Merge branch 'main' into fix-bank-npc

opentibiabr · Mar 18, 2024 · febae3f · febae3f
2 parents 7b75e74 + 4a661ef
commit febae3f
Show file tree

Hide file tree

Showing 52 changed files with 193 additions and 313 deletions.
diff --git a/data-canary/monster/demons/fury.lua b/data-canary/monster/demons/fury.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Fury")
 local monster = {}
 
 monster.description = "a fury"
-monster.experience = 3600
+monster.experience = 4000
 monster.outfit = {
 	lookType = 149,
 	lookHead = 94,

diff --git a/data-canary/scripts/actions/tools/crowbar.lua b/data-canary/scripts/actions/tools/crowbar.lua
diff --git a/data-canary/scripts/actions/tools/machete.lua b/data-canary/scripts/actions/tools/machete.lua
diff --git a/data-canary/scripts/actions/tools/pick.lua b/data-canary/scripts/actions/tools/pick.lua
diff --git a/data-canary/scripts/actions/tools/rope.lua b/data-canary/scripts/actions/tools/rope.lua
diff --git a/data-canary/scripts/actions/tools/scythe.lua b/data-canary/scripts/actions/tools/scythe.lua
diff --git a/data-canary/scripts/actions/tools/shovel.lua b/data-canary/scripts/actions/tools/shovel.lua
diff --git a/data-canary/scripts/actions/tools/spoon.lua b/data-canary/scripts/actions/tools/spoon.lua
diff --git a/data-otservbr-global/monster/demons/hellfire_fighter.lua b/data-otservbr-global/monster/demons/hellfire_fighter.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Hellfire Fighter")
 local monster = {}
 
 monster.description = "a hellfire fighter"
-monster.experience = 3120
+monster.experience = 3400
 monster.outfit = {
 	lookType = 243,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/demons/hellflayer.lua b/data-otservbr-global/monster/demons/hellflayer.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Hellflayer")
 local monster = {}
 
 monster.description = "a hellflayer"
-monster.experience = 11000
+monster.experience = 11720
 monster.outfit = {
 	lookType = 856,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/demons/juggernaut.lua b/data-otservbr-global/monster/demons/juggernaut.lua
@@ -28,8 +28,8 @@ monster.Bestiary = {
 	Oramond Dungeon, Grounds of Destruction and Halls of Ascension.",
 }
 
-monster.health = 20000
-monster.maxHealth = 20000
+monster.health = 18000
+monster.maxHealth = 18000
 monster.race = "blood"
 monster.corpse = 6335
 monster.speed = 170

diff --git a/data-otservbr-global/monster/demons/plaguesmith.lua b/data-otservbr-global/monster/demons/plaguesmith.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Plaguesmith")
 local monster = {}
 
 monster.description = "a plaguesmith"
-monster.experience = 3555
+monster.experience = 3800
 monster.outfit = {
 	lookType = 247,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/magicals/nightmare.lua b/data-otservbr-global/monster/magicals/nightmare.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Nightmare")
 local monster = {}
 
 monster.description = "a nightmare"
-monster.experience = 1666
+monster.experience = 1800
 monster.outfit = {
 	lookType = 245,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Ferumbras Mortal Shell")
 local monster = {}
 
 monster.description = "Ferumbras Mortal Shell"
-monster.experience = 100000
+monster.experience = 500000
 monster.outfit = {
 	lookType = 229,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Mazoran")
 local monster = {}
 
 monster.description = "Mazoran"
-monster.experience = 50000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 842,
 	lookHead = 77,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Plagirath")
 local monster = {}
 
 monster.description = "Plagirath"
-monster.experience = 50000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 862,
 	lookHead = 84,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Ragiaz")
 local monster = {}
 
 monster.description = "Ragiaz"
-monster.experience = 50000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 862,
 	lookHead = 76,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Razzagorn")
 local monster = {}
 
 monster.description = "Razzagorn"
-monster.experience = 50000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 842,
 	lookHead = 78,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Shulgrax")
 local monster = {}
 
 monster.description = "Shulgrax"
-monster.experience = 21000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 842,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Tarbaz")
 local monster = {}
 
 monster.description = "Tarbaz"
-monster.experience = 55000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 842,
 	lookHead = 0,

diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua
@@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Zamulosh")
 local monster = {}
 
 monster.description = "Zamulosh"
-monster.experience = 50000
+monster.experience = 250000
 monster.outfit = {
 	lookType = 862,
 	lookHead = 16,

diff --git a/data-otservbr-global/monster/undeads/blightwalker.lua b/data-otservbr-global/monster/undeads/blightwalker.lua
@@ -26,8 +26,8 @@ monster.Bestiary = {
 	Locations = "Pits of Inferno, Edron (In the Vats during The Inquisition Quest), Roshamuul Prison, Grounds of Undeath.",
 }
 
-monster.health = 8900
-monster.maxHealth = 8900
+monster.health = 8100
+monster.maxHealth = 8100
 monster.race = "undead"
 monster.corpse = 6353
 monster.speed = 175

diff --git a/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua b/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua
@@ -26,8 +26,8 @@ monster.Bestiary = {
 	Locations = "Pits of Inferno, The Battlefield, The Arcanum, The Blood Halls and The Crystal Caves.",
 }
 
-monster.health = 7500
-monster.maxHealth = 7500
+monster.health = 6600
+monster.maxHealth = 6600
 monster.race = "blood"
 monster.corpse = 6311
 monster.speed = 130

diff --git a/data-otservbr-global/monster/undeads/undead_dragon.lua b/data-otservbr-global/monster/undeads/undead_dragon.lua
@@ -133,7 +133,7 @@ monster.elements = {
 	{ type = COMBAT_LIFEDRAIN, percent = 0 },
 	{ type = COMBAT_MANADRAIN, percent = 0 },
 	{ type = COMBAT_DROWNDAMAGE, percent = 100 },
-	{ type = COMBAT_ICEDAMAGE, percent = 50 },
+	{ type = COMBAT_ICEDAMAGE, percent = 90 },
 	{ type = COMBAT_HOLYDAMAGE, percent = -25 },
 	{ type = COMBAT_DEATHDAMAGE, percent = 100 },
 }

diff --git a/data-otservbr-global/npc/gnomadness.lua b/data-otservbr-global/npc/gnomadness.lua
@@ -83,12 +83,13 @@ local function creatureSayCallback(npc, creature, type, message)
 			end
 			if hazard:setPlayerCurrentLevel(player, desiredLevel) then
 				npcHandler:say("Your hazard level has been set to " .. desiredLevel .. ". Good luck!", npc, creature)
-				if desiredLevel >= hazard.maxLevel and not player:kv():scoped("primal-ordeal"):get("received-prize") then
-					player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Congratulations you received the Noxious Ripptor mount.")
+				if desiredLevel >= 6 and not player:kv():scoped("primal-ordeal"):get("received-prize") then
 					player:addMount(202)
-					npcHandler:say("You've achived the maximum hazard level. As a reward, you've received the Noxious Ripptor mount and a primal bag.", npc, creature)
+					player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Congratulations you received the Noxious Ripptor mount.")
+					player:addAchievement("Ripp-Ripp Hooray!")
 					player:addItem(PRIMAL_BAG, 1)
 					player:kv():scoped("primal-ordeal"):set("received-prize", true)
+					npcHandler:say("You've achieved the necessary hazard level. As a reward, you've received the Noxious Ripptor mount and a primal bag.", npc, creature)
 				end
 			else
 				npcHandler:say("You can't set your hazard level higher than your maximum unlocked level.", npc, creature)