Merge branch 'main' into phacUFPE/new_augments

data-otservbr-global/lib/others/fragment_gems.lua

@@ -0,0 +1,16 @@
+MAX_GEM_BREAK = 10
+
+FRAGMENT_GEMS = {
+	small = { ids = { 44602, 44605, 44608, 44611 }, fragment = 46625, range = { 1, 4 } },
+	medium = { ids = { 44603, 44606, 44609, 44612 }, fragment = 46625, range = { 2, 8 } },
+	great = { ids = { 44604, 44607, 44610, 44613 }, fragment = 46626, range = { 1, 4 } },
+}
+
+function getGemData(id)
+	for _, gem in pairs(FRAGMENT_GEMS) do
+		if table.contains(gem.ids, id) then
+			return gem.fragment, gem.range
+		end
+	end
+	return nil
+end

data-otservbr-global/lib/others/load.lua

@@ -1 +1,2 @@
 dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua")
+dofile(DATA_DIRECTORY .. "/lib/others/fragment_gems.lua")

data-otservbr-global/monster/bosses/the_book_of_death.lua

@@ -20,6 +20,10 @@ monster.corpse = 0
 monster.speed = 39
 monster.manaCost = 0
 
+monster.events = {
+	"ghuloshDeath",
+}
+
 monster.changeTarget = {
 	interval = 5000,
 	chance = 8,

data-otservbr-global/monster/bosses/the_flaming_orchid.lua

@@ -0,0 +1,126 @@
+local mType = Game.createMonsterType("The Flaming Orchid")
+local monster = {}
+
+monster.description = "a flaming orchid"
+monster.experience = 8500
+monster.outfit = {
+	lookType = 150,
+	lookHead = 114,
+	lookBody = 94,
+	lookLegs = 78,
+	lookFeet = 79,
+	lookAddons = 1,
+	lookMount = 0,
+}
+
+monster.health = 4000
+monster.maxHealth = 4000
+monster.race = "blood"
+monster.corpse = 21987 -- review later
+monster.speed = 210
+monster.manaCost = 0
+
+monster.events = {
+	"killingLibrary",
+}
+
+monster.changeTarget = {
+	interval = 4000,
+	chance = 10,
+}
+
+monster.strategiesTarget = {
+	nearest = 100,
+}
+
+monster.flags = {
+	summonable = false,
+	attackable = true,
+	hostile = true,
+	convinceable = false,
+	pushable = false,
+	rewardBoss = false,
+	illusionable = true,
+	canPushItems = true,
+	canPushCreatures = true,
+	staticAttackChance = 80,
+	targetDistance = 1,
+	runHealth = 0,
+	healthHidden = false,
+	isBlockable = false,
+	canWalkOnEnergy = true,
+	canWalkOnFire = true,
+	canWalkOnPoison = true,
+}
+
+monster.light = {
+	level = 0,
+	color = 0,
+}
+
+monster.voices = {
+	interval = 2000,
+	chance = 7,
+	{ text = "I will end your torment. Do not run, little mortal.", yell = true },
+	{ text = "*SNIFF* *SNIFF* BLOOD! I CAN SMELL YOU, MORTAL!!", yell = true },
+}
+
+monster.loot = {
+	{ name = "gold coin", chance = 100000, maxCount = 250 },
+	{ name = "platinum coin", chance = 9240, maxCount = 10 },
+	{ id = 3039, chance = 18200 }, -- red gem
+	{ name = "gold ingot", chance = 29700, maxCount = 5 },
+	{ name = "assassin star", chance = 29700, maxCount = 13 },
+	{ name = "demonic essence", chance = 330 },
+	{ name = "great spirit potion", chance = 330 },
+	{ name = "soul orb", chance = 19530 },
+	{ name = "small amethyst", chance = 8310, maxCount = 2 },
+	{ name = "small amethyst", chance = 8310, maxCount = 2 },
+	{ name = "ultimate health potion", chance = 700, maxCount = 4 },
+	{ name = "golden lotus brooch", chance = 19740 },
+	{ name = "green gem", chance = 15780 },
+	{ name = "magma coat", chance = 1050 },
+	{ name = "moonlight rod", chance = 1050 },
+	{ name = "necrotic rod", chance = 1050 },
+	{ name = "oriental shoes", chance = 490 },
+	{ name = "peacock feather fan", chance = 16870 },
+}
+
+monster.attacks = {
+	{ name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -25 },
+	{ name = "combat", interval = 1000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -400, maxDamage = -700, range = 7, effect = CONST_ANI_DEATH, target = true },
+	{ name = "Ignite", interval = 2000, chance = 20, range = 7, radius = 1, target = true, shootEffect = CONST_ANI_FIRE },
+	{ name = "big death wave", interval = 4000, chance = 18, minDamage = 0, maxDamage = -500 }, -- review later
+	{ name = "aggressivelavawave", interval = 5000, chance = 19, minDamage = 0, maxDamage = -200 }, -- review later
+	{ name = "combat", interval = 6000, chance = 20, type = COMBAT_FIREDAMAGE, range = 5, radius = 7, target = true, minDamage = -100, maxDamage = -250, shootEffect = CONST_ANI_FIRE, effect = CONST_ME_FIREAREA, target = false },
+}
+
+monster.defenses = {
+	defense = 55,
+	armor = 55,
+	{ name = "combat", interval = 2000, chance = 15, type = COMBAT_HEALING, minDamage = 50, maxDamage = 280, effect = CONST_ME_MAGIC_BLUE, target = false },
+	{ name = "speed", interval = 2000, chance = 15, speedChange = 320, duration = 5000, areaEffect = CONST_ME_MAGIC_RED },
+	{ name = "invisible", interval = 1000, chance = 100, duration = 10000, areaEffect = CONST_ME_MAGIC_BLUE },
+}
+
+monster.elements = {
+	{ type = COMBAT_PHYSICALDAMAGE, percent = 0 },
+	{ type = COMBAT_ENERGYDAMAGE, percent = 0 },
+	{ type = COMBAT_EARTHDAMAGE, percent = 0 },
+	{ type = COMBAT_FIREDAMAGE, percent = 0 },
+	{ type = COMBAT_LIFEDRAIN, percent = 0 },
+	{ type = COMBAT_MANADRAIN, percent = 0 },
+	{ type = COMBAT_DROWNDAMAGE, percent = 0 },
+	{ type = COMBAT_ICEDAMAGE, percent = 0 },
+	{ type = COMBAT_HOLYDAMAGE, percent = 0 },
+	{ type = COMBAT_DEATHDAMAGE, percent = 0 },
+}
+
+monster.immunities = {
+	{ type = "paralyze", condition = true },
+	{ type = "outfit", condition = false },
+	{ type = "invisible", condition = true },
+	{ type = "bleed", condition = false },
+}
+
+mType:register(monster)

data-otservbr-global/monster/quests/cults_of_tibia/misguided_bully.lua

@@ -13,10 +13,6 @@ monster.outfit = {
 	lookMount = 0,
 }
 
-monster.events = {
-	"GlowingRubbishAmuletDeath",
-}
-
 monster.raceId = 1412
 monster.Bestiary = {
 	class = "Humanoid",
@@ -49,6 +45,10 @@ monster.strategiesTarget = {
 	random = 10,
 }
 
+monster.events = {
+	"GlowingRubbishAmuletDeath",
+}
+
 monster.flags = {
 	summonable = false,
 	attackable = true,

data-otservbr-global/monster/quests/cults_of_tibia/misguided_shadow.lua

@@ -13,10 +13,6 @@ monster.outfit = {
 	lookMount = 0,
 }
 
-monster.events = {
-	"GlowingRubbishAmuletDeath",
-}
-
 monster.health = 3000
 monster.maxHealth = 3000
 monster.race = "blood"
@@ -36,6 +32,10 @@ monster.strategiesTarget = {
 	random = 10,
 }
 
+monster.events = {
+	"GlowingRubbishAmuletDeath",
+}
+
 monster.flags = {
 	summonable = false,
 	attackable = true,

data-otservbr-global/monster/quests/cults_of_tibia/misguided_thief.lua

@@ -45,6 +45,10 @@ monster.strategiesTarget = {
 	random = 10,
 }
 
+monster.events = {
+	"GlowingRubbishAmuletDeath",
+}
+
 monster.flags = {
 	summonable = false,
 	attackable = true,

data-otservbr-global/monster/quests/the_first_dragon/angry_plant.lua

@@ -20,6 +20,10 @@ monster.corpse = 2983
 monster.speed = 55
 monster.manaCost = 0
 
+monster.events = {
+	"AngryPlantDeath",
+}
+
 monster.changeTarget = {
 	interval = 2000,
 	chance = 5,

data-otservbr-global/monster/quests/the_first_dragon/bosses/fallen_challenger.lua

@@ -20,6 +20,10 @@ monster.corpse = 775
 monster.speed = 150
 monster.manaCost = 0
 
+monster.events = {
+	"FallenDeath",
+}
+
 monster.changeTarget = {
 	interval = 5000,
 	chance = 8,

data-otservbr-global/monster/quests/the_first_dragon/dragon_essence.lua

@@ -20,6 +20,10 @@ monster.corpse = 0
 monster.speed = 125
 monster.manaCost = 0
 
+monster.events = {
+	"DragonEssenceDeath",
+}
+
 monster.changeTarget = {
 	interval = 2000,
 	chance = 5,

data-otservbr-global/monster/quests/the_first_dragon/somewhat_beatable.lua

@@ -53,7 +53,7 @@ monster.flags = {
 }
 
 monster.events = {
-	"Somewhat Beatable Death",
+	"SomewhatBeatableDeath",
 }
 
 monster.light = {

data-otservbr-global/monster/quests/the_secret_library/bosses/brokul.lua

@@ -25,6 +25,10 @@ monster.corpse = 28635
 monster.speed = 105
 monster.manaCost = 0
 
+monster.events = {
+	"killingLibrary",
+}
+
 monster.changeTarget = {
 	interval = 1000,
 	chance = 10,

data-otservbr-global/monster/quests/the_secret_library/bosses/ghulosh.lua

@@ -14,7 +14,7 @@ monster.outfit = {
 }
 
 monster.events = {
-	"SecretLibraryBossDeath",
+	"ghuloshThink",
 }
 
 monster.bosstiary = {

data-otservbr-global/monster/quests/the_secret_library/bosses/gorzindel.lua

@@ -14,7 +14,7 @@ monster.outfit = {
 }
 
 monster.events = {
-	"SecretLibraryBossDeath",
+	"gorzindelHealth",
 }
 
 monster.bosstiary = {

data-otservbr-global/monster/quests/the_secret_library/bosses/grand_canon_dominus.lua

@@ -26,7 +26,7 @@ monster.speed = 105
 monster.manaCost = 0
 
 monster.events = {
-	"GrandCanonDominusDeath",
+	"killingLibrary",
 }
 
 monster.changeTarget = {

data-otservbr-global/monster/quests/the_secret_library/bosses/grand_chaplain_gaunder.lua

@@ -26,7 +26,7 @@ monster.speed = 105
 monster.manaCost = 0
 
 monster.events = {
-	"GrandChaplainGaunderDeath",
+	"killingLibrary",
 }
 
 monster.changeTarget = {

data-otservbr-global/monster/quests/the_secret_library/bosses/grand_commander_soeren.lua

@@ -26,7 +26,7 @@ monster.speed = 105
 monster.manaCost = 0
 
 monster.events = {
-	"GrandCommanderSoerenDeath",
+	"killingLibrary",
 }
 
 monster.changeTarget = {

data-otservbr-global/monster/quests/the_secret_library/bosses/grand_master_oberon.lua

@@ -25,6 +25,11 @@ monster.corpse = 28625
 monster.speed = 115
 monster.manaCost = 0
 
+monster.events = {
+	"killingLibrary",
+	"oberonImmune",
+}
+
 monster.changeTarget = {
 	interval = 4000,
 	chance = 10,

data-otservbr-global/monster/quests/the_secret_library/bosses/preceptor_lazare.lua

@@ -26,7 +26,7 @@ monster.speed = 105
 monster.manaCost = 0
 
 monster.events = {
-	"PreceptorLazareDeath",
+	"killingLibrary",
 }
 
 monster.changeTarget = {

data-otservbr-global/monster/quests/the_secret_library/concentrated_death.lua

@@ -20,6 +20,10 @@ monster.corpse = 28601
 monster.speed = 175
 monster.manaCost = 0
 
+monster.events = {
+	"ghuloshDeath",
+}
+
 monster.changeTarget = {
 	interval = 5000,
 	chance = 8,

data-otservbr-global/monster/quests/the_secret_library/dazed_leaf_golem.lua

@@ -21,7 +21,7 @@ monster.speed = 175
 monster.manaCost = 0
 
 monster.events = {
-	"DazedLeafGolemDeath",
+	"killingLibrary",
 }
 
 monster.changeTarget = {

data-otservbr-global/monster/quests/the_secret_library/lokathmor.lua

@@ -14,7 +14,7 @@ monster.outfit = {
 }
 
 monster.events = {
-	"SecretLibraryBossDeath",
+	"lokathmorDeath",
 }
 
 monster.bosstiary = {

data-otservbr-global/monster/quests/the_secret_library/mazzinor.lua

@@ -14,7 +14,8 @@ monster.outfit = {
 }
 
 monster.events = {
-	"SecretLibraryBossDeath",
+	"mazzinorDeath",
+	"mazzinorHealth",
 }
 
 monster.bosstiary = {

data-otservbr-global/monster/quests/the_secret_library/stolen_knowledge_of_armor.lua

@@ -20,6 +20,10 @@ monster.corpse = 0
 monster.speed = 75
 monster.manaCost = 0
 
+monster.events = {
+	"gorzindelDeath",
+}
+
 monster.changeTarget = {
 	interval = 5000,
 	chance = 8,

data-otservbr-global/monster/quests/the_secret_library/stolen_knowledge_of_healing.lua

@@ -20,6 +20,10 @@ monster.corpse = 0
 monster.speed = 75
 monster.manaCost = 0
 
+monster.events = {
+	"gorzindelDeath",
+}
+
 monster.changeTarget = {
 	interval = 5000,
 	chance = 8,