Merge branch 'main' into hotfix/fix-scripts

elsongabriel · Nov 21, 2023 · 33fb5f2 · 33fb5f2
2 parents cb91876 + 24c702d
commit 33fb5f2
Show file tree

Hide file tree

Showing 52 changed files with 229 additions and 378 deletions.
diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -2791,10 +2791,6 @@ Storage = {
 		U12_90 = { -- update 12.90 - Reserved Storages 47851 - 47900
 			PrimalOrdeal = {
 				QuestLine = 47851,
-				Hazard = {
-					Current = 47856,
-					Max = 47857,
-				},
 				Bosses = {
 					MagmaBubbleKilled = 47853,
 					ThePrimalMenaceKilled = 47855,

diff --git a/data-otservbr-global/lib/quests/quest.lua b/data-otservbr-global/lib/quests/quest.lua
@@ -6,3 +6,4 @@ dofile(DATA_DIRECTORY .. "/lib/quests/svargrond_arena.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/the_cursed_crystal.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/the_queen_of_the_banshees.lua")
 dofile(DATA_DIRECTORY .. "/lib/quests/their_masters_voice.lua")
+dofile(DATA_DIRECTORY .. "/lib/quests/the_primal_ordeal.lua")
diff --git a/data-otservbr-global/lib/quests/the_primal_ordeal.lua b/data-otservbr-global/lib/quests/the_primal_ordeal.lua
@@ -0,0 +1,14 @@
+function RegisterPrimalPackBeast(template)
+	local name = template.name or template.description:gsub("an ", ""):gsub("a ", ""):titleCase()
+	local primal = Game.createMonsterType(name .. " (Primal)")
+	local primalMonster = table.copy(template)
+	primalMonster.experience = 0
+	primalMonster.loot = {}
+	primalMonster.name = "Primal Pack Beast"
+	primalMonster.description = "a primal pack beast"
+
+	primalMonster.raceId = nil
+	primalMonster.Bestiary = nil
+
+	primal:register(primalMonster)
+end
diff --git a/data-otservbr-global/monster/birds/headpecker.lua b/data-otservbr-global/monster/birds/headpecker.lua
@@ -121,3 +121,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/giants/hulking_prehemoth.lua b/data-otservbr-global/monster/giants/hulking_prehemoth.lua
@@ -119,3 +119,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/mammals/beast_gore_horn.lua b/data-otservbr-global/monster/mammals/beast_gore_horn.lua
diff --git a/data-otservbr-global/monster/mammals/beast_gorerilla.lua b/data-otservbr-global/monster/mammals/beast_gorerilla.lua
diff --git a/data-otservbr-global/monster/mammals/beast_sabretooth.lua b/data-otservbr-global/monster/mammals/beast_sabretooth.lua
diff --git a/data-otservbr-global/monster/mammals/gore_horn.lua b/data-otservbr-global/monster/mammals/gore_horn.lua
@@ -120,3 +120,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/mammals/gorerilla.lua b/data-otservbr-global/monster/mammals/gorerilla.lua
@@ -121,3 +121,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/mammals/nighthunter.lua b/data-otservbr-global/monster/mammals/nighthunter.lua
@@ -120,3 +120,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/mammals/sabretooth.lua b/data-otservbr-global/monster/mammals/sabretooth.lua
@@ -119,3 +119,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
diff --git a/data-otservbr-global/monster/plants/stalking_stalk.lua b/data-otservbr-global/monster/plants/stalking_stalk.lua
@@ -120,3 +120,5 @@ monster.immunities = {
 }
 
 mType:register(monster)
+
+RegisterPrimalPackBeast(monster)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,3 +121,5 @@ monster.immunities = {
		}

		mType:register(monster)

		RegisterPrimalPackBeast(monster)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,3 +119,5 @@ monster.immunities = {
		}

		mType:register(monster)

		RegisterPrimalPackBeast(monster)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -120,3 +120,5 @@ monster.immunities = {
		}

		mType:register(monster)

		RegisterPrimalPackBeast(monster)