Merge branch 'main' into custom-pvp-system

opentibiabr · Oct 31, 2023 · 3f2a029 · 3f2a029
2 parents 6f005cc + e54b9c7
commit 3f2a029
Show file tree

Hide file tree

Showing 68 changed files with 798 additions and 278 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -10,7 +10,7 @@ coreDirectory = "data"
 -- Set log level
 -- It can be trace, debug, info, warning, error, critical, off (default: info).
 -- NOTE: Will only display logs with level higher or equal the one set.
-logLevel = "debug"
+logLevel = "info"
 
 -- Combat settings
 -- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"

diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -908,6 +908,7 @@ Storage = {
 		DeeplingAnchor = 51023,
 		FirstOrientalAddon = 51024,
 		SecondOrientalAddon = 51025,
+		RoyalCostumeOutfit = 51026,
 	},
 	TheAncientTombs = {
 		-- Reserved storage from 50940 - 51059
@@ -2767,6 +2768,7 @@ Storage = {
 				GoshnarMegalomaniaAccess = 47220,
 				GoshnarMegalomaniaKilled = 47222,
 				QuestReward = 47223,
+				OutfitReward = 47224,
 			},
 		},
 		U12_60 = { -- update 12.60 - Reserved Storages 47501 - 47600

diff --git a/data-otservbr-global/monster/bosses/doctor_marrow.lua b/data-otservbr-global/monster/bosses/doctor_marrow.lua
@@ -20,10 +20,6 @@ monster.corpse = 18074
 monster.speed = 180
 monster.manaCost = 0
 
-monster.events = {
-	"DoctorMarrowHealth",
-}
-
 monster.changeTarget = {
 	interval = 4000,
 	chance = 15,

diff --git a/data-otservbr-global/monster/bosses/the_first_dragon.lua b/data-otservbr-global/monster/bosses/the_first_dragon.lua
@@ -58,7 +58,7 @@ monster.flags = {
 }
 
 monster.events = {
-	"First Dragon Death",
+	"FirstDragonDeath",
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/quests/a_pirates_tail_quest/ratmiral_blackwhiskers.lua b/data-otservbr-global/monster/quests/a_pirates_tail_quest/ratmiral_blackwhiskers.lua
@@ -20,6 +20,10 @@ monster.corpse = 35846
 monster.speed = 115
 monster.manaCost = 0
 
+monster.events = {
+	"RatmiralBlackwhiskersDeath",
+}
+
 monster.changeTarget = {
 	interval = 4000,
 	chance = 10,

diff --git a/data-otservbr-global/monster/quests/feaster_of_souls/the_pale_worm.lua b/data-otservbr-global/monster/quests/feaster_of_souls/the_pale_worm.lua
@@ -95,6 +95,8 @@ monster.loot = {
 	{ name = "bloody tears", chance = 1500 },
 	{ name = "ghost chestplate", chance = 150 },
 	{ name = "spooky hood", chance = 150 },
+	{ name = "pale worm's scalp", chance = 1200 },
+	{ name = "spectral scrap of cloth", chance = 250 },
 	{ name = "fabulous legs", chance = 150 },
 	{ name = "phantasmal axe", chance = 150 },
 	{ name = "ghost backpack", chance = 150 },

diff --git a/data-otservbr-global/monster/quests/soul_war/goshnars_megalomania.lua b/data-otservbr-global/monster/quests/soul_war/goshnars_megalomania.lua
@@ -18,6 +18,7 @@ monster.maxHealth = 500000
 monster.race = "undead"
 monster.corpse = 33889
 monster.speed = 165
+monster.manaCost = 0
 
 monster.changeTarget = {
 	interval = 2000,

diff --git a/...ripts/custom/monster_training_machine.lua → ...bal/monster/trainers/training_machine.lua b/...ripts/custom/monster_training_machine.lua → ...bal/monster/trainers/training_machine.lua
@@ -1,6 +1,7 @@
 local mType = Game.createMonsterType("Training Machine")
 local monster = {}
-monster.description = "Training Machine"
+
+monster.description = "a training machine"
 monster.experience = 0
 monster.outfit = {
 	lookType = 1142,