diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 3293c5f65..eea62fa57 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -52,12 +52,14 @@ jobs:
run: >
sudo apt-get update && sudo apt-get install ccache linux-headers-"$(uname -r)"
- - name: Switch to gcc-12 on Ubuntu 22.04
+ - name: Switch to gcc-13 on Ubuntu 22.04
if: matrix.os == 'ubuntu-22.04'
run: |
- sudo apt install gcc-12 g++-12
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
- sudo update-alternatives --set gcc /usr/bin/gcc-12
+ sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ sudo apt-get update
+ sudo apt install gcc-13 g++-13 -y
+ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
+ sudo update-alternatives --set gcc /usr/bin/gcc-13
- name: Switch to gcc-14 on Ubuntu 24.04
if: matrix.os == 'ubuntu-24.04'
diff --git a/.gitignore b/.gitignore
index ec7dd9522..165f1e9b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -401,5 +401,8 @@ otxserver.old
# VCPKG
vcpkg_installed
+# DB Backups
+database_backup
+
# CLION
cmake-build-*
diff --git a/README.md b/README.md
index 801a1b39a..c1a5bbf23 100644
--- a/README.md
+++ b/README.md
@@ -12,31 +12,25 @@ We are trying to create the perfect custom OpenTibia server.
We currently provide build instructions for the following systems:
* [Windows Tutorial for OTX 6](https://github.com/mattyx14/otxserver/wiki/Compiling-on-Windows-(OTX-6-))
-## 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]
-* [Tibia Face](https://tibiaface.foroactivo.com/) - [Español]
-
## 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]
+* [Tibia Face](https://tibiaface.foroactivo.com/) - [Español]
+
## Contacts OTX Server 2:
- Matty(English & Spanish):
Facebook: https://www.facebook.com/Mattyx14/
E-mail: darkylive@live.com.mx
-Whatsapp: +5213173832937
-
+Whatsapp: +523211136700
- Reason(English & Portuguese):
Discord: Reason#2913
-- FeeTads(Portuguese):
-E-mail: felps18.082@gmail.com
-Whatsapp: +55 41 9 84036942
-Discord: FeeTads#0246
-
## Special Thanks
- Our contributors ([Canary](https://github.com/opentibiabr/canary/graphs/contributors) | [OTServBR-Global](https://github.com/opentibiabr/otservbr-global/graphs/contributors)).
diff --git a/config.lua.dist b/config.lua.dist
index 735977dc8..410057f15 100644
--- a/config.lua.dist
+++ b/config.lua.dist
@@ -26,6 +26,7 @@ maintainModeMessage = ""
-- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
-- NOTE: removeBeginningWeaponAmmunition: spears, arrows, bolt have endless ammo (allows training for paladins)
-- NOTE: refundManaOnBeginningWeapons: wand of vortex and snakebite refund mana used (allows training for mages)
+-- NOTE: loginProtectionTime in MS
worldType = "pvp"
hotkeyAimbotEnabled = true
protectionLevel = 7
@@ -47,6 +48,7 @@ monthKillsToRedSkull = 10
redSkullDuration = 1
blackSkullDuration = 3
orangeSkullDuration = 7
+loginProtectionTime = 10 * 1000
cleanProtectionZones = false
@@ -401,6 +403,7 @@ mysqlHost = "127.0.0.1"
mysqlUser = "root"
mysqlPass = ""
mysqlDatabase = ""
+mysqlDatabaseBackup = true
mysqlPort = 3306
mysqlSock = ""
passwordType = "sha1"
diff --git a/data-otxserver/lib/functions/load.lua b/data-otxserver/lib/functions/load.lua
new file mode 100644
index 000000000..9862b00d2
--- /dev/null
+++ b/data-otxserver/lib/functions/load.lua
@@ -0,0 +1 @@
+dofile(DATA_DIRECTORY .. "/lib/functions/players.lua")
diff --git a/data-otxserver/lib/functions/players.lua b/data-otxserver/lib/functions/players.lua
new file mode 100644
index 000000000..45fec4c66
--- /dev/null
+++ b/data-otxserver/lib/functions/players.lua
@@ -0,0 +1,76 @@
+function Player.getCookiesDelivered(self)
+ local storage, amount =
+ {
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.SimonTheBeggar,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Markwin,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Ariella,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Hairycles,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Djinn,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.AvarTar,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.OrcKing,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Lorbas,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Wyda,
+ Storage.Quest.U8_1.WhatAFoolishQuest.CookieDelivery.Hjaern,
+ }, 0
+ for i = 1, #storage do
+ if self:getStorageValue(storage[i]) == 1 then
+ amount = amount + 1
+ end
+ end
+ return amount
+end
+
+function Player.checkGnomeRank(self)
+ local points = self:getStorageValue(Storage.Quest.U9_60.BigfootsBurden.Rank)
+ local questProgress = self:getStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine)
+ if points >= 30 and points < 120 then
+ if questProgress <= 25 then
+ self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 26)
+ self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+ self:addAchievement("Gnome Little Helper")
+ end
+ elseif points >= 120 and points < 480 then
+ if questProgress <= 26 then
+ self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 27)
+ self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+ self:addAchievement("Gnome Little Helper")
+ self:addAchievement("Gnome Friend")
+ end
+ elseif points >= 480 and points < 1440 then
+ if questProgress <= 27 then
+ self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 28)
+ self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+ self:addAchievement("Gnome Little Helper")
+ self:addAchievement("Gnome Friend")
+ self:addAchievement("Gnomelike")
+ end
+ elseif points >= 1440 then
+ if questProgress <= 29 then
+ self:setStorageValue(Storage.Quest.U9_60.BigfootsBurden.QuestLine, 30)
+ self:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
+ self:addAchievement("Gnome Little Helper")
+ self:addAchievement("Gnome Friend")
+ self:addAchievement("Gnomelike")
+ self:addAchievement("Honorary Gnome")
+ end
+ end
+ return true
+end
+
+function Player.addFamePoint(self)
+ local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+ local current = math.max(0, points)
+ self:setStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points, current + 1)
+ self:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have received a fame point.")
+end
+
+function Player.getFamePoints(self)
+ local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+ return math.max(0, points)
+end
+
+function Player.removeFamePoints(self, amount)
+ local points = self:getStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points)
+ local current = math.max(0, points)
+ self:setStorageValue(Storage.Quest.U10_20.SpikeTaskQuest.Constants.Spike_Fame_Points, current - amount)
+end
diff --git a/data-otxserver/lib/lib.lua b/data-otxserver/lib/lib.lua
index 2e9ead889..e6ee85db8 100644
--- a/data-otxserver/lib/lib.lua
+++ b/data-otxserver/lib/lib.lua
@@ -9,3 +9,6 @@ dofile(DATA_DIRECTORY .. "/lib/quests/quest.lua")
-- Tables library
dofile(DATA_DIRECTORY .. "/lib/tables/load.lua")
+
+-- Functions library
+dofile(DATA_DIRECTORY .. "/lib/functions/load.lua")
diff --git a/data-otxserver/npc/hireling.lua b/data-otxserver/npc/hireling.lua
index bfc9000ca..234c28012 100644
--- a/data-otxserver/npc/hireling.lua
+++ b/data-otxserver/npc/hireling.lua
@@ -233,7 +233,7 @@ function createHirelingType(HirelingName)
{ itemName = "crossbow", clientId = 3349, buy = 500, sell = 120 },
{ itemName = "crystalline arrow", clientId = 15793, buy = 450 },
{ itemName = "drill bolt", clientId = 16142, buy = 12 },
- { itemName = "diamond arrow", clientId = 35901, buy = 100 },
+ { itemName = "diamond arrow", clientId = 35901, buy = 130 },
{ itemName = "earth arrow", clientId = 774, buy = 5 },
{ itemName = "envenomed arrow", clientId = 16143, buy = 12 },
{ itemName = "flaming arrow", clientId = 763, buy = 5 },
@@ -276,16 +276,16 @@ function createHirelingType(HirelingName)
},
["potions"] = {
{ itemName = "great health potion", clientId = 239, buy = 225 },
- { itemName = "great mana potion", clientId = 238, buy = 144 },
- { itemName = "great spirit potion", clientId = 7642, buy = 228 },
+ { itemName = "great mana potion", clientId = 238, buy = 158 },
+ { itemName = "great spirit potion", clientId = 7642, buy = 254 },
{ itemName = "health potion", clientId = 266, buy = 50 },
{ itemName = "mana potion", clientId = 268, buy = 56 },
{ itemName = "strong health potion", clientId = 236, buy = 115 },
- { itemName = "strong mana potion", clientId = 237, buy = 93 },
- { itemName = "supreme health potion", clientId = 23375, buy = 625 },
+ { itemName = "strong mana potion", clientId = 237, buy = 108 },
+ { itemName = "supreme health potion", clientId = 23375, buy = 650 },
{ itemName = "ultimate health potion", clientId = 7643, buy = 379 },
- { itemName = "ultimate mana potion", clientId = 23373, buy = 438 },
- { itemName = "ultimate spirit potion", clientId = 23374, buy = 438 },
+ { itemName = "ultimate mana potion", clientId = 23373, buy = 488 },
+ { itemName = "ultimate spirit potion", clientId = 23374, buy = 488 },
{ itemName = "empty potion flask", clientId = 283, sell = 5 },
{ itemName = "empty potion flask", clientId = 284, sell = 5 },
{ itemName = "empty potion flask", clientId = 285, sell = 5 },
@@ -293,7 +293,7 @@ function createHirelingType(HirelingName)
},
["runes"] = {
{ itemName = "animate dead rune", clientId = 3203, buy = 375 },
- { itemName = "avalanche rune", clientId = 3161, buy = 57 },
+ { itemName = "avalanche rune", clientId = 3161, buy = 64 },
{ itemName = "blank rune", clientId = 3147, buy = 10 },
{ itemName = "chameleon rune", clientId = 3178, buy = 210 },
{ itemName = "convince creature rune", clientId = 3177, buy = 80 },
@@ -308,7 +308,7 @@ function createHirelingType(HirelingName)
{ itemName = "fire field rune", clientId = 3188, buy = 28 },
{ itemName = "fire wall rune", clientId = 3190, buy = 61 },
{ itemName = "fireball rune", clientId = 3189, buy = 30 },
- { itemName = "great fireball rune", clientId = 3191, buy = 57 },
+ { itemName = "great fireball rune", clientId = 3191, buy = 64 },
{ itemName = "heavy magic missile rune", clientId = 3198, buy = 12 },
{ itemName = "holy missile rune", clientId = 3182, buy = 16 },
{ itemName = "icicle rune", clientId = 3158, buy = 30 },
@@ -321,9 +321,9 @@ function createHirelingType(HirelingName)
{ itemName = "poison wall rune", clientId = 3176, buy = 52 },
{ itemName = "soulfire rune", clientId = 3195, buy = 46 },
{ itemName = "stalagmite rune", clientId = 3179, buy = 12 },
- { itemName = "stone shower rune", clientId = 3175, buy = 37 },
- { itemName = "sudden death rune", clientId = 3155, buy = 135 },
- { itemName = "thunderstorm rune", clientId = 3202, buy = 47 },
+ { itemName = "stone shower rune", clientId = 3175, buy = 41 },
+ { itemName = "sudden death rune", clientId = 3155, buy = 162 },
+ { itemName = "thunderstorm rune", clientId = 3202, buy = 52 },
{ itemName = "ultimate healing rune", clientId = 3160, buy = 175 },
{ itemName = "wild growth rune", clientId = 3156, buy = 160 },
},
diff --git a/data-otxserver/scripts/creaturescripts/customs/freequests.lua b/data-otxserver/scripts/creaturescripts/customs/freequests.lua
index 3a429715a..c6756005f 100644
--- a/data-otxserver/scripts/creaturescripts/customs/freequests.lua
+++ b/data-otxserver/scripts/creaturescripts/customs/freequests.lua
@@ -18,8 +18,15 @@ local function playerFreeQuestStart(playerId, index)
return
end
- if player:getStorageValue(questTable[index].storage) ~= questTable[index].storageValue then
- player:setStorageValue(questTable[index].storage, questTable[index].storageValue)
+ local questData = questTable[index]
+ local currentStorageValue = player:getStorageValue(questData.storage)
+
+ if not questData.storage then
+ logger.warn("[Freequest System]: error storage for '" .. questData.storageName .. "' is nil for the index")
+ elseif currentStorageValue ~= questData.storageValue then
+ player:setStorageValue(questData.storage, questData.storageValue)
+ elseif currentStorageValue == -1 then
+ logger.warn("[Freequest System]: warning Storage '" .. questData.storageName .. "' currently nil for player ID " .. playerId)
end
end
diff --git a/data/XML/events.xml b/data/XML/events.xml
index 6a33c940f..70c45e629 100644
--- a/data/XML/events.xml
+++ b/data/XML/events.xml
@@ -1,12 +1,12 @@
-
+
- &item) {
checkTradeState(item);
}
diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp
index 1b52607f2..371048fbe 100644
--- a/src/creatures/players/player.hpp
+++ b/src/creatures/players/player.hpp
@@ -945,6 +945,13 @@ class Player final : public Creature, public Cylinder, public Bankable {
void setNextPotionAction(int64_t time);
bool canDoPotionAction() const;
+ void setLoginProtection(int64_t time);
+ bool isLoginProtected() const;
+ void resetLoginProtection();
+
+ void setProtection(bool status);
+ bool isProtected();
+
void cancelPush();
void setModuleDelay(uint8_t byteortype, int16_t delay);
@@ -1421,6 +1428,7 @@ class Player final : public Creature, public Cylinder, public Bankable {
int64_t nextPotionAction = 0;
int64_t lastQuickLootNotification = 0;
int64_t lastWalking = 0;
+ int64_t loginProtectionTime = 0;
uint64_t asyncOngoingTasks = 0;
std::vector unjustifiedKills;
@@ -1560,6 +1568,8 @@ class Player final : public Creature, public Cylinder, public Bankable {
bool moved = false;
bool m_isDead = false;
bool imbuementTrackerWindowOpen = false;
+ bool shouldForceLogout = true;
+ bool connProtected = false;
// Hazard system
int64_t lastHazardSystemCriticalHit = 0;
diff --git a/src/database/database.cpp b/src/database/database.cpp
index fcb737170..a6e732694 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -12,6 +12,7 @@
#include "config/configmanager.hpp"
#include "lib/di/container.hpp"
#include "lib/metrics/metrics.hpp"
+#include "utils/tools.hpp"
Database::~Database() {
if (handle != nullptr) {
@@ -60,6 +61,102 @@ bool Database::connect(const std::string* host, const std::string* user, const s
return true;
}
+void Database::createDatabaseBackup(bool compress) const {
+ if (!g_configManager().getBoolean(MYSQL_DB_BACKUP)) {
+ return;
+ }
+
+ // Get current time for formatting
+ auto now = std::chrono::system_clock::now();
+ std::time_t now_c = std::chrono::system_clock::to_time_t(now);
+ std::string formattedDate = fmt::format("{:%Y-%m-%d}", fmt::localtime(now_c));
+ std::string formattedTime = fmt::format("{:%H-%M-%S}", fmt::localtime(now_c));
+
+ // Create a backup directory based on the current date
+ std::string backupDir = fmt::format("database_backup/{}/", formattedDate);
+ std::filesystem::create_directories(backupDir);
+ std::string backupFileName = fmt::format("{}backup_{}.sql", backupDir, formattedTime);
+
+ // Create a temporary configuration file for MySQL credentials
+ std::string tempConfigFile = "database_backup.cnf";
+ std::ofstream configFile(tempConfigFile);
+ if (configFile.is_open()) {
+ configFile << "[client]\n";
+ configFile << "user=" << g_configManager().getString(MYSQL_USER) << "\n";
+ configFile << "password=" << g_configManager().getString(MYSQL_PASS) << "\n";
+ configFile << "host=" << g_configManager().getString(MYSQL_HOST) << "\n";
+ configFile << "port=" << g_configManager().getNumber(SQL_PORT) << "\n";
+ configFile.close();
+ } else {
+ g_logger().error("Failed to create temporary MySQL configuration file.");
+ return;
+ }
+
+ // Execute mysqldump command to create backup file
+ std::string command = fmt::format(
+ "mysqldump --defaults-extra-file={} {} > {}",
+ tempConfigFile, g_configManager().getString(MYSQL_DB), backupFileName
+ );
+
+ int result = std::system(command.c_str());
+ std::filesystem::remove(tempConfigFile);
+
+ if (result != 0) {
+ g_logger().error("Failed to create database backup using mysqldump.");
+ return;
+ }
+
+ // Compress the backup file if requested
+ std::string compressedFileName;
+ compressedFileName = backupFileName + ".gz";
+ gzFile gzFile = gzopen(compressedFileName.c_str(), "wb9");
+ if (!gzFile) {
+ g_logger().error("Failed to open gzip file for compression.");
+ return;
+ }
+
+ std::ifstream backupFile(backupFileName, std::ios::binary);
+ if (!backupFile.is_open()) {
+ g_logger().error("Failed to open backup file for compression: {}", backupFileName);
+ gzclose(gzFile);
+ return;
+ }
+
+ std::string buffer(8192, '\0');
+ while (backupFile.read(&buffer[0], buffer.size()) || backupFile.gcount() > 0) {
+ gzwrite(gzFile, buffer.data(), backupFile.gcount());
+ }
+
+ backupFile.close();
+ gzclose(gzFile);
+ std::filesystem::remove(backupFileName);
+
+ g_logger().info("Database backup successfully compressed to: {}", compressedFileName);
+
+ // Delete backups older than 7 days
+ auto nowTime = std::chrono::system_clock::now();
+ auto sevenDaysAgo = nowTime - std::chrono::hours(7 * 24); // 7 days in hours
+ for (const auto &entry : std::filesystem::directory_iterator("database_backup")) {
+ if (entry.is_directory()) {
+ try {
+ for (const auto &file : std::filesystem::directory_iterator(entry)) {
+ if (file.path().extension() == ".gz") {
+ auto fileTime = std::filesystem::last_write_time(file);
+ auto fileTimeSystemClock = std::chrono::clock_cast(fileTime);
+
+ if (fileTimeSystemClock < sevenDaysAgo) {
+ std::filesystem::remove(file);
+ g_logger().info("Deleted old backup file: {}", file.path().string());
+ }
+ }
+ }
+ } catch (const std::filesystem::filesystem_error &e) {
+ g_logger().error("Failed to check or delete files in backup directory: {}. Error: {}", entry.path().string(), e.what());
+ }
+ }
+ }
+}
+
bool Database::beginTransaction() {
if (!executeQuery("BEGIN")) {
return false;
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 69c47d324..3566425a5 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -37,6 +37,23 @@ class Database {
bool connect(const std::string* host, const std::string* user, const std::string* password, const std::string* database, uint32_t port, const std::string* sock);
+ /**
+ * @brief Creates a backup of the database.
+ *
+ * This function generates a backup of the database, with options for compression.
+ * The backup can be triggered periodically or during specific events like server loading.
+ *
+ * The backup operation will only execute if the configuration option `MYSQL_DB_BACKUP`
+ * is set to true in the `config.lua` file. If this configuration is disabled, the function
+ * will return without performing any action.
+ *
+ * @param compress Indicates whether the backup should be compressed.
+ * - If `compress` is true, the backup is created during an interval-based save, which occurs every 2 hours.
+ * This helps prevent excessive growth in the number of backup files.
+ * - If `compress` is false, the backup is created during the global save, which is triggered once a day when the server loads.
+ */
+ void createDatabaseBackup(bool compress) const;
+
bool retryQuery(std::string_view query, int retries);
bool executeQuery(std::string_view query);
diff --git a/src/game/game.cpp b/src/game/game.cpp
index a4a53738b..80aea6c8b 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -424,7 +424,7 @@ Game &Game::getInstance() {
}
void Game::resetMonsters() const {
- for (const auto &[monsterId, monster] : getMonsters()) {
+ for (const auto &monster : getMonsters()) {
monster->clearTargetList();
monster->clearFriendList();
}
@@ -432,7 +432,7 @@ void Game::resetMonsters() const {
void Game::resetNpcs() const {
// Close shop window from all npcs and reset the shopPlayerSet
- for (const auto &[npcId, npc] : getNpcs()) {
+ for (const auto &npc : getNpcs()) {
npc->closeAllShopWindows();
npc->resetPlayerInteractions();
}
@@ -440,7 +440,10 @@ void Game::resetNpcs() const {
void Game::loadBoostedCreature() {
auto &db = Database::getInstance();
- const auto result = db.storeQuery("SELECT * FROM `boosted_creature`");
+ const auto result = db.storeQuery(
+ "SELECT `date`, `boostname`, `raceid`, `looktype`, `lookfeet`, `looklegs`, `lookhead`, `lookbody`, `lookaddons`, `lookmount` "
+ "FROM `boosted_creature`"
+ );
if (!result) {
g_logger().warn("[Game::loadBoostedCreature] - "
"Failed to detect boosted creature database. (CODE 01)");
@@ -954,11 +957,16 @@ std::shared_ptr Game::getMonsterByID(uint32_t id) {
return nullptr;
}
- auto it = monsters.find(id);
- if (it == monsters.end()) {
+ auto it = monstersIdIndex.find(id);
+ if (it == monstersIdIndex.end()) {
return nullptr;
}
- return it->second;
+
+ if (it->second >= monsters.size()) {
+ return nullptr;
+ }
+
+ return monsters[it->second];
}
std::shared_ptr Game::getNpcByID(uint32_t id) {
@@ -966,11 +974,12 @@ std::shared_ptr Game::getNpcByID(uint32_t id) {
return nullptr;
}
- auto it = npcs.find(id);
- if (it == npcs.end()) {
+ auto it = npcsIdIndex.find(id);
+ if (it == npcsIdIndex.end()) {
return nullptr;
}
- return it->second;
+
+ return npcs[it->second];
}
std::shared_ptr Game::getPlayerByID(uint32_t id, bool allowOffline /* = false */) {
@@ -990,43 +999,41 @@ std::shared_ptr Game::getPlayerByID(uint32_t id, bool allowOffline /* =
return tmpPlayer;
}
-std::shared_ptr Game::getCreatureByName(const std::string &s) {
- if (s.empty()) {
+std::shared_ptr Game::getCreatureByName(const std::string &creatureName) {
+ if (creatureName.empty()) {
return nullptr;
}
- const std::string &lowerCaseName = asLowerCaseString(s);
+ const std::string &lowerCaseName = asLowerCaseString(creatureName);
auto m_it = mappedPlayerNames.find(lowerCaseName);
if (m_it != mappedPlayerNames.end()) {
return m_it->second.lock();
}
- for (const auto &it : npcs) {
- if (lowerCaseName == asLowerCaseString(it.second->getName())) {
- return it.second;
- }
+ auto npcIterator = npcsNameIndex.find(lowerCaseName);
+ if (npcIterator != npcsNameIndex.end()) {
+ return npcs[npcIterator->second];
}
- for (const auto &it : monsters) {
- if (lowerCaseName == asLowerCaseString(it.second->getName())) {
- return it.second;
- }
+ auto monsterIterator = monstersNameIndex.find(lowerCaseName);
+ if (monsterIterator != monstersNameIndex.end()) {
+ return monsters[monsterIterator->second];
}
return nullptr;
}
-std::shared_ptr Game::getNpcByName(const std::string &s) {
- if (s.empty()) {
+std::shared_ptr Game::getNpcByName(const std::string &npcName) {
+ if (npcName.empty()) {
return nullptr;
}
- const char* npcName = s.c_str();
- for (const auto &it : npcs) {
- if (strcasecmp(npcName, it.second->getName().c_str()) == 0) {
- return it.second;
- }
+ const std::string lowerCaseName = asLowerCaseString(npcName);
+ auto it = npcsNameIndex.find(lowerCaseName);
+ if (it != npcsNameIndex.end()) {
+ return npcs[it->second];
}
+
return nullptr;
}
@@ -3184,13 +3191,18 @@ ReturnValue Game::internalCollectManagedItems(const std::shared_ptr &pla
ReturnValue Game::collectRewardChestItems(const std::shared_ptr &player, uint32_t maxMoveItems /* = 0*/) {
// Check if have item on player reward chest
- std::shared_ptr rewardChest = player->getRewardChest();
+ const std::shared_ptr &rewardChest = player->getRewardChest();
if (rewardChest->empty()) {
g_logger().debug("Reward chest is empty");
return RETURNVALUE_REWARDCHESTISEMPTY;
}
- auto rewardItemsVector = player->getRewardsFromContainer(rewardChest->getContainer());
+ const auto &container = rewardChest->getContainer();
+ if (!container) {
+ return RETURNVALUE_REWARDCHESTISEMPTY;
+ }
+
+ auto rewardItemsVector = player->getRewardsFromContainer(container);
auto rewardCount = rewardItemsVector.size();
uint32_t movedRewardItems = 0;
std::string lootedItemsMessage;
@@ -3371,6 +3383,21 @@ void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* =
return;
}
+ if (!player->canDoAction()) {
+ uint32_t delay = player->getNextActionTime() - OTSYS_TIME();
+ if (delay > 0) {
+ const auto &task = createPlayerTask(
+ delay,
+ [this, playerId, itemId, hasTier, tier] {
+ playerEquipItem(playerId, itemId, hasTier, tier);
+ },
+ __FUNCTION__
+ );
+ player->setNextActionTask(task);
+ }
+ return;
+ }
+
if (player->hasCondition(CONDITION_FEARED)) {
/*
* When player is feared the player can´t equip any items.
@@ -3468,6 +3495,8 @@ void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* =
if (ret != RETURNVALUE_NOERROR) {
player->sendCancelMessage(ret);
}
+
+ player->setNextAction(OTSYS_TIME() + g_configManager().getNumber(ACTIONS_DELAY_INTERVAL));
}
void Game::playerMove(uint32_t playerId, Direction direction) {
@@ -3476,6 +3505,7 @@ void Game::playerMove(uint32_t playerId, Direction direction) {
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
player->setNextWalkActionTask(nullptr);
player->cancelPush();
@@ -3489,6 +3519,7 @@ void Game::forcePlayerMove(uint32_t playerId, Direction direction) {
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
player->setNextWalkActionTask(nullptr);
player->cancelPush();
@@ -3664,6 +3695,7 @@ void Game::playerAutoWalk(uint32_t playerId, const std::vector &listD
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
player->setNextWalkTask(nullptr);
player->startAutoWalk(listDir, false);
@@ -3680,6 +3712,7 @@ void Game::forcePlayerAutoWalk(uint32_t playerId, const std::vector &
player->sendCancelTarget();
player->setFollowCreature(nullptr);
+ player->resetLoginProtection();
player->resetIdleTime();
player->setNextWalkTask(nullptr);
@@ -3813,6 +3846,7 @@ void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t f
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
if (it.isRune() || it.type == ITEM_TYPE_POTION) {
player->setNextPotionActionTask(nullptr);
@@ -3934,6 +3968,7 @@ void Game::playerUseItem(uint32_t playerId, const Position &pos, uint8_t stackPo
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
player->setNextActionTask(nullptr);
@@ -4098,6 +4133,7 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
if (it.isRune() || it.type == ITEM_TYPE_POTION) {
player->setNextPotionActionTask(nullptr);
@@ -5882,6 +5918,7 @@ void Game::playerSetAttackedCreature(uint32_t playerId, uint32_t creatureId) {
}
if (player->getAttackedCreature() && creatureId == 0) {
+ player->resetLoginProtection();
player->setAttackedCreature(nullptr);
player->sendCancelTarget();
return;
@@ -6056,6 +6093,7 @@ void Game::playerTurn(uint32_t playerId, Direction dir) {
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
internalCreatureTurn(player, dir);
}
@@ -6179,6 +6217,7 @@ void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type, c
return;
}
+ player->resetLoginProtection();
player->resetIdleTime();
if (playerSaySpell(player, type, text)) {
@@ -8504,39 +8543,66 @@ void Game::playerCyclopediaCharacterInfo(const std::shared_ptr &player,
}
}
-std::string Game::generateHighscoreQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation) {
- std::ostringstream query;
- uint32_t startPage = (static_cast(page - 1) * static_cast(entriesPerPage));
+std::string Game::generateHighscoreQuery(
+ const std::string &categoryName,
+ uint32_t page,
+ uint8_t entriesPerPage,
+ uint32_t vocation,
+ uint32_t playerGUID /*= 0*/
+) {
+ uint32_t startPage = (page - 1) * static_cast(entriesPerPage);
uint32_t endPage = startPage + static_cast(entriesPerPage);
+ std::string entriesStr = std::to_string(entriesPerPage);
+
+ if (categoryName.empty()) {
+ g_logger().error("Category name cannot be empty.");
+ return "";
+ }
- query << "SELECT *, @row AS `entries`, " << page << " AS `page` FROM (SELECT *, (@row := @row + 1) AS `rn` FROM (SELECT `id`, `name`, `level`, `vocation`, `"
- << categoryName << "` AS `points`, @curRank := IF(@prevRank = `" << categoryName << "`, @curRank, IF(@prevRank := `" << categoryName
- << "`, @curRank + 1, @curRank + 1)) AS `rank` FROM `players` `p`, (SELECT @curRank := 0, @prevRank := NULL, @row := 0) `r` WHERE `group_id` < "
- << static_cast(GROUP_TYPE_GAMEMASTER) << " ORDER BY `" << categoryName << "` DESC) `t`";
+ std::string query = fmt::format(
+ "SELECT `id`, `name`, `level`, `vocation`, `points`, `rank`, `rn` AS `entries`, "
+ );
- if (vocation != 0xFFFFFFFF) {
- query << generateVocationConditionHighscore(vocation);
+ if (playerGUID != 0) {
+ query += fmt::format("(@ourRow DIV {0}) + 1 AS `page` FROM (", entriesStr);
+ } else {
+ query += fmt::format("{} AS `page` FROM (", page);
}
- query << ") `T` WHERE `rn` > " << startPage << " AND `rn` <= " << endPage;
- return query.str();
-}
+ query += fmt::format(
+ "SELECT `id`, `name`, `level`, `vocation`, `{}` AS `points`, "
+ "@curRank := IF(@prevRank = `{}`, @curRank, IF(@prevRank := `{}`, @curRank + 1, @curRank + 1)) AS `rank`, "
+ "(@row := @row + 1) AS `rn`",
+ categoryName, categoryName, categoryName
+ );
-std::string Game::generateHighscoreQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation) {
- std::ostringstream query;
- std::string entriesStr = std::to_string(entriesPerPage);
+ if (playerGUID != 0) {
+ query += fmt::format(", @ourRow := IF(`id` = {}, @row - 1, @ourRow) AS `rw`", playerGUID);
+ }
- query << "SELECT *, @row AS `entries`, (@ourRow DIV " << entriesStr << ") + 1 AS `page` FROM (SELECT *, (@row := @row + 1) AS `rn`, @ourRow := IF(`id` = "
- << playerGUID << ", @row - 1, @ourRow) AS `rw` FROM (SELECT `id`, `name`, `level`, `vocation`, `" << categoryName << "` AS `points`, @curRank := IF(@prevRank = `"
- << categoryName << "`, @curRank, IF(@prevRank := `" << categoryName << "`, @curRank + 1, @curRank + 1)) AS `rank` FROM `players` `p`, (SELECT @curRank := 0, @prevRank := NULL, @row := 0, @ourRow := 0) `r` WHERE `group_id` < "
- << static_cast(GROUP_TYPE_GAMEMASTER) << " ORDER BY `" << categoryName << "` DESC) `t`";
+ query += fmt::format(
+ " FROM (SELECT `id`, `name`, `level`, `vocation`, `{}` FROM `players` `p`, "
+ "(SELECT @curRank := 0, @prevRank := NULL, @row := 0, @ourRow := 0) `r` "
+ "WHERE `group_id` < {} ORDER BY `{}` DESC) `t`",
+ categoryName, static_cast(GROUP_TYPE_GAMEMASTER), categoryName
+ );
if (vocation != 0xFFFFFFFF) {
- query << generateVocationConditionHighscore(vocation);
+ query += generateVocationConditionHighscore(vocation);
}
- query << ") `T` WHERE `rn` > ((@ourRow DIV " << entriesStr << ") * " << entriesStr << ") AND `rn` <= (((@ourRow DIV " << entriesStr << ") * " << entriesStr << ") + " << entriesStr << ")";
- return query.str();
+ query += ") `T` WHERE ";
+
+ if (playerGUID != 0) {
+ query += fmt::format(
+ "`rn` > ((@ourRow DIV {0}) * {0}) AND `rn` <= (((@ourRow DIV {0}) * {0}) + {0})",
+ entriesStr
+ );
+ } else {
+ query += fmt::format("`rn` > {} AND `rn` <= {}", startPage, endPage);
+ }
+
+ return query;
}
std::string Game::generateVocationConditionHighscore(uint32_t vocation) {
@@ -8624,7 +8690,7 @@ std::string Game::generateHighscoreOrGetCachedQueryForEntries(const std::string
}
}
- std::string newQuery = generateHighscoreQueryForEntries(categoryName, page, entriesPerPage, vocation);
+ std::string newQuery = generateHighscoreQuery(categoryName, page, entriesPerPage, vocation);
cacheQueryHighscore(cacheKey, newQuery, page, entriesPerPage);
return newQuery;
@@ -8642,7 +8708,7 @@ std::string Game::generateHighscoreOrGetCachedQueryForOurRank(const std::string
}
}
- std::string newQuery = generateHighscoreQueryForOurRank(categoryName, entriesPerPage, playerGUID, vocation);
+ std::string newQuery = generateHighscoreQuery(categoryName, 0, entriesPerPage, vocation, playerGUID);
cacheQueryHighscore(cacheKey, newQuery, entriesPerPage, entriesPerPage);
return newQuery;
@@ -8997,9 +9063,10 @@ void Game::playerCreateMarketOffer(uint32_t playerId, uint8_t type, uint16_t ite
return;
}
- uint64_t calcFee = (price / 100) * amount;
- uint64_t minFee = std::min(100000, calcFee);
- uint64_t fee = std::max(20, minFee);
+ uint64_t totalPrice = price * amount;
+ uint64_t totalFee = totalPrice * 0.02;
+ uint64_t maxFee = std::min(1000000, totalFee);
+ uint64_t fee = std::max(20, totalFee);
if (type == MARKETACTION_SELL) {
if (fee > (player->getBankBalance() + player->getMoney())) {
@@ -9930,19 +9997,72 @@ void Game::removePlayer(const std::shared_ptr &player) {
}
void Game::addNpc(const std::shared_ptr &npc) {
- npcs[npc->getID()] = npc;
+ npcs.push_back(npc);
+ size_t index = npcs.size() - 1;
+ npcsNameIndex[npc->getLowerName()] = index;
+ npcsIdIndex[npc->getID()] = index;
}
void Game::removeNpc(const std::shared_ptr &npc) {
- npcs.erase(npc->getID());
+ if (!npc) {
+ return;
+ }
+
+ auto npcId = npc->getID();
+ const auto &npcLowerName = npc->getLowerName();
+ auto it = npcsIdIndex.find(npcId);
+ if (it != npcsIdIndex.end()) {
+ size_t index = it->second;
+ npcsNameIndex.erase(npcLowerName);
+ npcsIdIndex.erase(npcId);
+
+ if (index != npcs.size() - 1) {
+ std::swap(npcs[index], npcs.back());
+
+ const auto &movedNpc = npcs[index];
+ npcsNameIndex[movedNpc->getLowerName()] = index;
+ npcsIdIndex[movedNpc->getID()] = index;
+ }
+
+ npcs.pop_back();
+ }
}
void Game::addMonster(const std::shared_ptr &monster) {
- monsters[monster->getID()] = monster;
+ if (!monster) {
+ return;
+ }
+
+ const auto &lowerName = monster->getLowerName();
+ monsters.push_back(monster);
+ size_t index = monsters.size() - 1;
+ monstersNameIndex[lowerName] = index;
+ monstersIdIndex[monster->getID()] = index;
}
void Game::removeMonster(const std::shared_ptr &monster) {
- monsters.erase(monster->getID());
+ if (!monster) {
+ return;
+ }
+
+ auto monsterId = monster->getID();
+ const auto &monsterLowerName = monster->getLowerName();
+ auto it = monstersIdIndex.find(monsterId);
+ if (it != monstersIdIndex.end()) {
+ size_t index = it->second;
+ monstersNameIndex.erase(monsterLowerName);
+ monstersIdIndex.erase(monsterId);
+
+ if (index != monsters.size() - 1) {
+ std::swap(monsters[index], monsters.back());
+
+ const auto &movedMonster = monsters[index];
+ monstersNameIndex[movedMonster->getLowerName()] = index;
+ monstersIdIndex[movedMonster->getID()] = index;
+ }
+
+ monsters.pop_back();
+ }
}
std::shared_ptr Game::getGuild(uint32_t id, bool allowOffline /* = flase */) const {
@@ -10151,7 +10271,7 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr
forgeableMonsters.clear();
// If the forgeable monsters haven't been created
// Then we'll create them so they don't return in the next if (forgeableMonsters.empty())
- for (const auto &[monsterId, monster] : monsters) {
+ for (const auto &monster : monsters) {
auto monsterTile = monster->getTile();
if (!monster || !monsterTile) {
continue;
@@ -10324,7 +10444,7 @@ void Game::updateForgeableMonsters() {
if (auto influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT);
forgeableMonsters.size() < influencedLimit) {
forgeableMonsters.clear();
- for (const auto &[monsterId, monster] : monsters) {
+ for (const auto &monster : monsters) {
const auto &monsterTile = monster->getTile();
if (!monsterTile) {
continue;
@@ -10540,7 +10660,7 @@ void Game::playerRewardChestCollect(uint32_t playerId, const Position &pos, uint
}
// Updates the parent of the reward chest and reward containers to avoid memory usage after cleaning
- auto playerRewardChest = player->getRewardChest();
+ const auto &playerRewardChest = player->getRewardChest();
if (playerRewardChest && playerRewardChest->empty()) {
player->sendCancelMessage(RETURNVALUE_REWARDCHESTISEMPTY);
return;
diff --git a/src/game/game.hpp b/src/game/game.hpp
index b16d1787d..9a4b59f8a 100644
--- a/src/game/game.hpp
+++ b/src/game/game.hpp
@@ -522,10 +522,10 @@ class Game {
const phmap::parallel_flat_hash_map> &getPlayers() const {
return players;
}
- const std::map> &getMonsters() const {
+ const auto &getMonsters() const {
return monsters;
}
- const std::map> &getNpcs() const {
+ const auto &getNpcs() const {
return npcs;
}
@@ -539,8 +539,8 @@ class Game {
void addNpc(const std::shared_ptr &npc);
void removeNpc(const std::shared_ptr &npc);
- void addMonster(const std::shared_ptr &npc);
- void removeMonster(const std::shared_ptr &npc);
+ void addMonster(const std::shared_ptr &monster);
+ void removeMonster(const std::shared_ptr &monster);
std::shared_ptr getGuild(uint32_t id, bool allowOffline = false) const;
std::shared_ptr getGuildByName(const std::string &name, bool allowOffline = false) const;
@@ -851,8 +851,16 @@ class Game {
std::shared_ptr wildcardTree = nullptr;
- std::map> npcs;
- std::map> monsters;
+ std::vector> monsters;
+ // This works only for unique monsters (bosses, quest monsters, etc)
+ std::unordered_map monstersNameIndex;
+ std::unordered_map monstersIdIndex;
+
+ std::vector> npcs;
+ // This works only for unique npcs (quest npcs, etc)
+ std::unordered_map npcsNameIndex;
+ std::unordered_map npcsIdIndex;
+
std::vector forgeableMonsters;
std::map> teamFinderMap; // [leaderGUID] = TeamFinder*
@@ -949,8 +957,13 @@ class Game {
void processHighscoreResults(const DBResult_ptr &result, uint32_t playerID, uint8_t category, uint32_t vocation, uint8_t entriesPerPage);
std::string generateVocationConditionHighscore(uint32_t vocation);
- std::string generateHighscoreQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation);
- std::string generateHighscoreQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation);
+ std::string generateHighscoreQuery(
+ const std::string &categoryName,
+ uint32_t page,
+ uint8_t entriesPerPage,
+ uint32_t vocation,
+ uint32_t playerGUID = 0
+ );
std::string generateHighscoreOrGetCachedQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation);
std::string generateHighscoreOrGetCachedQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation);
diff --git a/src/game/zones/zone.hpp b/src/game/zones/zone.hpp
index a3af961bd..e13652e8b 100644
--- a/src/game/zones/zone.hpp
+++ b/src/game/zones/zone.hpp
@@ -216,7 +216,7 @@ class Zone {
Position removeDestination = Position();
std::string name;
std::string monsterVariant;
- std::unordered_set positions;
+ phmap::flat_hash_set positions;
uint32_t id = 0; // ID 0 is used in zones created dynamically from lua. The map editor uses IDs starting from 1 (automatically generated).
weak::set
- itemsCache;
diff --git a/src/io/functions/iologindata_load_player.cpp b/src/io/functions/iologindata_load_player.cpp
index e724d0ced..21d251c6d 100644
--- a/src/io/functions/iologindata_load_player.cpp
+++ b/src/io/functions/iologindata_load_player.cpp
@@ -869,14 +869,18 @@ void IOLoginDataLoad::loadPlayerTaskHuntingClass(const std::shared_ptr &
}
void IOLoginDataLoad::loadPlayerForgeHistory(const std::shared_ptr &player, DBResult_ptr result) {
- if (!result || !player) {
- g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__);
+ if (!player) {
+ g_logger().warn("[{}] - Player nullptr", __FUNCTION__);
return;
}
- std::ostringstream query;
- query << "SELECT * FROM `forge_history` WHERE `player_id` = " << player->getGUID();
- if ((result = Database::getInstance().storeQuery(query.str()))) {
+ auto playerGUID = player->getGUID();
+
+ auto query = fmt::format(
+ "SELECT id, action_type, description, done_at, is_success FROM forge_history WHERE player_id = {}",
+ playerGUID
+ );
+ if ((result = Database::getInstance().storeQuery(query))) {
do {
auto actionEnum = magic_enum::enum_value(result->getNumber("action_type"));
ForgeHistory history;
diff --git a/src/io/io_bosstiary.cpp b/src/io/io_bosstiary.cpp
index 3e8a05524..351f80177 100644
--- a/src/io/io_bosstiary.cpp
+++ b/src/io/io_bosstiary.cpp
@@ -21,45 +21,45 @@ IOBosstiary &IOBosstiary::getInstance() {
void IOBosstiary::loadBoostedBoss() {
Database &database = Database::getInstance();
- std::ostringstream query;
- query << "SELECT * FROM `boosted_boss`";
- DBResult_ptr result = database.storeQuery(query.str());
+ auto query = fmt::format("SELECT `date`, `boostname`, `raceid` FROM `boosted_boss`");
+ DBResult_ptr result = database.storeQuery(query);
if (!result) {
g_logger().error("[{}] Failed to detect boosted boss database. (CODE 01)", __FUNCTION__);
return;
}
- auto date = result->getNumber("date");
- auto timeNow = getTimeNow();
- auto time = localtime(&timeNow);
- auto today = time->tm_mday;
-
- auto bossMap = getBosstiaryMap();
+ const auto &bossMap = getBosstiaryMap();
if (bossMap.size() <= 1) {
g_logger().error("[{}] It is not possible to create a boosted boss with only one registered boss. (CODE 02)", __FUNCTION__);
return;
}
- std::string bossName;
- uint16_t bossId = 0;
- if (date == today) {
- bossName = result->getString("boostname");
- bossId = result->getNumber("raceid");
- setBossBoostedName(bossName);
- setBossBoostedId(bossId);
- g_logger().info("Boosted boss: {}", bossName);
- return;
+ auto timeNow = getTimeNow();
+ auto time = localtime(&timeNow);
+ auto today = time->tm_mday;
+
+ if (!result) {
+ g_logger().warn("[{}] No boosted boss found in g_database(). A new one will be selected.", __FUNCTION__);
+ } else {
+ auto date = result->getNumber("date");
+ if (date == today) {
+ std::string bossName = result->getString("boostname");
+ uint16_t bossId = result->getNumber("raceid");
+ setBossBoostedName(bossName);
+ setBossBoostedId(bossId);
+ g_logger().info("Boosted boss: {}", bossName);
+ return;
+ }
}
// Filter only archfoe bosses
- std::map bossInfo;
- for (auto [infoBossRaceId, infoBossName] : bossMap) {
- const auto mType = getMonsterTypeByBossRaceId(infoBossRaceId);
+ std::vector> bossInfo;
+ for (const auto &[infoBossRaceId, infoBossName] : bossMap) {
+ const auto &mType = getMonsterTypeByBossRaceId(infoBossRaceId);
if (!mType || mType->info.bosstiaryRace != BosstiaryRarity_t::RARITY_ARCHFOE) {
continue;
}
-
- bossInfo.try_emplace(infoBossRaceId, infoBossName);
+ bossInfo.emplace_back(infoBossRaceId, infoBossName);
}
// Check if not have archfoe registered boss
@@ -68,55 +68,54 @@ void IOBosstiary::loadBoostedBoss() {
return;
}
- auto oldBossRace = result->getNumber("raceid");
- while (true) {
- uint32_t randomIndex = uniform_random(0, static_cast(bossInfo.size()));
- auto it = std::next(bossInfo.begin(), randomIndex);
- if (it == bossInfo.end()) {
- break;
- }
-
- const auto &[randomBossId, randomBossName] = *it;
- if (randomBossId == oldBossRace) {
- continue;
- }
-
- bossName = randomBossName;
- bossId = randomBossId;
- break;
+ const auto &[randomBossId, randomBossName] = bossInfo[uniform_random(0, static_cast(bossInfo.size() - 1))];
+ std::string bossName = randomBossName;
+ uint16_t bossId = randomBossId;
+
+ query = fmt::format(
+ "UPDATE `boosted_boss` SET `date` = '{}', `boostname` = {}, `raceid` = '{}', ",
+ today, database.escapeString(bossName), bossId
+ );
+
+ if (const auto bossType = getMonsterTypeByBossRaceId(bossId); bossType) {
+ query += fmt::format(
+ "`looktypeEx` = {}, `looktype` = {}, `lookfeet` = {}, `looklegs` = {}, "
+ "`lookhead` = {}, `lookbody` = {}, `lookaddons` = {}, `lookmount` = {}, ",
+ static_cast(bossType->info.outfit.lookTypeEx),
+ static_cast(bossType->info.outfit.lookType),
+ static_cast(bossType->info.outfit.lookFeet),
+ static_cast(bossType->info.outfit.lookLegs),
+ static_cast(bossType->info.outfit.lookHead),
+ static_cast(bossType->info.outfit.lookBody),
+ static_cast(bossType->info.outfit.lookAddons),
+ static_cast(bossType->info.outfit.lookMount)
+ );
}
- query.str(std::string());
- query << "UPDATE `boosted_boss` SET ";
- query << "`date` = '" << today << "',";
- query << "`boostname` = " << database.escapeString(bossName) << ",";
- if (const auto bossType = getMonsterTypeByBossRaceId(bossId);
- bossType) {
- query << "`looktypeEx` = " << static_cast(bossType->info.outfit.lookTypeEx) << ",";
- query << "`looktype` = " << static_cast(bossType->info.outfit.lookType) << ",";
- query << "`lookfeet` = " << static_cast(bossType->info.outfit.lookFeet) << ",";
- query << "`looklegs` = " << static_cast(bossType->info.outfit.lookLegs) << ",";
- query << "`lookhead` = " << static_cast(bossType->info.outfit.lookHead) << ",";
- query << "`lookbody` = " << static_cast(bossType->info.outfit.lookBody) << ",";
- query << "`lookaddons` = " << static_cast(bossType->info.outfit.lookAddons) << ",";
- query << "`lookmount` = " << static_cast(bossType->info.outfit.lookMount) << ",";
- }
- query << "`raceid` = '" << bossId << "'";
- if (!database.executeQuery(query.str())) {
+ query += fmt::format("`raceid` = '{}'", bossId);
+
+ if (!database.executeQuery(query)) {
g_logger().error("[{}] Failed to detect boosted boss database. (CODE 03)", __FUNCTION__);
return;
}
- query.str(std::string());
- query << "UPDATE `player_bosstiary` SET `bossIdSlotOne` = 0 WHERE `bossIdSlotOne` = " << bossId;
- if (!database.executeQuery(query.str())) {
+ query = fmt::format(
+ "UPDATE `player_bosstiary` SET `bossIdSlotOne` = 0 WHERE `bossIdSlotOne` = {}",
+ bossId
+ );
+
+ if (!database.executeQuery(query)) {
g_logger().error("[{}] Failed to reset players selected boss slot 1. (CODE 03)", __FUNCTION__);
}
- query.str(std::string());
- query << "UPDATE `player_bosstiary` SET `bossIdSlotTwo` = 0 WHERE `bossIdSlotTwo` = " << bossId;
- if (!database.executeQuery(query.str())) {
- g_logger().error("[{}] Failed to reset players selected boss slot 1. (CODE 03)", __FUNCTION__);
+ query = fmt::format(
+ "UPDATE `player_bosstiary` SET `bossIdSlotTwo` = 0 WHERE `bossIdSlotTwo` = {}",
+ bossId
+ );
+
+ if (!database.executeQuery(query)) {
+ g_logger().error("[{}] Failed to reset players selected boss slot 2. (CODE 03)", __FUNCTION__);
+ return;
}
setBossBoostedName(bossName);
diff --git a/src/lua/creature/movement.cpp b/src/lua/creature/movement.cpp
index 6804cdfa7..51daea8cf 100644
--- a/src/lua/creature/movement.cpp
+++ b/src/lua/creature/movement.cpp
@@ -808,6 +808,13 @@ uint32_t MoveEvent::fireAddRemItem(const std::shared_ptr
- &item, const std:
if (isLoadedScriptId()) {
return executeAddRemItem(item, fromTile, pos);
} else {
+ if (!moveFunction) {
+ g_logger().error("[MoveEvent::fireAddRemItem - Item {} item on position: {}] "
+ "Move function is nullptr.",
+ item->getName(), pos.toString());
+ return 0;
+ }
+
return moveFunction(item, fromTile, pos);
}
}
@@ -840,6 +847,13 @@ uint32_t MoveEvent::fireAddRemItem(const std::shared_ptr
- &item, const Posi
if (isLoadedScriptId()) {
return executeAddRemItem(item, pos);
} else {
+ if (!moveFunction) {
+ g_logger().error("[MoveEvent::fireAddRemItem - Item {} item on position: {}] "
+ "Move function is nullptr.",
+ item->getName(), pos.toString());
+ return 0;
+ }
+
return moveFunction(item, nullptr, pos);
}
}
@@ -849,9 +863,9 @@ bool MoveEvent::executeAddRemItem(const std::shared_ptr
- &item, const Posit
// onRemoveItem(moveitem, pos)
if (!LuaScriptInterface::reserveScriptEnv()) {
g_logger().error("[MoveEvent::executeAddRemItem - "
- "Item {} item on tile x: {} y: {} z: {}] "
+ "Item {} item on position: {}] "
"Call stack overflow. Too many lua script calls being nested.",
- item->getName(), pos.getX(), pos.getY(), pos.getZ());
+ item->getName(), pos.toString());
return false;
}
diff --git a/src/lua/functions/core/game/lua_enums.cpp b/src/lua/functions/core/game/lua_enums.cpp
index 2136a3e59..8bff42580 100644
--- a/src/lua/functions/core/game/lua_enums.cpp
+++ b/src/lua/functions/core/game/lua_enums.cpp
@@ -772,14 +772,22 @@ void LuaEnums::initCreatureTypeEnums(lua_State* L) {
}
void LuaEnums::initClientOsEnums(lua_State* L) {
+ registerEnum(L, CLIENTOS_NONE);
registerEnum(L, CLIENTOS_LINUX);
registerEnum(L, CLIENTOS_WINDOWS);
registerEnum(L, CLIENTOS_FLASH);
+ registerEnum(L, CLIENTOS_NEW_LINUX);
registerEnum(L, CLIENTOS_NEW_WINDOWS);
registerEnum(L, CLIENTOS_NEW_MAC);
registerEnum(L, CLIENTOS_OTCLIENT_LINUX);
registerEnum(L, CLIENTOS_OTCLIENT_WINDOWS);
registerEnum(L, CLIENTOS_OTCLIENT_MAC);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_LINUX);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_WINDOWS);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_MAC);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_ANDROID);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_IOS);
+ registerEnum(L, CLIENTOS_OTCLIENTV8_WEB);
}
void LuaEnums::initFightModeEnums(lua_State* L) {
diff --git a/src/lua/functions/creatures/monster/monster_type_functions.cpp b/src/lua/functions/creatures/monster/monster_type_functions.cpp
index 07ce44b62..8b2f4a5f3 100644
--- a/src/lua/functions/creatures/monster/monster_type_functions.cpp
+++ b/src/lua/functions/creatures/monster/monster_type_functions.cpp
@@ -1170,18 +1170,22 @@ int MonsterTypeFunctions::luaMonsterTypeGetCreatureEvents(lua_State* L) {
int MonsterTypeFunctions::luaMonsterTypeRegisterEvent(lua_State* L) {
// monsterType:registerEvent(name)
const auto &monsterType = Lua::getUserdataShared(L, 1);
- if (monsterType) {
- const auto eventName = Lua::getString(L, 2);
- monsterType->info.scripts.insert(eventName);
- for (const auto &[_, monster] : g_game().getMonsters()) {
- if (monster->getMonsterType() == monsterType) {
- monster->registerCreatureEvent(eventName);
- }
- }
- Lua::pushBoolean(L, true);
- } else {
+ if (!monsterType) {
lua_pushnil(L);
+ return 1;
}
+
+ const auto eventName = Lua::getString(L, 2);
+ monsterType->info.scripts.insert(eventName);
+
+ for (const auto &monster : g_game().getMonsters()) {
+ const auto monsterTypeCompare = monster->getMonsterType();
+ if (monsterTypeCompare == monsterType) {
+ monster->registerCreatureEvent(eventName);
+ }
+ }
+
+ Lua::pushBoolean(L, true);
return 1;
}
diff --git a/src/lua/functions/items/item_type_functions.cpp b/src/lua/functions/items/item_type_functions.cpp
index 9c12f80e5..a1751ed4f 100644
--- a/src/lua/functions/items/item_type_functions.cpp
+++ b/src/lua/functions/items/item_type_functions.cpp
@@ -34,6 +34,7 @@ void ItemTypeFunctions::init(lua_State* L) {
Lua::registerMethod(L, "ItemType", "isPickupable", ItemTypeFunctions::luaItemTypeIsPickupable);
Lua::registerMethod(L, "ItemType", "isKey", ItemTypeFunctions::luaItemTypeIsKey);
Lua::registerMethod(L, "ItemType", "isQuiver", ItemTypeFunctions::luaItemTypeIsQuiver);
+ Lua::registerMethod(L, "ItemType", "isPodium", ItemTypeFunctions::luaItemTypeIsPodium);
Lua::registerMethod(L, "ItemType", "getType", ItemTypeFunctions::luaItemTypeGetType);
Lua::registerMethod(L, "ItemType", "getId", ItemTypeFunctions::luaItemTypeGetId);
diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
index 60e298474..9d385be58 100644
--- a/src/server/network/protocol/protocolgame.cpp
+++ b/src/server/network/protocol/protocolgame.cpp
@@ -614,6 +614,7 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS
player->lastIP = player->getIP();
player->lastLoginSaved = std::max(time(nullptr), player->lastLoginSaved + 1);
+ player->loginProtectionTime = OTSYS_TIME() + g_configManager().getNumber(LOGIN_PROTECTION_TIME);
acceptPackets = true;
} else {
if (eventConnect != 0 || !g_configManager().getBoolean(REPLACE_KICK_ON_LOGIN)) {
@@ -666,6 +667,12 @@ void ProtocolGame::connect(const std::string &playerName, OperatingSystem_t oper
sendAddCreature(player, player->getPosition(), 0, true);
player->lastIP = player->getIP();
player->lastLoginSaved = std::max(time(nullptr), player->lastLoginSaved + 1);
+ if (player->isProtected()) {
+ player->setProtection(false);
+ player->resetLoginProtection();
+ } else {
+ player->setLoginProtection(g_configManager().getNumber(LOGIN_PROTECTION_TIME));
+ }
player->resetIdleTime();
acceptPackets = true;
}
diff --git a/src/utils/object_pool.hpp b/src/utils/object_pool.hpp
new file mode 100644
index 000000000..c37d1d2ef
--- /dev/null
+++ b/src/utils/object_pool.hpp
@@ -0,0 +1,84 @@
+/**
+ * Canary - A free and open-source MMORPG server emulator
+ * Copyright (©) 2019-2024 OpenTibiaBR
+ * Repository: https://github.com/opentibiabr/canary
+ * License: https://github.com/opentibiabr/canary/blob/main/LICENSE
+ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors
+ * Website: https://docs.opentibiabr.com/
+ */
+
+#pragma once
+
+#include "utils/lockfree.hpp"
+
+/**
+ * @brief A lock-free object pool for efficient memory allocation and reuse.
+ *
+ * This class provides an efficient mechanism for managing the allocation
+ * and deallocation of objects, reducing the overhead associated with
+ * frequent memory operations. It uses a lock-free structure to ensure
+ * thread safety and high performance in multithreaded environments.
+ *
+ * @tparam T The type of objects managed by the pool.
+ * @tparam CAPACITY The maximum number of objects that can be held in the pool.
+ */
+template
+class ObjectPool {
+public:
+ /**
+ * @brief The allocator type used for managing object memory.
+ */
+ using Allocator = LockfreePoolingAllocator;
+
+ /**
+ * @brief Allocates an object from the pool and returns it as a `std::shared_ptr`.
+ *
+ * The object is constructed in place using the provided arguments.
+ * The `std::shared_ptr` includes a custom deleter that returns the object
+ * to the pool when it is no longer needed.
+ *
+ * @tparam Args The types of the arguments used to construct the object.* @param args The arguments forwarded to the constructor of the object.
+ * @return A `std::shared_ptr` managing the allocated object, or `nullptr` if the pool is empty.
+ */
+ template
+ static std::shared_ptr allocateShared(Args &&... args) {
+ T* obj = allocator.allocate(1);
+ if (obj) {
+ // Construct the object in place
+ std::construct_at(obj, std::forward(args)...);
+
+ // Return a shared_ptr with a custom deleter
+ return std::shared_ptr(obj, [](T* ptr) {
+ std::destroy_at(ptr); // Destroy the object
+ allocator.deallocate(ptr, 1); // Return to the pool
+ });
+ }
+ // Return nullptr if the pool is empty
+ return nullptr;
+ }
+
+ static void clear() {
+ allocator.clear();
+ }
+
+ /**
+ * @brief Preallocates a specified number of objects in the pool.
+ *
+ * This method allows you to populate the pool with preallocated objects
+ * to improve performance by reducing the need for dynamic allocations at runtime.
+ *
+ * @param count The number of objects to preallocate.
+ */
+ static void preallocate(size_t count) {
+ LockfreeFreeList::preallocate(count);
+ }
+
+private:
+ /**
+ * @brief The allocator instance used to manage object memory.
+ */
+ static Allocator allocator;
+};
+
+template
+typename ObjectPool::Allocator ObjectPool::allocator;