Merge branch 'opentibiabr:main' into new-outfits-and-mounts

opentibiabr · Mar 8, 2024 · d787997 · d787997
2 parents 568e89e + ac3f183
commit d787997
Show file tree

Hide file tree

Showing 80 changed files with 566 additions and 842 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -238,6 +238,7 @@ onlyPremiumAccount = false
 -- NOTE: randomMonsterSpawn = true, will enable monsters from the same spawn to be randomized between them, thus making a variable hunt
 -- NOTE: enablePlayerPutItemInAmmoSlot = true, will enable players to put any items on ammo slot, more used in custom shopping system
 -- NOTE: startStreakLevel will make a reward streak level for new players who never logged in
+-- NOTE: if showLootsInBestiary is true, will cause all loots to be shown in the bestiary even if the player has not reached the required number of kills
 stashMoving = false
 depotChest = 4
 autoLoot = false
@@ -255,6 +256,7 @@ lootPouchMaxLimit = 2000
 storeInboxMaxLimit = 2000
 enablePlayerPutItemInAmmoSlot = false
 startStreakLevel = 0
+showLootsInBestiary = false
 
 -- Teleport summon
 -- Set to true will never remove the summon
@@ -427,6 +429,9 @@ maxDamageReflection = 200
 toggleChainSystem = true
 combatChainDelay = 50
 combatChainTargets = 5
+combatChainSkillFormulaAxe = 0.9
+combatChainSkillFormulaClub = 0.7
+combatChainSkillFormulaSword = 1.1
 
 -- Global server Save
 -- NOTE: globalServerSaveNotifyDuration in minutes

diff --git a/data-canary/scripts/actions/other/carpets.lua b/data-canary/scripts/actions/other/carpets.lua
diff --git a/data-canary/scripts/actions/other/die.lua b/data-canary/scripts/actions/other/die.lua
diff --git a/data-canary/scripts/actions/other/food.lua b/data-canary/scripts/actions/other/food.lua
diff --git a/data-canary/scripts/creaturescripts/advance_save.lua b/data-canary/scripts/creaturescripts/advance_save.lua
diff --git a/data-canary/scripts/creaturescripts/logout.lua b/data-canary/scripts/creaturescripts/logout.lua
diff --git a/data-canary/scripts/creaturescripts/regenerate_stamina.lua b/data-canary/scripts/creaturescripts/regenerate_stamina.lua
diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
@@ -103,7 +103,7 @@ Storage = {
 	Factions = 30024,
 	-- unused TrainerRoom = 30027,
 	-- unused NpcSpawn = 30028,
-	ExerciseDummyExhaust = 30029,
+	-- unused ExerciseDummyExhaust = 30029,
 	SamsOldBackpack = 30030,
 	SamsOldBackpackDoor = 30031,
 	StrawberryCupcake = 30032,
@@ -2113,7 +2113,7 @@ Storage = {
 			BloodBrothers = {
 				QuestLine = 41901,
 				Mission01 = 41902,
-				GarlicBread = 41903,
+				-- unused GarlicBread = 41903,
 				Mission02 = 41904,
 				Cookies = {
 					Serafin = 41905,

diff --git a/data-otservbr-global/lib/others/vip_system.lua b/data-otservbr-global/lib/others/vip_system.lua
@@ -3,7 +3,7 @@ local config = {
 	activationMessageType = MESSAGE_EVENT_ADVANCE,
 
 	expirationMessage = "Your VIP days ran out.",
-	expirationMessageType = MESSAGE_ADMINISTRADOR,
+	expirationMessageType = MESSAGE_ADMINISTRATOR,
 
 	outfits = {},
 	mounts = {},

diff --git a/data-otservbr-global/migrations/41.lua b/data-otservbr-global/migrations/41.lua
@@ -3,8 +3,8 @@ function onUpdateDatabase()
 
 	db.query([[
 		ALTER TABLE `players`
-    MODIFY `xpboost_stamina` smallint(5) UNSIGNED DEFAULT NULL,
-    MODIFY `xpboost_value` tinyint(4) UNSIGNED DEFAULT NULL
+		MODIFY `xpboost_stamina` smallint(5) UNSIGNED DEFAULT NULL,
+		MODIFY `xpboost_value` tinyint(4) UNSIGNED DEFAULT NULL
 	]])
 
 	return true