Ferumbras' Ascension Quest

Congratulations to the creator of this quest, it was the most complex so far and very well done.
htc16 · Sep 19, 2024 · 839d5de · 839d5de
1 parent 15b7e0a
commit 839d5de
Show file tree

Hide file tree

Showing 138 changed files with 2,321 additions and 1,093 deletions.
diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -424,42 +424,6 @@ Storage = {
 		AccessTeleport2 = 50405,
 		AccessTeleport3 = 50406,
 	},
-	FerumbrasAscension = {
-		-- Reserved storage from 50420 - 50469
-		RiftRunner = 50420, -- Scroll
-		TheShattererTimer = 50421,
-		TheLordOfTheLiceTimer = 50422,
-		Tarbaz = 50431,
-		Razzagorn = 50432,
-		Ragiaz = 50433,
-		Zamulosh = 50434,
-		Shulgrax = 50435,
-		Mazoran = 50436,
-		Plagirath = 50437,
-		Access = 50438,
-		TheShatterer = 50439,
-		ZamuloshTeleports = 50440,
-		BasinCounter = 50441,
-		TheLordOfTheLiceAccess = 50442,
-		FirstDoor = 50443,
-		MonsterDoor = 50444,
-		TarbazDoor = 50445,
-		HabitatsAccess = 50446,
-		HabitatsTimer = 50447,
-		TarbazNotes = 50448,
-		ColorLever = 50449,
-		BoneFluteWall = 50450,
-		BoneFlute = 50451,
-		Ring = 50452,
-		Statue = 50453,
-		Fount = 50454,
-		Vampire = 50455,
-		Flower = 50456,
-		Ring2 = 50457,
-		Bone = 50458,
-		Reward = 50459,
-		TheShattererLever = 50460,
-	},
 	ForgottenKnowledge = {
 		-- Reserved storage from 50470 - 50519
 		AccessDeath = 50470,
@@ -2467,11 +2431,91 @@ Storage = {
 				DragonCounter = 45181,
 				Achievement = 45182,
 			},
-			TheLostBrotherQuest = 52149,
+			TheLostBrotherQuest = 45183,
 			TheTaintedSouls = {},
 		},
 		U10_90 = { -- update 10.90 - Reserved Storages 45201 - 45350
-			FerumbrasAscension = {},
+			FerumbrasAscension = {
+				RiftRunner = 45201, -- Scroll
+				TheShattererTimer = 45202,
+				TheLordOfTheLiceTimer = 45203,
+				Tarbaz = 45204,
+				Razzagorn = 45205,
+				Ragiaz = 45206,
+				Zamulosh = 45207,
+				Shulgrax = 45208,
+				Mazoran = 45209,
+				Plagirath = 45210,
+				Access = 45211,
+				TheShatterer = 45212,
+				ZamuloshTeleports = 45213,
+				BasinCounter = 45214,
+				TheLordOfTheLiceAccess = 45215,
+				FirstDoor = 45216,
+				MonsterDoor = 45217,
+				TarbazDoor = 45218,
+				HabitatsAccess = 45219,
+				HabitatsTimer = 45220,
+				TarbazNotes = 45221,
+				ColorLever = 45222,
+				BoneFluteWall = 45223,
+				BoneFlute = 45224,
+				Ring = 45225,
+				Statue = 45226,
+				Fount = 45227,
+				Vampire = 45228,
+				Flower = 45229,
+				Ring2 = 45230,
+				Bone = 45231,
+				Reward = 45232,
+				TheShattererLever = 45233,
+				TheLordOfTheLiceTime = 45234,
+				TarbazTime = 45235,
+				RagiazTime = 45236,
+				PlagirathTime = 45237,
+				RazzagornTime = 45238,
+				ZamuloshTime = 45239,
+				MazoranTime = 45240,
+				ShulgraxTime = 45241,
+				FerumbrasMortalShellTime = 45242,
+				ZamuloshSummon = 45243,
+				FerumbrasEssence = 45244,
+				DesperateSoul = 45245,
+				FlowerPuzzleTimer = 45246,
+				Crystals = {
+					Crystal1 = 45247,
+					Crystal2 = 45248,
+					Crystal3 = 45249,
+					Crystal4 = 45250,
+					Crystal5 = 45251,
+					Crystal6 = 45252,
+					Crystal7 = 45253,
+					Crystal8 = 45254,
+					AllCrystals = 45255,
+				},
+				Habitats = {
+					Roshamuul = 45256,
+					Grass = 45257,
+					Mushroom = 45258,
+					Desert = 45259,
+					Venom = 45260,
+					Ice = 45261,
+					Corrupted = 45262,
+					Dimension = 45263,
+					AllHabitats = 45264,
+				},
+				Elements = {
+					First = 45265,
+					Second = 45266,
+					Third = 45267,
+					Four = 45268,
+					Active = 45269,
+					Done = 45270,
+				},
+				TheRiteOfEternalNight = 45271,
+				StoneCoffinsBones = 45272,
+				VampireTeeth = 45273,
+			},
 			Krailos = {},
 			RiftWarriorOutfits = {},
 		},
@@ -2781,43 +2825,7 @@ GlobalStorage = {
 		Chance = 60020,
 		Active = 60021,
 	},
-	FerumbrasAscendant = {
-		-- Reserved storage from 60030 - 60069
-		ZamuloshSummon = 60030,
-		FerumbrasEssence = 60031,
-		DesperateSoul = 60032,
-		FlowerPuzzleTimer = 60033,
-		Crystals = {
-			Crystal1 = 60040,
-			Crystal2 = 60041,
-			Crystal3 = 60042,
-			Crystal4 = 60043,
-			Crystal5 = 60044,
-			Crystal6 = 60045,
-			Crystal7 = 60046,
-			Crystal8 = 60047,
-			AllCrystals = 60048,
-		},
-		Habitats = {
-			Roshamuul = 60050,
-			Grass = 60051,
-			Mushroom = 60052,
-			Desert = 60053,
-			Venom = 60054,
-			Ice = 60055,
-			Corrupted = 60056,
-			Dimension = 60057,
-			AllHabitats = 60058,
-		},
-		Elements = {
-			First = 60060,
-			Second = 60061,
-			Third = 60062,
-			Four = 60063,
-			Active = 60064,
-			Done = 60065,
-		},
-	},
+
 	HeroRathleton = {
 		-- Reserved storage from 60070 - 60089
 		FirstMachines = 60070,
@@ -2914,21 +2922,21 @@ startupGlobalStorages = {
 	GlobalStorage.HeroRathleton.MaxxenRunning,
 	GlobalStorage.HeroRathleton.LavaCounter,
 	GlobalStorage.HeroRathleton.FourthMachines,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal1,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal2,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal3,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal4,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal5,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal6,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal7,
-	GlobalStorage.FerumbrasAscendant.Crystals.Crystal8,
-	GlobalStorage.FerumbrasAscendant.Crystals.AllCrystals,
-	GlobalStorage.FerumbrasAscendant.FerumbrasEssence,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal1,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal2,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal3,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal4,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal5,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal6,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal7,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.Crystal8,
+	Storage.Quest.U10_90.FerumbrasAscension.Crystals.AllCrystals,
+	Storage.Quest.U10_90.FerumbrasAscension.FerumbrasEssence,
 	GlobalStorage.Feroxa.Active,
-	GlobalStorage.FerumbrasAscendant.Habitats.AllHabitats,
-	GlobalStorage.FerumbrasAscendant.Elements.Active,
-	GlobalStorage.FerumbrasAscendant.Elements.First,
-	GlobalStorage.FerumbrasAscendant.Elements.Second,
-	GlobalStorage.FerumbrasAscendant.Elements.Third,
-	GlobalStorage.FerumbrasAscendant.Elements.Done,
+	Storage.Quest.U10_90.FerumbrasAscension.Habitats.AllHabitats,
+	Storage.Quest.U10_90.FerumbrasAscension.Elements.Active,
+	Storage.Quest.U10_90.FerumbrasAscension.Elements.First,
+	Storage.Quest.U10_90.FerumbrasAscension.Elements.Second,
+	Storage.Quest.U10_90.FerumbrasAscension.Elements.Third,
+	Storage.Quest.U10_90.FerumbrasAscension.Elements.Done,
 }
diff --git a/..._ascendant/bosses/ascending_ferumbras.lua → ..._ascension/bosses/ascending_ferumbras.lua b/..._ascendant/bosses/ascending_ferumbras.lua → ..._ascension/bosses/ascending_ferumbras.lua
diff --git a/...rumbras_ascendant/bosses/death_dragon.lua → ...rumbras_ascension/bosses/death_dragon.lua b/...rumbras_ascendant/bosses/death_dragon.lua → ...rumbras_ascension/bosses/death_dragon.lua
diff --git a/...cendant/bosses/destabilized_ferumbras.lua → ...cension/bosses/destabilized_ferumbras.lua b/...cendant/bosses/destabilized_ferumbras.lua → ...cension/bosses/destabilized_ferumbras.lua
diff --git a/...rumbras_ascendant/bosses/enraged_soul.lua → ...rumbras_ascension/bosses/enraged_soul.lua b/...rumbras_ascendant/bosses/enraged_soul.lua → ...rumbras_ascension/bosses/enraged_soul.lua
diff --git a/...cendant/bosses/ferumbras_mortal_shell.lua → ...cension/bosses/ferumbras_mortal_shell.lua b/...cendant/bosses/ferumbras_mortal_shell.lua → ...cension/bosses/ferumbras_mortal_shell.lua
diff --git a/...endant/bosses/ferumbras_soul_splinter.lua → ...ension/bosses/ferumbras_soul_splinter.lua b/...endant/bosses/ferumbras_soul_splinter.lua → ...ension/bosses/ferumbras_soul_splinter.lua
diff --git a/...ts/ferumbras_ascendant/bosses/mazoran.lua → ...ts/ferumbras_ascension/bosses/mazoran.lua b/...ts/ferumbras_ascendant/bosses/mazoran.lua → ...ts/ferumbras_ascension/bosses/mazoran.lua
diff --git a/.../ferumbras_ascendant/bosses/plagirath.lua → .../ferumbras_ascension/bosses/plagirath.lua b/.../ferumbras_ascendant/bosses/plagirath.lua → .../ferumbras_ascension/bosses/plagirath.lua
diff --git a/...sts/ferumbras_ascendant/bosses/ragiaz.lua → ...sts/ferumbras_ascension/bosses/ragiaz.lua b/...sts/ferumbras_ascendant/bosses/ragiaz.lua → ...sts/ferumbras_ascension/bosses/ragiaz.lua
diff --git a/.../ferumbras_ascendant/bosses/razzagorn.lua → .../ferumbras_ascension/bosses/razzagorn.lua b/.../ferumbras_ascendant/bosses/razzagorn.lua → .../ferumbras_ascension/bosses/razzagorn.lua
diff --git a/...umbras_ascendant/bosses/redeemed_soul.lua → ...umbras_ascension/bosses/redeemed_soul.lua b/...umbras_ascendant/bosses/redeemed_soul.lua → ...umbras_ascension/bosses/redeemed_soul.lua
diff --git a/...s/ferumbras_ascendant/bosses/shulgrax.lua → ...s/ferumbras_ascension/bosses/shulgrax.lua b/...s/ferumbras_ascendant/bosses/shulgrax.lua → ...s/ferumbras_ascension/bosses/shulgrax.lua
diff --git a/...rumbras_ascendant/bosses/sin_devourer.lua → ...rumbras_ascension/bosses/sin_devourer.lua b/...rumbras_ascendant/bosses/sin_devourer.lua → ...rumbras_ascension/bosses/sin_devourer.lua
diff --git a/...sts/ferumbras_ascendant/bosses/tarbaz.lua → ...sts/ferumbras_ascension/bosses/tarbaz.lua b/...sts/ferumbras_ascendant/bosses/tarbaz.lua → ...sts/ferumbras_ascension/bosses/tarbaz.lua
diff --git a/...ascendant/bosses/the_lord_of_the_lice.lua → ...ascension/bosses/the_lord_of_the_lice.lua b/...ascendant/bosses/the_lord_of_the_lice.lua → ...ascension/bosses/the_lord_of_the_lice.lua
diff --git a/...umbras_ascendant/bosses/the_shatterer.lua → ...umbras_ascension/bosses/the_shatterer.lua b/...umbras_ascendant/bosses/the_shatterer.lua → ...umbras_ascension/bosses/the_shatterer.lua
diff --git a/...s/ferumbras_ascendant/bosses/zamulosh.lua → ...s/ferumbras_ascension/bosses/zamulosh.lua b/...s/ferumbras_ascendant/bosses/zamulosh.lua → ...s/ferumbras_ascension/bosses/zamulosh.lua
diff --git a/.../ferumbras_ascendant/bosses/zamulosh2.lua → .../ferumbras_ascension/bosses/zamulosh2.lua b/.../ferumbras_ascendant/bosses/zamulosh2.lua → .../ferumbras_ascension/bosses/zamulosh2.lua
@@ -14,10 +14,6 @@ monster.outfit = {
 	lookMount = 0,
 }
 
-monster.events = {
-	"AscendantBossesDeath",
-}
-
 monster.health = 300000
 monster.maxHealth = 300000
 monster.race = "undead"

diff --git a/.../ferumbras_ascendant/bosses/zamulosh3.lua → .../ferumbras_ascension/bosses/zamulosh3.lua b/.../ferumbras_ascendant/bosses/zamulosh3.lua → .../ferumbras_ascension/bosses/zamulosh3.lua
@@ -15,7 +15,6 @@ monster.outfit = {
 }
 
 monster.events = {
-	"AscendantBossesDeath",
 	"ZamuloshClone",
 }
 

diff --git a/...uests/ferumbras_ascendant/damned_soul.lua → ...uests/ferumbras_ascension/damned_soul.lua b/...uests/ferumbras_ascendant/damned_soul.lua → ...uests/ferumbras_ascension/damned_soul.lua
diff --git a/...ts/ferumbras_ascendant/desperate_soul.lua → ...ts/ferumbras_ascension/desperate_soul.lua b/...ts/ferumbras_ascendant/desperate_soul.lua → ...ts/ferumbras_ascension/desperate_soul.lua
diff --git a/...s/ferumbras_ascendant/disgusting_ooze.lua → ...s/ferumbras_ascension/disgusting_ooze.lua b/...s/ferumbras_ascendant/disgusting_ooze.lua → ...s/ferumbras_ascension/disgusting_ooze.lua
diff --git a/...ferumbras_ascendant/ferumbras_essence.lua → ...ferumbras_ascension/ferumbras_essence.lua b/...ferumbras_ascendant/ferumbras_essence.lua → ...ferumbras_ascension/ferumbras_essence.lua
diff --git a/...erumbras_ascendant/lovely/lovely_deer.lua → ...erumbras_ascension/lovely/lovely_deer.lua b/...erumbras_ascendant/lovely/lovely_deer.lua → ...erumbras_ascension/lovely/lovely_deer.lua
diff --git a/...as_ascendant/lovely/lovely_frazzlemaw.lua → ...as_ascension/lovely/lovely_frazzlemaw.lua b/...as_ascendant/lovely/lovely_frazzlemaw.lua → ...as_ascension/lovely/lovely_frazzlemaw.lua
diff --git a/...as_ascendant/lovely/lovely_polar_bear.lua → ...as_ascension/lovely/lovely_polar_bear.lua b/...as_ascendant/lovely/lovely_polar_bear.lua → ...as_ascension/lovely/lovely_polar_bear.lua
diff --git a/...mbras_ascendant/lovely/lovely_rotworm.lua → ...mbras_ascension/lovely/lovely_rotworm.lua b/...mbras_ascendant/lovely/lovely_rotworm.lua → ...mbras_ascension/lovely/lovely_rotworm.lua
diff --git a/...bras_ascendant/lovely/lovely_scorpion.lua → ...bras_ascension/lovely/lovely_scorpion.lua b/...bras_ascendant/lovely/lovely_scorpion.lua → ...bras_ascension/lovely/lovely_scorpion.lua
diff --git a/...rumbras_ascendant/lovely/lovely_snake.lua → ...rumbras_ascension/lovely/lovely_snake.lua b/...rumbras_ascendant/lovely/lovely_snake.lua → ...rumbras_ascension/lovely/lovely_snake.lua
diff --git a/...ras_ascendant/lovely/lovely_souleater.lua → ...ras_ascension/lovely/lovely_souleater.lua b/...ras_ascendant/lovely/lovely_souleater.lua → ...ras_ascension/lovely/lovely_souleater.lua
diff --git a/...ras_ascendant/lovely/lovely_yielothax.lua → ...ras_ascension/lovely/lovely_yielothax.lua b/...ras_ascendant/lovely/lovely_yielothax.lua → ...ras_ascension/lovely/lovely_yielothax.lua
diff --git a/...s/ferumbras_ascendant/rage_of_mazoran.lua → ...s/ferumbras_ascension/rage_of_mazoran.lua b/...s/ferumbras_ascendant/rage_of_mazoran.lua → ...s/ferumbras_ascension/rage_of_mazoran.lua
diff --git a/...as_ascendant/summons/enthralled_demon.lua → ...as_ascension/summons/enthralled_demon.lua b/...as_ascendant/summons/enthralled_demon.lua → ...as_ascension/summons/enthralled_demon.lua
diff --git a/...mbras_ascendant/summons/rift_fragment.lua → ...mbras_ascension/summons/rift_fragment.lua b/...mbras_ascendant/summons/rift_fragment.lua → ...mbras_ascension/summons/rift_fragment.lua
diff --git a/...umbras_ascendant/summons/rift_invader.lua → ...umbras_ascension/summons/rift_invader.lua b/...umbras_ascendant/summons/rift_invader.lua → ...umbras_ascension/summons/rift_invader.lua
diff --git a/...erumbras_ascendant/traps/bone_capsule.lua → ...erumbras_ascension/traps/bone_capsule.lua b/...erumbras_ascendant/traps/bone_capsule.lua → ...erumbras_ascension/traps/bone_capsule.lua
diff --git a/...sts/ferumbras_ascendant/traps/despair.lua → ...sts/ferumbras_ascension/traps/despair.lua b/...sts/ferumbras_ascendant/traps/despair.lua → ...sts/ferumbras_ascension/traps/despair.lua
diff --git a/...mbras_ascendant/traps/electric_sparks.lua → ...mbras_ascension/traps/electric_sparks.lua b/...mbras_ascendant/traps/electric_sparks.lua → ...mbras_ascension/traps/electric_sparks.lua
diff --git a/...cendant/traps/eruption_of_destruction.lua → ...cension/traps/eruption_of_destruction.lua b/...cendant/traps/eruption_of_destruction.lua → ...cension/traps/eruption_of_destruction.lua
diff --git a/...uests/ferumbras_ascendant/traps/guilt.lua → ...uests/ferumbras_ascension/traps/guilt.lua b/...uests/ferumbras_ascendant/traps/guilt.lua → ...uests/ferumbras_ascension/traps/guilt.lua
diff --git a/...quests/ferumbras_ascendant/traps/void.lua → ...quests/ferumbras_ascension/traps/void.lua b/...quests/ferumbras_ascendant/traps/void.lua → ...quests/ferumbras_ascension/traps/void.lua
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ monster.outfit = { @@
     }
     monster.events = {
-    	"AscendantBossesDeath",
     	"ZamuloshClone",
     }
@@ Expand Down @@