From 360e00683afe6dd92f0237f42b09fdd5bd902c7a Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Tue, 21 May 2024 19:14:27 -0300 Subject: [PATCH 01/50] fix: update market average price and configurable refresh interval (#2642) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Optimized Resource Usage: Reduced unnecessary copying of the statistics and sale maps in protocolgame.cpp, enhancing safety with the use of find for more secure access. • Bug Fix: Addressed a loading issue with items in market_offers and market_history. • Improved Readability: Replaced ostringstream with fmt::format to enhance code clarity and readability. • Feature: change price update interval to 30 by default and added a setting to enable/disable it (only set to 0). --- config.lua.dist | 3 + src/config/config_enums.hpp | 1 + src/config/configmanager.cpp | 1 + src/game/game.cpp | 30 +++++----- src/game/game.hpp | 3 +- src/io/iomarket.cpp | 24 ++++++-- src/io/iomarket.hpp | 7 +-- src/server/network/protocol/protocolgame.cpp | 60 ++++++++++++-------- 8 files changed, 78 insertions(+), 51 deletions(-) diff --git a/config.lua.dist b/config.lua.dist index ed2561d4532..447a90647c2 100644 --- a/config.lua.dist +++ b/config.lua.dist @@ -377,7 +377,10 @@ partyListMaxDistance = 30 toggleMapCustom = true -- Market +-- NOTE: marketRefreshPricesInterval (in minutes, minimum is 1 minute) +-- NOTE: set it to 0 for disable, is the time in which the task will run updating the prices of the items that will be sent to the client marketOfferDuration = 30 * 24 * 60 * 60 +marketRefreshPricesInterval = 30 premiumToCreateMarketOffer = true checkExpiredMarketOffersEachMinutes = 60 maxMarketOffersAtATimePerPlayer = 100 diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp index 30a4b172af1..22043f42525 100644 --- a/src/config/config_enums.hpp +++ b/src/config/config_enums.hpp @@ -139,6 +139,7 @@ enum ConfigKey_t : uint16_t { MAP_DOWNLOAD_URL, MAP_NAME, MARKET_OFFER_DURATION, + MARKET_REFRESH_PRICES, MARKET_PREMIUM, MAX_ALLOWED_ON_A_DUMMY, MAX_CONTAINER_ITEM, diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp index 37634abf514..e1345bbac4b 100644 --- a/src/config/configmanager.cpp +++ b/src/config/configmanager.cpp @@ -61,6 +61,7 @@ bool ConfigManager::load() { loadIntConfig(L, GAME_PORT, "gameProtocolPort", 7172); loadIntConfig(L, LOGIN_PORT, "loginProtocolPort", 7171); loadIntConfig(L, MARKET_OFFER_DURATION, "marketOfferDuration", 30 * 24 * 60 * 60); + loadIntConfig(L, MARKET_REFRESH_PRICES, "marketRefreshPricesInterval", 30); loadIntConfig(L, PREMIUM_DEPOT_LIMIT, "premiumDepotLimit", 8000); loadIntConfig(L, SQL_PORT, "mysqlPort", 3306); loadIntConfig(L, STASH_ITEMS, "stashItemCount", 5000); diff --git a/src/game/game.cpp b/src/game/game.cpp index 00ec056ccb3..6188973781a 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -486,9 +486,16 @@ void Game::start(ServiceManager* manager) { g_dispatcher().cycleEvent( EVENT_LUA_GARBAGE_COLLECTION, [this] { g_luaEnvironment().collectGarbage(); }, "Calling GC" ); - g_dispatcher().cycleEvent( - EVENT_REFRESH_MARKET_PRICES, [this] { loadItemsPrice(); }, "Game::loadItemsPrice" - ); + auto marketItemsPriceIntervalMinutes = g_configManager().getNumber(MARKET_REFRESH_PRICES, __FUNCTION__); + if (marketItemsPriceIntervalMinutes > 0) { + auto marketItemsPriceIntervalMS = marketItemsPriceIntervalMinutes * 60000; + if (marketItemsPriceIntervalMS < 60000) { + marketItemsPriceIntervalMS = 60000; + } + g_dispatcher().cycleEvent( + marketItemsPriceIntervalMS, [this] { loadItemsPrice(); }, "Game::loadItemsPrice" + ); + } } GameState_t Game::getGameState() const { @@ -580,18 +587,11 @@ void Game::setGameState(GameState_t newState) { } } -bool Game::loadItemsPrice() { +void Game::loadItemsPrice() { IOMarket::getInstance().updateStatistics(); - std::ostringstream query, marketQuery; - query << "SELECT DISTINCT `itemtype` FROM `market_offers`;"; - - Database &db = Database::getInstance(); - DBResult_ptr result = db.storeQuery(query.str()); - if (!result) { - return false; - } - auto stats = IOMarket::getInstance().getPurchaseStatistics(); + // Update purchased offers (market_history) + const auto &stats = IOMarket::getInstance().getPurchaseStatistics(); for (const auto &[itemId, itemStats] : stats) { std::map tierToPrice; for (const auto &[tier, tierStats] : itemStats) { @@ -600,12 +600,12 @@ bool Game::loadItemsPrice() { } itemsPriceMap[itemId] = tierToPrice; } + + // Update active buy offers (market_offers) auto offers = IOMarket::getInstance().getActiveOffers(MARKETACTION_BUY); for (const auto &offer : offers) { itemsPriceMap[offer.itemId][offer.tier] = std::max(itemsPriceMap[offer.itemId][offer.tier], offer.price); } - - return true; } void Game::loadMainMap(const std::string &filename) { diff --git a/src/game/game.hpp b/src/game/game.hpp index 554c418a2c8..0e7b5fc147f 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -60,7 +60,6 @@ static constexpr int32_t EVENT_DECAYINTERVAL = 250; static constexpr int32_t EVENT_DECAY_BUCKETS = 4; static constexpr int32_t EVENT_FORGEABLEMONSTERCHECKINTERVAL = 300000; static constexpr int32_t EVENT_LUA_GARBAGE_COLLECTION = 60000 * 10; // 10min -static constexpr int32_t EVENT_REFRESH_MARKET_PRICES = 60000; // 1min static constexpr std::chrono::minutes CACHE_EXPIRATION_TIME { 10 }; // 10min static constexpr std::chrono::minutes HIGHSCORE_CACHE_EXPIRATION_TIME { 10 }; // 10min @@ -517,7 +516,7 @@ class Game { return lightHour; } - bool loadItemsPrice(); + void loadItemsPrice(); void loadMotdNum(); void saveMotdNum() const; diff --git a/src/io/iomarket.cpp b/src/io/iomarket.cpp index ca1bdb209d2..a0253e2ea01 100644 --- a/src/io/iomarket.cpp +++ b/src/io/iomarket.cpp @@ -29,10 +29,14 @@ uint8_t IOMarket::getTierFromDatabaseTable(const std::string &string) { MarketOfferList IOMarket::getActiveOffers(MarketAction_t action) { MarketOfferList offerList; - std::ostringstream query; - query << "SELECT `id`, `amount`, `price`, `tier`, `created`, `anonymous`, (SELECT `name` FROM `players` WHERE `id` = `player_id`) AS `player_name` FROM `market_offers` WHERE `sale` = " << action; + std::string query = fmt::format( + "SELECT `id`, `itemtype`, `amount`, `price`, `tier`, `created`, `anonymous`, " + "(SELECT `name` FROM `players` WHERE `id` = `player_id`) AS `player_name` " + "FROM `market_offers` WHERE `sale` = {}", + action + ); - DBResult_ptr result = Database::getInstance().storeQuery(query.str()); + DBResult_ptr result = g_database().storeQuery(query); if (!result) { return offerList; } @@ -41,6 +45,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action) { do { MarketOffer offer; + offer.itemId = result->getNumber("itemtype"); offer.amount = result->getNumber("amount"); offer.price = result->getNumber("price"); offer.timestamp = result->getNumber("created") + marketOfferDuration; @@ -71,6 +76,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action, uint16_t itemId do { MarketOffer offer; + offer.itemId = itemId; offer.amount = result->getNumber("amount"); offer.price = result->getNumber("price"); offer.timestamp = result->getNumber("created") + marketOfferDuration; @@ -333,9 +339,15 @@ bool IOMarket::moveOfferToHistory(uint32_t offerId, MarketOfferState_t state) { } void IOMarket::updateStatistics() { - std::ostringstream query; - query << "SELECT `sale` AS `sale`, `itemtype` AS `itemtype`, COUNT(`price`) AS `num`, MIN(`price`) AS `min`, MAX(`price`) AS `max`, SUM(`price`) AS `sum`, `tier` AS `tier` FROM `market_history` WHERE `state` = " << OFFERSTATE_ACCEPTED << " GROUP BY `itemtype`, `sale`, `tier`"; - DBResult_ptr result = Database::getInstance().storeQuery(query.str()); + auto query = fmt::format( + "SELECT sale, itemtype, COUNT(price) AS num, MIN(price) AS min, MAX(price) AS max, SUM(price) AS sum, tier " + "FROM market_history " + "WHERE state = '{}' " + "GROUP BY itemtype, sale, tier", + OFFERSTATE_ACCEPTED + ); + + DBResult_ptr result = g_database().storeQuery(query); if (!result) { return; } diff --git a/src/io/iomarket.hpp b/src/io/iomarket.hpp index 33180053584..4292651fb47 100644 --- a/src/io/iomarket.hpp +++ b/src/io/iomarket.hpp @@ -14,8 +14,6 @@ #include "lib/di/container.hpp" class IOMarket { - using StatisticsMap = std::map>; - public: IOMarket() = default; @@ -43,10 +41,11 @@ class IOMarket { void updateStatistics(); - StatisticsMap getPurchaseStatistics() const { + using StatisticsMap = std::map>; + const StatisticsMap &getPurchaseStatistics() const { return purchaseStatistics; } - StatisticsMap getSaleStatistics() const { + const StatisticsMap &getSaleStatistics() const { return saleStatistics; } diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index ada1340a7c6..e16f015eb49 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -5804,35 +5804,47 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { } } - auto purchase = IOMarket::getInstance().getPurchaseStatistics()[itemId][tier]; - if (const MarketStatistics* purchaseStatistics = &purchase; purchaseStatistics) { - msg.addByte(0x01); - msg.add(purchaseStatistics->numTransactions); - if (oldProtocol) { - msg.add(std::min(std::numeric_limits::max(), purchaseStatistics->totalPrice)); - msg.add(std::min(std::numeric_limits::max(), purchaseStatistics->highestPrice)); - msg.add(std::min(std::numeric_limits::max(), purchaseStatistics->lowestPrice)); - } else { - msg.add(purchaseStatistics->totalPrice); - msg.add(purchaseStatistics->highestPrice); - msg.add(purchaseStatistics->lowestPrice); + const auto &purchaseStatsMap = IOMarket::getInstance().getPurchaseStatistics(); + auto purchaseIterator = purchaseStatsMap.find(itemId); + if (purchaseIterator != purchaseStatsMap.end()) { + const auto &tierStatsMap = purchaseIterator->second; + auto tierStatsIter = tierStatsMap.find(tier); + if (tierStatsIter != tierStatsMap.end()) { + const auto &purchaseStatistics = tierStatsIter->second; + msg.addByte(0x01); + msg.add(purchaseStatistics.numTransactions); + if (oldProtocol) { + msg.add(std::min(std::numeric_limits::max(), purchaseStatistics.totalPrice)); + msg.add(std::min(std::numeric_limits::max(), purchaseStatistics.highestPrice)); + msg.add(std::min(std::numeric_limits::max(), purchaseStatistics.lowestPrice)); + } else { + msg.add(purchaseStatistics.totalPrice); + msg.add(purchaseStatistics.highestPrice); + msg.add(purchaseStatistics.lowestPrice); + } } } else { msg.addByte(0x00); // send to old protocol ? } - auto sale = IOMarket::getInstance().getSaleStatistics()[itemId][tier]; - if (const MarketStatistics* saleStatistics = &sale; saleStatistics) { - msg.addByte(0x01); - msg.add(saleStatistics->numTransactions); - if (oldProtocol) { - msg.add(std::min(std::numeric_limits::max(), saleStatistics->totalPrice)); - msg.add(std::min(std::numeric_limits::max(), saleStatistics->highestPrice)); - msg.add(std::min(std::numeric_limits::max(), saleStatistics->lowestPrice)); - } else { - msg.add(std::min(std::numeric_limits::max(), saleStatistics->totalPrice)); - msg.add(saleStatistics->highestPrice); - msg.add(saleStatistics->lowestPrice); + const auto &saleStatsMap = IOMarket::getInstance().getSaleStatistics(); + auto saleIterator = saleStatsMap.find(itemId); + if (saleIterator != saleStatsMap.end()) { + const auto &tierStatsMap = saleIterator->second; + auto tierStatsIter = tierStatsMap.find(tier); + if (tierStatsIter != tierStatsMap.end()) { + const auto &saleStatistics = tierStatsIter->second; + msg.addByte(0x01); + msg.add(saleStatistics.numTransactions); + if (oldProtocol) { + msg.add(std::min(std::numeric_limits::max(), saleStatistics.totalPrice)); + msg.add(std::min(std::numeric_limits::max(), saleStatistics.highestPrice)); + msg.add(std::min(std::numeric_limits::max(), saleStatistics.lowestPrice)); + } else { + msg.add(std::min(std::numeric_limits::max(), saleStatistics.totalPrice)); + msg.add(saleStatistics.highestPrice); + msg.add(saleStatistics.lowestPrice); + } } } else { msg.addByte(0x00); // send to old protocol ? From c57f5a28d6affef23dcf5a801b321d7e72465c52 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Wed, 22 May 2024 20:14:22 -0300 Subject: [PATCH 02/50] enhance: MapSector system for improved performance and flexibility Introduces a new map sector system using a hashmap instead of a node-based structure, which significantly improves search performance. It stores tiles and creatures for each area, and is critical for server functionality. Credits @saiyansking --- src/items/tile.cpp | 2 +- .../functions/core/game/global_functions.cpp | 2 +- src/map/CMakeLists.txt | 2 +- src/map/map.cpp | 67 +++++++----- src/map/map.hpp | 8 +- src/map/map_const.hpp | 7 +- src/map/mapcache.cpp | 46 +++++++- src/map/mapcache.hpp | 61 ++++------- src/map/spectators.cpp | 70 ++++++------ src/map/utils/mapsector.cpp | 46 ++++++++ src/map/utils/mapsector.hpp | 92 ++++++++++++++++ src/map/utils/qtreenode.cpp | 103 ------------------ src/map/utils/qtreenode.hpp | 92 ---------------- vcproj/canary.vcxproj | 4 +- 14 files changed, 290 insertions(+), 312 deletions(-) create mode 100644 src/map/utils/mapsector.cpp create mode 100644 src/map/utils/mapsector.hpp delete mode 100644 src/map/utils/qtreenode.cpp delete mode 100644 src/map/utils/qtreenode.hpp diff --git a/src/items/tile.cpp b/src/items/tile.cpp index 11e3fafd6fd..f2006f627e1 100644 --- a/src/items/tile.cpp +++ b/src/items/tile.cpp @@ -1272,7 +1272,7 @@ void Tile::removeThing(std::shared_ptr thing, uint32_t count) { } void Tile::removeCreature(std::shared_ptr creature) { - g_game().map.getQTNode(tilePos.x, tilePos.y)->removeCreature(creature); + g_game().map.getMapSector(tilePos.x, tilePos.y)->removeCreature(creature); removeThing(creature, 0); } diff --git a/src/lua/functions/core/game/global_functions.cpp b/src/lua/functions/core/game/global_functions.cpp index 0403e88dd95..af89c1854f7 100644 --- a/src/lua/functions/core/game/global_functions.cpp +++ b/src/lua/functions/core/game/global_functions.cpp @@ -712,7 +712,7 @@ int GlobalFunctions::luaSaveServer(lua_State* L) { } int GlobalFunctions::luaCleanMap(lua_State* L) { - lua_pushnumber(L, Map::clean()); + lua_pushnumber(L, g_game().map.clean()); return 1; } diff --git a/src/map/CMakeLists.txt b/src/map/CMakeLists.txt index 7d744950c1f..cab0eb03b15 100644 --- a/src/map/CMakeLists.txt +++ b/src/map/CMakeLists.txt @@ -2,7 +2,7 @@ target_sources(${PROJECT_NAME}_lib PRIVATE house/house.cpp house/housetile.cpp utils/astarnodes.cpp - utils/qtreenode.cpp + utils/mapsector.cpp map.cpp mapcache.cpp spectators.cpp diff --git a/src/map/map.cpp b/src/map/map.cpp index fcf14262c30..d4d1c4147b1 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -163,7 +163,7 @@ std::shared_ptr Map::getLoadedTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto leaf = getQTNode(x, y); + const auto leaf = getMapSector(x, y); if (!leaf) { return nullptr; } @@ -182,12 +182,12 @@ std::shared_ptr Map::getTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto leaf = getQTNode(x, y); - if (!leaf) { + const auto sector = getMapSector(x, y); + if (!sector) { return nullptr; } - const auto &floor = leaf->getFloor(z); + const auto &floor = sector->getFloor(z); if (!floor) { return nullptr; } @@ -215,10 +215,10 @@ void Map::setTile(uint16_t x, uint16_t y, uint8_t z, std::shared_ptr newTi return; } - if (const auto leaf = getQTNode(x, y)) { - leaf->createFloor(z)->setTile(x, y, newTile); + if (const auto sector = getMapSector(x, y)) { + sector->createFloor(z)->setTile(x, y, newTile); } else { - root.getBestLeaf(x, y, 15)->createFloor(z)->setTile(x, y, newTile); + getBestMapSector(x, y)->createFloor(z)->setTile(x, y, newTile); } } @@ -315,7 +315,7 @@ bool Map::placeCreature(const Position ¢erPos, std::shared_ptr cre toCylinder->internalAddThing(creature); const Position &dest = toCylinder->getPosition(); - getQTNode(dest.x, dest.y)->addCreature(creature); + getMapSector(dest.x, dest.y)->addCreature(creature); return true; } @@ -351,13 +351,13 @@ void Map::moveCreature(const std::shared_ptr &creature, const std::sha // remove the creature oldTile->removeThing(creature, 0); - auto leaf = getQTNode(oldPos.x, oldPos.y); - auto new_leaf = getQTNode(newPos.x, newPos.y); + MapSector* old_sector = getMapSector(oldPos.x, oldPos.y); + MapSector* new_sector = getMapSector(newPos.x, newPos.y); // Switch the node ownership - if (leaf != new_leaf) { - leaf->removeCreature(creature); - new_leaf->addCreature(creature); + if (old_sector != new_sector) { + old_sector->removeCreature(creature); + new_sector->addCreature(creature); } // add the creature @@ -687,32 +687,47 @@ bool Map::getPathMatching(const std::shared_ptr &creature, const Posit uint32_t Map::clean() { uint64_t start = OTSYS_TIME(); - size_t tiles = 0; + size_t qntTiles = 0; if (g_game().getGameState() == GAME_STATE_NORMAL) { g_game().setGameState(GAME_STATE_MAINTAIN); } - std::vector> toRemove; - for (const auto &tile : g_game().getTilesToClean()) { - if (!tile) { - continue; - } - if (const auto items = tile->getItemList()) { - ++tiles; - for (const auto &item : *items) { - if (item->isCleanable()) { - toRemove.emplace_back(item); + ItemVector toRemove; + toRemove.reserve(128); + for (const auto &mit : mapSectors) { + for (uint8_t z = 0; z < MAP_MAX_LAYERS; ++z) { + if (const auto &floor = mit.second.getFloor(z)) { + for (auto &tiles : floor->getTiles()) { + for (const auto &[tile, cachedTile] : tiles) { + if (!tile || tile->hasFlag(TILESTATE_PROTECTIONZONE)) { + continue; + } + + TileItemVector* itemList = tile->getItemList(); + if (!itemList) { + continue; + } + + ++qntTiles; + + for (auto it = ItemVector::const_reverse_iterator(itemList->getEndDownItem()), end = ItemVector::const_reverse_iterator(itemList->getBeginDownItem()); it != end; ++it) { + const auto &item = *it; + if (item->isCleanable()) { + toRemove.push_back(item); + } + } + } } } } } + const size_t count = toRemove.size(); for (const auto &item : toRemove) { g_game().internalRemoveItem(item, -1); } - size_t count = toRemove.size(); g_game().clearTilesToClean(); if (g_game().getGameState() == GAME_STATE_MAINTAIN) { @@ -720,6 +735,6 @@ uint32_t Map::clean() { } uint64_t end = OTSYS_TIME(); - g_logger().info("CLEAN: Removed {} item{} from {} tile{} in {} seconds", count, (count != 1 ? "s" : ""), tiles, (tiles != 1 ? "s" : ""), (end - start) / (1000.f)); + g_logger().info("CLEAN: Removed {} item{} from {} tile{} in {} seconds", count, (count != 1 ? "s" : ""), qntTiles, (qntTiles != 1 ? "s" : ""), (end - start) / (1000.f)); return count; } diff --git a/src/map/map.hpp b/src/map/map.hpp index 0894853e30e..e57328e12b3 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -29,9 +29,9 @@ class FrozenPathingConditionCall; * Map class. * Holds all the actual map-data */ -class Map : protected MapCache { +class Map : public MapCache { public: - static uint32_t clean(); + uint32_t clean(); std::filesystem::path getPath() const { return path; @@ -131,10 +131,6 @@ class Map : protected MapCache { std::map waypoints; - QTreeLeafNode* getQTNode(uint16_t x, uint16_t y) { - return QTreeNode::getLeafStatic(&root, x, y); - } - // Storage made by "loadFromXML" of houses, monsters and npcs for main map SpawnsMonster spawnsMonster; SpawnsNpc spawnsNpc; diff --git a/src/map/map_const.hpp b/src/map/map_const.hpp index 10f814d7f8b..109641d6bfe 100644 --- a/src/map/map_const.hpp +++ b/src/map/map_const.hpp @@ -18,6 +18,7 @@ static constexpr int8_t MAP_MAX_LAYERS = 16; static constexpr int8_t MAP_INIT_SURFACE_LAYER = 7; // (MAP_MAX_LAYERS / 2) -1 static constexpr int8_t MAP_LAYER_VIEW_LIMIT = 2; -static constexpr int32_t FLOOR_BITS = 3; -static constexpr int32_t FLOOR_SIZE = (1 << FLOOR_BITS); -static constexpr int32_t FLOOR_MASK = (FLOOR_SIZE - 1); +// SECTOR_SIZE must be power of 2 value +// The bigger the SECTOR_SIZE is the less hash map collision there should be but it'll consume more memory +static constexpr int32_t SECTOR_SIZE = 16; +static constexpr int32_t SECTOR_MASK = SECTOR_SIZE - 1; diff --git a/src/map/mapcache.cpp b/src/map/mapcache.cpp index ede4d3fd862..0448615ee99 100644 --- a/src/map/mapcache.cpp +++ b/src/map/mapcache.cpp @@ -154,10 +154,10 @@ void MapCache::setBasicTile(uint16_t x, uint16_t y, uint8_t z, const std::shared } const auto tile = static_tryGetTileFromCache(newTile); - if (const auto leaf = QTreeNode::getLeafStatic(&root, x, y)) { - leaf->createFloor(z)->setTileCache(x, y, tile); + if (const auto sector = getMapSector(x, y)) { + sector->createFloor(z)->setTileCache(x, y, tile); } else { - root.getBestLeaf(x, y, 15)->createFloor(z)->setTileCache(x, y, tile); + getBestMapSector(x, y)->createFloor(z)->setTileCache(x, y, tile); } } @@ -165,6 +165,46 @@ std::shared_ptr MapCache::tryReplaceItemFromCache(const std::shared_p return static_tryGetItemFromCache(ref); } +MapSector* MapCache::createMapSector(const uint32_t x, const uint32_t y) { + const uint32_t index = x / SECTOR_SIZE | y / SECTOR_SIZE << 16; + const auto it = mapSectors.find(index); + if (it != mapSectors.end()) { + return &it->second; + } + + MapSector::newSector = true; + return &mapSectors[index]; +} + +MapSector* MapCache::getBestMapSector(uint32_t x, uint32_t y) { + MapSector::newSector = false; + const auto sector = createMapSector(x, y); + + if (MapSector::newSector) { + // update north sector + if (const auto northSector = getMapSector(x, y - SECTOR_SIZE)) { + northSector->sectorS = sector; + } + + // update west sector + if (const auto westSector = getMapSector(x - SECTOR_SIZE, y)) { + westSector->sectorE = sector; + } + + // update south sector + if (const auto southSector = getMapSector(x, y + SECTOR_SIZE)) { + sector->sectorS = southSector; + } + + // update east sector + if (const auto eastSector = getMapSector(x + SECTOR_SIZE, y)) { + sector->sectorE = eastSector; + } + } + + return sector; +} + void BasicTile::hash(size_t &h) const { std::array arr = { flags, houseId, type, isStatic }; for (const auto v : arr) { diff --git a/src/map/mapcache.hpp b/src/map/mapcache.hpp index bc3e59a700a..429d786972b 100644 --- a/src/map/mapcache.hpp +++ b/src/map/mapcache.hpp @@ -10,7 +10,7 @@ #pragma once #include "items/items_definitions.hpp" -#include "utils/qtreenode.hpp" +#include "utils/mapsector.hpp" class Map; class Tile; @@ -79,42 +79,6 @@ struct BasicTile { #pragma pack() -struct Floor { - explicit Floor(uint8_t z) : - z(z) { } - - std::shared_ptr getTile(uint16_t x, uint16_t y) const { - std::shared_lock sl(mutex); - return tiles[x & FLOOR_MASK][y & FLOOR_MASK].first; - } - - void setTile(uint16_t x, uint16_t y, std::shared_ptr tile) { - tiles[x & FLOOR_MASK][y & FLOOR_MASK].first = tile; - } - - std::shared_ptr getTileCache(uint16_t x, uint16_t y) const { - std::shared_lock sl(mutex); - return tiles[x & FLOOR_MASK][y & FLOOR_MASK].second; - } - - void setTileCache(uint16_t x, uint16_t y, const std::shared_ptr &newTile) { - tiles[x & FLOOR_MASK][y & FLOOR_MASK].second = newTile; - } - - uint8_t getZ() const { - return z; - } - - auto &getMutex() const { - return mutex; - } - -private: - std::pair, std::shared_ptr> tiles[FLOOR_SIZE][FLOOR_SIZE] = {}; - mutable std::shared_mutex mutex; - uint8_t z { 0 }; -}; - class MapCache { public: virtual ~MapCache() = default; @@ -125,10 +89,31 @@ class MapCache { void flush(); + /** + * Creates a map sector. + * \returns A pointer to that map sector. + */ + MapSector* createMapSector(uint32_t x, uint32_t y); + MapSector* getBestMapSector(uint32_t x, uint32_t y); + + /** + * Gets a map sector. + * \returns A pointer to that map sector. + */ + MapSector* getMapSector(const uint32_t x, const uint32_t y) { + const auto it = mapSectors.find(x / SECTOR_SIZE | y / SECTOR_SIZE << 16); + return it != mapSectors.end() ? &it->second : nullptr; + } + + const MapSector* getMapSector(const uint32_t x, const uint32_t y) const { + const auto it = mapSectors.find(x / SECTOR_SIZE | y / SECTOR_SIZE << 16); + return it != mapSectors.end() ? &it->second : nullptr; + } + protected: std::shared_ptr getOrCreateTileFromCache(const std::unique_ptr &floor, uint16_t x, uint16_t y); - QTreeNode root; + std::unordered_map mapSectors; private: void parseItemAttr(const std::shared_ptr &BasicItem, std::shared_ptr item); diff --git a/src/map/spectators.cpp b/src/map/spectators.cpp index 7c0e80a0412..36cce6d535b 100644 --- a/src/map/spectators.cpp +++ b/src/map/spectators.cpp @@ -154,59 +154,57 @@ Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onl } } - const int_fast32_t min_y = centerPos.y + minRangeY; - const int_fast32_t min_x = centerPos.x + minRangeX; - const int_fast32_t max_y = centerPos.y + maxRangeY; - const int_fast32_t max_x = centerPos.x + maxRangeX; + const int32_t min_y = centerPos.y + minRangeY; + const int32_t min_x = centerPos.x + minRangeX; + const int32_t max_y = centerPos.y + maxRangeY; + const int32_t max_x = centerPos.x + maxRangeX; - const int_fast16_t minoffset = centerPos.getZ() - maxRangeZ; - const int_fast32_t x1 = std::min(0xFFFF, std::max(0, (min_x + minoffset))); - const int_fast32_t y1 = std::min(0xFFFF, std::max(0, (min_y + minoffset))); + const auto width = static_cast(max_x - min_x); + const auto height = static_cast(max_y - min_y); + const auto depth = static_cast(maxRangeZ - minRangeZ); - const int_fast16_t maxoffset = centerPos.getZ() - minRangeZ; - const int_fast32_t x2 = std::min(0xFFFF, std::max(0, (max_x + maxoffset))); - const int_fast32_t y2 = std::min(0xFFFF, std::max(0, (max_y + maxoffset))); + const int32_t minoffset = centerPos.getZ() - maxRangeZ; + const int32_t x1 = std::min(0xFFFF, std::max(0, min_x + minoffset)); + const int32_t y1 = std::min(0xFFFF, std::max(0, min_y + minoffset)); - const uint_fast16_t startx1 = x1 - (x1 % FLOOR_SIZE); - const uint_fast16_t starty1 = y1 - (y1 % FLOOR_SIZE); - const uint_fast16_t endx2 = x2 - (x2 % FLOOR_SIZE); - const uint_fast16_t endy2 = y2 - (y2 % FLOOR_SIZE); + const int32_t maxoffset = centerPos.getZ() - minRangeZ; + const int32_t x2 = std::min(0xFFFF, std::max(0, max_x + maxoffset)); + const int32_t y2 = std::min(0xFFFF, std::max(0, max_y + maxoffset)); - const auto startLeaf = g_game().map.getQTNode(static_cast(startx1), static_cast(starty1)); - const QTreeLeafNode* leafS = startLeaf; - const QTreeLeafNode* leafE; + const int32_t startx1 = x1 - (x1 & SECTOR_MASK); + const int32_t starty1 = y1 - (y1 & SECTOR_MASK); + const int32_t endx2 = x2 - (x2 & SECTOR_MASK); + const int32_t endy2 = y2 - (y2 & SECTOR_MASK); SpectatorList spectators; spectators.reserve(std::max(MAP_MAX_VIEW_PORT_X, MAP_MAX_VIEW_PORT_Y) * 2); - for (uint_fast16_t ny = starty1; ny <= endy2; ny += FLOOR_SIZE) { - leafE = leafS; - for (uint_fast16_t nx = startx1; nx <= endx2; nx += FLOOR_SIZE) { - if (leafE) { - const auto &node_list = (onlyPlayers ? leafE->player_list : leafE->creature_list); + const MapSector* startSector = g_game().map.getMapSector(startx1, starty1); + const MapSector* sectorS = startSector; + for (int32_t ny = starty1; ny <= endy2; ny += SECTOR_SIZE) { + const MapSector* sectorE = sectorS; + for (int32_t nx = startx1; nx <= endx2; nx += SECTOR_SIZE) { + if (sectorE) { + const auto &node_list = onlyPlayers ? sectorE->player_list : sectorE->creature_list; for (const auto &creature : node_list) { const auto &cpos = creature->getPosition(); - if (minRangeZ > cpos.z || maxRangeZ < cpos.z) { - continue; + if (static_cast(static_cast(cpos.z) - minRangeZ) <= depth) { + const int_fast16_t offsetZ = Position::getOffsetZ(centerPos, cpos); + if (static_cast(cpos.x - offsetZ - min_x) <= width && static_cast(cpos.y - offsetZ - min_y) <= height) { + spectators.emplace_back(creature); + } } - - const int_fast16_t offsetZ = Position::getOffsetZ(centerPos, cpos); - if ((min_y + offsetZ) > cpos.y || (max_y + offsetZ) < cpos.y || (min_x + offsetZ) > cpos.x || (max_x + offsetZ) < cpos.x) { - continue; - } - - spectators.emplace_back(creature); } - leafE = leafE->leafE; + sectorE = sectorE->sectorE; } else { - leafE = g_game().map.getQTNode(static_cast(nx + FLOOR_SIZE), static_cast(ny)); + sectorE = g_game().map.getMapSector(nx + SECTOR_SIZE, ny); } } - if (leafS) { - leafS = leafS->leafS; + if (sectorS) { + sectorS = sectorS->sectorS; } else { - leafS = g_game().map.getQTNode(static_cast(startx1), static_cast(ny + FLOOR_SIZE)); + sectorS = g_game().map.getMapSector(startx1, ny + SECTOR_SIZE); } } diff --git a/src/map/utils/mapsector.cpp b/src/map/utils/mapsector.cpp new file mode 100644 index 00000000000..de036728b76 --- /dev/null +++ b/src/map/utils/mapsector.cpp @@ -0,0 +1,46 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (©) 2019-2023 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/ + */ + +#include "pch.hpp" + +#include "creatures/creature.hpp" +#include "mapsector.hpp" + +bool MapSector::newSector = false; + +void MapSector::addCreature(const std::shared_ptr &c) { + creature_list.emplace_back(c); + if (c->getPlayer()) { + player_list.emplace_back(c); + } +} + +void MapSector::removeCreature(const std::shared_ptr &c) { + auto iter = std::find(creature_list.begin(), creature_list.end(), c); + if (iter == creature_list.end()) { + g_logger().error("[{}]: Creature not found in creature_list!", __FUNCTION__); + return; + } + + assert(iter != creature_list.end()); + *iter = creature_list.back(); + creature_list.pop_back(); + + if (c->getPlayer()) { + iter = std::find(player_list.begin(), player_list.end(), c); + if (iter == player_list.end()) { + g_logger().error("[{}]: Player not found in player_list!", __FUNCTION__); + return; + } + + assert(iter != player_list.end()); + *iter = player_list.back(); + player_list.pop_back(); + } +} diff --git a/src/map/utils/mapsector.hpp b/src/map/utils/mapsector.hpp new file mode 100644 index 00000000000..7b95db7f78b --- /dev/null +++ b/src/map/utils/mapsector.hpp @@ -0,0 +1,92 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (©) 2019-2023 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 "map/map_const.hpp" + +class Creature; +class Tile; +struct BasicTile; + +struct Floor { + explicit Floor(uint8_t z) : + z(z) { } + + std::shared_ptr getTile(uint16_t x, uint16_t y) const { + std::shared_lock sl(mutex); + return tiles[x & SECTOR_MASK][y & SECTOR_MASK].first; + } + + void setTile(uint16_t x, uint16_t y, std::shared_ptr tile) { + tiles[x & SECTOR_MASK][y & SECTOR_MASK].first = tile; + } + + std::shared_ptr getTileCache(uint16_t x, uint16_t y) const { + std::shared_lock sl(mutex); + return tiles[x & SECTOR_MASK][y & SECTOR_MASK].second; + } + + void setTileCache(uint16_t x, uint16_t y, const std::shared_ptr &newTile) { + tiles[x & SECTOR_MASK][y & SECTOR_MASK].second = newTile; + } + + const auto &getTiles() const { + return tiles; + } + + uint8_t getZ() const { + return z; + } + + auto &getMutex() const { + return mutex; + } + +private: + std::pair, std::shared_ptr> tiles[SECTOR_SIZE][SECTOR_SIZE] = {}; + mutable std::shared_mutex mutex; + uint8_t z { 0 }; +}; + +class MapSector { +public: + MapSector() = default; + + // non-copyable + MapSector(const MapSector &) = delete; + MapSector &operator=(const MapSector &) = delete; + + // non-moveable + MapSector(const MapSector &&) = delete; + MapSector &operator=(const MapSector &&) = delete; + + const std::unique_ptr &createFloor(uint32_t z) { + return floors[z] ? floors[z] : (floors[z] = std::make_unique(z)); + } + + const std::unique_ptr &getFloor(uint8_t z) const { + return floors[z]; + } + + void addCreature(const std::shared_ptr &c); + void removeCreature(const std::shared_ptr &c); + +private: + static bool newSector; + MapSector* sectorS = nullptr; + MapSector* sectorE = nullptr; + std::vector> creature_list; + std::vector> player_list; + std::unique_ptr floors[MAP_MAX_LAYERS] = {}; + uint32_t floorBits = 0; + + friend class Spectators; + friend class MapCache; +}; diff --git a/src/map/utils/qtreenode.cpp b/src/map/utils/qtreenode.cpp deleted file mode 100644 index 279bcabe3fa..00000000000 --- a/src/map/utils/qtreenode.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/** - * Canary - A free and open-source MMORPG server emulator - * Copyright (©) 2019-2023 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/ - */ - -#include "pch.hpp" - -#include "creatures/creature.hpp" -#include "qtreenode.hpp" - -bool QTreeLeafNode::newLeaf = false; - -QTreeLeafNode* QTreeNode::getLeaf(uint32_t x, uint32_t y) { - if (leaf) { - return static_cast(this); - } - - const auto node = child[((x & 0x8000) >> 15) | ((y & 0x8000) >> 14)]; - return node ? node->getLeaf(x << 1, y << 1) : nullptr; -} - -QTreeLeafNode* QTreeNode::createLeaf(uint32_t x, uint32_t y, uint32_t level) { - if (isLeaf()) { - return static_cast(this); - } - - const uint32_t index = ((x & 0x8000) >> 15) | ((y & 0x8000) >> 14); - if (!child[index]) { - if (level != FLOOR_BITS) { - child[index] = new QTreeNode(); - } else { - child[index] = new QTreeLeafNode(); - QTreeLeafNode::newLeaf = true; - } - } - - return child[index]->createLeaf(x * 2, y * 2, level - 1); -} - -QTreeLeafNode* QTreeNode::getBestLeaf(uint32_t x, uint32_t y, uint32_t level) { - QTreeLeafNode::newLeaf = false; - auto tempLeaf = createLeaf(x, y, level); - - if (QTreeLeafNode::newLeaf) { - // update north - if (const auto northLeaf = getLeaf(x, y - FLOOR_SIZE)) { - northLeaf->leafS = tempLeaf; - } - - // update west leaf - if (const auto westLeaf = getLeaf(x - FLOOR_SIZE, y)) { - westLeaf->leafE = tempLeaf; - } - - // update south - if (const auto southLeaf = getLeaf(x, y + FLOOR_SIZE)) { - tempLeaf->leafS = southLeaf; - } - - // update east - if (const auto eastLeaf = getLeaf(x + FLOOR_SIZE, y)) { - tempLeaf->leafE = eastLeaf; - } - } - - return tempLeaf; -} - -void QTreeLeafNode::addCreature(const std::shared_ptr &c) { - creature_list.push_back(c); - - if (c->getPlayer()) { - player_list.push_back(c); - } -} - -void QTreeLeafNode::removeCreature(std::shared_ptr c) { - auto iter = std::find(creature_list.begin(), creature_list.end(), c); - if (iter == creature_list.end()) { - g_logger().error("[{}]: Creature not found in creature_list!", __FUNCTION__); - return; - } - - assert(iter != creature_list.end()); - *iter = creature_list.back(); - creature_list.pop_back(); - - if (c->getPlayer()) { - iter = std::find(player_list.begin(), player_list.end(), c); - if (iter == player_list.end()) { - g_logger().error("[{}]: Player not found in player_list!", __FUNCTION__); - return; - } - - assert(iter != player_list.end()); - *iter = player_list.back(); - player_list.pop_back(); - } -} diff --git a/src/map/utils/qtreenode.hpp b/src/map/utils/qtreenode.hpp deleted file mode 100644 index 83f052a6abf..00000000000 --- a/src/map/utils/qtreenode.hpp +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Canary - A free and open-source MMORPG server emulator - * Copyright (©) 2019-2023 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 "map/map_const.hpp" - -struct Floor; -class QTreeLeafNode; -class Creature; - -class QTreeNode { -public: - constexpr QTreeNode() = default; - - virtual ~QTreeNode() { } - - // non-copyable - QTreeNode(const QTreeNode &) = delete; - QTreeNode &operator=(const QTreeNode &) = delete; - - bool isLeaf() const { - return leaf; - } - - template - static Leaf getLeafStatic(Node node, uint32_t x, uint32_t y) { - do { - node = node->child[((x & 0x8000) >> 15) | ((y & 0x8000) >> 14)]; - if (!node) { - return nullptr; - } - - x <<= 1; - y <<= 1; - } while (!node->leaf); - return static_cast(node); - } - - QTreeLeafNode* getLeaf(uint32_t x, uint32_t y); - QTreeLeafNode* getBestLeaf(uint32_t x, uint32_t y, uint32_t level); - - QTreeLeafNode* createLeaf(uint32_t x, uint32_t y, uint32_t level); - -protected: - QTreeNode* child[4] = {}; - bool leaf = false; -}; - -class QTreeLeafNode final : public QTreeNode { -public: - QTreeLeafNode() { - QTreeNode::leaf = true; - newLeaf = true; - } - - // non-copyable - QTreeLeafNode(const QTreeLeafNode &) = delete; - QTreeLeafNode &operator=(const QTreeLeafNode &) = delete; - - const std::unique_ptr &createFloor(uint32_t z) { - return array[z] ? array[z] : (array[z] = std::make_unique(z)); - } - - const std::unique_ptr &getFloor(uint8_t z) const { - return array[z]; - } - - void addCreature(const std::shared_ptr &c); - void removeCreature(std::shared_ptr c); - -private: - static bool newLeaf; - QTreeLeafNode* leafS = nullptr; - QTreeLeafNode* leafE = nullptr; - - std::unique_ptr array[MAP_MAX_LAYERS] = {}; - - std::vector> creature_list; - std::vector> player_list; - - friend class Map; - friend class MapCache; - friend class QTreeNode; - friend class Spectators; -}; diff --git a/vcproj/canary.vcxproj b/vcproj/canary.vcxproj index 1c21dc87210..b3e4eaffb42 100644 --- a/vcproj/canary.vcxproj +++ b/vcproj/canary.vcxproj @@ -203,7 +203,7 @@ - + @@ -388,7 +388,7 @@ - + From caa35461ea75fea7fdbdf34a308b2183e499b5b9 Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Fri, 24 May 2024 00:46:48 -0300 Subject: [PATCH 03/50] improve: move wheel scrolls to kv (#2637) --- ...e_wheel_scrolls_from_storagename_to_kv.lua | 24 +++++++++++++ data/scripts/actions/items/wheel_scrolls.lua | 17 +++++----- data/scripts/lib/register_migrations.lua | 2 +- src/creatures/players/wheel/player_wheel.cpp | 34 ++++++++++++------- .../creatures/player/player_functions.cpp | 2 ++ 5 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 data-otservbr-global/scripts/game_migrations/20241715984279_move_wheel_scrolls_from_storagename_to_kv.lua diff --git a/data-otservbr-global/scripts/game_migrations/20241715984279_move_wheel_scrolls_from_storagename_to_kv.lua b/data-otservbr-global/scripts/game_migrations/20241715984279_move_wheel_scrolls_from_storagename_to_kv.lua new file mode 100644 index 00000000000..a5cc9a123f4 --- /dev/null +++ b/data-otservbr-global/scripts/game_migrations/20241715984279_move_wheel_scrolls_from_storagename_to_kv.lua @@ -0,0 +1,24 @@ +local promotionScrolls = { + { oldScroll = "wheel.scroll.abridged", newScroll = "abridged" }, + { oldScroll = "wheel.scroll.basic", newScroll = "basic" }, + { oldScroll = "wheel.scroll.revised", newScroll = "revised" }, + { oldScroll = "wheel.scroll.extended", newScroll = "extended" }, + { oldScroll = "wheel.scroll.advanced", newScroll = "advanced" }, +} + +local function migrate(player) + for _, scrollTable in ipairs(promotionScrolls) do + local oldStorage = player:getStorageValueByName(scrollTable.oldScroll) + if oldStorage > 0 then + player:kv():scoped("wheel-of-destiny"):scoped("scrolls"):set(scrollTable.newScroll, true) + end + end +end + +local migration = Migration("20241715984279_move_wheel_scrolls_from_storagename_to_kv") + +function migration:onExecute() + self:forEachPlayer(migrate) +end + +migration:register() diff --git a/data/scripts/actions/items/wheel_scrolls.lua b/data/scripts/actions/items/wheel_scrolls.lua index b42339a706e..61aaa6fe40a 100644 --- a/data/scripts/actions/items/wheel_scrolls.lua +++ b/data/scripts/actions/items/wheel_scrolls.lua @@ -1,9 +1,9 @@ local promotionScrolls = { - [43946] = { storageName = "wheel.scroll.abridged", points = 3, name = "abridged promotion scroll" }, - [43947] = { storageName = "wheel.scroll.basic", points = 5, name = "basic promotion scroll" }, - [43948] = { storageName = "wheel.scroll.revised", points = 9, name = "revised promotion scroll" }, - [43949] = { storageName = "wheel.scroll.extended", points = 13, name = "extended promotion scroll" }, - [43950] = { storageName = "wheel.scroll.advanced", points = 20, name = "advanced promotion scroll" }, + [43946] = { name = "abridged", points = 3, itemName = "abridged promotion scroll" }, + [43947] = { name = "basic", points = 5, itemName = "basic promotion scroll" }, + [43948] = { name = "revised", points = 9, itemName = "revised promotion scroll" }, + [43949] = { name = "extended", points = 13, itemName = "extended promotion scroll" }, + [43950] = { name = "advanced", points = 20, itemName = "advanced promotion scroll" }, } local scroll = Action() @@ -15,13 +15,14 @@ function scroll.onUse(player, item, fromPosition, target, toPosition, isHotkey) end local scrollData = promotionScrolls[item:getId()] - if player:getStorageValueByName(scrollData.storageName) == 1 then + local scrollKV = player:kv():scoped("wheel-of-destiny"):scoped("scrolls") + if scrollKV:get(scrollData.name) then player:sendTextMessage(MESSAGE_LOOK, "You have already deciphered this scroll.") return true end - player:setStorageValueByName(scrollData.storageName, 1) - player:sendTextMessage(MESSAGE_LOOK, "You have gained " .. scrollData.points .. " promotion points for the Wheel of Destiny by deciphering the " .. scrollData.name .. ".") + scrollKV:set(scrollData.name, true) + player:sendTextMessage(MESSAGE_LOOK, "You have gained " .. scrollData.points .. " promotion points for the Wheel of Destiny by deciphering the " .. scrollData.itemName .. ".") item:remove(1) return true end diff --git a/data/scripts/lib/register_migrations.lua b/data/scripts/lib/register_migrations.lua index 5a2734dfc51..26b9a7b1a94 100644 --- a/data/scripts/lib/register_migrations.lua +++ b/data/scripts/lib/register_migrations.lua @@ -45,7 +45,7 @@ function Migration:register() return end if not self:_validateName() then - error("Invalid migration name: " .. self.name .. ". Migration names must be in the format: _. Example: 20231128213149_add_new_monsters") + logger.error("Invalid migration name: " .. self.name .. ". Migration names must be in the format: _. Example: 20231128213149_add_new_monsters") end table.insert(Migration.registry, self) diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp index c4fdbf5e169..4c7a3dc52e0 100644 --- a/src/creatures/players/wheel/player_wheel.cpp +++ b/src/creatures/players/wheel/player_wheel.cpp @@ -130,16 +130,16 @@ namespace { struct PromotionScroll { uint16_t itemId; - std::string storageKey; + std::string name; uint8_t extraPoints; }; std::vector WheelOfDestinyPromotionScrolls = { - { 43946, "wheel.scroll.abridged", 3 }, - { 43947, "wheel.scroll.basic", 5 }, - { 43948, "wheel.scroll.revised", 9 }, - { 43949, "wheel.scroll.extended", 13 }, - { 43950, "wheel.scroll.advanced", 20 }, + { 43946, "abridged", 3 }, + { 43947, "basic", 5 }, + { 43948, "revised", 9 }, + { 43949, "extended", 13 }, + { 43950, "advanced", 20 }, }; } // namespace @@ -744,18 +744,21 @@ int PlayerWheel::getSpellAdditionalDuration(const std::string &spellName) const } void PlayerWheel::addPromotionScrolls(NetworkMessage &msg) const { - uint16_t count = 0; std::vector unlockedScrolls; for (const auto &scroll : WheelOfDestinyPromotionScrolls) { - auto storageValue = m_player.getStorageValueByName(scroll.storageKey); - if (storageValue > 0) { - count++; + const auto &scrollKv = m_player.kv()->scoped("wheel-of-destiny")->scoped("scrolls"); + if (!scrollKv) { + continue; + } + + auto scrollOpt = scrollKv->get(scroll.name); + if (scrollOpt && scrollOpt->get()) { unlockedScrolls.push_back(scroll.itemId); } } - msg.add(count); + msg.add(unlockedScrolls.size()); for (const auto &itemId : unlockedScrolls) { msg.add(itemId); } @@ -1239,8 +1242,13 @@ uint16_t PlayerWheel::getExtraPoints() const { uint16_t totalBonus = 0; for (const auto &scroll : WheelOfDestinyPromotionScrolls) { - auto storageValue = m_player.getStorageValueByName(scroll.storageKey); - if (storageValue > 0) { + const auto &scrollKv = m_player.kv()->scoped("wheel-of-destiny")->scoped("scrolls"); + if (!scrollKv) { + continue; + } + + auto scrollKV = scrollKv->get(scroll.name); + if (scrollKV && scrollKV->get()) { totalBonus += scroll.extraPoints; } } diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp index 50774e35e2a..413f1bd3f47 100644 --- a/src/lua/functions/creatures/player/player_functions.cpp +++ b/src/lua/functions/creatures/player/player_functions.cpp @@ -1767,6 +1767,7 @@ int PlayerFunctions::luaPlayerGetStorageValueByName(lua_State* L) { return 0; } + g_logger().warn("The function 'player:getStorageValueByName' is deprecated and will be removed in future versions, please use KV system"); auto name = getString(L, 2); lua_pushnumber(L, player->getStorageValueByName(name)); return 1; @@ -1781,6 +1782,7 @@ int PlayerFunctions::luaPlayerSetStorageValueByName(lua_State* L) { return 0; } + g_logger().warn("The function 'player:setStorageValueByName' is deprecated and will be removed in future versions, please use KV system"); auto storageName = getString(L, 2); int32_t value = getNumber(L, 3); From c545325193705989e2e912a08b3d763ad0672301 Mon Sep 17 00:00:00 2001 From: Karin Date: Fri, 24 May 2024 08:56:43 -0300 Subject: [PATCH 04/50] fix: prevent lag stacking items on npc with shopping bags (#2640) --- src/game/game.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/game/game.cpp b/src/game/game.cpp index 6188973781a..afc58e75198 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -5165,6 +5165,23 @@ void Game::playerBuyItem(uint32_t playerId, uint16_t itemId, uint8_t count, uint return; } + if (inBackpacks) { + uint32_t maxContainer = static_cast(g_configManager().getNumber(MAX_CONTAINER, __FUNCTION__)); + auto backpack = player->getInventoryItem(CONST_SLOT_BACKPACK); + auto mainBackpack = backpack ? backpack->getContainer() : nullptr; + + if (mainBackpack && mainBackpack->getContainerHoldingCount() >= maxContainer) { + player->sendCancelMessage(RETURNVALUE_CONTAINERISFULL); + return; + } + + std::shared_ptr tile = player->getTile(); + if (tile && tile->getItemCount() >= 20) { + player->sendCancelMessage(RETURNVALUE_CONTAINERISFULL); + return; + } + } + merchant->onPlayerBuyItem(player, it.id, count, amount, ignoreCap, inBackpacks); player->updateUIExhausted(); } From 1df6ce57d6ab19912dcb3b326e997be38b09926b Mon Sep 17 00:00:00 2001 From: Pedro Cruz Date: Fri, 24 May 2024 08:57:04 -0300 Subject: [PATCH 05/50] feat: vip groups (#2635) --- data-otservbr-global/migrations/45.lua | 55 +++- data-otservbr-global/migrations/46.lua | 3 + schema.sql | 57 +++- src/creatures/CMakeLists.txt | 1 + src/creatures/creatures_definitions.hpp | 33 ++- src/creatures/players/player.cpp | 105 ++------ src/creatures/players/player.hpp | 19 +- src/creatures/players/vip/player_vip.cpp | 247 ++++++++++++++++++ src/creatures/players/vip/player_vip.hpp | 74 ++++++ src/game/game.cpp | 16 +- src/game/game.hpp | 2 +- src/io/functions/iologindata_load_player.cpp | 30 ++- src/io/iologindata.cpp | 77 ++++-- src/io/iologindata.hpp | 7 + .../creatures/player/player_functions.cpp | 4 +- src/server/network/protocol/protocolgame.cpp | 84 +++++- src/server/network/protocol/protocolgame.hpp | 4 + vcproj/canary.vcxproj | 2 + 18 files changed, 658 insertions(+), 162 deletions(-) create mode 100644 data-otservbr-global/migrations/46.lua create mode 100644 src/creatures/players/vip/player_vip.cpp create mode 100644 src/creatures/players/vip/player_vip.hpp diff --git a/data-otservbr-global/migrations/45.lua b/data-otservbr-global/migrations/45.lua index 86a6d8ffec1..c606f18522e 100644 --- a/data-otservbr-global/migrations/45.lua +++ b/data-otservbr-global/migrations/45.lua @@ -1,3 +1,56 @@ function onUpdateDatabase() - return false -- true = There are others migrations file | false = this is the last migration file + logger.info("Updating database to version 46 (feat: vip groups)") + + db.query([[ + CREATE TABLE IF NOT EXISTS `account_vipgroups` ( + `id` tinyint(3) UNSIGNED NOT NULL, + `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose vip group entry it is', + `name` varchar(128) NOT NULL, + `customizable` BOOLEAN NOT NULL DEFAULT '1', + CONSTRAINT `account_vipgroups_pk` PRIMARY KEY (`id`, `account_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + ]]) + + db.query([[ + CREATE TRIGGER `oncreate_accounts` AFTER INSERT ON `accounts` FOR EACH ROW BEGIN + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (1, NEW.`id`, 'Enemies', 0); + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (2, NEW.`id`, 'Friends', 0); + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (3, NEW.`id`, 'Trading Partner', 0); + END; + ]]) + + db.query([[ + CREATE TABLE IF NOT EXISTS `account_vipgrouplist` ( + `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose viplist entry it is', + `player_id` int(11) NOT NULL COMMENT 'id of target player of viplist entry', + `vipgroup_id` tinyint(3) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', + INDEX `account_id` (`account_id`), + INDEX `player_id` (`player_id`), + INDEX `vipgroup_id` (`vipgroup_id`), + CONSTRAINT `account_vipgrouplist_unique` UNIQUE (`account_id`, `player_id`, `vipgroup_id`), + CONSTRAINT `account_vipgrouplist_player_fk` + FOREIGN KEY (`player_id`) REFERENCES `players` (`id`) + ON DELETE CASCADE, + CONSTRAINT `account_vipgrouplist_vipgroup_fk` + FOREIGN KEY (`vipgroup_id`, `account_id`) REFERENCES `account_vipgroups` (`id`, `account_id`) + ON DELETE CASCADE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + ]]) + + db.query([[ + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) + SELECT 1, id, 'Friends', 0 FROM `accounts`; + ]]) + + db.query([[ + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) + SELECT 2, id, 'Enemies', 0 FROM `accounts`; + ]]) + + db.query([[ + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) + SELECT 3, id, 'Trading Partners', 0 FROM `accounts`; + ]]) + + return true end diff --git a/data-otservbr-global/migrations/46.lua b/data-otservbr-global/migrations/46.lua new file mode 100644 index 00000000000..86a6d8ffec1 --- /dev/null +++ b/data-otservbr-global/migrations/46.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/schema.sql b/schema.sql index 624f434509e..7bbf6c86ac5 100644 --- a/schema.sql +++ b/schema.sql @@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `server_config` ( CONSTRAINT `server_config_pk` PRIMARY KEY (`config`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO `server_config` (`config`, `value`) VALUES ('db_version', '45'), ('motd_hash', ''), ('motd_num', '0'), ('players_record', '0'); +INSERT INTO `server_config` (`config`, `value`) VALUES ('db_version', '46'), ('motd_hash', ''), ('motd_num', '0'), ('players_record', '0'); -- Table structure `accounts` CREATE TABLE IF NOT EXISTS `accounts` ( @@ -215,6 +215,44 @@ CREATE TABLE IF NOT EXISTS `account_viplist` ( ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- Table structure `account_vipgroup` +CREATE TABLE IF NOT EXISTS `account_vipgroups` ( + `id` tinyint(3) UNSIGNED NOT NULL, + `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose vip group entry it is', + `name` varchar(128) NOT NULL, + `customizable` BOOLEAN NOT NULL DEFAULT '1', + CONSTRAINT `account_vipgroups_pk` PRIMARY KEY (`id`, `account_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- +-- Trigger +-- +DELIMITER // +CREATE TRIGGER `oncreate_accounts` AFTER INSERT ON `accounts` FOR EACH ROW BEGIN + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (1, NEW.`id`, 'Enemies', 0); + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (2, NEW.`id`, 'Friends', 0); + INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (3, NEW.`id`, 'Trading Partner', 0); +END +// +DELIMITER ; + +-- Table structure `account_vipgrouplist` +CREATE TABLE IF NOT EXISTS `account_vipgrouplist` ( + `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose viplist entry it is', + `player_id` int(11) NOT NULL COMMENT 'id of target player of viplist entry', + `vipgroup_id` tinyint(3) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', + INDEX `account_id` (`account_id`), + INDEX `player_id` (`player_id`), + INDEX `vipgroup_id` (`vipgroup_id`), + CONSTRAINT `account_vipgrouplist_unique` UNIQUE (`account_id`, `player_id`, `vipgroup_id`), + CONSTRAINT `account_vipgrouplist_player_fk` + FOREIGN KEY (`player_id`) REFERENCES `players` (`id`) + ON DELETE CASCADE, + CONSTRAINT `account_vipgrouplist_vipgroup_fk` + FOREIGN KEY (`vipgroup_id`, `account_id`) REFERENCES `account_vipgroups` (`id`, `account_id`) + ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + -- Table structure `boosted_boss` CREATE TABLE IF NOT EXISTS `boosted_boss` ( `boostname` TEXT, @@ -372,9 +410,9 @@ CREATE TABLE IF NOT EXISTS `guild_ranks` ( -- DELIMITER // CREATE TRIGGER `oncreate_guilds` AFTER INSERT ON `guilds` FOR EACH ROW BEGIN - INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('The Leader', 3, NEW.`id`); - INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('Vice-Leader', 2, NEW.`id`); - INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('Member', 1, NEW.`id`); + INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('The Leader', 3, NEW.`id`); + INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('Vice-Leader', 2, NEW.`id`); + INSERT INTO `guild_ranks` (`name`, `level`, `guild_id`) VALUES ('Member', 1, NEW.`id`); END // DELIMITER ; @@ -428,9 +466,8 @@ CREATE TABLE IF NOT EXISTS `houses` ( -- trigger -- DELIMITER // -CREATE TRIGGER `ondelete_players` BEFORE DELETE ON `players` - FOR EACH ROW BEGIN - UPDATE `houses` SET `owner` = 0 WHERE `owner` = OLD.`id`; +CREATE TRIGGER `ondelete_players` BEFORE DELETE ON `players` FOR EACH ROW BEGIN + UPDATE `houses` SET `owner` = 0 WHERE `owner` = OLD.`id`; END // DELIMITER ; @@ -815,3 +852,9 @@ INSERT INTO `players` (4, 'Paladin Sample', 1, 1, 8, 3, 185, 185, 4200, 113, 115, 95, 39, 129, 0, 90, 90, 0, 8, '', 470, 1, 10, 0, 10, 0, 10, 0, 10, 0), (5, 'Knight Sample', 1, 1, 8, 4, 185, 185, 4200, 113, 115, 95, 39, 129, 0, 90, 90, 0, 8, '', 470, 1, 10, 0, 10, 0, 10, 0, 10, 0), (6, 'GOD', 6, 1, 2, 0, 155, 155, 100, 113, 115, 95, 39, 75, 0, 60, 60, 0, 8, '', 410, 1, 10, 0, 10, 0, 10, 0, 10, 0); + +-- Create vip groups for GOD account +INSERT INTO `account_vipgroups` (`id`, `name`, `account_id`. `customizable`) VALUES +(1, 'Friends', 1, 0), +(2, 'Enemies', 1, 0), +(3, 'Trading Partners', 1, 0); diff --git a/src/creatures/CMakeLists.txt b/src/creatures/CMakeLists.txt index 6715281439f..af6ba129eac 100644 --- a/src/creatures/CMakeLists.txt +++ b/src/creatures/CMakeLists.txt @@ -27,4 +27,5 @@ target_sources(${PROJECT_NAME}_lib PRIVATE players/wheel/player_wheel.cpp players/wheel/wheel_gems.cpp players/vocations/vocation.cpp + players/vip/player_vip.cpp ) diff --git a/src/creatures/creatures_definitions.hpp b/src/creatures/creatures_definitions.hpp index 136f587a64a..33f62dbd2aa 100644 --- a/src/creatures/creatures_definitions.hpp +++ b/src/creatures/creatures_definitions.hpp @@ -714,11 +714,11 @@ enum ChannelEvent_t : uint8_t { CHANNELEVENT_EXCLUDE = 3, }; -enum VipStatus_t : uint8_t { - VIPSTATUS_OFFLINE = 0, - VIPSTATUS_ONLINE = 1, - VIPSTATUS_PENDING = 2, - VIPSTATUS_TRAINING = 3 +enum class VipStatus_t : uint8_t { + Offline = 0, + Online = 1, + Pending = 2, + Training = 3 }; enum Vocation_t : uint16_t { @@ -1397,18 +1397,29 @@ struct CreatureIcon { struct Position; struct VIPEntry { - VIPEntry(uint32_t initGuid, std::string initName, std::string initDescription, uint32_t initIcon, bool initNotify) : + VIPEntry(uint32_t initGuid, const std::string &initName, const std::string &initDescription, uint32_t initIcon, bool initNotify) : guid(initGuid), name(std::move(initName)), description(std::move(initDescription)), icon(initIcon), notify(initNotify) { } - uint32_t guid; - std::string name; - std::string description; - uint32_t icon; - bool notify; + uint32_t guid = 0; + std::string name = ""; + std::string description = ""; + uint32_t icon = 0; + bool notify = false; +}; + +struct VIPGroupEntry { + VIPGroupEntry(uint8_t initId, const std::string &initName, bool initCustomizable) : + id(initId), + name(std::move(initName)), + customizable(initCustomizable) { } + + uint8_t id = 0; + std::string name = ""; + bool customizable = false; }; struct Skill { diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 3182607ecba..553ca2e3b04 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -49,6 +49,7 @@ Player::Player(ProtocolGame_ptr p) : lastPong(lastPing), inbox(std::make_shared(ITEM_INBOX)), client(std::move(p)) { + m_playerVIP = std::make_unique(*this); m_wheelPlayer = std::make_unique(*this); m_playerAchievement = std::make_unique(*this); m_playerBadge = std::make_unique(*this); @@ -649,10 +650,10 @@ phmap::flat_hash_map Player::getBlessingNames() const void Player::setTraining(bool value) { for (const auto &[key, player] : g_game().getPlayers()) { if (!this->isInGhostMode() || player->isAccessPlayer()) { - player->notifyStatusChange(static_self_cast(), value ? VIPSTATUS_TRAINING : VIPSTATUS_ONLINE, false); + player->vip()->notifyStatusChange(static_self_cast(), value ? VipStatus_t::Training : VipStatus_t::Online, false); } } - this->statusVipList = VIPSTATUS_TRAINING; + vip()->setStatus(VipStatus_t::Training); setExerciseTraining(value); } @@ -2985,7 +2986,7 @@ void Player::despawn() { // show player as pending for (const auto &[key, player] : g_game().getPlayers()) { - player->notifyStatusChange(static_self_cast(), VIPSTATUS_PENDING, false); + player->vip()->notifyStatusChange(static_self_cast(), VipStatus_t::Pending, false); } setDead(true); @@ -3039,13 +3040,13 @@ void Player::removeList() { g_game().removePlayer(static_self_cast()); for (const auto &[key, player] : g_game().getPlayers()) { - player->notifyStatusChange(static_self_cast(), VIPSTATUS_OFFLINE); + player->vip()->notifyStatusChange(static_self_cast(), VipStatus_t::Offline); } } void Player::addList() { for (const auto &[key, player] : g_game().getPlayers()) { - player->notifyStatusChange(static_self_cast(), this->statusVipList); + player->vip()->notifyStatusChange(static_self_cast(), vip()->getStatus()); } g_game().addPlayer(static_self_cast()); @@ -3060,82 +3061,6 @@ void Player::removePlayer(bool displayEffect, bool forced /*= true*/) { } } -void Player::notifyStatusChange(std::shared_ptr loginPlayer, VipStatus_t status, bool message) const { - if (!client) { - return; - } - - if (!VIPList.contains(loginPlayer->guid)) { - return; - } - - client->sendUpdatedVIPStatus(loginPlayer->guid, status); - - if (message) { - if (status == VIPSTATUS_ONLINE) { - client->sendTextMessage(TextMessage(MESSAGE_FAILURE, loginPlayer->getName() + " has logged in.")); - } else if (status == VIPSTATUS_OFFLINE) { - client->sendTextMessage(TextMessage(MESSAGE_FAILURE, loginPlayer->getName() + " has logged out.")); - } - } -} - -bool Player::removeVIP(uint32_t vipGuid) { - if (!VIPList.erase(vipGuid)) { - return false; - } - - VIPList.erase(vipGuid); - if (account) { - IOLoginData::removeVIPEntry(account->getID(), vipGuid); - } - - return true; -} - -bool Player::addVIP(uint32_t vipGuid, const std::string &vipName, VipStatus_t status) { - if (VIPList.size() >= getMaxVIPEntries() || VIPList.size() == 200) { // max number of buddies is 200 in 9.53 - sendTextMessage(MESSAGE_FAILURE, "You cannot add more buddies."); - return false; - } - - if (!VIPList.insert(vipGuid).second) { - sendTextMessage(MESSAGE_FAILURE, "This player is already in your list."); - return false; - } - - if (account) { - IOLoginData::addVIPEntry(account->getID(), vipGuid, "", 0, false); - } - - if (client) { - client->sendVIP(vipGuid, vipName, "", 0, false, status); - } - - return true; -} - -bool Player::addVIPInternal(uint32_t vipGuid) { - if (VIPList.size() >= getMaxVIPEntries() || VIPList.size() == 200) { // max number of buddies is 200 in 9.53 - return false; - } - - return VIPList.insert(vipGuid).second; -} - -bool Player::editVIP(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify) const { - auto it = VIPList.find(vipGuid); - if (it == VIPList.end()) { - return false; // player is not in VIP - } - - if (account) { - IOLoginData::editVIPEntry(account->getID(), vipGuid, description, icon, notify); - } - - return true; -} - // close container and its child containers void Player::autoCloseContainers(std::shared_ptr container) { std::vector closeList; @@ -6293,15 +6218,6 @@ std::pair Player::getForgeSliversAndCores() const { return std::make_pair(sliverCount, coreCount); } -size_t Player::getMaxVIPEntries() const { - if (group->maxVipEntries != 0) { - return group->maxVipEntries; - } else if (isPremium()) { - return 100; - } - return 20; -} - size_t Player::getMaxDepotItems() const { if (group->maxDepotItems != 0) { return group->maxDepotItems; @@ -8079,6 +7995,15 @@ const std::unique_ptr &Player::title() const { return m_playerTitle; } +// VIP interface +std::unique_ptr &Player::vip() { + return m_playerVIP; +} + +const std::unique_ptr &Player::vip() const { + return m_playerVIP; +} + void Player::sendLootMessage(const std::string &message) const { auto party = getParty(); if (!party) { diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index f61e33a37ef..58bebfb9f2f 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -37,6 +37,7 @@ #include "enums/player_cyclopedia.hpp" #include "creatures/players/cyclopedia/player_badge.hpp" #include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/players/vip/player_vip.hpp" class House; class NetworkMessage; @@ -54,6 +55,7 @@ class PlayerWheel; class PlayerAchievement; class PlayerBadge; class PlayerTitle; +class PlayerVIP; class Spectators; class Account; @@ -61,6 +63,7 @@ struct ModalWindow; struct Achievement; struct Badge; struct Title; +struct VIPGroup; struct ForgeHistory { ForgeAction_t actionType = ForgeAction_t::FUSION; @@ -830,13 +833,6 @@ class Player final : public Creature, public Cylinder, public Bankable { return shopOwner; } - // V.I.P. functions - void notifyStatusChange(std::shared_ptr player, VipStatus_t status, bool message = true) const; - bool removeVIP(uint32_t vipGuid); - bool addVIP(uint32_t vipGuid, const std::string &vipName, VipStatus_t status); - bool addVIPInternal(uint32_t vipGuid); - bool editVIP(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify) const; - // follow functions bool setFollowCreature(std::shared_ptr creature) override; void goToFollowCreature() override; @@ -1050,7 +1046,6 @@ class Player final : public Creature, public Cylinder, public Bankable { bool hasKilled(std::shared_ptr player) const; - size_t getMaxVIPEntries() const; size_t getMaxDepotItems() const; // tile @@ -2630,6 +2625,10 @@ class Player final : public Creature, public Cylinder, public Bankable { std::unique_ptr &title(); const std::unique_ptr &title() const; + // Player vip interface + std::unique_ptr &vip(); + const std::unique_ptr &vip() const; + void sendLootMessage(const std::string &message) const; std::shared_ptr getLootPouch(); @@ -2716,7 +2715,6 @@ class Player final : public Creature, public Cylinder, public Bankable { void addBosstiaryKill(const std::shared_ptr &mType); phmap::flat_hash_set attackedSet; - phmap::flat_hash_set VIPList; std::map openContainers; std::map> depotLockerMap; @@ -2911,7 +2909,6 @@ class Player final : public Creature, public Cylinder, public Bankable { FightMode_t fightMode = FIGHTMODE_ATTACK; Faction_t faction = FACTION_PLAYER; QuickLootFilter_t quickLootFilter; - VipStatus_t statusVipList = VIPSTATUS_ONLINE; PlayerPronoun_t pronoun = PLAYERPRONOUN_THEY; bool chaseMode = false; @@ -3026,11 +3023,13 @@ class Player final : public Creature, public Cylinder, public Bankable { friend class PlayerAchievement; friend class PlayerBadge; friend class PlayerTitle; + friend class PlayerVIP; std::unique_ptr m_wheelPlayer; std::unique_ptr m_playerAchievement; std::unique_ptr m_playerBadge; std::unique_ptr m_playerTitle; + std::unique_ptr m_playerVIP; std::mutex quickLootMutex; diff --git a/src/creatures/players/vip/player_vip.cpp b/src/creatures/players/vip/player_vip.cpp new file mode 100644 index 00000000000..b4b1642ec69 --- /dev/null +++ b/src/creatures/players/vip/player_vip.cpp @@ -0,0 +1,247 @@ +/** + * 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/ + */ + +#include "pch.hpp" + +#include "creatures/players/vip/player_vip.hpp" + +#include "io/iologindata.hpp" + +#include "game/game.hpp" +#include "creatures/players/player.hpp" + +const uint8_t PlayerVIP::firstID = 1; +const uint8_t PlayerVIP::lastID = 8; + +PlayerVIP::PlayerVIP(Player &player) : + m_player(player) { } + +size_t PlayerVIP::getMaxEntries() const { + if (m_player.group && m_player.group->maxVipEntries != 0) { + return m_player.group->maxVipEntries; + } else if (m_player.isPremium()) { + return 100; + } + return 20; +} + +uint8_t PlayerVIP::getMaxGroupEntries() const { + if (m_player.isPremium()) { + return 8; // max number of groups is 8 (5 custom and 3 default) + } + return 0; +} + +void PlayerVIP::notifyStatusChange(std::shared_ptr loginPlayer, VipStatus_t status, bool message) const { + if (!m_player.client) { + return; + } + + if (!vipGuids.contains(loginPlayer->getGUID())) { + return; + } + + m_player.client->sendUpdatedVIPStatus(loginPlayer->getGUID(), status); + + if (message) { + if (status == VipStatus_t::Online) { + m_player.sendTextMessage(TextMessage(MESSAGE_FAILURE, fmt::format("{} has logged in.", loginPlayer->getName()))); + } else if (status == VipStatus_t::Offline) { + m_player.sendTextMessage(TextMessage(MESSAGE_FAILURE, fmt::format("{} has logged out.", loginPlayer->getName()))); + } + } +} + +bool PlayerVIP::remove(uint32_t vipGuid) { + if (!vipGuids.erase(vipGuid)) { + return false; + } + + vipGuids.erase(vipGuid); + if (m_player.account) { + IOLoginData::removeVIPEntry(m_player.account->getID(), vipGuid); + } + + return true; +} + +bool PlayerVIP::add(uint32_t vipGuid, const std::string &vipName, VipStatus_t status) { + if (vipGuids.size() >= getMaxEntries() || vipGuids.size() == 200) { // max number of buddies is 200 in 9.53 + m_player.sendTextMessage(MESSAGE_FAILURE, "You cannot add more buddies."); + return false; + } + + if (!vipGuids.insert(vipGuid).second) { + m_player.sendTextMessage(MESSAGE_FAILURE, "This player is already in your list."); + return false; + } + + if (m_player.account) { + IOLoginData::addVIPEntry(m_player.account->getID(), vipGuid, "", 0, false); + } + + if (m_player.client) { + m_player.client->sendVIP(vipGuid, vipName, "", 0, false, status); + } + + return true; +} + +bool PlayerVIP::addInternal(uint32_t vipGuid) { + if (vipGuids.size() >= getMaxEntries() || vipGuids.size() == 200) { // max number of buddies is 200 in 9.53 + return false; + } + + return vipGuids.insert(vipGuid).second; +} + +bool PlayerVIP::edit(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify, std::vector groupsId) const { + const auto it = vipGuids.find(vipGuid); + if (it == vipGuids.end()) { + return false; // player is not in VIP + } + + if (m_player.account) { + IOLoginData::editVIPEntry(m_player.account->getID(), vipGuid, description, icon, notify); + } + + IOLoginData::removeGuidVIPGroupEntry(m_player.account->getID(), vipGuid); + + for (const auto groupId : groupsId) { + const auto &group = getGroupByID(groupId); + if (group) { + group->vipGroupGuids.insert(vipGuid); + IOLoginData::addGuidVIPGroupEntry(group->id, m_player.account->getID(), vipGuid); + } + } + + return true; +} + +std::shared_ptr PlayerVIP::getGroupByID(uint8_t groupId) const { + auto it = std::find_if(vipGroups.begin(), vipGroups.end(), [groupId](const std::shared_ptr vipGroup) { + return vipGroup->id == groupId; + }); + + return it != vipGroups.end() ? *it : nullptr; +} + +std::shared_ptr PlayerVIP::getGroupByName(const std::string &name) const { + const auto groupName = name.c_str(); + auto it = std::find_if(vipGroups.begin(), vipGroups.end(), [groupName](const std::shared_ptr vipGroup) { + return strcmp(groupName, vipGroup->name.c_str()) == 0; + }); + + return it != vipGroups.end() ? *it : nullptr; +} + +void PlayerVIP::addGroupInternal(uint8_t groupId, const std::string &name, bool customizable) { + if (getGroupByName(name) != nullptr) { + g_logger().warn("{} - Group name already exists.", __FUNCTION__); + return; + } + + const auto freeId = getFreeId(); + if (freeId == 0) { + g_logger().warn("{} - No id available.", __FUNCTION__); + return; + } + + vipGroups.emplace_back(std::make_shared(freeId, name, customizable)); +} + +void PlayerVIP::removeGroup(uint8_t groupId) { + auto it = std::find_if(vipGroups.begin(), vipGroups.end(), [groupId](const std::shared_ptr vipGroup) { + return vipGroup->id == groupId; + }); + + if (it == vipGroups.end()) { + return; + } + + vipGroups.erase(it); + + if (m_player.account) { + IOLoginData::removeVIPGroupEntry(groupId, m_player.account->getID()); + } + + if (m_player.client) { + m_player.client->sendVIPGroups(); + } +} + +void PlayerVIP::addGroup(const std::string &name, bool customizable /*= true */) { + if (getGroupByName(name) != nullptr) { + m_player.sendCancelMessage("A group with this name already exists. Please choose another name."); + return; + } + + const auto freeId = getFreeId(); + if (freeId == 0) { + g_logger().warn("{} - No id available.", __FUNCTION__); + return; + } + + std::shared_ptr vipGroup = std::make_shared(freeId, name, customizable); + vipGroups.emplace_back(vipGroup); + + if (m_player.account) { + IOLoginData::addVIPGroupEntry(vipGroup->id, m_player.account->getID(), vipGroup->name, vipGroup->customizable); + } + + if (m_player.client) { + m_player.client->sendVIPGroups(); + } +} + +void PlayerVIP::editGroup(uint8_t groupId, const std::string &newName, bool customizable /*= true*/) { + if (getGroupByName(newName) != nullptr) { + m_player.sendCancelMessage("A group with this name already exists. Please choose another name."); + return; + } + + const auto &vipGroup = getGroupByID(groupId); + vipGroup->name = newName; + vipGroup->customizable = customizable; + + if (m_player.account) { + IOLoginData::editVIPGroupEntry(vipGroup->id, m_player.account->getID(), vipGroup->name, vipGroup->customizable); + } + + if (m_player.client) { + m_player.client->sendVIPGroups(); + } +} + +uint8_t PlayerVIP::getFreeId() const { + for (uint8_t i = firstID; i <= lastID; ++i) { + if (getGroupByID(i) == nullptr) { + return i; + } + } + + return 0; +} + +const std::vector PlayerVIP::getGroupsIdGuidBelongs(uint32_t guid) { + std::vector guidBelongs; + for (const auto &vipGroup : vipGroups) { + if (vipGroup->vipGroupGuids.contains(guid)) { + guidBelongs.emplace_back(vipGroup->id); + } + } + return guidBelongs; +} + +void PlayerVIP::addGuidToGroupInternal(uint8_t groupId, uint32_t guid) { + const auto &group = getGroupByID(groupId); + if (group) { + group->vipGroupGuids.insert(guid); + } +} diff --git a/src/creatures/players/vip/player_vip.hpp b/src/creatures/players/vip/player_vip.hpp new file mode 100644 index 00000000000..e9aeaf85326 --- /dev/null +++ b/src/creatures/players/vip/player_vip.hpp @@ -0,0 +1,74 @@ +/** + * 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 "creatures/creatures_definitions.hpp" + +class Player; + +struct VIPGroup { + uint8_t id = 0; + std::string name = ""; + bool customizable = false; + phmap::flat_hash_set vipGroupGuids; + + VIPGroup() = default; + VIPGroup(uint8_t id, const std::string &name, bool customizable) : + id(id), name(std::move(name)), customizable(customizable) { } +}; +class PlayerVIP { + +public: + explicit PlayerVIP(Player &player); + + static const uint8_t firstID; + static const uint8_t lastID; + + size_t getMaxEntries() const; + uint8_t getMaxGroupEntries() const; + + VipStatus_t getStatus() const { + return status; + } + void setStatus(VipStatus_t newStatus) { + status = newStatus; + } + + void notifyStatusChange(std::shared_ptr loginPlayer, VipStatus_t status, bool message = true) const; + bool remove(uint32_t vipGuid); + bool add(uint32_t vipGuid, const std::string &vipName, VipStatus_t status); + bool addInternal(uint32_t vipGuid); + bool edit(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify, std::vector groupsId) const; + + // VIP Group + std::shared_ptr getGroupByID(uint8_t groupId) const; + std::shared_ptr getGroupByName(const std::string &name) const; + + void addGroupInternal(uint8_t groupId, const std::string &name, bool customizable); + void removeGroup(uint8_t groupId); + void addGroup(const std::string &name, bool customizable = true); + void editGroup(uint8_t groupId, const std::string &newName, bool customizable = true); + + void addGuidToGroupInternal(uint8_t groupId, uint32_t guid); + + uint8_t getFreeId() const; + const std::vector getGroupsIdGuidBelongs(uint32_t guid); + + [[nodiscard]] const std::vector> &getGroups() const { + return vipGroups; + } + +private: + Player &m_player; + + VipStatus_t status = VipStatus_t::Online; + std::vector> vipGroups; + phmap::flat_hash_set vipGuids; +}; diff --git a/src/game/game.cpp b/src/game/game.cpp index afc58e75198..621e3593816 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -5773,21 +5773,21 @@ void Game::playerRequestAddVip(uint32_t playerId, const std::string &name) { } if (specialVip && !player->hasFlag(PlayerFlags_t::SpecialVIP)) { - player->sendTextMessage(MESSAGE_FAILURE, "You can not add this player->"); + player->sendTextMessage(MESSAGE_FAILURE, "You can not add this player"); return; } - player->addVIP(guid, formattedName, VIPSTATUS_OFFLINE); + player->vip()->add(guid, formattedName, VipStatus_t::Offline); } else { if (vipPlayer->hasFlag(PlayerFlags_t::SpecialVIP) && !player->hasFlag(PlayerFlags_t::SpecialVIP)) { - player->sendTextMessage(MESSAGE_FAILURE, "You can not add this player->"); + player->sendTextMessage(MESSAGE_FAILURE, "You can not add this player"); return; } if (!vipPlayer->isInGhostMode() || player->isAccessPlayer()) { - player->addVIP(vipPlayer->getGUID(), vipPlayer->getName(), vipPlayer->statusVipList); + player->vip()->add(vipPlayer->getGUID(), vipPlayer->getName(), vipPlayer->vip()->getStatus()); } else { - player->addVIP(vipPlayer->getGUID(), vipPlayer->getName(), VIPSTATUS_OFFLINE); + player->vip()->add(vipPlayer->getGUID(), vipPlayer->getName(), VipStatus_t::Offline); } } } @@ -5798,16 +5798,16 @@ void Game::playerRequestRemoveVip(uint32_t playerId, uint32_t guid) { return; } - player->removeVIP(guid); + player->vip()->remove(guid); } -void Game::playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::string &description, uint32_t icon, bool notify) { +void Game::playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::string &description, uint32_t icon, bool notify, std::vector vipGroupsId) { std::shared_ptr player = getPlayerByID(playerId); if (!player) { return; } - player->editVIP(guid, description, icon, notify); + player->vip()->edit(guid, description, icon, notify, vipGroupsId); } void Game::playerApplyImbuement(uint32_t playerId, uint16_t imbuementid, uint8_t slot, bool protectionCharm) { diff --git a/src/game/game.hpp b/src/game/game.hpp index 0e7b5fc147f..3a199254259 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -393,7 +393,7 @@ class Game { void playerRequestAddVip(uint32_t playerId, const std::string &name); void playerRequestRemoveVip(uint32_t playerId, uint32_t guid); - void playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::string &description, uint32_t icon, bool notify); + void playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::string &description, uint32_t icon, bool notify, std::vector vipGroupsId); void playerApplyImbuement(uint32_t playerId, uint16_t imbuementid, uint8_t slot, bool protectionCharm); void playerClearImbuement(uint32_t playerid, uint8_t slot); void playerCloseImbuementWindow(uint32_t playerid); diff --git a/src/io/functions/iologindata_load_player.cpp b/src/io/functions/iologindata_load_player.cpp index bcbfc531468..6273f8fefbb 100644 --- a/src/io/functions/iologindata_load_player.cpp +++ b/src/io/functions/iologindata_load_player.cpp @@ -678,12 +678,34 @@ void IOLoginDataLoad::loadPlayerVip(std::shared_ptr player, DBResult_ptr return; } + uint32_t accountId = player->getAccountId(); + Database &db = Database::getInstance(); - std::ostringstream query; - query << "SELECT `player_id` FROM `account_viplist` WHERE `account_id` = " << player->getAccountId(); - if ((result = db.storeQuery(query.str()))) { + std::string query = fmt::format("SELECT `player_id` FROM `account_viplist` WHERE `account_id` = {}", accountId); + if ((result = db.storeQuery(query))) { + do { + player->vip()->addInternal(result->getNumber("player_id")); + } while (result->next()); + } + + query = fmt::format("SELECT `id`, `name`, `customizable` FROM `account_vipgroups` WHERE `account_id` = {}", accountId); + if ((result = db.storeQuery(query))) { + do { + player->vip()->addGroupInternal( + result->getNumber("id"), + result->getString("name"), + result->getNumber("customizable") == 0 ? false : true + ); + } while (result->next()); + } + + query = fmt::format("SELECT `player_id`, `vipgroup_id` FROM `account_vipgrouplist` WHERE `account_id` = {}", accountId); + if ((result = db.storeQuery(query))) { do { - player->addVIPInternal(result->getNumber("player_id")); + player->vip()->addGuidToGroupInternal( + result->getNumber("vipgroup_id"), + result->getNumber("player_id") + ); } while (result->next()); } } diff --git a/src/io/iologindata.cpp b/src/io/iologindata.cpp index 46426451ddc..122ade42c72 100644 --- a/src/io/iologindata.cpp +++ b/src/io/iologindata.cpp @@ -352,10 +352,9 @@ bool IOLoginData::hasBiddedOnHouse(uint32_t guid) { std::forward_list IOLoginData::getVIPEntries(uint32_t accountId) { std::forward_list entries; - std::ostringstream query; - query << "SELECT `player_id`, (SELECT `name` FROM `players` WHERE `id` = `player_id`) AS `name`, `description`, `icon`, `notify` FROM `account_viplist` WHERE `account_id` = " << accountId; + std::string query = fmt::format("SELECT `player_id`, (SELECT `name` FROM `players` WHERE `id` = `player_id`) AS `name`, `description`, `icon`, `notify` FROM `account_viplist` WHERE `account_id` = {}", accountId); - DBResult_ptr result = Database::getInstance().storeQuery(query.str()); + DBResult_ptr result = Database::getInstance().storeQuery(query); if (result) { do { entries.emplace_front( @@ -371,27 +370,69 @@ std::forward_list IOLoginData::getVIPEntries(uint32_t accountId) { } void IOLoginData::addVIPEntry(uint32_t accountId, uint32_t guid, const std::string &description, uint32_t icon, bool notify) { - Database &db = Database::getInstance(); - - std::ostringstream query; - query << "INSERT INTO `account_viplist` (`account_id`, `player_id`, `description`, `icon`, `notify`) VALUES (" << accountId << ',' << guid << ',' << db.escapeString(description) << ',' << icon << ',' << notify << ')'; - if (!db.executeQuery(query.str())) { - g_logger().error("Failed to add VIP entry for account %u. QUERY: %s", accountId, query.str().c_str()); + std::string query = fmt::format("INSERT INTO `account_viplist` (`account_id`, `player_id`, `description`, `icon`, `notify`) VALUES ({}, {}, {}, {}, {})", accountId, guid, g_database().escapeString(description), icon, notify); + if (!g_database().executeQuery(query)) { + g_logger().error("Failed to add VIP entry for account {}. QUERY: {}", accountId, query.c_str()); } } void IOLoginData::editVIPEntry(uint32_t accountId, uint32_t guid, const std::string &description, uint32_t icon, bool notify) { - Database &db = Database::getInstance(); - - std::ostringstream query; - query << "UPDATE `account_viplist` SET `description` = " << db.escapeString(description) << ", `icon` = " << icon << ", `notify` = " << notify << " WHERE `account_id` = " << accountId << " AND `player_id` = " << guid; - if (!db.executeQuery(query.str())) { - g_logger().error("Failed to edit VIP entry for account %u. QUERY: %s", accountId, query.str().c_str()); + std::string query = fmt::format("UPDATE `account_viplist` SET `description` = {}, `icon` = {}, `notify` = {} WHERE `account_id` = {} AND `player_id` = {}", g_database().escapeString(description), icon, notify, accountId, guid); + if (!g_database().executeQuery(query)) { + g_logger().error("Failed to edit VIP entry for account {}. QUERY: {}", accountId, query.c_str()); } } void IOLoginData::removeVIPEntry(uint32_t accountId, uint32_t guid) { - std::ostringstream query; - query << "DELETE FROM `account_viplist` WHERE `account_id` = " << accountId << " AND `player_id` = " << guid; - Database::getInstance().executeQuery(query.str()); + std::string query = fmt::format("DELETE FROM `account_viplist` WHERE `account_id` = {} AND `player_id` = {}", accountId, guid); + g_database().executeQuery(query); +} + +std::forward_list IOLoginData::getVIPGroupEntries(uint32_t accountId, uint32_t guid) { + std::forward_list entries; + + std::string query = fmt::format("SELECT `id`, `name`, `customizable` FROM `account_vipgroups` WHERE `account_id` = {}", accountId); + + DBResult_ptr result = g_database().storeQuery(query); + if (result) { + do { + entries.emplace_front( + result->getNumber("id"), + result->getString("name"), + result->getNumber("customizable") == 0 ? false : true + ); + } while (result->next()); + } + return entries; +} + +void IOLoginData::addVIPGroupEntry(uint8_t groupId, uint32_t accountId, const std::string &groupName, bool customizable) { + std::string query = fmt::format("INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES ({}, {}, {}, {})", groupId, accountId, g_database().escapeString(groupName), customizable); + if (!g_database().executeQuery(query)) { + g_logger().error("Failed to add VIP Group entry for account {} and group {}. QUERY: {}", accountId, groupId, query.c_str()); + } +} + +void IOLoginData::editVIPGroupEntry(uint8_t groupId, uint32_t accountId, const std::string &groupName, bool customizable) { + std::string query = fmt::format("UPDATE `account_vipgroups` SET `name` = {}, `customizable` = {} WHERE `id` = {} AND `account_id` = {}", g_database().escapeString(groupName), customizable, groupId, accountId); + if (!g_database().executeQuery(query)) { + g_logger().error("Failed to update VIP Group entry for account {} and group {}. QUERY: {}", accountId, groupId, query.c_str()); + } +} + +void IOLoginData::removeVIPGroupEntry(uint8_t groupId, uint32_t accountId) { + std::string query = fmt::format("DELETE FROM `account_vipgroups` WHERE `id` = {} AND `account_id` = {}", groupId, accountId); + g_database().executeQuery(query); +} + +void IOLoginData::addGuidVIPGroupEntry(uint8_t groupId, uint32_t accountId, uint32_t guid) { + std::string query = fmt::format("INSERT INTO `account_vipgrouplist` (`account_id`, `player_id`, `vipgroup_id`) VALUES ({}, {}, {})", accountId, guid, groupId); + if (!g_database().executeQuery(query)) { + g_logger().error("Failed to add guid VIP Group entry for account {}, player {} and group {}. QUERY: {}", accountId, guid, groupId, query.c_str()); + } +} + +void IOLoginData::removeGuidVIPGroupEntry(uint32_t accountId, uint32_t guid) { + std::string query = fmt::format("DELETE FROM `account_vipgrouplist` WHERE `account_id` = {} AND `player_id` = {}", accountId, guid); + g_database().executeQuery(query); } diff --git a/src/io/iologindata.hpp b/src/io/iologindata.hpp index b9fcc124ea0..be414739837 100644 --- a/src/io/iologindata.hpp +++ b/src/io/iologindata.hpp @@ -36,6 +36,13 @@ class IOLoginData { static void editVIPEntry(uint32_t accountId, uint32_t guid, const std::string &description, uint32_t icon, bool notify); static void removeVIPEntry(uint32_t accountId, uint32_t guid); + static std::forward_list getVIPGroupEntries(uint32_t accountId, uint32_t guid); + static void addVIPGroupEntry(uint8_t groupId, uint32_t accountId, const std::string &groupName, bool customizable); + static void editVIPGroupEntry(uint8_t groupId, uint32_t accountId, const std::string &groupName, bool customizable); + static void removeVIPGroupEntry(uint8_t groupId, uint32_t accountId); + static void addGuidVIPGroupEntry(uint8_t groupId, uint32_t accountId, uint32_t guid); + static void removeGuidVIPGroupEntry(uint32_t accountId, uint32_t guid); + private: static bool savePlayerGuard(std::shared_ptr player); }; diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp index 413f1bd3f47..5f14db6ea99 100644 --- a/src/lua/functions/creatures/player/player_functions.cpp +++ b/src/lua/functions/creatures/player/player_functions.cpp @@ -3024,14 +3024,14 @@ int PlayerFunctions::luaPlayerSetGhostMode(lua_State* L) { if (player->isInGhostMode()) { for (const auto &it : g_game().getPlayers()) { if (!it.second->isAccessPlayer()) { - it.second->notifyStatusChange(player, VIPSTATUS_OFFLINE); + it.second->vip()->notifyStatusChange(player, VipStatus_t::Offline); } } IOLoginData::updateOnlineStatus(player->getGUID(), false); } else { for (const auto &it : g_game().getPlayers()) { if (!it.second->isAccessPlayer()) { - it.second->notifyStatusChange(player, player->statusVipList); + it.second->vip()->notifyStatusChange(player, player->vip()->getStatus()); } } IOLoginData::updateOnlineStatus(player->getGUID(), true); diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index e16f015eb49..751da531273 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -1276,6 +1276,9 @@ void ProtocolGame::parsePacketFromDispatcher(NetworkMessage msg, uint8_t recvbyt case 0xDE: parseEditVip(msg); break; + case 0xDF: + parseVipGroupActions(msg); + break; case 0xE1: parseBestiarysendRaces(); break; @@ -1972,11 +1975,43 @@ void ProtocolGame::parseRemoveVip(NetworkMessage &msg) { } void ProtocolGame::parseEditVip(NetworkMessage &msg) { + std::vector vipGroupsId; uint32_t guid = msg.get(); const std::string description = msg.getString(); uint32_t icon = std::min(10, msg.get()); // 10 is max icon in 9.63 bool notify = msg.getByte() != 0; - g_game().playerRequestEditVip(player->getID(), guid, description, icon, notify); + uint8_t groupsAmount = msg.getByte(); + for (uint8_t i = 0; i < groupsAmount; ++i) { + uint8_t groupId = msg.getByte(); + vipGroupsId.emplace_back(groupId); + } + g_game().playerRequestEditVip(player->getID(), guid, description, icon, notify, vipGroupsId); +} + +void ProtocolGame::parseVipGroupActions(NetworkMessage &msg) { + uint8_t action = msg.getByte(); + + switch (action) { + case 0x01: { + const std::string groupName = msg.getString(); + player->vip()->addGroup(groupName); + break; + } + case 0x02: { + const uint8_t groupId = msg.getByte(); + const std::string newGroupName = msg.getString(); + player->vip()->editGroup(groupId, newGroupName); + break; + } + case 0x03: { + const uint8_t groupId = msg.getByte(); + player->vip()->removeGroup(groupId); + break; + } + default: { + break; + } + } } void ProtocolGame::parseRotateItem(NetworkMessage &msg) { @@ -6535,6 +6570,8 @@ void ProtocolGame::sendAddCreature(std::shared_ptr creature, const Pos // player light level sendCreatureLight(creature); + sendVIPGroups(); + const std::forward_list &vipEntries = IOLoginData::getVIPEntries(player->getAccountId()); if (player->isAccessPlayer()) { @@ -6543,9 +6580,9 @@ void ProtocolGame::sendAddCreature(std::shared_ptr creature, const Pos std::shared_ptr vipPlayer = g_game().getPlayerByGUID(entry.guid); if (!vipPlayer) { - vipStatus = VIPSTATUS_OFFLINE; + vipStatus = VipStatus_t::Offline; } else { - vipStatus = vipPlayer->statusVipList; + vipStatus = vipPlayer->vip()->getStatus(); } sendVIP(entry.guid, entry.name, entry.description, entry.icon, entry.notify, vipStatus); @@ -6556,9 +6593,9 @@ void ProtocolGame::sendAddCreature(std::shared_ptr creature, const Pos std::shared_ptr vipPlayer = g_game().getPlayerByGUID(entry.guid); if (!vipPlayer || vipPlayer->isInGhostMode()) { - vipStatus = VIPSTATUS_OFFLINE; + vipStatus = VipStatus_t::Offline; } else { - vipStatus = vipPlayer->statusVipList; + vipStatus = vipPlayer->vip()->getStatus(); } sendVIP(entry.guid, entry.name, entry.description, entry.icon, entry.notify, vipStatus); @@ -7085,19 +7122,19 @@ void ProtocolGame::sendPodiumWindow(std::shared_ptr podium, const Position } void ProtocolGame::sendUpdatedVIPStatus(uint32_t guid, VipStatus_t newStatus) { - if (oldProtocol && newStatus == VIPSTATUS_TRAINING) { + if (oldProtocol && newStatus == VipStatus_t::Training) { return; } NetworkMessage msg; msg.addByte(0xD3); msg.add(guid); - msg.addByte(newStatus); + msg.addByte(enumToValue(newStatus)); writeToOutputBuffer(msg); } void ProtocolGame::sendVIP(uint32_t guid, const std::string &name, const std::string &description, uint32_t icon, bool notify, VipStatus_t status) { - if (oldProtocol && status == VIPSTATUS_TRAINING) { + if (oldProtocol && status == VipStatus_t::Training) { return; } @@ -7108,10 +7145,37 @@ void ProtocolGame::sendVIP(uint32_t guid, const std::string &name, const std::st msg.addString(description, "ProtocolGame::sendVIP - description"); msg.add(std::min(10, icon)); msg.addByte(notify ? 0x01 : 0x00); - msg.addByte(status); + msg.addByte(enumToValue(status)); + + const auto &vipGuidGroups = player->vip()->getGroupsIdGuidBelongs(guid); + if (!oldProtocol) { - msg.addByte(0x00); // vipGroups + msg.addByte(vipGuidGroups.size()); // vipGroups + for (const auto &vipGroupID : vipGuidGroups) { + msg.addByte(vipGroupID); + } + } + + writeToOutputBuffer(msg); +} + +void ProtocolGame::sendVIPGroups() { + if (oldProtocol) { + return; + } + + const auto &vipGroups = player->vip()->getGroups(); + + NetworkMessage msg; + msg.addByte(0xD4); + msg.addByte(vipGroups.size()); // vipGroups.size() + for (const auto &vipGroup : vipGroups) { + msg.addByte(vipGroup->id); + msg.addString(vipGroup->name, "ProtocolGame::sendVIP - vipGroup.name"); + msg.addByte(vipGroup->customizable ? 0x01 : 0x00); // 0x00 = not Customizable, 0x01 = Customizable } + msg.addByte(player->vip()->getMaxGroupEntries() - vipGroups.size()); // max vip groups + writeToOutputBuffer(msg); } diff --git a/src/server/network/protocol/protocolgame.hpp b/src/server/network/protocol/protocolgame.hpp index 16105ee0b8b..0386093cfc4 100644 --- a/src/server/network/protocol/protocolgame.hpp +++ b/src/server/network/protocol/protocolgame.hpp @@ -18,6 +18,7 @@ class NetworkMessage; class Player; +class VIPGroup; class Game; class House; class Container; @@ -213,6 +214,7 @@ class ProtocolGame final : public Protocol { void parseAddVip(NetworkMessage &msg); void parseRemoveVip(NetworkMessage &msg); void parseEditVip(NetworkMessage &msg); + void parseVipGroupActions(NetworkMessage &msg); void parseRotateItem(NetworkMessage &msg); void parseConfigureShowOffSocket(NetworkMessage &msg); @@ -360,6 +362,7 @@ class ProtocolGame final : public Protocol { void sendUpdatedVIPStatus(uint32_t guid, VipStatus_t newStatus); void sendVIP(uint32_t guid, const std::string &name, const std::string &description, uint32_t icon, bool notify, VipStatus_t status); + void sendVIPGroups(); void sendPendingStateEntered(); void sendEnterWorld(); @@ -477,6 +480,7 @@ class ProtocolGame final : public Protocol { friend class Player; friend class PlayerWheel; + friend class PlayerVIP; std::unordered_set knownCreatureSet; std::shared_ptr player = nullptr; diff --git a/vcproj/canary.vcxproj b/vcproj/canary.vcxproj index b3e4eaffb42..4cb91d1cb94 100644 --- a/vcproj/canary.vcxproj +++ b/vcproj/canary.vcxproj @@ -47,6 +47,7 @@ + @@ -261,6 +262,7 @@ + From 5f88c6d635018debc3fbc6168782d504aeec19cb Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Fri, 24 May 2024 08:58:51 -0300 Subject: [PATCH 06/50] fix: onDeEquip properly handled at logout/death (#2625) --- src/creatures/players/player.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 553ca2e3b04..4109eb77472 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -1862,6 +1862,13 @@ void Player::onRemoveCreature(std::shared_ptr creature, bool isLogout) Creature::onRemoveCreature(creature, isLogout); if (auto player = getPlayer(); player == creature) { + for (uint8_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { + const auto item = inventory[slot]; + if (item) { + g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast(slot)); + } + } + if (isLogout) { if (m_party) { m_party->leaveParty(player); From dabbeada591b89445c73d4e8a524fff640f8a7c9 Mon Sep 17 00:00:00 2001 From: Pedro Cruz Date: Fri, 24 May 2024 22:14:53 -0300 Subject: [PATCH 07/50] fix: vip groups schema (#2651) Fixes the schema of vip groups. --- schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema.sql b/schema.sql index 7bbf6c86ac5..bf37d1c2f37 100644 --- a/schema.sql +++ b/schema.sql @@ -854,7 +854,7 @@ INSERT INTO `players` (6, 'GOD', 6, 1, 2, 0, 155, 155, 100, 113, 115, 95, 39, 75, 0, 60, 60, 0, 8, '', 410, 1, 10, 0, 10, 0, 10, 0, 10, 0); -- Create vip groups for GOD account -INSERT INTO `account_vipgroups` (`id`, `name`, `account_id`. `customizable`) VALUES +INSERT INTO `account_vipgroups` (`id`, `name`, `account_id`, `customizable`) VALUES (1, 'Friends', 1, 0), (2, 'Enemies', 1, 0), (3, 'Trading Partners', 1, 0); From b9a2336247cc246ef3ddc8baea719e108041ad83 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Tue, 28 May 2024 20:27:19 -0300 Subject: [PATCH 08/50] perf: change ThreadPool by ASIO to barak shoshany (#2660) Replaces the existing ThreadPool with ASIO to enhance server performance, implementing a strategy inspired by Barak Shoshany's methodology. The goal is to optimize asynchronous task execution and thread management for improved scalability and efficiency https://github.com/bshoshany/thread-pool --------- Co-authored-by: GitHub Actions Co-authored-by: Eduardo Dantas --- CMakeLists.txt | 4 +- src/database/databasetasks.cpp | 4 +- src/game/scheduling/dispatcher.cpp | 6 +- src/game/scheduling/dispatcher.hpp | 2 +- src/game/scheduling/save_manager.cpp | 4 +- src/lib/thread/README.md | 2 +- src/lib/thread/thread_pool.cpp | 77 ++++---------------------- src/lib/thread/thread_pool.hpp | 19 +++---- src/server/network/webhook/webhook.cpp | 2 +- vcpkg.json | 1 + 10 files changed, 30 insertions(+), 91 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52c35a471f7..07701451aad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR) # VCPKG # cmake -DCMAKE_TOOLCHAIN_FILE=/opt/workspace/vcpkg/scripts/buildsystems/vcpkg.cmake .. # Needed libs is in file vcpkg.json -# Windows required libs: .\vcpkg install --triplet x64-windows asio pugixml spdlog curl protobuf parallel-hashmap magic-enum mio luajit libmariadb mpir abseil +# Windows required libs: .\vcpkg install --triplet x64-windows asio pugixml spdlog curl protobuf parallel-hashmap magic-enum mio luajit libmariadb mpir abseil bshoshany-thread-pool if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") @@ -124,4 +124,4 @@ add_subdirectory(src) if(BUILD_TESTS) add_subdirectory(tests) -endif() \ No newline at end of file +endif() diff --git a/src/database/databasetasks.cpp b/src/database/databasetasks.cpp index 6d43992ac81..06cfda93fc0 100644 --- a/src/database/databasetasks.cpp +++ b/src/database/databasetasks.cpp @@ -23,7 +23,7 @@ DatabaseTasks &DatabaseTasks::getInstance() { } void DatabaseTasks::execute(const std::string &query, std::function callback /* nullptr */) { - threadPool.addLoad([this, query, callback]() { + threadPool.detach_task([this, query, callback]() { bool success = db.executeQuery(query); if (callback != nullptr) { g_dispatcher().addEvent([callback, success]() { callback(nullptr, success); }, "DatabaseTasks::execute"); @@ -32,7 +32,7 @@ void DatabaseTasks::execute(const std::string &query, std::function callback /* nullptr */) { - threadPool.addLoad([this, query, callback]() { + threadPool.detach_task([this, query, callback]() { DBResult_ptr result = db.storeQuery(query); if (callback != nullptr) { g_dispatcher().addEvent([callback, result]() { callback(result, true); }, "DatabaseTasks::store"); diff --git a/src/game/scheduling/dispatcher.cpp b/src/game/scheduling/dispatcher.cpp index ec999848a92..7cff69d66bf 100644 --- a/src/game/scheduling/dispatcher.cpp +++ b/src/game/scheduling/dispatcher.cpp @@ -23,10 +23,10 @@ Dispatcher &Dispatcher::getInstance() { void Dispatcher::init() { UPDATE_OTSYS_TIME(); - threadPool.addLoad([this] { + threadPool.detach_task([this] { std::unique_lock asyncLock(dummyMutex); - while (!threadPool.getIoContext().stopped()) { + while (!threadPool.isStopped()) { UPDATE_OTSYS_TIME(); executeEvents(); @@ -60,7 +60,7 @@ void Dispatcher::executeParallelEvents(std::vector &tasks, const uint8_t g std::atomic_bool isTasksCompleted = false; for (const auto &task : tasks) { - threadPool.addLoad([groupId, &task, &isTasksCompleted, &totalTaskSize] { + threadPool.detach_task([groupId, &task, &isTasksCompleted, &totalTaskSize] { dispacherContext.type = DispatcherType::AsyncEvent; dispacherContext.group = static_cast(groupId); dispacherContext.taskName = task.getContext(); diff --git a/src/game/scheduling/dispatcher.hpp b/src/game/scheduling/dispatcher.hpp index d9e26a0b5d5..a6cbc8dd6dd 100644 --- a/src/game/scheduling/dispatcher.hpp +++ b/src/game/scheduling/dispatcher.hpp @@ -84,7 +84,7 @@ class Dispatcher { public: explicit Dispatcher(ThreadPool &threadPool) : threadPool(threadPool) { - threads.reserve(threadPool.getNumberOfThreads() + 1); + threads.reserve(threadPool.get_thread_count() + 1); for (uint_fast16_t i = 0; i < threads.capacity(); ++i) { threads.emplace_back(std::make_unique()); } diff --git a/src/game/scheduling/save_manager.cpp b/src/game/scheduling/save_manager.cpp index 2c1eff6657c..fbad528598b 100644 --- a/src/game/scheduling/save_manager.cpp +++ b/src/game/scheduling/save_manager.cpp @@ -41,7 +41,7 @@ void SaveManager::scheduleAll() { return; } - threadPool.addLoad([this, scheduledAt]() { + threadPool.detach_task([this, scheduledAt]() { if (m_scheduledAt.load() != scheduledAt) { logger.warn("Skipping save for server because another save has been scheduled."); return; @@ -69,7 +69,7 @@ void SaveManager::schedulePlayer(std::weak_ptr playerPtr) { logger.debug("Scheduling player {} for saving.", playerToSave->getName()); auto scheduledAt = std::chrono::steady_clock::now(); m_playerMap[playerToSave->getGUID()] = scheduledAt; - threadPool.addLoad([this, playerPtr, scheduledAt]() { + threadPool.detach_task([this, playerPtr, scheduledAt]() { auto player = playerPtr.lock(); if (!player) { logger.debug("Skipping save for player because player is no longer online."); diff --git a/src/lib/thread/README.md b/src/lib/thread/README.md index ddb5cd6239c..52792d07b3d 100644 --- a/src/lib/thread/README.md +++ b/src/lib/thread/README.md @@ -20,7 +20,7 @@ int main() { ThreadPool &pool = inject(); // preferrably uses constructor injection or setter injection. // Post a task to the thread pool - pool.addLoad([]() { + pool.detach_task([]() { std::cout << "Hello from thread " << std::this_thread::get_id() << std::endl; }); } diff --git a/src/lib/thread/thread_pool.cpp b/src/lib/thread/thread_pool.cpp index 3971d3a6a02..702f0c05504 100644 --- a/src/lib/thread/thread_pool.cpp +++ b/src/lib/thread/thread_pool.cpp @@ -14,84 +14,27 @@ #include "game/game.hpp" #include "utils/tools.hpp" +/** + * Regardless of how many cores your computer have, we want at least + * 4 threads because, even though they won't improve processing they + * will make processing non-blocking in some way and that would allow + * single core computers to process things concurrently, but not in parallel. + */ + #ifndef DEFAULT_NUMBER_OF_THREADS #define DEFAULT_NUMBER_OF_THREADS 4 #endif ThreadPool::ThreadPool(Logger &logger) : - logger(logger) { + logger(logger), BS::thread_pool(std::max(getNumberOfCores(), DEFAULT_NUMBER_OF_THREADS)) { start(); } void ThreadPool::start() { - logger.info("Setting up thread pool"); - - /** - * Regardless of how many cores your computer have, we want at least - * 4 threads because, even though they won't improve processing they - * will make processing non-blocking in some way and that would allow - * single core computers to process things concurrently, but not in parallel. - */ - nThreads = std::max(static_cast(getNumberOfCores()), DEFAULT_NUMBER_OF_THREADS); - - for (std::size_t i = 0; i < nThreads; ++i) { - threads.emplace_back([this] { ioService.run(); }); - } - - logger.info("Running with {} threads.", threads.size()); + logger.info("Running with {} threads.", get_thread_count()); } void ThreadPool::shutdown() { - if (ioService.stopped()) { - return; - } - + stopped = true; logger.info("Shutting down thread pool..."); - - ioService.stop(); - - std::vector> futures; - for (std::size_t i = 0; i < threads.size(); i++) { - logger.debug("Joining thread {}/{}.", i + 1, threads.size()); - - if (threads[i].joinable()) { - futures.emplace_back(std::async(std::launch::async, [&]() { - threads[i].join(); - })); - } - } - - std::future_status status = std::future_status::timeout; - auto timeout = std::chrono::seconds(5); - auto start = std::chrono::steady_clock::now(); - int tries = 0; - while (status == std::future_status::timeout && std::chrono::steady_clock::now() - start < timeout) { - tries++; - if (tries > 5) { - break; - } - for (auto &future : futures) { - status = future.wait_for(std::chrono::seconds(0)); - if (status != std::future_status::timeout) { - break; - } - } - } -} - -asio::io_context &ThreadPool::getIoContext() { - return ioService; -} - -void ThreadPool::addLoad(const std::function &load) { - asio::post(ioService, [this, load]() { - if (ioService.stopped()) { - if (g_game().getGameState() != GAME_STATE_SHUTDOWN) { - logger.error("Shutting down, cannot execute task."); - } - return; - } - - load(); - }); } diff --git a/src/lib/thread/thread_pool.hpp b/src/lib/thread/thread_pool.hpp index e36d8beca57..ea24d3486cb 100644 --- a/src/lib/thread/thread_pool.hpp +++ b/src/lib/thread/thread_pool.hpp @@ -9,8 +9,9 @@ #pragma once #include "lib/logging/logger.hpp" +#include "BS_thread_pool.hpp" -class ThreadPool { +class ThreadPool : public BS::thread_pool { public: explicit ThreadPool(Logger &logger); @@ -20,12 +21,6 @@ class ThreadPool { void start(); void shutdown(); - asio::io_context &getIoContext(); - void addLoad(const std::function &load); - - uint16_t getNumberOfThreads() const { - return nThreads; - } static int16_t getThreadId() { static std::atomic_int16_t lastId = -1; @@ -39,11 +34,11 @@ class ThreadPool { return id; }; + bool isStopped() const { + return stopped; + } + private: Logger &logger; - asio::io_context ioService; - std::vector threads; - asio::io_context::work work { ioService }; - - uint16_t nThreads = 0; + bool stopped = false; }; diff --git a/src/server/network/webhook/webhook.cpp b/src/server/network/webhook/webhook.cpp index 57d4f607aac..f80ff4e59b3 100644 --- a/src/server/network/webhook/webhook.cpp +++ b/src/server/network/webhook/webhook.cpp @@ -38,7 +38,7 @@ Webhook &Webhook::getInstance() { } void Webhook::run() { - threadPool.addLoad([this] { sendWebhook(); }); + threadPool.detach_task([this] { sendWebhook(); }); g_dispatcher().scheduleEvent( g_configManager().getNumber(DISCORD_WEBHOOK_DELAY_MS, __FUNCTION__), [this] { run(); }, "Webhook::run" ); diff --git a/vcpkg.json b/vcpkg.json index dda054f3774..1f821379bad 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -17,6 +17,7 @@ "pugixml", "spdlog", "zlib", + "bshoshany-thread-pool", { "name": "libmariadb", "features": [ From 5636d549bb5bb7fe2ab960524f5588dc08d9c8bf Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Tue, 28 May 2024 21:11:34 -0300 Subject: [PATCH 09/50] fix: clean map in pz (#2661) --- src/map/map.cpp | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/map/map.cpp b/src/map/map.cpp index d4d1c4147b1..173b4fbcc3d 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -695,29 +695,17 @@ uint32_t Map::clean() { ItemVector toRemove; toRemove.reserve(128); - for (const auto &mit : mapSectors) { - for (uint8_t z = 0; z < MAP_MAX_LAYERS; ++z) { - if (const auto &floor = mit.second.getFloor(z)) { - for (auto &tiles : floor->getTiles()) { - for (const auto &[tile, cachedTile] : tiles) { - if (!tile || tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - continue; - } - - TileItemVector* itemList = tile->getItemList(); - if (!itemList) { - continue; - } - - ++qntTiles; - - for (auto it = ItemVector::const_reverse_iterator(itemList->getEndDownItem()), end = ItemVector::const_reverse_iterator(itemList->getBeginDownItem()); it != end; ++it) { - const auto &item = *it; - if (item->isCleanable()) { - toRemove.push_back(item); - } - } - } + + for (const auto &tile : g_game().getTilesToClean()) { + if (!tile) { + continue; + } + + if (const auto items = tile->getItemList()) { + ++qntTiles; + for (const auto &item : *items) { + if (item->isCleanable()) { + toRemove.emplace_back(item); } } } From e0193bbd9b1794dff6744d04a933e9515b2879b9 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Tue, 28 May 2024 21:22:27 -0300 Subject: [PATCH 10/50] fix: crash on move creature (#2662) Fix #2657 --- src/map/map.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/map/map.cpp b/src/map/map.cpp index 173b4fbcc3d..8b8cebeb539 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -320,13 +320,22 @@ bool Map::placeCreature(const Position ¢erPos, std::shared_ptr cre } void Map::moveCreature(const std::shared_ptr &creature, const std::shared_ptr &newTile, bool forceTeleport /* = false*/) { - auto oldTile = creature->getTile(); + if (!creature || !newTile) { + return; + } - Position oldPos = oldTile->getPosition(); - Position newPos = newTile->getPosition(); + const auto &oldTile = creature->getTile(); + + if (!oldTile) { + return; + } + + const auto &oldPos = oldTile->getPosition(); + const auto &newPos = newTile->getPosition(); const auto &fromZones = oldTile->getZones(); const auto &toZones = newTile->getZones(); + if (auto ret = g_game().beforeCreatureZoneChange(creature, fromZones, toZones); ret != RETURNVALUE_NOERROR) { return; } From 368f9d30dc629f9a78b55b78c00952015cb78a9f Mon Sep 17 00:00:00 2001 From: Slawomir Boczek Date: Wed, 29 May 2024 02:26:19 +0200 Subject: [PATCH 11/50] Add GitHub Workflow: MySQL Schema Checker (#2659) --- .github/workflows/mysql-schema-check.yml | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/mysql-schema-check.yml diff --git a/.github/workflows/mysql-schema-check.yml b/.github/workflows/mysql-schema-check.yml new file mode 100644 index 00000000000..b0291956edc --- /dev/null +++ b/.github/workflows/mysql-schema-check.yml @@ -0,0 +1,43 @@ +--- +name: MySQL Schema Check +on: + workflow_dispatch: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + paths: + - "schema.sql" + merge_group: + push: + paths: + - "schema.sql" + branches: + - main + +jobs: + mysql-schema-check: + runs-on: ubuntu-latest + services: + mysql: + image: mysql:8.0 + env: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: canary + MYSQL_USER: canary + MYSQL_PASSWORD: canary + ports: + - 3306/tcp + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + strategy: + fail-fast: false + name: Check + steps: + - name: Checkout repository + uses: actions/checkout@main + - name: 📌 MySQL Start & init & show db + run: | + sudo /etc/init.d/mysql start + mysql -e 'CREATE DATABASE canary;' -uroot -proot + mysql -e "SHOW DATABASES" -uroot -proot + - name: Import Canary Schema + run: | + mysql -uroot -proot canary < schema.sql From 38c2ec359ab5eda18f873922cf49f11e6f8e73ba Mon Sep 17 00:00:00 2001 From: Karin Date: Tue, 28 May 2024 21:26:46 -0300 Subject: [PATCH 12/50] fix: wrong exit position fear feaster (#2654) --- .../scripts/actions/bosses_levers/the_fear_feaster.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-otservbr-global/scripts/actions/bosses_levers/the_fear_feaster.lua b/data-otservbr-global/scripts/actions/bosses_levers/the_fear_feaster.lua index af870accd41..41dfa1ffe33 100644 --- a/data-otservbr-global/scripts/actions/bosses_levers/the_fear_feaster.lua +++ b/data-otservbr-global/scripts/actions/bosses_levers/the_fear_feaster.lua @@ -15,7 +15,7 @@ local config = { from = Position(33705, 31463, 14), to = Position(33719, 31477, 14), }, - exit = Position(33609, 31499, 10), + exit = Position(33609, 31495, 10), } local lever = BossLever(config) From e3fefe824ce825cd96bb20d6a418ddfcdb81ff66 Mon Sep 17 00:00:00 2001 From: Karin Date: Wed, 29 May 2024 09:21:37 -0300 Subject: [PATCH 13/50] fix: adding the correct range (#2663) --- .../globalevents/quests/secret_library_preceptor_lazare.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua b/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua index 4da496fb659..ea05353ad09 100644 --- a/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua +++ b/data-otservbr-global/scripts/globalevents/quests/secret_library_preceptor_lazare.lua @@ -1,7 +1,7 @@ local config = { monsterName = "Preceptor Lazare", bossPosition = Position(33374, 31338, 3), - range = 5, + range = 50, } local preceptorLazare = GlobalEvent("PreceptorLazareRespawn") From 6fed1764a943b6034cdbf0428f2bb87ae63efde8 Mon Sep 17 00:00:00 2001 From: Elson Costa Date: Wed, 29 May 2024 17:08:03 -0300 Subject: [PATCH 14/50] fix: schema query (#2664) --- data-otservbr-global/migrations/45.lua | 10 ++--- schema.sql | 62 +++++++++++++------------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/data-otservbr-global/migrations/45.lua b/data-otservbr-global/migrations/45.lua index c606f18522e..4ceb5f7e3fd 100644 --- a/data-otservbr-global/migrations/45.lua +++ b/data-otservbr-global/migrations/45.lua @@ -3,7 +3,7 @@ function onUpdateDatabase() db.query([[ CREATE TABLE IF NOT EXISTS `account_vipgroups` ( - `id` tinyint(3) UNSIGNED NOT NULL, + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose vip group entry it is', `name` varchar(128) NOT NULL, `customizable` BOOLEAN NOT NULL DEFAULT '1', @@ -13,9 +13,9 @@ function onUpdateDatabase() db.query([[ CREATE TRIGGER `oncreate_accounts` AFTER INSERT ON `accounts` FOR EACH ROW BEGIN - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (1, NEW.`id`, 'Enemies', 0); - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (2, NEW.`id`, 'Friends', 0); - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (3, NEW.`id`, 'Trading Partner', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Enemies', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Friends', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Trading Partner', 0); END; ]]) @@ -23,7 +23,7 @@ function onUpdateDatabase() CREATE TABLE IF NOT EXISTS `account_vipgrouplist` ( `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose viplist entry it is', `player_id` int(11) NOT NULL COMMENT 'id of target player of viplist entry', - `vipgroup_id` tinyint(3) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', + `vipgroup_id` int(11) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', INDEX `account_id` (`account_id`), INDEX `player_id` (`player_id`), INDEX `vipgroup_id` (`vipgroup_id`), diff --git a/schema.sql b/schema.sql index bf37d1c2f37..2fbc7dd649b 100644 --- a/schema.sql +++ b/schema.sql @@ -217,7 +217,7 @@ CREATE TABLE IF NOT EXISTS `account_viplist` ( -- Table structure `account_vipgroup` CREATE TABLE IF NOT EXISTS `account_vipgroups` ( - `id` tinyint(3) UNSIGNED NOT NULL, + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose vip group entry it is', `name` varchar(128) NOT NULL, `customizable` BOOLEAN NOT NULL DEFAULT '1', @@ -229,9 +229,9 @@ CREATE TABLE IF NOT EXISTS `account_vipgroups` ( -- DELIMITER // CREATE TRIGGER `oncreate_accounts` AFTER INSERT ON `accounts` FOR EACH ROW BEGIN - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (1, NEW.`id`, 'Enemies', 0); - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (2, NEW.`id`, 'Friends', 0); - INSERT INTO `account_vipgroups` (`id`, `account_id`, `name`, `customizable`) VALUES (3, NEW.`id`, 'Trading Partner', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Enemies', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Friends', 0); + INSERT INTO `account_vipgroups` (`account_id`, `name`, `customizable`) VALUES (NEW.`id`, 'Trading Partner', 0); END // DELIMITER ; @@ -240,7 +240,7 @@ DELIMITER ; CREATE TABLE IF NOT EXISTS `account_vipgrouplist` ( `account_id` int(11) UNSIGNED NOT NULL COMMENT 'id of account whose viplist entry it is', `player_id` int(11) NOT NULL COMMENT 'id of target player of viplist entry', - `vipgroup_id` tinyint(3) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', + `vipgroup_id` int(11) UNSIGNED NOT NULL COMMENT 'id of vip group that player belongs', INDEX `account_id` (`account_id`), INDEX `player_id` (`player_id`), INDEX `vipgroup_id` (`vipgroup_id`), @@ -258,35 +258,36 @@ CREATE TABLE IF NOT EXISTS `boosted_boss` ( `boostname` TEXT, `date` varchar(250) NOT NULL DEFAULT '', `raceid` varchar(250) NOT NULL DEFAULT '', - `looktypeEx` int(11) NOT NULL DEFAULT "0", - `looktype` int(11) NOT NULL DEFAULT "136", - `lookfeet` int(11) NOT NULL DEFAULT "0", - `looklegs` int(11) NOT NULL DEFAULT "0", - `lookhead` int(11) NOT NULL DEFAULT "0", - `lookbody` int(11) NOT NULL DEFAULT "0", - `lookaddons` int(11) NOT NULL DEFAULT "0", - `lookmount` int(11) DEFAULT "0", + `looktypeEx` int(11) NOT NULL DEFAULT 0, + `looktype` int(11) NOT NULL DEFAULT 136, + `lookfeet` int(11) NOT NULL DEFAULT 0, + `looklegs` int(11) NOT NULL DEFAULT 0, + `lookhead` int(11) NOT NULL DEFAULT 0, + `lookbody` int(11) NOT NULL DEFAULT 0, + `lookaddons` int(11) NOT NULL DEFAULT 0, + `lookmount` int(11) DEFAULT 0, PRIMARY KEY (`date`) -) AS SELECT 0 AS date, "default" AS boostname, 0 AS raceid; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `boosted_boss` (`boostname`, `date`, `raceid`) VALUES ('default', 0, 0); -- Table structure `boosted_creature` CREATE TABLE IF NOT EXISTS `boosted_creature` ( `boostname` TEXT, `date` varchar(250) NOT NULL DEFAULT '', `raceid` varchar(250) NOT NULL DEFAULT '', - `looktype` int(11) NOT NULL DEFAULT "136", - `lookfeet` int(11) NOT NULL DEFAULT "0", - `looklegs` int(11) NOT NULL DEFAULT "0", - `lookhead` int(11) NOT NULL DEFAULT "0", - `lookbody` int(11) NOT NULL DEFAULT "0", - `lookaddons` int(11) NOT NULL DEFAULT "0", - `lookmount` int(11) DEFAULT "0", + `looktype` int(11) NOT NULL DEFAULT 136, + `lookfeet` int(11) NOT NULL DEFAULT 0, + `looklegs` int(11) NOT NULL DEFAULT 0, + `lookhead` int(11) NOT NULL DEFAULT 0, + `lookbody` int(11) NOT NULL DEFAULT 0, + `lookaddons` int(11) NOT NULL DEFAULT 0, + `lookmount` int(11) DEFAULT 0, PRIMARY KEY (`date`) -) AS SELECT 0 AS date, "default" AS boostname, 0 AS raceid; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- -------------------------------------------------------- +INSERT INTO `boosted_creature` (`boostname`, `date`, `raceid`) VALUES ('default', 0, 0); --- -- Tabble Structure `daily_reward_history` CREATE TABLE IF NOT EXISTS `daily_reward_history` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -473,7 +474,6 @@ END DELIMITER ; -- Table structure `house_lists` - CREATE TABLE IF NOT EXISTS `house_lists` ( `house_id` int NOT NULL, `listid` int NOT NULL, @@ -485,7 +485,6 @@ CREATE TABLE IF NOT EXISTS `house_lists` ( CONSTRAINT `houses_list_house_fk` FOREIGN KEY (`house_id`) REFERENCES `houses` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; - -- Table structure `ip_bans` CREATE TABLE IF NOT EXISTS `ip_bans` ( `ip` int(11) NOT NULL, @@ -540,7 +539,6 @@ CREATE TABLE IF NOT EXISTS `market_offers` ( ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- Table structure `players_online` CREATE TABLE IF NOT EXISTS `players_online` ( `player_id` int(11) NOT NULL, @@ -671,7 +669,6 @@ CREATE TABLE IF NOT EXISTS `player_wheeldata` ( PRIMARY KEY (`player_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -- Table structure `player_kills` CREATE TABLE IF NOT EXISTS `player_kills` ( `player_id` int(11) NOT NULL, @@ -830,6 +827,7 @@ CREATE TABLE IF NOT EXISTS `account_sessions` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- Table structure `kv_store` CREATE TABLE IF NOT EXISTS `kv_store` ( `key_name` varchar(191) NOT NULL, `timestamp` bigint NOT NULL, @@ -854,7 +852,7 @@ INSERT INTO `players` (6, 'GOD', 6, 1, 2, 0, 155, 155, 100, 113, 115, 95, 39, 75, 0, 60, 60, 0, 8, '', 410, 1, 10, 0, 10, 0, 10, 0, 10, 0); -- Create vip groups for GOD account -INSERT INTO `account_vipgroups` (`id`, `name`, `account_id`, `customizable`) VALUES -(1, 'Friends', 1, 0), -(2, 'Enemies', 1, 0), -(3, 'Trading Partners', 1, 0); +INSERT INTO `account_vipgroups` (`name`, `account_id`, `customizable`) VALUES +('Friends', 1, 0), +('Enemies', 1, 0), +('Trading Partners', 1, 0); From 83ebce55a86dcd31ebd89c301822f8af0daa2d98 Mon Sep 17 00:00:00 2001 From: Karin Date: Sat, 1 Jun 2024 01:44:39 -0300 Subject: [PATCH 15/50] fix: checking if the item is container in playerBuyItem (#2672) --- src/game/game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/game.cpp b/src/game/game.cpp index 621e3593816..899a89549d9 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -5165,7 +5165,7 @@ void Game::playerBuyItem(uint32_t playerId, uint16_t itemId, uint8_t count, uint return; } - if (inBackpacks) { + if (inBackpacks || it.isContainer()) { uint32_t maxContainer = static_cast(g_configManager().getNumber(MAX_CONTAINER, __FUNCTION__)); auto backpack = player->getInventoryItem(CONST_SLOT_BACKPACK); auto mainBackpack = backpack ? backpack->getContainer() : nullptr; From 7e7a6109f521e87bcd82296ee570fff62d7a66c1 Mon Sep 17 00:00:00 2001 From: Marco Date: Sat, 1 Jun 2024 14:41:18 -0300 Subject: [PATCH 16/50] refactor: experience calculation efficiency and increase level cap (#2631) --- data/scripts/talkactions/god/add_skill.lua | 7 +------ src/creatures/players/player.hpp | 5 ++--- src/lua/functions/core/game/game_functions.cpp | 11 +++++++++++ src/lua/functions/core/game/game_functions.hpp | 2 ++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/data/scripts/talkactions/god/add_skill.lua b/data/scripts/talkactions/god/add_skill.lua index 20644582325..09d240ece4d 100644 --- a/data/scripts/talkactions/god/add_skill.lua +++ b/data/scripts/talkactions/god/add_skill.lua @@ -16,11 +16,6 @@ local function getSkillId(skillName) end end -local function getExpForLevel(level) - level = level - 1 - return ((50 * level * level * level) - (150 * level * level) + (400 * level)) / 3 -end - local addSkill = TalkAction("/addskill") function addSkill.onSay(player, words, param) @@ -54,7 +49,7 @@ function addSkill.onSay(player, words, param) local ch = split[2]:sub(1, 1) if ch == "l" or ch == "e" then targetLevel = target:getLevel() + count - targetExp = getExpForLevel(targetLevel) + targetExp = Game.getExperienceForLevel(targetLevel) addExp = targetExp - target:getExperience() target:addExperience(addExp, false) elseif ch == "m" then diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 58bebfb9f2f..c0761704db4 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -230,9 +230,8 @@ class Player final : public Creature, public Cylinder, public Bankable { void addList() override; void removePlayer(bool displayEffect, bool forced = true); - static uint64_t getExpForLevel(int32_t lv) { - lv--; - return ((50ULL * lv * lv * lv) - (150ULL * lv * lv) + (400ULL * lv)) / 3ULL; + static uint64_t getExpForLevel(const uint32_t level) { + return (((level - 6ULL) * level + 17ULL) * level - 12ULL) / 6ULL * 100ULL; } uint16_t getStaminaMinutes() const { diff --git a/src/lua/functions/core/game/game_functions.cpp b/src/lua/functions/core/game/game_functions.cpp index 0fdbc96f4d6..4858b3ab264 100644 --- a/src/lua/functions/core/game/game_functions.cpp +++ b/src/lua/functions/core/game/game_functions.cpp @@ -191,6 +191,17 @@ int GameFunctions::luaGameloadMapChunk(lua_State* L) { return 0; } +int GameFunctions::luaGameGetExperienceForLevel(lua_State* L) { + // Game.getExperienceForLevel(level) + const uint32_t level = getNumber(L, 1); + if (level == 0) { + reportErrorFunc("Level must be greater than 0."); + } else { + lua_pushnumber(L, Player::getExpForLevel(level)); + } + return 1; +} + int GameFunctions::luaGameGetMonsterCount(lua_State* L) { // Game.getMonsterCount() lua_pushnumber(L, g_game().getMonstersOnline()); diff --git a/src/lua/functions/core/game/game_functions.hpp b/src/lua/functions/core/game/game_functions.hpp index 7f3b642e97d..70e81061c9c 100644 --- a/src/lua/functions/core/game/game_functions.hpp +++ b/src/lua/functions/core/game/game_functions.hpp @@ -28,6 +28,7 @@ class GameFunctions final : LuaScriptInterface { registerMethod(L, "Game", "loadMap", GameFunctions::luaGameLoadMap); registerMethod(L, "Game", "loadMapChunk", GameFunctions::luaGameloadMapChunk); + registerMethod(L, "Game", "getExperienceForLevel", GameFunctions::luaGameGetExperienceForLevel); registerMethod(L, "Game", "getMonsterCount", GameFunctions::luaGameGetMonsterCount); registerMethod(L, "Game", "getPlayerCount", GameFunctions::luaGameGetPlayerCount); registerMethod(L, "Game", "getNpcCount", GameFunctions::luaGameGetNpcCount); @@ -103,6 +104,7 @@ class GameFunctions final : LuaScriptInterface { static int luaGameLoadMap(lua_State* L); static int luaGameloadMapChunk(lua_State* L); + static int luaGameGetExperienceForLevel(lua_State* L); static int luaGameGetMonsterCount(lua_State* L); static int luaGameGetPlayerCount(lua_State* L); static int luaGameGetNpcCount(lua_State* L); From 3b90a6970a7d91c8c58e1faf49a8af40f35a6835 Mon Sep 17 00:00:00 2001 From: Leandro Date: Sat, 1 Jun 2024 15:32:11 -0300 Subject: [PATCH 17/50] feat: place monster spawn with default time if not set correctly (#2671) --- config.lua.dist | 1 + src/config/config_enums.hpp | 1 + src/config/configmanager.cpp | 1 + src/creatures/monsters/spawns/spawn_monster.cpp | 10 +++++++++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config.lua.dist b/config.lua.dist index 447a90647c2..9d1ed2fa681 100644 --- a/config.lua.dist +++ b/config.lua.dist @@ -511,6 +511,7 @@ bossDefaultTimeToFightAgain = 20 * 60 * 60 -- 20 hours bossDefaultTimeToDefeat = 20 * 60 -- 20 minutes -- Monsters +defaultRespawnTime = 60 deSpawnRange = 2 deSpawnRadius = 50 diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp index 22043f42525..0e53c97546e 100644 --- a/src/config/config_enums.hpp +++ b/src/config/config_enums.hpp @@ -50,6 +50,7 @@ enum ConfigKey_t : uint16_t { DATA_DIRECTORY, DAY_KILLS_TO_RED, DEATH_LOSE_PERCENT, + DEFAULT_RESPAWN_TIME, DEFAULT_DESPAWNRADIUS, DEFAULT_DESPAWNRANGE, DEFAULT_PRIORITY, diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp index e1345bbac4b..35d2cf3b1be 100644 --- a/src/config/configmanager.cpp +++ b/src/config/configmanager.cpp @@ -225,6 +225,7 @@ bool ConfigManager::load() { loadIntConfig(L, CRITICALCHANCE, "criticalChance", 10); loadIntConfig(L, DAY_KILLS_TO_RED, "dayKillsToRedSkull", 3); loadIntConfig(L, DEATH_LOSE_PERCENT, "deathLosePercent", -1); + loadIntConfig(L, DEFAULT_RESPAWN_TIME, "defaultRespawnTime", 60); loadIntConfig(L, DEFAULT_DESPAWNRADIUS, "deSpawnRadius", 50); loadIntConfig(L, DEFAULT_DESPAWNRANGE, "deSpawnRange", 2); loadIntConfig(L, DEPOTCHEST, "depotChest", 4); diff --git a/src/creatures/monsters/spawns/spawn_monster.cpp b/src/creatures/monsters/spawns/spawn_monster.cpp index ef5912c8052..968b90d8cae 100644 --- a/src/creatures/monsters/spawns/spawn_monster.cpp +++ b/src/creatures/monsters/spawns/spawn_monster.cpp @@ -94,7 +94,15 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { weight = pugi::cast(weightAttribute.value()); } - spawnMonster.addMonster(nameAttribute.as_string(), pos, dir, pugi::cast(childMonsterNode.attribute("spawntime").value()) * 1000, weight); + uint32_t scheduleInterval = g_configManager().getNumber(DEFAULT_RESPAWN_TIME, __FUNCTION__); + + try { + scheduleInterval = pugi::cast(childMonsterNode.attribute("spawntime").value()); + } catch (...) { + g_logger().warn("Failed to add schedule interval to monster: {}, interval: {}. Setting to default respawn time: {}", nameAttribute.value(), childMonsterNode.attribute("spawntime").value(), scheduleInterval); + } + + spawnMonster.addMonster(nameAttribute.as_string(), pos, dir, scheduleInterval * 1000, weight); } } } From 8d74ea6db7c663fdc199fc39be3d137fa685544c Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Sun, 2 Jun 2024 00:02:44 -0300 Subject: [PATCH 18/50] fix: possible memory leak in connection (#2668) May never be called async_wait and therefore may leave the connection stuck in limbo. --- src/server/network/connection/connection.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/network/connection/connection.cpp b/src/server/network/connection/connection.cpp index 1c575ff00d0..3effd52f829 100644 --- a/src/server/network/connection/connection.cpp +++ b/src/server/network/connection/connection.cpp @@ -105,7 +105,7 @@ void Connection::accept(Protocol_ptr protocolPtr) { void Connection::acceptInternal(bool toggleParseHeader) { readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + readTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); try { asio::async_read(socket, asio::buffer(msg.getBuffer(), HEADER_LENGTH), [self = shared_from_this(), toggleParseHeader](const std::error_code &error, std::size_t N) { @@ -147,7 +147,7 @@ void Connection::parseProxyIdentification(const std::error_code &error) { connectionState = CONNECTION_STATE_READINGS; try { readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + readTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); // Read the remainder of proxy identification asio::async_read(socket, asio::buffer(msg.getBuffer(), remainder), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parseProxyIdentification(error); }); @@ -208,7 +208,7 @@ void Connection::parseHeader(const std::error_code &error) { try { readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + readTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); // Read packet content msg.setLength(size + HEADER_LENGTH); @@ -275,7 +275,7 @@ void Connection::parsePacket(const std::error_code &error) { try { readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + readTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); if (!skipReadingNextPacket) { // Wait to the next packet @@ -289,7 +289,7 @@ void Connection::parsePacket(const std::error_code &error) { void Connection::resumeWork() { readTimer.expires_from_now(std::chrono::seconds(CONNECTION_READ_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + readTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); try { asio::async_read(socket, asio::buffer(msg.getBuffer(), HEADER_LENGTH), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parseHeader(error); }); @@ -358,7 +358,7 @@ uint32_t Connection::getIP() { void Connection::internalSend(const OutputMessage_ptr &outputMessage) { writeTimer.expires_from_now(std::chrono::seconds(CONNECTION_WRITE_TIMEOUT)); - readTimer.async_wait([self = shared_from_this()](const std::error_code &error) { Connection::handleTimeout(std::weak_ptr(self), error); }); + writeTimer.async_wait([self = std::weak_ptr(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); try { asio::async_write(socket, asio::buffer(outputMessage->getOutputBuffer(), outputMessage->getLength()), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->onWriteOperation(error); }); From 02a7bc0c85c3a9cc0817b59950679a2b355f6c71 Mon Sep 17 00:00:00 2001 From: Pedro Cruz Date: Mon, 3 Jun 2024 15:44:36 -0300 Subject: [PATCH 19/50] feat: equipments winter update 2023 (#2608) --- data/items/items.xml | 290 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+) diff --git a/data/items/items.xml b/data/items/items.xml index e7e73d9753b..9fdc89bbd8f 100644 --- a/data/items/items.xml +++ b/data/items/items.xml @@ -75820,5 +75820,295 @@ Granted by TibiaGoals.com"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2db5fee1f44a6d5cadca8db6a9ef9defdbad67f0 Mon Sep 17 00:00:00 2001 From: miah-sebastian Date: Tue, 4 Jun 2024 18:42:36 -0400 Subject: [PATCH 20/50] fix: opentelemetry linker error (#2678) --- vcpkg.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vcpkg.json b/vcpkg.json index 1f821379bad..eed7e776ee0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -18,6 +18,11 @@ "spdlog", "zlib", "bshoshany-thread-pool", + { + "name": "opentelemetry-cpp", + "default-features": true, + "features": ["otlp-http", "prometheus"] + }, { "name": "libmariadb", "features": [ From 4af13eefdcc71f900587f3f4e9afa8083a1fe1ae Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 4 Jun 2024 22:17:28 -0300 Subject: [PATCH 21/50] fix: small adjustments and corrections to the core (#2524) - Previously, players were not being removed from the room upon killing the boss, as the relevant script was confined to rlmap only. This update ensures its functionality across any datapack. - Hirelings are now accessible beyond rlmap environments. - Addressed an issue with the loading of VIP days library. - Relocated the large sea shell asset to the core. - Implemented VIP status check and associated actions. - Transferred weapons scripts to the core. --- .../scripts/actions/other/large_sea_shell.lua | 28 ----- .../scripts/weapons/scripted_weapons.lua | 101 ------------------ data-otservbr-global/lib/others/load.lua | 1 - .../scripts/creaturescripts/customs/vip.lua | 20 ---- .../creaturescripts/others/forge_kill.lua | 12 --- .../{bosslever.lua => boss_lever.lua} | 0 data/libs/functions/load.lua | 10 +- data/libs/systems/load.lua | 1 + .../libs/systems/vip.lua | 20 ++-- .../scripts/actions/items/hireling_lamp.lua | 7 +- .../actions/objects/large_seashell.lua | 30 ++++++ .../monster/boss_lever_death.lua | 7 ++ .../creaturescripts/monster}/forge_kill.lua | 0 .../player}/adventure_blessing_login.lua | 1 + data/scripts/creaturescripts/player/login.lua | 24 ++++- .../scripts/weapons/dawnport_weapons.lua | 0 .../scripts/weapons/scripts/burst_arrow.lua | 0 .../scripts/weapons/scripts/diamond_arrow.lua | 0 .../scripts/weapons/scripts/poison_arrow.lua | 0 .../scripts/weapons/scripts/viper_star.lua | 0 20 files changed, 75 insertions(+), 187 deletions(-) delete mode 100644 data-canary/scripts/actions/other/large_sea_shell.lua delete mode 100644 data-canary/scripts/weapons/scripted_weapons.lua delete mode 100644 data-otservbr-global/scripts/creaturescripts/customs/vip.lua delete mode 100644 data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua rename data/libs/functions/{bosslever.lua => boss_lever.lua} (100%) rename data-otservbr-global/lib/others/vip_system.lua => data/libs/systems/vip.lua (61%) rename data-otservbr-global/scripts/actions/other/hirelinglamp.lua => data/scripts/actions/items/hireling_lamp.lua (93%) create mode 100644 data/scripts/actions/objects/large_seashell.lua rename data-otservbr-global/scripts/globalevents/others/bosslever_death.lua => data/scripts/creaturescripts/monster/boss_lever_death.lua (99%) rename {data-canary/scripts/creaturescripts => data/scripts/creaturescripts/monster}/forge_kill.lua (100%) rename {data-otservbr-global/scripts/creaturescripts/others => data/scripts/creaturescripts/player}/adventure_blessing_login.lua (99%) rename data-otservbr-global/scripts/weapons/dawnport_weapon.lua => data/scripts/weapons/dawnport_weapons.lua (100%) rename {data-otservbr-global => data}/scripts/weapons/scripts/burst_arrow.lua (100%) rename {data-otservbr-global => data}/scripts/weapons/scripts/diamond_arrow.lua (100%) rename {data-otservbr-global => data}/scripts/weapons/scripts/poison_arrow.lua (100%) rename {data-otservbr-global => data}/scripts/weapons/scripts/viper_star.lua (100%) diff --git a/data-canary/scripts/actions/other/large_sea_shell.lua b/data-canary/scripts/actions/other/large_sea_shell.lua deleted file mode 100644 index b396bd70611..00000000000 --- a/data-canary/scripts/actions/other/large_sea_shell.lua +++ /dev/null @@ -1,28 +0,0 @@ -local largeSeaShell = Action() - -function largeSeaShell.onUse(player, item, fromPosition, target, toPosition, isHotkey) - if player:getStorageValue(Storage.DelayLargeSeaShell) <= os.time() then - local chance = math.random(100) - local msg = "" - if chance <= 16 then - doTargetCombatHealth(0, player, COMBAT_PHYSICALDAMAGE, -200, -200, CONST_ME_NONE) - msg = "Ouch! You squeezed your fingers." - elseif chance > 16 and chance <= 64 then - Game.createItem(math.random(281, 282), 1, player:getPosition()) - msg = "You found a beautiful pearl." - else - msg = "Nothing is inside." - end - player:say(msg, TALKTYPE_MONSTER_SAY, false, player, item:getPosition()) - item:transform(198) - item:decay() - player:setStorageValue(Storage.DelayLargeSeaShell, os.time() + 20 * 60 * 60) - item:getPosition():sendMagicEffect(CONST_ME_BUBBLES) - else - player:say("You have already opened a shell today.", TALKTYPE_MONSTER_SAY, false, player, item:getPosition()) - end - return true -end - -largeSeaShell:id(197) -largeSeaShell:register() diff --git a/data-canary/scripts/weapons/scripted_weapons.lua b/data-canary/scripts/weapons/scripted_weapons.lua deleted file mode 100644 index 93e677d43cd..00000000000 --- a/data-canary/scripts/weapons/scripted_weapons.lua +++ /dev/null @@ -1,101 +0,0 @@ -local burstArea = createCombatArea({ - { 1, 1, 1 }, - { 1, 3, 1 }, - { 1, 1, 1 }, -}) - -local burstCombat = Combat() -burstCombat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE) -burstCombat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_EXPLOSIONAREA) -burstCombat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_BURSTARROW) -burstCombat:setParameter(COMBAT_PARAM_BLOCKARMOR, true) -burstCombat:setFormula(COMBAT_FORMULA_SKILL, 0, 0, 1, 0) -burstCombat:setParameter(COMBAT_PARAM_IMPACTSOUND, SOUND_EFFECT_TYPE_BURST_ARROW_EFFECT) -burstCombat:setParameter(COMBAT_PARAM_CASTSOUND, SOUND_EFFECT_TYPE_DIST_ATK_BOW) -burstCombat:setArea(burstArea) - -local burstarrow = Weapon(WEAPON_AMMO) -burstarrow.onUseWeapon = function(player, variant) - if player:getSkull() == SKULL_BLACK then - return false - end - - return burstCombat:execute(player, variant) -end - -burstarrow:id(3449) -burstarrow:action("removecount") -burstarrow:register() - -local poisonCombat = Combat() -poisonCombat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE) -poisonCombat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_POISONARROW) -poisonCombat:setParameter(COMBAT_PARAM_BLOCKARMOR, true) -poisonCombat:setFormula(COMBAT_FORMULA_SKILL, 0, 0, 1, 0) - -local poisonarrow = Weapon(WEAPON_AMMO) -poisonarrow.onUseWeapon = function(player, variant) - if not poisonCombat:execute(player, variant) then - return false - end - - player:addDamageCondition(Creature(variant:getNumber()), CONDITION_POISON, DAMAGELIST_LOGARITHMIC_DAMAGE, 3) - return true -end - -poisonarrow:id(3448) -poisonarrow:action("removecount") -poisonarrow:register() - -local viperCombat = Combat() -viperCombat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE) -viperCombat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_GREENSTAR) -viperCombat:setParameter(COMBAT_PARAM_BLOCKARMOR, true) -viperCombat:setFormula(COMBAT_FORMULA_SKILL, 0, 0, 1, 0) - -local viperstar = Weapon(WEAPON_DISTANCE) -viperstar.onUseWeapon = function(player, variant) - if not viperCombat:execute(player, variant) then - return false - end - - if math.random(1, 100) <= 90 then - return false - end - - player:addDamageCondition(Creature(variant:getNumber()), CONDITION_POISON, DAMAGELIST_LOGARITHMIC_DAMAGE, 2) - return true -end - -viperstar:id(7366) -viperstar:breakChance(9) -viperstar:register() - -local diamondArea = createCombatArea({ - { 0, 1, 1, 1, 0 }, - { 1, 1, 1, 1, 1 }, - { 1, 1, 3, 1, 1 }, - { 1, 1, 1, 1, 1 }, - { 0, 1, 1, 1, 0 }, -}) - -local diamondCombat = Combat() -diamondCombat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE) -diamondCombat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_ENERGYHIT) -diamondCombat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_DIAMONDARROW) -diamondCombat:setParameter(COMBAT_PARAM_IMPACTSOUND, SOUND_EFFECT_TYPE_DIAMOND_ARROW_EFFECT) -diamondCombat:setParameter(COMBAT_PARAM_CASTSOUND, SOUND_EFFECT_TYPE_DIST_ATK_BOW) -diamondCombat:setParameter(COMBAT_PARAM_BLOCKARMOR, true) -diamondCombat:setFormula(COMBAT_FORMULA_SKILL, 0, 0, 1, 0) -diamondCombat:setArea(diamondArea) - -local diamondarrow = Weapon(WEAPON_AMMO) -diamondarrow.onUseWeapon = function(player, variant) - return diamondCombat:execute(player, variant) -end - -diamondarrow:id(ITEM_OLD_DIAMOND_ARROW) -diamondarrow:action("removecount") -diamondarrow:level(150) -diamondarrow:wieldUnproperly(true) -diamondarrow:register() diff --git a/data-otservbr-global/lib/others/load.lua b/data-otservbr-global/lib/others/load.lua index 1052efb7bd6..031c8fb2026 100644 --- a/data-otservbr-global/lib/others/load.lua +++ b/data-otservbr-global/lib/others/load.lua @@ -1,2 +1 @@ dofile(DATA_DIRECTORY .. "/lib/others/dawnport.lua") -dofile(DATA_DIRECTORY .. "/lib/others/vip_system.lua") diff --git a/data-otservbr-global/scripts/creaturescripts/customs/vip.lua b/data-otservbr-global/scripts/creaturescripts/customs/vip.lua deleted file mode 100644 index 0ae99c00f2d..00000000000 --- a/data-otservbr-global/scripts/creaturescripts/customs/vip.lua +++ /dev/null @@ -1,20 +0,0 @@ -local playerLogin = CreatureEvent("VipLogin") - -function playerLogin.onLogin(player) - if configManager.getBoolean(configKeys.VIP_SYSTEM_ENABLED) then - local wasVip = player:kv():scoped("account"):get("vip-system") or false - if wasVip and not player:isVip() then - player:onRemoveVip() - end - if not wasVip and player:isVip() then - player:onAddVip(player:getVipDays()) - end - - if player:isVip() then - CheckPremiumAndPrint(player, MESSAGE_LOGIN) - end - end - return true -end - -playerLogin:register() diff --git a/data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua b/data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua deleted file mode 100644 index 3e454d84d14..00000000000 --- a/data-otservbr-global/scripts/creaturescripts/others/forge_kill.lua +++ /dev/null @@ -1,12 +0,0 @@ -local forgeKill = CreatureEvent("ForgeSystemMonster") - -function forgeKill.onDeath(creature, corpse, killer, mostDamageKiller, unjustified, mostDamageUnjustified) - local targetMonster = creature:getMonster() - if not targetMonster then - return true - end - - return ForgeMonster:onDeath(creature, corpse, killer, mostDamageKiller, unjustified, mostDamageUnjustified) -end - -forgeKill:register() diff --git a/data/libs/functions/bosslever.lua b/data/libs/functions/boss_lever.lua similarity index 100% rename from data/libs/functions/bosslever.lua rename to data/libs/functions/boss_lever.lua diff --git a/data/libs/functions/load.lua b/data/libs/functions/load.lua index c63276d9444..0fab2c3cb5e 100644 --- a/data/libs/functions/load.lua +++ b/data/libs/functions/load.lua @@ -1,14 +1,15 @@ -- Load core functions dofile(CORE_DIRECTORY .. "/libs/functions/bit.lua") dofile(CORE_DIRECTORY .. "/libs/functions/bitwise_flags.lua") +dofile(CORE_DIRECTORY .. "/libs/functions/boss_lever.lua") dofile(CORE_DIRECTORY .. "/libs/functions/combat.lua") dofile(CORE_DIRECTORY .. "/libs/functions/constants.lua") dofile(CORE_DIRECTORY .. "/libs/functions/container.lua") dofile(CORE_DIRECTORY .. "/libs/functions/creature.lua") -dofile(CORE_DIRECTORY .. "/libs/functions/functions.lua") -dofile(CORE_DIRECTORY .. "/libs/functions/gematelier.lua") dofile(CORE_DIRECTORY .. "/libs/functions/fs.lua") +dofile(CORE_DIRECTORY .. "/libs/functions/functions.lua") dofile(CORE_DIRECTORY .. "/libs/functions/game.lua") +dofile(CORE_DIRECTORY .. "/libs/functions/gematelier.lua") dofile(CORE_DIRECTORY .. "/libs/functions/item.lua") dofile(CORE_DIRECTORY .. "/libs/functions/itemtype.lua") dofile(CORE_DIRECTORY .. "/libs/functions/lever.lua") @@ -20,14 +21,13 @@ dofile(CORE_DIRECTORY .. "/libs/functions/player.lua") dofile(CORE_DIRECTORY .. "/libs/functions/position.lua") dofile(CORE_DIRECTORY .. "/libs/functions/pronouns.lua") dofile(CORE_DIRECTORY .. "/libs/functions/quests.lua") +dofile(CORE_DIRECTORY .. "/libs/functions/queue.lua") dofile(CORE_DIRECTORY .. "/libs/functions/revscriptsys.lua") +dofile(CORE_DIRECTORY .. "/libs/functions/set.lua") dofile(CORE_DIRECTORY .. "/libs/functions/spawn.lua") dofile(CORE_DIRECTORY .. "/libs/functions/spectators.lua") -dofile(CORE_DIRECTORY .. "/libs/functions/bosslever.lua") dofile(CORE_DIRECTORY .. "/libs/functions/string.lua") dofile(CORE_DIRECTORY .. "/libs/functions/tables.lua") dofile(CORE_DIRECTORY .. "/libs/functions/teleport.lua") dofile(CORE_DIRECTORY .. "/libs/functions/tile.lua") dofile(CORE_DIRECTORY .. "/libs/functions/vocation.lua") -dofile(CORE_DIRECTORY .. "/libs/functions/set.lua") -dofile(CORE_DIRECTORY .. "/libs/functions/queue.lua") diff --git a/data/libs/systems/load.lua b/data/libs/systems/load.lua index 5c7073ad64e..281b8b1d466 100644 --- a/data/libs/systems/load.lua +++ b/data/libs/systems/load.lua @@ -9,4 +9,5 @@ dofile(CORE_DIRECTORY .. "/libs/systems/hazard.lua") dofile(CORE_DIRECTORY .. "/libs/systems/hireling.lua") dofile(CORE_DIRECTORY .. "/libs/systems/raids.lua") dofile(CORE_DIRECTORY .. "/libs/systems/reward_boss.lua") +dofile(CORE_DIRECTORY .. "/libs/systems/vip.lua") dofile(CORE_DIRECTORY .. "/libs/systems/zones.lua") diff --git a/data-otservbr-global/lib/others/vip_system.lua b/data/libs/systems/vip.lua similarity index 61% rename from data-otservbr-global/lib/others/vip_system.lua rename to data/libs/systems/vip.lua index 5a393157c8c..9e76fd8ad80 100644 --- a/data-otservbr-global/lib/others/vip_system.lua +++ b/data/libs/systems/vip.lua @@ -1,16 +1,10 @@ local config = { - activationMessage = "You have received %s VIP days.", - activationMessageType = MESSAGE_EVENT_ADVANCE, - - expirationMessage = "Your VIP days ran out.", - expirationMessageType = MESSAGE_ADMINISTRATOR, - outfits = {}, mounts = {}, } function Player.onRemoveVip(self) - self:sendTextMessage(config.expirationMessageType, config.expirationMessage) + self:sendTextMessage(MESSAGE_ADMINISTRATOR, "Your VIP status has expired. All VIP benefits have been removed.") for _, outfit in ipairs(config.outfits) do self:removeOutfit(outfit) @@ -21,13 +15,14 @@ function Player.onRemoveVip(self) end local playerOutfit = self:getOutfit() - if table.contains(config.outfits, self:getOutfit().lookType) then + if table.contains(config.outfits, playerOutfit.lookType) then if self:getSex() == PLAYERSEX_FEMALE then playerOutfit.lookType = 136 else playerOutfit.lookType = 128 end playerOutfit.lookAddons = 0 + self:setOutfit(playerOutfit) end @@ -36,7 +31,7 @@ end function Player.onAddVip(self, days, silent) if not silent then - self:sendTextMessage(config.activationMessageType, string.format(config.activationMessage, days)) + self:sendTextMessage(MESSAGE_EVENT_ADVANCE, string.format("You have been granted %s days of VIP status.", days)) end for _, outfit in ipairs(config.outfits) do @@ -52,16 +47,15 @@ end function CheckPremiumAndPrint(player, msgType) if player:getVipDays() == 0xFFFF then - player:sendTextMessage(msgType, "You have infinite amount of VIP days left.") + player:sendTextMessage(msgType, "You have an unlimited VIP status.") return true end local playerVipTime = player:getVipTime() if playerVipTime < os.time() then - local msg = "You do not have VIP on your account." - player:sendTextMessage(msgType, msg) + player:sendTextMessage(msgType, "Your VIP status is currently inactive.") return true end - player:sendTextMessage(msgType, string.format("You have %s of VIP time left.", getFormattedTimeRemaining(playerVipTime))) + player:sendTextMessage(msgType, string.format("You have %s of VIP time remaining.", getFormattedTimeRemaining(playerVipTime))) end diff --git a/data-otservbr-global/scripts/actions/other/hirelinglamp.lua b/data/scripts/actions/items/hireling_lamp.lua similarity index 93% rename from data-otservbr-global/scripts/actions/other/hirelinglamp.lua rename to data/scripts/actions/items/hireling_lamp.lua index 8117b5366bc..0ffed1fa744 100644 --- a/data-otservbr-global/scripts/actions/other/hirelinglamp.lua +++ b/data/scripts/actions/items/hireling_lamp.lua @@ -2,8 +2,9 @@ local hirelingLamp = Action() function hirelingLamp.onUse(player, item, fromPosition, target, toPosition, isHotkey) local spawnPosition = player:getPosition() - local hireling_id = item:getCustomAttribute("Hireling") + local hirelingId = item:getCustomAttribute("Hireling") local house = spawnPosition and spawnPosition:getTile() and spawnPosition:getTile():getHouse() or nil + if not house then player:getPosition():sendMagicEffect(CONST_ME_POFF) player:sendTextMessage(MESSAGE_FAILURE, "You may use this only inside a house.") @@ -22,10 +23,10 @@ function hirelingLamp.onUse(player, item, fromPosition, target, toPosition, isHo return false end - local hireling = getHirelingById(hireling_id) + local hireling = getHirelingById(hirelingId) if not hireling then player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "There was an error creating the hireling and it has been deleted, please, contact server admin.") - logger.warn("[hirelingLamp.onUse] Player {} is using hireling with id {} not exist in the database", player:getName(), hireling_id) + logger.warn("[hirelingLamp.onUse] Player {} is using hireling with id {} not exist in the database", player:getName(), hirelingId) logger.error("Deleted the lamp") item:remove(1) return true diff --git a/data/scripts/actions/objects/large_seashell.lua b/data/scripts/actions/objects/large_seashell.lua new file mode 100644 index 00000000000..c6d767146ec --- /dev/null +++ b/data/scripts/actions/objects/large_seashell.lua @@ -0,0 +1,30 @@ +local largeSeashell = Action() + +function largeSeashell.onUse(player, item, fromPosition, target, toPosition, isHotkey) + if player:hasExhaustion("delay-large-seashell") then + player:say("You have already opened a shell today.", TALKTYPE_MONSTER_SAY, false, player, item:getPosition()) + return true + end + + local chance = math.random(100) + local message = "Nothing is inside." + + if chance <= 16 then + doTargetCombatHealth(0, player, COMBAT_PHYSICALDAMAGE, -200, -200, CONST_ME_NONE) + message = "Ouch! You squeezed your fingers." + elseif chance > 16 and chance <= 64 then + Game.createItem(math.random(281, 282), 1, player:getPosition()) + message = "You found a beautiful pearl." + player:addAchievementProgress("Shell Seeker", 100) + end + + player:setExhaustion("delay-large-seashell", 20 * 60 * 60) + player:say(message, TALKTYPE_MONSTER_SAY, false, player, item:getPosition()) + item:transform(198) + item:decay() + item:getPosition():sendMagicEffect(CONST_ME_BUBBLES) + return true +end + +largeSeashell:id(197) +largeSeashell:register() diff --git a/data-otservbr-global/scripts/globalevents/others/bosslever_death.lua b/data/scripts/creaturescripts/monster/boss_lever_death.lua similarity index 99% rename from data-otservbr-global/scripts/globalevents/others/bosslever_death.lua rename to data/scripts/creaturescripts/monster/boss_lever_death.lua index 9538fe15eb7..a2c58d1e43b 100644 --- a/data-otservbr-global/scripts/globalevents/others/bosslever_death.lua +++ b/data/scripts/creaturescripts/monster/boss_lever_death.lua @@ -1,22 +1,28 @@ local onBossDeath = CreatureEvent("BossLeverOnDeath") + function onBossDeath.onDeath(creature) if not creature then return true end + local name = creature:getName() local key = "boss." .. toKey(name) local zone = Zone(key) + if not zone then return true end + local bossLever = BossLever[name] if not bossLever then return true end + if bossLever.timeoutEvent then stopEvent(bossLever.timeoutEvent) bossLever.timeoutEvent = nil end + if bossLever.timeAfterKill > 0 then zone:sendTextMessage(MESSAGE_EVENT_ADVANCE, "The " .. name .. " has been defeated. You have " .. bossLever.timeAfterKill .. " seconds to leave the room.") bossLever.timeoutEvent = addEvent(function(zn) @@ -26,4 +32,5 @@ function onBossDeath.onDeath(creature) end return true end + onBossDeath:register() diff --git a/data-canary/scripts/creaturescripts/forge_kill.lua b/data/scripts/creaturescripts/monster/forge_kill.lua similarity index 100% rename from data-canary/scripts/creaturescripts/forge_kill.lua rename to data/scripts/creaturescripts/monster/forge_kill.lua diff --git a/data-otservbr-global/scripts/creaturescripts/others/adventure_blessing_login.lua b/data/scripts/creaturescripts/player/adventure_blessing_login.lua similarity index 99% rename from data-otservbr-global/scripts/creaturescripts/others/adventure_blessing_login.lua rename to data/scripts/creaturescripts/player/adventure_blessing_login.lua index df04052716f..8ebf88a72e9 100644 --- a/data-otservbr-global/scripts/creaturescripts/others/adventure_blessing_login.lua +++ b/data/scripts/creaturescripts/player/adventure_blessing_login.lua @@ -1,6 +1,7 @@ dofile(CORE_DIRECTORY .. "/modules/scripts/blessings/blessings.lua") local adventurerBlessingLogin = CreatureEvent("AdventurerBlessingLogin") + function adventurerBlessingLogin.onLogin(player) return Blessings.doAdventurerBlessing(player) end diff --git a/data/scripts/creaturescripts/player/login.lua b/data/scripts/creaturescripts/player/login.lua index 34d139a047d..fbe4f9e63b6 100644 --- a/data/scripts/creaturescripts/player/login.lua +++ b/data/scripts/creaturescripts/player/login.lua @@ -49,10 +49,8 @@ function playerLoginGlobal.onLogin(player) end -- Boosted - player:sendTextMessage(MESSAGE_BOOSTED_CREATURE, "Today's boosted creature: " .. Game.getBoostedCreature() .. " \ - Boosted creatures yield more experience points, carry more loot than usual and respawn at a faster rate.") - player:sendTextMessage(MESSAGE_BOOSTED_CREATURE, "Today's boosted boss: " .. Game.getBoostedBoss() .. " \ - Boosted bosses contain more loot and count more kills for your Bosstiary.") + player:sendTextMessage(MESSAGE_BOOSTED_CREATURE, string.format("Today's boosted creature: %s.\nBoosted creatures yield more experience points, carry more loot than usual, and respawn at a faster rate.", Game.getBoostedCreature())) + player:sendTextMessage(MESSAGE_BOOSTED_CREATURE, string.format("Today's boosted boss: %s.\nBoosted bosses contain more loot and count more kills for your Bosstiary.", Game.getBoostedBoss())) -- Rewards local rewards = #player:getRewardList() @@ -118,6 +116,24 @@ function playerLoginGlobal.onLogin(player) player:setStaminaXpBoost(player:getFinalBonusStamina() * 100) player:getFinalLowLevelBonus() + -- Updates the player's VIP status and executes corresponding actions if applicable. + if configManager.getBoolean(configKeys.VIP_SYSTEM_ENABLED) then + local isVipNow = player:isVip() + local wasVip = player:kv():scoped("account"):get("vip-system") or false + + if wasVip ~= isVipNow then + if wasVip then + player:onRemoveVip() + else + player:onAddVip(player:getVipDays()) + end + end + + if isVipNow then + CheckPremiumAndPrint(player, MESSAGE_LOGIN) + end + end + -- Set Ghost Mode if player:getGroup():getId() >= GROUP_TYPE_GAMEMASTER then player:setGhostMode(true) diff --git a/data-otservbr-global/scripts/weapons/dawnport_weapon.lua b/data/scripts/weapons/dawnport_weapons.lua similarity index 100% rename from data-otservbr-global/scripts/weapons/dawnport_weapon.lua rename to data/scripts/weapons/dawnport_weapons.lua diff --git a/data-otservbr-global/scripts/weapons/scripts/burst_arrow.lua b/data/scripts/weapons/scripts/burst_arrow.lua similarity index 100% rename from data-otservbr-global/scripts/weapons/scripts/burst_arrow.lua rename to data/scripts/weapons/scripts/burst_arrow.lua diff --git a/data-otservbr-global/scripts/weapons/scripts/diamond_arrow.lua b/data/scripts/weapons/scripts/diamond_arrow.lua similarity index 100% rename from data-otservbr-global/scripts/weapons/scripts/diamond_arrow.lua rename to data/scripts/weapons/scripts/diamond_arrow.lua diff --git a/data-otservbr-global/scripts/weapons/scripts/poison_arrow.lua b/data/scripts/weapons/scripts/poison_arrow.lua similarity index 100% rename from data-otservbr-global/scripts/weapons/scripts/poison_arrow.lua rename to data/scripts/weapons/scripts/poison_arrow.lua diff --git a/data-otservbr-global/scripts/weapons/scripts/viper_star.lua b/data/scripts/weapons/scripts/viper_star.lua similarity index 100% rename from data-otservbr-global/scripts/weapons/scripts/viper_star.lua rename to data/scripts/weapons/scripts/viper_star.lua From 8af607bdf87ab8004ed01e9557175f2d33116eec Mon Sep 17 00:00:00 2001 From: Paulo Henrique Lisboa Date: Tue, 11 Jun 2024 10:05:04 -0300 Subject: [PATCH 22/50] fix: docker ubuntu package and start.sh permission (#2681) --- docker/Dockerfile.dev | 6 +++--- docker/data/start.sh | 4 ++-- docker/docker-compose.yml | 2 -- start.sh | 0 4 files changed, 5 insertions(+), 7 deletions(-) mode change 100644 => 100755 start.sh diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 161a80a2e21..4cd63334d5e 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,10 +1,10 @@ # Stage 1: Download all dependencies -FROM ubuntu:23.04 AS dependencies +FROM ubuntu:24.04 AS dependencies RUN --mount=type=cache,target=/var/cache/apt \ apt-get update && apt-get install -y --no-install-recommends cmake git \ unzip build-essential ca-certificates curl zip unzip tar \ - pkg-config ninja-build autoconf automake libtool \ + pkg-config ninja-build autoconf automake libtool glibc-tools \ python3 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -32,7 +32,7 @@ COPY recompile.sh CMakeLists.txt CMakePresets.json vcpkg.json ./ RUN ./recompile.sh "/opt" # Stage 3: execute -FROM ubuntu:23.04 AS prod +FROM ubuntu:24.04 AS prod COPY --from=build /srv/build/build/linux-release/bin/canary /bin/canary WORKDIR /srv/canary ENTRYPOINT ["/srv/canary/start.sh", "canary"] diff --git a/docker/data/start.sh b/docker/data/start.sh index db688b488d0..c7d10fa0fdb 100755 --- a/docker/data/start.sh +++ b/docker/data/start.sh @@ -10,8 +10,8 @@ OT_SERVER_LOGIN_PORT="${OT_SERVER_LOGIN_PORT:-7171}" OT_SERVER_GAME_PORT="${OT_SERVER_GAME_PORT:-7172}" OT_SERVER_STATUS_PORT="${OT_SERVER_STATUS_PORT:-7171}" OT_SERVER_TEST_ACCOUNTS="${OT_SERVER_TEST_ACCOUNTS:-false}" -OT_SERVER_DATA="${OT_SERVER_DATA:-data-canary}" -OT_SERVER_MAP="${OT_SERVER_MAP:-https://github.com/opentibiabr/otservbr-global/releases/download/v1.5.0/otservbr.otbm}" +OT_SERVER_DATA="${OT_SERVER_DATA:-data-otservbr-global}" +OT_SERVER_MAP="${OT_SERVER_MAP:-https://github.com/opentibiabr/canary/releases/download/v3.1.0/otservbr.otbm}" echo "" echo "===== Print Variables =====" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 46a2fb619b2..88fd938e500 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,3 @@ ---- -version: '3.8' name: otbr services: database: diff --git a/start.sh b/start.sh old mode 100644 new mode 100755 From ede4b035bcb3c664bd42c757f1d4466b8d7b5c43 Mon Sep 17 00:00:00 2001 From: Felipe Paluco <87909998+FelipePaluco@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:05:20 -0300 Subject: [PATCH 23/50] feat: rebalancing monsters (#2683) --- data-canary/monster/demons/fury.lua | 2 +- data-canary/monster/demons/juggernaut.lua | 4 ++-- .../monster/aquatics/quara_constrictor.lua | 2 +- .../monster/aquatics/quara_hydromancer.lua | 2 +- .../monster/aquatics/quara_mantassin.lua | 2 +- .../monster/aquatics/quara_pincher.lua | 2 +- .../monster/aquatics/quara_predator.lua | 2 +- data-otservbr-global/monster/bosses/splasher.lua | 2 +- .../monster/constructs/clay_guardian.lua | 2 +- .../monster/constructs/infected_weeper.lua | 2 +- .../monster/constructs/lava_golem.lua | 3 +-- .../monster/constructs/magma_crawler.lua | 8 ++++---- .../monster/constructs/orewalker.lua | 3 +-- .../monster/constructs/stone_devourer.lua | 2 +- data-otservbr-global/monster/constructs/weeper.lua | 6 +++--- .../monster/demons/hellfire_fighter.lua | 2 +- .../monster/elementals/cliff_strider.lua | 6 +++--- .../monster/elementals/earth_elemental.lua | 4 ++-- .../monster/elementals/high_voltage_elemental.lua | 2 +- .../monster/elementals/ironblight.lua | 2 +- .../monster/elementals/massive_earth_elemental.lua | 4 ++-- .../monster/elementals/sulphur_spouter.lua | 2 +- .../monster/humanoids/lost_basher.lua | 6 +++--- .../monster/humanoids/lost_berserker.lua | 12 +++++------- .../monster/humanoids/lost_husher.lua | 9 ++++----- .../monster/humanoids/lost_thrower.lua | 6 +++--- data-otservbr-global/monster/magicals/armadile.lua | 13 +++++-------- .../monster/magicals/choking_fear.lua | 2 +- data-otservbr-global/monster/magicals/phantasm.lua | 2 +- .../monster/magicals/retching_horror.lua | 2 +- .../monster/mammals/mutated_bat.lua | 2 +- .../monster/plants/hideous_fungus.lua | 13 ++++++------- .../monster/plants/humongous_fungus.lua | 7 +++---- .../quests/bigfoots_burden/bosses/abyssador.lua | 2 +- .../quests/bigfoots_burden/bosses/gnomevil.lua | 2 +- .../quests/bigfoots_burden/humorless_fungus.lua | 9 +++------ .../bosses/the_count_of_the_core.lua | 2 +- .../bosses/the_duke_of_the_depths.lua | 2 +- .../bosses/ferumbras_mortal_shell.lua | 2 +- .../quests/ferumbras_ascendant/bosses/mazoran.lua | 2 +- .../quests/ferumbras_ascendant/bosses/plagirath.lua | 2 +- .../quests/ferumbras_ascendant/bosses/ragiaz.lua | 2 +- .../quests/ferumbras_ascendant/bosses/razzagorn.lua | 2 +- .../quests/ferumbras_ascendant/bosses/shulgrax.lua | 2 +- .../quests/ferumbras_ascendant/bosses/tarbaz.lua | 2 +- .../quests/ferumbras_ascendant/bosses/zamulosh.lua | 2 +- .../monster/quests/in_service_of_yalahar/inky.lua | 2 +- .../quests/in_service_of_yalahar/sharptooth.lua | 2 +- .../monster/reptiles/seacrest_serpent.lua | 2 +- .../monster/reptiles/young_sea_serpent.lua | 2 +- .../monster/undeads/betrayed_wraith.lua | 2 +- .../monster/undeads/blightwalker.lua | 7 +++---- .../monster/undeads/crypt_warrior.lua | 2 +- .../monster/undeads/falcon_knight.lua | 2 +- .../monster/undeads/falcon_paladin.lua | 2 +- .../monster/undeads/hand_of_cursed_fate.lua | 4 ++-- .../monster/undeads/skeleton_elite_warrior.lua | 2 +- .../monster/undeads/undead_dragon.lua | 2 +- .../monster/undeads/undead_elite_gladiator.lua | 2 +- .../monster/vermins/cave_devourer.lua | 4 ++-- .../monster/vermins/chasm_spawn.lua | 4 ++-- data-otservbr-global/monster/vermins/deepworm.lua | 2 +- data-otservbr-global/monster/vermins/diremaw.lua | 2 +- data-otservbr-global/monster/vermins/drillworm.lua | 2 +- .../monster/vermins/tunnel_tyrant.lua | 4 ++-- ...d_,master_oberon.lua => grand_master_oberon.lua} | 0 66 files changed, 105 insertions(+), 119 deletions(-) rename data-otservbr-global/scripts/actions/bosses_levers/{grand_,master_oberon.lua => grand_master_oberon.lua} (100%) diff --git a/data-canary/monster/demons/fury.lua b/data-canary/monster/demons/fury.lua index 3835050ce67..a01553afeed 100644 --- a/data-canary/monster/demons/fury.lua +++ b/data-canary/monster/demons/fury.lua @@ -125,7 +125,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 30 }, + { type = COMBAT_ICEDAMAGE, percent = 5 }, { type = COMBAT_HOLYDAMAGE, percent = 30 }, { type = COMBAT_DEATHDAMAGE, percent = -10 }, } diff --git a/data-canary/monster/demons/juggernaut.lua b/data-canary/monster/demons/juggernaut.lua index 7b3e3d1795b..704ce847f13 100644 --- a/data-canary/monster/demons/juggernaut.lua +++ b/data-canary/monster/demons/juggernaut.lua @@ -27,8 +27,8 @@ monster.Bestiary = { The Blood Halls, The Vats, The Hive, The Shadow Nexus, a room deep in Formorgar Mines, Roshamuul Prison, Oramond Dungeon, Grounds of Destruction.", } -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-otservbr-global/monster/aquatics/quara_constrictor.lua b/data-otservbr-global/monster/aquatics/quara_constrictor.lua index 02b4877620e..c04460f1f50 100644 --- a/data-otservbr-global/monster/aquatics/quara_constrictor.lua +++ b/data-otservbr-global/monster/aquatics/quara_constrictor.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Quara Constrictor") local monster = {} monster.description = "a quara constrictor" -monster.experience = 250 +monster.experience = 380 monster.outfit = { lookType = 46, lookHead = 0, diff --git a/data-otservbr-global/monster/aquatics/quara_hydromancer.lua b/data-otservbr-global/monster/aquatics/quara_hydromancer.lua index 4129dcfe81c..07c3ffbfda3 100644 --- a/data-otservbr-global/monster/aquatics/quara_hydromancer.lua +++ b/data-otservbr-global/monster/aquatics/quara_hydromancer.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Quara Hydromancer") local monster = {} monster.description = "a quara hydromancer" -monster.experience = 800 +monster.experience = 950 monster.outfit = { lookType = 47, lookHead = 0, diff --git a/data-otservbr-global/monster/aquatics/quara_mantassin.lua b/data-otservbr-global/monster/aquatics/quara_mantassin.lua index 53594881d50..3e857cab7f2 100644 --- a/data-otservbr-global/monster/aquatics/quara_mantassin.lua +++ b/data-otservbr-global/monster/aquatics/quara_mantassin.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Quara Mantassin") local monster = {} monster.description = "a quara mantassin" -monster.experience = 400 +monster.experience = 600 monster.outfit = { lookType = 72, lookHead = 0, diff --git a/data-otservbr-global/monster/aquatics/quara_pincher.lua b/data-otservbr-global/monster/aquatics/quara_pincher.lua index 200aed87628..09fea436314 100644 --- a/data-otservbr-global/monster/aquatics/quara_pincher.lua +++ b/data-otservbr-global/monster/aquatics/quara_pincher.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Quara Pincher") local monster = {} monster.description = "a quara pincher" -monster.experience = 1200 +monster.experience = 1500 monster.outfit = { lookType = 77, lookHead = 0, diff --git a/data-otservbr-global/monster/aquatics/quara_predator.lua b/data-otservbr-global/monster/aquatics/quara_predator.lua index e513aa5712c..b12719e26f8 100644 --- a/data-otservbr-global/monster/aquatics/quara_predator.lua +++ b/data-otservbr-global/monster/aquatics/quara_predator.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Quara Predator") local monster = {} monster.description = "a quara predator" -monster.experience = 1600 +monster.experience = 1850 monster.outfit = { lookType = 20, lookHead = 0, diff --git a/data-otservbr-global/monster/bosses/splasher.lua b/data-otservbr-global/monster/bosses/splasher.lua index 60b89710c4f..426d3be3c26 100644 --- a/data-otservbr-global/monster/bosses/splasher.lua +++ b/data-otservbr-global/monster/bosses/splasher.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Splasher") local monster = {} monster.description = "Splasher" -monster.experience = 500 +monster.experience = 1500 monster.outfit = { lookType = 47, lookHead = 0, diff --git a/data-otservbr-global/monster/constructs/clay_guardian.lua b/data-otservbr-global/monster/constructs/clay_guardian.lua index 804d671bdf9..fb28abe50c3 100644 --- a/data-otservbr-global/monster/constructs/clay_guardian.lua +++ b/data-otservbr-global/monster/constructs/clay_guardian.lua @@ -107,7 +107,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 35 }, + { type = COMBAT_ICEDAMAGE, percent = 20 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, { type = COMBAT_DEATHDAMAGE, percent = 40 }, } diff --git a/data-otservbr-global/monster/constructs/infected_weeper.lua b/data-otservbr-global/monster/constructs/infected_weeper.lua index e302618f3eb..2b7d97f0479 100644 --- a/data-otservbr-global/monster/constructs/infected_weeper.lua +++ b/data-otservbr-global/monster/constructs/infected_weeper.lua @@ -105,7 +105,7 @@ monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 50 }, { type = COMBAT_ENERGYDAMAGE, percent = 25 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, - { type = COMBAT_FIREDAMAGE, percent = 100 }, + { type = COMBAT_FIREDAMAGE, percent = -100 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/constructs/lava_golem.lua b/data-otservbr-global/monster/constructs/lava_golem.lua index aed9ad864c0..5c3f695cf32 100644 --- a/data-otservbr-global/monster/constructs/lava_golem.lua +++ b/data-otservbr-global/monster/constructs/lava_golem.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Lava Golem") local monster = {} monster.description = "a lava golem" -monster.experience = 6200 +monster.experience = 7900 monster.outfit = { lookType = 491, lookHead = 0, @@ -109,7 +109,6 @@ monster.loot = { monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -400 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -350, maxDamage = -700, length = 8, spread = 0, effect = CONST_ME_FIREATTACK, target = false }, - { name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -600, maxDamage = -1300, length = 8, spread = 3, effect = CONST_ME_MORTAREA, target = false }, { name = "lava golem soulfire", interval = 2000, chance = 15, target = false }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -220, maxDamage = -350, radius = 4, effect = CONST_ME_FIREAREA, target = true }, { name = "speed", interval = 2000, chance = 10, speedChange = -800, length = 5, spread = 3, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 }, diff --git a/data-otservbr-global/monster/constructs/magma_crawler.lua b/data-otservbr-global/monster/constructs/magma_crawler.lua index 39c58ab8838..bf5f7ac4feb 100644 --- a/data-otservbr-global/monster/constructs/magma_crawler.lua +++ b/data-otservbr-global/monster/constructs/magma_crawler.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Magma Crawler") local monster = {} monster.description = "a magma crawler" -monster.experience = 2700 +monster.experience = 3900 monster.outfit = { lookType = 492, lookHead = 0, @@ -35,7 +35,7 @@ monster.manaCost = 0 monster.changeTarget = { interval = 4000, - chance = 10, + chance = 5, } monster.strategiesTarget = { @@ -118,7 +118,7 @@ monster.defenses = { defense = 45, armor = 84, mitigation = 2.51, - { name = "invisible", interval = 2000, chance = 10, effect = CONST_ME_MAGIC_BLUE }, + { name = "invisible", interval = 2000, chance = 5, effect = CONST_ME_MAGIC_BLUE }, } monster.elements = { @@ -129,7 +129,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 10 }, + { type = COMBAT_ICEDAMAGE, percent = 0 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, { type = COMBAT_DEATHDAMAGE, percent = 25 }, } diff --git a/data-otservbr-global/monster/constructs/orewalker.lua b/data-otservbr-global/monster/constructs/orewalker.lua index 767b8a049ae..3e1dc4deedd 100644 --- a/data-otservbr-global/monster/constructs/orewalker.lua +++ b/data-otservbr-global/monster/constructs/orewalker.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Orewalker") local monster = {} monster.description = "an orewalker" -monster.experience = 4800 +monster.experience = 5900 monster.outfit = { lookType = 490, lookHead = 0, @@ -112,7 +112,6 @@ monster.attacks = { { name = "combat", interval = 2000, chance = 10, type = COMBAT_PHYSICALDAMAGE, minDamage = 0, maxDamage = -1500, length = 6, spread = 3, effect = CONST_ME_GROUNDSHAKER, target = false }, -- poison { name = "condition", type = CONDITION_POISON, interval = 2000, chance = 10, minDamage = -800, maxDamage = -1080, radius = 3, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_SMALLPLANTS, target = true }, - { name = "drunk", interval = 2000, chance = 15, radius = 4, effect = CONST_ME_SOUND_PURPLE, target = false, duration = 6000 }, { name = "speed", interval = 2000, chance = 15, speedChange = -800, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 }, } diff --git a/data-otservbr-global/monster/constructs/stone_devourer.lua b/data-otservbr-global/monster/constructs/stone_devourer.lua index 5a9174c3129..39c85402870 100644 --- a/data-otservbr-global/monster/constructs/stone_devourer.lua +++ b/data-otservbr-global/monster/constructs/stone_devourer.lua @@ -118,7 +118,7 @@ monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 10 }, { type = COMBAT_ENERGYDAMAGE, percent = 30 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, - { type = COMBAT_FIREDAMAGE, percent = 100 }, + { type = COMBAT_FIREDAMAGE, percent = -5 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/constructs/weeper.lua b/data-otservbr-global/monster/constructs/weeper.lua index 75a8d7ebb42..cfc7c6b0d68 100644 --- a/data-otservbr-global/monster/constructs/weeper.lua +++ b/data-otservbr-global/monster/constructs/weeper.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Weeper") local monster = {} monster.description = "a weeper" -monster.experience = 4800 +monster.experience = 5800 monster.outfit = { lookType = 489, lookHead = 0, @@ -55,7 +55,7 @@ monster.flags = { canPushCreatures = true, staticAttackChance = 70, targetDistance = 1, - runHealth = 570, + runHealth = 0, healthHidden = false, isBlockable = false, canWalkOnEnergy = false, @@ -101,7 +101,7 @@ monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -450 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_FIREDAMAGE, minDamage = -400, maxDamage = -1000, length = 8, spread = 0, effect = CONST_ME_FIREATTACK, target = false }, { name = "combat", interval = 3000, chance = 100, type = COMBAT_FIREDAMAGE, minDamage = -80, maxDamage = -250, radius = 3, effect = CONST_ME_HITBYFIRE, target = false }, - { name = "speed", interval = 2000, chance = 10, speedChange = -800, length = 5, spread = 0, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 }, + { name = "speed", interval = 2000, chance = 10, speedChange = -600, length = 5, spread = 0, effect = CONST_ME_BLOCKHIT, target = false, duration = 30000 }, } monster.defenses = { diff --git a/data-otservbr-global/monster/demons/hellfire_fighter.lua b/data-otservbr-global/monster/demons/hellfire_fighter.lua index 6a90b5af06d..2ae5b00303a 100644 --- a/data-otservbr-global/monster/demons/hellfire_fighter.lua +++ b/data-otservbr-global/monster/demons/hellfire_fighter.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Hellfire Fighter") local monster = {} monster.description = "a hellfire fighter" -monster.experience = 3400 +monster.experience = 3800 monster.outfit = { lookType = 243, lookHead = 0, diff --git a/data-otservbr-global/monster/elementals/cliff_strider.lua b/data-otservbr-global/monster/elementals/cliff_strider.lua index 2690f356f23..2e143d42796 100644 --- a/data-otservbr-global/monster/elementals/cliff_strider.lua +++ b/data-otservbr-global/monster/elementals/cliff_strider.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Cliff Strider") local monster = {} monster.description = "a cliff strider" -monster.experience = 5700 +monster.experience = 7100 monster.outfit = { lookType = 497, lookHead = 0, @@ -119,7 +119,7 @@ monster.attacks = { { name = "cliff strider skill reducer", interval = 2000, chance = 10, target = false }, { name = "cliff strider electrify", interval = 2000, chance = 15, range = 1, target = false }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_PHYSICALDAMAGE, minDamage = 0, maxDamage = -1000, length = 6, spread = 0, effect = CONST_ME_GROUNDSHAKER, target = false }, - { name = "combat", interval = 2000, chance = 15, type = COMBAT_MANADRAIN, minDamage = -100, maxDamage = -300, radius = 4, effect = CONST_ME_YELLOWENERGY, target = false }, + { name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -100, maxDamage = -300, radius = 4, effect = CONST_ME_YELLOWENERGY, target = false }, } monster.defenses = { @@ -130,7 +130,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 10 }, - { type = COMBAT_ENERGYDAMAGE, percent = 100 }, + { type = COMBAT_ENERGYDAMAGE, percent = 5 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 20 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, diff --git a/data-otservbr-global/monster/elementals/earth_elemental.lua b/data-otservbr-global/monster/elementals/earth_elemental.lua index f71d6a7964d..4c3b3e11aa3 100644 --- a/data-otservbr-global/monster/elementals/earth_elemental.lua +++ b/data-otservbr-global/monster/elementals/earth_elemental.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Earth Elemental") local monster = {} monster.description = "an earth elemental" -monster.experience = 450 +monster.experience = 550 monster.outfit = { lookType = 301, lookHead = 0, @@ -117,7 +117,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 85 }, + { type = COMBAT_ICEDAMAGE, percent = 5 }, { type = COMBAT_HOLYDAMAGE, percent = 50 }, { type = COMBAT_DEATHDAMAGE, percent = 40 }, } diff --git a/data-otservbr-global/monster/elementals/high_voltage_elemental.lua b/data-otservbr-global/monster/elementals/high_voltage_elemental.lua index ca99e57527e..3d6806a707b 100644 --- a/data-otservbr-global/monster/elementals/high_voltage_elemental.lua +++ b/data-otservbr-global/monster/elementals/high_voltage_elemental.lua @@ -102,7 +102,7 @@ monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 35 }, { type = COMBAT_ENERGYDAMAGE, percent = 100 }, { type = COMBAT_EARTHDAMAGE, percent = -15 }, - { type = COMBAT_FIREDAMAGE, percent = 100 }, + { type = COMBAT_FIREDAMAGE, percent = -100 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/elementals/ironblight.lua b/data-otservbr-global/monster/elementals/ironblight.lua index 593069318ed..7cb7c7c58fc 100644 --- a/data-otservbr-global/monster/elementals/ironblight.lua +++ b/data-otservbr-global/monster/elementals/ironblight.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Ironblight") local monster = {} monster.description = "an ironblight" -monster.experience = 4400 +monster.experience = 5400 monster.outfit = { lookType = 498, lookHead = 0, diff --git a/data-otservbr-global/monster/elementals/massive_earth_elemental.lua b/data-otservbr-global/monster/elementals/massive_earth_elemental.lua index e894319b6ec..1b131e7c7ae 100644 --- a/data-otservbr-global/monster/elementals/massive_earth_elemental.lua +++ b/data-otservbr-global/monster/elementals/massive_earth_elemental.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Massive Earth Elemental") local monster = {} monster.description = "a massive earth elemental" -monster.experience = 950 +monster.experience = 1100 monster.outfit = { lookType = 285, lookHead = 0, @@ -119,7 +119,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 100 }, + { type = COMBAT_ICEDAMAGE, percent = 15 }, { type = COMBAT_HOLYDAMAGE, percent = 50 }, { type = COMBAT_DEATHDAMAGE, percent = 45 }, } diff --git a/data-otservbr-global/monster/elementals/sulphur_spouter.lua b/data-otservbr-global/monster/elementals/sulphur_spouter.lua index 6f574cc0a07..79ebcf8db4b 100644 --- a/data-otservbr-global/monster/elementals/sulphur_spouter.lua +++ b/data-otservbr-global/monster/elementals/sulphur_spouter.lua @@ -105,7 +105,7 @@ monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 0 }, { type = COMBAT_ENERGYDAMAGE, percent = 0 }, { type = COMBAT_EARTHDAMAGE, percent = 0 }, - { type = COMBAT_FIREDAMAGE, percent = 100 }, + { type = COMBAT_FIREDAMAGE, percent = 25 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/humanoids/lost_basher.lua b/data-otservbr-global/monster/humanoids/lost_basher.lua index e19aef97f78..f8866bdd177 100644 --- a/data-otservbr-global/monster/humanoids/lost_basher.lua +++ b/data-otservbr-global/monster/humanoids/lost_basher.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Lost Basher") local monster = {} monster.description = "a lost basher" -monster.experience = 1800 +monster.experience = 2300 monster.outfit = { lookType = 538, lookHead = 0, @@ -61,7 +61,7 @@ monster.flags = { healthHidden = false, isBlockable = false, canWalkOnEnergy = false, - canWalkOnFire = false, + canWalkOnFire = true, canWalkOnPoison = true, } @@ -126,7 +126,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 20 }, + { type = COMBAT_ICEDAMAGE, percent = 0 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, { type = COMBAT_DEATHDAMAGE, percent = 15 }, } diff --git a/data-otservbr-global/monster/humanoids/lost_berserker.lua b/data-otservbr-global/monster/humanoids/lost_berserker.lua index cd48787df95..cbc7012ff95 100644 --- a/data-otservbr-global/monster/humanoids/lost_berserker.lua +++ b/data-otservbr-global/monster/humanoids/lost_berserker.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Lost Berserker") local monster = {} monster.description = "a lost berserker" -monster.experience = 4400 +monster.experience = 4800 monster.outfit = { lookType = 496, lookHead = 0, @@ -111,27 +111,25 @@ monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -501 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_PHYSICALDAMAGE, minDamage = 0, maxDamage = -300, range = 7, shootEffect = CONST_ANI_WHIRLWINDAXE, target = false }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_PHYSICALDAMAGE, minDamage = 0, maxDamage = -250, range = 7, radius = 3, shootEffect = CONST_ANI_EXPLOSION, effect = CONST_ME_EXPLOSIONAREA, target = true }, - { name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -150, maxDamage = -250, radius = 5, effect = CONST_ME_MAGIC_RED, target = false }, + { name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -50, maxDamage = -100, radius = 5, effect = CONST_ME_MAGIC_RED, target = false }, { name = "speed", interval = 2000, chance = 10, speedChange = -800, radius = 2, effect = CONST_ME_MAGIC_RED, target = false, duration = 20000 }, - { name = "drunk", interval = 2000, chance = 10, radius = 4, effect = CONST_ME_STUN, target = true, duration = 6000 }, } monster.defenses = { defense = 40, armor = 80, mitigation = 2.40, - { name = "invisible", interval = 2000, chance = 5, effect = CONST_ME_TELEPORT }, } monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 20 }, - { type = COMBAT_ENERGYDAMAGE, percent = 17 }, + { type = COMBAT_ENERGYDAMAGE, percent = 100 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 10 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 40 }, + { type = COMBAT_ICEDAMAGE, percent = 10 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, { type = COMBAT_DEATHDAMAGE, percent = 15 }, } @@ -139,7 +137,7 @@ monster.elements = { monster.immunities = { { type = "paralyze", condition = true }, { type = "outfit", condition = false }, - { type = "invisible", condition = true }, + { type = "invisible", condition = false }, { type = "bleed", condition = false }, } diff --git a/data-otservbr-global/monster/humanoids/lost_husher.lua b/data-otservbr-global/monster/humanoids/lost_husher.lua index d8167f9710d..419bae1ab96 100644 --- a/data-otservbr-global/monster/humanoids/lost_husher.lua +++ b/data-otservbr-global/monster/humanoids/lost_husher.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Lost Husher") local monster = {} monster.description = "a lost husher" -monster.experience = 1800 +monster.experience = 1100 monster.outfit = { lookType = 537, lookHead = 0, @@ -61,7 +61,7 @@ monster.flags = { healthHidden = false, isBlockable = false, canWalkOnEnergy = false, - canWalkOnFire = false, + canWalkOnFire = true, canWalkOnPoison = true, } @@ -103,7 +103,6 @@ monster.loot = { monster.attacks = { { name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -150, maxDamage = -300, length = 6, spread = 0, effect = CONST_ME_BLACKSMOKE, target = false }, - { name = "combat", interval = 2000, chance = 10, type = COMBAT_MANADRAIN, minDamage = -150, maxDamage = -250, radius = 5, effect = CONST_ME_BLACKSMOKE, target = false }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_DEATHDAMAGE, minDamage = -150, maxDamage = -200, range = 7, shootEffect = CONST_ANI_SUDDENDEATH, effect = CONST_ME_MORTAREA, target = false }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_EARTHDAMAGE, minDamage = -150, maxDamage = -250, range = 7, radius = 2, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_MAGIC_GREEN, target = true }, { name = "drunk", interval = 2000, chance = 10, radius = 4, effect = CONST_ME_SOUND_RED, target = false, duration = 6000 }, @@ -125,7 +124,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 15 }, + { type = COMBAT_ICEDAMAGE, percent = 0 }, { type = COMBAT_HOLYDAMAGE, percent = -10 }, { type = COMBAT_DEATHDAMAGE, percent = 20 }, } @@ -133,7 +132,7 @@ monster.elements = { monster.immunities = { { type = "paralyze", condition = true }, { type = "outfit", condition = false }, - { type = "invisible", condition = true }, + { type = "invisible", condition = false }, { type = "bleed", condition = false }, } diff --git a/data-otservbr-global/monster/humanoids/lost_thrower.lua b/data-otservbr-global/monster/humanoids/lost_thrower.lua index c2a87f0d551..21a14bce085 100644 --- a/data-otservbr-global/monster/humanoids/lost_thrower.lua +++ b/data-otservbr-global/monster/humanoids/lost_thrower.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Lost Thrower") local monster = {} monster.description = "a lost thrower" -monster.experience = 1200 +monster.experience = 1500 monster.outfit = { lookType = 539, lookHead = 0, @@ -61,7 +61,7 @@ monster.flags = { healthHidden = false, isBlockable = false, canWalkOnEnergy = false, - canWalkOnFire = false, + canWalkOnFire = true, canWalkOnPoison = true, } @@ -117,7 +117,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 15 }, + { type = COMBAT_ICEDAMAGE, percent = -5 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, { type = COMBAT_DEATHDAMAGE, percent = 10 }, } diff --git a/data-otservbr-global/monster/magicals/armadile.lua b/data-otservbr-global/monster/magicals/armadile.lua index beca89510f4..98665845d28 100644 --- a/data-otservbr-global/monster/magicals/armadile.lua +++ b/data-otservbr-global/monster/magicals/armadile.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Armadile") local monster = {} monster.description = "an armadile" -monster.experience = 2900 +monster.experience = 3200 monster.outfit = { lookType = 487, lookHead = 0, @@ -56,8 +56,8 @@ monster.flags = { canPushItems = false, canPushCreatures = true, staticAttackChance = 90, - targetDistance = 4, - runHealth = 300, + targetDistance = 1, + runHealth = 0, healthHidden = false, isBlockable = false, canWalkOnEnergy = false, @@ -102,9 +102,7 @@ monster.loot = { monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -150 }, - { name = "drunk", interval = 2000, chance = 15, radius = 4, effect = CONST_ME_FIREAREA, target = true, duration = 5000 }, - { name = "combat", interval = 2000, chance = 15, type = COMBAT_MANADRAIN, minDamage = -430, maxDamage = -550, range = 7, effect = CONST_ME_MAGIC_BLUE, target = false }, - -- poison + { name = "drunk", interval = 2000, chance = 10, radius = 4, effect = CONST_ME_FIREAREA, target = true, duration = 5000 }, { name = "condition", type = CONDITION_POISON, interval = 2000, chance = 15, minDamage = -200, maxDamage = -400, radius = 4, effect = CONST_ME_POISONAREA, target = false }, } @@ -112,14 +110,13 @@ monster.defenses = { defense = 25, armor = 66, mitigation = 1.96, - { name = "invisible", interval = 2000, chance = 15, effect = CONST_ME_MAGIC_RED }, } monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 5 }, { type = COMBAT_ENERGYDAMAGE, percent = 15 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, - { type = COMBAT_FIREDAMAGE, percent = 20 }, + { type = COMBAT_FIREDAMAGE, percent = 0 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/magicals/choking_fear.lua b/data-otservbr-global/monster/magicals/choking_fear.lua index 16361bab0e9..604ca5cdaa6 100644 --- a/data-otservbr-global/monster/magicals/choking_fear.lua +++ b/data-otservbr-global/monster/magicals/choking_fear.lua @@ -124,7 +124,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 10 }, - { type = COMBAT_ENERGYDAMAGE, percent = 15 }, + { type = COMBAT_ENERGYDAMAGE, percent = 2 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 100 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, diff --git a/data-otservbr-global/monster/magicals/phantasm.lua b/data-otservbr-global/monster/magicals/phantasm.lua index 9dc266f8bb3..36c0baed405 100644 --- a/data-otservbr-global/monster/magicals/phantasm.lua +++ b/data-otservbr-global/monster/magicals/phantasm.lua @@ -70,7 +70,7 @@ monster.light = { monster.summon = { maxSummons = 4, summons = { - { name = "Phantasm Summon", chance = 20, interval = 2000, count = 4 }, + { name = "Phantasm Summon", chance = 35, interval = 2000, count = 4 }, }, } diff --git a/data-otservbr-global/monster/magicals/retching_horror.lua b/data-otservbr-global/monster/magicals/retching_horror.lua index a6814343eaf..0479a7cb368 100644 --- a/data-otservbr-global/monster/magicals/retching_horror.lua +++ b/data-otservbr-global/monster/magicals/retching_horror.lua @@ -113,7 +113,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 5 }, - { type = COMBAT_ENERGYDAMAGE, percent = 10 }, + { type = COMBAT_ENERGYDAMAGE, percent = -3 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 85 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, diff --git a/data-otservbr-global/monster/mammals/mutated_bat.lua b/data-otservbr-global/monster/mammals/mutated_bat.lua index 211ca62d2ad..dfea480341b 100644 --- a/data-otservbr-global/monster/mammals/mutated_bat.lua +++ b/data-otservbr-global/monster/mammals/mutated_bat.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Mutated Bat") local monster = {} monster.description = "a mutated bat" -monster.experience = 615 +monster.experience = 750 monster.outfit = { lookType = 307, lookHead = 0, diff --git a/data-otservbr-global/monster/plants/hideous_fungus.lua b/data-otservbr-global/monster/plants/hideous_fungus.lua index a80ba080fd7..275adb03b2f 100644 --- a/data-otservbr-global/monster/plants/hideous_fungus.lua +++ b/data-otservbr-global/monster/plants/hideous_fungus.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Hideous Fungus") local monster = {} monster.description = "a hideous fungus" -monster.experience = 2900 +monster.experience = 3700 monster.outfit = { lookType = 499, lookHead = 0, @@ -57,7 +57,7 @@ monster.flags = { canPushCreatures = true, staticAttackChance = 90, targetDistance = 4, - runHealth = 275, + runHealth = 0, healthHidden = false, isBlockable = false, canWalkOnEnergy = true, @@ -71,9 +71,9 @@ monster.light = { } monster.summon = { - maxSummons = 2, + maxSummons = 1, summons = { - { name = "humorless fungus", chance = 10, interval = 2000, count = 2 }, + { name = "humorless fungus", chance = 10, interval = 2000, count = 1 }, }, } @@ -110,7 +110,6 @@ monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -450 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_EARTHDAMAGE, minDamage = -250, maxDamage = -430, range = 7, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_SMALLPLANTS, target = false }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_ICEDAMAGE, minDamage = -250, maxDamage = -550, length = 8, spread = 0, shootEffect = CONST_ANI_SNOWBALL, effect = CONST_ME_ICEAREA, target = false }, - { name = "speed", interval = 2000, chance = 10, speedChange = -600, radius = 1, effect = CONST_ME_MAGIC_RED, target = true, duration = 60000 }, { name = "drunk", interval = 2000, chance = 10, range = 7, radius = 5, shootEffect = CONST_ANI_SMALLSTONE, effect = CONST_ME_STUN, target = true, duration = 4000 }, -- poison { name = "condition", type = CONDITION_POISON, interval = 2000, chance = 10, minDamage = -400, maxDamage = -640, range = 7, radius = 3, effect = CONST_ME_HITBYPOISON, target = false }, @@ -121,14 +120,14 @@ monster.defenses = { armor = 60, mitigation = 1.74, { name = "combat", interval = 2000, chance = 15, type = COMBAT_HEALING, minDamage = 275, maxDamage = 350, effect = CONST_ME_MAGIC_BLUE, target = false }, - { name = "invisible", interval = 2000, chance = 10, effect = CONST_ME_MAGIC_BLUE }, + { name = "invisible", interval = 2000, chance = 5, effect = CONST_ME_MAGIC_BLUE, duration = 2000 }, } monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 0 }, { type = COMBAT_ENERGYDAMAGE, percent = 15 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, - { type = COMBAT_FIREDAMAGE, percent = 5 }, + { type = COMBAT_FIREDAMAGE, percent = -5 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/plants/humongous_fungus.lua b/data-otservbr-global/monster/plants/humongous_fungus.lua index 942684e732c..09f301a6a59 100644 --- a/data-otservbr-global/monster/plants/humongous_fungus.lua +++ b/data-otservbr-global/monster/plants/humongous_fungus.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Humongous Fungus") local monster = {} monster.description = "a humongous fungus" -monster.experience = 2600 +monster.experience = 2900 monster.outfit = { lookType = 488, lookHead = 0, @@ -104,7 +104,7 @@ monster.loot = { monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -330 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_EARTHDAMAGE, minDamage = -180, maxDamage = -350, range = 7, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_SMALLPLANTS, target = false }, - { name = "poisonfield", interval = 2000, chance = 20, radius = 4, target = false }, + { name = "poisonfield", interval = 2000, chance = 10, radius = 4, target = false }, -- poison { name = "condition", type = CONDITION_POISON, interval = 2000, chance = 10, minDamage = -500, maxDamage = -1000, length = 8, spread = 0, effect = CONST_ME_GREEN_RINGS, target = false }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_LIFEDRAIN, minDamage = -130, maxDamage = -260, length = 5, spread = 0, effect = CONST_ME_MAGIC_RED, target = false }, @@ -117,14 +117,13 @@ monster.defenses = { armor = 70, mitigation = 2.02, { name = "combat", interval = 2000, chance = 10, type = COMBAT_HEALING, minDamage = 225, maxDamage = 380, effect = CONST_ME_MAGIC_BLUE, target = false }, - { name = "invisible", interval = 2000, chance = 15, effect = CONST_ME_MAGIC_BLUE }, } monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 0 }, { type = COMBAT_ENERGYDAMAGE, percent = 15 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, - { type = COMBAT_FIREDAMAGE, percent = 5 }, + { type = COMBAT_FIREDAMAGE, percent = -10 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, diff --git a/data-otservbr-global/monster/quests/bigfoots_burden/bosses/abyssador.lua b/data-otservbr-global/monster/quests/bigfoots_burden/bosses/abyssador.lua index 24c993fda5b..1ca0ff1ca75 100644 --- a/data-otservbr-global/monster/quests/bigfoots_burden/bosses/abyssador.lua +++ b/data-otservbr-global/monster/quests/bigfoots_burden/bosses/abyssador.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Abyssador") local monster = {} monster.description = "Abyssador" -monster.experience = 50000 +monster.experience = 400000 monster.outfit = { lookType = 495, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/bigfoots_burden/bosses/gnomevil.lua b/data-otservbr-global/monster/quests/bigfoots_burden/bosses/gnomevil.lua index cd287d83709..8d410c85d26 100644 --- a/data-otservbr-global/monster/quests/bigfoots_burden/bosses/gnomevil.lua +++ b/data-otservbr-global/monster/quests/bigfoots_burden/bosses/gnomevil.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Gnomevil") local monster = {} monster.description = "Gnomevil" -monster.experience = 45000 +monster.experience = 400000 monster.outfit = { lookType = 504, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/bigfoots_burden/humorless_fungus.lua b/data-otservbr-global/monster/quests/bigfoots_burden/humorless_fungus.lua index 19ab3230231..ead6b096fbf 100644 --- a/data-otservbr-global/monster/quests/bigfoots_burden/humorless_fungus.lua +++ b/data-otservbr-global/monster/quests/bigfoots_burden/humorless_fungus.lua @@ -13,8 +13,8 @@ monster.outfit = { lookMount = 0, } -monster.health = 2500 -monster.maxHealth = 2500 +monster.health = 1600 +monster.maxHealth = 1600 monster.race = "venom" monster.corpse = 16083 monster.speed = 115 @@ -70,17 +70,14 @@ monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -475 }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_EARTHDAMAGE, minDamage = -40, maxDamage = -197, range = 7, shootEffect = CONST_ANI_SMALLEARTH, effect = CONST_ME_SMALLPLANTS, target = true }, { name = "combat", interval = 2000, chance = 10, type = COMBAT_ICEDAMAGE, minDamage = 0, maxDamage = -525, range = 7, shootEffect = CONST_ANI_SNOWBALL, effect = CONST_ME_ICEAREA, target = true }, - -- poison { name = "condition", type = CONDITION_POISON, interval = 2000, chance = 10, minDamage = -400, maxDamage = -640, range = 7, radius = 3, effect = CONST_ME_HITBYPOISON, target = false }, - { name = "drunk", interval = 2000, chance = 10, range = 7, radius = 4, effect = CONST_ME_STUN, target = true, duration = 4000 }, } monster.defenses = { defense = 0, armor = 0, - -- mitigation = ???, { name = "combat", interval = 2000, chance = 5, type = COMBAT_HEALING, minDamage = 0, maxDamage = 230, effect = CONST_ME_MAGIC_BLUE, target = false }, - { name = "invisible", interval = 2000, chance = 10, effect = CONST_ME_MAGIC_BLUE }, + { name = "invisible", interval = 2000, chance = 5, effect = CONST_ME_MAGIC_BLUE }, } monster.elements = { diff --git a/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_count_of_the_core.lua b/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_count_of_the_core.lua index d611e78d84b..17cb6520d29 100644 --- a/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_count_of_the_core.lua +++ b/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_count_of_the_core.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("The Count of the Core") local monster = {} monster.description = "The Count Of The Core" -monster.experience = 40000 +monster.experience = 300000 monster.outfit = { lookType = 1046, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_duke_of_the_depths.lua b/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_duke_of_the_depths.lua index d654288c405..99053b93882 100644 --- a/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_duke_of_the_depths.lua +++ b/data-otservbr-global/monster/quests/dangerous_depth/bosses/the_duke_of_the_depths.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("The Duke of the Depths") local monster = {} monster.description = "The Duke Of The Depths" -monster.experience = 40000 +monster.experience = 300000 monster.outfit = { lookType = 1047, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua index 90b3124369a..7ad855bc88a 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ferumbras_mortal_shell.lua +++ b/data-otservbr-global/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 = 500000 +monster.experience = 2000000 monster.outfit = { lookType = 229, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua index 0e0822e3d72..3f32bac95d4 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/mazoran.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Mazoran") local monster = {} monster.description = "Mazoran" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 842, lookHead = 77, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua index 625f10cf7fc..364b4f864a8 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/plagirath.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Plagirath") local monster = {} monster.description = "Plagirath" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 862, lookHead = 84, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua index 9701dc7d0f9..df016edfd84 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/ragiaz.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Ragiaz") local monster = {} monster.description = "Ragiaz" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 862, lookHead = 76, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua index 67d218c5ee0..066e22237c0 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/razzagorn.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Razzagorn") local monster = {} monster.description = "Razzagorn" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 842, lookHead = 78, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua index c0de2c0c362..72c908104af 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/shulgrax.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Shulgrax") local monster = {} monster.description = "Shulgrax" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 842, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua index 583167460e1..30b99353cdf 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/tarbaz.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Tarbaz") local monster = {} monster.description = "Tarbaz" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 842, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua index 5a441ff10f1..03fa92d3394 100644 --- a/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua +++ b/data-otservbr-global/monster/quests/ferumbras_ascendant/bosses/zamulosh.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Zamulosh") local monster = {} monster.description = "Zamulosh" -monster.experience = 250000 +monster.experience = 500000 monster.outfit = { lookType = 862, lookHead = 16, diff --git a/data-otservbr-global/monster/quests/in_service_of_yalahar/inky.lua b/data-otservbr-global/monster/quests/in_service_of_yalahar/inky.lua index 49025f4c6c4..bbc58881ee4 100644 --- a/data-otservbr-global/monster/quests/in_service_of_yalahar/inky.lua +++ b/data-otservbr-global/monster/quests/in_service_of_yalahar/inky.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Inky") local monster = {} monster.description = "Inky" -monster.experience = 250 +monster.experience = 700 monster.outfit = { lookType = 46, lookHead = 0, diff --git a/data-otservbr-global/monster/quests/in_service_of_yalahar/sharptooth.lua b/data-otservbr-global/monster/quests/in_service_of_yalahar/sharptooth.lua index 583df08b8b5..0325642344c 100644 --- a/data-otservbr-global/monster/quests/in_service_of_yalahar/sharptooth.lua +++ b/data-otservbr-global/monster/quests/in_service_of_yalahar/sharptooth.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Sharptooth") local monster = {} monster.description = "Sharptooth" -monster.experience = 1600 +monster.experience = 3000 monster.outfit = { lookType = 20, lookHead = 0, diff --git a/data-otservbr-global/monster/reptiles/seacrest_serpent.lua b/data-otservbr-global/monster/reptiles/seacrest_serpent.lua index 9be39aaa571..04b7dba7416 100644 --- a/data-otservbr-global/monster/reptiles/seacrest_serpent.lua +++ b/data-otservbr-global/monster/reptiles/seacrest_serpent.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Seacrest Serpent") local monster = {} monster.description = "a seacrest serpent" -monster.experience = 2600 +monster.experience = 2900 monster.outfit = { lookType = 675, lookHead = 0, diff --git a/data-otservbr-global/monster/reptiles/young_sea_serpent.lua b/data-otservbr-global/monster/reptiles/young_sea_serpent.lua index 961ff8204c6..98e8744b7b1 100644 --- a/data-otservbr-global/monster/reptiles/young_sea_serpent.lua +++ b/data-otservbr-global/monster/reptiles/young_sea_serpent.lua @@ -108,7 +108,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = -20 }, { type = COMBAT_ENERGYDAMAGE, percent = -10 }, - { type = COMBAT_EARTHDAMAGE, percent = 100 }, + { type = COMBAT_EARTHDAMAGE, percent = -5 }, { type = COMBAT_FIREDAMAGE, percent = 30 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, diff --git a/data-otservbr-global/monster/undeads/betrayed_wraith.lua b/data-otservbr-global/monster/undeads/betrayed_wraith.lua index 0c0648acda5..201887a7712 100644 --- a/data-otservbr-global/monster/undeads/betrayed_wraith.lua +++ b/data-otservbr-global/monster/undeads/betrayed_wraith.lua @@ -112,7 +112,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 0 }, - { type = COMBAT_ENERGYDAMAGE, percent = 100 }, + { type = COMBAT_ENERGYDAMAGE, percent = 10 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 100 }, { type = COMBAT_LIFEDRAIN, percent = 100 }, diff --git a/data-otservbr-global/monster/undeads/blightwalker.lua b/data-otservbr-global/monster/undeads/blightwalker.lua index 28706adeb50..d900484b19f 100644 --- a/data-otservbr-global/monster/undeads/blightwalker.lua +++ b/data-otservbr-global/monster/undeads/blightwalker.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Blightwalker") local monster = {} monster.description = "a blightwalker" -monster.experience = 5850 +monster.experience = 6400 monster.outfit = { lookType = 246, lookHead = 0, @@ -108,9 +108,8 @@ monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -490 }, { name = "combat", interval = 2000, chance = 20, type = COMBAT_EARTHDAMAGE, minDamage = -220, maxDamage = -405, range = 7, radius = 1, shootEffect = CONST_ANI_POISON, target = true }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_LIFEDRAIN, minDamage = -65, maxDamage = -135, radius = 4, effect = CONST_ME_MAGIC_GREEN, target = false }, - { name = "drunk", interval = 2000, chance = 10, radius = 3, effect = CONST_ME_HITBYPOISON, target = false, duration = 5000 }, { name = "blightwalker curse", interval = 2000, chance = 15, target = false }, - { name = "speed", interval = 2000, chance = 15, speedChange = -300, range = 7, shootEffect = CONST_ANI_POISON, target = true, duration = 30000 }, + { name = "speed", interval = 2000, chance = 10, speedChange = -300, range = 7, shootEffect = CONST_ANI_POISON, target = true, duration = 15000 }, } monster.defenses = { @@ -127,7 +126,7 @@ monster.elements = { { type = COMBAT_LIFEDRAIN, percent = 0 }, { type = COMBAT_MANADRAIN, percent = 0 }, { type = COMBAT_DROWNDAMAGE, percent = 0 }, - { type = COMBAT_ICEDAMAGE, percent = 50 }, + { type = COMBAT_ICEDAMAGE, percent = 15 }, { type = COMBAT_HOLYDAMAGE, percent = -30 }, { type = COMBAT_DEATHDAMAGE, percent = 100 }, } diff --git a/data-otservbr-global/monster/undeads/crypt_warrior.lua b/data-otservbr-global/monster/undeads/crypt_warrior.lua index 5de0ab637ba..dad0cbe7529 100644 --- a/data-otservbr-global/monster/undeads/crypt_warrior.lua +++ b/data-otservbr-global/monster/undeads/crypt_warrior.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Crypt Warrior") local monster = {} monster.description = "a crypt warrior" -monster.experience = 4200 +monster.experience = 6050 monster.outfit = { lookType = 298, lookHead = 0, diff --git a/data-otservbr-global/monster/undeads/falcon_knight.lua b/data-otservbr-global/monster/undeads/falcon_knight.lua index 54a23130758..2e2ac28a1fe 100644 --- a/data-otservbr-global/monster/undeads/falcon_knight.lua +++ b/data-otservbr-global/monster/undeads/falcon_knight.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Falcon Knight") local monster = {} monster.description = "a falcon knight" -monster.experience = 5985 +monster.experience = 6300 monster.outfit = { lookType = 1071, lookHead = 57, diff --git a/data-otservbr-global/monster/undeads/falcon_paladin.lua b/data-otservbr-global/monster/undeads/falcon_paladin.lua index 799143fe943..cc6a41571e4 100644 --- a/data-otservbr-global/monster/undeads/falcon_paladin.lua +++ b/data-otservbr-global/monster/undeads/falcon_paladin.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Falcon Paladin") local monster = {} monster.description = "a falcon paladin" -monster.experience = 6544 +monster.experience = 6900 monster.outfit = { lookType = 1071, lookHead = 57, diff --git a/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua b/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua index b1f76414dd4..527d0708730 100644 --- a/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua +++ b/data-otservbr-global/monster/undeads/hand_of_cursed_fate.lua @@ -108,7 +108,7 @@ monster.loot = { monster.attacks = { { name = "melee", interval = 2000, chance = 100, minDamage = 0, maxDamage = -520, condition = { type = CONDITION_POISON, totalDamage = 380, interval = 4000 } }, - { name = "combat", interval = 2000, chance = 15, type = COMBAT_MANADRAIN, minDamage = 0, maxDamage = -920, range = 1, target = false }, + { name = "combat", interval = 2000, chance = 15, type = COMBAT_MANADRAIN, minDamage = 0, maxDamage = -620, range = 1, target = false }, { name = "drunk", interval = 2000, chance = 10, radius = 4, effect = CONST_ME_SMALLCLOUDS, target = false, duration = 3000 }, { name = "combat", interval = 2000, chance = 15, type = COMBAT_LIFEDRAIN, minDamage = -220, maxDamage = -880, range = 1, effect = CONST_ME_SMALLCLOUDS, target = false }, } @@ -124,7 +124,7 @@ monster.defenses = { monster.elements = { { type = COMBAT_PHYSICALDAMAGE, percent = 0 }, - { type = COMBAT_ENERGYDAMAGE, percent = 100 }, + { type = COMBAT_ENERGYDAMAGE, percent = 5 }, { type = COMBAT_EARTHDAMAGE, percent = 100 }, { type = COMBAT_FIREDAMAGE, percent = 100 }, { type = COMBAT_LIFEDRAIN, percent = 0 }, diff --git a/data-otservbr-global/monster/undeads/skeleton_elite_warrior.lua b/data-otservbr-global/monster/undeads/skeleton_elite_warrior.lua index a0cc7545b99..25ebd9c1f6d 100644 --- a/data-otservbr-global/monster/undeads/skeleton_elite_warrior.lua +++ b/data-otservbr-global/monster/undeads/skeleton_elite_warrior.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Skeleton Elite Warrior") local monster = {} monster.description = "a skeleton elite warrior" -monster.experience = 4500 +monster.experience = 4800 monster.outfit = { lookType = 298, lookHead = 0, diff --git a/data-otservbr-global/monster/undeads/undead_dragon.lua b/data-otservbr-global/monster/undeads/undead_dragon.lua index 2ab63af8b77..b9039c5d914 100644 --- a/data-otservbr-global/monster/undeads/undead_dragon.lua +++ b/data-otservbr-global/monster/undeads/undead_dragon.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Undead Dragon") local monster = {} monster.description = "an undead dragon" -monster.experience = 7200 +monster.experience = 7500 monster.outfit = { lookType = 231, lookHead = 0, diff --git a/data-otservbr-global/monster/undeads/undead_elite_gladiator.lua b/data-otservbr-global/monster/undeads/undead_elite_gladiator.lua index 0f66c87cb21..10d1d5b08bc 100644 --- a/data-otservbr-global/monster/undeads/undead_elite_gladiator.lua +++ b/data-otservbr-global/monster/undeads/undead_elite_gladiator.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Undead Elite Gladiator") local monster = {} monster.description = "an undead elite gladiator" -monster.experience = 4740 +monster.experience = 5090 monster.outfit = { lookType = 306, lookHead = 0, diff --git a/data-otservbr-global/monster/vermins/cave_devourer.lua b/data-otservbr-global/monster/vermins/cave_devourer.lua index 1283ac20b81..17d89dfb176 100644 --- a/data-otservbr-global/monster/vermins/cave_devourer.lua +++ b/data-otservbr-global/monster/vermins/cave_devourer.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Cave Devourer") local monster = {} monster.description = "a cave devourer" -monster.experience = 2380 +monster.experience = 3380 monster.outfit = { lookType = 1036, lookHead = 0, @@ -88,7 +88,7 @@ monster.loot = { { name = "slime heart", chance = 13770, maxCount = 4 }, { name = "cave devourer legs", chance = 17160 }, { id = 3049, chance = 2540 }, -- stealth ring - { name = "suspicious device", chance = 420 }, + { name = "suspicious device", chance = 850 }, } monster.attacks = { diff --git a/data-otservbr-global/monster/vermins/chasm_spawn.lua b/data-otservbr-global/monster/vermins/chasm_spawn.lua index 0764367a1d0..9f27f57b006 100644 --- a/data-otservbr-global/monster/vermins/chasm_spawn.lua +++ b/data-otservbr-global/monster/vermins/chasm_spawn.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Chasm Spawn") local monster = {} monster.description = "a chasm spawn" -monster.experience = 2700 +monster.experience = 3600 monster.outfit = { lookType = 1037, lookHead = 0, @@ -89,7 +89,7 @@ monster.loot = { { name = "green crystal shard", chance = 7850 }, { name = "violet crystal shard", chance = 4690 }, { name = "mushroom backpack", chance = 610 }, - { name = "suspicious device", chance = 520 }, + { name = "suspicious device", chance = 850 }, } monster.attacks = { diff --git a/data-otservbr-global/monster/vermins/deepworm.lua b/data-otservbr-global/monster/vermins/deepworm.lua index 91b2ded8752..21775b2c673 100644 --- a/data-otservbr-global/monster/vermins/deepworm.lua +++ b/data-otservbr-global/monster/vermins/deepworm.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Deepworm") local monster = {} monster.description = "a deepworm" -monster.experience = 2300 +monster.experience = 2520 monster.outfit = { lookType = 1033, lookHead = 0, diff --git a/data-otservbr-global/monster/vermins/diremaw.lua b/data-otservbr-global/monster/vermins/diremaw.lua index b89c47c99e7..fd74c4e2be6 100644 --- a/data-otservbr-global/monster/vermins/diremaw.lua +++ b/data-otservbr-global/monster/vermins/diremaw.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Diremaw") local monster = {} monster.description = "a diremaw" -monster.experience = 2500 +monster.experience = 2770 monster.outfit = { lookType = 1034, lookHead = 0, diff --git a/data-otservbr-global/monster/vermins/drillworm.lua b/data-otservbr-global/monster/vermins/drillworm.lua index 3cf92fce18a..a435dc16ca3 100644 --- a/data-otservbr-global/monster/vermins/drillworm.lua +++ b/data-otservbr-global/monster/vermins/drillworm.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Drillworm") local monster = {} monster.description = "a drillworm" -monster.experience = 858 +monster.experience = 1200 monster.outfit = { lookType = 527, lookHead = 0, diff --git a/data-otservbr-global/monster/vermins/tunnel_tyrant.lua b/data-otservbr-global/monster/vermins/tunnel_tyrant.lua index f8e3b7bfb03..c2b8eb2df90 100644 --- a/data-otservbr-global/monster/vermins/tunnel_tyrant.lua +++ b/data-otservbr-global/monster/vermins/tunnel_tyrant.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Tunnel Tyrant") local monster = {} monster.description = "a tunnel tyrant" -monster.experience = 3400 +monster.experience = 4420 monster.outfit = { lookType = 1035, lookHead = 0, @@ -87,7 +87,7 @@ monster.loot = { { name = "crystal mace", chance = 1580 }, { id = 23508, chance = 3010 }, -- energy vein { name = "crystalline armor", chance = 860 }, - { name = "suspicious device", chance = 1290 }, + { name = "suspicious device", chance = 1850 }, } monster.attacks = { diff --git a/data-otservbr-global/scripts/actions/bosses_levers/grand_,master_oberon.lua b/data-otservbr-global/scripts/actions/bosses_levers/grand_master_oberon.lua similarity index 100% rename from data-otservbr-global/scripts/actions/bosses_levers/grand_,master_oberon.lua rename to data-otservbr-global/scripts/actions/bosses_levers/grand_master_oberon.lua From f56af162772371b5a109e2514ff12341b7693148 Mon Sep 17 00:00:00 2001 From: Felipe Paluco <87909998+FelipePaluco@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:37:27 -0300 Subject: [PATCH 24/50] fix: sam sellable missing items (#2685) --- data-otservbr-global/npc/sam.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/data-otservbr-global/npc/sam.lua b/data-otservbr-global/npc/sam.lua index cd3a517c147..fdca8c02f01 100644 --- a/data-otservbr-global/npc/sam.lua +++ b/data-otservbr-global/npc/sam.lua @@ -210,6 +210,7 @@ npcConfig.shop = { { itemName = "legion helmet", clientId = 3374, sell = 22 }, { itemName = "longsword", clientId = 3285, buy = 160, sell = 51 }, { itemName = "mace", clientId = 3286, buy = 90, sell = 30 }, + { itemName = "magic plate armor", clientId = 3366, sell = 6400 }, { itemName = "morning star", clientId = 3282, buy = 430, sell = 100 }, { itemName = "orcish axe", clientId = 3316, sell = 350 }, { itemName = "plate armor", clientId = 3357, buy = 1200, sell = 400 }, @@ -227,16 +228,16 @@ npcConfig.shop = { { itemName = "steel shield", clientId = 3409, buy = 240, sell = 80 }, { itemName = "studded armor", clientId = 3378, buy = 90, sell = 25 }, { itemName = "studded club", clientId = 3336, sell = 10 }, - { itemName = "studded helmet", clientId = 3376, buy = 63 }, - { itemName = "studded legs", clientId = 3362, buy = 50 }, - { itemName = "studded shield", clientId = 3426, buy = 50 }, - { itemName = "sword", clientId = 3264, buy = 85 }, - { itemName = "throwing knife", clientId = 3298, buy = 25 }, - { itemName = "two handed sword", clientId = 3265, buy = 950 }, - { itemName = "viking helmet", clientId = 3367, buy = 265 }, - { itemName = "viking shield", clientId = 3431, buy = 260 }, - { itemName = "war hammer", clientId = 3279, buy = 10000 }, - { itemName = "wooden shield", clientId = 3412, buy = 15 }, + { itemName = "studded helmet", clientId = 3376, buy = 63, sell = 20 }, + { itemName = "studded legs", clientId = 3362, buy = 50, sell = 15 }, + { itemName = "studded shield", clientId = 3426, buy = 50, sell = 16 }, + { itemName = "sword", clientId = 3264, buy = 85, sell = 25 }, + { itemName = "throwing knife", clientId = 3298, buy = 25, sell = 2 }, + { itemName = "two handed sword", clientId = 3265, buy = 950, sell = 450 }, + { itemName = "viking helmet", clientId = 3367, buy = 265, sell = 66 }, + { itemName = "viking shield", clientId = 3431, buy = 260, sell = 85 }, + { itemName = "war hammer", clientId = 3279, buy = 10000, sell = 470 }, + { itemName = "wooden shield", clientId = 3412, buy = 15, sell = 5 }, } -- On buy npc shop message npcType.onBuyItem = function(npc, player, itemId, subType, amount, ignore, inBackpacks, totalCost) From 552eaefeca2530fee2194da37498fc21083ce2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Lu=C3=ADs=20Lucarelo=20Lamonato?= Date: Tue, 11 Jun 2024 10:39:55 -0300 Subject: [PATCH 25/50] fix: mispelled storages in freequests.lua and add some quests (#2658) --- .../creaturescripts/customs/freequests.lua | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua b/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua index ad0e8d49b73..6f7e00e77f6 100644 --- a/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua +++ b/data-otservbr-global/scripts/creaturescripts/customs/freequests.lua @@ -60,15 +60,15 @@ local questTable = { { storage = Storage.InServiceofYalahar.DoorToMatrix, storageValue = 1 }, { storage = Storage.InServiceofYalahar.DoorToQuara, storageValue = 1 }, { storage = Storage.CultsOfTibia.Questline, storageValue = 7 }, - { storage = Storage.CultsOfTibia.Minotaurs.jamesfrancisTask, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Minotaurs.JamesfrancisTask, storageValue = 1 }, { storage = Storage.CultsOfTibia.Minotaurs.Mission, storageValue = 1 }, - { storage = Storage.CultsOfTibia.Minotaurs.bossTimer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Minotaurs.BossTimer, storageValue = 1 }, { storage = Storage.CultsOfTibia.MotA.Mission, storageValue = 1 }, - { storage = Storage.CultsOfTibia.MotA.Pedra1, storageValue = 1 }, - { storage = Storage.CultsOfTibia.MotA.Pedra2, storageValue = 1 }, - { storage = Storage.CultsOfTibia.MotA.Pedra3, storageValue = 1 }, - { storage = Storage.CultsOfTibia.MotA.Respostas, storageValue = 1 }, - { storage = Storage.CultsOfTibia.MotA.Perguntaid, storageValue = 1 }, + { storage = Storage.CultsOfTibia.MotA.Stone1, storageValue = 1 }, + { storage = Storage.CultsOfTibia.MotA.Stone2, storageValue = 1 }, + { storage = Storage.CultsOfTibia.MotA.Stone3, storageValue = 1 }, + { storage = Storage.CultsOfTibia.MotA.Answer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.MotA.QuestionId, storageValue = 1 }, { storage = Storage.CultsOfTibia.Barkless.Mission, storageValue = 1 }, { storage = Storage.CultsOfTibia.Barkless.sulphur, storageValue = 4 }, { storage = Storage.CultsOfTibia.Barkless.Tar, storageValue = 3 }, @@ -76,19 +76,19 @@ local questTable = { { storage = Storage.CultsOfTibia.Barkless.Objects, storageValue = 1 }, { storage = Storage.CultsOfTibia.Barkless.Temp, storageValue = 1 }, { storage = Storage.CultsOfTibia.Orcs.Mission, storageValue = 1 }, - { storage = Storage.CultsOfTibia.Orcs.lookType, storageValue = 1 }, - { storage = Storage.CultsOfTibia.Orcs.bossTimer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Orcs.LookType, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Orcs.BossTimer, storageValue = 1 }, { storage = Storage.CultsOfTibia.Life.Mission, storageValue = 7 }, - { storage = Storage.CultsOfTibia.Life.bossTimer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Life.BossTimer, storageValue = 1 }, { storage = Storage.CultsOfTibia.Humans.Mission, storageValue = 1 }, { storage = Storage.CultsOfTibia.Humans.Vaporized, storageValue = 1 }, { storage = Storage.CultsOfTibia.Humans.Decaying, storageValue = 1 }, - { storage = Storage.CultsOfTibia.Humans.bossTimer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Humans.BossTimer, storageValue = 1 }, { storage = Storage.CultsOfTibia.Misguided.Mission, storageValue = 1 }, { storage = Storage.CultsOfTibia.Misguided.Monsters, storageValue = 1 }, { storage = Storage.CultsOfTibia.Misguided.Exorcisms, storageValue = 1 }, { storage = Storage.CultsOfTibia.Misguided.Time, storageValue = 1 }, - { storage = Storage.CultsOfTibia.Misguided.bossTimer, storageValue = 1 }, + { storage = Storage.CultsOfTibia.Misguided.BossTimer, storageValue = 1 }, { storage = Storage.CultsOfTibia.Minotaurs.EntranceAccessDoor, storageValue = 1 }, { storage = Storage.CultsOfTibia.Minotaurs.AccessDoor, storageValue = 1 }, { storage = Storage.ExplorerSociety.QuestLine, storageValue = 1 }, @@ -119,6 +119,7 @@ local questTable = { { storage = Storage.ForgottenKnowledge.LloydKilled, storageValue = 1 }, { storage = Storage.ForgottenKnowledge.LadyTenebrisKilled, storageValue = 1 }, { storage = Storage.ForgottenKnowledge.AccessMachine, storageValue = 1 }, + { storage = Storage.ForgottenKnowledge.AccessLavaTeleport, storageValue = 1 }, { storage = Storage.BarbarianTest.Questline, storageValue = 8 }, { storage = Storage.BarbarianTest.Mission01, storageValue = 3 }, { storage = Storage.BarbarianTest.Mission02, storageValue = 3 }, @@ -146,8 +147,8 @@ local questTable = { { storage = Storage.DjinnWar.MaridFaction.Mission02, storageValue = 2 }, { storage = Storage.DjinnWar.MaridFaction.RataMari, storageValue = 2 }, { storage = Storage.DjinnWar.MaridFaction.Mission03, storageValue = 3 }, - { storage = Storage.TheWayToYalahar.Questline, storageValue = 1 }, - { storage = Storage.SearoutesAroundYalahar.TownsCounter, storageValue = 1 }, + { storage = Storage.TheWayToYalahar.QuestLine, storageValue = 1 }, + { storage = Storage.SearoutesAroundYalahar.TownsCounter, storageValue = 5 }, { storage = Storage.SearoutesAroundYalahar.AbDendriel, storageValue = 1 }, { storage = Storage.SearoutesAroundYalahar.Darashia, storageValue = 1 }, { storage = Storage.SearoutesAroundYalahar.Venore, storageValue = 1 }, @@ -205,7 +206,7 @@ local questTable = { { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.KingTibianus, storageValue = 1 }, { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Leeland, storageValue = 1 }, { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Angus, storageValue = 1 }, - { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Wydrin, storageValue = 1 }, + { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Wyrdin, storageValue = 1 }, { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Telas, storageValue = 1 }, { storage = Storage.Quest.U8_54.TheNewFrontier.Mission05.Humgolf, storageValue = 1 }, { storage = Storage.TheShatteredIsles.DefaultStart, storageValue = 3 }, @@ -314,6 +315,7 @@ local questTable = { { storage = Storage.FerumbrasAscension.TarbazDoor, storageValue = 1 }, { storage = Storage.FerumbrasAscension.HabitatsAccess, storageValue = 1 }, { storage = Storage.FerumbrasAscension.TheLordOfTheLiceAccess, storageValue = 1 }, + { storage = Storage.FerumbrasAscension.Statue, storageValue = 1 }, { storage = Storage.Quest.U12_00.TheDreamCourts.AndrewDoor, storageValue = 1 }, @@ -372,11 +374,19 @@ local questTable = { { storage = Storage.OutfitQuest.DefaultStart, storageValue = 1 }, { storage = Storage.HeroRathleton.AccessDoor, storageValue = 1 }, - { storage = Storage.HeroRathleton.FastWay, storageValue = 1 }, + { storage = Storage.HeroRathleton.AccessTeleport1, storageValue = 1 }, + { storage = Storage.HeroRathleton.AccessTeleport2, storageValue = 1 }, + { storage = Storage.HeroRathleton.AccessTeleport3, storageValue = 1 }, -- Sea Serpent Quest { storage = Storage.Quest.U8_2.FishForASerpent.QuestLine, storageValue = 5 }, { storage = Storage.Quest.U8_2.TheHuntForTheSeaSerpent.QuestLine, storageValue = 2 }, + + --The White Raven Monastery + { storage = Storage.WhiteRavenMonastery.QuestLog, storageValue = 1 }, + { storage = Storage.WhiteRavenMonastery.Passage, storageValue = 1 }, + { storage = Storage.WhiteRavenMonastery.Diary, storageValue = 2 }, + { storage = Storage.WhiteRavenMonastery.Door, storageValue = 1 }, } -- from Position: (33201, 31762, 1) From 5d0d1c9e0947dee376461a51caa828c430521ca7 Mon Sep 17 00:00:00 2001 From: Karin Date: Wed, 12 Jun 2024 10:17:48 -0300 Subject: [PATCH 26/50] fix: prevent guests to rotate dummy (#2684) --- src/game/game.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/game/game.cpp b/src/game/game.cpp index 899a89549d9..fed3a3910a1 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -126,6 +126,10 @@ namespace InternalGame { if (isGuest && !isItemInGuestInventory && !item->isLadder() && !item->canBeUsedByGuests()) { return false; } + + if (isGuest && item->isDummy()) { + return false; + } } return true; From 201aa8cb940bab3c2db6779a0dee3be3ae218198 Mon Sep 17 00:00:00 2001 From: Beats Date: Wed, 12 Jun 2024 10:43:03 -0300 Subject: [PATCH 27/50] feat: shared_ptr: familiar, groups and reload: familiars, outfits (#2556) --- CMakePresets.json | 1 + data/scripts/talkactions/god/reload.lua | 3 + src/creatures/appearance/mounts/mounts.cpp | 2 +- src/creatures/appearance/outfit/outfit.cpp | 37 +++-- src/creatures/appearance/outfit/outfit.hpp | 14 +- src/creatures/players/grouping/familiars.cpp | 7 +- src/creatures/players/grouping/familiars.hpp | 5 +- src/creatures/players/grouping/groups.cpp | 4 +- src/creatures/players/grouping/groups.hpp | 4 +- src/creatures/players/player.cpp | 6 +- src/creatures/players/player.hpp | 11 +- src/game/functions/game_reload.cpp | 154 ++++++++++-------- src/game/functions/game_reload.hpp | 50 +++--- src/game/game.cpp | 4 +- src/game/game.hpp | 2 + src/io/functions/iologindata_load_player.cpp | 4 +- .../creatures/player/group_functions.cpp | 16 +- src/server/network/protocol/protocolgame.cpp | 2 +- 18 files changed, 184 insertions(+), 142 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 92ef2d33c6a..49f631e1921 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -54,6 +54,7 @@ "DEBUG_LOG": "ON", "ASAN_ENABLED": "OFF", "BUILD_STATIC_LIBRARY": "OFF", + "SPEED_UP_BUILD_UNITY": "OFF", "VCPKG_TARGET_TRIPLET": "x64-windows" } }, diff --git a/data/scripts/talkactions/god/reload.lua b/data/scripts/talkactions/god/reload.lua index 20b9431dbba..d0c0cdd45a8 100644 --- a/data/scripts/talkactions/god/reload.lua +++ b/data/scripts/talkactions/god/reload.lua @@ -7,6 +7,7 @@ local reloadTypes = { ["configuration"] = RELOAD_TYPE_CONFIG, ["core"] = RELOAD_TYPE_CORE, ["events"] = RELOAD_TYPE_EVENTS, + ["familiar"] = RELOAD_TYPE_FAMILIARS, ["global"] = RELOAD_TYPE_CORE, ["group"] = RELOAD_TYPE_GROUPS, ["groups"] = RELOAD_TYPE_GROUPS, @@ -20,6 +21,8 @@ local reloadTypes = { ["monsters"] = RELOAD_TYPE_MONSTERS, ["mount"] = RELOAD_TYPE_MOUNTS, ["mounts"] = RELOAD_TYPE_MOUNTS, + ["outfit"] = RELOAD_TYPE_OUTFITS, + ["outfits"] = RELOAD_TYPE_OUTFITS, ["npc"] = RELOAD_TYPE_NPCS, ["npcs"] = RELOAD_TYPE_NPCS, ["raid"] = RELOAD_TYPE_RAIDS, diff --git a/src/creatures/appearance/mounts/mounts.cpp b/src/creatures/appearance/mounts/mounts.cpp index 7051d04ddb8..7014d0b026b 100644 --- a/src/creatures/appearance/mounts/mounts.cpp +++ b/src/creatures/appearance/mounts/mounts.cpp @@ -29,7 +29,7 @@ bool Mounts::loadFromXml() { } for (auto mountNode : doc.child("mounts").children()) { - uint16_t lookType = pugi::cast(mountNode.attribute("clientid").value()); + auto lookType = pugi::cast(mountNode.attribute("clientid").value()); if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) { g_logger().warn("{} - An unregistered creature mount with id '{}' was blocked to prevent client crash.", __FUNCTION__, lookType); continue; diff --git a/src/creatures/appearance/outfit/outfit.cpp b/src/creatures/appearance/outfit/outfit.cpp index 9e96c60e756..97120659333 100644 --- a/src/creatures/appearance/outfit/outfit.cpp +++ b/src/creatures/appearance/outfit/outfit.cpp @@ -14,6 +14,10 @@ #include "utils/tools.hpp" #include "game/game.hpp" +Outfits &Outfits::getInstance() { + return inject(); +} + bool Outfits::reload() { for (auto &outfitsVector : outfits) { outfitsVector.clear(); @@ -41,7 +45,7 @@ bool Outfits::loadFromXml() { continue; } - uint16_t type = pugi::cast(attr.value()); + auto type = pugi::cast(attr.value()); if (type > PLAYERSEX_LAST) { g_logger().warn("[Outfits::loadFromXml] - Invalid outfit type {}", type); continue; @@ -53,7 +57,7 @@ bool Outfits::loadFromXml() { continue; } - if (uint16_t lookType = pugi::cast(lookTypeAttribute.value()); + if (auto lookType = pugi::cast(lookTypeAttribute.value()); g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) { g_logger().warn("[Outfits::loadFromXml] An unregistered creature looktype type with id '{}' was ignored to prevent client crash.", lookType); @@ -74,7 +78,22 @@ bool Outfits::loadFromXml() { return true; } -std::shared_ptr Outfits::getOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const { +std::shared_ptr Outfits::getOutfitByLookType(const std::shared_ptr &player, uint16_t lookType, bool isOppositeOutfit) const { + if (!player) { + g_logger().error("[{}] - Player not found", __FUNCTION__); + return nullptr; + } + + auto sex = player->getSex(); + if (sex != PLAYERSEX_FEMALE && sex != PLAYERSEX_MALE) { + g_logger().error("[{}] - Sex invalid or player: {}", __FUNCTION__, player->getName()); + return nullptr; + } + + if (isOppositeOutfit) { + sex = (sex == PLAYERSEX_MALE) ? PLAYERSEX_FEMALE : PLAYERSEX_MALE; + } + auto it = std::ranges::find_if(outfits[sex], [&lookType](const auto &outfit) { return outfit->lookType == lookType; }); @@ -84,15 +103,3 @@ std::shared_ptr Outfits::getOutfitByLookType(PlayerSex_t sex, uint16_t l } return nullptr; } - -/** - * Get the oposite sex equivalent outfit - * @param sex current sex - * @param lookType current looktype - * @return const pointer to the outfit or nullptr if it could not be found. - */ - -std::shared_ptr Outfits::getOpositeSexOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const { - PlayerSex_t searchSex = (sex == PLAYERSEX_MALE) ? PLAYERSEX_FEMALE : PLAYERSEX_MALE; - return getOutfitByLookType(searchSex, lookType); -} diff --git a/src/creatures/appearance/outfit/outfit.hpp b/src/creatures/appearance/outfit/outfit.hpp index 30b84d1aca2..0d89a2c932d 100644 --- a/src/creatures/appearance/outfit/outfit.hpp +++ b/src/creatures/appearance/outfit/outfit.hpp @@ -12,8 +12,10 @@ #include "declarations.hpp" #include "lib/di/container.hpp" +class Player; + struct OutfitEntry { - constexpr OutfitEntry(uint16_t initLookType, uint8_t initAddons) : + constexpr explicit OutfitEntry(uint16_t initLookType, uint8_t initAddons) : lookType(initLookType), addons(initAddons) { } uint16_t lookType; @@ -42,16 +44,12 @@ struct ProtocolOutfit { class Outfits { public: - static Outfits &getInstance() { - return inject(); - } - - std::shared_ptr getOpositeSexOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const; + static Outfits &getInstance(); - bool loadFromXml(); bool reload(); + bool loadFromXml(); - [[nodiscard]] std::shared_ptr getOutfitByLookType(PlayerSex_t sex, uint16_t lookType) const; + [[nodiscard]] std::shared_ptr getOutfitByLookType(const std::shared_ptr &player, uint16_t lookType, bool isOppositeOutfit = false) const; [[nodiscard]] const std::vector> &getOutfits(PlayerSex_t sex) const { return outfits[sex]; } diff --git a/src/creatures/players/grouping/familiars.cpp b/src/creatures/players/grouping/familiars.cpp index a922013f19b..6e923b823dc 100644 --- a/src/creatures/players/grouping/familiars.cpp +++ b/src/creatures/players/grouping/familiars.cpp @@ -10,10 +10,15 @@ #include "pch.hpp" #include "creatures/players/grouping/familiars.hpp" +#include "lib/di/container.hpp" #include "config/configmanager.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" +Familiars &Familiars::getInstance() { + return inject(); +} + bool Familiars::reload() { for (auto &familiarsVector : familiars) { familiarsVector.clear(); @@ -42,7 +47,7 @@ bool Familiars::loadFromXml() { continue; } - uint16_t vocation = pugi::cast(attr.value()); + auto vocation = pugi::cast(attr.value()); if (vocation > VOCATION_LAST) { g_logger().warn("[Familiars::loadFromXml] - Invalid familiar vocation {}", vocation); continue; diff --git a/src/creatures/players/grouping/familiars.hpp b/src/creatures/players/grouping/familiars.hpp index 8f553af9fbe..9eda7d95ba2 100644 --- a/src/creatures/players/grouping/familiars.hpp +++ b/src/creatures/players/grouping/familiars.hpp @@ -9,6 +9,7 @@ #pragma once +#include "declarations.hpp" #include "lib/di/container.hpp" struct FamiliarEntry { @@ -32,9 +33,7 @@ struct Familiar { class Familiars { public: - static Familiars &getInstance() { - return inject(); - } + static Familiars &getInstance(); bool loadFromXml(); bool reload(); diff --git a/src/creatures/players/grouping/groups.cpp b/src/creatures/players/grouping/groups.cpp index 27ae68d9fd4..937fa848f3f 100644 --- a/src/creatures/players/grouping/groups.cpp +++ b/src/creatures/players/grouping/groups.cpp @@ -43,7 +43,7 @@ PlayerFlags_t Groups::getFlagFromNumber(uint8_t value) { return magic_enum::enum_value(value); } -bool Groups::reload() const { +bool Groups::reload() { // Clear groups g_game().groups.getGroups().clear(); return g_game().groups.load(); @@ -99,7 +99,7 @@ bool Groups::load() { return true; } -std::shared_ptr Groups::getGroup(uint16_t id) { +std::shared_ptr Groups::getGroup(uint16_t id) const { if (auto it = std::find_if(groups_vector.begin(), groups_vector.end(), [id](auto group_it) { return group_it->id == id; }); diff --git a/src/creatures/players/grouping/groups.hpp b/src/creatures/players/grouping/groups.hpp index d76914e2632..af319e95772 100644 --- a/src/creatures/players/grouping/groups.hpp +++ b/src/creatures/players/grouping/groups.hpp @@ -24,9 +24,9 @@ class Groups { public: static uint8_t getFlagNumber(PlayerFlags_t playerFlags); static PlayerFlags_t getFlagFromNumber(uint8_t value); - bool reload() const; + static bool reload(); bool load(); - std::shared_ptr getGroup(uint16_t id); + [[nodiscard]] std::shared_ptr getGroup(uint16_t id) const; std::vector> &getGroups() { return groups_vector; } diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 4109eb77472..2b10c0f77ee 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -4914,7 +4914,7 @@ bool Player::canWear(uint16_t lookType, uint8_t addons) const { return true; } - const auto &outfit = Outfits::getInstance().getOutfitByLookType(sex, lookType); + const auto &outfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), lookType); if (!outfit) { return false; } @@ -5001,7 +5001,7 @@ bool Player::removeOutfitAddon(uint16_t lookType, uint8_t addons) { return false; } -bool Player::getOutfitAddons(const std::shared_ptr outfit, uint8_t &addons) const { +bool Player::getOutfitAddons(const std::shared_ptr &outfit, uint8_t &addons) const { if (group->access) { addons = 3; return true; @@ -5826,7 +5826,7 @@ bool Player::toggleMount(bool mount) { return false; } - const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(getSex(), defaultOutfit.lookType); + const auto &playerOutfit = Outfits::getInstance().getOutfitByLookType(getPlayer(), defaultOutfit.lookType); if (!playerOutfit) { return false; } diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index c0761704db4..19e3af5ca9c 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -476,7 +476,12 @@ class Player final : public Creature, public Cylinder, public Bankable { return blessings[index - 1] != 0; } uint8_t getBlessingCount(uint8_t index) const { - return blessings[index - 1]; + if (index > 0 && index <= blessings.size()) { + return blessings[index - 1]; + } else { + g_logger().error("[{}] - index outside range 0-10.", __FUNCTION__); + return 0; + } } std::string getBlessingsName() const; @@ -1031,7 +1036,7 @@ class Player final : public Creature, public Cylinder, public Bankable { void addOutfit(uint16_t lookType, uint8_t addons); bool removeOutfit(uint16_t lookType); bool removeOutfitAddon(uint16_t lookType, uint8_t addons); - bool getOutfitAddons(const std::shared_ptr outfit, uint8_t &addons) const; + bool getOutfitAddons(const std::shared_ptr &outfit, uint8_t &addons) const; bool canFamiliar(uint16_t lookType) const; void addFamiliar(uint16_t lookType); @@ -2853,7 +2858,7 @@ class Player final : public Creature, public Cylinder, public Bankable { uint16_t lastStatsTrainingTime = 0; uint16_t staminaMinutes = 2520; - std::vector blessings = { 0, 0, 0, 0, 0, 0, 0, 0 }; + std::vector blessings = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; uint16_t maxWriteLen = 0; uint16_t baseXpGain = 100; uint16_t voucherXpBoost = 0; diff --git a/src/game/functions/game_reload.cpp b/src/game/functions/game_reload.cpp index 0fc74bcee71..d9d9eb1f449 100644 --- a/src/game/functions/game_reload.cpp +++ b/src/game/functions/game_reload.cpp @@ -22,7 +22,7 @@ GameReload::GameReload() = default; GameReload::~GameReload() = default; -bool GameReload::init(Reload_t reloadTypes) const { +bool GameReload::init(Reload_t reloadTypes) { switch (reloadTypes) { case Reload_t::RELOAD_TYPE_ALL: return reloadAll(); @@ -32,34 +32,38 @@ bool GameReload::init(Reload_t reloadTypes) const { return reloadConfig(); case Reload_t::RELOAD_TYPE_EVENTS: return reloadEvents(); - case Reload_t::RELOAD_TYPE_CORE: - return reloadCore(); + case Reload_t::RELOAD_TYPE_MODULES: + return reloadModules(); + case Reload_t::RELOAD_TYPE_OUTFITS: + return reloadOutfits(); + case Reload_t::RELOAD_TYPE_MOUNTS: + return reloadMounts(); + case Reload_t::RELOAD_TYPE_FAMILIARS: + return reloadFamiliars(); case Reload_t::RELOAD_TYPE_IMBUEMENTS: return reloadImbuements(); + case Reload_t::RELOAD_TYPE_VOCATIONS: + return reloadVocations(); + case Reload_t::RELOAD_TYPE_CORE: + return reloadCore(); + case Reload_t::RELOAD_TYPE_GROUPS: + return reloadGroups(); + case Reload_t::RELOAD_TYPE_SCRIPTS: + return reloadScripts(); case Reload_t::RELOAD_TYPE_ITEMS: return reloadItems(); - case Reload_t::RELOAD_TYPE_MODULES: - return reloadModules(); case Reload_t::RELOAD_TYPE_MONSTERS: return reloadMonsters(); - case Reload_t::RELOAD_TYPE_MOUNTS: - return reloadMounts(); case Reload_t::RELOAD_TYPE_NPCS: return reloadNpcs(); case Reload_t::RELOAD_TYPE_RAIDS: return reloadRaids(); - case Reload_t::RELOAD_TYPE_SCRIPTS: - return reloadScripts(); - case Reload_t::RELOAD_TYPE_GROUPS: - return reloadGroups(); - case Reload_t::RELOAD_TYPE_VOCATIONS: - return reloadVocations(); default: return false; } } -uint8_t GameReload::getReloadNumber(Reload_t reloadTypes) const { +uint8_t GameReload::getReloadNumber(Reload_t reloadTypes) { return magic_enum::enum_integer(reloadTypes); } @@ -78,7 +82,7 @@ void logReloadStatus(const std::string &name, bool result) { * If it is necessary to call elsewhere, seriously think about creating a function that calls this * Changing this to public may cause some unexpected behavior or bug */ -bool GameReload::reloadAll() const { +bool GameReload::reloadAll() { std::vector reloadResults; reloadResults.reserve(magic_enum::enum_count()); @@ -93,25 +97,62 @@ bool GameReload::reloadAll() const { return std::ranges::any_of(reloadResults, [](bool result) { return result; }); } -bool GameReload::reloadChat() const { +bool GameReload::reloadChat() { const bool result = g_chat().load(); logReloadStatus("Chat", result); return result; } -bool GameReload::reloadConfig() const { +bool GameReload::reloadConfig() { const bool result = g_configManager().reload(); logReloadStatus("Config", result); return result; } -bool GameReload::reloadEvents() const { +bool GameReload::reloadEvents() { const bool result = g_events().loadFromXml(); logReloadStatus("Events", result); return result; } -bool GameReload::reloadCore() const { +bool GameReload::reloadModules() { + const bool result = g_modules().reload(); + logReloadStatus("Modules", result); + return result; +} + +bool GameReload::reloadOutfits() { + const bool result = g_game().outfits.reload(); + logReloadStatus("Outfits", result); + return result; +} + +bool GameReload::reloadMounts() { + const bool result = g_game().mounts.reload(); + logReloadStatus("Mounts", result); + return result; +} + +bool GameReload::reloadFamiliars() { + const bool result = g_game().familiars.reload(); + logReloadStatus("Familiars", result); + return result; +} + +bool GameReload::reloadImbuements() { + const bool result = g_imbuements().reload(); + logReloadStatus("Imbuements", result); + return result; +} + +bool GameReload::reloadVocations() { + const bool result = g_vocations().reload(); + reloadScripts(); + logReloadStatus("Vocations", result); + return result; +} + +bool GameReload::reloadCore() { const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); const bool coreLoaded = g_luaEnvironment().loadFile(coreFolder + "/core.lua", "core.lua") == 0; @@ -126,25 +167,38 @@ bool GameReload::reloadCore() const { return false; } -bool GameReload::reloadImbuements() const { - const bool result = g_imbuements().reload(); - logReloadStatus("Imbuements", result); +bool GameReload::reloadGroups() { + const bool result = g_game().groups.reload(); + logReloadStatus("Groups", result); return result; } -bool GameReload::reloadItems() const { - const bool result = Item::items.reload(); - logReloadStatus("Items", result); - return result; +bool GameReload::reloadScripts() { + g_scripts().clearAllScripts(); + Zone::clearZones(); + + const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); + const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + + g_scripts().loadScripts(coreFolder + "/scripts/lib", true, false); + g_scripts().loadScripts(datapackFolder + "/scripts", false, true); + g_scripts().loadScripts(coreFolder + "/scripts", false, true); + + // It should come last, after everything else has been cleaned up. + reloadMonsters(); + reloadNpcs(); + reloadItems(); + logReloadStatus("Scripts", true); + return true; } -bool GameReload::reloadModules() const { - const bool result = g_modules().reload(); - logReloadStatus("Modules", result); +bool GameReload::reloadItems() { + const bool result = Item::items.reload(); + logReloadStatus("Items", result); return result; } -bool GameReload::reloadMonsters() const { +bool GameReload::reloadMonsters() { g_monsters().clear(); const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); @@ -161,50 +215,14 @@ bool GameReload::reloadMonsters() const { } } -bool GameReload::reloadMounts() const { - const bool result = g_game().mounts.reload(); - logReloadStatus("Mounts", result); - return result; -} - -bool GameReload::reloadNpcs() const { +bool GameReload::reloadNpcs() { const bool result = g_npcs().reload(); logReloadStatus("NPCs", result); return result; } -bool GameReload::reloadRaids() const { +bool GameReload::reloadRaids() { const bool result = g_game().raids.reload() && g_game().raids.startup(); logReloadStatus("Raids", result); return result; } - -bool GameReload::reloadScripts() const { - g_scripts().clearAllScripts(); - Zone::clearZones(); - - const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); - const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); - - g_scripts().loadScripts(coreFolder + "/scripts/lib", true, false); - g_scripts().loadScripts(datapackFolder + "/scripts", false, true); - g_scripts().loadScripts(coreFolder + "/scripts", false, true); - - // It should come last, after everything else has been cleaned up. - reloadMonsters(); - reloadNpcs(); - logReloadStatus("Scripts", true); - return true; -} - -bool GameReload::reloadGroups() const { - const bool result = g_game().groups.reload(); - logReloadStatus("Groups", result); - return result; -} - -bool GameReload::reloadVocations() const { - const bool result = g_vocations().reload(); - logReloadStatus("Vocations", result); - return result; -} diff --git a/src/game/functions/game_reload.hpp b/src/game/functions/game_reload.hpp index 45ff35c01a2..0f59046a9d4 100644 --- a/src/game/functions/game_reload.hpp +++ b/src/game/functions/game_reload.hpp @@ -19,17 +19,19 @@ enum class Reload_t : uint8_t { RELOAD_TYPE_CHAT, RELOAD_TYPE_CONFIG, RELOAD_TYPE_EVENTS, - RELOAD_TYPE_CORE, + RELOAD_TYPE_MODULES, + RELOAD_TYPE_OUTFITS, + RELOAD_TYPE_MOUNTS, + RELOAD_TYPE_FAMILIARS, RELOAD_TYPE_IMBUEMENTS, + RELOAD_TYPE_VOCATIONS, + RELOAD_TYPE_CORE, + RELOAD_TYPE_GROUPS, + RELOAD_TYPE_SCRIPTS, RELOAD_TYPE_ITEMS, - RELOAD_TYPE_MODULES, RELOAD_TYPE_MONSTERS, - RELOAD_TYPE_MOUNTS, RELOAD_TYPE_NPCS, RELOAD_TYPE_RAIDS, - RELOAD_TYPE_SCRIPTS, - RELOAD_TYPE_GROUPS, - RELOAD_TYPE_VOCATIONS, // Every is last RELOAD_TYPE_LAST @@ -48,25 +50,27 @@ class GameReload : public Game { return inject(); } - bool init(Reload_t reloadType) const; - uint8_t getReloadNumber(Reload_t reloadTypes) const; + static bool init(Reload_t reloadType); + static uint8_t getReloadNumber(Reload_t reloadTypes); private: - bool reloadAll() const; - bool reloadChat() const; - bool reloadConfig() const; - bool reloadEvents() const; - bool reloadCore() const; - bool reloadImbuements() const; - bool reloadItems() const; - bool reloadModules() const; - bool reloadMonsters() const; - bool reloadMounts() const; - bool reloadNpcs() const; - bool reloadRaids() const; - bool reloadScripts() const; - bool reloadGroups() const; - bool reloadVocations() const; + static bool reloadAll(); + static bool reloadChat(); + static bool reloadConfig(); + static bool reloadEvents(); + static bool reloadModules(); + static bool reloadOutfits(); + static bool reloadMounts(); + static bool reloadFamiliars(); + static bool reloadImbuements(); + static bool reloadVocations(); + static bool reloadCore(); + static bool reloadGroups(); + static bool reloadScripts(); + static bool reloadItems(); + static bool reloadMonsters(); + static bool reloadNpcs(); + static bool reloadRaids(); }; constexpr auto g_gameReload = GameReload::getInstance; diff --git a/src/game/game.cpp b/src/game/game.cpp index fed3a3910a1..57daddded2e 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -4261,7 +4261,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos name << item->getName() << " displaying the "; bool outfited = false; if (outfit.lookType != 0) { - const auto &outfitInfo = Outfits::getInstance().getOutfitByLookType(player->getSex(), outfit.lookType); + const auto &outfitInfo = Outfits::getInstance().getOutfitByLookType(player, outfit.lookType); if (!outfitInfo) { return; } @@ -5927,7 +5927,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun outfit.lookMount = randomMount->clientId; } - const auto playerOutfit = Outfits::getInstance().getOutfitByLookType(player->getSex(), outfit.lookType); + const auto playerOutfit = Outfits::getInstance().getOutfitByLookType(player, outfit.lookType); if (!playerOutfit) { outfit.lookMount = 0; } diff --git a/src/game/game.hpp b/src/game/game.hpp index 3a199254259..b4be8facd09 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -582,8 +582,10 @@ class Game { bool hasDistanceEffect(uint16_t effectId); Groups groups; + Familiars familiars; Map map; Mounts mounts; + Outfits outfits; Raids raids; std::unique_ptr m_appearancesPtr; diff --git a/src/io/functions/iologindata_load_player.cpp b/src/io/functions/iologindata_load_player.cpp index 6273f8fefbb..8f7cf461fdf 100644 --- a/src/io/functions/iologindata_load_player.cpp +++ b/src/io/functions/iologindata_load_player.cpp @@ -66,7 +66,7 @@ bool IOLoginDataLoad::preLoadPlayer(std::shared_ptr player, const std::s } player->setGUID(result->getNumber("id")); - std::shared_ptr group = g_game().groups.getGroup(result->getNumber("group_id")); + const auto &group = g_game().groups.getGroup(result->getNumber("group_id")); if (!group) { g_logger().error("Player {} has group id {} which doesn't exist", player->name, result->getNumber("group_id")); return false; @@ -118,7 +118,7 @@ bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr player, DBResult_p player->setAccount(result->getNumber("account_id")); } - std::shared_ptr group = g_game().groups.getGroup(result->getNumber("group_id")); + const auto &group = g_game().groups.getGroup(result->getNumber("group_id")); if (!group) { g_logger().error("Player {} has group id {} which doesn't exist", player->name, result->getNumber("group_id")); return false; diff --git a/src/lua/functions/creatures/player/group_functions.cpp b/src/lua/functions/creatures/player/group_functions.cpp index 5acc16d72a9..f547eec1590 100644 --- a/src/lua/functions/creatures/player/group_functions.cpp +++ b/src/lua/functions/creatures/player/group_functions.cpp @@ -17,7 +17,7 @@ int GroupFunctions::luaGroupCreate(lua_State* L) { // Group(id) uint32_t id = getNumber(L, 2); - std::shared_ptr group = g_game().groups.getGroup(id); + const auto &group = g_game().groups.getGroup(id); if (group) { pushUserdata(L, group); setMetatable(L, -1, "Group"); @@ -29,7 +29,7 @@ int GroupFunctions::luaGroupCreate(lua_State* L) { int GroupFunctions::luaGroupGetId(lua_State* L) { // group:getId() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { lua_pushnumber(L, group->id); } else { @@ -40,7 +40,7 @@ int GroupFunctions::luaGroupGetId(lua_State* L) { int GroupFunctions::luaGroupGetName(lua_State* L) { // group:getName() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { pushString(L, group->name); } else { @@ -51,7 +51,7 @@ int GroupFunctions::luaGroupGetName(lua_State* L) { int GroupFunctions::luaGroupGetFlags(lua_State* L) { // group:getFlags() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { std::bitset flags; for (uint8_t i = 0; i < magic_enum::enum_integer(PlayerFlags_t::FlagLast); ++i) { @@ -68,7 +68,7 @@ int GroupFunctions::luaGroupGetFlags(lua_State* L) { int GroupFunctions::luaGroupGetAccess(lua_State* L) { // group:getAccess() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { pushBoolean(L, group->access); } else { @@ -79,7 +79,7 @@ int GroupFunctions::luaGroupGetAccess(lua_State* L) { int GroupFunctions::luaGroupGetMaxDepotItems(lua_State* L) { // group:getMaxDepotItems() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { lua_pushnumber(L, group->maxDepotItems); } else { @@ -90,7 +90,7 @@ int GroupFunctions::luaGroupGetMaxDepotItems(lua_State* L) { int GroupFunctions::luaGroupGetMaxVipEntries(lua_State* L) { // group:getMaxVipEntries() - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { lua_pushnumber(L, group->maxVipEntries); } else { @@ -101,7 +101,7 @@ int GroupFunctions::luaGroupGetMaxVipEntries(lua_State* L) { int GroupFunctions::luaGroupHasFlag(lua_State* L) { // group:hasFlag(flag) - std::shared_ptr group = getUserdataShared(L, 1); + const auto &group = getUserdataShared(L, 1); if (group) { auto flag = static_cast(getNumber(L, 2)); pushBoolean(L, group->flags[Groups::getFlagNumber(flag)]); diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 751da531273..98bacfc5e12 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -4055,7 +4055,7 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { // Outfit description playerDescriptionSize++; msg.addString("Outfit", "ProtocolGame::sendCyclopediaCharacterInspection - Outfit"); - if (const auto outfit = Outfits::getInstance().getOutfitByLookType(player->getSex(), player->getDefaultOutfit().lookType)) { + if (const auto outfit = Outfits::getInstance().getOutfitByLookType(player, player->getDefaultOutfit().lookType)) { msg.addString(outfit->name, "ProtocolGame::sendCyclopediaCharacterInspection - outfit->name"); } else { msg.addString("unknown", "ProtocolGame::sendCyclopediaCharacterInspection - unknown"); From e20e7eb68b24eafdbc13b1c3c72928ee8caf3ee1 Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Wed, 12 Jun 2024 10:43:24 -0300 Subject: [PATCH 28/50] feat: monster rename functionality (#2621) --- ...{create_monster.lua => manage_monster.lua} | 32 +++++++++++++++++- src/creatures/monsters/monster.cpp | 33 ++++++++++++++++++- src/creatures/monsters/monster.hpp | 20 ++++++----- src/creatures/players/player.hpp | 9 +++-- .../creatures/monster/monster_functions.cpp | 20 ++++++++++- .../creatures/monster/monster_functions.hpp | 2 ++ src/server/network/protocol/protocolgame.cpp | 33 ++++++++++++++----- src/server/network/protocol/protocolgame.hpp | 1 + 8 files changed, 128 insertions(+), 22 deletions(-) rename data/scripts/talkactions/god/{create_monster.lua => manage_monster.lua} (83%) diff --git a/data/scripts/talkactions/god/create_monster.lua b/data/scripts/talkactions/god/manage_monster.lua similarity index 83% rename from data/scripts/talkactions/god/create_monster.lua rename to data/scripts/talkactions/god/manage_monster.lua index ce5869a2eee..da110d59265 100644 --- a/data/scripts/talkactions/god/create_monster.lua +++ b/data/scripts/talkactions/god/manage_monster.lua @@ -56,7 +56,7 @@ local createMonster = TalkAction("/m") -- @param param: String containing the command parameters. -- Format: "/m monstername, monstercount, [fiendish/influenced level], spawnRadius, [forceCreate]" -- Example: "/m rat, 10, fiendish, 5, true" --- @param: the last param is by default "false", if add "," or any value i'ts set to true +-- @param: the last param is by default "false", if add "," or any value it's set to true -- @return true if the command is executed successfully, false otherwise. function createMonster.onSay(player, words, param) -- create log @@ -127,3 +127,33 @@ end createMonster:separator(" ") createMonster:groupType("god") createMonster:register() + +----------------- Rename monster name ----------------- +local setMonsterName = TalkAction("/setmonstername") + +-- @function setMonsterName.onSay +-- @desc TalkAction to rename nearby monsters within a radius of 4 sqm. +-- Format: "/setmonstername newName" +function setMonsterName.onSay(player, words, param) + if param == "" then + player:sendCancelMessage("Command param required.") + return true + end + + local split = param:split(",") + local monsterNewName = split[1] + + local spectators, spectator = Game.getSpectators(player:getPosition(), false, false, 4, 4, 4, 4) + for i = 1, #spectators do + spectator = spectators[i] + if spectator:isMonster() then + spectator:setName(monsterNewName) + end + end + + return true +end + +setMonsterName:separator(" ") +setMonsterName:groupType("god") +setMonsterName:register() diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp index fccc19b05e5..5e0a7d16bb4 100644 --- a/src/creatures/monsters/monster.cpp +++ b/src/creatures/monsters/monster.cpp @@ -33,7 +33,7 @@ std::shared_ptr Monster::createMonster(const std::string &name) { Monster::Monster(const std::shared_ptr mType) : Creature(), - strDescription(asLowerCaseString(mType->nameDescription)), + nameDescription(asLowerCaseString(mType->nameDescription)), mType(mType) { defaultOutfit = mType->info.outfit; currentOutfit = mType->info.outfit; @@ -64,6 +64,37 @@ void Monster::removeList() { g_game().removeMonster(static_self_cast()); } +const std::string &Monster::getName() const { + if (name.empty()) { + return mType->name; + } + return name; +} + +void Monster::setName(const std::string &name) { + if (getName() == name) { + return; + } + + this->name = name; + + // NOTE: Due to how client caches known creatures, + // it is not feasible to send creature update to everyone that has ever met it + auto spectators = Spectators().find(position, true); + for (const auto &spectator : spectators) { + if (const auto &tmpPlayer = spectator->getPlayer()) { + tmpPlayer->sendUpdateTileCreature(static_self_cast()); + } + } +} + +const std::string &Monster::getNameDescription() const { + if (nameDescription.empty()) { + return mType->nameDescription; + } + return nameDescription; +} + bool Monster::canWalkOnFieldType(CombatType_t combatType) const { switch (combatType) { case COMBAT_ENERGYDAMAGE: diff --git a/src/creatures/monsters/monster.hpp b/src/creatures/monsters/monster.hpp index bf9a39e4133..6c45fa3eaca 100644 --- a/src/creatures/monsters/monster.hpp +++ b/src/creatures/monsters/monster.hpp @@ -41,21 +41,22 @@ class Monster final : public Creature { } } - void removeList() override; void addList() override; + void removeList() override; + + const std::string &getName() const override; + void setName(const std::string &name); - const std::string &getName() const override { - return mType->name; - } // Real monster name, set on monster creation "createMonsterType(typeName)" const std::string &getTypeName() const override { return mType->typeName; } - const std::string &getNameDescription() const override { - return mType->nameDescription; - } + const std::string &getNameDescription() const override; + void setNameDescription(const std::string &nameDescription) { + this->nameDescription = nameDescription; + }; std::string getDescription(int32_t) override { - return strDescription + '.'; + return nameDescription + '.'; } CreatureType_t getType() const override { @@ -363,7 +364,8 @@ class Monster final : public Creature { uint16_t forgeStack = 0; ForgeClassifications_t monsterForgeClassification = ForgeClassifications_t::FORGE_NORMAL_MONSTER; - std::string strDescription; + std::string name; + std::string nameDescription; std::shared_ptr mType; SpawnMonster* spawnMonster = nullptr; diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 19e3af5ca9c..947acedca54 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -153,8 +153,8 @@ class Player final : public Creature, public Cylinder, public Bankable { const std::string &getName() const override { return name; } - void setName(std::string newName) { - this->name = std::move(newName); + void setName(const std::string &name) { + this->name = name; } const std::string &getTypeName() const override { return name; @@ -1075,6 +1075,11 @@ class Player final : public Creature, public Cylinder, public Bankable { client->sendRemoveTileThing(pos, stackpos); } } + void sendUpdateTileCreature(const std::shared_ptr creature) { + if (client) { + client->sendUpdateTileCreature(creature->getPosition(), creature->getTile()->getClientIndexOfCreature(static_self_cast(), creature), creature); + } + } void sendUpdateTile(std::shared_ptr updateTile, const Position &pos) { if (client) { client->sendUpdateTile(updateTile, pos); diff --git a/src/lua/functions/creatures/monster/monster_functions.cpp b/src/lua/functions/creatures/monster/monster_functions.cpp index 1591053c391..273f6af5c99 100644 --- a/src/lua/functions/creatures/monster/monster_functions.cpp +++ b/src/lua/functions/creatures/monster/monster_functions.cpp @@ -77,7 +77,7 @@ int MonsterFunctions::luaMonsterSetType(lua_State* L) { } // Assign new MonsterType monster->mType = mType; - monster->strDescription = asLowerCaseString(mType->nameDescription); + monster->nameDescription = asLowerCaseString(mType->nameDescription); monster->defaultOutfit = mType->info.outfit; monster->currentOutfit = mType->info.outfit; monster->skull = mType->info.skull; @@ -529,6 +529,24 @@ int MonsterFunctions::luaMonsterGetName(lua_State* L) { return 1; } +int MonsterFunctions::luaMonsterSetName(lua_State* L) { + // monster:setName(name[, nameDescription]) + auto monster = getUserdataShared(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + monster->setName(getString(L, 2)); + if (lua_gettop(L) >= 3) { + monster->setNameDescription(getString(L, 3)); + } + + pushBoolean(L, true); + return 1; +} + int MonsterFunctions::luaMonsterHazard(lua_State* L) { // get: monster:hazard() ; set: monster:hazard(hazard) std::shared_ptr monster = getUserdataShared(L, 1); diff --git a/src/lua/functions/creatures/monster/monster_functions.hpp b/src/lua/functions/creatures/monster/monster_functions.hpp index bf2785ae430..dd1c3827344 100644 --- a/src/lua/functions/creatures/monster/monster_functions.hpp +++ b/src/lua/functions/creatures/monster/monster_functions.hpp @@ -56,6 +56,7 @@ class MonsterFunctions final : LuaScriptInterface { registerMethod(L, "Monster", "isForgeable", MonsterFunctions::luaMonsterIsForgeable); registerMethod(L, "Monster", "getName", MonsterFunctions::luaMonsterGetName); + registerMethod(L, "Monster", "setName", MonsterFunctions::luaMonsterSetName); registerMethod(L, "Monster", "hazard", MonsterFunctions::luaMonsterHazard); registerMethod(L, "Monster", "hazardCrit", MonsterFunctions::luaMonsterHazardCrit); @@ -116,6 +117,7 @@ class MonsterFunctions final : LuaScriptInterface { static int luaMonsterIsForgeable(lua_State* L); static int luaMonsterGetName(lua_State* L); + static int luaMonsterSetName(lua_State* L); static int luaMonsterHazard(lua_State* L); static int luaMonsterHazardCrit(lua_State* L); diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 98bacfc5e12..8cf0660a262 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -5947,7 +5947,7 @@ void ProtocolGame::sendCreatureTurn(std::shared_ptr creature, uint32_t NetworkMessage msg; msg.addByte(0x6B); msg.addPosition(creature->getPosition()); - msg.addByte(stackPos); + msg.addByte(static_cast(stackPos)); msg.add(0x63); msg.add(creature->getID()); msg.addByte(creature->getDirection()); @@ -6385,7 +6385,7 @@ void ProtocolGame::sendAddTileItem(const Position &pos, uint32_t stackpos, std:: NetworkMessage msg; msg.addByte(0x6A); msg.addPosition(pos); - msg.addByte(stackpos); + msg.addByte(static_cast(stackpos)); AddItem(msg, item); writeToOutputBuffer(msg); } @@ -6398,7 +6398,7 @@ void ProtocolGame::sendUpdateTileItem(const Position &pos, uint32_t stackpos, st NetworkMessage msg; msg.addByte(0x6B); msg.addPosition(pos); - msg.addByte(stackpos); + msg.addByte(static_cast(stackpos)); AddItem(msg, item); writeToOutputBuffer(msg); } @@ -6413,6 +6413,23 @@ void ProtocolGame::sendRemoveTileThing(const Position &pos, uint32_t stackpos) { writeToOutputBuffer(msg); } +void ProtocolGame::sendUpdateTileCreature(const Position &pos, uint32_t stackpos, const std::shared_ptr creature) { + if (!canSee(pos)) { + return; + } + + NetworkMessage msg; + msg.addByte(0x6B); + msg.addPosition(pos); + msg.addByte(static_cast(stackpos)); + + bool known; + uint32_t removedKnown; + checkCreatureAsKnown(creature->getID(), known, removedKnown); + AddCreature(msg, creature, false, removedKnown); + writeToOutputBuffer(msg); +} + void ProtocolGame::sendUpdateTile(std::shared_ptr tile, const Position &pos) { if (!canSee(pos)) { return; @@ -6484,7 +6501,7 @@ void ProtocolGame::sendAddCreature(std::shared_ptr creature, const Pos NetworkMessage msg; msg.addByte(0x6A); msg.addPosition(pos); - msg.addByte(stackpos); + msg.addByte(static_cast(stackpos)); bool known; uint32_t removedKnown; @@ -6641,7 +6658,7 @@ void ProtocolGame::sendMoveCreature(std::shared_ptr creature, const Po } else { msg.addByte(0x6D); msg.addPosition(oldPos); - msg.addByte(oldStackPos); + msg.addByte(static_cast(oldStackPos)); msg.addPosition(newPos); } @@ -6676,7 +6693,7 @@ void ProtocolGame::sendMoveCreature(std::shared_ptr creature, const Po NetworkMessage msg; msg.addByte(0x6D); msg.addPosition(oldPos); - msg.addByte(oldStackPos); + msg.addByte(static_cast(oldStackPos)); msg.addPosition(newPos); writeToOutputBuffer(msg); } @@ -7836,7 +7853,7 @@ void ProtocolGame::RemoveTileThing(NetworkMessage &msg, const Position &pos, uin msg.addByte(0x6C); msg.addPosition(pos); - msg.addByte(stackpos); + msg.addByte(static_cast(stackpos)); } void ProtocolGame::sendKillTrackerUpdate(std::shared_ptr corpse, const std::string &name, const Outfit_t creatureOutfit) { @@ -8279,7 +8296,7 @@ void ProtocolGame::reloadCreature(std::shared_ptr creature) { if (knownCreatureSet.contains(creature->getID())) { msg.addByte(0x6B); msg.addPosition(creature->getPosition()); - msg.addByte(stackpos); + msg.addByte(static_cast(stackpos)); AddCreature(msg, creature, false, 0); } else { sendAddCreature(creature, creature->getPosition(), stackpos, false); diff --git a/src/server/network/protocol/protocolgame.hpp b/src/server/network/protocol/protocolgame.hpp index 0386093cfc4..100ca199b77 100644 --- a/src/server/network/protocol/protocolgame.hpp +++ b/src/server/network/protocol/protocolgame.hpp @@ -393,6 +393,7 @@ class ProtocolGame final : public Protocol { void sendAddTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr item); void sendUpdateTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr item); void sendRemoveTileThing(const Position &pos, uint32_t stackpos); + void sendUpdateTileCreature(const Position &pos, uint32_t stackpos, const std::shared_ptr creature); void sendUpdateTile(std::shared_ptr tile, const Position &pos); void sendAddCreature(std::shared_ptr creature, const Position &pos, int32_t stackpos, bool isLogin); From 7c3393a1015ff4d8c1f43c5988b33f489302e20f Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Wed, 12 Jun 2024 10:48:41 -0300 Subject: [PATCH 29/50] fix: crash on shutdown (#2676) --- src/lib/thread/thread_pool.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/thread/thread_pool.cpp b/src/lib/thread/thread_pool.cpp index 702f0c05504..b2f51ef8f9d 100644 --- a/src/lib/thread/thread_pool.cpp +++ b/src/lib/thread/thread_pool.cpp @@ -26,7 +26,7 @@ #endif ThreadPool::ThreadPool(Logger &logger) : - logger(logger), BS::thread_pool(std::max(getNumberOfCores(), DEFAULT_NUMBER_OF_THREADS)) { + BS::thread_pool(std::max(getNumberOfCores(), DEFAULT_NUMBER_OF_THREADS)), logger(logger) { start(); } @@ -35,6 +35,7 @@ void ThreadPool::start() { } void ThreadPool::shutdown() { - stopped = true; logger.info("Shutting down thread pool..."); + stopped = true; + wait(); } From f741bebc0bbd4fb04bdd5948b551f7f5ec91064a Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Thu, 13 Jun 2024 14:14:10 -0300 Subject: [PATCH 30/50] improver: mini-refactor inventory update (#2652) --- src/creatures/players/player.cpp | 36 +++++++++++++++++++------------- src/creatures/players/player.hpp | 3 +++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 2b10c0f77ee..2c92f694197 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -1715,13 +1715,7 @@ void Player::onCreatureAppear(std::shared_ptr creature, bool isLogin) Creature::onCreatureAppear(creature, isLogin); if (isLogin && creature == getPlayer()) { - for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { - std::shared_ptr item = inventory[slot]; - if (item) { - item->startDecaying(); - g_moveEvents().onPlayerEquip(getPlayer(), item, static_cast(slot), false); - } - } + onEquipInventory(); // Refresh bosstiary tracker onLogin refreshCyclopediaMonsterTracker(true); @@ -1862,14 +1856,9 @@ void Player::onRemoveCreature(std::shared_ptr creature, bool isLogout) Creature::onRemoveCreature(creature, isLogout); if (auto player = getPlayer(); player == creature) { - for (uint8_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { - const auto item = inventory[slot]; - if (item) { - g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast(slot)); - } - } - if (isLogout) { + onDeEquipInventory(); + if (m_party) { m_party->leaveParty(player); } @@ -2011,6 +2000,25 @@ void Player::onCreatureMove(const std::shared_ptr &creature, const std } } +void Player::onEquipInventory() { + for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { + std::shared_ptr item = inventory[slot]; + if (item) { + item->startDecaying(); + g_moveEvents().onPlayerEquip(getPlayer(), item, static_cast(slot), false); + } + } +} + +void Player::onDeEquipInventory() { + for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { + std::shared_ptr item = inventory[slot]; + if (item) { + g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast(slot)); + } + } +} + // container void Player::onAddContainerItem(std::shared_ptr item) { checkTradeState(item); diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 947acedca54..d374bd59911 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -1315,6 +1315,9 @@ class Player final : public Creature, public Cylinder, public Bankable { void onRemoveCreature(std::shared_ptr creature, bool isLogout) override; void onCreatureMove(const std::shared_ptr &creature, const std::shared_ptr &newTile, const Position &newPos, const std::shared_ptr &oldTile, const Position &oldPos, bool teleport) override; + void onEquipInventory(); + void onDeEquipInventory(); + void onAttackedCreatureDisappear(bool isLogout) override; void onFollowCreatureDisappear(bool isLogout) override; From e1fd98e010c35471094a9a6f12c0e3af7e08f8a5 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Fri, 14 Jun 2024 21:25:21 -0300 Subject: [PATCH 31/50] improve: async batch dispatcher (#2666) Now the asynchronous requests will be made in batches and not one at a time, that is, we will take the total number of tasks divided by the number of available threads, this avoids locking the threads to retrieve the next task to be processed. ex: if we have 1000 tasks and 8 threads, 125 tasks will be triggered per thread. (1000/8) = 125 In this PR I also brought a new method called asyncWait, with this method you can make asynchronous requests but without needing to define a group, the asynchronous tasks will be executed immediately and will wait for them to finish. --- src/game/scheduling/dispatcher.cpp | 55 +++++++++++++++++++++--------- src/game/scheduling/dispatcher.hpp | 19 +++++++++++ 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/src/game/scheduling/dispatcher.cpp b/src/game/scheduling/dispatcher.cpp index 7cff69d66bf..dbbfc020be5 100644 --- a/src/game/scheduling/dispatcher.cpp +++ b/src/game/scheduling/dispatcher.cpp @@ -56,30 +56,51 @@ void Dispatcher::executeSerialEvents(std::vector &tasks) { } void Dispatcher::executeParallelEvents(std::vector &tasks, const uint8_t groupId) { - std::atomic_uint_fast64_t totalTaskSize = tasks.size(); - std::atomic_bool isTasksCompleted = false; + asyncWait(tasks.size(), [groupId, &tasks](size_t i) { + dispacherContext.type = DispatcherType::AsyncEvent; + dispacherContext.group = static_cast(groupId); + tasks[i].execute(); - for (const auto &task : tasks) { - threadPool.detach_task([groupId, &task, &isTasksCompleted, &totalTaskSize] { - dispacherContext.type = DispatcherType::AsyncEvent; - dispacherContext.group = static_cast(groupId); - dispacherContext.taskName = task.getContext(); + dispacherContext.reset(); + }); - task.execute(); + tasks.clear(); +} - dispacherContext.reset(); +void Dispatcher::asyncWait(size_t requestSize, std::function &&f) { + if (requestSize == 0) { + return; + } - totalTaskSize.fetch_sub(1); - if (totalTaskSize.load() == 0) { - isTasksCompleted.store(true); - isTasksCompleted.notify_one(); - } - }); + // This prevents an async call from running inside another async call. + if (asyncWaitDisabled) { + for (uint_fast64_t i = 0; i < requestSize; ++i) { + f(i); + } + return; } - isTasksCompleted.wait(false); + const auto &partitions = generatePartition(requestSize); + const auto pSize = partitions.size(); - tasks.clear(); + BS::multi_future retFuture; + + if (pSize > 1) { + asyncWaitDisabled = true; + const auto min = partitions[1].first; + const auto max = partitions[partitions.size() - 1].second; + retFuture = threadPool.submit_loop(min, max, [&f](const unsigned int i) { f(i); }); + } + + const auto &[min, max] = partitions[0]; + for (uint_fast64_t i = min; i < max; ++i) { + f(i); + } + + if (pSize > 1) { + retFuture.wait(); + asyncWaitDisabled = false; + } } void Dispatcher::executeEvents(const TaskGroup startGroup) { diff --git a/src/game/scheduling/dispatcher.hpp b/src/game/scheduling/dispatcher.hpp index a6cbc8dd6dd..94b284c9316 100644 --- a/src/game/scheduling/dispatcher.hpp +++ b/src/game/scheduling/dispatcher.hpp @@ -108,6 +108,7 @@ class Dispatcher { } void asyncEvent(std::function &&f, TaskGroup group = TaskGroup::GenericParallel); + void asyncWait(size_t size, std::function &&f); uint64_t asyncCycleEvent(uint32_t delay, std::function &&f, TaskGroup group = TaskGroup::GenericParallel) { return scheduleEvent( @@ -173,6 +174,22 @@ class Dispatcher { } } + std::vector> generatePartition(size_t size) const { + if (size == 0) { + return {}; + } + + std::vector> list; + list.reserve(threadPool.get_thread_count()); + + const auto size_per_block = std::ceil(size / static_cast(threadPool.get_thread_count())); + for (uint_fast64_t i = 0; i < size; i += size_per_block) { + list.emplace_back(i, std::min(size, i + size_per_block)); + } + + return list; + } + uint_fast64_t dispatcherCycle = 0; ThreadPool &threadPool; @@ -200,6 +217,8 @@ class Dispatcher { phmap::btree_multiset, Task::Compare> scheduledTasks; phmap::parallel_flat_hash_map_m> scheduledTasksRef; + bool asyncWaitDisabled = false; + friend class CanaryServer; }; From 883c3ff7ce55b8ad69413fbb551580e310d95909 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Fri, 14 Jun 2024 21:26:44 -0300 Subject: [PATCH 32/50] perf: optimized moveCreature and spectators (#2667) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • In moveCreature, a check was added so that the spectator's search is not called twice, now only one position is passed with the interval adjusted to assume both positions as if it were. • In spectators we no longer use vector_set but just vector and if there is a need to remove record duplication, it will use unordered_set passing the vector in the constructor which is much faster. • Why was useCacheMap disabled? As the map cache is done synchronously for each movement that a monster makes, it is better to disable it, as the pathfinder, which is one of the resources that uses this cache the most, is multithreding and thus the processing cost is divided between the threads. --- src/creatures/monsters/monster.hpp | 6 +++- src/map/map.cpp | 28 ++++++++++++++-- src/map/spectators.cpp | 51 ++++++++---------------------- src/map/spectators.hpp | 49 ++++++++++++++++++++-------- 4 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/creatures/monsters/monster.hpp b/src/creatures/monsters/monster.hpp index 6c45fa3eaca..061ad2b9879 100644 --- a/src/creatures/monsters/monster.hpp +++ b/src/creatures/monsters/monster.hpp @@ -455,7 +455,11 @@ class Monster final : public Creature { void dropLoot(std::shared_ptr corpse, std::shared_ptr lastHitCreature) override; void getPathSearchParams(const std::shared_ptr &creature, FindPathParams &fpp) override; bool useCacheMap() const override { - return !randomStepping; + // return !randomStepping; + // As the map cache is done synchronously for each movement that a monster makes, it is better to disable it, + // as the pathfinder, which is one of the resources that uses this cache the most, + // is multithreding and thus the processing cost is divided between the threads. + return false; } friend class MonsterFunctions; diff --git a/src/map/map.cpp b/src/map/map.cpp index 8b8cebeb539..82629aeae05 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -342,13 +342,35 @@ void Map::moveCreature(const std::shared_ptr &creature, const std::sha bool teleport = forceTeleport || !newTile->getGround() || !Position::areInRange<1, 1, 0>(oldPos, newPos); - auto spectators = Spectators() - .find(oldPos, true) - .find(newPos, true); + Spectators spectators; + if (!teleport && oldPos.z == newPos.z) { + int32_t minRangeX = MAP_MAX_VIEW_PORT_X; + int32_t maxRangeX = MAP_MAX_VIEW_PORT_X; + int32_t minRangeY = MAP_MAX_VIEW_PORT_Y; + int32_t maxRangeY = MAP_MAX_VIEW_PORT_Y; + + if (oldPos.y > newPos.y) { + ++minRangeY; + } else if (oldPos.y < newPos.y) { + ++maxRangeY; + } + + if (oldPos.x < newPos.x) { + ++maxRangeX; + } else if (oldPos.x > newPos.x) { + ++minRangeX; + } + + spectators.find(oldPos, true, minRangeX, maxRangeX, minRangeY, maxRangeY); + } else { + spectators.find(oldPos, true); + spectators.find(newPos, true); + } auto playersSpectators = spectators.filter(); std::vector oldStackPosVector; + oldStackPosVector.reserve(playersSpectators.size()); for (const auto &spec : playersSpectators) { if (spec->canSeeCreature(creature)) { oldStackPosVector.push_back(oldTile->getClientIndexOfCreature(spec->getPlayer(), creature)); diff --git a/src/map/spectators.cpp b/src/map/spectators.cpp index 36cce6d535b..10aaf0faf87 100644 --- a/src/map/spectators.cpp +++ b/src/map/spectators.cpp @@ -18,50 +18,27 @@ void Spectators::clearCache() { spectatorsCache.clear(); } -bool Spectators::contains(const std::shared_ptr &creature) { - return creatures.contains(creature); -} - -bool Spectators::erase(const std::shared_ptr &creature) { - return creatures.erase(creature); -} - Spectators Spectators::insert(const std::shared_ptr &creature) { if (creature) { - creatures.emplace(creature); + creatures.emplace_back(creature); } return *this; } -Spectators Spectators::insertAll(const SpectatorList &list) { +Spectators Spectators::insertAll(const CreatureVector &list) { if (!list.empty()) { - creatures.insertAll(list); - } - return *this; -} + const bool hasValue = !creatures.empty(); -Spectators Spectators::join(Spectators &anotherSpectators) { - return insertAll(anotherSpectators.creatures.data()); -} - -bool Spectators::empty() const noexcept { - return creatures.empty(); -} + creatures.insert(creatures.end(), list.begin(), list.end()); -size_t Spectators::size() noexcept { - return creatures.size(); -} - -CreatureVector::iterator Spectators::begin() noexcept { - return creatures.begin(); -} - -CreatureVector::iterator Spectators::end() noexcept { - return creatures.end(); -} - -const CreatureVector &Spectators::data() noexcept { - return creatures.data(); + // Remove duplicate + if (hasValue) { + std::unordered_set uset(creatures.begin(), creatures.end()); + creatures.clear(); + creatures.insert(creatures.end(), uset.begin(), uset.end()); + } + } + return *this; } bool Spectators::checkCache(const SpectatorsCache::FloorData &specData, bool onlyPlayers, const Position ¢erPos, bool checkDistance, bool multifloor, int32_t minRangeX, int32_t maxRangeX, int32_t minRangeY, int32_t maxRangeY) { @@ -77,7 +54,7 @@ bool Spectators::checkCache(const SpectatorsCache::FloorData &specData, bool onl } if (checkDistance) { - SpectatorList spectators; + CreatureVector spectators; spectators.reserve(creatures.size()); for (const auto &creature : *list) { const auto &specPos = creature->getPosition(); @@ -176,7 +153,7 @@ Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onl const int32_t endx2 = x2 - (x2 & SECTOR_MASK); const int32_t endy2 = y2 - (y2 & SECTOR_MASK); - SpectatorList spectators; + CreatureVector spectators; spectators.reserve(std::max(MAP_MAX_VIEW_PORT_X, MAP_MAX_VIEW_PORT_Y) * 2); const MapSector* startSector = g_game().map.getMapSector(startx1, starty1); diff --git a/src/map/spectators.hpp b/src/map/spectators.hpp index 93526e05c93..9e998da2bfa 100644 --- a/src/map/spectators.hpp +++ b/src/map/spectators.hpp @@ -16,12 +16,10 @@ class Monster; class Npc; struct Position; -using SpectatorList = std::vector>; - struct SpectatorsCache { struct FloorData { - std::optional floor; - std::optional multiFloor; + std::optional floor; + std::optional multiFloor; }; int32_t minRangeX { 0 }; @@ -48,16 +46,39 @@ class Spectators { requires std::is_base_of_v Spectators filter(); - bool contains(const std::shared_ptr &creature); - bool erase(const std::shared_ptr &creature); Spectators insert(const std::shared_ptr &creature); - Spectators insertAll(const SpectatorList &list); - Spectators join(Spectators &anotherSpectators); - bool empty() const noexcept; - size_t size() noexcept; - CreatureVector::iterator begin() noexcept; - CreatureVector::iterator end() noexcept; - const CreatureVector &data() noexcept; + Spectators insertAll(const CreatureVector &list); + Spectators join(const Spectators &anotherSpectators) { + return insertAll(anotherSpectators.creatures); + } + + bool contains(const std::shared_ptr &creature) const { + return std::ranges::find(creatures, creature) != creatures.end(); + } + + bool erase(const std::shared_ptr &creature) { + return std::erase(creatures, creature) > 0; + } + + bool empty() const noexcept { + return creatures.empty(); + } + + size_t size() const noexcept { + return creatures.size(); + } + + auto begin() const noexcept { + return creatures.begin(); + } + + auto end() const noexcept { + return creatures.end(); + } + + const auto &data() const noexcept { + return creatures; + } private: static phmap::flat_hash_map spectatorsCache; @@ -65,7 +86,7 @@ class Spectators { Spectators find(const Position ¢erPos, bool multifloor = false, bool onlyPlayers = false, int32_t minRangeX = 0, int32_t maxRangeX = 0, int32_t minRangeY = 0, int32_t maxRangeY = 0); bool checkCache(const SpectatorsCache::FloorData &specData, bool onlyPlayers, const Position ¢erPos, bool checkDistance, bool multifloor, int32_t minRangeX, int32_t maxRangeX, int32_t minRangeY, int32_t maxRangeY); - stdext::vector_set> creatures; + CreatureVector creatures; }; template From 8a2e5f2e2cbd79cb3606e1553ea233b388782ac8 Mon Sep 17 00:00:00 2001 From: Renato Machado Date: Fri, 14 Jun 2024 21:55:29 -0300 Subject: [PATCH 33/50] perf: remove browseField on container destruction (#2677) Instead of checking all the time if there is a browsefield to be destroyed, why not remove it at the time of its destruction?! Besides, the linear search of phmap::flat_hash_map is very slow. --- src/game/game.cpp | 14 -------------- src/game/game.hpp | 1 - src/items/containers/container.cpp | 4 ++++ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/game/game.cpp b/src/game/game.cpp index 57daddded2e..984e675407c 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -6255,7 +6255,6 @@ void Game::checkCreatureWalk(uint32_t creatureId) { const auto &creature = getCreatureByID(creatureId); if (creature && creature->getHealth() > 0) { creature->onCreatureWalk(); - cleanup(); } } @@ -6318,7 +6317,6 @@ void Game::checkCreatures() { --end; } } - cleanup(); index = (index + 1) % EVENT_CREATURECOUNT; } @@ -7967,8 +7965,6 @@ void Game::shutdown() { map.spawnsNpc.clear(); raids.clear(); - cleanup(); - if (serviceManager) { serviceManager->stop(); } @@ -7980,16 +7976,6 @@ void Game::shutdown() { g_logger().info("Done!"); } -void Game::cleanup() { - for (auto it = browseFields.begin(); it != browseFields.end();) { - if (it->second.expired()) { - it = browseFields.erase(it); - } else { - ++it; - } - } -} - void Game::addBestiaryList(uint16_t raceid, std::string name) { auto it = BestiaryList.find(raceid); if (it != BestiaryList.end()) { diff --git a/src/game/game.hpp b/src/game/game.hpp index b4be8facd09..2de00410e5e 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -426,7 +426,6 @@ class Game { void updatePlayerHelpers(std::shared_ptr player); - void cleanup(); void shutdown(); void dieSafely(const std::string &errorMsg); void addBestiaryList(uint16_t raceid, std::string name); diff --git a/src/items/containers/container.cpp b/src/items/containers/container.cpp index 63ce657741a..6c526a8500a 100644 --- a/src/items/containers/container.cpp +++ b/src/items/containers/container.cpp @@ -63,6 +63,10 @@ std::shared_ptr Container::create(std::shared_ptr tile) { Container::~Container() { if (getID() == ITEM_BROWSEFIELD) { + if (getParent() && getParent()->getTile()) { + g_game().browseFields.erase(getParent()->getTile()); + } + for (std::shared_ptr item : itemlist) { item->setParent(getParent()); } From 81e250a8f9448c476fc12a1c63b53daa8a762aaa Mon Sep 17 00:00:00 2001 From: Elson Costa Date: Fri, 14 Jun 2024 21:56:31 -0300 Subject: [PATCH 34/50] fix: autoloot default value (#2690) --- src/creatures/players/player.hpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index d374bd59911..802b4e6fb6e 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -2562,8 +2562,7 @@ class Player final : public Creature, public Cylinder, public Bankable { } bool checkAutoLoot(bool isBoss) const { - const bool autoLoot = g_configManager().getBoolean(AUTOLOOT, __FUNCTION__); - if (!autoLoot) { + if (!g_configManager().getBoolean(AUTOLOOT, __FUNCTION__)) { return false; } if (g_configManager().getBoolean(VIP_SYSTEM_ENABLED, __FUNCTION__) && g_configManager().getBoolean(VIP_AUTOLOOT_VIP_ONLY, __FUNCTION__) && !isVip()) { @@ -2571,18 +2570,13 @@ class Player final : public Creature, public Cylinder, public Bankable { } auto featureKV = kv()->scoped("features")->get("autoloot"); - if (featureKV.has_value()) { - auto value = featureKV->getNumber(); - if (value == 2) { - return true; - } else if (value == 1) { - return !isBoss; - } else if (value == 0) { - return false; - } + auto value = featureKV.has_value() ? featureKV->getNumber() : 0; + if (value == 2) { + return true; + } else if (value == 1) { + return !isBoss; } - - return true; + return false; } QuickLootFilter_t getQuickLootFilter() const { From b682da775f4c573d15f1dc15a899eb540a7ec969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Lu=C3=ADs=20Lucarelo=20Lamonato?= Date: Sat, 15 Jun 2024 00:13:42 -0300 Subject: [PATCH 35/50] fix: prevent client debug when purchase/sale statistics are missing (#2693) This PR introduces a change to ensure proper handling of cases where sale statistics for a specific item with tier are not found in the tierStatsMap. Fixes #2656 --- src/server/network/protocol/protocolgame.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 8cf0660a262..1c40b67d6c6 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -5857,6 +5857,8 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { msg.add(purchaseStatistics.highestPrice); msg.add(purchaseStatistics.lowestPrice); } + } else { + msg.addByte(0x00); } } else { msg.addByte(0x00); // send to old protocol ? @@ -5880,6 +5882,8 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { msg.add(saleStatistics.highestPrice); msg.add(saleStatistics.lowestPrice); } + } else { + msg.addByte(0x00); } } else { msg.addByte(0x00); // send to old protocol ? From 4af5b2dc1898f0e69da2730bf1a41768b43c29ed Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Sat, 15 Jun 2024 00:14:03 -0300 Subject: [PATCH 36/50] fix: store UI exhaustion and improve bosslever messages (#2694) Fixed the store exhaustion to work correctly. Fixed the boss lever messages to better inform the participants. --- data/libs/functions/boss_lever.lua | 32 +++++++++++++++++-------- data/modules/scripts/gamestore/init.lua | 17 ++++++++----- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/data/libs/functions/boss_lever.lua b/data/libs/functions/boss_lever.lua index 3792cdf629d..48d00582e89 100644 --- a/data/libs/functions/boss_lever.lua +++ b/data/libs/functions/boss_lever.lua @@ -174,24 +174,36 @@ function BossLever:onUse(player) end if creature:getLevel() < self.requiredLevel then - creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, "All the players need to be level " .. self.requiredLevel .. " or higher.") + local message = "All players need to be level " .. self.requiredLevel .. " or higher." + creature:sendTextMessage(MESSAGE_EVENT_ADVANCE, message) + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, message) return false end - if self:lastEncounterTime(creature) > os.time() then - local info = lever:getInfoPositions() - for _, v in pairs(info) do - local newPlayer = v.creature - if newPlayer then - local timeLeft = self:lastEncounterTime(newPlayer) - os.time() - newPlayer:sendTextMessage(MESSAGE_EVENT_ADVANCE, "You or a member in your team have to wait " .. getTimeInWords(timeLeft) .. " to face " .. self.name .. " again!") - if self:lastEncounterTime(newPlayer) > os.time() then - newPlayer:getPosition():sendMagicEffect(CONST_ME_POFF) + if creature:getGroup():getId() < GROUP_TYPE_GOD and self:lastEncounterTime(creature) > os.time() then + local infoPositions = lever:getInfoPositions() + for _, posInfo in pairs(infoPositions) do + local currentPlayer = posInfo.creature + if currentPlayer then + local lastEncounter = self:lastEncounterTime(currentPlayer) + local currentTime = os.time() + if lastEncounter and currentTime < lastEncounter then + local timeLeft = lastEncounter - currentTime + local timeMessage = getTimeInWords(timeLeft) .. " to face " .. monsterName .. " again!" + local message = "You have to wait " .. timeMessage + + if currentPlayer ~= player then + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "A member in your team has to wait " .. timeMessage) + end + + currentPlayer:sendTextMessage(MESSAGE_EVENT_ADVANCE, message) + currentPlayer:getPosition():sendMagicEffect(CONST_ME_POFF) end end end return false end + self.onUseExtra(creature) return true end) diff --git a/data/modules/scripts/gamestore/init.lua b/data/modules/scripts/gamestore/init.lua index ba7398d9d3e..214aec77d43 100644 --- a/data/modules/scripts/gamestore/init.lua +++ b/data/modules/scripts/gamestore/init.lua @@ -247,6 +247,11 @@ function onRecvbyte(player, msg, byte) return player:sendCancelMessage("Store don't have offers for rookgaard citizen.") end + if player:isUIExhausted(250) then + player:sendCancelMessage("You are exhausted.") + return + end + if byte == GameStore.RecivedPackets.C_StoreEvent then elseif byte == GameStore.RecivedPackets.C_TransferCoins then parseTransferableCoins(player:getId(), msg) @@ -262,12 +267,6 @@ function onRecvbyte(player, msg, byte) parseRequestTransactionHistory(player:getId(), msg) end - if player:isUIExhausted(250) then - player:sendCancelMessage("You are exhausted.") - return false - end - - player:updateUIExhausted() return true end @@ -306,6 +305,7 @@ function parseTransferableCoins(playerId, msg) GameStore.insertHistory(accountId, GameStore.HistoryTypes.HISTORY_TYPE_NONE, player:getName() .. " transferred you this amount.", amount, GameStore.CoinType.Transferable) GameStore.insertHistory(player:getAccountId(), GameStore.HistoryTypes.HISTORY_TYPE_NONE, "You transferred this amount to " .. reciver, -1 * amount, GameStore.CoinType.Transferable) openStore(playerId) + player:updateUIExhausted() end function parseOpenStore(playerId, msg) @@ -396,6 +396,7 @@ function parseRequestStoreOffers(playerId, msg) addPlayerEvent(sendShowStoreOffers, 250, playerId, searchResultsCategory) end + player:updateUIExhausted() end function parseBuyStoreOffer(playerId, msg) @@ -532,6 +533,8 @@ function parseBuyStoreOffer(playerId, msg) sendUpdatedStoreBalances(playerId) return addPlayerEvent(sendStorePurchaseSuccessful, 650, playerId, message) end + + player:updateUIExhausted() return true end @@ -540,11 +543,13 @@ function parseOpenTransactionHistory(playerId, msg) local page = 1 GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE = msg:getByte() sendStoreTransactionHistory(playerId, page, GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE) + player:updateUIExhausted() end function parseRequestTransactionHistory(playerId, msg) local page = msg:getU32() sendStoreTransactionHistory(playerId, page + 1, GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE) + player:updateUIExhausted() end local function getCategoriesRook() From 74a5df00160ad11ecfc4557b1dd4cf6857fb8ee7 Mon Sep 17 00:00:00 2001 From: attack787 <47985212+attack787@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:49:43 -0300 Subject: [PATCH 37/50] Fix: send timeMessage when using boss lever (#2701) --- data/libs/functions/boss_lever.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/libs/functions/boss_lever.lua b/data/libs/functions/boss_lever.lua index 48d00582e89..b95bf7211b0 100644 --- a/data/libs/functions/boss_lever.lua +++ b/data/libs/functions/boss_lever.lua @@ -189,7 +189,7 @@ function BossLever:onUse(player) local currentTime = os.time() if lastEncounter and currentTime < lastEncounter then local timeLeft = lastEncounter - currentTime - local timeMessage = getTimeInWords(timeLeft) .. " to face " .. monsterName .. " again!" + local timeMessage = getTimeInWords(timeLeft) .. " to face " .. self.name .. " again!" local message = "You have to wait " .. timeMessage if currentPlayer ~= player then From e6294912ae9e260b8ecc488a186387f300440ded Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Thu, 20 Jun 2024 01:48:50 -0300 Subject: [PATCH 38/50] fix: prevent requesting a new trade window with each "trade" (#2700) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Identified Problems: • Item Loop Performance: The loop in the ProtocolGame::sendShop function performed key-value store (KV) access operations for each NPC item during every iteration. This was highly inefficient for NPCs with many items, such as "The Lootmonger," which has 1380 items. • Lack of Database Caching: Currently, our database does not implement caching for query results. This leads to redundant database accesses, particularly noticeable when commands like "trade" are used repeatedly, significantly increasing CPU usage and processing time. Implemented Solutions: • Optimization of the Item Loop: Necessary initialization has been moved outside the loop in the ProtocolGame::sendShop method. This reduces overhead by avoiding unnecessary repetitive database accesses. • Removal of Unnecessary Map: Removed an extraneous map in npc.hpp and simplified the use of the shop player cache. These changes aim to streamline interactions and reduce the computational load, especially during frequent trade requests with item-rich NPCs like "The Lootmonger." Additional optimizations have been made to enhance overall system performance. --- data/npclib/npc_system/npc_handler.lua | 1 - src/creatures/npcs/npc.cpp | 36 +++++++++---------- src/creatures/npcs/npc.hpp | 17 ++++----- src/creatures/players/player.cpp | 21 +++++++---- src/creatures/players/player.hpp | 2 +- .../functions/creatures/npc/npc_functions.cpp | 8 ++--- src/server/network/message/networkmessage.cpp | 4 +-- src/server/network/message/networkmessage.hpp | 15 +++++++- src/server/network/protocol/protocolgame.cpp | 32 +++++++++-------- 9 files changed, 73 insertions(+), 63 deletions(-) diff --git a/data/npclib/npc_system/npc_handler.lua b/data/npclib/npc_system/npc_handler.lua index 8f4d5f2ca48..31aaa88faaf 100644 --- a/data/npclib/npc_system/npc_handler.lua +++ b/data/npclib/npc_system/npc_handler.lua @@ -480,7 +480,6 @@ if NpcHandler == nil then -- If is npc shop, send shop window and parse default message (if not have callback on the npc) if npc:isMerchant() then - npc:closeShopWindow(player) npc:openShopWindow(player) self:say(msg, npc, player) end diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp index e445a58fcca..53fcfd07a3c 100644 --- a/src/creatures/npcs/npc.cpp +++ b/src/creatures/npcs/npc.cpp @@ -108,7 +108,7 @@ void Npc::onRemoveCreature(std::shared_ptr creature, bool isLogout) { spawnNpc->startSpawnNpcCheck(); } - shopPlayerMap.clear(); + shopPlayers.clear(); } void Npc::onCreatureMove(const std::shared_ptr &creature, const std::shared_ptr &newTile, const Position &newPos, const std::shared_ptr &oldTile, const Position &oldPos, bool teleport) { @@ -259,7 +259,7 @@ void Npc::onPlayerBuyItem(std::shared_ptr player, uint16_t itemId, uint8 } uint32_t buyPrice = 0; - const std::vector &shopVector = getShopItemVector(player->getGUID()); + const auto &shopVector = getShopItemVector(player->getGUID()); for (const ShopBlock &shopBlock : shopVector) { if (itemType.id == shopBlock.itemId && shopBlock.itemBuyPrice != 0) { buyPrice = shopBlock.itemBuyPrice; @@ -372,7 +372,7 @@ void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint uint32_t sellPrice = 0; const ItemType &itemType = Item::items[itemId]; - const std::vector &shopVector = getShopItemVector(player->getGUID()); + const auto &shopVector = getShopItemVector(player->getGUID()); for (const ShopBlock &shopBlock : shopVector) { if (itemType.id == shopBlock.itemId && shopBlock.itemSellPrice != 0) { sellPrice = shopBlock.itemSellPrice; @@ -586,7 +586,7 @@ void Npc::setPlayerInteraction(uint32_t playerId, uint16_t topicId /*= 0*/) { void Npc::removePlayerInteraction(std::shared_ptr player) { if (playerInteractions.contains(player->getID())) { playerInteractions.erase(player->getID()); - player->closeShopWindow(true); + player->closeShopWindow(); } } @@ -643,30 +643,26 @@ bool Npc::getRandomStep(Direction &moveDirection) { return false; } -void Npc::addShopPlayer(const std::shared_ptr &player, const std::vector &shopItems /* = {}*/) { - if (!player) { - return; - } - - shopPlayerMap.try_emplace(player->getGUID(), shopItems); +bool Npc::isShopPlayer(uint32_t playerGUID) const { + return shopPlayers.find(playerGUID) != shopPlayers.end(); } -void Npc::removeShopPlayer(const std::shared_ptr &player) { - if (!player) { - return; - } +void Npc::addShopPlayer(uint32_t playerGUID) { + shopPlayers.insert(playerGUID); +} - shopPlayerMap.erase(player->getGUID()); +void Npc::removeShopPlayer(uint32_t playerGUID) { + shopPlayers.erase(playerGUID); } void Npc::closeAllShopWindows() { - for (const auto &[playerGUID, playerPtr] : shopPlayerMap) { - auto shopPlayer = g_game().getPlayerByGUID(playerGUID); - if (shopPlayer) { - shopPlayer->closeShopWindow(); + for (const auto playerGUID : shopPlayers) { + const auto &player = g_game().getPlayerByGUID(playerGUID); + if (player) { + player->closeShopWindow(); } } - shopPlayerMap.clear(); + shopPlayers.clear(); } void Npc::handlePlayerMove(std::shared_ptr player, const Position &newPos) { diff --git a/src/creatures/npcs/npc.hpp b/src/creatures/npcs/npc.hpp index 7e8be84c7f1..605aaae570e 100644 --- a/src/creatures/npcs/npc.hpp +++ b/src/creatures/npcs/npc.hpp @@ -95,14 +95,7 @@ class Npc final : public Creature { npcType->info.currencyId = currency; } - std::vector getShopItemVector(uint32_t playerGUID) { - if (playerGUID != 0) { - auto it = shopPlayerMap.find(playerGUID); - if (it != shopPlayerMap.end() && !it->second.empty()) { - return it->second; - } - } - + const std::vector &getShopItemVector(uint32_t playerGUID) const { return npcType->info.shopItemVector; } @@ -165,8 +158,10 @@ class Npc final : public Creature { internalLight = npcType->info.light; } - void addShopPlayer(const std::shared_ptr &player, const std::vector &shopItems = {}); - void removeShopPlayer(const std::shared_ptr &player); + bool isShopPlayer(uint32_t playerGUID) const; + + void addShopPlayer(uint32_t playerGUID); + void removeShopPlayer(uint32_t playerGUID); void closeAllShopWindows(); static uint32_t npcAutoID; @@ -184,7 +179,7 @@ class Npc final : public Creature { std::map playerInteractions; - phmap::flat_hash_map> shopPlayerMap; + std::unordered_set shopPlayers; std::shared_ptr npcType; std::shared_ptr spawnNpc; diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 2c92f694197..52ceb8b3377 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -1895,31 +1895,38 @@ void Player::onRemoveCreature(std::shared_ptr creature, bool isLogout) } bool Player::openShopWindow(std::shared_ptr npc) { + Benchmark brenchmark; if (!npc) { g_logger().error("[Player::openShopWindow] - Npc is wrong or nullptr"); return false; } + if (npc->isShopPlayer(getGUID())) { + g_logger().debug("[Player::openShopWindow] - Player {} is already in shop window", getName()); + return false; + } + + npc->addShopPlayer(getGUID()); + setShopOwner(npc); sendShop(npc); std::map inventoryMap; sendSaleItemList(getAllSaleItemIdAndCount(inventoryMap)); + + g_logger().debug("[Player::openShopWindow] - Player {} has opened shop window in {} ms", getName(), brenchmark.duration()); return true; } -bool Player::closeShopWindow(bool sendCloseShopWindow /*= true*/) { +bool Player::closeShopWindow() { if (!shopOwner) { return false; } - shopOwner->removeShopPlayer(static_self_cast()); + shopOwner->removeShopPlayer(getGUID()); setShopOwner(nullptr); - if (sendCloseShopWindow) { - sendCloseShop(); - } - + sendCloseShop(); return true; } @@ -4293,7 +4300,7 @@ bool Player::hasShopItemForSale(uint16_t itemId, uint8_t subType) const { } const ItemType &itemType = Item::items[itemId]; - std::vector shoplist = shopOwner->getShopItemVector(getGUID()); + const auto &shoplist = shopOwner->getShopItemVector(getGUID()); return std::any_of(shoplist.begin(), shoplist.end(), [&](const ShopBlock &shopBlock) { return shopBlock.itemId == itemId && shopBlock.itemBuyPrice != 0 && (!itemType.isFluidContainer() || shopBlock.itemSubType == subType); }); diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 802b4e6fb6e..332887acc51 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -851,7 +851,7 @@ class Player final : public Creature, public Cylinder, public Bankable { void stopWalk(); bool openShopWindow(std::shared_ptr npc); - bool closeShopWindow(bool sendCloseShopWindow = true); + bool closeShopWindow(); bool updateSaleShopList(std::shared_ptr item); bool hasShopItemForSale(uint16_t itemId, uint8_t subType) const; diff --git a/src/lua/functions/creatures/npc/npc_functions.cpp b/src/lua/functions/creatures/npc/npc_functions.cpp index 8c19a4ede0a..2b14ef46b72 100644 --- a/src/lua/functions/creatures/npc/npc_functions.cpp +++ b/src/lua/functions/creatures/npc/npc_functions.cpp @@ -354,7 +354,6 @@ int NpcFunctions::luaNpcOpenShopWindow(lua_State* L) { return 1; } - npc->addShopPlayer(player); pushBoolean(L, player->openShopWindow(npc)); return 1; } @@ -405,9 +404,6 @@ int NpcFunctions::luaNpcOpenShopWindowTable(lua_State* L) { } lua_pop(L, 3); - // Close any eventual other shop window currently open. - player->closeShopWindow(true); - npc->addShopPlayer(player, items); pushBoolean(L, player->openShopWindow(npc)); return 1; } @@ -429,7 +425,7 @@ int NpcFunctions::luaNpcCloseShopWindow(lua_State* L) { } if (player->getShopOwner() == npc) { - player->closeShopWindow(true); + player->closeShopWindow(); } pushBoolean(L, true); @@ -577,7 +573,7 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { } uint64_t pricePerUnit = 0; - const std::vector &shopVector = npc->getShopItemVector(player->getGUID()); + const auto &shopVector = npc->getShopItemVector(player->getGUID()); for (ShopBlock shopBlock : shopVector) { if (itemId == shopBlock.itemId && shopBlock.itemBuyPrice != 0) { pricePerUnit = shopBlock.itemBuyPrice; diff --git a/src/server/network/message/networkmessage.cpp b/src/server/network/message/networkmessage.cpp index 15963135560..38acc0b484c 100644 --- a/src/server/network/message/networkmessage.cpp +++ b/src/server/network/message/networkmessage.cpp @@ -40,9 +40,9 @@ Position NetworkMessage::getPosition() { return pos; } -void NetworkMessage::addString(const std::string &value, const std::string &function) { +void NetworkMessage::addString(const std::string &value, const std::string &function /* = ""*/) { size_t stringLen = value.length(); - if (value.empty()) { + if (value.empty() && !function.empty()) { g_logger().debug("[NetworkMessage::addString] - Value string is empty, function '{}'", function); } if (!canAdd(stringLen + 2)) { diff --git a/src/server/network/message/networkmessage.hpp b/src/server/network/message/networkmessage.hpp index 72f0e69c3dc..02e19253146 100644 --- a/src/server/network/message/networkmessage.hpp +++ b/src/server/network/message/networkmessage.hpp @@ -90,7 +90,20 @@ class NetworkMessage { void addBytes(const char* bytes, size_t size); void addPaddingBytes(size_t n); - void addString(const std::string &value, const std::string &function); + /** + * Adds a string to the network message buffer. + * + * @param value The string value to be added to the message buffer. + * @param function * @param function An optional parameter that specifies the function name from which `addString` is invoked. + * Including this enhances logging by adding the function name to the debug and error log messages. + * This helps in debugging by indicating the context when issues occur, such as attempting to add an + * empty string or when there are message size errors. + * + * When the function parameter is used, it aids in identifying the context in log messages, + * making it easier to diagnose issues related to network message construction, + * especially in complex systems where the same method might be called from multiple places. + */ + void addString(const std::string &value, const std::string &function = ""); void addDouble(double value, uint8_t precision = 2); diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 1c40b67d6c6..c006e315ab1 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -4637,6 +4637,7 @@ void ProtocolGame::sendLootStats(std::shared_ptr item, uint8_t count) { } void ProtocolGame::sendShop(std::shared_ptr npc) { + Benchmark brenchmark; NetworkMessage msg; msg.addByte(0x7A); msg.addString(npc->getName(), "ProtocolGame::sendShop - npc->getName()"); @@ -4646,20 +4647,35 @@ void ProtocolGame::sendShop(std::shared_ptr npc) { msg.addString(std::string(), "ProtocolGame::sendShop - std::string()"); // Currency name } - std::vector shoplist = npc->getShopItemVector(player->getGUID()); + const auto &shoplist = npc->getShopItemVector(player->getGUID()); uint16_t itemsToSend = std::min(shoplist.size(), std::numeric_limits::max()); msg.add(itemsToSend); + // Initialize before the loop to avoid database overload on each iteration + auto talkactionHidden = player->kv()->get("npc-shop-hidden-sell-item"); + // Initialize the inventoryMap outside the loop to avoid creation on each iteration + std::map inventoryMap; + player->getAllSaleItemIdAndCount(inventoryMap); uint16_t i = 0; for (const ShopBlock &shopBlock : shoplist) { if (++i > itemsToSend) { break; } + // Hidden sell items from the shop if they are not in the player's inventory + if (talkactionHidden && talkactionHidden->get()) { + const auto &foundItem = inventoryMap.find(shopBlock.itemId); + if (foundItem == inventoryMap.end() && shopBlock.itemSellPrice > 0 && shopBlock.itemBuyPrice == 0) { + AddHiddenShopItem(msg); + continue; + } + } + AddShopItem(msg, shopBlock); } writeToOutputBuffer(msg); + g_logger().debug("ProtocolGame::sendShop - Time: {} ms, shop items: {}", brenchmark.duration(), shoplist.size()); } void ProtocolGame::sendCloseShop() { @@ -8101,7 +8117,7 @@ void ProtocolGame::AddHiddenShopItem(NetworkMessage &msg) { // Empty bytes from AddShopItem msg.add(0); msg.addByte(0); - msg.addString(std::string(), "ProtocolGame::AddHiddenShopItem - std::string()"); + msg.addString(std::string()); msg.add(0); msg.add(0); msg.add(0); @@ -8114,18 +8130,6 @@ void ProtocolGame::AddShopItem(NetworkMessage &msg, const ShopBlock &shopBlock) return; } - // Hidden sell items from the shop if they are not in the player's inventory - auto talkactionHidden = player->kv()->get("npc-shop-hidden-sell-item"); - if (talkactionHidden && talkactionHidden->get() == true) { - std::map inventoryMap; - player->getAllSaleItemIdAndCount(inventoryMap); - auto inventoryItems = inventoryMap.find(shopBlock.itemId); - if (inventoryItems == inventoryMap.end() && shopBlock.itemSellPrice > 0 && shopBlock.itemBuyPrice == 0) { - AddHiddenShopItem(msg); - return; - } - } - const ItemType &it = Item::items[shopBlock.itemId]; msg.add(shopBlock.itemId); if (it.isSplash() || it.isFluidContainer()) { From fb20f6f40c88b0181aaf3d2def66a7f9aa48a648 Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Sat, 22 Jun 2024 14:36:40 -0300 Subject: [PATCH 39/50] improve: small adjustment to 'hasTraceableContext()' (#2374) - The 'checkCreatureWalk' function is of the 'Game' class and not 'Creature' as advertised. - '__FUNCTION__' was only returning the name of the function and not the class, so it had been necessary to add it to 'hasTraceableContext()'. --- src/creatures/creature.cpp | 2 +- src/game/scheduling/task.hpp | 3 +-- src/server/network/protocol/protocol.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp index 7796863f066..d033d59c829 100644 --- a/src/creatures/creature.cpp +++ b/src/creatures/creature.cpp @@ -259,7 +259,7 @@ void Creature::addEventWalk(bool firstStep) { self->eventWalk = g_dispatcher().scheduleEvent( static_cast(ticks), - [creatureId = self->getID()] { g_game().checkCreatureWalk(creatureId); }, "Creature::checkCreatureWalk" + [creatureId = self->getID()] { g_game().checkCreatureWalk(creatureId); }, "Game::checkCreatureWalk" ); }); } diff --git a/src/game/scheduling/task.hpp b/src/game/scheduling/task.hpp index c6591887c8a..7bdc7db8084 100644 --- a/src/game/scheduling/task.hpp +++ b/src/game/scheduling/task.hpp @@ -70,10 +70,10 @@ class Task { bool hasTraceableContext() const { const static auto tasksContext = std::unordered_set({ - "Creature::checkCreatureWalk", "Decay::checkDecay", "Dispatcher::asyncEvent", "Game::checkCreatureAttack", + "Game::checkCreatureWalk", "Game::checkCreatures", "Game::checkImbuements", "Game::checkLight", @@ -94,7 +94,6 @@ class Task { "SpawnNpc::checkSpawnNpc", "Webhook::run", "Protocol::sendRecvMessageCallback", - "sendRecvMessageCallback", }); return tasksContext.contains(context); diff --git a/src/server/network/protocol/protocol.cpp b/src/server/network/protocol/protocol.cpp index 6f6a1c8228e..78cff72fab4 100644 --- a/src/server/network/protocol/protocol.cpp +++ b/src/server/network/protocol/protocol.cpp @@ -50,7 +50,7 @@ bool Protocol::sendRecvMessageCallback(NetworkMessage &msg) { protocol->parsePacket(msg); protocolConnection->resumeWork(); } - } }, __FUNCTION__); + } }, "Protocol::sendRecvMessageCallback"); return true; } From 0e134942812e0b0e84534b6aa3d912706c27225d Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Sat, 22 Jun 2024 14:49:07 -0300 Subject: [PATCH 40/50] feat: auto switch hotkey presets (#2115) Auto switch hotkey presets in login. --- src/server/network/protocol/protocolgame.cpp | 15 +++++++++++++++ src/server/network/protocol/protocolgame.hpp | 1 + 2 files changed, 16 insertions(+) diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index c006e315ab1..ddfc867f918 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -6584,6 +6584,7 @@ void ProtocolGame::sendAddCreature(std::shared_ptr creature, const Pos if (isLogin) { sendMagicEffect(pos, CONST_ME_TELEPORT); + sendHotkeyPreset(); sendDisableLoginMusic(); } @@ -9056,3 +9057,17 @@ void ProtocolGame::sendDisableLoginMusic() { msg.addByte(0x00); writeToOutputBuffer(msg); } + +void ProtocolGame::sendHotkeyPreset() { + if (!player || oldProtocol) { + return; + } + + auto vocation = g_vocations().getVocation(player->getVocation()->getBaseId()); + if (vocation) { + NetworkMessage msg; + msg.addByte(0x9D); + msg.add(vocation->getClientId()); + writeToOutputBuffer(msg); + } +} diff --git a/src/server/network/protocol/protocolgame.hpp b/src/server/network/protocol/protocolgame.hpp index 100ca199b77..24341f15e1e 100644 --- a/src/server/network/protocol/protocolgame.hpp +++ b/src/server/network/protocol/protocolgame.hpp @@ -514,6 +514,7 @@ class ProtocolGame final : public Protocol { void sendSingleSoundEffect(const Position &pos, SoundEffect_t id, SourceEffect_t source); void sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundId, SourceEffect_t mainSource, SoundEffect_t secondarySoundId, SourceEffect_t secondarySource); + void sendHotkeyPreset(); void sendDisableLoginMusic(); uint8_t m_playerDeathTime = 0; From 3cf22437f0bc7b91f4fc39f6f5818121f7704da6 Mon Sep 17 00:00:00 2001 From: odisk777 <65802862+odisk777@users.noreply.github.com> Date: Sat, 22 Jun 2024 19:06:20 -0500 Subject: [PATCH 41/50] fix: lord azaram health (#2687) --- .../monster/quests/grave_danger/bosses/lord_azaram.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data-otservbr-global/monster/quests/grave_danger/bosses/lord_azaram.lua b/data-otservbr-global/monster/quests/grave_danger/bosses/lord_azaram.lua index 701a0b6f92b..8507c3a0c1c 100644 --- a/data-otservbr-global/monster/quests/grave_danger/bosses/lord_azaram.lua +++ b/data-otservbr-global/monster/quests/grave_danger/bosses/lord_azaram.lua @@ -17,8 +17,8 @@ monster.events = { "GraveDangerBossDeath", } -monster.health = 75000 -monster.maxHealth = 75000 +monster.health = 300000 +monster.maxHealth = 300000 monster.race = "venom" monster.corpse = 31599 monster.speed = 125 From b4647d191dd1402d15f24be533dbb52a3b0ad72d Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Sat, 22 Jun 2024 21:07:43 -0300 Subject: [PATCH 42/50] feat: faceless bane mechanics (#2619) --- data-otservbr-global/lib/core/storages.lua | 9 ++ .../the_dream_courts/bosses/faceless_bane.lua | 19 +-- .../monster/faceless_bane_immunity.lua | 47 ++++++++ .../faceless_bane_step_positions.lua | 114 ++++++++++++++++++ 4 files changed, 182 insertions(+), 7 deletions(-) create mode 100644 data-otservbr-global/scripts/creaturescripts/monster/faceless_bane_immunity.lua create mode 100644 data-otservbr-global/scripts/movements/quests/the_dream_courts/faceless_bane_step_positions.lua diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua index fce8059f7d1..2b8d9a7783d 100644 --- a/data-otservbr-global/lib/core/storages.lua +++ b/data-otservbr-global/lib/core/storages.lua @@ -3079,6 +3079,15 @@ GlobalStorage = { DarashiaWest = 60193, }, }, + TheDreamCourts = { + -- Reserved storage from 60194 - 60196 + FacelessBane = { + -- Global + StepsOn = 60194, + Deaths = 60195, + ResetSteps = 60196, + }, + }, FuryGates = 65000, Yakchal = 65001, PitsOfInfernoLevers = 65002, diff --git a/data-otservbr-global/monster/quests/the_dream_courts/bosses/faceless_bane.lua b/data-otservbr-global/monster/quests/the_dream_courts/bosses/faceless_bane.lua index e4d8553c46a..868fe08e756 100644 --- a/data-otservbr-global/monster/quests/the_dream_courts/bosses/faceless_bane.lua +++ b/data-otservbr-global/monster/quests/the_dream_courts/bosses/faceless_bane.lua @@ -2,7 +2,7 @@ local mType = Game.createMonsterType("Faceless Bane") local monster = {} monster.description = "Faceless Bane" -monster.experience = 30000 +monster.experience = 20000 monster.outfit = { lookType = 1119, lookHead = 0, @@ -22,7 +22,11 @@ monster.manaCost = 0 monster.changeTarget = { interval = 4000, - chance = 10, + chance = 20, +} + +monster.reflects = { + { type = COMBAT_DEATHDAMAGE, percent = 90 }, } monster.bosstiary = { @@ -131,11 +135,7 @@ monster.elements = { { type = COMBAT_DROWNDAMAGE, percent = 0 }, { type = COMBAT_ICEDAMAGE, percent = 0 }, { type = COMBAT_HOLYDAMAGE, percent = 0 }, - { type = COMBAT_DEATHDAMAGE, percent = 99 }, -} - -monster.heals = { - { type = COMBAT_DEATHDAMAGE, percent = 100 }, + { type = COMBAT_DEATHDAMAGE, percent = 50 }, } monster.immunities = { @@ -149,6 +149,11 @@ mType.onThink = function(monster, interval) end mType.onAppear = function(monster, creature) if monster:getType():isRewardBoss() then + -- reset global storage state to default / ensure sqm's reset for the next team + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.Deaths, -1) + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn, -1) + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.ResetSteps, 1) + monster:registerEvent("facelessBaneImmunity") monster:setReward(true) end end diff --git a/data-otservbr-global/scripts/creaturescripts/monster/faceless_bane_immunity.lua b/data-otservbr-global/scripts/creaturescripts/monster/faceless_bane_immunity.lua new file mode 100644 index 00000000000..36e1ecd11c3 --- /dev/null +++ b/data-otservbr-global/scripts/creaturescripts/monster/faceless_bane_immunity.lua @@ -0,0 +1,47 @@ +local bossName = "Faceless Bane" + +local function healBoss(creature) + if creature then + creature:addHealth(creature:getMaxHealth()) + creature:getPosition():sendMagicEffect(CONST_ME_BLOCKHIT) + end +end + +local function createSummons(creature) + if creature then + local pos = creature:getPosition() + Game.createMonster("Gazer Spectre", pos, true, false, creature) + Game.createMonster("Ripper Spectre", pos, true, false, creature) + Game.createMonster("Burster Spectre", pos, true, false, creature) + end +end + +local function resetBoss(creature, deaths) + if creature then + healBoss(creature) + createSummons(creature) + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.Deaths, deaths + 1) + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn, 0) + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.ResetSteps, 1) + end +end + +local facelessBaneImmunity = CreatureEvent("facelessBaneImmunity") + +function facelessBaneImmunity.onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType) + if creature and creature:isMonster() and creature:getName() == bossName then + local creatureHealthPercent = (creature:getHealth() * 100) / creature:getMaxHealth() + local facelessBaneDeathsStorage = Game.getStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.Deaths) + + if creatureHealthPercent <= 20 and facelessBaneDeathsStorage < 1 then + resetBoss(creature, facelessBaneDeathsStorage) + return true + elseif Game.getStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn) < 1 then + healBoss(creature) + return true + end + end + return primaryDamage, primaryType, secondaryDamage, secondaryType +end + +facelessBaneImmunity:register() diff --git a/data-otservbr-global/scripts/movements/quests/the_dream_courts/faceless_bane_step_positions.lua b/data-otservbr-global/scripts/movements/quests/the_dream_courts/faceless_bane_step_positions.lua new file mode 100644 index 00000000000..8ebdc47ae6f --- /dev/null +++ b/data-otservbr-global/scripts/movements/quests/the_dream_courts/faceless_bane_step_positions.lua @@ -0,0 +1,114 @@ +local walkedPositions = {} +local lastResetTime = os.time() +local checkTime = false + +local function resetWalkedPositions(checkLastResetTime) + if lastResetTime > os.time() and checkLastResetTime then + return true + end + + walkedPositions = {} + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn, 0) + lastResetTime = os.time() + (1 * 60) +end + +local pipePositions = { + Position(33612, 32568, 13), + Position(33612, 32567, 13), + Position(33612, 32566, 13), + Position(33612, 32565, 13), + Position(33612, 32564, 13), + Position(33612, 32563, 13), + Position(33612, 32562, 13), + Position(33612, 32561, 13), + Position(33612, 32560, 13), + Position(33612, 32559, 13), + Position(33612, 32558, 13), + Position(33612, 32557, 13), + Position(33612, 32556, 13), + Position(33622, 32556, 13), + Position(33622, 32557, 13), + Position(33622, 32558, 13), + Position(33622, 32559, 13), + Position(33622, 32560, 13), + Position(33622, 32561, 13), + Position(33622, 32562, 13), + Position(33622, 32563, 13), + Position(33622, 32564, 13), + Position(33622, 32565, 13), + Position(33622, 32566, 13), + Position(33622, 32567, 13), + Position(33622, 32568, 13), +} + +local function sendEnergyEffect() + for _, position in ipairs(pipePositions) do + position:sendMagicEffect(CONST_ME_PURPLEENERGY) + position:sendSingleSoundEffect(SOUND_EFFECT_TYPE_SPELL_GREAT_ENERGY_BEAM) + end + + return true +end + +local facelessBaneStepPositions = MoveEvent() + +function facelessBaneStepPositions.onStepIn(creature, item, position, fromPosition) + local player = creature:getPlayer() + if not player then + return true + end + + if Game.getStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.ResetSteps) == 1 then + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.ResetSteps, 0) + lastResetTime = os.time() + resetWalkedPositions(true) + end + + if not checkTime then + checkTime = addEvent(resetWalkedPositions, 15 * 1000, false) + end + + if Game.getStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn) < 1 then + if #walkedPositions > 0 then + for _, walkedPos in ipairs(walkedPositions) do + if walkedPos == position then + return true + end + end + end + + position:sendSingleSoundEffect(SOUND_EFFECT_TYPE_SPELL_BUZZ) + position:sendMagicEffect(CONST_ME_YELLOWENERGY) + table.insert(walkedPositions, position) + + if #walkedPositions == 13 then + Game.setStorageValue(GlobalStorage.TheDreamCourts.FacelessBane.StepsOn, 1) + addEvent(resetWalkedPositions, 60 * 1000, true) + sendEnergyEffect() + checkTime = nil + end + end + return true +end + +local facelessBaneSteps = { + Position(33615, 32567, 13), + Position(33613, 32567, 13), + Position(33611, 32563, 13), + Position(33610, 32561, 13), + Position(33611, 32558, 13), + Position(33614, 32557, 13), + Position(33617, 32558, 13), + Position(33620, 32557, 13), + Position(33623, 32558, 13), + Position(33624, 32561, 13), + Position(33623, 32563, 13), + Position(33621, 32567, 13), + Position(33619, 32567, 13), +} + +for _, pos in ipairs(facelessBaneSteps) do + facelessBaneStepPositions:position(pos) +end + +facelessBaneStepPositions:register() From 7b53154f96a07fa41b99de4a4335fad10b96c10f Mon Sep 17 00:00:00 2001 From: Pedro Cruz Date: Sat, 22 Jun 2024 21:22:32 -0300 Subject: [PATCH 43/50] fix: vip groups (#2703) Fix vip groups schema and update warnings of free id and group name already exists to debug to avoid spam in the console in production. --- schema.sql | 6 ------ src/creatures/players/vip/player_vip.cpp | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/schema.sql b/schema.sql index 2fbc7dd649b..af245067057 100644 --- a/schema.sql +++ b/schema.sql @@ -850,9 +850,3 @@ INSERT INTO `players` (4, 'Paladin Sample', 1, 1, 8, 3, 185, 185, 4200, 113, 115, 95, 39, 129, 0, 90, 90, 0, 8, '', 470, 1, 10, 0, 10, 0, 10, 0, 10, 0), (5, 'Knight Sample', 1, 1, 8, 4, 185, 185, 4200, 113, 115, 95, 39, 129, 0, 90, 90, 0, 8, '', 470, 1, 10, 0, 10, 0, 10, 0, 10, 0), (6, 'GOD', 6, 1, 2, 0, 155, 155, 100, 113, 115, 95, 39, 75, 0, 60, 60, 0, 8, '', 410, 1, 10, 0, 10, 0, 10, 0, 10, 0); - --- Create vip groups for GOD account -INSERT INTO `account_vipgroups` (`name`, `account_id`, `customizable`) VALUES -('Friends', 1, 0), -('Enemies', 1, 0), -('Trading Partners', 1, 0); diff --git a/src/creatures/players/vip/player_vip.cpp b/src/creatures/players/vip/player_vip.cpp index b4b1642ec69..95ebe91ad5f 100644 --- a/src/creatures/players/vip/player_vip.cpp +++ b/src/creatures/players/vip/player_vip.cpp @@ -143,13 +143,13 @@ std::shared_ptr PlayerVIP::getGroupByName(const std::string &name) con void PlayerVIP::addGroupInternal(uint8_t groupId, const std::string &name, bool customizable) { if (getGroupByName(name) != nullptr) { - g_logger().warn("{} - Group name already exists.", __FUNCTION__); + g_logger().debug("{} - Group name already exists.", __FUNCTION__); return; } const auto freeId = getFreeId(); if (freeId == 0) { - g_logger().warn("{} - No id available.", __FUNCTION__); + g_logger().debug("{} - No id available.", __FUNCTION__); return; } From 3f6ac9adb9c4e9f086748916bb894c52e1629aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Lu=C3=ADs=20Lucarelo=20Lamonato?= Date: Sat, 22 Jun 2024 21:26:42 -0300 Subject: [PATCH 44/50] fix: eventcallbacks which returns a ReturnValue (#2532) --- data/scripts/eventcallbacks/README.md | 33 ++++++++++++++++--- .../creature/on_area_combat.lua | 2 +- src/creatures/combat/combat.cpp | 15 +++++++-- src/lua/callbacks/events_callbacks.hpp | 26 +++++++++++++++ 4 files changed, 67 insertions(+), 9 deletions(-) diff --git a/data/scripts/eventcallbacks/README.md b/data/scripts/eventcallbacks/README.md index 601653574bd..ae5de046bd2 100644 --- a/data/scripts/eventcallbacks/README.md +++ b/data/scripts/eventcallbacks/README.md @@ -14,8 +14,8 @@ Event callbacks are available for several categories of game entities, such as ` ### These are the functions available to use - `(bool)` `creatureOnChangeOutfit` -- `(bool)` `creatureOnAreaCombat` -- `(bool)` `creatureOnTargetCombat` +- `(ReturnValue)` `creatureOnAreaCombat` +- `(ReturnValue)` `creatureOnTargetCombat` - `(void)` `creatureOnHear` - `(void)` `creatureOnDrainHealth` - `(bool)` `partyOnJoin` @@ -66,7 +66,7 @@ local callback = EventCallback() function callback.creatureOnAreaCombat(creature, tile, isAggressive) -- custom behavior when a creature enters combat area - return true + return RETURNVALUE_NOERROR end callback:register() @@ -131,14 +131,36 @@ Here is an example of a boolean event callback: ```lua local callback = EventCallback() +function callback.playerOnMoveItem(player, item, count, fromPos, toPos, fromCylinder, toCylinder) + if item:getId() == ITEM_PARCEL then + --Custom behavior when the player moves a parcel. + return false + end + return true +end + +callback:register() +``` + +### In this example, when a player moves an item, the function checks if the item is a parcel and apply a custom behaviour, returning false making it impossible to move, stopping the associated function on the C++ side. + +## ReturnValue Event Callbacks + +Some event callbacks are expected to return a enum value, in this case, the enum ReturnValue. If the return is different of RETURNVALUE_NOERROR, it will stop the execution of the next callbacks. + +Here is an example of a ReturnValue event callback: + +```lua +local callback = EventCallback() + function callback.creatureOnAreaCombat(creature, tile, isAggressive) -- if the creature is not aggressive, stop the execution of the C++ function if not isAggressive then - return false + return RETURNVALUE_NOTPOSSIBLE end -- custom behavior when an aggressive creature enters a combat area - return true + return RETURNVALUE_NOERROR end callback:register() @@ -146,6 +168,7 @@ callback:register() ### In this example, when a non-aggressive creature enters a combat area, the creatureOnAreaCombat function returns false, stopping the associated function on the C++ side. + ## Multiple Callbacks for the Same Event You can define multiple callbacks for the same event type. This allows you to encapsulate different behaviors in separate callbacks, making your code more modular and easier to manage. diff --git a/data/scripts/eventcallbacks/creature/on_area_combat.lua b/data/scripts/eventcallbacks/creature/on_area_combat.lua index a6295074df3..f68cc95ccad 100644 --- a/data/scripts/eventcallbacks/creature/on_area_combat.lua +++ b/data/scripts/eventcallbacks/creature/on_area_combat.lua @@ -1,7 +1,7 @@ local callback = EventCallback() function callback.creatureOnAreaCombat(creature, tile, isAggressive) - return true + return RETURNVALUE_NOERROR end callback:register() diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp index 2aaadac4d61..175fad49e20 100644 --- a/src/creatures/combat/combat.cpp +++ b/src/creatures/combat/combat.cpp @@ -21,6 +21,8 @@ #include "items/weapons/weapons.hpp" #include "map/spectators.hpp" #include "lib/metrics/metrics.hpp" +#include "lua/callbacks/event_callback.hpp" +#include "lua/callbacks/events_callbacks.hpp" int32_t Combat::getLevelFormula(std::shared_ptr player, const std::shared_ptr wheelSpell, const CombatDamage &damage) const { if (!player) { @@ -273,8 +275,11 @@ ReturnValue Combat::canDoCombat(std::shared_ptr caster, std::shared_pt } } } - - return g_events().eventCreatureOnAreaCombat(caster, tile, aggressive); + ReturnValue ret = g_events().eventCreatureOnAreaCombat(caster, tile, aggressive); + if (ret == RETURNVALUE_NOERROR) { + ret = g_callbacks().checkCallbackWithReturnValue(EventCallback_t::creatureOnTargetCombat, &EventCallback::creatureOnAreaCombat, caster, tile, aggressive); + } + return ret; } bool Combat::isInPvpZone(std::shared_ptr attacker, std::shared_ptr target) { @@ -409,7 +414,11 @@ ReturnValue Combat::canDoCombat(std::shared_ptr attacker, std::shared_ } } } - return g_events().eventCreatureOnTargetCombat(attacker, target); + ReturnValue ret = g_events().eventCreatureOnTargetCombat(attacker, target); + if (ret == RETURNVALUE_NOERROR) { + ret = g_callbacks().checkCallbackWithReturnValue(EventCallback_t::creatureOnTargetCombat, &EventCallback::creatureOnTargetCombat, attacker, target); + } + return ret; } void Combat::setPlayerCombatValues(formulaType_t newFormulaType, double newMina, double newMinb, double newMaxa, double newMaxb) { diff --git a/src/lua/callbacks/events_callbacks.hpp b/src/lua/callbacks/events_callbacks.hpp index 53b119f6445..f71103047e6 100644 --- a/src/lua/callbacks/events_callbacks.hpp +++ b/src/lua/callbacks/events_callbacks.hpp @@ -89,6 +89,32 @@ class EventsCallbacks { } } } + /** + * @brief Checks if all registered callbacks of the specified event type succeed. + * @param eventType The type of event to check. + * @param callbackFunc Function pointer to the callback method. + * @param args Variadic arguments to pass to the callback function. + * @return ReturnValue enum. + */ + template + ReturnValue checkCallbackWithReturnValue(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) { + ReturnValue res = RETURNVALUE_NOERROR; + for (const auto &callback : getCallbacksByType(eventType)) { + auto argsCopy = std::make_tuple(args...); + if (callback && callback->isLoadedCallback()) { + ReturnValue callbackResult = std::apply( + [&callback, &callbackFunc](auto &&... args) { + return ((*callback).*callbackFunc)(std::forward(args)...); + }, + argsCopy + ); + if (callbackResult != RETURNVALUE_NOERROR) { + return callbackResult; + } + } + } + return res; + } /** * @brief Checks if all registered callbacks of the specified event type succeed. From 95dd0fb3c5c04a49aa121323e5c8f8a417512c6e Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Sat, 22 Jun 2024 22:13:37 -0300 Subject: [PATCH 45/50] fix: hireling shop (#2707) --- src/creatures/npcs/npc.cpp | 9 ++++----- src/creatures/npcs/npc.hpp | 11 +++++++++-- src/creatures/players/player.cpp | 4 ++-- src/creatures/players/player.hpp | 2 +- src/enums/player_cyclopedia.hpp | 14 ++++++++++++++ src/lua/functions/creatures/npc/npc_functions.cpp | 2 +- src/server/network/protocol/protocolgame.cpp | 6 +++--- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp index 53fcfd07a3c..8f6fa370087 100644 --- a/src/creatures/npcs/npc.cpp +++ b/src/creatures/npcs/npc.cpp @@ -101,14 +101,13 @@ void Npc::onRemoveCreature(std::shared_ptr creature, bool isLogout) { } if (auto player = creature->getPlayer()) { + removeShopPlayer(player->getGUID()); onPlayerDisappear(player); } if (spawnNpc) { spawnNpc->startSpawnNpcCheck(); } - - shopPlayers.clear(); } void Npc::onCreatureMove(const std::shared_ptr &creature, const std::shared_ptr &newTile, const Position &newPos, const std::shared_ptr &oldTile, const Position &oldPos, bool teleport) { @@ -647,8 +646,8 @@ bool Npc::isShopPlayer(uint32_t playerGUID) const { return shopPlayers.find(playerGUID) != shopPlayers.end(); } -void Npc::addShopPlayer(uint32_t playerGUID) { - shopPlayers.insert(playerGUID); +void Npc::addShopPlayer(uint32_t playerGUID, const std::vector &shopItems) { + shopPlayers.try_emplace(playerGUID, shopItems); } void Npc::removeShopPlayer(uint32_t playerGUID) { @@ -656,7 +655,7 @@ void Npc::removeShopPlayer(uint32_t playerGUID) { } void Npc::closeAllShopWindows() { - for (const auto playerGUID : shopPlayers) { + for (const auto &[playerGUID, shopBlock] : shopPlayers) { const auto &player = g_game().getPlayerByGUID(playerGUID); if (player) { player->closeShopWindow(); diff --git a/src/creatures/npcs/npc.hpp b/src/creatures/npcs/npc.hpp index 605aaae570e..c246aa4b68d 100644 --- a/src/creatures/npcs/npc.hpp +++ b/src/creatures/npcs/npc.hpp @@ -96,6 +96,13 @@ class Npc final : public Creature { } const std::vector &getShopItemVector(uint32_t playerGUID) const { + if (playerGUID != 0) { + auto it = shopPlayers.find(playerGUID); + if (it != shopPlayers.end() && !it->second.empty()) { + return it->second; + } + } + return npcType->info.shopItemVector; } @@ -160,7 +167,7 @@ class Npc final : public Creature { bool isShopPlayer(uint32_t playerGUID) const; - void addShopPlayer(uint32_t playerGUID); + void addShopPlayer(uint32_t playerGUID, const std::vector &shopItems); void removeShopPlayer(uint32_t playerGUID); void closeAllShopWindows(); @@ -179,7 +186,7 @@ class Npc final : public Creature { std::map playerInteractions; - std::unordered_set shopPlayers; + std::unordered_map> shopPlayers; std::shared_ptr npcType; std::shared_ptr spawnNpc; diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 52ceb8b3377..49c553f1326 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -1894,7 +1894,7 @@ void Player::onRemoveCreature(std::shared_ptr creature, bool isLogout) } } -bool Player::openShopWindow(std::shared_ptr npc) { +bool Player::openShopWindow(std::shared_ptr npc, const std::vector &shopItems) { Benchmark brenchmark; if (!npc) { g_logger().error("[Player::openShopWindow] - Npc is wrong or nullptr"); @@ -1906,7 +1906,7 @@ bool Player::openShopWindow(std::shared_ptr npc) { return false; } - npc->addShopPlayer(getGUID()); + npc->addShopPlayer(getGUID(), shopItems); setShopOwner(npc); diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 332887acc51..141caafacd9 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -850,7 +850,7 @@ class Player final : public Creature, public Cylinder, public Bankable { void onWalkComplete() override; void stopWalk(); - bool openShopWindow(std::shared_ptr npc); + bool openShopWindow(std::shared_ptr npc, const std::vector &shopItems = {}); bool closeShopWindow(); bool updateSaleShopList(std::shared_ptr item); bool hasShopItemForSale(uint16_t itemId, uint8_t subType) const; diff --git a/src/enums/player_cyclopedia.hpp b/src/enums/player_cyclopedia.hpp index f0637011a19..c6e1b7032c0 100644 --- a/src/enums/player_cyclopedia.hpp +++ b/src/enums/player_cyclopedia.hpp @@ -36,3 +36,17 @@ enum CyclopediaTitle_t : uint8_t { MAP, OTHERS, }; + +enum class CyclopediaMapData_t : uint8_t { + MinimapMarker = 0, + DiscoveryData = 1, + ActiveRaid = 2, + ImminentRaidMainArea = 3, + ImminentRaidSubArea = 4, + SetDiscoveryArea = 5, + Passage = 6, + SubAreaMonsters = 7, + MonsterBestiary = 8, + Donations = 9, + SetCurrentArea = 10, +}; diff --git a/src/lua/functions/creatures/npc/npc_functions.cpp b/src/lua/functions/creatures/npc/npc_functions.cpp index 2b14ef46b72..13e9b499abc 100644 --- a/src/lua/functions/creatures/npc/npc_functions.cpp +++ b/src/lua/functions/creatures/npc/npc_functions.cpp @@ -404,7 +404,7 @@ int NpcFunctions::luaNpcOpenShopWindowTable(lua_State* L) { } lua_pop(L, 3); - pushBoolean(L, player->openShopWindow(npc)); + pushBoolean(L, player->openShopWindow(npc, items)); return 1; } diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index ddfc867f918..58f06eee5ae 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -3381,7 +3381,7 @@ void ProtocolGame::sendAddMarker(const Position &pos, uint8_t markType, const st msg.addByte(0xDD); if (!oldProtocol) { - msg.addByte(0x00); // unknow + msg.addByte(enumToValue(CyclopediaMapData_t::MinimapMarker)); } msg.addPosition(pos); @@ -4644,7 +4644,7 @@ void ProtocolGame::sendShop(std::shared_ptr npc) { if (!oldProtocol) { msg.add(npc->getCurrency()); - msg.addString(std::string(), "ProtocolGame::sendShop - std::string()"); // Currency name + msg.addString(std::string()); // Currency name } const auto &shoplist = npc->getShopItemVector(player->getGUID()); @@ -7472,7 +7472,7 @@ void ProtocolGame::AddCreature(NetworkMessage &msg, std::shared_ptr cr } if (!oldProtocol && creature->isHealthHidden()) { - msg.addString("", "ProtocolGame::AddCreature - empty"); + msg.addString(std::string()); } else { msg.addString(creature->getName(), "ProtocolGame::AddCreature - creature->getName()"); } From bfb3149e165f6f652b6f3e5361e36a0c92633697 Mon Sep 17 00:00:00 2001 From: Luan Luciano Date: Sat, 22 Jun 2024 22:22:26 -0300 Subject: [PATCH 46/50] fix: correction in checking inbox:getMaxCapacity() (#2679) --- data-otservbr-global/npc/emael.lua | 2 +- data-otservbr-global/npc/emperor_kruzak.lua | 2 +- data-otservbr-global/npc/hireling.lua | 2 +- data-otservbr-global/npc/king_tibianus.lua | 2 +- data-otservbr-global/npc/queen_eloise.lua | 2 +- data-otservbr-global/npc/walter_jaeger.lua | 2 +- data/libs/systems/hireling.lua | 4 ++-- data/modules/scripts/daily_reward/daily_reward.lua | 2 +- data/scripts/talkactions/player/reward.lua | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data-otservbr-global/npc/emael.lua b/data-otservbr-global/npc/emael.lua index 79111f8f324..4fff95b1b95 100644 --- a/data-otservbr-global/npc/emael.lua +++ b/data-otservbr-global/npc/emael.lua @@ -69,7 +69,7 @@ local function creatureSayCallback(npc, creature, type, message) npcHandler:say("Ah, I see you killed a lot of dangerous creatures. Here's your podium of vigour!", npc, creature) local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() then + if inbox and #inboxItems < inbox:getMaxCapacity() then local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1) if decoKit then decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "Unwrap it in your own house to create a <" .. ItemType(38707):getName() .. ">.") diff --git a/data-otservbr-global/npc/emperor_kruzak.lua b/data-otservbr-global/npc/emperor_kruzak.lua index 4f838396df0..daf0742f615 100644 --- a/data-otservbr-global/npc/emperor_kruzak.lua +++ b/data-otservbr-global/npc/emperor_kruzak.lua @@ -82,7 +82,7 @@ local function creatureSayCallback(npc, creature, type, message) if player:getMoney() + player:getBankBalance() >= 500000000 then local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() then + if inbox and #inboxItems < inbox:getMaxCapacity() then local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1) local decoItemName = ItemType(31510):getName() decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "You bought this item in the Store.\nUnwrap it in your own house to create a " .. decoItemName .. ".") diff --git a/data-otservbr-global/npc/hireling.lua b/data-otservbr-global/npc/hireling.lua index aad7785079d..6897bafdcf7 100644 --- a/data-otservbr-global/npc/hireling.lua +++ b/data-otservbr-global/npc/hireling.lua @@ -521,7 +521,7 @@ function createHirelingType(HirelingName) local inboxItems = inbox:getItems() if player:getFreeCapacity() < itType:getWeight(1) then npcHandler:say("Sorry, but you don't have enough capacity.", npc, creature) - elseif not inbox or #inboxItems > inbox:getMaxCapacity() then + elseif not inbox or #inboxItems >= inbox:getMaxCapacity() then player:getPosition():sendMagicEffect(CONST_ME_POFF) npcHandler:say("Sorry, you don't have enough room on your inbox", npc, creature) elseif not player:removeMoneyBank(15000) then diff --git a/data-otservbr-global/npc/king_tibianus.lua b/data-otservbr-global/npc/king_tibianus.lua index de47e45acca..d9968357fa1 100644 --- a/data-otservbr-global/npc/king_tibianus.lua +++ b/data-otservbr-global/npc/king_tibianus.lua @@ -87,7 +87,7 @@ local function creatureSayCallback(npc, creature, type, message) if player:getMoney() + player:getBankBalance() >= 500000000 then local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() then + if inbox and #inboxItems < inbox:getMaxCapacity() then local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1) local decoItemName = ItemType(31510):getName() decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "Unwrap it in your own house to create a " .. decoItemName .. ".") diff --git a/data-otservbr-global/npc/queen_eloise.lua b/data-otservbr-global/npc/queen_eloise.lua index a9397061a56..0467bb6e74a 100644 --- a/data-otservbr-global/npc/queen_eloise.lua +++ b/data-otservbr-global/npc/queen_eloise.lua @@ -77,7 +77,7 @@ local function creatureSayCallback(npc, creature, type, message) if player:getMoney() + player:getBankBalance() >= 500000000 then local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() then + if inbox and #inboxItems < inbox:getMaxCapacity() then local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1) local decoItemName = ItemType(31510):getName() decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "You bought this item in the Store.\nUnwrap it in your own house to create a " .. decoItemName .. ".") diff --git a/data-otservbr-global/npc/walter_jaeger.lua b/data-otservbr-global/npc/walter_jaeger.lua index 6911d7ed323..6b0e26075d6 100644 --- a/data-otservbr-global/npc/walter_jaeger.lua +++ b/data-otservbr-global/npc/walter_jaeger.lua @@ -283,7 +283,7 @@ local function processItemInboxPurchase(player, name, id) local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() then + if inbox and #inboxItems < inbox:getMaxCapacity() then local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1) if decoKit then decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "You bought this item with the Walter Jaeger.\nUnwrap it in your own house to create a <" .. name .. ">.") diff --git a/data/libs/systems/hireling.lua b/data/libs/systems/hireling.lua index 8b5784759fa..30134cd7cd0 100644 --- a/data/libs/systems/hireling.lua +++ b/data/libs/systems/hireling.lua @@ -361,7 +361,7 @@ function Hireling:returnToLamp(player_id) local inbox = owner:getStoreInbox() local inboxItems = inbox:getItems() - if not inbox or #inboxItems > inbox:getMaxCapacity() then + if not inbox or #inboxItems >= inbox:getMaxCapacity() then owner:getPosition():sendMagicEffect(CONST_ME_POFF) return owner:sendTextMessage(MESSAGE_FAILURE, "You don't have enough room in your inbox.") end @@ -556,7 +556,7 @@ function Player:addNewHireling(name, sex) local inbox = self:getStoreInbox() local inboxItems = inbox:getItems() - if not inbox or #inboxItems > inbox:getMaxCapacity() then + if not inbox or #inboxItems >= inbox:getMaxCapacity() then self:getPosition():sendMagicEffect(CONST_ME_POFF) self:sendTextMessage(MESSAGE_FAILURE, "You don't have enough room in your inbox.") return false diff --git a/data/modules/scripts/daily_reward/daily_reward.lua b/data/modules/scripts/daily_reward/daily_reward.lua index 09b927cedda..b6a7c16993a 100644 --- a/data/modules/scripts/daily_reward/daily_reward.lua +++ b/data/modules/scripts/daily_reward/daily_reward.lua @@ -454,7 +454,7 @@ function Player.selectDailyReward(self, msg) -- Adding items to store inbox local inbox = self:getStoreInbox() local inboxItems = inbox:getItems() - if not inbox or #inboxItems > inbox:getMaxCapacity() then + if not inbox or #inboxItems >= inbox:getMaxCapacity() then self:sendError("You do not have enough space in your store inbox.") return false end diff --git a/data/scripts/talkactions/player/reward.lua b/data/scripts/talkactions/player/reward.lua index 3f4cc3787de..a05dab3a933 100644 --- a/data/scripts/talkactions/player/reward.lua +++ b/data/scripts/talkactions/player/reward.lua @@ -26,7 +26,7 @@ local function sendExerciseRewardModal(player) local inbox = player:getStoreInbox() local inboxItems = inbox:getItems() - if inbox and #inboxItems <= inbox:getMaxCapacity() and player:getFreeCapacity() >= iType:getWeight() then + if inbox and #inboxItems < inbox:getMaxCapacity() and player:getFreeCapacity() >= iType:getWeight() then local item = inbox:addItem(it.id, it.charges) if item then item:setActionId(IMMOVABLE_ACTION_ID) From 0fdd8b042bc868ddd85ee0247cd07bb9e7febac2 Mon Sep 17 00:00:00 2001 From: Beats Date: Mon, 24 Jun 2024 13:23:51 -0400 Subject: [PATCH 47/50] fix: clang format (#2710) --- .clang-format | 4 +- .github/workflows/clang-lint.yml | 6 +- src/canary_server.cpp | 10 +- src/creatures/appearance/outfit/outfit.cpp | 4 +- src/creatures/combat/combat.cpp | 40 +-- src/creatures/combat/condition.cpp | 2 +- src/creatures/combat/spells.cpp | 20 +- src/creatures/creature.cpp | 2 +- src/creatures/creatures_definitions.hpp | 12 +- src/creatures/interactions/chat.cpp | 16 +- src/creatures/monsters/monster.cpp | 28 +-- src/creatures/monsters/monsters.cpp | 20 +- src/creatures/npcs/npc.cpp | 4 +- .../achievement/player_achievement.cpp | 4 +- .../players/cyclopedia/player_badge.cpp | 2 +- .../players/cyclopedia/player_title.cpp | 2 +- src/creatures/players/grouping/familiars.cpp | 2 +- src/creatures/players/grouping/groups.cpp | 2 +- src/creatures/players/grouping/party.hpp | 2 +- .../players/imbuements/imbuements.cpp | 6 +- src/creatures/players/player.cpp | 32 +-- src/creatures/players/player.hpp | 10 +- src/creatures/players/vocations/vocation.cpp | 12 +- src/database/databasemanager.cpp | 4 +- src/game/game.cpp | 94 +++---- src/game/movement/teleport.cpp | 4 +- src/io/io_bosstiary.cpp | 6 +- src/io/iobestiary.cpp | 6 +- src/io/iomap.cpp | 54 ++-- src/io/ioprey.cpp | 6 +- src/items/decay/decay.cpp | 8 +- src/items/functions/item/item_parse.cpp | 4 +- src/items/item.cpp | 32 +-- src/items/items.cpp | 8 +- src/items/tile.cpp | 2 +- src/items/weapons/weapons.cpp | 4 +- src/lua/callbacks/event_callback.cpp | 230 +++++++++--------- src/lua/creature/actions.cpp | 10 +- src/lua/creature/actions.hpp | 8 +- src/lua/creature/creatureevent.cpp | 60 ++--- src/lua/creature/events.cpp | 194 +++++++-------- src/lua/creature/movement.cpp | 32 +-- src/lua/creature/movement.hpp | 8 +- src/lua/creature/raids.cpp | 104 ++++---- src/lua/creature/talkaction.cpp | 4 +- .../functions/core/game/game_functions.cpp | 4 +- .../creatures/combat/spell_functions.cpp | 22 +- .../creatures/creature_functions.cpp | 2 +- .../creatures/monster/loot_functions.cpp | 12 +- .../monster/monster_type_functions.cpp | 12 +- .../creatures/npc/shop_functions.cpp | 12 +- .../creatures/player/player_functions.cpp | 16 +- src/lua/functions/events/action_functions.cpp | 2 +- .../events/creature_event_functions.cpp | 4 +- .../events/global_event_functions.cpp | 14 +- .../functions/events/move_event_functions.cpp | 8 +- src/lua/functions/items/item_functions.cpp | 2 +- src/lua/functions/items/weapon_functions.cpp | 16 +- src/lua/functions/lua_functions_loader.cpp | 4 +- src/lua/global/baseevents.cpp | 6 +- src/lua/global/globalevent.cpp | 16 +- src/lua/scripts/lua_environment.cpp | 4 +- src/lua/scripts/scripts.cpp | 2 +- src/map/house/house.cpp | 4 +- src/map/house/housetile.cpp | 6 +- src/map/mapcache.cpp | 2 +- src/map/spectators.cpp | 10 +- src/server/network/connection/connection.cpp | 2 +- src/server/network/protocol/protocol.cpp | 2 +- src/server/network/protocol/protocol.hpp | 2 +- src/server/network/protocol/protocolgame.cpp | 46 ++-- src/server/network/protocol/protocollogin.cpp | 2 +- .../network/protocol/protocolstatus.cpp | 4 +- src/server/server.hpp | 8 +- src/server/signals.cpp | 4 +- src/utils/simd.hpp | 2 +- 76 files changed, 688 insertions(+), 688 deletions(-) diff --git a/.clang-format b/.clang-format index de45e1b2e7a..289f5508316 100644 --- a/.clang-format +++ b/.clang-format @@ -111,7 +111,7 @@ QualifierAlignment: Left ReferenceAlignment: Right ReflowComments: true RemoveBracesLLVM: false -SortIncludes: false +SortIncludes: Never SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false @@ -138,4 +138,4 @@ StatementMacros: - QT_REQUIRE_VERSION TabWidth: 4 UseCRLF: false -UseTab: true +UseTab: AlignWithSpaces diff --git a/.github/workflows/clang-lint.yml b/.github/workflows/clang-lint.yml index 67e6427d853..b57e407cbb9 100644 --- a/.github/workflows/clang-lint.yml +++ b/.github/workflows/clang-lint.yml @@ -37,17 +37,17 @@ jobs: - name: Run clang format lint if: ${{ github.ref != 'refs/heads/main' }} - uses: DoozyX/clang-format-lint-action@v0.16.2 + uses: DoozyX/clang-format-lint-action@v0.17 with: source: "src" exclude: "src/protobuf" extensions: "cpp,hpp,h" - clangFormatVersion: 16 + clangFormatVersion: 17 inplace: true - name: Run add and commit if: ${{ github.ref != 'refs/heads/main' }} - uses: EndBug/add-and-commit@v9 + uses: EndBug/add-and-commit@v9.1.4 with: author_name: GitHub Actions author_email: github-actions[bot]@users.noreply.github.com diff --git a/src/canary_server.cpp b/src/canary_server.cpp index 17a36ff3d23..e49a86d7d9f 100644 --- a/src/canary_server.cpp +++ b/src/canary_server.cpp @@ -93,8 +93,8 @@ int CanaryServer::run() { #ifndef _WIN32 if (getuid() == 0 || geteuid() == 0) { logger.warn("{} has been executed as root user, " - "please consider running it as a normal user", - ProtocolStatus::SERVER_NAME); + "please consider running it as a normal user", + ProtocolStatus::SERVER_NAME); } #endif @@ -213,7 +213,7 @@ void CanaryServer::logInfos() { logger.info("A server developed by: {}", ProtocolStatus::SERVER_DEVELOPERS); logger.info("Visit our website for updates, support, and resources: " - "https://docs.opentibiabr.com/"); + "https://docs.opentibiabr.com/"); } /** @@ -234,7 +234,7 @@ void CanaryServer::toggleForceCloseButton() { void CanaryServer::badAllocationHandler() { // Use functions that only use stack allocation g_logger().error("Allocation failed, server out of memory, " - "decrease the size of your map or compile in 64 bits mode"); + "decrease the size of your map or compile in 64 bits mode"); if (isatty(STDIN_FILENO)) { getchar(); @@ -318,7 +318,7 @@ void CanaryServer::initializeDatabase() { DatabaseManager::updateDatabase(); if (g_configManager().getBoolean(OPTIMIZE_DATABASE, __FUNCTION__) - && !DatabaseManager::optimizeTables()) { + && !DatabaseManager::optimizeTables()) { logger.debug("No tables were optimized"); } } diff --git a/src/creatures/appearance/outfit/outfit.cpp b/src/creatures/appearance/outfit/outfit.cpp index 97120659333..251bf7bde35 100644 --- a/src/creatures/appearance/outfit/outfit.cpp +++ b/src/creatures/appearance/outfit/outfit.cpp @@ -58,8 +58,8 @@ bool Outfits::loadFromXml() { } if (auto lookType = pugi::cast(lookTypeAttribute.value()); - g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 - && !g_game().isLookTypeRegistered(lookType)) { + g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 + && !g_game().isLookTypeRegistered(lookType)) { g_logger().warn("[Outfits::loadFromXml] An unregistered creature looktype type with id '{}' was ignored to prevent client crash.", lookType); continue; } diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp index 175fad49e20..87f7500d0a9 100644 --- a/src/creatures/combat/combat.cpp +++ b/src/creatures/combat/combat.cpp @@ -657,8 +657,8 @@ CombatDamage Combat::applyImbuementElementalDamage(std::shared_ptr attac } if (imbuementInfo.imbuement->combatType == COMBAT_NONE - || damage.primary.type == COMBAT_HEALING - || damage.secondary.type == COMBAT_HEALING) { + || damage.primary.type == COMBAT_HEALING + || damage.secondary.type == COMBAT_HEALING) { continue; } @@ -1256,8 +1256,8 @@ void Combat::doCombatHealth(std::shared_ptr caster, std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms) { bool canCombat = !params.aggressive || (caster != target && Combat::canDoCombat(caster, target, params.aggressive) == RETURNVALUE_NOERROR); if ((caster && target) - && (caster == target || canCombat) - && (params.impactEffect != CONST_ME_NONE)) { + && (caster == target || canCombat) + && (params.impactEffect != CONST_ME_NONE)) { g_game().addMagicEffect(target->getPosition(), params.impactEffect); } @@ -1300,8 +1300,8 @@ void Combat::doCombatMana(std::shared_ptr caster, std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms) { bool canCombat = !params.aggressive || (caster != target && Combat::canDoCombat(caster, target, params.aggressive) == RETURNVALUE_NOERROR); if ((caster && target) - && (caster == target || canCombat) - && (params.impactEffect != CONST_ME_NONE)) { + && (caster == target || canCombat) + && (params.impactEffect != CONST_ME_NONE)) { g_game().addMagicEffect(target->getPosition(), params.impactEffect); } @@ -1368,8 +1368,8 @@ void Combat::doCombatDispel(std::shared_ptr caster, const Position &po void Combat::doCombatDispel(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms) { bool canCombat = !params.aggressive || (caster != target && Combat::canDoCombat(caster, target, params.aggressive) == RETURNVALUE_NOERROR); if ((caster && target) - && (caster == target || canCombat) - && (params.impactEffect != CONST_ME_NONE)) { + && (caster == target || canCombat) + && (params.impactEffect != CONST_ME_NONE)) { g_game().addMagicEffect(target->getPosition(), params.impactEffect); } @@ -1408,7 +1408,7 @@ void Combat::doCombatDefault(std::shared_ptr caster, std::shared_ptrgetPosition(), params.impactEffect); + g_game().addMagicEffect(target->getPosition(), params.impactEffect); } */ @@ -1540,8 +1540,8 @@ void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage // onGetPlayerMinMaxValues(...) if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[ValueCallback::getMinMaxValues - Player {} formula {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), fmt::underlying(type)); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), fmt::underlying(type)); return; } @@ -1633,8 +1633,8 @@ void TileCallback::onTileCombat(std::shared_ptr creature, std::shared_ // onTileCombat(creature, pos) if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[TileCallback::onTileCombat - Creature {} type {} on tile x: {} y: {} z: {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), fmt::underlying(type), (tile->getPosition()).getX(), (tile->getPosition()).getY(), (tile->getPosition()).getZ()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), fmt::underlying(type), (tile->getPosition()).getX(), (tile->getPosition()).getY(), (tile->getPosition()).getZ()); return; } @@ -1664,8 +1664,8 @@ void TargetCallback::onTargetCombat(std::shared_ptr creature, std::sha // onTargetCombat(creature, target) if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[TargetCallback::onTargetCombat - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return; } @@ -1724,8 +1724,8 @@ void ChainCallback::onChainCombat(std::shared_ptr creature, uint8_t &m // onChainCombat(creature) if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[ChainCallback::onTargetCombat - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return; } @@ -1766,8 +1766,8 @@ bool ChainPickerCallback::onChainCombat(std::shared_ptr creature, std: // onChainCombat(creature, target) if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[ChainPickerCallback::onTargetCombat - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return true; } @@ -2178,7 +2178,7 @@ void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptrgetInventoryItem(CONST_SLOT_LEFT); - playerWeapon != nullptr && playerWeapon->getTier() > 0) { + playerWeapon != nullptr && playerWeapon->getTier() > 0) { double_t fatalChance = playerWeapon->getFatalChance(); double_t randomChance = uniform_random(0, 10000) / 100; if (fatalChance > 0 && randomChance < fatalChance) { diff --git a/src/creatures/combat/condition.cpp b/src/creatures/combat/condition.cpp index 7f477f1d859..b9603d010a2 100644 --- a/src/creatures/combat/condition.cpp +++ b/src/creatures/combat/condition.cpp @@ -2042,7 +2042,7 @@ bool ConditionFeared::executeCondition(std::shared_ptr creature, int32 g_dispatcher().addEvent([id = creature->getID(), listDir = listDir.data()] { g_game().forcePlayerAutoWalk(id, listDir); }, - "ConditionFeared::executeCondition"); + "ConditionFeared::executeCondition"); g_logger().debug("[ConditionFeared::executeCondition] Walking Scheduled"); } diff --git a/src/creatures/combat/spells.cpp b/src/creatures/combat/spells.cpp index dd4305de14e..f8852c5e534 100644 --- a/src/creatures/combat/spells.cpp +++ b/src/creatures/combat/spells.cpp @@ -108,7 +108,7 @@ void Spells::clear() { bool Spells::hasInstantSpell(const std::string &word) const { if (auto iterate = instants.find(word); - iterate != instants.end()) { + iterate != instants.end()) { return true; } return false; @@ -127,8 +127,8 @@ bool Spells::registerInstantLuaEvent(const std::shared_ptr instant // Checks if there is any spell registered with the same name if (hasInstantSpell(words)) { g_logger().warn("[Spells::registerInstantLuaEvent] - " - "Duplicate registered instant spell with words: {}, on spell with name: {}", - words, instantName); + "Duplicate registered instant spell with words: {}, on spell with name: {}", + words, instantName); return false; } // Register spell word in the map @@ -166,7 +166,7 @@ std::list Spells::getSpellsByVocation(uint16_t vocationId) { vocSpellsIt = vocSpells.find(vocationId); if (vocSpellsIt != vocSpells.end() - && vocSpellsIt->second) { + && vocSpellsIt->second) { spellsList.push_back(it.second->getSpellId()); } } @@ -361,8 +361,8 @@ bool CombatSpell::executeCastSpell(std::shared_ptr creature, const Lua // onCastSpell(creature, var) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CombatSpell::executeCastSpell - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return false; } @@ -950,8 +950,8 @@ bool InstantSpell::executeCastSpell(std::shared_ptr creature, const Lu // onCastSpell(creature, var) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[InstantSpell::executeCastSpell - Creature {} words {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), getWords()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), getWords()); return false; } @@ -1095,8 +1095,8 @@ bool RuneSpell::executeCastSpell(std::shared_ptr creature, const LuaVa // onCastSpell(creature, var, isHotkey) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[RuneSpell::executeCastSpell - Creature {} runeId {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), getRuneItemId()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), getRuneItemId()); return false; } diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp index d033d59c829..c68ab4f351b 100644 --- a/src/creatures/creature.cpp +++ b/src/creatures/creature.cpp @@ -828,7 +828,7 @@ bool Creature::dropCorpse(std::shared_ptr lastHitCreature, std::shared g_dispatcher().addEvent([player, corpseContainer, corpsePosition = corpse->getPosition()] { g_game().playerQuickLootCorpse(player, corpseContainer, corpsePosition); }, - "Game::playerQuickLootCorpse"); + "Game::playerQuickLootCorpse"); } } } diff --git a/src/creatures/creatures_definitions.hpp b/src/creatures/creatures_definitions.hpp index 33f62dbd2aa..74ec6c5f2c8 100644 --- a/src/creatures/creatures_definitions.hpp +++ b/src/creatures/creatures_definitions.hpp @@ -1524,12 +1524,12 @@ using StashItemList = std::map; using ItemsTierCountList = std::map>; /* - > ItemsTierCountList structure: - |- [itemID] - |- [itemTier] - |- Count - | ... - | ... + > ItemsTierCountList structure: + |- [itemID] + |- [itemTier] + |- Count + | ... + | ... */ struct ProtocolFamiliars { diff --git a/src/creatures/interactions/chat.cpp b/src/creatures/interactions/chat.cpp index e16af670fcc..900247e457a 100644 --- a/src/creatures/interactions/chat.cpp +++ b/src/creatures/interactions/chat.cpp @@ -145,8 +145,8 @@ bool ChatChannel::executeCanJoinEvent(const std::shared_ptr &player) { LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[CanJoinChannelEvent::execute - Player {}, on channel {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -171,8 +171,8 @@ bool ChatChannel::executeOnJoinEvent(const std::shared_ptr &player) { LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[OnJoinChannelEvent::execute - Player {}, on channel {}] " - "Call stack overflow. Too many lua script calls being nested", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested", + player->getName(), getName()); return false; } @@ -197,8 +197,8 @@ bool ChatChannel::executeOnLeaveEvent(const std::shared_ptr &player) { LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[OnLeaveChannelEvent::execute - Player {}, on channel {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -223,8 +223,8 @@ bool ChatChannel::executeOnSpeakEvent(const std::shared_ptr &player, Spe LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[OnSpeakChannelEvent::execute - Player {}, type {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), fmt::underlying(type)); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), fmt::underlying(type)); return false; } diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp index 5e0a7d16bb4..4b993cbab0e 100644 --- a/src/creatures/monsters/monster.cpp +++ b/src/creatures/monsters/monster.cpp @@ -50,8 +50,8 @@ Monster::Monster(const std::shared_ptr mType) : for (const std::string &scriptName : mType->info.scripts) { if (!registerCreatureEvent(scriptName)) { g_logger().warn("[Monster::Monster] - " - "Unknown event name: {}", - scriptName); + "Unknown event name: {}", + scriptName); } } } @@ -138,8 +138,8 @@ void Monster::onCreatureAppear(std::shared_ptr creature, bool isLogin) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[Monster::onCreatureAppear - Monster {} creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName(), creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName(), creature->getName()); return; } @@ -176,8 +176,8 @@ void Monster::onRemoveCreature(std::shared_ptr creature, bool isLogout LuaScriptInterface* scriptInterface = mType->info.scriptInterface; if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[Monster::onCreatureDisappear - Monster {} creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName(), creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName(), creature->getName()); return; } @@ -217,8 +217,8 @@ void Monster::onCreatureMove(const std::shared_ptr &creature, const st LuaScriptInterface* scriptInterface = mType->info.scriptInterface; if (!scriptInterface->reserveScriptEnv()) { g_logger().error("[Monster::onCreatureMove - Monster {} creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName(), creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName(), creature->getName()); return; } @@ -291,8 +291,8 @@ void Monster::onCreatureSay(std::shared_ptr creature, SpeakClasses typ LuaScriptInterface* scriptInterface = mType->info.scriptInterface; if (!scriptInterface->reserveScriptEnv()) { g_logger().error("Monster {} creature {}] Call stack overflow. Too many lua " - "script calls being nested.", - getName(), creature->getName()); + "script calls being nested.", + getName(), creature->getName()); return; } @@ -771,8 +771,8 @@ void Monster::onThink(uint32_t interval) { LuaScriptInterface* scriptInterface = mType->info.scriptInterface; if (!scriptInterface->reserveScriptEnv()) { g_logger().error("Monster {} Call stack overflow. Too many lua script calls " - "being nested.", - getName()); + "being nested.", + getName()); return; } @@ -2041,8 +2041,8 @@ void Monster::dropLoot(std::shared_ptr corpse, std::shared_ptr spell, spell } if (std::string spellName = asLowerCaseString(spell->name); - spellName == "melee") { + spellName == "melee") { sb.isMelee = true; if (spell->attack > 0 && spell->skill > 0) { @@ -164,8 +164,8 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell condition->setOutfit(outfit); } else { g_logger().error("[Monsters::deserializeSpell] - " - "Missing outfit monster or item in outfit spell for: {}", - description); + "Missing outfit monster or item in outfit spell for: {}", + description); return false; } @@ -208,8 +208,8 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell } else if (spellName == "condition") { if (spell->conditionType == CONDITION_NONE) { g_logger().error("[Monsters::deserializeSpell] - " - "{} condition is not set for: {}", - description, spell->name); + "{} condition is not set for: {}", + description, spell->name); } } else if (spellName == "strength") { // @@ -217,8 +217,8 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell // } else { g_logger().error("[Monsters::deserializeSpell] - " - "{} unknown or missing parameter on spell with name: {}", - description, spell->name); + "{} unknown or missing parameter on spell with name: {}", + description, spell->name); } if (spell->shoot != CONST_ANI_NONE) { @@ -295,9 +295,9 @@ bool MonsterType::loadCallback(LuaScriptInterface* scriptInterface) { std::shared_ptr Monsters::getMonsterType(const std::string &name, bool silent /* = false*/) const { std::string lowerCaseName = asLowerCaseString(name); if (auto it = monsters.find(lowerCaseName); - it != monsters.end() - // We will only return the MonsterType if it match the exact name of the monster - && it->first.find(lowerCaseName) != it->first.npos) { + it != monsters.end() + // We will only return the MonsterType if it match the exact name of the monster + && it->first.find(lowerCaseName) != it->first.npos) { return it->second; } if (!silent) { diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp index 8f6fa370087..fdbf58853b4 100644 --- a/src/creatures/npcs/npc.cpp +++ b/src/creatures/npcs/npc.cpp @@ -521,7 +521,7 @@ void Npc::onThinkWalk(uint32_t interval) { } if (Direction newDirection; - getRandomStep(newDirection)) { + getRandomStep(newDirection)) { listWalkDir.push_front(newDirection); addEventWalk(); } @@ -633,7 +633,7 @@ bool Npc::getRandomStep(Direction &moveDirection) { std::ranges::shuffle(directionvector, getRandomGenerator()); for (const Position &creaturePos = getPosition(); - Direction direction : directionvector) { + Direction direction : directionvector) { if (canWalkTo(creaturePos, direction)) { moveDirection = direction; return true; diff --git a/src/creatures/players/achievement/player_achievement.cpp b/src/creatures/players/achievement/player_achievement.cpp index 2db53dbe776..69d1d7ab1fa 100644 --- a/src/creatures/players/achievement/player_achievement.cpp +++ b/src/creatures/players/achievement/player_achievement.cpp @@ -53,7 +53,7 @@ bool PlayerAchievement::remove(uint16_t id) { if (auto it = std::find_if(m_achievementsUnlocked.begin(), m_achievementsUnlocked.end(), [id](auto achievement_it) { return achievement_it.first == id; }); - it != m_achievementsUnlocked.end()) { + it != m_achievementsUnlocked.end()) { getUnlockedKV()->remove(achievement.name); m_achievementsUnlocked.erase(it); removePoints(achievement.points); @@ -72,7 +72,7 @@ bool PlayerAchievement::isUnlocked(uint16_t id) const { if (auto it = std::find_if(m_achievementsUnlocked.begin(), m_achievementsUnlocked.end(), [id](auto achievement_it) { return achievement_it.first == id; }); - it != m_achievementsUnlocked.end()) { + it != m_achievementsUnlocked.end()) { return true; } diff --git a/src/creatures/players/cyclopedia/player_badge.cpp b/src/creatures/players/cyclopedia/player_badge.cpp index 9b892a6164c..639640b2ffe 100644 --- a/src/creatures/players/cyclopedia/player_badge.cpp +++ b/src/creatures/players/cyclopedia/player_badge.cpp @@ -26,7 +26,7 @@ bool PlayerBadge::hasBadge(uint8_t id) const { if (auto it = std::find_if(m_badgesUnlocked.begin(), m_badgesUnlocked.end(), [id](auto badge_it) { return badge_it.first.m_id == id; }); - it != m_badgesUnlocked.end()) { + it != m_badgesUnlocked.end()) { return true; } diff --git a/src/creatures/players/cyclopedia/player_title.cpp b/src/creatures/players/cyclopedia/player_title.cpp index 624b0313457..a6b44f3d3c4 100644 --- a/src/creatures/players/cyclopedia/player_title.cpp +++ b/src/creatures/players/cyclopedia/player_title.cpp @@ -26,7 +26,7 @@ bool PlayerTitle::isTitleUnlocked(uint8_t id) const { if (auto it = std::find_if(m_titlesUnlocked.begin(), m_titlesUnlocked.end(), [id](auto title_it) { return title_it.first.m_id == id; }); - it != m_titlesUnlocked.end()) { + it != m_titlesUnlocked.end()) { return true; } diff --git a/src/creatures/players/grouping/familiars.cpp b/src/creatures/players/grouping/familiars.cpp index 6e923b823dc..6312aaa285d 100644 --- a/src/creatures/players/grouping/familiars.cpp +++ b/src/creatures/players/grouping/familiars.cpp @@ -77,7 +77,7 @@ std::shared_ptr Familiars::getFamiliarByLookType(uint16_t vocation, ui if (auto it = std::find_if(familiars[vocation].begin(), familiars[vocation].end(), [lookType](auto familiar_it) { return familiar_it->lookType == lookType; }); - it != familiars[vocation].end()) { + it != familiars[vocation].end()) { return *it; } return nullptr; diff --git a/src/creatures/players/grouping/groups.cpp b/src/creatures/players/grouping/groups.cpp index 937fa848f3f..c4dab4a9039 100644 --- a/src/creatures/players/grouping/groups.cpp +++ b/src/creatures/players/grouping/groups.cpp @@ -103,7 +103,7 @@ std::shared_ptr Groups::getGroup(uint16_t id) const { if (auto it = std::find_if(groups_vector.begin(), groups_vector.end(), [id](auto group_it) { return group_it->id == id; }); - it != groups_vector.end()) { + it != groups_vector.end()) { return *it; } return nullptr; diff --git a/src/creatures/players/grouping/party.hpp b/src/creatures/players/grouping/party.hpp index 10663a278bf..6aaecc56190 100644 --- a/src/creatures/players/grouping/party.hpp +++ b/src/creatures/players/grouping/party.hpp @@ -108,7 +108,7 @@ class Party : public SharedObject { if (auto it = std::find_if(membersData.begin(), membersData.end(), [playerId](const std::shared_ptr &preyIt) { return preyIt->id == playerId; }); - it != membersData.end()) { + it != membersData.end()) { return *it; } diff --git a/src/creatures/players/imbuements/imbuements.cpp b/src/creatures/players/imbuements/imbuements.cpp index ed312dbf8e1..4bfb0de836b 100644 --- a/src/creatures/players/imbuements/imbuements.cpp +++ b/src/creatures/players/imbuements/imbuements.cpp @@ -347,9 +347,9 @@ std::vector Imbuements::getImbuements(std::shared_ptr player // Parse the storages for each imbuement in imbuements.xml and config.lua (enable/disable storage) if (g_configManager().getBoolean(TOGGLE_IMBUEMENT_SHRINE_STORAGE, __FUNCTION__) - && imbuement->getStorage() != 0 - && player->getStorageValue(imbuement->getStorage() == -1) - && imbuement->getBaseID() >= 1 && imbuement->getBaseID() <= 3) { + && imbuement->getStorage() != 0 + && player->getStorageValue(imbuement->getStorage() == -1) + && imbuement->getBaseID() >= 1 && imbuement->getBaseID() <= 3) { continue; } diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index 49c553f1326..a9320ffba5f 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -284,7 +284,7 @@ std::shared_ptr Player::getQuiverAmmoOfType(const ItemType &it) const { std::shared_ptr quiver = inventory[CONST_SLOT_RIGHT]; for (std::shared_ptr container = quiver->getContainer(); - auto ammoItem : container->getItemList()) { + auto ammoItem : container->getItemList()) { if (ammoItem->getAmmoType() == it.ammoType) { if (level >= Item::items[ammoItem->getID()].minReqLevel) { return ammoItem; @@ -3835,7 +3835,7 @@ bool Player::hasItemCountById(uint16_t itemId, uint32_t itemAmount, bool checkSt // Check items from stash for (StashItemList stashToSend = getStashItems(); - auto [stashItemId, itemCount] : stashToSend) { + auto [stashItemId, itemCount] : stashToSend) { if (!checkStash) { break; } @@ -5392,7 +5392,7 @@ uint16_t Player::getSkillLevel(skills_t skill) const { skillLevel = std::max(0, skillLevel + varSkills[skill]); if (auto it = maxValuePerSkill.find(skill); - it != maxValuePerSkill.end()) { + it != maxValuePerSkill.end()) { skillLevel = std::min(it->second, skillLevel); } @@ -6228,7 +6228,7 @@ std::pair Player::getForgeSliversAndCores() const { // Check items from stash for (StashItemList stashToSend = getStashItems(); - auto [itemId, itemCount] : stashToSend) { + auto [itemId, itemCount] : stashToSend) { if (itemId == ITEM_FORGE_SLIVER) { sliverCount += itemCount; } @@ -6624,7 +6624,7 @@ std::string Player::getBlessingsName() const { for (uint8_t i = 1; i <= 8; i++) { if (hasBlessing(i)) { if (auto blessName = BlessingNames.find(static_cast(i)); - blessName != BlessingNames.end()) { + blessName != BlessingNames.end()) { os << (*blessName).second; } else { continue; @@ -6817,7 +6817,7 @@ void Player::requestDepotSearchItem(uint16_t itemId, uint8_t tier) { uint32_t stashCount = 0; if (const ItemType &iType = Item::items[itemId]; - iType.stackable && iType.wareId > 0) { + iType.stackable && iType.wareId > 0) { stashCount = getStashItemCount(itemId); } @@ -6866,10 +6866,10 @@ void Player::retrieveAllItemsFromDepotSearch(uint16_t itemId, uint8_t tier, bool for (const std::shared_ptr &locker : depotLocker->getItemList()) { std::shared_ptr c = locker->getContainer(); if (!c || c->empty() || - // Retrieve from inbox. - (c->isInbox() && isDepot) || - // Retrieve from depot. - (!c->isInbox() && !isDepot)) { + // Retrieve from inbox. + (c->isInbox() && isDepot) || + // Retrieve from depot. + (!c->isInbox() && !isDepot)) { continue; } @@ -6935,7 +6935,7 @@ std::shared_ptr Player::getItemFromDepotSearch(uint16_t itemId, const Posi for (const std::shared_ptr &locker : depotLocker->getItemList()) { std::shared_ptr c = locker->getContainer(); if (!c || c->empty() || (c->isInbox() && pos.y != 0x21) || // From inbox. - (!c->isInbox() && pos.y != 0x20)) { // From depot. + (!c->isInbox() && pos.y != 0x20)) { // From depot. continue; } @@ -7119,7 +7119,7 @@ void Player::forgeFuseItems(ForgeAction_t actionType, uint16_t firstItemId, uint return; } if (returnValue = g_game().internalRemoveItem(secondForgingItem, 1); - returnValue != RETURNVALUE_NOERROR) { + returnValue != RETURNVALUE_NOERROR) { g_logger().error("[Log 2] Failed to remove forge item {} from player with name {}", secondItemId, getName()); sendCancelMessage(getReturnMessage(returnValue)); sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); @@ -7362,7 +7362,7 @@ void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemI return; } if (returnValue = g_game().internalRemoveItem(receiveItem, 1); - returnValue != RETURNVALUE_NOERROR) { + returnValue != RETURNVALUE_NOERROR) { g_logger().error("[Log 2] Failed to remove transfer item {} from player with name {}", receiveItemId, getName()); sendCancelMessage(getReturnMessage(returnValue)); sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); @@ -7502,7 +7502,7 @@ void Player::forgeResourceConversion(ForgeAction_t actionType) { } if (std::shared_ptr item = Item::CreateItem(ITEM_FORGE_CORE, 1); - item) { + item) { returnValue = g_game().internalPlayerAddItem(static_self_cast(), item); } if (returnValue != RETURNVALUE_NOERROR) { @@ -7524,7 +7524,7 @@ void Player::forgeResourceConversion(ForgeAction_t actionType) { auto upgradeCost = dustLevel - 75; if (auto dusts = getForgeDusts(); - upgradeCost > dusts) { + upgradeCost > dusts) { g_logger().error("[{}] Not enough dust", __FUNCTION__); sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); return; @@ -8100,7 +8100,7 @@ bool Player::hasPermittedConditionInPZ() const { uint16_t Player::getDodgeChance() const { uint16_t chance = 0; if (auto playerArmor = getInventoryItem(CONST_SLOT_ARMOR); - playerArmor != nullptr && playerArmor->getTier()) { + playerArmor != nullptr && playerArmor->getTier()) { chance += static_cast(playerArmor->getDodgeChance() * 100); } diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index 141caafacd9..04b6a139a02 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -1956,7 +1956,7 @@ class Player final : public Creature, public Cylinder, public Bankable { bool isImmuneCleanse(ConditionType_t conditiontype) { uint64_t timenow = OTSYS_TIME(); if ((cleanseCondition.first == conditiontype) - && (timenow <= cleanseCondition.second)) { + && (timenow <= cleanseCondition.second)) { return true; } return false; @@ -2154,7 +2154,7 @@ class Player final : public Creature, public Cylinder, public Bankable { if (auto it = std::find_if(preys.begin(), preys.end(), [slotid](const std::unique_ptr &preyIt) { return preyIt->id == slotid; }); - it != preys.end()) { + it != preys.end()) { return *it; } @@ -2221,7 +2221,7 @@ class Player final : public Creature, public Cylinder, public Bankable { if (auto it = std::find_if(preys.begin(), preys.end(), [raceId](const std::unique_ptr &it) { return it->selectedRaceId == raceId; }); - it != preys.end()) { + it != preys.end()) { return *it; } @@ -2252,7 +2252,7 @@ class Player final : public Creature, public Cylinder, public Bankable { if (auto it = std::find_if(taskHunting.begin(), taskHunting.end(), [slotid](const std::unique_ptr &itTask) { return itTask->id == slotid; }); - it != taskHunting.end()) { + it != taskHunting.end()) { return *it; } @@ -2321,7 +2321,7 @@ class Player final : public Creature, public Cylinder, public Bankable { if (auto it = std::find_if(taskHunting.begin(), taskHunting.end(), [raceId](const std::unique_ptr &itTask) { return itTask->selectedRaceId == raceId; }); - it != taskHunting.end()) { + it != taskHunting.end()) { return *it; } diff --git a/src/creatures/players/vocations/vocation.cpp b/src/creatures/players/vocations/vocation.cpp index 98dbaeb1bea..6fec2725164 100644 --- a/src/creatures/players/vocations/vocation.cpp +++ b/src/creatures/players/vocations/vocation.cpp @@ -129,13 +129,13 @@ bool Vocations::loadFromXml() { voc->skillMultipliers[skill_id] = pugi::cast(childNode.attribute("multiplier").value()); } else { g_logger().warn("[Vocations::loadFromXml] - " - "No valid skill id: {} for vocation: {}", - skill_id, voc->id); + "No valid skill id: {} for vocation: {}", + skill_id, voc->id); } } else { g_logger().warn("[Vocations::loadFromXml] - " - "Missing skill id for vocation: {}", - voc->id); + "Missing skill id for vocation: {}", + voc->id); } } else if (strcasecmp(childNode.name(), "mitigation") == 0) { pugi::xml_attribute factorAttribute = childNode.attribute("multiplier"); @@ -198,8 +198,8 @@ std::shared_ptr Vocations::getVocation(uint16_t id) { auto it = vocationsMap.find(id); if (it == vocationsMap.end()) { g_logger().warn("[Vocations::getVocation] - " - "Vocation {} not found", - id); + "Vocation {} not found", + id); return nullptr; } return it->second; diff --git a/src/database/databasemanager.cpp b/src/database/databasemanager.cpp index cbcc116dd9a..dfbb7d9a64a 100644 --- a/src/database/databasemanager.cpp +++ b/src/database/databasemanager.cpp @@ -89,8 +89,8 @@ void DatabaseManager::updateDatabase() { ss << g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/migrations/" << version << ".lua"; if (luaL_dofile(L, ss.str().c_str()) != 0) { g_logger().error("DatabaseManager::updateDatabase - Version: {}" - "] {}", - version, lua_tostring(L, -1)); + "] {}", + version, lua_tostring(L, -1)); break; } diff --git a/src/game/game.cpp b/src/game/game.cpp index 984e675407c..bae7975a295 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -386,7 +386,7 @@ void Game::loadBoostedCreature() { const auto result = db.storeQuery("SELECT * FROM `boosted_creature`"); if (!result) { g_logger().warn("[Game::loadBoostedCreature] - " - "Failed to detect boosted creature database. (CODE 01)"); + "Failed to detect boosted creature database. (CODE 01)"); return; } @@ -423,15 +423,15 @@ void Game::loadBoostedCreature() { if (selectedMonster.raceId == 0) { g_logger().warn("[Game::loadBoostedCreature] - " - "It was not possible to generate a new boosted creature->"); + "It was not possible to generate a new boosted creature->"); return; } const auto monsterType = g_monsters().getMonsterType(selectedMonster.name); if (!monsterType) { g_logger().warn("[Game::loadBoostedCreature] - " - "It was not possible to generate a new boosted creature-> Monster '{}' not found.", - selectedMonster.name); + "It was not possible to generate a new boosted creature-> Monster '{}' not found.", + selectedMonster.name); return; } @@ -451,7 +451,7 @@ void Game::loadBoostedCreature() { if (!db.executeQuery(query)) { g_logger().warn("[Game::loadBoostedCreature] - " - "Failed to detect boosted creature database. (CODE 02)"); + "Failed to detect boosted creature database. (CODE 02)"); } } @@ -1703,7 +1703,7 @@ void Game::playerMoveItem(std::shared_ptr player, const Position &fromPo uint8_t itemStackPos = fromStackPos; if (fromPos.x != 0xFFFF && Position::areInRange<1, 1>(mapFromPos, playerPos) - && !Position::areInRange<1, 1, 0>(mapFromPos, walkPos)) { + && !Position::areInRange<1, 1, 0>(mapFromPos, walkPos)) { // need to pickup the item first std::shared_ptr moveItem = nullptr; @@ -2093,20 +2093,20 @@ ReturnValue Game::internalMoveItem(std::shared_ptr fromCylinder, std:: std::shared_ptr quiver = toCylinder->getItem(); if (quiver && quiver->isQuiver() - && quiver->getHoldingPlayer() - && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { + && quiver->getHoldingPlayer() + && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { quiver->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, quiver); } else { quiver = fromCylinder->getItem(); if (quiver && quiver->isQuiver() - && quiver->getHoldingPlayer() - && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { + && quiver->getHoldingPlayer() + && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { quiver->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, quiver); } } if (SoundEffect_t soundEffect = item->getMovementSound(toCylinder); - toCylinder && soundEffect != SoundEffect_t::SILENCE) { + toCylinder && soundEffect != SoundEffect_t::SILENCE) { if (toCylinder->getContainer() && actor && actor->getPlayer() && (toCylinder->getContainer()->isInsideDepot(true) || toCylinder->getContainer()->getHoldingPlayer())) { actor->getPlayer()->sendSingleSoundEffect(toCylinder->getPosition(), soundEffect, SourceEffect_t::OWN); } else { @@ -2239,8 +2239,8 @@ ReturnValue Game::internalAddItem(std::shared_ptr toCylinder, std::sha } if (addedItem && addedItem->isQuiver() - && addedItem->getHoldingPlayer() - && addedItem->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == addedItem) { + && addedItem->getHoldingPlayer() + && addedItem->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == addedItem) { addedItem->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, addedItem); } @@ -2300,8 +2300,8 @@ ReturnValue Game::internalRemoveItem(std::shared_ptr item, int32_t count / std::shared_ptr quiver = cylinder->getItem(); if (quiver && quiver->isQuiver() - && quiver->getHoldingPlayer() - && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { + && quiver->getHoldingPlayer() + && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { quiver->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, quiver); } @@ -2760,8 +2760,8 @@ std::shared_ptr Game::transformItem(std::shared_ptr item, uint16_t n std::shared_ptr quiver = cylinder->getItem(); if (quiver && quiver->isQuiver() - && quiver->getHoldingPlayer() - && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { + && quiver->getHoldingPlayer() + && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { quiver->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, quiver); } item->startDecaying(); @@ -2772,8 +2772,8 @@ std::shared_ptr Game::transformItem(std::shared_ptr item, uint16_t n std::shared_ptr quiver = cylinder->getItem(); if (quiver && quiver->isQuiver() - && quiver->getHoldingPlayer() - && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { + && quiver->getHoldingPlayer() + && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { quiver->getHoldingPlayer()->sendInventoryItem(CONST_SLOT_RIGHT, quiver); } @@ -3699,7 +3699,7 @@ void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t f mustReloadDepotSearch = true; } else { if (auto targetThing = internalGetThing(player, toPos, toStackPos, toItemId, STACKPOS_FIND_THING); - targetThing && targetThing->getItem() && targetThing->getItem()->isInsideDepot(true)) { + targetThing && targetThing->getItem() && targetThing->getItem()->isInsideDepot(true)) { mustReloadDepotSearch = true; } } @@ -4235,7 +4235,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos item->setCustomAttribute("LookFeet", static_cast(outfit.lookFeet)); item->setCustomAttribute("LookAddons", static_cast(outfit.lookAddons)); } else if (auto pastLookType = item->getCustomAttribute("PastLookType"); - pastLookType && pastLookType->getInteger() > 0) { + pastLookType && pastLookType->getInteger() > 0) { item->removeCustomAttribute("LookType"); item->removeCustomAttribute("PastLookType"); } @@ -4247,7 +4247,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos item->setCustomAttribute("LookMountLegs", static_cast(outfit.lookMountLegs)); item->setCustomAttribute("LookMountFeet", static_cast(outfit.lookMountFeet)); } else if (auto pastLookMount = item->getCustomAttribute("PastLookMount"); - pastLookMount && pastLookMount->getInteger() > 0) { + pastLookMount && pastLookMount->getInteger() > 0) { item->removeCustomAttribute("LookMount"); item->removeCustomAttribute("PastLookMount"); } @@ -5496,8 +5496,8 @@ void Game::playerLootAllCorpses(std::shared_ptr player, const Position & } if (!tileCorpse->isRewardCorpse() - && tileCorpse->getCorpseOwner() != 0 - && !player->canOpenCorpse(tileCorpse->getCorpseOwner())) { + && tileCorpse->getCorpseOwner() != 0 + && !player->canOpenCorpse(tileCorpse->getCorpseOwner())) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); g_logger().debug("Player {} cannot loot corpse from id {} in position {}", player->getName(), tileItem->getID(), tileItem->getPosition().toString()); continue; @@ -7120,9 +7120,9 @@ bool Game::combatChangeHealth(std::shared_ptr attacker, std::shared_pt if (!damage.extension && attackerMonster && targetPlayer) { // Charm rune (target as player) if (charmRune_t activeCharm = g_iobestiary().getCharmFromTarget(targetPlayer, g_monsters().getMonsterTypeByRaceId(attackerMonster->getRaceId())); - activeCharm != CHARM_NONE && activeCharm != CHARM_CLEANSE) { + activeCharm != CHARM_NONE && activeCharm != CHARM_CLEANSE) { if (const auto charm = g_iobestiary().getBestiaryCharm(activeCharm); - charm->type == CHARM_DEFENSIVE && charm->chance > normal_random(0, 100) && g_iobestiary().parseCharmCombat(charm, targetPlayer, attacker, (damage.primary.value + damage.secondary.value))) { + charm->type == CHARM_DEFENSIVE && charm->chance > normal_random(0, 100) && g_iobestiary().parseCharmCombat(charm, targetPlayer, attacker, (damage.primary.value + damage.secondary.value))) { return false; // Dodge charm } } @@ -7508,7 +7508,7 @@ void Game::applyCharmRune( return; } if (charmRune_t activeCharm = g_iobestiary().getCharmFromTarget(attackerPlayer, g_monsters().getMonsterTypeByRaceId(targetMonster->getRaceId())); - activeCharm != CHARM_NONE) { + activeCharm != CHARM_NONE) { const auto charm = g_iobestiary().getBestiaryCharm(activeCharm); int8_t chance = charm->id == CHARM_CRIPPLE ? charm->chance : charm->chance + attackerPlayer->getCharmChanceModifier(); g_logger().debug("charm chance: {}, base: {}, bonus: {}", chance, charm->chance, attackerPlayer->getCharmChanceModifier()); @@ -7534,7 +7534,7 @@ void Game::applyManaLeech( // Void charm rune if (targetMonster) { if (uint16_t playerCharmRaceidVoid = attackerPlayer->parseRacebyCharm(CHARM_VOID, false, 0); - playerCharmRaceidVoid != 0 && playerCharmRaceidVoid == targetMonster->getRace()) { + playerCharmRaceidVoid != 0 && playerCharmRaceidVoid == targetMonster->getRace()) { if (const auto charm = g_iobestiary().getBestiaryCharm(CHARM_VOID)) { manaSkill += charm->percent; } @@ -7565,7 +7565,7 @@ void Game::applyLifeLeech( } if (targetMonster) { if (uint16_t playerCharmRaceidVamp = attackerPlayer->parseRacebyCharm(CHARM_VAMP, false, 0); - playerCharmRaceidVamp != 0 && playerCharmRaceidVamp == targetMonster->getRaceId()) { + playerCharmRaceidVamp != 0 && playerCharmRaceidVamp == targetMonster->getRaceId()) { if (const auto lifec = g_iobestiary().getBestiaryCharm(CHARM_VAMP)) { lifeSkill += lifec->percent; } @@ -9523,7 +9523,7 @@ void Game::playerBosstiarySlot(uint32_t playerId, uint8_t slotId, uint32_t selec uint32_t bossIdSlot = player->getSlotBossId(slotId); if (uint32_t boostedBossId = g_ioBosstiary().getBoostedBossId(); - selectedBossId == 0 && bossIdSlot != boostedBossId) { + selectedBossId == 0 && bossIdSlot != boostedBossId) { uint8_t removeTimes = player->getRemoveTimes(); uint32_t removePrice = g_ioBosstiary().calculteRemoveBoss(removeTimes); g_game().removeMoney(player, removePrice, 0, true); @@ -9559,7 +9559,7 @@ void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, con if (!Position::areInRange<1, 1, 0>(pos, player->getPosition())) { if (stdext::arraylist listDir(128); - player->getPathTo(pos, listDir, 0, 1, true, false)) { + player->getPathTo(pos, listDir, 0, 1, true, false)) { g_dispatcher().addEvent([this, playerId = player->getID(), listDir = listDir.data()] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); std::shared_ptr task = createPlayerTask( 400, [this, playerId, pos] { playerBrowseField(playerId, pos); }, "Game::playerBrowseField" @@ -9597,7 +9597,7 @@ void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, con const auto [podiumVisible, monsterVisible] = podiumAndMonsterVisible; bool changeTentuglyName = false; if (auto monsterOutfit = mType->info.outfit; - (monsterOutfit.lookType != 0 || monsterOutfit.lookTypeEx != 0) && monsterVisible) { + (monsterOutfit.lookType != 0 || monsterOutfit.lookTypeEx != 0) && monsterVisible) { // "Tantugly's Head" boss have to send other looktype to the podium if (monsterOutfit.lookTypeEx == 35105) { monsterOutfit.lookTypeEx = 39003; @@ -9659,7 +9659,7 @@ void Game::playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t st if (pos.x != 0xFFFF && !Position::areInRange<1, 1, 0>(pos, player->getPosition())) { if (stdext::arraylist listDir(128); - player->getPathTo(pos, listDir, 0, 1, true, true)) { + player->getPathTo(pos, listDir, 0, 1, true, true)) { g_dispatcher().addEvent([this, playerId = player->getID(), listDir = listDir.data()] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); std::shared_ptr task = createPlayerTask( 400, [this, playerId, pos, stackPos, itemId] { @@ -10031,8 +10031,8 @@ void Game::sendUpdateCreature(std::shared_ptr creature) { uint32_t Game::makeInfluencedMonster() { if (auto influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT, __FUNCTION__); - // Condition - forgeableMonsters.empty() || influencedMonsters.size() >= influencedLimit) { + // Condition + forgeableMonsters.empty() || influencedMonsters.size() >= influencedLimit) { return 0; } @@ -10112,8 +10112,8 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr } if (auto fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT, __FUNCTION__); - // Condition - forgeableMonsters.empty() || fiendishMonsters.size() >= fiendishLimit) { + // Condition + forgeableMonsters.empty() || fiendishMonsters.size() >= fiendishLimit) { return 0; } @@ -10217,8 +10217,8 @@ bool Game::removeForgeMonster(uint32_t id, ForgeClassifications_t monsterForgeCl bool Game::removeInfluencedMonster(uint32_t id, bool create /* = false*/) { if (auto find = influencedMonsters.find(id); - // Condition - find != influencedMonsters.end()) { + // Condition + find != influencedMonsters.end()) { influencedMonsters.erase(find); if (create) { @@ -10234,8 +10234,8 @@ bool Game::removeInfluencedMonster(uint32_t id, bool create /* = false*/) { bool Game::removeFiendishMonster(uint32_t id, bool create /* = true*/) { if (auto find = fiendishMonsters.find(id); - // Condition - find != fiendishMonsters.end()) { + // Condition + find != fiendishMonsters.end()) { fiendishMonsters.erase(find); checkForgeEventId(id); @@ -10286,8 +10286,8 @@ void Game::createFiendishMonsters() { } if (auto ret = makeFiendishMonster(); - // Condition - ret == 0) { + // Condition + ret == 0) { return; } @@ -10305,8 +10305,8 @@ void Game::createInfluencedMonsters() { } if (auto ret = makeInfluencedMonster(); - // If condition - ret == 0) { + // If condition + ret == 0) { return; } @@ -10325,8 +10325,8 @@ void Game::checkForgeEventId(uint32_t monsterId) { bool Game::addInfluencedMonster(std::shared_ptr monster) { if (monster && monster->canBeForgeMonster()) { if (auto maxInfluencedMonsters = static_cast(g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT, __FUNCTION__)); - // If condition - (influencedMonsters.size() + 1) > maxInfluencedMonsters) { + // If condition + (influencedMonsters.size() + 1) > maxInfluencedMonsters) { return false; } diff --git a/src/game/movement/teleport.cpp b/src/game/movement/teleport.cpp index d5a3a73daf1..44050100eb6 100644 --- a/src/game/movement/teleport.cpp +++ b/src/game/movement/teleport.cpp @@ -80,8 +80,8 @@ void Teleport::addThing(int32_t, std::shared_ptr thing) { if (checkInfinityLoop(destTile)) { const Position &pos = getPosition(); g_logger().warn("[Teleport:addThing] - " - "Infinity loop teleport at position: {}", - pos.toString()); + "Infinity loop teleport at position: {}", + pos.toString()); return; } diff --git a/src/io/io_bosstiary.cpp b/src/io/io_bosstiary.cpp index 0090c0b3ebb..2f625cdb7cc 100644 --- a/src/io/io_bosstiary.cpp +++ b/src/io/io_bosstiary.cpp @@ -89,7 +89,7 @@ void IOBosstiary::loadBoostedBoss() { query << "`date` = '" << today << "',"; query << "`boostname` = " << database.escapeString(bossName) << ","; if (const auto bossType = getMonsterTypeByBossRaceId(bossId); - bossType) { + 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) << ","; @@ -124,7 +124,7 @@ void IOBosstiary::loadBoostedBoss() { void IOBosstiary::addBosstiaryMonster(uint16_t raceId, const std::string &name) { if (auto it = bosstiaryMap.find(raceId); - it != bosstiaryMap.end()) { + it != bosstiaryMap.end()) { return; } @@ -282,7 +282,7 @@ uint8_t IOBosstiary::getBossCurrentLevel(std::shared_ptr player, uint16_ auto bossRace = mType->info.bosstiaryRace; uint8_t level = 0; if (auto it = levelInfos.find(bossRace); - it != levelInfos.end()) { + it != levelInfos.end()) { const std::vector &infoForCurrentRace = it->second; for (const auto &raceInfo : infoForCurrentRace) { if (currentKills >= raceInfo.kills) { diff --git a/src/io/iobestiary.cpp b/src/io/iobestiary.cpp index c544021367e..9cd964e7c7c 100644 --- a/src/io/iobestiary.cpp +++ b/src/io/iobestiary.cpp @@ -225,9 +225,9 @@ void IOBestiary::addBestiaryKill(std::shared_ptr player, const std::shar player->addBestiaryKillCount(raceid, amount); if ((curCount == 0) || // Initial kill stage - (curCount < mtype->info.bestiaryFirstUnlock && (curCount + amount) >= mtype->info.bestiaryFirstUnlock) || // First kill stage reached - (curCount < mtype->info.bestiarySecondUnlock && (curCount + amount) >= mtype->info.bestiarySecondUnlock) || // Second kill stage reached - (curCount < mtype->info.bestiaryToUnlock && (curCount + amount) >= mtype->info.bestiaryToUnlock)) { // Final kill stage reached + (curCount < mtype->info.bestiaryFirstUnlock && (curCount + amount) >= mtype->info.bestiaryFirstUnlock) || // First kill stage reached + (curCount < mtype->info.bestiarySecondUnlock && (curCount + amount) >= mtype->info.bestiarySecondUnlock) || // Second kill stage reached + (curCount < mtype->info.bestiaryToUnlock && (curCount + amount) >= mtype->info.bestiaryToUnlock)) { // Final kill stage reached ss << "You unlocked details for the creature '" << mtype->name << "'"; player->sendTextMessage(MESSAGE_STATUS, ss.str()); player->sendBestiaryEntryChanged(raceid); diff --git a/src/io/iomap.cpp b/src/io/iomap.cpp index d50d9b2804f..c17978e8d1d 100644 --- a/src/io/iomap.cpp +++ b/src/io/iomap.cpp @@ -14,27 +14,27 @@ #include "io/filestream.hpp" /* - OTBM_ROOTV1 - | - |--- OTBM_MAP_DATA - | | - | |--- OTBM_TILE_AREA - | | |--- OTBM_TILE - | | |--- OTBM_TILE_SQUARE (not implemented) - | | |--- OTBM_TILE_REF (not implemented) - | | |--- OTBM_HOUSETILE - | | - | |--- OTBM_SPAWNS (not implemented) - | | |--- OTBM_SPAWN_AREA (not implemented) - | | |--- OTBM_MONSTER (not implemented) - | | - | |--- OTBM_TOWNS - | | |--- OTBM_TOWN - | | - | |--- OTBM_WAYPOINTS - | |--- OTBM_WAYPOINT - | - |--- OTBM_ITEM_DEF (not implemented) + OTBM_ROOTV1 + | + |--- OTBM_MAP_DATA + | | + | |--- OTBM_TILE_AREA + | | |--- OTBM_TILE + | | |--- OTBM_TILE_SQUARE (not implemented) + | | |--- OTBM_TILE_REF (not implemented) + | | |--- OTBM_HOUSETILE + | | + | |--- OTBM_SPAWNS (not implemented) + | | |--- OTBM_SPAWN_AREA (not implemented) + | | |--- OTBM_MONSTER (not implemented) + | | + | |--- OTBM_TOWNS + | | |--- OTBM_TOWN + | | + | |--- OTBM_WAYPOINTS + | |--- OTBM_WAYPOINT + | + |--- OTBM_ITEM_DEF (not implemented) */ void IOMap::loadMap(Map* map, const Position &pos) { @@ -170,9 +170,9 @@ void IOMap::parseTileArea(FileStream &stream, Map &map, const Position &pos) { if (tile->isHouse() && iType.movable) { g_logger().warn("[IOMap::loadMap] - " - "Movable item with ID: {}, in house: {}, " - "at position: x {}, y {}, z {}", - id, tile->houseId, x, y, z); + "Movable item with ID: {}, in house: {}, " + "at position: x {}, y {}, z {}", + id, tile->houseId, x, y, z); } else if (iType.isGroundTile()) { tile->ground = map.tryReplaceItemFromCache(item); } else { @@ -200,9 +200,9 @@ void IOMap::parseTileArea(FileStream &stream, Map &map, const Position &pos) { // nothing } else if (tile->isHouse() && iType.movable) { g_logger().warn("[IOMap::loadMap] - " - "Movable item with ID: {}, in house: {}, " - "at position: x {}, y {}, z {}", - id, tile->houseId, x, y, z); + "Movable item with ID: {}, in house: {}, " + "at position: x {}, y {}, z {}", + id, tile->houseId, x, y, z); } else if (iType.isGroundTile()) { tile->ground = map.tryReplaceItemFromCache(item); } else { diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 642423c2abd..6b2816355ff 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -73,7 +73,7 @@ void PreySlot::reloadMonsterGrid(std::vector blackList, uint32_t level uint8_t stageThree; uint8_t stageFour; if (auto levelStage = static_cast(std::floor(level / 100)); - levelStage == 0) { // From level 0 to 99 + levelStage == 0) { // From level 0 to 99 stageOne = 3; stageTwo = 3; stageThree = 2; @@ -154,7 +154,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector blackList, uint32_ uint8_t stageThree; uint8_t stageFour; if (auto levelStage = static_cast(std::floor(level / 100)); - levelStage == 0) { // From level 0 to 99 + levelStage == 0) { // From level 0 to 99 stageOne = 3; stageTwo = 3; stageThree = 2; @@ -253,7 +253,7 @@ void IOPrey::checkPlayerPreys(std::shared_ptr player, uint8_t amount) co for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { if (const auto &slot = player->getPreySlotById(static_cast(slotId)); - slot && slot->isOccupied()) { + slot && slot->isOccupied()) { if (slot->bonusTimeLeft <= amount) { if (slot->option == PreyOption_AutomaticReroll) { if (player->usePreyCards(static_cast(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE, __FUNCTION__)))) { diff --git a/src/items/decay/decay.cpp b/src/items/decay/decay.cpp index 848acffbf68..5eaff61a7a9 100644 --- a/src/items/decay/decay.cpp +++ b/src/items/decay/decay.cpp @@ -156,8 +156,8 @@ void Decay::internalDecayItem(std::shared_ptr item) { auto player = item->getHoldingPlayer(); if (player) { g_logger().error("[{}] - internalDecayItem failed to player {}, item id is same from transform equip/deequip, " - " item id: {}, equip to id: '{}', deequip to id '{}'", - __FUNCTION__, player->getName(), it.id, it.transformEquipTo, it.transformDeEquipTo); + " item id: {}, equip to id: '{}', deequip to id '{}'", + __FUNCTION__, player->getName(), it.id, it.transformEquipTo, it.transformDeEquipTo); } return; } @@ -207,8 +207,8 @@ void Decay::internalDecayItem(std::shared_ptr item) { ReturnValue ret = g_game().internalRemoveItem(item); if (ret != RETURNVALUE_NOERROR) { g_logger().error("[Decay::internalDecayItem] - internalDecayItem failed, " - "error code: {}, item id: {}", - static_cast(ret), item->getID()); + "error code: {}, item id: {}", + static_cast(ret), item->getID()); } } } diff --git a/src/items/functions/item/item_parse.cpp b/src/items/functions/item/item_parse.cpp index 1f247b611bc..9b63b9aee0e 100644 --- a/src/items/functions/item/item_parse.cpp +++ b/src/items/functions/item/item_parse.cpp @@ -400,7 +400,7 @@ void ItemParse::parseTransform(const std::string &tmpStrValue, pugi::xml_attribu itemType.decayTo = 0; } if (ItemType &transform = Item::items.getItemType(itemType.transformEquipTo); - transform.type == ITEM_TYPE_NONE) { + transform.type == ITEM_TYPE_NONE) { transform.type = itemType.type; } } else if (stringValue == "transformdeequipto") { @@ -1140,7 +1140,7 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri token.erase(std::find_if(token.rbegin(), token.rend(), [](unsigned char ch) { return !std::isspace(ch); }).base(), - token.end()); + token.end()); std::string v1; bool showInDescription = false; diff --git a/src/items/item.cpp b/src/items/item.cpp index 823eb13b393..dd2d5c965a6 100644 --- a/src/items/item.cpp +++ b/src/items/item.cpp @@ -132,7 +132,7 @@ bool Item::hasImbuementCategoryId(uint16_t categoryId) const { ImbuementInfo imbuementInfo; if (getImbuementInfo(slotid, &imbuementInfo)) { if (const CategoryImbuement* categoryImbuement = g_imbuements().getCategoryByID(imbuementInfo.imbuement->getCategory()); - categoryImbuement->id == categoryId) { + categoryImbuement->id == categoryId) { return true; } } @@ -142,14 +142,14 @@ bool Item::hasImbuementCategoryId(uint16_t categoryId) const { std::shared_ptr Item::CreateItemAsContainer(const uint16_t type, uint16_t size) { if (const ItemType &it = Item::items[type]; - it.id == 0 - || it.stackable - || it.multiUse - || it.movable - || it.pickupable - || it.isDepot() - || it.isSplash() - || it.isDoor()) { + it.id == 0 + || it.stackable + || it.multiUse + || it.movable + || it.pickupable + || it.isDepot() + || it.isSplash() + || it.isDoor()) { return nullptr; } @@ -883,7 +883,7 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { } if (const std::string &text = getString(ItemAttribute_t::TEXT); - !text.empty()) { + !text.empty()) { propWriteStream.write(ATTR_TEXT); propWriteStream.writeString(text); } @@ -911,7 +911,7 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { } if (auto decayState = getDecaying(); - decayState == DECAYING_TRUE || decayState == DECAYING_PENDING) { + decayState == DECAYING_TRUE || decayState == DECAYING_PENDING) { propWriteStream.write(ATTR_DECAYING_STATE); propWriteStream.write(decayState); } @@ -1166,7 +1166,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr item /*= nullptr separator = true; } if (int32_t hitChance = item->getHitChance(); - hitChance != 0) { + hitChance != 0) { if (separator) { ss << ", "; } @@ -1174,7 +1174,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr item /*= nullptr separator = true; } if (int32_t shootRange = item->getShootRange(); - shootRange != 0) { + shootRange != 0) { if (separator) { ss << ", "; } @@ -1579,7 +1579,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr item /*= nullptr separator = true; } if (int32_t hitChance = it.hitChance; - hitChance != 0) { + hitChance != 0) { if (separator) { ss << ", "; } @@ -1587,7 +1587,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr item /*= nullptr separator = true; } if (int32_t shootRange = it.shootRange; - shootRange != 0) { + shootRange != 0) { if (separator) { ss << ", "; } @@ -1950,7 +1950,7 @@ SoundEffect_t Item::getMovementSound(std::shared_ptr toCylinder) const } if (std::shared_ptr toContainer = toCylinder->getContainer(); - toContainer && toContainer->getHoldingPlayer()) { + toContainer && toContainer->getHoldingPlayer()) { return SoundEffect_t::ITEM_MOVE_BACKPACK; } diff --git a/src/items/items.cpp b/src/items/items.cpp index 7d8ff0cf7c0..2d4020c5416 100644 --- a/src/items/items.cpp +++ b/src/items/items.cpp @@ -260,8 +260,8 @@ bool Items::loadFromXml() { auto toIdAttribute = itemNode.attribute("toid"); if (!toIdAttribute) { g_logger().warn("[Items::loadFromXml] - " - "tag fromid: {} without toid", - fromIdAttribute.value()); + "tag fromid: {} without toid", + fromIdAttribute.value()); continue; } @@ -302,12 +302,12 @@ void Items::parseItemNode(const pugi::xml_node &itemNode, uint16_t id) { } if (std::string xmlName = itemNode.attribute("name").as_string(); - !xmlName.empty() && itemType.name != xmlName) { + !xmlName.empty() && itemType.name != xmlName) { if (!itemType.name.empty()) { if (auto it = std::find_if(nameToItems.begin(), nameToItems.end(), [id](const auto nameMapIt) { return nameMapIt.second == id; }); - it != nameToItems.end()) { + it != nameToItems.end()) { nameToItems.erase(it); } } diff --git a/src/items/tile.cpp b/src/items/tile.cpp index f2006f627e1..fc16dd5799c 100644 --- a/src/items/tile.cpp +++ b/src/items/tile.cpp @@ -393,7 +393,7 @@ void Tile::onAddTileItem(std::shared_ptr item) { } if ((!hasFlag(TILESTATE_PROTECTIONZONE) || g_configManager().getBoolean(CLEAN_PROTECTION_ZONES, __FUNCTION__)) - && item->isCleanable()) { + && item->isCleanable()) { if (!this->getHouse()) { g_game().addTileToClean(static_self_cast()); } diff --git a/src/items/weapons/weapons.cpp b/src/items/weapons/weapons.cpp index 6c0d56d882e..69d20d43e06 100644 --- a/src/items/weapons/weapons.cpp +++ b/src/items/weapons/weapons.cpp @@ -360,8 +360,8 @@ bool Weapon::executeUseWeapon(std::shared_ptr player, const LuaVariant & if (!getScriptInterface()->reserveScriptEnv()) { std::string playerName = player ? player->getName() : "Player nullptr"; g_logger().error("[Weapon::executeUseWeapon - Player {} weaponId {}]" - "Call stack overflow. Too many lua script calls being nested.", - playerName, getID()); + "Call stack overflow. Too many lua script calls being nested.", + playerName, getID()); return false; } diff --git a/src/lua/callbacks/event_callback.cpp b/src/lua/callbacks/event_callback.cpp index d2b88c30f3a..38e7654d8d5 100644 --- a/src/lua/callbacks/event_callback.cpp +++ b/src/lua/callbacks/event_callback.cpp @@ -50,8 +50,8 @@ void EventCallback::setType(EventCallback_t type) { bool EventCallback::creatureOnChangeOutfit(std::shared_ptr creature, const Outfit_t &outfit) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnChangeOutfit - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return false; } @@ -72,9 +72,9 @@ bool EventCallback::creatureOnChangeOutfit(std::shared_ptr creature, c ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr creature, std::shared_ptr tile, bool aggressive) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnAreaCombat - " - "Creature {} on tile position {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), tile->getPosition().toString()); + "Creature {} on tile position {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), tile->getPosition().toString()); return RETURNVALUE_NOTPOSSIBLE; } @@ -112,9 +112,9 @@ ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr creatu ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr creature, std::shared_ptr target) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnTargetCombat - " - "Creature {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), target->getName()); + "Creature {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), target->getName()); return RETURNVALUE_NOTPOSSIBLE; } @@ -150,9 +150,9 @@ ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr crea void EventCallback::creatureOnHear(std::shared_ptr creature, std::shared_ptr speaker, const std::string &words, SpeakClasses type) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnHear - " - "Creature {} speaker {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), speaker->getName()); + "Creature {} speaker {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), speaker->getName()); return; } @@ -177,9 +177,9 @@ void EventCallback::creatureOnHear(std::shared_ptr creature, std::shar void EventCallback::creatureOnDrainHealth(std::shared_ptr creature, std::shared_ptr attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnDrainHealth - " - "Creature {} attacker {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), attacker->getName()); + "Creature {} attacker {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), attacker->getName()); return; } @@ -229,9 +229,9 @@ void EventCallback::creatureOnDrainHealth(std::shared_ptr creature, st bool EventCallback::partyOnJoin(std::shared_ptr party, std::shared_ptr player) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnJoin - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -253,9 +253,9 @@ bool EventCallback::partyOnJoin(std::shared_ptr party, std::shared_ptr party, std::shared_ptr player) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnLeave - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -277,8 +277,8 @@ bool EventCallback::partyOnLeave(std::shared_ptr party, std::shared_ptr

party) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnDisband - Party leader {}] Call stack " - "overflow. Too many lua script calls being nested.", - party->getLeader() ? party->getLeader()->getName() : "unknown"); + "overflow. Too many lua script calls being nested.", + party->getLeader() ? party->getLeader()->getName() : "unknown"); return false; } @@ -325,9 +325,9 @@ void EventCallback::partyOnShareExperience(std::shared_ptr party, uint64_ bool EventCallback::playerOnBrowseField(std::shared_ptr player, const Position &position) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnBrowseField - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -348,9 +348,9 @@ bool EventCallback::playerOnBrowseField(std::shared_ptr player, const Po void EventCallback::playerOnLook(std::shared_ptr player, const Position &position, std::shared_ptr thing, uint8_t stackpos, int32_t lookDistance) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLook - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -382,9 +382,9 @@ void EventCallback::playerOnLook(std::shared_ptr player, const Position void EventCallback::playerOnLookInBattleList(std::shared_ptr player, std::shared_ptr creature, int32_t lookDistance) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInBattleList - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -408,9 +408,9 @@ void EventCallback::playerOnLookInBattleList(std::shared_ptr player, std void EventCallback::playerOnLookInTrade(std::shared_ptr player, std::shared_ptr partner, std::shared_ptr item, int32_t lookDistance) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInTrade - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -437,9 +437,9 @@ void EventCallback::playerOnLookInTrade(std::shared_ptr player, std::sha bool EventCallback::playerOnLookInShop(std::shared_ptr player, const ItemType* itemType, uint8_t count) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInShop - " - "Player {} itemType {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), itemType->getPluralName()); + "Player {} itemType {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), itemType->getPluralName()); return false; } @@ -463,9 +463,9 @@ bool EventCallback::playerOnLookInShop(std::shared_ptr player, const Ite void EventCallback::playerOnRemoveCount(std::shared_ptr player, std::shared_ptr item) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnMove - " - "Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Player {} item {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return; } @@ -492,8 +492,8 @@ bool EventCallback::playerOnMoveItem(std::shared_ptr player, std::shared if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[Action::executeUse - Player {}, on item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return false; } @@ -522,9 +522,9 @@ bool EventCallback::playerOnMoveItem(std::shared_ptr player, std::shared void EventCallback::playerOnItemMoved(std::shared_ptr player, std::shared_ptr item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr fromCylinder, std::shared_ptr toCylinder) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnItemMoved - " - "Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Player {} item {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return; } @@ -553,9 +553,9 @@ void EventCallback::playerOnItemMoved(std::shared_ptr player, std::share void EventCallback::playerOnChangeZone(std::shared_ptr player, ZoneType_t zone) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnChangeZone - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -575,9 +575,9 @@ void EventCallback::playerOnChangeZone(std::shared_ptr player, ZoneType_ bool EventCallback::playerOnMoveCreature(std::shared_ptr player, std::shared_ptr creature, const Position &fromPosition, const Position &toPosition) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnMoveCreature - " - "Player {} creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), creature->getName()); + "Player {} creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), creature->getName()); return false; } @@ -602,9 +602,9 @@ bool EventCallback::playerOnMoveCreature(std::shared_ptr player, std::sh void EventCallback::playerOnReportRuleViolation(std::shared_ptr player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnReportRuleViolation - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -631,9 +631,9 @@ void EventCallback::playerOnReportRuleViolation(std::shared_ptr player, void EventCallback::playerOnReportBug(std::shared_ptr player, const std::string &message, const Position &position, uint8_t category) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnReportBug - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -656,9 +656,9 @@ void EventCallback::playerOnReportBug(std::shared_ptr player, const std: bool EventCallback::playerOnTurn(std::shared_ptr player, Direction direction) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTurn - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -679,9 +679,9 @@ bool EventCallback::playerOnTurn(std::shared_ptr player, Direction direc bool EventCallback::playerOnTradeRequest(std::shared_ptr player, std::shared_ptr target, std::shared_ptr item) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTradeRequest - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return false; } @@ -706,9 +706,9 @@ bool EventCallback::playerOnTradeRequest(std::shared_ptr player, std::sh bool EventCallback::playerOnTradeAccept(std::shared_ptr player, std::shared_ptr target, std::shared_ptr item, std::shared_ptr targetItem) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTradeAccept - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return false; } @@ -736,9 +736,9 @@ bool EventCallback::playerOnTradeAccept(std::shared_ptr player, std::sha void EventCallback::playerOnGainExperience(std::shared_ptr player, std::shared_ptr target, uint64_t &exp, uint64_t rawExp) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnGainExperience - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return; } @@ -774,9 +774,9 @@ void EventCallback::playerOnGainExperience(std::shared_ptr player, std:: void EventCallback::playerOnLoseExperience(std::shared_ptr player, uint64_t &exp) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLoseExperience - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -804,9 +804,9 @@ void EventCallback::playerOnLoseExperience(std::shared_ptr player, uint6 void EventCallback::playerOnGainSkillTries(std::shared_ptr player, skills_t skill, uint64_t &tries) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnGainSkillTries - " - "Player {} skill {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), fmt::underlying(skill)); + "Player {} skill {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), fmt::underlying(skill)); return; } @@ -835,9 +835,9 @@ void EventCallback::playerOnGainSkillTries(std::shared_ptr player, skill void EventCallback::playerOnCombat(std::shared_ptr player, std::shared_ptr target, std::shared_ptr item, CombatDamage &damage) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnCombat - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return; } @@ -880,7 +880,7 @@ void EventCallback::playerOnCombat(std::shared_ptr player, std::shared_p damage.secondary.value = -damage.secondary.value; } /* - Only EK with dealing physical damage will get elemental damage on skill + Only EK with dealing physical damage will get elemental damage on skill */ if (damage.origin == ORIGIN_SPELL) { if (player->getVocationId() != 4 && player->getVocationId() != 8) { @@ -897,9 +897,9 @@ void EventCallback::playerOnCombat(std::shared_ptr player, std::shared_p void EventCallback::playerOnRequestQuestLog(std::shared_ptr player) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnRequestQuestLog - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -918,9 +918,9 @@ void EventCallback::playerOnRequestQuestLog(std::shared_ptr player) cons void EventCallback::playerOnRequestQuestLine(std::shared_ptr player, uint16_t questId) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnRequestQuestLine - " - "Player {} questId {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), questId); + "Player {} questId {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), questId); return; } @@ -988,9 +988,9 @@ bool EventCallback::playerOnRotateItem(std::shared_ptr player, std::shar void EventCallback::playerOnWalk(std::shared_ptr player, Direction &dir) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::eventOnWalk - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -1011,9 +1011,9 @@ void EventCallback::playerOnWalk(std::shared_ptr player, Direction &dir) void EventCallback::playerOnStorageUpdate(std::shared_ptr player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::eventOnStorageUpdate - " - "Player {} key {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), key); + "Player {} key {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), key); return; } @@ -1038,9 +1038,9 @@ void EventCallback::playerOnStorageUpdate(std::shared_ptr player, const void EventCallback::monsterOnDropLoot(std::shared_ptr monster, std::shared_ptr corpse) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::monsterOnDropLoot - " - "Monster corpse {}] " - "Call stack overflow. Too many lua script calls being nested.", - corpse->getName()); + "Monster corpse {}] " + "Call stack overflow. Too many lua script calls being nested.", + corpse->getName()); return; } @@ -1062,9 +1062,9 @@ void EventCallback::monsterOnDropLoot(std::shared_ptr monster, std::sha void EventCallback::monsterPostDropLoot(std::shared_ptr monster, std::shared_ptr corpse) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::monsterPostDropLoot - " - "Monster corpse {}] " - "Call stack overflow. Too many lua script calls being nested.", - corpse->getName()); + "Monster corpse {}] " + "Call stack overflow. Too many lua script calls being nested.", + corpse->getName()); return; } @@ -1086,9 +1086,9 @@ void EventCallback::monsterPostDropLoot(std::shared_ptr monster, std::s void EventCallback::monsterOnSpawn(std::shared_ptr monster, const Position &position) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("{} - " - "Position {}" - ". Call stack overflow. Too many lua script calls being nested.", - __FUNCTION__, position.toString()); + "Position {}" + ". Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, position.toString()); return; } @@ -1115,9 +1115,9 @@ void EventCallback::monsterOnSpawn(std::shared_ptr monster, const Posit void EventCallback::npcOnSpawn(std::shared_ptr npc, const Position &position) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("{} - " - "Position {}" - ". Call stack overflow. Too many lua script calls being nested.", - __FUNCTION__, position.toString()); + "Position {}" + ". Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, position.toString()); return; } @@ -1143,9 +1143,9 @@ void EventCallback::npcOnSpawn(std::shared_ptr npc, const Position &positio bool EventCallback::zoneBeforeCreatureEnter(std::shared_ptr zone, std::shared_ptr creature) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::zoneBeforeCreatureEnter - " - "Zone {} Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - zone->getName(), creature->getName()); + "Zone {} Creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + zone->getName(), creature->getName()); return false; } @@ -1167,9 +1167,9 @@ bool EventCallback::zoneBeforeCreatureEnter(std::shared_ptr zone, std::sha bool EventCallback::zoneBeforeCreatureLeave(std::shared_ptr zone, std::shared_ptr creature) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::zoneBeforeCreatureLeave - " - "Zone {} Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - zone->getName(), creature->getName()); + "Zone {} Creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + zone->getName(), creature->getName()); return false; } @@ -1191,9 +1191,9 @@ bool EventCallback::zoneBeforeCreatureLeave(std::shared_ptr zone, std::sha void EventCallback::zoneAfterCreatureEnter(std::shared_ptr zone, std::shared_ptr creature) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::zoneAfterCreatureEnter - " - "Zone {} Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - zone->getName(), creature->getName()); + "Zone {} Creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + zone->getName(), creature->getName()); return; } @@ -1215,9 +1215,9 @@ void EventCallback::zoneAfterCreatureEnter(std::shared_ptr zone, std::shar void EventCallback::zoneAfterCreatureLeave(std::shared_ptr zone, std::shared_ptr creature) const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[EventCallback::zoneAfterCreatureLeave - " - "Zone {} Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - zone->getName(), creature->getName()); + "Zone {} Creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + zone->getName(), creature->getName()); return; } diff --git a/src/lua/creature/actions.cpp b/src/lua/creature/actions.cpp index 42f3e12c865..485509cae06 100644 --- a/src/lua/creature/actions.cpp +++ b/src/lua/creature/actions.cpp @@ -231,11 +231,11 @@ std::shared_ptr Actions::getAction(std::shared_ptr item) { } if (auto iteratePositions = actionPositionMap.find(item->getPosition()); - iteratePositions != actionPositionMap.end()) { + iteratePositions != actionPositionMap.end()) { if (std::shared_ptr tile = item->getTile(); - tile) { + tile) { if (std::shared_ptr player = item->getHoldingPlayer(); - player && item->getTopParent() == player) { + player && item->getTopParent() == player) { g_logger().debug("[Actions::getAction] - The position only is valid for use item in the map, player name {}", player->getName()); return nullptr; } @@ -515,8 +515,8 @@ bool Action::executeUse(std::shared_ptr player, std::shared_ptr it // onUse(player, item, fromPosition, target, toPosition, isHotkey) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[Action::executeUse - Player {}, on item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return false; } diff --git a/src/lua/creature/actions.hpp b/src/lua/creature/actions.hpp index 80fd2ea54e9..81a7754a5b1 100644 --- a/src/lua/creature/actions.hpp +++ b/src/lua/creature/actions.hpp @@ -161,7 +161,7 @@ class Actions final : public Scripts { private: bool hasPosition(Position position) const { if (auto it = actionPositionMap.find(position); - it != actionPositionMap.end()) { + it != actionPositionMap.end()) { return true; } return false; @@ -177,7 +177,7 @@ class Actions final : public Scripts { bool hasItemId(uint16_t itemId) const { if (auto it = useItemMap.find(itemId); - it != useItemMap.end()) { + it != useItemMap.end()) { return true; } return false; @@ -189,7 +189,7 @@ class Actions final : public Scripts { bool hasUniqueId(uint16_t uniqueId) const { if (auto it = uniqueItemMap.find(uniqueId); - it != uniqueItemMap.end()) { + it != uniqueItemMap.end()) { return true; } return false; @@ -201,7 +201,7 @@ class Actions final : public Scripts { bool hasActionId(uint16_t actionId) const { if (auto it = actionItemMap.find(actionId); - it != actionItemMap.end()) { + it != actionItemMap.end()) { return true; } return false; diff --git a/src/lua/creature/creatureevent.cpp b/src/lua/creature/creatureevent.cpp index fe2a782b914..09dbdf086ce 100644 --- a/src/lua/creature/creatureevent.cpp +++ b/src/lua/creature/creatureevent.cpp @@ -173,8 +173,8 @@ bool CreatureEvent::executeOnLogin(std::shared_ptr player) const { // onLogin(player) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnLogin - Player {} event {}]" - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -193,8 +193,8 @@ bool CreatureEvent::executeOnLogout(std::shared_ptr player) const { // onLogout(player) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnLogout - Player {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -213,8 +213,8 @@ bool CreatureEvent::executeOnThink(std::shared_ptr creature, uint32_t // onThink(creature, interval) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnThink - Creature {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), getName()); return false; } @@ -235,8 +235,8 @@ bool CreatureEvent::executeOnPrepareDeath(std::shared_ptr creature, st // onPrepareDeath(creature, killer) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnPrepareDeath - Creature {} killer {}" - " event {}] Call stack overflow. Too many lua script calls being nested.", - creature->getName(), killer->getName(), getName()); + " event {}] Call stack overflow. Too many lua script calls being nested.", + creature->getName(), killer->getName(), getName()); return false; } @@ -264,8 +264,8 @@ bool CreatureEvent::executeOnDeath(std::shared_ptr creature, std::shar // onDeath(creature, corpse, lasthitkiller, mostdamagekiller, lasthitunjustified, mostdamageunjustified) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnDeath - Creature {} killer {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), killer->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), killer->getName(), getName()); return false; } @@ -304,8 +304,8 @@ bool CreatureEvent::executeAdvance(std::shared_ptr player, skills_t skil // onAdvance(player, skill, oldLevel, newLevel) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeAdvance - Player {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -330,12 +330,12 @@ bool CreatureEvent::executeAdvance(std::shared_ptr player, skills_t skil void CreatureEvent::executeOnKill(std::shared_ptr creature, std::shared_ptr target, bool lastHit) const { // onKill(creature, target, lastHit) g_logger().warn("[CreatureEvent::executeOnKill - Creature {} target {} event {}] " - "Deprecated use of onKill event. Use registered onDeath events instead for better performance.", - creature->getName(), target->getName(), getName()); + "Deprecated use of onKill event. Use registered onDeath events instead for better performance.", + creature->getName(), target->getName(), getName()); if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnKill - Creature {} target {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), target->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), target->getName(), getName()); return; } @@ -357,9 +357,9 @@ void CreatureEvent::executeModalWindow(std::shared_ptr player, uint32_t // onModalWindow(player, modalWindowId, buttonId, choiceId) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeModalWindow - " - "Player {} modaw window id {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), modalWindowId, getName()); + "Player {} modaw window id {} event {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), modalWindowId, getName()); return; } @@ -383,8 +383,8 @@ bool CreatureEvent::executeTextEdit(std::shared_ptr player, std::shared_ // onTextEdit(player, item, text) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeTextEdit - Player {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return false; } @@ -407,9 +407,9 @@ void CreatureEvent::executeHealthChange(std::shared_ptr creature, std: // onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeHealthChange - " - "Creature {} attacker {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), attacker->getName(), getName()); + "Creature {} attacker {} event {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), attacker->getName(), getName()); return; } @@ -452,9 +452,9 @@ void CreatureEvent::executeManaChange(std::shared_ptr creature, std::s // onManaChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeManaChange - " - "Creature {} attacker {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), attacker->getName(), getName()); + "Creature {} attacker {} event {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), attacker->getName(), getName()); return; } @@ -492,9 +492,9 @@ void CreatureEvent::executeExtendedOpcode(std::shared_ptr player, uint8_ // onExtendedOpcode(player, opcode, buffer) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeExtendedOpcode - " - "Player {} event {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), getName()); + "Player {} event {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), getName()); return; } diff --git a/src/lua/creature/events.cpp b/src/lua/creature/events.cpp index 2917d128b8a..8bdd53465b3 100644 --- a/src/lua/creature/events.cpp +++ b/src/lua/creature/events.cpp @@ -158,9 +158,9 @@ void Events::eventMonsterOnSpawn(std::shared_ptr monster, const Positio if (!scriptInterface.reserveScriptEnv()) { g_logger().error("{} - " - "Position {}" - ". Call stack overflow. Too many lua script calls being nested.", - __FUNCTION__, position.toString()); + "Position {}" + ". Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, position.toString()); return; } @@ -192,9 +192,9 @@ void Events::eventNpcOnSpawn(std::shared_ptr npc, const Position &position) if (!scriptInterface.reserveScriptEnv()) { g_logger().error("{} - " - "Position {}" - ". Call stack overflow. Too many lua script calls being nested.", - __FUNCTION__, position.toString()); + "Position {}" + ". Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, position.toString()); return; } @@ -226,8 +226,8 @@ bool Events::eventCreatureOnChangeOutfit(std::shared_ptr creature, con if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnChangeOutfit - Creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName()); return false; } @@ -253,9 +253,9 @@ ReturnValue Events::eventCreatureOnAreaCombat(std::shared_ptr creature if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnAreaCombat - " - "Creature {} on tile position {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), tile->getPosition().toString()); + "Creature {} on tile position {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), tile->getPosition().toString()); return RETURNVALUE_NOTPOSSIBLE; } @@ -298,9 +298,9 @@ ReturnValue Events::eventCreatureOnTargetCombat(std::shared_ptr creatu if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnTargetCombat - " - "Creature {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), target->getName()); + "Creature {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), target->getName()); return RETURNVALUE_NOTPOSSIBLE; } @@ -341,9 +341,9 @@ void Events::eventCreatureOnHear(std::shared_ptr creature, std::shared if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnHear - " - "Creature {} speaker {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), speaker->getName()); + "Creature {} speaker {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), speaker->getName()); return; } @@ -372,9 +372,9 @@ void Events::eventCreatureOnDrainHealth(std::shared_ptr creature, std: if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnDrainHealth - " - "Creature {} attacker {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), attacker->getName()); + "Creature {} attacker {}] " + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), attacker->getName()); return; } @@ -429,9 +429,9 @@ bool Events::eventPartyOnJoin(std::shared_ptr party, std::shared_ptrgetName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -458,9 +458,9 @@ bool Events::eventPartyOnLeave(std::shared_ptr party, std::shared_ptrgetName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -487,8 +487,8 @@ bool Events::eventPartyOnDisband(std::shared_ptr party) { if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPartyOnDisband - Party leader {}] Call stack " - "overflow. Too many lua script calls being nested.", - party->getLeader() ? party->getLeader()->getName() : "unknown"); + "overflow. Too many lua script calls being nested.", + party->getLeader() ? party->getLeader()->getName() : "unknown"); return false; } @@ -545,9 +545,9 @@ bool Events::eventPlayerOnBrowseField(std::shared_ptr player, const Posi if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnBrowseField - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -573,9 +573,9 @@ void Events::eventPlayerOnLook(std::shared_ptr player, const Position &p if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLook - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -612,9 +612,9 @@ void Events::eventPlayerOnLookInBattleList(std::shared_ptr player, std:: if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInBattleList - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -643,9 +643,9 @@ void Events::eventPlayerOnLookInTrade(std::shared_ptr player, std::share if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInTrade - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -677,9 +677,9 @@ bool Events::eventPlayerOnLookInShop(std::shared_ptr player, const ItemT if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInShop - " - "Player {} itemType {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), itemType->getPluralName()); + "Player {} itemType {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), itemType->getPluralName()); return false; } @@ -708,9 +708,9 @@ bool Events::eventPlayerOnRemoveCount(std::shared_ptr player, std::share if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMove - " - "Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Player {} item {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return false; } @@ -737,9 +737,9 @@ bool Events::eventPlayerOnMoveItem(std::shared_ptr player, std::shared_p if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMoveItem - " - "Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Player {} item {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return false; } @@ -773,9 +773,9 @@ void Events::eventPlayerOnItemMoved(std::shared_ptr player, std::shared_ if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnItemMoved - " - "Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Player {} item {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return; } @@ -809,9 +809,9 @@ void Events::eventPlayerOnChangeZone(std::shared_ptr player, ZoneType_t if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnChangeZone - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -836,9 +836,9 @@ bool Events::eventPlayerOnMoveCreature(std::shared_ptr player, std::shar if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMoveCreature - " - "Player {} creature {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), creature->getName()); + "Player {} creature {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), creature->getName()); return false; } @@ -868,9 +868,9 @@ void Events::eventPlayerOnReportRuleViolation(std::shared_ptr player, co if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnReportRuleViolation - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -902,9 +902,9 @@ bool Events::eventPlayerOnReportBug(std::shared_ptr player, const std::s if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnReportBug - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -932,9 +932,9 @@ bool Events::eventPlayerOnTurn(std::shared_ptr player, Direction directi if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTurn - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return false; } @@ -960,9 +960,9 @@ bool Events::eventPlayerOnTradeRequest(std::shared_ptr player, std::shar if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTradeRequest - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return false; } @@ -992,9 +992,9 @@ bool Events::eventPlayerOnTradeAccept(std::shared_ptr player, std::share if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTradeAccept - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return false; } @@ -1028,9 +1028,9 @@ void Events::eventPlayerOnGainExperience(std::shared_ptr player, std::sh if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnGainExperience - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return; } @@ -1071,9 +1071,9 @@ void Events::eventPlayerOnLoseExperience(std::shared_ptr player, uint64_ if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLoseExperience - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -1106,9 +1106,9 @@ void Events::eventPlayerOnGainSkillTries(std::shared_ptr player, skills_ if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnGainSkillTries - " - "Player {} skill {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), fmt::underlying(skill)); + "Player {} skill {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), fmt::underlying(skill)); return; } @@ -1142,9 +1142,9 @@ void Events::eventPlayerOnCombat(std::shared_ptr player, std::shared_ptr if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnCombat - " - "Player {} target {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), target->getName()); + "Player {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), target->getName()); return; } @@ -1199,9 +1199,9 @@ void Events::eventPlayerOnRequestQuestLog(std::shared_ptr player) { if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnRequestQuestLog - " - "Player {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName()); + "Player {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName()); return; } @@ -1225,9 +1225,9 @@ void Events::eventPlayerOnRequestQuestLine(std::shared_ptr player, uint1 if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnRequestQuestLine - " - "Player {} questId {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), questId); + "Player {} questId {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), questId); return; } @@ -1282,9 +1282,9 @@ void Events::eventOnStorageUpdate(std::shared_ptr player, const uint32_t if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventOnStorageUpdate - " - "Player {} key {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), key); + "Player {} key {}] " + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), key); return; } @@ -1314,9 +1314,9 @@ void Events::eventMonsterOnDropLoot(std::shared_ptr monster, std::share if (!scriptInterface.reserveScriptEnv()) { g_logger().error("[Events::eventMonsterOnDropLoot - " - "Monster corpse {}] " - "Call stack overflow. Too many lua script calls being nested.", - corpse->getName()); + "Monster corpse {}] " + "Call stack overflow. Too many lua script calls being nested.", + corpse->getName()); return; } diff --git a/src/lua/creature/movement.cpp b/src/lua/creature/movement.cpp index b302877b3d3..b75ff31c661 100644 --- a/src/lua/creature/movement.cpp +++ b/src/lua/creature/movement.cpp @@ -133,9 +133,9 @@ bool MoveEvents::registerLuaPositionEvent(const std::shared_ptr moveE bool MoveEvents::registerLuaEvent(const std::shared_ptr moveEvent) { // Check if event is correct if (registerLuaItemEvent(moveEvent) - || registerLuaUniqueEvent(moveEvent) - || registerLuaActionEvent(moveEvent) - || registerLuaPositionEvent(moveEvent)) { + || registerLuaUniqueEvent(moveEvent) + || registerLuaActionEvent(moveEvent) + || registerLuaPositionEvent(moveEvent)) { return true; } else { g_logger().warn( @@ -292,7 +292,7 @@ bool MoveEvents::registerEvent(const std::shared_ptr moveEvent, const std::shared_ptr MoveEvents::getEvent(const std::shared_ptr &tile, MoveEvent_t eventType) { if (auto it = positionsMap.find(tile->getPosition()); - it != positionsMap.end()) { + it != positionsMap.end()) { std::list> &moveEventList = it->second.moveEvent[eventType]; if (!moveEventList.empty()) { return *moveEventList.begin(); @@ -727,12 +727,12 @@ bool MoveEvent::executeStep(const std::shared_ptr &creature, std::shar if (!getScriptInterface()->reserveScriptEnv()) { if (item != nullptr) { g_logger().error("[MoveEvent::executeStep - Creature {} item {}, position {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), item->getName(), pos.toString()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), item->getName(), pos.toString()); } else { g_logger().error("[MoveEvent::executeStep - Creature {}, position {}] " - "Call stack overflow. Too many lua script calls being nested.", - creature->getName(), pos.toString()); + "Call stack overflow. Too many lua script calls being nested.", + creature->getName(), pos.toString()); } return false; } @@ -770,8 +770,8 @@ bool MoveEvent::executeEquip(const std::shared_ptr &player, const std::s // onDeEquip(player, item, slot, isCheck) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[MoveEvent::executeEquip - Player {} item {}] " - "Call stack overflow. Too many lua script calls being nested.", - player->getName(), item->getName()); + "Call stack overflow. Too many lua script calls being nested.", + player->getName(), item->getName()); return false; } @@ -803,9 +803,9 @@ bool MoveEvent::executeAddRemItem(const std::shared_ptr &item, const std:: // onRemoveItem(moveitem, tileitem, pos) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[MoveEvent::executeAddRemItem - " - "Item {} item on tile x: {} y: {} z: {}] " - "Call stack overflow. Too many lua script calls being nested.", - item->getName(), pos.getX(), pos.getY(), pos.getZ()); + "Item {} item on tile x: {} y: {} z: {}] " + "Call stack overflow. Too many lua script calls being nested.", + item->getName(), pos.getX(), pos.getY(), pos.getZ()); return false; } @@ -835,9 +835,9 @@ bool MoveEvent::executeAddRemItem(const std::shared_ptr &item, const Posit // onRemoveItem(moveitem, pos) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[MoveEvent::executeAddRemItem - " - "Item {} item on tile x: {} y: {} z: {}] " - "Call stack overflow. Too many lua script calls being nested.", - item->getName(), pos.getX(), pos.getY(), pos.getZ()); + "Item {} item on tile x: {} y: {} z: {}] " + "Call stack overflow. Too many lua script calls being nested.", + item->getName(), pos.getX(), pos.getY(), pos.getZ()); return false; } diff --git a/src/lua/creature/movement.hpp b/src/lua/creature/movement.hpp index 4ce4297b0f5..b8168f58521 100644 --- a/src/lua/creature/movement.hpp +++ b/src/lua/creature/movement.hpp @@ -47,7 +47,7 @@ class MoveEvents final : public Scripts { bool hasPosition(Position position) const { if (auto it = positionsMap.find(position); - it != positionsMap.end()) { + it != positionsMap.end()) { return true; } return false; @@ -63,7 +63,7 @@ class MoveEvents final : public Scripts { bool hasItemId(int32_t itemId) const { if (auto it = itemIdMap.find(itemId); - it != itemIdMap.end()) { + it != itemIdMap.end()) { return true; } return false; @@ -79,7 +79,7 @@ class MoveEvents final : public Scripts { bool hasUniqueId(int32_t uniqueId) const { if (auto it = uniqueIdMap.find(uniqueId); - it != uniqueIdMap.end()) { + it != uniqueIdMap.end()) { return true; } return false; @@ -95,7 +95,7 @@ class MoveEvents final : public Scripts { bool hasActionId(int32_t actionId) const { if (auto it = actionIdMap.find(actionId); - it != actionIdMap.end()) { + it != actionIdMap.end()) { return true; } return false; diff --git a/src/lua/creature/raids.cpp b/src/lua/creature/raids.cpp index a4500d126ba..8064bf52b81 100644 --- a/src/lua/creature/raids.cpp +++ b/src/lua/creature/raids.cpp @@ -52,16 +52,16 @@ bool Raids::loadFromXml() { ss << "raids/" << name << ".xml"; file = ss.str(); g_logger().warn("{} - " - "'file' tag missing for raid: {} using default: {}", - __FUNCTION__, name, file); + "'file' tag missing for raid: {} using default: {}", + __FUNCTION__, name, file); } interval = pugi::cast(raidNode.attribute("interval2").value()) * 60; if (interval == 0) { g_logger().error("{} - " - "'interval2' tag missing or zero " - "(would divide by 0) for raid: {}", - __FUNCTION__, name); + "'interval2' tag missing or zero " + "(would divide by 0) for raid: {}", + __FUNCTION__, name); continue; } @@ -69,8 +69,8 @@ bool Raids::loadFromXml() { margin = pugi::cast(attr.value()) * 60 * 1000; } else { g_logger().warn("{} - " - "'margin' tag missing for raid: {}", - __FUNCTION__, name); + "'margin' tag missing for raid: {}", + __FUNCTION__, name); margin = 0; } @@ -202,8 +202,8 @@ bool Raid::loadFromXml(const std::string &filename) { raidEvents.push_back(event); } else { g_logger().error("{} - " - "In file: {}, eventNode: {}", - __FUNCTION__, filename, eventNode.name()); + "In file: {}, eventNode: {}", + __FUNCTION__, filename, eventNode.name()); } } @@ -288,8 +288,8 @@ bool AnnounceEvent::configureRaidEvent(const pugi::xml_node &eventNode) { pugi::xml_attribute messageAttribute = eventNode.attribute("message"); if (!messageAttribute) { g_logger().error("{} - " - "'message' tag missing for announce event", - __FUNCTION__); + "'message' tag missing for announce event", + __FUNCTION__); return false; } message = messageAttribute.as_string(); @@ -311,16 +311,16 @@ bool AnnounceEvent::configureRaidEvent(const pugi::xml_node &eventNode) { messageType = MESSAGE_GAMEMASTER_CONSOLE; } else { g_logger().warn("{} - " - "Unknown type tag missing for announce event, " - "using default: {}", - __FUNCTION__, static_cast(messageType)); + "Unknown type tag missing for announce event, " + "using default: {}", + __FUNCTION__, static_cast(messageType)); } } else { messageType = MESSAGE_EVENT_ADVANCE; g_logger().warn("{} - " - "Type tag missing for announce event, " - "using default: {}", - __FUNCTION__, static_cast(messageType)); + "Type tag missing for announce event, " + "using default: {}", + __FUNCTION__, static_cast(messageType)); } return true; } @@ -341,8 +341,8 @@ bool SingleSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { monsterName = attr.as_string(); } else { g_logger().error("{} - " - "'Name' tag missing for singlespawn event", - __FUNCTION__); + "'Name' tag missing for singlespawn event", + __FUNCTION__); return false; } @@ -350,8 +350,8 @@ bool SingleSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { position.x = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'X' tag missing for singlespawn event", - __FUNCTION__); + "'X' tag missing for singlespawn event", + __FUNCTION__); return false; } @@ -359,8 +359,8 @@ bool SingleSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { position.y = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'Y' tag missing for singlespawn event", - __FUNCTION__); + "'Y' tag missing for singlespawn event", + __FUNCTION__); return false; } @@ -368,8 +368,8 @@ bool SingleSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { position.z = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'Z' tag missing for singlespawn event", - __FUNCTION__); + "'Z' tag missing for singlespawn event", + __FUNCTION__); return false; } return true; @@ -405,9 +405,9 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { centerPos.x = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "" - "'centerx' tag missing for areaspawn event", - __FUNCTION__); + "" + "'centerx' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -415,8 +415,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { centerPos.y = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'centery' tag missing for areaspawn event", - __FUNCTION__); + "'centery' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -424,8 +424,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { centerPos.z = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "centerz' tag missing for areaspawn event", - __FUNCTION__); + "centerz' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -441,8 +441,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { fromPos.x = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'fromx' tag missing for areaspawn event", - __FUNCTION__); + "'fromx' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -450,8 +450,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { fromPos.y = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'fromy' tag missing for areaspawn event", - __FUNCTION__); + "'fromy' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -459,8 +459,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { fromPos.z = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'fromz' tag missing for areaspawn event", - __FUNCTION__); + "'fromz' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -468,8 +468,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { toPos.x = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'tox' tag missing for areaspawn event", - __FUNCTION__); + "'tox' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -477,8 +477,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { toPos.y = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'toy' tag missing for areaspawn event", - __FUNCTION__); + "'toy' tag missing for areaspawn event", + __FUNCTION__); return false; } @@ -486,8 +486,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { toPos.z = pugi::cast(attr.value()); } else { g_logger().error("{} - " - "'toz' tag missing for areaspawn event", - __FUNCTION__); + "'toz' tag missing for areaspawn event", + __FUNCTION__); return false; } } @@ -499,8 +499,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { name = attr.value(); } else { g_logger().error("{} - " - "'name' tag missing for monster node", - __FUNCTION__); + "'name' tag missing for monster node", + __FUNCTION__); return false; } @@ -524,8 +524,8 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { maxAmount = minAmount; } else { g_logger().error("{} - " - "'amount' tag missing for monster node", - __FUNCTION__); + "'amount' tag missing for monster node", + __FUNCTION__); return false; } } @@ -570,8 +570,8 @@ bool ScriptEvent::configureRaidEvent(const pugi::xml_node &eventNode) { pugi::xml_attribute scriptAttribute = eventNode.attribute("script"); if (!scriptAttribute) { g_logger().error("{} - " - "No script file found for raid", - __FUNCTION__); + "No script file found for raid", + __FUNCTION__); return false; } @@ -595,8 +595,8 @@ bool ScriptEvent::executeEvent() { // onRaid() if (!scriptInterface->reserveScriptEnv()) { g_logger().error("{} - Script with name {} " - "Call stack overflow. Too many lua script calls being nested.", - __FUNCTION__, getScriptName()); + "Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, getScriptName()); return false; } diff --git a/src/lua/creature/talkaction.cpp b/src/lua/creature/talkaction.cpp index 3586bdbceea..c1b8c028ddc 100644 --- a/src/lua/creature/talkaction.cpp +++ b/src/lua/creature/talkaction.cpp @@ -83,8 +83,8 @@ bool TalkAction::executeSay(std::shared_ptr player, const std::string &w // onSay(player, words, param, type) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[TalkAction::executeSay - Player {} words {}] " - "Call stack overflow. Too many lua script calls being nested. Script name {}", - player->getName(), getWords(), getScriptInterface()->getLoadingScriptName()); + "Call stack overflow. Too many lua script calls being nested. Script name {}", + player->getName(), getWords(), getScriptInterface()->getLoadingScriptName()); return false; } diff --git a/src/lua/functions/core/game/game_functions.cpp b/src/lua/functions/core/game/game_functions.cpp index 4858b3ab264..ec5c5102794 100644 --- a/src/lua/functions/core/game/game_functions.cpp +++ b/src/lua/functions/core/game/game_functions.cpp @@ -728,8 +728,8 @@ int GameFunctions::luaGameGetDummies(lua_State* L) { * @details This function provides a table containing two sub-tables: one for free dummies and one for house (or premium) dummies. * @note usage on lua: - local dummies = Game.getDummies() - local rate = dummies[1] -- Retrieve dummy rate + local dummies = Game.getDummies() + local rate = dummies[1] -- Retrieve dummy rate */ const auto &dummies = Item::items.getDummys(); diff --git a/src/lua/functions/creatures/combat/spell_functions.cpp b/src/lua/functions/creatures/combat/spell_functions.cpp index 0bcf7c9c11a..a24407c1682 100644 --- a/src/lua/functions/creatures/combat/spell_functions.cpp +++ b/src/lua/functions/creatures/combat/spell_functions.cpp @@ -18,7 +18,7 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { // Spell(type) ex: Spell(SPELL_INSTANT) or Spell(SPELL_RUNE) to create a new spell if (lua_gettop(L) == 1) { g_logger().error("[SpellFunctions::luaSpellCreate] - " - "There is no parameter set!"); + "There is no parameter set!"); lua_pushnil(L); return 1; } @@ -209,16 +209,16 @@ int SpellFunctions::luaSpellGroup(lua_State* L) { spell->setGroup(group); } else { g_logger().warn("[SpellFunctions::luaSpellGroup] - " - "Unknown group: {}", - getString(L, 2)); + "Unknown group: {}", + getString(L, 2)); pushBoolean(L, false); return 1; } pushBoolean(L, true); } else { g_logger().warn("[SpellFunctions::luaSpellGroup] - " - "Unknown group: {}", - getString(L, 2)); + "Unknown group: {}", + getString(L, 2)); pushBoolean(L, false); return 1; } @@ -235,8 +235,8 @@ int SpellFunctions::luaSpellGroup(lua_State* L) { spell->setGroup(primaryGroup); } else { g_logger().warn("[SpellFunctions::luaSpellGroup] - " - "Unknown primaryGroup: {}", - getString(L, 2)); + "Unknown primaryGroup: {}", + getString(L, 2)); pushBoolean(L, false); return 1; } @@ -245,16 +245,16 @@ int SpellFunctions::luaSpellGroup(lua_State* L) { spell->setSecondaryGroup(secondaryGroup); } else { g_logger().warn("[SpellFunctions::luaSpellGroup] - " - "Unknown secondaryGroup: {}", - getString(L, 3)); + "Unknown secondaryGroup: {}", + getString(L, 3)); pushBoolean(L, false); return 1; } pushBoolean(L, true); } else { g_logger().warn("[SpellFunctions::luaSpellGroup] - " - "Unknown primaryGroup: {} or secondaryGroup: {}", - getString(L, 2), getString(L, 3)); + "Unknown primaryGroup: {} or secondaryGroup: {}", + getString(L, 2), getString(L, 3)); pushBoolean(L, false); return 1; } diff --git a/src/lua/functions/creatures/creature_functions.cpp b/src/lua/functions/creatures/creature_functions.cpp index 7a40cc426f1..4ae5da0e132 100644 --- a/src/lua/functions/creatures/creature_functions.cpp +++ b/src/lua/functions/creatures/creature_functions.cpp @@ -793,7 +793,7 @@ int CreatureFunctions::luaCreatureTeleportTo(lua_State* L) { const Position oldPosition = creature->getPosition(); if (auto ret = g_game().internalTeleport(creature, position, pushMovement); - ret != RETURNVALUE_NOERROR) { + ret != RETURNVALUE_NOERROR) { g_logger().debug("[{}] Failed to teleport creature {}, on position {}, error code: {}", __FUNCTION__, creature->getName(), oldPosition.toString(), getReturnMessage(ret)); pushBoolean(L, false); return 1; diff --git a/src/lua/functions/creatures/monster/loot_functions.cpp b/src/lua/functions/creatures/monster/loot_functions.cpp index 3fe3a188368..47e0d8778e3 100644 --- a/src/lua/functions/creatures/monster/loot_functions.cpp +++ b/src/lua/functions/creatures/monster/loot_functions.cpp @@ -29,7 +29,7 @@ int LootFunctions::luaLootSetId(lua_State* L) { pushBoolean(L, true); } else { g_logger().warn("[LootFunctions::luaLootSetId] - " - "Unknown loot item loot, int value expected"); + "Unknown loot item loot, int value expected"); lua_pushnil(L); } } else { @@ -47,16 +47,16 @@ int LootFunctions::luaLootSetIdFromName(lua_State* L) { if (ids.first == Item::items.nameToItems.cend()) { g_logger().warn("[LootFunctions::luaLootSetIdFromName] - " - "Unknown loot item {}", - name); + "Unknown loot item {}", + name); lua_pushnil(L); return 1; } if (std::next(ids.first) != ids.second) { g_logger().warn("[LootFunctions::luaLootSetIdFromName] - " - "Non-unique loot item {}", - name); + "Non-unique loot item {}", + name); lua_pushnil(L); return 1; } @@ -65,7 +65,7 @@ int LootFunctions::luaLootSetIdFromName(lua_State* L) { pushBoolean(L, true); } else { g_logger().warn("[LootFunctions::luaLootSetIdFromName] - " - "Unknown loot item loot, string value expected"); + "Unknown loot item loot, string value expected"); lua_pushnil(L); } return 1; diff --git a/src/lua/functions/creatures/monster/monster_type_functions.cpp b/src/lua/functions/creatures/monster/monster_type_functions.cpp index b937083fddb..ded7c2054db 100644 --- a/src/lua/functions/creatures/monster/monster_type_functions.cpp +++ b/src/lua/functions/creatures/monster/monster_type_functions.cpp @@ -681,8 +681,8 @@ int MonsterTypeFunctions::luaMonsterTypeCombatImmunities(lua_State* L) { combatType = COMBAT_NEUTRALDAMAGE; } else { g_logger().warn("[MonsterTypeFunctions::luaMonsterTypeCombatImmunities] - " - "Unknown immunity name {} for monster: {}", - immunity, monsterType->name); + "Unknown immunity name {} for monster: {}", + immunity, monsterType->name); lua_pushnil(L); } @@ -739,8 +739,8 @@ int MonsterTypeFunctions::luaMonsterTypeConditionImmunities(lua_State* L) { conditionType = CONDITION_BLEEDING; } else { g_logger().warn("[MonsterTypeFunctions::luaMonsterTypeConditionImmunities] - " - "Unknown immunity name: {} for monster: {}", - immunity, monsterType->name); + "Unknown immunity name: {} for monster: {}", + immunity, monsterType->name); lua_pushnil(L); } @@ -1195,8 +1195,8 @@ int MonsterTypeFunctions::luaMonsterTypeRace(lua_State* L) { monsterType->info.race = RACE_INK; } else { g_logger().warn("[MonsterTypeFunctions::luaMonsterTypeRace] - " - "Unknown race type {}", - race); + "Unknown race type {}", + race); lua_pushnil(L); return 1; } diff --git a/src/lua/functions/creatures/npc/shop_functions.cpp b/src/lua/functions/creatures/npc/shop_functions.cpp index ee848e0bf47..122e249a8db 100644 --- a/src/lua/functions/creatures/npc/shop_functions.cpp +++ b/src/lua/functions/creatures/npc/shop_functions.cpp @@ -28,7 +28,7 @@ int ShopFunctions::luaShopSetId(lua_State* L) { pushBoolean(L, true); } else { g_logger().warn("[ShopFunctions::luaShopSetId] - " - "Unknown shop item shop, int value expected"); + "Unknown shop item shop, int value expected"); lua_pushnil(L); } } else { @@ -46,16 +46,16 @@ int ShopFunctions::luaShopSetIdFromName(lua_State* L) { if (ids.first == Item::items.nameToItems.cend()) { g_logger().warn("[ShopFunctions::luaShopSetIdFromName] - " - "Unknown shop item {}", - name); + "Unknown shop item {}", + name); lua_pushnil(L); return 1; } if (std::next(ids.first) != ids.second) { g_logger().warn("[ShopFunctions::luaShopSetIdFromName] - " - "Non-unique shop item {}", - name); + "Non-unique shop item {}", + name); lua_pushnil(L); return 1; } @@ -64,7 +64,7 @@ int ShopFunctions::luaShopSetIdFromName(lua_State* L) { pushBoolean(L, true); } else { g_logger().warn("[ShopFunctions::luaShopSetIdFromName] - " - "Unknown shop item shop, string value expected"); + "Unknown shop item shop, string value expected"); lua_pushnil(L); } return 1; diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp index 5f14db6ea99..9cc5434abd5 100644 --- a/src/lua/functions/creatures/player/player_functions.cpp +++ b/src/lua/functions/creatures/player/player_functions.cpp @@ -407,7 +407,7 @@ int PlayerFunctions::luaPlayerGetPreyExperiencePercentage(lua_State* L) { // player:getPreyExperiencePercentage(raceId) if (std::shared_ptr player = getUserdataShared(L, 1)) { if (const std::unique_ptr &slot = player->getPreyWithMonster(getNumber(L, 2, 0)); - slot && slot->isOccupied() && slot->bonus == PreyBonus_Experience && slot->bonusTimeLeft > 0) { + slot && slot->isOccupied() && slot->bonus == PreyBonus_Experience && slot->bonusTimeLeft > 0) { lua_pushnumber(L, static_cast(100 + slot->bonusPercentage)); } else { lua_pushnumber(L, 100); @@ -457,7 +457,7 @@ int PlayerFunctions::luaPlayerGetPreyLootPercentage(lua_State* L) { // player:getPreyLootPercentage(raceid) if (std::shared_ptr player = getUserdataShared(L, 1)) { if (const std::unique_ptr &slot = player->getPreyWithMonster(getNumber(L, 2, 0)); - slot && slot->isOccupied() && slot->bonus == PreyBonus_Loot) { + slot && slot->isOccupied() && slot->bonus == PreyBonus_Loot) { lua_pushnumber(L, slot->bonusPercentage); } else { lua_pushnumber(L, 0); @@ -472,7 +472,7 @@ int PlayerFunctions::luaPlayerisMonsterPrey(lua_State* L) { // player:isMonsterPrey(raceid) if (std::shared_ptr player = getUserdataShared(L, 1)) { if (const std::unique_ptr &slot = player->getPreyWithMonster(getNumber(L, 2, 0)); - slot && slot->isOccupied()) { + slot && slot->isOccupied()) { pushBoolean(L, true); } else { pushBoolean(L, false); @@ -486,7 +486,7 @@ int PlayerFunctions::luaPlayerisMonsterPrey(lua_State* L) { int PlayerFunctions::luaPlayerPreyThirdSlot(lua_State* L) { // get: player:preyThirdSlot() set: player:preyThirdSlot(bool) if (std::shared_ptr player = getUserdataShared(L, 1); - const auto &slot = player->getPreySlotById(PreySlot_Three)) { + const auto &slot = player->getPreySlotById(PreySlot_Three)) { if (!slot) { lua_pushnil(L); } else if (lua_gettop(L) == 1) { @@ -513,7 +513,7 @@ int PlayerFunctions::luaPlayerPreyThirdSlot(lua_State* L) { int PlayerFunctions::luaPlayerTaskThirdSlot(lua_State* L) { // get: player:taskHuntingThirdSlot() set: player:taskHuntingThirdSlot(bool) if (std::shared_ptr player = getUserdataShared(L, 1); - const auto &slot = player->getTaskHuntingSlotById(PreySlot_Three)) { + const auto &slot = player->getTaskHuntingSlotById(PreySlot_Three)) { if (lua_gettop(L) == 1) { pushBoolean(L, slot->state != PreyTaskDataState_Locked); } else { @@ -3574,7 +3574,7 @@ int PlayerFunctions::luaPlayerBosstiaryCooldownTimer(lua_State* L) { int PlayerFunctions::luaPlayerGetBosstiaryLevel(lua_State* L) { // player:getBosstiaryLevel(name) if (std::shared_ptr player = getUserdataShared(L, 1); - player) { + player) { const auto mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { uint32_t bossId = mtype->info.raceid; @@ -3596,7 +3596,7 @@ int PlayerFunctions::luaPlayerGetBosstiaryLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetBosstiaryKills(lua_State* L) { // player:getBosstiaryKills(name) if (std::shared_ptr player = getUserdataShared(L, 1); - player) { + player) { const auto mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { uint32_t bossId = mtype->info.raceid; @@ -3618,7 +3618,7 @@ int PlayerFunctions::luaPlayerGetBosstiaryKills(lua_State* L) { int PlayerFunctions::luaPlayerAddBosstiaryKill(lua_State* L) { // player:addBosstiaryKill(name[, amount = 1]) if (std::shared_ptr player = getUserdataShared(L, 1); - player) { + player) { const auto mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { g_ioBosstiary().addBosstiaryKill(player, mtype, getNumber(L, 3, 1)); diff --git a/src/lua/functions/events/action_functions.cpp b/src/lua/functions/events/action_functions.cpp index c1fd581f8bd..31b202465c7 100644 --- a/src/lua/functions/events/action_functions.cpp +++ b/src/lua/functions/events/action_functions.cpp @@ -133,7 +133,7 @@ int ActionFunctions::luaActionPosition(lua_State* L) { // The parameter "- 1" because self is a parameter aswell, which we want to skip L 1 (UserData) // isNumber(L, 2) is for skip the itemId if (int parameters = lua_gettop(L) - 1; - parameters > 1 && isNumber(L, 2)) { + parameters > 1 && isNumber(L, 2)) { for (int i = 0; i < parameters; ++i) { action->setPositionsVector(getPosition(L, 2 + i)); } diff --git a/src/lua/functions/events/creature_event_functions.cpp b/src/lua/functions/events/creature_event_functions.cpp index 7b5e25a12f3..7edbabad1d3 100644 --- a/src/lua/functions/events/creature_event_functions.cpp +++ b/src/lua/functions/events/creature_event_functions.cpp @@ -54,8 +54,8 @@ int CreatureEventFunctions::luaCreatureEventType(lua_State* L) { creatureEvent->setEventType(CREATURE_EVENT_EXTENDED_OPCODE); } else { g_logger().error("[CreatureEventFunctions::luaCreatureEventType] - " - "Invalid type for creature event: {}", - typeName); + "Invalid type for creature event: {}", + typeName); pushBoolean(L, false); } creatureEvent->setLoaded(true); diff --git a/src/lua/functions/events/global_event_functions.cpp b/src/lua/functions/events/global_event_functions.cpp index 8f54e5b03fd..ea6a5f7df03 100644 --- a/src/lua/functions/events/global_event_functions.cpp +++ b/src/lua/functions/events/global_event_functions.cpp @@ -42,7 +42,7 @@ int GlobalEventFunctions::luaGlobalEventType(lua_State* L) { global->setEventType(GLOBALEVENT_ON_THINK); } else { g_logger().error("[GlobalEventFunctions::luaGlobalEventType] - " - "Invalid type for global event: {}"); + "Invalid type for global event: {}"); pushBoolean(L, false); } pushBoolean(L, true); @@ -97,8 +97,8 @@ int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { int32_t hour = params.front(); if (hour < 0 || hour > 23) { g_logger().error("[GlobalEventFunctions::luaGlobalEventTime] - " - "Invalid hour {} for globalevent with name: {}", - timer, globalevent->getName()); + "Invalid hour {} for globalevent with name: {}", + timer, globalevent->getName()); pushBoolean(L, false); return 1; } @@ -111,8 +111,8 @@ int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { min = params[1]; if (min < 0 || min > 59) { g_logger().error("[GlobalEventFunctions::luaGlobalEventTime] - " - "Invalid minute: {} for globalevent with name: {}", - timer, globalevent->getName()); + "Invalid minute: {} for globalevent with name: {}", + timer, globalevent->getName()); pushBoolean(L, false); return 1; } @@ -121,8 +121,8 @@ int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { sec = params[2]; if (sec < 0 || sec > 59) { g_logger().error("[GlobalEventFunctions::luaGlobalEventTime] - " - "Invalid minute: {} for globalevent with name: {}", - timer, globalevent->getName()); + "Invalid minute: {} for globalevent with name: {}", + timer, globalevent->getName()); pushBoolean(L, false); return 1; } diff --git a/src/lua/functions/events/move_event_functions.cpp b/src/lua/functions/events/move_event_functions.cpp index 5de49c26f59..8340dded92f 100644 --- a/src/lua/functions/events/move_event_functions.cpp +++ b/src/lua/functions/events/move_event_functions.cpp @@ -47,8 +47,8 @@ int MoveEventFunctions::luaMoveEventType(lua_State* L) { moveevent->moveFunction = moveevent->RemoveItemField; } else { g_logger().error("[MoveEventFunctions::luaMoveEventType] - " - "No valid event name: {}", - typeName); + "No valid event name: {}", + typeName); pushBoolean(L, false); } pushBoolean(L, true); @@ -126,8 +126,8 @@ int MoveEventFunctions::luaMoveEventSlot(lua_State* L) { moveevent->setSlot(SLOTP_AMMO); } else { g_logger().warn("[MoveEventFunctions::luaMoveEventSlot] - " - "Unknown slot type: {}", - slotName); + "Unknown slot type: {}", + slotName); pushBoolean(L, false); return 1; } diff --git a/src/lua/functions/items/item_functions.cpp b/src/lua/functions/items/item_functions.cpp index 71ab040f47d..361a469da32 100644 --- a/src/lua/functions/items/item_functions.cpp +++ b/src/lua/functions/items/item_functions.cpp @@ -398,7 +398,7 @@ int ItemFunctions::luaItemSetAttribute(lua_State* L) { switch (attribute) { case ItemAttribute_t::DECAYSTATE: { if (ItemDecayState_t decayState = getNumber(L, 3); - decayState == DECAYING_FALSE || decayState == DECAYING_STOPPING) { + decayState == DECAYING_FALSE || decayState == DECAYING_STOPPING) { g_decay().stopDecay(item); } else { g_decay().startDecay(item); diff --git a/src/lua/functions/items/weapon_functions.cpp b/src/lua/functions/items/weapon_functions.cpp index 962c1181fe4..61eff2dfb66 100644 --- a/src/lua/functions/items/weapon_functions.cpp +++ b/src/lua/functions/items/weapon_functions.cpp @@ -77,8 +77,8 @@ int WeaponFunctions::luaWeaponAction(lua_State* L) { weapon->action = WEAPONACTION_MOVE; } else { g_logger().error("[WeaponFunctions::luaWeaponAction] - " - "No valid action {}", - typeName); + "No valid action {}", + typeName); pushBoolean(L, false); } pushBoolean(L, true); @@ -285,8 +285,8 @@ int WeaponFunctions::luaWeaponElement(lua_State* L) { weapon->params.combatType = COMBAT_HOLYDAMAGE; } else { g_logger().warn("[WeaponFunctions:luaWeaponElement] - " - "Type {} does not exist", - element); + "Type {} does not exist", + element); } } else { weapon->params.combatType = getNumber(L, 2); @@ -539,8 +539,8 @@ int WeaponFunctions::luaWeaponAmmoType(lua_State* L) { it.ammoType = AMMO_BOLT; } else { g_logger().warn("[WeaponFunctions:luaWeaponAmmoType] - " - "Type {} does not exist", - type); + "Type {} does not exist", + type); lua_pushnil(L); return 1; } @@ -604,8 +604,8 @@ int WeaponFunctions::luaWeaponExtraElement(lua_State* L) { it.abilities->elementType = COMBAT_HOLYDAMAGE; } else { g_logger().warn("[WeaponFunctions:luaWeaponExtraElement] - " - "Type {} does not exist", - element); + "Type {} does not exist", + element); } } else { it.abilities->elementType = getNumber(L, 3); diff --git a/src/lua/functions/lua_functions_loader.cpp b/src/lua/functions/lua_functions_loader.cpp index 69ee85dd865..c2dedfb57b6 100644 --- a/src/lua/functions/lua_functions_loader.cpp +++ b/src/lua/functions/lua_functions_loader.cpp @@ -289,13 +289,13 @@ void LuaFunctionsLoader::setWeakMetatable(lua_State* L, int32_t index, const std int metatable = lua_gettop(L); for (static const std::vector methodKeys = { "__index", "__metatable", "__eq" }; - const std::string &metaKey : methodKeys) { + const std::string &metaKey : methodKeys) { lua_getfield(L, childMetatable, metaKey.c_str()); lua_setfield(L, metatable, metaKey.c_str()); } for (static const std::vector methodIndexes = { 'h', 'p', 't' }; - int metaIndex : methodIndexes) { + int metaIndex : methodIndexes) { lua_rawgeti(L, childMetatable, metaIndex); lua_rawseti(L, metatable, metaIndex); } diff --git a/src/lua/global/baseevents.cpp b/src/lua/global/baseevents.cpp index 9728342f7ed..3b312100d3b 100644 --- a/src/lua/global/baseevents.cpp +++ b/src/lua/global/baseevents.cpp @@ -25,7 +25,7 @@ bool BaseEvents::loadFromXml() { basePath + "lib/" + scriptsName + ".lua", scriptsName + ".lua" ) - == -1) { + == -1) { g_logger().warn(__FUNCTION__, scriptsName, scriptsName); } @@ -107,8 +107,8 @@ bool Event::checkScript(const std::string &basePath, const std::string &scriptsN int32_t id = testInterface->getEvent(getScriptEventName()); if (id == -1) { g_logger().warn("[Event::checkScript] - Event " - "{} not found {}", - getScriptEventName(), scriptFile); + "{} not found {}", + getScriptEventName(), scriptFile); return false; } return true; diff --git a/src/lua/global/globalevent.cpp b/src/lua/global/globalevent.cpp index 9626173dc9f..04420431def 100644 --- a/src/lua/global/globalevent.cpp +++ b/src/lua/global/globalevent.cpp @@ -126,8 +126,8 @@ void GlobalEvents::think() { if (!globalEvent->executeEvent()) { g_logger().error("[GlobalEvents::think] - " - "Failed to execute event: {}", - globalEvent->getName()); + "Failed to execute event: {}", + globalEvent->getName()); } nextExecutionTime = globalEvent->getInterval(); @@ -206,8 +206,8 @@ bool GlobalEvent::executePeriodChange(LightState_t lightState, LightInfo lightIn // onPeriodChange(lightState, lightTime) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[GlobalEvent::executePeriodChange - {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName()); return false; } @@ -226,8 +226,8 @@ bool GlobalEvent::executeRecord(uint32_t current, uint32_t old) { // onRecord(current, old) if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[GlobalEvent::executeRecord - {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName()); return false; } @@ -245,8 +245,8 @@ bool GlobalEvent::executeRecord(uint32_t current, uint32_t old) { bool GlobalEvent::executeEvent() const { if (!getScriptInterface()->reserveScriptEnv()) { g_logger().error("[GlobalEvent::executeEvent - {}] " - "Call stack overflow. Too many lua script calls being nested.", - getName()); + "Call stack overflow. Too many lua script calls being nested.", + getName()); return false; } diff --git a/src/lua/scripts/lua_environment.cpp b/src/lua/scripts/lua_environment.cpp index f3d2273df34..cd5023a8d4b 100644 --- a/src/lua/scripts/lua_environment.cpp +++ b/src/lua/scripts/lua_environment.cpp @@ -174,8 +174,8 @@ void LuaEnvironment::executeTimerEvent(uint32_t eventIndex) { callFunction(timerEventDesc.parameters.size()); } else { g_logger().error("[LuaEnvironment::executeTimerEvent - Lua file {}] " - "Call stack overflow. Too many lua script calls being nested", - getLoadingFile()); + "Call stack overflow. Too many lua script calls being nested", + getLoadingFile()); } // free resources diff --git a/src/lua/scripts/scripts.cpp b/src/lua/scripts/scripts.cpp index 1d395cdd096..cb92c1cc29a 100644 --- a/src/lua/scripts/scripts.cpp +++ b/src/lua/scripts/scripts.cpp @@ -88,7 +88,7 @@ bool Scripts::loadScripts(std::string loadPath, bool isLib, bool reload) { // Check if file start with "#" if (std::string disable("#"); - file.front() == disable.front()) { + file.front() == disable.front()) { // Send log of disabled script if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS, __FUNCTION__)) { g_logger().info("[script]: {} [disabled]", realPath.filename().string()); diff --git a/src/map/house/house.cpp b/src/map/house/house.cpp index 842622b2af5..261147fff40 100644 --- a/src/map/house/house.cpp +++ b/src/map/house/house.cpp @@ -753,8 +753,8 @@ bool Houses::loadHousesXML(const std::string &filename) { ); if (entryPos.x == 0 && entryPos.y == 0 && entryPos.z == 0) { g_logger().warn("[Houses::loadHousesXML] - Entry not set for house " - "name: {} with id: {}", - house->getName(), houseId); + "name: {} with id: {}", + house->getName(), houseId); } house->setEntryPos(entryPos); diff --git a/src/map/house/housetile.cpp b/src/map/house/housetile.cpp index 6b301f0e817..5e728a14ea3 100644 --- a/src/map/house/housetile.cpp +++ b/src/map/house/housetile.cpp @@ -95,9 +95,9 @@ std::shared_ptr HouseTile::queryDestination(int32_t &index, const std: std::shared_ptr destTile = g_game().map.getTile(entryPos); if (!destTile) { g_logger().error("[HouseTile::queryDestination] - " - "Entry not correct for house name: {} " - "with id: {} not found tile: {}", - house->getName(), house->getId(), entryPos.toString()); + "Entry not correct for house name: {} " + "with id: {} not found tile: {}", + house->getName(), house->getId(), entryPos.toString()); destTile = g_game().map.getTile(player->getTemplePosition()); if (!destTile) { destTile = Tile::nullptr_tile; diff --git a/src/map/mapcache.cpp b/src/map/mapcache.cpp index 0448615ee99..cb3e95eb30e 100644 --- a/src/map/mapcache.cpp +++ b/src/map/mapcache.cpp @@ -70,7 +70,7 @@ void MapCache::parseItemAttr(const std::shared_ptr &BasicItem, std::s } /* if (BasicItem.description != 0) - item->setAttribute(ItemAttribute_t::DESCRIPTION, STRING_CACHE[BasicItem.description]);*/ + item->setAttribute(ItemAttribute_t::DESCRIPTION, STRING_CACHE[BasicItem.description]);*/ } std::shared_ptr MapCache::createItem(const std::shared_ptr &BasicItem, Position position) { diff --git a/src/map/spectators.cpp b/src/map/spectators.cpp index 10aaf0faf87..405119b83e9 100644 --- a/src/map/spectators.cpp +++ b/src/map/spectators.cpp @@ -59,11 +59,11 @@ bool Spectators::checkCache(const SpectatorsCache::FloorData &specData, bool onl for (const auto &creature : *list) { const auto &specPos = creature->getPosition(); if (centerPos.x - specPos.x >= minRangeX - && centerPos.y - specPos.y >= minRangeY - && centerPos.x - specPos.x <= maxRangeX - && centerPos.y - specPos.y <= maxRangeY - && (multifloor || specPos.z == centerPos.z) - && (!onlyPlayers || creature->getPlayer())) { + && centerPos.y - specPos.y >= minRangeY + && centerPos.x - specPos.x <= maxRangeX + && centerPos.y - specPos.y <= maxRangeY + && (multifloor || specPos.z == centerPos.z) + && (!onlyPlayers || creature->getPlayer())) { spectators.emplace_back(creature); } } diff --git a/src/server/network/connection/connection.cpp b/src/server/network/connection/connection.cpp index 3effd52f829..3072384420d 100644 --- a/src/server/network/connection/connection.cpp +++ b/src/server/network/connection/connection.cpp @@ -241,7 +241,7 @@ void Connection::parsePacket(const std::error_code &error) { // Check packet checksum uint32_t checksum; if (int32_t len = msg.getLength() - msg.getBufferPosition() - CHECKSUM_LENGTH; - len > 0) { + len > 0) { checksum = adlerChecksum(msg.getBuffer() + msg.getBufferPosition() + CHECKSUM_LENGTH, len); } else { checksum = 0; diff --git a/src/server/network/protocol/protocol.cpp b/src/server/network/protocol/protocol.cpp index 78cff72fab4..255899f2f99 100644 --- a/src/server/network/protocol/protocol.cpp +++ b/src/server/network/protocol/protocol.cpp @@ -78,7 +78,7 @@ bool Protocol::onRecvMessage(NetworkMessage &msg) { } else { uint32_t checksum; if (int32_t len = msg.getLength() - msg.getBufferPosition(); - len > 0) { + len > 0) { checksum = adlerChecksum(msg.getBuffer() + msg.getBufferPosition(), len); } else { checksum = 0; diff --git a/src/server/network/protocol/protocol.hpp b/src/server/network/protocol/protocol.hpp index c264f49bf01..54e3dcfd4c3 100644 --- a/src/server/network/protocol/protocol.hpp +++ b/src/server/network/protocol/protocol.hpp @@ -50,7 +50,7 @@ class Protocol : public std::enable_shared_from_this { void send(OutputMessage_ptr msg) const { if (auto connection = getConnection(); - connection != nullptr) { + connection != nullptr) { connection->send(msg); } } diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 58f06eee5ae..1476f255135 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -1485,7 +1485,7 @@ void ProtocolGame::GetFloorDescription(NetworkMessage &msg, int32_t x, int32_t y void ProtocolGame::checkCreatureAsKnown(uint32_t id, bool &known, uint32_t &removedKnown) { if (auto [creatureKnown, creatureInserted] = knownCreatureSet.insert(id); - !creatureInserted) { + !creatureInserted) { known = true; return; } @@ -1499,7 +1499,7 @@ void ProtocolGame::checkCreatureAsKnown(uint32_t id, bool &known, uint32_t &remo // We need to protect party players from removing std::shared_ptr creature = g_game().getCreatureByID(*it); if (std::shared_ptr checkPlayer; - creature && (checkPlayer = creature->getPlayer()) != nullptr) { + creature && (checkPlayer = creature->getPlayer()) != nullptr) { if (player->getParty() != checkPlayer->getParty() && !canSee(creature)) { removedKnown = *it; knownCreatureSet.erase(it); @@ -2334,7 +2334,7 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { if (!mtype) { g_logger().warn("[ProtocolGame::parseBestiarysendMonsterData] - " - "MonsterType was not found"); + "MonsterType was not found"); return; } @@ -2944,8 +2944,8 @@ void ProtocolGame::parseBestiarysendCreatures(NetworkMessage &msg) { if (race.empty()) { g_logger().warn("[ProtocolGame::parseBestiarysendCreature] - " - "Race was not found: {}, search: {}", - raceName, search); + "Race was not found: {}, search: {}", + raceName, search); return; } text = raceName; @@ -4887,7 +4887,7 @@ void ProtocolGame::updateCoinBalance() { threadPlayer->sendCoinBalance(); } }, - "ProtocolGame::updateCoinBalance"); + "ProtocolGame::updateCoinBalance"); } void ProtocolGame::sendMarketLeave() { @@ -5282,9 +5282,9 @@ void ProtocolGame::sendOpenForge() { for each convergence fusion (1 per item slot, only class 4): 1 byte: count fusable items for each fusable item: - 2 bytes: item id - 1 byte: tier - 2 bytes: count + 2 bytes: item id + 1 byte: tier + 2 bytes: count */ for (const auto &[slot, itemMap] : convergenceItemsMap) { uint8_t totalItemsCount = 0; @@ -5364,15 +5364,15 @@ void ProtocolGame::sendOpenForge() { /* for each convergence transfer: - 2 bytes: count donors - for each donor: - 2 bytes: item id - 1 byte: tier - 2 bytes: count - 2 bytes: count receivers - for each receiver: - 2 bytes: item id - 2 bytes: count + 2 bytes: count donors + for each donor: + 2 bytes: item id + 1 byte: tier + 2 bytes: count + 2 bytes: count receivers + for each receiver: + 2 bytes: item id + 2 bytes: count */ for (const auto &[slot, itemMap] : convergenceItemsMap) { uint16_t donorCount = 0; @@ -7694,7 +7694,7 @@ void ProtocolGame::addImbuementInfo(NetworkMessage &msg, uint16_t imbuementId) c msg.add(imbuementId); msg.addString(baseImbuement->name + " " + imbuement->getName(), "ProtocolGame::addImbuementInfo - baseImbuement->name + " - " + imbuement->getName()"); + " + imbuement->getName()"); msg.addString(imbuement->getDescription(), "ProtocolGame::addImbuementInfo - imbuement->getDescription()"); msg.addString(categoryImbuement->name + imbuement->getSubGroup(), "ProtocolGame::addImbuementInfo - categoryImbuement->name + imbuement->getSubGroup()"); @@ -7832,7 +7832,7 @@ void ProtocolGame::updatePartyTrackerAnalyzer(const std::shared_ptr party for (const std::shared_ptr &analyzer : party->membersData) { msg.add(analyzer->id); if (std::shared_ptr member = g_game().getPlayerByID(analyzer->id); - !member || !member->getParty() || member->getParty() != party) { + !member || !member->getParty() || member->getParty() != party) { msg.addByte(0); } else { msg.addByte(1); @@ -8226,7 +8226,7 @@ void ProtocolGame::sendInventoryImbuements(const std::mapgetBaseID()); msg.addByte(0x01); msg.addString(baseImbuement->name + " " + imbuement->getName(), "ProtocolGame::sendInventoryImbuements - baseImbuement->name + " - " + imbuement->getName()"); + " + imbuement->getName()"); msg.add(imbuement->getIconID()); msg.add(imbuementInfo.duration); @@ -8714,7 +8714,7 @@ void ProtocolGame::parseSendBosstiarySlots() { auto bossesUnlockedList = g_ioBosstiary().getBosstiaryFinished(player); if (auto it = std::ranges::find(bossesUnlockedList.begin(), bossesUnlockedList.end(), boostedBossId); - it != bossesUnlockedList.end()) { + it != bossesUnlockedList.end()) { bossesUnlockedList.erase(it); } auto bossesUnlockedSize = static_cast(bossesUnlockedList.size()); @@ -8930,7 +8930,7 @@ void ProtocolGame::sendBosstiaryCooldownTimer() { msg.skipBytes(2); // Boss count uint16_t bossesCount = 0; for (std::map bossesMap = g_ioBosstiary().getBosstiaryMap(); - const auto &[bossRaceId, _] : bossesMap) { + const auto &[bossRaceId, _] : bossesMap) { const auto mType = g_ioBosstiary().getMonsterTypeByBossRaceId(bossRaceId); if (!mType) { continue; diff --git a/src/server/network/protocol/protocollogin.cpp b/src/server/network/protocol/protocollogin.cpp index b59a3704429..d6e9e3cb9f1 100644 --- a/src/server/network/protocol/protocollogin.cpp +++ b/src/server/network/protocol/protocollogin.cpp @@ -177,5 +177,5 @@ void ProtocolLogin::onRecvFirstMessage(NetworkMessage &msg) { g_dispatcher().addEvent([self = std::static_pointer_cast(shared_from_this()), accountDescriptor, password] { self->getCharacterList(accountDescriptor, password); }, - "ProtocolLogin::getCharacterList"); + "ProtocolLogin::getCharacterList"); } diff --git a/src/server/network/protocol/protocolstatus.cpp b/src/server/network/protocol/protocolstatus.cpp index a4dfe1651d6..1674b80a2b5 100644 --- a/src/server/network/protocol/protocolstatus.cpp +++ b/src/server/network/protocol/protocolstatus.cpp @@ -47,7 +47,7 @@ void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { g_dispatcher().addEvent([self = std::static_pointer_cast(shared_from_this())] { self->sendStatusString(); }, - "ProtocolStatus::sendStatusString"); + "ProtocolStatus::sendStatusString"); return; } break; @@ -63,7 +63,7 @@ void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { g_dispatcher().addEvent([self = std::static_pointer_cast(shared_from_this()), requestedInfo, characterName] { self->sendInfo(requestedInfo, characterName); }, - "ProtocolStatus::sendInfo"); + "ProtocolStatus::sendInfo"); return; } diff --git a/src/server/server.hpp b/src/server/server.hpp index 054ec2607c8..42134f765b0 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -114,8 +114,8 @@ template bool ServiceManager::add(uint16_t port) { if (port == 0) { g_logger().error("[ServiceManager::add] - " - "No port provided for service {}, service disabled", - ProtocolType::protocol_name()); + "No port provided for service {}, service disabled", + ProtocolType::protocol_name()); return false; } @@ -132,8 +132,8 @@ bool ServiceManager::add(uint16_t port) { if (service_port->is_single_socket() || ProtocolType::SERVER_SENDS_FIRST) { g_logger().error("[ServiceManager::add] - " - "{} and {} cannot use the same port {}", - ProtocolType::protocol_name(), service_port->get_protocol_names(), port); + "{} and {} cannot use the same port {}", + ProtocolType::protocol_name(), service_port->get_protocol_names(), port); return false; } } diff --git a/src/server/signals.cpp b/src/server/signals.cpp index 978b589eb38..c85b21312eb 100644 --- a/src/server/signals.cpp +++ b/src/server/signals.cpp @@ -38,8 +38,8 @@ void Signals::asyncWait() { set.async_wait([this](std::error_code err, int signal) { if (err) { g_logger().error("[Signals::asyncWait] - " - "Signal handling error: {}", - err.message()); + "Signal handling error: {}", + err.message()); return; } dispatchSignalHandler(signal); diff --git a/src/utils/simd.hpp b/src/utils/simd.hpp index 3961d51e708..7e57e75bfad 100644 --- a/src/utils/simd.hpp +++ b/src/utils/simd.hpp @@ -13,7 +13,7 @@ #if defined(__DISABLE_VECTORIZATION__) // You might want to disable vectorization on some compilers - // it can just get buggy and the engine will crashes + // it can just get buggy and the engine will crashes #undef __NEON__ #undef __ARM_NEON__ #undef __ARM_FEATURE_SIMD32 From 609a1871780b01e34f3bf116bb69e28ad5009716 Mon Sep 17 00:00:00 2001 From: sebbesiren <35768829+sebbesiren@users.noreply.github.com> Date: Wed, 26 Jun 2024 19:53:24 +0200 Subject: [PATCH 48/50] fix: offline training (#2341) --- .../creaturescripts/player/offline_training.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/data/scripts/creaturescripts/player/offline_training.lua b/data/scripts/creaturescripts/player/offline_training.lua index 4466c6ee0e3..7d08f07efe8 100644 --- a/data/scripts/creaturescripts/player/offline_training.lua +++ b/data/scripts/creaturescripts/player/offline_training.lua @@ -55,18 +55,23 @@ function offlineTraining.onLogin(player) local vocation = player:getVocation() local promotion = vocation:getPromotion() local topVocation = not promotion and vocation or promotion - local updateSkills = false + local tries = nil if table.contains({ SKILL_CLUB, SKILL_SWORD, SKILL_AXE, SKILL_DISTANCE }, offlineTrainingSkill) then - local modifier = topVocation:getBaseAttackSpeed() / 1000 / configManager.getFloat(configKeys.RATE_OFFLINE_TRAINING_SPEED) - updateSkills = player:addOfflineTrainingTries(offlineTrainingSkill, (trainingTime / modifier) / (offlineTrainingSkill == SKILL_DISTANCE and 4 or 2)) + local modifier = topVocation:getBaseAttackSpeed() / 1000 + tries = (trainingTime / modifier) / (offlineTrainingSkill == SKILL_DISTANCE and 4 or 2) elseif offlineTrainingSkill == SKILL_MAGLEVEL then - local gainTicks = topVocation:getManaGainTicks() * 2 + local gainTicks = topVocation:getManaGainTicks() / 1000 if gainTicks == 0 then gainTicks = 1 end - updateSkills = player:addOfflineTrainingTries(SKILL_MAGLEVEL, trainingTime * (vocation:getManaGainAmount() / gainTicks)) + tries = trainingTime * (vocation:getManaGainAmount() / gainTicks) + end + + local updateSkills = false + if tries then + updateSkills = player:addOfflineTrainingTries(offlineTrainingSkill, tries * configManager.getFloat(configKeys.RATE_OFFLINE_TRAINING_SPEED)) end if updateSkills then From d3ddea0b038c6da6f8019f7afe3f98827f386dec Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Thu, 27 Jun 2024 13:58:25 -0300 Subject: [PATCH 49/50] fix: gamestore nil player (#2715) Related to #2694 --- data/modules/scripts/gamestore/init.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/modules/scripts/gamestore/init.lua b/data/modules/scripts/gamestore/init.lua index 214aec77d43..322a7749c93 100644 --- a/data/modules/scripts/gamestore/init.lua +++ b/data/modules/scripts/gamestore/init.lua @@ -540,6 +540,11 @@ end -- Both functions use same formula! function parseOpenTransactionHistory(playerId, msg) + local player = Player(playerId) + if not player then + return + end + local page = 1 GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE = msg:getByte() sendStoreTransactionHistory(playerId, page, GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE) @@ -547,6 +552,11 @@ function parseOpenTransactionHistory(playerId, msg) end function parseRequestTransactionHistory(playerId, msg) + local player = Player(playerId) + if not player then + return + end + local page = msg:getU32() sendStoreTransactionHistory(playerId, page + 1, GameStore.DefaultValues.DEFAULT_VALUE_ENTRIES_PER_PAGE) player:updateUIExhausted() From 926a5f3e1605f73b0560c994a0116cec5685be7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Lu=C3=ADs=20Lucarelo=20Lamonato?= Date: Tue, 2 Jul 2024 16:13:00 -0300 Subject: [PATCH 50/50] feat: possibility to persist NPC on map with /n talkaction (#2682) --- data/scripts/talkactions/god/create_npc.lua | 38 ++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/data/scripts/talkactions/god/create_npc.lua b/data/scripts/talkactions/god/create_npc.lua index 4aeec3dde80..b6d0412d391 100644 --- a/data/scripts/talkactions/god/create_npc.lua +++ b/data/scripts/talkactions/god/create_npc.lua @@ -1,3 +1,6 @@ +-- To summon a temporary npc use /n npcname +-- To summon a permanent npc use /n npcname,true + local createNpc = TalkAction("/n") function createNpc.onSay(player, words, param) @@ -9,11 +12,44 @@ function createNpc.onSay(player, words, param) return true end + local split = param:split(",") + local name = split[1] + local permanentStr = split[2] + local position = player:getPosition() - local npc = Game.createNpc(param, position) + local npc = Game.createNpc(name, position) if npc then npc:setMasterPos(position) position:sendMagicEffect(CONST_ME_MAGIC_RED) + + if permanentStr and permanentStr == "true" then + local mapName = configManager.getString(configKeys.MAP_NAME) + local mapNpcsPath = mapName .. "-npc.xml" + local filePath = string.format("%s/world/%s", DATA_DIRECTORY, mapNpcsPath) + local npcsFile = io.open(filePath, "r") + if not npcsFile then + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "There was an error when trying to add permanent NPC. NPC File not found.") + return true + end + local fileContent = npcsFile:read("*all") + npcsFile:close() + local endTag = "" + if not fileContent:find(endTag, 1, true) then + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "There was an error when trying to add permanent NPC. The NPC file format is incorrect. Missing end tag " .. endTag .. ".") + return true + end + local textToAdd = string.format('\t\n\t\t\n\t', position.x, position.y, position.z, name, position.z) + local newFileContent = fileContent:gsub(endTag, textToAdd .. "\n" .. endTag) + npcsFile = io.open(filePath, "w") + if not npcsFile then + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "There was an error when trying to write to the NPC file.") + return true + end + npcsFile:write(newFileContent) + npcsFile:close() + + player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "Permanent NPC added successfully.") + end else player:sendCancelMessage("There is not enough room.") position:sendMagicEffect(CONST_ME_POFF)