Update Readme

base: update : opentibiabr/canary@944c74b
mattyx14 · Mar 19, 2024 · 62ff7ef · 62ff7ef
1 parent 6c0fa54
commit 62ff7ef
Show file tree

Hide file tree

Showing 80 changed files with 497 additions and 390 deletions.
diff --git a/README.md b/README.md
@@ -1,31 +1,37 @@
 ## Builds
-[![Build on Ubuntu](https://github.com/mattyx14/otxserver/workflows/Build%20on%20Ubuntu/badge.svg?branch=otxserv6)](https://github.com/mattyx14/otxserver/actions?query=workflow%3A%22Build+on+Ubuntu%22)
+[![Build - Ubuntu](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml)
+[![Build - Windows](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml)
 
 ## What is OTX Server 6 Series
 We are trying to create the perfect custom OpenTibia server.
 <br>It is a fork of the from: [OTServBR-Global](https://github.com/opentibiabr/canary) project.
 
 ## How Compile:
 We currently provide build instructions for the following systems:
-* [Windows Tutorial for OTX 6](https://forums.otserv.com.br/index.php?/forums/topic/169235-windowsvc2019-compilando-sources-otservbr-global/)
+* [Windows Tutorial for OTX 6](https://github.com/mattyx14/otxserver/wiki/Compiling-on-Windows-(OTX-6-))
+
+## Old Server Series:
+Server created with TFS 0.3.7-(AKA 0.4) with endless improvements that make it ideal for old school servers based on 8.6, clearly it should be used completely with its data defined there.
+* [OTX Server 2](https://github.com/mattyx14/otxserver/tree/otxserv2)
 
 ## OpenTibia Comunity:
 With downloads, support, tutorials, Lua scripts, C++ codes, PHP codes and more ...
+* [OTServ Brasil](https://docs.opentibiabr.com/) - [Português/English]
+* [Tibiaking](https://tibiaking.com/) - [Português]
 * [OTLand](https://otland.net/) - [English]
-* [OTServ Brasil](https://forums.otserv.com.br/) - [Português/English]
-* [Tibia Face](http://tibiaface.com/) - [Español]
-* [Black Tibia](http://blacktibia.foroactivo.com/) - [Español]
-* [Tibiaking](http://www.tibiaking.com/forum/) - [Português]
+* [Tibia Face](https://tibiaface.foroactivo.com/) - [Español]
+* [Black Tibia](https://tibiaface.foroactivo.com/) - [Español]
 
 ## Special Thanks OTServBR-Global
 - our partners OTServBR-Global.
 - our crew (majesty, gpedro, eduardo dantas)
 - our testers (raphaellb, petardako, szulcek and olimpotibia)
-- [our contributors](https://github.com/opentibiabr/OTServBR-Global/graphs/contributors)
+- [our contributors](https://github.com/opentibiabr/canary/graphs/contributors)
 - [fear lucien](https://github.com/FearLucien)
 - [cjaker](https://github.com/Eternal-Scripts)
 - [slavidodo](https://github.com/slavidodo)
 - [mignari and our awesome tools](https://github.com/ottools)
+- [saiyansking/optimized_forgottenserver and contributors](https://github.com/SaiyansKing/optimized_forgottenserver)
 - [mattyx14/otxserver](https://github.com/mattyx14/otxserver) and contributors.
 - [otland/forgottenserver](https://github.com/otland/forgottenserver) and contributors.
 - if we forget someone, we apologize by forgot you. but you know, **forgot**tenserver.

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-otxserver/lib/core/storages.lua b/data-otxserver/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,

diff --git a/data-otxserver/monster/demons/hellfire_fighter.lua b/data-otxserver/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-otxserver/monster/demons/hellflayer.lua b/data-otxserver/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-otxserver/monster/demons/juggernaut.lua b/data-otxserver/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-otxserver/monster/demons/plaguesmith.lua b/data-otxserver/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-otxserver/monster/magicals/nightmare.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/mazoran.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/plagirath.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua b/data-otxserver/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-otxserver/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua b/data-otxserver/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-otxserver/monster/undeads/blightwalker.lua b/data-otxserver/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-otxserver/monster/undeads/hand_of_cursed_fate.lua b/data-otxserver/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-otxserver/monster/undeads/undead_dragon.lua b/data-otxserver/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-otxserver/scripts/actions/other/dice.lua b/data-otxserver/scripts/actions/other/dice.lua
diff --git a/data-otxserver/scripts/creaturescripts/others/advance_save.lua b/data-otxserver/scripts/creaturescripts/others/advance_save.lua