Merge branch 'main' into custom-pvp-system

opentibiabr · Nov 11, 2023 · 93351d8 · 93351d8
2 parents 3f2a029 + fa0e120
commit 93351d8
Show file tree

Hide file tree

Showing 360 changed files with 3,028 additions and 2,711 deletions.
diff --git a/.github/workflows/clean-cache.yaml b/.github/workflows/clean-cache.yaml
@@ -0,0 +1,30 @@
+---
+name: Cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R "$REPO" -B "$BRANCH" -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete "$cacheKey" -R "$REPO" -B "$BRANCH" --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/config.lua.dist b/config.lua.dist
@@ -12,6 +12,15 @@ coreDirectory = "data"
 -- NOTE: Will only display logs with level higher or equal the one set.
 logLevel = "info"
 
+--- Toggles the server's maintenance mode.
+-- When enabled, it restricts user access and indicates maintenance operations.
+-- @field [parent=#global] #boolean toggleMaintainMode false by default, set to true to enable maintenance mode.
+toggleMaintainMode = false
+--- Message displayed during maintenance mode.
+-- Should inform the expected downtime or resumption details succinctly.
+-- @field [parent=#global] #string maintainModeMessage an empty string by default, set a custom message if needed.
+maintainModeMessage = ""
+
 -- Combat settings
 -- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
 worldType = "pvp"

diff --git a/data-otservbr-global/migrations/41.lua b/data-otservbr-global/migrations/41.lua
@@ -1,3 +1,11 @@
 function onUpdateDatabase()
-	return false -- true = There are others migrations file | false = this is the last migration file
+	logger.info("Updating database to version 42 (fix xpboost types)")
+
+	db.query([[
+		ALTER TABLE `players`
+    MODIFY `xpboost_stamina` smallint(5) UNSIGNED DEFAULT NULL,
+    MODIFY `xpboost_value` tinyint(4) UNSIGNED DEFAULT NULL
+	]])
+
+	return true
 end
diff --git a/data-otservbr-global/migrations/42.lua b/data-otservbr-global/migrations/42.lua
@@ -0,0 +1,3 @@
+function onUpdateDatabase()
+	return false -- true = There are others migrations file | false = this is the last migration file
+end
diff --git a/data-otservbr-global/monster/bosses/black_knight.lua b/data-otservbr-global/monster/bosses/black_knight.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"BlackKnightDeath",
+}
+
 monster.bosstiary = {
 	bossRaceId = 46,
 	bossRace = RARITY_BANE,

diff --git a/data-otservbr-global/monster/bosses/diseased_bill.lua b/data-otservbr-global/monster/bosses/diseased_bill.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"DiseasedTrioDeath",
+}
+
 monster.bosstiary = {
 	bossRaceId = 485,
 	bossRace = RARITY_BANE,

diff --git a/data-otservbr-global/monster/bosses/diseased_dan.lua b/data-otservbr-global/monster/bosses/diseased_dan.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"DiseasedTrioDeath",
+}
+
 monster.bosstiary = {
 	bossRaceId = 486,
 	bossRace = RARITY_BANE,

diff --git a/data-otservbr-global/monster/bosses/diseased_fred.lua b/data-otservbr-global/monster/bosses/diseased_fred.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"DiseasedTrioDeath",
+}
+
 monster.bosstiary = {
 	bossRaceId = 484,
 	bossRace = RARITY_BANE,

diff --git a/data-otservbr-global/monster/bosses/energized_raging_mage.lua b/data-otservbr-global/monster/bosses/energized_raging_mage.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"EnergizedRagingMageDeath",
+}
+
 monster.health = 3500
 monster.maxHealth = 3500
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/bosses/kroazur.lua b/data-otservbr-global/monster/bosses/kroazur.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"ThreatenedDreamsNightmareMonstersDeath",
+}
+
 monster.bosstiary = {
 	bossRaceId = 1515,
 	bossRace = RARITY_BANE,

diff --git a/data-otservbr-global/monster/bosses/pythius_the_rotten.lua b/data-otservbr-global/monster/bosses/pythius_the_rotten.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"PythiusTheRottenDeath",
+}
+
 monster.health = 9000
 monster.maxHealth = 9000
 monster.race = "undead"

diff --git a/data-otservbr-global/monster/bosses/raging_mage.lua b/data-otservbr-global/monster/bosses/raging_mage.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"RagingMageDeath",
+}
+
 monster.health = 3500
 monster.maxHealth = 3500
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/bosses/renegade_orc.lua b/data-otservbr-global/monster/bosses/renegade_orc.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"RenegadeOrcDeath",
+}
+
 monster.health = 450
 monster.maxHealth = 450
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/bosses/splasher.lua b/data-otservbr-global/monster/bosses/splasher.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"QuaraLeadersDeath",
+}
+
 monster.health = 1700
 monster.maxHealth = 1700
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/constructs/diamond_servant_replica.lua b/data-otservbr-global/monster/constructs/diamond_servant_replica.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"ReplicaServantDeath",
+}
+
 monster.raceId = 1326
 monster.Bestiary = {
 	class = "Construct",

diff --git a/data-otservbr-global/monster/constructs/golden_servant_replica.lua b/data-otservbr-global/monster/constructs/golden_servant_replica.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"ReplicaServantDeath",
+}
+
 monster.raceId = 1327
 monster.Bestiary = {
 	class = "Construct",

diff --git a/data-otservbr-global/monster/dawnport/mountain_troll.lua b/data-otservbr-global/monster/dawnport/mountain_troll.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MorrisTrollDeath",
+}
+
 monster.health = 30
 monster.maxHealth = 30
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/dawnport/muglex_clan_footman.lua b/data-otservbr-global/monster/dawnport/muglex_clan_footman.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MorrisGoblinDeath",
+}
+
 monster.health = 50
 monster.maxHealth = 50
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/dragons/dragon.lua b/data-otservbr-global/monster/dragons/dragon.lua
@@ -13,6 +13,11 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"TheGreatDragonHuntDeath",
+	"TheFirstDragonDragonTaskDeath",
+}
+
 monster.raceId = 34
 monster.Bestiary = {
 	class = "Dragon",

diff --git a/data-otservbr-global/monster/dragons/dragon_lord.lua b/data-otservbr-global/monster/dragons/dragon_lord.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"TheGreatDragonHuntDeath",
+}
+
 monster.raceId = 39
 monster.Bestiary = {
 	class = "Dragon",

diff --git a/data-otservbr-global/monster/extra_dimensional/yielothax.lua b/data-otservbr-global/monster/extra_dimensional/yielothax.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"YielothaxDeath",
+}
+
 monster.raceId = 717
 monster.Bestiary = {
 	class = "Extra Dimensional",

diff --git a/data-otservbr-global/monster/humanoids/lost_exile.lua b/data-otservbr-global/monster/humanoids/lost_exile.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"LastExileDeath",
+}
+
 monster.raceId = 1529
 monster.Bestiary = {
 	class = "Humanoid",

diff --git a/data-otservbr-global/monster/humanoids/minotaur_bruiser.lua b/data-otservbr-global/monster/humanoids/minotaur_bruiser.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MorrisMinotaurDeath",
+}
+
 monster.health = 100
 monster.maxHealth = 100
 monster.race = "blood"

diff --git a/data-otservbr-global/monster/humanoids/minotaur_cult_follower.lua b/data-otservbr-global/monster/humanoids/minotaur_cult_follower.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MinotaurCultTaskDeath",
+}
+
 monster.raceId = 1508
 monster.Bestiary = {
 	class = "Humanoid",

diff --git a/data-otservbr-global/monster/humanoids/minotaur_cult_prophet.lua b/data-otservbr-global/monster/humanoids/minotaur_cult_prophet.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MinotaurCultTaskDeath",
+}
+
 monster.raceId = 1509
 monster.Bestiary = {
 	class = "Humanoid",

diff --git a/data-otservbr-global/monster/humanoids/minotaur_cult_zealot.lua b/data-otservbr-global/monster/humanoids/minotaur_cult_zealot.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MinotaurCultTaskDeath",
+}
+
 monster.raceId = 1510
 monster.Bestiary = {
 	class = "Humanoid",

diff --git a/data-otservbr-global/monster/humans/burning_gladiator.lua b/data-otservbr-global/monster/humans/burning_gladiator.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"FafnarMissionsDeath",
+}
+
 monster.raceId = 1798
 monster.Bestiary = {
 	class = "Human",

diff --git a/data-otservbr-global/monster/humans/nomad.lua b/data-otservbr-global/monster/humans/nomad.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"NomadDeath",
+}
+
 monster.raceId = 310
 monster.Bestiary = {
 	class = "Human",

diff --git a/data-otservbr-global/monster/humans/nomad_blue.lua b/data-otservbr-global/monster/humans/nomad_blue.lua
@@ -14,7 +14,11 @@ monster.outfit = {
 	lookMount = 0,
 }
 
-monster.raceId = 777
+monster.events = {
+	"NomadDeath",
+}
+
+monster.raceId = 776
 monster.Bestiary = {
 	class = "Human",
 	race = BESTY_RACE_HUMAN,

diff --git a/data-otservbr-global/monster/humans/nomad_female.lua b/data-otservbr-global/monster/humans/nomad_female.lua
@@ -14,7 +14,11 @@ monster.outfit = {
 	lookMount = 0,
 }
 
-monster.raceId = 776
+monster.events = {
+	"NomadDeath",
+}
+
+monster.raceId = 777
 monster.Bestiary = {
 	class = "Human",
 	race = BESTY_RACE_HUMAN,

diff --git a/data-otservbr-global/monster/humans/priestess_of_the_wild_sun.lua b/data-otservbr-global/monster/humans/priestess_of_the_wild_sun.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"FafnarMissionsDeath",
+}
+
 monster.raceId = 1799
 monster.Bestiary = {
 	class = "Human",

diff --git a/data-otservbr-global/monster/magicals/crystalcrusher.lua b/data-otservbr-global/monster/magicals/crystalcrusher.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"MiddleSpikeDeath",
+}
+
 monster.raceId = 869
 monster.Bestiary = {
 	class = "Magical",

diff --git a/data-otservbr-global/monster/magicals/enfeebled_silencer.lua b/data-otservbr-global/monster/magicals/enfeebled_silencer.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"ThreatenedDreamsNightmareMonstersDeath",
+}
+
 monster.raceId = 1443
 monster.Bestiary = {
 	class = "Magical",

diff --git a/data-otservbr-global/monster/magicals/frazzlemaw.lua b/data-otservbr-global/monster/magicals/frazzlemaw.lua
@@ -13,6 +13,10 @@ monster.outfit = {
 	lookMount = 0,
 }
 
+monster.events = {
+	"RoshamuulKillsDeath",
+}
+
 monster.raceId = 1022
 monster.Bestiary = {
 	class = "Magical",