diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 61703025c..3293c5f65 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -36,11 +36,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-22.04, ubuntu-24.04] buildtype: [linux-release] include: - os: ubuntu-22.04 triplet: x64-linux + - os: ubuntu-24.04 + triplet: x64-linux steps: - name: Checkout repository @@ -48,14 +50,23 @@ jobs: - name: Install Linux Dependencies run: > - sudo apt-get update && sudo apt-get install ccache linux-headers-$(uname -r) + sudo apt-get update && sudo apt-get install ccache linux-headers-"$(uname -r)" + + - name: Switch to gcc-12 on Ubuntu 22.04 + if: matrix.os == 'ubuntu-22.04' + run: | + sudo apt install gcc-12 g++-12 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12 + sudo update-alternatives --set gcc /usr/bin/gcc-12 - - name: Switch to gcc-11 - if: matrix.os == 'ubuntu-20.04' + - name: Switch to gcc-14 on Ubuntu 24.04 + if: matrix.os == 'ubuntu-24.04' run: | - sudo apt install gcc-11 g++-11 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11 - sudo update-alternatives --set gcc /usr/bin/gcc-11 + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt-get update + sudo apt-get install gcc-14 g++-14 -y + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14 + sudo update-alternatives --set gcc /usr/bin/gcc-14 - name: CCache uses: hendrikmuhs/ccache-action@main @@ -70,7 +81,7 @@ jobs: run: | vcpkgCommitId=$(grep '.builtin-baseline' vcpkg.json | awk -F: '{print $2}' | tr -d '," ') echo "vcpkg commit ID: $vcpkgCommitId" - echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> $GITHUB_ENV + echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" >> "$GITHUB_ENV" - name: Get vcpkg commit id from vcpkg.json uses: lukka/run-vcpkg@main diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f0d7cdc7..c0ab25857 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,30 +7,31 @@ 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 +# Needed libs are 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 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 "") + set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "") endif() if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") + set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") endif() set(VCPKG_FEATURE_FLAGS "versions") set(VCPKG_BUILD_TYPE "release") +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ***************************************************************************** # Project canary # ***************************************************************************** if(CMAKE_BUILD_TYPE STREQUAL "Debug") - project(otxserver-debug) + project(otxserver-debug LANGUAGES CXX) else() - project(otxserver) + project(otxserver LANGUAGES CXX) endif() - # ***************************************************************************** # Append cmake search path # ***************************************************************************** @@ -54,7 +55,7 @@ option(FEATURE_METRICS "Enable metrics feature" OFF) # Options Code # ***************************************************************************** -if(FEATURE_METRIC) +if(FEATURE_METRICS) log_option_enabled("metrics") else () log_option_disabled("metrics") @@ -66,52 +67,21 @@ if(OPTIONS_ENABLE_CCACHE) if(CCACHE) log_option_enabled("ccache") set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE}) - else() + else() log_option_disabled("ccache") endif() endif() - # === SCCACHE === if(OPTIONS_ENABLE_SCCACHE) - find_program(SCCACHE_PATH sccache) - if(SCCACHE_PATH) - log_option_enabled("sccache") - set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH}) - set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH}) - else() - log_option_disabled("sccache") - endif() -endif() - - -# === IPO === -if(OPTIONS_ENABLE_IPO) - if(MSVC) - log_option_enabled("IPO/LTO") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL") - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") - set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") - set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") + find_program(SCCACHE_PATH sccache) + if(SCCACHE_PATH) + log_option_enabled("sccache") + set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH}) + set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH}) else() - if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release") - log_option_enabled("IPO/LTO") - include(CheckIPOSupported) - check_ipo_supported(RESULT result OUTPUT output) - if(result) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=auto") - message(STATUS "IPO/LTO enabled with -flto=auto for non-MSVC compiler.") - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) - else() - log_war("IPO/LTO not supported: ${output}") - endif() - else() - log_option_disabled("IPO/LTO") - endif () + log_option_disabled("sccache") endif() -else() - log_option_disabled("IPO/LTO") endif() option(BUILD_TESTS "Build tests" OFF) # By default, tests will not be built @@ -122,6 +92,6 @@ option(RUN_TESTS_AFTER_BUILD "Run tests when building" OFF) # By default, tests # ***************************************************************************** add_subdirectory(src) -if(BUILD_TESTS) +if(BUILD_TESTS OR PACKAGE_TESTS) add_subdirectory(tests) endif() diff --git a/CMakePresets.json b/CMakePresets.json index 49f631e19..0bd22012b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -83,9 +83,21 @@ "description": "Build Debug Mode", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "DEBUG_LOG": "ON", - "SPEED_UP_BUILD_UNITY": "OFF", - "ASAN_ENABLED": "ON" + "SPEED_UP_BUILD_UNITY": "OFF" + } + }, + { + "name": "linux-debug-asan", + "inherits": "linux-release", + "displayName": "Linux - Debug Build", + "description": "Build Debug Mode With ASAN Enable", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "DEBUG_LOG": "ON", + "ASAN_ENABLED": "ON", + "SPEED_UP_BUILD_UNITY": "OFF" } }, { diff --git a/README.md b/README.md index c1db7f702..c1a5bbf23 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# The OTX Server - Based on: Canary Server + ## Builds [![Build - Ubuntu](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-ubuntu.yml) [![Build - Windows](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml/badge.svg)](https://github.com/mattyx14/otxserver/actions/workflows/build-windows-cmake.yml) @@ -21,19 +23,6 @@ With downloads, support, tutorials, Lua scripts, C++ codes, PHP codes and more . * [OTLand](https://otland.net/) - [English] * [Tibia Face](https://tibiaface.foroactivo.com/) - [Espaņol] -## Special Thanks OTServBR-Global -- our partners OTServBR-Global. -- our crew (majesty, gpedro, eduardo dantas) -- our testers (raphaellb, petardako, szulcek and olimpotibia) -- [our contributors](https://github.com/opentibiabr/canary/graphs/contributors) -- [fear lucien](https://github.com/FearLucien) -- [cjaker](https://github.com/Eternal-Scripts) -- [slavidodo](https://github.com/slavidodo) -- [mignari and our awesome tools](https://github.com/ottools) -- [saiyansking/optimized_forgottenserver and contributors](https://github.com/SaiyansKing/optimized_forgottenserver) -- [otland/forgottenserver](https://github.com/otland/forgottenserver) and contributors. -- if we forget someone, we apologize by forgot you. but you know, **forgot**tenserver. - ## Contacts OTX Server 2: - Matty(English & Spanish):
Facebook: https://www.facebook.com/Mattyx14/
@@ -41,3 +30,25 @@ E-mail: darkylive@live.com.mx
Whatsapp: +523211136700

- Reason(English & Portuguese):
Discord: Reason#2913 + +## Special Thanks + +- Our contributors ([Canary](https://github.com/opentibiabr/canary/graphs/contributors) | [OTServBR-Global](https://github.com/opentibiabr/otservbr-global/graphs/contributors)). + +## Sponsors + +See our [donate page](https://docs.opentibiabr.com/home/donate). + +## Project supported by JetBrains + +We extend our heartfelt gratitude to Jetbrains for generously granting us licenses to collaborate on this and various +other open-source initiatives. + + + JetBrains + + +## Partners + +[![Supported by OTServ Brasil](https://raw.githubusercontent.com/otbr/otserv-brasil/main/otbr.png)](https://forums.otserv.com.br) + diff --git a/cmake/modules/BaseConfig.cmake b/cmake/modules/BaseConfig.cmake index a1980d0f6..14dc6e221 100644 --- a/cmake/modules/BaseConfig.cmake +++ b/cmake/modules/BaseConfig.cmake @@ -3,9 +3,7 @@ cmake_minimum_required(VERSION 3.22 FATAL_ERROR) # ***************************************************************************** # CMake Features # ***************************************************************************** -set(CMAKE_CXX_STANDARD 20) -set(GNUCXX_MINIMUM_VERSION 11) -set(MSVC_MINIMUM_VERSION "19.32") +set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_DISABLE_SOURCE_CHANGES ON) @@ -15,9 +13,6 @@ set(Boost_NO_WARN_NEW_VERSIONS ON) # Make will print more details set(CMAKE_VERBOSE_MAKEFILE OFF) -# Generate compile_commands.json -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - # ***************************************************************************** # Packages / Libs # ***************************************************************************** @@ -50,21 +45,21 @@ find_path(BOOST_DI_INCLUDE_DIRS "boost/di.hpp") # === GCC Minimum Version === if (CMAKE_COMPILER_IS_GNUCXX) message("-- Compiler: GCC - Version: ${CMAKE_CXX_COMPILER_VERSION}") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNUCXX_MINIMUM_VERSION) - message(FATAL_ERROR "GCC version must be at least ${GNUCXX_MINIMUM_VERSION}!") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11) + message(FATAL_ERROR "GCC version must be at least 11!") endif() endif() # === Minimum required version for visual studio === if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("-- Compiler: Visual Studio - Version: ${CMAKE_CXX_COMPILER_VERSION}") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVC_MINIMUM_VERSION) - message(FATAL_ERROR "Visual Studio version must be at least ${MSVC_MINIMUM_VERSION}") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.32") + message(FATAL_ERROR "Visual Studio version must be at least 19.32") endif() endif() # ***************************************************************************** -# Sanity Checks +# Options # ***************************************************************************** option(TOGGLE_BIN_FOLDER "Use build/bin folder for generate compilation files" ON) option(OPTIONS_ENABLE_OPENMP "Enable Open Multi-Processing support." ON) @@ -74,6 +69,30 @@ option(BUILD_STATIC_LIBRARY "Build using static libraries" OFF) option(SPEED_UP_BUILD_UNITY "Compile using build unity for speed up build" ON) option(USE_PRECOMPILED_HEADER "Compile using precompiled header" ON) +# === TOGGLE_BIN_FOLDER === +if(TOGGLE_BIN_FOLDER) + log_option_enabled("TOGGLE_BIN_FOLDER") +else() + log_option_disabled("TOGGLE_BIN_FOLDER") +endif() + +# === OPTIONS_ENABLE_OPENMP === +if(OPTIONS_ENABLE_OPENMP) + log_option_enabled("OPTIONS_ENABLE_OPENMP") +else() + log_option_disabled("OPTIONS_ENABLE_OPENMP") +endif() + +# === DEBUG LOG === +# cmake -DDEBUG_LOG=ON .. +if(DEBUG_LOG) + add_definitions(-DDEBUG_LOG=ON) + add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE) + log_option_enabled("DEBUG LOG") +else() + log_option_disabled("DEBUG LOG") +endif() + # === ASAN === if(ASAN_ENABLED) log_option_enabled("asan") @@ -87,10 +106,9 @@ else() log_option_disabled("asan") endif() -# Build static libs +# === BUILD_STATIC_LIBRARY === if(BUILD_STATIC_LIBRARY) log_option_enabled("STATIC_LIBRARY") - if(MSVC) set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") elseif(UNIX AND NOT APPLE) @@ -102,14 +120,63 @@ else() log_option_disabled("STATIC_LIBRARY") endif() -# === DEBUG LOG === -# cmake -DDEBUG_LOG=ON .. -if(DEBUG_LOG) - add_definitions(-DDEBUG_LOG=ON) - log_option_enabled("DEBUG LOG") +# === SPEED_UP_BUILD_UNITY === +if(SPEED_UP_BUILD_UNITY) + log_option_enabled("SPEED_UP_BUILD_UNITY") else() - log_option_disabled("DEBUG LOG") -endif(DEBUG_LOG) + log_option_disabled("SPEED_UP_BUILD_UNITY") +endif() + +# === USE_PRECOMPILED_HEADER === +if(USE_PRECOMPILED_HEADER) + log_option_enabled("USE_PRECOMPILED_HEADER") +else() + log_option_disabled("USE_PRECOMPILED_HEADER") +endif() + +# === IPO Configuration === +function(configure_linking target_name) + if(OPTIONS_ENABLE_IPO) + # Check if IPO/LTO is supported + include(CheckIPOSupported) + check_ipo_supported(RESULT ipo_supported OUTPUT ipo_output LANGUAGES CXX) + + # Get the GCC compiler version, if applicable + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + execute_process( + COMMAND ${CMAKE_CXX_COMPILER} -dumpversion + OUTPUT_VARIABLE GCC_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + endif() + + if(ipo_supported) + set_property(TARGET ${target_name} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) + log_option_enabled("IPO/LTO enabled for target ${target_name}.") + + if(MSVC) + target_compile_options(${target_name} PRIVATE /GL) + target_link_options(${target_name} PRIVATE /LTCG) + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + # Check if it's running on Linux, using GCC 14, and in Debug mode + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND + CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND + GCC_VERSION VERSION_EQUAL "14" AND + CMAKE_BUILD_TYPE STREQUAL "Debug") + log_option_disabled("LTO disabled for GCC 14 in Debug mode on Linux for target ${target_name}.") + # Disable LTO for Debug builds with GCC 14 + target_compile_options(${target_name} PRIVATE -fno-lto) + target_link_options(${target_name} PRIVATE -fno-lto) + else() + target_compile_options(${target_name} PRIVATE -flto=auto) + target_link_options(${target_name} PRIVATE -flto=auto) + endif() + endif() + else() + log_option_disabled("IPO/LTO is not supported for target ${target_name}: ${ipo_output}") + endif() + endif() +endfunction() # ***************************************************************************** # Compiler Options @@ -119,39 +186,38 @@ if (MSVC) string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_${type} "${CMAKE_CXX_FLAGS_${type}}") string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_${type} "${CMAKE_C_FLAGS_${type}}") endforeach(type) - add_compile_options(/MP /FS /Zf /EHsc) else() add_compile_options(-Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-implicit-fallthrough -Wno-extra) endif() -## Link compilation files to build/bin folder, else link to the main dir +# === Compiler Features === +add_library(project_options INTERFACE) +target_compile_features(project_options INTERFACE cxx_std_23) + +# ***************************************************************************** +# Output Directory Function +# ***************************************************************************** function(set_output_directory target_name) if (TOGGLE_BIN_FOLDER) set_target_properties(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) + ) else() set_target_properties(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/" - ) + ) endif() endfunction() -## Setup shared target basic configurations +# ***************************************************************************** +# Setup Target Function +# ***************************************************************************** function(setup_target TARGET_NAME) if (MSVC AND BUILD_STATIC_LIBRARY) set_property(TARGET ${TARGET_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") endif() + target_link_libraries(${TARGET_NAME} PUBLIC project_options) endfunction() - -# ***************************************************************************** -# DEBUG: Print cmake variables -# ***************************************************************************** -#get_cmake_property(_variableNames VARIABLES) -#list (SORT _variableNames) -#foreach (_variableName ${_variableNames}) -# message(STATUS "${_variableName}=${${_variableName}}") -#endforeach() diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake index a3f5410b9..916970c37 100644 --- a/cmake/modules/CanaryLib.cmake +++ b/cmake/modules/CanaryLib.cmake @@ -22,13 +22,10 @@ add_subdirectory(utils) # Add more global sources - please add preferably in the sub_directory CMakeLists. target_sources(${PROJECT_NAME}_lib PRIVATE canary_server.cpp) -# Add public pre compiler header to lib, to pass down to related targets -if (NOT SPEED_UP_BUILD_UNITY) +# Conditional Precompiled Headers +if(USE_PRECOMPILED_HEADER) target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp) -endif() - -if(NOT SPEED_UP_BUILD_UNITY AND USE_PRECOMPILED_HEADERS) - target_compile_definitions(${PROJECT_NAME}_lib PUBLIC -DUSE_PRECOMPILED_HEADERS) + target_compile_definitions(${PROJECT_NAME}_lib PUBLIC USE_PRECOMPILED_HEADERS) endif() # ***************************************************************************** @@ -38,38 +35,21 @@ if (CMAKE_COMPILER_IS_GNUCXX) target_compile_options(${PROJECT_NAME}_lib PRIVATE -Wno-deprecated-declarations) endif() -# Sets the NDEBUG macro for RelWithDebInfo and Release configurations. -# This disables assertions in these configurations, optimizing the code for performance -# and reducing debugging overhead, while keeping debug information available for diagnostics. +# Sets the NDEBUG macro for Release and RelWithDebInfo configurations. target_compile_definitions(${PROJECT_NAME}_lib PUBLIC - $<$:NDEBUG> - $<$:NDEBUG> + $<$:NDEBUG> + $<$:NDEBUG> ) -# === IPO === -if(MSVC) - target_compile_options(${PROJECT_NAME}_lib PRIVATE "/GL") - set_target_properties(${PROJECT_NAME}_lib PROPERTIES - STATIC_LINKER_FLAGS "/LTCG" - SHARED_LINKER_FLAGS "/LTCG" - MODULE_LINKER_FLAGS "/LTCG" - EXE_LINKER_FLAGS "/LTCG") -else() - include(CheckIPOSupported) - check_ipo_supported(RESULT result) - if(result) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=auto") - message(STATUS "IPO/LTO enabled with -flto=auto for non-MSVC compiler.") - set_property(TARGET ${PROJECT_NAME}_lib PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) - else() - message(WARNING "IPO/LTO is not supported: ${output}") - endif() -endif() +# Configurar IPO e Linkagem Incremental +configure_linking(${PROJECT_NAME}_lib) # === UNITY BUILD (compile time reducer) === if(SPEED_UP_BUILD_UNITY) set_target_properties(${PROJECT_NAME}_lib PROPERTIES UNITY_BUILD ON) - log_option_enabled("Build unity for speed up compilation") + log_option_enabled("Build unity for speed up compilation for taget ${PROJECT_NAME}_lib") +else() + log_option_disabled("Build unity") endif() # ***************************************************************************** @@ -82,13 +62,14 @@ target_include_directories(${PROJECT_NAME}_lib ${GMP_INCLUDE_DIRS} ${LUAJIT_INCLUDE_DIRS} ${PARALLEL_HASHMAP_INCLUDE_DIRS} - ) + ${ATOMIC_QUEUE_INCLUDE_DIRS} +) # ***************************************************************************** # Target links to external dependencies # ***************************************************************************** target_link_libraries(${PROJECT_NAME}_lib - PUBLIC + PUBLIC ${GMP_LIBRARIES} ${LUAJIT_LIBRARIES} CURL::libcurl @@ -104,13 +85,11 @@ target_link_libraries(${PROJECT_NAME}_lib spdlog::spdlog unofficial::argon2::libargon2 unofficial::libmariadb - unofficial::mariadbclient protobuf ) if(FEATURE_METRICS) add_definitions(-DFEATURE_METRICS) - target_link_libraries(${PROJECT_NAME}_lib PUBLIC opentelemetry-cpp::common @@ -136,11 +115,10 @@ if (MSVC) else() set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "") endif() - target_link_libraries(${PROJECT_NAME}_lib PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${MYSQL_CLIENT_LIBS}) else() target_link_libraries(${PROJECT_NAME}_lib PUBLIC Threads::Threads) -endif (MSVC) +endif() # === OpenMP === if(OPTIONS_ENABLE_OPENMP) @@ -152,3 +130,12 @@ if(OPTIONS_ENABLE_OPENMP) else() log_option_disabled("openmp") endif() + +# === Optimization Flags === +if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release") + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + target_compile_options(${PROJECT_NAME}_lib PRIVATE -O3 -march=native) + elseif(MSVC) + target_compile_options(${PROJECT_NAME}_lib PRIVATE /O2) + endif() +endif() diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake index e96b1e27d..9e3b45873 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake @@ -58,7 +58,7 @@ IF (WIN32) ADD_DEFINITIONS(-DDBUG_OFF) ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug) - FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient libmariadb + FIND_LIBRARY(MYSQL_LIB NAMES mariadbclient libmariadb PATHS $ENV{MYSQL_DIR}/lib/${libsuffixDist} $ENV{MYSQL_DIR}/libmysql diff --git a/config.lua.dist b/config.lua.dist index 81d8e5a3f..86050471a 100644 --- a/config.lua.dist +++ b/config.lua.dist @@ -9,7 +9,8 @@ coreDirectory = "data" -- Set log level -- It can be trace, debug, info, warning, error, critical, off (default: info). --- NOTE: Will only display logs with level higher or equal the one set. +-- NOTE: It will only be valid after the server starts up and only display logs with level higher or equal the one set. +-- NOTE: Debug and trace logs are only available if compiled in debug mode. logLevel = "info" --- Toggles the server's maintenance mode. @@ -52,7 +53,7 @@ cleanProtectionZones = false -- Connection Config -- NOTE: allowOldProtocol can allow login on 10x protocol. (11.00) -- NOTE: maxPlayers set to 0 means no limit --- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25, +-- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25, -- It's recommended to use a range like min 50 in this function, otherwise you will be disconnected after equipping two-handed distance weapons. ip = "127.0.0.1" allowOldProtocol = false @@ -66,8 +67,6 @@ serverMotd = "Welcome to The OTX Server" statusTimeout = 5 * 1000 replaceKickOnLogin = true maxPacketsPerSecond = 25 -maxItem = 2000 -maxContainer = 100 maxPlayersOnlinePerAccount = 1 maxPlayersOutsidePZPerAccount = 1 @@ -81,6 +80,12 @@ freeDepotLimit = 2000 premiumDepotLimit = 10000 depotBoxes = 20 +-- Item and containers limit +-- NOTE: 'maxContainerDepth' defines the maximum depth to which containers can be nested +maxItem = 5000 +maxContainer = 500 +maxContainerDepth = 200 + -- Augments System (Get more info in: https://github.com/opentibiabr/canary/pull/2602) -- NOTE: the following values are for all weapons and equipments that have type of "increase damage", "powerful impact" and "strong impact". -- To customize the percentage of a particular item with these augment types, please add to the item "augments" section on items.xml as the example above. @@ -141,7 +146,7 @@ forgeAmountMultiplier = 3 forgeMinSlivers = 3 forgeMaxSlivers = 7 forgeInfluencedLimit = 300 -forgeFiendishLimit = 3 +forgeFiendishLimit = 4 forgeFiendishIntervalType = "hour" forgeFiendishIntervalTime = "1" @@ -254,7 +259,7 @@ onlyPremiumAccount = false -- NOTE: enablePlayerPutItemInAmmoSlot = true, will enable players to put any items on ammo slot, more used in custom shopping system -- NOTE: startStreakLevel will make a reward streak level for new players who never logged in -- NOTE: if showLootsInBestiary is true, will cause all loots to be shown in the bestiary even if the player has not reached the required number of kills --- NOTE: minTownIdToBankTransfer blocks towns less than defined from receiving money transfers +-- NOTE: minTownIdToBankTransferFromMain blocks towns less than defined from receiving money transfers -- NOTE: enableSupportOutfit enable GODS and GMS to select support outfit (gamemaster, customer support or community manager) stashMoving = false stashItemCount = 5000 @@ -275,7 +280,7 @@ storeInboxMaxLimit = 2000 enablePlayerPutItemInAmmoSlot = false startStreakLevel = 0 showLootsInBestiary = false -minTownIdToBankTransfer = 3 +minTownIdToBankTransferFromMain = 4 enableSupportOutfit = true -- Teleport summon diff --git a/docs/python-scripts/normalize_cpp_own_includes.py.py b/docs/python-scripts/normalize_cpp_own_includes.py.py new file mode 100644 index 000000000..d5e0ca0e8 --- /dev/null +++ b/docs/python-scripts/normalize_cpp_own_includes.py.py @@ -0,0 +1,72 @@ +import os + +# Path to the directory containing C++ files (.cpp) +directory_path = "path/to/src" + +def normalize_include_line(line): + # Normalize the include line by removing extra spaces and using '/' as separator + return ' '.join(line.strip().split()).replace('\\', '/') + +def correct_include_path(line, correct_include): + # Check if the include line matches the correct include, regardless of the path + if line.strip().startswith('#include') and ('"' + correct_include.split('/')[-1] + '"') in line: + return f'#include "{correct_include}"\n' + return line + +# Function to modify files and correct their own includes +def modify_includes(directory): + for root, dirs, files in os.walk(directory): + for filename in files: + if filename.endswith('.cpp'): + file_path = os.path.join(root, filename) + correct_include = f"{os.path.relpath(root, directory).replace('\\', '/')}/{filename.replace('.cpp', '.hpp')}" + + # Remove './' from the beginning of the path, if present + if correct_include.startswith('./'): + correct_include = correct_include[2:] + + include_statement = f'#include "{correct_include}"\n' + + with open(file_path, 'r', encoding='utf8') as file: + lines = file.readlines() + + corrected_lines = [] + include_found = False + include_renamed = False + include_at_correct_position = False + + # Normalize lines and correct includes as necessary + for i, line in enumerate(lines): + normalized_line = normalize_include_line(line) + if correct_include in normalized_line: + # If the correct include was found and is in the correct position + include_found = True + if i == next((idx for idx, l in enumerate(lines) if l.strip().startswith('#include')), i): + include_at_correct_position = True + if include_at_correct_position: + corrected_lines.append(line) # Keep the original include if it is correct and in the right position + elif filename.replace('.cpp', '.hpp') in normalized_line: + # Replace any old version of the include with the corrected version + corrected_lines.append(correct_include_path(line, correct_include)) + include_renamed = True + else: + corrected_lines.append(line) + + # If the include was found but not in the correct position, or was renamed, move it to the first include position + if (include_found and not include_at_correct_position) or include_renamed: + # Remove any occurrence of the correct include that is out of place + corrected_lines = [line for line in corrected_lines if line.strip() != include_statement.strip()] + # Find the first include position and insert the correct include + first_include_index = next((i for i, line in enumerate(corrected_lines) if line.strip().startswith('#include')), len(corrected_lines)) + corrected_lines.insert(first_include_index, include_statement) + # Add a blank line immediately after the first include, if necessary + if first_include_index + 1 < len(corrected_lines) and not corrected_lines[first_include_index + 1].isspace(): + corrected_lines.insert(first_include_index + 1, '\n') + + # Write the changes back to the file only if modifications were made + if corrected_lines != lines: + with open(file_path, 'w', encoding='utf8') as file: + file.writelines(corrected_lines) + +# Call the function to modify the files +modify_includes(directory_path) diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index e5ef1cf71..000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,7 +0,0 @@ -sonar.projectKey=opentibiabr_otx-server -sonar.organization=otxserver -sonar.projectName=otxserver -sonar.projectVersion=6.2 -sonar.sources=./src -sonar.sourceEncoding=UTF-8 -sonar.cfamily.cpp20=true diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 72fe2f3c1..e65318ca5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,24 +15,17 @@ if(MSVC) target_sources(${PROJECT_NAME} PRIVATE ../cmake/otxserver.rc) endif() -if (UNIX) - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_options(${PROJECT_NAME}_lib - PRIVATE - -Wall -Wextra -Wpedantic - ) - endif() - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_options(${PROJECT_NAME} - PRIVATE - -Wall -Wextra -Wpedantic - ) - endif() - -endif (UNIX) - setup_target(${PROJECT_NAME}) set_output_directory(${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_lib) + +# Configure IPO and Incremental Linking for the executable +configure_linking(${PROJECT_NAME}) + +# Compiler warnings and options +if (UNIX) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${PROJECT_NAME}_lib PRIVATE -Wall -Wextra -Wpedantic) + target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic) + endif() +endif() diff --git a/src/account/account.cpp b/src/account/account.cpp index 2e5f58dd8..93596f77b 100644 --- a/src/account/account.cpp +++ b/src/account/account.cpp @@ -7,144 +7,144 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "account/account.hpp" #include "account/account_repository_db.hpp" -#include "config/configmanager.hpp" -#include "utils/definitions.hpp" +#include "account/account_info.hpp" #include "security/argon.hpp" #include "utils/tools.hpp" -#include "lib/logging/log_with_spd_log.hpp" - -#include "enums/account_type.hpp" #include "enums/account_coins.hpp" #include "enums/account_errors.hpp" +#include "enums/account_type.hpp" Account::Account(const uint32_t &id) { m_descriptor.clear(); - m_account.id = id; - m_account.premiumRemainingDays = 0; - m_account.premiumLastDay = 0; - m_account.accountType = ACCOUNT_TYPE_NORMAL; + m_account = std::make_unique(); + m_account->id = id; + m_account->premiumRemainingDays = 0; + m_account->premiumLastDay = 0; + m_account->accountType = ACCOUNT_TYPE_NORMAL; } Account::Account(std::string descriptor) : m_descriptor(std::move(descriptor)) { - m_account.id = 0; - m_account.premiumRemainingDays = 0; - m_account.premiumLastDay = 0; - m_account.accountType = ACCOUNT_TYPE_NORMAL; + m_account = std::make_unique(); + m_account->id = 0; + m_account->premiumRemainingDays = 0; + m_account->premiumLastDay = 0; + m_account->accountType = ACCOUNT_TYPE_NORMAL; } -uint8_t Account::load() { - if (m_account.id != 0 && g_accountRepository().loadByID(m_account.id, m_account)) { +AccountErrors_t Account::load() { + using enum AccountErrors_t; + if (m_account->id != 0 && g_accountRepository().loadByID(m_account->id, m_account)) { m_accLoaded = true; - return enumToValue(AccountErrors_t::Ok); + return Ok; } if (!m_descriptor.empty() && g_accountRepository().loadByEmailOrName(getProtocolCompat(), m_descriptor, m_account)) { m_accLoaded = true; - return enumToValue(AccountErrors_t::Ok); + return Ok; } if (!m_descriptor.empty() && g_accountRepository().loadBySession(m_descriptor, m_account)) { m_accLoaded = true; - return enumToValue(AccountErrors_t::Ok); + return Ok; } updatePremiumTime(); - return enumToValue(AccountErrors_t::LoadingAccount); + return LoadingAccount; } -uint8_t Account::reload() { +AccountErrors_t Account::reload() { if (!m_accLoaded) { - return enumToValue(AccountErrors_t::NotInitialized); + return AccountErrors_t::NotInitialized; } return load(); } -uint8_t Account::save() { +AccountErrors_t Account::save() const { + using enum AccountErrors_t; if (!m_accLoaded) { - return enumToValue(AccountErrors_t::NotInitialized); + return NotInitialized; } - if (!g_accountRepository().save(m_account)) { - return enumToValue(AccountErrors_t::Storage); + return Storage; } - - return enumToValue(AccountErrors_t::Ok); + return Ok; } -std::tuple Account::getCoins(const uint8_t &type) const { +std::tuple Account::getCoins(CoinType type) const { + using enum AccountErrors_t; if (!m_accLoaded) { - return { 0, enumToValue(AccountErrors_t::NotInitialized) }; + return { 0, NotInitialized }; } uint32_t coins = 0; - if (!g_accountRepository().getCoins(m_account.id, type, coins)) { - return { 0, enumToValue(AccountErrors_t::Storage) }; + if (!g_accountRepository().getCoins(m_account->id, type, coins)) { + return { 0, Storage }; } - return { coins, enumToValue(AccountErrors_t::Ok) }; + return { coins, Ok }; } -uint8_t Account::addCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail) { +AccountErrors_t Account::addCoins(CoinType type, const uint32_t &amount, const std::string &detail) { + using enum AccountErrors_t; if (!m_accLoaded) { - return enumToValue(AccountErrors_t::NotInitialized); + return NotInitialized; } if (amount == 0) { - return enumToValue(AccountErrors_t::Ok); + return Ok; } auto [coins, result] = getCoins(type); - if (AccountErrors_t::Ok != enumFromValue(result)) { + if (Ok != result) { return result; } - if (!g_accountRepository().setCoins(m_account.id, type, coins + amount)) { - return enumToValue(AccountErrors_t::Storage); + if (!g_accountRepository().setCoins(m_account->id, type, coins + amount)) { + return Storage; } - registerCoinTransaction(enumToValue(CoinTransactionType::Add), type, amount, detail); + registerCoinTransaction(CoinTransactionType::Add, type, amount, detail); - return enumToValue(AccountErrors_t::Ok); + return Ok; } -uint8_t Account::removeCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail) { +AccountErrors_t Account::removeCoins(CoinType type, const uint32_t &amount, const std::string &detail) { + using enum AccountErrors_t; if (!m_accLoaded) { - return enumToValue(AccountErrors_t::NotInitialized); + return NotInitialized; } if (amount == 0) { - return enumToValue(AccountErrors_t::Ok); + return Ok; } auto [coins, result] = getCoins(type); - if (AccountErrors_t::Ok != enumFromValue(result)) { + if (Ok != result) { return result; } if (coins < amount) { g_logger().info("Account doesn't have enough coins! current[{}], remove:[{}]", coins, amount); - return enumToValue(AccountErrors_t::RemoveCoins); + return RemoveCoins; } - if (!g_accountRepository().setCoins(m_account.id, type, coins - amount)) { - return enumToValue(AccountErrors_t::Storage); + if (!g_accountRepository().setCoins(m_account->id, type, coins - amount)) { + return Storage; } - registerCoinTransaction(enumToValue(CoinTransactionType::Remove), type, amount, detail); + registerCoinTransaction(CoinTransactionType::Remove, type, amount, detail); - return enumToValue(AccountErrors_t::Ok); + return Ok; } -void Account::registerCoinTransaction(const uint8_t &transactionType, const uint8_t &type, const uint32_t &amount, const std::string &detail) { +void Account::registerCoinTransaction(CoinTransactionType transactionType, CoinType type, const uint32_t &amount, const std::string &detail) { if (!m_accLoaded) { return; } @@ -153,17 +153,17 @@ void Account::registerCoinTransaction(const uint8_t &transactionType, const uint return; } - if (!g_accountRepository().registerCoinsTransaction(m_account.id, transactionType, amount, type, detail)) { + if (!g_accountRepository().registerCoinsTransaction(m_account->id, transactionType, amount, type, detail)) { g_logger().error( "Failed to register transaction: 'account:[{}], transaction " "type:[{}], coins:[{}], coin type:[{}], description:[{}]", - m_account.id, transactionType, amount, type, detail + m_account->id, transactionType, amount, type, detail ); } } [[nodiscard]] uint32_t Account::getID() const { - return m_account.id; + return m_account->id; }; std::string Account::getDescriptor() const { @@ -176,61 +176,61 @@ std::string Account::getPassword() { } std::string password; - if (!g_accountRepository().getPassword(m_account.id, password)) { + if (!g_accountRepository().getPassword(m_account->id, password)) { password.clear(); - g_logger().error("Failed to get password for account[{}]!", m_account.id); + g_logger().error("Failed to get password for account[{}]!", m_account->id); } return password; } void Account::addPremiumDays(const int32_t &days) { - auto timeLeft = std::max(0, static_cast((m_account.premiumLastDay - getTimeNow()) % 86400)); - setPremiumDays(m_account.premiumRemainingDays + days); - m_account.premiumDaysPurchased += days; + auto timeLeft = std::max(0, static_cast((m_account->premiumLastDay - getTimeNow()) % 86400)); + setPremiumDays(m_account->premiumRemainingDays + days); + m_account->premiumDaysPurchased += days; if (timeLeft > 0) { - m_account.premiumLastDay += timeLeft; + m_account->premiumLastDay += timeLeft; } } void Account::setPremiumDays(const int32_t &days) { - m_account.premiumRemainingDays = days; - m_account.premiumLastDay = getTimeNow() + (days * 86400); + m_account->premiumRemainingDays = days; + m_account->premiumLastDay = getTimeNow() + (days * 86400); if (days <= 0) { - m_account.premiumLastDay = 0; - m_account.premiumRemainingDays = 0; + m_account->premiumLastDay = 0; + m_account->premiumRemainingDays = 0; } } [[nodiscard]] uint32_t Account::getPremiumRemainingDays() const { - return m_account.premiumLastDay > getTimeNow() ? static_cast((m_account.premiumLastDay - getTimeNow()) / 86400) : 0; + return m_account->premiumLastDay > getTimeNow() ? static_cast((m_account->premiumLastDay - getTimeNow()) / 86400) : 0; } [[nodiscard]] uint32_t Account::getPremiumDaysPurchased() const { - return m_account.premiumDaysPurchased; + return m_account->premiumDaysPurchased; } -uint8_t Account::setAccountType(const uint8_t &accountType) { - m_account.accountType = accountType; - return enumToValue(AccountErrors_t::Ok); +AccountErrors_t Account::setAccountType(AccountType accountType) { + m_account->accountType = accountType; + return AccountErrors_t::Ok; } -[[nodiscard]] uint8_t Account::getAccountType() const { - return m_account.accountType; +[[nodiscard]] AccountType Account::getAccountType() const { + return m_account->accountType; } void Account::updatePremiumTime() { - time_t lastDay = m_account.premiumLastDay; - uint32_t remainingDays = m_account.premiumRemainingDays; + time_t lastDay = m_account->premiumLastDay; + uint32_t remainingDays = m_account->premiumRemainingDays; time_t currentTime = getTimeNow(); auto daysLeft = static_cast((lastDay - currentTime) / 86400); auto timeLeft = static_cast((lastDay - currentTime) % 86400); - m_account.premiumRemainingDays = daysLeft > 0 ? daysLeft : 0; + m_account->premiumRemainingDays = daysLeft > 0 ? daysLeft : 0; if (daysLeft == 0 && timeLeft == 0) { setPremiumDays(0); @@ -240,26 +240,27 @@ void Account::updatePremiumTime() { setPremiumDays(0); } - if (remainingDays == m_account.premiumRemainingDays) { + if (remainingDays == m_account->premiumRemainingDays) { return; } - if (AccountErrors_t::Ok != enumFromValue(save())) { + if (AccountErrors_t::Ok != save()) { g_logger().error("Failed to update account premium time: [{}]", getDescriptor()); } } -std::tuple, uint8_t> +std::tuple, AccountErrors_t> Account::getAccountPlayers() const { - auto valueToReturn = enumToValue(m_accLoaded ? AccountErrors_t::Ok : AccountErrors_t::NotInitialized); - return { m_account.players, valueToReturn }; + using enum AccountErrors_t; + auto valueToReturn = m_accLoaded ? Ok : NotInitialized; + return { m_account->players, valueToReturn }; } void Account::setProtocolCompat(bool toggle) { - m_account.oldProtocol = toggle; + m_account->oldProtocol = toggle; } bool Account::getProtocolCompat() const { - return m_account.oldProtocol; + return m_account->oldProtocol; } bool Account::authenticate() { @@ -272,8 +273,8 @@ bool Account::authenticate(const std::string &secret) { } bool Account::authenticateSession() { - if (m_account.sessionExpires < getTimeNow()) { - g_logger().error("Session expired for account[{}] expired at [{}] current time [{}]!", m_account.id, m_account.sessionExpires, getTimeNow()); + if (m_account->sessionExpires < getTimeNow()) { + g_logger().error("Session expired for account[{}] expired at [{}] current time [{}]!", m_account->id, m_account->sessionExpires, getTimeNow()); return false; } return true; @@ -293,9 +294,9 @@ bool Account::authenticatePassword(const std::string &password) { } uint32_t Account::getAccountAgeInDays() const { - return static_cast(std::ceil((getTimeNow() - m_account.creationTime) / 86400)); + return static_cast(std::ceil((getTimeNow() - m_account->creationTime) / 86400)); } [[nodiscard]] time_t Account::getPremiumLastDay() const { - return m_account.premiumLastDay; + return m_account->premiumLastDay; } diff --git a/src/account/account.hpp b/src/account/account.hpp index d968ba8dd..2c6098a8d 100644 --- a/src/account/account.hpp +++ b/src/account/account.hpp @@ -9,13 +9,20 @@ #pragma once -#include "account/account_info.hpp" +struct AccountInfo; + +enum class CoinType : uint8_t; +enum class CoinTransactionType : uint8_t; +enum class AccountErrors_t : uint8_t; +enum AccountType : uint8_t; class Account { public: explicit Account(const uint32_t &id); explicit Account(std::string descriptor); + ~Account() = default; + /** Coins * @brief Get the amount of coins that the account has from database. * @@ -24,7 +31,7 @@ class Account { * @return uint32_t Number of coins * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - [[nodiscard]] std::tuple getCoins(const uint8_t &type) const; + [[nodiscard]] std::tuple getCoins(CoinType type) const; /** * @brief Add coins to the account. @@ -33,7 +40,7 @@ class Account { * @param amount Amount of coins to be added * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - uint8_t addCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail = "ADD Coins"); + AccountErrors_t addCoins(CoinType type, const uint32_t &amount, const std::string &detail = "ADD Coins"); /** * @brief Removes coins from the account. @@ -42,7 +49,7 @@ class Account { * @param amount Amount of coins to be removed * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - uint8_t removeCoins(const uint8_t &type, const uint32_t &amount, const std::string &detail = "REMOVE Coins"); + AccountErrors_t removeCoins(CoinType type, const uint32_t &amount, const std::string &detail = "REMOVE Coins"); /** * @brief Registers a coin transaction. @@ -51,7 +58,7 @@ class Account { * @param amount Amount of coins to be added * @param detail Detail of the transaction */ - void registerCoinTransaction(const uint8_t &transactionType, const uint8_t &type, const uint32_t &amount, const std::string &detail); + void registerCoinTransaction(CoinTransactionType transactionType, CoinType type, const uint32_t &amount, const std::string &detail); /*************************************************************************** * Account Load/Save @@ -62,14 +69,14 @@ class Account { * * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - uint8_t save(); + AccountErrors_t save() const; /** * @brief Load Account Information. * * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - uint8_t load(); + AccountErrors_t load(); /** * @brief Re-Load Account Information to get update information(mainly the @@ -77,7 +84,7 @@ class Account { * * @return AccountErrors_t AccountErrors_t::Ok(0) Success, otherwise Fail. */ - uint8_t reload(); + AccountErrors_t reload(); /*************************************************************************** * Setters and Getters @@ -105,12 +112,12 @@ class Account { [[nodiscard]] time_t getPremiumLastDay() const; - uint8_t setAccountType(const uint8_t &accountType); - [[nodiscard]] uint8_t getAccountType() const; + AccountErrors_t setAccountType(AccountType accountType); + [[nodiscard]] AccountType getAccountType() const; void updatePremiumTime(); - std::tuple, uint8_t> getAccountPlayers() const; + std::tuple, AccountErrors_t> getAccountPlayers() const; // Old protocol compat void setProtocolCompat(bool toggle); @@ -126,6 +133,6 @@ class Account { private: std::string m_descriptor; - AccountInfo m_account; + std::unique_ptr m_account; bool m_accLoaded = false; }; diff --git a/src/account/account_info.hpp b/src/account/account_info.hpp index 698c3b96c..b9dad60db 100644 --- a/src/account/account_info.hpp +++ b/src/account/account_info.hpp @@ -14,11 +14,15 @@ #include #endif +#include "enums/account_type.hpp" + struct AccountInfo { + ~AccountInfo() = default; + uint32_t id = 0; uint32_t premiumRemainingDays = 0; time_t premiumLastDay = 0; - uint8_t accountType = 0; + AccountType accountType = ACCOUNT_TYPE_NONE; phmap::flat_hash_map players; bool oldProtocol = false; time_t sessionExpires = 0; diff --git a/src/account/account_repository.cpp b/src/account/account_repository.cpp index babca8470..f32982564 100644 --- a/src/account/account_repository.cpp +++ b/src/account/account_repository.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "account/account_repository.hpp" #include "lib/di/container.hpp" diff --git a/src/account/account_repository.hpp b/src/account/account_repository.hpp index 0d4dcc7ab..5a9cd5292 100644 --- a/src/account/account_repository.hpp +++ b/src/account/account_repository.hpp @@ -11,6 +11,9 @@ struct AccountInfo; +enum class CoinType : uint8_t; +enum class CoinTransactionType : uint8_t; + class AccountRepository { public: AccountRepository() = default; @@ -22,20 +25,22 @@ class AccountRepository { static AccountRepository &getInstance(); - virtual bool loadByID(const uint32_t &id, AccountInfo &acc) = 0; - virtual bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) = 0; - virtual bool loadBySession(const std::string &email, AccountInfo &acc) = 0; - virtual bool save(const AccountInfo &accInfo) = 0; + virtual bool loadByID(const uint32_t &id, std::unique_ptr &acc) = 0; + virtual bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, std::unique_ptr &acc) = 0; + virtual bool loadBySession(const std::string &email, std::unique_ptr &acc) = 0; + virtual bool save(const std::unique_ptr &accInfo) = 0; + + virtual bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) = 0; virtual bool getPassword(const uint32_t &id, std::string &password) = 0; - virtual bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) = 0; - virtual bool setCoins(const uint32_t &id, const uint8_t &type, const uint32_t &amount) = 0; + virtual bool getCoins(const uint32_t &id, CoinType coinType, uint32_t &coins) = 0; + virtual bool setCoins(const uint32_t &id, CoinType coinType, const uint32_t &amount) = 0; virtual bool registerCoinsTransaction( const uint32_t &id, - uint8_t type, + CoinTransactionType type, uint32_t coins, - const uint8_t &coinType, + CoinType coinType, const std::string &description ) = 0; }; diff --git a/src/account/account_repository_db.cpp b/src/account/account_repository_db.cpp index b150a636a..c3f02bfe9 100644 --- a/src/account/account_repository_db.cpp +++ b/src/account/account_repository_db.cpp @@ -7,33 +7,33 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "account/account_repository_db.hpp" #include "database/database.hpp" -#include "lib/logging/logger.hpp" +#include "enums/account_coins.hpp" #include "utils/definitions.hpp" #include "utils/tools.hpp" -#include "enums/account_type.hpp" -#include "enums/account_coins.hpp" -#include "account/account_info.hpp" -AccountRepositoryDB::AccountRepositoryDB() : - coinTypeToColumn({ { enumToValue(CoinType::Normal), "coins" }, { enumToValue(CoinType::Tournament), "tournament_coins" }, { enumToValue(CoinType::Transferable), "coins_transferable" } }) { } +AccountRepositoryDB::AccountRepositoryDB() { + coinTypeToColumn = { + { CoinType::Normal, "coins" }, + { CoinType::Tournament, "coins_tournament" }, + { CoinType::Transferable, "coins_transferable" } + }; +} -bool AccountRepositoryDB::loadByID(const uint32_t &id, AccountInfo &acc) { +bool AccountRepositoryDB::loadByID(const uint32_t &id, std::unique_ptr &acc) { auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `id` = {}", id); return load(query, acc); }; -bool AccountRepositoryDB::loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) { +bool AccountRepositoryDB::loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, std::unique_ptr &acc) { auto identifier = oldProtocol ? "name" : "email"; auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `{}` = {}", identifier, g_database().escapeString(emailOrName)); return load(query, acc); }; -bool AccountRepositoryDB::loadBySession(const std::string &sessionKey, AccountInfo &acc) { +bool AccountRepositoryDB::loadBySession(const std::string &sessionKey, std::unique_ptr &acc) { auto query = fmt::format( "SELECT `accounts`.`id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, `account_sessions`.`expires` " "FROM `accounts` " @@ -44,26 +44,36 @@ bool AccountRepositoryDB::loadBySession(const std::string &sessionKey, AccountIn return load(query, acc); }; -bool AccountRepositoryDB::save(const AccountInfo &accInfo) { +bool AccountRepositoryDB::save(const std::unique_ptr &accInfo) { bool successful = g_database().executeQuery( fmt::format( "UPDATE `accounts` SET `type` = {}, `premdays` = {}, `lastday` = {}, `creation` = {}, `premdays_purchased` = {} WHERE `id` = {}", - accInfo.accountType, - accInfo.premiumRemainingDays, - accInfo.premiumLastDay, - accInfo.creationTime, - accInfo.premiumDaysPurchased, - accInfo.id + accInfo->accountType, + accInfo->premiumRemainingDays, + accInfo->premiumLastDay, + accInfo->creationTime, + accInfo->premiumDaysPurchased, + accInfo->id ) ); if (!successful) { - g_logger().error("Failed to save account:[{}]", accInfo.id); + g_logger().error("Failed to save account:[{}]", accInfo->id); } return successful; }; +bool AccountRepositoryDB::getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) { + auto result = g_database().storeQuery(fmt::format("SELECT `id` FROM `players` WHERE `account_id` = {} AND `name` = {}", id, g_database().escapeString(name))); + if (!result) { + g_logger().error("Failed to get character: [{}] from account: [{}]!", name, id); + return false; + } + + return result->countResults() == 1; +} + bool AccountRepositoryDB::getPassword(const uint32_t &id, std::string &password) { auto result = g_database().storeQuery(fmt::format("SELECT * FROM `accounts` WHERE `id` = {}", id)); if (!result) { @@ -75,15 +85,18 @@ bool AccountRepositoryDB::getPassword(const uint32_t &id, std::string &password) return true; }; -bool AccountRepositoryDB::getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) { - if (coinTypeToColumn.find(type) == coinTypeToColumn.end()) { - g_logger().error("[{}]: invalid coin type:[{}]", __FUNCTION__, type); +bool AccountRepositoryDB::getCoins(const uint32_t &id, CoinType coinType, uint32_t &coins) { + auto it = coinTypeToColumn.find(coinType); + if (it == coinTypeToColumn.end()) { + g_logger().error("[{}] invalid coin type:[{}]", __FUNCTION__, coinType); return false; } - auto result = g_database().storeQuery(fmt::format( + auto column = it->second; + + const auto result = g_database().storeQuery(fmt::format( "SELECT `{}` FROM `accounts` WHERE `id` = {}", - coinTypeToColumn.at(type), + column, id )); @@ -91,20 +104,23 @@ bool AccountRepositoryDB::getCoins(const uint32_t &id, const uint8_t &type, uint return false; } - coins = result->getNumber(coinTypeToColumn.at(type)); + coins = result->getNumber(column); return true; }; -bool AccountRepositoryDB::setCoins(const uint32_t &id, const uint8_t &type, const uint32_t &amount) { - if (coinTypeToColumn.find(type) == coinTypeToColumn.end()) { - g_logger().error("[{}]: invalid coin type:[{}]", __FUNCTION__, type); +bool AccountRepositoryDB::setCoins(const uint32_t &id, CoinType coinType, const uint32_t &amount) { + auto it = coinTypeToColumn.find(coinType); + if (it == coinTypeToColumn.end()) { + g_logger().error("[{}]: invalid coin type:[{}]", __FUNCTION__, coinType); return false; } - bool successful = g_database().executeQuery(fmt::format( + auto column = it->second; + + const bool successful = g_database().executeQuery(fmt::format( "UPDATE `accounts` SET `{}` = {} WHERE `id` = {}", - coinTypeToColumn.at(type), + column, amount, id )); @@ -118,9 +134,9 @@ bool AccountRepositoryDB::setCoins(const uint32_t &id, const uint8_t &type, cons bool AccountRepositoryDB::registerCoinsTransaction( const uint32_t &id, - uint8_t type, + CoinTransactionType type, uint32_t coins, - const uint8_t &coinType, + CoinType coinType, const std::string &description ) { bool successful = g_database().executeQuery( @@ -148,13 +164,13 @@ bool AccountRepositoryDB::registerCoinsTransaction( return successful; }; -bool AccountRepositoryDB::loadAccountPlayers(AccountInfo &acc) { +bool AccountRepositoryDB::loadAccountPlayers(std::unique_ptr &acc) const { auto result = g_database().storeQuery( - fmt::format("SELECT `name`, `deletion` FROM `players` WHERE `account_id` = {} ORDER BY `name` ASC", acc.id) + fmt::format("SELECT `name`, `deletion` FROM `players` WHERE `account_id` = {} ORDER BY `name` ASC", acc->id) ); if (!result) { - g_logger().error("Failed to load account[{}] players!", acc.id); + g_logger().error("Failed to load account[{}] players!", acc->id); return false; } @@ -163,43 +179,43 @@ bool AccountRepositoryDB::loadAccountPlayers(AccountInfo &acc) { continue; } - acc.players.try_emplace({ result->getString("name"), result->getNumber("deletion") }); + acc->players.try_emplace({ result->getString("name"), result->getNumber("deletion") }); } while (result->next()); return true; } -bool AccountRepositoryDB::load(const std::string &query, AccountInfo &acc) { +bool AccountRepositoryDB::load(const std::string &query, std::unique_ptr &acc) { auto result = g_database().storeQuery(query); if (result == nullptr) { return false; } - acc.id = result->getNumber("id"); - acc.accountType = result->getNumber("type"); - acc.premiumLastDay = result->getNumber("lastday"); - acc.sessionExpires = result->getNumber("expires"); - acc.premiumDaysPurchased = result->getNumber("premdays_purchased"); - acc.creationTime = result->getNumber("creation"); - acc.premiumRemainingDays = acc.premiumLastDay > getTimeNow() ? (acc.premiumLastDay - getTimeNow()) / 86400 : 0; + acc->id = result->getNumber("id"); + acc->accountType = result->getNumber("type"); + acc->premiumLastDay = result->getNumber("lastday"); + acc->sessionExpires = result->getNumber("expires"); + acc->premiumDaysPurchased = result->getNumber("premdays_purchased"); + acc->creationTime = result->getNumber("creation"); + acc->premiumRemainingDays = acc->premiumLastDay > getTimeNow() ? (acc->premiumLastDay - getTimeNow()) / 86400 : 0; setupLoyaltyInfo(acc); return loadAccountPlayers(acc); } -void AccountRepositoryDB::setupLoyaltyInfo(AccountInfo &acc) { - if (acc.premiumDaysPurchased >= acc.premiumRemainingDays && acc.creationTime != 0) { +void AccountRepositoryDB::setupLoyaltyInfo(std::unique_ptr &acc) { + if (acc->premiumDaysPurchased >= acc->premiumRemainingDays && acc->creationTime != 0) { return; } - if (acc.premiumDaysPurchased < acc.premiumRemainingDays) { - acc.premiumDaysPurchased = acc.premiumRemainingDays; + if (acc->premiumDaysPurchased < acc->premiumRemainingDays) { + acc->premiumDaysPurchased = acc->premiumRemainingDays; } - if (acc.creationTime == 0) { - acc.creationTime = getTimeNow(); + if (acc->creationTime == 0) { + acc->creationTime = getTimeNow(); } save(acc); diff --git a/src/account/account_repository_db.hpp b/src/account/account_repository_db.hpp index 651600e3b..e7a11c15e 100644 --- a/src/account/account_repository_db.hpp +++ b/src/account/account_repository_db.hpp @@ -11,30 +11,36 @@ #include "account/account_repository.hpp" +enum class CoinType : uint8_t; +enum class CoinTransactionType : uint8_t; + class AccountRepositoryDB final : public AccountRepository { public: AccountRepositoryDB(); - bool loadByID(const uint32_t &id, AccountInfo &acc) override; - bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) override; - bool loadBySession(const std::string &esseionKey, AccountInfo &acc) override; - bool save(const AccountInfo &accInfo) override; + bool loadByID(const uint32_t &id, std::unique_ptr &acc) override; + bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, std::unique_ptr &acc) override; + bool loadBySession(const std::string &esseionKey, std::unique_ptr &acc) override; + bool save(const std::unique_ptr &accInfo) override; + + bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) override; bool getPassword(const uint32_t &id, std::string &password) override; - bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) override; - bool setCoins(const uint32_t &id, const uint8_t &type, const uint32_t &amount) override; + bool getCoins(const uint32_t &id, CoinType coinType, uint32_t &coins) override; + bool setCoins(const uint32_t &id, CoinType coinType, const uint32_t &amount) override; bool registerCoinsTransaction( const uint32_t &id, - uint8_t type, + CoinTransactionType type, uint32_t coins, - const uint8_t &coinType, + CoinType coinType, const std::string &description ) override; private: - const std::map coinTypeToColumn; - bool load(const std::string &query, AccountInfo &acc); - bool loadAccountPlayers(AccountInfo &acc); - void setupLoyaltyInfo(AccountInfo &acc); + std::unordered_map coinTypeToColumn {}; + + bool load(const std::string &query, std::unique_ptr &acc); + bool loadAccountPlayers(std::unique_ptr &acc) const; + void setupLoyaltyInfo(std::unique_ptr &acc); }; diff --git a/src/canary_server.cpp b/src/canary_server.cpp index ef1be1b1f..687fa51b6 100644 --- a/src/canary_server.cpp +++ b/src/canary_server.cpp @@ -7,19 +7,22 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "canary_server.hpp" -#include "declarations.hpp" +#include "config/configmanager.hpp" +#include "creatures/npcs/npcs.hpp" #include "creatures/players/grouping/familiars.hpp" +#include "creatures/players/imbuements/imbuements.hpp" #include "creatures/players/storages/storages.hpp" #include "database/databasemanager.hpp" +#include "declarations.hpp" #include "game/game.hpp" -#include "game/zones/zone.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/events_scheduler.hpp" +#include "game/zones/zone.hpp" +#include "io/io_bosstiary.hpp" #include "io/iomarket.hpp" +#include "io/ioprey.hpp" #include "lib/thread/thread_pool.hpp" #include "lua/creature/events.hpp" #include "lua/modules/modules.hpp" @@ -28,8 +31,6 @@ #include "server/network/protocol/protocollogin.hpp" #include "server/network/protocol/protocolstatus.hpp" #include "server/network/webhook/webhook.hpp" -#include "io/ioprey.hpp" -#include "io/io_bosstiary.hpp" #include "core.hpp" @@ -60,16 +61,16 @@ int CanaryServer::run() { try { loadConfigLua(); - logger.info("Server protocol: {}.{}{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER, g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__) ? " and 10x allowed!" : ""); + logger.info("Server protocol: {}.{}{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER, g_configManager().getBoolean(OLD_PROTOCOL) ? " and 10x allowed!" : ""); #ifdef FEATURE_METRICS metrics::Options metricsOptions; - metricsOptions.enablePrometheusExporter = g_configManager().getBoolean(METRICS_ENABLE_PROMETHEUS, __FUNCTION__); + metricsOptions.enablePrometheusExporter = g_configManager().getBoolean(METRICS_ENABLE_PROMETHEUS); if (metricsOptions.enablePrometheusExporter) { - metricsOptions.prometheusOptions.url = g_configManager().getString(METRICS_PROMETHEUS_ADDRESS, __FUNCTION__); + metricsOptions.prometheusOptions.url = g_configManager().getString(METRICS_PROMETHEUS_ADDRESS); } - metricsOptions.enableOStreamExporter = g_configManager().getBoolean(METRICS_ENABLE_OSTREAM, __FUNCTION__); + metricsOptions.enableOStreamExporter = g_configManager().getBoolean(METRICS_ENABLE_OSTREAM); if (metricsOptions.enableOStreamExporter) { - metricsOptions.ostreamOptions.export_interval_millis = std::chrono::milliseconds(g_configManager().getNumber(METRICS_OSTREAM_INTERVAL, __FUNCTION__)); + metricsOptions.ostreamOptions.export_interval_millis = std::chrono::milliseconds(g_configManager().getNumber(METRICS_OSTREAM_INTERVAL)); } g_metrics().init(metricsOptions); #endif @@ -99,8 +100,7 @@ int CanaryServer::run() { #endif g_game().start(&serviceManager); - g_game().setGameState(GAME_STATE_NORMAL); - if (g_configManager().getBoolean(TOGGLE_MAINTAIN_MODE, __FUNCTION__)) { + if (g_configManager().getBoolean(TOGGLE_MAINTAIN_MODE)) { g_game().setGameState(GAME_STATE_CLOSED); g_logger().warn("Initialized in maintain mode!"); g_webhook().sendMessage(":yellow_square: Server is now **online** _(access restricted to staff)_"); @@ -123,7 +123,7 @@ int CanaryServer::run() { loaderStatus.notify_one(); }, - "CanaryServer::run" + __FUNCTION__ ); loaderStatus.wait(LoaderStatus::LOADING); @@ -134,7 +134,8 @@ int CanaryServer::run() { return EXIT_FAILURE; } - logger.info("{} {}", g_configManager().getString(SERVER_NAME, __FUNCTION__), "server online!"); + logger.info("{} {}", g_configManager().getString(SERVER_NAME), "server online!"); + g_logger().setLevel(g_configManager().getString(LOGLEVEL)); serviceManager.run(); @@ -143,7 +144,7 @@ int CanaryServer::run() { } void CanaryServer::setWorldType() { - const std::string worldType = asLowerCaseString(g_configManager().getString(WORLD_TYPE, __FUNCTION__)); + const std::string worldType = asLowerCaseString(g_configManager().getString(WORLD_TYPE)); if (worldType == "pvp") { g_game().setWorldType(WORLD_TYPE_PVP); } else if (worldType == "no-pvp") { @@ -154,7 +155,7 @@ void CanaryServer::setWorldType() { throw FailedToInitializeCanary( fmt::format( "Unknown world type: {}, valid world types are: pvp, no-pvp and pvp-enforced", - g_configManager().getString(WORLD_TYPE, __FUNCTION__) + g_configManager().getString(WORLD_TYPE) ) ); } @@ -164,11 +165,11 @@ void CanaryServer::setWorldType() { void CanaryServer::loadMaps() const { try { - g_game().loadMainMap(g_configManager().getString(MAP_NAME, __FUNCTION__)); + g_game().loadMainMap(g_configManager().getString(MAP_NAME)); // If "mapCustomEnabled" is true on config.lua, then load the custom map - if (g_configManager().getBoolean(TOGGLE_MAP_CUSTOM, __FUNCTION__)) { - g_game().loadCustomMaps(g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/world/custom/"); + if (g_configManager().getBoolean(TOGGLE_MAP_CUSTOM)) { + g_game().loadCustomMaps(g_configManager().getString(DATA_DIRECTORY) + "/world/custom/"); } Zone::refreshAll(); } catch (const std::exception &err) { @@ -178,7 +179,7 @@ void CanaryServer::loadMaps() const { void CanaryServer::setupHousesRent() { RentPeriod_t rentPeriod; - std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD, __FUNCTION__)); + std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD)); if (strRentPeriod == "yearly") { rentPeriod = RENTPERIOD_YEARLY; @@ -205,16 +206,15 @@ void CanaryServer::logInfos() { logger.info("{} - Version {}", ProtocolStatus::SERVER_NAME, SERVER_RELEASE_VERSION); #endif - logger.debug("Compiled with {}, on {} {}, for platform {}\n", getCompiler(), __DATE__, __TIME__, getPlatform()); + logger.debug("Compiled with {}, on {} {}, for platform {}", getCompiler(), __DATE__, __TIME__, getPlatform()); #if defined(LUAJIT_VERSION) logger.debug("Linked with {} for Lua support", LUAJIT_VERSION); #endif logger.info("A server developed by: {}", ProtocolStatus::SERVER_DEVELOPERS); - logger.info("Visit our website for updates, support, and resources: \n" - "https://docs.opentibiabr.com/home/welcome/ \n" - "https://github.com/mattyx14/otxserver/\n"); + logger.info("Visit our website for updates, support, and resources: " + "https://docs.opentibiabr.com/"); } /** @@ -292,7 +292,7 @@ void CanaryServer::loadConfigLua() { modulesLoadHelper(g_configManager().load(), g_configManager().getConfigFileLua()); #ifdef _WIN32 - const std::string &defaultPriority = g_configManager().getString(DEFAULT_PRIORITY, __FUNCTION__); + const std::string &defaultPriority = g_configManager().getString(DEFAULT_PRIORITY); if (strcasecmp(defaultPriority.c_str(), "high") == 0) { SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); } else if (strcasecmp(defaultPriority.c_str(), "above-normal") == 0) { @@ -318,7 +318,7 @@ void CanaryServer::initializeDatabase() { DatabaseManager::updateDatabase(); - if (g_configManager().getBoolean(OPTIMIZE_DATABASE, __FUNCTION__) + if (g_configManager().getBoolean(OPTIMIZE_DATABASE) && !DatabaseManager::optimizeTables()) { logger.debug("No tables were optimized"); } @@ -326,8 +326,8 @@ void CanaryServer::initializeDatabase() { void CanaryServer::loadModules() { // If "USE_ANY_DATAPACK_FOLDER" is set to true then you can choose any datapack folder for your server - const auto useAnyDatapack = g_configManager().getBoolean(USE_ANY_DATAPACK_FOLDER, __FUNCTION__); - auto datapackName = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); + const auto useAnyDatapack = g_configManager().getBoolean(USE_ANY_DATAPACK_FOLDER); + auto datapackName = g_configManager().getString(DATA_DIRECTORY); if (!useAnyDatapack && datapackName != "data-canary" && datapackName != "data-otservbr-global") { throw FailedToInitializeCanary(fmt::format( "The datapack folder name '{}' is wrong, please select valid " @@ -342,7 +342,7 @@ void CanaryServer::loadModules() { g_luaEnvironment().initState(); } - auto coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + auto coreFolder = g_configManager().getString(CORE_DIRECTORY); // Load appearances.dat first modulesLoadHelper((g_game().loadAppearanceProtobuf(coreFolder + "/items/appearances.dat") == ERROR_NONE), "appearances.dat"); @@ -356,7 +356,7 @@ void CanaryServer::loadModules() { modulesLoadHelper(Item::items.loadFromXml(), "items.xml"); - const auto datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); + const auto datapackFolder = g_configManager().getString(DATA_DIRECTORY); logger.debug("Loading core scripts on folder: {}/", coreFolder); // Load first core Lua libs modulesLoadHelper((g_luaEnvironment().loadFile(coreFolder + "/core.lua", "core.lua") == 0), "core.lua"); @@ -368,6 +368,7 @@ void CanaryServer::loadModules() { modulesLoadHelper(g_modules().loadFromXml(), "modules/modules.xml"); logger.debug("Loading datapack scripts on folder: {}/", datapackName); + modulesLoadHelper(g_scripts().loadScripts(datapackFolder + "/scripts/lib", true, false), datapackFolder + "/scripts/libs"); // Load scripts modulesLoadHelper(g_scripts().loadScripts(datapackFolder + "/scripts", false, false), datapackFolder + "/scripts"); // Load monsters diff --git a/src/config/config_enums.hpp b/src/config/config_enums.hpp index bf4805050..559045fdb 100644 --- a/src/config/config_enums.hpp +++ b/src/config/config_enums.hpp @@ -142,6 +142,7 @@ enum ConfigKey_t : uint16_t { MAX_ALLOWED_ON_A_DUMMY, MAX_CONTAINER_ITEM, MAX_CONTAINER, + MAX_CONTAINER_DEPTH, MAX_DAMAGE_REFLECTION, MAX_ELEMENTAL_RESISTANCE, MAX_MARKET_OFFERS_AT_A_TIME_PER_PLAYER, @@ -157,7 +158,7 @@ enum ConfigKey_t : uint16_t { METRICS_PROMETHEUS_ADDRESS, MIN_DELAY_BETWEEN_CONDITIONS, MIN_ELEMENTAL_RESISTANCE, - MIN_TOWN_ID_TO_BANK_TRANSFER, + MIN_TOWN_ID_TO_BANK_TRANSFER_FROM_MAIN, MOMENTUM_CHANCE_FORMULA_A, MOMENTUM_CHANCE_FORMULA_B, MOMENTUM_CHANCE_FORMULA_C, diff --git a/src/config/configmanager.cpp b/src/config/configmanager.cpp index 6390d0699..1c00df76c 100644 --- a/src/config/configmanager.cpp +++ b/src/config/configmanager.cpp @@ -7,12 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "config/configmanager.hpp" + #include "lib/di/container.hpp" #include "game/game.hpp" #include "server/network/webhook/webhook.hpp" +#include "utils/tools.hpp" #if LUA_VERSION_NUM >= 502 #undef lua_strlen @@ -37,10 +37,6 @@ bool ConfigManager::load() { return false; } -#ifndef DEBUG_LOG - g_logger().setLevel(loadStringConfig(L, LOGLEVEL, "logLevel", "info")); -#endif - // Parse config // Info that must be loaded one time (unless we reset the modules involved) if (!loaded) { @@ -271,6 +267,7 @@ bool ConfigManager::load() { loadIntConfig(L, MAX_ALLOWED_ON_A_DUMMY, "maxAllowedOnADummy", 1); loadIntConfig(L, MAX_CONTAINER_ITEM, "maxItem", 5000); loadIntConfig(L, MAX_CONTAINER, "maxContainer", 500); + loadIntConfig(L, MAX_CONTAINER_DEPTH, "maxContainerDepth", 200); loadIntConfig(L, MAX_DAMAGE_REFLECTION, "maxDamageReflection", 200); loadIntConfig(L, MAX_ELEMENTAL_RESISTANCE, "maxElementalResistance", 200); loadIntConfig(L, MAX_MARKET_OFFERS_AT_A_TIME_PER_PLAYER, "maxMarketOffersAtATimePerPlayer", 100); @@ -283,7 +280,7 @@ bool ConfigManager::load() { loadIntConfig(L, METRICS_OSTREAM_INTERVAL, "metricsOstreamInterval", 1000); loadIntConfig(L, MIN_DELAY_BETWEEN_CONDITIONS, "minDelayBetweenConditions", 0); loadIntConfig(L, MIN_ELEMENTAL_RESISTANCE, "minElementalResistance", -200); - loadIntConfig(L, MIN_TOWN_ID_TO_BANK_TRANSFER, "minTownIdToBankTransfer", 3); + loadIntConfig(L, MIN_TOWN_ID_TO_BANK_TRANSFER_FROM_MAIN, "minTownIdToBankTransferFromMain", 4); loadIntConfig(L, MONTH_KILLS_TO_RED, "monthKillsToRedSkull", 10); loadIntConfig(L, MULTIPLIER_ATTACKONFIST, "multiplierSpeedOnFist", 5); loadIntConfig(L, ORANGE_SKULL_DURATION, "orangeSkullDuration", 7); @@ -364,6 +361,7 @@ bool ConfigManager::load() { loadStringConfig(L, TIBIADROME_CONCOCTION_TICK_TYPE, "tibiadromeConcoctionTickType", "online"); loadStringConfig(L, URL, "url", ""); loadStringConfig(L, WORLD_TYPE, "worldType", "pvp"); + loadStringConfig(L, LOGLEVEL, "logLevel", "info"); loaded = true; lua_close(L); @@ -372,14 +370,14 @@ bool ConfigManager::load() { bool ConfigManager::reload() { const bool result = load(); - if (transformToSHA1(getString(SERVER_MOTD, __FUNCTION__)) != g_game().getMotdHash()) { + if (transformToSHA1(getString(SERVER_MOTD)) != g_game().getMotdHash()) { g_game().incrementMotdNum(); } return result; } void ConfigManager::missingConfigWarning(const char* identifier) { - g_logger().warn("[{}]: Missing configuration for identifier: {}", __FUNCTION__, identifier); + g_logger().debug("[{}]: Missing configuration for identifier: {}", __FUNCTION__, identifier); } std::string ConfigManager::loadStringConfig(lua_State* L, const ConfigKey_t &key, const char* identifier, const std::string &defaultValue) { @@ -434,35 +432,35 @@ float ConfigManager::loadFloatConfig(lua_State* L, const ConfigKey_t &key, const return value; } -const std::string &ConfigManager::getString(const ConfigKey_t &key, std::string_view context) const { +const std::string &ConfigManager::getString(const ConfigKey_t &key, const std::source_location &location /*= std::source_location::current()*/) const { static const std::string dummyStr; if (configs.contains(key) && std::holds_alternative(configs.at(key))) { return std::get(configs.at(key)); } - g_logger().warn("[ConfigManager::getString] - Accessing invalid or wrong type index: {}[{}], Function: {}", magic_enum::enum_name(key), fmt::underlying(key), context); + g_logger().warn("[{}] accessing invalid or wrong type index: {}[{}]. Called line: {}:{}, in {}", __FUNCTION__, magic_enum::enum_name(key), fmt::underlying(key), location.line(), location.column(), location.function_name()); return dummyStr; } -int32_t ConfigManager::getNumber(const ConfigKey_t &key, std::string_view context) const { +int32_t ConfigManager::getNumber(const ConfigKey_t &key, const std::source_location &location /*= std::source_location::current()*/) const { if (configs.contains(key) && std::holds_alternative(configs.at(key))) { return std::get(configs.at(key)); } - g_logger().warn("[ConfigManager::getNumber] - Accessing invalid or wrong type index: {}[{}], Function: {}", magic_enum::enum_name(key), fmt::underlying(key), context); + g_logger().warn("[{}] accessing invalid or wrong type index: {}[{}]. Called line: {}:{}, in {}", __FUNCTION__, magic_enum::enum_name(key), fmt::underlying(key), location.line(), location.column(), location.function_name()); return 0; } -bool ConfigManager::getBoolean(const ConfigKey_t &key, std::string_view context) const { +bool ConfigManager::getBoolean(const ConfigKey_t &key, const std::source_location &location /*= std::source_location::current()*/) const { if (configs.contains(key) && std::holds_alternative(configs.at(key))) { return std::get(configs.at(key)); } - g_logger().warn("[ConfigManager::getBoolean] - Accessing invalid or wrong type index: {}[{}], Function: {}", magic_enum::enum_name(key), fmt::underlying(key), context); + g_logger().warn("[{}] accessing invalid or wrong type index: {}[{}]. Called line: {}:{}, in {}", __FUNCTION__, magic_enum::enum_name(key), fmt::underlying(key), location.line(), location.column(), location.function_name()); return false; } -float ConfigManager::getFloat(const ConfigKey_t &key, std::string_view context) const { +float ConfigManager::getFloat(const ConfigKey_t &key, const std::source_location &location /*= std::source_location::current()*/) const { if (configs.contains(key) && std::holds_alternative(configs.at(key))) { return std::get(configs.at(key)); } - g_logger().warn("[ConfigManager::getFloat] - Accessing invalid or wrong type index: {}[{}], Function: {}", magic_enum::enum_name(key), fmt::underlying(key), context); + g_logger().warn("[{}] accessing invalid or wrong type index: {}[{}]. Called line: {}:{}, in {}", __FUNCTION__, magic_enum::enum_name(key), fmt::underlying(key), location.line(), location.column(), location.function_name()); return 0.0f; } diff --git a/src/config/configmanager.hpp b/src/config/configmanager.hpp index 2a0c08619..ddc15e45e 100644 --- a/src/config/configmanager.hpp +++ b/src/config/configmanager.hpp @@ -36,10 +36,10 @@ class ConfigManager { return configFileLua; }; - [[nodiscard]] const std::string &getString(const ConfigKey_t &key, std::string_view context) const; - [[nodiscard]] int32_t getNumber(const ConfigKey_t &key, std::string_view context) const; - [[nodiscard]] bool getBoolean(const ConfigKey_t &key, std::string_view context) const; - [[nodiscard]] float getFloat(const ConfigKey_t &key, std::string_view context) const; + [[nodiscard]] const std::string &getString(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const; + [[nodiscard]] int32_t getNumber(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const; + [[nodiscard]] bool getBoolean(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const; + [[nodiscard]] float getFloat(const ConfigKey_t &key, const std::source_location &location = std::source_location::current()) const; private: phmap::flat_hash_map configs; diff --git a/src/core.hpp b/src/core.hpp index 5802c4966..635211884 100644 --- a/src/core.hpp +++ b/src/core.hpp @@ -14,8 +14,8 @@ static constexpr auto AUTHENTICATOR_PERIOD = 30U; // SERVER_MAJOR_VERSION is the actual full version of the server, including minor and patch numbers. // This is intended for internal use to identify the exact state of the server (release) software. -static constexpr auto SERVER_RELEASE_VERSION = "6.2"; -static constexpr auto CLIENT_VERSION = 1332; +static constexpr auto SERVER_RELEASE_VERSION = "3.1.2"; +static constexpr auto CLIENT_VERSION = 1340; #define CLIENT_VERSION_UPPER (CLIENT_VERSION / 100) #define CLIENT_VERSION_LOWER (CLIENT_VERSION % 100) diff --git a/src/creatures/appearance/mounts/mounts.cpp b/src/creatures/appearance/mounts/mounts.cpp index 7014d0b02..4b40d3835 100644 --- a/src/creatures/appearance/mounts/mounts.cpp +++ b/src/creatures/appearance/mounts/mounts.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/appearance/mounts/mounts.hpp" + +#include "config/configmanager.hpp" #include "game/game.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" @@ -21,7 +21,7 @@ bool Mounts::reload() { bool Mounts::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/mounts.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/mounts.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); @@ -30,7 +30,7 @@ bool Mounts::loadFromXml() { for (auto mountNode : doc.child("mounts").children()) { auto lookType = pugi::cast(mountNode.attribute("clientid").value()); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && 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 251bf7bde..4910f937b 100644 --- a/src/creatures/appearance/outfit/outfit.cpp +++ b/src/creatures/appearance/outfit/outfit.cpp @@ -7,12 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/appearance/outfit/outfit.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/player.hpp" +#include "game/game.hpp" +#include "lib/di/container.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" -#include "game/game.hpp" + +std::vector> outfits[PLAYERSEX_LAST + 1]; Outfits &Outfits::getInstance() { return inject(); @@ -27,7 +31,7 @@ bool Outfits::reload() { bool Outfits::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/outfits.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/outfits.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); @@ -58,7 +62,7 @@ bool Outfits::loadFromXml() { } if (auto lookType = pugi::cast(lookTypeAttribute.value()); - g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 + g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && 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; @@ -103,3 +107,17 @@ std::shared_ptr Outfits::getOutfitByLookType(const std::shared_ptr> &Outfits::getOutfits(PlayerSex_t sex) const { + return outfits[sex]; +} + +std::shared_ptr Outfits::getOutfitByName(PlayerSex_t sex, const std::string &name) const { + for (const auto &outfit : outfits[sex]) { + if (outfit->name == name) { + return outfit; + } + } + + return nullptr; +} diff --git a/src/creatures/appearance/outfit/outfit.hpp b/src/creatures/appearance/outfit/outfit.hpp index 0d89a2c93..2d9488449 100644 --- a/src/creatures/appearance/outfit/outfit.hpp +++ b/src/creatures/appearance/outfit/outfit.hpp @@ -9,9 +9,7 @@ #pragma once -#include "declarations.hpp" -#include "lib/di/container.hpp" - +enum PlayerSex_t : uint8_t; class Player; struct OutfitEntry { @@ -50,10 +48,7 @@ class Outfits { bool loadFromXml(); [[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]; - } + [[nodiscard]] const std::vector> &getOutfits(PlayerSex_t sex) const; -private: - std::vector> outfits[PLAYERSEX_LAST + 1]; + std::shared_ptr getOutfitByName(PlayerSex_t sex, const std::string &name) const; }; diff --git a/src/creatures/combat/combat.cpp b/src/creatures/combat/combat.cpp index 8e3de0da1..a63f42093 100644 --- a/src/creatures/combat/combat.cpp +++ b/src/creatures/combat/combat.cpp @@ -7,24 +7,28 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "declarations.hpp" #include "creatures/combat/combat.hpp" -#include "lua/creature/events.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/combat/spells.hpp" +#include "creatures/monsters/monster.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/players/grouping/party.hpp" +#include "creatures/players/imbuements/imbuements.hpp" #include "creatures/players/wheel/player_wheel.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "io/iobestiary.hpp" -#include "creatures/monsters/monster.hpp" -#include "creatures/monsters/monsters.hpp" +#include "io/ioprey.hpp" #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" +#include "lua/creature/events.hpp" +#include "map/spectators.hpp" -int32_t Combat::getLevelFormula(std::shared_ptr player, const std::shared_ptr wheelSpell, const CombatDamage &damage) const { +int32_t Combat::getLevelFormula(const std::shared_ptr &player, const std::shared_ptr &wheelSpell, const CombatDamage &damage) const { if (!player) { return 0; } @@ -43,7 +47,7 @@ int32_t Combat::getLevelFormula(std::shared_ptr player, const std::share return levelFormula; } -CombatDamage Combat::getCombatDamage(std::shared_ptr creature, std::shared_ptr target) const { +CombatDamage Combat::getCombatDamage(const std::shared_ptr &creature, const std::shared_ptr &target) const { CombatDamage damage; damage.origin = params.origin; damage.primary.type = params.combatType; @@ -66,7 +70,7 @@ CombatDamage Combat::getCombatDamage(std::shared_ptr creature, std::sh int32_t min, max; if (creature->getCombatValues(min, max)) { damage.primary.value = normal_random(min, max); - } else if (std::shared_ptr player = creature->getPlayer()) { + } else if (const auto &player = creature->getPlayer()) { if (params.valueCallback) { params.valueCallback->getMinMaxValues(player, damage, params.useCharges); } else if (formulaType == COMBAT_FORMULA_LEVELMAGIC) { @@ -76,8 +80,8 @@ CombatDamage Combat::getCombatDamage(std::shared_ptr creature, std::sh static_cast(levelFormula * maxa + maxb) ); } else if (formulaType == COMBAT_FORMULA_SKILL) { - std::shared_ptr tool = player->getWeapon(); - const WeaponShared_ptr weapon = g_weapons().getWeapon(tool); + const auto &tool = player->getWeapon(); + const WeaponShared_ptr &weapon = g_weapons().getWeapon(tool); if (weapon) { damage.primary.value = normal_random( static_cast(minb), @@ -184,7 +188,7 @@ ConditionType_t Combat::DamageToConditionType(CombatType_t type) { } } -bool Combat::isPlayerCombat(std::shared_ptr target) { +bool Combat::isPlayerCombat(const std::shared_ptr &target) { if (target->getPlayer()) { return true; } @@ -196,7 +200,7 @@ bool Combat::isPlayerCombat(std::shared_ptr target) { return false; } -ReturnValue Combat::canTargetCreature(std::shared_ptr player, std::shared_ptr target) { +ReturnValue Combat::canTargetCreature(const std::shared_ptr &player, const std::shared_ptr &target) { if (player == target) { return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER; } @@ -241,10 +245,10 @@ ReturnValue Combat::canTargetCreature(std::shared_ptr player, std::share } } - return Combat::canDoCombat(player, target, true); + return canDoCombat(player, target, true); } -ReturnValue Combat::canDoCombat(std::shared_ptr caster, std::shared_ptr tile, bool aggressive) { +ReturnValue Combat::canDoCombat(const std::shared_ptr &caster, const std::shared_ptr &tile, bool aggressive) { if (tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { return RETURNVALUE_NOTENOUGHROOM; } @@ -269,7 +273,7 @@ ReturnValue Combat::canDoCombat(std::shared_ptr caster, std::shared_pt return RETURNVALUE_FIRSTGOUPSTAIRS; } - if (std::shared_ptr player = caster->getPlayer()) { + if (const auto &player = caster->getPlayer()) { if (player->hasFlag(PlayerFlags_t::IgnoreProtectionZone)) { return RETURNVALUE_NOERROR; } @@ -282,12 +286,12 @@ ReturnValue Combat::canDoCombat(std::shared_ptr caster, std::shared_pt return ret; } -bool Combat::isInPvpZone(std::shared_ptr attacker, std::shared_ptr target) { +bool Combat::isInPvpZone(const std::shared_ptr &attacker, const std::shared_ptr &target) { return attacker->getZoneType() == ZONE_PVP && target->getZoneType() == ZONE_PVP; } -bool Combat::isProtected(std::shared_ptr attacker, std::shared_ptr target) { - uint32_t protectionLevel = g_configManager().getNumber(PROTECTION_LEVEL, __FUNCTION__); +bool Combat::isProtected(const std::shared_ptr &attacker, const std::shared_ptr &target) { + uint32_t protectionLevel = g_configManager().getNumber(PROTECTION_LEVEL); if (target->getLevel() < protectionLevel || attacker->getLevel() < protectionLevel) { return true; } @@ -303,33 +307,33 @@ bool Combat::isProtected(std::shared_ptr attacker, std::shared_ptr attacker, std::shared_ptr target, bool aggressive) { +ReturnValue Combat::canDoCombat(const std::shared_ptr &attacker, const std::shared_ptr &target, bool aggressive) { if (!aggressive) { return RETURNVALUE_NOERROR; } - auto targetPlayer = target ? target->getPlayer() : nullptr; + const auto &targetPlayer = target ? target->getPlayer() : nullptr; if (target) { - std::shared_ptr tile = target->getTile(); + const std::shared_ptr &tile = target->getTile(); if (tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { return RETURNVALUE_NOTENOUGHROOM; } - if (tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - auto permittedOnPz = targetPlayer ? targetPlayer->hasPermittedConditionInPZ() : false; + if (targetPlayer && tile->hasFlag(TILESTATE_PROTECTIONZONE)) { + const auto permittedOnPz = targetPlayer->hasPermittedConditionInPZ(); return permittedOnPz ? RETURNVALUE_NOERROR : RETURNVALUE_ACTIONNOTPERMITTEDINPROTECTIONZONE; } } if (attacker) { - const std::shared_ptr attackerMaster = attacker->getMaster(); + const auto &attackerMaster = attacker->getMaster(); + const auto &attackerPlayer = attacker->getPlayer(); if (targetPlayer) { if (targetPlayer->hasFlag(PlayerFlags_t::CannotBeAttacked)) { return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER; } - const std::shared_ptr targetPlayerTile = targetPlayer->getTile(); - - if (const std::shared_ptr attackerPlayer = attacker->getPlayer()) { + const auto &targetPlayerTile = targetPlayer->getTile(); + if (attackerPlayer) { if (attackerPlayer->hasFlag(PlayerFlags_t::CannotAttackPlayer)) { return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER; } @@ -339,7 +343,7 @@ ReturnValue Combat::canDoCombat(std::shared_ptr attacker, std::shared_ } // nopvp-zone - auto attackerTile = attackerPlayer->getTile(); + const auto &attackerTile = attackerPlayer->getTile(); if (targetPlayerTile && targetPlayerTile->hasFlag(TILESTATE_NOPVPZONE)) { return RETURNVALUE_ACTIONNOTPERMITTEDINANOPVPZONE; } else if (attackerTile && attackerTile->hasFlag(TILESTATE_NOPVPZONE) && targetPlayerTile && !targetPlayerTile->hasFlag(TILESTATE_NOPVPZONE | TILESTATE_PROTECTIONZONE)) { @@ -352,7 +356,7 @@ ReturnValue Combat::canDoCombat(std::shared_ptr attacker, std::shared_ } if (attackerMaster) { - if (const std::shared_ptr masterAttackerPlayer = attackerMaster->getPlayer()) { + if (const auto &masterAttackerPlayer = attackerMaster->getPlayer()) { if (masterAttackerPlayer->hasFlag(PlayerFlags_t::CannotAttackPlayer)) { return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER; } @@ -377,7 +381,7 @@ ReturnValue Combat::canDoCombat(std::shared_ptr attacker, std::shared_ return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE; } - if (const std::shared_ptr attackerPlayer = attacker->getPlayer()) { + if (attackerPlayer) { if (attackerPlayer->hasFlag(PlayerFlags_t::CannotAttackMonster)) { return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE; } @@ -386,7 +390,7 @@ ReturnValue Combat::canDoCombat(std::shared_ptr attacker, std::shared_ return RETURNVALUE_ACTIONNOTPERMITTEDINANOPVPZONE; } } else if (attacker->getMonster()) { - const std::shared_ptr targetMaster = target->getMaster(); + const auto &targetMaster = target->getMaster(); if ((!targetMaster || !targetMaster->getPlayer()) && attacker->getFaction() == FACTION_DEFAULT) { if (!attackerMaster || !attackerMaster->getPlayer()) { @@ -429,6 +433,14 @@ void Combat::setPlayerCombatValues(formulaType_t newFormulaType, double newMina, this->maxb = newMaxb; } +void Combat::postCombatEffects(const std::shared_ptr &caster, const Position &origin, const Position &pos) const { + postCombatEffects(caster, origin, pos, params); +} + +void Combat::setOrigin(CombatOrigin origin) { + params.origin = origin; +} + bool Combat::setParam(CombatParam_t param, uint32_t value) { switch (param) { case COMBAT_PARAM_TYPE: { @@ -499,6 +511,18 @@ bool Combat::setParam(CombatParam_t param, uint32_t value) { return false; } +void Combat::setArea(std::unique_ptr &newArea) { + this->area = std::move(newArea); +} + +bool Combat::hasArea() const { + return area != nullptr; +} + +void Combat::addCondition(const std::shared_ptr &condition) { + params.conditionList.emplace_back(condition); +} + bool Combat::setCallback(CallBackParam_t key) { switch (key) { case CALLBACK_PARAM_LEVELMAGICVALUE: { @@ -540,7 +564,7 @@ void Combat::setChainCallback(uint8_t chainTargets, uint8_t chainDistance, bool g_logger().trace("ChainCallback created: {}, with targets: {}, distance: {}, backtracking: {}", params.chainCallback != nullptr, chainTargets, chainDistance, backtracking); } -CallBack* Combat::getCallback(CallBackParam_t key) { +CallBack* Combat::getCallback(CallBackParam_t key) const { switch (key) { case CALLBACK_PARAM_LEVELMAGICVALUE: case CALLBACK_PARAM_SKILLVALUE: { @@ -566,7 +590,7 @@ CallBack* Combat::getCallback(CallBackParam_t key) { return nullptr; } -void Combat::CombatHealthFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data) { +void Combat::CombatHealthFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data) { if (!data) { g_logger().error("[{}]: CombatDamage is nullptr", __FUNCTION__); return; @@ -595,10 +619,15 @@ void Combat::CombatHealthFunc(std::shared_ptr caster, std::shared_ptr< targetPlayer = target->getPlayer(); } + g_logger().trace("[{}] (old) eventcallback: 'creatureOnCombat', damage primary: '{}', secondary: '{}'", __FUNCTION__, damage.primary.value, damage.secondary.value); + g_callbacks().executeCallback(EventCallback_t::creatureOnCombat, &EventCallback::creatureOnCombat, caster, target, std::ref(damage)); + g_logger().trace("[{}] (new) eventcallback: 'creatureOnCombat', damage primary: '{}', secondary: '{}'", __FUNCTION__, damage.primary.value, damage.secondary.value); + if (attackerPlayer) { - std::shared_ptr item = attackerPlayer->getWeapon(); + const auto &item = attackerPlayer->getWeapon(); damage = applyImbuementElementalDamage(attackerPlayer, item, damage); g_events().eventPlayerOnCombat(attackerPlayer, target, item, damage); + g_callbacks().executeCallback(EventCallback_t::playerOnCombat, &EventCallback::playerOnCombat, attackerPlayer, target, item, std::ref(damage)); if (targetPlayer && targetPlayer->getSkull() != SKULL_BLACK) { if (damage.primary.type != COMBAT_HEALING) { @@ -619,16 +648,19 @@ void Combat::CombatHealthFunc(std::shared_ptr caster, std::shared_ptr< // Player attacking monster if (attackerPlayer && targetMonster) { - const std::unique_ptr &slot = attackerPlayer->getPreyWithMonster(targetMonster->getRaceId()); + const auto &slot = attackerPlayer->getPreyWithMonster(targetMonster->getRaceId()); if (slot && slot->isOccupied() && slot->bonus == PreyBonus_Damage && slot->bonusTimeLeft > 0) { damage.primary.value += static_cast(std::ceil((damage.primary.value * slot->bonusPercentage) / 100)); damage.secondary.value += static_cast(std::ceil((damage.secondary.value * slot->bonusPercentage) / 100)); } + + // Monster type onPlayerAttack event + targetMonster->onAttackedByPlayer(attackerPlayer); } // Monster attacking player if (attackerMonster && targetPlayer) { - const std::unique_ptr &slot = targetPlayer->getPreyWithMonster(attackerMonster->getRaceId()); + const auto &slot = targetPlayer->getPreyWithMonster(attackerMonster->getRaceId()); if (slot && slot->isOccupied() && slot->bonus == PreyBonus_Defense && slot->bonusTimeLeft > 0) { damage.primary.value -= static_cast(std::ceil((damage.primary.value * slot->bonusPercentage) / 100)); damage.secondary.value -= static_cast(std::ceil((damage.secondary.value * slot->bonusPercentage) / 100)); @@ -641,7 +673,7 @@ void Combat::CombatHealthFunc(std::shared_ptr caster, std::shared_ptr< } } -CombatDamage Combat::applyImbuementElementalDamage(std::shared_ptr attackerPlayer, std::shared_ptr item, CombatDamage damage) { +CombatDamage Combat::applyImbuementElementalDamage(const std::shared_ptr &attackerPlayer, std::shared_ptr item, CombatDamage damage) { if (!item) { return damage; } @@ -683,7 +715,7 @@ CombatDamage Combat::applyImbuementElementalDamage(std::shared_ptr attac return damage; } -void Combat::CombatManaFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data) { +void Combat::CombatManaFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data) { if (!data) { g_logger().error("[{}]: CombatDamage is nullptr", __FUNCTION__); return; @@ -702,7 +734,7 @@ void Combat::CombatManaFunc(std::shared_ptr caster, std::shared_ptr player) { +bool Combat::checkFearConditionAffected(const std::shared_ptr &player) { if (player->isImmuneFear()) { return false; } @@ -711,7 +743,7 @@ bool Combat::checkFearConditionAffected(std::shared_ptr player) { return false; } - auto party = player->getParty(); + const auto &party = player->getParty(); if (party) { auto affectedCount = (party->getMemberCount() + 5) / 5; g_logger().debug("[{}] Player is member of a party, {} members can be feared", __FUNCTION__, affectedCount); @@ -730,7 +762,7 @@ bool Combat::checkFearConditionAffected(std::shared_ptr player) { return true; } -void Combat::CombatConditionFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data) { +void Combat::CombatConditionFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data) { if (params.origin == ORIGIN_MELEE && data && data->primary.value == 0 && data->secondary.value == 0) { return; } @@ -748,7 +780,7 @@ void Combat::CombatConditionFunc(std::shared_ptr caster, std::shared_p } else if (caster && caster->getMonster()) { uint16_t playerCharmRaceid = player->parseRacebyCharm(CHARM_CLEANSE, false, 0); if (playerCharmRaceid != 0) { - const auto mType = g_monsters().getMonsterType(caster->getName()); + const auto &mType = g_monsters().getMonsterType(caster->getName()); if (mType && playerCharmRaceid == mType->info.raceid) { const auto charm = g_iobestiary().getBestiaryCharm(CHARM_CLEANSE); if (charm && (charm->chance > normal_random(0, 100))) { @@ -783,18 +815,18 @@ void Combat::CombatConditionFunc(std::shared_ptr caster, std::shared_p } } -void Combat::CombatDispelFunc(std::shared_ptr, std::shared_ptr target, const CombatParams ¶ms, CombatDamage*) { +void Combat::CombatDispelFunc(const std::shared_ptr &, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage*) { if (target) { target->removeCombatCondition(params.dispelType); } } -void Combat::CombatNullFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage*) { +void Combat::CombatNullFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage*) { CombatConditionFunc(caster, target, params, nullptr); CombatDispelFunc(caster, target, params, nullptr); } -void Combat::combatTileEffects(const CreatureVector &spectators, std::shared_ptr caster, std::shared_ptr tile, const CombatParams ¶ms) { +void Combat::combatTileEffects(const CreatureVector &spectators, const std::shared_ptr &caster, const std::shared_ptr &tile, const CombatParams ¶ms) { if (params.itemId != 0) { uint16_t itemId = params.itemId; switch (itemId) { @@ -857,7 +889,7 @@ void Combat::combatTileEffects(const CreatureVector &spectators, std::shared_ptr } } - std::shared_ptr item = Item::CreateItem(itemId); + const auto &item = Item::CreateItem(itemId); if (caster) { item->setOwner(caster); } @@ -883,7 +915,7 @@ void Combat::combatTileEffects(const CreatureVector &spectators, std::shared_ptr } } -void Combat::postCombatEffects(std::shared_ptr caster, const Position &origin, const Position &pos, const CombatParams ¶ms) { +void Combat::postCombatEffects(const std::shared_ptr &caster, const Position &origin, const Position &pos, const CombatParams ¶ms) { if (caster && params.distanceEffect != CONST_ANI_NONE) { addDistanceEffect(caster, origin, pos, params.distanceEffect); } @@ -895,13 +927,13 @@ void Combat::postCombatEffects(std::shared_ptr caster, const Position } } -void Combat::addDistanceEffect(std::shared_ptr caster, const Position &fromPos, const Position &toPos, uint16_t effect) { +void Combat::addDistanceEffect(const std::shared_ptr &caster, const Position &fromPos, const Position &toPos, uint16_t effect) { if (effect == CONST_ANI_WEAPONTYPE) { if (!caster) { return; } - std::shared_ptr player = caster->getPlayer(); + const auto &player = caster->getPlayer(); if (!player) { return; } @@ -945,7 +977,7 @@ void Combat::doChainEffect(const Position &origin, const Position &dest, uint8_t fpp.maxSearchDist = 9; Position pos = origin; if (g_game().map.getPathMatching(origin, dirList, FrozenPathingConditionCall(dest), fpp)) { - for (auto dir : dirList) { + for (const auto &dir : dirList) { pos = getNextPosition(dir, pos); g_game().addMagicEffect(pos, effect); } @@ -998,17 +1030,17 @@ void Combat::setupChain(const std::shared_ptr &weapon) { setParam(COMBAT_PARAM_BLOCKARMOR, true); }; - setChainCallback(g_configManager().getNumber(COMBAT_CHAIN_TARGETS, __FUNCTION__), 1, true); + setChainCallback(g_configManager().getNumber(COMBAT_CHAIN_TARGETS), 1, true); switch (weaponType) { case WEAPON_SWORD: - setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_SWORD, __FUNCTION__), MELEE_ATK_SWORD, CONST_ME_SLASH); + setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_SWORD), MELEE_ATK_SWORD, CONST_ME_SLASH); break; case WEAPON_CLUB: - setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_CLUB, __FUNCTION__), MELEE_ATK_CLUB, CONST_ME_BLACK_BLOOD); + setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_CLUB), MELEE_ATK_CLUB, CONST_ME_BLACK_BLOOD); break; case WEAPON_AXE: - setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_AXE, __FUNCTION__), MELEE_ATK_AXE, CONST_ANI_WHIRLWINDAXE); + setCommonValues(g_configManager().getFloat(COMBAT_CHAIN_SKILL_FORMULA_AXE), MELEE_ATK_AXE, CONST_ANI_WHIRLWINDAXE); break; } @@ -1030,7 +1062,7 @@ void Combat::setupChain(const std::shared_ptr &weapon) { } } -bool Combat::doCombatChain(std::shared_ptr caster, std::shared_ptr target, bool aggressive) const { +bool Combat::doCombatChain(const std::shared_ptr &caster, const std::shared_ptr &target, bool aggressive) const { metrics::method_latency measure(__METHOD_NAME__); if (!params.chainCallback) { return false; @@ -1040,7 +1072,7 @@ bool Combat::doCombatChain(std::shared_ptr caster, std::shared_ptrgetChainValues(caster, maxTargets, chainDistance, backtracking); - auto targets = pickChainTargets(caster, params, chainDistance, maxTargets, aggressive, backtracking, std::move(target)); + auto targets = pickChainTargets(caster, params, chainDistance, maxTargets, aggressive, backtracking, target); g_logger().debug("[{}] Chain targets: {}", __FUNCTION__, targets.size()); if (targets.empty() || (targets.size() == 1 && targets.begin()->second.empty())) { @@ -1049,11 +1081,11 @@ bool Combat::doCombatChain(std::shared_ptr caster, std::shared_ptr(50, g_configManager().getNumber(COMBAT_CHAIN_DELAY, __FUNCTION__)); + auto delay = i * std::max(50, g_configManager().getNumber(COMBAT_CHAIN_DELAY)); ++i; - for (auto to : toVector) { + for (const auto &to : toVector) { auto nextTarget = g_game().getCreatureByID(to); if (!nextTarget) { continue; @@ -1061,7 +1093,7 @@ bool Combat::doCombatChain(std::shared_ptr caster, std::shared_ptrdoChainEffect(from, nextTarget->getPosition(), combat->params.chainEffect); + Combat::doChainEffect(from, nextTarget->getPosition(), combat->params.chainEffect); combat->doCombat(caster, nextTarget, from, affected); } }, @@ -1073,7 +1105,7 @@ bool Combat::doCombatChain(std::shared_ptr caster, std::shared_ptr caster, std::shared_ptr target) const { +bool Combat::doCombat(const std::shared_ptr &caster, const std::shared_ptr &target) const { if (caster != nullptr && params.chainCallback) { return doCombatChain(caster, target, params.aggressive); } @@ -1081,7 +1113,7 @@ bool Combat::doCombat(std::shared_ptr caster, std::shared_ptrgetPosition() : Position()); } -bool Combat::doCombat(std::shared_ptr caster, std::shared_ptr target, const Position &origin, int affected /* = 1 */) const { +bool Combat::doCombat(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, int affected /* = 1 */) const { // target combat callback function if (params.combatType != COMBAT_NONE) { CombatDamage damage = getCombatDamage(caster, target); @@ -1098,7 +1130,7 @@ bool Combat::doCombat(std::shared_ptr caster, std::shared_ptr caster, const Position &position) const { +bool Combat::doCombat(const std::shared_ptr &caster, const Position &position) const { if (caster != nullptr && params.chainCallback) { return doCombatChain(caster, caster, params.aggressive); } @@ -1119,7 +1151,7 @@ bool Combat::doCombat(std::shared_ptr caster, const Position &position return true; } -void Combat::CombatFunc(std::shared_ptr caster, const Position &origin, const Position &pos, const std::unique_ptr &area, const CombatParams ¶ms, CombatFunction func, CombatDamage* data) { +void Combat::CombatFunc(const std::shared_ptr &caster, const Position &origin, const Position &pos, const std::unique_ptr &area, const CombatParams ¶ms, const CombatFunction &func, CombatDamage* data) { std::vector> tileList; if (caster) { @@ -1132,7 +1164,7 @@ void Combat::CombatFunc(std::shared_ptr caster, const Position &origin uint32_t maxY = 0; // calculate the max viewable range - for (const std::shared_ptr &tile : tileList) { + for (const auto &tile : tileList) { const Position &tilePos = tile->getPosition(); uint32_t diff = Position::getDistanceX(tilePos, pos); @@ -1150,14 +1182,16 @@ void Combat::CombatFunc(std::shared_ptr caster, const Position &origin const int32_t rangeY = maxY + MAP_MAX_VIEW_PORT_Y; int affected = 0; - for (const std::shared_ptr &tile : tileList) { + for (const auto &tile : tileList) { if (canDoCombat(caster, tile, params.aggressive) != RETURNVALUE_NOERROR) { continue; } if (CreatureVector* creatures = tile->getCreatures()) { - const std::shared_ptr topCreature = tile->getTopCreature(); - for (auto &creature : *creatures) { + const auto &topCreature = tile->getTopCreature(); + // A copy of the tile's creature list is made because modifications to this vector, such as adding or removing creatures through a Lua callback, may occur during the iteration within the for loop. + CreatureVector creaturesCopy = *creatures; + for (const auto &creature : creaturesCopy) { if (params.targetCasterOrTopMost) { if (caster && caster->getTile() == tile) { if (creature != caster) { @@ -1200,19 +1234,21 @@ void Combat::CombatFunc(std::shared_ptr caster, const Position &origin // Wheel of destiny get beam affected total auto spectators = Spectators().find(pos, true, rangeX, rangeX, rangeY, rangeY); - std::shared_ptr casterPlayer = caster ? caster->getPlayer() : nullptr; + const std::shared_ptr &casterPlayer = caster ? caster->getPlayer() : nullptr; uint8_t beamAffectedTotal = casterPlayer ? casterPlayer->wheel()->getBeamAffectedTotal(tmpDamage) : 0; uint8_t beamAffectedCurrent = 0; tmpDamage.affected = affected; - for (const std::shared_ptr &tile : tileList) { + for (const auto &tile : tileList) { if (canDoCombat(caster, tile, params.aggressive) != RETURNVALUE_NOERROR) { continue; } if (CreatureVector* creatures = tile->getCreatures()) { - const std::shared_ptr topCreature = tile->getTopCreature(); - for (auto &creature : *creatures) { + const auto &topCreature = tile->getTopCreature(); + // A copy of the tile's creature list is made because modifications to this vector, such as adding or removing creatures through a Lua callback, may occur during the iteration within the for loop. + CreatureVector creaturesCopy = *creatures; + for (const auto &creature : creaturesCopy) { if (params.targetCasterOrTopMost) { if (caster && caster->getTile() == tile) { if (creature != caster) { @@ -1250,11 +1286,11 @@ void Combat::CombatFunc(std::shared_ptr caster, const Position &origin postCombatEffects(caster, origin, pos, params); } -void Combat::doCombatHealth(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms) { - doCombatHealth(caster, std::move(target), caster ? caster->getPosition() : Position(), damage, params); +void Combat::doCombatHealth(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms) { + doCombatHealth(caster, target, caster ? caster->getPosition() : Position(), damage, params); } -void Combat::doCombatHealth(std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::doCombatHealth(const std::shared_ptr &caster, const 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) @@ -1288,17 +1324,17 @@ void Combat::doCombatHealth(std::shared_ptr caster, std::shared_ptr caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::doCombatHealth(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms) { applyExtensions(caster, nullptr, damage, params); const auto origin = caster ? caster->getPosition() : Position(); CombatFunc(caster, origin, position, area, params, CombatHealthFunc, &damage); } -void Combat::doCombatMana(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::doCombatMana(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms) { doCombatMana(caster, target, caster ? caster->getPosition() : Position(), damage, params); } -void Combat::doCombatMana(std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::doCombatMana(const std::shared_ptr &caster, const 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) @@ -1326,18 +1362,18 @@ void Combat::doCombatMana(std::shared_ptr caster, std::shared_ptr caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::doCombatMana(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms) { applyExtensions(caster, nullptr, damage, params); const auto origin = caster ? caster->getPosition() : Position(); CombatFunc(caster, origin, position, area, params, CombatManaFunc, &damage); } -void Combat::doCombatCondition(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms) { +void Combat::doCombatCondition(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms) { const auto origin = caster ? caster->getPosition() : Position(); CombatFunc(caster, origin, position, area, params, CombatConditionFunc, nullptr); } -void Combat::doCombatCondition(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms) { +void Combat::doCombatCondition(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms) { bool canCombat = !params.aggressive || (caster != target && Combat::canDoCombat(caster, target, params.aggressive) == RETURNVALUE_NOERROR); if ((caster == target || canCombat) && params.impactEffect != CONST_ME_NONE) { g_game().addMagicEffect(target->getPosition(), params.impactEffect); @@ -1361,12 +1397,12 @@ void Combat::doCombatCondition(std::shared_ptr caster, std::shared_ptr } } -void Combat::doCombatDispel(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms) { +void Combat::doCombatDispel(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms) { const auto origin = caster ? caster->getPosition() : Position(); CombatFunc(caster, origin, position, area, params, CombatDispelFunc, nullptr); } -void Combat::doCombatDispel(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms) { +void Combat::doCombatDispel(const std::shared_ptr &caster, const 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) @@ -1392,11 +1428,11 @@ void Combat::doCombatDispel(std::shared_ptr caster, std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms) { +[[maybe_unused]] void Combat::doCombatDefault(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms) { doCombatDefault(caster, target, caster ? caster->getPosition() : Position(), params); } -void Combat::doCombatDefault(std::shared_ptr caster, std::shared_ptr target, const Position &origin, const CombatParams ¶ms) { +void Combat::doCombatDefault(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, const CombatParams ¶ms) { if (!params.aggressive || (caster != target && Combat::canDoCombat(caster, target, params.aggressive) == RETURNVALUE_NOERROR)) { auto spectators = Spectators().find(target->getPosition(), true); @@ -1433,7 +1469,7 @@ void Combat::setRuneSpellName(const std::string &value) { runeSpellName = value; } -std::vector>> Combat::pickChainTargets(std::shared_ptr caster, const CombatParams ¶ms, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive, std::shared_ptr initialTarget /* = nullptr */) { +std::vector>> Combat::pickChainTargets(const std::shared_ptr &caster, const CombatParams ¶ms, uint8_t chainDistance, uint8_t maxTargets, bool backtracking, bool aggressive, const std::shared_ptr &initialTarget /* = nullptr */) { Benchmark bm_pickChain; metrics::method_latency measure(__METHOD_NAME__); if (!caster) { @@ -1445,11 +1481,11 @@ std::vector>> Combat::pickChainTargets phmap::flat_hash_set visited; if (initialTarget && initialTarget != caster) { - targets.push_back(initialTarget); + targets.emplace_back(initialTarget); visited.insert(initialTarget->getID()); - resultMap.push_back({ caster->getPosition(), { initialTarget->getID() } }); + resultMap.emplace_back(caster->getPosition(), std::vector { initialTarget->getID() }); } else { - targets.push_back(caster); + targets.emplace_back(caster); maxTargets++; } @@ -1483,19 +1519,20 @@ std::vector>> Combat::pickChainTargets bool found = false; for (auto &[pos, vec] : resultMap) { if (pos == currentTarget->getPosition()) { - vec.push_back(closestSpectator->getID()); + vec.emplace_back(closestSpectator->getID()); found = true; break; } } if (!found) { - resultMap.push_back({ currentTarget->getPosition(), { closestSpectator->getID() } }); + resultMap.emplace_back(currentTarget->getPosition(), std::vector { closestSpectator->getID() }); } - targets.push_back(closestSpectator); + targets.emplace_back(closestSpectator); visited.insert(closestSpectator->getID()); continue; - } else if (backtracking) { + } + if (backtracking) { g_logger().debug("[{}] backtracking", __METHOD_NAME__); targets.pop_back(); backtrackingAttempts--; @@ -1508,7 +1545,7 @@ std::vector>> Combat::pickChainTargets return resultMap; } -bool Combat::isValidChainTarget(std::shared_ptr caster, std::shared_ptr currentTarget, std::shared_ptr potentialTarget, const CombatParams ¶ms, bool aggressive) { +bool Combat::isValidChainTarget(const std::shared_ptr &caster, const std::shared_ptr ¤tTarget, const std::shared_ptr &potentialTarget, const CombatParams ¶ms, bool aggressive) { bool canCombat = canDoCombat(caster, potentialTarget, aggressive) == RETURNVALUE_NOERROR; bool pick = params.chainPickerCallback ? params.chainPickerCallback->onChainCombat(caster, potentialTarget) : true; bool hasSight = g_game().isSightClear(currentTarget->getPosition(), potentialTarget->getPosition(), true); @@ -1517,7 +1554,10 @@ bool Combat::isValidChainTarget(std::shared_ptr caster, std::shared_pt //**********************************************************// -uint32_t ValueCallback::getMagicLevelSkill(std::shared_ptr player, const CombatDamage &damage) const { +ValueCallback::ValueCallback(formulaType_t initType) : + type(initType) { } + +uint32_t ValueCallback::getMagicLevelSkill(const std::shared_ptr &player, const CombatDamage &damage) const { if (!player) { return 0; } @@ -1525,9 +1565,9 @@ uint32_t ValueCallback::getMagicLevelSkill(std::shared_ptr player, const uint32_t magicLevelSkill = player->getMagicLevel(); // Wheel of destiny if (player && player->wheel()->getInstant("Runic Mastery") && damage.instantSpellName.empty()) { - const std::shared_ptr spell = g_spells().getRuneSpellByName(damage.runeSpellName); + const std::shared_ptr &spell = g_spells().getRuneSpellByName(damage.runeSpellName); // Rune conjuring spell have the same name as the rune item spell. - const std::shared_ptr conjuringSpell = g_spells().getInstantSpellByName(damage.runeSpellName); + const std::shared_ptr &conjuringSpell = g_spells().getInstantSpellByName(damage.runeSpellName); if (spell && conjuringSpell && conjuringSpell != spell && normal_random(0, 100) <= 25) { uint32_t castResult = conjuringSpell->canCast(player) ? 20 : 10; magicLevelSkill += magicLevelSkill * castResult / 100; @@ -1537,18 +1577,18 @@ uint32_t ValueCallback::getMagicLevelSkill(std::shared_ptr player, const return magicLevelSkill + player->getSpecializedMagicLevel(damage.primary.type, true); } -void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage &damage, bool useCharges) const { +void ValueCallback::getMinMaxValues(const std::shared_ptr &player, CombatDamage &damage, bool useCharges) const { // onGetPlayerMinMaxValues(...) - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[ValueCallback::getMinMaxValues - Player {} formula {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), fmt::underlying(type)); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); if (!env->setCallbackId(scriptId, scriptInterface)) { - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return; } @@ -1575,7 +1615,7 @@ void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage case COMBAT_FORMULA_SKILL: { // onGetPlayerMinMaxValues(player, attackSkill, attackValue, attackFactor) - std::shared_ptr tool = player->getWeapon(); + const auto &tool = player->getWeapon(); const auto &weapon = g_weapons().getWeapon(tool); int32_t attackSkill = 0; float attackFactor = 0; @@ -1592,7 +1632,7 @@ void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage default: { g_logger().warn("[ValueCallback::getMinMaxValues] - Unknown callback type"); - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return; } } @@ -1607,7 +1647,7 @@ void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage ); if (shouldCalculateSecondaryDamage) { - double factor = (double)elementAttack / (double)attackValue; // attack value here is phys dmg + element dmg + double factor = static_cast(elementAttack) / static_cast(attackValue); // attack value here is phys dmg + element dmg int32_t elementDamage = std::round(defaultDmg * factor); int32_t physDmg = std::round(defaultDmg * (1.0 - factor)); damage.primary.value = physDmg; @@ -1625,23 +1665,23 @@ void ValueCallback::getMinMaxValues(std::shared_ptr player, CombatDamage LuaScriptInterface::reportError(nullptr, "Stack size changed!"); } - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } //**********************************************************// -void TileCallback::onTileCombat(std::shared_ptr creature, std::shared_ptr tile) const { +void TileCallback::onTileCombat(const std::shared_ptr &creature, const std::shared_ptr &tile) const { // onTileCombat(creature, pos) - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::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()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); if (!env->setCallbackId(scriptId, scriptInterface)) { - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return; } @@ -1661,18 +1701,18 @@ void TileCallback::onTileCombat(std::shared_ptr creature, std::shared_ //**********************************************************// -void TargetCallback::onTargetCombat(std::shared_ptr creature, std::shared_ptr target) const { +void TargetCallback::onTargetCombat(const std::shared_ptr &creature, const std::shared_ptr &target) const { // onTargetCombat(creature, target) - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[TargetCallback::onTargetCombat - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); if (!env->setCallbackId(scriptId, scriptInterface)) { - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return; } @@ -1704,11 +1744,14 @@ void TargetCallback::onTargetCombat(std::shared_ptr creature, std::sha LuaScriptInterface::reportError(nullptr, "Stack size changed!"); } - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } //**********************************************************// +ChainCallback::ChainCallback(const uint8_t &chainTargets, const uint8_t &chainDistance, const bool &backtracking) : + m_chainDistance(chainDistance), m_chainTargets(chainTargets), m_backtracking(backtracking) { } + void ChainCallback::getChainValues(const std::shared_ptr &creature, uint8_t &maxTargets, uint8_t &chainDistance, bool &backtracking) { if (m_fromLua) { onChainCombat(creature, maxTargets, chainDistance, backtracking); @@ -1721,18 +1764,23 @@ void ChainCallback::getChainValues(const std::shared_ptr &creature, ui backtracking = m_backtracking; } } -void ChainCallback::onChainCombat(std::shared_ptr creature, uint8_t &maxTargets, uint8_t &chainDistance, bool &backtracking) { + +void ChainCallback::setFromLua(bool fromLua) { + m_fromLua = fromLua; +} + +void ChainCallback::onChainCombat(const std::shared_ptr &creature, uint8_t &maxTargets, uint8_t &chainDistance, bool &backtracking) const { // onChainCombat(creature) - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[ChainCallback::onTargetCombat - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); if (!env->setCallbackId(scriptId, scriptInterface)) { - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return; } @@ -1760,21 +1808,21 @@ void ChainCallback::onChainCombat(std::shared_ptr creature, uint8_t &m LuaScriptInterface::reportError(nullptr, "Stack size changed!"); } - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -bool ChainPickerCallback::onChainCombat(std::shared_ptr creature, std::shared_ptr target) const { +bool ChainPickerCallback::onChainCombat(const std::shared_ptr &creature, const std::shared_ptr &target) const { // onChainCombat(creature, target) - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[ChainPickerCallback::onTargetCombat - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return true; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); if (!env->setCallbackId(scriptId, scriptInterface)) { - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return true; } @@ -1809,7 +1857,7 @@ bool ChainPickerCallback::onChainCombat(std::shared_ptr creature, std: LuaScriptInterface::reportError(nullptr, "Stack size changed!"); } - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return result; } @@ -1819,6 +1867,10 @@ void AreaCombat::clear() { std::ranges::fill(areas, nullptr); } +std::unique_ptr AreaCombat::clone() const { + return std::make_unique(*this); +} + AreaCombat::AreaCombat(const AreaCombat &rhs) { hasExtArea = rhs.hasExtArea; for (uint_fast8_t i = 0; i <= Direction::DIRECTION_LAST; ++i) { @@ -1828,6 +1880,10 @@ AreaCombat::AreaCombat(const AreaCombat &rhs) { } } +AreaCombat::~AreaCombat() { + clear(); +} + void AreaCombat::getList(const Position ¢erPos, const Position &targetPos, std::vector> &list) const { const std::unique_ptr &area = getArea(centerPos, targetPos); if (!area) { @@ -1923,8 +1979,8 @@ void AreaCombat::copyArea(const std::unique_ptr &input, const std::u int32_t newY = y - centerY; // perform rotation - int32_t rotatedX = static_cast(round(newX * a + newY * b)); - int32_t rotatedY = static_cast(round(newX * c + newY * d)); + auto rotatedX = static_cast(round(newX * a + newY * b)); + auto rotatedY = static_cast(round(newX * c + newY * d)); // write in the output matrix using rotated coordinates (*output)[rotatedY + rotateCenterY][rotatedX + rotateCenterX] = (*input)[y][x]; @@ -1935,6 +1991,36 @@ void AreaCombat::copyArea(const std::unique_ptr &input, const std::u } } +const std::unique_ptr &AreaCombat::getArea(const Position ¢erPos, const Position &targetPos) const { + int32_t dx = Position::getOffsetX(targetPos, centerPos); + int32_t dy = Position::getOffsetY(targetPos, centerPos); + + Direction dir; + if (dx < 0) { + dir = DIRECTION_WEST; + } else if (dx > 0) { + dir = DIRECTION_EAST; + } else if (dy < 0) { + dir = DIRECTION_NORTH; + } else { + dir = DIRECTION_SOUTH; + } + + if (hasExtArea) { + if (dx < 0 && dy < 0) { + dir = DIRECTION_NORTHWEST; + } else if (dx > 0 && dy < 0) { + dir = DIRECTION_NORTHEAST; + } else if (dx < 0 && dy > 0) { + dir = DIRECTION_SOUTHWEST; + } else if (dx > 0 && dy > 0) { + dir = DIRECTION_SOUTHEAST; + } + } + + return areas[dir]; +} + std::unique_ptr AreaCombat::createArea(const std::list &list, uint32_t rows) { uint32_t cols; if (rows == 0) { @@ -1967,7 +2053,7 @@ std::unique_ptr AreaCombat::createArea(const std::list &li return area; } -void AreaCombat::setupArea(const std::list &list, uint32_t rows) { +void AreaCombat::setupArea(const std::list &list, const uint32_t rows) { auto northArea = createArea(list, rows); const uint32_t maxOutput = std::max(northArea->getCols(), northArea->getRows()) * 2; @@ -2005,11 +2091,11 @@ void AreaCombat::setupArea(int32_t length, int32_t spread) { for (int32_t x = 1; x <= cols; ++x) { if (y == rows && x == ((cols - (cols % 2)) / 2) + 1) { - list.push_back(3); + list.emplace_back(3); } else if (x >= mincol && x <= maxcol) { - list.push_back(1); + list.emplace_back(1); } else { - list.push_back(0); + list.emplace_back(0); } } @@ -2043,11 +2129,11 @@ void AreaCombat::setupArea(int32_t radius) { for (auto &row : area) { for (int cell : row) { if (cell == 1) { - list.push_back(3); + list.emplace_back(3); } else if (cell > 0 && cell <= radius) { - list.push_back(1); + list.emplace_back(1); } else { - list.push_back(0); + list.emplace_back(0); } } } @@ -2099,17 +2185,17 @@ void MagicField::onStepInField(const std::shared_ptr &creature) { const ItemType &it = items[getID()]; if (it.conditionDamage) { - auto conditionCopy = it.conditionDamage->clone(); + const auto &conditionCopy = it.conditionDamage->clone(); auto ownerId = getOwnerId(); if (ownerId) { bool harmfulField = true; - auto itemTile = getTile(); + const auto &itemTile = getTile(); if (g_game().getWorldType() == WORLD_TYPE_NO_PVP || (itemTile && itemTile->hasFlag(TILESTATE_NOPVPZONE))) { - auto ownerPlayer = g_game().getPlayerByGUID(ownerId); + const auto &ownerPlayer = g_game().getPlayerByGUID(ownerId); if (ownerPlayer) { harmfulField = false; } - auto ownerCreature = g_game().getCreatureByID(ownerId); + const auto &ownerCreature = g_game().getCreatureByID(ownerId); if (ownerCreature) { if (ownerCreature->getPlayer() || (ownerCreature->isSummon() && ownerCreature->getMaster()->getPlayer())) { harmfulField = false; @@ -2117,9 +2203,9 @@ void MagicField::onStepInField(const std::shared_ptr &creature) { } } - std::shared_ptr targetPlayer = creature->getPlayer(); + const auto &targetPlayer = creature->getPlayer(); if (targetPlayer) { - const std::shared_ptr attackerPlayer = g_game().getPlayerByID(ownerId); + const auto &attackerPlayer = g_game().getPlayerByID(ownerId); if (attackerPlayer) { if (Combat::isProtected(attackerPlayer, targetPlayer)) { harmfulField = false; @@ -2136,7 +2222,7 @@ void MagicField::onStepInField(const std::shared_ptr &creature) { } } -void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms) { +void Combat::applyExtensions(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms) { metrics::method_latency measure(__METHOD_NAME__); if (damage.extension || !caster || damage.primary.type == COMBAT_HEALING) { return; @@ -2147,15 +2233,15 @@ void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptrgetPlayer(); - auto monster = caster->getMonster(); + const auto &player = caster->getPlayer(); + const auto &monster = caster->getMonster(); if (player) { chance = player->getSkillLevel(SKILL_CRITICAL_HIT_CHANCE); bonus = player->getSkillLevel(SKILL_CRITICAL_HIT_DAMAGE); if (target && target->getMonster()) { uint16_t playerCharmRaceid = player->parseRacebyCharm(CHARM_LOW, false, 0); if (playerCharmRaceid != 0) { - const auto mType = g_monsters().getMonsterType(target->getName()); + const auto &mType = g_monsters().getMonsterType(target->getName()); if (mType && playerCharmRaceid == mType->info.raceid) { const auto charm = g_iobestiary().getBestiaryCharm(CHARM_LOW); if (charm) { @@ -2171,7 +2257,7 @@ void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptr(bonus) / 10000; - chance += (uint16_t)damage.criticalChance; + chance += static_cast(damage.criticalChance); if (chance != 0 && uniform_random(1, 10000) <= chance) { damage.critical = true; @@ -2181,10 +2267,10 @@ void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptrgetInventoryItem(CONST_SLOT_LEFT); + if (const auto &playerWeapon = player->getInventoryItem(CONST_SLOT_LEFT); playerWeapon != nullptr && playerWeapon->getTier() > 0) { - double_t fatalChance = playerWeapon->getFatalChance(); - double_t randomChance = uniform_random(0, 10000) / 100; + const double_t fatalChance = playerWeapon->getFatalChance(); + const double_t randomChance = uniform_random(0, 10000) / 100; if (fatalChance > 0 && randomChance < fatalChance) { damage.fatal = true; damage.primary.value += static_cast(std::round(damage.primary.value * 0.6)); @@ -2196,3 +2282,107 @@ void Combat::applyExtensions(std::shared_ptr caster, std::shared_ptrgetAttackMultiplier(); } } + +MagicField::MagicField(uint16_t type) : + Item(type), createTime(OTSYS_TIME()) { } + +std::shared_ptr MagicField::getMagicField() { + return static_self_cast(); +} + +bool MagicField::isReplaceable() const { + return Item::items[getID()].replaceable; +} + +CombatType_t MagicField::getCombatType() const { + const ItemType &it = items[getID()]; + return it.combatType; +} + +int32_t MagicField::getDamage() const { + const ItemType &it = items[getID()]; + if (it.conditionDamage) { + return it.conditionDamage->getTotalDamage(); + } + return 0; +} + +MatrixArea::MatrixArea(uint32_t initRows, uint32_t initCols) : + centerX(0), centerY(0), rows(initRows), cols(initCols) { + data_ = new bool*[rows]; + + for (uint32_t row = 0; row < rows; ++row) { + data_[row] = new bool[cols]; + + for (uint32_t col = 0; col < cols; ++col) { + data_[row][col] = false; + } + } +} + +MatrixArea::MatrixArea(const MatrixArea &rhs) { + centerX = rhs.centerX; + centerY = rhs.centerY; + rows = rhs.rows; + cols = rhs.cols; + + data_ = new bool*[rows]; + + for (uint32_t row = 0; row < rows; ++row) { + data_[row] = new bool[cols]; + + for (uint32_t col = 0; col < cols; ++col) { + data_[row][col] = rhs.data_[row][col]; + } + } +} + +MatrixArea::~MatrixArea() { + for (uint32_t row = 0; row < rows; ++row) { + delete[] data_[row]; + } + + delete[] data_; +} + +std::unique_ptr MatrixArea::clone() const { + return std::make_unique(*this); +} + +void MatrixArea::setValue(uint32_t row, uint32_t col, bool value) const { + if (row < rows && col < cols) { + data_[row][col] = value; + } else { + g_logger().error("[{}] Access exceeds the upper limit of memory block"); + throw std::out_of_range("Access exceeds the upper limit of memory block"); + } +} + +bool MatrixArea::getValue(uint32_t row, uint32_t col) const { + return data_[row][col]; +} + +void MatrixArea::setCenter(uint32_t y, uint32_t x) { + centerX = x; + centerY = y; +} + +void MatrixArea::getCenter(uint32_t &y, uint32_t &x) const { + x = centerX; + y = centerY; +} + +uint32_t MatrixArea::getRows() const { + return rows; +} + +uint32_t MatrixArea::getCols() const { + return cols; +} +const bool* MatrixArea::operator[](uint32_t i) const { + return data_[i]; +} + +bool* MatrixArea::operator[](uint32_t i) { + return data_[i]; +} diff --git a/src/creatures/combat/combat.hpp b/src/creatures/combat/combat.hpp index 304a70913..1b8af7112 100644 --- a/src/creatures/combat/combat.hpp +++ b/src/creatures/combat/combat.hpp @@ -9,24 +9,23 @@ #pragma once +#include "items/item.hpp" #include "lua/global/baseevents.hpp" -#include "creatures/combat/condition.hpp" -#include "declarations.hpp" -#include "map/map.hpp" class Condition; class Creature; -class Item; class Spell; class Player; class MatrixArea; class Weapon; +class Tile; + +using CreatureVector = std::vector>; // for luascript callback class ValueCallback final : public CallBack { public: - explicit ValueCallback(formulaType_t initType) : - type(initType) { } + explicit ValueCallback(formulaType_t initType); /** * @brief Get the magic level skill for the player. @@ -35,42 +34,39 @@ class ValueCallback final : public CallBack { * @param damage The combat damage information. * @return The magic level skill of the player. */ - uint32_t getMagicLevelSkill(std::shared_ptr player, const CombatDamage &damage) const; - void getMinMaxValues(std::shared_ptr player, CombatDamage &damage, bool useCharges) const; + uint32_t getMagicLevelSkill(const std::shared_ptr &player, const CombatDamage &damage) const; + void getMinMaxValues(const std::shared_ptr &player, CombatDamage &damage, bool useCharges) const; private: - formulaType_t type; + formulaType_t type {}; }; class TileCallback final : public CallBack { public: - void onTileCombat(std::shared_ptr creature, std::shared_ptr tile) const; + void onTileCombat(const std::shared_ptr &creature, const std::shared_ptr &tile) const; protected: - formulaType_t type; + formulaType_t type {}; }; class TargetCallback final : public CallBack { public: - void onTargetCombat(std::shared_ptr creature, std::shared_ptr target) const; + void onTargetCombat(const std::shared_ptr &creature, const std::shared_ptr &target) const; protected: - formulaType_t type; + formulaType_t type {}; }; class ChainCallback final : public CallBack { public: ChainCallback() = default; - ChainCallback(uint8_t &chainTargets, uint8_t &chainDistance, bool &backtracking) : - m_chainDistance(chainDistance), m_chainTargets(chainTargets), m_backtracking(backtracking) { } + ChainCallback(const uint8_t &chainTargets, const uint8_t &chainDistance, const bool &backtracking); void getChainValues(const std::shared_ptr &creature, uint8_t &maxTargets, uint8_t &chainDistance, bool &backtracking); - void setFromLua(bool fromLua) { - m_fromLua = fromLua; - } + void setFromLua(bool fromLua); private: - void onChainCombat(std::shared_ptr creature, uint8_t &chainTargets, uint8_t &chainDistance, bool &backtracking); + void onChainCombat(const std::shared_ptr &creature, uint8_t &chainTargets, uint8_t &chainDistance, bool &backtracking) const; uint8_t m_chainDistance = 0; uint8_t m_chainTargets = 0; @@ -80,7 +76,7 @@ class ChainCallback final : public CallBack { class ChainPickerCallback final : public CallBack { public: - bool onChainCombat(std::shared_ptr creature, std::shared_ptr target) const; + bool onChainCombat(const std::shared_ptr &creature, const std::shared_ptr &target) const; }; struct CombatParams { @@ -117,85 +113,28 @@ using CombatFunction = std::function, std::shared class MatrixArea { public: - MatrixArea(uint32_t initRows, uint32_t initCols) : - centerX(0), centerY(0), rows(initRows), cols(initCols) { - data_ = new bool*[rows]; - - for (uint32_t row = 0; row < rows; ++row) { - data_[row] = new bool[cols]; - - for (uint32_t col = 0; col < cols; ++col) { - data_[row][col] = false; - } - } - } + MatrixArea(uint32_t initRows, uint32_t initCols); - MatrixArea(const MatrixArea &rhs) { - centerX = rhs.centerX; - centerY = rhs.centerY; - rows = rhs.rows; - cols = rhs.cols; + MatrixArea(const MatrixArea &rhs); - data_ = new bool*[rows]; + ~MatrixArea(); - for (uint32_t row = 0; row < rows; ++row) { - data_[row] = new bool[cols]; + std::unique_ptr clone() const; - for (uint32_t col = 0; col < cols; ++col) { - data_[row][col] = rhs.data_[row][col]; - } - } - } - - ~MatrixArea() { - for (uint32_t row = 0; row < rows; ++row) { - delete[] data_[row]; - } + // non-assignable + MatrixArea &operator=(const MatrixArea &) = delete; - delete[] data_; - } + void setValue(uint32_t row, uint32_t col, bool value) const; + bool getValue(uint32_t row, uint32_t col) const; - std::unique_ptr clone() const { - return std::make_unique(*this); - } + void setCenter(uint32_t y, uint32_t x); + void getCenter(uint32_t &y, uint32_t &x) const; - // non-assignable - MatrixArea &operator=(const MatrixArea &) = delete; + uint32_t getRows() const; + uint32_t getCols() const; - void setValue(uint32_t row, uint32_t col, bool value) { - if (row < rows && col < cols) { - data_[row][col] = value; - } else { - g_logger().error("[{}] Access exceeds the upper limit of memory block"); - throw std::out_of_range("Access exceeds the upper limit of memory block"); - } - } - bool getValue(uint32_t row, uint32_t col) const { - return data_[row][col]; - } - - void setCenter(uint32_t y, uint32_t x) { - centerX = x; - centerY = y; - } - void getCenter(uint32_t &y, uint32_t &x) const { - x = centerX; - y = centerY; - } - - uint32_t getRows() const { - return rows; - } - uint32_t getCols() const { - return cols; - } - - const bool* operator[](uint32_t i) const { - return data_[i]; - } - bool* operator[](uint32_t i) { - return data_[i]; - } + const bool* operator[](uint32_t i) const; + bool* operator[](uint32_t i); private: uint32_t centerX; @@ -211,9 +150,7 @@ class AreaCombat { AreaCombat() = default; AreaCombat(const AreaCombat &rhs); - ~AreaCombat() { - clear(); - } + ~AreaCombat(); // non-assignable AreaCombat &operator=(const AreaCombat &) = delete; @@ -226,43 +163,13 @@ class AreaCombat { void setupExtArea(const std::list &list, uint32_t rows); void clear(); - std::unique_ptr clone() const { - return std::make_unique(*this); - } + std::unique_ptr clone() const; private: std::unique_ptr createArea(const std::list &list, uint32_t rows); void copyArea(const std::unique_ptr &input, const std::unique_ptr &output, MatrixOperation_t op) const; - const std::unique_ptr &getArea(const Position ¢erPos, const Position &targetPos) const { - int32_t dx = Position::getOffsetX(targetPos, centerPos); - int32_t dy = Position::getOffsetY(targetPos, centerPos); - - Direction dir; - if (dx < 0) { - dir = DIRECTION_WEST; - } else if (dx > 0) { - dir = DIRECTION_EAST; - } else if (dy < 0) { - dir = DIRECTION_NORTH; - } else { - dir = DIRECTION_SOUTH; - } - - if (hasExtArea) { - if (dx < 0 && dy < 0) { - dir = DIRECTION_NORTHWEST; - } else if (dx > 0 && dy < 0) { - dir = DIRECTION_NORTHEAST; - } else if (dx < 0 && dy > 0) { - dir = DIRECTION_SOUTHWEST; - } else if (dx > 0 && dy > 0) { - dir = DIRECTION_SOUTHEAST; - } - } - - return areas[dir]; - } + const std::unique_ptr &getArea(const Position ¢erPos, const Position &targetPos) const; std::array, Direction::DIRECTION_LAST + 1> areas {}; bool hasExtArea = false; @@ -276,60 +183,50 @@ class Combat { Combat(const Combat &) = delete; Combat &operator=(const Combat &) = delete; - static void applyExtensions(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms); + static void applyExtensions(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatHealth(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatHealth(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatHealth(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatHealth(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatMana(std::shared_ptr caster, std::shared_ptr target, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatMana(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatMana(const std::shared_ptr &caster, const std::shared_ptr &target, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatMana(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatCondition(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms); - static void doCombatCondition(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms); + static void doCombatCondition(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms); + static void doCombatCondition(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms); - static void doCombatDispel(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms); - static void doCombatDispel(std::shared_ptr caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms); + static void doCombatDispel(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms); + static void doCombatDispel(const std::shared_ptr &caster, const Position &position, const std::unique_ptr &area, const CombatParams ¶ms); static void getCombatArea(const Position ¢erPos, const Position &targetPos, const std::unique_ptr &area, std::vector> &list); - static bool isInPvpZone(std::shared_ptr attacker, std::shared_ptr target); - static bool isProtected(std::shared_ptr attacker, std::shared_ptr target); - static bool isPlayerCombat(std::shared_ptr target); + static bool isInPvpZone(const std::shared_ptr &attacker, const std::shared_ptr &target); + static bool isProtected(const std::shared_ptr &attacker, const std::shared_ptr &target); + static bool isPlayerCombat(const std::shared_ptr &target); static CombatType_t ConditionToDamageType(ConditionType_t type); static ConditionType_t DamageToConditionType(CombatType_t type); - static ReturnValue canTargetCreature(std::shared_ptr attacker, std::shared_ptr target); - static ReturnValue canDoCombat(std::shared_ptr caster, std::shared_ptr tile, bool aggressive); - static ReturnValue canDoCombat(std::shared_ptr attacker, std::shared_ptr target, bool aggressive); - static void postCombatEffects(std::shared_ptr caster, const Position &origin, const Position &pos, const CombatParams ¶ms); + static ReturnValue canTargetCreature(const std::shared_ptr &attacker, const std::shared_ptr &target); + static ReturnValue canDoCombat(const std::shared_ptr &caster, const std::shared_ptr &tile, bool aggressive); + static ReturnValue canDoCombat(const std::shared_ptr &attacker, const std::shared_ptr &target, bool aggressive); + static void postCombatEffects(const std::shared_ptr &caster, const Position &origin, const Position &pos, const CombatParams ¶ms); - static void addDistanceEffect(std::shared_ptr caster, const Position &fromPos, const Position &toPos, uint16_t effect); + static void addDistanceEffect(const std::shared_ptr &caster, const Position &fromPos, const Position &toPos, uint16_t effect); - bool doCombat(std::shared_ptr caster, std::shared_ptr target) const; - bool doCombat(std::shared_ptr caster, std::shared_ptr target, const Position &origin, int affected = 1) const; - bool doCombat(std::shared_ptr caster, const Position &pos) const; + bool doCombat(const std::shared_ptr &caster, const std::shared_ptr &target) const; + bool doCombat(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, int affected = 1) const; + bool doCombat(const std::shared_ptr &caster, const Position &pos) const; bool setCallback(CallBackParam_t key); void setChainCallback(uint8_t chainTargets, uint8_t chainDistance, bool backtracking); - CallBack* getCallback(CallBackParam_t key); + CallBack* getCallback(CallBackParam_t key) const; bool setParam(CombatParam_t param, uint32_t value); - void setArea(std::unique_ptr &newArea) { - this->area = std::move(newArea); - } - bool hasArea() const { - return area != nullptr; - } - void addCondition(const std::shared_ptr condition) { - params.conditionList.emplace_back(condition); - } + void setArea(std::unique_ptr &newArea); + bool hasArea() const; + void addCondition(const std::shared_ptr &condition); void setPlayerCombatValues(formulaType_t formulaType, double mina, double minb, double maxa, double maxb); - void postCombatEffects(std::shared_ptr caster, const Position &origin, const Position &pos) const { - postCombatEffects(std::move(caster), origin, pos, params); - } + void postCombatEffects(const std::shared_ptr &caster, const Position &origin, const Position &pos) const; - void setOrigin(CombatOrigin origin) { - params.origin = origin; - } + void setOrigin(CombatOrigin origin); /** * @brief Sets the name of the instant spell. @@ -346,24 +243,24 @@ class Combat { void setRuneSpellName(const std::string &value); void setupChain(const std::shared_ptr &weapon); - bool doCombatChain(std::shared_ptr caster, std::shared_ptr target, bool aggressive) const; + bool doCombatChain(const std::shared_ptr &caster, const std::shared_ptr &target, bool aggressive) const; private: static void doChainEffect(const Position &origin, const Position &pos, uint8_t effect); - static std::vector>> pickChainTargets(std::shared_ptr caster, const CombatParams ¶ms, uint8_t chainDistance, uint8_t maxTargets, bool aggressive, bool backtracking, std::shared_ptr initialTarget = nullptr); - static bool isValidChainTarget(std::shared_ptr caster, std::shared_ptr currentTarget, std::shared_ptr potentialTarget, const CombatParams ¶ms, bool aggressive); + static std::vector>> pickChainTargets(const std::shared_ptr &caster, const CombatParams ¶ms, uint8_t chainDistance, uint8_t maxTargets, bool aggressive, bool backtracking, const std::shared_ptr &initialTarget = nullptr); + static bool isValidChainTarget(const std::shared_ptr &caster, const std::shared_ptr ¤tTarget, const std::shared_ptr &potentialTarget, const CombatParams ¶ms, bool aggressive); - static void doCombatDefault(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms); + static void doCombatDefault(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms); - static void doCombatHealth(std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatMana(std::shared_ptr caster, std::shared_ptr target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms); - static void doCombatDefault(std::shared_ptr caster, std::shared_ptr target, const Position &origin, const CombatParams ¶ms); + static void doCombatHealth(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatMana(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, CombatDamage &damage, const CombatParams ¶ms); + static void doCombatDefault(const std::shared_ptr &caster, const std::shared_ptr &target, const Position &origin, const CombatParams ¶ms); - static void CombatFunc(std::shared_ptr caster, const Position &origin, const Position &pos, const std::unique_ptr &area, const CombatParams ¶ms, CombatFunction func, CombatDamage* data); + static void CombatFunc(const std::shared_ptr &caster, const Position &origin, const Position &pos, const std::unique_ptr &area, const CombatParams ¶ms, const CombatFunction &func, CombatDamage* data); - static void CombatHealthFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data); - static CombatDamage applyImbuementElementalDamage(std::shared_ptr attackerPlayer, std::shared_ptr item, CombatDamage damage); - static void CombatManaFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* damage); + static void CombatHealthFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data); + static CombatDamage applyImbuementElementalDamage(const std::shared_ptr &attackerPlayer, std::shared_ptr item, CombatDamage damage); + static void CombatManaFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* damage); /** * @brief Checks if a fear condition can be applied to a player. * @@ -378,12 +275,12 @@ class Combat { * @param player Pointer to the Player object to be checked. * @return true if the fear condition can be applied, false otherwise. */ - static bool checkFearConditionAffected(std::shared_ptr player); - static void CombatConditionFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data); - static void CombatDispelFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data); - static void CombatNullFunc(std::shared_ptr caster, std::shared_ptr target, const CombatParams ¶ms, CombatDamage* data); + static bool checkFearConditionAffected(const std::shared_ptr &player); + static void CombatConditionFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data); + static void CombatDispelFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data); + static void CombatNullFunc(const std::shared_ptr &caster, const std::shared_ptr &target, const CombatParams ¶ms, CombatDamage* data); - static void combatTileEffects(const CreatureVector &spectators, std::shared_ptr caster, std::shared_ptr tile, const CombatParams ¶ms); + static void combatTileEffects(const CreatureVector &spectators, const std::shared_ptr &caster, const std::shared_ptr &tile, const CombatParams ¶ms); /** * @brief Calculate the level formula for combat. @@ -393,8 +290,8 @@ class Combat { * @param damage The combat damage. * @return The calculated level formula. */ - int32_t getLevelFormula(std::shared_ptr player, std::shared_ptr wheelSpell, const CombatDamage &damage) const; - CombatDamage getCombatDamage(std::shared_ptr creature, std::shared_ptr target) const; + int32_t getLevelFormula(const std::shared_ptr &player, const std::shared_ptr &wheelSpell, const CombatDamage &damage) const; + CombatDamage getCombatDamage(const std::shared_ptr &creature, const std::shared_ptr &target) const; // configureable CombatParams params; @@ -414,27 +311,13 @@ class Combat { class MagicField final : public Item { public: - explicit MagicField(uint16_t type) : - Item(type), createTime(OTSYS_TIME()) { } - - std::shared_ptr getMagicField() override { - return static_self_cast(); - } - - bool isReplaceable() const { - return Item::items[getID()].replaceable; - } - CombatType_t getCombatType() const { - const ItemType &it = items[getID()]; - return it.combatType; - } - int32_t getDamage() const { - const ItemType &it = items[getID()]; - if (it.conditionDamage) { - return it.conditionDamage->getTotalDamage(); - } - return 0; - } + explicit MagicField(uint16_t type); + + std::shared_ptr getMagicField() override; + + bool isReplaceable() const; + CombatType_t getCombatType() const; + int32_t getDamage() const; void onStepInField(const std::shared_ptr &creature); private: diff --git a/src/creatures/combat/condition.cpp b/src/creatures/combat/condition.cpp index 34db29dcd..da90b03f6 100644 --- a/src/creatures/combat/condition.cpp +++ b/src/creatures/combat/condition.cpp @@ -7,13 +7,20 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/combat/condition.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/combat.hpp" +#include "creatures/monsters/monsters.hpp" +#include "enums/player_icons.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "io/fileloader.hpp" +#include "kv/kv.hpp" #include "map/spectators.hpp" +#include "creatures/creature.hpp" +#include "creatures/players/player.hpp" +#include "server/network/protocol/protocolgame.hpp" /** * Condition @@ -131,6 +138,16 @@ bool Condition::unserializeProp(ConditionAttr_t attr, PropStream &propStream) { return true; } + case CONDITIONATTR_PERSISTENT: { + bool value = false; + if (!propStream.read(value)) { + return false; + } + + m_isPersistent = value; + return true; + } + case CONDITIONATTR_END: return true; @@ -160,6 +177,9 @@ void Condition::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(CONDITIONATTR_ADDSOUND); propWriteStream.write(static_cast(addSound)); + + propWriteStream.write(CONDITIONATTR_PERSISTENT); + propWriteStream.write(m_isPersistent); } void Condition::setTicks(int32_t newTicks) { @@ -167,7 +187,7 @@ void Condition::setTicks(int32_t newTicks) { endTime = ticks + OTSYS_TIME(); } -bool Condition::executeCondition(std::shared_ptr creature, int32_t interval) { +bool Condition::executeCondition(const std::shared_ptr &creature, int32_t interval) { if (ticks == -1) { return true; } @@ -185,7 +205,7 @@ bool Condition::executeCondition(std::shared_ptr creature, int32_t int return true; } -std::shared_ptr Condition::createCondition(ConditionId_t id, ConditionType_t type, int32_t ticks, int32_t param /* = 0*/, bool buff /* = false*/, uint32_t subId /* = 0*/) { +std::shared_ptr Condition::createCondition(ConditionId_t id, ConditionType_t type, int32_t ticks, int32_t param /* = 0*/, bool buff /* = false*/, uint32_t subId /* = 0*/, bool isPersistent /* = false*/) { switch (type) { case CONDITION_POISON: case CONDITION_FIRE: @@ -242,6 +262,10 @@ std::shared_ptr Condition::createCondition(ConditionId_t id, Conditio case CONDITION_YELLTICKS: case CONDITION_PACIFIED: return std::make_shared(id, type, ticks, buff, subId); + case CONDITION_BAKRAGORE: + return std::make_shared(id, type, ticks, buff, subId, isPersistent); + case CONDITION_GOSHNARTAINT: + return std::make_shared(id, type, ticks, buff, subId); default: return nullptr; @@ -298,6 +322,10 @@ std::shared_ptr Condition::createCondition(PropStream &propStream) { return createCondition(static_cast(id), static_cast(type), ticks, 0, buff != 0, subId); } +Condition::Condition(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, bool isPersistent) : + endTime(initTicks == -1 ? std::numeric_limits::max() : 0), + subId(initSubId), ticks(initTicks), conditionType(initType), id(initId), isBuff(initBuff), m_isPersistent(isPersistent) { } + bool Condition::startCondition(std::shared_ptr) { if (ticks > 0) { endTime = ticks + OTSYS_TIME(); @@ -306,6 +334,10 @@ bool Condition::startCondition(std::shared_ptr) { } bool Condition::isPersistent() const { + if (m_isPersistent) { + g_logger().debug("Condition {} is persistent", conditionType); + return true; + } if (ticks == -1) { return false; } @@ -318,22 +350,58 @@ bool Condition::isPersistent() const { } bool Condition::isRemovableOnDeath() const { + if (m_isPersistent) { + return false; + } + if (ticks == -1) { return false; } - if (conditionType == CONDITION_SPELLCOOLDOWN || conditionType == CONDITION_SPELLGROUPCOOLDOWN || conditionType == CONDITION_MUTED) { + static const std::unordered_set nonRemovableConditions = { + CONDITION_SPELLCOOLDOWN, + CONDITION_SPELLGROUPCOOLDOWN, + CONDITION_MUTED, + CONDITION_GOSHNARTAINT + }; + + if (nonRemovableConditions.find(conditionType) != nonRemovableConditions.end()) { return false; } return true; } -uint32_t Condition::getIcons() const { - return isBuff ? ICON_PARTY_BUFF : 0; +std::unordered_set Condition::getIcons() const { + std::unordered_set icons; + if (isBuff) { + icons.insert(PlayerIcon::PartyBuff); + } + + return icons; +} + +ConditionId_t Condition::getId() const { + return id; } -bool Condition::updateCondition(const std::shared_ptr addCondition) { +uint32_t Condition::getSubId() const { + return subId; +} + +ConditionType_t Condition::getType() const { + return conditionType; +} + +int64_t Condition::getEndTime() const { + return endTime; +} + +int32_t Condition::getTicks() const { + return ticks; +} + +bool Condition::updateCondition(const std::shared_ptr &addCondition) { if (conditionType != addCondition->getType()) { return false; } @@ -353,11 +421,14 @@ bool Condition::updateCondition(const std::shared_ptr addCondition) { * ConditionGeneric */ +ConditionGeneric::ConditionGeneric(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, bool isPersistent) : + Condition(initId, initType, initTicks, initBuff, initSubId, isPersistent) { } + bool ConditionGeneric::startCondition(std::shared_ptr creature) { return Condition::startCondition(creature); } -bool ConditionGeneric::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionGeneric::executeCondition(const std::shared_ptr &creature, int32_t interval) { return Condition::executeCondition(creature, interval); } @@ -375,22 +446,41 @@ void ConditionGeneric::addCondition(std::shared_ptr creature, const st } } -uint32_t ConditionGeneric::getIcons() const { - uint32_t icons = Condition::getIcons(); +std::unordered_set ConditionGeneric::getIcons() const { + auto icons = Condition::getIcons(); switch (conditionType) { case CONDITION_INFIGHT: - icons |= ICON_SWORDS; + icons.insert(PlayerIcon::Swords); break; case CONDITION_DRUNK: - icons |= ICON_DRUNK; + icons.insert(PlayerIcon::Drunk); break; case CONDITION_ROOTED: - icons |= ICON_ROOTED; + icons.insert(PlayerIcon::Rooted); break; - + case CONDITION_GOSHNARTAINT: + switch (subId) { + case 1: + icons.insert(PlayerIcon::GoshnarTaint1); + break; + case 2: + icons.insert(PlayerIcon::GoshnarTaint2); + break; + case 3: + icons.insert(PlayerIcon::GoshnarTaint3); + break; + case 4: + icons.insert(PlayerIcon::GoshnarTaint4); + break; + case 5: + icons.insert(PlayerIcon::GoshnarTaint5); + break; + default: + break; + } default: break; } @@ -398,6 +488,10 @@ uint32_t ConditionGeneric::getIcons() const { return icons; } +std::shared_ptr ConditionGeneric::clone() const { + return std::make_shared(*this); +} + /** * ConditionAttributes */ @@ -415,14 +509,13 @@ void ConditionAttributes::addCondition(std::shared_ptr creature, const endCondition(creature); // Apply the new one - memcpy(skills, conditionAttrs->skills, sizeof(skills)); - memcpy(skillsPercent, conditionAttrs->skillsPercent, sizeof(skillsPercent)); - memcpy(stats, conditionAttrs->stats, sizeof(stats)); - memcpy(statsPercent, conditionAttrs->statsPercent, sizeof(statsPercent)); - memcpy(buffs, conditionAttrs->buffs, sizeof(buffs)); - memcpy(buffsPercent, conditionAttrs->buffsPercent, sizeof(buffsPercent)); - - // Using std::array can only increment to the new instead of use memcpy + std::ranges::copy(std::span(conditionAttrs->skills), skills); + std::ranges::copy(std::span(conditionAttrs->skillsPercent), skillsPercent); + std::ranges::copy(std::span(conditionAttrs->stats), stats); + std::ranges::copy(std::span(conditionAttrs->statsPercent), statsPercent); + std::ranges::copy(std::span(conditionAttrs->buffs), buffs); + std::ranges::copy(std::span(conditionAttrs->buffsPercent), buffsPercent); + absorbs = conditionAttrs->absorbs; absorbsPercent = conditionAttrs->absorbsPercent; increases = conditionAttrs->increases; @@ -438,7 +531,7 @@ void ConditionAttributes::addCondition(std::shared_ptr creature, const updateCharmChanceModifier(creature); disableDefense = conditionAttrs->disableDefense; - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { updatePercentSkills(player); updateSkills(player); updatePercentStats(player); @@ -528,6 +621,9 @@ void ConditionAttributes::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(charmChanceModifier); } +ConditionAttributes::ConditionAttributes(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + bool ConditionAttributes::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; @@ -542,7 +638,7 @@ bool ConditionAttributes::startCondition(std::shared_ptr creature) { updatePercentIncreases(creature); updateIncreases(creature); updateCharmChanceModifier(creature); - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { updatePercentSkills(player); updateSkills(player); updatePercentStats(player); @@ -552,7 +648,7 @@ bool ConditionAttributes::startCondition(std::shared_ptr creature) { return true; } -void ConditionAttributes::updatePercentStats(std::shared_ptr player) { +void ConditionAttributes::updatePercentStats(const std::shared_ptr &player) { for (int32_t i = STAT_FIRST; i <= STAT_LAST; ++i) { if (statsPercent[i] == 0) { continue; @@ -578,7 +674,7 @@ void ConditionAttributes::updatePercentStats(std::shared_ptr player) { } } -void ConditionAttributes::updateStats(std::shared_ptr player) { +void ConditionAttributes::updateStats(const std::shared_ptr &player) const { bool needUpdate = false; for (int32_t i = STAT_FIRST; i <= STAT_LAST; ++i) { @@ -594,9 +690,9 @@ void ConditionAttributes::updateStats(std::shared_ptr player) { } } -void ConditionAttributes::updatePercentSkills(std::shared_ptr player) { +void ConditionAttributes::updatePercentSkills(const std::shared_ptr &player) { for (uint8_t i = SKILL_FIRST; i <= SKILL_LAST; ++i) { - skills_t skill = static_cast(i); + auto skill = static_cast(i); if (skillsPercent[skill] == 0) { continue; } @@ -606,7 +702,7 @@ void ConditionAttributes::updatePercentSkills(std::shared_ptr player) { } } -void ConditionAttributes::updateSkills(std::shared_ptr player) { +void ConditionAttributes::updateSkills(const std::shared_ptr &player) const { bool needUpdateSkills = false; for (int32_t i = SKILL_FIRST; i <= SKILL_LAST; ++i) { @@ -621,7 +717,7 @@ void ConditionAttributes::updateSkills(std::shared_ptr player) { } } -void ConditionAttributes::updatePercentAbsorbs(std::shared_ptr creature) { +void ConditionAttributes::updatePercentAbsorbs(const std::shared_ptr &creature) { for (uint8_t i = 0; i < COMBAT_COUNT; i++) { auto value = getAbsorbPercentByIndex(i); if (value == 0) { @@ -631,7 +727,7 @@ void ConditionAttributes::updatePercentAbsorbs(std::shared_ptr creatur } } -void ConditionAttributes::updateAbsorbs(std::shared_ptr creature) const { +void ConditionAttributes::updateAbsorbs(const std::shared_ptr &creature) const { for (uint8_t i = 0; i < COMBAT_COUNT; i++) { auto value = getAbsorbByIndex(i); if (value == 0) { @@ -642,7 +738,7 @@ void ConditionAttributes::updateAbsorbs(std::shared_ptr creature) cons } } -void ConditionAttributes::updatePercentIncreases(std::shared_ptr creature) { +void ConditionAttributes::updatePercentIncreases(const std::shared_ptr &creature) { for (uint8_t i = 0; i < COMBAT_COUNT; i++) { auto increasePercentValue = getIncreasePercentById(i); if (increasePercentValue == 0) { @@ -652,7 +748,7 @@ void ConditionAttributes::updatePercentIncreases(std::shared_ptr creat } } -void ConditionAttributes::updateIncreases(std::shared_ptr creature) const { +void ConditionAttributes::updateIncreases(const std::shared_ptr &creature) const { for (uint8_t i = 0; i < COMBAT_COUNT; i++) { auto increaseValue = getIncreaseByIndex(i); if (increaseValue == 0) { @@ -662,11 +758,11 @@ void ConditionAttributes::updateIncreases(std::shared_ptr creature) co } } -void ConditionAttributes::updateCharmChanceModifier(std::shared_ptr creature) const { +void ConditionAttributes::updateCharmChanceModifier(const std::shared_ptr &creature) const { creature->setCharmChanceModifier(creature->getCharmChanceModifier() + charmChanceModifier); } -void ConditionAttributes::updatePercentBuffs(std::shared_ptr creature) { +void ConditionAttributes::updatePercentBuffs(const std::shared_ptr &creature) { for (int32_t i = BUFF_FIRST; i <= BUFF_LAST; ++i) { if (buffsPercent[i] == 0) { continue; @@ -677,7 +773,7 @@ void ConditionAttributes::updatePercentBuffs(std::shared_ptr creature) } } -void ConditionAttributes::updateBuffs(std::shared_ptr creature) { +void ConditionAttributes::updateBuffs(const std::shared_ptr &creature) const { bool needUpdate = false; for (int32_t i = BUFF_FIRST; i <= BUFF_LAST; ++i) { if (buffs[i]) { @@ -690,12 +786,12 @@ void ConditionAttributes::updateBuffs(std::shared_ptr creature) { } } -bool ConditionAttributes::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionAttributes::executeCondition(const std::shared_ptr &creature, int32_t interval) { return ConditionGeneric::executeCondition(creature, interval); } void ConditionAttributes::endCondition(std::shared_ptr creature) { - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { bool needUpdate = false; @@ -1025,6 +1121,10 @@ bool ConditionAttributes::setParam(ConditionParam_t param, int32_t value) { } } +std::shared_ptr ConditionAttributes::clone() const { + return std::make_shared(*this); +} + int32_t ConditionAttributes::getAbsorbByIndex(uint8_t index) const { try { return absorbs.at(index); @@ -1097,19 +1197,22 @@ void ConditionAttributes::setIncreasePercent(uint8_t index, int32_t value) { * ConditionRegeneration */ +ConditionRegeneration::ConditionRegeneration(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, iniTicks, initBuff, initSubId) { } + bool ConditionRegeneration::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; } - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } return true; } void ConditionRegeneration::endCondition(std::shared_ptr creature) { - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } } @@ -1118,7 +1221,7 @@ void ConditionRegeneration::addCondition(std::shared_ptr creature, con if (updateCondition(addCondition)) { setTicks(addCondition->getTicks()); - const std::shared_ptr &conditionRegen = addCondition->static_self_cast(); + const auto &conditionRegen = addCondition->static_self_cast(); healthTicks = conditionRegen->healthTicks; manaTicks = conditionRegen->manaTicks; @@ -1127,7 +1230,7 @@ void ConditionRegeneration::addCondition(std::shared_ptr creature, con manaGain = conditionRegen->manaGain; } - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } } @@ -1161,10 +1264,10 @@ void ConditionRegeneration::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(manaGain); } -bool ConditionRegeneration::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionRegeneration::executeCondition(const std::shared_ptr &creature, int32_t interval) { internalHealthTicks += interval; internalManaTicks += interval; - auto player = creature->getPlayer(); + const auto &player = creature->getPlayer(); int32_t dailyStreak = 0; if (player) { dailyStreak = static_cast(player->kv()->scoped("daily-reward")->get("streak")->getNumber()); @@ -1244,30 +1347,37 @@ bool ConditionRegeneration::setParam(ConditionParam_t param, int32_t value) { } } -uint32_t ConditionRegeneration::getHealthTicks(std::shared_ptr creature) const { - std::shared_ptr player = creature->getPlayer(); +uint32_t ConditionRegeneration::getHealthTicks(const std::shared_ptr &creature) const { + const auto &player = creature->getPlayer(); if (player != nullptr && isBuff) { - return healthTicks / g_configManager().getFloat(RATE_SPELL_COOLDOWN, __FUNCTION__); + return healthTicks / g_configManager().getFloat(RATE_SPELL_COOLDOWN); } return healthTicks; } -uint32_t ConditionRegeneration::getManaTicks(std::shared_ptr creature) const { - std::shared_ptr player = creature->getPlayer(); +uint32_t ConditionRegeneration::getManaTicks(const std::shared_ptr &creature) const { + const auto &player = creature->getPlayer(); if (player != nullptr && isBuff) { - return manaTicks / g_configManager().getFloat(RATE_SPELL_COOLDOWN, __FUNCTION__); + return manaTicks / g_configManager().getFloat(RATE_SPELL_COOLDOWN); } return manaTicks; } +std::shared_ptr ConditionRegeneration::clone() const { + return std::make_shared(*this); +} + /** * ConditionManaShield */ +ConditionManaShield::ConditionManaShield(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff, uint32_t initSubId) : + Condition(initId, initType, iniTicks, initBuff, initSubId) { } + bool ConditionManaShield::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; @@ -1276,7 +1386,7 @@ bool ConditionManaShield::startCondition(std::shared_ptr creature) { creature->setManaShield(manaShield); creature->setMaxManaShield(manaShield); - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } @@ -1286,7 +1396,7 @@ bool ConditionManaShield::startCondition(std::shared_ptr creature) { void ConditionManaShield::endCondition(std::shared_ptr creature) { creature->setManaShield(0); creature->setMaxManaShield(0); - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } } @@ -1301,7 +1411,7 @@ void ConditionManaShield::addCondition(std::shared_ptr creature, const creature->setManaShield(manaShield); creature->setMaxManaShield(manaShield); - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->sendStats(); } } @@ -1332,12 +1442,16 @@ bool ConditionManaShield::setParam(ConditionParam_t param, int32_t value) { } } -uint32_t ConditionManaShield::getIcons() const { - uint32_t icons = Condition::getIcons(); +std::shared_ptr ConditionManaShield::clone() const { + return std::make_shared(*this); +} + +std::unordered_set ConditionManaShield::getIcons() const { + auto icons = Condition::getIcons(); if (manaShield != 0) { - icons |= ICON_NEWMANASHIELD; + icons.insert(PlayerIcon::NewManaShield); } else { - icons |= ICON_MANASHIELD; + icons.insert(PlayerIcon::ManaShield); } return icons; } @@ -1346,11 +1460,14 @@ uint32_t ConditionManaShield::getIcons() const { * ConditionSoul */ +ConditionSoul::ConditionSoul(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, iniTicks, initBuff, initSubId) { } + void ConditionSoul::addCondition(std::shared_ptr, const std::shared_ptr addCondition) { if (updateCondition(addCondition)) { setTicks(addCondition->getTicks()); - const std::shared_ptr &conditionSoul = addCondition->static_self_cast(); + const auto &conditionSoul = addCondition->static_self_cast(); soulTicks = conditionSoul->soulTicks; soulGain = conditionSoul->soulGain; @@ -1376,10 +1493,10 @@ void ConditionSoul::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(soulTicks); } -bool ConditionSoul::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionSoul::executeCondition(const std::shared_ptr &creature, int32_t interval) { internalSoulTicks += interval; - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { if (player->getZoneType() != ZONE_PROTECTION) { if (internalSoulTicks >= soulTicks) { internalSoulTicks = 0; @@ -1407,6 +1524,10 @@ bool ConditionSoul::setParam(ConditionParam_t param, int32_t value) { } } +std::shared_ptr ConditionSoul::clone() const { + return std::make_shared(*this); +} + /** * ConditionDamage */ @@ -1477,7 +1598,7 @@ bool ConditionDamage::unserializeProp(ConditionAttr_t attr, PropStream &propStre return false; } - damageList.push_back(damageInfo); + damageList.emplace_back(damageInfo); if (ticks != -1) { setTicks(ticks + damageInfo.interval); } @@ -1501,8 +1622,8 @@ void ConditionDamage::serialize(PropWriteStream &propWriteStream) { } } -bool ConditionDamage::updateCondition(const std::shared_ptr addCondition) { - const std::shared_ptr &conditionDamage = addCondition->static_self_cast(); +bool ConditionDamage::updateCondition(const std::shared_ptr &addCondition) { + const auto &conditionDamage = addCondition->static_self_cast(); if (conditionDamage->doForceUpdate()) { return true; } @@ -1535,7 +1656,7 @@ bool ConditionDamage::addDamage(int32_t rounds, int32_t time, int32_t value) { damageInfo.timeLeft = time; damageInfo.value = value; - damageList.push_back(damageInfo); + damageList.emplace_back(damageInfo); if (ticks != -1) { setTicks(ticks + damageInfo.interval); @@ -1545,6 +1666,10 @@ bool ConditionDamage::addDamage(int32_t rounds, int32_t time, int32_t value) { return true; } +bool ConditionDamage::doForceUpdate() const { + return forceUpdate; +} + bool ConditionDamage::init() { if (periodDamage != 0) { return true; @@ -1589,7 +1714,7 @@ bool ConditionDamage::startCondition(std::shared_ptr creature) { return true; } -bool ConditionDamage::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionDamage::executeCondition(const std::shared_ptr &creature, int32_t interval) { if (periodDamage != 0) { periodDamageTick += interval; @@ -1643,8 +1768,8 @@ bool ConditionDamage::getNextDamage(int32_t &damage) { return false; } -bool ConditionDamage::doDamage(std::shared_ptr creature, int32_t healthChange) { - auto attacker = g_game().getPlayerByGUID(owner) ? g_game().getPlayerByGUID(owner)->getCreature() : g_game().getCreatureByID(owner); +bool ConditionDamage::doDamage(const std::shared_ptr &creature, int32_t healthChange) const { + const auto &attacker = g_game().getPlayerByGUID(owner) ? g_game().getPlayerByGUID(owner)->getCreature() : g_game().getCreatureByID(owner); bool isPlayer = attacker && attacker->getPlayer(); if (creature->isSuppress(getType(), isPlayer)) { return true; @@ -1739,39 +1864,39 @@ int32_t ConditionDamage::getTotalDamage() const { return std::abs(result); } -uint32_t ConditionDamage::getIcons() const { - uint32_t icons = Condition::getIcons(); +std::unordered_set ConditionDamage::getIcons() const { + auto icons = Condition::getIcons(); switch (conditionType) { case CONDITION_FIRE: - icons |= ICON_BURN; + icons.insert(PlayerIcon::Burn); break; case CONDITION_ENERGY: - icons |= ICON_ENERGY; + icons.insert(PlayerIcon::Energy); break; case CONDITION_DROWN: - icons |= ICON_DROWNING; + icons.insert(PlayerIcon::Drowning); break; case CONDITION_POISON: - icons |= ICON_POISON; + icons.insert(PlayerIcon::Poison); break; case CONDITION_FREEZING: - icons |= ICON_FREEZING; + icons.insert(PlayerIcon::Freezing); break; case CONDITION_DAZZLED: - icons |= ICON_DAZZLED; + icons.insert(PlayerIcon::Dazzled); break; case CONDITION_CURSED: - icons |= ICON_CURSED; + icons.insert(PlayerIcon::Cursed); break; case CONDITION_BLEEDING: - icons |= ICON_BLEEDING; + icons.insert(PlayerIcon::Bleeding); break; default: @@ -1780,6 +1905,13 @@ uint32_t ConditionDamage::getIcons() const { return icons; } +std::shared_ptr ConditionDamage::clone() const { + return std::make_shared(*this); +} + +ConditionDamage::ConditionDamage(ConditionId_t intiId, ConditionType_t initType, bool initBuff, uint32_t initSubId) : + Condition(intiId, initType, 0, initBuff, initSubId) { } + void ConditionDamage::generateDamageList(int32_t amount, int32_t start, std::list &list) { amount = std::abs(amount); int32_t sum = 0; @@ -1791,7 +1923,7 @@ void ConditionDamage::generateDamageList(int32_t amount, int32_t start, std::lis do { sum += i; - list.push_back(i); + list.emplace_back(i); x1 = std::fabs(1.0 - ((static_cast(sum)) + i) / med); x2 = std::fabs(1.0 - (static_cast(sum) / med)); @@ -1802,13 +1934,13 @@ void ConditionDamage::generateDamageList(int32_t amount, int32_t start, std::lis /** * ConditionFeared */ -bool ConditionFeared::isStuck(std::shared_ptr creature, Position pos) const { +bool ConditionFeared::isStuck(const std::shared_ptr &creature, Position pos) const { return std::ranges::all_of(m_directionsVector, [&](Direction dir) { return !canWalkTo(creature, pos, dir); }); } -bool ConditionFeared::getRandomDirection(std::shared_ptr creature, Position pos) { +bool ConditionFeared::getRandomDirection(const std::shared_ptr &creature, Position pos) { static std::vector directions { DIRECTION_NORTH, DIRECTION_NORTHEAST, @@ -1820,18 +1952,21 @@ bool ConditionFeared::getRandomDirection(std::shared_ptr creature, Pos DIRECTION_NORTHWEST }; - std::ranges::shuffle(directions.begin(), directions.end(), getRandomGenerator()); - for (Direction dir : directions) { - if (canWalkTo(creature, pos, dir)) { - this->fleeIndx = static_cast(dir); - return true; - } + std::ranges::shuffle(directions, getRandomGenerator()); + + auto it = std::ranges::find_if(directions, [&](Direction dir) { + return canWalkTo(creature, pos, dir); + }); + + if (it != directions.end()) { + this->fleeIndx = static_cast(*it); + return true; } return false; } -bool ConditionFeared::canWalkTo(std::shared_ptr creature, Position pos, Direction moveDirection) const { +bool ConditionFeared::canWalkTo(const std::shared_ptr &creature, Position pos, Direction moveDirection) const { pos = getNextPosition(moveDirection, pos); if (!creature) { g_logger().error("[{}] creature is nullptr", __FUNCTION__); @@ -1840,7 +1975,7 @@ bool ConditionFeared::canWalkTo(std::shared_ptr creature, Position pos auto tile = g_game().map.getTile(pos); if (tile && tile->getTopVisibleCreature(creature) == nullptr && tile->queryAdd(0, creature, 1, FLAG_PATHFINDING) == RETURNVALUE_NOERROR) { - std::shared_ptr field = tile->getFieldItem(); + const auto &field = tile->getFieldItem(); if (field && !field->isBlocking() && field->getDamage() != 0) { return false; } @@ -1850,7 +1985,7 @@ bool ConditionFeared::canWalkTo(std::shared_ptr creature, Position pos return false; } -bool ConditionFeared::getFleeDirection(std::shared_ptr creature) { +bool ConditionFeared::getFleeDirection(const std::shared_ptr &creature) { Position creaturePos = creature->getPosition(); int_fast32_t offx = Position::getOffsetX(creaturePos, fleeingFromPos); @@ -1926,7 +2061,7 @@ bool ConditionFeared::getFleeDirection(std::shared_ptr creature) { return false; } -bool ConditionFeared::getFleePath(std::shared_ptr creature, const Position &pos, std::vector &dirList) { +bool ConditionFeared::getFleePath(const std::shared_ptr &creature, const Position &pos, std::vector &dirList) { const std::vector walkSize { 15, 9, 3, 1 }; bool found = false; std::ptrdiff_t found_size = 0; @@ -2020,6 +2155,9 @@ bool ConditionFeared::setPositionParam(ConditionParam_t param, const Position &p return false; } +ConditionFeared::ConditionFeared(ConditionId_t intiId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + Condition(intiId, initType, initTicks, initBuff, initSubId) { } + bool ConditionFeared::startCondition(std::shared_ptr creature) { g_logger().debug("[ConditionFeared::executeCondition] Condition started for {}", creature->getName()); getFleeDirection(creature); @@ -2027,7 +2165,7 @@ bool ConditionFeared::startCondition(std::shared_ptr creature) { return Condition::startCondition(creature); } -bool ConditionFeared::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionFeared::executeCondition(const std::shared_ptr &creature, int32_t interval) { Position currentPos = creature->getPosition(); std::vector listDir; @@ -2039,10 +2177,12 @@ bool ConditionFeared::executeCondition(std::shared_ptr creature, int32 } if (getFleePath(creature, currentPos, listDir)) { - g_dispatcher().addEvent([id = creature->getID(), listDir] { - g_game().forcePlayerAutoWalk(id, listDir); - }, - "ConditionFeared::executeCondition"); + g_dispatcher().addEvent( + [id = creature->getID(), listDir] { + g_game().forcePlayerAutoWalk(id, listDir); + }, + __FUNCTION__ + ); g_logger().debug("[ConditionFeared::executeCondition] Walking Scheduled"); } @@ -2056,7 +2196,7 @@ void ConditionFeared::endCondition(std::shared_ptr creature) { /* * After a player is feared there's a 10 seconds before they can can feared again. */ - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->setImmuneFear(); } @@ -2068,14 +2208,17 @@ void ConditionFeared::addCondition(std::shared_ptr, const std::shared_ } } -uint32_t ConditionFeared::getIcons() const { - uint32_t icons = Condition::getIcons(); - - icons |= ICON_FEARED; +std::unordered_set ConditionFeared::getIcons() const { + auto icons = Condition::getIcons(); + icons.insert(PlayerIcon::Feared); return icons; } +std::shared_ptr ConditionFeared::clone() const { + return std::make_shared(*this); +} + /** * ConditionSpeed */ @@ -2143,6 +2286,9 @@ void ConditionSpeed::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(maxb); } +ConditionSpeed::ConditionSpeed(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, int32_t initChangeSpeed) : + Condition(initId, initType, initTicks, initBuff, initSubId), speedDelta(initChangeSpeed) { } + bool ConditionSpeed::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; @@ -2163,7 +2309,7 @@ bool ConditionSpeed::startCondition(std::shared_ptr creature) { return true; } -bool ConditionSpeed::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionSpeed::executeCondition(const std::shared_ptr &creature, int32_t interval) { return Condition::executeCondition(creature, interval); } @@ -2208,15 +2354,15 @@ void ConditionSpeed::addCondition(std::shared_ptr creature, const std: } } -uint32_t ConditionSpeed::getIcons() const { - uint32_t icons = Condition::getIcons(); +std::unordered_set ConditionSpeed::getIcons() const { + auto icons = Condition::getIcons(); switch (conditionType) { case CONDITION_HASTE: - icons |= ICON_HASTE; + icons.insert(PlayerIcon::Haste); break; case CONDITION_PARALYZE: - icons |= ICON_PARALYZE; + icons.insert(PlayerIcon::Paralyze); break; default: @@ -2225,10 +2371,17 @@ uint32_t ConditionSpeed::getIcons() const { return icons; } +std::shared_ptr ConditionSpeed::clone() const { + return std::make_shared(*this); +} + /** * ConditionInvisible */ +ConditionInvisible::ConditionInvisible(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + bool ConditionInvisible::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; @@ -2244,6 +2397,10 @@ void ConditionInvisible::endCondition(std::shared_ptr creature) { } } +std::shared_ptr ConditionInvisible::clone() const { + return std::make_shared(*this); +} + /** * ConditionOutfit */ @@ -2270,14 +2427,17 @@ void ConditionOutfit::serialize(PropWriteStream &propWriteStream) { propWriteStream.write(outfit); } +ConditionOutfit::ConditionOutfit(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + Condition(initId, initType, initTicks, initBuff, initSubId) { } + bool ConditionOutfit::startCondition(std::shared_ptr creature) { - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { g_logger().warn("[ConditionOutfit::startCondition] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", outfit.lookType); return false; } if ((outfit.lookType == 0 && outfit.lookTypeEx == 0) && !monsterName.empty()) { - const auto monsterType = g_monsters().getMonsterType(monsterName); + const auto &monsterType = g_monsters().getMonsterType(monsterName); if (monsterType) { setOutfit(monsterType->info.outfit); } else { @@ -2294,7 +2454,7 @@ bool ConditionOutfit::startCondition(std::shared_ptr creature) { return true; } -bool ConditionOutfit::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionOutfit::executeCondition(const std::shared_ptr &creature, int32_t interval) { return Condition::executeCondition(creature, interval); } @@ -2303,7 +2463,7 @@ void ConditionOutfit::endCondition(std::shared_ptr creature) { } void ConditionOutfit::addCondition(std::shared_ptr creature, const std::shared_ptr addCondition) { - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { g_logger().warn("[ConditionOutfit::addCondition] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", outfit.lookType); return; } @@ -2311,9 +2471,9 @@ void ConditionOutfit::addCondition(std::shared_ptr creature, const std if (updateCondition(addCondition)) { setTicks(addCondition->getTicks()); - const std::shared_ptr &conditionOutfit = addCondition->static_self_cast(); - if (!conditionOutfit->monsterName.empty() && conditionOutfit->monsterName.compare(monsterName) != 0) { - const auto monsterType = g_monsters().getMonsterType(conditionOutfit->monsterName); + const auto &conditionOutfit = addCondition->static_self_cast(); + if (!conditionOutfit->monsterName.empty() && conditionOutfit->monsterName != monsterName) { + const auto &monsterType = g_monsters().getMonsterType(conditionOutfit->monsterName); if (monsterType) { setOutfit(monsterType->info.outfit); } else { @@ -2328,10 +2488,17 @@ void ConditionOutfit::addCondition(std::shared_ptr creature, const std } } +std::shared_ptr ConditionOutfit::clone() const { + return std::make_shared(*this); +} + /** * ConditionLight */ +ConditionLight::ConditionLight(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, uint8_t initLightlevel, uint8_t initLightcolor) : + Condition(initId, initType, initTicks, initBuff, initSubId), lightInfo(initLightlevel, initLightcolor) { } + bool ConditionLight::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; @@ -2344,7 +2511,7 @@ bool ConditionLight::startCondition(std::shared_ptr creature) { return true; } -bool ConditionLight::executeCondition(std::shared_ptr creature, int32_t interval) { +bool ConditionLight::executeCondition(const std::shared_ptr &creature, int32_t interval) { internalLightTicks += interval; if (internalLightTicks >= lightChangeInterval) { @@ -2370,16 +2537,20 @@ void ConditionLight::addCondition(std::shared_ptr creature, const std: if (updateCondition(condition)) { setTicks(condition->getTicks()); - const std::shared_ptr &conditionLight = condition->static_self_cast(); + const auto &conditionLight = condition->static_self_cast(); lightInfo.level = conditionLight->lightInfo.level; lightInfo.color = conditionLight->lightInfo.color; - lightChangeInterval = ticks / lightInfo.level; + lightChangeInterval = ticks / std::max(1, lightInfo.level); internalLightTicks = 0; creature->setCreatureLight(lightInfo); g_game().changeLight(creature); } } +std::shared_ptr ConditionLight::clone() const { + return std::make_shared(*this); +} + bool ConditionLight::setParam(ConditionParam_t param, int32_t value) { bool ret = Condition::setParam(param, value); if (ret) { @@ -2387,9 +2558,13 @@ bool ConditionLight::setParam(ConditionParam_t param, int32_t value) { } switch (param) { - case CONDITION_PARAM_LIGHT_LEVEL: - lightInfo.level = value; + case CONDITION_PARAM_LIGHT_LEVEL: { + if (value < 1) { + g_logger().warn("[ConditionLight::setParam] Trying to set invalid light value: '{}', defaulting to 1.", value); + } + lightInfo.level = std::max(1, static_cast(value)); return true; + } case CONDITION_PARAM_LIGHT_COLOR: lightInfo.color = value; @@ -2453,7 +2628,7 @@ void ConditionSpellCooldown::addCondition(std::shared_ptr creature, co setTicks(addCondition->getTicks()); if (subId != 0 && ticks > 0) { - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendSpellCooldown(subId, ticks); } @@ -2461,13 +2636,20 @@ void ConditionSpellCooldown::addCondition(std::shared_ptr creature, co } } +std::shared_ptr ConditionSpellCooldown::clone() const { + return std::make_shared(*this); +} + +ConditionSpellCooldown::ConditionSpellCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + bool ConditionSpellCooldown::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; } if (subId != 0 && ticks > 0) { - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendSpellCooldown(subId, ticks); } @@ -2484,7 +2666,7 @@ void ConditionSpellGroupCooldown::addCondition(std::shared_ptr creatur setTicks(addCondition->getTicks()); if (subId != 0 && ticks > 0) { - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendSpellGroupCooldown(static_cast(subId), ticks); } @@ -2492,13 +2674,20 @@ void ConditionSpellGroupCooldown::addCondition(std::shared_ptr creatur } } +std::shared_ptr ConditionSpellGroupCooldown::clone() const { + return std::make_shared(*this); +} + +ConditionSpellGroupCooldown::ConditionSpellGroupCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : + ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + bool ConditionSpellGroupCooldown::startCondition(std::shared_ptr creature) { if (!Condition::startCondition(creature)) { return false; } if (subId != 0 && ticks > 0) { - std::shared_ptr player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendSpellGroupCooldown(static_cast(subId), ticks); } diff --git a/src/creatures/combat/condition.hpp b/src/creatures/combat/condition.hpp index 2b28029bc..50d072059 100644 --- a/src/creatures/combat/condition.hpp +++ b/src/creatures/combat/condition.hpp @@ -9,7 +9,10 @@ #pragma once -#include "declarations.hpp" +#include "creatures/creatures_definitions.hpp" +#include "game/movement/position.hpp" + +enum class PlayerIcon : uint8_t; class Creature; class Player; @@ -19,37 +22,25 @@ class PropWriteStream; class Condition : public SharedObject { public: Condition() = default; - Condition(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - endTime(initTicks == -1 ? std::numeric_limits::max() : 0), - subId(initSubId), ticks(initTicks), conditionType(initType), id(initId), isBuff(initBuff) { } + Condition(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0, bool isPersistent = false); virtual ~Condition() = default; virtual bool startCondition(std::shared_ptr creature); - virtual bool executeCondition(std::shared_ptr creature, int32_t interval); + virtual bool executeCondition(const std::shared_ptr &creature, int32_t interval); virtual void endCondition(std::shared_ptr creature) = 0; virtual void addCondition(std::shared_ptr creature, std::shared_ptr condition) = 0; - virtual uint32_t getIcons() const; - ConditionId_t getId() const { - return id; - } - uint32_t getSubId() const { - return subId; - } + virtual std::unordered_set getIcons() const; + ConditionId_t getId() const; + uint32_t getSubId() const; virtual std::shared_ptr clone() const = 0; - ConditionType_t getType() const { - return conditionType; - } - int64_t getEndTime() const { - return endTime; - } - int32_t getTicks() const { - return ticks; - } + ConditionType_t getType() const; + int64_t getEndTime() const; + int32_t getTicks() const; void setTicks(int32_t newTicks); - static std::shared_ptr createCondition(ConditionId_t id, ConditionType_t type, int32_t ticks, int32_t param = 0, bool buff = false, uint32_t subId = 0); + static std::shared_ptr createCondition(ConditionId_t id, ConditionType_t type, int32_t ticks, int32_t param = 0, bool buff = false, uint32_t subId = 0, bool isPersistent = false); static std::shared_ptr createCondition(PropStream &propStream); virtual bool setParam(ConditionParam_t param, int32_t value); @@ -71,8 +62,9 @@ class Condition : public SharedObject { ConditionType_t conditionType {}; ConditionId_t id {}; bool isBuff {}; + bool m_isPersistent {}; - virtual bool updateCondition(std::shared_ptr addCondition); + virtual bool updateCondition(const std::shared_ptr &addCondition); private: SoundEffect_t tickSound = SoundEffect_t::SILENCE; @@ -84,35 +76,29 @@ class Condition : public SharedObject { class ConditionGeneric : public Condition { public: - ConditionGeneric(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - Condition(initId, initType, initTicks, initBuff, initSubId) { } + ConditionGeneric(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0, bool isPersistent = false); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - uint32_t getIcons() const override; + std::unordered_set getIcons() const override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; }; class ConditionAttributes final : public ConditionGeneric { public: - ConditionAttributes(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + ConditionAttributes(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) final; - bool executeCondition(std::shared_ptr creature, int32_t interval) final; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) final; void endCondition(std::shared_ptr creature) final; void addCondition(std::shared_ptr creature, std::shared_ptr condition) final; bool setParam(ConditionParam_t param, int32_t value) final; - std::shared_ptr clone() const final { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; // serialization void serialize(PropWriteStream &propWriteStream) final; @@ -150,39 +136,36 @@ class ConditionAttributes final : public ConditionGeneric { bool disableDefense = false; - void updatePercentStats(std::shared_ptr player); - void updateStats(std::shared_ptr player); - void updatePercentSkills(std::shared_ptr player); - void updateSkills(std::shared_ptr player); - void updateBuffs(std::shared_ptr creature); + void updatePercentStats(const std::shared_ptr &player); + void updateStats(const std::shared_ptr &player) const; + void updatePercentSkills(const std::shared_ptr &player); + void updateSkills(const std::shared_ptr &player) const; + void updateBuffs(const std::shared_ptr &creature) const; // 12.72 mechanics - void updatePercentAbsorbs(std::shared_ptr creature); - void updateAbsorbs(std::shared_ptr creature) const; - void updatePercentIncreases(std::shared_ptr creature); - void updateIncreases(std::shared_ptr creature) const; - void updateCharmChanceModifier(std::shared_ptr creature) const; - void updatePercentBuffs(std::shared_ptr creature); + void updatePercentAbsorbs(const std::shared_ptr &creature); + void updateAbsorbs(const std::shared_ptr &creature) const; + void updatePercentIncreases(const std::shared_ptr &creature); + void updateIncreases(const std::shared_ptr &creature) const; + void updateCharmChanceModifier(const std::shared_ptr &creature) const; + void updatePercentBuffs(const std::shared_ptr &creature); }; class ConditionRegeneration final : public ConditionGeneric { public: - ConditionRegeneration(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, iniTicks, initBuff, initSubId) { } + ConditionRegeneration(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr addCondition) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; bool setParam(ConditionParam_t param, int32_t value) override; - uint32_t getHealthTicks(std::shared_ptr creature) const; - uint32_t getManaTicks(std::shared_ptr creature) const; + uint32_t getHealthTicks(const std::shared_ptr &creature) const; + uint32_t getManaTicks(const std::shared_ptr &creature) const; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; // serialization void serialize(PropWriteStream &propWriteStream) override; @@ -200,19 +183,16 @@ class ConditionRegeneration final : public ConditionGeneric { class ConditionManaShield final : public Condition { public: - ConditionManaShield(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0) : - Condition(initId, initType, iniTicks, initBuff, initSubId) { } + ConditionManaShield(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr addCondition) override; - uint32_t getIcons() const override; + std::unordered_set getIcons() const override; bool setParam(ConditionParam_t param, int32_t value) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; // serialization void serialize(PropWriteStream &propWriteStream) override; @@ -224,17 +204,14 @@ class ConditionManaShield final : public Condition { class ConditionSoul final : public ConditionGeneric { public: - ConditionSoul(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, iniTicks, initBuff, initSubId) { } + ConditionSoul(ConditionId_t initId, ConditionType_t initType, int32_t iniTicks, bool initBuff = false, uint32_t initSubId = 0); void addCondition(std::shared_ptr creature, std::shared_ptr addCondition) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; bool setParam(ConditionParam_t param, int32_t value) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; // serialization void serialize(PropWriteStream &propWriteStream) override; @@ -248,41 +225,33 @@ class ConditionSoul final : public ConditionGeneric { class ConditionInvisible final : public ConditionGeneric { public: - ConditionInvisible(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + ConditionInvisible(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; void endCondition(std::shared_ptr creature) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; }; class ConditionDamage final : public Condition { public: ConditionDamage() = default; - ConditionDamage(ConditionId_t intiId, ConditionType_t initType, bool initBuff = false, uint32_t initSubId = 0) : - Condition(intiId, initType, 0, initBuff, initSubId) { } + ConditionDamage(ConditionId_t intiId, ConditionType_t initType, bool initBuff = false, uint32_t initSubId = 0); static void generateDamageList(int32_t amount, int32_t start, std::list &list); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - uint32_t getIcons() const override; + std::unordered_set getIcons() const override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; bool setParam(ConditionParam_t param, int32_t value) override; bool addDamage(int32_t rounds, int32_t time, int32_t value); - bool doForceUpdate() const { - return forceUpdate; - } + bool doForceUpdate() const; int32_t getTotalDamage() const; // serialization @@ -307,35 +276,32 @@ class ConditionDamage final : public Condition { std::list damageList; bool getNextDamage(int32_t &damage); - bool doDamage(std::shared_ptr creature, int32_t healthChange); + bool doDamage(const std::shared_ptr &creature, int32_t healthChange) const; - bool updateCondition(std::shared_ptr addCondition) override; + bool updateCondition(const std::shared_ptr &addCondition) override; }; class ConditionFeared final : public Condition { public: ConditionFeared() = default; - ConditionFeared(ConditionId_t intiId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId) : - Condition(intiId, initType, initTicks, initBuff, initSubId) { } + ConditionFeared(ConditionId_t intiId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - uint32_t getIcons() const override; + std::unordered_set getIcons() const override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; bool setPositionParam(ConditionParam_t param, const Position &pos) override; private: - bool canWalkTo(std::shared_ptr creature, Position pos, Direction moveDirection) const; - bool getFleeDirection(std::shared_ptr creature); - bool getFleePath(std::shared_ptr creature, const Position &pos, std::vector &dirList); - bool getRandomDirection(std::shared_ptr creature, Position pos); - bool isStuck(std::shared_ptr creature, Position pos) const; + bool canWalkTo(const std::shared_ptr &creature, Position pos, Direction moveDirection) const; + bool getFleeDirection(const std::shared_ptr &creature); + bool getFleePath(const std::shared_ptr &creature, const Position &pos, std::vector &dirList); + bool getRandomDirection(const std::shared_ptr &creature, Position pos); + bool isStuck(const std::shared_ptr &creature, Position pos) const; std::vector m_directionsVector { DIRECTION_NORTH, @@ -354,18 +320,15 @@ class ConditionFeared final : public Condition { class ConditionSpeed final : public Condition { public: - ConditionSpeed(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, int32_t initChangeSpeed) : - Condition(initId, initType, initTicks, initBuff, initSubId), speedDelta(initChangeSpeed) { } + ConditionSpeed(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, int32_t initChangeSpeed); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - uint32_t getIcons() const override; + std::unordered_set getIcons() const override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; bool setParam(ConditionParam_t param, int32_t value) override; @@ -389,17 +352,14 @@ class ConditionSpeed final : public Condition { class ConditionOutfit final : public Condition { public: - ConditionOutfit(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - Condition(initId, initType, initTicks, initBuff, initSubId) { } + ConditionOutfit(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; void setOutfit(const Outfit_t &outfit); void setLazyMonsterOutfit(const std::string &monsterName); @@ -415,17 +375,14 @@ class ConditionOutfit final : public Condition { class ConditionLight final : public Condition { public: - ConditionLight(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, uint8_t initLightlevel, uint8_t initLightcolor) : - Condition(initId, initType, initTicks, initBuff, initSubId), lightInfo(initLightlevel, initLightcolor) { } + ConditionLight(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff, uint32_t initSubId, uint8_t initLightlevel, uint8_t initLightcolor); bool startCondition(std::shared_ptr creature) override; - bool executeCondition(std::shared_ptr creature, int32_t interval) override; + bool executeCondition(const std::shared_ptr &creature, int32_t interval) override; void endCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr addCondition) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; bool setParam(ConditionParam_t param, int32_t value) override; @@ -434,33 +391,27 @@ class ConditionLight final : public Condition { bool unserializeProp(ConditionAttr_t attr, PropStream &propStream) override; private: - LightInfo lightInfo; + LightInfo lightInfo { 1, 215 }; uint32_t internalLightTicks = 0; uint32_t lightChangeInterval = 0; }; class ConditionSpellCooldown final : public ConditionGeneric { public: - ConditionSpellCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + ConditionSpellCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; }; class ConditionSpellGroupCooldown final : public ConditionGeneric { public: - ConditionSpellGroupCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0) : - ConditionGeneric(initId, initType, initTicks, initBuff, initSubId) { } + ConditionSpellGroupCooldown(ConditionId_t initId, ConditionType_t initType, int32_t initTicks, bool initBuff = false, uint32_t initSubId = 0); bool startCondition(std::shared_ptr creature) override; void addCondition(std::shared_ptr creature, std::shared_ptr condition) override; - std::shared_ptr clone() const override { - return std::make_shared(*this); - } + std::shared_ptr clone() const override; }; diff --git a/src/creatures/combat/spells.cpp b/src/creatures/combat/spells.cpp index f8852c5e5..0d66602dd 100644 --- a/src/creatures/combat/spells.cpp +++ b/src/creatures/combat/spells.cpp @@ -7,28 +7,32 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "creatures/combat/spells.hpp" +#include "config/configmanager.hpp" #include "creatures/combat/combat.hpp" -#include "creatures/combat/spells.hpp" -#include "creatures/monsters/monster.hpp" -#include "game/game.hpp" -#include "lua/scripts/lua_environment.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/players/player.hpp" #include "creatures/players/wheel/player_wheel.hpp" - +#include "creatures/players/wheel/wheel_definitions.hpp" +#include "enums/account_group_type.hpp" +#include "enums/account_type.hpp" +#include "game/game.hpp" #include "lua/global/lua_variant.hpp" +#include "lua/scripts/lua_environment.hpp" +#include "lua/scripts/luascript.hpp" -#include "enums/account_type.hpp" -#include "enums/account_group_type.hpp" +std::array(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyRegularBoost = { 0 }; +std::array(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyUpgradedBoost = { 0 }; Spells::Spells() = default; Spells::~Spells() = default; -TalkActionResult_t Spells::playerSaySpell(std::shared_ptr player, std::string &words) { - auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT, __FUNCTION__); - auto tile = player->getTile(); +TalkActionResult_t Spells::playerSaySpell(const std::shared_ptr &player, std::string &words) { + auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT); + const auto &tile = player->getTile(); if (maxOnline > 1 && player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER && tile && !tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT, __FUNCTION__); + auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT); auto accountPlayers = g_game().getPlayersByAccount(player->getAccount()); int countOutsizePZ = 0; for (const auto &accountPlayer : accountPlayers) { @@ -54,7 +58,7 @@ TalkActionResult_t Spells::playerSaySpell(std::shared_ptr player, std::s // strip trailing spaces trimString(str_words); - const std::shared_ptr instantSpell = getInstantSpell(str_words); + const auto &instantSpell = getInstantSpell(str_words); if (!instantSpell) { return TALKACTION_CONTINUE; } @@ -114,7 +118,11 @@ bool Spells::hasInstantSpell(const std::string &word) const { return false; } -bool Spells::registerInstantLuaEvent(const std::shared_ptr instant) { +void Spells::setInstantSpell(const std::string &word, const std::shared_ptr &instant) { + instants.try_emplace(word, instant); +} + +bool Spells::registerInstantLuaEvent(const std::shared_ptr &instant) { if (instant) { // If the spell not have the "spell:words()" return a error message const std::string &instantName = instant->getName(); @@ -133,16 +141,17 @@ bool Spells::registerInstantLuaEvent(const std::shared_ptr instant } // Register spell word in the map setInstantSpell(words, instant); + return true; } return false; } -bool Spells::registerRuneLuaEvent(const std::shared_ptr rune) { +bool Spells::registerRuneLuaEvent(const std::shared_ptr &rune) { if (rune) { uint16_t id = rune->getRuneItemId(); - auto result = runes.emplace(rune->getRuneItemId(), rune); - if (!result.second) { + const auto &[iter, inserted] = runes.try_emplace(rune->getRuneItemId(), rune); + if (!inserted) { g_logger().warn( "[{}] duplicate registered rune with id: {}, for script: {}", __FUNCTION__, @@ -150,7 +159,7 @@ bool Spells::registerRuneLuaEvent(const std::shared_ptr rune) { rune->getScriptInterface()->getLoadingScriptName() ); } - return result.second; + return inserted; } return false; @@ -174,6 +183,14 @@ std::list Spells::getSpellsByVocation(uint16_t vocationId) { return spellsList; } +const std::map> &Spells::getInstantSpells() const { + return instants; +} + +Spells &Spells::getInstance() { + return inject(); +} + std::shared_ptr Spells::getSpellByName(const std::string &name) { std::shared_ptr spell = getRuneSpellByName(name); if (!spell) { @@ -256,11 +273,11 @@ std::shared_ptr Spells::getInstantSpellByName(const std::string &n return nullptr; } -Position Spells::getCasterPosition(std::shared_ptr creature, Direction dir) { +Position Spells::getCasterPosition(const std::shared_ptr &creature, Direction dir) { return getNextPosition(dir, creature->getPosition()); } -CombatSpell::CombatSpell(const std::shared_ptr newCombat, bool newNeedTarget, bool newNeedDirection) : +CombatSpell::CombatSpell(const std::shared_ptr &newCombat, bool newNeedTarget, bool newNeedDirection) : Script(&g_spells().getScriptInterface()), m_combat(newCombat), needDirection(newNeedDirection), @@ -273,28 +290,40 @@ bool CombatSpell::loadScriptCombat() { return m_combat != nullptr; } -bool CombatSpell::castSpell(std::shared_ptr creature) { +std::shared_ptr CombatSpell::getCombat() const { + return m_combat; +} + +std::string CombatSpell::getScriptTypeName() const { + return "onCastSpell"; +} + +bool CombatSpell::castSpell(const std::shared_ptr &creature) { if (isLoadedCallback()) { LuaVariant var; var.type = VARIANT_POSITION; - if (needDirection) { - var.pos = Spells::getCasterPosition(creature, creature->getDirection()); - } else { - var.pos = creature->getPosition(); + if (creature) { + if (needDirection) { + var.pos = Spells::getCasterPosition(creature, creature->getDirection()); + } else { + var.pos = creature->getPosition(); + } } return executeCastSpell(creature, var); } Position pos; - if (needDirection) { - pos = Spells::getCasterPosition(creature, creature->getDirection()); - } else { - pos = creature->getPosition(); + if (creature) { + if (needDirection) { + pos = Spells::getCasterPosition(creature, creature->getDirection()); + } else { + pos = creature->getPosition(); + } } - auto combat = getCombat(); + const auto &combat = getCombat(); if (!combat) { return false; } @@ -311,8 +340,8 @@ bool CombatSpell::castSpell(std::shared_ptr creature) { return true; } -bool CombatSpell::castSpell(std::shared_ptr creature, std::shared_ptr target) { - auto combat = getCombat(); +bool CombatSpell::castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) { + const auto &combat = getCombat(); if (!combat) { return false; } @@ -322,12 +351,14 @@ bool CombatSpell::castSpell(std::shared_ptr creature, std::shared_ptr< if (combat->hasArea()) { var.type = VARIANT_POSITION; - if (needTarget) { + if (needTarget && target) { var.pos = target->getPosition(); - } else if (needDirection) { + } else if (needDirection && creature) { var.pos = Spells::getCasterPosition(creature, creature->getDirection()); } else { - var.pos = creature->getPosition(); + if (creature) { + var.pos = creature->getPosition(); + } } } else { var.type = VARIANT_NUMBER; @@ -346,7 +377,7 @@ bool CombatSpell::castSpell(std::shared_ptr creature, std::shared_ptr< } if (combat->hasArea()) { - if (needTarget) { + if (needTarget && target) { combat->doCombat(creature, target->getPosition()); } else { return castSpell(creature); @@ -357,16 +388,16 @@ bool CombatSpell::castSpell(std::shared_ptr creature, std::shared_ptr< return true; } -bool CombatSpell::executeCastSpell(std::shared_ptr creature, const LuaVariant &var) const { +bool CombatSpell::executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var) const { // onCastSpell(creature, var) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaEnvironment::reserveScriptEnv()) { g_logger().error("[CombatSpell::executeCastSpell - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaEnvironment::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -381,7 +412,7 @@ bool CombatSpell::executeCastSpell(std::shared_ptr creature, const Lua return getScriptInterface()->callFunction(2); } -bool Spell::playerSpellCheck(std::shared_ptr player) const { +bool Spell::playerSpellCheck(const std::shared_ptr &player) const { if (player->hasFlag(PlayerFlags_t::CannotUseSpells)) { return false; } @@ -485,7 +516,7 @@ bool Spell::playerSpellCheck(std::shared_ptr player) const { return true; } -bool Spell::playerInstantSpellCheck(std::shared_ptr player, const Position &toPos) const { +bool Spell::playerInstantSpellCheck(const std::shared_ptr &player, const Position &toPos) const { if (toPos.x == 0xFFFF) { return true; } @@ -501,7 +532,7 @@ bool Spell::playerInstantSpellCheck(std::shared_ptr player, const Positi return false; } - const auto tile = g_game().map.getOrCreateTile(toPos); + const auto &tile = g_game().map.getOrCreateTile(toPos); ReturnValue ret = Combat::canDoCombat(player, tile, aggressive); if (ret != RETURNVALUE_NOERROR) { @@ -525,7 +556,7 @@ bool Spell::playerInstantSpellCheck(std::shared_ptr player, const Positi return true; } -bool Spell::playerRuneSpellCheck(std::shared_ptr player, const Position &toPos) { +bool Spell::playerRuneSpellCheck(const std::shared_ptr &player, const Position &toPos) const { if (!playerSpellCheck(player)) { return false; } @@ -545,14 +576,14 @@ bool Spell::playerRuneSpellCheck(std::shared_ptr player, const Position return false; } - std::shared_ptr tile = g_game().map.getTile(toPos); + const auto &tile = g_game().map.getTile(toPos); if (!tile) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); g_game().addMagicEffect(player->getPosition(), CONST_ME_POFF); return false; } - if (range != -1 && !g_game().canThrowObjectTo(playerPos, toPos, true, range, range)) { + if (range != -1 && !g_game().canThrowObjectTo(playerPos, toPos, SightLine_CheckSightLineAndFloor, range, range)) { player->sendCancelMessage(RETURNVALUE_DESTINATIONOUTOFREACH); g_game().addMagicEffect(player->getPosition(), CONST_ME_POFF); return false; @@ -565,12 +596,8 @@ bool Spell::playerRuneSpellCheck(std::shared_ptr player, const Position return false; } - const std::shared_ptr topVisibleCreature = tile->getBottomVisibleCreature(player); - if (blockingCreature && topVisibleCreature) { - player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); - g_game().addMagicEffect(player->getPosition(), CONST_ME_POFF); - return false; - } else if (blockingSolid && tile->hasFlag(TILESTATE_BLOCKSOLID) && !topVisibleCreature) { + const auto &topVisibleCreature = tile->getBottomVisibleCreature(player); + if ((blockingCreature && topVisibleCreature) || (blockingSolid && tile->hasFlag(TILESTATE_BLOCKSOLID) && !topVisibleCreature)) { player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); g_game().addMagicEffect(player->getPosition(), CONST_ME_POFF); return false; @@ -583,7 +610,7 @@ bool Spell::playerRuneSpellCheck(std::shared_ptr player, const Position } if (aggressive && needTarget && topVisibleCreature && player->hasSecureMode()) { - const std::shared_ptr targetPlayer = topVisibleCreature->getPlayer(); + const auto &targetPlayer = topVisibleCreature->getPlayer(); if (targetPlayer && targetPlayer != player && player->getSkullClient(targetPlayer) == SKULL_NONE && !Combat::isInPvpZone(player, targetPlayer)) { player->sendCancelMessage(RETURNVALUE_TURNSECUREMODETOATTACKUNMARKEDPLAYERS); g_game().addMagicEffect(player->getPosition(), CONST_ME_POFF); @@ -630,16 +657,34 @@ void Spell::setWheelOfDestinyBoost(WheelSpellBoost_t boost, WheelSpellGrade_t gr } } -void Spell::getCombatDataAugment(std::shared_ptr player, CombatDamage &damage) { +const std::string &Spell::getWords() const { + return m_words; +} + +void Spell::setWords(std::string_view newWord) { + m_words = newWord.data(); +} + +const std::string &Spell::getSeparator() const { + return m_separator; +} + +void Spell::setSeparator(std::string_view newSeparator) { + m_separator = newSeparator.data(); +} + +void Spell::getCombatDataAugment(const std::shared_ptr &player, CombatDamage &damage) const { if (!(damage.instantSpellName).empty()) { const auto equippedAugmentItems = player->getEquippedAugmentItems(); for (const auto &item : equippedAugmentItems) { - const auto augments = item->getAugmentsBySpellName(damage.instantSpellName); + const auto &augments = item->getAugmentsBySpellName(damage.instantSpellName); for (auto &augment : augments) { if (augment->value == 0) { continue; } - if (augment->type == Augment_t::IncreasedDamage || augment->type == Augment_t::PowerfulImpact || augment->type == Augment_t::StrongImpact) { + if ( + augment->type == Augment_t::IncreasedDamage || augment->type == Augment_t::PowerfulImpact || augment->type == Augment_t::StrongImpact || augment->type == Augment_t::Base + ) { const float augmentPercent = augment->value / 100.0; damage.primary.value += static_cast(damage.primary.value * augmentPercent); damage.secondary.value += static_cast(damage.secondary.value * augmentPercent); @@ -654,12 +699,12 @@ void Spell::getCombatDataAugment(std::shared_ptr player, CombatDamage &d } }; -int32_t Spell::calculateAugmentSpellCooldownReduction(std::shared_ptr player) const { +int32_t Spell::calculateAugmentSpellCooldownReduction(const std::shared_ptr &player) const { int32_t spellCooldown = 0; - const auto equippedAugmentItems = player->getEquippedAugmentItemsByType(Augment_t::Cooldown); + const auto &equippedAugmentItems = player->getEquippedAugmentItemsByType(Augment_t::Cooldown); for (const auto &item : equippedAugmentItems) { const auto augments = item->getAugmentsBySpellNameAndType(getName(), Augment_t::Cooldown); - for (auto &augment : augments) { + for (const auto &augment : augments) { spellCooldown += augment->value; } } @@ -667,11 +712,11 @@ int32_t Spell::calculateAugmentSpellCooldownReduction(std::shared_ptr pl return spellCooldown; } -void Spell::applyCooldownConditions(std::shared_ptr player) const { +void Spell::applyCooldownConditions(const std::shared_ptr &player) const { WheelSpellGrade_t spellGrade = player->wheel()->getSpellUpgrade(getName()); bool isUpgraded = getWheelOfDestinyUpgraded() && static_cast(spellGrade) > 0; // Safety check to prevent division by zero - auto rateCooldown = g_configManager().getFloat(RATE_SPELL_COOLDOWN, __FUNCTION__); + auto rateCooldown = g_configManager().getFloat(RATE_SPELL_COOLDOWN); if (std::abs(rateCooldown) < std::numeric_limits::epsilon()) { rateCooldown = 0.1; // Safe minimum value } @@ -686,7 +731,7 @@ void Spell::applyCooldownConditions(std::shared_ptr player) const { spellCooldown -= player->wheel()->getSpellBonus(name, WheelSpellBoost_t::COOLDOWN); spellCooldown -= augmentCooldownReduction; if (spellCooldown > 0) { - std::shared_ptr condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN, spellCooldown / rateCooldown, 0, false, m_spellId); + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLCOOLDOWN, spellCooldown / rateCooldown, 0, false, m_spellId); player->addCondition(condition); } } @@ -697,7 +742,7 @@ void Spell::applyCooldownConditions(std::shared_ptr player) const { spellGroupCooldown -= getWheelOfDestinyBoost(WheelSpellBoost_t::GROUP_COOLDOWN, spellGrade); } if (spellGroupCooldown > 0) { - std::shared_ptr condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, spellGroupCooldown / rateCooldown, 0, false, group); + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, spellGroupCooldown / rateCooldown, 0, false, group); player->addCondition(condition); } } @@ -708,13 +753,29 @@ void Spell::applyCooldownConditions(std::shared_ptr player) const { spellSecondaryGroupCooldown -= getWheelOfDestinyBoost(WheelSpellBoost_t::SECONDARY_GROUP_COOLDOWN, spellGrade); } if (spellSecondaryGroupCooldown > 0) { - std::shared_ptr condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, spellSecondaryGroupCooldown / rateCooldown, 0, false, secondaryGroup); + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_SPELLGROUPCOOLDOWN, spellSecondaryGroupCooldown / rateCooldown, 0, false, secondaryGroup); player->addCondition(condition); } } } -void Spell::postCastSpell(std::shared_ptr player, bool finishedCast /*= true*/, bool payCost /*= true*/) const { +const std::string &Spell::getName() const { + return name; +} + +void Spell::setName(std::string n) { + name = std::move(n); +} + +uint16_t Spell::getSpellId() const { + return m_spellId; +} + +void Spell::setSpellId(uint16_t id) { + m_spellId = id; +} + +void Spell::postCastSpell(const std::shared_ptr &player, bool finishedCast /*= true*/, bool payCost /*= true*/) const { if (finishedCast) { if (!player->hasFlag(PlayerFlags_t::HasNoExhaustion)) { applyCooldownConditions(player); @@ -731,11 +792,11 @@ void Spell::postCastSpell(std::shared_ptr player, bool finishedCast /*= } if (payCost) { - Spell::postCastSpell(player, getManaCost(player), getSoulCost()); + postCastSpell(player, getManaCost(player), getSoulCost()); } } -void Spell::postCastSpell(std::shared_ptr player, uint32_t manaCost, uint32_t soulCost) { +void Spell::postCastSpell(const std::shared_ptr &player, uint32_t manaCost, uint32_t soulCost) { if (manaCost > 0) { player->addManaSpent(manaCost); player->changeMana(-static_cast(manaCost)); @@ -748,7 +809,11 @@ void Spell::postCastSpell(std::shared_ptr player, uint32_t manaCost, uin } } -uint32_t Spell::getManaCost(std::shared_ptr player) const { +bool Spell::isLearnable() const { + return learnable; +} + +uint32_t Spell::getManaCost(const std::shared_ptr &player) const { WheelSpellGrade_t spellGrade = player->wheel()->getSpellUpgrade(getName()); uint32_t manaRedution = 0; if (getWheelOfDestinyUpgraded() && static_cast(spellGrade) > 0) { @@ -775,7 +840,197 @@ uint32_t Spell::getManaCost(std::shared_ptr player) const { return 0; } -bool InstantSpell::playerCastInstant(std::shared_ptr player, std::string ¶m) { +uint32_t Spell::getSoulCost() const { + return soul; +} + +void Spell::setSoulCost(uint32_t s) { + soul = s; +} + +uint32_t Spell::getLevel() const { + return level; +} + +void Spell::setLevel(uint32_t lvl) { + level = lvl; +} + +uint32_t Spell::getMagicLevel() const { + return magLevel; +} + +void Spell::setMagicLevel(uint32_t lvl) { + magLevel = lvl; +} + +uint32_t Spell::getMana() const { + return mana; +} + +void Spell::setMana(uint32_t m) { + mana = m; +} + +uint32_t Spell::getManaPercent() const { + return manaPercent; +} + +void Spell::setManaPercent(uint32_t m) { + manaPercent = m; +} + +bool Spell::isPremium() const { + return premium; +} + +void Spell::setPremium(bool p) { + premium = p; +} + +bool Spell::isEnabled() const { + return enabled; +} + +void Spell::setEnabled(bool e) { + enabled = e; +} + +const VocSpellMap &Spell::getVocMap() const { + return vocSpellMap; +} + +void Spell::addVocMap(uint16_t vocationId, bool b) { + if (vocationId == 0XFFFF) { + g_logger().error("Vocation overflow for spell: {}", getName()); + return; + } + + g_logger().trace("Adding spell: {} to voc id: {}", getName(), vocationId); + vocSpellMap[vocationId] = b; +} + +SpellGroup_t Spell::getGroup() { + return group; +} + +void Spell::setGroup(SpellGroup_t g) { + group = g; +} + +SpellGroup_t Spell::getSecondaryGroup() { + return secondaryGroup; +} + +void Spell::setSecondaryGroup(SpellGroup_t g) { + secondaryGroup = g; +} + +uint32_t Spell::getCooldown() const { + return cooldown; +} + +void Spell::setCooldown(uint32_t cd) { + cooldown = cd; +} + +uint32_t Spell::getSecondaryCooldown() const { + return secondaryGroupCooldown; +} + +void Spell::setSecondaryCooldown(uint32_t cd) { + secondaryGroupCooldown = cd; +} + +uint32_t Spell::getGroupCooldown() const { + return groupCooldown; +} + +void Spell::setGroupCooldown(uint32_t cd) { + groupCooldown = cd; +} + +int32_t Spell::getRange() const { + return range; +} + +void Spell::setRange(int32_t r) { + range = r; +} + +bool Spell::getNeedTarget() const { + return needTarget; +} + +void Spell::setNeedTarget(bool n) { + needTarget = n; +} + +bool Spell::getNeedWeapon() const { + return needWeapon; +} + +void Spell::setNeedWeapon(bool n) { + needWeapon = n; +} + +bool Spell::getNeedLearn() const { + return learnable; +} + +void Spell::setNeedLearn(bool n) { + learnable = n; +} + +bool Spell::getSelfTarget() const { + return selfTarget; +} + +void Spell::setSelfTarget(bool s) { + selfTarget = s; +} + +bool Spell::getBlockingSolid() const { + return blockingSolid; +} + +void Spell::setBlockingSolid(bool b) { + blockingSolid = b; +} + +bool Spell::getBlockingCreature() const { + return blockingCreature; +} + +void Spell::setBlockingCreature(bool b) { + blockingCreature = b; +} + +bool Spell::getAggressive() const { + return aggressive; +} + +void Spell::setAggressive(bool a) { + aggressive = a; +} + +bool Spell::getAllowOnSelf() const { + return allowOnSelf; +} + +void Spell::setAllowOnSelf(bool s) { + allowOnSelf = s; +} + +bool Spell::getLockedPZ() const { + return pzLocked; +} + +void Spell::setLockedPZ(bool b) { + pzLocked = b; +} + +bool InstantSpell::playerCastInstant(const std::shared_ptr &player, std::string ¶m) const { if (!playerSpellCheck(player)) { return false; } @@ -897,21 +1152,25 @@ bool InstantSpell::playerCastInstant(std::shared_ptr player, std::string return result; } -bool InstantSpell::canThrowSpell(std::shared_ptr creature, std::shared_ptr target) const { +bool InstantSpell::canThrowSpell(const std::shared_ptr &creature, const std::shared_ptr &target) const { const Position &fromPos = creature->getPosition(); const Position &toPos = target->getPosition(); - if (fromPos.z != toPos.z || (range == -1 && !g_game().canThrowObjectTo(fromPos, toPos, checkLineOfSight)) || (range != -1 && !g_game().canThrowObjectTo(fromPos, toPos, checkLineOfSight, range, range))) { + if (fromPos.z != toPos.z || (range == -1 && !g_game().canThrowObjectTo(fromPos, toPos, checkLineOfSight ? SightLine_CheckSightLineAndFloor : SightLine_NoCheck)) || (range != -1 && !g_game().canThrowObjectTo(fromPos, toPos, checkLineOfSight ? SightLine_CheckSightLineAndFloor : SightLine_NoCheck, range, range))) { return false; } return true; } -bool InstantSpell::castSpell(std::shared_ptr creature) { +std::string InstantSpell::getScriptTypeName() const { + return "onCastSpell"; +} + +bool InstantSpell::castSpell(const std::shared_ptr &creature) { LuaVariant var; var.instantName = getName(); if (casterTargetOrDirection) { - std::shared_ptr target = creature->getAttackedCreature(); + const auto &target = creature->getAttackedCreature(); if (target && target->getHealth() > 0) { if (!canThrowSpell(creature, target)) { return false; @@ -935,27 +1194,26 @@ bool InstantSpell::castSpell(std::shared_ptr creature) { return executeCastSpell(creature, var); } -bool InstantSpell::castSpell(std::shared_ptr creature, std::shared_ptr target) { +bool InstantSpell::castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) { if (needTarget) { LuaVariant var; var.type = VARIANT_NUMBER; var.number = target->getID(); return executeCastSpell(creature, var); - } else { - return castSpell(creature); } + return castSpell(creature); } -bool InstantSpell::executeCastSpell(std::shared_ptr creature, const LuaVariant &var) const { +bool InstantSpell::executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var) const { // onCastSpell(creature, var) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaEnvironment::reserveScriptEnv()) { g_logger().error("[InstantSpell::executeCastSpell - Creature {} words {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName(), getWords()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaEnvironment::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -970,7 +1228,51 @@ bool InstantSpell::executeCastSpell(std::shared_ptr creature, const Lu return getScriptInterface()->callFunction(2); } -bool InstantSpell::canCast(std::shared_ptr player) const { +bool InstantSpell::isInstant() const { + return true; +} + +bool InstantSpell::getHasParam() const { + return hasParam; +} + +void InstantSpell::setHasParam(bool p) { + hasParam = p; +} + +bool InstantSpell::getHasPlayerNameParam() const { + return hasPlayerNameParam; +} + +void InstantSpell::setHasPlayerNameParam(bool p) { + hasPlayerNameParam = p; +} + +bool InstantSpell::getNeedDirection() const { + return needDirection; +} + +void InstantSpell::setNeedDirection(bool n) { + needDirection = n; +} + +bool InstantSpell::getNeedCasterTargetOrDirection() const { + return casterTargetOrDirection; +} + +void InstantSpell::setNeedCasterTargetOrDirection(bool d) { + casterTargetOrDirection = d; +} + +bool InstantSpell::getBlockWalls() const { + return checkLineOfSight; +} + +void InstantSpell::setBlockWalls(bool w) { + checkLineOfSight = w; +} + +bool InstantSpell::canCast(const std::shared_ptr &player) const { if (player->hasFlag(PlayerFlags_t::CannotUseSpells)) { return false; } @@ -992,7 +1294,7 @@ bool InstantSpell::canCast(std::shared_ptr player) const { return false; } -ReturnValue RuneSpell::canExecuteAction(std::shared_ptr player, const Position &toPos) { +ReturnValue RuneSpell::canExecuteAction(const std::shared_ptr &player, const Position &toPos) { if (player->hasFlag(PlayerFlags_t::CannotUseSpells)) { return RETURNVALUE_CANNOTUSETHISOBJECT; } @@ -1013,7 +1315,15 @@ ReturnValue RuneSpell::canExecuteAction(std::shared_ptr player, const Po return RETURNVALUE_NOERROR; } -bool RuneSpell::executeUse(std::shared_ptr player, std::shared_ptr item, const Position &, std::shared_ptr target, const Position &toPosition, bool isHotkey) { +bool RuneSpell::hasOwnErrorHandler() { + return true; +} + +std::shared_ptr RuneSpell::getTarget(const std::shared_ptr &, const std::shared_ptr &targetCreature, const Position &, uint8_t) const { + return targetCreature; +} + +bool RuneSpell::executeUse(const std::shared_ptr &player, const std::shared_ptr &item, const Position &, const std::shared_ptr &target, const Position &toPosition, bool isHotkey) { if (!playerRuneSpellCheck(player, toPosition)) { return false; } @@ -1030,9 +1340,9 @@ bool RuneSpell::executeUse(std::shared_ptr player, std::shared_ptr var.type = VARIANT_NUMBER; if (target == nullptr) { - std::shared_ptr toTile = g_game().map.getTile(toPosition); + const auto &toTile = g_game().map.getTile(toPosition); if (toTile) { - std::shared_ptr visibleCreature = toTile->getBottomVisibleCreature(player); + const auto &visibleCreature = toTile->getBottomVisibleCreature(player); if (visibleCreature) { var.number = visibleCreature->getID(); } @@ -1050,7 +1360,7 @@ bool RuneSpell::executeUse(std::shared_ptr player, std::shared_ptr } postCastSpell(player); - if (hasCharges && item && g_configManager().getBoolean(REMOVE_RUNE_CHARGES, __FUNCTION__)) { + if (hasCharges && item && g_configManager().getBoolean(REMOVE_RUNE_CHARGES)) { int32_t newCount = std::max(0, item->getItemCount() - 1); g_game().transformItem(item, item->getID(), newCount); player->updateSupplyTracker(item); @@ -1065,7 +1375,7 @@ bool RuneSpell::executeUse(std::shared_ptr player, std::shared_ptr return true; } -bool RuneSpell::castSpell(std::shared_ptr creature) { +bool RuneSpell::castSpell(const std::shared_ptr &creature) { LuaVariant var; var.type = VARIANT_NUMBER; var.number = creature->getID(); @@ -1073,7 +1383,7 @@ bool RuneSpell::castSpell(std::shared_ptr creature) { return internalCastSpell(creature, var, false); } -bool RuneSpell::castSpell(std::shared_ptr creature, std::shared_ptr target) { +bool RuneSpell::castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) { LuaVariant var; var.type = VARIANT_NUMBER; var.number = target->getID(); @@ -1081,26 +1391,30 @@ bool RuneSpell::castSpell(std::shared_ptr creature, std::shared_ptr creature, const LuaVariant &var, bool isHotkey) { +std::string RuneSpell::getScriptTypeName() const { + return "onCastSpell"; +} + +bool RuneSpell::internalCastSpell(const std::shared_ptr &creature, const LuaVariant &var, bool isHotkey) const { bool result; if (isLoadedCallback()) { - result = executeCastSpell(std::move(creature), var, isHotkey); + result = executeCastSpell(creature, var, isHotkey); } else { result = false; } return result; } -bool RuneSpell::executeCastSpell(std::shared_ptr creature, const LuaVariant &var, bool isHotkey) const { +bool RuneSpell::executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var, bool isHotkey) const { // onCastSpell(creature, var, isHotkey) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaEnvironment::reserveScriptEnv()) { g_logger().error("[RuneSpell::executeCastSpell - Creature {} runeId {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName(), getRuneItemId()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaEnvironment::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1116,3 +1430,26 @@ bool RuneSpell::executeCastSpell(std::shared_ptr creature, const LuaVa return getScriptInterface()->callFunction(3); } + +bool RuneSpell::isInstant() const { + return false; +} + +uint16_t RuneSpell::getRuneItemId() const { + return runeId; +} + +void RuneSpell::setRuneItemId(uint16_t i) { + runeId = i; +} + +uint32_t RuneSpell::getCharges() const { + return charges; +} + +void RuneSpell::setCharges(uint32_t c) { + if (c > 0) { + hasCharges = true; + } + charges = c; +} diff --git a/src/creatures/combat/spells.hpp b/src/creatures/combat/spells.hpp index fc23bbf90..ab34fa6db 100644 --- a/src/creatures/combat/spells.hpp +++ b/src/creatures/combat/spells.hpp @@ -9,13 +9,12 @@ #pragma once -#include "lua/scripts/luascript.hpp" -#include "creatures/players/player.hpp" -#include "creatures/players/wheel/wheel_definitions.hpp" #include "lua/creature/actions.hpp" -#include "lua/creature/talkaction.hpp" #include "lua/scripts/scripts.hpp" +enum class WheelSpellBoost_t : uint8_t; +enum class WheelSpellGrade_t : uint8_t; + class InstantSpell; class RuneSpell; class Spell; @@ -33,9 +32,7 @@ class Spells final : public Scripts { Spells(const Spells &) = delete; Spells &operator=(const Spells &) = delete; - static Spells &getInstance() { - return inject(); - } + static Spells &getInstance(); std::shared_ptr getSpellByName(const std::string &name); std::shared_ptr getRuneSpell(uint16_t id); @@ -46,25 +43,21 @@ class Spells final : public Scripts { std::shared_ptr getInstantSpellById(uint16_t spellId); - TalkActionResult_t playerSaySpell(std::shared_ptr player, std::string &words); + TalkActionResult_t playerSaySpell(const std::shared_ptr &player, std::string &words); - static Position getCasterPosition(std::shared_ptr creature, Direction dir); + static Position getCasterPosition(const std::shared_ptr &creature, Direction dir); std::list getSpellsByVocation(uint16_t vocationId); - [[nodiscard]] const std::map> &getInstantSpells() const { - return instants; - }; + [[nodiscard]] const std::map> &getInstantSpells() const; [[nodiscard]] bool hasInstantSpell(const std::string &word) const; - void setInstantSpell(const std::string &word, const std::shared_ptr instant) { - instants.try_emplace(word, instant); - } + void setInstantSpell(const std::string &word, const std::shared_ptr &instant); void clear(); - bool registerInstantLuaEvent(std::shared_ptr instant); - bool registerRuneLuaEvent(std::shared_ptr rune); + bool registerInstantLuaEvent(const std::shared_ptr &instant); + bool registerRuneLuaEvent(const std::shared_ptr &rune); private: std::map> runes; @@ -75,15 +68,15 @@ class Spells final : public Scripts { constexpr auto g_spells = Spells::getInstance; -using RuneSpellFunction = std::function spell, std::shared_ptr player, const Position &posTo)>; +using RuneSpellFunction [[maybe_unused]] = std::function &spell, const std::shared_ptr &player, const Position &posTo)>; class BaseSpell { public: constexpr BaseSpell() = default; virtual ~BaseSpell() = default; - virtual bool castSpell(std::shared_ptr creature) = 0; - virtual bool castSpell(std::shared_ptr creature, std::shared_ptr target) = 0; + virtual bool castSpell(const std::shared_ptr &creature) = 0; + virtual bool castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) = 0; SoundEffect_t soundImpactEffect = SoundEffect_t::SILENCE; SoundEffect_t soundCastEffect = SoundEffect_t::SPELL_OR_RUNE; @@ -92,27 +85,23 @@ class BaseSpell { class CombatSpell final : public Script, public BaseSpell, public std::enable_shared_from_this { public: // Constructor - CombatSpell(std::shared_ptr newCombat, bool newNeedTarget, bool newNeedDirection); + CombatSpell(const std::shared_ptr &newCombat, bool newNeedTarget, bool newNeedDirection); // The copy constructor and the assignment operator have been deleted to prevent accidental copying. CombatSpell(const CombatSpell &) = delete; CombatSpell &operator=(const CombatSpell &) = delete; - bool castSpell(std::shared_ptr creature) override; - bool castSpell(std::shared_ptr creature, std::shared_ptr target) override; + bool castSpell(const std::shared_ptr &creature) override; + bool castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) override; // Scripting spell - bool executeCastSpell(std::shared_ptr creature, const LuaVariant &var) const; + bool executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var) const; bool loadScriptCombat(); - std::shared_ptr getCombat() const { - return m_combat; - } + std::shared_ptr getCombat() const; private: - std::string getScriptTypeName() const override { - return "onCastSpell"; - } + std::string getScriptTypeName() const override; std::shared_ptr m_combat; @@ -124,176 +113,68 @@ class Spell : public BaseSpell { public: Spell() = default; - [[nodiscard]] const std::string &getName() const { - return name; - } - void setName(std::string n) { - name = std::move(n); - } - [[nodiscard]] uint16_t getSpellId() const { - return m_spellId; - } - void setSpellId(uint16_t id) { - m_spellId = id; - } - - void postCastSpell(std::shared_ptr player, bool finishedCast = true, bool payCost = true) const; - static void postCastSpell(std::shared_ptr player, uint32_t manaCost, uint32_t soulCost); + [[nodiscard]] const std::string &getName() const; + void setName(std::string n); + [[nodiscard]] uint16_t getSpellId() const; + void setSpellId(uint16_t id); + + void postCastSpell(const std::shared_ptr &player, bool finishedCast = true, bool payCost = true) const; + static void postCastSpell(const std::shared_ptr &player, uint32_t manaCost, uint32_t soulCost); [[nodiscard]] virtual bool isInstant() const = 0; - [[nodiscard]] bool isLearnable() const { - return learnable; - } - - uint32_t getManaCost(std::shared_ptr player) const; - [[nodiscard]] uint32_t getSoulCost() const { - return soul; - } - void setSoulCost(uint32_t s) { - soul = s; - } - [[nodiscard]] uint32_t getLevel() const { - return level; - } - void setLevel(uint32_t lvl) { - level = lvl; - } - [[nodiscard]] uint32_t getMagicLevel() const { - return magLevel; - } - void setMagicLevel(uint32_t lvl) { - magLevel = lvl; - } - [[nodiscard]] uint32_t getMana() const { - return mana; - } - void setMana(uint32_t m) { - mana = m; - } - [[nodiscard]] uint32_t getManaPercent() const { - return manaPercent; - } - void setManaPercent(uint32_t m) { - manaPercent = m; - } - [[nodiscard]] bool isPremium() const { - return premium; - } - void setPremium(bool p) { - premium = p; - } - [[nodiscard]] bool isEnabled() const { - return enabled; - } - void setEnabled(bool e) { - enabled = e; - } - - [[nodiscard]] const VocSpellMap &getVocMap() const { - return vocSpellMap; - } - void addVocMap(uint16_t vocationId, bool b) { - if (vocationId == 0XFFFF) { - g_logger().error("Vocation overflow for spell: {}", getName()); - return; - } - - g_logger().trace("Adding spell: {} to voc id: {}", getName(), vocationId); - vocSpellMap[vocationId] = b; - } - - SpellGroup_t getGroup() { - return group; - } - void setGroup(SpellGroup_t g) { - group = g; - } - SpellGroup_t getSecondaryGroup() { - return secondaryGroup; - } - void setSecondaryGroup(SpellGroup_t g) { - secondaryGroup = g; - } - - [[nodiscard]] uint32_t getCooldown() const { - return cooldown; - } - void setCooldown(uint32_t cd) { - cooldown = cd; - } - [[nodiscard]] uint32_t getSecondaryCooldown() const { - return secondaryGroupCooldown; - } - void setSecondaryCooldown(uint32_t cd) { - secondaryGroupCooldown = cd; - } - [[nodiscard]] uint32_t getGroupCooldown() const { - return groupCooldown; - } - void setGroupCooldown(uint32_t cd) { - groupCooldown = cd; - } - - [[nodiscard]] int32_t getRange() const { - return range; - } - void setRange(int32_t r) { - range = r; - } - - [[nodiscard]] bool getNeedTarget() const { - return needTarget; - } - void setNeedTarget(bool n) { - needTarget = n; - } - [[nodiscard]] bool getNeedWeapon() const { - return needWeapon; - } - void setNeedWeapon(bool n) { - needWeapon = n; - } - [[nodiscard]] bool getNeedLearn() const { - return learnable; - } - void setNeedLearn(bool n) { - learnable = n; - } - [[nodiscard]] bool getSelfTarget() const { - return selfTarget; - } - void setSelfTarget(bool s) { - selfTarget = s; - } - [[nodiscard]] bool getBlockingSolid() const { - return blockingSolid; - } - void setBlockingSolid(bool b) { - blockingSolid = b; - } - [[nodiscard]] bool getBlockingCreature() const { - return blockingCreature; - } - void setBlockingCreature(bool b) { - blockingCreature = b; - } - [[nodiscard]] bool getAggressive() const { - return aggressive; - } - void setAggressive(bool a) { - aggressive = a; - } - [[nodiscard]] bool getAllowOnSelf() const { - return allowOnSelf; - } - void setAllowOnSelf(bool s) { - allowOnSelf = s; - } - [[nodiscard]] bool getLockedPZ() const { - return pzLocked; - } - void setLockedPZ(bool b) { - pzLocked = b; - } + [[nodiscard]] bool isLearnable() const; + + uint32_t getManaCost(const std::shared_ptr &player) const; + [[nodiscard]] uint32_t getSoulCost() const; + void setSoulCost(uint32_t s); + [[nodiscard]] uint32_t getLevel() const; + void setLevel(uint32_t lvl); + [[nodiscard]] uint32_t getMagicLevel() const; + void setMagicLevel(uint32_t lvl); + [[nodiscard]] uint32_t getMana() const; + void setMana(uint32_t m); + [[nodiscard]] uint32_t getManaPercent() const; + void setManaPercent(uint32_t m); + [[nodiscard]] bool isPremium() const; + void setPremium(bool p); + [[nodiscard]] bool isEnabled() const; + void setEnabled(bool e); + + [[nodiscard]] const VocSpellMap &getVocMap() const; + void addVocMap(uint16_t vocationId, bool b); + + SpellGroup_t getGroup(); + void setGroup(SpellGroup_t g); + SpellGroup_t getSecondaryGroup(); + void setSecondaryGroup(SpellGroup_t g); + + [[nodiscard]] uint32_t getCooldown() const; + void setCooldown(uint32_t cd); + [[nodiscard]] uint32_t getSecondaryCooldown() const; + void setSecondaryCooldown(uint32_t cd); + [[nodiscard]] uint32_t getGroupCooldown() const; + void setGroupCooldown(uint32_t cd); + + [[nodiscard]] int32_t getRange() const; + void setRange(int32_t r); + + [[nodiscard]] bool getNeedTarget() const; + void setNeedTarget(bool n); + [[nodiscard]] bool getNeedWeapon() const; + void setNeedWeapon(bool n); + [[nodiscard]] bool getNeedLearn() const; + void setNeedLearn(bool n); + [[nodiscard]] bool getSelfTarget() const; + void setSelfTarget(bool s); + [[nodiscard]] bool getBlockingSolid() const; + void setBlockingSolid(bool b); + [[nodiscard]] bool getBlockingCreature() const; + void setBlockingCreature(bool b); + [[nodiscard]] bool getAggressive() const; + void setAggressive(bool a); + [[nodiscard]] bool getAllowOnSelf() const; + void setAllowOnSelf(bool s); + [[nodiscard]] bool getLockedPZ() const; + void setLockedPZ(bool b); /** * @brief Get whether the wheel of destiny is upgraded. @@ -327,37 +208,28 @@ class Spell : public BaseSpell { */ void setWheelOfDestinyBoost(WheelSpellBoost_t boost, WheelSpellGrade_t grade, int32_t value); - SpellType_t spellType = SPELL_UNDEFINED; - - [[nodiscard]] const std::string &getWords() const { - return m_words; - } + [[nodiscard]] const std::string &getWords() const; - void setWords(const std::string_view &newWord) { - m_words = newWord.data(); - } + void setWords(std::string_view newWord); - [[nodiscard]] const std::string &getSeparator() const { - return m_separator; - } + [[nodiscard]] const std::string &getSeparator() const; - void setSeparator(const std::string_view &newSeparator) { - m_separator = newSeparator.data(); - } + void setSeparator(std::string_view newSeparator); - void getCombatDataAugment(std::shared_ptr player, CombatDamage &damage); - int32_t calculateAugmentSpellCooldownReduction(std::shared_ptr player) const; + void getCombatDataAugment(const std::shared_ptr &player, CombatDamage &damage) const; + int32_t calculateAugmentSpellCooldownReduction(const std::shared_ptr &player) const; protected: - void applyCooldownConditions(std::shared_ptr player) const; - bool playerSpellCheck(std::shared_ptr player) const; - bool playerInstantSpellCheck(std::shared_ptr player, const Position &toPos) const; - bool playerRuneSpellCheck(std::shared_ptr player, const Position &toPos); + void applyCooldownConditions(const std::shared_ptr &player) const; + bool playerSpellCheck(const std::shared_ptr &player) const; + bool playerInstantSpellCheck(const std::shared_ptr &player, const Position &toPos) const; + bool playerRuneSpellCheck(const std::shared_ptr &player, const Position &toPos) const; VocSpellMap vocSpellMap; SpellGroup_t group = SPELLGROUP_NONE; SpellGroup_t secondaryGroup = SPELLGROUP_NONE; + SpellType_t spellType = SPELL_UNDEFINED; uint32_t cooldown = 1000; uint32_t groupCooldown = 1000; @@ -374,8 +246,6 @@ class Spell : public BaseSpell { bool pzLocked = false; bool whellOfDestinyUpgraded = false; - std::array(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyRegularBoost = { 0 }; - std::array(WheelSpellBoost_t::TOTAL_COUNT)> wheelOfDestinyUpgradedBoost = { 0 }; private: uint32_t mana = 0; @@ -393,60 +263,38 @@ class Spell : public BaseSpell { std::string name; std::string m_words; std::string m_separator; + + friend class SpellFunctions; }; class InstantSpell final : public Script, public Spell { public: using Script::Script; - virtual bool playerCastInstant(std::shared_ptr player, std::string ¶m); + bool playerCastInstant(const std::shared_ptr &player, std::string ¶m) const; - bool castSpell(std::shared_ptr creature) override; - bool castSpell(std::shared_ptr creature, std::shared_ptr target) override; + bool castSpell(const std::shared_ptr &creature) override; + bool castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) override; // Scripting spell - bool executeCastSpell(std::shared_ptr creature, const LuaVariant &var) const; - - [[nodiscard]] bool isInstant() const override { - return true; - } - [[nodiscard]] bool getHasParam() const { - return hasParam; - } - void setHasParam(bool p) { - hasParam = p; - } - [[nodiscard]] bool getHasPlayerNameParam() const { - return hasPlayerNameParam; - } - void setHasPlayerNameParam(bool p) { - hasPlayerNameParam = p; - } - [[nodiscard]] bool getNeedDirection() const { - return needDirection; - } - void setNeedDirection(bool n) { - needDirection = n; - } - [[nodiscard]] bool getNeedCasterTargetOrDirection() const { - return casterTargetOrDirection; - } - void setNeedCasterTargetOrDirection(bool d) { - casterTargetOrDirection = d; - } - [[nodiscard]] bool getBlockWalls() const { - return checkLineOfSight; - } - void setBlockWalls(bool w) { - checkLineOfSight = w; - } - bool canCast(std::shared_ptr player) const; - bool canThrowSpell(std::shared_ptr creature, std::shared_ptr target) const; + bool executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var) const; + + [[nodiscard]] bool isInstant() const override; + [[nodiscard]] bool getHasParam() const; + void setHasParam(bool p); + [[nodiscard]] bool getHasPlayerNameParam() const; + void setHasPlayerNameParam(bool p); + [[nodiscard]] bool getNeedDirection() const; + void setNeedDirection(bool n); + [[nodiscard]] bool getNeedCasterTargetOrDirection() const; + void setNeedCasterTargetOrDirection(bool d); + [[nodiscard]] bool getBlockWalls() const; + void setBlockWalls(bool w); + bool canCast(const std::shared_ptr &player) const; + bool canThrowSpell(const std::shared_ptr &creature, const std::shared_ptr &target) const; private: - [[nodiscard]] std::string getScriptTypeName() const override { - return "onCastSpell"; - } + [[nodiscard]] std::string getScriptTypeName() const override; bool needDirection = false; bool hasParam = false; @@ -459,47 +307,28 @@ class RuneSpell final : public Action, public Spell { public: using Action::Action; - ReturnValue canExecuteAction(std::shared_ptr player, const Position &toPos) override; - bool hasOwnErrorHandler() override { - return true; - } - std::shared_ptr getTarget(std::shared_ptr, std::shared_ptr targetCreature, const Position &, uint8_t) const override { - return targetCreature; - } + ReturnValue canExecuteAction(const std::shared_ptr &player, const Position &toPos) override; + bool hasOwnErrorHandler() override; + std::shared_ptr getTarget(const std::shared_ptr &, const std::shared_ptr &targetCreature, const Position &, uint8_t) const override; - bool executeUse(std::shared_ptr player, std::shared_ptr item, const Position &fromPosition, std::shared_ptr target, const Position &toPosition, bool isHotkey) override; + bool executeUse(const std::shared_ptr &player, const std::shared_ptr &item, const Position &fromPosition, const std::shared_ptr &target, const Position &toPosition, bool isHotkey) override; - bool castSpell(std::shared_ptr creature) override; - bool castSpell(std::shared_ptr creature, std::shared_ptr target) override; + bool castSpell(const std::shared_ptr &creature) override; + bool castSpell(const std::shared_ptr &creature, const std::shared_ptr &target) override; // Scripting spell - bool executeCastSpell(std::shared_ptr creature, const LuaVariant &var, bool isHotkey) const; - - [[nodiscard]] bool isInstant() const override { - return false; - } - [[nodiscard]] uint16_t getRuneItemId() const { - return runeId; - } - void setRuneItemId(uint16_t i) { - runeId = i; - } - [[nodiscard]] uint32_t getCharges() const { - return charges; - } - void setCharges(uint32_t c) { - if (c > 0) { - hasCharges = true; - } - charges = c; - } + bool executeCastSpell(const std::shared_ptr &creature, const LuaVariant &var, bool isHotkey) const; + + [[nodiscard]] bool isInstant() const override; + [[nodiscard]] uint16_t getRuneItemId() const; + void setRuneItemId(uint16_t i); + [[nodiscard]] uint32_t getCharges() const; + void setCharges(uint32_t c); private: - [[nodiscard]] std::string getScriptTypeName() const override { - return "onCastSpell"; - } + [[nodiscard]] std::string getScriptTypeName() const override; - bool internalCastSpell(std::shared_ptr creature, const LuaVariant &var, bool isHotkey); + bool internalCastSpell(const std::shared_ptr &creature, const LuaVariant &var, bool isHotkey) const; uint16_t runeId = 0; uint32_t charges = 0; diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp index 947956695..baf93fb65 100644 --- a/src/creatures/creature.cpp +++ b/src/creatures/creature.cpp @@ -7,19 +7,24 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/creature.hpp" -#include "declarations.hpp" -#include "game/scheduling/dispatcher.hpp" -#include "game/game.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/combat/combat.hpp" #include "creatures/monsters/monster.hpp" +#include "creatures/players/grouping/party.hpp" +#include "game/game.hpp" +#include "game/scheduling/dispatcher.hpp" #include "game/zones/zone.hpp" -#include "map/spectators.hpp" #include "lib/metrics/metrics.hpp" +#include "lua/creature/creatureevent.hpp" +#include "map/spectators.hpp" +#include "creatures/players/player.hpp" +#include "server/network/protocol/protocolgame.hpp" Creature::Creature() { - onIdleStatus(); + Creature::onIdleStatus(); } Creature::~Creature() { @@ -54,7 +59,7 @@ bool Creature::canSee(const Position &pos) { return canSee(getPosition(), pos, MAP_MAX_VIEW_PORT_X, MAP_MAX_VIEW_PORT_Y); } -bool Creature::canSeeCreature(std::shared_ptr creature) const { +bool Creature::canSeeCreature(const std::shared_ptr &creature) const { if (!canSeeInvisibility() && creature->isInvisible()) { return false; } @@ -96,13 +101,13 @@ void Creature::onThink(uint32_t interval) { updateMapCache(); } - auto followCreature = getFollowCreature(); - auto master = getMaster(); + const auto &followCreature = getFollowCreature(); + const auto &master = getMaster(); if (followCreature && master != followCreature && !canSeeCreature(followCreature)) { onCreatureDisappear(followCreature, false); } - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (attackedCreature && master != attackedCreature && !canSeeCreature(attackedCreature)) { onCreatureDisappear(attackedCreature, false); } @@ -140,7 +145,7 @@ void Creature::onThink(uint32_t interval) { } void Creature::onAttacking(uint32_t interval) { - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (!attackedCreature) { return; } @@ -161,39 +166,53 @@ void Creature::onIdleStatus() { } void Creature::onCreatureWalk() { + if (checkingWalkCreature) { + return; + } + + checkingWalkCreature = true; + metrics::method_latency measure(__METHOD_NAME__); - if (getWalkDelay() <= 0) { - Direction dir; - uint32_t flags = FLAG_IGNOREFIELDDAMAGE; - if (getNextStep(dir, flags)) { - ReturnValue ret = g_game().internalMoveCreature(static_self_cast(), dir, flags); - if (ret != RETURNVALUE_NOERROR) { - if (std::shared_ptr player = getPlayer()) { - player->sendCancelMessage(ret); - player->sendCancelWalk(); + + g_dispatcher().addWalkEvent([self = getCreature(), this] { + checkingWalkCreature = false; + if (isRemoved()) { + return; + } + + if (getWalkDelay() <= 0) { + Direction dir; + uint32_t flags = FLAG_IGNOREFIELDDAMAGE; + if (getNextStep(dir, flags)) { + ReturnValue ret = g_game().internalMoveCreature(static_self_cast(), dir, flags); + if (ret != RETURNVALUE_NOERROR) { + if (std::shared_ptr player = getPlayer()) { + player->sendCancelMessage(ret); + player->sendCancelWalk(); + } + + forceUpdateFollowPath = true; + } + } else { + if (listWalkDir.empty()) { + onWalkComplete(); } - forceUpdateFollowPath = true; - } - } else { - if (listWalkDir.empty()) { - onWalkComplete(); + stopEventWalk(); } - - stopEventWalk(); } - } - if (cancelNextWalk) { - listWalkDir.clear(); - onWalkAborted(); - cancelNextWalk = false; - } + if (cancelNextWalk) { + listWalkDir.clear(); + onWalkAborted(); + cancelNextWalk = false; + } - if (eventWalk != 0) { - eventWalk = 0; - addEventWalk(); - } + if (eventWalk != 0) { + eventWalk = 0; + addEventWalk(); + } + }); } void Creature::onWalk(Direction &dir) { @@ -261,7 +280,8 @@ void Creature::addEventWalk(bool firstStep) { static_cast(ticks), [creatureId = self->getID()] { g_game().checkCreatureWalk(creatureId); }, "Game::checkCreatureWalk" ); - }); + }, + "addEventWalk"); } void Creature::stopEventWalk() { @@ -272,6 +292,10 @@ void Creature::stopEventWalk() { } void Creature::updateMapCache() { + if (!useCacheMap()) { + return; + } + metrics::method_latency measure(__METHOD_NAME__); std::shared_ptr newTile; const Position &myPos = getPosition(); @@ -287,19 +311,19 @@ void Creature::updateMapCache() { } } -void Creature::updateTileCache(std::shared_ptr newTile, int32_t dx, int32_t dy) { +void Creature::updateTileCache(const std::shared_ptr &newTile, int32_t dx, int32_t dy) { metrics::method_latency measure(__METHOD_NAME__); if (std::abs(dx) <= maxWalkCacheWidth && std::abs(dy) <= maxWalkCacheHeight) { localMapCache[maxWalkCacheHeight + dy][maxWalkCacheWidth + dx] = newTile && newTile->queryAdd(0, getCreature(), 1, FLAG_PATHFINDING | FLAG_IGNOREFIELDDAMAGE) == RETURNVALUE_NOERROR; } } -void Creature::updateTileCache(std::shared_ptr upTile, const Position &pos) { +void Creature::updateTileCache(const std::shared_ptr &upTile, const Position &pos) { const Position &myPos = getPosition(); if (pos.z == myPos.z) { int32_t dx = Position::getOffsetX(pos, myPos); int32_t dy = Position::getOffsetY(pos, myPos); - updateTileCache(std::move(upTile), dx, dy); + updateTileCache(upTile, dx, dy); } } @@ -330,39 +354,39 @@ int32_t Creature::getWalkCache(const Position &pos) { return 2; } -void Creature::onAddTileItem(std::shared_ptr tileItem, const Position &pos) { +void Creature::onAddTileItem(const std::shared_ptr &tileItem, const Position &pos) { if (isMapLoaded && pos.z == getPosition().z) { - updateTileCache(std::move(tileItem), pos); + updateTileCache(tileItem, pos); } } -void Creature::onUpdateTileItem(std::shared_ptr updateTile, const Position &pos, std::shared_ptr, const ItemType &oldType, std::shared_ptr, const ItemType &newType) { +void Creature::onUpdateTileItem(const std::shared_ptr &updateTile, const Position &pos, const std::shared_ptr &, const ItemType &oldType, const std::shared_ptr &, const ItemType &newType) { if (!isMapLoaded) { return; } if (oldType.blockSolid || oldType.blockPathFind || newType.blockPathFind || newType.blockSolid) { if (pos.z == getPosition().z) { - updateTileCache(std::move(updateTile), pos); + updateTileCache(updateTile, pos); } } } -void Creature::onRemoveTileItem(std::shared_ptr updateTile, const Position &pos, const ItemType &iType, std::shared_ptr) { +void Creature::onRemoveTileItem(const std::shared_ptr &updateTile, const Position &pos, const ItemType &iType, const std::shared_ptr &) { if (!isMapLoaded) { return; } if (iType.blockSolid || iType.blockPathFind || iType.isGroundTile()) { if (pos.z == getPosition().z) { - updateTileCache(std::move(updateTile), pos); + updateTileCache(updateTile, pos); } } } -void Creature::onCreatureAppear(std::shared_ptr creature, bool isLogin) { +void Creature::onCreatureAppear(const std::shared_ptr &creature, bool isLogin) { metrics::method_latency measure(__METHOD_NAME__); - if (creature == getCreature()) { + if (creature.get() == this) { if (useCacheMap()) { isMapLoaded = true; updateMapCache(); @@ -378,23 +402,23 @@ void Creature::onCreatureAppear(std::shared_ptr creature, bool isLogin } } -void Creature::onRemoveCreature(std::shared_ptr creature, bool) { +void Creature::onRemoveCreature(const std::shared_ptr &creature, bool) { metrics::method_latency measure(__METHOD_NAME__); onCreatureDisappear(creature, true); - if (creature != getCreature() && isMapLoaded) { + if (creature && creature != getCreature() && isMapLoaded) { if (creature->getPosition().z == getPosition().z) { updateTileCache(creature->getTile(), creature->getPosition()); } } // Update player from monster target list (avoid memory usage after clean) - if (auto monster = getMonster(); monster && monster->getAttackedCreature() == creature) { + if (const auto &monster = getMonster(); monster && monster->getAttackedCreature() == creature) { monster->setAttackedCreature(creature); monster->setFollowCreature(creature); } } -void Creature::onCreatureDisappear(std::shared_ptr creature, bool isLogout) { +void Creature::onCreatureDisappear(const std::shared_ptr &creature, bool isLogout) { metrics::method_latency measure(__METHOD_NAME__); if (getAttackedCreature() == creature) { setAttackedCreature(nullptr); @@ -409,7 +433,7 @@ void Creature::onCreatureDisappear(std::shared_ptr creature, bool isLo void Creature::onChangeZone(ZoneType_t zone) { metrics::method_latency measure(__METHOD_NAME__); - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (attackedCreature && zone == ZONE_PROTECTION) { onCreatureDisappear(attackedCreature, false); } @@ -418,7 +442,7 @@ void Creature::onChangeZone(ZoneType_t zone) { void Creature::onAttackedCreatureChangeZone(ZoneType_t zone) { metrics::method_latency measure(__METHOD_NAME__); if (zone == ZONE_PROTECTION) { - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (attackedCreature) { onCreatureDisappear(attackedCreature, false); } @@ -430,6 +454,10 @@ void Creature::checkSummonMove(const Position &newPos, bool teleportSummon) { if (hasSummons()) { std::vector> despawnMonsterList; for (const auto &summon : getSummons()) { + if (!summon) { + continue; + } + const auto &pos = summon->getPosition(); const auto &monster = summon->getMonster(); const auto &tile = getTile(); @@ -470,7 +498,7 @@ void Creature::checkSummonMove(const Position &newPos, bool teleportSummon) { void Creature::onCreatureMove(const std::shared_ptr &creature, const std::shared_ptr &newTile, const Position &newPos, const std::shared_ptr &oldTile, const Position &oldPos, bool teleport) { metrics::method_latency measure(__METHOD_NAME__); - if (creature == getCreature()) { + if (creature.get() == this) { lastStep = OTSYS_TIME(); lastStepCost = 1; @@ -484,13 +512,13 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s stopEventWalk(); } - bool configTeleportSummons = g_configManager().getBoolean(TELEPORT_SUMMONS, __FUNCTION__); + bool configTeleportSummons = g_configManager().getBoolean(TELEPORT_SUMMONS); checkSummonMove(newPos, configTeleportSummons); if (isLostSummon()) { handleLostSummon(configTeleportSummons); } - if (std::shared_ptr player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { if (player->isExerciseTraining()) { player->setTraining(false); } @@ -510,7 +538,7 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s if (oldPos.y > newPos.y) { // north // shift y south for (int32_t y = mapWalkHeight - 1; --y >= 0;) { - memcpy(localMapCache[y + 1], localMapCache[y], sizeof(localMapCache[y])); + std::ranges::copy(std::span(localMapCache[y]), localMapCache[y + 1]); } // update 0 @@ -521,7 +549,7 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s } else if (oldPos.y < newPos.y) { // south // shift y north for (int32_t y = 0; y <= mapWalkHeight - 2; ++y) { - memcpy(localMapCache[y], localMapCache[y + 1], sizeof(localMapCache[y])); + std::ranges::copy(std::span(localMapCache[y + 1]), localMapCache[y]); } // update mapWalkHeight - 1 @@ -574,7 +602,7 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s // update 0 for (int32_t y = -maxWalkCacheHeight; y <= maxWalkCacheHeight; ++y) { - std::shared_ptr cacheTile = g_game().map.getTile(myPos.x - maxWalkCacheWidth, static_cast(myPos.y + y), myPos.z); + const auto &cacheTile = g_game().map.getTile(myPos.x - maxWalkCacheWidth, static_cast(myPos.y + y), myPos.z); updateTileCache(cacheTile, -maxWalkCacheWidth, y); } } @@ -597,10 +625,10 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s } const auto &followCreature = getFollowCreature(); - if (followCreature && (creature == getCreature() || creature == followCreature)) { + if (followCreature && (creature.get() == this || creature == followCreature)) { if (hasFollowPath) { isUpdatingPath = true; - g_dispatcher().addEvent([creatureId = getID()] { g_game().updateCreatureWalk(creatureId); }, "Game::updateCreatureWalk"); + g_game().updateCreatureWalk(getID()); // internally uses addEventWalk. } if (newPos.z != oldPos.z || !canSee(followCreature->getPosition())) { @@ -609,7 +637,7 @@ void Creature::onCreatureMove(const std::shared_ptr &creature, const s } const auto &attackedCreature = getAttackedCreature(); - if (attackedCreature && (creature == attackedCreature || creature == getCreature())) { + if (attackedCreature && (creature == attackedCreature || creature.get() == this)) { if (newPos.z != oldPos.z || !canSee(attackedCreature->getPosition())) { onCreatureDisappear(attackedCreature, false); } else { @@ -629,7 +657,7 @@ void Creature::onDeath() { metrics::method_latency measure(__METHOD_NAME__); bool lastHitUnjustified = false; bool mostDamageUnjustified = false; - std::shared_ptr lastHitCreature = g_game().getCreatureByID(lastHitCreatureId); + const auto &lastHitCreature = g_game().getCreatureByID(lastHitCreatureId); std::shared_ptr lastHitCreatureMaster; if (lastHitCreature && getPlayer()) { /** @@ -645,25 +673,33 @@ void Creature::onDeath() { std::shared_ptr mostDamageCreature = nullptr; const int64_t timeNow = OTSYS_TIME(); - const uint32_t inFightTicks = g_configManager().getNumber(PZ_LOCKED, __FUNCTION__); + const uint32_t inFightTicks = g_configManager().getNumber(PZ_LOCKED); int32_t mostDamage = 0; std::map, uint64_t> experienceMap; std::unordered_set> killers; - for (const auto &it : damageMap) { - if (auto attacker = g_game().getCreatureByID(it.first)) { - CountBlock_t cb = it.second; - if ((cb.total > mostDamage && (timeNow - cb.ticks <= inFightTicks))) { - mostDamage = cb.total; + for (const auto &[creatureId, damageInfo] : damageMap) { + if (creatureId == 0) { + continue; + } + + if (auto attacker = g_game().getCreatureByID(creatureId)) { + const auto &[total, ticks] = damageInfo; + if (total == 0 || ticks == 0) { + continue; + } + + if (total > mostDamage && timeNow - ticks <= inFightTicks) { + mostDamage = total; mostDamageCreature = attacker; } if (attacker != getCreature()) { - uint64_t gainExp = getGainedExperience(attacker); - auto attackerMaster = attacker->getMaster() ? attacker->getMaster() : attacker; + const uint64_t gainExp = getGainedExperience(attacker); + const auto &attackerMaster = attacker->getMaster() ? attacker->getMaster() : attacker; if (auto attackerPlayer = attackerMaster->getPlayer()) { attackerPlayer->removeAttacked(getPlayer()); - auto party = attackerPlayer->getParty(); + const auto &party = attackerPlayer->getParty(); killers.insert(attackerPlayer); if (party && party->getLeader() && party->isSharedExperienceActive() && party->isSharedExperienceEnabled()) { attacker = party->getLeader(); @@ -686,15 +722,15 @@ void Creature::onDeath() { } } - for (const auto &it : experienceMap) { - it.first->onGainExperience(it.second, getCreature()); + for (const auto &[creature, experience] : experienceMap) { + creature->onGainExperience(experience, getCreature()); } mostDamageCreature = mostDamageCreature && mostDamageCreature->getMaster() ? mostDamageCreature->getMaster() : mostDamageCreature; for (const auto &killer : killers) { - if (auto monster = getMonster()) { + if (const auto &monster = getMonster()) { killer->onKilledMonster(monster); - } else if (auto player = getPlayer(); player && mostDamageCreature != killer) { + } else if (const auto &player = getPlayer(); player && mostDamageCreature != killer) { killer->onKilledPlayer(player, false); } } @@ -702,7 +738,7 @@ void Creature::onDeath() { /** * @deprecated -- This is here to trigger the deprecated onKill events in lua */ - auto mostDamageCreatureMaster = mostDamageCreature ? mostDamageCreature->getMaster() : nullptr; + const auto &mostDamageCreatureMaster = mostDamageCreature ? mostDamageCreature->getMaster() : nullptr; if (mostDamageCreature && (mostDamageCreature != lastHitCreature || getMonster()) && mostDamageCreature != lastHitCreatureMaster) { if (lastHitCreature != mostDamageCreatureMaster && (lastHitCreatureMaster == nullptr || mostDamageCreatureMaster != lastHitCreatureMaster)) { mostDamageUnjustified = mostDamageCreature->deprecatedOnKilledCreature(getCreature(), false); @@ -755,7 +791,7 @@ void Creature::onDeath() { } } -bool Creature::dropCorpse(std::shared_ptr lastHitCreature, std::shared_ptr mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) { +bool Creature::dropCorpse(const std::shared_ptr &lastHitCreature, const std::shared_ptr &mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) { metrics::method_latency measure(__METHOD_NAME__); if (!lootDrop && getMonster()) { if (getMaster()) { @@ -787,25 +823,25 @@ bool Creature::dropCorpse(std::shared_ptr lastHitCreature, std::shared break; } - std::shared_ptr tile = getTile(); + const auto &tile = getTile(); if (tile && splash) { g_game().internalAddItem(tile, splash, INDEX_WHEREEVER, FLAG_NOLIMIT); splash->startDecaying(); } - std::shared_ptr corpse = getCorpse(lastHitCreature, mostDamageCreature); + const auto &corpse = getCorpse(lastHitCreature, mostDamageCreature); if (tile && corpse) { g_game().internalAddItem(tile, corpse, INDEX_WHEREEVER, FLAG_NOLIMIT); dropLoot(corpse->getContainer(), lastHitCreature); corpse->startDecaying(); - bool disallowedCorpses = corpse->isRewardCorpse() || (corpse->getID() == ITEM_MALE_CORPSE || corpse->getID() == ITEM_FEMALE_CORPSE); - const auto player = mostDamageCreature ? mostDamageCreature->getPlayer() : nullptr; - auto corpseContainer = corpse->getContainer(); + const bool disallowedCorpses = corpse->isRewardCorpse() || (corpse->getID() == ITEM_MALE_CORPSE || corpse->getID() == ITEM_FEMALE_CORPSE); + const auto &player = mostDamageCreature ? mostDamageCreature->getPlayer() : nullptr; + const auto &corpseContainer = corpse->getContainer(); if (corpseContainer && player && !disallowedCorpses) { - auto monster = getMonster(); + const auto &monster = getMonster(); if (monster && !monster->isRewardBoss()) { std::ostringstream lootMessage; - auto collorMessage = player->getProtocolVersion() > 1200 && player->getOperatingSystem() < CLIENTOS_OTCLIENT_LINUX; + auto collorMessage = player->getProtocolVersion() > 1200; lootMessage << "Loot of " << getNameDescription() << ": " << corpseContainer->getContentDescription(collorMessage) << "."; auto suffix = corpseContainer->getAttribute(ItemAttribute_t::LOOTMESSAGE_SUFFIX); if (!suffix.empty()) { @@ -849,10 +885,10 @@ bool Creature::hasBeenAttacked(uint32_t attackerId) { if (it == damageMap.end()) { return false; } - return (OTSYS_TIME() - it->second.ticks) <= g_configManager().getNumber(PZ_LOCKED, __FUNCTION__); + return (OTSYS_TIME() - it->second.ticks) <= g_configManager().getNumber(PZ_LOCKED); } -std::shared_ptr Creature::getCorpse(std::shared_ptr, std::shared_ptr) { +std::shared_ptr Creature::getCorpse(const std::shared_ptr &, const std::shared_ptr &) { if (getLookCorpse() != 0) { return Item::CreateItem(getLookCorpse()); } @@ -884,14 +920,14 @@ void Creature::changeMana(int32_t manaChange) { } } -void Creature::gainHealth(std::shared_ptr healer, int32_t healthGain) { +void Creature::gainHealth(const std::shared_ptr &healer, int32_t healthGain) { changeHealth(healthGain); if (healer) { healer->onTargetCreatureGainHealth(static_self_cast(), healthGain); } } -void Creature::drainHealth(std::shared_ptr attacker, int32_t damage) { +void Creature::drainHealth(const std::shared_ptr &attacker, int32_t damage) { changeHealth(-damage, false); if (attacker) { @@ -899,7 +935,7 @@ void Creature::drainHealth(std::shared_ptr attacker, int32_t damage) { } } -void Creature::drainMana(std::shared_ptr attacker, int32_t manaLoss) { +void Creature::drainMana(const std::shared_ptr &attacker, int32_t manaLoss) { onAttacked(); changeMana(-manaLoss); @@ -922,7 +958,7 @@ void Creature::mitigateDamage(const CombatType_t &combatType, BlockType_t &block } } -void Creature::applyAbsorbDamageModifications(std::shared_ptr attacker, int32_t &damage, CombatType_t combatType) const { +void Creature::applyAbsorbDamageModifications(const std::shared_ptr &attacker, int32_t &damage, CombatType_t combatType) const { if (combatType != COMBAT_HEALING && damage != 0) { int32_t value = getAbsorbPercent(combatType); if (value != 0) { @@ -942,13 +978,13 @@ void Creature::applyAbsorbDamageModifications(std::shared_ptr attacker } } -BlockType_t Creature::blockHit(std::shared_ptr attacker, CombatType_t combatType, int32_t &damage, bool checkDefense /* = false */, bool checkArmor /* = false */, bool /* field = false */) { +BlockType_t Creature::blockHit(const std::shared_ptr &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense /* = false */, bool checkArmor /* = false */, bool /* field = false */) { BlockType_t blockType = BLOCK_NONE; // Apply skills 12.72 absorbs damage applyAbsorbDamageModifications(attacker, damage, combatType); - if (getMonster() && g_configManager().getBoolean(DISABLE_MONSTER_ARMOR, __FUNCTION__)) { + if (getMonster() && g_configManager().getBoolean(DISABLE_MONSTER_ARMOR)) { checkDefense = false; checkArmor = false; } @@ -998,7 +1034,9 @@ BlockType_t Creature::blockHit(std::shared_ptr attacker, CombatType_t attacker->onAttackedCreatureBlockHit(blockType); } - mitigateDamage(combatType, blockType, damage); + if (damage != 0) { + mitigateDamage(combatType, blockType, damage); + } if (damage != 0) { onTakeDamage(attacker, damage); @@ -1007,10 +1045,10 @@ BlockType_t Creature::blockHit(std::shared_ptr attacker, CombatType_t return blockType; } -bool Creature::setAttackedCreature(std::shared_ptr creature) { +bool Creature::setAttackedCreature(const std::shared_ptr &creature) { if (creature) { - auto monster = getMonster(); - auto tile = getTile(); + const auto &monster = getMonster(); + const auto &tile = getTile(); if (monster && monster->isFamiliar() && tile && tile->hasFlag(TILESTATE_PROTECTIONZONE)) { return false; } @@ -1043,24 +1081,11 @@ void Creature::getPathSearchParams(const std::shared_ptr &, FindPathPa } void Creature::goToFollowCreature_async(std::function &&onComplete) { - metrics::method_latency measure(__METHOD_NAME__); - if (pathfinderRunning.load()) { - return; + if (!hasAsyncTaskFlag(Pathfinder) && onComplete) { + g_dispatcher().context().addEvent(std::move(onComplete), "goToFollowCreature_async"); } - pathfinderRunning.store(true); - g_dispatcher().asyncEvent([self = getCreature()] { - if (!self || self->isRemoved()) { - return; - } - - self->goToFollowCreature(); - self->pathfinderRunning.store(false); - }); - - if (onComplete) { - g_dispatcher().context().addEvent(std::move(onComplete)); - } + setAsyncTaskFlag(Pathfinder, true); } void Creature::goToFollowCreature() { @@ -1109,16 +1134,16 @@ void Creature::goToFollowCreature() { } } -bool Creature::canFollowMaster() { - auto master = getMaster(); +bool Creature::canFollowMaster() const { + const auto &master = getMaster(); if (!master) { return false; } - auto tile = master->getTile(); + const auto &tile = master->getTile(); return tile && !tile->hasFlag(TILESTATE_PROTECTIONZONE) && (canSeeInvisibility() || !master->isInvisible()); } -bool Creature::setFollowCreature(std::shared_ptr creature) { +bool Creature::setFollowCreature(const std::shared_ptr &creature) { metrics::method_latency measure(__METHOD_NAME__); if (creature) { if (getFollowCreature() == creature) { @@ -1154,15 +1179,19 @@ bool Creature::setFollowCreature(std::shared_ptr creature) { return true; } -double Creature::getDamageRatio(std::shared_ptr attacker) const { +double Creature::getDamageRatio(const std::shared_ptr &attacker) const { uint32_t totalDamage = 0; uint32_t attackerDamage = 0; - for (const auto &it : damageMap) { - const CountBlock_t &cb = it.second; - totalDamage += cb.total; - if (it.first == attacker->getID()) { - attackerDamage += cb.total; + for (const auto &[attackerId, damageInfo] : damageMap) { + const auto &[totalDamageValue, ticks] = damageInfo; + if (attackerId == 0 || totalDamageValue == 0) { + continue; + } + + totalDamage += totalDamageValue; + if (attackerId == attacker->getID()) { + attackerDamage += totalDamageValue; } } @@ -1173,11 +1202,11 @@ double Creature::getDamageRatio(std::shared_ptr attacker) const { return (static_cast(attackerDamage) / totalDamage); } -uint64_t Creature::getGainedExperience(std::shared_ptr attacker) const { - return std::floor(getDamageRatio(std::move(attacker)) * getLostExperience()); +uint64_t Creature::getGainedExperience(const std::shared_ptr &attacker) const { + return std::floor(getDamageRatio(attacker) * getLostExperience()); } -void Creature::addDamagePoints(std::shared_ptr attacker, int32_t damagePoints) { +void Creature::addDamagePoints(const std::shared_ptr &attacker, int32_t damagePoints) { if (damagePoints <= 0) { return; } @@ -1215,8 +1244,8 @@ void Creature::onEndCondition(ConditionType_t) { } void Creature::onTickCondition(ConditionType_t type, bool &bRemove) { - auto tile = getTile(); - std::shared_ptr field = tile ? tile->getFieldItem() : nullptr; + const auto &tile = getTile(); + const auto &field = tile ? tile->getFieldItem() : nullptr; if (!field) { return; } @@ -1251,19 +1280,19 @@ void Creature::onTickCondition(ConditionType_t type, bool &bRemove) { } } -void Creature::onCombatRemoveCondition(std::shared_ptr condition) { - removeCondition(std::move(condition)); +void Creature::onCombatRemoveCondition(const std::shared_ptr &condition) { + removeCondition(condition); } void Creature::onAttacked() { // } -void Creature::onAttackedCreatureDrainHealth(std::shared_ptr target, int32_t points) { +void Creature::onAttackedCreatureDrainHealth(const std::shared_ptr &target, int32_t points) { target->addDamagePoints(static_self_cast(), points); } -void Creature::onAttackedCreatureKilled(std::shared_ptr target) { +void Creature::onAttackedCreatureKilled(const std::shared_ptr &target) { metrics::method_latency measure(__METHOD_NAME__); if (target != getCreature()) { uint64_t gainExp = target->getGainedExperience(static_self_cast()); @@ -1271,9 +1300,9 @@ void Creature::onAttackedCreatureKilled(std::shared_ptr target) { } } -bool Creature::deprecatedOnKilledCreature(std::shared_ptr target, bool lastHit) { +bool Creature::deprecatedOnKilledCreature(const std::shared_ptr &target, bool lastHit) { metrics::method_latency measure(__METHOD_NAME__); - auto master = getMaster(); + const auto &master = getMaster(); if (master) { master->deprecatedOnKilledCreature(target, lastHit); } @@ -1286,19 +1315,19 @@ bool Creature::deprecatedOnKilledCreature(std::shared_ptr target, bool return false; } -void Creature::onGainExperience(uint64_t gainExp, std::shared_ptr target) { +void Creature::onGainExperience(uint64_t gainExp, const std::shared_ptr &target) { metrics::method_latency measure(__METHOD_NAME__); - auto master = getMaster(); + const auto &master = getMaster(); if (gainExp == 0 || !master) { return; } - std::shared_ptr m = getMonster(); + const auto &m = getMonster(); if (!m->isFamiliar()) { gainExp /= 2; } - master->onGainExperience(gainExp, std::move(target)); + master->onGainExperience(gainExp, target); if (!m->isFamiliar()) { auto spectators = Spectators().find(position); @@ -1317,11 +1346,11 @@ void Creature::onGainExperience(uint64_t gainExp, std::shared_ptr targ } } -bool Creature::setMaster(std::shared_ptr newMaster, bool reloadCreature /* = false*/) { +bool Creature::setMaster(const std::shared_ptr &newMaster, bool reloadCreature /* = false*/) { metrics::method_latency measure(__METHOD_NAME__); // Persists if this creature has ever been a summon this->summoned = true; - auto oldMaster = getMaster(); + const auto &oldMaster = getMaster(); if (!newMaster && !oldMaster) { return false; @@ -1342,7 +1371,7 @@ bool Creature::setMaster(std::shared_ptr newMaster, bool reloadCreatur m_master = newMaster; if (oldMaster) { - const auto &it = std::ranges::find(oldMaster->m_summons, self); + auto it = std::ranges::find(oldMaster->m_summons, self); if (it != oldMaster->m_summons.end()) { oldMaster->m_summons.erase(it); } @@ -1350,7 +1379,7 @@ bool Creature::setMaster(std::shared_ptr newMaster, bool reloadCreatur return true; } -bool Creature::addCondition(std::shared_ptr condition, bool attackerPlayer /* = false*/) { +bool Creature::addCondition(const std::shared_ptr &condition, bool attackerPlayer /* = false*/) { metrics::method_latency measure(__METHOD_NAME__); if (condition == nullptr) { return false; @@ -1358,14 +1387,14 @@ bool Creature::addCondition(std::shared_ptr condition, bool attackerP if (isSuppress(condition->getType(), attackerPlayer)) { return false; } - std::shared_ptr prevCond = getCondition(condition->getType(), condition->getId(), condition->getSubId()); + const auto &prevCond = getCondition(condition->getType(), condition->getId(), condition->getSubId()); if (prevCond) { prevCond->addCondition(getCreature(), condition); return true; } if (condition->startCondition(getCreature())) { - conditions.push_back(condition); + conditions.emplace_back(condition); onAddCondition(condition->getType()); return true; } @@ -1373,8 +1402,11 @@ bool Creature::addCondition(std::shared_ptr condition, bool attackerP return false; } -bool Creature::addCombatCondition(std::shared_ptr condition, bool attackerPlayer /* = false*/) { - // Caution: condition variable could be deleted after the call to addCondition +bool Creature::addCombatCondition(const std::shared_ptr &condition, bool attackerPlayer /* = false*/) { + if (condition == nullptr) { + return false; + } + ConditionType_t type = condition->getType(); if (!addCondition(condition, attackerPlayer)) { @@ -1405,9 +1437,10 @@ void Creature::removeCondition(ConditionType_t type) { void Creature::removeCondition(ConditionType_t conditionType, ConditionId_t conditionId, bool force /* = false*/) { metrics::method_latency measure(__METHOD_NAME__); - auto it = conditions.begin(), end = conditions.end(); + auto it = conditions.begin(); + const auto end = conditions.end(); while (it != end) { - std::shared_ptr condition = *it; + auto condition = *it; if (condition->getType() != conditionType || condition->getId() != conditionId) { ++it; continue; @@ -1435,7 +1468,7 @@ void Creature::removeCombatCondition(ConditionType_t type) { std::vector> removeConditions; for (const auto &condition : conditions) { if (condition->getType() == type) { - removeConditions.push_back(condition); + removeConditions.emplace_back(condition); } } @@ -1444,8 +1477,8 @@ void Creature::removeCombatCondition(ConditionType_t type) { } } -void Creature::removeCondition(std::shared_ptr condition) { - auto it = std::find(conditions.begin(), conditions.end(), condition); +void Creature::removeCondition(const std::shared_ptr &condition) { + const auto it = std::ranges::find(conditions, condition); if (it == conditions.end()) { return; } @@ -1479,7 +1512,7 @@ std::vector> Creature::getConditionsByType(ConditionT std::vector> conditionsVec; for (const auto &condition : conditions) { if (condition->getType() == type) { - conditionsVec.push_back(condition); + conditionsVec.emplace_back(condition); } } return conditionsVec; @@ -1587,7 +1620,7 @@ void Creature::setNormalCreatureLight() { } bool Creature::registerCreatureEvent(const std::string &name) { - const auto event = g_creatureEvents().getEventByName(name); + const auto &event = g_creatureEvents().getEventByName(name); if (!event) { return false; } @@ -1603,12 +1636,12 @@ bool Creature::registerCreatureEvent(const std::string &name) { scriptEventsBitField |= static_cast(1) << type; } - eventsList.push_back(event); + eventsList.emplace_back(event); return true; } bool Creature::unregisterCreatureEvent(const std::string &name) { - const auto event = g_creatureEvents().getEventByName(name); + const auto &event = g_creatureEvents().getEventByName(name); if (!event) { return false; } @@ -1640,7 +1673,38 @@ bool Creature::unregisterCreatureEvent(const std::string &name) { return true; } -CreatureEventList Creature::getCreatureEvents(CreatureEventType_t type) { +std::shared_ptr Creature::getParent() { + return getTile(); +} + +void Creature::setParent(std::weak_ptr cylinder) { + const auto oldGroundSpeed = walk.groundSpeed; + walk.groundSpeed = 150; + + if (const auto &lockedCylinder = cylinder.lock()) { + const auto &newParent = lockedCylinder->getTile(); + position = newParent->getPosition(); + m_tile = newParent; + + if (newParent->getGround()) { + const auto &it = Item::items[newParent->getGround()->getID()]; + if (it.speed > 0) { + walk.groundSpeed = it.speed; + } + } + } + + if (walk.groundSpeed != oldGroundSpeed) { + walk.recache(); + } +} + +// creature script events +bool Creature::hasEventRegistered(CreatureEventType_t event) const { + return (0 != (scriptEventsBitField & (static_cast(1) << event))); +} + +CreatureEventList Creature::getCreatureEvents(CreatureEventType_t type) const { CreatureEventList tmpEventList; if (!hasEventRegistered(type)) { @@ -1649,7 +1713,7 @@ CreatureEventList Creature::getCreatureEvents(CreatureEventType_t type) { for (const auto &creatureEventPtr : eventsList) { if (creatureEventPtr->getEventType() == type) { - tmpEventList.push_back(creatureEventPtr); + tmpEventList.emplace_back(creatureEventPtr); } } @@ -1722,8 +1786,7 @@ bool FrozenPathingConditionCall::operator()(const Position &startPos, const Posi if (testDist == fpp.maxTargetDist) { bestMatchDist = 0; return true; - } else if (testDist > bestMatchDist) { - // not quite what we want, but the best so far + } else if (testDist > bestMatchDist) { // not quite what we want, but the best so far bestMatchDist = testDist; return true; } @@ -1732,12 +1795,20 @@ bool FrozenPathingConditionCall::operator()(const Position &startPos, const Posi } bool Creature::isInvisible() const { - return std::find_if(conditions.begin(), conditions.end(), [](const std::shared_ptr &condition) { + return std::ranges::find_if(conditions, [](const std::shared_ptr &condition) { return condition->getType() == CONDITION_INVISIBLE; }) != conditions.end(); } +ZoneType_t Creature::getZoneType() { + if (getTile()) { + return getTile()->getZoneType(); + } + + return ZONE_NORMAL; +} + bool Creature::getPathTo(const Position &targetPos, std::vector &dirList, const FindPathParams &fpp) { metrics::method_latency measure(__METHOD_NAME__); if (fpp.maxSearchDist != 0 || fpp.keepDistance) { @@ -1756,7 +1827,7 @@ bool Creature::getPathTo(const Position &targetPos, std::vector &dirL return getPathTo(targetPos, dirList, fpp); } -void Creature::turnToCreature(std::shared_ptr creature) { +void Creature::turnToCreature(const std::shared_ptr &creature) { const Position &creaturePos = creature->getPosition(); const auto dx = Position::getOffsetX(position, creaturePos); const auto dy = Position::getOffsetY(position, creaturePos); @@ -1802,7 +1873,7 @@ void Creature::handleLostSummon(bool teleportSummons) { g_game().addMagicEffect(getPosition(), CONST_ME_POFF); } -int32_t Creature::getReflectPercent(CombatType_t combatType, bool useCharges /*= false*/) const { +double_t Creature::getReflectPercent(CombatType_t combatType, bool useCharges /*= false*/) const { try { return reflectPercent.at(combatTypeToIndex(combatType)); } catch (const std::out_of_range &e) { @@ -1895,7 +1966,7 @@ std::unordered_set> Creature::getZones() { } void Creature::iconChanged() { - auto tile = getTile(); + const auto &tile = getTile(); if (!tile) { return; } @@ -1904,3 +1975,30 @@ void Creature::iconChanged() { spectator->getPlayer()->sendCreatureIcon(getCreature()); } } + +void Creature::sendAsyncTasks() { + if (hasAsyncTaskFlag(AsyncTaskRunning)) { + return; + } + + setAsyncTaskFlag(AsyncTaskRunning, true); + g_dispatcher().asyncEvent([self = std::weak_ptr(getCreature())] { + if (const auto &creature = self.lock()) { + if (!creature->isRemoved()) { + for (const auto &task : creature->asyncTasks) { + task(); + } + + if (creature->hasAsyncTaskFlag(Pathfinder)) { + creature->goToFollowCreature(); + } + + creature->onExecuteAsyncTasks(); + } + + creature->asyncTasks.clear(); + creature->m_flagAsyncTask = 0; + } + }, + TaskGroup::WalkParallel); +} diff --git a/src/creatures/creature.hpp b/src/creatures/creature.hpp index 138e8b364..46f628188 100644 --- a/src/creatures/creature.hpp +++ b/src/creatures/creature.hpp @@ -9,19 +9,16 @@ #pragma once -#include "declarations.hpp" -#include "creatures/combat/condition.hpp" -#include "utils/utils_definitions.hpp" -#include "lua/creature/creatureevent.hpp" -#include "map/map.hpp" +#include "creatures/creatures_definitions.hpp" +#include "game/game_definitions.hpp" #include "game/movement/position.hpp" -#include "items/tile.hpp" - -using ConditionList = std::list>; -using CreatureEventList = std::list>; +#include "items/thing.hpp" +#include "map/map_const.hpp" +#include "utils/utils_definitions.hpp" +class CreatureEvent; +class Condition; class Map; -class Thing; class Container; class Player; class Monster; @@ -29,6 +26,19 @@ class Npc; class Item; class Tile; class Zone; +class MonsterType; +class Cylinder; +class ItemType; + +struct CreatureIcon; +struct Position; + +enum CreatureType_t : uint8_t; +enum ZoneType_t : uint8_t; +enum CreatureEventType_t : uint8_t; + +using ConditionList = std::list>; +using CreatureEventList = std::list>; static constexpr uint8_t WALK_TARGET_NEARBY_EXTRA_COST = 2; static constexpr uint8_t WALK_FLOOR_CHANGE_EXTRA_COST = 2; @@ -40,7 +50,7 @@ static constexpr int32_t EVENT_CHECK_CREATURE_INTERVAL = (EVENT_CREATURE_THINK_I class FrozenPathingConditionCall { public: explicit FrozenPathingConditionCall(Position newTargetPos) : - targetPos(std::move(newTargetPos)) { } + targetPos(newTargetPos) { } bool operator()(const Position &startPos, const Position &testPos, const FindPathParams &fpp, int32_t &bestMatchDist) const; @@ -79,7 +89,7 @@ class Creature : virtual public Thing, public SharedObject { std::shared_ptr getCreature() const override final { return static_self_cast(); } - virtual std::shared_ptr getPlayer() { + std::shared_ptr getPlayer() override { return nullptr; } virtual std::shared_ptr getPlayer() const { @@ -117,7 +127,7 @@ class Creature : virtual public Thing, public SharedObject { virtual void addList() = 0; virtual bool canSee(const Position &pos); - virtual bool canSeeCreature(std::shared_ptr creature) const; + virtual bool canSeeCreature(const std::shared_ptr &creature) const; virtual RaceType_t getRace() const { return RACE_NONE; @@ -125,7 +135,7 @@ class Creature : virtual public Thing, public SharedObject { virtual Skulls_t getSkull() const { return skull; } - virtual Skulls_t getSkullClient(std::shared_ptr creature) { + virtual Skulls_t getSkullClient(const std::shared_ptr &creature) { return creature->getSkull(); } void setSkull(Skulls_t newSkull); @@ -199,6 +209,11 @@ class Creature : virtual public Thing, public SharedObject { int32_t getHealth() const { return health; } + + bool isAlive() const { + return !isDead(); + } + virtual int32_t getMaxHealth() const { return healthMax; } @@ -255,6 +270,10 @@ class Creature : virtual public Thing, public SharedObject { return creatureIcons.at(key); } + bool hasIcon(const std::string &key) const { + return creatureIcons.contains(key); + } + void setIcon(const std::string &key, CreatureIcon icon) { creatureIcons[key] = icon; iconChanged(); @@ -286,13 +305,7 @@ class Creature : virtual public Thing, public SharedObject { return outfit == 75 || outfit == 266 || outfit == 302; } bool isInvisible() const; - ZoneType_t getZoneType() { - if (getTile()) { - return getTile()->getZoneType(); - } - - return ZONE_NORMAL; - } + ZoneType_t getZoneType(); std::unordered_set> getZones(); @@ -313,7 +326,7 @@ class Creature : virtual public Thing, public SharedObject { std::shared_ptr getFollowCreature() const { return m_followCreature.lock(); } - virtual bool setFollowCreature(std::shared_ptr creature); + virtual bool setFollowCreature(const std::shared_ptr &creature); // follow events virtual void onFollowCreature(const std::shared_ptr &) { @@ -324,10 +337,10 @@ class Creature : virtual public Thing, public SharedObject { } // combat functions - std::shared_ptr getAttackedCreature() { + std::shared_ptr getAttackedCreature() const { return m_attackedCreature.lock(); } - virtual bool setAttackedCreature(std::shared_ptr creature); + virtual bool setAttackedCreature(const std::shared_ptr &creature); /** * @brief Mitigates damage inflicted on a creature. @@ -342,11 +355,11 @@ class Creature : virtual public Thing, public SharedObject { * @param damage Reference to the amount of damage inflicted, which will be reduced by the creature's mitigation factor. */ void mitigateDamage(const CombatType_t &combatType, BlockType_t &blockType, int32_t &damage) const; - virtual BlockType_t blockHit(std::shared_ptr attacker, CombatType_t combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false); + virtual BlockType_t blockHit(const std::shared_ptr &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false); - void applyAbsorbDamageModifications(std::shared_ptr attacker, int32_t &damage, CombatType_t combatType) const; + void applyAbsorbDamageModifications(const std::shared_ptr &attacker, int32_t &damage, CombatType_t combatType) const; - bool setMaster(std::shared_ptr newMaster, bool reloadCreature = false); + bool setMaster(const std::shared_ptr &newMaster, bool reloadCreature = false); void removeMaster() { if (getMaster()) { @@ -392,11 +405,11 @@ class Creature : virtual public Thing, public SharedObject { return SPEECHBUBBLE_NONE; } - bool addCondition(std::shared_ptr condition, bool attackerPlayer = false); - bool addCombatCondition(std::shared_ptr condition, bool attackerPlayer = false); + bool addCondition(const std::shared_ptr &condition, bool attackerPlayer = false); + bool addCombatCondition(const std::shared_ptr &condition, bool attackerPlayer = false); void removeCondition(ConditionType_t conditionType, ConditionId_t conditionId, bool force = false); void removeCondition(ConditionType_t type); - void removeCondition(std::shared_ptr condition); + void removeCondition(const std::shared_ptr &condition); void removeCombatCondition(ConditionType_t type); std::shared_ptr getCondition(ConditionType_t type) const; std::shared_ptr getCondition(ConditionType_t type, ConditionId_t conditionId, uint32_t subId = 0) const; @@ -424,17 +437,17 @@ class Creature : virtual public Thing, public SharedObject { virtual void changeHealth(int32_t healthChange, bool sendHealthChange = true); virtual void changeMana(int32_t manaChange); - void gainHealth(std::shared_ptr attacker, int32_t healthGain); - virtual void drainHealth(std::shared_ptr attacker, int32_t damage); - virtual void drainMana(std::shared_ptr attacker, int32_t manaLoss); + void gainHealth(const std::shared_ptr &attacker, int32_t healthGain); + virtual void drainHealth(const std::shared_ptr &attacker, int32_t damage); + virtual void drainMana(const std::shared_ptr &attacker, int32_t manaLoss); - virtual bool challengeCreature(std::shared_ptr, [[maybe_unused]] int targetChangeCooldown) { + virtual bool challengeCreature(const std::shared_ptr &, [[maybe_unused]] int targetChangeCooldown) { return false; } void onDeath(); - virtual uint64_t getGainedExperience(std::shared_ptr attacker) const; - void addDamagePoints(std::shared_ptr attacker, int32_t damagePoints); + virtual uint64_t getGainedExperience(const std::shared_ptr &attacker) const; + void addDamagePoints(const std::shared_ptr &attacker, int32_t damagePoints); bool hasBeenAttacked(uint32_t attackerId); // combat event functions @@ -442,26 +455,26 @@ class Creature : virtual public Thing, public SharedObject { virtual void onAddCombatCondition(ConditionType_t type); virtual void onEndCondition(ConditionType_t type); void onTickCondition(ConditionType_t type, bool &bRemove); - virtual void onCombatRemoveCondition(std::shared_ptr condition); - virtual void onAttackedCreature(std::shared_ptr) { } + virtual void onCombatRemoveCondition(const std::shared_ptr &condition); + virtual void onAttackedCreature(const std::shared_ptr &) { } virtual void onAttacked(); - virtual void onAttackedCreatureDrainHealth(std::shared_ptr target, int32_t points); - virtual void onTargetCreatureGainHealth(std::shared_ptr, int32_t) { } - void onAttackedCreatureKilled(std::shared_ptr target); + virtual void onAttackedCreatureDrainHealth(const std::shared_ptr &target, int32_t points); + virtual void onTargetCreatureGainHealth(const std::shared_ptr &, int32_t) { } + void onAttackedCreatureKilled(const std::shared_ptr &target); /** * @deprecated -- This is here to trigger the deprecated onKill events in lua */ - bool deprecatedOnKilledCreature(std::shared_ptr target, bool lastHit); + bool deprecatedOnKilledCreature(const std::shared_ptr &target, bool lastHit); virtual bool onKilledPlayer([[maybe_unused]] const std::shared_ptr &target, [[maybe_unused]] bool lastHit) { return false; }; virtual bool onKilledMonster([[maybe_unused]] const std::shared_ptr &target) { return false; }; - virtual void onGainExperience(uint64_t gainExp, std::shared_ptr target); - virtual void onAttackedCreatureBlockHit(BlockType_t) { } + virtual void onGainExperience(uint64_t gainExp, const std::shared_ptr &target); + virtual void onAttackedCreatureBlockHit(const BlockType_t &) { } virtual void onBlockHit() { } - virtual void onTakeDamage(std::shared_ptr, int32_t) { } + virtual void onTakeDamage(const std::shared_ptr &, int32_t) { } virtual void onChangeZone(ZoneType_t zone); virtual void onAttackedCreatureChangeZone(ZoneType_t zone); virtual void onIdleStatus(); @@ -475,14 +488,14 @@ class Creature : virtual public Thing, public SharedObject { virtual void onCreatureWalk(); virtual bool getNextStep(Direction &dir, uint32_t &flags); - virtual void turnToCreature(std::shared_ptr creature); + virtual void turnToCreature(const std::shared_ptr &creature); - void onAddTileItem(std::shared_ptr tile, const Position &pos); - virtual void onUpdateTileItem(std::shared_ptr tile, const Position &pos, std::shared_ptr oldItem, const ItemType &oldType, std::shared_ptr newItem, const ItemType &newType); - virtual void onRemoveTileItem(std::shared_ptr tile, const Position &pos, const ItemType &iType, std::shared_ptr item); + void onAddTileItem(const std::shared_ptr &tile, const Position &pos); + virtual void onUpdateTileItem(const std::shared_ptr &tile, const Position &pos, const std::shared_ptr &oldItem, const ItemType &oldType, const std::shared_ptr &newItem, const ItemType &newType); + virtual void onRemoveTileItem(const std::shared_ptr &tile, const Position &pos, const ItemType &iType, const std::shared_ptr &item); - virtual void onCreatureAppear(std::shared_ptr creature, bool isLogin); - virtual void onRemoveCreature(std::shared_ptr creature, bool isLogout); + virtual void onCreatureAppear(const std::shared_ptr &creature, bool isLogin); + virtual void onRemoveCreature(const std::shared_ptr &creature, bool isLogout); /** * @brief Check if the summon can move/spawn and if the familiar can teleport to the master @@ -498,7 +511,7 @@ class Creature : virtual public Thing, public SharedObject { virtual void onAttackedCreatureDisappear(bool) { } virtual void onFollowCreatureDisappear(bool) { } - virtual void onCreatureSay(std::shared_ptr, SpeakClasses, const std::string &) { } + virtual void onCreatureSay(const std::shared_ptr &, SpeakClasses, const std::string &) { } virtual void onPlacedCreature() { } @@ -537,31 +550,9 @@ class Creature : virtual public Thing, public SharedObject { bool registerCreatureEvent(const std::string &name); bool unregisterCreatureEvent(const std::string &name); - std::shared_ptr getParent() override final { - return getTile(); - } - - void setParent(std::weak_ptr cylinder) override final { - const auto oldGroundSpeed = walk.groundSpeed; - walk.groundSpeed = 150; - - if (const auto &lockedCylinder = cylinder.lock()) { - const auto &newParent = lockedCylinder->getTile(); - position = newParent->getPosition(); - m_tile = newParent; - - if (newParent->getGround()) { - const auto &it = Item::items[newParent->getGround()->getID()]; - if (it.speed > 0) { - walk.groundSpeed = it.speed; - } - } - } + std::shared_ptr getParent() final; - if (walk.groundSpeed != oldGroundSpeed) { - walk.recache(); - } - } + void setParent(std::weak_ptr cylinder) final; const Position &getPosition() override final { return position; @@ -582,7 +573,7 @@ class Creature : virtual public Thing, public SharedObject { static bool canSee(const Position &myPos, const Position &pos, int32_t viewRangeX, int32_t viewRangeY); - double getDamageRatio(std::shared_ptr attacker) const; + double getDamageRatio(const std::shared_ptr &attacker) const; bool getPathTo(const Position &targetPos, std::vector &dirList, const FindPathParams &fpp); bool getPathTo(const Position &targetPos, std::vector &dirList, int32_t minTargetDist, int32_t maxTargetDist, bool fullPathSearch = true, bool clearSight = true, int32_t maxSearchDist = 7); @@ -609,7 +600,7 @@ class Creature : virtual public Thing, public SharedObject { * @param useCharges Indicates whether charges should be considered. * @return The reflection percentage for the specified combat type. */ - virtual int32_t getReflectPercent(CombatType_t combatType, bool useCharges = false) const; + virtual double_t getReflectPercent(CombatType_t combatType, bool useCharges = false) const; /** * @brief Retrieves the flat reflection value for a given combat type. @@ -703,10 +694,21 @@ class Creature : virtual public Thing, public SharedObject { } protected: + enum FlagAsyncClass_t : uint8_t { + AsyncTaskRunning = 1 << 0, + UpdateTargetList = 1 << 1, + UpdateIdleStatus = 1 << 2, + Pathfinder = 1 << 3 + }; + virtual bool useCacheMap() const { return false; } + virtual bool isDead() const { + return false; + } + static constexpr int32_t mapWalkWidth = MAP_MAX_VIEW_PORT_X * 2 + 1; static constexpr int32_t mapWalkHeight = MAP_MAX_VIEW_PORT_Y * 2 + 1; static constexpr int32_t maxWalkCacheWidth = (mapWalkWidth - 1) / 2; @@ -752,8 +754,8 @@ class Creature : virtual public Thing, public SharedObject { int32_t health = 1000; int32_t healthMax = 1000; - uint16_t manaShield = 0; - uint16_t maxManaShield = 0; + uint32_t manaShield = 0; + uint32_t maxManaShield = 0; int32_t varBuffs[BUFF_LAST + 1] = { 100, 100, 100 }; std::array reflectPercent = { 0 }; @@ -772,12 +774,13 @@ class Creature : virtual public Thing, public SharedObject { Direction direction = DIRECTION_SOUTH; Skulls_t skull = SKULL_NONE; + std::atomic_bool creatureCheck = false; + std::atomic_bool inCheckCreaturesVector = false; + bool localMapCache[mapWalkHeight][mapWalkWidth] = { { false } }; bool isInternalRemoved = false; bool isMapLoaded = false; bool isUpdatingPath = false; - bool creatureCheck = false; - bool inCheckCreaturesVector = false; bool skillLoss = true; bool lootDrop = true; bool cancelNextWalk = false; @@ -788,25 +791,22 @@ class Creature : virtual public Thing, public SharedObject { bool moveLocked = false; bool directionLocked = false; bool hasFollowPath = false; + bool checkingWalkCreature = false; int8_t charmChanceModifier = 0; uint8_t wheelOfDestinyDrainBodyDebuff = 0; - std::atomic_bool pathfinderRunning = false; - // use map here instead of phmap to keep the keys in a predictable order std::map creatureIcons = {}; // creature script events - bool hasEventRegistered(CreatureEventType_t event) const { - return (0 != (scriptEventsBitField & (static_cast(1) << event))); - } - CreatureEventList getCreatureEvents(CreatureEventType_t type); + bool hasEventRegistered(CreatureEventType_t event) const; + CreatureEventList getCreatureEvents(CreatureEventType_t type) const; void updateMapCache(); - void updateTileCache(std::shared_ptr tile, int32_t dx, int32_t dy); - void updateTileCache(std::shared_ptr tile, const Position &pos); - void onCreatureDisappear(std::shared_ptr creature, bool isLogout); + void updateTileCache(const std::shared_ptr &tile, int32_t dx, int32_t dy); + void updateTileCache(const std::shared_ptr &tile, const Position &pos); + void onCreatureDisappear(const std::shared_ptr &creature, bool isLogout); virtual void doAttacking(uint32_t) { } virtual bool hasExtraSwing() { return false; @@ -815,24 +815,47 @@ class Creature : virtual public Thing, public SharedObject { virtual uint64_t getLostExperience() const { return 0; } - virtual void dropLoot(std::shared_ptr, std::shared_ptr) { } + virtual void dropLoot(const std::shared_ptr &, const std::shared_ptr &) { } virtual uint16_t getLookCorpse() const { return 0; } virtual void getPathSearchParams(const std::shared_ptr &, FindPathParams &fpp); - virtual void death(std::shared_ptr) { } - virtual bool dropCorpse(std::shared_ptr lastHitCreature, std::shared_ptr mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified); - virtual std::shared_ptr getCorpse(std::shared_ptr lastHitCreature, std::shared_ptr mostDamageCreature); + virtual void death(const std::shared_ptr &) { } + virtual bool dropCorpse(const std::shared_ptr &lastHitCreature, const std::shared_ptr &mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified); + virtual std::shared_ptr getCorpse(const std::shared_ptr &lastHitCreature, const std::shared_ptr &mostDamageCreature); friend class Game; friend class Map; friend class CreatureFunctions; + void addAsyncTask(std::function &&fnc) { + asyncTasks.emplace_back(std::move(fnc)); + sendAsyncTasks(); + } + + bool hasAsyncTaskFlag(FlagAsyncClass_t prop) const { + return (m_flagAsyncTask & prop); + } + + void setAsyncTaskFlag(FlagAsyncClass_t taskFlag, bool v) { + if (v) { + m_flagAsyncTask |= taskFlag; + sendAsyncTasks(); + } else { + m_flagAsyncTask &= ~taskFlag; + } + } + + virtual void onExecuteAsyncTasks() {}; + private: - bool canFollowMaster(); + bool canFollowMaster() const; bool isLostSummon(); + void sendAsyncTasks(); void handleLostSummon(bool teleportSummons); + std::vector> asyncTasks; + struct { uint16_t groundSpeed { 0 }; uint16_t calculatedStepSpeed { 1 }; @@ -856,4 +879,6 @@ class Creature : virtual public Thing, public SharedObject { walk.recache(); } + + uint8_t m_flagAsyncTask = 0; }; diff --git a/src/creatures/creatures_definitions.hpp b/src/creatures/creatures_definitions.hpp index 74ec6c5f2..f7ba1e203 100644 --- a/src/creatures/creatures_definitions.hpp +++ b/src/creatures/creatures_definitions.hpp @@ -11,6 +11,7 @@ #ifndef USE_PRECOMPILED_HEADERS #include + #include #include #include #include @@ -71,6 +72,7 @@ enum ConditionAttr_t { CONDITIONATTR_ABSORBS, CONDITIONATTR_INCREASES, CONDITIONATTR_CHARM_CHANCE_MODIFIER, + CONDITIONATTR_PERSISTENT, // reserved for serialization CONDITIONATTR_END = 254, @@ -112,14 +114,11 @@ enum ConditionType_t : uint8_t { CONDITION_LESSERHEX = 31, CONDITION_INTENSEHEX = 32, CONDITION_GREATERHEX = 33, - CONDITION_GOSHNAR1 = 34, - CONDITION_GOSHNAR2 = 35, - CONDITION_GOSHNAR3 = 36, - CONDITION_GOSHNAR4 = 37, - CONDITION_GOSHNAR5 = 38, + CONDITION_BAKRAGORE = 34, + CONDITION_GOSHNARTAINT = 35, // Need the last ever - CONDITION_COUNT = 39 + CONDITION_COUNT }; // constexpr definiting suppressible conditions @@ -490,12 +489,14 @@ enum BestiaryType_t : uint8_t { }; enum MonstersEvent_t : uint8_t { - MONSTERS_EVENT_NONE = 0, - MONSTERS_EVENT_THINK = 1, - MONSTERS_EVENT_APPEAR = 2, - MONSTERS_EVENT_DISAPPEAR = 3, - MONSTERS_EVENT_MOVE = 4, - MONSTERS_EVENT_SAY = 5, + MONSTERS_EVENT_NONE, + MONSTERS_EVENT_THINK, + MONSTERS_EVENT_APPEAR, + MONSTERS_EVENT_DISAPPEAR, + MONSTERS_EVENT_MOVE, + MONSTERS_EVENT_SAY, + MONSTERS_EVENT_ATTACKED_BY_PLAYER, + MONSTERS_EVENT_ON_SPAWN, }; enum NpcsEvent_t : uint8_t { @@ -1368,7 +1369,7 @@ struct CreatureIcon { explicit constexpr CreatureIcon(CreatureIconQuests_t quest, uint16_t count = 0) : category(CreatureIconCategory_t::Quests), quest(quest), count(count) { } - CreatureIconCategory_t category; + CreatureIconCategory_t category {}; CreatureIconModifications_t modification = CreatureIconModifications_t::None; CreatureIconQuests_t quest = CreatureIconQuests_t::None; uint16_t count = 0; @@ -1397,7 +1398,7 @@ struct CreatureIcon { struct Position; struct VIPEntry { - VIPEntry(uint32_t initGuid, const std::string &initName, const std::string &initDescription, uint32_t initIcon, bool initNotify) : + VIPEntry(uint32_t initGuid, std::string initName, std::string initDescription, uint32_t initIcon, bool initNotify) : guid(initGuid), name(std::move(initName)), description(std::move(initDescription)), @@ -1405,20 +1406,20 @@ struct VIPEntry { notify(initNotify) { } uint32_t guid = 0; - std::string name = ""; - std::string description = ""; + 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) : + VIPGroupEntry(uint8_t initId, std::string initName, bool initCustomizable) : id(initId), name(std::move(initName)), customizable(initCustomizable) { } uint8_t id = 0; - std::string name = ""; + std::string name; bool customizable = false; }; @@ -1485,7 +1486,7 @@ struct MarketOffer { struct MarketOfferEx { MarketOfferEx() = default; - MarketOfferEx(MarketOfferEx &&other) : + MarketOfferEx(MarketOfferEx &&other) noexcept : id(other.id), playerId(other.playerId), timestamp(other.timestamp), @@ -1497,15 +1498,15 @@ struct MarketOfferEx { tier(other.tier), playerName(std::move(other.playerName)) { } - uint32_t id; - uint32_t playerId; - uint32_t timestamp; - uint64_t price; - uint16_t amount; - uint16_t counter; - uint16_t itemId; - MarketAction_t type; - uint8_t tier; + uint32_t id {}; + uint32_t playerId {}; + uint32_t timestamp {}; + uint64_t price {}; + uint16_t amount {}; + uint16_t counter {}; + uint16_t itemId {}; + MarketAction_t type {}; + uint8_t tier {}; std::string playerName; }; @@ -1583,8 +1584,6 @@ struct RespawnType { bool underground; }; -struct LootBlock; - struct LootBlock { uint16_t id; uint32_t countmax; @@ -1625,17 +1624,16 @@ struct LootBlock { }; struct ShopBlock { - uint16_t itemId; + uint16_t itemId {}; std::string itemName; - int32_t itemSubType; - uint32_t itemBuyPrice; - uint32_t itemSellPrice; - int32_t itemStorageKey; - int32_t itemStorageValue; + int32_t itemSubType {}; + uint32_t itemBuyPrice {}; + uint32_t itemSellPrice {}; + int32_t itemStorageKey {}; + int32_t itemStorageValue {}; std::vector childShop; - ShopBlock() : - itemId(0), itemName(""), itemSubType(0), itemBuyPrice(0), itemSellPrice(0), itemStorageKey(0), itemStorageValue(0) { } + ShopBlock() = default; explicit ShopBlock(uint16_t newItemId, std::string newName = "", int32_t newSubType = 0, uint32_t newBuyPrice = 0, uint32_t newSellPrice = 0, int32_t newStorageKey = 0, int32_t newStorageValue = 0) : itemId(newItemId), itemName(std::move(newName)), itemSubType(newSubType), itemBuyPrice(newBuyPrice), itemSellPrice(newSellPrice), itemStorageKey(newStorageKey), itemStorageValue(newStorageValue) { } diff --git a/src/creatures/interactions/chat.cpp b/src/creatures/interactions/chat.cpp index 900247e45..326b25551 100644 --- a/src/creatures/interactions/chat.cpp +++ b/src/creatures/interactions/chat.cpp @@ -7,18 +7,31 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/interactions/chat.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "utils/pugicast.hpp" #include "game/scheduling/dispatcher.hpp" +#include "lib/di/container.hpp" +#include "utils/pugicast.hpp" + +PrivateChatChannel::PrivateChatChannel(uint16_t channelId, std::string channelName) : + ChatChannel(channelId, std::move(channelName)) { } + +uint32_t PrivateChatChannel::getOwner() const { + return owner; +} + +void PrivateChatChannel::setOwner(uint32_t newOwner) { + this->owner = newOwner; +} bool PrivateChatChannel::isInvited(uint32_t guid) const { if (guid == getOwner()) { return true; } - return invites.find(guid) != invites.end(); + return invites.contains(guid); } bool PrivateChatChannel::removeInvite(uint32_t guid) { @@ -26,8 +39,8 @@ bool PrivateChatChannel::removeInvite(uint32_t guid) { } void PrivateChatChannel::invitePlayer(const std::shared_ptr &player, const std::shared_ptr &invitePlayer) { - auto result = invites.emplace(invitePlayer->getGUID(), invitePlayer); - if (!result.second) { + auto [iter, inserted] = invites.try_emplace(invitePlayer->getGUID(), invitePlayer); + if (!inserted) { return; } @@ -39,8 +52,12 @@ void PrivateChatChannel::invitePlayer(const std::shared_ptr &player, con ss << invitePlayer->getName() << " has been invited."; player->sendTextMessage(MESSAGE_PARTY_MANAGEMENT, ss.str()); - for (const auto &it : users) { - it.second->sendChannelEvent(id, invitePlayer->getName(), CHANNELEVENT_INVITE); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0 || !playerUser) { + continue; + } + + playerUser->sendChannelEvent(id, invitePlayer->getName(), CHANNELEVENT_INVITE); } } @@ -57,19 +74,35 @@ void PrivateChatChannel::excludePlayer(const std::shared_ptr &player, co excludePlayer->sendClosePrivate(id); - for (const auto &it : users) { - it.second->sendChannelEvent(id, excludePlayer->getName(), CHANNELEVENT_EXCLUDE); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendChannelEvent(id, excludePlayer->getName(), CHANNELEVENT_EXCLUDE); } } void PrivateChatChannel::closeChannel() const { - for (const auto &it : users) { - it.second->sendClosePrivate(id); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendClosePrivate(id); } } +const InvitedMap* PrivateChatChannel::getInvitedUsers() const { + return &invites; +} + +ChatChannel::ChatChannel(uint16_t channelId, std::string channelName) : + name(std::move(channelName)), + id(channelId) { } + bool ChatChannel::addUser(const std::shared_ptr &player) { - if (users.find(player->getID()) != users.end()) { + if (users.contains(player->getID())) { return false; } @@ -79,7 +112,7 @@ bool ChatChannel::addUser(const std::shared_ptr &player) { // TODO: Move to script when guild channels can be scripted if (id == CHANNEL_GUILD) { - const auto guild = player->getGuild(); + const auto &guild = player->getGuild(); if (guild && !guild->getMotd().empty()) { g_dispatcher().scheduleEvent( 150, [playerId = player->getID()] { g_game().sendGuildMotd(playerId); }, "Game::sendGuildMotd" @@ -88,8 +121,12 @@ bool ChatChannel::addUser(const std::shared_ptr &player) { } if (!publicChannel) { - for (const auto &it : users) { - it.second->sendChannelEvent(id, player->getName(), CHANNELEVENT_JOIN); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendChannelEvent(id, player->getName(), CHANNELEVENT_JOIN); } } @@ -106,8 +143,12 @@ bool ChatChannel::removeUser(const std::shared_ptr &player) { users.erase(iter); if (!publicChannel) { - for (const auto &it : users) { - it.second->sendChannelEvent(id, player->getName(), CHANNELEVENT_LEAVE); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendChannelEvent(id, player->getName(), CHANNELEVENT_LEAVE); } } @@ -115,42 +156,74 @@ bool ChatChannel::removeUser(const std::shared_ptr &player) { return true; } -bool ChatChannel::hasUser(const std::shared_ptr &player) { - return users.find(player->getID()) != users.end(); +bool ChatChannel::hasUser(const std::shared_ptr &player) const { + return users.contains(player->getID()); } void ChatChannel::sendToAll(const std::string &message, SpeakClasses type) const { - for (const auto &it : users) { - it.second->sendChannelMessage("", message, type, id); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendChannelMessage("", message, type, id); } } -bool ChatChannel::talk(const std::shared_ptr &fromPlayer, SpeakClasses type, const std::string &text) { - if (users.find(fromPlayer->getID()) == users.end()) { +const std::string &ChatChannel::getName() const { + return name; +} + +uint16_t ChatChannel::getId() const { + return id; +} + +const UsersMap &ChatChannel::getUsers() const { + return users; +} + +const InvitedMap* ChatChannel::getInvitedUsers() const { + return nullptr; +} + +uint32_t ChatChannel::getOwner() const { + return 0; +} + +bool ChatChannel::isPublicChannel() const { + return publicChannel; +} + +bool ChatChannel::talk(const std::shared_ptr &fromPlayer, SpeakClasses type, const std::string &text) const { + if (!users.contains(fromPlayer->getID())) { return false; } - for (const auto &it : users) { - it.second->sendToChannel(fromPlayer, type, text, id); + for (const auto &[playerUserId, playerUser] : users) { + if (playerUserId == 0) { + continue; + } + + playerUser->sendToChannel(fromPlayer, type, text, id); } return true; } -bool ChatChannel::executeCanJoinEvent(const std::shared_ptr &player) { +bool ChatChannel::executeCanJoinEvent(const std::shared_ptr &player) const { if (canJoinEvent == -1) { return true; } // canJoin(player) LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CanJoinChannelEvent::execute - Player {}, on channel {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(canJoinEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -162,21 +235,21 @@ bool ChatChannel::executeCanJoinEvent(const std::shared_ptr &player) { return scriptInterface->callFunction(1); } -bool ChatChannel::executeOnJoinEvent(const std::shared_ptr &player) { +bool ChatChannel::executeOnJoinEvent(const std::shared_ptr &player) const { if (onJoinEvent == -1) { return true; } // onJoin(player) LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[OnJoinChannelEvent::execute - Player {}, on channel {}] " "Call stack overflow. Too many lua script calls being nested", player->getName(), getName()); return false; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(onJoinEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -188,21 +261,21 @@ bool ChatChannel::executeOnJoinEvent(const std::shared_ptr &player) { return scriptInterface->callFunction(1); } -bool ChatChannel::executeOnLeaveEvent(const std::shared_ptr &player) { +bool ChatChannel::executeOnLeaveEvent(const std::shared_ptr &player) const { if (onLeaveEvent == -1) { return true; } // onLeave(player) LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[OnLeaveChannelEvent::execute - Player {}, on channel {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(onLeaveEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -214,21 +287,21 @@ bool ChatChannel::executeOnLeaveEvent(const std::shared_ptr &player) { return scriptInterface->callFunction(1); } -bool ChatChannel::executeOnSpeakEvent(const std::shared_ptr &player, SpeakClasses &type, const std::string &message) { +bool ChatChannel::executeOnSpeakEvent(const std::shared_ptr &player, SpeakClasses &type, const std::string &message) const { if (onSpeakEvent == -1) { return true; } // onSpeak(player, type, message) LuaScriptInterface* scriptInterface = g_chat().getScriptInterface(); - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[OnSpeakChannelEvent::execute - Player {}, type {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), fmt::underlying(type)); return false; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(onSpeakEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -242,7 +315,7 @@ bool ChatChannel::executeOnSpeakEvent(const std::shared_ptr &player, Spe bool result = false; int size0 = lua_gettop(L); - int ret = scriptInterface->protectedCall(L, 3, 1); + int ret = LuaScriptInterface::protectedCall(L, 3, 1); if (ret != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else if (lua_gettop(L) > 0) { @@ -258,7 +331,7 @@ bool ChatChannel::executeOnSpeakEvent(const std::shared_ptr &player, Spe if ((lua_gettop(L) + 4) != size0) { LuaScriptInterface::reportError(nullptr, "Stack size changed!"); } - scriptInterface->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return result; } @@ -268,9 +341,13 @@ Chat::Chat() : scriptInterface.initState(); } +Chat &Chat::getInstance() { + return inject(); +} + bool Chat::load() { pugi::xml_document doc; - auto coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + auto coreFolder = g_configManager().getString(CORE_DIRECTORY); auto folder = coreFolder + "/chatchannels/chatchannels.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { @@ -278,8 +355,8 @@ bool Chat::load() { return false; } - for (auto channelNode : doc.child("channels").children()) { - uint16_t channelId = pugi::cast(channelNode.attribute("id").value()); + for (const auto &channelNode : doc.child("channels").children()) { + auto channelId = pugi::cast(channelNode.attribute("id").value()); std::string channelName = channelNode.attribute("name").as_string(); bool isPublic = channelNode.attribute("public").as_bool(); pugi::xml_attribute scriptAttribute = channelNode.attribute("script"); @@ -302,8 +379,12 @@ bool Chat::load() { } UsersMap tempUserMap = std::move(channel->users); - for (const auto &pair : tempUserMap) { - channel->addUser(pair.second); + for (const auto &[playerUserId, playerUser] : tempUserMap) { + if (playerUserId == 0) { + continue; + } + + channel->addUser(playerUser); } continue; } @@ -334,19 +415,23 @@ std::shared_ptr Chat::createChannel(const std::shared_ptr & switch (channelId) { case CHANNEL_GUILD: { - const auto guild = player->getGuild(); + const auto &guild = player->getGuild(); if (guild != nullptr) { - auto ret = guildChannels.emplace(std::make_pair(guild->getId(), std::make_shared(channelId, guild->getName()))); - return ret.first->second; + auto [iter, inserted] = guildChannels.try_emplace(guild->getId(), std::make_shared(channelId, guild->getName())); + if (inserted) { + return iter->second; + } } break; } case CHANNEL_PARTY: { - auto party = player->getParty(); + const auto &party = player->getParty(); if (party != nullptr) { - auto ret = partyChannels.emplace(std::make_pair(party, std::make_shared(channelId, "Party"))); - return ret.first->second; + auto [iter, inserted] = partyChannels.try_emplace(party, std::make_shared(channelId, "Party")); + if (inserted) { + return iter->second; + } } break; } @@ -359,9 +444,9 @@ std::shared_ptr Chat::createChannel(const std::shared_ptr & // find a free private channel slot for (uint16_t i = 100; i < 10000; ++i) { - auto ret = privateChannels.emplace(std::make_pair(i, std::make_shared(i, player->getName() + "'s Channel"))); - if (ret.second) { // second is a bool that indicates that a new channel has been placed in the map - const auto &newChannel = (*ret.first).second; + auto [iter, inserted] = privateChannels.try_emplace(i, std::make_shared(i, player->getName() + "'s Channel")); + if (inserted) { + const auto &newChannel = iter->second; newChannel->setOwner(player->getGUID()); return newChannel; } @@ -378,7 +463,7 @@ std::shared_ptr Chat::createChannel(const std::shared_ptr & bool Chat::deleteChannel(const std::shared_ptr &player, uint16_t channelId) { switch (channelId) { case CHANNEL_GUILD: { - const auto guild = player->getGuild(); + const auto &guild = player->getGuild(); if (guild == nullptr) { return false; } @@ -393,7 +478,7 @@ bool Chat::deleteChannel(const std::shared_ptr &player, uint16_t channel } case CHANNEL_PARTY: { - auto party = player->getParty(); + const auto &party = player->getParty(); if (party == nullptr) { return false; } @@ -443,16 +528,28 @@ bool Chat::removeUserFromChannel(const std::shared_ptr &player, uint16_t } void Chat::removeUserFromAllChannels(const std::shared_ptr &player) { - for (auto &it : normalChannels) { - it.second->removeUser(player); + for (const auto &[playerUserId, playerUser] : normalChannels) { + if (playerUserId == 0) { + continue; + } + + playerUser->removeUser(player); } - for (auto &it : partyChannels) { - it.second->removeUser(player); + for (const auto &[playerUserId, playerUser] : partyChannels) { + if (playerUserId == 0) { + continue; + } + + playerUser->removeUser(player); } - for (auto &it : guildChannels) { - it.second->removeUser(player); + for (const auto &[playerUserId, playerUser] : guildChannels) { + if (playerUserId == 0) { + continue; + } + + playerUser->removeUser(player); } auto it = privateChannels.begin(); @@ -476,7 +573,7 @@ bool Chat::talkToChannel(const std::shared_ptr &player, SpeakClasses typ } if (channelId == CHANNEL_GUILD) { - GuildRank_ptr rank = player->getGuildRank(); + const auto &rank = player->getGuildRank(); if (rank && rank->level > 1) { type = TALKTYPE_CHANNEL_O; } else if (type != TALKTYPE_CHANNEL_Y) { @@ -498,11 +595,11 @@ ChannelList Chat::getChannelList(const std::shared_ptr &player) { if (player->getGuild()) { auto channel = getChannel(player, CHANNEL_GUILD); if (channel) { - list.push_back(channel); + list.emplace_back(channel); } else { channel = createChannel(player, CHANNEL_GUILD); if (channel) { - list.push_back(channel); + list.emplace_back(channel); } } } @@ -510,28 +607,36 @@ ChannelList Chat::getChannelList(const std::shared_ptr &player) { if (player->getParty()) { auto channel = getChannel(player, CHANNEL_PARTY); if (channel) { - list.push_back(channel); + list.emplace_back(channel); } else { channel = createChannel(player, CHANNEL_PARTY); if (channel) { - list.push_back(channel); + list.emplace_back(channel); } } } - for (const auto &it : normalChannels) { - const auto &channel = getChannel(player, it.first); + for (const auto &[playerUserId, playerUser] : normalChannels) { + if (playerUserId == 0) { + continue; + } + + const auto &channel = getChannel(player, playerUserId); if (channel) { - list.push_back(channel); + list.emplace_back(channel); } } bool hasPrivate = false; - for (auto &it : privateChannels) { - if (const auto &channel = it.second) { - uint32_t guid = player->getGUID(); + for (const auto &[playerUserId, playerUser] : privateChannels) { + if (playerUserId == 0) { + continue; + } + + if (const auto &channel = playerUser) { + const uint32_t guid = player->getGUID(); if (channel->isInvited(guid)) { - list.push_back(channel); + list.emplace_back(channel); } if (channel->getOwner() == guid) { @@ -541,7 +646,7 @@ ChannelList Chat::getChannelList(const std::shared_ptr &player) { } if (!hasPrivate && player->isPremium()) { - list.push_front(dummyPrivate); + list.emplace_back(dummyPrivate); } return list; } @@ -549,7 +654,7 @@ ChannelList Chat::getChannelList(const std::shared_ptr &player) { std::shared_ptr Chat::getChannel(const std::shared_ptr &player, uint16_t channelId) { switch (channelId) { case CHANNEL_GUILD: { - const auto guild = player->getGuild(); + const auto &guild = player->getGuild(); if (guild != nullptr) { auto it = guildChannels.find(guild->getId()); if (it != guildChannels.end()) { @@ -560,7 +665,7 @@ std::shared_ptr Chat::getChannel(const std::shared_ptr &pla } case CHANNEL_PARTY: { - auto party = player->getParty(); + const auto &party = player->getParty(); if (party != nullptr) { auto it = partyChannels.find(party); if (it != partyChannels.end()) { @@ -580,9 +685,9 @@ std::shared_ptr Chat::getChannel(const std::shared_ptr &pla return channel; } - auto it2 = privateChannels.find(channelId); - if (it2 != privateChannels.end() && it2->second->isInvited(player->getGUID())) { - return it2->second; + auto privateIt = privateChannels.find(channelId); + if (privateIt != privateChannels.end() && privateIt->second->isInvited(player->getGUID())) { + return privateIt->second; } break; } @@ -606,11 +711,18 @@ std::shared_ptr Chat::getChannelById(uint16_t channelId) { return it->second; } -std::shared_ptr Chat::getPrivateChannel(const std::shared_ptr &player) { - for (auto &it : privateChannels) { - if (it.second->getOwner() == player->getGUID()) { - return it.second; - } +std::shared_ptr Chat::getPrivateChannel(const std::shared_ptr &player) const { + auto it = std::ranges::find_if(privateChannels, [&player](const auto &channelPair) { + const auto &[channelId, channel] = channelPair; + return channel->getOwner() == player->getGUID(); + }); + + if (it != privateChannels.end()) { + return it->second; } return nullptr; } + +LuaScriptInterface* Chat::getScriptInterface() { + return &scriptInterface; +} diff --git a/src/creatures/interactions/chat.hpp b/src/creatures/interactions/chat.hpp index 364308618..9dd347aa5 100644 --- a/src/creatures/interactions/chat.hpp +++ b/src/creatures/interactions/chat.hpp @@ -9,10 +9,10 @@ #pragma once -#include "utils/utils_definitions.hpp" -#include "lib/di/container.hpp" #include "lua/scripts/luascript.hpp" +enum SpeakClasses : uint8_t; + class Party; class Player; @@ -22,44 +22,30 @@ using InvitedMap = std::map>; class ChatChannel { public: ChatChannel() = default; - ChatChannel(uint16_t channelId, std::string channelName) : - name(std::move(channelName)), - id(channelId) { } + ChatChannel(uint16_t channelId, std::string channelName); virtual ~ChatChannel() = default; bool addUser(const std::shared_ptr &player); bool removeUser(const std::shared_ptr &player); - bool hasUser(const std::shared_ptr &player); + bool hasUser(const std::shared_ptr &player) const; - bool talk(const std::shared_ptr &fromPlayer, SpeakClasses type, const std::string &text); + bool talk(const std::shared_ptr &fromPlayer, SpeakClasses type, const std::string &text) const; void sendToAll(const std::string &message, SpeakClasses type) const; - const std::string &getName() const { - return name; - } - uint16_t getId() const { - return id; - } - const UsersMap &getUsers() const { - return users; - } - virtual const InvitedMap* getInvitedUsers() const { - return nullptr; - } - - virtual uint32_t getOwner() const { - return 0; - } - - bool isPublicChannel() const { - return publicChannel; - } - - bool executeOnJoinEvent(const std::shared_ptr &player); - bool executeCanJoinEvent(const std::shared_ptr &player); - bool executeOnLeaveEvent(const std::shared_ptr &player); - bool executeOnSpeakEvent(const std::shared_ptr &player, SpeakClasses &type, const std::string &message); + const std::string &getName() const; + uint16_t getId() const; + const UsersMap &getUsers() const; + virtual const InvitedMap* getInvitedUsers() const; + + virtual uint32_t getOwner() const; + + bool isPublicChannel() const; + + bool executeOnJoinEvent(const std::shared_ptr &player) const; + bool executeCanJoinEvent(const std::shared_ptr &player) const; + bool executeOnLeaveEvent(const std::shared_ptr &player) const; + bool executeOnSpeakEvent(const std::shared_ptr &player, SpeakClasses &type, const std::string &message) const; protected: UsersMap users; @@ -79,15 +65,10 @@ class ChatChannel { class PrivateChatChannel final : public ChatChannel { public: - PrivateChatChannel(uint16_t channelId, [[maybe_unused]] std::string channelName) : - ChatChannel(channelId, std::move(channelName)) { } + PrivateChatChannel(uint16_t channelId, [[maybe_unused]] std::string channelName); - uint32_t getOwner() const override { - return owner; - } - void setOwner(uint32_t newOwner) { - this->owner = newOwner; - } + uint32_t getOwner() const override; + void setOwner(uint32_t newOwner); bool isInvited(uint32_t guid) const; @@ -98,9 +79,7 @@ class PrivateChatChannel final : public ChatChannel { void closeChannel() const; - [[nodiscard]] const InvitedMap* getInvitedUsers() const override { - return &invites; - } + [[nodiscard]] const InvitedMap* getInvitedUsers() const override; private: InvitedMap invites; @@ -117,9 +96,7 @@ class Chat { Chat(const Chat &) = delete; Chat &operator=(const Chat &) = delete; - static Chat &getInstance() { - return inject(); - } + static Chat &getInstance(); bool load(); @@ -137,11 +114,9 @@ class Chat { std::shared_ptr getChannel(const std::shared_ptr &player, uint16_t channelId); std::shared_ptr getChannelById(uint16_t channelId); std::shared_ptr getGuildChannelById(uint32_t guildId); - std::shared_ptr getPrivateChannel(const std::shared_ptr &player); + std::shared_ptr getPrivateChannel(const std::shared_ptr &player) const; - LuaScriptInterface* getScriptInterface() { - return &scriptInterface; - } + LuaScriptInterface* getScriptInterface(); private: std::map> normalChannels; diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp index 3ae73f8dc..2e9140dcc 100644 --- a/src/creatures/monsters/monster.cpp +++ b/src/creatures/monsters/monster.cpp @@ -7,13 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/monsters/monster.hpp" + +#include "config/configmanager.hpp" #include "creatures/combat/spells.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/players/player.hpp" #include "creatures/players/wheel/player_wheel.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" +#include "items/tile.hpp" #include "lua/callbacks/event_callback.hpp" #include "lua/callbacks/events_callbacks.hpp" #include "map/spectators.hpp" @@ -24,15 +27,14 @@ int32_t Monster::despawnRadius; uint32_t Monster::monsterAutoID = 0x50000001; std::shared_ptr Monster::createMonster(const std::string &name) { - const auto mType = g_monsters().getMonsterType(name); + const auto &mType = g_monsters().getMonsterType(name); if (!mType) { return nullptr; } return std::make_shared(mType); } -Monster::Monster(const std::shared_ptr mType) : - Creature(), +Monster::Monster(const std::shared_ptr &mType) : nameDescription(asLowerCaseString(mType->nameDescription)), mType(mType) { defaultOutfit = mType->info.outfit; @@ -56,6 +58,20 @@ Monster::Monster(const std::shared_ptr mType) : } } +std::shared_ptr Monster::getMonster() { + return static_self_cast(); +} + +std::shared_ptr Monster::getMonster() const { + return static_self_cast(); +} + +void Monster::setID() { + if (id == 0) { + id = monsterAutoID++; + } +} + void Monster::addList() { g_game().addMonster(static_self_cast()); } @@ -88,6 +104,12 @@ void Monster::setName(const std::string &name) { } } +// Real monster name, set on monster creation "createMonsterType(typeName)" + +const std::string &Monster::getTypeName() const { + return mType->typeName; +} + const std::string &Monster::getNameDescription() const { if (nameDescription.empty()) { return mType->nameDescription; @@ -95,6 +117,26 @@ const std::string &Monster::getNameDescription() const { return nameDescription; } +void Monster::setNameDescription(std::string_view newNameDescription) { + this->nameDescription = newNameDescription; +} + +std::string Monster::getDescription(int32_t) { + return nameDescription + '.'; +} + +CreatureType_t Monster::getType() const { + return CREATURETYPE_MONSTER; +} + +const Position &Monster::getMasterPos() const { + return masterPos; +} + +void Monster::setMasterPos(Position pos) { + masterPos = pos; +} + bool Monster::canWalkOnFieldType(CombatType_t combatType) const { switch (combatType) { case COMBAT_ENERGYDAMAGE: @@ -108,15 +150,120 @@ bool Monster::canWalkOnFieldType(CombatType_t combatType) const { } } -int32_t Monster::getReflectPercent(CombatType_t reflectType, bool useCharges) const { - int32_t result = Creature::getReflectPercent(reflectType, useCharges); +double_t Monster::getReflectPercent(CombatType_t reflectType, bool useCharges) const { + // Monster type reflect + auto result = Creature::getReflectPercent(reflectType, useCharges); + if (result != 0) { + g_logger().debug("[{}] before mtype reflect element {}, percent {}", __FUNCTION__, fmt::underlying(reflectType), result); + } auto it = mType->info.reflectMap.find(reflectType); if (it != mType->info.reflectMap.end()) { result += it->second; } + + if (result != 0) { + g_logger().debug("[{}] after mtype reflect element {}, percent {}", __FUNCTION__, fmt::underlying(reflectType), result); + } + + // Monster reflect + auto monsterReflectIt = m_reflectElementMap.find(reflectType); + if (monsterReflectIt != m_reflectElementMap.end()) { + result += monsterReflectIt->second; + } + + if (result != 0) { + g_logger().debug("[{}] (final) after monster reflect element {}, percent {}", __FUNCTION__, fmt::underlying(reflectType), result); + } + return result; } +void Monster::addReflectElement(CombatType_t combatType, int32_t percent) { + g_logger().debug("[{}] added reflect element {}, percent {}", __FUNCTION__, fmt::underlying(combatType), percent); + m_reflectElementMap[combatType] += percent; +} + +int32_t Monster::getDefense() const { + auto mtypeDefense = mType->info.defense; + if (mtypeDefense != 0) { + g_logger().trace("[{}] old defense {}", __FUNCTION__, mtypeDefense); + } + mtypeDefense += m_defense; + if (mtypeDefense != 0) { + g_logger().trace("[{}] new defense {}", __FUNCTION__, mtypeDefense); + } + return mtypeDefense * getDefenseMultiplier(); +} + +void Monster::addDefense(int32_t defense) { + g_logger().trace("[{}] adding defense {}", __FUNCTION__, defense); + m_defense += defense; + g_logger().trace("[{}] new defense {}", __FUNCTION__, m_defense); +} + +Faction_t Monster::getFaction() const { + if (const auto &master = getMaster()) { + return master->getFaction(); + } + return mType->info.faction; +} + +bool Monster::isEnemyFaction(Faction_t faction) const { + const auto &master = getMaster(); + if (master && master->getMonster()) { + return master->getMonster()->isEnemyFaction(faction); + } + return mType->info.enemyFactions.empty() ? false : mType->info.enemyFactions.contains(faction); +} + +bool Monster::isPushable() { + return mType->info.pushable && baseSpeed != 0; +} + +bool Monster::isAttackable() const { + return mType->info.isAttackable; +} + +bool Monster::canPushItems() const { + return mType->info.canPushItems; +} + +bool Monster::canPushCreatures() const { + return mType->info.canPushCreatures; +} + +bool Monster::isRewardBoss() const { + return mType->info.isRewardBoss; +} + +bool Monster::isHostile() const { + return mType->info.isHostile; +} + +bool Monster::isFamiliar() const { + return mType->info.isFamiliar; +} + +bool Monster::canSeeInvisibility() const { + return isImmune(CONDITION_INVISIBLE); +} + +uint16_t Monster::critChance() const { + return mType->info.critChance; +} + +uint32_t Monster::getManaCost() const { + return mType->info.manaCost; +} + +RespawnType Monster::getRespawnType() const { + return mType->info.respawnType; +} + +void Monster::setSpawnMonster(const std::shared_ptr &newSpawnMonster) { + this->spawnMonster = newSpawnMonster; +} + uint32_t Monster::getHealingCombatValue(CombatType_t healingType) const { auto it = mType->info.healingMap.find(healingType); if (it != mType->info.healingMap.end()) { @@ -130,20 +277,20 @@ void Monster::onAttackedCreatureDisappear(bool) { extraMeleeAttack = true; } -void Monster::onCreatureAppear(std::shared_ptr creature, bool isLogin) { +void Monster::onCreatureAppear(const std::shared_ptr &creature, bool isLogin) { Creature::onCreatureAppear(creature, isLogin); if (mType->info.creatureAppearEvent != -1) { // onCreatureAppear(self, creature) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Monster::onCreatureAppear - Monster {} creature {}] " "Call stack overflow. Too many lua script calls being nested.", getName(), creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(mType->info.creatureAppearEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -164,24 +311,26 @@ void Monster::onCreatureAppear(std::shared_ptr creature, bool isLogin) updateTargetList(); updateIdleStatus(); } else { - onCreatureEnter(creature); + addAsyncTask([this, creature] { + onCreatureEnter(creature); + }); } } -void Monster::onRemoveCreature(std::shared_ptr creature, bool isLogout) { +void Monster::onRemoveCreature(const std::shared_ptr &creature, bool isLogout) { Creature::onRemoveCreature(creature, isLogout); if (mType->info.creatureDisappearEvent != -1) { // onCreatureDisappear(self, creature) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Monster::onCreatureDisappear - Monster {} creature {}] " "Call stack overflow. Too many lua script calls being nested.", getName(), creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(mType->info.creatureDisappearEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -215,14 +364,14 @@ void Monster::onCreatureMove(const std::shared_ptr &creature, const st if (mType->info.creatureMoveEvent != -1) { // onCreatureMove(self, creature, oldPosition, newPosition) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Monster::onCreatureMove - Monster {} creature {}] " "Call stack overflow. Too many lua script calls being nested.", getName(), creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(mType->info.creatureMoveEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -246,57 +395,79 @@ void Monster::onCreatureMove(const std::shared_ptr &creature, const st updateTargetList(); updateIdleStatus(); } else { - bool canSeeNewPos = canSee(newPos); - bool canSeeOldPos = canSee(oldPos); + auto action = [this, newPos, oldPos, creature] { + bool canSeeNewPos = canSee(newPos); + bool canSeeOldPos = canSee(oldPos); - if (canSeeNewPos && !canSeeOldPos) { - onCreatureEnter(creature); - } else if (!canSeeNewPos && canSeeOldPos) { - onCreatureLeave(creature); - } + if (canSeeNewPos && !canSeeOldPos) { + onCreatureEnter(creature); + } else if (!canSeeNewPos && canSeeOldPos) { + onCreatureLeave(creature); + } - updateIdleStatus(); + updateIdleStatus(); - if (!isSummon()) { - if (const auto &followCreature = getFollowCreature()) { - const Position &followPosition = followCreature->getPosition(); - const Position &pos = getPosition(); - - int32_t offset_x = Position::getDistanceX(followPosition, pos); - int32_t offset_y = Position::getDistanceY(followPosition, pos); - if ((offset_x > 1 || offset_y > 1) && mType->info.changeTargetChance > 0) { - Direction dir = getDirectionTo(pos, followPosition); - const auto &checkPosition = getNextPosition(dir, pos); - - if (const auto &nextTile = g_game().map.getTile(checkPosition)) { - const auto &topCreature = nextTile->getTopCreature(); - if (followCreature != topCreature && isOpponent(topCreature)) { - selectTarget(topCreature); + if (!isSummon()) { + if (const auto &followCreature = getFollowCreature()) { + const Position &followPosition = followCreature->getPosition(); + const Position &pos = getPosition(); + + int32_t offset_x = Position::getDistanceX(followPosition, pos); + int32_t offset_y = Position::getDistanceY(followPosition, pos); + if ((offset_x > 1 || offset_y > 1) && mType->info.changeTargetChance > 0) { + Direction dir = getDirectionTo(pos, followPosition); + const auto &checkPosition = getNextPosition(dir, pos); + + if (const auto &nextTile = g_game().map.getTile(checkPosition)) { + const auto &topCreature = nextTile->getTopCreature(); + if (followCreature != topCreature && isOpponent(topCreature)) { + g_dispatcher().addEvent([selfWeak = std::weak_ptr(getMonster()), topCreatureWeak = std::weak_ptr(topCreature)] { + const auto &self = selfWeak.lock(); + const auto &topCreature = topCreatureWeak.lock(); + if (self && topCreature) { + self->selectTarget(topCreature); + } + }, + "Monster::onCreatureMove"); + } } } + } else if (isOpponent(creature)) { + // we have no target lets try pick this one + g_dispatcher().addEvent([selfWeak = std::weak_ptr(getMonster()), creatureWeak = std::weak_ptr(creature)] { + const auto &self = selfWeak.lock(); + const auto &creaturePtr = creatureWeak.lock(); + if (self && creaturePtr) { + self->selectTarget(creaturePtr); + } + }, + "Monster::onCreatureMove"); } - } else if (isOpponent(creature)) { - // we have no target lets try pick this one - selectTarget(creature); } + }; + + if (g_dispatcher().context().getGroup() == TaskGroup::Walk) { + addAsyncTask(std::move(action)); + } else { + action(); } } } -void Monster::onCreatureSay(std::shared_ptr creature, SpeakClasses type, const std::string &text) { +void Monster::onCreatureSay(const std::shared_ptr &creature, SpeakClasses type, const std::string &text) { Creature::onCreatureSay(creature, type, text); if (mType->info.creatureSayEvent != -1) { // onCreatureSay(self, creature, type, message) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("Monster {} creature {}] Call stack overflow. Too many lua " "script calls being nested.", getName(), creature->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(mType->info.creatureSayEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -315,6 +486,57 @@ void Monster::onCreatureSay(std::shared_ptr creature, SpeakClasses typ } } +void Monster::onAttackedByPlayer(const std::shared_ptr &attackerPlayer) { + if (mType->info.monsterAttackedByPlayerEvent != -1) { + // onPlayerAttack(self, attackerPlayer) + LuaScriptInterface* scriptInterface = mType->info.scriptInterface; + if (!scriptInterface->reserveScriptEnv()) { + g_logger().error("Monster {} creature {}] Call stack overflow. Too many lua " + "script calls being nested.", + getName(), this->getName()); + return; + } + + ScriptEnvironment* env = scriptInterface->getScriptEnv(); + env->setScriptId(mType->info.monsterAttackedByPlayerEvent, scriptInterface); + + lua_State* L = scriptInterface->getLuaState(); + scriptInterface->pushFunction(mType->info.monsterAttackedByPlayerEvent); + + LuaScriptInterface::pushUserdata(L, getMonster()); + LuaScriptInterface::setMetatable(L, -1, "Monster"); + + LuaScriptInterface::pushUserdata(L, attackerPlayer); + LuaScriptInterface::setMetatable(L, -1, "Player"); + + scriptInterface->callVoidFunction(2); + } +} + +void Monster::onSpawn() { + if (mType->info.spawnEvent != -1) { + // onSpawn(self) + LuaScriptInterface* scriptInterface = mType->info.scriptInterface; + if (!scriptInterface->reserveScriptEnv()) { + g_logger().error("Monster {} creature {}] Call stack overflow. Too many lua " + "script calls being nested.", + getName(), this->getName()); + return; + } + + ScriptEnvironment* env = scriptInterface->getScriptEnv(); + env->setScriptId(mType->info.spawnEvent, scriptInterface); + + lua_State* L = scriptInterface->getLuaState(); + scriptInterface->pushFunction(mType->info.spawnEvent); + + LuaScriptInterface::pushUserdata(L, getMonster()); + LuaScriptInterface::setMetatable(L, -1, "Monster"); + + scriptInterface->callVoidFunction(1); + } +} + void Monster::addFriend(const std::shared_ptr &creature) { if (creature == getMonster()) { g_logger().error("[{}]: adding creature is same of monster", __FUNCTION__); @@ -340,7 +562,7 @@ bool Monster::addTarget(const std::shared_ptr &creature, bool pushFron assert(creature != getMonster()); - const auto &it = getTargetIterator(creature); + auto it = getTargetIterator(creature); if (it != targetList.end()) { return false; } @@ -351,7 +573,8 @@ bool Monster::addTarget(const std::shared_ptr &creature, bool pushFron targetList.emplace_back(creature); } - if (!getMaster() && getFaction() != FACTION_DEFAULT && creature->getPlayer()) { + const auto &master = getMaster(); + if (!master && getFaction() != FACTION_DEFAULT && creature->getPlayer()) { totalPlayersOnScreen++; } @@ -363,12 +586,13 @@ bool Monster::removeTarget(const std::shared_ptr &creature) { return false; } - const auto &it = getTargetIterator(creature); + auto it = getTargetIterator(creature); if (it == targetList.end()) { return false; } - if (!getMaster() && getFaction() != FACTION_DEFAULT && creature->getPlayer()) { + const auto &master = getMaster(); + if (!master && getFaction() != FACTION_DEFAULT && creature->getPlayer()) { totalPlayersOnScreen--; } @@ -378,6 +602,11 @@ bool Monster::removeTarget(const std::shared_ptr &creature) { } void Monster::updateTargetList() { + if (g_dispatcher().context().getGroup() == TaskGroup::Walk) { + setAsyncTaskFlag(UpdateTargetList, true); + return; + } + std::erase_if(friendList, [this](const auto &it) { const auto &target = it.second.lock(); return !target || target->getHealth() <= 0 || !canSee(target->getPosition()); @@ -388,7 +617,7 @@ void Monster::updateTargetList() { return !target || target->getHealth() <= 0 || !canSee(target->getPosition()); }); - for (const auto &spectator : Spectators().find(position, true)) { + for (const auto &spectator : Spectators().find(position, true, 0, 0, 0, 0, false)) { if (spectator.get() != this && canSee(spectator->getPosition())) { onCreatureFound(spectator); } @@ -403,7 +632,7 @@ void Monster::clearFriendList() { friendList.clear(); } -void Monster::onCreatureFound(std::shared_ptr creature, bool pushFront /* = false*/) { +void Monster::onCreatureFound(const std::shared_ptr &creature, bool pushFront /* = false*/) { if (isFriend(creature)) { addFriend(creature); } @@ -415,15 +644,15 @@ void Monster::onCreatureFound(std::shared_ptr creature, bool pushFront updateIdleStatus(); } -void Monster::onCreatureEnter(std::shared_ptr creature) { - onCreatureFound(std::move(creature), true); +void Monster::onCreatureEnter(const std::shared_ptr &creature) { + onCreatureFound(creature, true); } bool Monster::isFriend(const std::shared_ptr &creature) const { - if (isSummon() && getMaster()->getPlayer()) { - const auto &masterPlayer = getMaster()->getPlayer(); + const auto &master = getMaster(); + const auto &masterPlayer = master ? master->getPlayer() : nullptr; + if (isSummon() && masterPlayer) { auto tmpPlayer = creature->getPlayer(); - if (!tmpPlayer) { const auto &creatureMaster = creature->getMaster(); if (creatureMaster && creatureMaster->getPlayer()) { @@ -431,7 +660,7 @@ bool Monster::isFriend(const std::shared_ptr &creature) const { } } - if (tmpPlayer && (tmpPlayer == getMaster() || masterPlayer->isPartner(tmpPlayer))) { + if (tmpPlayer && (tmpPlayer == master || masterPlayer->isPartner(tmpPlayer))) { return true; } } @@ -444,8 +673,10 @@ bool Monster::isOpponent(const std::shared_ptr &creature) const { return false; } - if (isSummon() && getMaster()->getPlayer()) { - return creature != getMaster(); + const auto &master = getMaster(); + const auto &masterPlayer = master ? master->getPlayer() : nullptr; + if (isSummon() && masterPlayer) { + return creature != master; } if (creature->getPlayer() && creature->getPlayer()->hasFlag(PlayerFlags_t::IgnoredByMonsters)) { @@ -456,14 +687,24 @@ bool Monster::isOpponent(const std::shared_ptr &creature) const { return isEnemyFaction(creature->getFaction()) || creature->getFaction() == FACTION_PLAYER; } - if ((creature->getPlayer()) || (creature->getMaster() && creature->getMaster()->getPlayer())) { + const auto &creatureMaster = creature->getMaster(); + const auto &creaturePlayer = creatureMaster ? creatureMaster->getPlayer() : nullptr; + if (creature->getPlayer() || creaturePlayer) { return true; } return false; } -void Monster::onCreatureLeave(std::shared_ptr creature) { +uint64_t Monster::getLostExperience() const { + return skillLoss ? mType->info.experience : 0; +} + +uint16_t Monster::getLookCorpse() const { + return mType->info.lookcorpse; +} + +void Monster::onCreatureLeave(const std::shared_ptr &creature) { // update friendList if (isFriend(creature)) { removeFriend(creature); @@ -506,7 +747,7 @@ bool Monster::searchTarget(TargetSearchType_t searchType /*= TARGETSEARCH_DEFAUL const auto &creature = cref.lock(); if (creature && isTarget(creature)) { if ((static_self_cast()->targetDistance == 1) || canUseAttack(myPos, creature)) { - resultList.push_back(creature); + resultList.emplace_back(creature); } } } @@ -628,15 +869,23 @@ void Monster::onFollowCreatureComplete(const std::shared_ptr &creature } } +RaceType_t Monster::getRace() const { + return mType->info.race; +} + float Monster::getMitigation() const { float mitigation = mType->info.mitigation * getDefenseMultiplier(); - if (g_configManager().getBoolean(DISABLE_MONSTER_ARMOR, __FUNCTION__)) { + if (g_configManager().getBoolean(DISABLE_MONSTER_ARMOR)) { mitigation += std::ceil(static_cast(getDefense() + getArmor()) / 100.f) * getDefenseMultiplier() * 2.f; } return std::min(mitigation, 30.f); } -BlockType_t Monster::blockHit(std::shared_ptr attacker, CombatType_t combatType, int32_t &damage, bool checkDefense /* = false*/, bool checkArmor /* = false*/, bool /* field = false */) { +int32_t Monster::getArmor() const { + return mType->info.armor * getDefenseMultiplier(); +} + +BlockType_t Monster::blockHit(const std::shared_ptr &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense /* = false*/, bool checkArmor /* = false*/, bool /* field = false */) { BlockType_t blockType = Creature::blockHit(attacker, combatType, damage, checkDefense, checkArmor); if (damage != 0) { @@ -647,7 +896,7 @@ BlockType_t Monster::blockHit(std::shared_ptr attacker, CombatType_t c } // Wheel of destiny - std::shared_ptr player = attacker ? attacker->getPlayer() : nullptr; + const auto &player = attacker ? attacker->getPlayer() : nullptr; if (player && player->wheel()->getInstant("Ballistic Mastery")) { elementMod -= player->wheel()->checkElementSensitiveReduction(combatType); } @@ -664,7 +913,7 @@ BlockType_t Monster::blockHit(std::shared_ptr attacker, CombatType_t c return blockType; } -bool Monster::isTarget(std::shared_ptr creature) { +bool Monster::isTarget(const std::shared_ptr &creature) { if (creature->isRemoved() || !creature->isAttackable() || creature->getZoneType() == ZONE_PROTECTION || !canSeeCreature(creature)) { return false; } @@ -686,12 +935,16 @@ bool Monster::isTarget(std::shared_ptr creature) { return true; } +bool Monster::isFleeing() const { + return !isSummon() && getHealth() <= runAwayHealth && challengeFocusDuration <= 0 && challengeMeleeDuration <= 0; +} + bool Monster::selectTarget(const std::shared_ptr &creature) { if (!isTarget(creature)) { return false; } - const auto &it = getTargetIterator(creature); + auto it = getTargetIterator(creature); if (it == targetList.end()) { // Target not found in our target list. return false; @@ -699,7 +952,7 @@ bool Monster::selectTarget(const std::shared_ptr &creature) { if (isHostile() || isSummon()) { if (setAttackedCreature(creature)) { - g_dispatcher().addEvent([creatureId = getID()] { g_game().checkCreatureAttack(creatureId); }, "Game::checkCreatureAttack"); + g_dispatcher().addEvent([creatureId = getID()] { g_game().checkCreatureAttack(creatureId); }, __FUNCTION__); } } return setFollowCreature(creature); @@ -713,7 +966,8 @@ void Monster::setIdle(bool idle) { isIdle = idle; if (!isIdle) { - g_game().addCreatureCheck(static_self_cast()); + g_game().addCreatureCheck(getMonster()); + } else { onIdleStatus(); clearTargetList(); @@ -723,6 +977,11 @@ void Monster::setIdle(bool idle) { } void Monster::updateIdleStatus() { + if (g_dispatcher().context().getGroup() == TaskGroup::Walk) { + setAsyncTaskFlag(UpdateIdleStatus, true); + return; + } + bool idle = false; if (conditions.empty()) { if (!isSummon() && targetList.empty()) { @@ -741,6 +1000,10 @@ void Monster::updateIdleStatus() { setIdle(idle); } +bool Monster::getIdleStatus() const { + return isIdle; +} + bool Monster::isInSpawnLocation() const { if (!spawnMonster) { return true; @@ -752,7 +1015,7 @@ void Monster::onAddCondition(ConditionType_t type) { onConditionStatusChange(type); } -void Monster::onConditionStatusChange(const ConditionType_t &type) { +void Monster::onConditionStatusChange(ConditionType_t type) { if (type == CONDITION_FIRE || type == CONDITION_ENERGY || type == CONDITION_POISON) { updateMapCache(); } @@ -769,14 +1032,14 @@ void Monster::onThink(uint32_t interval) { if (mType->info.thinkEvent != -1) { // onThink(self, interval) LuaScriptInterface* scriptInterface = mType->info.scriptInterface; - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("Monster {} Call stack overflow. Too many lua script calls " "being nested.", getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(mType->info.thinkEvent, scriptInterface); lua_State* L = scriptInterface->getLuaState(); @@ -822,17 +1085,18 @@ void Monster::onThink(uint32_t interval) { const auto &attackedCreature = getAttackedCreature(); const auto &followCreature = getFollowCreature(); if (isSummon()) { + const auto &master = getMaster(); if (attackedCreature.get() == this) { setFollowCreature(nullptr); } else if (attackedCreature && followCreature != attackedCreature) { // This happens just after a master orders an attack, so lets follow it aswell. setFollowCreature(attackedCreature); - } else if (getMaster() && getMaster()->getAttackedCreature()) { + } else if (master && master->getAttackedCreature()) { // This happens if the monster is summoned during combat - selectTarget(getMaster()->getAttackedCreature()); - } else if (getMaster() != followCreature) { + selectTarget(master->getAttackedCreature()); + } else if (master && master != followCreature) { // Our master has not ordered us to attack anything, lets follow him around instead. - setFollowCreature(getMaster()); + setFollowCreature(master); } } else if (!targetList.empty()) { const bool attackedCreatureIsDisconnected = attackedCreature && attackedCreature->getPlayer() && attackedCreature->getPlayer()->isDisconnected(); @@ -854,7 +1118,7 @@ void Monster::onThink(uint32_t interval) { } void Monster::doAttacking(uint32_t interval) { - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (!attackedCreature || (isSummon() && attackedCreature.get() == this)) { return; } @@ -910,6 +1174,10 @@ void Monster::doAttacking(uint32_t interval) { } } +bool Monster::hasExtraSwing() { + return extraMeleeAttack; +} + bool Monster::canUseAttack(const Position &pos, const std::shared_ptr &target) const { if (isHostile()) { const Position &targetPos = target->getPosition(); @@ -1028,8 +1296,8 @@ void Monster::onThinkDefense(uint32_t interval) { } if (!isSummon() && m_summons.size() < mType->info.maxSummons && hasFollowPath) { - for (const summonBlock_t &summonBlock : mType->info.summons) { - if (summonBlock.speed > defenseTicks) { + for (const auto &[summonName, summonChance, summonSpeed, summonCount, summonForce] : mType->info.summons) { + if (summonSpeed > defenseTicks) { resetTicks = false; continue; } @@ -1038,29 +1306,29 @@ void Monster::onThinkDefense(uint32_t interval) { continue; } - if (defenseTicks % summonBlock.speed >= interval) { + if (defenseTicks % summonSpeed >= interval) { // already used this spell for this round continue; } - uint32_t summonCount = 0; + uint32_t summonsCount = 0; for (const auto &summon : m_summons) { - if (summon && summon->getName() == summonBlock.name) { - ++summonCount; + if (summon && summon->getName() == summonName) { + ++summonsCount; } } - if (summonCount >= summonBlock.count) { + if (summonsCount >= summonCount) { continue; } - if (summonBlock.chance < static_cast(uniform_random(1, 100))) { + if (summonChance < static_cast(uniform_random(1, 100))) { continue; } - std::shared_ptr summon = Monster::createMonster(summonBlock.name); + const auto &summon = Monster::createMonster(summonName); if (summon) { - if (g_game().placeCreature(summon, getPosition(), false, summonBlock.force)) { + if (g_game().placeCreature(summon, getPosition(), false, summonForce)) { summon->setMaster(static_self_cast(), true); g_game().addMagicEffect(getPosition(), CONST_ME_MAGIC_BLUE); g_game().addMagicEffect(summon->getPosition(), CONST_ME_TELEPORT); @@ -1085,13 +1353,13 @@ void Monster::onThinkYell(uint32_t interval) { yellTicks = 0; if (!mType->info.voiceVector.empty() && (mType->info.yellChance >= static_cast(uniform_random(1, 100)))) { - uint32_t index = uniform_random(0, mType->info.voiceVector.size() - 1); - const voiceBlock_t &vb = mType->info.voiceVector[index]; + const uint32_t index = uniform_random(0, mType->info.voiceVector.size() - 1); + const auto &[text, yellText] = mType->info.voiceVector[index]; - if (vb.yellText) { - g_game().internalCreatureSay(static_self_cast(), TALKTYPE_MONSTER_YELL, vb.text, false); + if (yellText) { + g_game().internalCreatureSay(static_self_cast(), TALKTYPE_MONSTER_YELL, text, false); } else { - g_game().internalCreatureSay(static_self_cast(), TALKTYPE_MONSTER_SAY, vb.text, false); + g_game().internalCreatureSay(static_self_cast(), TALKTYPE_MONSTER_SAY, text, false); } } } @@ -1113,7 +1381,7 @@ void Monster::onThinkSound(uint32_t interval) { } } -bool Monster::pushItem(std::shared_ptr item, const Direction &nextDirection) { +bool Monster::pushItem(const std::shared_ptr &item, const Direction &nextDirection) { const Position ¢erPos = item->getPosition(); for (const auto &[x, y] : getPushItemLocationOptions(nextDirection)) { Position tryPos(centerPos.x + x, centerPos.y + y, centerPos.z); @@ -1125,11 +1393,11 @@ bool Monster::pushItem(std::shared_ptr item, const Direction &nextDirectio return false; } -void Monster::pushItems(std::shared_ptr tile, const Direction &nextDirection) { +void Monster::pushItems(const std::shared_ptr &tile, const Direction &nextDirection) { // We can not use iterators here since we can push the item to another tile // which will invalidate the iterator. // start from the end to minimize the amount of traffic - if (const auto items = tile->getItemList()) { + if (const auto &items = tile->getItemList()) { uint32_t moveCount = 0; uint32_t removeCount = 0; int32_t downItemSize = tile->getDownItemCount(); @@ -1149,17 +1417,17 @@ void Monster::pushItems(std::shared_ptr tile, const Direction &nextDirecti } } -bool Monster::pushCreature(std::shared_ptr creature) { +bool Monster::pushCreature(const std::shared_ptr &creature) { static std::vector dirList { DIRECTION_NORTH, DIRECTION_WEST, DIRECTION_EAST, DIRECTION_SOUTH }; - std::shuffle(dirList.begin(), dirList.end(), getRandomGenerator()); + std::ranges::shuffle(dirList, getRandomGenerator()); - for (Direction dir : dirList) { + for (const Direction &dir : dirList) { const Position &tryPos = Spells::getCasterPosition(creature, dir); - const auto toTile = g_game().map.getTile(tryPos); + const auto &toTile = g_game().map.getTile(tryPos); if (toTile && !toTile->hasFlag(TILESTATE_BLOCKPATH) && g_game().internalMoveCreature(creature, dir) == RETURNVALUE_NOERROR) { return true; } @@ -1167,15 +1435,15 @@ bool Monster::pushCreature(std::shared_ptr creature) { return false; } -void Monster::pushCreatures(std::shared_ptr tile) { +void Monster::pushCreatures(const std::shared_ptr &tile) { // We can not use iterators here since we can push a creature to another tile // which will invalidate the iterator. - if (CreatureVector* creatures = tile->getCreatures()) { + if (const CreatureVector* creatures = tile->getCreatures()) { uint32_t removeCount = 0; std::shared_ptr lastPushedMonster = nullptr; for (size_t i = 0; i < creatures->size();) { - std::shared_ptr monster = creatures->at(i)->getMonster(); + const auto &monster = creatures->at(i)->getMonster(); if (monster && monster->isPushable()) { if (monster != lastPushedMonster && Monster::pushCreature(monster)) { lastPushedMonster = monster; @@ -1215,14 +1483,20 @@ bool Monster::getNextStep(Direction &nextDirection, uint32_t &flags) { if (result && (canPushItems() || canPushCreatures())) { const Position &pos = getNextPosition(nextDirection, getPosition()); - auto posTile = g_game().map.getTile(pos); + const auto &posTile = g_game().map.getTile(pos); if (posTile) { if (canPushItems()) { Monster::pushItems(posTile, nextDirection); } if (canPushCreatures()) { - Monster::pushCreatures(posTile); + if (g_dispatcher().context().getGroup() == TaskGroup::Walk) { + Monster::pushCreatures(posTile); + } else { + g_dispatcher().addWalkEvent([=] { + Monster::pushCreatures(posTile); + }); + } } } } @@ -1273,8 +1547,8 @@ void Monster::doFollowCreature(uint32_t &flags, Direction &nextDirection, bool & updateMapCache(); } // target dancing - auto attackedCreature = getAttackedCreature(); - auto followCreature = getFollowCreature(); + const auto &attackedCreature = getAttackedCreature(); + const auto &followCreature = getFollowCreature(); if (attackedCreature && attackedCreature == followCreature) { if (isFleeing()) { result = getDanceStep(getPosition(), nextDirection, false, false); @@ -1291,9 +1565,9 @@ bool Monster::getRandomStep(const Position &creaturePos, Direction &moveDirectio DIRECTION_WEST, DIRECTION_EAST, DIRECTION_SOUTH }; - std::shuffle(dirList.begin(), dirList.end(), getRandomGenerator()); + std::ranges::shuffle(dirList, getRandomGenerator()); - for (Direction dir : dirList) { + for (const Direction &dir : dirList) { if (canWalkTo(creaturePos, dir)) { moveDirection = dir; return true; @@ -1303,7 +1577,7 @@ bool Monster::getRandomStep(const Position &creaturePos, Direction &moveDirectio } bool Monster::getDanceStep(const Position &creaturePos, Direction &moveDirection, bool keepAttack /*= true*/, bool keepDistance /*= true*/) { - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (!attackedCreature) { return false; } @@ -1884,6 +2158,71 @@ bool Monster::getDistanceStep(const Position &targetPos, Direction &moveDirectio return true; } +bool Monster::isTargetNearby() const { + return stepDuration >= 1; +} + +bool Monster::isIgnoringFieldDamage() const { + return ignoreFieldDamage; +} + +bool Monster::israndomStepping() const { + return randomStepping; +} + +void Monster::setIgnoreFieldDamage(bool ignore) { + ignoreFieldDamage = ignore; +} + +bool Monster::getIgnoreFieldDamage() const { + return ignoreFieldDamage; +} + +uint16_t Monster::getRaceId() const { + return mType->info.raceid; +} + +// Hazard system +bool Monster::getHazard() const { + return hazard; +} + +void Monster::setHazard(bool value) { + hazard = value; +} + +bool Monster::getHazardSystemCrit() const { + return hazardCrit; +} + +void Monster::setHazardSystemCrit(bool value) { + hazardCrit = value; +} + +bool Monster::getHazardSystemDodge() const { + return hazardDodge; +} + +void Monster::setHazardSystemDodge(bool value) { + hazardDodge = value; +} + +bool Monster::getHazardSystemDamageBoost() const { + return hazardDamageBoost; +} + +void Monster::setHazardSystemDamageBoost(bool value) { + hazardDamageBoost = value; +} + +bool Monster::getHazardSystemDefenseBoost() const { + return hazardDefenseBoost; +} + +void Monster::setHazardSystemDefenseBoost(bool value) { + hazardDefenseBoost = value; +} + bool Monster::canWalkTo(Position pos, Direction moveDirection) { pos = getNextPosition(moveDirection, pos); if (isInSpawnRange(pos)) { @@ -1891,7 +2230,7 @@ bool Monster::canWalkTo(Position pos, Direction moveDirection) { return false; } - const auto tile = g_game().map.getTile(pos); + const auto &tile = g_game().map.getTile(pos); if (tile && tile->getTopVisibleCreature(getMonster()) == nullptr && tile->queryAdd(0, getMonster(), 1, FLAG_PATHFINDING | FLAG_IGNOREFIELDDAMAGE) == RETURNVALUE_NOERROR) { return true; } @@ -1899,7 +2238,7 @@ bool Monster::canWalkTo(Position pos, Direction moveDirection) { return false; } -void Monster::death(std::shared_ptr) { +void Monster::death(const std::shared_ptr &) { if (monsterForgeClassification > ForgeClassifications_t::FORGE_NORMAL_MONSTER) { g_game().removeForgeMonster(getID(), monsterForgeClassification, true); } @@ -1921,16 +2260,18 @@ void Monster::death(std::shared_ptr) { if (mType) { g_game().sendSingleSoundEffect(static_self_cast()->getPosition(), mType->info.deathSound, getMonster()); } + + setDead(true); } -std::shared_ptr Monster::getCorpse(std::shared_ptr lastHitCreature, std::shared_ptr mostDamageCreature) { - std::shared_ptr corpse = Creature::getCorpse(lastHitCreature, mostDamageCreature); +std::shared_ptr Monster::getCorpse(const std::shared_ptr &lastHitCreature, const std::shared_ptr &mostDamageCreature) { + const auto &corpse = Creature::getCorpse(lastHitCreature, mostDamageCreature); if (corpse) { if (mostDamageCreature) { if (mostDamageCreature->getPlayer()) { corpse->setAttribute(ItemAttribute_t::CORPSEOWNER, mostDamageCreature->getID()); } else { - std::shared_ptr mostDamageCreatureMaster = mostDamageCreature->getMaster(); + const auto &mostDamageCreatureMaster = mostDamageCreature->getMaster(); if (mostDamageCreatureMaster && mostDamageCreatureMaster->getPlayer()) { corpse->setAttribute(ItemAttribute_t::CORPSEOWNER, mostDamageCreatureMaster->getID()); } @@ -1976,7 +2317,7 @@ bool Monster::getCombatValues(int32_t &min, int32_t &max) { void Monster::updateLookDirection() { Direction newDir = getDirection(); - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (!attackedCreature) { return; } @@ -2033,23 +2374,23 @@ void Monster::updateLookDirection() { g_game().internalCreatureTurn(getMonster(), newDir); } -void Monster::dropLoot(std::shared_ptr corpse, std::shared_ptr) { +void Monster::dropLoot(const std::shared_ptr &corpse, const std::shared_ptr &) { if (corpse && lootDrop) { // Only fiendish drops sliver if (ForgeClassifications_t classification = getMonsterForgeClassification(); // Condition classification == ForgeClassifications_t::FORGE_FIENDISH_MONSTER) { - auto minSlivers = g_configManager().getNumber(FORGE_MIN_SLIVERS, __FUNCTION__); - auto maxSlivers = g_configManager().getNumber(FORGE_MAX_SLIVERS, __FUNCTION__); + auto minSlivers = g_configManager().getNumber(FORGE_MIN_SLIVERS); + auto maxSlivers = g_configManager().getNumber(FORGE_MAX_SLIVERS); auto sliverCount = static_cast(uniform_random(minSlivers, maxSlivers)); - std::shared_ptr sliver = Item::CreateItem(ITEM_FORGE_SLIVER, sliverCount); + const auto &sliver = Item::CreateItem(ITEM_FORGE_SLIVER, sliverCount); if (g_game().internalAddItem(corpse, sliver) != RETURNVALUE_NOERROR) { corpse->internalAddThing(sliver); } } - if (!this->isRewardBoss() && g_configManager().getNumber(RATE_LOOT, __FUNCTION__) > 0) { + if (!this->isRewardBoss() && g_configManager().getNumber(RATE_LOOT) > 0) { g_callbacks().executeCallback(EventCallback_t::monsterOnDropLoot, &EventCallback::monsterOnDropLoot, getMonster(), corpse); g_callbacks().executeCallback(EventCallback_t::monsterPostDropLoot, &EventCallback::monsterPostDropLoot, getMonster(), corpse); } @@ -2060,7 +2401,7 @@ void Monster::setNormalCreatureLight() { internalLight = mType->info.light; } -void Monster::drainHealth(std::shared_ptr attacker, int32_t damage) { +void Monster::drainHealth(const std::shared_ptr &attacker, int32_t damage) { Creature::drainHealth(attacker, damage); if (damage > 0 && randomStepping) { @@ -2084,7 +2425,7 @@ void Monster::changeHealth(int32_t healthChange, bool sendHealthChange /* = true Creature::changeHealth(healthChange, sendHealthChange); } -bool Monster::challengeCreature(std::shared_ptr creature, int targetChangeCooldown) { +bool Monster::challengeCreature(const std::shared_ptr &creature, int targetChangeCooldown) { if (isSummon()) { return false; } @@ -2094,7 +2435,7 @@ bool Monster::challengeCreature(std::shared_ptr creature, int targetCh challengeFocusDuration = targetChangeCooldown; targetChangeTicks = 0; // Wheel of destiny - std::shared_ptr player = creature ? creature->getPlayer() : nullptr; + const auto &player = creature ? creature->getPlayer() : nullptr; if (player && !player->isRemoved()) { player->wheel()->healIfBattleHealingActive(); } @@ -2121,12 +2462,65 @@ bool Monster::changeTargetDistance(int32_t distance, uint32_t duration /* = 1200 return true; } +bool Monster::isChallenged() const { + return challengeFocusDuration > 0; +} + +std::vector Monster::getIcons() const { + auto creatureIcons = Creature::getIcons(); + if (!creatureIcons.empty()) { + return creatureIcons; + } + + using enum CreatureIconModifications_t; + if (challengeMeleeDuration > 0 && mType->info.targetDistance > targetDistance) { + return { CreatureIcon(TurnedMelee) }; + } else if (varBuffs[BUFF_DAMAGERECEIVED] > 100) { + return { CreatureIcon(HigherDamageReceived) }; + } else if (varBuffs[BUFF_DAMAGEDEALT] < 100) { + return { CreatureIcon(LowerDamageDealt) }; + } + return {}; +} + bool Monster::isImmune(ConditionType_t conditionType) const { - return mType->info.m_conditionImmunities[static_cast(conditionType)]; + return m_isImmune || mType->info.m_conditionImmunities[static_cast(conditionType)]; } bool Monster::isImmune(CombatType_t combatType) const { - return mType->info.m_damageImmunities[combatTypeToIndex(combatType)]; + return m_isImmune || mType->info.m_damageImmunities[combatTypeToIndex(combatType)]; +} + +void Monster::setImmune(bool immune) { + m_isImmune = immune; +} + +bool Monster::isImmune() const { + return m_isImmune; +} + +float Monster::getAttackMultiplier() const { + float multiplier = mType->getAttackMultiplier(); + if (auto stacks = getForgeStack(); stacks > 0) { + multiplier *= (1.35 + (stacks - 1) * 0.1); + } + return multiplier; +} + +float Monster::getDefenseMultiplier() const { + float multiplier = mType->getDefenseMultiplier(); + if (auto stacks = getForgeStack(); stacks > 0) { + multiplier *= (1 + (0.1 * stacks)); + } + return multiplier; +} + +bool Monster::isDead() const { + return m_isDead; +} + +void Monster::setDead(bool isDead) { + m_isDead = isDead; } void Monster::getPathSearchParams(const std::shared_ptr &creature, FindPathParams &fpp) { @@ -2136,7 +2530,8 @@ void Monster::getPathSearchParams(const std::shared_ptr &creature, Fin fpp.maxTargetDist = targetDistance; if (isSummon()) { - if (getMaster() == creature) { + const auto &master = getMaster(); + if (master && master == creature) { fpp.maxTargetDist = 2; fpp.fullPathSearch = true; } else if (targetDistance <= 1) { @@ -2174,7 +2569,7 @@ void Monster::configureForgeSystem() { } // Change health based in stacks - float percentToIncrement = static_cast((forgeStack * 6) + 100) / 100.f; + const auto percentToIncrement = 1 + (15 * forgeStack + 35) / 100.f; auto newHealth = static_cast(std::ceil(static_cast(healthMax) * percentToIncrement)); healthMax = newHealth; @@ -2187,6 +2582,46 @@ void Monster::configureForgeSystem() { g_game().sendUpdateCreature(static_self_cast()); } +bool Monster::canBeForgeMonster() const { + return getForgeStack() == 0 && !isSummon() && !isRewardBoss() && canDropLoot() && isForgeCreature() && getRaceId() > 0; +} + +bool Monster::isForgeCreature() const { + return mType->info.isForgeCreature; +} + +void Monster::setForgeMonster(bool forge) const { + mType->info.isForgeCreature = forge; +} + +uint16_t Monster::getForgeStack() const { + return forgeStack; +} + +void Monster::setForgeStack(uint16_t stack) { + forgeStack = stack; +} + +ForgeClassifications_t Monster::getMonsterForgeClassification() const { + return monsterForgeClassification; +} + +void Monster::setMonsterForgeClassification(ForgeClassifications_t classification) { + monsterForgeClassification = classification; +} + +void Monster::setTimeToChangeFiendish(time_t time) { + timeToChangeFiendish = time; +} + +time_t Monster::getTimeToChangeFiendish() const { + return timeToChangeFiendish; +} + +std::shared_ptr Monster::getMonsterType() const { + return mType; +} + void Monster::clearFiendishStatus() { timeToChangeFiendish = 0; forgeStack = 0; @@ -2226,3 +2661,13 @@ std::vector> Monster::getPushItemLocationOptions(const return {}; } + +void Monster::onExecuteAsyncTasks() { + if (hasAsyncTaskFlag(UpdateTargetList)) { + updateTargetList(); + } + + if (hasAsyncTaskFlag(UpdateIdleStatus)) { + updateIdleStatus(); + } +} diff --git a/src/creatures/monsters/monster.hpp b/src/creatures/monsters/monster.hpp index 061ad2b98..c52a2a6de 100644 --- a/src/creatures/monsters/monster.hpp +++ b/src/creatures/monsters/monster.hpp @@ -8,13 +8,17 @@ */ #pragma once +#include "creatures/creature.hpp" +#include "lua/lua_definitions.hpp" -#include "creatures/monsters/monsters.hpp" -#include "declarations.hpp" -#include "items/tile.hpp" - +struct spellBlock_t; +class MonsterType; +class Tile; class Creature; class Game; +class SpawnMonster; + +using CreatureVector = std::vector>; class Monster final : public Creature { public: @@ -22,24 +26,16 @@ class Monster final : public Creature { static int32_t despawnRange; static int32_t despawnRadius; - explicit Monster(std::shared_ptr mType); + explicit Monster(const std::shared_ptr &mType); // non-copyable Monster(const Monster &) = delete; Monster &operator=(const Monster &) = delete; - std::shared_ptr getMonster() override { - return static_self_cast(); - } - std::shared_ptr getMonster() const override { - return static_self_cast(); - } + std::shared_ptr getMonster() override; + std::shared_ptr getMonster() const override; - void setID() override { - if (id == 0) { - id = monsterAutoID++; - } - } + void setID() override; void addList() override; void removeList() override; @@ -48,139 +44,75 @@ class Monster final : public Creature { void setName(const std::string &name); // Real monster name, set on monster creation "createMonsterType(typeName)" - const std::string &getTypeName() const override { - return mType->typeName; - } + const std::string &getTypeName() const override; const std::string &getNameDescription() const override; - void setNameDescription(const std::string &nameDescription) { - this->nameDescription = nameDescription; - }; - std::string getDescription(int32_t) override { - return nameDescription + '.'; - } + void setNameDescription(std::string_view nameDescription); + ; + std::string getDescription(int32_t) override; - CreatureType_t getType() const override { - return CREATURETYPE_MONSTER; - } + CreatureType_t getType() const override; - const Position &getMasterPos() const { - return masterPos; - } - void setMasterPos(Position pos) { - masterPos = pos; - } + const Position &getMasterPos() const; + void setMasterPos(Position pos); - RaceType_t getRace() const override { - return mType->info.race; - } + RaceType_t getRace() const override; float getMitigation() const override; - int32_t getArmor() const override { - return mType->info.armor * getDefenseMultiplier(); - } - int32_t getDefense() const override { - return mType->info.defense * getDefenseMultiplier(); - } + int32_t getArmor() const override; + int32_t getDefense() const override; - Faction_t getFaction() const override { - auto master = getMaster(); - if (getMaster()) { - return getMaster()->getFaction(); - } - return mType->info.faction; - } + void addDefense(int32_t defense); - bool isEnemyFaction(Faction_t faction) const { - auto master = getMaster(); - if (master && master->getMonster()) { - return master->getMonster()->isEnemyFaction(faction); - } - return mType->info.enemyFactions.empty() ? false : mType->info.enemyFactions.contains(faction); - } + Faction_t getFaction() const override; - bool isPushable() override { - return mType->info.pushable && baseSpeed != 0; - } - bool isAttackable() const override { - return mType->info.isAttackable; - } - bool canPushItems() const { - return mType->info.canPushItems; - } - bool canPushCreatures() const { - return mType->info.canPushCreatures; - } - bool isRewardBoss() const { - return mType->info.isRewardBoss; - } - bool isHostile() const { - return mType->info.isHostile; - } - bool isFamiliar() const { - return mType->info.isFamiliar; - } - bool canSeeInvisibility() const override { - return isImmune(CONDITION_INVISIBLE); - } - uint16_t critChance() const { - return mType->info.critChance; - } - uint32_t getManaCost() const { - return mType->info.manaCost; - } - RespawnType getRespawnType() const { - return mType->info.respawnType; - } - void setSpawnMonster(SpawnMonster* newSpawnMonster) { - this->spawnMonster = newSpawnMonster; - } + bool isEnemyFaction(Faction_t faction) const; - int32_t getReflectPercent(CombatType_t combatType, bool useCharges = false) const override; + bool isPushable() override; + bool isAttackable() const override; + bool canPushItems() const; + bool canPushCreatures() const; + bool isRewardBoss() const; + bool isHostile() const; + bool isFamiliar() const; + bool canSeeInvisibility() const override; + uint16_t critChance() const; + uint32_t getManaCost() const; + RespawnType getRespawnType() const; + void setSpawnMonster(const std::shared_ptr &newSpawnMonster); + + double_t getReflectPercent(CombatType_t combatType, bool useCharges = false) const override; uint32_t getHealingCombatValue(CombatType_t healingType) const; + void addReflectElement(CombatType_t combatType, int32_t percent); + bool canWalkOnFieldType(CombatType_t combatType) const; void onAttackedCreatureDisappear(bool isLogout) override; - void onCreatureAppear(std::shared_ptr creature, bool isLogin) override; - void onRemoveCreature(std::shared_ptr creature, bool isLogout) override; + void onCreatureAppear(const std::shared_ptr &creature, bool isLogin) override; + void onRemoveCreature(const 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 onCreatureSay(std::shared_ptr creature, SpeakClasses type, const std::string &text) override; + void onCreatureSay(const std::shared_ptr &creature, SpeakClasses type, const std::string &text) override; + void onAttackedByPlayer(const std::shared_ptr &attackerPlayer); + void onSpawn(); - void drainHealth(std::shared_ptr attacker, int32_t damage) override; + void drainHealth(const std::shared_ptr &attacker, int32_t damage) override; void changeHealth(int32_t healthChange, bool sendHealthChange = true) override; bool getNextStep(Direction &direction, uint32_t &flags) override; void onFollowCreatureComplete(const std::shared_ptr &creature) override; void onThink(uint32_t interval) override; - bool challengeCreature(std::shared_ptr creature, int targetChangeCooldown) override; + bool challengeCreature(const std::shared_ptr &creature, int targetChangeCooldown) override; bool changeTargetDistance(int32_t distance, uint32_t duration = 12000); - bool isChallenged() const { - return challengeFocusDuration > 0; - } + bool isChallenged() const; - std::vector getIcons() const override { - auto creatureIcons = Creature::getIcons(); - if (!creatureIcons.empty()) { - return creatureIcons; - } - if (challengeMeleeDuration > 0 && mType->info.targetDistance > targetDistance) { - return { CreatureIcon(CreatureIconModifications_t::TurnedMelee) }; - } else if (varBuffs[BUFF_DAMAGERECEIVED] > 100) { - return { CreatureIcon(CreatureIconModifications_t::HigherDamageReceived) }; - } else if (varBuffs[BUFF_DAMAGEDEALT] < 100) { - return { CreatureIcon(CreatureIconModifications_t::LowerDamageDealt) }; - } - return {}; - } + std::vector getIcons() const override; void setNormalCreatureLight() override; bool getCombatValues(int32_t &min, int32_t &max) override; void doAttacking(uint32_t interval) override; - bool hasExtraSwing() override { - return extraMeleeAttack; - } + bool hasExtraSwing() override; bool searchTarget(TargetSearchType_t searchType = TARGETSEARCH_DEFAULT); bool selectTarget(const std::shared_ptr &creature); @@ -217,135 +149,81 @@ class Monster final : public Creature { return list; } - bool isTarget(std::shared_ptr creature); - bool isFleeing() const { - return !isSummon() && getHealth() <= runAwayHealth && challengeFocusDuration <= 0 && challengeMeleeDuration <= 0; - } + bool isTarget(const std::shared_ptr &creature); + bool isFleeing() const; bool getDistanceStep(const Position &targetPos, Direction &direction, bool flee = false); - bool isTargetNearby() const { - return stepDuration >= 1; - } - bool isIgnoringFieldDamage() const { - return ignoreFieldDamage; - } - bool israndomStepping() const { - return randomStepping; - } - void setIgnoreFieldDamage(bool ignore) { - ignoreFieldDamage = ignore; - } - bool getIgnoreFieldDamage() const { - return ignoreFieldDamage; - } - uint16_t getRaceId() const { - return mType->info.raceid; - } + bool isTargetNearby() const; + bool isIgnoringFieldDamage() const; + bool israndomStepping() const; + void setIgnoreFieldDamage(bool ignore); + bool getIgnoreFieldDamage() const; + uint16_t getRaceId() const; // Hazard system - bool getHazard() const { - return hazard; - } - void setHazard(bool value) { - hazard = value; - } + bool getHazard() const; + void setHazard(bool value); - bool getHazardSystemCrit() const { - return hazardCrit; - } - void setHazardSystemCrit(bool value) { - hazardCrit = value; - } + bool getHazardSystemCrit() const; + void setHazardSystemCrit(bool value); - bool getHazardSystemDodge() const { - return hazardDodge; - } - void setHazardSystemDodge(bool value) { - hazardDodge = value; - } + bool getHazardSystemDodge() const; + void setHazardSystemDodge(bool value); - bool getHazardSystemDamageBoost() const { - return hazardDamageBoost; - } - void setHazardSystemDamageBoost(bool value) { - hazardDamageBoost = value; - } - bool getHazardSystemDefenseBoost() const { - return hazardDefenseBoost; - } - void setHazardSystemDefenseBoost(bool value) { - hazardDefenseBoost = value; - } + bool getHazardSystemDamageBoost() const; + void setHazardSystemDamageBoost(bool value); + bool getHazardSystemDefenseBoost() const; + void setHazardSystemDefenseBoost(bool value); // Hazard end void updateTargetList(); void clearTargetList(); void clearFriendList(); - BlockType_t blockHit(std::shared_ptr attacker, CombatType_t combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false) override; + BlockType_t blockHit(const std::shared_ptr &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false) override; static uint32_t monsterAutoID; void configureForgeSystem(); - bool canBeForgeMonster() const { - return getForgeStack() == 0 && !isSummon() && !isRewardBoss() && canDropLoot() && isForgeCreature() && getRaceId() > 0; - } + bool canBeForgeMonster() const; - bool isForgeCreature() const { - return mType->info.isForgeCreature; - } + bool isForgeCreature() const; - void setForgeMonster(bool forge) const { - mType->info.isForgeCreature = forge; - } + void setForgeMonster(bool forge) const; - uint16_t getForgeStack() const { - return forgeStack; - } + uint16_t getForgeStack() const; - void setForgeStack(uint16_t stack) { - forgeStack = stack; - } + void setForgeStack(uint16_t stack); - ForgeClassifications_t getMonsterForgeClassification() const { - return monsterForgeClassification; - } + ForgeClassifications_t getMonsterForgeClassification() const; - void setMonsterForgeClassification(ForgeClassifications_t classification) { - monsterForgeClassification = classification; - } + void setMonsterForgeClassification(ForgeClassifications_t classification); - void setTimeToChangeFiendish(time_t time) { - timeToChangeFiendish = time; - } + void setTimeToChangeFiendish(time_t time); - time_t getTimeToChangeFiendish() const { - return timeToChangeFiendish; - } + time_t getTimeToChangeFiendish() const; - std::shared_ptr getMonsterType() const { - return mType; - } + std::shared_ptr getMonsterType() const; void clearFiendishStatus(); bool canDropLoot() const; bool isImmune(ConditionType_t conditionType) const override; bool isImmune(CombatType_t combatType) const override; + void setImmune(bool immune); + bool isImmune() const; - float getAttackMultiplier() const { - float multiplier = mType->getAttackMultiplier(); - if (auto stacks = getForgeStack(); stacks > 0) { - multiplier *= (1.35 + (stacks - 1) * 0.1); - } - return multiplier; - } + float getAttackMultiplier() const; - float getDefenseMultiplier() const { - float multiplier = mType->getDefenseMultiplier(); - return multiplier * std::pow(1.02f, getForgeStack()); - } + float getDefenseMultiplier() const; + + bool isDead() const override; + + void setDead(bool isDead); + +protected: + void onExecuteAsyncTasks() override; private: auto getTargetIterator(const std::shared_ptr &creature) { @@ -368,10 +246,12 @@ class Monster final : public Creature { std::string nameDescription; std::shared_ptr mType; - SpawnMonster* spawnMonster = nullptr; + std::shared_ptr spawnMonster = nullptr; int64_t lastMeleeAttack = 0; + uint16_t totalPlayersOnScreen = 0; + uint32_t attackTicks = 0; uint32_t targetChangeTicks = 0; uint32_t defenseTicks = 0; @@ -385,8 +265,10 @@ class Monster final : public Creature { int32_t stepDuration = 0; int32_t targetDistance = 1; int32_t challengeMeleeDuration = 0; - uint16_t totalPlayersOnScreen = 0; int32_t runAwayHealth = 0; + int32_t m_defense = 0; + + std::unordered_map m_reflectElementMap; Position masterPos; @@ -402,9 +284,12 @@ class Monster final : public Creature { bool hazardDamageBoost = false; bool hazardDefenseBoost = false; - void onCreatureEnter(std::shared_ptr creature); - void onCreatureLeave(std::shared_ptr creature); - void onCreatureFound(std::shared_ptr creature, bool pushFront = false); + bool m_isDead = false; + bool m_isImmune = false; + + void onCreatureEnter(const std::shared_ptr &creature); + void onCreatureLeave(const std::shared_ptr &creature); + void onCreatureFound(const std::shared_ptr &creature, bool pushFront = false); void updateLookDirection(); @@ -413,14 +298,12 @@ class Monster final : public Creature { bool addTarget(const std::shared_ptr &creature, bool pushFront = false); bool removeTarget(const std::shared_ptr &creature); - void death(std::shared_ptr lastHitCreature) override; - std::shared_ptr getCorpse(std::shared_ptr lastHitCreature, std::shared_ptr mostDamageCreature) override; + void death(const std::shared_ptr &lastHitCreature) override; + std::shared_ptr getCorpse(const std::shared_ptr &lastHitCreature, const std::shared_ptr &mostDamageCreature) override; void setIdle(bool idle); void updateIdleStatus(); - bool getIdleStatus() const { - return isIdle; - } + bool getIdleStatus() const; void onAddCondition(ConditionType_t type) override; void onEndCondition(ConditionType_t type) override; @@ -433,10 +316,10 @@ class Monster final : public Creature { bool isInSpawnRange(const Position &pos) const; bool canWalkTo(Position pos, Direction direction); - static bool pushItem(std::shared_ptr item, const Direction &nextDirection); - static void pushItems(std::shared_ptr tile, const Direction &nextDirection); - static bool pushCreature(std::shared_ptr creature); - static void pushCreatures(std::shared_ptr tile); + static bool pushItem(const std::shared_ptr &item, const Direction &nextDirection); + static void pushItems(const std::shared_ptr &tile, const Direction &nextDirection); + static bool pushCreature(const std::shared_ptr &creature); + static void pushCreatures(const std::shared_ptr &tile); void onThinkTarget(uint32_t interval); void onThinkYell(uint32_t interval); @@ -446,13 +329,9 @@ class Monster final : public Creature { bool isFriend(const std::shared_ptr &creature) const; bool isOpponent(const std::shared_ptr &creature) const; - uint64_t getLostExperience() const override { - return skillLoss ? mType->info.experience : 0; - } - uint16_t getLookCorpse() const override { - return mType->info.lookcorpse; - } - void dropLoot(std::shared_ptr corpse, std::shared_ptr lastHitCreature) override; + uint64_t getLostExperience() const override; + uint16_t getLookCorpse() const override; + void dropLoot(const std::shared_ptr &corpse, const std::shared_ptr &lastHitCreature) override; void getPathSearchParams(const std::shared_ptr &creature, FindPathParams &fpp) override; bool useCacheMap() const override { // return !randomStepping; @@ -471,5 +350,5 @@ class Monster final : public Creature { void doFollowCreature(uint32_t &flags, Direction &nextDirection, bool &result); void doRandomStep(Direction &nextDirection, bool &result); - void onConditionStatusChange(const ConditionType_t &type); + void onConditionStatusChange(ConditionType_t type); }; diff --git a/src/creatures/monsters/monsters.cpp b/src/creatures/monsters/monsters.cpp index 78358f69d..87fd967ab 100644 --- a/src/creatures/monsters/monsters.cpp +++ b/src/creatures/monsters/monsters.cpp @@ -7,32 +7,33 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/monsters/monsters.hpp" -#include "creatures/combat/spells.hpp" +#include "config/configmanager.hpp" #include "creatures/combat/combat.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/combat/spells.hpp" #include "game/game.hpp" #include "items/weapons/weapons.hpp" +#include "lua/scripts/luascript.hpp" -void MonsterType::loadLoot(const std::shared_ptr monsterType, LootBlock lootBlock) { +void MonsterType::loadLoot(const std::shared_ptr &monsterType, LootBlock lootBlock) const { if (lootBlock.childLoot.empty()) { - bool isContainer = Item::items[lootBlock.id].isContainer(); + const bool isContainer = Item::items[lootBlock.id].isContainer(); if (isContainer) { for (const LootBlock &child : lootBlock.childLoot) { - lootBlock.childLoot.push_back(child); + lootBlock.childLoot.emplace_back(child); } } - monsterType->info.lootItems.push_back(lootBlock); + monsterType->info.lootItems.emplace_back(lootBlock); } else { - monsterType->info.lootItems.push_back(lootBlock); + monsterType->info.lootItems.emplace_back(lootBlock); } } -bool MonsterType::canSpawn(const Position &pos) { +bool MonsterType::canSpawn(const Position &pos) const { bool canSpawn = true; - bool isDay = g_game().gameIsDay(); + const bool isDay = g_game().gameIsDay(); if ((isDay && info.respawnType.period == RESPAWNPERIOD_NIGHT) || (!isDay && info.respawnType.period == RESPAWNPERIOD_DAY)) { // It will ignore day and night if underground @@ -42,8 +43,8 @@ bool MonsterType::canSpawn(const Position &pos) { return canSpawn; } -std::shared_ptr Monsters::getDamageCondition(ConditionType_t conditionType, int32_t maxDamage, int32_t minDamage, int32_t startDamage, uint32_t tickInterval) { - std::shared_ptr condition = Condition::createCondition(CONDITIONID_COMBAT, conditionType, 0, 0)->static_self_cast(); +std::shared_ptr Monsters::getDamageCondition(ConditionType_t conditionType, int32_t maxDamage, int32_t minDamage, int32_t startDamage, uint32_t tickInterval) const { + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, conditionType, 0, 0)->static_self_cast(); condition->setParam(CONDITION_PARAM_TICKINTERVAL, tickInterval); condition->setParam(CONDITION_PARAM_MINVALUE, minDamage); condition->setParam(CONDITION_PARAM_MAXVALUE, maxDamage); @@ -52,7 +53,7 @@ std::shared_ptr Monsters::getDamageCondition(ConditionType_t co return condition; } -bool Monsters::deserializeSpell(const std::shared_ptr spell, spellBlock_t &sb, const std::string &description) { +bool Monsters::deserializeSpell(const std::shared_ptr &spell, spellBlock_t &sb, const std::string &description) const { if (!spell->scriptName.empty()) { spell->isScripted = true; } else if (!spell->name.empty()) { @@ -62,8 +63,8 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell } sb.speed = spell->interval; - sb.chance = std::min((int)spell->chance, 100); - sb.range = std::min((int)spell->range, MAP_MAX_VIEW_PORT_X * 2); + sb.chance = std::min(static_cast(spell->chance), 100); + sb.range = std::min(static_cast(spell->range), MAP_MAX_VIEW_PORT_X * 2); sb.minCombatValue = std::min(spell->minCombatValue, spell->maxCombatValue); sb.maxCombatValue = std::max(spell->minCombatValue, spell->maxCombatValue); sb.soundCastEffect = spell->soundCastEffect; @@ -96,7 +97,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell combatPtr->setArea(area); } - if (std::string spellName = asLowerCaseString(spell->name); + if (const std::string spellName = asLowerCaseString(spell->name); spellName == "melee") { sb.isMelee = true; @@ -143,8 +144,8 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell conditionType = CONDITION_PARALYZE; } - std::shared_ptr condition = Condition::createCondition(CONDITIONID_COMBAT, conditionType, duration, 0)->static_self_cast(); - float multiplier = 1.0f + static_cast(speedChange) / 1000.0f; + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, conditionType, duration, 0)->static_self_cast(); + const float multiplier = 1.0f + static_cast(speedChange) / 1000.0f; condition->setFormulaVars(multiplier / 2, 40, multiplier, 40); combatPtr->addCondition(condition); } else if (spellName == "outfit") { @@ -154,7 +155,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell duration = spell->duration; } - std::shared_ptr condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_OUTFIT, duration, 0)->static_self_cast(); + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_OUTFIT, duration, 0)->static_self_cast(); if (!spell->outfitMonster.empty()) { condition->setLazyMonsterOutfit(spell->outfitMonster); @@ -178,7 +179,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell duration = spell->duration; } - std::shared_ptr condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_INVISIBLE, duration, 0); + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_INVISIBLE, duration, 0); combatPtr->setParam(COMBAT_PARAM_AGGRESSIVE, 0); combatPtr->addCondition(condition); } else if (spellName == "drunk") { @@ -188,7 +189,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell duration = spell->duration; } - std::shared_ptr condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_DRUNK, duration, 0); + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_DRUNK, duration, 0); combatPtr->addCondition(condition); } else if (spellName == "soulwars fear" || spellName == "fear") { int32_t duration = 6000; @@ -197,7 +198,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell duration = spell->duration; } - const auto condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_FEARED, duration, 0); + const auto &condition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_FEARED, duration, 0); combatPtr->addCondition(condition); } else if (spellName == "firefield") { combatPtr->setParam(COMBAT_PARAM_CREATEITEM, ITEM_FIREFIELD_PVP_FULL); @@ -231,7 +232,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell // If a spell has a condition, it always applies, no matter what kind of spell it is if (spell->conditionType != CONDITION_NONE) { - int32_t minDamage = std::abs(spell->conditionMinDamage); + const int32_t minDamage = std::abs(spell->conditionMinDamage); int32_t maxDamage = std::abs(spell->conditionMaxDamage); int32_t startDamage = std::abs(spell->conditionStartDamage); uint32_t tickInterval = 2000; @@ -248,7 +249,7 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell maxDamage = minDamage; } - std::shared_ptr condition = getDamageCondition(spell->conditionType, maxDamage, minDamage, startDamage, tickInterval); + const auto &condition = getDamageCondition(spell->conditionType, maxDamage, minDamage, startDamage, tickInterval); combatPtr->addCondition(condition); } @@ -271,33 +272,82 @@ bool Monsters::deserializeSpell(const std::shared_ptr spell, spell } bool MonsterType::loadCallback(LuaScriptInterface* scriptInterface) { - int32_t id = scriptInterface->getEvent(); + const int32_t id = scriptInterface->getEvent(); if (id == -1) { g_logger().warn("[MonsterType::loadCallback] - Event not found"); return false; } info.scriptInterface = scriptInterface; - if (info.eventType == MONSTERS_EVENT_THINK) { - info.thinkEvent = id; - } else if (info.eventType == MONSTERS_EVENT_APPEAR) { - info.creatureAppearEvent = id; - } else if (info.eventType == MONSTERS_EVENT_DISAPPEAR) { - info.creatureDisappearEvent = id; - } else if (info.eventType == MONSTERS_EVENT_MOVE) { - info.creatureMoveEvent = id; - } else if (info.eventType == MONSTERS_EVENT_SAY) { - info.creatureSayEvent = id; + + switch (info.eventType) { + case MONSTERS_EVENT_THINK: + info.thinkEvent = id; + break; + case MONSTERS_EVENT_APPEAR: + info.creatureAppearEvent = id; + break; + case MONSTERS_EVENT_DISAPPEAR: + info.creatureDisappearEvent = id; + break; + case MONSTERS_EVENT_MOVE: + info.creatureMoveEvent = id; + break; + case MONSTERS_EVENT_SAY: + info.creatureSayEvent = id; + break; + case MONSTERS_EVENT_ATTACKED_BY_PLAYER: + info.monsterAttackedByPlayerEvent = id; + break; + case MONSTERS_EVENT_ON_SPAWN: + info.spawnEvent = id; + break; + default: + g_logger().error("[MonsterType::loadCallback] - Unknown event type"); + return false; } + return true; } +uint16_t MonsterType::getBaseSpeed() const { + return info.baseSpeed; +} + +void MonsterType::setBaseSpeed(const uint16_t initBaseSpeed) { + info.baseSpeed = initBaseSpeed; +} + +float MonsterType::getHealthMultiplier() const { + return isBoss() ? g_configManager().getFloat(RATE_BOSS_HEALTH) : g_configManager().getFloat(RATE_MONSTER_HEALTH); +} + +float MonsterType::getAttackMultiplier() const { + return isBoss() ? g_configManager().getFloat(RATE_BOSS_ATTACK) : g_configManager().getFloat(RATE_MONSTER_ATTACK); +} + +float MonsterType::getDefenseMultiplier() const { + return isBoss() ? g_configManager().getFloat(RATE_BOSS_DEFENSE) : g_configManager().getFloat(RATE_MONSTER_DEFENSE); +} + +bool MonsterType::isBoss() const { + return !info.bosstiaryClass.empty(); +} + +Monsters &Monsters::getInstance() { + return inject(); +} + +void Monsters::clear() { + monsters.clear(); +} + 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->first.find(lowerCaseName) != std::basic_string::npos) { return it->second; } if (!silent) { @@ -307,12 +357,12 @@ std::shared_ptr Monsters::getMonsterType(const std::string &name, b } std::shared_ptr Monsters::getMonsterTypeByRaceId(uint16_t raceId, bool isBoss /* = false*/) const { - auto bossType = g_ioBosstiary().getMonsterTypeByBossRaceId(raceId); + const auto &bossType = g_ioBosstiary().getMonsterTypeByBossRaceId(raceId); if (isBoss && bossType) { return bossType; } - auto monster_race_map = g_game().getBestiaryList(); + const auto &monster_race_map = g_game().getBestiaryList(); auto it = monster_race_map.find(raceId); if (it == monster_race_map.end()) { return nullptr; @@ -321,9 +371,9 @@ std::shared_ptr Monsters::getMonsterTypeByRaceId(uint16_t raceId, b return g_monsters().getMonsterType(it->second); } -bool Monsters::tryAddMonsterType(const std::string &name, const std::shared_ptr mType) { - std::string lowerName = asLowerCaseString(name); - if (monsters.find(lowerName) != monsters.end()) { +bool Monsters::tryAddMonsterType(const std::string &name, const std::shared_ptr &mType) { + const std::string lowerName = asLowerCaseString(name); + if (monsters.contains(lowerName)) { g_logger().debug("[{}] the monster with name '{}' already exist", __FUNCTION__, name); return false; } diff --git a/src/creatures/monsters/monsters.hpp b/src/creatures/monsters/monsters.hpp index 518befd8a..35c4d7305 100644 --- a/src/creatures/monsters/monsters.hpp +++ b/src/creatures/monsters/monsters.hpp @@ -9,9 +9,13 @@ #pragma once +#include "creatures/creatures_definitions.hpp" +#include "game/game_definitions.hpp" #include "io/io_bosstiary.hpp" -#include "creatures/creature.hpp" -#include "declarations.hpp" +#include "utils/utils_definitions.hpp" + +class LuaScriptInterface; +class ConditionDamage; class Loot { public: @@ -31,7 +35,7 @@ struct spellBlock_t { spellBlock_t(const spellBlock_t &other) = delete; spellBlock_t &operator=(const spellBlock_t &other) = delete; spellBlock_t(spellBlock_t &&other) noexcept : - spell(other.spell), + spell(std::move(other.spell)), chance(other.chance), speed(other.speed), range(other.range), @@ -120,7 +124,9 @@ class MonsterType { int32_t creatureDisappearEvent = -1; int32_t creatureMoveEvent = -1; int32_t creatureSayEvent = -1; + int32_t monsterAttackedByPlayerEvent = -1; int32_t thinkEvent = -1; + int32_t spawnEvent = -1; int32_t targetDistance = 1; int32_t runAwayHealth = 0; int32_t health = 100; @@ -155,6 +161,8 @@ class MonsterType { bool canWalkOnFire = true; bool canWalkOnPoison = true; bool isForgeCreature = true; + bool isPreyable = true; + bool isPreyExclusive = false; MonstersEvent_t eventType = MONSTERS_EVENT_NONE; }; @@ -162,7 +170,7 @@ class MonsterType { public: MonsterType() = default; explicit MonsterType(const std::string &initName) : - name(initName), typeName(initName), nameDescription(initName), variantName("") {}; + name(initName), typeName(initName), nameDescription(initName) { } // non-copyable MonsterType(const MonsterType &) = delete; @@ -177,33 +185,21 @@ class MonsterType { MonsterInfo info; - uint16_t getBaseSpeed() const { - return info.baseSpeed; - } + uint16_t getBaseSpeed() const; - void setBaseSpeed(const uint16_t initBaseSpeed) { - info.baseSpeed = initBaseSpeed; - } + void setBaseSpeed(const uint16_t initBaseSpeed); - float getHealthMultiplier() const { - return isBoss() ? g_configManager().getFloat(RATE_BOSS_HEALTH, __FUNCTION__) : g_configManager().getFloat(RATE_MONSTER_HEALTH, __FUNCTION__); - } + float getHealthMultiplier() const; - float getAttackMultiplier() const { - return isBoss() ? g_configManager().getFloat(RATE_BOSS_ATTACK, __FUNCTION__) : g_configManager().getFloat(RATE_MONSTER_ATTACK, __FUNCTION__); - } + float getAttackMultiplier() const; - float getDefenseMultiplier() const { - return isBoss() ? g_configManager().getFloat(RATE_BOSS_DEFENSE, __FUNCTION__) : g_configManager().getFloat(RATE_MONSTER_DEFENSE, __FUNCTION__); - } + float getDefenseMultiplier() const; - bool isBoss() const { - return !info.bosstiaryClass.empty(); - } + bool isBoss() const; - void loadLoot(std::shared_ptr monsterType, LootBlock lootblock); + void loadLoot(const std::shared_ptr &monsterType, LootBlock lootblock) const; - bool canSpawn(const Position &pos); + bool canSpawn(const Position &pos) const; }; class MonsterSpell { @@ -213,8 +209,8 @@ class MonsterSpell { MonsterSpell(const MonsterSpell &) = delete; MonsterSpell &operator=(const MonsterSpell &) = delete; - std::string name = ""; - std::string scriptName = ""; + std::string name; + std::string scriptName; uint8_t chance = 100; uint8_t range = 0; @@ -242,7 +238,7 @@ class MonsterSpell { bool isMelee = false; Outfit_t outfit = {}; - std::string outfitMonster = ""; + std::string outfitMonster; uint16_t outfitItem = 0; ShootType_t shoot = CONST_ANI_NONE; @@ -261,24 +257,20 @@ class Monsters { Monsters(const Monsters &) = delete; Monsters &operator=(const Monsters &) = delete; - static Monsters &getInstance() { - return inject(); - } + static Monsters &getInstance(); - void clear() { - monsters.clear(); - } + void clear(); std::shared_ptr getMonsterType(const std::string &name, bool silent = false) const; std::shared_ptr getMonsterTypeByRaceId(uint16_t raceId, bool isBoss = false) const; - bool tryAddMonsterType(const std::string &name, std::shared_ptr mType); - bool deserializeSpell(std::shared_ptr spell, spellBlock_t &sb, const std::string &description = ""); + bool tryAddMonsterType(const std::string &name, const std::shared_ptr &mType); + bool deserializeSpell(const std::shared_ptr &spell, spellBlock_t &sb, const std::string &description = "") const; std::unique_ptr scriptInterface; std::map> monsters; private: - std::shared_ptr getDamageCondition(ConditionType_t conditionType, int32_t maxDamage, int32_t minDamage, int32_t startDamage, uint32_t tickInterval); + std::shared_ptr getDamageCondition(ConditionType_t conditionType, int32_t maxDamage, int32_t minDamage, int32_t startDamage, uint32_t tickInterval) const; }; constexpr auto g_monsters = Monsters::getInstance; diff --git a/src/creatures/monsters/spawns/spawn_monster.cpp b/src/creatures/monsters/spawns/spawn_monster.cpp index ca8f45847..7d7bbc84e 100644 --- a/src/creatures/monsters/spawns/spawn_monster.cpp +++ b/src/creatures/monsters/spawns/spawn_monster.cpp @@ -7,19 +7,22 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/monsters/spawns/spawn_monster.hpp" -#include "game/game.hpp" + +#include "config/configmanager.hpp" #include "creatures/monsters/monster.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/players/player.hpp" +#include "game/game.hpp" +#include "game/movement/position.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/events_scheduler.hpp" -#include "lua/creature/events.hpp" +#include "game/zones/zone.hpp" #include "lua/callbacks/event_callback.hpp" #include "lua/callbacks/events_callbacks.hpp" -#include "utils/pugicast.hpp" -#include "game/zones/zone.hpp" +#include "lua/creature/events.hpp" #include "map/spectators.hpp" +#include "utils/pugicast.hpp" static constexpr int32_t MONSTER_MINSPAWN_INTERVAL = 1000; // 1 second static constexpr int32_t MONSTER_MAXSPAWN_INTERVAL = 86400000; // 1 day @@ -30,7 +33,7 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { } pugi::xml_document doc; - pugi::xml_parse_result result = doc.load_file(filemonstername.c_str()); + const pugi::xml_parse_result result = doc.load_file(filemonstername.c_str()); if (!result) { printXMLError(__FUNCTION__, filemonstername, result); return false; @@ -41,7 +44,8 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { std::string boostedNameGet = g_game().getBoostedMonsterName(); - for (auto spawnMonsterNode : doc.child("monsters").children()) { + spawnMonsterList.reserve(100000); + for (const auto &spawnMonsterNode : doc.child("monsters").children()) { Position centerPos( pugi::cast(spawnMonsterNode.attribute("centerx").value()), pugi::cast(spawnMonsterNode.attribute("centery").value()), @@ -61,9 +65,8 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { continue; } - SpawnMonster &spawnMonster = spawnMonsterList.emplace_back(centerPos, radius); - - for (auto childMonsterNode : spawnMonsterNode.children()) { + const auto &spawnMonster = spawnMonsterList.emplace_back(std::make_shared(centerPos, radius)); + for (const auto &childMonsterNode : spawnMonsterNode.children()) { if (strcasecmp(childMonsterNode.name(), "monster") == 0) { pugi::xml_attribute nameAttribute = childMonsterNode.attribute("name"); if (!nameAttribute) { @@ -79,8 +82,8 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { dir = DIRECTION_NORTH; } - auto xOffset = pugi::cast(childMonsterNode.attribute("x").value()); - auto yOffset = pugi::cast(childMonsterNode.attribute("y").value()); + const auto xOffset = pugi::cast(childMonsterNode.attribute("x").value()); + const auto yOffset = pugi::cast(childMonsterNode.attribute("y").value()); Position pos( static_cast(centerPos.x + xOffset), static_cast(centerPos.y + yOffset), @@ -93,18 +96,27 @@ bool SpawnsMonster::loadFromXML(const std::string &filemonstername) { weight = pugi::cast(weightAttribute.value()); } - uint32_t scheduleInterval = g_configManager().getNumber(DEFAULT_RESPAWN_TIME, __FUNCTION__); + uint32_t scheduleInterval = g_configManager().getNumber(DEFAULT_RESPAWN_TIME); - 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); + pugi::xml_attribute spawnTimeAttr = childMonsterNode.attribute("spawntime"); + if (spawnTimeAttr) { + const auto xmlSpawnTime = pugi::cast(spawnTimeAttr.value()); + if (xmlSpawnTime > 0) { + scheduleInterval = xmlSpawnTime; + } else { + g_logger().warn("Invalid spawntime value '{}' for monster '{}'. Setting to default respawn time: {}", spawnTimeAttr.value(), nameAttribute.value(), scheduleInterval); + } + } else { + g_logger().warn("Missing spawntime attribute for monster '{}'. Setting to default respawn time: {}", nameAttribute.value(), scheduleInterval); } - spawnMonster.addMonster(nameAttribute.as_string(), pos, dir, scheduleInterval * 1000, weight); + spawnMonster->addMonster(nameAttribute.as_string(), pos, dir, scheduleInterval * 1000, weight); } } } + + // Clears unused memory that has been reserved + spawnMonsterList.shrink_to_fit(); return true; } @@ -113,16 +125,16 @@ void SpawnsMonster::startup() { return; } - for (SpawnMonster &spawnMonster : spawnMonsterList) { - spawnMonster.startup(); + for (const auto &spawnMonster : spawnMonsterList) { + spawnMonster->startup(); } started = true; } void SpawnsMonster::clear() { - for (SpawnMonster &spawnMonster : spawnMonsterList) { - spawnMonster.stopEvent(); + for (const auto &spawnMonster : spawnMonsterList) { + spawnMonster->stopEvent(); } spawnMonsterList.clear(); @@ -131,6 +143,18 @@ void SpawnsMonster::clear() { filemonstername.clear(); } +bool SpawnsMonster::isStarted() const { + return started; +} + +bool SpawnsMonster::isLoaded() const { + return loaded; +} + +std::vector> &SpawnsMonster::getspawnMonsterList() { + return spawnMonsterList; +} + bool SpawnsMonster::isInZone(const Position ¢erPos, int32_t radius, const Position &pos) { if (radius == -1) { return true; @@ -148,11 +172,30 @@ void SpawnMonster::startSpawnMonsterCheck() { } SpawnMonster::~SpawnMonster() { - for (const auto &[_, monster] : spawnedMonsterMap) { - monster->setSpawnMonster(nullptr); - } stopEvent(); - spawnMonsterMap.clear(); +} + +// moveable + +SpawnMonster::SpawnMonster(SpawnMonster &&rhs) noexcept : + spawnedMonsterMap(std::move(rhs.spawnedMonsterMap)), + spawnMonsterMap(std::move(rhs.spawnMonsterMap)), + centerPos(rhs.centerPos), + radius(rhs.radius), + interval(rhs.interval), + checkSpawnMonsterEvent(rhs.checkSpawnMonsterEvent) { } + +SpawnMonster &SpawnMonster::operator=(SpawnMonster &&rhs) noexcept { + if (this != &rhs) { + spawnMonsterMap = std::move(rhs.spawnMonsterMap); + spawnedMonsterMap = std::move(rhs.spawnedMonsterMap); + + checkSpawnMonsterEvent = rhs.checkSpawnMonsterEvent; + centerPos = rhs.centerPos; + radius = rhs.radius; + interval = rhs.interval; + } + return *this; } bool SpawnMonster::findPlayer(const Position &pos) { @@ -162,11 +205,11 @@ bool SpawnMonster::findPlayer(const Position &pos) { }); } -bool SpawnMonster::isInSpawnMonsterZone(const Position &pos) { +bool SpawnMonster::isInSpawnMonsterZone(const Position &pos) const { return SpawnsMonster::isInZone(centerPos, radius, pos); } -bool SpawnMonster::spawnMonster(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr monsterType, bool startup /*= false*/) { +bool SpawnMonster::spawnMonster(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr &monsterType, bool startup /*= false*/) { if (spawnedMonsterMap.contains(spawnMonsterId)) { return false; } @@ -177,25 +220,26 @@ bool SpawnMonster::spawnMonster(uint32_t spawnMonsterId, spawnBlock_t &sb, const return false; } } else { - g_logger().debug("[SpawnMonster] Spawning {} at {}", monsterType->name, sb.pos.toString()); + g_logger().trace("[SpawnMonster] Spawning {} at {}", monsterType->name, sb.pos.toString()); if (!g_game().placeCreature(monster, sb.pos, false, true)) { return false; } } monster->setDirection(sb.direction); - monster->setSpawnMonster(this); + monster->setSpawnMonster(static_self_cast()); monster->setMasterPos(sb.pos); spawnedMonsterMap[spawnMonsterId] = monster; sb.lastSpawn = OTSYS_TIME(); g_events().eventMonsterOnSpawn(monster, sb.pos); + monster->onSpawn(); g_callbacks().executeCallback(EventCallback_t::monsterOnSpawn, &EventCallback::monsterOnSpawn, monster, sb.pos); return true; } void SpawnMonster::startup(bool delayed) { - if (g_configManager().getBoolean(RANDOM_MONSTER_SPAWN, __FUNCTION__)) { + if (g_configManager().getBoolean(RANDOM_MONSTER_SPAWN)) { for (auto it = spawnMonsterMap.begin(); it != spawnMonsterMap.end(); ++it) { auto &[spawnMonsterId, sb] = *it; for (auto &[monsterType, weight] : sb.monsterTypes) { @@ -225,7 +269,7 @@ void SpawnMonster::startup(bool delayed) { continue; } if (delayed) { - g_dispatcher().addEvent([this, spawnMonsterId, &sb, mType] { scheduleSpawn(spawnMonsterId, sb, mType, 0, true); }, "SpawnMonster::startup"); + g_dispatcher().addEvent([this, spawnMonsterId, &sb, mType] { scheduleSpawn(spawnMonsterId, sb, mType, 0, true); }, __FUNCTION__); } else { scheduleSpawn(spawnMonsterId, sb, mType, 0, true); } @@ -271,7 +315,7 @@ void SpawnMonster::checkSpawnMonster() { } } -void SpawnMonster::scheduleSpawn(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr mType, uint16_t interval, bool startup /*= false*/) { +void SpawnMonster::scheduleSpawn(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr &mType, uint16_t interval, bool startup /*= false*/) { if (interval <= 0) { spawnMonster(spawnMonsterId, sb, mType, startup); } else { @@ -283,16 +327,22 @@ void SpawnMonster::scheduleSpawn(uint32_t spawnMonsterId, spawnBlock_t &sb, cons } void SpawnMonster::cleanup() { - std::vector removeList; - for (const auto &[spawnMonsterId, monster] : spawnedMonsterMap) { - if (monster == nullptr || monster->isRemoved()) { - removeList.push_back(spawnMonsterId); + for (auto it = spawnedMonsterMap.begin(); it != spawnedMonsterMap.end();) { + const auto &monster = it->second; + if (!monster || monster->isRemoved()) { + auto spawnIt = spawnMonsterMap.find(it->first); + if (spawnIt != spawnMonsterMap.end()) { + spawnIt->second.lastSpawn = OTSYS_TIME(); + } + it = spawnedMonsterMap.erase(it); + } else { + ++it; } } - for (const auto &spawnMonsterId : removeList) { - spawnMonsterMap[spawnMonsterId].lastSpawn = OTSYS_TIME(); - spawnedMonsterMap.erase(spawnMonsterId); - } +} + +const Position &SpawnMonster::getCenterPos() const { + return centerPos; } bool SpawnMonster::addMonster(const std::string &name, const Position &pos, Direction dir, uint32_t scheduleInterval, uint32_t weight /*= 1*/) { @@ -303,20 +353,21 @@ bool SpawnMonster::addMonster(const std::string &name, const Position &pos, Dire break; } } - const auto monsterType = g_monsters().getMonsterType(variant + name); + const auto &monsterType = g_monsters().getMonsterType(variant + name); if (!monsterType) { g_logger().error("Can not find {}", name); return false; } - uint32_t eventschedule = g_eventsScheduler().getSpawnMonsterSchedule(); - std::string boostedMonster = g_game().getBoostedMonsterName(); + const uint32_t eventschedule = g_eventsScheduler().getSpawnMonsterSchedule(); + const std::string boostedMonster = g_game().getBoostedMonsterName(); int32_t boostedrate = 1; if (name == boostedMonster) { boostedrate = 2; } + auto rateSpawn = g_configManager().getNumber(RATE_SPAWN); // eventschedule is a whole percentage, so we need to multiply by 100 to match the order of magnitude of the other values - scheduleInterval = scheduleInterval * 100 / std::max((uint32_t)1, (g_configManager().getNumber(RATE_SPAWN, __FUNCTION__) * boostedrate * eventschedule)); + scheduleInterval = scheduleInterval * 100 / std::max(static_cast(1), (rateSpawn * boostedrate * eventschedule)); if (scheduleInterval < MONSTER_MINSPAWN_INTERVAL) { g_logger().warn("[SpawnsMonster::addMonster] - {} {} spawntime cannot be less than {} seconds, set to {} by default.", name, pos.toString(), MONSTER_MINSPAWN_INTERVAL / 1000, MONSTER_MINSPAWN_INTERVAL / 1000); scheduleInterval = MONSTER_MINSPAWN_INTERVAL; @@ -360,7 +411,7 @@ bool SpawnMonster::addMonster(const std::string &name, const Position &pos, Dire return true; } -void SpawnMonster::removeMonster(std::shared_ptr monster) { +void SpawnMonster::removeMonster(const std::shared_ptr &monster) { uint32_t spawnMonsterId = 0; for (const auto &[id, m] : spawnedMonsterMap) { if (m == monster) { @@ -377,9 +428,13 @@ void SpawnMonster::removeMonsters() { } void SpawnMonster::setMonsterVariant(const std::string &variant) { - for (auto &it : spawnMonsterMap) { + for (auto &[monsterId, monsterInfo] : spawnMonsterMap) { + if (monsterId == 0) { + continue; + } + std::unordered_map, uint32_t> monsterTypes; - for (const auto &[monsterType, weight] : it.second.monsterTypes) { + for (const auto &[monsterType, weight] : monsterInfo.monsterTypes) { if (!monsterType || monsterType->typeName.empty()) { continue; } @@ -389,7 +444,7 @@ void SpawnMonster::setMonsterVariant(const std::string &variant) { monsterTypes.emplace(variantType, weight); } } - it.second.monsterTypes = monsterTypes; + monsterInfo.monsterTypes = monsterTypes; } } @@ -420,7 +475,7 @@ std::shared_ptr spawnBlock_t::getMonsterType() const { uint32_t randomWeight = uniform_random(0, totalWeight - 1); // order monsters by weight DESC std::vector, uint32_t>> orderedMonsterTypes(monsterTypes.begin(), monsterTypes.end()); - std::sort(orderedMonsterTypes.begin(), orderedMonsterTypes.end(), [](const auto &a, const auto &b) { + std::ranges::sort(orderedMonsterTypes, [](const auto &a, const auto &b) { return a.second > b.second; }); for (const auto &[mType, weight] : orderedMonsterTypes) { diff --git a/src/creatures/monsters/spawns/spawn_monster.hpp b/src/creatures/monsters/spawns/spawn_monster.hpp index 81a08973c..d825ad73c 100644 --- a/src/creatures/monsters/spawns/spawn_monster.hpp +++ b/src/creatures/monsters/spawns/spawn_monster.hpp @@ -9,24 +9,25 @@ #pragma once -#include "items/tile.hpp" #include "game/movement/position.hpp" +enum Direction : uint8_t; +struct Position; class Monster; class MonsterType; struct spawnBlock_t { Position pos; - std::unordered_map, uint32_t> monsterTypes; - int64_t lastSpawn; - uint32_t interval; + std::unordered_map, uint32_t> monsterTypes {}; + int64_t lastSpawn {}; + uint32_t interval {}; Direction direction; std::shared_ptr getMonsterType() const; bool hasBoss() const; }; -class SpawnMonster { +class SpawnMonster : public SharedObject { public: SpawnMonster(Position initPos, int32_t initRadius) : centerPos(initPos), radius(initRadius) { } @@ -37,26 +38,12 @@ class SpawnMonster { SpawnMonster &operator=(const SpawnMonster &) = delete; // moveable - SpawnMonster(SpawnMonster &&rhs) noexcept : - spawnMonsterMap(std::move(rhs.spawnMonsterMap)), - spawnedMonsterMap(std::move(rhs.spawnedMonsterMap)), - checkSpawnMonsterEvent(rhs.checkSpawnMonsterEvent), centerPos(rhs.centerPos), radius(rhs.radius), interval(rhs.interval) { } - - SpawnMonster &operator=(SpawnMonster &&rhs) noexcept { - if (this != &rhs) { - spawnMonsterMap = std::move(rhs.spawnMonsterMap); - spawnedMonsterMap = std::move(rhs.spawnedMonsterMap); - - checkSpawnMonsterEvent = rhs.checkSpawnMonsterEvent; - centerPos = rhs.centerPos; - radius = rhs.radius; - interval = rhs.interval; - } - return *this; - } + SpawnMonster(SpawnMonster &&rhs) noexcept; + + SpawnMonster &operator=(SpawnMonster &&rhs) noexcept; bool addMonster(const std::string &name, const Position &pos, Direction dir, uint32_t interval, uint32_t weight = 1); - void removeMonster(std::shared_ptr monster); + void removeMonster(const std::shared_ptr &monster); void removeMonsters(); uint32_t getInterval() const { @@ -67,32 +54,27 @@ class SpawnMonster { void startSpawnMonsterCheck(); void stopEvent(); - bool isInSpawnMonsterZone(const Position &pos); + bool isInSpawnMonsterZone(const Position &pos) const; void cleanup(); - const Position &getCenterPos() const { - return centerPos; - } + const Position &getCenterPos() const; void setMonsterVariant(const std::string &variant); private: - // map of the spawned creatures + // The map of the spawned creatures std::map> spawnedMonsterMap; - - // map of creatures in the spawn + // The map of creatures in the spawn std::map spawnMonsterMap; - Position centerPos; int32_t radius; - uint32_t interval = 30000; uint32_t checkSpawnMonsterEvent = 0; static bool findPlayer(const Position &pos); - bool spawnMonster(uint32_t spawnMonsterId, spawnBlock_t &sb, std::shared_ptr monsterType, bool startup = false); + bool spawnMonster(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr &monsterType, bool startup = false); void checkSpawnMonster(); - void scheduleSpawn(uint32_t spawnMonsterId, spawnBlock_t &sb, std::shared_ptr monsterType, uint16_t interval, bool startup = false); + void scheduleSpawn(uint32_t spawnMonsterId, spawnBlock_t &sb, const std::shared_ptr &monsterType, uint16_t interval, bool startup = false); }; class SpawnsMonster { @@ -103,18 +85,12 @@ class SpawnsMonster { void startup(); void clear(); - bool isStarted() const { - return started; - } - bool isLoaded() const { - return loaded; - } - std::vector &getspawnMonsterList() { - return spawnMonsterList; - } + bool isStarted() const; + bool isLoaded() const; + std::vector> &getspawnMonsterList(); private: - std::vector spawnMonsterList; + std::vector> spawnMonsterList; std::string filemonstername; bool loaded = false; bool started = false; diff --git a/src/creatures/npcs/npc.cpp b/src/creatures/npcs/npc.cpp index 18ca0dd07..e2ab99a1d 100644 --- a/src/creatures/npcs/npc.cpp +++ b/src/creatures/npcs/npc.cpp @@ -7,16 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/npcs/npc.hpp" + +#include "config/configmanager.hpp" +#include "creatures/creature.hpp" #include "creatures/npcs/npcs.hpp" -#include "declarations.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "lua/callbacks/creaturecallback.hpp" #include "game/scheduling/dispatcher.hpp" -#include "map/spectators.hpp" #include "lib/metrics/metrics.hpp" +#include "lua/callbacks/creaturecallback.hpp" +#include "lua/global/shared_object.hpp" +#include "map/spectators.hpp" int32_t Npc::despawnRange; int32_t Npc::despawnRadius; @@ -37,7 +39,7 @@ Npc::Npc(const std::shared_ptr &npcType) : npcType(npcType) { defaultOutfit = npcType->info.outfit; currentOutfit = npcType->info.outfit; - float multiplier = g_configManager().getFloat(RATE_NPC_HEALTH, __FUNCTION__); + const float multiplier = g_configManager().getFloat(RATE_NPC_HEALTH); health = npcType->info.health * multiplier; healthMax = npcType->info.healthMax * multiplier; baseSpeed = npcType->info.baseSpeed; @@ -52,10 +54,96 @@ Npc::Npc(const std::shared_ptr &npcType) : } } +Npc &Npc::getInstance() { + return inject(); +} + +std::shared_ptr Npc::getNpc() { + return static_self_cast(); +} + +std::shared_ptr Npc::getNpc() const { + return static_self_cast(); +} + +void Npc::setID() { + if (id == 0) { + id = npcAutoID++; + } +} + void Npc::addList() { g_game().addNpc(static_self_cast()); } +const std::string &Npc::getName() const { + return npcType->name; +} + +// Real npc name, set on npc creation "createNpcType(typeName)" +const std::string &Npc::getTypeName() const { + return npcType->typeName; +} + +const std::string &Npc::getNameDescription() const { + return npcType->nameDescription; +} + +std::string Npc::getDescription(int32_t) { + return strDescription + '.'; +} + +void Npc::setName(std::string newName) const { + npcType->name = std::move(newName); +} + +CreatureType_t Npc::getType() const { + return CREATURETYPE_NPC; +} + +const Position &Npc::getMasterPos() const { + return masterPos; +} + +void Npc::setMasterPos(Position pos) { + masterPos = pos; +} + +uint8_t Npc::getSpeechBubble() const { + return npcType->info.speechBubble; +} + +void Npc::setSpeechBubble(const uint8_t bubble) const { + npcType->info.speechBubble = bubble; +} + +uint16_t Npc::getCurrency() const { + return npcType->info.currencyId; +} + +void Npc::setCurrency(uint16_t currency) { + npcType->info.currencyId = currency; +} + +const std::vector &Npc::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; +} + +bool Npc::isPushable() { + return npcType->info.pushable; +} + +bool Npc::isAttackable() const { + return false; +} + void Npc::removeList() { g_game().removeNpc(static_self_cast()); } @@ -67,15 +155,50 @@ bool Npc::canInteract(const Position &pos, uint32_t range /* = 4 */) { return Creature::canSee(getPosition(), pos, range, range); } -void Npc::onCreatureAppear(std::shared_ptr creature, bool isLogin) { +bool Npc::canSeeInvisibility() const { + return true; +} + +RespawnType Npc::getRespawnType() const { + return npcType->info.respawnType; +} + +void Npc::setSpawnNpc(const std::shared_ptr &newSpawn) { + spawnNpc = newSpawn; +} + +bool Npc::isInteractingWithPlayer(uint32_t playerId) { + if (playerInteractions.empty()) { + return false; + } + + if (!playerInteractions.contains(playerId)) { + return false; + } + return true; +} + +bool Npc::isPlayerInteractingOnTopic(uint32_t playerId, uint16_t topicId) { + if (playerInteractions.empty()) { + return false; + } + + auto it = playerInteractions.find(playerId); + if (it == playerInteractions.end()) { + return false; + } + return it->second == topicId; +} + +void Npc::onCreatureAppear(const std::shared_ptr &creature, bool isLogin) { Creature::onCreatureAppear(creature, isLogin); - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { onPlayerAppear(player); } // onCreatureAppear(self, creature) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.creatureAppearEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(creature); @@ -86,11 +209,11 @@ void Npc::onCreatureAppear(std::shared_ptr creature, bool isLogin) { } } -void Npc::onRemoveCreature(std::shared_ptr creature, bool isLogout) { +void Npc::onRemoveCreature(const std::shared_ptr &creature, bool isLogout) { Creature::onRemoveCreature(creature, isLogout); // onCreatureDisappear(self, creature) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.creatureDisappearEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(creature); @@ -100,7 +223,7 @@ void Npc::onRemoveCreature(std::shared_ptr creature, bool isLogout) { return; } - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { removeShopPlayer(player->getGUID()); onPlayerDisappear(player); } @@ -114,7 +237,7 @@ void Npc::onCreatureMove(const std::shared_ptr &creature, const std::s Creature::onCreatureMove(creature, newTile, newPos, oldTile, oldPos, teleport); // onCreatureMove(self, creature, oldPosition, newPosition) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.creatureMoveEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(creature); @@ -144,7 +267,7 @@ void Npc::manageIdle() { } } -void Npc::onPlayerAppear(std::shared_ptr player) { +void Npc::onPlayerAppear(const std::shared_ptr &player) { if (player->hasFlag(PlayerFlags_t::IgnoredByNpcs) || playerSpectators.contains(player)) { return; } @@ -152,7 +275,7 @@ void Npc::onPlayerAppear(std::shared_ptr player) { manageIdle(); } -void Npc::onPlayerDisappear(std::shared_ptr player) { +void Npc::onPlayerDisappear(const std::shared_ptr &player) { removePlayerInteraction(player); if (!player->hasFlag(PlayerFlags_t::IgnoredByNpcs) && playerSpectators.contains(player)) { playerSpectators.erase(player); @@ -160,7 +283,7 @@ void Npc::onPlayerDisappear(std::shared_ptr player) { } } -void Npc::onCreatureSay(std::shared_ptr creature, SpeakClasses type, const std::string &text) { +void Npc::onCreatureSay(const std::shared_ptr &creature, SpeakClasses type, const std::string &text) { Creature::onCreatureSay(creature, type, text); if (!creature->getPlayer()) { @@ -168,7 +291,7 @@ void Npc::onCreatureSay(std::shared_ptr creature, SpeakClasses type, c } // onCreatureSay(self, creature, type, message) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.creatureSayEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(creature); @@ -191,7 +314,7 @@ void Npc::onThinkSound(uint32_t interval) { soundTicks = 0; if (!npcType->info.soundVector.empty() && (npcType->info.soundChance >= static_cast(uniform_random(1, 100)))) { - auto index = uniform_random(0, npcType->info.soundVector.size() - 1); + const auto index = uniform_random(0, npcType->info.soundVector.size() - 1); g_game().sendSingleSoundEffect(static_self_cast()->getPosition(), npcType->info.soundVector[index], getNpc()); } } @@ -201,7 +324,7 @@ void Npc::onThink(uint32_t interval) { Creature::onThink(interval); // onThink(self, interval) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.thinkEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushNumber(interval); @@ -228,22 +351,22 @@ void Npc::onThink(uint32_t interval) { } } -void Npc::onPlayerBuyItem(std::shared_ptr player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore, bool inBackpacks) { +void Npc::onPlayerBuyItem(const std::shared_ptr &player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore, bool inBackpacks) { if (player == nullptr) { g_logger().error("[Npc::onPlayerBuyItem] - Player is nullptr"); return; } - // Check if the player not have empty slots - if (!ignore && player->getFreeBackpackSlots() == 0) { + // Check if the player not have empty slots or the item is not a container + if (!ignore && (player->getFreeBackpackSlots() == 0 && (player->getInventoryItem(CONST_SLOT_BACKPACK) || (!Item::items[itemId].isContainer() || !(Item::items[itemId].slotPosition & SLOTP_BACKPACK))))) { player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); return; } - uint32_t shoppingBagPrice = 20; - uint32_t shoppingBagSlots = 20; + constexpr uint32_t shoppingBagPrice = 20; + constexpr uint32_t shoppingBagSlots = 20; const ItemType &itemType = Item::items[itemId]; - if (std::shared_ptr tile = ignore ? player->getTile() : nullptr; tile) { + if (const std::shared_ptr &tile = ignore ? player->getTile() : nullptr; tile) { double slotsNedeed; if (itemType.stackable) { slotsNedeed = inBackpacks ? std::ceil(std::ceil(static_cast(amount) / itemType.stackSize) / shoppingBagSlots) : std::ceil(static_cast(amount) / itemType.stackSize); @@ -265,7 +388,7 @@ void Npc::onPlayerBuyItem(std::shared_ptr player, uint16_t itemId, uint8 } } - uint32_t totalCost = buyPrice * amount; + const uint32_t totalCost = buyPrice * amount; uint32_t bagsCost = 0; if (inBackpacks && itemType.stackable) { bagsCost = shoppingBagPrice * static_cast(std::ceil(std::ceil(static_cast(amount) / itemType.stackSize) / shoppingBagSlots)); @@ -285,7 +408,7 @@ void Npc::onPlayerBuyItem(std::shared_ptr player, uint16_t itemId, uint8 } // npc:onBuyItem(player, itemId, subType, amount, ignore, inBackpacks, totalCost) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.playerBuyEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(player); @@ -302,18 +425,18 @@ void Npc::onPlayerBuyItem(std::shared_ptr player, uint16_t itemId, uint8 } } -void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore) { +void Npc::onPlayerSellItem(const std::shared_ptr &player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore) { uint64_t totalPrice = 0; - onPlayerSellItem(std::move(player), itemId, subType, amount, ignore, totalPrice); + onPlayerSellItem(player, itemId, subType, amount, ignore, totalPrice); } void Npc::onPlayerSellAllLoot(uint32_t playerId, uint16_t itemId, bool ignore, uint64_t totalPrice) { - std::shared_ptr player = g_game().getPlayerByID(playerId); + const auto &player = g_game().getPlayerByID(playerId); if (!player) { return; } if (itemId == ITEM_GOLD_POUCH) { - auto container = player->getLootPouch(); + const auto &container = player->getLootPouch(); if (!container) { return; } @@ -325,7 +448,7 @@ void Npc::onPlayerSellAllLoot(uint32_t playerId, uint16_t itemId, bool ignore, u hasMore = true; break; } - auto item = *it; + const auto &item = *it; if (!item) { continue; } @@ -336,7 +459,7 @@ void Npc::onPlayerSellAllLoot(uint32_t playerId, uint16_t itemId, bool ignore, u toSellCount += item->getItemAmount(); } } - for (auto &[m_itemId, amount] : toSell) { + for (const auto &[m_itemId, amount] : toSell) { onPlayerSellItem(player, m_itemId, 0, amount, ignore, totalPrice, container); } auto ss = std::stringstream(); @@ -358,7 +481,7 @@ void Npc::onPlayerSellAllLoot(uint32_t playerId, uint16_t itemId, bool ignore, u } } -void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore, uint64_t &totalPrice, std::shared_ptr parent /*= nullptr*/) { +void Npc::onPlayerSellItem(const std::shared_ptr &player, uint16_t itemId, uint8_t subType, uint16_t amount, bool ignore, uint64_t &totalPrice, const std::shared_ptr &parent /*= nullptr*/) { if (!player) { return; } @@ -387,10 +510,21 @@ void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint continue; } + if (const auto &container = item->getContainer()) { + if (container->size() > 0) { + player->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You must empty the container before selling it."); + continue; + } + } + if (parent && item->getParent() != parent) { continue; } + if (!item->hasMarketAttributes()) { + continue; + } + auto removeCount = std::min(toRemove, item->getItemCount()); if (g_game().internalRemoveItem(item, removeCount) != RETURNVALUE_NOERROR) { @@ -405,19 +539,23 @@ void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint } auto totalRemoved = amount - toRemove; + if (totalRemoved == 0) { + return; + } + auto totalCost = static_cast(sellPrice * totalRemoved); g_logger().debug("[Npc::onPlayerSellItem] - Removing items from player {} amount {} of items with id {} on shop for npc {}", player->getName(), toRemove, itemId, getName()); if (totalRemoved > 0 && totalCost > 0) { if (getCurrency() == ITEM_GOLD_COIN) { totalPrice += totalCost; - if (g_configManager().getBoolean(AUTOBANK, __FUNCTION__)) { + if (g_configManager().getBoolean(AUTOBANK)) { player->setBankBalance(player->getBankBalance() + totalCost); } else { g_game().addMoney(player, totalCost); } g_metrics().addCounter("balance_increase", totalCost, { { "player", player->getName() }, { "context", "npc_sale" } }); } else { - std::shared_ptr newItem = Item::CreateItem(getCurrency(), totalCost); + const auto &newItem = Item::CreateItem(getCurrency(), totalCost); if (newItem) { g_game().internalPlayerAddItem(player, newItem, true); } @@ -425,7 +563,7 @@ void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint } // npc:onSellItem(player, itemId, subType, amount, ignore, itemName, totalCost) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.playerSellEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(player); @@ -442,13 +580,13 @@ void Npc::onPlayerSellItem(std::shared_ptr player, uint16_t itemId, uint } } -void Npc::onPlayerCheckItem(std::shared_ptr player, uint16_t itemId, uint8_t subType) { +void Npc::onPlayerCheckItem(const std::shared_ptr &player, uint16_t itemId, uint8_t subType) { if (!player) { return; } // onPlayerCheckItem(self, player, itemId, subType) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.playerLookEvent)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(player); @@ -461,14 +599,14 @@ void Npc::onPlayerCheckItem(std::shared_ptr player, uint16_t itemId, uin } } -void Npc::onPlayerCloseChannel(std::shared_ptr creature) { - std::shared_ptr player = creature->getPlayer(); +void Npc::onPlayerCloseChannel(const std::shared_ptr &creature) { + const auto &player = creature->getPlayer(); if (!player) { return; } // onPlayerCloseChannel(npc, player) - CreatureCallback callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); + auto callback = CreatureCallback(npcType->info.scriptInterface, getNpc()); if (callback.startScriptInterface(npcType->info.playerCloseChannel)) { callback.pushSpecificCreature(static_self_cast()); callback.pushCreature(player); @@ -491,13 +629,13 @@ void Npc::onThinkYell(uint32_t interval) { yellTicks = 0; if (!npcType->info.voiceVector.empty() && (npcType->info.yellChance >= static_cast(uniform_random(1, 100)))) { - uint32_t index = uniform_random(0, npcType->info.voiceVector.size() - 1); - const voiceBlock_t &vb = npcType->info.voiceVector[index]; + const uint32_t index = uniform_random(0, npcType->info.voiceVector.size() - 1); + const auto &[text, yellText] = npcType->info.voiceVector[index]; - if (vb.yellText) { - g_game().internalCreatureSay(static_self_cast(), TALKTYPE_YELL, vb.text, false); + if (yellText) { + g_game().internalCreatureSay(static_self_cast(), TALKTYPE_YELL, text, false); } else { - g_game().internalCreatureSay(static_self_cast(), TALKTYPE_SAY, vb.text, false); + g_game().internalCreatureSay(static_self_cast(), TALKTYPE_SAY, text, false); } } } @@ -539,7 +677,7 @@ void Npc::onPlacedCreature() { } void Npc::loadPlayerSpectators() { - auto spec = Spectators().find(position, true); + const auto &spec = Spectators().find(position, true); for (const auto &creature : spec) { if (!creature->getPlayer()->hasFlag(PlayerFlags_t::IgnoredByNpcs)) { playerSpectators.emplace(creature->getPlayer()); @@ -572,21 +710,32 @@ bool Npc::isInSpawnRange(const Position &pos) const { } void Npc::setPlayerInteraction(uint32_t playerId, uint16_t topicId /*= 0*/) { - std::shared_ptr creature = g_game().getCreatureByID(playerId); + const auto &creature = g_game().getCreatureByID(playerId); if (!creature) { return; } - turnToCreature(creature); + if (playerInteractionsOrder.empty() || std::ranges::find(playerInteractionsOrder, playerId) == playerInteractionsOrder.end()) { + playerInteractionsOrder.emplace_back(playerId); + turnToCreature(creature); + } playerInteractions[playerId] = topicId; } -void Npc::removePlayerInteraction(std::shared_ptr player) { +void Npc::removePlayerInteraction(const std::shared_ptr &player) { + auto view = std::ranges::remove(playerInteractionsOrder, player->getID()); + playerInteractionsOrder.erase(view.begin(), view.end()); if (playerInteractions.contains(player->getID())) { playerInteractions.erase(player->getID()); player->closeShopWindow(); } + + if (!playerInteractionsOrder.empty()) { + if (const auto &creature = g_game().getCreatureByID(playerInteractionsOrder.back())) { + turnToCreature(creature); + } + } } void Npc::resetPlayerInteractions() { @@ -598,12 +747,12 @@ bool Npc::canWalkTo(const Position &fromPos, Direction dir) { return false; } - Position toPos = getNextPosition(dir, fromPos); + const Position toPos = getNextPosition(dir, fromPos); if (!SpawnsNpc::isInZone(masterPos, npcType->info.walkRadius, toPos)) { return false; } - std::shared_ptr toTile = g_game().map.getTile(toPos); + const auto &toTile = g_game().map.getTile(toPos); if (!toTile || toTile->queryAdd(0, getNpc(), 1, 0) != RETURNVALUE_NOERROR) { return false; } @@ -633,7 +782,7 @@ bool Npc::getRandomStep(Direction &moveDirection) { std::ranges::shuffle(directionvector, getRandomGenerator()); for (const Position &creaturePos = getPosition(); - Direction direction : directionvector) { + const Direction &direction : directionvector) { if (canWalkTo(creaturePos, direction)) { moveDirection = direction; return true; @@ -642,8 +791,12 @@ bool Npc::getRandomStep(Direction &moveDirection) { return false; } +void Npc::setNormalCreatureLight() { + internalLight = npcType->info.light; +} + bool Npc::isShopPlayer(uint32_t playerGUID) const { - return shopPlayers.find(playerGUID) != shopPlayers.end(); + return shopPlayers.contains(playerGUID); } void Npc::addShopPlayer(uint32_t playerGUID, const std::vector &shopItems) { @@ -655,7 +808,7 @@ void Npc::removeShopPlayer(uint32_t playerGUID) { } void Npc::closeAllShopWindows() { - for (const auto &[playerGUID, shopBlock] : shopPlayers) { + for (const auto &playerGUID : shopPlayers | std::views::keys) { const auto &player = g_game().getPlayerByGUID(playerGUID); if (player) { player->closeShopWindow(); @@ -664,10 +817,13 @@ void Npc::closeAllShopWindows() { shopPlayers.clear(); } -void Npc::handlePlayerMove(std::shared_ptr player, const Position &newPos) { +void Npc::handlePlayerMove(const std::shared_ptr &player, const Position &newPos) { if (!canInteract(newPos)) { - removePlayerInteraction(player); + onPlayerCloseChannel(player); + } else if (canInteract(newPos) && !playerInteractionsOrder.empty() && playerInteractionsOrder.back() == player->getID()) { + turnToCreature(player); } + if (canSee(newPos)) { onPlayerAppear(player); } else { diff --git a/src/creatures/npcs/npc.hpp b/src/creatures/npcs/npc.hpp index c246aa4b6..dc3e16961 100644 --- a/src/creatures/npcs/npc.hpp +++ b/src/creatures/npcs/npc.hpp @@ -9,12 +9,13 @@ #pragma once -#include "creatures/npcs/npcs.hpp" -#include "creatures/players/player.hpp" -#include "declarations.hpp" -#include "items/tile.hpp" -#include "lib/di/container.hpp" +#include "creatures/creature.hpp" +enum Direction : uint8_t; +struct Position; +class NpcType; +class Player; +class Tile; class Creature; class Game; class SpawnNpc; @@ -32,138 +33,71 @@ class Npc final : public Creature { Npc(const Npc &) = delete; void operator=(const std::shared_ptr &) = delete; - static Npc &getInstance() { - return inject(); - } + static Npc &getInstance(); - std::shared_ptr getNpc() override { - return static_self_cast(); - } - std::shared_ptr getNpc() const override { - return static_self_cast(); - } + std::shared_ptr getNpc() override; + std::shared_ptr getNpc() const override; - void setID() override { - if (id == 0) { - id = npcAutoID++; - } - } + void setID() override; void removeList() override; void addList() override; - const std::string &getName() const override { - return npcType->name; - } + const std::string &getName() const override; // Real npc name, set on npc creation "createNpcType(typeName)" - const std::string &getTypeName() const override { - return npcType->typeName; - } - const std::string &getNameDescription() const override { - return npcType->nameDescription; - } - std::string getDescription(int32_t) override { - return strDescription + '.'; - } - - void setName(std::string newName) { - npcType->name = std::move(newName); - } - - CreatureType_t getType() const override { - return CREATURETYPE_NPC; - } - - const Position &getMasterPos() const { - return masterPos; - } - void setMasterPos(Position pos) { - masterPos = pos; - } - - uint8_t getSpeechBubble() const override { - return npcType->info.speechBubble; - } - void setSpeechBubble(const uint8_t bubble) { - npcType->info.speechBubble = bubble; - } - - uint16_t getCurrency() const { - return npcType->info.currencyId; - } - void setCurrency(uint16_t currency) { - npcType->info.currencyId = currency; - } - - 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; - } - - bool isPushable() override { - return npcType->info.pushable; - } - - bool isAttackable() const override { - return false; - } + const std::string &getTypeName() const override; + const std::string &getNameDescription() const override; + std::string getDescription(int32_t) override; + + void setName(std::string newName) const; + + CreatureType_t getType() const override; + + const Position &getMasterPos() const; + void setMasterPos(Position pos); + + uint8_t getSpeechBubble() const override; + void setSpeechBubble(const uint8_t bubble) const; + + uint16_t getCurrency() const; + void setCurrency(uint16_t currency); + + const std::vector &getShopItemVector(uint32_t playerGUID) const; + + bool isPushable() override; + + bool isAttackable() const override; bool canInteract(const Position &pos, uint32_t range = 4); - bool canSeeInvisibility() const override { - return true; - } - RespawnType getRespawnType() const { - return npcType->info.respawnType; - } - void setSpawnNpc(const std::shared_ptr &newSpawn) { - spawnNpc = newSpawn; - } + bool canSeeInvisibility() const override; + RespawnType getRespawnType() const; + void setSpawnNpc(const std::shared_ptr &newSpawn); void setPlayerInteraction(uint32_t playerId, uint16_t topicId = 0); - void removePlayerInteraction(std::shared_ptr player); + void removePlayerInteraction(const std::shared_ptr &player); void resetPlayerInteractions(); - bool isInteractingWithPlayer(uint32_t playerId) { - if (playerInteractions.find(playerId) == playerInteractions.end()) { - return false; - } - return true; - } - - bool isPlayerInteractingOnTopic(uint32_t playerId, uint16_t topicId) { - auto it = playerInteractions.find(playerId); - if (it == playerInteractions.end()) { - return false; - } - return it->second == topicId; - } - - void onCreatureAppear(std::shared_ptr creature, bool isLogin) override; - void onRemoveCreature(std::shared_ptr creature, bool isLogout) override; + bool isInteractingWithPlayer(uint32_t playerId); + bool isPlayerInteractingOnTopic(uint32_t playerId, uint16_t topicId); + + void onCreatureAppear(const std::shared_ptr &creature, bool isLogin) override; + void onRemoveCreature(const 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 onCreatureSay(std::shared_ptr creature, SpeakClasses type, const std::string &text) override; + void onCreatureSay(const std::shared_ptr &creature, SpeakClasses type, const std::string &text) override; void onThink(uint32_t interval) override; - void onPlayerBuyItem(std::shared_ptr player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore, bool inBackpacks); + void onPlayerBuyItem(const std::shared_ptr &player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore, bool inBackpacks); void onPlayerSellAllLoot(uint32_t playerId, uint16_t itemid, bool ignore, uint64_t totalPrice); - void onPlayerSellItem(std::shared_ptr player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore); - void onPlayerSellItem(std::shared_ptr player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore, uint64_t &totalPrice, std::shared_ptr parent = nullptr); - void onPlayerCheckItem(std::shared_ptr player, uint16_t itemid, uint8_t count); - void onPlayerCloseChannel(std::shared_ptr creature); + void onPlayerSellItem(const std::shared_ptr &player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore); + void onPlayerSellItem(const std::shared_ptr &player, uint16_t itemid, uint8_t count, uint16_t amount, bool ignore, uint64_t &totalPrice, const std::shared_ptr &parent = nullptr); + void onPlayerCheckItem(const std::shared_ptr &player, uint16_t itemid, uint8_t count); + void onPlayerCloseChannel(const std::shared_ptr &creature); void onPlacedCreature() override; bool canWalkTo(const Position &fromPos, Direction dir); bool getNextStep(Direction &nextDirection, uint32_t &flags) override; bool getRandomStep(Direction &moveDirection); - void setNormalCreatureLight() override { - internalLight = npcType->info.light; - } + void setNormalCreatureLight() override; bool isShopPlayer(uint32_t playerGUID) const; @@ -184,6 +118,8 @@ class Npc final : public Creature { std::string strDescription; + std::vector playerInteractionsOrder; + std::map playerInteractions; std::unordered_map> shopPlayers; @@ -205,10 +141,10 @@ class Npc final : public Creature { friend class LuaScriptInterface; friend class Map; - void onPlayerAppear(std::shared_ptr player); - void onPlayerDisappear(std::shared_ptr player); + void onPlayerAppear(const std::shared_ptr &player); + void onPlayerDisappear(const std::shared_ptr &player); void manageIdle(); - void handlePlayerMove(std::shared_ptr player, const Position &newPos); + void handlePlayerMove(const std::shared_ptr &player, const Position &newPos); void loadPlayerSpectators(); }; diff --git a/src/creatures/npcs/npcs.cpp b/src/creatures/npcs/npcs.cpp index 6fe7f0b83..cff44588d 100644 --- a/src/creatures/npcs/npcs.cpp +++ b/src/creatures/npcs/npcs.cpp @@ -7,19 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "creatures/npcs/npcs.hpp" -#include "declarations.hpp" -#include "creatures/combat/combat.hpp" +#include "config/configmanager.hpp" +#include "game/game.hpp" #include "lua/scripts/lua_environment.hpp" -#include "creatures/combat/spells.hpp" -#include "creatures/npcs/npcs.hpp" +#include "lua/scripts/luascript.hpp" #include "lua/scripts/scripts.hpp" -#include "game/game.hpp" -bool NpcType::canSpawn(const Position &pos) { +bool NpcType::canSpawn(const Position &pos) const { bool canSpawn = true; - bool isDay = g_game().gameIsDay(); + const bool isDay = g_game().gameIsDay(); if ((isDay && info.respawnType.period == RESPAWNPERIOD_NIGHT) || (!isDay && info.respawnType.period == RESPAWNPERIOD_DAY)) { // It will ignore day and night if underground @@ -30,7 +28,7 @@ bool NpcType::canSpawn(const Position &pos) { } bool NpcType::loadCallback(LuaScriptInterface* scriptInterface) { - int32_t id = scriptInterface->getEvent(); + const int32_t id = scriptInterface->getEvent(); if (id == -1) { g_logger().warn("[NpcType::loadCallback] - Event not found"); return false; @@ -84,32 +82,32 @@ void NpcType::loadShop(const std::shared_ptr &npcType, ShopBlock shopBl } // Check if the item already exists in the shop vector and ignore it - if (std::any_of(npcType->info.shopItemVector.begin(), npcType->info.shopItemVector.end(), [&shopBlock](const auto &shopIterator) { + if (std::ranges::any_of(npcType->info.shopItemVector, [&shopBlock](const auto &shopIterator) { return shopIterator == shopBlock; })) { return; } if (shopBlock.childShop.empty()) { - bool isContainer = iType.isContainer(); + const bool &isContainer = iType.isContainer(); if (isContainer) { for (const ShopBlock &child : shopBlock.childShop) { shopBlock.childShop.push_back(child); } } } - npcType->info.shopItemVector.push_back(shopBlock); + npcType->info.shopItemVector.emplace_back(shopBlock); info.speechBubble = SPEECHBUBBLE_TRADE; } bool Npcs::load(bool loadLibs /* = true*/, bool loadNpcs /* = true*/, bool reloading /* = false*/) const { if (loadLibs) { - auto coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + const auto coreFolder = g_configManager().getString(CORE_DIRECTORY); return g_luaEnvironment().loadFile(coreFolder + "/npclib/load.lua", "load.lua") == 0; } if (loadNpcs) { - auto datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); + const auto datapackFolder = g_configManager().getString(DATA_DIRECTORY); return g_scripts().loadScripts(datapackFolder + "/npc", false, reloading); } return false; @@ -131,8 +129,12 @@ bool Npcs::reload() { return false; } +Npcs &Npcs::getInstance() { + return inject(); +} + std::shared_ptr Npcs::getNpcType(const std::string &name, bool create /* = false*/) { - std::string key = asLowerCaseString(name); + const std::string key = asLowerCaseString(name); auto it = npcs.find(key); if (it != npcs.end()) { diff --git a/src/creatures/npcs/npcs.hpp b/src/creatures/npcs/npcs.hpp index ab5e700ca..b91e1547c 100644 --- a/src/creatures/npcs/npcs.hpp +++ b/src/creatures/npcs/npcs.hpp @@ -9,8 +9,10 @@ #pragma once -#include "creatures/creature.hpp" -#include "lib/di/container.hpp" +#include "creatures/creatures_definitions.hpp" +#include "utils/utils_definitions.hpp" + +class LuaScriptInterface; class Shop { public: @@ -23,7 +25,7 @@ class Shop { ShopBlock shopBlock; }; -class NpcType : public SharedObject { +class NpcType final : public SharedObject { struct NpcInfo { LuaScriptInterface* scriptInterface {}; @@ -90,7 +92,7 @@ class NpcType : public SharedObject { void loadShop(const std::shared_ptr &npcType, ShopBlock shopBlock); bool loadCallback(LuaScriptInterface* scriptInterface); - bool canSpawn(const Position &pos); + bool canSpawn(const Position &pos) const; }; class Npcs { @@ -100,9 +102,7 @@ class Npcs { Npcs(const Npcs &) = delete; Npcs &operator=(const Npcs &) = delete; - static Npcs &getInstance() { - return inject(); - } + static Npcs &getInstance(); std::shared_ptr getNpcType(const std::string &name, bool create = false); diff --git a/src/creatures/npcs/spawns/spawn_npc.cpp b/src/creatures/npcs/spawns/spawn_npc.cpp index 694822c23..bf3b6a1bc 100644 --- a/src/creatures/npcs/spawns/spawn_npc.cpp +++ b/src/creatures/npcs/spawns/spawn_npc.cpp @@ -7,17 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/npcs/spawns/spawn_npc.hpp" + #include "creatures/npcs/npc.hpp" +#include "creatures/npcs/npcs.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" -#include "lua/creature/events.hpp" #include "lua/callbacks/event_callback.hpp" #include "lua/callbacks/events_callbacks.hpp" -#include "utils/pugicast.hpp" +#include "lua/creature/events.hpp" #include "map/spectators.hpp" +#include "utils/pugicast.hpp" static constexpr int32_t MINSPAWN_INTERVAL = 1000; // 1 second static constexpr int32_t MAXSPAWN_INTERVAL = 86400000; // 1 day @@ -28,7 +29,7 @@ bool SpawnsNpc::loadFromXml(const std::string &fileNpcName) { } pugi::xml_document doc; - pugi::xml_parse_result result = doc.load_file(fileNpcName.c_str()); + const pugi::xml_parse_result result = doc.load_file(fileNpcName.c_str()); if (!result) { printXMLError(__FUNCTION__, fileNpcName, result); return false; @@ -37,7 +38,7 @@ bool SpawnsNpc::loadFromXml(const std::string &fileNpcName) { setFileName(fileNpcName); setLoaded(true); - for (auto spawnNode : doc.child("npcs").children()) { + for (const auto &spawnNode : doc.child("npcs").children()) { Position centerPos( pugi::cast(spawnNode.attribute("centerx").value()), pugi::cast(spawnNode.attribute("centery").value()), @@ -59,7 +60,7 @@ bool SpawnsNpc::loadFromXml(const std::string &fileNpcName) { const auto &spawnNpc = spawnNpcList.emplace_back(std::make_shared(centerPos, radius)); - for (auto childNode : spawnNode.children()) { + for (const auto &childNode : spawnNode.children()) { if (strcasecmp(childNode.name(), "npc") == 0) { pugi::xml_attribute nameAttribute = childNode.attribute("name"); if (!nameAttribute) { @@ -75,14 +76,14 @@ bool SpawnsNpc::loadFromXml(const std::string &fileNpcName) { dir = DIRECTION_NORTH; } - auto xOffset = pugi::cast(childNode.attribute("x").value()); - auto yOffset = pugi::cast(childNode.attribute("y").value()); + const auto xOffset = pugi::cast(childNode.attribute("x").value()); + const auto yOffset = pugi::cast(childNode.attribute("y").value()); Position pos( static_cast(centerPos.x + xOffset), static_cast(centerPos.y + yOffset), centerPos.z ); - int64_t interval = pugi::cast(childNode.attribute("spawntime").value()) * 1000; + const int64_t interval = pugi::cast(childNode.attribute("spawntime").value()) * 1000; if (interval >= MINSPAWN_INTERVAL && interval <= MAXSPAWN_INTERVAL) { spawnNpc->addNpc(nameAttribute.as_string(), pos, dir, static_cast(interval)); } else { @@ -121,6 +122,30 @@ void SpawnsNpc::clear() { fileName.clear(); } +bool SpawnsNpc::isStarted() const { + return started; +} + +bool SpawnsNpc::setStarted(bool setStarted) { + return started = setStarted; +} + +bool SpawnsNpc::isLoaded() const { + return loaded; +} + +bool SpawnsNpc::setLoaded(bool setLoaded) { + return loaded = setLoaded; +} + +std::string SpawnsNpc::setFileName(std::string setName) { + return fileName = std::move(setName); +} + +std::vector> &SpawnsNpc::getSpawnNpcList() { + return spawnNpcList; +} + bool SpawnsNpc::isInZone(const Position ¢erPos, int32_t radius, const Position &pos) { if (radius == -1) { return true; @@ -138,8 +163,11 @@ void SpawnNpc::startSpawnNpcCheck() { } SpawnNpc::~SpawnNpc() { - for (const auto &it : spawnedNpcMap) { - auto npc = it.second; + for (const auto &[spawnId, npc] : spawnedNpcMap) { + if (spawnId == 0) { + continue; + } + npc->setSpawnNpc(nullptr); } } @@ -151,7 +179,7 @@ bool SpawnNpc::findPlayer(const Position &pos) { }); } -bool SpawnNpc::isInSpawnNpcZone(const Position &pos) { +bool SpawnNpc::isInSpawnNpcZone(const Position &pos) const { return SpawnsNpc::isInZone(centerPos, radius, pos); } @@ -180,11 +208,18 @@ bool SpawnNpc::spawnNpc(uint32_t spawnId, const std::shared_ptr &npcTyp return true; } +uint32_t SpawnNpc::getInterval() const { + return interval; +} + void SpawnNpc::startup() { - for (const auto &it : spawnNpcMap) { - uint32_t spawnId = it.first; - const spawnBlockNpc_t &sb = it.second; - spawnNpc(spawnId, sb.npcType, sb.pos, sb.direction, true); + for (const auto &[spawnId, npcInfo] : spawnNpcMap) { + if (spawnId == 0) { + continue; + } + + const auto &[pos, npcType, lastSpawnNpc, _, direction] = npcInfo; + spawnNpc(spawnId, npcType, pos, direction, true); } } @@ -193,25 +228,24 @@ void SpawnNpc::checkSpawnNpc() { cleanup(); - for (auto &it : spawnNpcMap) { - uint32_t spawnId = it.first; - if (spawnedNpcMap.find(spawnId) != spawnedNpcMap.end()) { + for (auto &[spawnId, npcInfo] : spawnNpcMap) { + if (spawnedNpcMap.contains(spawnId)) { continue; } - spawnBlockNpc_t &sb = it.second; - if (!sb.npcType->canSpawn(sb.pos)) { - sb.lastSpawnNpc = OTSYS_TIME(); + auto &[pos, npcType, lastSpawnNpc, mapInterval, direction] = npcInfo; + if (!npcType->canSpawn(pos)) { + lastSpawnNpc = OTSYS_TIME(); continue; } - if (OTSYS_TIME() >= sb.lastSpawnNpc + sb.interval) { - if (findPlayer(sb.pos)) { - sb.lastSpawnNpc = OTSYS_TIME(); + if (OTSYS_TIME() >= lastSpawnNpc + mapInterval) { + if (findPlayer(pos)) { + lastSpawnNpc = OTSYS_TIME(); continue; } - scheduleSpawnNpc(spawnId, sb, 3 * NONBLOCKABLE_SPAWN_NPC_INTERVAL); + scheduleSpawnNpc(spawnId, npcInfo, 3 * NONBLOCKABLE_SPAWN_NPC_INTERVAL); } } @@ -237,7 +271,7 @@ void SpawnNpc::cleanup() { auto it = spawnedNpcMap.begin(); while (it != spawnedNpcMap.end()) { uint32_t spawnId = it->first; - auto npc = it->second; + const auto &npc = it->second; if (npc->isRemoved()) { spawnNpcMap[spawnId].lastSpawnNpc = OTSYS_TIME(); it = spawnedNpcMap.erase(it); @@ -263,12 +297,12 @@ bool SpawnNpc::addNpc(const std::string &name, const Position &pos, Direction di sb.interval = scheduleInterval; sb.lastSpawnNpc = 0; - uint32_t spawnId = spawnNpcMap.size() + 1; + const uint32_t spawnId = spawnNpcMap.size() + 1; spawnNpcMap[spawnId] = sb; return true; } -void SpawnNpc::removeNpc(std::shared_ptr npc) { +void SpawnNpc::removeNpc(const std::shared_ptr &npc) { for (auto it = spawnedNpcMap.begin(), end = spawnedNpcMap.end(); it != end; ++it) { if (it->second == npc) { spawnedNpcMap.erase(it); diff --git a/src/creatures/npcs/spawns/spawn_npc.hpp b/src/creatures/npcs/spawns/spawn_npc.hpp index b0d0ab862..38bbb55ae 100644 --- a/src/creatures/npcs/spawns/spawn_npc.hpp +++ b/src/creatures/npcs/spawns/spawn_npc.hpp @@ -10,7 +10,6 @@ #pragma once #include "game/movement/position.hpp" -#include "items/tile.hpp" class Npc; class NpcType; @@ -23,28 +22,26 @@ struct spawnBlockNpc_t { Direction direction; }; -class SpawnNpc : public SharedObject { +class SpawnNpc final : public SharedObject { public: SpawnNpc(Position initPos, int32_t initRadius) : centerPos(initPos), radius(initRadius) { } - ~SpawnNpc(); + ~SpawnNpc() override; // non-copyable SpawnNpc(const SpawnNpc &) = delete; SpawnNpc &operator=(const SpawnNpc &) = delete; bool addNpc(const std::string &name, const Position &pos, Direction dir, uint32_t interval); - void removeNpc(std::shared_ptr npc); + void removeNpc(const std::shared_ptr &npc); - uint32_t getInterval() const { - return interval; - } + uint32_t getInterval() const; void startup(); void startSpawnNpcCheck(); void stopEvent(); - bool isInSpawnNpcZone(const Position &pos); + bool isInSpawnNpcZone(const Position &pos) const; void cleanup(); private: @@ -76,27 +73,15 @@ class SpawnsNpc { void startup(); void clear(); - bool isStarted() const { - return started; - } - bool setStarted(bool setStarted) { - return started = setStarted; - } - - bool isLoaded() const { - return loaded; - } - bool setLoaded(bool setLoaded) { - return loaded = setLoaded; - } - - std::string setFileName(std::string setName) { - return fileName = std::move(setName); - } - - std::vector> &getSpawnNpcList() { - return spawnNpcList; - } + bool isStarted() const; + bool setStarted(bool setStarted); + + bool isLoaded() const; + bool setLoaded(bool setLoaded); + + std::string setFileName(std::string setName); + + std::vector> &getSpawnNpcList(); private: std::vector> spawnNpcList; diff --git a/src/creatures/players/achievement/player_achievement.cpp b/src/creatures/players/achievement/player_achievement.cpp index cd0735ab5..0be4244b2 100644 --- a/src/creatures/players/achievement/player_achievement.cpp +++ b/src/creatures/players/achievement/player_achievement.cpp @@ -7,9 +7,7 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "player_achievement.hpp" +#include "creatures/players/achievement/player_achievement.hpp" #include "creatures/players/player.hpp" #include "game/game.hpp" @@ -23,7 +21,7 @@ bool PlayerAchievement::add(uint16_t id, bool message /* = true*/, uint32_t time return false; } - const Achievement &achievement = g_game().getAchievementById(id); + const auto &achievement = g_game().getAchievementById(id); if (achievement.id == 0) { return false; } @@ -45,12 +43,12 @@ bool PlayerAchievement::remove(uint16_t id) { return false; } - Achievement achievement = g_game().getAchievementById(id); + const auto achievement = g_game().getAchievementById(id); if (achievement.id == 0) { return false; } - if (auto it = std::find_if(m_achievementsUnlocked.begin(), m_achievementsUnlocked.end(), [id](auto achievement_it) { + if (auto it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) { return achievement_it.first == id; }); it != m_achievementsUnlocked.end()) { @@ -69,7 +67,7 @@ bool PlayerAchievement::isUnlocked(uint16_t id) const { return false; } - if (auto it = std::find_if(m_achievementsUnlocked.begin(), m_achievementsUnlocked.end(), [id](auto achievement_it) { + if (auto it = std::ranges::find_if(m_achievementsUnlocked, [id](auto achievement_it) { return achievement_it.first == id; }); it != m_achievementsUnlocked.end()) { @@ -80,17 +78,17 @@ bool PlayerAchievement::isUnlocked(uint16_t id) const { } uint16_t PlayerAchievement::getPoints() const { - auto kvScoped = m_player.kv()->scoped("achievements")->get("points"); + const auto kvScoped = m_player.kv()->scoped("achievements")->get("points"); return kvScoped ? static_cast(kvScoped->getNumber()) : 0; } -void PlayerAchievement::addPoints(uint16_t toAddPoints) { - auto oldPoints = getPoints(); +void PlayerAchievement::addPoints(uint16_t toAddPoints) const { + const auto oldPoints = getPoints(); m_player.kv()->scoped("achievements")->set("points", oldPoints + toAddPoints); } -void PlayerAchievement::removePoints(uint16_t points) { - auto oldPoints = getPoints(); +void PlayerAchievement::removePoints(uint16_t points) const { + const auto oldPoints = getPoints(); m_player.kv()->scoped("achievements")->set("points", oldPoints - std::min(oldPoints, points)); } @@ -114,11 +112,11 @@ void PlayerAchievement::loadUnlockedAchievements() { } } -void PlayerAchievement::sendUnlockedSecretAchievements() { +void PlayerAchievement::sendUnlockedSecretAchievements() const { std::vector> achievementsUnlocked; uint16_t unlockedSecret = 0; for (const auto &[achievId, achievCreatedTime] : getUnlockedAchievements()) { - Achievement achievement = g_game().getAchievementById(achievId); + const auto &achievement = g_game().getAchievementById(achievId); if (achievement.id == 0) { continue; } diff --git a/src/creatures/players/achievement/player_achievement.hpp b/src/creatures/players/achievement/player_achievement.hpp index e0c027e58..946be626e 100644 --- a/src/creatures/players/achievement/player_achievement.hpp +++ b/src/creatures/players/achievement/player_achievement.hpp @@ -15,8 +15,8 @@ class KV; struct Achievement { Achievement() = default; - std::string name; - std::string description; + std::string name {}; + std::string description {}; bool secret = false; @@ -33,11 +33,11 @@ class PlayerAchievement { bool remove(uint16_t id); [[nodiscard]] bool isUnlocked(uint16_t id) const; [[nodiscard]] uint16_t getPoints() const; - void addPoints(uint16_t toAddPoints); - void removePoints(uint16_t toRemovePoints); + void addPoints(uint16_t toAddPoints) const; + void removePoints(uint16_t toRemovePoints) const; [[nodiscard]] std::vector> getUnlockedAchievements() const; void loadUnlockedAchievements(); - void sendUnlockedSecretAchievements(); + void sendUnlockedSecretAchievements() const; const std::shared_ptr &getUnlockedKV(); private: diff --git a/src/creatures/players/cyclopedia/player_badge.cpp b/src/creatures/players/cyclopedia/player_badge.cpp index 639640b2f..c27e98cb1 100644 --- a/src/creatures/players/cyclopedia/player_badge.cpp +++ b/src/creatures/players/cyclopedia/player_badge.cpp @@ -7,11 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "player_badge.hpp" +#include "creatures/players/cyclopedia/player_badge.hpp" +#include "account/account.hpp" #include "creatures/players/player.hpp" +#include "enums/account_errors.hpp" +#include "enums/player_cyclopedia.hpp" #include "game/game.hpp" #include "kv/kv.hpp" @@ -23,7 +24,7 @@ bool PlayerBadge::hasBadge(uint8_t id) const { return false; } - if (auto it = std::find_if(m_badgesUnlocked.begin(), m_badgesUnlocked.end(), [id](auto badge_it) { + if (auto it = std::ranges::find_if(m_badgesUnlocked, [id](auto badge_it) { return badge_it.first.m_id == id; }); it != m_badgesUnlocked.end()) { @@ -107,30 +108,61 @@ const std::shared_ptr &PlayerBadge::getUnlockedKV() { } // Badge Calculate Functions -bool PlayerBadge::accountAge(uint8_t amount) { +bool PlayerBadge::accountAge(uint8_t amount) const { return std::floor(m_player.getLoyaltyPoints() / 365) >= amount; } -bool PlayerBadge::loyalty(uint8_t amount) { +bool PlayerBadge::loyalty(uint8_t amount) const { return m_player.getLoyaltyPoints() >= amount; } -bool PlayerBadge::accountAllLevel(uint8_t amount) { - const auto &players = g_game().getPlayersByAccount(m_player.getAccount(), true); +std::vector> PlayerBadge::getPlayersInfoByAccount(const std::shared_ptr &acc) const { + const auto [accountPlayers, error] = acc->getAccountPlayers(); + if (error != AccountErrors_t::Ok || accountPlayers.empty()) { + return {}; + } + + std::string namesList; + for (const auto &[name, _] : accountPlayers) { + if (!namesList.empty()) { + namesList += ", "; + } + std::string escapedName = g_database().escapeString(name); + namesList += fmt::format("{}", escapedName); + } + + auto query = fmt::format("SELECT name, level, vocation FROM players WHERE name IN ({})", namesList); + std::vector> players; + DBResult_ptr result = g_database().storeQuery(query); + if (result) { + do { + auto player = std::make_shared(nullptr); + player->setName(result->getString("name")); + player->setLevel(result->getNumber("level")); + player->setVocation(result->getNumber("vocation")); + players.push_back(player); + } while (result->next()); + } + + return players; +} + +bool PlayerBadge::accountAllLevel(uint8_t amount) const { + auto players = getPlayersInfoByAccount(m_player.getAccount()); uint16_t total = std::accumulate(players.begin(), players.end(), 0, [](uint16_t sum, const std::shared_ptr &player) { return sum + player->getLevel(); }); return total >= amount; } -bool PlayerBadge::accountAllVocations(uint8_t amount) { +bool PlayerBadge::accountAllVocations(uint8_t amount) const { auto knight = false; auto paladin = false; auto druid = false; auto sorcerer = false; - for (const auto &player : g_game().getPlayersByAccount(m_player.getAccount(), true)) { + for (const auto &player : getPlayersInfoByAccount(m_player.getAccount())) { if (player->getLevel() >= amount) { - auto vocationEnum = player->getPlayerVocationEnum(); + const auto &vocationEnum = player->getPlayerVocationEnum(); if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { knight = true; } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { @@ -145,12 +177,12 @@ bool PlayerBadge::accountAllVocations(uint8_t amount) { return knight && paladin && druid && sorcerer; } -bool PlayerBadge::tournamentParticipation(uint8_t skill) { +bool PlayerBadge::tournamentParticipation(uint8_t skill) const { // todo check if is used return false; } -bool PlayerBadge::tournamentPoints(uint8_t race) { +bool PlayerBadge::tournamentPoints(uint8_t race) const { // todo check if is used return false; } diff --git a/src/creatures/players/cyclopedia/player_badge.hpp b/src/creatures/players/cyclopedia/player_badge.hpp index 7bf28c0c3..cc8135b41 100644 --- a/src/creatures/players/cyclopedia/player_badge.hpp +++ b/src/creatures/players/cyclopedia/player_badge.hpp @@ -9,15 +9,16 @@ #pragma once -#include "enums/player_cyclopedia.hpp" - class Player; class KV; +class Account; + +enum class CyclopediaBadge_t : uint8_t; struct Badge { uint8_t m_id = 0; - CyclopediaBadge_t m_type; - std::string m_name; + CyclopediaBadge_t m_type {}; + std::string m_name {}; uint16_t m_amount = 0; Badge() = default; @@ -30,14 +31,12 @@ struct Badge { } }; -namespace std { - template <> - struct hash { - std::size_t operator()(const Badge &b) const { - return hash()(b.m_id); - } - }; -} +template <> +struct std::hash { + std::size_t operator()(const Badge &b) const noexcept { + return hash()(b.m_id); + } +}; class PlayerBadge { public: @@ -50,12 +49,13 @@ class PlayerBadge { const std::shared_ptr &getUnlockedKV(); // Badge Calculate Functions - bool accountAge(uint8_t amount); - bool loyalty(uint8_t amount); - bool accountAllLevel(uint8_t amount); - bool accountAllVocations(uint8_t amount); - [[nodiscard]] bool tournamentParticipation(uint8_t skill); - [[nodiscard]] bool tournamentPoints(uint8_t race); + bool accountAge(uint8_t amount) const; + bool loyalty(uint8_t amount) const; + std::vector> getPlayersInfoByAccount(const std::shared_ptr &acc) const; + bool accountAllLevel(uint8_t amount) const; + bool accountAllVocations(uint8_t amount) const; + [[nodiscard]] bool tournamentParticipation(uint8_t skill) const; + [[nodiscard]] bool tournamentPoints(uint8_t race) const; private: // {badge ID, time when it was unlocked} diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.cpp b/src/creatures/players/cyclopedia/player_cyclopedia.cpp index abbc920d3..980d6897c 100644 --- a/src/creatures/players/cyclopedia/player_cyclopedia.cpp +++ b/src/creatures/players/cyclopedia/player_cyclopedia.cpp @@ -7,39 +7,40 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "database/databasetasks.hpp" #include "creatures/players/player.hpp" -#include "player_cyclopedia.hpp" +#include "database/databasetasks.hpp" +#include "enums/player_blessings.hpp" +#include "enums/player_cyclopedia.hpp" #include "game/game.hpp" #include "kv/kv.hpp" PlayerCyclopedia::PlayerCyclopedia(Player &player) : m_player(player) { } -Summary PlayerCyclopedia::getSummary() { +Summary PlayerCyclopedia::getSummary() const { return { getAmount(Summary_t::PREY_CARDS), getAmount(Summary_t::INSTANT_REWARDS), getAmount(Summary_t::HIRELINGS) }; } -void PlayerCyclopedia::loadSummaryData() { - DBResult_ptr result = g_database().storeQuery(fmt::format("SELECT COUNT(*) as `count` FROM `player_hirelings` WHERE `player_id` = {}", m_player.getGUID())); - auto kvScoped = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(static_cast(Summary_t::HIRELINGS))); +void PlayerCyclopedia::loadSummaryData() const { + const DBResult_ptr result = g_database().storeQuery(fmt::format("SELECT COUNT(*) as `count` FROM `player_hirelings` WHERE `player_id` = {}", m_player.getGUID())); + const auto kvScoped = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(static_cast(Summary_t::HIRELINGS))); if (result && !kvScoped->get("amount").has_value()) { kvScoped->set("amount", result->getNumber("count")); } } -void PlayerCyclopedia::loadDeathHistory(uint16_t page, uint16_t entriesPerPage) { +void PlayerCyclopedia::loadDeathHistory(uint16_t page, uint16_t entriesPerPage) const { Benchmark bm_check; uint32_t offset = static_cast(page - 1) * entriesPerPage; - auto query = fmt::format("SELECT `time`, `level`, `killed_by`, `mostdamage_by`, (select count(*) FROM `player_deaths` WHERE `player_id` = {}) as `entries` FROM `player_deaths` WHERE `player_id` = {} AND `time` >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 30 DAY)) ORDER BY `time` DESC LIMIT {}, {}", m_player.getGUID(), m_player.getGUID(), offset, entriesPerPage); + const auto query = fmt::format("SELECT `time`, `level`, `killed_by`, `mostdamage_by`, (select count(*) FROM `player_deaths` WHERE `player_id` = {}) as `entries` FROM `player_deaths` WHERE `player_id` = {} AND `time` >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 30 DAY)) ORDER BY `time` DESC LIMIT {}, {}", m_player.getGUID(), m_player.getGUID(), offset, entriesPerPage); uint32_t playerID = m_player.getID(); - std::function callback = [playerID, page, entriesPerPage](const DBResult_ptr &result, bool) { - std::shared_ptr player = g_game().getPlayerByID(playerID); + const std::function callback = [playerID, page, entriesPerPage](const DBResult_ptr &result, bool) { + const auto &player = g_game().getPlayerByID(playerID); if (!player) { return; } @@ -80,16 +81,16 @@ void PlayerCyclopedia::loadDeathHistory(uint16_t page, uint16_t entriesPerPage) g_logger().debug("Loading death history from the player {} took {} milliseconds.", m_player.getName(), bm_check.duration()); } -void PlayerCyclopedia::loadRecentKills(uint16_t page, uint16_t entriesPerPage) { +void PlayerCyclopedia::loadRecentKills(uint16_t page, uint16_t entriesPerPage) const { Benchmark bm_check; const std::string &escapedName = g_database().escapeString(m_player.getName()); uint32_t offset = static_cast(page - 1) * entriesPerPage; - auto query = fmt::format("SELECT `d`.`time`, `d`.`killed_by`, `d`.`mostdamage_by`, `d`.`unjustified`, `d`.`mostdamage_unjustified`, `p`.`name`, (select count(*) FROM `player_deaths` WHERE ((`killed_by` = {} AND `is_player` = 1) OR (`mostdamage_by` = {} AND `mostdamage_is_player` = 1))) as `entries` FROM `player_deaths` AS `d` INNER JOIN `players` AS `p` ON `d`.`player_id` = `p`.`id` WHERE ((`d`.`killed_by` = {} AND `d`.`is_player` = 1) OR (`d`.`mostdamage_by` = {} AND `d`.`mostdamage_is_player` = 1)) AND `time` >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 70 DAY)) ORDER BY `time` DESC LIMIT {}, {}", escapedName, escapedName, escapedName, escapedName, offset, entriesPerPage); + const auto query = fmt::format("SELECT `d`.`time`, `d`.`killed_by`, `d`.`mostdamage_by`, `d`.`unjustified`, `d`.`mostdamage_unjustified`, `p`.`name`, (select count(*) FROM `player_deaths` WHERE ((`killed_by` = {} AND `is_player` = 1) OR (`mostdamage_by` = {} AND `mostdamage_is_player` = 1))) as `entries` FROM `player_deaths` AS `d` INNER JOIN `players` AS `p` ON `d`.`player_id` = `p`.`id` WHERE ((`d`.`killed_by` = {} AND `d`.`is_player` = 1) OR (`d`.`mostdamage_by` = {} AND `d`.`mostdamage_is_player` = 1)) AND `time` >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 70 DAY)) ORDER BY `time` DESC LIMIT {}, {}", escapedName, escapedName, escapedName, escapedName, offset, entriesPerPage); uint32_t playerID = m_player.getID(); - std::function callback = [playerID, page, entriesPerPage](const DBResult_ptr &result, bool) { - std::shared_ptr player = g_game().getPlayerByID(playerID); + const std::function callback = [playerID, page, entriesPerPage](const DBResult_ptr &result, bool) { + const auto &player = g_game().getPlayerByID(playerID); if (!player) { return; } @@ -132,15 +133,15 @@ void PlayerCyclopedia::loadRecentKills(uint16_t page, uint16_t entriesPerPage) { g_logger().debug("Loading recent kills from the player {} took {} milliseconds.", m_player.getName(), bm_check.duration()); } -void PlayerCyclopedia::updateStoreSummary(uint8_t type, uint16_t amount, const std::string &id) { +void PlayerCyclopedia::updateStoreSummary(uint8_t type, uint16_t amount, const std::string &id) const { switch (type) { case Summary_t::HOUSE_ITEMS: case Summary_t::BLESSINGS: insertValue(type, amount, id); break; case Summary_t::ALL_BLESSINGS: - for (int i = 1; i < 8; ++i) { - insertValue(static_cast(Summary_t::BLESSINGS), amount, fmt::format("{}", i)); + for (auto blessIt : magic_enum::enum_values()) { + insertValue(static_cast(Summary_t::BLESSINGS), amount, fmt::format("{}", blessIt)); } break; default: @@ -149,35 +150,35 @@ void PlayerCyclopedia::updateStoreSummary(uint8_t type, uint16_t amount, const s } } -uint16_t PlayerCyclopedia::getAmount(uint8_t type) { - auto kvScope = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type))->get("amount"); +uint16_t PlayerCyclopedia::getAmount(uint8_t type) const { + const auto kvScope = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type))->get("amount"); return static_cast(kvScope ? kvScope->getNumber() : 0); } -void PlayerCyclopedia::updateAmount(uint8_t type, uint16_t amount) { - auto oldAmount = getAmount(type); +void PlayerCyclopedia::updateAmount(uint8_t type, uint16_t amount) const { + const auto oldAmount = getAmount(type); m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type))->set("amount", oldAmount + amount); } std::map PlayerCyclopedia::getResult(uint8_t type) const { - auto kvScope = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type)); + const auto kvScope = m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type)); std::map result; // ID, amount for (const auto &scope : kvScope->keys()) { - size_t pos = scope.find('.'); + const size_t &pos = scope.find('.'); if (pos == std::string::npos) { g_logger().error("[{}] Invalid key format: {}", __FUNCTION__, scope); continue; } std::string id = scope.substr(0, pos); - auto amount = kvScope->scoped(id)->get("amount"); + const auto amount = kvScope->scoped(id)->get("amount"); result.emplace(std::stoll(id), static_cast(amount ? amount->getNumber() : 0)); } return result; } -void PlayerCyclopedia::insertValue(uint8_t type, uint16_t amount, const std::string &id) { +void PlayerCyclopedia::insertValue(uint8_t type, uint16_t amount, const std::string &id) const { auto result = getResult(type); - auto it = result.find(std::stoll(id)); + const auto it = result.find(std::stoll(id)); auto oldAmount = (it != result.end() ? it->second : 0); auto newAmount = oldAmount + amount; m_player.kv()->scoped("summary")->scoped(g_game().getSummaryKeyByType(type))->scoped(id)->set("amount", newAmount); diff --git a/src/creatures/players/cyclopedia/player_cyclopedia.hpp b/src/creatures/players/cyclopedia/player_cyclopedia.hpp index 32c446cc3..0f399af03 100644 --- a/src/creatures/players/cyclopedia/player_cyclopedia.hpp +++ b/src/creatures/players/cyclopedia/player_cyclopedia.hpp @@ -9,9 +9,6 @@ #pragma once -#include "creatures/creatures_definitions.hpp" -#include "enums/player_cyclopedia.hpp" - class Player; class KV; @@ -28,18 +25,18 @@ class PlayerCyclopedia { public: explicit PlayerCyclopedia(Player &player); - Summary getSummary(); + Summary getSummary() const; - void loadSummaryData(); - void loadDeathHistory(uint16_t page, uint16_t entriesPerPage); - void loadRecentKills(uint16_t page, uint16_t entriesPerPage); + void loadSummaryData() const; + void loadDeathHistory(uint16_t page, uint16_t entriesPerPage) const; + void loadRecentKills(uint16_t page, uint16_t entriesPerPage) const; - void updateStoreSummary(uint8_t type, uint16_t amount = 1, const std::string &id = ""); - uint16_t getAmount(uint8_t type); - void updateAmount(uint8_t type, uint16_t amount = 1); + void updateStoreSummary(uint8_t type, uint16_t amount = 1, const std::string &id = "") const; + uint16_t getAmount(uint8_t type) const; + void updateAmount(uint8_t type, uint16_t amount = 1) const; [[nodiscard]] std::map getResult(uint8_t type) const; - void insertValue(uint8_t type, uint16_t amount = 1, const std::string &id = ""); + void insertValue(uint8_t type, uint16_t amount = 1, const std::string &id = "") const; private: Player &m_player; diff --git a/src/creatures/players/cyclopedia/player_title.cpp b/src/creatures/players/cyclopedia/player_title.cpp index 7c348cbf7..089d02f28 100644 --- a/src/creatures/players/cyclopedia/player_title.cpp +++ b/src/creatures/players/cyclopedia/player_title.cpp @@ -7,13 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "player_title.hpp" +#include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/appearance/mounts/mounts.hpp" +#include "creatures/monsters/monsters.hpp" #include "creatures/players/player.hpp" +#include "enums/account_group_type.hpp" #include "game/game.hpp" #include "kv/kv.hpp" +#include "enums/account_group_type.hpp" PlayerTitle::PlayerTitle(Player &player) : m_player(player) { } @@ -23,7 +25,7 @@ bool PlayerTitle::isTitleUnlocked(uint8_t id) const { return false; } - if (auto it = std::find_if(m_titlesUnlocked.begin(), m_titlesUnlocked.end(), [id](auto title_it) { + if (auto it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) { return title_it.first.m_id == id; }); it != m_titlesUnlocked.end()) { @@ -65,7 +67,7 @@ void PlayerTitle::remove(const Title &title) { return; } - auto it = std::find_if(m_titlesUnlocked.begin(), m_titlesUnlocked.end(), [id](auto title_it) { + auto it = std::ranges::find_if(m_titlesUnlocked, [id](auto title_it) { return title_it.first.m_id == id; }); @@ -84,21 +86,21 @@ const std::vector> &PlayerTitle::getUnlockedTitles() } uint8_t PlayerTitle::getCurrentTitle() const { - auto title = m_player.kv()->scoped("titles")->get("current-title"); + const auto title = m_player.kv()->scoped("titles")->get("current-title"); return title ? static_cast(title->getNumber()) : 0; } -void PlayerTitle::setCurrentTitle(uint8_t id) { +void PlayerTitle::setCurrentTitle(uint8_t id) const { m_player.kv()->scoped("titles")->set("current-title", id != 0 && isTitleUnlocked(id) ? id : 0); } -std::string PlayerTitle::getCurrentTitleName() { - auto currentTitle = getCurrentTitle(); +std::string PlayerTitle::getCurrentTitleName() const { + const auto currentTitle = getCurrentTitle(); if (currentTitle == 0) { return ""; } - auto title = g_game().getTitleById(currentTitle); + const auto &title = g_game().getTitleById(currentTitle); if (title.m_id == 0) { return ""; } @@ -178,13 +180,13 @@ const std::shared_ptr &PlayerTitle::getUnlockedKV() { } // Title Calculate Functions -bool PlayerTitle::checkGold(uint32_t amount) { +bool PlayerTitle::checkGold(uint32_t amount) const { return m_player.getBankBalance() >= amount; } -bool PlayerTitle::checkMount(uint32_t amount) { +bool PlayerTitle::checkMount(uint32_t amount) const { uint8_t total = 0; - for (const auto &mount : g_game().mounts.getMounts()) { + for (const auto &mount : g_game().mounts->getMounts()) { if (m_player.hasMount(mount)) { total++; } @@ -192,15 +194,15 @@ bool PlayerTitle::checkMount(uint32_t amount) { return total >= amount; } -bool PlayerTitle::checkOutfit(uint32_t amount) { +bool PlayerTitle::checkOutfit(uint32_t amount) const { return m_player.outfits.size() >= amount; } -bool PlayerTitle::checkLevel(uint32_t amount) { +bool PlayerTitle::checkLevel(uint32_t amount) const { return m_player.getLevel() >= amount; } -bool PlayerTitle::checkHighscore(uint8_t skill) { +bool PlayerTitle::checkHighscore(uint8_t skill) const { Database &db = Database::getInstance(); std::string query; std::string fieldCheck = "id"; @@ -228,7 +230,7 @@ bool PlayerTitle::checkHighscore(uint8_t skill) { break; } - DBResult_ptr result = db.storeQuery(query); + const DBResult_ptr result = db.storeQuery(query); if (!result) { return false; } @@ -239,7 +241,7 @@ bool PlayerTitle::checkHighscore(uint8_t skill) { return resultValue == m_player.getGUID(); } -bool PlayerTitle::checkBestiary(const std::string &name, uint16_t race, bool isBoss /* = false*/, uint32_t amount) { +bool PlayerTitle::checkBestiary(const std::string &name, uint16_t race, bool isBoss /* = false*/, uint32_t amount) const { if (race == 0) { if (name == "Executioner") { // todo check if player has unlocked all bestiary @@ -255,23 +257,23 @@ bool PlayerTitle::checkBestiary(const std::string &name, uint16_t race, bool isB return m_player.isCreatureUnlockedOnTaskHunting(g_monsters().getMonsterTypeByRaceId(race, isBoss)); } -bool PlayerTitle::checkLoginStreak(uint32_t amount) { - auto streakKV = m_player.kv()->scoped("daily-reward")->get("streak"); +bool PlayerTitle::checkLoginStreak(uint32_t amount) const { + const auto streakKV = m_player.kv()->scoped("daily-reward")->get("streak"); return streakKV && streakKV.has_value() && static_cast(streakKV->getNumber()) >= amount; } -bool PlayerTitle::checkTask(uint32_t amount) { +bool PlayerTitle::checkTask(uint32_t amount) const { return m_player.getTaskHuntingPoints() >= amount; } -bool PlayerTitle::checkMap(uint32_t amount) { +bool PlayerTitle::checkMap(uint32_t amount) const { // todo cyclopledia return false; } -bool PlayerTitle::checkOther(const std::string &name) { +bool PlayerTitle::checkOther(const std::string &name) const { if (name == "Guild Leader") { - auto rank = m_player.getGuildRank(); + const auto &rank = m_player.getGuildRank(); return rank && rank->level == 3; } else if (name == "Proconsul of Iksupan") { // Win Ancient Aucar Outfits complete so fight with Atab and be teleported to the arena. diff --git a/src/creatures/players/cyclopedia/player_title.hpp b/src/creatures/players/cyclopedia/player_title.hpp index 0530fcc08..72362424e 100644 --- a/src/creatures/players/cyclopedia/player_title.hpp +++ b/src/creatures/players/cyclopedia/player_title.hpp @@ -9,11 +9,9 @@ #pragma once -#include - -#include "creatures/creatures_definitions.hpp" #include "enums/player_cyclopedia.hpp" -#include "enums/account_group_type.hpp" + +enum PlayerSex_t : uint8_t; class Player; class KV; @@ -60,14 +58,12 @@ struct Title { } }; -namespace std { - template <> - struct hash { - std::size_t operator()(const Title &t) const { - return hash<uint8_t>()(t.m_id); - } - }; -} +template <> +struct std::hash<Title> { + std::size_t operator()(const Title &t) const noexcept { + return hash<uint8_t>()(t.m_id); + } +}; class PlayerTitle { public: @@ -78,24 +74,24 @@ class PlayerTitle { void remove(const Title &title); const std::vector<std::pair<Title, uint32_t>> &getUnlockedTitles(); [[nodiscard]] uint8_t getCurrentTitle() const; - void setCurrentTitle(uint8_t id); - std::string getCurrentTitleName(); + void setCurrentTitle(uint8_t id) const; + std::string getCurrentTitleName() const; static const std::string &getNameBySex(PlayerSex_t sex, const std::string &male, const std::string &female); void checkAndUpdateNewTitles(); void loadUnlockedTitles(); const std::shared_ptr<KV> &getUnlockedKV(); // Title Calculate Functions - bool checkGold(uint32_t amount); - bool checkMount(uint32_t amount); - bool checkOutfit(uint32_t amount); - bool checkLevel(uint32_t amount); - bool checkHighscore(uint8_t skill); - bool checkBestiary(const std::string &name, uint16_t race, bool isBoss = false, uint32_t amount = 0); - bool checkLoginStreak(uint32_t amount); - bool checkTask(uint32_t amount); - bool checkMap(uint32_t amount); - bool checkOther(const std::string &name); + bool checkGold(uint32_t amount) const; + bool checkMount(uint32_t amount) const; + bool checkOutfit(uint32_t amount) const; + bool checkLevel(uint32_t amount) const; + bool checkHighscore(uint8_t skill) const; + bool checkBestiary(const std::string &name, uint16_t race, bool isBoss = false, uint32_t amount = 0) const; + bool checkLoginStreak(uint32_t amount) const; + bool checkTask(uint32_t amount) const; + bool checkMap(uint32_t amount) const; + bool checkOther(const std::string &name) const; private: // {title ID, time when it was unlocked} diff --git a/src/creatures/players/grouping/familiars.cpp b/src/creatures/players/grouping/familiars.cpp index 6312aaa28..66e9b41bc 100644 --- a/src/creatures/players/grouping/familiars.cpp +++ b/src/creatures/players/grouping/familiars.cpp @@ -7,13 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/grouping/familiars.hpp" -#include "lib/di/container.hpp" + #include "config/configmanager.hpp" +#include "lib/di/container.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" +#include <creatures/creatures_definitions.hpp> + +std::vector<std::shared_ptr<Familiar>> familiars[VOCATION_LAST + 1]; Familiars &Familiars::getInstance() { return inject<Familiars>(); @@ -26,23 +28,27 @@ bool Familiars::reload() { return loadFromXml(); } +std::vector<std::shared_ptr<Familiar>> &Familiars::getFamiliars(uint16_t vocation) { + return familiars[vocation]; +} + bool Familiars::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/familiars.xml"; - pugi::xml_parse_result result = doc.load_file(folder.c_str()); + const auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/familiars.xml"; + const pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { g_logger().error("Failed to load Familiars"); printXMLError(__FUNCTION__, folder, result); return false; } - for (auto familiarsNode : doc.child("familiars").children()) { + for (const auto &familiarsNode : doc.child("familiars").children()) { pugi::xml_attribute attr; - if ((attr = familiarsNode.attribute("enabled")) && !attr.as_bool()) { + if ((attr = familiarsNode.attribute("enabled") && !attr.as_bool())) { continue; } - if (!(attr = familiarsNode.attribute("vocation"))) { + if (!((attr = familiarsNode.attribute("vocation")))) { g_logger().warn("[Familiars::loadFromXml] - Missing familiar vocation."); continue; } @@ -74,7 +80,7 @@ bool Familiars::loadFromXml() { } std::shared_ptr<Familiar> Familiars::getFamiliarByLookType(uint16_t vocation, uint16_t lookType) const { - if (auto it = std::find_if(familiars[vocation].begin(), familiars[vocation].end(), [lookType](auto familiar_it) { + if (auto it = std::ranges::find_if(familiars[vocation], [lookType](const auto &familiar_it) { return familiar_it->lookType == lookType; }); it != familiars[vocation].end()) { diff --git a/src/creatures/players/grouping/familiars.hpp b/src/creatures/players/grouping/familiars.hpp index 9eda7d95b..502874747 100644 --- a/src/creatures/players/grouping/familiars.hpp +++ b/src/creatures/players/grouping/familiars.hpp @@ -9,9 +9,6 @@ #pragma once -#include "declarations.hpp" -#include "lib/di/container.hpp" - struct FamiliarEntry { constexpr explicit FamiliarEntry(uint16_t initLookType) : lookType(initLookType) { } @@ -38,12 +35,7 @@ class Familiars { bool loadFromXml(); bool reload(); - std::vector<std::shared_ptr<Familiar>> &getFamiliars(uint16_t vocation) { - return familiars[vocation]; - } + std::vector<std::shared_ptr<Familiar>> &getFamiliars(uint16_t vocation); [[nodiscard]] std::shared_ptr<Familiar> getFamiliarByLookType(uint16_t vocation, uint16_t lookType) const; - -private: - std::vector<std::shared_ptr<Familiar>> familiars[VOCATION_LAST + 1]; }; diff --git a/src/creatures/players/grouping/groups.cpp b/src/creatures/players/grouping/groups.cpp index c4dab4a90..dc2607f46 100644 --- a/src/creatures/players/grouping/groups.cpp +++ b/src/creatures/players/grouping/groups.cpp @@ -7,11 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "creatures/players/grouping/groups.hpp" #include "config/configmanager.hpp" #include "game/game.hpp" -#include "creatures/players/grouping/groups.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" @@ -20,7 +19,7 @@ namespace ParsePlayerFlagMap { phmap::flat_hash_map<std::string, PlayerFlags_t> initParsePlayerFlagMap() { phmap::flat_hash_map<std::string, PlayerFlags_t> map; // Iterate through all values of the PlayerFlags_t enumeration - for (auto value : magic_enum::enum_values<PlayerFlags_t>()) { + for (const auto &value : magic_enum::enum_values<PlayerFlags_t>()) { // Get the string representation of the current enumeration value std::string name(magic_enum::enum_name(value).data()); // Convert the string to lowercase @@ -50,8 +49,8 @@ bool Groups::reload() { } void parseGroupFlags(Group &group, const pugi::xml_node &groupNode) { - if (pugi::xml_node node = groupNode.child("flags")) { - for (auto flagNode : node.children()) { + if (const pugi::xml_node node = groupNode.child("flags")) { + for (const auto &flagNode : node.children()) { pugi::xml_attribute attr = flagNode.first_attribute(); if (!attr || !attr.as_bool()) { continue; @@ -69,24 +68,24 @@ void parseGroupFlags(Group &group, const pugi::xml_node &groupNode) { bool Groups::load() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/groups.xml"; - pugi::xml_parse_result result = doc.load_file(folder.c_str()); + const auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/groups.xml"; + const pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); return false; } - for (auto groupNode : doc.child("groups").children()) { + for (const auto &groupNode : doc.child("groups").children()) { Group group; group.id = pugi::cast<uint32_t>(groupNode.attribute("id").value()); group.name = groupNode.attribute("name").as_string(); group.access = groupNode.attribute("access").as_bool(); group.maxDepotItems = pugi::cast<uint32_t>(groupNode.attribute("maxdepotitems").value()); group.maxVipEntries = pugi::cast<uint32_t>(groupNode.attribute("maxvipentries").value()); - auto flagsInt = static_cast<uint8_t>(groupNode.attribute("flags").as_uint()); + const auto flagsInt = static_cast<uint8_t>(groupNode.attribute("flags").as_uint()); std::bitset<magic_enum::enum_integer(PlayerFlags_t::FlagLast)> flags(flagsInt); for (uint8_t i = 0; i < getFlagNumber(PlayerFlags_t::FlagLast); i++) { - PlayerFlags_t flag = getFlagFromNumber(i); + const PlayerFlags_t flag = getFlagFromNumber(i); group.flags[i] = flags[Groups::getFlagNumber(flag)]; } @@ -100,7 +99,7 @@ bool Groups::load() { } std::shared_ptr<Group> Groups::getGroup(uint16_t id) const { - if (auto it = std::find_if(groups_vector.begin(), groups_vector.end(), [id](auto group_it) { + if (auto it = std::ranges::find_if(groups_vector, [id](auto group_it) { return group_it->id == id; }); it != groups_vector.end()) { @@ -108,3 +107,7 @@ std::shared_ptr<Group> Groups::getGroup(uint16_t id) const { } return nullptr; } + +std::vector<std::shared_ptr<Group>> &Groups::getGroups() { + return groups_vector; +} diff --git a/src/creatures/players/grouping/groups.hpp b/src/creatures/players/grouping/groups.hpp index af319e957..91328a0e6 100644 --- a/src/creatures/players/grouping/groups.hpp +++ b/src/creatures/players/grouping/groups.hpp @@ -9,7 +9,7 @@ #pragma once -#include "declarations.hpp" +#include "utils/utils_definitions.hpp" struct Group { std::string name; @@ -27,9 +27,7 @@ class Groups { static bool reload(); bool load(); [[nodiscard]] std::shared_ptr<Group> getGroup(uint16_t id) const; - std::vector<std::shared_ptr<Group>> &getGroups() { - return groups_vector; - } + std::vector<std::shared_ptr<Group>> &getGroups(); private: std::vector<std::shared_ptr<Group>> groups_vector; diff --git a/src/creatures/players/grouping/guild.cpp b/src/creatures/players/grouping/guild.cpp index bbd662d1a..b00f3a264 100644 --- a/src/creatures/players/grouping/guild.cpp +++ b/src/creatures/players/grouping/guild.cpp @@ -7,13 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/grouping/guild.hpp" + #include "game/game.hpp" void Guild::addMember(const std::shared_ptr<Player> &player) { - membersOnline.push_back(player); + membersOnline.emplace_back(player); for (const auto &member : getMembersOnline()) { g_game().updatePlayerHelpers(member); } @@ -32,8 +31,8 @@ void Guild::removeMember(const std::shared_ptr<Player> &player) { } } -GuildRank_ptr Guild::getRankById(uint32_t rankId) { - for (auto rank : ranks) { +GuildRank_ptr Guild::getRankById(uint32_t rankId) const { + for (const auto &rank : ranks) { if (rank->id == rankId) { return rank; } @@ -42,7 +41,7 @@ GuildRank_ptr Guild::getRankById(uint32_t rankId) { } GuildRank_ptr Guild::getRankByName(const std::string &guildName) const { - for (auto rank : ranks) { + for (const auto &rank : ranks) { if (rank->name == guildName) { return rank; } @@ -51,7 +50,7 @@ GuildRank_ptr Guild::getRankByName(const std::string &guildName) const { } GuildRank_ptr Guild::getRankByLevel(uint8_t level) const { - for (auto rank : ranks) { + for (const auto &rank : ranks) { if (rank->level == level) { return rank; } diff --git a/src/creatures/players/grouping/guild.hpp b/src/creatures/players/grouping/guild.hpp index 82b0a7367..f4c3f605a 100644 --- a/src/creatures/players/grouping/guild.hpp +++ b/src/creatures/players/grouping/guild.hpp @@ -24,7 +24,7 @@ struct GuildRank { using GuildRank_ptr = std::shared_ptr<GuildRank>; -class Guild : public Bankable { +class Guild final : public Bankable { public: Guild(uint32_t initId, std::string initName) : name(std::move(initName)), id(initId) { } @@ -72,7 +72,7 @@ class Guild : public Bankable { return ranks; } - GuildRank_ptr getRankById(uint32_t id); + GuildRank_ptr getRankById(uint32_t id) const; GuildRank_ptr getRankByName(const std::string &name) const; GuildRank_ptr getRankByLevel(uint8_t level) const; void addRank(uint32_t id, const std::string &name, uint8_t level); diff --git a/src/creatures/players/grouping/party.cpp b/src/creatures/players/grouping/party.cpp index 76f1d955f..e63ca14b6 100644 --- a/src/creatures/players/grouping/party.cpp +++ b/src/creatures/players/grouping/party.cpp @@ -7,26 +7,60 @@ * Website: https://docs.opentibiabr.com/ */ -#include <utility> - -#include "pch.hpp" - #include "creatures/players/grouping/party.hpp" + +#include "config/configmanager.hpp" +#include "creatures/creature.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "lua/creature/events.hpp" +#include "game/movement/position.hpp" #include "lua/callbacks/event_callback.hpp" #include "lua/callbacks/events_callbacks.hpp" +#include "lua/creature/events.hpp" -std::shared_ptr<Party> Party::create(std::shared_ptr<Player> leader) { +std::shared_ptr<Party> Party::create(const std::shared_ptr<Player> &leader) { auto party = std::make_shared<Party>(); party->m_leader = leader; leader->setParty(party); - if (g_configManager().getBoolean(PARTY_AUTO_SHARE_EXPERIENCE, __FUNCTION__)) { + if (g_configManager().getBoolean(PARTY_AUTO_SHARE_EXPERIENCE)) { party->setSharedExperience(leader, true); } return party; } +std::shared_ptr<Party> Party::getParty() { + return static_self_cast<Party>(); +} + +std::shared_ptr<Player> Party::getLeader() const { + return m_leader.lock(); +} + +std::vector<std::shared_ptr<Player>> Party::getPlayers() const { + std::vector<std::shared_ptr<Player>> players; + for (auto &member : memberList) { + players.push_back(member); + } + players.push_back(getLeader()); + return players; +} + +std::vector<std::shared_ptr<Player>> Party::getMembers() { + return memberList; +} + +std::vector<std::shared_ptr<Player>> Party::getInvitees() { + return inviteList; +} + +size_t Party::getMemberCount() const { + return memberList.size(); +} + +size_t Party::getInvitationCount() const { + return inviteList.size(); +} + void Party::disband() { if (!g_events().eventPartyOnDisband(getParty())) { return; @@ -36,7 +70,7 @@ void Party::disband() { return; } - auto currentLeader = getLeader(); + const auto ¤tLeader = getLeader(); if (!currentLeader) { return; } @@ -55,7 +89,7 @@ void Party::disband() { } inviteList.clear(); - auto members = getMembers(); + const auto &members = getMembers(); for (const auto &member : members) { member->setParty(nullptr); member->sendClosePrivate(CHANNEL_PARTY); @@ -77,12 +111,12 @@ void Party::disband() { membersData.clear(); } -bool Party::leaveParty(std::shared_ptr<Player> player) { +bool Party::leaveParty(const std::shared_ptr<Player> &player, bool forceRemove /* = false */) { if (!player) { return false; } - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return false; } @@ -91,7 +125,8 @@ bool Party::leaveParty(std::shared_ptr<Player> player) { return false; } - if (!g_events().eventPartyOnLeave(getParty(), player)) { + bool canRemove = g_events().eventPartyOnLeave(getParty(), player); + if (!forceRemove && !canRemove) { return false; } @@ -124,7 +159,7 @@ bool Party::leaveParty(std::shared_ptr<Player> player) { } // since we already passed the leadership, we remove the player from the list - auto it = std::find(memberList.begin(), memberList.end(), player); + auto it = std::ranges::find(memberList, player); if (it != memberList.end()) { memberList.erase(it); } @@ -163,14 +198,14 @@ bool Party::leaveParty(std::shared_ptr<Player> player) { return true; } -bool Party::passPartyLeadership(std::shared_ptr<Player> player) { - auto leader = getLeader(); +bool Party::passPartyLeadership(const std::shared_ptr<Player> &player) { + const auto &leader = getLeader(); if (!leader || !player || leader == player || player->getParty().get() != this) { return false; } // Remove it before to broadcast the message correctly - auto it = std::find(memberList.begin(), memberList.end(), player); + auto it = std::ranges::find(memberList, player); if (it != memberList.end()) { memberList.erase(it); } @@ -179,7 +214,7 @@ bool Party::passPartyLeadership(std::shared_ptr<Player> player) { ss << player->getName() << " is now the leader of the party."; broadcastPartyMessage(MESSAGE_PARTY_MANAGEMENT, ss.str(), true); - auto oldLeader = leader; + const auto &oldLeader = leader; m_leader = player; memberList.insert(memberList.begin(), oldLeader); @@ -205,7 +240,7 @@ bool Party::passPartyLeadership(std::shared_ptr<Player> player) { } bool Party::joinParty(const std::shared_ptr<Player> &player) { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return false; } @@ -218,7 +253,7 @@ bool Party::joinParty(const std::shared_ptr<Player> &player) { return false; } - auto it = std::find(inviteList.begin(), inviteList.end(), player); + auto it = std::ranges::find(inviteList, player); if (it == inviteList.end()) { return false; } @@ -244,7 +279,7 @@ bool Party::joinParty(const std::shared_ptr<Player> &player) { leader->sendPlayerPartyIcons(player); player->sendPlayerPartyIcons(leader); - memberList.push_back(player); + memberList.emplace_back(player); g_game().updatePlayerHelpers(player); @@ -262,12 +297,12 @@ bool Party::joinParty(const std::shared_ptr<Player> &player) { } bool Party::removeInvite(const std::shared_ptr<Player> &player, bool removeFromPlayer /* = true*/) { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return false; } - auto it = std::find(inviteList.begin(), inviteList.end(), player); + auto it = std::ranges::find(inviteList, player); if (it == inviteList.end()) { return false; } @@ -295,7 +330,7 @@ bool Party::removeInvite(const std::shared_ptr<Player> &player, bool removeFromP } void Party::revokeInvitation(const std::shared_ptr<Player> &player) { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return; } @@ -312,7 +347,7 @@ void Party::revokeInvitation(const std::shared_ptr<Player> &player) { } bool Party::invitePlayer(const std::shared_ptr<Player> &player) { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return false; } @@ -332,7 +367,7 @@ bool Party::invitePlayer(const std::shared_ptr<Player> &player) { leader->sendTextMessage(MESSAGE_PARTY_MANAGEMENT, ss.str()); - inviteList.push_back(player); + inviteList.emplace_back(player); for (const auto &member : getMembers()) { g_game().updatePlayerHelpers(member); @@ -352,15 +387,15 @@ bool Party::invitePlayer(const std::shared_ptr<Player> &player) { } bool Party::isPlayerInvited(const std::shared_ptr<Player> &player) const { - return std::find(inviteList.begin(), inviteList.end(), player) != inviteList.end(); + return std::ranges::find(inviteList, player) != inviteList.end(); } void Party::updateAllPartyIcons() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return; } - auto members = getMembers(); + const auto &members = getMembers(); for (const auto &member : members) { for (const auto &otherMember : members) { member->sendPartyCreatureShield(otherMember); @@ -374,7 +409,7 @@ void Party::updateAllPartyIcons() { } void Party::broadcastPartyMessage(MessageClasses msgClass, const std::string &msg, bool sendToInvitations /*= false*/) { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return; } @@ -391,9 +426,13 @@ void Party::broadcastPartyMessage(MessageClasses msgClass, const std::string &ms } } +bool Party::empty() const { + return memberList.empty() && inviteList.empty(); +} + void Party::updateSharedExperience() { if (sharedExpActive) { - bool result = getSharedExperienceStatus() == SHAREDEXP_OK; + const bool result = getSharedExperienceStatus() == SHAREDEXP_OK; if (result != sharedExpEnabled) { sharedExpEnabled = result; updateAllPartyIcons(); @@ -401,7 +440,7 @@ void Party::updateSharedExperience() { } } -const char* Party::getSharedExpReturnMessage(SharedExpStatus_t value) { +const char* Party::getSharedExpReturnMessage(SharedExpStatus_t value) const { switch (value) { case SHAREDEXP_OK: return "Shared Experience is now active."; @@ -418,8 +457,8 @@ const char* Party::getSharedExpReturnMessage(SharedExpStatus_t value) { } } -bool Party::setSharedExperience(std::shared_ptr<Player> player, bool newSharedExpActive, bool silent /*= false*/) { - auto leader = getLeader(); +bool Party::setSharedExperience(const std::shared_ptr<Player> &player, bool newSharedExpActive, bool silent /*= false*/) { + const auto &leader = getLeader(); if (!player || leader != player) { return false; } @@ -431,7 +470,7 @@ bool Party::setSharedExperience(std::shared_ptr<Player> player, bool newSharedEx this->sharedExpActive = newSharedExpActive; if (newSharedExpActive) { - SharedExpStatus_t sharedExpStatus = getSharedExperienceStatus(); + const SharedExpStatus_t &sharedExpStatus = getSharedExperienceStatus(); this->sharedExpEnabled = sharedExpStatus == SHAREDEXP_OK; if (!silent) { leader->sendTextMessage(MESSAGE_PARTY_MANAGEMENT, getSharedExpReturnMessage(sharedExpStatus)); @@ -446,7 +485,15 @@ bool Party::setSharedExperience(std::shared_ptr<Player> player, bool newSharedEx return true; } -void Party::shareExperience(uint64_t experience, std::shared_ptr<Creature> target /* = nullptr*/) { +bool Party::isSharedExperienceActive() const { + return sharedExpActive; +} + +bool Party::isSharedExperienceEnabled() const { + return sharedExpEnabled; +} + +void Party::shareExperience(uint64_t experience, const std::shared_ptr<Creature> &target /* = nullptr*/) { auto leader = getLeader(); if (!leader) { return; @@ -454,7 +501,7 @@ void Party::shareExperience(uint64_t experience, std::shared_ptr<Creature> targe uint64_t shareExperience = experience; g_events().eventPartyOnShareExperience(getParty(), shareExperience); - g_callbacks().executeCallback(EventCallback_t::partyOnShareExperience, &EventCallback::partyOnShareExperience, getParty(), shareExperience); + g_callbacks().executeCallback(EventCallback_t::partyOnShareExperience, &EventCallback::partyOnShareExperience, getParty(), std::ref(shareExperience)); for (const auto &member : getMembers()) { member->onGainSharedExperience(shareExperience, target); @@ -462,12 +509,12 @@ void Party::shareExperience(uint64_t experience, std::shared_ptr<Creature> targe leader->onGainSharedExperience(shareExperience, target); } -bool Party::canUseSharedExperience(std::shared_ptr<Player> player) { - return getMemberSharedExperienceStatus(std::move(player)) == SHAREDEXP_OK; +bool Party::canUseSharedExperience(const std::shared_ptr<Player> &player) { + return getMemberSharedExperienceStatus(player) == SHAREDEXP_OK; } -SharedExpStatus_t Party::getMemberSharedExperienceStatus(std::shared_ptr<Player> player) { - auto leader = getLeader(); +SharedExpStatus_t Party::getMemberSharedExperienceStatus(const std::shared_ptr<Player> &player) { + const auto &leader = getLeader(); if (!leader) { return SHAREDEXP_EMPTYPARTY; } @@ -475,7 +522,7 @@ SharedExpStatus_t Party::getMemberSharedExperienceStatus(std::shared_ptr<Player> return SHAREDEXP_EMPTYPARTY; } - uint32_t minLevel = getMinLevel(); + const uint32_t minLevel = getMinLevel(); if (player->getLevel() < minLevel) { return SHAREDEXP_LEVELDIFFTOOLARGE; } @@ -493,11 +540,11 @@ SharedExpStatus_t Party::getMemberSharedExperienceStatus(std::shared_ptr<Player> } float Party::shareRangeMultiplier() const { - return g_configManager().getFloat(PARTY_SHARE_RANGE_MULTIPLIER, __FUNCTION__); + return g_configManager().getFloat(PARTY_SHARE_RANGE_MULTIPLIER); } uint32_t Party::getHighestLevel() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return 0; } @@ -516,7 +563,7 @@ uint32_t Party::getMinLevel() { } uint32_t Party::getLowestLevel() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return 0; } @@ -533,27 +580,27 @@ uint32_t Party::getMaxLevel() { return static_cast<uint32_t>(std::floor(static_cast<float>(getLowestLevel()) * shareRangeMultiplier())); } -bool Party::isPlayerActive(std::shared_ptr<Player> player) { +bool Party::isPlayerActive(const std::shared_ptr<Player> &player) { auto it = ticksMap.find(player->getID()); if (it == ticksMap.end()) { return false; } - uint64_t timeDiff = OTSYS_TIME() - it->second; + const uint64_t timeDiff = OTSYS_TIME() - it->second; return timeDiff <= 2 * 60 * 1000; } SharedExpStatus_t Party::getSharedExperienceStatus() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return SHAREDEXP_EMPTYPARTY; } - SharedExpStatus_t leaderStatus = getMemberSharedExperienceStatus(leader); + const SharedExpStatus_t &leaderStatus = getMemberSharedExperienceStatus(leader); if (leaderStatus != SHAREDEXP_OK) { return leaderStatus; } for (const auto &member : getMembers()) { - SharedExpStatus_t memberStatus = getMemberSharedExperienceStatus(member); + const SharedExpStatus_t &memberStatus = getMemberSharedExperienceStatus(member); if (memberStatus != SHAREDEXP_OK) { return memberStatus; } @@ -561,14 +608,14 @@ SharedExpStatus_t Party::getSharedExperienceStatus() { return SHAREDEXP_OK; } -void Party::updatePlayerTicks(std::shared_ptr<Player> player, uint32_t points) { +void Party::updatePlayerTicks(const std::shared_ptr<Player> &player, uint32_t points) { if (points != 0 && !player->hasFlag(PlayerFlags_t::NotGainInFight)) { ticksMap[player->getID()] = OTSYS_TIME(); updateSharedExperience(); } } -void Party::clearPlayerPoints(std::shared_ptr<Player> player) { +void Party::clearPlayerPoints(const std::shared_ptr<Player> &player) { auto it = ticksMap.find(player->getID()); if (it != ticksMap.end()) { ticksMap.erase(it); @@ -577,18 +624,18 @@ void Party::clearPlayerPoints(std::shared_ptr<Player> player) { } bool Party::canOpenCorpse(uint32_t ownerId) const { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return false; } - if (std::shared_ptr<Player> player = g_game().getPlayerByID(ownerId)) { + if (const auto &player = g_game().getPlayerByID(ownerId)) { return leader->getID() == ownerId || player->getParty().get() == this; } return false; } -void Party::showPlayerStatus(std::shared_ptr<Player> player, std::shared_ptr<Player> member, bool showStatus) { +void Party::showPlayerStatus(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &member, bool showStatus) const { player->sendPartyCreatureShowStatus(member, showStatus); member->sendPartyCreatureShowStatus(player, showStatus); if (showStatus) { @@ -614,22 +661,22 @@ void Party::showPlayerStatus(std::shared_ptr<Player> player, std::shared_ptr<Pla } } -void Party::updatePlayerStatus(std::shared_ptr<Player> player) { - auto leader = getLeader(); +void Party::updatePlayerStatus(const std::shared_ptr<Player> &player) { + const auto &leader = getLeader(); if (!leader) { return; } - int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE, __FUNCTION__); + const int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE); for (const auto &member : getMembers()) { - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); if (condition) { showPlayerStatus(player, member, true); } else { showPlayerStatus(player, member, false); } } - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); if (condition) { showPlayerStatus(player, leader, true); } else { @@ -637,17 +684,17 @@ void Party::updatePlayerStatus(std::shared_ptr<Player> player) { } } -void Party::updatePlayerStatus(std::shared_ptr<Player> player, const Position &oldPos, const Position &newPos) { - auto leader = getLeader(); +void Party::updatePlayerStatus(const std::shared_ptr<Player> &player, const Position &oldPos, const Position &newPos) { + const auto &leader = getLeader(); if (!leader) { return; } - int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE, __FUNCTION__); + const int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE); if (maxDistance != 0) { for (const auto &member : getMembers()) { - bool condition1 = (Position::getDistanceX(oldPos, member->getPosition()) <= maxDistance && Position::getDistanceY(oldPos, member->getPosition()) <= maxDistance); - bool condition2 = (Position::getDistanceX(newPos, member->getPosition()) <= maxDistance && Position::getDistanceY(newPos, member->getPosition()) <= maxDistance); + const bool condition1 = Position::getDistanceX(oldPos, member->getPosition()) <= maxDistance && Position::getDistanceY(oldPos, member->getPosition()) <= maxDistance; + const bool condition2 = Position::getDistanceX(newPos, member->getPosition()) <= maxDistance && Position::getDistanceY(newPos, member->getPosition()) <= maxDistance; if (condition1 && !condition2) { showPlayerStatus(player, member, false); } else if (!condition1 && condition2) { @@ -655,8 +702,8 @@ void Party::updatePlayerStatus(std::shared_ptr<Player> player, const Position &o } } - bool condition1 = (Position::getDistanceX(oldPos, leader->getPosition()) <= maxDistance && Position::getDistanceY(oldPos, leader->getPosition()) <= maxDistance); - bool condition2 = (Position::getDistanceX(newPos, leader->getPosition()) <= maxDistance && Position::getDistanceY(newPos, leader->getPosition()) <= maxDistance); + const bool condition1 = Position::getDistanceX(oldPos, leader->getPosition()) <= maxDistance && Position::getDistanceY(oldPos, leader->getPosition()) <= maxDistance; + const bool condition2 = Position::getDistanceX(newPos, leader->getPosition()) <= maxDistance && Position::getDistanceY(newPos, leader->getPosition()) <= maxDistance; if (condition1 && !condition2) { showPlayerStatus(player, leader, false); } else if (!condition1 && condition2) { @@ -665,68 +712,68 @@ void Party::updatePlayerStatus(std::shared_ptr<Player> player, const Position &o } } -void Party::updatePlayerHealth(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint8_t healthPercent) { - auto leader = getLeader(); +void Party::updatePlayerHealth(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint8_t healthPercent) { + const auto &leader = getLeader(); if (!leader) { return; } - int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE, __FUNCTION__); - auto playerPosition = player->getPosition(); - auto leaderPosition = leader->getPosition(); + const int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE); + const auto playerPosition = player->getPosition(); + const auto leaderPosition = leader->getPosition(); for (const auto &member : getMembers()) { auto memberPosition = member->getPosition(); - bool condition = (maxDistance == 0 || (Position::getDistanceX(playerPosition, memberPosition) <= maxDistance && Position::getDistanceY(playerPosition, memberPosition) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(playerPosition, memberPosition) <= maxDistance && Position::getDistanceY(playerPosition, memberPosition) <= maxDistance)); if (condition) { member->sendPartyCreatureHealth(target, healthPercent); } } - bool condition = (maxDistance == 0 || (Position::getDistanceX(playerPosition, leaderPosition) <= maxDistance && Position::getDistanceY(playerPosition, leaderPosition) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(playerPosition, leaderPosition) <= maxDistance && Position::getDistanceY(playerPosition, leaderPosition) <= maxDistance)); if (condition) { leader->sendPartyCreatureHealth(target, healthPercent); } } -void Party::updatePlayerMana(std::shared_ptr<Player> player, uint8_t manaPercent) { - auto leader = getLeader(); +void Party::updatePlayerMana(const std::shared_ptr<Player> &player, uint8_t manaPercent) { + const auto &leader = getLeader(); if (!leader) { return; } - int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE, __FUNCTION__); + const int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE); for (const auto &member : getMembers()) { - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); if (condition) { member->sendPartyPlayerMana(player, manaPercent); } } - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); if (condition) { leader->sendPartyPlayerMana(player, manaPercent); } } -void Party::updatePlayerVocation(std::shared_ptr<Player> player) { - auto leader = getLeader(); +void Party::updatePlayerVocation(const std::shared_ptr<Player> &player) { + const auto &leader = getLeader(); if (!leader) { return; } - int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE, __FUNCTION__); + const int32_t maxDistance = g_configManager().getNumber(PARTY_LIST_MAX_DISTANCE); for (const auto &member : getMembers()) { - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), member->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), member->getPosition()) <= maxDistance)); if (condition) { member->sendPartyPlayerVocation(player); } } - bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); + const bool condition = (maxDistance == 0 || (Position::getDistanceX(player->getPosition(), leader->getPosition()) <= maxDistance && Position::getDistanceY(player->getPosition(), leader->getPosition()) <= maxDistance)); if (condition) { leader->sendPartyPlayerVocation(player); } } void Party::updateTrackerAnalyzer() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return; } @@ -738,21 +785,21 @@ void Party::updateTrackerAnalyzer() { leader->updatePartyTrackerAnalyzer(); } -void Party::addPlayerLoot(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { - auto leader = getLeader(); +void Party::addPlayerLoot(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { + const auto &leader = getLeader(); if (!leader) { return; } - auto playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); + std::shared_ptr<PartyAnalyzer> playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); if (!playerAnalyzer) { playerAnalyzer = std::make_shared<PartyAnalyzer>(player->getID(), player->getName()); - membersData.push_back(playerAnalyzer); + membersData.emplace_back(playerAnalyzer); } uint32_t count = std::max<uint32_t>(1, item->getItemCount()); if (auto it = playerAnalyzer->lootMap.find(item->getID()); it != playerAnalyzer->lootMap.end()) { - (*it).second += count; + it->second += count; } else { playerAnalyzer->lootMap.insert({ item->getID(), count }); } @@ -760,14 +807,14 @@ void Party::addPlayerLoot(std::shared_ptr<Player> player, std::shared_ptr<Item> if (priceType == LEADER_PRICE) { playerAnalyzer->lootPrice += leader->getItemCustomPrice(item->getID()) * count; } else { - std::map<uint16_t, uint64_t> itemMap { { item->getID(), count } }; + const std::map<uint16_t, uint64_t> itemMap { { item->getID(), count } }; playerAnalyzer->lootPrice += g_game().getItemMarketPrice(itemMap, false); } updateTrackerAnalyzer(); } -void Party::addPlayerSupply(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { - auto leader = getLeader(); +void Party::addPlayerSupply(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { + const auto &leader = getLeader(); if (!leader) { return; } @@ -775,11 +822,11 @@ void Party::addPlayerSupply(std::shared_ptr<Player> player, std::shared_ptr<Item std::shared_ptr<PartyAnalyzer> playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); if (!playerAnalyzer) { playerAnalyzer = std::make_shared<PartyAnalyzer>(player->getID(), player->getName()); - membersData.push_back(playerAnalyzer); + membersData.emplace_back(playerAnalyzer); } if (auto it = playerAnalyzer->supplyMap.find(item->getID()); it != playerAnalyzer->supplyMap.end()) { - (*it).second += 1; + it->second += 1; } else { playerAnalyzer->supplyMap.insert({ item->getID(), 1 }); } @@ -787,28 +834,28 @@ void Party::addPlayerSupply(std::shared_ptr<Player> player, std::shared_ptr<Item if (priceType == LEADER_PRICE) { playerAnalyzer->supplyPrice += leader->getItemCustomPrice(item->getID(), true); } else { - std::map<uint16_t, uint64_t> itemMap { { item->getID(), 1 } }; + const std::map<uint16_t, uint64_t> itemMap { { item->getID(), 1 } }; playerAnalyzer->supplyPrice += g_game().getItemMarketPrice(itemMap, true); } updateTrackerAnalyzer(); } -void Party::addPlayerDamage(std::shared_ptr<Player> player, uint64_t amount) { - auto playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); +void Party::addPlayerDamage(const std::shared_ptr<Player> &player, uint64_t amount) { + std::shared_ptr<PartyAnalyzer> playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); if (!playerAnalyzer) { playerAnalyzer = std::make_shared<PartyAnalyzer>(player->getID(), player->getName()); - membersData.push_back(playerAnalyzer); + membersData.emplace_back(playerAnalyzer); } playerAnalyzer->damage += amount; updateTrackerAnalyzer(); } -void Party::addPlayerHealing(std::shared_ptr<Player> player, uint64_t amount) { - auto playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); +void Party::addPlayerHealing(const std::shared_ptr<Player> &player, uint64_t amount) { + std::shared_ptr<PartyAnalyzer> playerAnalyzer = getPlayerPartyAnalyzerStruct(player->getID()); if (!playerAnalyzer) { playerAnalyzer = std::make_shared<PartyAnalyzer>(player->getID(), player->getName()); - membersData.push_back(playerAnalyzer); + membersData.emplace_back(playerAnalyzer); } playerAnalyzer->healing += amount; @@ -816,7 +863,7 @@ void Party::addPlayerHealing(std::shared_ptr<Player> player, uint64_t amount) { } void Party::switchAnalyzerPriceType() { - auto leader = getLeader(); + const auto &leader = getLeader(); if (!leader) { return; } @@ -832,8 +879,8 @@ void Party::resetAnalyzer() { updateTrackerAnalyzer(); } -void Party::reloadPrices() { - auto leader = getLeader(); +void Party::reloadPrices() const { + const auto &leader = getLeader(); if (!leader) { return; } @@ -846,13 +893,28 @@ void Party::reloadPrices() { } analyzer->lootPrice = 0; - for (const auto it : analyzer->lootMap) { - analyzer->lootPrice += leader->getItemCustomPrice(it.first) * it.second; + for (const auto &[itemId, price] : analyzer->lootMap) { + analyzer->lootPrice += leader->getItemCustomPrice(itemId) * price; } analyzer->supplyPrice = 0; - for (const auto it : analyzer->supplyMap) { - analyzer->supplyPrice += leader->getItemCustomPrice(it.first, true) * it.second; + for (const auto &[itemId, price] : analyzer->supplyMap) { + analyzer->supplyPrice += leader->getItemCustomPrice(itemId, true) * price; } } } + +std::shared_ptr<PartyAnalyzer> Party::getPlayerPartyAnalyzerStruct(uint32_t playerId) const { + if (auto it = std::ranges::find_if(membersData, [playerId](const std::shared_ptr<PartyAnalyzer> &preyIt) { + return preyIt->id == playerId; + }); + it != membersData.end()) { + return *it; + } + + return nullptr; +} + +uint32_t Party::getAnalyzerTimeNow() const { + return static_cast<uint32_t>(time(nullptr) - trackerTime); +} diff --git a/src/creatures/players/grouping/party.hpp b/src/creatures/players/grouping/party.hpp index 6aaecc561..cef450c0c 100644 --- a/src/creatures/players/grouping/party.hpp +++ b/src/creatures/players/grouping/party.hpp @@ -9,9 +9,9 @@ #pragma once -#include "creatures/players/player.hpp" -#include "creatures/monsters/monsters.hpp" -#include "lib/di/container.hpp" +#include "creatures/creatures_definitions.hpp" + +enum MessageClasses : uint8_t; enum SharedExpStatus_t : uint8_t { SHAREDEXP_OK, @@ -21,103 +21,71 @@ enum SharedExpStatus_t : uint8_t { SHAREDEXP_EMPTYPARTY }; +struct Position; + class Player; class Party; +class Item; +class Creature; -class Party : public SharedObject { +class Party final : public SharedObject { public: - static std::shared_ptr<Party> create(std::shared_ptr<Player> leader); - - std::shared_ptr<Party> getParty() { - return static_self_cast<Party>(); - } - - std::shared_ptr<Player> getLeader() const { - return m_leader.lock(); - } - std::vector<std::shared_ptr<Player>> getPlayers() const { - std::vector<std::shared_ptr<Player>> players; - for (auto &member : memberList) { - players.push_back(member); - } - players.push_back(getLeader()); - return players; - } - std::vector<std::shared_ptr<Player>> getMembers() { - return memberList; - } - std::vector<std::shared_ptr<Player>> getInvitees() { - return inviteList; - } - size_t getMemberCount() const { - return memberList.size(); - } - size_t getInvitationCount() const { - return inviteList.size(); - } + static std::shared_ptr<Party> create(const std::shared_ptr<Player> &leader); + + std::shared_ptr<Party> getParty(); + + std::shared_ptr<Player> getLeader() const; + std::vector<std::shared_ptr<Player>> getPlayers() const; + std::vector<std::shared_ptr<Player>> getMembers(); + std::vector<std::shared_ptr<Player>> getInvitees(); + size_t getMemberCount() const; + size_t getInvitationCount() const; void disband(); bool invitePlayer(const std::shared_ptr<Player> &player); bool joinParty(const std::shared_ptr<Player> &player); void revokeInvitation(const std::shared_ptr<Player> &player); - bool passPartyLeadership(std::shared_ptr<Player> player); - bool leaveParty(std::shared_ptr<Player> player); + bool passPartyLeadership(const std::shared_ptr<Player> &player); + bool leaveParty(const std::shared_ptr<Player> &player, bool forceRemove = false); bool removeInvite(const std::shared_ptr<Player> &player, bool removeFromPlayer = true); bool isPlayerInvited(const std::shared_ptr<Player> &player) const; void updateAllPartyIcons(); void broadcastPartyMessage(MessageClasses msgClass, const std::string &msg, bool sendToInvitations = false); - bool empty() const { - return memberList.empty() && inviteList.empty(); - } + bool empty() const; bool canOpenCorpse(uint32_t ownerId) const; - void shareExperience(uint64_t experience, std::shared_ptr<Creature> target = nullptr); - bool setSharedExperience(std::shared_ptr<Player> player, bool sharedExpActive, bool silent = false); - bool isSharedExperienceActive() const { - return sharedExpActive; - } - bool isSharedExperienceEnabled() const { - return sharedExpEnabled; - } - bool canUseSharedExperience(std::shared_ptr<Player> player); - SharedExpStatus_t getMemberSharedExperienceStatus(std::shared_ptr<Player> player); + void shareExperience(uint64_t experience, const std::shared_ptr<Creature> &target = nullptr); + bool setSharedExperience(const std::shared_ptr<Player> &player, bool sharedExpActive, bool silent = false); + bool isSharedExperienceActive() const; + bool isSharedExperienceEnabled() const; + bool canUseSharedExperience(const std::shared_ptr<Player> &player); + SharedExpStatus_t getMemberSharedExperienceStatus(const std::shared_ptr<Player> &player); void updateSharedExperience(); - void updatePlayerTicks(std::shared_ptr<Player> player, uint32_t points); - void clearPlayerPoints(std::shared_ptr<Player> player); + void updatePlayerTicks(const std::shared_ptr<Player> &player, uint32_t points); + void clearPlayerPoints(const std::shared_ptr<Player> &player); - void showPlayerStatus(std::shared_ptr<Player> player, std::shared_ptr<Player> member, bool showStatus); - void updatePlayerStatus(std::shared_ptr<Player> player); - void updatePlayerStatus(std::shared_ptr<Player> player, const Position &oldPos, const Position &newPos); - void updatePlayerHealth(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint8_t healthPercent); - void updatePlayerMana(std::shared_ptr<Player> player, uint8_t manaPercent); - void updatePlayerVocation(std::shared_ptr<Player> player); + void showPlayerStatus(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &member, bool showStatus) const; + void updatePlayerStatus(const std::shared_ptr<Player> &player); + void updatePlayerStatus(const std::shared_ptr<Player> &player, const Position &oldPos, const Position &newPos); + void updatePlayerHealth(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint8_t healthPercent); + void updatePlayerMana(const std::shared_ptr<Player> &player, uint8_t manaPercent); + void updatePlayerVocation(const std::shared_ptr<Player> &player); void updateTrackerAnalyzer(); - void addPlayerLoot(std::shared_ptr<Player> player, std::shared_ptr<Item> item); - void addPlayerSupply(std::shared_ptr<Player> player, std::shared_ptr<Item> item); - void addPlayerDamage(std::shared_ptr<Player> player, uint64_t amount); - void addPlayerHealing(std::shared_ptr<Player> player, uint64_t amount); + void addPlayerLoot(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item); + void addPlayerSupply(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item); + void addPlayerDamage(const std::shared_ptr<Player> &player, uint64_t amount); + void addPlayerHealing(const std::shared_ptr<Player> &player, uint64_t amount); void switchAnalyzerPriceType(); void resetAnalyzer(); - void reloadPrices(); - - std::shared_ptr<PartyAnalyzer> getPlayerPartyAnalyzerStruct(uint32_t playerId) const { - if (auto it = std::find_if(membersData.begin(), membersData.end(), [playerId](const std::shared_ptr<PartyAnalyzer> &preyIt) { - return preyIt->id == playerId; - }); - it != membersData.end()) { - return *it; - } + void reloadPrices() const; - return nullptr; - } + std::shared_ptr<PartyAnalyzer> getPlayerPartyAnalyzerStruct(uint32_t playerId) const; - uint32_t getAnalyzerTimeNow() const { - return static_cast<uint32_t>(time(nullptr) - trackerTime); - } + uint32_t getAnalyzerTimeNow() const; public: // Party analyzer @@ -126,8 +94,8 @@ class Party : public SharedObject { std::vector<std::shared_ptr<PartyAnalyzer>> membersData; private: - const char* getSharedExpReturnMessage(SharedExpStatus_t value); - bool isPlayerActive(std::shared_ptr<Player> player); + const char* getSharedExpReturnMessage(SharedExpStatus_t value) const; + bool isPlayerActive(const std::shared_ptr<Player> &player); SharedExpStatus_t getSharedExperienceStatus(); uint32_t getHighestLevel(); uint32_t getLowestLevel(); diff --git a/src/creatures/players/grouping/team_finder.hpp b/src/creatures/players/grouping/team_finder.hpp index 9fafbd032..e46217560 100644 --- a/src/creatures/players/grouping/team_finder.hpp +++ b/src/creatures/players/grouping/team_finder.hpp @@ -1,5 +1,3 @@ -#include <utility> - /** * Canary - A free and open-source MMORPG server emulator * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> @@ -16,7 +14,7 @@ * This class is responsible control and manage the team finder feature. **/ -class TeamFinder { +class TeamFinder final { public: TeamFinder() = default; TeamFinder(uint16_t initMinLevel, uint16_t initMaxLevel, uint8_t initVocationIDs, uint16_t initTeamSlots, uint16_t initFreeSlots, bool initPartyBool, uint32_t initTimestamp, uint8_t initTeamType, uint16_t initBossID, uint16_t initHunt_type, uint16_t initHunt_area, uint16_t initQuestID, uint32_t initLeaderGuid, std::map<uint32_t, uint8_t> initMembersMap) : @@ -34,7 +32,7 @@ class TeamFinder { questID(initQuestID), leaderGuid(initLeaderGuid), membersMap(std::move(initMembersMap)) { } - virtual ~TeamFinder() = default; + ~TeamFinder() = default; uint16_t minLevel = 0; uint16_t maxLevel = 0; diff --git a/src/creatures/players/imbuements/imbuements.cpp b/src/creatures/players/imbuements/imbuements.cpp index 4bfb0de83..c71a56fd5 100644 --- a/src/creatures/players/imbuements/imbuements.cpp +++ b/src/creatures/players/imbuements/imbuements.cpp @@ -7,10 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" #include "creatures/players/imbuements/imbuements.hpp" -#include "lua/creature/events.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/player.hpp" +#include "items/item.hpp" +#include "lib/di/container.hpp" #include "utils/pugicast.hpp" +#include <utils/tools.hpp> + +Imbuements &Imbuements::getInstance() { + return inject<Imbuements>(); +} Imbuement* Imbuements::getImbuement(uint16_t id) { if (id == 0) { @@ -27,7 +35,7 @@ Imbuement* Imbuements::getImbuement(uint16_t id) { bool Imbuements::loadFromXml(bool /* reloading */) { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/imbuements.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/imbuements.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); @@ -35,7 +43,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { } loaded = true; - for (auto baseNode : doc.child("imbuements").children()) { + for (const auto &baseNode : doc.child("imbuements").children()) { pugi::xml_attribute attr; // Base for imbue if (strcasecmp(baseNode.name(), "base") == 0) { @@ -83,14 +91,14 @@ bool Imbuements::loadFromXml(bool /* reloading */) { continue; } - auto imbuements = imbuementMap.emplace(std::piecewise_construct, std::forward_as_tuple(runningid), std::forward_as_tuple(runningid, baseid)); + auto [imbuementInfo, inserted] = imbuementMap.emplace(std::piecewise_construct, std::forward_as_tuple(runningid), std::forward_as_tuple(runningid, baseid)); - if (!imbuements.second) { + if (!inserted) { g_logger().warn("Duplicate imbuement of Base ID: '{}' ignored", baseid); continue; } - Imbuement &imbuement = imbuements.first->second; + Imbuement &imbuement = imbuementInfo->second; pugi::xml_attribute iconBase = baseNode.attribute("iconid"); if (!iconBase) { @@ -123,7 +131,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { continue; } - uint16_t category = pugi::cast<uint16_t>(categorybase.value()); + auto category = pugi::cast<uint16_t>(categorybase.value()); auto category_p = getCategoryByID(category); if (category_p == nullptr) { g_logger().warn("Category imbuement {} not exist", category); @@ -139,26 +147,26 @@ bool Imbuements::loadFromXml(bool /* reloading */) { } imbuement.name = nameBase.value(); - for (auto childNode : baseNode.children()) { - if (!(attr = childNode.attribute("key"))) { + for (const auto &childNode : baseNode.children()) { + if (!((attr = childNode.attribute("key")))) { g_logger().warn("Missing key attribute in imbuement id: {}", runningid); continue; } std::string type = attr.as_string(); if (strcasecmp(type.c_str(), "item") == 0) { - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing item ID for imbuement name '{}'", imbuement.name); continue; } - uint16_t sourceId = pugi::cast<uint16_t>(attr.value()); + auto sourceId = pugi::cast<uint16_t>(attr.value()); uint16_t count = 1; if ((attr = childNode.attribute("count"))) { count = pugi::cast<uint16_t>(childNode.attribute("count").value()); } - auto it2 = std::find_if(imbuement.items.begin(), imbuement.items.end(), [sourceId](const std::pair<uint16_t, uint16_t> &source) -> bool { + const auto &it2 = std::ranges::find_if(imbuement.items, [sourceId](const std::pair<uint16_t, uint16_t> &source) -> bool { return source.first == sourceId; }); @@ -178,7 +186,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { imbuement.description = description; } else if (strcasecmp(type.c_str(), "effect") == 0) { // Effects - if (!(attr = childNode.attribute("type"))) { + if (!((attr = childNode.attribute("type")))) { g_logger().warn("Missing effect type for imbuement name: {}", imbuement.name); continue; } @@ -186,7 +194,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { std::string effecttype = attr.as_string(); if (strcasecmp(effecttype.c_str(), "skill") == 0) { - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing effect value for imbuement name {}", imbuement.name); continue; } @@ -226,11 +234,11 @@ bool Imbuements::loadFromXml(bool /* reloading */) { continue; } - if (!(attr = childNode.attribute("bonus"))) { + if (!((attr = childNode.attribute("bonus")))) { g_logger().warn("Missing skill bonus for imbuement name {}", imbuement.name); continue; } - int32_t bonus = pugi::cast<int32_t>(attr.value()); + auto bonus = pugi::cast<int32_t>(attr.value()); if (usenormalskill == 1) { imbuement.skills[skillId] = bonus; @@ -246,7 +254,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { imbuement.skills[skillId - 1] = chance; } } else if (strcasecmp(effecttype.c_str(), "damage") == 0) { - if (!(attr = childNode.attribute("combat"))) { + if (!((attr = childNode.attribute("combat")))) { g_logger().warn("Missing combat for imbuement name {}", imbuement.name); continue; } @@ -257,7 +265,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { continue; } - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing damage reduction percentage for imbuement name {}", imbuement.name); continue; } @@ -267,7 +275,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { imbuement.combatType = combatType; imbuement.elementDamage = std::min<int16_t>(100, percent); } else if (strcasecmp(effecttype.c_str(), "reduction") == 0) { - if (!(attr = childNode.attribute("combat"))) { + if (!((attr = childNode.attribute("combat")))) { g_logger().warn("Missing combat for imbuement name {}", imbuement.name); continue; } @@ -278,7 +286,7 @@ bool Imbuements::loadFromXml(bool /* reloading */) { continue; } - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing damage reduction percentage for imbuement name {}", imbuement.name); continue; } @@ -287,14 +295,14 @@ bool Imbuements::loadFromXml(bool /* reloading */) { imbuement.absorbPercent[combatTypeToIndex(combatType)] = percent; } else if (strcasecmp(effecttype.c_str(), "speed") == 0) { - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing speed value for imbuement name {}", imbuement.name); continue; } imbuement.speed = pugi::cast<uint32_t>(attr.value()); } else if (strcasecmp(effecttype.c_str(), "capacity") == 0) { - if (!(attr = childNode.attribute("value"))) { + if (!((attr = childNode.attribute("value")))) { g_logger().warn("Missing cap value for imbuement name {}", imbuement.name); continue; } @@ -321,7 +329,7 @@ bool Imbuements::reload() { } BaseImbuement* Imbuements::getBaseByID(uint16_t id) { - auto baseImbuements = std::find_if(basesImbuement.begin(), basesImbuement.end(), [id](const BaseImbuement &groupImbuement) { + const auto &baseImbuements = std::ranges::find_if(basesImbuement, [id](const BaseImbuement &groupImbuement) { return groupImbuement.id == id; }); @@ -329,14 +337,14 @@ BaseImbuement* Imbuements::getBaseByID(uint16_t id) { } CategoryImbuement* Imbuements::getCategoryByID(uint16_t id) { - auto categoryImbuements = std::find_if(categoriesImbuement.begin(), categoriesImbuement.end(), [id](const CategoryImbuement &categoryImbuement) { + const auto &categoryImbuements = std::ranges::find_if(categoriesImbuement, [id](const CategoryImbuement &categoryImbuement) { return categoryImbuement.id == id; }); return categoryImbuements != categoriesImbuement.end() ? &*categoryImbuements : nullptr; } -std::vector<Imbuement*> Imbuements::getImbuements(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { +std::vector<Imbuement*> Imbuements::getImbuements(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { std::vector<Imbuement*> imbuements; for (auto &[key, value] : imbuementMap) { @@ -346,7 +354,7 @@ std::vector<Imbuement*> Imbuements::getImbuements(std::shared_ptr<Player> 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__) + if (g_configManager().getBoolean(TOGGLE_IMBUEMENT_SHRINE_STORAGE) && imbuement->getStorage() != 0 && player->getStorageValue(imbuement->getStorage() == -1) && imbuement->getBaseID() >= 1 && imbuement->getBaseID() <= 3) { @@ -364,8 +372,48 @@ std::vector<Imbuement*> Imbuements::getImbuements(std::shared_ptr<Player> player continue; } - imbuements.push_back(imbuement); + imbuements.emplace_back(imbuement); } return imbuements; } + +uint16_t Imbuement::getID() const { + return id; +} + +uint16_t Imbuement::getBaseID() const { + return baseid; +} + +uint32_t Imbuement::getStorage() const { + return storage; +} + +bool Imbuement::isPremium() const { + return premium; +} + +std::string Imbuement::getName() const { + return name; +} + +std::string Imbuement::getDescription() const { + return description; +} + +std::string Imbuement::getSubGroup() const { + return subgroup; +} + +uint16_t Imbuement::getCategory() const { + return category; +} + +const std::vector<std::pair<uint16_t, uint16_t>> &Imbuement::getItems() const { + return items; +} + +uint16_t Imbuement::getIconID() const { + return icon + (baseid - 1); +} diff --git a/src/creatures/players/imbuements/imbuements.hpp b/src/creatures/players/imbuements/imbuements.hpp index 265e813aa..b2429cc81 100644 --- a/src/creatures/players/imbuements/imbuements.hpp +++ b/src/creatures/players/imbuements/imbuements.hpp @@ -9,16 +9,15 @@ #pragma once -#include "creatures/players/player.hpp" -#include "declarations.hpp" -#include "lib/di/container.hpp" -#include "utils/tools.hpp" +#include "creatures/creatures_definitions.hpp" class Player; class Item; class Imbuement; +constexpr int32_t maxSkillOrStatId = std::max<int32_t>(STAT_LAST, SKILL_LAST); + struct BaseImbuement { BaseImbuement(uint16_t initId, std::string initName, uint32_t initPrice, uint32_t initProtectionPrice, uint32_t initRemoveCost, uint32_t initDuration, uint8_t initPercent) : id(initId), name(std::move(initName)), price(initPrice), protectionPrice(initProtectionPrice), removeCost(initRemoveCost), duration(initDuration), percent(initPercent) { } @@ -52,15 +51,13 @@ class Imbuements { Imbuements(const Imbuements &) = delete; Imbuements &operator=(const Imbuements &) = delete; - static Imbuements &getInstance() { - return inject<Imbuements>(); - } + static Imbuements &getInstance(); Imbuement* getImbuement(uint16_t id); BaseImbuement* getBaseByID(uint16_t id); CategoryImbuement* getCategoryByID(uint16_t id); - std::vector<Imbuement*> getImbuements(std::shared_ptr<Player> player, std::shared_ptr<Item> item); + std::vector<Imbuement*> getImbuements(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item); protected: friend class Imbuement; @@ -82,46 +79,26 @@ class Imbuement { Imbuement(uint16_t initId, uint16_t initBaseId) : id(initId), baseid(initBaseId) { } - uint16_t getID() const { - return id; - } + uint16_t getID() const; - uint16_t getBaseID() const { - return baseid; - } + uint16_t getBaseID() const; - uint32_t getStorage() const { - return storage; - } + uint32_t getStorage() const; - bool isPremium() { - return premium; - } - std::string getName() const { - return name; - } - std::string getDescription() const { - return description; - } + bool isPremium() const; + std::string getName() const; + std::string getDescription() const; - std::string getSubGroup() const { - return subgroup; - } + std::string getSubGroup() const; - uint16_t getCategory() const { - return category; - } + uint16_t getCategory() const; - const std::vector<std::pair<uint16_t, uint16_t>> &getItems() const { - return items; - } + const std::vector<std::pair<uint16_t, uint16_t>> &getItems() const; - uint16_t getIconID() { - return icon + (baseid - 1); - } + uint16_t getIconID() const; uint16_t icon = 1; - int32_t stats[STAT_LAST + 1] = {}; + int32_t stats[maxSkillOrStatId + 1] = {}; int32_t skills[SKILL_LAST + 1] = {}; int32_t speed = 0; uint32_t capacity = 0; @@ -136,10 +113,14 @@ class Imbuement { friend class Item; private: - bool premium = false; - uint32_t storage = 0; - uint16_t id, baseid, category = 0; - std::string name, description, subgroup = ""; + bool premium {}; + uint32_t storage {}; + uint16_t id {}; + uint16_t baseid {}; + uint16_t category {}; + std::string name; + std::string description; + std::string subgroup; std::vector<std::pair<uint16_t, uint16_t>> items; }; diff --git a/src/creatures/players/management/ban.cpp b/src/creatures/players/management/ban.cpp index d81045c53..8ed990af7 100644 --- a/src/creatures/players/management/ban.cpp +++ b/src/creatures/players/management/ban.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/management/ban.hpp" + #include "database/database.hpp" #include "database/databasetasks.hpp" #include "utils/tools.hpp" @@ -17,7 +16,7 @@ bool Ban::acceptConnection(uint32_t clientIP) { std::scoped_lock<std::recursive_mutex> lockClass(lock); - uint64_t currentTime = OTSYS_TIME(); + const uint64_t currentTime = OTSYS_TIME(); auto it = ipConnectMap.find(clientIP); if (it == ipConnectMap.end()) { @@ -31,7 +30,7 @@ bool Ban::acceptConnection(uint32_t clientIP) { return false; } - int64_t timeDiff = currentTime - connectBlock.lastAttempt; + const int64_t timeDiff = currentTime - connectBlock.lastAttempt; connectBlock.lastAttempt = currentTime; if (timeDiff <= 5000) { if (++connectBlock.count > 5) { @@ -53,12 +52,12 @@ bool IOBan::isAccountBanned(uint32_t accountId, BanInfo &banInfo) { std::ostringstream query; query << "SELECT `reason`, `expires_at`, `banned_at`, `banned_by`, (SELECT `name` FROM `players` WHERE `id` = `banned_by`) AS `name` FROM `account_bans` WHERE `account_id` = " << accountId; - DBResult_ptr result = db.storeQuery(query.str()); + const DBResult_ptr result = db.storeQuery(query.str()); if (!result) { return false; } - int64_t expiresAt = result->getNumber<int64_t>("expires_at"); + const auto expiresAt = result->getNumber<int64_t>("expires_at"); if (expiresAt != 0 && time(nullptr) > expiresAt) { // Move the ban to history if it has expired query.str(std::string()); @@ -87,12 +86,12 @@ bool IOBan::isIpBanned(uint32_t clientIP, BanInfo &banInfo) { std::ostringstream query; query << "SELECT `reason`, `expires_at`, (SELECT `name` FROM `players` WHERE `id` = `banned_by`) AS `name` FROM `ip_bans` WHERE `ip` = " << clientIP; - DBResult_ptr result = db.storeQuery(query.str()); + const DBResult_ptr result = db.storeQuery(query.str()); if (!result) { return false; } - int64_t expiresAt = result->getNumber<int64_t>("expires_at"); + const auto expiresAt = result->getNumber<int64_t>("expires_at"); if (expiresAt != 0 && time(nullptr) > expiresAt) { query.str(std::string()); query << "DELETE FROM `ip_bans` WHERE `ip` = " << clientIP; diff --git a/src/creatures/players/management/ban.hpp b/src/creatures/players/management/ban.hpp index 6fdb94296..3e9b3f07f 100644 --- a/src/creatures/players/management/ban.hpp +++ b/src/creatures/players/management/ban.hpp @@ -10,18 +10,18 @@ #pragma once struct BanInfo { - std::string bannedBy; - std::string reason; - time_t expiresAt; + std::string bannedBy {}; + std::string reason {}; + time_t expiresAt {}; }; struct ConnectBlock { constexpr ConnectBlock(uint64_t lastAttempt, uint64_t blockTime, uint32_t count) : lastAttempt(lastAttempt), blockTime(blockTime), count(count) { } - uint64_t lastAttempt; - uint64_t blockTime; - uint32_t count; + uint64_t lastAttempt {}; + uint64_t blockTime {}; + uint32_t count {}; }; using IpConnectMap = std::map<uint32_t, ConnectBlock>; diff --git a/src/creatures/players/management/waitlist.cpp b/src/creatures/players/management/waitlist.cpp index 345c20f26..eceb8b708 100644 --- a/src/creatures/players/management/waitlist.cpp +++ b/src/creatures/players/management/waitlist.cpp @@ -7,10 +7,13 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/management/waitlist.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" +#include "lib/di/container.hpp" +#include "utils/tools.hpp" #include "enums/account_type.hpp" @@ -27,13 +30,13 @@ WaitingList &WaitingList::getInstance() { return inject<WaitingList>(); } -void WaitingList::cleanupList(WaitList &list) { - int64_t time = OTSYS_TIME(); +void WaitingList::cleanupList(WaitList &list) const { + const int64_t time = OTSYS_TIME(); auto it = list.begin(); while (it != list.end()) { - auto timeout = static_cast<int64_t>(it->timeout); - g_logger().warn("time: {}", timeout - time); + const auto timeout = static_cast<int64_t>(it->timeout); + g_logger().debug("[{}] time: {}", __FUNCTION__, timeout - time); if ((timeout - time) <= 0) { info->playerReferences.erase(it->playerGUID); it = list.erase(it); @@ -43,30 +46,32 @@ void WaitingList::cleanupList(WaitList &list) { } } -std::size_t WaitingList::getTimeout(std::size_t slot) { +std::size_t WaitingList::getTimeout(std::size_t slot) const { return WaitingList::getTime(slot) + TIMEOUT_EXTRA; } std::size_t WaitingList::getTime(std::size_t slot) { if (slot < SLOT_LIMIT_ONE) { return 5; - } else if (slot < SLOT_LIMIT_TWO) { + } + if (slot < SLOT_LIMIT_TWO) { return 10; - } else if (slot < SLOT_LIMIT_THREE) { + } + if (slot < SLOT_LIMIT_THREE) { return 20; - } else if (slot < SLOT_LIMIT_FOUR) { + } + if (slot < SLOT_LIMIT_FOUR) { return 60; - } else { - return 120; } + return 120; } -bool WaitingList::clientLogin(std::shared_ptr<Player> player) { +bool WaitingList::clientLogin(const std::shared_ptr<Player> &player) const { if (player->hasFlag(PlayerFlags_t::CanAlwaysLogin) || player->getAccountType() >= ACCOUNT_TYPE_GAMEMASTER) { return true; } - auto maxPlayers = static_cast<uint32_t>(g_configManager().getNumber(MAX_PLAYERS, __FUNCTION__)); + auto maxPlayers = static_cast<uint32_t>(g_configManager().getNumber(MAX_PLAYERS)); if (maxPlayers == 0 || (info->priorityWaitList.empty() && info->waitList.empty() && g_game().getPlayersOnline() < maxPlayers)) { return true; } @@ -77,7 +82,7 @@ bool WaitingList::clientLogin(std::shared_ptr<Player> player) { addPlayerToList(player); auto it = info->playerReferences.find(player->getGUID()); - std::size_t slot = it->second.second; + const std::size_t slot = it->second.second; if ((g_game().getPlayersOnline() + slot) <= maxPlayers) { // should be able to login now info->waitList.erase(it->second.first); @@ -87,7 +92,7 @@ bool WaitingList::clientLogin(std::shared_ptr<Player> player) { return false; } -void WaitingList::addPlayerToList(std::shared_ptr<Player> player) { +void WaitingList::addPlayerToList(const std::shared_ptr<Player> &player) const { auto it = info->playerReferences.find(player->getGUID()); if (it != info->playerReferences.end()) { std::size_t slot; @@ -113,7 +118,7 @@ void WaitingList::addPlayerToList(std::shared_ptr<Player> player) { } } -std::size_t WaitingList::getClientSlot(std::shared_ptr<Player> player) { +std::size_t WaitingList::getClientSlot(const std::shared_ptr<Player> &player) const { auto it = info->playerReferences.find(player->getGUID()); if (it == info->playerReferences.end()) { return 0; diff --git a/src/creatures/players/management/waitlist.hpp b/src/creatures/players/management/waitlist.hpp index 24752f264..28a21b4a4 100644 --- a/src/creatures/players/management/waitlist.hpp +++ b/src/creatures/players/management/waitlist.hpp @@ -34,13 +34,13 @@ class WaitingList { public: WaitingList(); static WaitingList &getInstance(); - bool clientLogin(std::shared_ptr<Player> player); - std::size_t getClientSlot(std::shared_ptr<Player> player); + bool clientLogin(const std::shared_ptr<Player> &player) const; + std::size_t getClientSlot(const std::shared_ptr<Player> &player) const; static std::size_t getTime(std::size_t slot); private: - void cleanupList(WaitList &list); - std::size_t getTimeout(std::size_t slot); - void addPlayerToList(std::shared_ptr<Player> player); + void cleanupList(WaitList &list) const; + std::size_t getTimeout(std::size_t slot) const; + void addPlayerToList(const std::shared_ptr<Player> &player) const; std::unique_ptr<WaitListInfo> info; }; diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index c2d8c7a8c..dfdf467aa 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -7,45 +7,64 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "creatures/players/player.hpp" +#include "config/configmanager.hpp" +#include "core.hpp" +#include "creatures/appearance/mounts/mounts.hpp" #include "creatures/combat/combat.hpp" +#include "creatures/combat/condition.hpp" #include "creatures/interactions/chat.hpp" #include "creatures/monsters/monster.hpp" #include "creatures/monsters/monsters.hpp" -#include "creatures/players/player.hpp" +#include "creatures/npcs/npc.hpp" #include "creatures/players/wheel/player_wheel.hpp" +#include "creatures/players/wheel/wheel_gems.hpp" #include "creatures/players/achievement/player_achievement.hpp" #include "creatures/players/cyclopedia/player_badge.hpp" #include "creatures/players/cyclopedia/player_cyclopedia.hpp" #include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/players/grouping/party.hpp" +#include "creatures/players/imbuements/imbuements.hpp" #include "creatures/players/storages/storages.hpp" +#include "creatures/players/vip/player_vip.hpp" +#include "creatures/players/wheel/player_wheel.hpp" +#include "server/network/protocol/protocolgame.hpp" +#include "enums/account_errors.hpp" +#include "enums/account_group_type.hpp" +#include "enums/account_type.hpp" +#include "enums/object_category.hpp" +#include "enums/player_blessings.hpp" +#include "enums/player_icons.hpp" #include "game/game.hpp" #include "game/modal_window/modal_window.hpp" #include "game/scheduling/dispatcher.hpp" -#include "game/scheduling/task.hpp" #include "game/scheduling/save_manager.hpp" +#include "game/scheduling/task.hpp" #include "grouping/familiars.hpp" -#include "lua/creature/creatureevent.hpp" -#include "lua/creature/events.hpp" -#include "lua/callbacks/event_callback.hpp" -#include "lua/callbacks/events_callbacks.hpp" -#include "lua/creature/movement.hpp" +#include "grouping/guild.hpp" +#include "io/iobestiary.hpp" #include "io/iologindata.hpp" +#include "io/ioprey.hpp" #include "items/bed.hpp" +#include "items/containers/depot/depotchest.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "items/containers/rewards/reward.hpp" +#include "items/containers/rewards/rewardchest.hpp" +#include "items/items_classification.hpp" #include "items/weapons/weapons.hpp" -#include "core.hpp" -#include "map/spectators.hpp" #include "lib/metrics/metrics.hpp" -#include "enums/object_category.hpp" -#include "enums/account_errors.hpp" -#include "enums/account_type.hpp" -#include "enums/account_group_type.hpp" +#include "lua/callbacks/event_callback.hpp" +#include "lua/callbacks/events_callbacks.hpp" +#include "lua/creature/actions.hpp" +#include "lua/creature/creatureevent.hpp" +#include "lua/creature/events.hpp" +#include "lua/creature/movement.hpp" +#include "map/spectators.hpp" MuteCountMap Player::muteCountMap; -Player::Player(ProtocolGame_ptr p) : - Creature(), +Player::Player(std::shared_ptr<ProtocolGame> p) : lastPing(OTSYS_TIME()), lastPong(lastPing), inbox(std::make_shared<Inbox>(ITEM_INBOX)), @@ -59,19 +78,20 @@ Player::Player(ProtocolGame_ptr p) : } Player::~Player() { - for (const std::shared_ptr<Item> &item : inventory) { + for (const auto &item : inventory) { if (item) { item->resetParent(); item->stopDecaying(); } } - for (const auto &it : depotLockerMap) { - it.second->removeInbox(inbox); - it.second->stopDecaying(); - } + for (const auto &[depotId, depotLocker] : depotLockerMap) { + if (depotId == 0) { + continue; + } - inbox->stopDecaying(); + depotLocker->removeInbox(inbox); + } setWriteItem(nullptr); setEditHouse(nullptr); @@ -90,6 +110,10 @@ bool Player::setVocation(uint16_t vocId) { return true; } +uint16_t Player::getVocationId() const { + return vocation->getId(); +} + bool Player::isPushable() { if (hasFlag(PlayerFlags_t::CannotBePushed)) { return false; @@ -97,8 +121,8 @@ bool Player::isPushable() { return Creature::isPushable(); } -std::shared_ptr<Task> Player::createPlayerTask(uint32_t delay, std::function<void(void)> f, std::string context) { - return std::make_shared<Task>(std::move(f), std::move(context), delay); +std::shared_ptr<Task> Player::createPlayerTask(uint32_t delay, std::function<void(void)> f, const std::string &context) { + return std::make_shared<Task>(std::move(f), context, delay); } uint32_t Player::playerFirstID = 0x10000000; @@ -124,7 +148,7 @@ std::string Player::getDescription(int32_t lookDistance) { std::ostringstream s; std::string subjectPronoun = getSubjectPronoun(); capitalizeWords(subjectPronoun); - auto playerTitle = title()->getCurrentTitle() == 0 ? "" : (", " + title()->getCurrentTitleName()); + const auto playerTitle = title()->getCurrentTitle() == 0 ? "" : (", " + title()->getCurrentTitleName()); if (lookDistance == -1) { s << "yourself" << playerTitle << "."; @@ -180,14 +204,14 @@ std::string Player::getDescription(int32_t lookDistance) { s << " " << subjectPronoun << " " << getSubjectVerb() << " in a party with "; } - size_t memberCount = m_party->getMemberCount() + 1; + const size_t memberCount = m_party->getMemberCount() + 1; if (memberCount == 1) { s << "1 member and "; } else { s << memberCount << " members and "; } - size_t invitationCount = m_party->getInvitationCount(); + const size_t invitationCount = m_party->getInvitationCount(); if (invitationCount == 1) { s << "1 pending invitation."; } else { @@ -196,7 +220,7 @@ std::string Player::getDescription(int32_t lookDistance) { } if (guild && guildRank) { - size_t memberCount = guild->getMemberCount(); + const size_t memberCount = guild->getMemberCount(); if (memberCount >= 1000) { s << ""; return s.str(); @@ -229,8 +253,20 @@ std::shared_ptr<Item> Player::getInventoryItem(Slots_t slot) const { return inventory[slot]; } +bool Player::isItemAbilityEnabled(Slots_t slot) const { + return inventoryAbilities[slot]; +} + +void Player::setItemAbility(Slots_t slot, bool enabled) { + inventoryAbilities[slot] = enabled; +} + +void Player::setVarSkill(skills_t skill, int32_t modifier) { + varSkills[skill] += modifier; +} + bool Player::isSuppress(ConditionType_t conditionType, bool attackerPlayer) const { - auto minDelay = g_configManager().getNumber(MIN_DELAY_BETWEEN_CONDITIONS, __FUNCTION__); + auto minDelay = g_configManager().getNumber(MIN_DELAY_BETWEEN_CONDITIONS); if (IsConditionSuppressible(conditionType) && checkLastConditionTimeWithin(conditionType, minDelay)) { return true; } @@ -249,12 +285,12 @@ void Player::removeConditionSuppressions() { } std::shared_ptr<Item> Player::getWeapon(Slots_t slot, bool ignoreAmmo) const { - std::shared_ptr<Item> item = inventory[slot]; + const auto &item = inventory[slot]; if (!item) { return nullptr; } - WeaponType_t weaponType = item->getWeaponType(); + const WeaponType_t &weaponType = item->getWeaponType(); if (weaponType == WEAPON_NONE || weaponType == WEAPON_SHIELD || weaponType == WEAPON_AMMO) { return nullptr; } @@ -262,7 +298,7 @@ std::shared_ptr<Item> Player::getWeapon(Slots_t slot, bool ignoreAmmo) const { if (!ignoreAmmo && (weaponType == WEAPON_DISTANCE || weaponType == WEAPON_MISSILE)) { const ItemType &it = Item::items[item->getID()]; if (it.ammoType != AMMO_NONE) { - item = getQuiverAmmoOfType(it); + return getQuiverAmmoOfType(it); } } @@ -270,12 +306,12 @@ std::shared_ptr<Item> Player::getWeapon(Slots_t slot, bool ignoreAmmo) const { } bool Player::hasQuiverEquipped() const { - std::shared_ptr<Item> quiver = inventory[CONST_SLOT_RIGHT]; + const auto &quiver = inventory[CONST_SLOT_RIGHT]; return quiver && quiver->isQuiver() && quiver->getContainer(); } bool Player::hasWeaponDistanceEquipped() const { - std::shared_ptr<Item> item = inventory[CONST_SLOT_LEFT]; + const auto &item = inventory[CONST_SLOT_LEFT]; return item && item->getWeaponType() == WEAPON_DISTANCE; } @@ -284,9 +320,9 @@ std::shared_ptr<Item> Player::getQuiverAmmoOfType(const ItemType &it) const { return nullptr; } - std::shared_ptr<Item> quiver = inventory[CONST_SLOT_RIGHT]; - for (std::shared_ptr<Container> container = quiver->getContainer(); - auto ammoItem : container->getItemList()) { + const auto &quiver = inventory[CONST_SLOT_RIGHT]; + for (const auto &container = quiver->getContainer(); + const auto &ammoItem : container->getItemList()) { if (ammoItem->getAmmoType() == it.ammoType) { if (level >= Item::items[ammoItem->getID()].minReqLevel) { return ammoItem; @@ -297,34 +333,34 @@ std::shared_ptr<Item> Player::getQuiverAmmoOfType(const ItemType &it) const { } std::shared_ptr<Item> Player::getWeapon(bool ignoreAmmo /* = false*/) const { - std::shared_ptr<Item> item = getWeapon(CONST_SLOT_LEFT, ignoreAmmo); - if (item) { - return item; + const auto &itemLeft = getWeapon(CONST_SLOT_LEFT, ignoreAmmo); + if (itemLeft) { + return itemLeft; } - item = getWeapon(CONST_SLOT_RIGHT, ignoreAmmo); - if (item) { - return item; + const auto &itemRight = getWeapon(CONST_SLOT_RIGHT, ignoreAmmo); + if (itemRight) { + return itemRight; } return nullptr; } WeaponType_t Player::getWeaponType() const { - std::shared_ptr<Item> item = getWeapon(); + const auto &item = getWeapon(); if (!item) { return WEAPON_NONE; } return item->getWeaponType(); } -int32_t Player::getWeaponSkill(std::shared_ptr<Item> item) const { +int32_t Player::getWeaponSkill(const std::shared_ptr<Item> &item) const { if (!item) { return getSkillLevel(SKILL_FIST); } int32_t attackSkill; - WeaponType_t weaponType = item->getWeaponType(); + const WeaponType_t &weaponType = item->getWeaponType(); switch (weaponType) { case WEAPON_SWORD: { attackSkill = getSkillLevel(SKILL_SWORD); @@ -358,14 +394,14 @@ int32_t Player::getWeaponSkill(std::shared_ptr<Item> item) const { int32_t Player::getArmor() const { int32_t armor = 0; - static const Slots_t armorSlots[] = { CONST_SLOT_HEAD, CONST_SLOT_NECKLACE, CONST_SLOT_ARMOR, CONST_SLOT_LEGS, CONST_SLOT_FEET, CONST_SLOT_RING, CONST_SLOT_AMMO }; - for (Slots_t slot : armorSlots) { - std::shared_ptr<Item> inventoryItem = inventory[slot]; + static constexpr Slots_t armorSlots[] = { CONST_SLOT_HEAD, CONST_SLOT_NECKLACE, CONST_SLOT_ARMOR, CONST_SLOT_LEGS, CONST_SLOT_FEET, CONST_SLOT_RING, CONST_SLOT_AMMO }; + for (const Slots_t &slot : armorSlots) { + const auto &inventoryItem = inventory[slot]; if (inventoryItem) { armor += inventoryItem->getArmor(); } } - return static_cast<int32_t>(armor * vocation->armorMultiplier); + return armor * static_cast<int32_t>(vocation->armorMultiplier); } void Player::getShieldAndWeapon(std::shared_ptr<Item> &shield, std::shared_ptr<Item> &weapon) const { @@ -373,7 +409,7 @@ void Player::getShieldAndWeapon(std::shared_ptr<Item> &shield, std::shared_ptr<I weapon = nullptr; for (uint32_t slot = CONST_SLOT_RIGHT; slot <= CONST_SLOT_LEFT; slot++) { - std::shared_ptr<Item> item = inventory[slot]; + const auto &item = inventory[slot]; if (!item) { continue; } @@ -466,44 +502,55 @@ float Player::getDefenseFactor() const { } } -uint32_t Player::getClientIcons() { - uint32_t icons = 0; +void Player::setLastWalkthroughAttempt(int64_t walkthroughAttempt) { + lastWalkthroughAttempt = walkthroughAttempt; +} + +void Player::setLastWalkthroughPosition(Position walkthroughPosition) { + lastWalkthroughPosition = walkthroughPosition; +} + +std::shared_ptr<Inbox> Player::getInbox() const { + return inbox; +} + +std::unordered_set<PlayerIcon> Player::getClientIcons() { + std::unordered_set<PlayerIcon> icons; + for (const auto &condition : conditions) { if (!isSuppress(condition->getType(), false)) { - icons |= condition->getIcons(); + auto conditionIcons = condition->getIcons(); + icons.insert(conditionIcons.begin(), conditionIcons.end()); + if (icons.size() == 9) { + return icons; + } } } - if (pzLocked) { - icons |= ICON_REDSWORDS; + if (pzLocked && icons.size() < 9) { + icons.insert(PlayerIcon::RedSwords); } - auto tile = getTile(); + const auto &tile = getTile(); if (tile && tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - icons |= ICON_PIGEON; + if (icons.size() < 9) { + icons.insert(PlayerIcon::Pigeon); + } client->sendRestingStatus(1); - // Don't show ICON_SWORDS if player is in protection zone. - if (hasBitSet(ICON_SWORDS, icons)) { - icons &= ~ICON_SWORDS; - } + icons.erase(PlayerIcon::Swords); } else { client->sendRestingStatus(0); } - // Game client debugs with 10 or more icons - // so let's prevent that from happening. - std::bitset<32> icon_bitset(static_cast<uint64_t>(icons)); - for (size_t pos = 0, bits_set = icon_bitset.count(); bits_set >= 10; ++pos) { - if (icon_bitset[pos]) { - icon_bitset.reset(pos); - --bits_set; - } - } - return icon_bitset.to_ulong(); + return icons; +} + +const std::unordered_set<std::shared_ptr<MonsterType>> &Player::getCyclopediaMonsterTrackerSet(bool isBoss) const { + return isBoss ? m_bosstiaryMonsterTracker : m_bestiaryMonsterTracker; } -void Player::addMonsterToCyclopediaTrackerList(const std::shared_ptr<MonsterType> mtype, bool isBoss, bool reloadClient /* = false */) { +void Player::addMonsterToCyclopediaTrackerList(const std::shared_ptr<MonsterType> &mtype, bool isBoss, bool reloadClient /* = false */) { if (!client) { return; } @@ -523,7 +570,7 @@ void Player::addMonsterToCyclopediaTrackerList(const std::shared_ptr<MonsterType } } -void Player::removeMonsterFromCyclopediaTrackerList(std::shared_ptr<MonsterType> mtype, bool isBoss, bool reloadClient /* = false */) { +void Player::removeMonsterFromCyclopediaTrackerList(const std::shared_ptr<MonsterType> &mtype, bool isBoss, bool reloadClient /* = false */) { if (!client) { return; } @@ -544,10 +591,79 @@ void Player::removeMonsterFromCyclopediaTrackerList(std::shared_ptr<MonsterType> } } +void Player::sendBestiaryEntryChanged(uint16_t raceid) const { + if (client) { + client->sendBestiaryEntryChanged(raceid); + } +} + +void Player::refreshCyclopediaMonsterTracker(const std::unordered_set<std::shared_ptr<MonsterType>> &trackerList, bool isBoss) const { + if (client) { + client->refreshCyclopediaMonsterTracker(trackerList, isBoss); + } +} + bool Player::isBossOnBosstiaryTracker(const std::shared_ptr<MonsterType> &monsterType) const { return monsterType ? m_bosstiaryMonsterTracker.contains(monsterType) : false; } +std::shared_ptr<Vocation> Player::getVocation() const { + return vocation; +} + +OperatingSystem_t Player::getOperatingSystem() const { + return operatingSystem; +} + +void Player::setOperatingSystem(OperatingSystem_t clientos) { + operatingSystem = clientos; +} + +bool Player::isOldProtocol() const { + return client && client->oldProtocol; +} + +uint32_t Player::getProtocolVersion() const { + if (!client) { + return 0; + } + + return client->getVersion(); +} + +bool Player::hasSecureMode() const { + return secureMode; +} + +void Player::setParty(std::shared_ptr<Party> newParty) { + m_party = std::move(newParty); +} + +std::shared_ptr<Party> Player::getParty() const { + return m_party; +} + +int32_t Player::getCleavePercent(bool useCharges) const { + int32_t result = cleavePercent; + for (const auto &item : getEquippedItems()) { + const ItemType &it = Item::items[item->getID()]; + if (!it.abilities) { + continue; + } + + const int32_t &cleave_percent = it.abilities->cleavePercent; + if (cleave_percent != 0) { + result += cleave_percent; + const uint16_t charges = item->getCharges(); + if (useCharges && charges != 0) { + g_game().transformItem(item, item->getID(), charges - 1); + } + } + } + + return result; +} + void Player::updateInventoryWeight() { if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { return; @@ -555,7 +671,7 @@ void Player::updateInventoryWeight() { inventoryWeight = 0; for (int i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (item) { inventoryWeight += item->getWeight(); } @@ -564,17 +680,16 @@ void Player::updateInventoryWeight() { void Player::updateInventoryImbuement() { // Get the tile the player is currently on - std::shared_ptr<Tile> playerTile = getTile(); + const auto &playerTile = getTile(); // Check if the player is in a protection zone - bool isInProtectionZone = playerTile && playerTile->hasFlag(TILESTATE_PROTECTIONZONE); + const bool &isInProtectionZone = playerTile && playerTile->hasFlag(TILESTATE_PROTECTIONZONE); // Check if the player is in fight mode bool isInFightMode = hasCondition(CONDITION_INFIGHT); - bool nonAggressiveFightOnly = g_configManager().getBoolean(TOGGLE_IMBUEMENT_NON_AGGRESSIVE_FIGHT_ONLY, __FUNCTION__); + bool nonAggressiveFightOnly = g_configManager().getBoolean(TOGGLE_IMBUEMENT_NON_AGGRESSIVE_FIGHT_ONLY); // Iterate through all items in the player's inventory - for (auto [key, item] : getAllSlotItems()) { + for (const auto &[slodNumber, item] : getAllSlotItems()) { // Iterate through all imbuement slots on the item - for (uint8_t slotid = 0; slotid < item->getImbuementSlot(); slotid++) { ImbuementInfo imbuementInfo; // Get the imbuement information for the current slot @@ -584,12 +699,12 @@ void Player::updateInventoryImbuement() { } // Imbuement from imbuementInfo, this variable reduces code complexity - auto imbuement = imbuementInfo.imbuement; + const auto imbuement = imbuementInfo.imbuement; // Get the category of the imbuement const CategoryImbuement* categoryImbuement = g_imbuements().getCategoryByID(imbuement->getCategory()); // Parent of the imbued item - auto parent = item->getParent(); - bool isInBackpack = parent && parent->getContainer(); + const auto &parent = item->getParent(); + const bool &isInBackpack = parent && parent->getContainer(); // If the imbuement is aggressive and the player is not in fight mode or is in a protection zone, or the item is in a container, ignore it. if (categoryImbuement && (categoryImbuement->agressive || nonAggressiveFightOnly) && (isInProtectionZone || !isInFightMode || isInBackpack)) { continue; @@ -608,14 +723,13 @@ void Player::updateInventoryImbuement() { g_logger().trace("Decaying imbuement {} from item {} of player {}", imbuement->getName(), item->getName(), getName()); // Calculate the new duration of the imbuement, making sure it doesn't go below 0 - uint32_t duration = std::max<uint32_t>(0, imbuementInfo.duration - EVENT_IMBUEMENT_INTERVAL / 1000); + const uint32_t duration = std::max<uint32_t>(0, imbuementInfo.duration - EVENT_IMBUEMENT_INTERVAL / 1000); // Update the imbuement's duration in the item item->decayImbuementTime(slotid, imbuement->getID(), duration); if (duration == 0) { removeItemImbuementStats(imbuement); updateImbuementTrackerStats(); - continue; } } } @@ -624,7 +738,7 @@ void Player::updateInventoryImbuement() { phmap::flat_hash_map<uint8_t, std::shared_ptr<Item>> Player::getAllSlotItems() const { phmap::flat_hash_map<uint8_t, std::shared_ptr<Item>> itemMap; for (uint8_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } @@ -635,16 +749,6 @@ phmap::flat_hash_map<uint8_t, std::shared_ptr<Item>> Player::getAllSlotItems() c return itemMap; } -void Player::setTraining(bool value) { - for (const auto &[key, player] : g_game().getPlayers()) { - if (!this->isInGhostMode() || player->isAccessPlayer()) { - player->vip()->notifyStatusChange(static_self_cast<Player>(), value ? VipStatus_t::Training : VipStatus_t::Online, false); - } - } - vip()->setStatus(VipStatus_t::Training); - setExerciseTraining(value); -} - uint16_t Player::getLoyaltySkill(skills_t skill) const { uint16_t level = getBaseSkill(skill); absl::uint128 currReqTries = vocation->getReqSkillTries(skill, level); @@ -655,7 +759,7 @@ uint16_t Player::getLoyaltySkill(skills_t skill) const { } absl::uint128 tries = skills[skill].tries; - absl::uint128 totalTries = vocation->getTotalSkillTries(skill, skills[skill].level) + tries; + const absl::uint128 totalTries = vocation->getTotalSkillTries(skill, skills[skill].level) + tries; absl::uint128 loyaltyTries = (totalTries * getLoyaltyBonus()) / 100; while ((tries + loyaltyTries) >= nextReqTries) { loyaltyTries -= nextReqTries - tries; @@ -672,6 +776,69 @@ uint16_t Player::getLoyaltySkill(skills_t skill) const { return level; } +uint16_t Player::getBaseSkill(uint8_t skill) const { + return skills[skill].level; +} + +double_t Player::getSkillPercent(skills_t skill) const { + return skills[skill].percent; +} + +bool Player::getAddAttackSkill() const { + return addAttackSkillPoint; +} + +BlockType_t Player::getLastAttackBlockType() const { + return lastAttackBlockType; +} + +uint64_t Player::getLastConditionTime(ConditionType_t type) const { + if (!lastConditionTime.contains(static_cast<uint8_t>(type))) { + return 0; + } + return lastConditionTime.at(static_cast<uint8_t>(type)); +} + +void Player::updateLastConditionTime(ConditionType_t type) { + lastConditionTime[static_cast<uint8_t>(type)] = OTSYS_TIME(); +} + +bool Player::checkLastConditionTimeWithin(ConditionType_t type, uint32_t interval) const { + if (!lastConditionTime.contains(static_cast<uint8_t>(type))) { + return false; + } + const auto last = lastConditionTime.at(static_cast<uint8_t>(type)); + return last > 0 && ((OTSYS_TIME() - last) < interval); +} + +uint64_t Player::getLastAttack() const { + return lastAttack; +} + +bool Player::checkLastAttackWithin(uint32_t interval) const { + return lastAttack > 0 && ((OTSYS_TIME() - lastAttack) < interval); +} + +void Player::updateLastAttack() { + if (lastAttack == 0) { + lastAttack = OTSYS_TIME() - getAttackSpeed() - 1; + return; + } + lastAttack = OTSYS_TIME(); +} + +uint64_t Player::getLastAggressiveAction() const { + return lastAggressiveAction; +} + +bool Player::checkLastAggressiveActionWithin(uint32_t interval) const { + return lastAggressiveAction > 0 && ((OTSYS_TIME() - lastAggressiveAction) < interval); +} + +void Player::updateLastAggressiveAction() { + lastAggressiveAction = OTSYS_TIME(); +} + void Player::addSkillAdvance(skills_t skill, uint64_t count) { uint64_t currReqTries = vocation->getReqSkillTries(skill, skills[skill].level); uint64_t nextReqTries = vocation->getReqSkillTries(skill, skills[skill].level + 1); @@ -681,7 +848,7 @@ void Player::addSkillAdvance(skills_t skill, uint64_t count) { } g_events().eventPlayerOnGainSkillTries(static_self_cast<Player>(), skill, count); - g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), skill, count); + g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), std::ref(skill), std::ref(count)); if (count == 0) { return; } @@ -774,7 +941,7 @@ int32_t Player::getDefaultStats(stats_t stat) const { } } -void Player::addContainer(uint8_t cid, std::shared_ptr<Container> container) { +void Player::addContainer(uint8_t cid, const std::shared_ptr<Container> &container) { if (cid > 0xF) { return; } @@ -783,13 +950,9 @@ void Player::addContainer(uint8_t cid, std::shared_ptr<Container> container) { return; } - auto it = openContainers.find(cid); + const auto it = openContainers.find(cid); if (it != openContainers.end()) { OpenContainer &openContainer = it->second; - auto oldContainer = openContainer.container; - if (oldContainer->getID() == ITEM_BROWSEFIELD) { - } - openContainer.container = container; openContainer.index = 0; } else { @@ -801,13 +964,13 @@ void Player::addContainer(uint8_t cid, std::shared_ptr<Container> container) { } void Player::closeContainer(uint8_t cid) { - auto it = openContainers.find(cid); + const auto it = openContainers.find(cid); if (it == openContainers.end()) { return; } - OpenContainer openContainer = it->second; - std::shared_ptr<Container> container = openContainer.container; + const OpenContainer &openContainer = it->second; + const auto &container = openContainer.container; if (container && container->isAnyKindOfRewardChest() && !hasOtherRewardContainerOpen(container)) { removeEmptyRewards(); @@ -828,14 +991,14 @@ void Player::removeEmptyRewards() { }); } -bool Player::hasOtherRewardContainerOpen(const std::shared_ptr<Container> container) const { +bool Player::hasOtherRewardContainerOpen(const std::shared_ptr<Container> &container) const { return std::ranges::any_of(openContainers.begin(), openContainers.end(), [container](const auto &containerPair) { return containerPair.second.container != container && containerPair.second.container->isAnyKindOfRewardContainer(); }); } void Player::setContainerIndex(uint8_t cid, uint16_t index) { - auto it = openContainers.find(cid); + const auto it = openContainers.find(cid); if (it == openContainers.end()) { return; } @@ -843,24 +1006,24 @@ void Player::setContainerIndex(uint8_t cid, uint16_t index) { } std::shared_ptr<Container> Player::getContainerByID(uint8_t cid) { - auto it = openContainers.find(cid); + const auto it = openContainers.find(cid); if (it == openContainers.end()) { return nullptr; } return it->second.container; } -int8_t Player::getContainerID(std::shared_ptr<Container> container) const { - for (const auto &it : openContainers) { - if (it.second.container == container) { - return it.first; +int8_t Player::getContainerID(const std::shared_ptr<Container> &container) const { + for (const auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container == container) { + return containerId; } } return -1; } uint16_t Player::getContainerIndex(uint8_t cid) const { - auto it = openContainers.find(cid); + const auto it = openContainers.find(cid); if (it == openContainers.end()) { return 0; } @@ -874,9 +1037,8 @@ bool Player::canOpenCorpse(uint32_t ownerId) const { uint16_t Player::getLookCorpse() const { if (sex == PLAYERSEX_FEMALE) { return ITEM_FEMALE_CORPSE; - } else { - return ITEM_MALE_CORPSE; } + return ITEM_MALE_CORPSE; } void Player::addStorageValue(const uint32_t key, const int32_t value, const bool isLogin /* = false*/) { @@ -887,7 +1049,8 @@ void Player::addStorageValue(const uint32_t key, const int32_t value, const bool value & 0xFF ); return; - } else if (IS_IN_KEYRANGE(key, MOUNTS_RANGE)) { + } + if (IS_IN_KEYRANGE(key, MOUNTS_RANGE)) { // do nothing } else if (IS_IN_KEYRANGE(key, FAMILIARS_RANGE)) { familiars.emplace_back( @@ -916,7 +1079,7 @@ void Player::addStorageValue(const uint32_t key, const int32_t value, const bool int32_t Player::getStorageValue(const uint32_t key) const { int32_t value = -1; - auto it = storageMap.find(key); + const auto it = storageMap.find(key); if (it == storageMap.end()) { return value; } @@ -926,11 +1089,11 @@ int32_t Player::getStorageValue(const uint32_t key) const { } int32_t Player::getStorageValueByName(const std::string &storageName) const { - auto it = g_storages().getStorageMap().find(storageName); + const auto it = g_storages().getStorageMap().find(storageName); if (it == g_storages().getStorageMap().end()) { return -1; } - uint32_t key = it->second; + const uint32_t key = it->second; return getStorageValue(key); } @@ -941,10 +1104,14 @@ void Player::addStorageValueByName(const std::string &storageName, const int32_t g_logger().error("[{}] Storage name '{}' not found in storage map, register your storage in 'storages.xml' first for use", __func__, storageName); return; } - uint32_t key = it->second; + const uint32_t key = it->second; addStorageValue(key, value, isLogin); } +std::shared_ptr<KV> Player::kv() const { + return g_kv().scoped("player")->scoped(fmt::format("{}", getGUID())); +} + bool Player::canSee(const Position &pos) { if (!client) { return false; @@ -952,7 +1119,7 @@ bool Player::canSee(const Position &pos) { return client->canSee(pos); } -bool Player::canSeeCreature(std::shared_ptr<Creature> creature) const { +bool Player::canSeeCreature(const std::shared_ptr<Creature> &creature) const { if (creature.get() == this) { return true; } @@ -967,14 +1134,14 @@ bool Player::canSeeCreature(std::shared_ptr<Creature> creature) const { return true; } -bool Player::canWalkthrough(std::shared_ptr<Creature> creature) { +bool Player::canWalkthrough(const std::shared_ptr<Creature> &creature) { if (group->access || creature->isInGhostMode()) { return true; } - std::shared_ptr<Player> player = creature->getPlayer(); - std::shared_ptr<Monster> monster = creature->getMonster(); - std::shared_ptr<Npc> npc = creature->getNpc(); + const auto &player = creature->getPlayer(); + const auto &monster = creature->getMonster(); + const auto &npc = creature->getNpc(); if (monster) { if (!monster->isFamiliar()) { return false; @@ -983,17 +1150,17 @@ bool Player::canWalkthrough(std::shared_ptr<Creature> creature) { } if (player) { - std::shared_ptr<Tile> playerTile = player->getTile(); - if (!playerTile || (!playerTile->hasFlag(TILESTATE_NOPVPZONE) && !playerTile->hasFlag(TILESTATE_PROTECTIONZONE) && player->getLevel() > static_cast<uint32_t>(g_configManager().getNumber(PROTECTION_LEVEL, __FUNCTION__)) && g_game().getWorldType() != WORLD_TYPE_NO_PVP)) { + const auto &playerTile = player->getTile(); + if (!playerTile || (!playerTile->hasFlag(TILESTATE_NOPVPZONE) && !playerTile->hasFlag(TILESTATE_PROTECTIONZONE) && player->getLevel() > static_cast<uint32_t>(g_configManager().getNumber(PROTECTION_LEVEL)) && g_game().getWorldType() != WORLD_TYPE_NO_PVP)) { return false; } - std::shared_ptr<Item> playerTileGround = playerTile->getGround(); + const auto &playerTileGround = playerTile->getGround(); if (!playerTileGround || !playerTileGround->hasWalkStack()) { return false; } - std::shared_ptr<Player> thisPlayer = getPlayer(); + const auto &thisPlayer = getPlayer(); if ((OTSYS_TIME() - lastWalkthroughAttempt) > 2000) { thisPlayer->setLastWalkthroughAttempt(OTSYS_TIME()); return false; @@ -1007,20 +1174,20 @@ bool Player::canWalkthrough(std::shared_ptr<Creature> creature) { thisPlayer->setLastWalkthroughPosition(creature->getPosition()); return true; } else if (npc) { - std::shared_ptr<Tile> tile = npc->getTile(); - std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(tile); + const auto &tile = npc->getTile(); + const auto &houseTile = std::dynamic_pointer_cast<HouseTile>(tile); return (houseTile != nullptr); } return false; } -bool Player::canWalkthroughEx(std::shared_ptr<Creature> creature) { +bool Player::canWalkthroughEx(const std::shared_ptr<Creature> &creature) const { if (group->access) { return true; } - std::shared_ptr<Monster> monster = creature->getMonster(); + const auto &monster = creature->getMonster(); if (monster) { if (!monster->isFamiliar()) { return false; @@ -1028,29 +1195,90 @@ bool Player::canWalkthroughEx(std::shared_ptr<Creature> creature) { return true; } - std::shared_ptr<Player> player = creature->getPlayer(); - std::shared_ptr<Npc> npc = creature->getNpc(); + const auto &player = creature->getPlayer(); + const auto &npc = creature->getNpc(); if (player) { - std::shared_ptr<Tile> playerTile = player->getTile(); - return playerTile && (playerTile->hasFlag(TILESTATE_NOPVPZONE) || playerTile->hasFlag(TILESTATE_PROTECTIONZONE) || player->getLevel() <= static_cast<uint32_t>(g_configManager().getNumber(PROTECTION_LEVEL, __FUNCTION__)) || g_game().getWorldType() == WORLD_TYPE_NO_PVP); + const auto &playerTile = player->getTile(); + return playerTile && (playerTile->hasFlag(TILESTATE_NOPVPZONE) || playerTile->hasFlag(TILESTATE_PROTECTIONZONE) || player->getLevel() <= static_cast<uint32_t>(g_configManager().getNumber(PROTECTION_LEVEL)) || g_game().getWorldType() == WORLD_TYPE_NO_PVP); } else if (npc) { - std::shared_ptr<Tile> tile = npc->getTile(); - std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(tile); + const auto &tile = npc->getTile(); + const auto &houseTile = std::dynamic_pointer_cast<HouseTile>(tile); return (houseTile != nullptr); } else { return false; } } +RaceType_t Player::getRace() const { + return RACE_BLOOD; +} + +uint64_t Player::getMoney() const { + uint64_t moneyCount = 0; + + auto countMoneyInContainer = [&moneyCount](const auto &self, const std::shared_ptr<Container> &container) -> void { + for (const auto &item : container->getItemList()) { + if (const auto &tmpContainer = item->getContainer()) { + self(self, tmpContainer); + } else { + moneyCount += item->getWorth(); + } + } + }; + + for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { + const auto &item = inventory[i]; + if (!item) { + continue; + } + + if (const auto &container = item->getContainer()) { + countMoneyInContainer(countMoneyInContainer, container); + } else { + moneyCount += item->getWorth(); + } + } + + return moneyCount; +} + +std::pair<uint64_t, uint64_t> Player::getForgeSliversAndCores() const { + uint64_t sliverCount = 0; + uint64_t coreCount = 0; + + // Check items from inventory + for (const auto &item : getAllInventoryItems()) { + if (!item) { + continue; + } + + sliverCount += item->getForgeSlivers(); + coreCount += item->getForgeCores(); + } + + // Check items from stash + for (const auto &stashToSend = getStashItems(); + const auto &[itemId, itemCount] : stashToSend) { + if (itemId == ITEM_FORGE_SLIVER) { + sliverCount += itemCount; + } + if (itemId == ITEM_FORGE_CORE) { + coreCount += itemCount; + } + } + + return std::make_pair(sliverCount, coreCount); +} + void Player::onReceiveMail() { if (isNearDepotBox()) { sendTextMessage(MESSAGE_EVENT_ADVANCE, "New mail has arrived."); } } -std::shared_ptr<Container> Player::refreshManagedContainer(ObjectCategory_t category, std::shared_ptr<Container> container, bool isLootContainer, bool loading /* = false*/) { +std::shared_ptr<Container> Player::refreshManagedContainer(ObjectCategory_t category, const std::shared_ptr<Container> &container, bool isLootContainer, bool loading /* = false*/) { std::shared_ptr<Container> previousContainer = nullptr; - auto toSetAttribute = isLootContainer ? ItemAttribute_t::QUICKLOOTCONTAINER : ItemAttribute_t::OBTAINCONTAINER; + const auto toSetAttribute = isLootContainer ? ItemAttribute_t::QUICKLOOTCONTAINER : ItemAttribute_t::OBTAINCONTAINER; if (auto it = m_managedContainers.find(category); it != m_managedContainers.end() && !loading) { previousContainer = isLootContainer ? it->second.first : it->second.second; if (previousContainer) { @@ -1076,7 +1304,7 @@ std::shared_ptr<Container> Player::refreshManagedContainer(ObjectCategory_t cate if (container) { previousContainer = container; - if (m_managedContainers.find(category) != m_managedContainers.end()) { + if (m_managedContainers.contains(category)) { if (isLootContainer) { m_managedContainers[category].first = container; } else { @@ -1095,8 +1323,8 @@ std::shared_ptr<Container> Player::refreshManagedContainer(ObjectCategory_t cate } if (!loading) { - auto flags = container->getAttribute<uint32_t>(toSetAttribute); - auto sendAttribute = flags | (1 << category); + const auto flags = container->getAttribute<uint32_t>(toSetAttribute); + const auto sendAttribute = flags | (1 << category); container->setAttribute(toSetAttribute, sendAttribute); } } @@ -1109,7 +1337,7 @@ std::shared_ptr<Container> Player::getManagedContainer(ObjectCategory_t category category = OBJECTCATEGORY_DEFAULT; } - auto it = m_managedContainers.find(category); + const auto it = m_managedContainers.find(category); std::shared_ptr<Container> container = nullptr; if (it != m_managedContainers.end()) { container = isLootContainer ? it->second.first : it->second.second; @@ -1123,15 +1351,15 @@ std::shared_ptr<Container> Player::getManagedContainer(ObjectCategory_t category return container; } -void Player::checkLootContainers(std::shared_ptr<Container> container) { +void Player::checkLootContainers(const std::shared_ptr<Container> &container) { if (!container) { return; } bool shouldSend = false; for (auto it = m_managedContainers.begin(); it != m_managedContainers.end();) { - std::shared_ptr<Container> &lootContainer = it->second.first; - std::shared_ptr<Container> &obtainContainer = it->second.second; + auto &lootContainer = it->second.first; + auto &obtainContainer = it->second.second; bool removeLoot = false; bool removeObtain = false; if (lootContainer && container->getHoldingPlayer() != getPlayer() && (container == lootContainer || container->isHoldingItem(lootContainer))) { @@ -1166,15 +1394,15 @@ void Player::checkLootContainers(std::shared_ptr<Container> container) { } } -void Player::setMainBackpackUnassigned(std::shared_ptr<Container> container) { +void Player::setMainBackpackUnassigned(const std::shared_ptr<Container> &container) { if (!container) { return; } // Update containers bool toSendInventoryUpdate = false; - for (bool isLootContainer : { true, false }) { - std::shared_ptr<Container> managedContainer = getManagedContainer(OBJECTCATEGORY_DEFAULT, isLootContainer); + for (const bool isLootContainer : { true, false }) { + const auto &managedContainer = getManagedContainer(OBJECTCATEGORY_DEFAULT, isLootContainer); if (!managedContainer) { refreshManagedContainer(OBJECTCATEGORY_DEFAULT, container, isLootContainer); toSendInventoryUpdate = true; @@ -1187,7 +1415,22 @@ void Player::setMainBackpackUnassigned(std::shared_ptr<Container> container) { } } -void Player::sendLootStats(std::shared_ptr<Item> item, uint8_t count) { +bool Player::updateKillTracker(const std::shared_ptr<Container> &corpse, const std::string &playerName, const Outfit_t &creatureOutfit) const { + if (client) { + client->sendKillTrackerUpdate(corpse, playerName, creatureOutfit); + return true; + } + + return false; +} + +void Player::updatePartyTrackerAnalyzer() const { + if (client && m_party) { + client->updatePartyTrackerAnalyzer(m_party); + } +} + +void Player::sendLootStats(const std::shared_ptr<Item> &item, uint8_t count) { uint64_t value = 0; if (item->getID() == ITEM_GOLD_COIN || item->getID() == ITEM_PLATINUM_COIN || item->getID() == ITEM_CRYSTAL_COIN) { if (item->getID() == ITEM_PLATINUM_COIN) { @@ -1198,7 +1441,7 @@ void Player::sendLootStats(std::shared_ptr<Item> item, uint8_t count) { value = count; } } else if ( - auto npc = g_game().getNpcByName("The Lootmonger") + const auto &npc = g_game().getNpcByName("The Lootmonger") ) { const auto &iType = Item::items.getItemType(item->getID()); value = iType.sellPrice * count; @@ -1214,40 +1457,293 @@ void Player::sendLootStats(std::shared_ptr<Item> item, uint8_t count) { } } -bool Player::isNearDepotBox() { - const Position &pos = getPosition(); - for (int32_t cx = -1; cx <= 1; ++cx) { - for (int32_t cy = -1; cy <= 1; ++cy) { - std::shared_ptr<Tile> posTile = g_game().map.getTile(static_cast<uint16_t>(pos.x + cx), static_cast<uint16_t>(pos.y + cy), pos.z); - if (!posTile) { - continue; - } +void Player::updateSupplyTracker(const std::shared_ptr<Item> &item) { + const auto &iType = Item::items.getItemType(item->getID()); + const auto value = iType.buyPrice; + g_metrics().addCounter("player_supply", value, { { "player", getName() } }); - if (posTile->hasFlag(TILESTATE_DEPOT)) { - return true; - } - } + if (client) { + client->sendUpdateSupplyTracker(item); + } + + if (m_party) { + m_party->addPlayerSupply(getPlayer(), item); } - return false; } -std::shared_ptr<DepotChest> Player::getDepotChest(uint32_t depotId, bool autoCreate) { - auto it = depotChests.find(depotId); - if (it != depotChests.end()) { - return it->second; +void Player::updateImpactTracker(CombatType_t type, int32_t amount) const { + if (client) { + client->sendUpdateImpactTracker(type, amount); } +} - if (!autoCreate) { - return nullptr; +void Player::updateInputAnalyzer(CombatType_t type, int32_t amount, const std::string &target) const { + if (client) { + client->sendUpdateInputAnalyzer(type, amount, target); } +} - std::shared_ptr<DepotChest> depotChest; - if (depotId > 0 && depotId < 18) { - depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_NULL + depotId); - } else if (depotId == 18) { - depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_XVIII); - } else if (depotId == 19) { - depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_XIX); +void Player::createLeaderTeamFinder(NetworkMessage &msg) const { + if (client) { + client->createLeaderTeamFinder(msg); + } +} + +void Player::sendLeaderTeamFinder(bool reset) const { + if (client) { + client->sendLeaderTeamFinder(reset); + } +} + +void Player::sendTeamFinderList() const { + if (client) { + client->sendTeamFinderList(); + } +} + +void Player::sendCreatureHelpers(uint32_t creatureId, uint16_t helpers) const { + if (client) { + client->sendCreatureHelpers(creatureId, helpers); + } +} + +void Player::setItemCustomPrice(uint16_t itemId, uint64_t price) { + itemPriceMap[itemId] = price; +} + +uint32_t Player::getCharmPoints() const { + return charmPoints; +} + +void Player::setCharmPoints(uint32_t points) { + charmPoints = points; +} + +bool Player::hasCharmExpansion() const { + return charmExpansion; +} + +void Player::setCharmExpansion(bool onOff) { + charmExpansion = onOff; +} + +void Player::setUsedRunesBit(int32_t bit) { + UsedRunesBit = bit; +} + +int32_t Player::getUsedRunesBit() const { + return UsedRunesBit; +} + +void Player::setUnlockedRunesBit(int32_t bit) { + UnlockedRunesBit = bit; +} + +int32_t Player::getUnlockedRunesBit() const { + return UnlockedRunesBit; +} + +void Player::setImmuneCleanse(ConditionType_t conditiontype) { + cleanseCondition.first = conditiontype; + cleanseCondition.second = OTSYS_TIME() + 10000; +} + +bool Player::isImmuneCleanse(ConditionType_t conditiontype) const { + const uint64_t timenow = OTSYS_TIME(); + if ((cleanseCondition.first == conditiontype) + && (timenow <= cleanseCondition.second)) { + return true; + } + return false; +} + +void Player::setImmuneFear() { + m_fearCondition.first = CONDITION_FEARED; + m_fearCondition.second = OTSYS_TIME() + 10000; +} + +bool Player::isImmuneFear() const { + const uint64_t timenow = OTSYS_TIME(); + return (m_fearCondition.first == CONDITION_FEARED) && (timenow <= m_fearCondition.second); +} + +uint16_t Player::parseRacebyCharm(charmRune_t charmId, bool set, uint16_t newRaceid) { + uint16_t raceid = 0; + switch (charmId) { + case CHARM_WOUND: + if (set) { + charmRuneWound = newRaceid; + } else { + raceid = charmRuneWound; + } + break; + case CHARM_ENFLAME: + if (set) { + charmRuneEnflame = newRaceid; + } else { + raceid = charmRuneEnflame; + } + break; + case CHARM_POISON: + if (set) { + charmRunePoison = newRaceid; + } else { + raceid = charmRunePoison; + } + break; + case CHARM_FREEZE: + if (set) { + charmRuneFreeze = newRaceid; + } else { + raceid = charmRuneFreeze; + } + break; + case CHARM_ZAP: + if (set) { + charmRuneZap = newRaceid; + } else { + raceid = charmRuneZap; + } + break; + case CHARM_CURSE: + if (set) { + charmRuneCurse = newRaceid; + } else { + raceid = charmRuneCurse; + } + break; + case CHARM_CRIPPLE: + if (set) { + charmRuneCripple = newRaceid; + } else { + raceid = charmRuneCripple; + } + break; + case CHARM_PARRY: + if (set) { + charmRuneParry = newRaceid; + } else { + raceid = charmRuneParry; + } + break; + case CHARM_DODGE: + if (set) { + charmRuneDodge = newRaceid; + } else { + raceid = charmRuneDodge; + } + break; + case CHARM_ADRENALINE: + if (set) { + charmRuneAdrenaline = newRaceid; + } else { + raceid = charmRuneAdrenaline; + } + break; + case CHARM_NUMB: + if (set) { + charmRuneNumb = newRaceid; + } else { + raceid = charmRuneNumb; + } + break; + case CHARM_CLEANSE: + if (set) { + charmRuneCleanse = newRaceid; + } else { + raceid = charmRuneCleanse; + } + break; + case CHARM_BLESS: + if (set) { + charmRuneBless = newRaceid; + } else { + raceid = charmRuneBless; + } + break; + case CHARM_SCAVENGE: + if (set) { + charmRuneScavenge = newRaceid; + } else { + raceid = charmRuneScavenge; + } + break; + case CHARM_GUT: + if (set) { + charmRuneGut = newRaceid; + } else { + raceid = charmRuneGut; + } + break; + case CHARM_LOW: + if (set) { + charmRuneLowBlow = newRaceid; + } else { + raceid = charmRuneLowBlow; + } + break; + case CHARM_DIVINE: + if (set) { + charmRuneDivine = newRaceid; + } else { + raceid = charmRuneDivine; + } + break; + case CHARM_VAMP: + if (set) { + charmRuneVamp = newRaceid; + } else { + raceid = charmRuneVamp; + } + break; + case CHARM_VOID: + if (set) { + charmRuneVoid = newRaceid; + } else { + raceid = charmRuneVoid; + } + break; + default: + raceid = 0; + break; + } + return raceid; +} + +bool Player::isNearDepotBox() { + const Position &pos = getPosition(); + for (int32_t cx = -1; cx <= 1; ++cx) { + for (int32_t cy = -1; cy <= 1; ++cy) { + const auto &posTile = g_game().map.getTile(static_cast<uint16_t>(pos.x + cx), static_cast<uint16_t>(pos.y + cy), pos.z); + if (!posTile) { + continue; + } + + if (posTile->hasFlag(TILESTATE_DEPOT)) { + return true; + } + } + } + return false; +} + +std::shared_ptr<DepotChest> Player::getDepotChest(uint32_t depotId, bool autoCreate) { + const auto it = depotChests.find(depotId); + if (it != depotChests.end()) { + return it->second; + } + + if (!autoCreate) { + return nullptr; + } + + std::shared_ptr<DepotChest> depotChest; + if (depotId > 0 && depotId < 18) { + depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_NULL + depotId); + } else if (depotId == 18) { + depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_XVIII); + } else if (depotId == 19) { + depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_XIX); } else { depotChest = std::make_shared<DepotChest>(ITEM_DEPOT_XX); } @@ -1257,11 +1753,11 @@ std::shared_ptr<DepotChest> Player::getDepotChest(uint32_t depotId, bool autoCre } std::shared_ptr<DepotLocker> Player::getDepotLocker(uint32_t depotId) { - auto it = depotLockerMap.find(depotId); + const auto it = depotLockerMap.find(depotId); if (it != depotLockerMap.end()) { inbox->setParent(it->second); - for (uint32_t i = g_configManager().getNumber(DEPOT_BOXES, __FUNCTION__); i > 0; i--) { - if (std::shared_ptr<DepotChest> depotBox = getDepotChest(i, false)) { + for (uint32_t i = g_configManager().getNumber(DEPOT_BOXES); i > 0; i--) { + if (const auto &depotBox = getDepotChest(i, false)) { depotBox->setParent(it->second->getItemByIndex(0)->getContainer()); } } @@ -1269,18 +1765,20 @@ std::shared_ptr<DepotLocker> Player::getDepotLocker(uint32_t depotId) { } // We need to make room for supply stash on 12+ protocol versions and remove it for 10x. - bool createSupplyStash = !client->oldProtocol; + const bool createSupplyStash = !client->oldProtocol; - std::shared_ptr<DepotLocker> depotLocker = std::make_shared<DepotLocker>(ITEM_LOCKER, createSupplyStash ? 4 : 3); + auto depotLocker = std::make_shared<DepotLocker>(ITEM_LOCKER, createSupplyStash ? 4 : 3); depotLocker->setDepotId(depotId); - depotLocker->internalAddThing(Item::CreateItem(ITEM_MARKET)); + const auto &marketItem = Item::CreateItem(ITEM_MARKET); + depotLocker->internalAddThing(marketItem); depotLocker->internalAddThing(inbox); if (createSupplyStash) { - depotLocker->internalAddThing(Item::CreateItem(ITEM_SUPPLY_STASH)); + const auto &supplyStash = Item::CreateItem(ITEM_SUPPLY_STASH); + depotLocker->internalAddThing(supplyStash); } - std::shared_ptr<Container> depotChest = Item::CreateItemAsContainer(ITEM_DEPOT, static_cast<uint16_t>(g_configManager().getNumber(DEPOT_BOXES, __FUNCTION__))); - for (uint32_t i = g_configManager().getNumber(DEPOT_BOXES, __FUNCTION__); i > 0; i--) { - std::shared_ptr<DepotChest> depotBox = getDepotChest(i, true); + const auto &depotChest = Item::CreateItemAsContainer(ITEM_DEPOT, static_cast<uint16_t>(g_configManager().getNumber(DEPOT_BOXES))); + for (uint32_t i = g_configManager().getNumber(DEPOT_BOXES); i > 0; i--) { + const auto &depotBox = getDepotChest(i, true); depotChest->internalAddThing(depotBox); depotBox->setParent(depotChest); } @@ -1299,7 +1797,7 @@ std::shared_ptr<RewardChest> Player::getRewardChest() { } std::shared_ptr<Reward> Player::getReward(const uint64_t rewardId, const bool autoCreate) { - auto it = rewardMap.find(rewardId); + const auto it = rewardMap.find(rewardId); if (it != rewardMap.end()) { return it->second; } @@ -1321,20 +1819,20 @@ void Player::removeReward(uint64_t rewardId) { void Player::getRewardList(std::vector<uint64_t> &rewards) const { rewards.reserve(rewardMap.size()); - for (auto &it : rewardMap) { - rewards.push_back(it.first); + for (const auto &[rewardId, snd] : rewardMap) { + rewards.emplace_back(rewardId); } } -std::vector<std::shared_ptr<Item>> Player::getRewardsFromContainer(std::shared_ptr<Container> container) const { +std::vector<std::shared_ptr<Item>> Player::getRewardsFromContainer(const std::shared_ptr<Container> &container) const { std::vector<std::shared_ptr<Item>> rewardItemsVector; if (container) { for (const auto &item : container->getItems(false)) { if (item->getID() == ITEM_REWARD_CONTAINER) { - auto items = getRewardsFromContainer(item->getContainer()); + const auto &items = getRewardsFromContainer(item->getContainer()); rewardItemsVector.insert(rewardItemsVector.end(), items.begin(), items.end()); } else { - rewardItemsVector.push_back(item); + rewardItemsVector.emplace_back(item); } } } @@ -1342,101 +1840,95 @@ std::vector<std::shared_ptr<Item>> Player::getRewardsFromContainer(std::shared_p return rewardItemsVector; } +void Player::sendCancelMessage(const std::string &msg) const { + if (client) { + client->sendTextMessage(TextMessage(MESSAGE_FAILURE, msg)); + } +} + void Player::sendCancelMessage(ReturnValue message) const { sendCancelMessage(getReturnMessage(message)); } -void Player::sendStats() { +void Player::sendCancelTarget() const { if (client) { - client->sendStats(); - lastStatsTrainingTime = getOfflineTrainingTime() / 60 / 1000; + client->sendCancelTarget(); } } -void Player::updateSupplyTracker(std::shared_ptr<Item> item) { - const auto &iType = Item::items.getItemType(item->getID()); - auto value = iType.buyPrice; - g_metrics().addCounter("player_supply", value, { { "player", getName() } }); - +void Player::sendCancelWalk() const { if (client) { - client->sendUpdateSupplyTracker(item); + client->sendCancelWalk(); } +} - if (m_party) { - m_party->addPlayerSupply(getPlayer(), item); +void Player::sendChangeSpeed(const std::shared_ptr<Creature> &creature, uint16_t newSpeed) const { + if (client) { + client->sendChangeSpeed(creature, newSpeed); } } -void Player::updateImpactTracker(CombatType_t type, int32_t amount) const { +void Player::sendCreatureHealth(const std::shared_ptr<Creature> &creature) const { if (client) { - client->sendUpdateImpactTracker(type, amount); + client->sendCreatureHealth(creature); } } -void Player::sendPing() { - int64_t timeNow = OTSYS_TIME(); - - bool hasLostConnection = false; - if ((timeNow - lastPing) >= 5000) { - lastPing = timeNow; - if (client) { - client->sendPing(); - } else { - hasLostConnection = true; - } +void Player::sendPartyCreatureUpdate(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendPartyCreatureUpdate(creature); } +} - int64_t noPongTime = timeNow - lastPong; - auto attackedCreature = getAttackedCreature(); - if ((hasLostConnection || noPongTime >= 7000) && attackedCreature && attackedCreature->getPlayer()) { - setAttackedCreature(nullptr); +void Player::sendPartyCreatureShield(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendPartyCreatureShield(creature); } +} - if (noPongTime >= 60000 && canLogout() && g_creatureEvents().playerLogout(static_self_cast<Player>())) { - g_logger().info("Player {} has been kicked due to ping timeout. (has client: {})", getName(), client != nullptr); - if (client) { - client->logout(true, true); - } else { - g_game().removeCreature(static_self_cast<Player>(), true); - } +void Player::sendPartyCreatureSkull(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendPartyCreatureSkull(creature); } } -std::shared_ptr<Item> Player::getWriteItem(uint32_t &retWindowTextId, uint16_t &retMaxWriteLen) { - retWindowTextId = this->windowTextId; - retMaxWriteLen = this->maxWriteLen; - return writeItem; +void Player::sendPartyCreatureHealth(const std::shared_ptr<Creature> &creature, uint8_t healthPercent) const { + if (client) { + client->sendPartyCreatureHealth(creature, healthPercent); + } } -void Player::setImbuingItem(std::shared_ptr<Item> item) { - imbuingItem = item; +void Player::sendPartyPlayerMana(const std::shared_ptr<Player> &player, uint8_t manaPercent) const { + if (client) { + client->sendPartyPlayerMana(player, manaPercent); + } } -void Player::setWriteItem(std::shared_ptr<Item> item, uint16_t maxWriteLength /*= 0*/) { - windowTextId++; +void Player::sendPartyCreatureShowStatus(const std::shared_ptr<Creature> &creature, bool showStatus) const { + if (client) { + client->sendPartyCreatureShowStatus(creature, showStatus); + } +} - if (item) { - writeItem = item; - this->maxWriteLen = maxWriteLength; - } else { - writeItem = nullptr; - this->maxWriteLen = 0; +void Player::sendPartyPlayerVocation(const std::shared_ptr<Player> &player) const { + if (client) { + client->sendPartyPlayerVocation(player); } } -std::shared_ptr<House> Player::getEditHouse(uint32_t &retWindowTextId, uint32_t &retListId) { - retWindowTextId = this->windowTextId; - retListId = this->editListId; - return editHouse; +void Player::sendPlayerVocation(const std::shared_ptr<Player> &player) const { + if (client) { + client->sendPlayerVocation(player); + } } -void Player::setEditHouse(std::shared_ptr<House> house, uint32_t listId /*= 0*/) { - windowTextId++; - editHouse = house; - editListId = listId; +void Player::sendDistanceShoot(const Position &from, const Position &to, uint16_t type) const { + if (client) { + client->sendDistanceShoot(from, to, type); + } } -void Player::sendHouseWindow(std::shared_ptr<House> house, uint32_t listId) const { +void Player::sendHouseWindow(const std::shared_ptr<House> &house, uint32_t listId) const { if (!client) { return; } @@ -1447,134 +1939,190 @@ void Player::sendHouseWindow(std::shared_ptr<House> house, uint32_t listId) cons } } -void Player::onApplyImbuement(Imbuement* imbuement, std::shared_ptr<Item> item, uint8_t slot, bool protectionCharm) { - if (!imbuement || !item) { - return; +void Player::sendCreatePrivateChannel(uint16_t channelId, const std::string &channelName) const { + if (client) { + client->sendCreatePrivateChannel(channelId, channelName); } +} - ImbuementInfo imbuementInfo; - if (item->getImbuementInfo(slot, &imbuementInfo)) { - g_logger().error("[Player::onApplyImbuement] - An error occurred while player with name {} try to apply imbuement, item already contains imbuement", this->getName()); - this->sendImbuementResult("An error ocurred, please reopen imbuement window."); - return; +void Player::sendClosePrivate(uint16_t channelId) { + if (channelId == CHANNEL_GUILD || channelId == CHANNEL_PARTY) { + g_chat().removeUserFromChannel(getPlayer(), channelId); } - const auto items = imbuement->getItems(); - for (auto &[key, value] : items) { - const ItemType &itemType = Item::items[key]; - if (static_self_cast<Player>()->getItemTypeCount(key) + this->getStashItemCount(itemType.id) < value) { - this->sendImbuementResult("You don't have all necessary items."); - return; - } + if (client) { + client->sendClosePrivate(channelId); } +} - const BaseImbuement* baseImbuement = g_imbuements().getBaseByID(imbuement->getBaseID()); - if (!baseImbuement) { +void Player::sendIcons() { + if (!client) { return; } - uint32_t price = baseImbuement->price; - price += protectionCharm ? baseImbuement->protectionPrice : 0; - - if (!g_game().removeMoney(static_self_cast<Player>(), price, 0, true)) { - std::string message = fmt::format("You don't have {} gold coins.", price); + // Iterates over the Bakragore icons to check if the player has any + auto iconBakragore = IconBakragore::None; + for (const auto &icon : magic_enum::enum_values<IconBakragore>()) { + if (icon == IconBakragore::None) { + continue; + } - g_logger().error("[Player::onApplyImbuement] - An error occurred while player with name {} try to apply imbuement, player do not have money", this->getName()); - sendImbuementResult(message); - return; + const auto &condition = getCondition(CONDITION_BAKRAGORE, CONDITIONID_DEFAULT, magic_enum::enum_integer(icon)); + if (condition) { + g_logger().debug("[{}] found active condition Bakragore with subId {}", __FUNCTION__, magic_enum::enum_integer(icon)); + iconBakragore = icon; + } } - g_metrics().addCounter("balance_decrease", price, { { "player", getName() }, { "context", "apply_imbuement" } }); + // Remove the last icon so that Bakragore's is added + auto iconSet = getClientIcons(); + if (iconSet.size() >= 9 && iconBakragore != IconBakragore::None) { + std::vector<PlayerIcon> tempVector(iconSet.begin(), iconSet.end()); + tempVector.pop_back(); + iconSet = std::unordered_set<PlayerIcon>(tempVector.begin(), tempVector.end()); + } - for (auto &[key, value] : items) { - std::stringstream withdrawItemMessage; + client->sendIcons(iconSet, iconBakragore); +} - uint32_t inventoryItemCount = getItemTypeCount(key); - if (inventoryItemCount >= value) { - removeItemOfType(key, value, -1, true); - continue; - } +void Player::sendIconBakragore(IconBakragore icon) const { + if (client) { + client->sendIconBakragore(icon); + } +} - uint32_t mathItemCount = value; - if (inventoryItemCount > 0 && removeItemOfType(key, inventoryItemCount, -1, false)) { - mathItemCount = mathItemCount - inventoryItemCount; +void Player::removeBakragoreIcons() { + for (auto icon : magic_enum::enum_values<IconBakragore>()) { + if (hasCondition(CONDITION_BAKRAGORE, enumToValue(icon))) { + removeCondition(CONDITION_BAKRAGORE, CONDITIONID_DEFAULT, true); } + } +} - const ItemType &itemType = Item::items[key]; +void Player::removeBakragoreIcon(const IconBakragore icon) { + if (hasCondition(CONDITION_BAKRAGORE, enumToValue(icon))) { + removeCondition(CONDITION_BAKRAGORE, CONDITIONID_DEFAULT, true); + } +} - withdrawItemMessage << "Using " << mathItemCount << "x " << itemType.name << " from your supply stash. "; - withdrawItem(itemType.id, mathItemCount); - sendTextMessage(MESSAGE_STATUS, withdrawItemMessage.str()); +void Player::sendClientCheck() const { + if (client) { + client->sendClientCheck(); } +} - if (!protectionCharm && uniform_random(1, 100) > baseImbuement->percent) { - openImbuementWindow(item); - sendImbuementResult("Oh no!\n\nThe imbuement has failed. You have lost the astral sources and gold you needed for the imbuement.\n\nNext time use a protection charm to better your chances."); - openImbuementWindow(item); - return; +void Player::sendGameNews() const { + if (client) { + client->sendGameNews(); } +} - // Update imbuement stats item if the item is equipped - if (item->getParent() == getPlayer()) { - addItemImbuementStats(imbuement); +void Player::sendMagicEffect(const Position &pos, uint16_t type) const { + if (client) { + client->sendMagicEffect(pos, type); } +} - item->addImbuement(slot, imbuement->getID(), baseImbuement->duration); - openImbuementWindow(item); +void Player::removeMagicEffect(const Position &pos, uint16_t type) const { + if (client) { + client->removeMagicEffect(pos, type); + } } -void Player::onClearImbuement(std::shared_ptr<Item> item, uint8_t slot) { - if (!item) { - return; +void Player::sendPing() { + const int64_t timeNow = OTSYS_TIME(); + + bool hasLostConnection = false; + if ((timeNow - lastPing) >= 5000) { + lastPing = timeNow; + if (client) { + client->sendPing(); + } else { + hasLostConnection = true; + } } - ImbuementInfo imbuementInfo; - if (!item->getImbuementInfo(slot, &imbuementInfo)) { - g_logger().error("[Player::onClearImbuement] - An error occurred while player with name {} try to apply imbuement, item not contains imbuement", this->getName()); - this->sendImbuementResult("An error ocurred, please reopen imbuement window."); - return; + const int64_t noPongTime = timeNow - lastPong; + const auto &attackedCreature = getAttackedCreature(); + if ((hasLostConnection || noPongTime >= 7000) && attackedCreature && attackedCreature->getPlayer()) { + setAttackedCreature(nullptr); } - const BaseImbuement* baseImbuement = g_imbuements().getBaseByID(imbuementInfo.imbuement->getBaseID()); - if (!baseImbuement) { - return; + if (noPongTime >= 60000 && canLogout() && g_creatureEvents().playerLogout(static_self_cast<Player>())) { + g_logger().info("Player {} has been kicked due to ping timeout. (has client: {})", getName(), client != nullptr); + if (client) { + client->logout(true, true); + } else { + g_game().removeCreature(static_self_cast<Player>(), true); + } } +} - if (!g_game().removeMoney(static_self_cast<Player>(), baseImbuement->removeCost, 0, true)) { - std::string message = fmt::format("You don't have {} gold coins.", baseImbuement->removeCost); +void Player::sendPingBack() const { + if (client) { + client->sendPingBack(); + } +} - g_logger().error("[Player::onClearImbuement] - An error occurred while player with name {} try to apply imbuement, player do not have money", this->getName()); - this->sendImbuementResult(message); - this->openImbuementWindow(item); - return; +void Player::sendStats() { + if (client) { + client->sendStats(); + lastStatsTrainingTime = getOfflineTrainingTime() / 60 / 1000; } - g_metrics().addCounter("balance_decrease", baseImbuement->removeCost, { { "player", getName() }, { "context", "clear_imbuement" } }); +} - if (item->getParent() == getPlayer()) { - removeItemImbuementStats(imbuementInfo.imbuement); +void Player::sendBasicData() const { + if (client) { + client->sendBasicData(); } +} - item->clearImbuement(slot, imbuementInfo.imbuement->getID()); - this->openImbuementWindow(item); +void Player::sendBlessStatus() const { + if (client) { + client->sendBlessStatus(); + } } -void Player::openImbuementWindow(std::shared_ptr<Item> item) { - if (!client || !item) { - return; +void Player::sendSkills() const { + if (client) { + client->sendSkills(); } +} - if (item->getImbuementSlot() <= 0) { - this->sendTextMessage(MESSAGE_EVENT_ADVANCE, "This item is not imbuable."); - return; +void Player::sendTextMessage(MessageClasses mclass, const std::string &message) const { + if (client) { + client->sendTextMessage(TextMessage(mclass, message)); + } +} + +void Player::sendTextMessage(const TextMessage &message) const { + if (client) { + client->sendTextMessage(message); } +} - auto itemParent = item->getTopParent(); - if (itemParent && itemParent != getPlayer()) { - this->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have to pick up the item to imbue it."); - return; +void Player::sendReLoginWindow(uint8_t unfairFightReduction) const { + if (client) { + client->sendReLoginWindow(unfairFightReduction); } +} - client->openImbuementWindow(item); +void Player::sendTextWindow(const std::shared_ptr<Item> &item, uint16_t maxlen, bool canWrite) const { + if (client) { + client->sendTextWindow(windowTextId, item, maxlen, canWrite); + } +} + +void Player::sendToChannel(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, uint16_t channelId) const { + if (client) { + client->sendToChannel(creature, type, text, channelId); + } +} + +void Player::sendShop(const std::shared_ptr<Npc> &npc) const { + if (client) { + client->sendShop(npc); + } } void Player::sendSaleItemList(const std::map<uint16_t, uint16_t> &inventoryMap) const { @@ -1583,207 +2131,273 @@ void Player::sendSaleItemList(const std::map<uint16_t, uint16_t> &inventoryMap) } } -void Player::sendMarketEnter(uint32_t depotId) { - if (!client || this->getLastDepotId() == -1 || !depotId) { - return; - } +bool Player::hasImbuingItem() const { + return imbuingItem != nullptr; +} - client->sendMarketEnter(depotId); +void Player::setImbuingItem(const std::shared_ptr<Item> &item) { + imbuingItem = item; } -// container -void Player::sendAddContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> item) { - if (!client) { +void Player::addBlessing(uint8_t index, uint8_t count) { + if (blessings[index - 1] == 255) { return; } - if (!container) { + blessings[index - 1] += count; +} + +void Player::removeBlessing(uint8_t index, uint8_t count) { + if (blessings[index - 1] == 0) { return; } - for (const auto &it : openContainers) { - const OpenContainer &openContainer = it.second; - if (openContainer.container != container) { - continue; - } + blessings[index - 1] -= count; +} - uint16_t slot = openContainer.index; - if (container->getID() == ITEM_BROWSEFIELD) { - uint16_t containerSize = container->size() - 1; - uint16_t pageEnd = openContainer.index + container->capacity() - 1; - if (containerSize > pageEnd) { - slot = pageEnd; - item = container->getItemByIndex(pageEnd); - } else { - slot = containerSize; - } - } else if (openContainer.index >= container->capacity()) { - item = container->getItemByIndex(openContainer.index - 1); - } - client->sendAddContainerItem(it.first, slot, item); +bool Player::hasBlessing(uint8_t index) const { + return blessings[index - 1] != 0; +} + +void Player::sendCloseShop() const { + if (client) { + client->sendCloseShop(); } } -void Player::sendUpdateContainerItem(std::shared_ptr<Container> container, uint16_t slot, std::shared_ptr<Item> newItem) { - if (!client) { +void Player::sendMarketEnter(uint32_t depotId) const { + if (!client || this->getLastDepotId() == -1 || !depotId) { return; } - for (const auto &it : openContainers) { - const OpenContainer &openContainer = it.second; - if (openContainer.container != container) { - continue; - } + client->sendMarketEnter(depotId); +} - if (slot < openContainer.index) { - continue; - } +void Player::sendMarketLeave() { + inMarket = false; + if (client) { + client->sendMarketLeave(); + } +} - uint16_t pageEnd = openContainer.index + container->capacity(); - if (slot >= pageEnd) { - continue; - } +void Player::sendMarketBrowseItem(uint16_t itemId, const MarketOfferList &buyOffers, const MarketOfferList &sellOffers, uint8_t tier) const { + if (client) { + client->sendMarketBrowseItem(itemId, buyOffers, sellOffers, tier); + } +} - client->sendUpdateContainerItem(it.first, slot, newItem); +void Player::sendMarketBrowseOwnOffers(const MarketOfferList &buyOffers, const MarketOfferList &sellOffers) const { + if (client) { + client->sendMarketBrowseOwnOffers(buyOffers, sellOffers); } } -void Player::sendRemoveContainerItem(std::shared_ptr<Container> container, uint16_t slot) { - if (!client) { - return; +void Player::sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyOffers, const HistoryMarketOfferList &sellOffers) const { + if (client) { + client->sendMarketBrowseOwnHistory(buyOffers, sellOffers); } +} - if (!container) { - return; +void Player::sendMarketDetail(uint16_t itemId, uint8_t tier) const { + if (client) { + client->sendMarketDetail(itemId, tier); } +} - for (auto &it : openContainers) { - OpenContainer &openContainer = it.second; - if (openContainer.container != container) { - continue; - } +void Player::sendMarketAcceptOffer(const MarketOfferEx &offer) const { + if (client) { + client->sendMarketAcceptOffer(offer); + } +} - uint16_t &firstIndex = openContainer.index; - if (firstIndex > 0 && firstIndex >= container->size() - 1) { - firstIndex -= container->capacity(); - sendContainer(it.first, container, false, firstIndex); - } +void Player::sendMarketCancelOffer(const MarketOfferEx &offer) const { + if (client) { + client->sendMarketCancelOffer(offer); + } +} - client->sendRemoveContainerItem(it.first, std::max<uint16_t>(slot, firstIndex), container->getItemByIndex(container->capacity() + firstIndex)); +void Player::sendTradeItemRequest(const std::string &traderName, const std::shared_ptr<Item> &item, bool ack) const { + if (client) { + client->sendTradeItemRequest(traderName, item, ack); } } -void Player::onUpdateTileItem(std::shared_ptr<Tile> updateTile, const Position &pos, std::shared_ptr<Item> oldItem, const ItemType &oldType, std::shared_ptr<Item> newItem, const ItemType &newType) { - Creature::onUpdateTileItem(updateTile, pos, oldItem, oldType, newItem, newType); +void Player::sendTradeClose() const { + if (client) { + client->sendCloseTrade(); + } +} - if (oldItem != newItem) { - onRemoveTileItem(updateTile, pos, oldType, oldItem); +void Player::sendWorldLight(LightInfo lightInfo) const { + if (client) { + client->sendWorldLight(lightInfo); } +} - if (tradeState != TRADE_TRANSFER) { - if (tradeItem && oldItem == tradeItem) { - g_game().internalCloseTrade(getPlayer()); - } +void Player::sendTibiaTime(int32_t time) const { + if (client) { + client->sendTibiaTime(time); } } -void Player::onRemoveTileItem(std::shared_ptr<Tile> fromTile, const Position &pos, const ItemType &iType, std::shared_ptr<Item> item) { - Creature::onRemoveTileItem(fromTile, pos, iType, item); +void Player::sendChannelsDialog() const { + if (client) { + client->sendChannelsDialog(); + } +} - if (tradeState != TRADE_TRANSFER) { - checkTradeState(item); +void Player::sendOpenPrivateChannel(const std::string &receiver) const { + if (client) { + client->sendOpenPrivateChannel(receiver); + } +} - if (tradeItem) { - std::shared_ptr<Container> container = item->getContainer(); - if (container && container->isHoldingItem(tradeItem)) { - g_game().internalCloseTrade(static_self_cast<Player>()); - } - } +void Player::sendExperienceTracker(int64_t rawExp, int64_t finalExp) const { + if (client) { + client->sendExperienceTracker(rawExp, finalExp); } +} - checkLootContainers(item->getContainer()); +void Player::sendOutfitWindow() const { + if (client) { + client->sendOutfitWindow(); + } } -void Player::onCreatureAppear(std::shared_ptr<Creature> creature, bool isLogin) { - Creature::onCreatureAppear(creature, isLogin); +// Imbuements - if (isLogin && creature == getPlayer()) { - onEquipInventory(); +void Player::onApplyImbuement(const Imbuement* imbuement, const std::shared_ptr<Item> &item, uint8_t slot, bool protectionCharm) { + if (!imbuement || !item) { + return; + } - // Refresh bosstiary tracker onLogin - refreshCyclopediaMonsterTracker(true); - // Refresh bestiary tracker onLogin - refreshCyclopediaMonsterTracker(false); + ImbuementInfo imbuementInfo; + if (item->getImbuementInfo(slot, &imbuementInfo)) { + g_logger().error("[Player::onApplyImbuement] - An error occurred while player with name {} try to apply imbuement, item already contains imbuement", this->getName()); + this->sendImbuementResult("An error ocurred, please reopen imbuement window."); + return; + } - for (const auto &condition : storedConditionList) { - addCondition(condition); + const auto &items = imbuement->getItems(); + for (auto &[key, value] : items) { + const ItemType &itemType = Item::items[key]; + if (static_self_cast<Player>()->getItemTypeCount(key) + this->getStashItemCount(itemType.id) < value) { + this->sendImbuementResult("You don't have all necessary items."); + return; } - storedConditionList.clear(); + } - updateRegeneration(); + const BaseImbuement* baseImbuement = g_imbuements().getBaseByID(imbuement->getBaseID()); + if (!baseImbuement) { + return; + } - std::shared_ptr<BedItem> bed = g_game().getBedBySleeper(guid); - if (bed) { - bed->wakeUp(static_self_cast<Player>()); - } + uint32_t price = baseImbuement->price; + price += protectionCharm ? baseImbuement->protectionPrice : 0; - auto version = client->oldProtocol ? getProtocolVersion() : CLIENT_VERSION; - g_logger().info("{} has logged in. (Protocol: {})", name, version); + if (!g_game().removeMoney(static_self_cast<Player>(), price, 0, true)) { + const std::string message = fmt::format("You don't have {} gold coins.", price); - if (guild) { - guild->addMember(static_self_cast<Player>()); - } + g_logger().error("[Player::onApplyImbuement] - An error occurred while player with name {} try to apply imbuement, player do not have money", this->getName()); + sendImbuementResult(message); + return; + } - int32_t offlineTime; - if (getLastLogout() != 0) { - // Not counting more than 21 days to prevent overflow when multiplying with 1000 (for milliseconds). - offlineTime = std::min<int32_t>(time(nullptr) - getLastLogout(), 86400 * 21); - } else { - offlineTime = 0; - } + g_metrics().addCounter("balance_decrease", price, { { "player", getName() }, { "context", "apply_imbuement" } }); - for (const std::shared_ptr<Condition> &condition : getMuteConditions()) { - condition->setTicks(condition->getTicks() - (offlineTime * 1000)); - if (condition->getTicks() <= 0) { - removeCondition(condition); - } - } + for (auto &[key, value] : items) { + std::stringstream withdrawItemMessage; - g_game().checkPlayersRecord(); - IOLoginData::updateOnlineStatus(guid, true); - if (getLevel() < g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL, __FUNCTION__) && getVocationId() > VOCATION_NONE) { - for (uint8_t i = 2; i <= 6; i++) { - if (!hasBlessing(i)) { - addBlessing(i, 1); - } - } - sendBlessStatus(); + const uint32_t inventoryItemCount = getItemTypeCount(key); + if (inventoryItemCount >= value) { + removeItemOfType(key, value, -1, true); + continue; } - if (getCurrentMount() != 0) { - toggleMount(true); + uint32_t mathItemCount = value; + if (inventoryItemCount > 0 && removeItemOfType(key, inventoryItemCount, -1, false)) { + mathItemCount = mathItemCount - inventoryItemCount; } - g_game().changePlayerSpeed(static_self_cast<Player>(), 0); + const ItemType &itemType = Item::items[key]; + + withdrawItemMessage << "Using " << mathItemCount << "x " << itemType.name << " from your supply stash. "; + withdrawItem(itemType.id, mathItemCount); + sendTextMessage(MESSAGE_STATUS, withdrawItemMessage.str()); + } + + if (!protectionCharm && uniform_random(1, 100) > baseImbuement->percent) { + openImbuementWindow(item); + sendImbuementResult("Oh no!\n\nThe imbuement has failed. You have lost the astral sources and gold you needed for the imbuement.\n\nNext time use a protection charm to better your chances."); + openImbuementWindow(item); + return; + } + + // Update imbuement stats item if the item is equipped + if (item->getParent() == getPlayer()) { + addItemImbuementStats(imbuement); } + + item->addImbuement(slot, imbuement->getID(), baseImbuement->duration); + openImbuementWindow(item); } -void Player::onAttackedCreatureDisappear(bool isLogout) { - sendCancelTarget(); +void Player::onClearImbuement(const std::shared_ptr<Item> &item, uint8_t slot) { + if (!item) { + return; + } - if (!isLogout) { - sendTextMessage(MESSAGE_FAILURE, "Target lost."); + ImbuementInfo imbuementInfo; + if (!item->getImbuementInfo(slot, &imbuementInfo)) { + g_logger().error("[Player::onClearImbuement] - An error occurred while player with name {} try to apply imbuement, item not contains imbuement", this->getName()); + this->sendImbuementResult("An error ocurred, please reopen imbuement window."); + return; + } + + const BaseImbuement* baseImbuement = g_imbuements().getBaseByID(imbuementInfo.imbuement->getBaseID()); + if (!baseImbuement) { + return; + } + + if (!g_game().removeMoney(static_self_cast<Player>(), baseImbuement->removeCost, 0, true)) { + const std::string message = fmt::format("You don't have {} gold coins.", baseImbuement->removeCost); + + g_logger().error("[Player::onClearImbuement] - An error occurred while player with name {} try to apply imbuement, player do not have money", this->getName()); + this->sendImbuementResult(message); + this->openImbuementWindow(item); + return; + } + g_metrics().addCounter("balance_decrease", baseImbuement->removeCost, { { "player", getName() }, { "context", "clear_imbuement" } }); + + if (item->getParent() == getPlayer()) { + removeItemImbuementStats(imbuementInfo.imbuement); } + + item->clearImbuement(slot, imbuementInfo.imbuement->getID()); + this->openImbuementWindow(item); } -void Player::onFollowCreatureDisappear(bool isLogout) { - sendCancelTarget(); +void Player::openImbuementWindow(const std::shared_ptr<Item> &item) { + if (!client || !item) { + return; + } - if (!isLogout) { - sendTextMessage(MESSAGE_FAILURE, "Target lost."); + if (item->getImbuementSlot() <= 0) { + this->sendTextMessage(MESSAGE_EVENT_ADVANCE, "This item is not imbuable."); + return; + } + + const auto &itemParent = item->getTopParent(); + if (itemParent && itemParent != getPlayer()) { + this->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You have to pick up the item to imbue it."); + return; } + + client->openImbuementWindow(item); } +// inventory + void Player::onChangeZone(ZoneType_t zone) { if (zone == ZONE_PROTECTION) { if (getAttackedCreature() && !hasFlag(PlayerFlags_t::IgnoreProtectionZone)) { @@ -1791,13 +2405,13 @@ void Player::onChangeZone(ZoneType_t zone) { onAttackedCreatureDisappear(false); } - if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ, __FUNCTION__) && !group->access && isMounted()) { + if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ) && !group->access && isMounted()) { dismount(); g_game().internalCreatureChangeOutfit(getPlayer(), defaultOutfit); wasMounted = true; } } else { - int32_t ticks = g_configManager().getNumber(STAIRHOP_DELAY, __FUNCTION__); + int32_t ticks = g_configManager().getNumber(STAIRHOP_DELAY); if (ticks > 0) { if (const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_PACIFIED, ticks, 0)) { addCondition(condition); @@ -1820,7 +2434,7 @@ void Player::onChangeZone(ZoneType_t zone) { } void Player::onAttackedCreatureChangeZone(ZoneType_t zone) { - auto attackedCreature = getAttackedCreature(); + const auto &attackedCreature = getAttackedCreature(); if (!attackedCreature) { return; } @@ -1845,56 +2459,14 @@ void Player::onAttackedCreatureChangeZone(ZoneType_t zone) { } } -void Player::onRemoveCreature(std::shared_ptr<Creature> creature, bool isLogout) { - Creature::onRemoveCreature(creature, isLogout); - - if (auto player = getPlayer(); player == creature) { - if (isLogout) { - onDeEquipInventory(); - - if (m_party) { - m_party->leaveParty(player); - } - if (guild) { - guild->removeMember(player); - } - - g_game().removePlayerUniqueLogin(player); - loginPosition = getPosition(); - lastLogout = time(nullptr); - g_logger().info("{} has logged out", getName()); - g_chat().removeUserFromAllChannels(player); - clearPartyInvitations(); - IOLoginData::updateOnlineStatus(guid, false); - } - - if (eventWalk != 0) { - setFollowCreature(nullptr); - } - - if (tradePartner) { - g_game().internalCloseTrade(player); - } - - closeShopWindow(); - - g_saveManager().savePlayer(player); - } - - if (creature == shopOwner) { - setShopOwner(nullptr); - sendCloseShop(); - } -} - -bool Player::openShopWindow(std::shared_ptr<Npc> npc, const std::vector<ShopBlock> &shopItems) { +bool Player::openShopWindow(const std::shared_ptr<Npc> &npc, const std::vector<ShopBlock> &shopItems) { Benchmark brenchmark; if (!npc) { g_logger().error("[Player::openShopWindow] - Npc is wrong or nullptr"); return false; } - if (npc->isShopPlayer(getGUID())) { + if (npc->isShopPlayer(getGUID()) && npc->getShopItemVector(getGUID()).size() == shopItems.size()) { g_logger().debug("[Player::openShopWindow] - Player {} is already in shop window", getName()); return false; } @@ -1925,11 +2497,11 @@ bool Player::closeShopWindow() { void Player::onWalk(Direction &dir) { if (hasCondition(CONDITION_FEARED)) { - Position pos = getNextPosition(dir, getPosition()); + const Position pos = getNextPosition(dir, getPosition()); - std::shared_ptr<Tile> tile = g_game().map.getTile(pos); + const auto &tile = g_game().map.getTile(pos); if (tile) { - std::shared_ptr<MagicField> field = tile->getFieldItem(); + const auto &field = tile->getFieldItem(); if (field && !field->isBlocking() && field->getDamage() != 0) { setNextActionTask(nullptr); setNextAction(OTSYS_TIME() + getStepDuration(dir)); @@ -1944,384 +2516,483 @@ void Player::onWalk(Direction &dir) { g_callbacks().executeCallback(EventCallback_t::playerOnWalk, &EventCallback::playerOnWalk, getPlayer(), dir); } -void Player::onCreatureMove(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &newTile, const Position &newPos, const std::shared_ptr<Tile> &oldTile, const Position &oldPos, bool teleport) { - Creature::onCreatureMove(creature, newTile, newPos, oldTile, oldPos, teleport); - - const auto &followCreature = getFollowCreature(); - if (hasFollowPath && (creature == followCreature || (creature.get() == this && followCreature))) { - isUpdatingPath = false; - g_dispatcher().addEvent([creatureId = getID()] { g_game().updateCreatureWalk(creatureId); }, "Game::updateCreatureWalk"); - } - - if (creature != getPlayer()) { +void Player::checkTradeState(const std::shared_ptr<Item> &item) { + if (!tradeItem || tradeState == TRADE_TRANSFER) { return; } - if (tradeState != TRADE_TRANSFER) { - // check if we should close trade - if (tradeItem && !Position::areInRange<1, 1, 0>(tradeItem->getPosition(), getPosition())) { - g_game().internalCloseTrade(getPlayer()); - } - - if (tradePartner && !Position::areInRange<2, 2, 0>(tradePartner->getPosition(), getPosition())) { - g_game().internalCloseTrade(getPlayer()); - } - } - - // close modal windows - if (!modalWindows.empty()) { - // TODO: This shouldn't be hardcoded - for (uint32_t modalWindowId : modalWindows) { - if (modalWindowId == std::numeric_limits<uint32_t>::max()) { - sendTextMessage(MESSAGE_EVENT_ADVANCE, "Offline training aborted."); + if (tradeItem == item) { + g_game().internalCloseTrade(static_self_cast<Player>()); + } else { + auto container = std::dynamic_pointer_cast<Container>(item->getParent()); + while (container) { + if (container == tradeItem) { + g_game().internalCloseTrade(static_self_cast<Player>()); break; } - } - modalWindows.clear(); - } - - // leave market - if (inMarket) { - inMarket = false; - } - - if (m_party) { - m_party->updateSharedExperience(); - m_party->updatePlayerStatus(getPlayer(), oldPos, newPos); - } - - if (teleport || oldPos.z != newPos.z) { - int32_t ticks = g_configManager().getNumber(STAIRHOP_DELAY, __FUNCTION__); - if (ticks > 0) { - if (const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_PACIFIED, ticks, 0)) { - addCondition(condition); - } - } - } -} -void Player::onEquipInventory() { - for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { - std::shared_ptr<Item> item = inventory[slot]; - if (item) { - item->startDecaying(); - g_moveEvents().onPlayerEquip(getPlayer(), item, static_cast<Slots_t>(slot), false); + container = std::dynamic_pointer_cast<Container>(container->getParent()); } } } -void Player::onDeEquipInventory() { - for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { - std::shared_ptr<Item> item = inventory[slot]; - if (item) { - g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast<Slots_t>(slot)); - } +void Player::setNextWalkActionTask(const std::shared_ptr<Task> &task) { + if (walkTaskEvent != 0) { + g_dispatcher().stopEvent(walkTaskEvent); + walkTaskEvent = 0; } -} -// container -void Player::onAddContainerItem(std::shared_ptr<Item> item) { - checkTradeState(item); + walkTask = task; } -void Player::onUpdateContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem) { - if (oldItem != newItem) { - onRemoveContainerItem(container, oldItem); +void Player::setNextWalkTask(const std::shared_ptr<Task> &task) { + if (nextStepEvent != 0) { + g_dispatcher().stopEvent(nextStepEvent); + nextStepEvent = 0; } - if (tradeState != TRADE_TRANSFER) { - checkTradeState(oldItem); + if (task) { + nextStepEvent = g_dispatcher().scheduleEvent(task); + resetIdleTime(); } } -void Player::onRemoveContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> item) { - if (tradeState != TRADE_TRANSFER) { - checkTradeState(item); - - if (tradeItem) { - if (tradeItem->getParent() != container && container->isHoldingItem(tradeItem)) { - g_game().internalCloseTrade(static_self_cast<Player>()); - } - } +void Player::setNextActionTask(const std::shared_ptr<Task> &task, bool resetIdleTime /*= true */) { + if (actionTaskEvent != 0) { + g_dispatcher().stopEvent(actionTaskEvent); + actionTaskEvent = 0; } - checkLootContainers(item->getContainer()); -} - -void Player::onCloseContainer(std::shared_ptr<Container> container) { - if (!client) { - return; + if (!inEventMovePush && !g_configManager().getBoolean(PUSH_WHEN_ATTACKING)) { + cancelPush(); } - for (const auto &it : openContainers) { - if (it.second.container == container) { - client->sendCloseContainer(it.first); + if (task) { + actionTaskEvent = g_dispatcher().scheduleEvent(task); + if (resetIdleTime) { + this->resetIdleTime(); } } } -void Player::onSendContainer(std::shared_ptr<Container> container) { - if (!client || !container) { - return; +void Player::setNextActionPushTask(const std::shared_ptr<Task> &task) { + if (actionTaskEventPush != 0) { + g_dispatcher().stopEvent(actionTaskEventPush); + actionTaskEventPush = 0; } - bool hasParent = container->hasParent(); - for (const auto &it : openContainers) { - const OpenContainer &openContainer = it.second; - if (openContainer.container == container) { - client->sendContainer(it.first, container, hasParent, openContainer.index); - } + if (task) { + actionTaskEventPush = g_dispatcher().scheduleEvent(task); } } -// inventory -void Player::onUpdateInventoryItem(std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem) { - if (oldItem != newItem) { - onRemoveInventoryItem(oldItem); - } +void Player::setNextPotionActionTask(const std::shared_ptr<Task> &task) { + if (actionPotionTaskEvent != 0) { + g_dispatcher().stopEvent(actionPotionTaskEvent); + actionPotionTaskEvent = 0; + } - if (tradeState != TRADE_TRANSFER) { - checkTradeState(oldItem); + cancelPush(); + + if (task) { + actionPotionTaskEvent = g_dispatcher().scheduleEvent(task); + // resetIdleTime(); } } -void Player::onRemoveInventoryItem(std::shared_ptr<Item> item) { - if (tradeState != TRADE_TRANSFER) { - checkTradeState(item); +void Player::setModuleDelay(uint8_t byteortype, int16_t delay) { + moduleDelayMap[byteortype] = OTSYS_TIME() + delay; +} - if (tradeItem) { - std::shared_ptr<Container> container = item->getContainer(); - if (container && container->isHoldingItem(tradeItem)) { - g_game().internalCloseTrade(static_self_cast<Player>()); - } - } +bool Player::canRunModule(uint8_t byteortype) { + if (!moduleDelayMap[byteortype]) { + return true; } + return moduleDelayMap[byteortype] <= OTSYS_TIME(); +} - checkLootContainers(item->getContainer()); +uint32_t Player::getNextActionTime() const { + return std::max<int64_t>(SCHEDULER_MINTICKS, nextAction - OTSYS_TIME()); } -void Player::checkTradeState(std::shared_ptr<Item> item) { - if (!tradeItem || tradeState == TRADE_TRANSFER) { - return; - } +uint32_t Player::getNextPotionActionTime() const { + return std::max<int64_t>(SCHEDULER_MINTICKS, nextPotionAction - OTSYS_TIME()); +} - if (tradeItem == item) { - g_game().internalCloseTrade(static_self_cast<Player>()); - } else { - std::shared_ptr<Container> container = std::dynamic_pointer_cast<Container>(item->getParent()); - while (container) { - if (container == tradeItem) { - g_game().internalCloseTrade(static_self_cast<Player>()); - break; - } +std::shared_ptr<Item> Player::getWriteItem(uint32_t &retWindowTextId, uint16_t &retMaxWriteLen) { + retWindowTextId = this->windowTextId; + retMaxWriteLen = this->maxWriteLen; + return writeItem; +} - container = std::dynamic_pointer_cast<Container>(container->getParent()); - } +void Player::setWriteItem(const std::shared_ptr<Item> &item, uint16_t maxWriteLength) { + windowTextId++; + + if (item) { + writeItem = item; + this->maxWriteLen = maxWriteLength; + } else { + writeItem = nullptr; + this->maxWriteLen = 0; } } -void Player::setNextWalkActionTask(std::shared_ptr<Task> task) { - if (walkTaskEvent != 0) { - g_dispatcher().stopEvent(walkTaskEvent); - walkTaskEvent = 0; - } +std::shared_ptr<House> Player::getEditHouse(uint32_t &retWindowTextId, uint32_t &retListId) { + retWindowTextId = this->windowTextId; + retListId = this->editListId; + return editHouse; +} - walkTask = task; +void Player::setEditHouse(const std::shared_ptr<House> &house, uint32_t listId) { + windowTextId++; + editHouse = house; + editListId = listId; } -void Player::setNextWalkTask(std::shared_ptr<Task> task) { - if (nextStepEvent != 0) { - g_dispatcher().stopEvent(nextStepEvent); - nextStepEvent = 0; +void Player::learnInstantSpell(const std::string &spellName) { + if (!hasLearnedInstantSpell(spellName)) { + learnedInstantSpellList.emplace_back(spellName); } +} - if (task) { - nextStepEvent = g_dispatcher().scheduleEvent(task); - resetIdleTime(); - } +void Player::forgetInstantSpell(const std::string &spellName) { + std::erase(learnedInstantSpellList, spellName); } -void Player::setNextActionTask(std::shared_ptr<Task> task, bool resetIdleTime /*= true */) { - if (actionTaskEvent != 0) { - g_dispatcher().stopEvent(actionTaskEvent); - actionTaskEvent = 0; +bool Player::hasLearnedInstantSpell(const std::string &spellName) const { + if (hasFlag(PlayerFlags_t::CannotUseSpells)) { + return false; } - if (!inEventMovePush && !g_configManager().getBoolean(PUSH_WHEN_ATTACKING, __FUNCTION__)) { - cancelPush(); + if (hasFlag(PlayerFlags_t::IgnoreSpellCheck)) { + return true; } - if (task) { - actionTaskEvent = g_dispatcher().scheduleEvent(task); - if (resetIdleTime) { - this->resetIdleTime(); - } - } + return std::ranges::any_of(learnedInstantSpellList, [&](const auto &learnedSpellName) { + return strcasecmp(learnedSpellName.c_str(), spellName.c_str()) == 0; + }); } -void Player::setNextActionPushTask(std::shared_ptr<Task> task) { - if (actionTaskEventPush != 0) { - g_dispatcher().stopEvent(actionTaskEventPush); - actionTaskEventPush = 0; +void Player::updateRegeneration() const { + if (!vocation) { + return; } - if (task) { - actionTaskEventPush = g_dispatcher().scheduleEvent(task); + const auto &condition = getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT); + if (condition) { + condition->setParam(CONDITION_PARAM_HEALTHGAIN, vocation->getHealthGainAmount()); + condition->setParam(CONDITION_PARAM_HEALTHTICKS, vocation->getHealthGainTicks()); + condition->setParam(CONDITION_PARAM_MANAGAIN, vocation->getManaGainAmount()); + condition->setParam(CONDITION_PARAM_MANATICKS, vocation->getManaGainTicks()); } } -void Player::setNextPotionActionTask(std::shared_ptr<Task> task) { - if (actionPotionTaskEvent != 0) { - g_dispatcher().stopEvent(actionPotionTaskEvent); - actionPotionTaskEvent = 0; - } - - cancelPush(); +void Player::setScheduledSaleUpdate(bool scheduled) { + scheduledSaleUpdate = scheduled; +} - if (task) { - actionPotionTaskEvent = g_dispatcher().scheduleEvent(task); - // resetIdleTime(); - } +bool Player::getScheduledSaleUpdate() const { + return scheduledSaleUpdate; } -uint32_t Player::getNextActionTime() const { - return std::max<int64_t>(SCHEDULER_MINTICKS, nextAction - OTSYS_TIME()); +bool Player::inPushEvent() const { + return inEventMovePush; } -uint32_t Player::getNextPotionActionTime() const { - return std::max<int64_t>(SCHEDULER_MINTICKS, nextPotionAction - OTSYS_TIME()); +void Player::pushEvent(bool b) { + inEventMovePush = b; } -void Player::cancelPush() { - if (actionTaskEventPush != 0) { - g_dispatcher().stopEvent(actionTaskEventPush); - actionTaskEventPush = 0; - inEventMovePush = false; +bool Player::walkExhausted() const { + if (hasCondition(CONDITION_PARALYZE)) { + return lastWalking > OTSYS_TIME(); } + + return false; } -void Player::onThink(uint32_t interval) { - Creature::onThink(interval); +void Player::setWalkExhaust(int64_t value) { + lastWalking = OTSYS_TIME() + value; +} - sendPing(); +const std::map<uint8_t, OpenContainer> &Player::getOpenContainers() const { + return openContainers; +} - MessageBufferTicks += interval; - if (MessageBufferTicks >= 1500) { - MessageBufferTicks = 0; - addMessageBuffer(); - } +uint16_t Player::getBaseXpGain() const { + return baseXpGain; +} - // Transcendance (avatar trigger) - triggerTranscendance(); - // Momentum (cooldown resets) - triggerMomentum(); - auto playerTile = getTile(); - const bool vipStaysOnline = isVip() && g_configManager().getBoolean(VIP_STAY_ONLINE, __FUNCTION__); - idleTime += interval; - if (playerTile && !playerTile->hasFlag(TILESTATE_NOLOGOUT) && !isAccessPlayer() && !isExerciseTraining() && !vipStaysOnline) { - const int32_t kickAfterMinutes = g_configManager().getNumber(KICK_AFTER_MINUTES, __FUNCTION__); - if (idleTime > (kickAfterMinutes * 60000) + 60000) { - removePlayer(true); - } else if (client && idleTime == 60000 * kickAfterMinutes) { - std::ostringstream ss; - ss << "There was no variation in your behaviour for " << kickAfterMinutes << " minutes. You will be disconnected in one minute if there is no change in your actions until then."; - client->sendTextMessage(TextMessage(MESSAGE_ADMINISTRATOR, ss.str())); - } - } +void Player::setBaseXpGain(uint16_t value) { + baseXpGain = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); +} - if (g_game().getWorldType() != WORLD_TYPE_PVP_ENFORCED) { - checkSkullTicks(interval / 1000); - } +uint16_t Player::getVoucherXpBoost() const { + return voucherXpBoost; +} - addOfflineTrainingTime(interval); - if (lastStatsTrainingTime != getOfflineTrainingTime() / 60 / 1000) { - sendStats(); - } +void Player::setVoucherXpBoost(uint16_t value) { + voucherXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); +} - // Wheel of destiny major spells - wheel()->onThink(); +uint16_t Player::getGrindingXpBoost() const { + return grindingXpBoost; } -uint32_t Player::isMuted() const { - if (hasFlag(PlayerFlags_t::CannotBeMuted)) { - return 0; - } +void Player::setGrindingXpBoost(uint16_t value) { + grindingXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); +} - int32_t muteTicks = 0; - for (const std::shared_ptr<Condition> &condition : conditions) { - if (condition->getType() == CONDITION_MUTED && condition->getTicks() > muteTicks) { - muteTicks = condition->getTicks(); - } - } - return static_cast<uint32_t>(muteTicks) / 1000; +uint16_t Player::getXpBoostPercent() const { + return xpBoostPercent; } -void Player::addMessageBuffer() { - if (MessageBufferCount > 0 && g_configManager().getNumber(MAX_MESSAGEBUFFER, __FUNCTION__) != 0 && !hasFlag(PlayerFlags_t::CannotBeMuted)) { - --MessageBufferCount; - } +void Player::setXpBoostPercent(uint16_t percent) { + xpBoostPercent = percent; } -void Player::removeMessageBuffer() { - if (hasFlag(PlayerFlags_t::CannotBeMuted)) { +uint16_t Player::getStaminaXpBoost() const { + return staminaXpBoost; +} + +void Player::setStaminaXpBoost(uint16_t value) { + staminaXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); +} + +void Player::setXpBoostTime(uint16_t timeLeft) { + // only allow time boosts of 12 hours or less + if (timeLeft > 12 * 3600) { + xpBoostTime = 12 * 3600; return; } + xpBoostTime = timeLeft; +} - const int32_t maxMessageBuffer = g_configManager().getNumber(MAX_MESSAGEBUFFER, __FUNCTION__); - if (maxMessageBuffer != 0 && MessageBufferCount <= maxMessageBuffer + 1) { - if (++MessageBufferCount > maxMessageBuffer) { - uint32_t muteCount = 1; - auto it = muteCountMap.find(guid); - if (it != muteCountMap.end()) { - muteCount = it->second; - } +uint16_t Player::getXpBoostTime() const { + return xpBoostTime; +} - uint32_t muteTime = 5 * muteCount * muteCount; - muteCountMap[guid] = muteCount + 1; - std::shared_ptr<Condition> condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_MUTED, muteTime * 1000, 0); - addCondition(condition); +int32_t Player::getIdleTime() const { + return idleTime; +} - std::ostringstream ss; - ss << "You are muted for " << muteTime << " seconds."; - sendTextMessage(MESSAGE_FAILURE, ss.str()); +void Player::setTraining(bool value) { + for (const auto &[key, player] : g_game().getPlayers()) { + if (!this->isInGhostMode() || player->isAccessPlayer()) { + player->vip()->notifyStatusChange(static_self_cast<Player>(), value ? VipStatus_t::Training : VipStatus_t::Online, false); } } + vip()->setStatus(VipStatus_t::Training); + setExerciseTraining(value); } -void Player::drainHealth(std::shared_ptr<Creature> attacker, int32_t damage) { - if (PLAYER_SOUND_HEALTH_CHANGE >= static_cast<uint32_t>(uniform_random(1, 100))) { - g_game().sendSingleSoundEffect(static_self_cast<Player>()->getPosition(), sex == PLAYERSEX_FEMALE ? SoundEffect_t::HUMAN_FEMALE_BARK : SoundEffect_t::HUMAN_MALE_BARK, getPlayer()); +void Player::addItemImbuementStats(const Imbuement* imbuement) { + bool requestUpdate = false; + // Check imbuement skills + for (int32_t skill = SKILL_FIRST; skill <= SKILL_LAST; ++skill) { + if (imbuement->skills[skill]) { + requestUpdate = true; + setVarSkill(static_cast<skills_t>(skill), imbuement->skills[skill]); + } } - Creature::drainHealth(attacker, damage); - sendStats(); -} + // Check imbuement magic level + for (int32_t stat = STAT_FIRST; stat <= STAT_LAST; ++stat) { + if (imbuement->stats[stat]) { + requestUpdate = true; + setVarStats(static_cast<stats_t>(stat), imbuement->stats[stat]); + } + } -void Player::drainMana(std::shared_ptr<Creature> attacker, int32_t manaLoss) { - Creature::drainMana(attacker, manaLoss); - sendStats(); -} + // Add imbuement speed + if (imbuement->speed != 0) { + g_game().changeSpeed(static_self_cast<Player>(), imbuement->speed); + } -void Player::addManaSpent(uint64_t amount) { - if (hasFlag(PlayerFlags_t::NotGainMana)) { - return; + // Add imbuement capacity + if (imbuement->capacity != 0) { + requestUpdate = true; + bonusCapacity = (capacity * imbuement->capacity) / 100; } - uint64_t currReqMana = vocation->getReqMana(magLevel); - uint64_t nextReqMana = vocation->getReqMana(magLevel + 1); - if (currReqMana >= nextReqMana) { - // player has reached max magic level - return; + if (requestUpdate) { + sendStats(); + sendSkills(); } +} - g_events().eventPlayerOnGainSkillTries(static_self_cast<Player>(), SKILL_MAGLEVEL, amount); - g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), SKILL_MAGLEVEL, amount); - if (amount == 0) { +void Player::removeItemImbuementStats(const Imbuement* imbuement) { + if (!imbuement) { return; } - bool sendUpdateStats = false; - while ((manaSpent + amount) >= nextReqMana) { + bool requestUpdate = false; + + for (int32_t skill = SKILL_FIRST; skill <= SKILL_LAST; ++skill) { + if (imbuement->skills[skill]) { + requestUpdate = true; + setVarSkill(static_cast<skills_t>(skill), -imbuement->skills[skill]); + } + } + + // Check imbuement magic level + for (int32_t stat = STAT_FIRST; stat <= STAT_LAST; ++stat) { + if (imbuement->stats[stat]) { + requestUpdate = true; + setVarStats(static_cast<stats_t>(stat), -imbuement->stats[stat]); + } + } + + // Remove imbuement speed + if (imbuement->speed != 0) { + g_game().changeSpeed(static_self_cast<Player>(), -imbuement->speed); + } + + // Remove imbuement capacity + if (imbuement->capacity != 0) { + requestUpdate = true; + bonusCapacity = 0; + } + + if (requestUpdate) { + sendStats(); + sendSkills(); + } +} + +void Player::updateImbuementTrackerStats() const { + if (imbuementTrackerWindowOpen) { + g_game().playerRequestInventoryImbuements(getID(), true); + } +} + +// User Interface action exhaustion + +bool Player::isUIExhausted(uint32_t exhaustionTime) const { + return (OTSYS_TIME() - lastUIInteraction < exhaustionTime); +} + +void Player::updateUIExhausted() { + lastUIInteraction = OTSYS_TIME(); +} + +bool Player::isQuickLootListedItem(const std::shared_ptr<Item> &item) const { + if (!item) { + return false; + } + + auto it = std::ranges::find(quickLootListItemIds, item->getID()); + return it != quickLootListItemIds.end(); +} + +void Player::setNextAction(int64_t time) { + if (time > nextAction) { + nextAction = time; + } +} + +bool Player::canDoAction() const { + return nextAction <= OTSYS_TIME(); +} + +void Player::setNextPotionAction(int64_t time) { + if (time > nextPotionAction) { + nextPotionAction = time; + } +} + +bool Player::canDoPotionAction() const { + return nextPotionAction <= OTSYS_TIME(); +} + +void Player::cancelPush() { + if (actionTaskEventPush != 0) { + g_dispatcher().stopEvent(actionTaskEventPush); + actionTaskEventPush = 0; + inEventMovePush = false; + } +} + +uint32_t Player::isMuted() const { + if (hasFlag(PlayerFlags_t::CannotBeMuted)) { + return 0; + } + + int32_t muteTicks = 0; + for (const auto &condition : conditions) { + if (condition->getType() == CONDITION_MUTED && condition->getTicks() > muteTicks) { + muteTicks = condition->getTicks(); + } + } + return static_cast<uint32_t>(muteTicks) / 1000; +} + +void Player::addMessageBuffer() { + if (MessageBufferCount > 0 && g_configManager().getNumber(MAX_MESSAGEBUFFER) != 0 && !hasFlag(PlayerFlags_t::CannotBeMuted)) { + --MessageBufferCount; + } +} + +void Player::removeMessageBuffer() { + if (hasFlag(PlayerFlags_t::CannotBeMuted)) { + return; + } + + const int32_t maxMessageBuffer = g_configManager().getNumber(MAX_MESSAGEBUFFER); + if (maxMessageBuffer != 0 && MessageBufferCount <= maxMessageBuffer + 1) { + if (++MessageBufferCount > maxMessageBuffer) { + uint32_t muteCount = 1; + const auto it = muteCountMap.find(guid); + if (it != muteCountMap.end()) { + muteCount = it->second; + } + + const uint32_t muteTime = 5 * muteCount * muteCount; + muteCountMap[guid] = muteCount + 1; + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_MUTED, muteTime * 1000, 0); + addCondition(condition); + + std::ostringstream ss; + ss << "You are muted for " << muteTime << " seconds."; + sendTextMessage(MESSAGE_FAILURE, ss.str()); + } + } +} + +void Player::drainHealth(const std::shared_ptr<Creature> &attacker, int32_t damage) { + if (PLAYER_SOUND_HEALTH_CHANGE >= static_cast<uint32_t>(uniform_random(1, 100))) { + g_game().sendSingleSoundEffect(static_self_cast<Player>()->getPosition(), sex == PLAYERSEX_FEMALE ? SoundEffect_t::HUMAN_FEMALE_BARK : SoundEffect_t::HUMAN_MALE_BARK, getPlayer()); + } + + Creature::drainHealth(attacker, damage); + sendStats(); +} + +void Player::drainMana(const std::shared_ptr<Creature> &attacker, int32_t manaLoss) { + Creature::drainMana(attacker, manaLoss); + sendStats(); +} + +void Player::addManaSpent(uint64_t amount) { + if (hasFlag(PlayerFlags_t::NotGainMana)) { + return; + } + + uint64_t currReqMana = vocation->getReqMana(magLevel); + uint64_t nextReqMana = vocation->getReqMana(magLevel + 1); + if (currReqMana >= nextReqMana) { + // player has reached max magic level + return; + } + + g_events().eventPlayerOnGainSkillTries(static_self_cast<Player>(), SKILL_MAGLEVEL, amount); + g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), SKILL_MAGLEVEL, amount); + if (amount == 0) { + return; + } + + bool sendUpdateStats = false; + while ((manaSpent + amount) >= nextReqMana) { amount -= nextReqMana - manaSpent; magLevel++; @@ -2345,7 +3016,7 @@ void Player::addManaSpent(uint64_t amount) { manaSpent += amount; - uint8_t oldPercent = magLevelPercent; + const uint8_t oldPercent = magLevelPercent; if (nextReqMana > currReqMana) { magLevelPercent = Player::getPercentLevel(manaSpent, nextReqMana); } else { @@ -2362,9 +3033,9 @@ void Player::addManaSpent(uint64_t amount) { } } -void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool sendText /* = false*/) { - uint64_t currLevelExp = Player::getExpForLevel(level); - uint64_t nextLevelExp = Player::getExpForLevel(level + 1); +void Player::addExperience(const std::shared_ptr<Creature> &target, uint64_t exp, bool sendText /* = false*/) { + uint64_t currLevelExp = getExpForLevel(level); + uint64_t nextLevelExp = getExpForLevel(level + 1); uint64_t rawExp = exp; if (currLevelExp >= nextLevelExp) { // player has reached max level @@ -2373,15 +3044,15 @@ void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool return; } - g_callbacks().executeCallback(EventCallback_t::playerOnGainExperience, &EventCallback::playerOnGainExperience, getPlayer(), target, exp, rawExp); + g_callbacks().executeCallback(EventCallback_t::playerOnGainExperience, &EventCallback::playerOnGainExperience, getPlayer(), target, std::ref(exp), std::ref(rawExp)); g_events().eventPlayerOnGainExperience(static_self_cast<Player>(), target, exp, rawExp); if (exp == 0) { return; } - auto rate = exp / rawExp; - std::map<std::string, std::string> attrs({ { "player", getName() }, { "level", std::to_string(getLevel()) }, { "rate", std::to_string(rate) } }); + const auto rate = exp / rawExp; + const std::map<std::string, std::string> attrs({ { "player", getName() }, { "level", std::to_string(getLevel()) }, { "rate", std::to_string(rate) } }); if (sendText) { g_metrics().addCounter("player_experience_raw", rawExp, attrs); g_metrics().addCounter("player_experience_actual", exp, attrs); @@ -2391,10 +3062,10 @@ void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool } // Hazard system experience - std::shared_ptr<Monster> monster = target && target->getMonster() ? target->getMonster() : nullptr; - bool handleHazardExperience = monster && monster->getHazard() && getHazardSystemPoints() > 0; + const auto &monster = target && target->getMonster() ? target->getMonster() : nullptr; + const bool handleHazardExperience = monster && monster->getHazard() && getHazardSystemPoints() > 0; if (handleHazardExperience) { - exp += (exp * (1.75 * getHazardSystemPoints() * g_configManager().getFloat(HAZARD_EXP_BONUS_MULTIPLIER, __FUNCTION__))) / 100.; + exp += (exp * (1.75 * getHazardSystemPoints() * g_configManager().getFloat(HAZARD_EXP_BONUS_MULTIPLIER))) / 100.; } experience += exp; @@ -2402,7 +3073,7 @@ void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool if (sendText) { std::string expString = fmt::format("{} experience point{}.", exp, (exp != 1 ? "s" : "")); if (isVip()) { - uint8_t expPercent = g_configManager().getNumber(VIP_BONUS_EXP, __FUNCTION__); + uint8_t expPercent = g_configManager().getNumber(VIP_BONUS_EXP); if (expPercent > 0) { expString = expString + fmt::format(" (VIP bonus {}%)", expPercent > 100 ? 100 : expPercent); } @@ -2419,13 +3090,13 @@ void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool if (!spectators.empty()) { message.type = MESSAGE_EXPERIENCE_OTHERS; message.text = getName() + " gained " + expString; - for (const std::shared_ptr<Creature> &spectator : spectators) { + for (const auto &spectator : spectators) { spectator->getPlayer()->sendTextMessage(message); } } } - uint32_t prevLevel = level; + const uint32_t prevLevel = level; while (experience >= nextLevelExp) { ++level; // Player stats gain for vocations level <= 8 @@ -2445,7 +3116,7 @@ void Player::addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool } currLevelExp = nextLevelExp; - nextLevelExp = Player::getExpForLevel(level + 1); + nextLevelExp = getExpForLevel(level + 1); if (currLevelExp >= nextLevelExp) { // player has reached max level break; @@ -2489,7 +3160,7 @@ void Player::removeExperience(uint64_t exp, bool sendText /* = false*/) { } g_events().eventPlayerOnLoseExperience(static_self_cast<Player>(), exp); - g_callbacks().executeCallback(EventCallback_t::playerOnLoseExperience, &EventCallback::playerOnLoseExperience, getPlayer(), exp); + g_callbacks().executeCallback(EventCallback_t::playerOnLoseExperience, &EventCallback::playerOnLoseExperience, getPlayer(), std::ref(exp)); if (exp == 0) { return; } @@ -2500,7 +3171,7 @@ void Player::removeExperience(uint64_t exp, bool sendText /* = false*/) { if (sendText) { lostExp -= experience; - std::string expString = fmt::format("You lost {} experience point{}.", lostExp, (lostExp != 1 ? "s" : "")); + const std::string expString = fmt::format("You lost {} experience point{}.", lostExp, (lostExp != 1 ? "s" : "")); TextMessage message(MESSAGE_EXPERIENCE, expString); message.position = position; @@ -2513,13 +3184,13 @@ void Player::removeExperience(uint64_t exp, bool sendText /* = false*/) { if (!spectators.empty()) { message.type = MESSAGE_EXPERIENCE_OTHERS; message.text = getName() + " lost " + expString; - for (const std::shared_ptr<Creature> &spectator : spectators) { + for (const auto &spectator : spectators) { spectator->getPlayer()->sendTextMessage(message); } } } - uint32_t oldLevel = level; + const uint32_t oldLevel = level; uint64_t currLevelExp = Player::getExpForLevel(level); while (level > 1 && experience < currLevelExp) { @@ -2558,7 +3229,7 @@ void Player::removeExperience(uint64_t exp, bool sendText /* = false*/) { sendTextMessage(MESSAGE_EVENT_ADVANCE, ss.str()); } - uint64_t nextLevelExp = Player::getExpForLevel(level + 1); + const uint64_t nextLevelExp = Player::getExpForLevel(level + 1); if (nextLevelExp > currLevelExp) { levelPercent = Player::getPercentLevel(experience - currLevelExp, nextLevelExp - currLevelExp); } else { @@ -2573,7 +3244,7 @@ double_t Player::getPercentLevel(uint64_t count, uint64_t nextLevelCount) { return 0; } - double_t result = round(((count * 100.) / nextLevelCount) * 100.) / 100.; + const double_t result = round(((count * 100.) / nextLevelCount) * 100.) / 100.; if (result > 100) { return 0; } @@ -2590,11 +3261,11 @@ void Player::onBlockHit() { } } -void Player::onTakeDamage(std::shared_ptr<Creature> attacker, int32_t damage) { +void Player::onTakeDamage(const std::shared_ptr<Creature> &attacker, int32_t damage) { // nothing here yet } -void Player::onAttackedCreatureBlockHit(BlockType_t blockType) { +void Player::onAttackedCreatureBlockHit(const BlockType_t &blockType) { lastAttackBlockType = blockType; switch (blockType) { @@ -2625,19 +3296,23 @@ void Player::onAttackedCreatureBlockHit(BlockType_t blockType) { } bool Player::hasShield() const { - std::shared_ptr<Item> item = inventory[CONST_SLOT_LEFT]; - if (item && item->getWeaponType() == WEAPON_SHIELD) { + const auto &itemLeft = inventory[CONST_SLOT_LEFT]; + if (itemLeft && itemLeft->getWeaponType() == WEAPON_SHIELD) { return true; } - item = inventory[CONST_SLOT_RIGHT]; - if (item && item->getWeaponType() == WEAPON_SHIELD) { + const auto &itemRight = inventory[CONST_SLOT_RIGHT]; + if (itemRight && itemRight->getWeaponType() == WEAPON_SHIELD) { return true; } return false; } -BlockType_t Player::blockHit(std::shared_ptr<Creature> attacker, CombatType_t combatType, int32_t &damage, bool checkDefense /* = false*/, bool checkArmor /* = false*/, bool field /* = false*/) { +bool Player::isPzLocked() const { + return pzLocked; +} + +BlockType_t Player::blockHit(const std::shared_ptr<Creature> &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense, bool checkArmor, bool field) { BlockType_t blockType = Creature::blockHit(attacker, combatType, damage, checkDefense, checkArmor, field); if (attacker) { sendCreatureSquare(attacker, SQ_COLOR_BLACK); @@ -2653,43 +3328,47 @@ BlockType_t Player::blockHit(std::shared_ptr<Creature> attacker, CombatType_t co continue; } - std::shared_ptr<Item> item = inventory[slot]; + const auto &item = inventory[slot]; if (!item) { continue; } + for (uint8_t slotid = 0; slotid < item->getImbuementSlot(); slotid++) { + ImbuementInfo imbuementInfo; + if (!item->getImbuementInfo(slotid, &imbuementInfo)) { + continue; + } + + const int16_t &imbuementAbsorbPercent = imbuementInfo.imbuement->absorbPercent[combatTypeToIndex(combatType)]; + + if (imbuementAbsorbPercent != 0) { + damage -= std::ceil(damage * (imbuementAbsorbPercent / 100.)); + } + } + + // const ItemType &it = Item::items[item->getID()]; if (it.abilities) { + int totalAbsorbPercent = 0; const int16_t &absorbPercent = it.abilities->absorbPercent[combatTypeToIndex(combatType)]; - auto charges = item->getAttribute<uint16_t>(ItemAttribute_t::CHARGES); if (absorbPercent != 0) { - damage -= std::round(damage * (absorbPercent / 100.)); - if (charges != 0) { - g_game().transformItem(item, item->getID(), charges - 1); - } + totalAbsorbPercent += absorbPercent; } if (field) { const int16_t &fieldAbsorbPercent = it.abilities->fieldAbsorbPercent[combatTypeToIndex(combatType)]; if (fieldAbsorbPercent != 0) { - damage -= std::round(damage * (fieldAbsorbPercent / 100.)); - if (charges != 0) { - g_game().transformItem(item, item->getID(), charges - 1); - } + totalAbsorbPercent += fieldAbsorbPercent; } } - } - - for (uint8_t slotid = 0; slotid < item->getImbuementSlot(); slotid++) { - ImbuementInfo imbuementInfo; - if (!item->getImbuementInfo(slotid, &imbuementInfo)) { - continue; - } - const int16_t &imbuementAbsorbPercent = imbuementInfo.imbuement->absorbPercent[combatTypeToIndex(combatType)]; + if (totalAbsorbPercent > 0) { + damage -= std::round(damage * (totalAbsorbPercent / 100.0)); - if (imbuementAbsorbPercent != 0) { - damage -= std::ceil(damage * (imbuementAbsorbPercent / 100.)); + const auto charges = item->getAttribute<uint16_t>(ItemAttribute_t::CHARGES); + if (charges != 0) { + g_game().transformItem(item, item->getID(), charges - 1); + } } } } @@ -2706,8 +3385,63 @@ BlockType_t Player::blockHit(std::shared_ptr<Creature> attacker, CombatType_t co return blockType; } -void Player::death(std::shared_ptr<Creature> lastHitCreature) { - if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ, __FUNCTION__) && isMounted()) { +void Player::doAttacking(uint32_t interval) { + if (lastAttack == 0) { + lastAttack = OTSYS_TIME() - getAttackSpeed() - 1; + } + + if (hasCondition(CONDITION_PACIFIED)) { + return; + } + + const auto &attackedCreature = getAttackedCreature(); + if (!attackedCreature) { + return; + } + + if ((OTSYS_TIME() - lastAttack) >= getAttackSpeed()) { + bool result = false; + + const auto &tool = getWeapon(); + const auto &weapon = g_weapons().getWeapon(tool); + uint32_t delay = getAttackSpeed(); + bool classicSpeed = g_configManager().getBoolean(CLASSIC_ATTACK_SPEED); + + if (weapon) { + if (!weapon->interruptSwing()) { + result = weapon->useWeapon(static_self_cast<Player>(), tool, attackedCreature); + } else if (!classicSpeed && !canDoAction()) { + delay = getNextActionTime(); + } else { + result = weapon->useWeapon(static_self_cast<Player>(), tool, attackedCreature); + } + } else if (hasWeaponDistanceEquipped()) { + return; + } else { + result = Weapon::useFist(static_self_cast<Player>(), attackedCreature); + } + + const auto &task = createPlayerTask( + std::max<uint32_t>(SCHEDULER_MINTICKS, delay), + [playerId = getID()] { g_game().checkCreatureAttack(playerId); }, + __FUNCTION__ + ); + + if (!classicSpeed) { + setNextActionTask(task, false); + } else { + g_dispatcher().scheduleEvent(task); + } + + if (result) { + updateLastAggressiveAction(); + updateLastAttack(); + } + } +} + +void Player::death(const std::shared_ptr<Creature> &lastHitCreature) { + if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ) && isMounted()) { dismount(); g_game().internalCreatureChangeOutfit(getPlayer(), defaultOutfit); } @@ -2721,15 +3455,15 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { int othersDmg = 0; uint32_t sumLevels = 0; uint32_t inFightTicks = 5 * 60 * 1000; - for (const auto &it : damageMap) { - CountBlock_t cb = it.second; - if ((OTSYS_TIME() - cb.ticks) <= inFightTicks) { - std::shared_ptr<Player> damageDealer = g_game().getPlayerByID(it.first); + for (const auto &[creatureId, damageInfo] : damageMap) { + const auto &[total, ticks] = damageInfo; + if ((OTSYS_TIME() - ticks) <= inFightTicks) { + const auto &damageDealer = g_game().getPlayerByID(creatureId); if (damageDealer) { - playerDmg += cb.total; + playerDmg += total; sumLevels += damageDealer->getLevel(); } else { - othersDmg += cb.total; + othersDmg += total; } } } @@ -2783,7 +3517,7 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { } // Level loss - uint64_t expLoss = static_cast<uint64_t>(experience * deathLossPercent); + auto expLoss = static_cast<uint64_t>(experience * deathLossPercent); g_events().eventPlayerOnLoseExperience(static_self_cast<Player>(), expLoss); g_callbacks().executeCallback(EventCallback_t::playerOnLoseExperience, &EventCallback::playerOnLoseExperience, getPlayer(), expLoss); @@ -2800,7 +3534,7 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { sumSkillTries += skills[i].tries; - uint32_t lostSkillTries = static_cast<uint32_t>(sumSkillTries * deathLossPercent); + auto lostSkillTries = static_cast<uint32_t>(sumSkillTries * deathLossPercent); while (lostSkillTries > skills[i].tries) { lostSkillTries -= skills[i].tries; @@ -2859,7 +3593,7 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { } sendTextMessage(MESSAGE_EVENT_ADVANCE, deathType.str()); - auto adventurerBlessingLevel = g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL, __FUNCTION__); + auto adventurerBlessingLevel = g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL); auto willNotLoseBless = getLevel() < adventurerBlessingLevel && getVocationId() > VOCATION_NONE; std::string bless = getBlessingsName(); @@ -2896,7 +3630,7 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { auto it = conditions.begin(), end = conditions.end(); while (it != end) { - std::shared_ptr<Condition> condition = *it; + auto condition = *it; // isSupress block to delete spells conditions (ensures that the player cannot, for example, reset the cooldown time of the familiar and summon several) if (condition->isPersistent() && condition->isRemovableOnDeath()) { it = conditions.erase(it); @@ -2907,12 +3641,13 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { ++it; } } + despawn(); } else { setSkillLoss(true); auto it = conditions.begin(), end = conditions.end(); while (it != end) { - std::shared_ptr<Condition> condition = *it; + auto condition = *it; if (condition->isPersistent()) { it = conditions.erase(it); @@ -2931,8 +3666,6 @@ void Player::death(std::shared_ptr<Creature> lastHitCreature) { onIdleStatus(); sendStats(); } - - despawn(); } bool Player::spawn() { @@ -2944,7 +3677,7 @@ bool Player::spawn() { return false; } - auto spectators = Spectators().find<Creature>(position, true); + const auto &spectators = Spectators().find<Creature>(position, true); for (const auto &spectator : spectators) { if (const auto &tmpPlayer = spectator->getPlayer()) { tmpPlayer->sendCreatureAppear(static_self_cast<Player>(), pos, true); @@ -2976,18 +3709,18 @@ void Player::despawn() { Game::removeCreatureCheck(static_self_cast<Player>()); // remove from map - std::shared_ptr<Tile> tile = getTile(); + const auto &tile = getTile(); if (!tile) { return; } std::vector<int32_t> oldStackPosVector; - auto spectators = Spectators().find<Creature>(tile->getPosition(), true); + const auto &spectators = Spectators().find<Creature>(tile->getPosition(), true); size_t i = 0; for (const auto &spectator : spectators) { if (const auto &player = spectator->getPlayer()) { - oldStackPosVector.push_back(player->canSeeCreature(static_self_cast<Player>()) ? tile->getStackposOfCreature(player, getPlayer()) : -1); + oldStackPosVector.emplace_back(player->canSeeCreature(static_self_cast<Player>()) ? tile->getStackposOfCreature(player, getPlayer()) : -1); } if (const auto &player = spectator->getPlayer()) { player->sendRemoveTileThing(tile->getPosition(), oldStackPosVector[i++]); @@ -3010,7 +3743,7 @@ void Player::despawn() { setDead(true); } -bool Player::dropCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared_ptr<Creature> mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) { +bool Player::dropCorpse(const std::shared_ptr<Creature> &lastHitCreature, const std::shared_ptr<Creature> &mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) { if (getZoneType() != ZONE_PVP || !Player::lastHitIsPlayer(lastHitCreature)) { return Creature::dropCorpse(lastHitCreature, mostDamageCreature, lastHitUnjustified, mostDamageUnjustified); } @@ -3019,8 +3752,8 @@ bool Player::dropCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared_p return false; } -std::shared_ptr<Item> Player::getCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared_ptr<Creature> mostDamageCreature) { - std::shared_ptr<Item> corpse = Creature::getCorpse(lastHitCreature, mostDamageCreature); +std::shared_ptr<Item> Player::getCorpse(const std::shared_ptr<Creature> &lastHitCreature, const std::shared_ptr<Creature> &mostDamageCreature) { + const auto &corpse = Creature::getCorpse(lastHitCreature, mostDamageCreature); if (corpse && corpse->getContainer()) { std::ostringstream ss; if (lastHitCreature) { @@ -3050,8 +3783,18 @@ void Player::addInFightTicks(bool pzlock /*= false*/) { updateImbuementTrackerStats(); - std::shared_ptr<Condition> condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_INFIGHT, g_configManager().getNumber(PZ_LOCKED, __FUNCTION__), 0); - addCondition(condition); + // this method can be called asynchronously. + g_dispatcher().context().tryAddEvent([self = std::weak_ptr<Player>(getPlayer())] { + if (const auto &player = self.lock()) { + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_INFIGHT, g_configManager().getNumber(PZ_LOCKED), 0); + player->addCondition(condition); + } + }, + "Player::addInFightTicks"); +} + +void Player::setDailyReward(uint8_t reward) { + this->isDailyReward = reward; } void Player::removeList() { @@ -3079,30 +3822,27 @@ void Player::removePlayer(bool displayEffect, bool forced /*= true*/) { } } -// close container and its child containers -void Player::autoCloseContainers(std::shared_ptr<Container> container) { - std::vector<uint32_t> closeList; - for (const auto &it : openContainers) { - std::shared_ptr<Container> tmpContainer = it.second.container; - while (tmpContainer) { - if (tmpContainer->isRemoved() || tmpContainer == container) { - closeList.push_back(it.first); - break; - } +uint64_t Player::getExpForLevel(const uint32_t level) { + return (((level - 6ULL) * level + 17ULL) * level - 12ULL) / 6ULL * 100ULL; +} - tmpContainer = std::dynamic_pointer_cast<Container>(tmpContainer->getParent()); - } +uint16_t Player::getStaminaMinutes() const { + return staminaMinutes; +} + +void Player::sendItemsPrice() const { + if (client) { + client->sendItemsPrice(); } +} - for (uint32_t containerId : closeList) { - closeContainer(containerId); - if (client) { - client->sendCloseContainer(containerId); - } +void Player::sendForgingData() const { + if (client) { + client->sendForgingData(); } } -bool Player::hasCapacity(std::shared_ptr<Item> item, uint32_t count) const { +bool Player::hasCapacity(const std::shared_ptr<Item> &item, uint32_t count) const { if (hasFlag(PlayerFlags_t::CannotPickupItem)) { return false; } @@ -3118,8 +3858,8 @@ bool Player::hasCapacity(std::shared_ptr<Item> item, uint32_t count) const { return itemWeight <= getFreeCapacity(); } -ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature>) { - std::shared_ptr<Item> item = thing->getItem(); +ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &) { + const auto &item = thing->getItem(); if (item == nullptr) { g_logger().error("[Player::queryAdd] - Item is nullptr"); return RETURNVALUE_NOTPOSSIBLE; @@ -3128,10 +3868,10 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, return RETURNVALUE_ITEMISNOTYOURS; } - bool childIsOwner = hasBitSet(FLAG_CHILDISOWNER, flags); + const bool childIsOwner = hasBitSet(FLAG_CHILDISOWNER, flags); if (childIsOwner) { // a child container is querying the player, just check if enough capacity - bool skipLimit = hasBitSet(FLAG_NOLIMIT, flags); + const bool skipLimit = hasBitSet(FLAG_NOLIMIT, flags); if (skipLimit || hasCapacity(item, count)) { return RETURNVALUE_NOERROR; } @@ -3146,7 +3886,7 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, const int32_t &slotPosition = item->getSlotPosition(); - bool allowPutItemsOnAmmoSlot = g_configManager().getBoolean(ENABLE_PLAYER_PUT_ITEM_IN_AMMO_SLOT, __FUNCTION__); + bool allowPutItemsOnAmmoSlot = g_configManager().getBoolean(ENABLE_PLAYER_PUT_ITEM_IN_AMMO_SLOT); if (allowPutItemsOnAmmoSlot && index == CONST_SLOT_AMMO) { ret = RETURNVALUE_NOERROR; } else { @@ -3193,7 +3933,7 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, if (item->getWeaponType() != WEAPON_SHIELD && !item->isQuiver()) { ret = RETURNVALUE_CANNOTBEDRESSED; } else { - std::shared_ptr<Item> leftItem = inventory[CONST_SLOT_LEFT]; + const auto &leftItem = inventory[CONST_SLOT_LEFT]; if (leftItem) { if ((leftItem->getSlotPosition() | slotPosition) & SLOTP_TWO_HAND) { if (item->isQuiver() && leftItem->getWeaponType() == WEAPON_DISTANCE) { @@ -3211,12 +3951,12 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, } else if (slotPosition & SLOTP_TWO_HAND) { ret = RETURNVALUE_CANNOTBEDRESSED; } else if (inventory[CONST_SLOT_LEFT]) { - std::shared_ptr<Item> leftItem = inventory[CONST_SLOT_LEFT]; - WeaponType_t type = item->getWeaponType(), leftType = leftItem->getWeaponType(); - - if (leftItem->getSlotPosition() & SLOTP_TWO_HAND) { + const auto &leftItem = inventory[CONST_SLOT_LEFT]; + const WeaponType_t type = item->getWeaponType(); + const WeaponType_t leftType = leftItem ? leftItem->getWeaponType() : WEAPON_NONE; + if (leftItem && leftItem->getSlotPosition() & SLOTP_TWO_HAND) { ret = RETURNVALUE_DROPTWOHANDEDITEM; - } else if (item == leftItem && count == item->getItemCount()) { + } else if (leftItem && item == leftItem && count == item->getItemCount()) { ret = RETURNVALUE_NOERROR; } else if (leftType == WEAPON_SHIELD && type == WEAPON_SHIELD) { ret = RETURNVALUE_CANONLYUSEONESHIELD; @@ -3236,7 +3976,7 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, ret = RETURNVALUE_CANNOTBEDRESSED; } else if (slotPosition & SLOTP_TWO_HAND) { if (inventory[CONST_SLOT_RIGHT]) { - WeaponType_t type = item->getWeaponType(); + const WeaponType_t type = item->getWeaponType(); // Allow equip bow when quiver is in SLOT_RIGHT if (type == WEAPON_DISTANCE && inventory[CONST_SLOT_RIGHT]->isQuiver()) { ret = RETURNVALUE_NOERROR; @@ -3247,19 +3987,20 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, ret = RETURNVALUE_NOERROR; } } else if (slotPosition & SLOTP_LEFT) { - WeaponType_t type = item->getWeaponType(); + const WeaponType_t type = item->getWeaponType(); if (type == WEAPON_NONE || type == WEAPON_SHIELD || type == WEAPON_AMMO) { ret = RETURNVALUE_CANNOTBEDRESSED; } else { ret = RETURNVALUE_NOERROR; } } else if (inventory[CONST_SLOT_RIGHT]) { - std::shared_ptr<Item> rightItem = inventory[CONST_SLOT_RIGHT]; - WeaponType_t type = item->getWeaponType(), rightType = rightItem->getWeaponType(); + const auto &rightItem = inventory[CONST_SLOT_RIGHT]; + const WeaponType_t type = item->getWeaponType(); + const WeaponType_t rightType = rightItem ? rightItem->getWeaponType() : WEAPON_NONE; - if (rightItem->getSlotPosition() & SLOTP_TWO_HAND) { + if (rightItem && rightItem->getSlotPosition() & SLOTP_TWO_HAND) { ret = RETURNVALUE_DROPTWOHANDEDITEM; - } else if (item == rightItem && count == item->getItemCount()) { + } else if (rightItem && item == rightItem && count == item->getItemCount()) { ret = RETURNVALUE_NOERROR; } else if (rightType == WEAPON_SHIELD && type == WEAPON_SHIELD) { ret = RETURNVALUE_CANONLYUSEONESHIELD; @@ -3318,7 +4059,7 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, if (ret == RETURNVALUE_NOERROR || ret == RETURNVALUE_NOTENOUGHROOM) { // need an exchange with source? - std::shared_ptr<Item> inventoryItem = getInventoryItem(static_cast<Slots_t>(index)); + const auto &inventoryItem = getInventoryItem(static_cast<Slots_t>(index)); if (inventoryItem && (!inventoryItem->isStackable() || inventoryItem->getID() != item->getID())) { return RETURNVALUE_NEEDEXCHANGE; } @@ -3337,7 +4078,7 @@ ReturnValue Player::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, } ReturnValue Player::queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) { - auto item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { maxQueryCount = 0; return RETURNVALUE_NOTPOSSIBLE; @@ -3346,23 +4087,23 @@ ReturnValue Player::queryMaxCount(int32_t index, const std::shared_ptr<Thing> &t if (index == INDEX_WHEREEVER) { uint32_t n = 0; for (int32_t slotIndex = CONST_SLOT_FIRST; slotIndex <= CONST_SLOT_LAST; ++slotIndex) { - std::shared_ptr<Item> inventoryItem = inventory[slotIndex]; + const auto &inventoryItem = inventory[slotIndex]; if (inventoryItem) { - if (std::shared_ptr<Container> subContainer = inventoryItem->getContainer()) { + if (const auto &subContainer = inventoryItem->getContainer()) { uint32_t queryCount = 0; subContainer->queryMaxCount(INDEX_WHEREEVER, item, item->getItemCount(), queryCount, flags); n += queryCount; // iterate through all items, including sub-containers (deep search) for (ContainerIterator it = subContainer->iterator(); it.hasNext(); it.advance()) { - if (std::shared_ptr<Container> tmpContainer = (*it)->getContainer()) { + if (const auto &tmpContainer = (*it)->getContainer()) { queryCount = 0; tmpContainer->queryMaxCount(INDEX_WHEREEVER, item, item->getItemCount(), queryCount, flags); n += queryCount; } } } else if (inventoryItem->isStackable() && item->equals(inventoryItem) && inventoryItem->getItemCount() < inventoryItem->getStackSize()) { - uint32_t remainder = (inventoryItem->getStackSize() - inventoryItem->getItemCount()); + const uint32_t remainder = (inventoryItem->getStackSize() - inventoryItem->getItemCount()); if (queryAdd(slotIndex, item, remainder, flags) == RETURNVALUE_NOERROR) { n += remainder; @@ -3381,7 +4122,7 @@ ReturnValue Player::queryMaxCount(int32_t index, const std::shared_ptr<Thing> &t } else { std::shared_ptr<Item> destItem = nullptr; - std::shared_ptr<Thing> destThing = getThing(index); + const auto &destThing = getThing(index); if (destThing) { destItem = destThing->getItem(); } @@ -3405,18 +4146,17 @@ ReturnValue Player::queryMaxCount(int32_t index, const std::shared_ptr<Thing> &t if (maxQueryCount < count) { return RETURNVALUE_NOTENOUGHROOM; - } else { - return RETURNVALUE_NOERROR; } + return RETURNVALUE_NOERROR; } -ReturnValue Player::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> /*= nullptr*/) { - int32_t index = getThingIndex(thing); +ReturnValue Player::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> & /*= nullptr */) { + const int32_t index = getThingIndex(thing); if (index == -1) { return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return RETURNVALUE_NOTPOSSIBLE; } @@ -3432,17 +4172,17 @@ ReturnValue Player::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t co return RETURNVALUE_NOERROR; } -std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) { +std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) { if (index == 0 /*drop to capacity window*/ || index == INDEX_WHEREEVER) { - *destItem = nullptr; + destItem = nullptr; - std::shared_ptr<Item> item = thing->getItem(); - if (item == nullptr) { + const auto &item = thing->getItem(); + if (!item) { return getPlayer(); } - bool autoStack = !((flags & FLAG_IGNOREAUTOSTACK) == FLAG_IGNOREAUTOSTACK); - bool isStackable = item->isStackable(); + const bool autoStack = !(flags & FLAG_IGNOREAUTOSTACK); + const bool isStackable = item->isStackable(); std::vector<std::shared_ptr<Container>> containers; @@ -3462,20 +4202,20 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh if (queryAdd(slotIndex, item, item->getItemCount(), 0) == RETURNVALUE_NOERROR) { if (inventoryItem->equals(item) && inventoryItem->getItemCount() < inventoryItem->getStackSize()) { index = slotIndex; - *destItem = inventoryItem; + destItem = inventoryItem; return getPlayer(); } } - if (std::shared_ptr<Container> subContainer = inventoryItem->getContainer()) { + if (const auto &subContainer = inventoryItem->getContainer()) { containers.push_back(subContainer); } - } else if (std::shared_ptr<Container> subContainer = inventoryItem->getContainer()) { + } else if (const auto &subContainer = inventoryItem->getContainer()) { containers.push_back(subContainer); } } else if (queryAdd(slotIndex, item, item->getItemCount(), flags) == RETURNVALUE_NOERROR) { // empty slot index = slotIndex; - *destItem = nullptr; + destItem = nullptr; return getPlayer(); } } @@ -3489,15 +4229,15 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh while (n) { if (tmpContainer->queryAdd(tmpContainer->capacity() - n, item, item->getItemCount(), flags) == RETURNVALUE_NOERROR) { index = tmpContainer->capacity() - n; - *destItem = nullptr; + destItem = nullptr; return tmpContainer; } n--; } - for (const std::shared_ptr<Item> &tmpContainerItem : tmpContainer->getItemList()) { - if (std::shared_ptr<Container> subContainer = tmpContainerItem->getContainer()) { + for (const auto &tmpContainerItem : tmpContainer->getItemList()) { + if (const auto &subContainer = tmpContainerItem->getContainer()) { containers.push_back(subContainer); } } @@ -3519,11 +4259,11 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh // try find an already existing item to stack with if (tmpItem->equals(item) && tmpItem->getItemCount() < tmpItem->getStackSize()) { index = n; - *destItem = tmpItem; + destItem = tmpItem; return tmpContainer; } - if (std::shared_ptr<Container> subContainer = tmpItem->getContainer()) { + if (const auto &subContainer = tmpItem->getContainer()) { containers.push_back(subContainer); } @@ -3532,7 +4272,7 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh if (n < tmpContainer->capacity() && tmpContainer->queryAdd(n, item, item->getItemCount(), flags) == RETURNVALUE_NOERROR) { index = n; - *destItem = nullptr; + destItem = nullptr; return tmpContainer; } } @@ -3542,11 +4282,11 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh std::shared_ptr<Thing> destThing = getThing(index); if (destThing) { - *destItem = destThing->getItem(); + destItem = destThing->getItem(); } std::shared_ptr<Item> item = thing->getItem(); - bool movingAmmoToQuiver = item && *destItem && (*destItem)->isQuiver() && item->isAmmo(); + bool movingAmmoToQuiver = item && destItem && destItem->isQuiver() && item->isAmmo(); // force shield any slot right to player cylinder if (index == CONST_SLOT_RIGHT && !movingAmmoToQuiver) { return getPlayer(); @@ -3555,14 +4295,14 @@ std::shared_ptr<Cylinder> Player::queryDestination(int32_t &index, const std::sh std::shared_ptr<Cylinder> subCylinder = std::dynamic_pointer_cast<Cylinder>(destThing); if (subCylinder) { index = INDEX_WHEREEVER; - *destItem = nullptr; + destItem = nullptr; return subCylinder; } else { return getPlayer(); } } -void Player::addThing(int32_t index, std::shared_ptr<Thing> thing) { +void Player::addThing(int32_t index, const std::shared_ptr<Thing> &thing) { if (!thing) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -3571,7 +4311,7 @@ void Player::addThing(int32_t index, std::shared_ptr<Thing> thing) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -3583,13 +4323,13 @@ void Player::addThing(int32_t index, std::shared_ptr<Thing> thing) { sendInventoryItem(static_cast<Slots_t>(index), item); } -void Player::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) { +void Player::updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) { int32_t index = getThingIndex(thing); if (index == -1) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -3604,17 +4344,17 @@ void Player::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t onUpdateInventoryItem(item, item); } -void Player::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { +void Player::replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) { if (index > CONST_SLOT_LAST) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> oldItem = getInventoryItem(static_cast<Slots_t>(index)); + const auto &oldItem = getInventoryItem(static_cast<Slots_t>(index)); if (!oldItem) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -3630,8 +4370,8 @@ void Player::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { inventory[index] = item; } -void Player::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { - std::shared_ptr<Item> item = thing->getItem(); +void Player::removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) { + const auto &item = thing->getItem(); if (!item) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -3652,7 +4392,7 @@ void Player::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { item->resetParent(); inventory[index] = nullptr; } else { - uint8_t newCount = static_cast<uint8_t>(std::max<int32_t>(0, item->getItemCount() - count)); + const auto newCount = static_cast<uint8_t>(std::max<int32_t>(0, item->getItemCount() - count)); item->setItemCount(newCount); // send change to client @@ -3673,7 +4413,7 @@ void Player::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { } } -int32_t Player::getThingIndex(std::shared_ptr<Thing> thing) const { +int32_t Player::getThingIndex(const std::shared_ptr<Thing> &thing) const { for (uint8_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { if (inventory[i] == thing) { return i; @@ -3693,7 +4433,7 @@ size_t Player::getLastIndex() const { uint32_t Player::getItemTypeCount(uint16_t itemId, int32_t subType /*= -1*/) const { uint32_t count = 0; for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; i++) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } @@ -3702,7 +4442,7 @@ uint32_t Player::getItemTypeCount(uint16_t itemId, int32_t subType /*= -1*/) con count += Item::countByType(item, subType); } - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const auto &container = item->getContainer()) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { if ((*it)->getID() == itemId) { count += Item::countByType(*it, subType); @@ -3713,21 +4453,25 @@ uint32_t Player::getItemTypeCount(uint16_t itemId, int32_t subType /*= -1*/) con return count; } -void Player::stashContainer(StashContainerList itemDict) { +void Player::stashContainer(const StashContainerList &itemDict) { StashItemList stashItemDict; // ItemID - Count - for (const auto &it_dict : itemDict) { - stashItemDict[(it_dict.first)->getID()] = it_dict.second; + for (const auto &[item, itemCount] : itemDict) { + if (!item) { + continue; + } + + stashItemDict[item->getID()] = itemCount; } - for (auto it : stashItems) { - if (!stashItemDict[it.first]) { - stashItemDict[it.first] = it.second; + for (const auto &[itemId, itemCount] : stashItems) { + if (!stashItemDict[itemId]) { + stashItemDict[itemId] = itemCount; } else { - stashItemDict[it.first] += it.second; + stashItemDict[itemId] += itemCount; } } - if (getStashSize(stashItemDict) > g_configManager().getNumber(STASH_ITEMS, __FUNCTION__)) { + if (getStashSize(stashItemDict) > g_configManager().getNumber(STASH_ITEMS)) { sendCancelMessage("You don't have capacity in the Supply Stash to stow all this item->"); return; } @@ -3735,11 +4479,14 @@ void Player::stashContainer(StashContainerList itemDict) { uint32_t totalStowed = 0; std::ostringstream retString; uint16_t refreshDepotSearchOnItem = 0; - for (const auto &stashIterator : itemDict) { - uint16_t iteratorCID = (stashIterator.first)->getID(); - if (g_game().internalRemoveItem(stashIterator.first, stashIterator.second) == RETURNVALUE_NOERROR) { - addItemOnStash(iteratorCID, stashIterator.second); - totalStowed += stashIterator.second; + for (const auto &[item, itemCount] : itemDict) { + if (!item) { + continue; + } + const uint16_t iteratorCID = item->getID(); + if (g_game().internalRemoveItem(item, itemCount) == RETURNVALUE_NOERROR) { + addItemOnStash(iteratorCID, itemCount); + totalStowed += itemCount; if (isDepotSearchOpenOnItem(iteratorCID)) { refreshDepotSearchOnItem = iteratorCID; } @@ -3764,7 +4511,7 @@ void Player::stashContainer(StashContainerList itemDict) { } } -bool Player::removeItemOfType(uint16_t itemId, uint32_t amount, int32_t subType, bool ignoreEquipped /* = false*/) { +bool Player::removeItemOfType(uint16_t itemId, uint32_t amount, int32_t subType, bool ignoreEquipped /* = false*/) const { if (amount == 0) { return true; } @@ -3773,41 +4520,41 @@ bool Player::removeItemOfType(uint16_t itemId, uint32_t amount, int32_t subType, uint32_t count = 0; for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; i++) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } if (!ignoreEquipped && item->getID() == itemId) { - uint32_t itemCount = Item::countByType(item, subType); + const uint32_t itemCount = Item::countByType(item, subType); if (itemCount == 0) { continue; } - itemList.push_back(item); + itemList.emplace_back(item); count += itemCount; if (count >= amount) { - g_game().internalRemoveItems(std::move(itemList), amount, Item::items[itemId].stackable); + g_game().internalRemoveItems(itemList, amount, Item::items[itemId].stackable); return true; } - } else if (std::shared_ptr<Container> container = item->getContainer()) { + } else if (const auto &container = item->getContainer()) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> containerItem = *it; + const auto &containerItem = *it; if (containerItem->getID() == itemId) { - uint32_t itemCount = Item::countByType(containerItem, subType); + const uint32_t itemCount = Item::countByType(containerItem, subType); if (itemCount == 0) { continue; } - itemList.push_back(containerItem); + itemList.emplace_back(containerItem); count += itemCount; - auto stackable = Item::items[itemId].stackable; + const auto stackable = Item::items[itemId].stackable; // If the amount of items in the backpack is equal to or greater than the amount // It will remove items and stop the iteration if (count >= amount) { - g_game().internalRemoveItems(std::move(itemList), amount, stackable); + g_game().internalRemoveItems(itemList, amount, stackable); return true; } } @@ -3831,7 +4578,7 @@ bool Player::hasItemCountById(uint16_t itemId, uint32_t itemAmount, bool checkSt // Check items from stash for (StashItemList stashToSend = getStashItems(); - auto [stashItemId, itemCount] : stashToSend) { + const auto &[stashItemId, itemCount] : stashToSend) { if (!checkStash) { break; } @@ -3876,10 +4623,84 @@ bool Player::removeItemCountById(uint16_t itemId, uint32_t itemAmount, bool remo return false; } +void Player::addItemOnStash(uint16_t itemId, uint32_t amount) { + const auto it = stashItems.find(itemId); + if (it != stashItems.end()) { + stashItems[itemId] += amount; + return; + } + + stashItems[itemId] = amount; +} + +uint32_t Player::getStashItemCount(uint16_t itemId) const { + const auto it = stashItems.find(itemId); + if (it != stashItems.end()) { + return it->second; + } + return 0; +} + +bool Player::withdrawItem(uint16_t itemId, uint32_t amount) { + const auto it = stashItems.find(itemId); + if (it != stashItems.end()) { + if (it->second > amount) { + stashItems[itemId] -= amount; + } else if (it->second == amount) { + stashItems.erase(itemId); + } else { + return false; + } + return true; + } + return false; +} + +StashItemList Player::getStashItems() const { + return stashItems; +} + +uint32_t Player::getBaseCapacity() const { + if (hasFlag(PlayerFlags_t::CannotPickupItem)) { + return 0; + } + if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { + return std::numeric_limits<uint32_t>::max(); + } + return capacity; +} + +uint32_t Player::getCapacity() const { + if (hasFlag(PlayerFlags_t::CannotPickupItem)) { + return 0; + } + if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { + return std::numeric_limits<uint32_t>::max(); + } + return capacity + bonusCapacity + varStats[STAT_CAPACITY] + (m_wheelPlayer->getStat(WheelStat_t::CAPACITY) * 100); +} + +uint32_t Player::getBonusCapacity() const { + if (hasFlag(PlayerFlags_t::CannotPickupItem) || hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { + return std::numeric_limits<uint32_t>::max(); + } + return bonusCapacity; +} + +uint32_t Player::getFreeCapacity() const { + if (hasFlag(PlayerFlags_t::CannotPickupItem)) { + return 0; + } else if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { + return std::numeric_limits<uint32_t>::max(); + } else { + return std::max<int32_t>(0, getCapacity() - inventoryWeight); + } +} + ItemsTierCountList Player::getInventoryItemsId(bool ignoreStoreInbox /* false */) const { ItemsTierCountList itemMap; for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; i++) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } @@ -3901,23 +4722,208 @@ ItemsTierCountList Player::getInventoryItemsId(bool ignoreStoreInbox /* false */ return itemMap; } +/******************************************************************************* + * Hazard system + ******************************************************************************/ +// Parser + +void Player::parseAttackRecvHazardSystem(CombatDamage &damage, const std::shared_ptr<Monster> &monster) { + if (!monster || !monster->getHazard()) { + return; + } + + if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM)) { + return; + } + + if (damage.primary.type == COMBAT_HEALING) { + return; + } + + auto points = getHazardSystemPoints(); + if (m_party) { + for (const auto &partyMember : m_party->getMembers()) { + if (partyMember && partyMember->getHazardSystemPoints() < points) { + points = partyMember->getHazardSystemPoints(); + } + } + + if (m_party->getLeader() && m_party->getLeader()->getHazardSystemPoints() < points) { + points = m_party->getLeader()->getHazardSystemPoints(); + } + } + + if (points == 0) { + return; + } + + uint16_t stage = 0; + auto chance = static_cast<uint16_t>(normal_random(1, 10000)); + auto critChance = g_configManager().getNumber(HAZARD_CRITICAL_CHANCE); + // Critical chance + if (monster->getHazardSystemCrit() && (lastHazardSystemCriticalHit + g_configManager().getNumber(HAZARD_CRITICAL_INTERVAL)) <= OTSYS_TIME() && chance <= critChance && !damage.critical) { + damage.critical = true; + damage.extension = true; + damage.exString = "(Hazard)"; + + stage = (points - 1) * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_CRITICAL_MULTIPLIER)); + damage.primary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * (5000 + stage)) / 10000)); + damage.secondary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * (5000 + stage)) / 10000)); + lastHazardSystemCriticalHit = OTSYS_TIME(); + } + + // To prevent from punish the player twice with critical + damage boost, just uncomment code from the if + if (monster->getHazardSystemDamageBoost() /* && !damage.critical*/) { + stage = points * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_DAMAGE_MULTIPLIER)); + if (stage != 0) { + damage.extension = true; + damage.exString = "(Hazard)"; + damage.primary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * stage) / 10000)); + if (damage.secondary.value != 0) { + damage.secondary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * stage) / 10000)); + } + } + } +} + +void Player::parseAttackDealtHazardSystem(CombatDamage &damage, const std::shared_ptr<Monster> &monster) const { + if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM)) { + return; + } + + if (!monster || !monster->getHazard()) { + return; + } + + if (damage.primary.type == COMBAT_HEALING) { + return; + } + + auto points = getHazardSystemPoints(); + if (m_party) { + for (const auto &partyMember : m_party->getMembers()) { + if (partyMember && partyMember->getHazardSystemPoints() < points) { + points = partyMember->getHazardSystemPoints(); + } + } + + if (m_party->getLeader() && m_party->getLeader()->getHazardSystemPoints() < points) { + points = m_party->getLeader()->getHazardSystemPoints(); + } + } + + if (points == 0) { + return; + } + + // Dodge chance + uint16_t stage; + if (monster->getHazardSystemDodge()) { + stage = points * g_configManager().getNumber(HAZARD_DODGE_MULTIPLIER); + auto chance = static_cast<uint16_t>(normal_random(1, 10000)); + if (chance <= stage) { + damage.primary.value = 0; + damage.secondary.value = 0; + return; + } + } + if (monster->getHazardSystemDefenseBoost()) { + stage = points * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_DEFENSE_MULTIPLIER)); + if (stage != 0) { + damage.exString = fmt::format("(hazard -{}%)", stage / 100.); + damage.primary.value -= static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * stage) / 10000)); + if (damage.secondary.value != 0) { + damage.secondary.value -= static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * stage) / 10000)); + } + } + } +} + +// Points get: +// Points increase: +void Player::setHazardSystemPoints(int32_t count) { + if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM)) { + return; + } + addStorageValue(STORAGEVALUE_HAZARDCOUNT, std::max<int32_t>(0, std::min<int32_t>(0xFFFF, count)), true); + reloadHazardSystemPointsCounter = true; + if (count > 0) { + setIcon("hazard", CreatureIcon(CreatureIconQuests_t::Hazard, count)); + } else { + removeIcon("hazard"); + } +} + +uint16_t Player::getHazardSystemPoints() const { + const int32_t points = getStorageValue(STORAGEVALUE_HAZARDCOUNT); + if (points <= 0) { + return 0; + } + return static_cast<uint16_t>(std::max<int32_t>(0, std::min<int32_t>(0xFFFF, points))); +} + +// Concoction system + +void Player::updateConcoction(uint16_t itemId, uint16_t timeLeft) { + if (timeLeft == 0) { + activeConcoctions.erase(itemId); + } else { + activeConcoctions[itemId] = timeLeft; + } +} + +std::map<uint16_t, uint16_t> Player::getActiveConcoctions() const { + return activeConcoctions; +} + +bool Player::isConcoctionActive(Concoction_t concotion) const { + const auto itemId = static_cast<uint16_t>(concotion); + if (!activeConcoctions.contains(itemId)) { + return false; + } + const auto timeLeft = activeConcoctions.at(itemId); + return timeLeft > 0; +} + +bool Player::checkAutoLoot(bool isBoss) const { + if (!g_configManager().getBoolean(AUTOLOOT)) { + return false; + } + if (g_configManager().getBoolean(VIP_SYSTEM_ENABLED) && g_configManager().getBoolean(VIP_AUTOLOOT_VIP_ONLY) && !isVip()) { + return false; + } + + auto featureKV = kv()->scoped("features")->get("autoloot"); + auto value = featureKV.has_value() ? featureKV->getNumber() : 0; + if (value == 2) { + return true; + } else if (value == 1) { + return !isBoss; + } + return false; +} + +QuickLootFilter_t Player::getQuickLootFilter() const { + return quickLootFilter; +} + std::vector<std::shared_ptr<Item>> Player::getInventoryItemsFromId(uint16_t itemId, bool ignore /*= true*/) const { std::vector<std::shared_ptr<Item>> itemVector; for (int i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } if (!ignore && item->getID() == itemId) { - itemVector.push_back(item); + itemVector.emplace_back(item); } - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const auto &container = item->getContainer()) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { - auto containerItem = *it; + const auto &containerItem = *it; if (containerItem->getID() == itemId) { - itemVector.push_back(containerItem); + itemVector.emplace_back(containerItem); } } } @@ -3927,7 +4933,7 @@ std::vector<std::shared_ptr<Item>> Player::getInventoryItemsFromId(uint16_t item } std::array<double_t, COMBAT_COUNT> Player::getFinalDamageReduction() const { - std::array<double_t, COMBAT_COUNT> combatReductionArray; + std::array<double_t, COMBAT_COUNT> combatReductionArray {}; combatReductionArray.fill(0); calculateDamageReductionFromEquipedItems(combatReductionArray); for (int combatTypeIndex = 0; combatTypeIndex < COMBAT_COUNT; combatTypeIndex++) { @@ -3942,14 +4948,14 @@ std::array<double_t, COMBAT_COUNT> Player::getFinalDamageReduction() const { void Player::calculateDamageReductionFromEquipedItems(std::array<double_t, COMBAT_COUNT> &combatReductionArray) const { for (uint8_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { - std::shared_ptr<Item> item = inventory[slot]; + const auto &item = inventory[slot]; if (item) { calculateDamageReductionFromItem(combatReductionArray, item); } } } -void Player::calculateDamageReductionFromItem(std::array<double_t, COMBAT_COUNT> &combatReductionArray, std::shared_ptr<Item> item) const { +void Player::calculateDamageReductionFromItem(std::array<double_t, COMBAT_COUNT> &combatReductionArray, const std::shared_ptr<Item> &item) const { for (uint16_t combatTypeIndex = 0; combatTypeIndex < COMBAT_COUNT; combatTypeIndex++) { updateDamageReductionFromItemImbuement(combatReductionArray, item, combatTypeIndex); updateDamageReductionFromItemAbility(combatReductionArray, item, combatTypeIndex); @@ -3957,12 +4963,12 @@ void Player::calculateDamageReductionFromItem(std::array<double_t, COMBAT_COUNT> } void Player::updateDamageReductionFromItemImbuement( - std::array<double_t, COMBAT_COUNT> &combatReductionArray, std::shared_ptr<Item> item, uint16_t combatTypeIndex + std::array<double_t, COMBAT_COUNT> &combatReductionArray, const std::shared_ptr<Item> &item, uint16_t combatTypeIndex ) const { for (uint8_t imbueSlotId = 0; imbueSlotId < item->getImbuementSlot(); imbueSlotId++) { ImbuementInfo imbuementInfo; if (item->getImbuementInfo(imbueSlotId, &imbuementInfo) && imbuementInfo.imbuement) { - int16_t imbuementAbsorption = imbuementInfo.imbuement->absorbPercent[combatTypeIndex]; + const int16_t imbuementAbsorption = imbuementInfo.imbuement->absorbPercent[combatTypeIndex]; if (imbuementAbsorption != 0) { combatReductionArray[combatTypeIndex] = calculateDamageReduction(combatReductionArray[combatTypeIndex], imbuementAbsorption); } @@ -3971,7 +4977,7 @@ void Player::updateDamageReductionFromItemImbuement( } void Player::updateDamageReductionFromItemAbility( - std::array<double_t, COMBAT_COUNT> &combatReductionArray, std::shared_ptr<Item> item, uint16_t combatTypeIndex + std::array<double_t, COMBAT_COUNT> &combatReductionArray, const std::shared_ptr<Item> &item, uint16_t combatTypeIndex ) const { if (!item) { return; @@ -3979,7 +4985,7 @@ void Player::updateDamageReductionFromItemAbility( const ItemType &itemType = Item::items[item->getID()]; if (itemType.abilities) { - int16_t elementReduction = itemType.abilities->absorbPercent[combatTypeIndex]; + const int16_t elementReduction = itemType.abilities->absorbPercent[combatTypeIndex]; if (elementReduction != 0) { combatReductionArray[combatTypeIndex] = calculateDamageReduction(combatReductionArray[combatTypeIndex], elementReduction); } @@ -3995,7 +5001,7 @@ ItemsTierCountList Player::getStoreInboxItemsId() const { const auto &container = getStoreInbox(); if (container) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; + const auto &item = *it; (itemMap[item->getID()])[item->getTier()] += Item::countByType(item, -1); } } @@ -4007,9 +5013,9 @@ ItemsTierCountList Player::getDepotChestItemsId() const { ItemsTierCountList itemMap; for (const auto &[index, depot] : depotChests) { - const std::shared_ptr<Container> &container = depot->getContainer(); + const auto &container = depot->getContainer(); for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; + const auto &item = *it; (itemMap[item->getID()])[item->getTier()] += Item::countByType(item, -1); } } @@ -4020,8 +5026,8 @@ ItemsTierCountList Player::getDepotChestItemsId() const { ItemsTierCountList Player::getDepotInboxItemsId() const { ItemsTierCountList itemMap; - const std::shared_ptr<Inbox> &inbox = getInbox(); - const std::shared_ptr<Container> &container = inbox->getContainer(); + const auto &inbox = getInbox(); + const auto &container = inbox->getContainer(); if (container) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { const auto &item = *it; @@ -4035,22 +5041,22 @@ ItemsTierCountList Player::getDepotInboxItemsId() const { std::vector<std::shared_ptr<Item>> Player::getAllInventoryItems(bool ignoreEquiped /*= false*/, bool ignoreItemWithTier /* false*/) const { std::vector<std::shared_ptr<Item>> itemVector; for (int i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (!item) { continue; } // Only get equiped items if ignored equipped is false if (!ignoreEquiped) { - itemVector.push_back(item); + itemVector.emplace_back(item); } - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const auto &container = item->getContainer()) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { if (ignoreItemWithTier && (*it)->getTier() > 0) { continue; } - itemVector.push_back(*it); + itemVector.emplace_back(*it); } } } @@ -4060,12 +5066,12 @@ std::vector<std::shared_ptr<Item>> Player::getAllInventoryItems(bool ignoreEquip std::vector<std::shared_ptr<Item>> Player::getEquippedAugmentItemsByType(Augment_t augmentType) const { std::vector<std::shared_ptr<Item>> equippedAugmentItemsByType; - const auto equippedAugmentItems = getEquippedItems(); + auto equippedAugmentItems = getEquippedItems(); for (const auto &item : equippedAugmentItems) { - for (auto &augment : item->getAugments()) { + for (const auto &augment : item->getAugments()) { if (augment->type == augmentType) { - equippedAugmentItemsByType.push_back(item); + equippedAugmentItemsByType.emplace_back(item); } } } @@ -4075,20 +5081,20 @@ std::vector<std::shared_ptr<Item>> Player::getEquippedAugmentItemsByType(Augment std::vector<std::shared_ptr<Item>> Player::getEquippedAugmentItems() const { std::vector<std::shared_ptr<Item>> equippedAugmentItems; - const auto equippedItems = getEquippedItems(); + auto equippedItems = getEquippedItems(); for (const auto &item : equippedItems) { - if (item->getAugments().size() < 1) { + if (item->getAugments().empty()) { continue; } - equippedAugmentItems.push_back(item); + equippedAugmentItems.emplace_back(item); } return equippedAugmentItems; } std::vector<std::shared_ptr<Item>> Player::getEquippedItems() const { - std::vector<Slots_t> valid_slots { + static const std::vector valid_slots { CONST_SLOT_HEAD, CONST_SLOT_NECKLACE, CONST_SLOT_BACKPACK, @@ -4102,12 +5108,12 @@ std::vector<std::shared_ptr<Item>> Player::getEquippedItems() const { std::vector<std::shared_ptr<Item>> valid_items; for (const auto &slot : valid_slots) { - std::shared_ptr<Item> item = inventory[slot]; + const auto &item = inventory[slot]; if (!item) { continue; } - valid_items.push_back(item); + valid_items.emplace_back(item); } return valid_items; @@ -4122,6 +5128,18 @@ std::map<uint32_t, uint32_t> &Player::getAllItemTypeCount(std::map<uint32_t, uin std::map<uint16_t, uint16_t> &Player::getAllSaleItemIdAndCount(std::map<uint16_t, uint16_t> &countMap) const { for (const auto &item : getAllInventoryItems(false, true)) { + if (item->getID() != ITEM_GOLD_POUCH) { + if (!item->hasMarketAttributes()) { + continue; + } + + if (const auto &container = item->getContainer()) { + if (!container->empty()) { + continue; + } + } + } + countMap[item->getID()] += item->getItemCount(); } @@ -4130,7 +5148,7 @@ std::map<uint16_t, uint16_t> &Player::getAllSaleItemIdAndCount(std::map<uint16_t void Player::getAllItemTypeCountAndSubtype(std::map<uint32_t, uint32_t> &countMap) const { for (const auto &item : getAllInventoryItems()) { - uint16_t itemId = item->getID(); + const uint16_t itemId = item->getID(); if (Item::items[itemId].isFluidContainer()) { countMap[static_cast<uint32_t>(itemId) | (item->getAttribute<uint32_t>(ItemAttribute_t::FLUIDTYPE)) << 16] += item->getItemCount(); } else { @@ -4139,8 +5157,8 @@ void Player::getAllItemTypeCountAndSubtype(std::map<uint32_t, uint32_t> &countMa } } -std::shared_ptr<Item> Player::getForgeItemFromId(uint16_t itemId, uint8_t tier) { - for (auto item : getAllInventoryItems(true)) { +std::shared_ptr<Item> Player::getForgeItemFromId(uint16_t itemId, uint8_t tier) const { + for (const auto &item : getAllInventoryItems(true)) { if (item->hasImbuements()) { continue; } @@ -4160,174 +5178,80 @@ std::shared_ptr<Thing> Player::getThing(size_t index) const { return nullptr; } -void Player::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link /*= LINK_OWNER*/) { - if (link == LINK_OWNER) { - // calling movement scripts - g_moveEvents().onPlayerEquip(getPlayer(), thing->getItem(), static_cast<Slots_t>(index), false); +// TODO: review this function +bool Player::updateSaleShopList(const std::shared_ptr<Item> &item) { + const uint16_t itemId = item->getID(); + if (!itemId || !item) { + return true; } - bool requireListUpdate = true; - if (link == LINK_OWNER || link == LINK_TOPPARENT) { - std::shared_ptr<Item> i = (oldParent ? oldParent->getItem() : nullptr); - const auto &container = i ? i->getContainer() : nullptr; - if (container) { - requireListUpdate = container->getHoldingPlayer() != getPlayer(); - } else { - requireListUpdate = oldParent != getPlayer(); - } + g_dispatcher().addEvent([creatureId = getID()] { g_game().updatePlayerSaleItems(creatureId); }, __FUNCTION__); + scheduledSaleUpdate = true; + return true; +} - updateInventoryWeight(); - updateItemsLight(); - sendInventoryIds(); - sendStats(); +bool Player::hasShopItemForSale(uint16_t itemId, uint8_t subType) const { + if (!shopOwner) { + return false; } - if (std::shared_ptr<Item> item = thing->getItem()) { - if (std::shared_ptr<Container> container = item->getContainer()) { - onSendContainer(container); - } + const ItemType &itemType = Item::items[itemId]; + const auto &shoplist = shopOwner->getShopItemVector(getGUID()); + return std::ranges::any_of(shoplist, [&](const ShopBlock &shopBlock) { + return shopBlock.itemId == itemId && shopBlock.itemBuyPrice != 0 && (!itemType.isFluidContainer() || shopBlock.itemSubType == subType); + }); +} - if (shopOwner && !scheduledSaleUpdate && requireListUpdate) { - updateSaleShopList(item); - } - } else if (std::shared_ptr<Creature> creature = thing->getCreature()) { - if (creature == getPlayer()) { - // check containers - std::vector<std::shared_ptr<Container>> containers; +void Player::internalAddThing(const std::shared_ptr<Thing> &thing) { + internalAddThing(0, thing); +} - for (const auto &it : openContainers) { - std::shared_ptr<Container> container = it.second.container; - if (container == nullptr) { - continue; - } - - if (!Position::areInRange<1, 1, 0>(container->getPosition(), getPosition())) { - containers.push_back(container); - } - } - - for (const std::shared_ptr<Container> &container : containers) { - autoCloseContainers(container); - } - } - } -} - -void Player::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link /*= LINK_OWNER*/) { - if (link == LINK_OWNER) { - // calling movement scripts - g_moveEvents().onPlayerDeEquip(getPlayer(), thing->getItem(), static_cast<Slots_t>(index)); +void Player::internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) { + if (!thing) { + return; } - bool requireListUpdate = true; - - if (link == LINK_OWNER || link == LINK_TOPPARENT) { - std::shared_ptr<Item> i = (newParent ? newParent->getItem() : nullptr); - const auto &container = i ? i->getContainer() : nullptr; - if (container) { - requireListUpdate = container->getHoldingPlayer() != getPlayer(); - } else { - requireListUpdate = newParent != getPlayer(); - } - - updateInventoryWeight(); - updateItemsLight(); - sendInventoryIds(); - sendStats(); + const auto &item = thing->getItem(); + if (!item) { + return; } - if (std::shared_ptr<Item> item = thing->getItem()) { - if (std::shared_ptr<Container> container = item->getContainer()) { - checkLootContainers(container); - - if (container->isRemoved() || !Position::areInRange<1, 1, 0>(getPosition(), container->getPosition())) { - autoCloseContainers(container); - } else if (container->getTopParent() == getPlayer()) { - onSendContainer(container); - } else if (std::shared_ptr<Container> topContainer = std::dynamic_pointer_cast<Container>(container->getTopParent())) { - if (std::shared_ptr<DepotChest> depotChest = std::dynamic_pointer_cast<DepotChest>(topContainer)) { - bool isOwner = false; - - for (const auto &it : depotChests) { - if (it.second == depotChest) { - isOwner = true; - it.second->stopDecaying(); - onSendContainer(container); - } - } - - if (!isOwner) { - autoCloseContainers(container); - } - } else { - onSendContainer(container); - } - } else { - autoCloseContainers(container); - } - } - - // force list update if item exists tier - if (item->getTier() > 0 && !requireListUpdate) { - requireListUpdate = true; + // index == 0 means we should equip this item at the most appropiate slot (no action required here) + if (index >= CONST_SLOT_FIRST && index <= CONST_SLOT_LAST) { + if (inventory[index]) { + return; } - if (shopOwner && !scheduledSaleUpdate && requireListUpdate) { - updateSaleShopList(item); - } + inventory[index] = item; + item->setParent(static_self_cast<Player>()); } } -// i will keep this function so it can be reviewed -bool Player::updateSaleShopList(std::shared_ptr<Item> item) { - uint16_t itemId = item->getID(); - if (!itemId || !item) { - return true; - } +// safe-trade functions - g_dispatcher().addEvent([creatureId = getID()] { g_game().updatePlayerSaleItems(creatureId); }, "Game::updatePlayerSaleItems"); - scheduledSaleUpdate = true; - return true; +void Player::setTradeState(TradeState_t state) { + tradeState = state; } -bool Player::hasShopItemForSale(uint16_t itemId, uint8_t subType) const { - if (!shopOwner) { - return false; - } - - const ItemType &itemType = Item::items[itemId]; - 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); - }); +TradeState_t Player::getTradeState() const { + return tradeState; } -void Player::internalAddThing(std::shared_ptr<Thing> thing) { - internalAddThing(0, thing); +std::shared_ptr<Item> Player::getTradeItem() { + return tradeItem; } -void Player::internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) { - if (!thing) { - return; - } - - std::shared_ptr<Item> item = thing->getItem(); - if (!item) { - return; - } +// shop functions - // index == 0 means we should equip this item at the most appropiate slot (no action required here) - if (index >= CONST_SLOT_FIRST && index <= CONST_SLOT_LAST) { - if (inventory[index]) { - return; - } +void Player::setShopOwner(std::shared_ptr<Npc> owner) { + shopOwner = std::move(owner); +} - inventory[index] = item; - item->setParent(static_self_cast<Player>()); - } +std::shared_ptr<Npc> Player::getShopOwner() const { + return shopOwner; } -bool Player::setFollowCreature(std::shared_ptr<Creature> creature) { +bool Player::setFollowCreature(const std::shared_ptr<Creature> &creature) { if (!Creature::setFollowCreature(creature)) { setFollowCreature(nullptr); setAttackedCreature(nullptr); @@ -4340,13 +5264,13 @@ bool Player::setFollowCreature(std::shared_ptr<Creature> creature) { return true; } -bool Player::setAttackedCreature(std::shared_ptr<Creature> creature) { +bool Player::setAttackedCreature(const std::shared_ptr<Creature> &creature) { if (!Creature::setAttackedCreature(creature)) { sendCancelTarget(); return false; } - auto followCreature = getFollowCreature(); + const auto &followCreature = getFollowCreature(); if (chaseMode && creature) { if (followCreature != creature) { setFollowCreature(creature); @@ -4356,7 +5280,7 @@ bool Player::setAttackedCreature(std::shared_ptr<Creature> creature) { } if (creature) { - g_dispatcher().addEvent([creatureId = getID()] { g_game().checkCreatureAttack(creatureId); }, "Game::checkCreatureAttack"); + g_dispatcher().addEvent([creatureId = getID()] { g_game().checkCreatureAttack(creatureId); }, __FUNCTION__); } return true; } @@ -4380,64 +5304,10 @@ void Player::getPathSearchParams(const std::shared_ptr<Creature> &creature, Find fpp.fullPathSearch = true; } -void Player::doAttacking(uint32_t) { - if (lastAttack == 0) { - lastAttack = OTSYS_TIME() - getAttackSpeed() - 1; - } - - if (hasCondition(CONDITION_PACIFIED)) { - return; - } - - auto attackedCreature = getAttackedCreature(); - if (!attackedCreature) { - return; - } - - if ((OTSYS_TIME() - lastAttack) >= getAttackSpeed()) { - bool result = false; - - std::shared_ptr<Item> tool = getWeapon(); - const WeaponShared_ptr weapon = g_weapons().getWeapon(tool); - uint32_t delay = getAttackSpeed(); - bool classicSpeed = g_configManager().getBoolean(CLASSIC_ATTACK_SPEED, __FUNCTION__); - - if (weapon) { - if (!weapon->interruptSwing()) { - result = weapon->useWeapon(static_self_cast<Player>(), tool, attackedCreature); - } else if (!classicSpeed && !canDoAction()) { - delay = getNextActionTime(); - } else { - result = weapon->useWeapon(static_self_cast<Player>(), tool, attackedCreature); - } - } else if (hasWeaponDistanceEquipped()) { - return; - } else { - result = Weapon::useFist(static_self_cast<Player>(), attackedCreature); - } - - const auto &task = createPlayerTask( - std::max<uint32_t>(SCHEDULER_MINTICKS, delay), - [playerId = getID()] { g_game().checkCreatureAttack(playerId); }, "Game::checkCreatureAttack" - ); - - if (!classicSpeed) { - setNextActionTask(task, false); - } else { - g_dispatcher().scheduleEvent(task); - } - - if (result) { - updateLastAggressiveAction(); - updateLastAttack(); - } - } -} - -uint64_t Player::getGainedExperience(std::shared_ptr<Creature> attacker) const { - if (g_configManager().getBoolean(EXPERIENCE_FROM_PLAYERS, __FUNCTION__)) { - auto attackerPlayer = attacker->getPlayer(); - if (attackerPlayer && attackerPlayer.get() != this && skillLoss && std::abs(static_cast<int32_t>(attackerPlayer->getLevel() - level)) <= g_configManager().getNumber(EXP_FROM_PLAYERS_LEVEL_RANGE, __FUNCTION__)) { +uint64_t Player::getGainedExperience(const std::shared_ptr<Creature> &attacker) const { + if (g_configManager().getBoolean(EXPERIENCE_FROM_PLAYERS)) { + const auto &attackerPlayer = attacker->getPlayer(); + if (attackerPlayer && attackerPlayer.get() != this && skillLoss && std::abs(static_cast<int32_t>(attackerPlayer->getLevel() - level)) <= g_configManager().getNumber(EXP_FROM_PLAYERS_LEVEL_RANGE)) { return std::max<uint64_t>(0, std::floor(getLostExperience() * getDamageRatio(attacker) * 0.75)); } } @@ -4451,10 +5321,10 @@ void Player::onFollowCreature(const std::shared_ptr<Creature> &creature) { } void Player::setChaseMode(bool mode) { - bool prevChaseMode = chaseMode; + const bool prevChaseMode = chaseMode; chaseMode = mode; - auto attackedCreature = getAttackedCreature(); - auto followCreature = getFollowCreature(); + const auto &attackedCreature = getAttackedCreature(); + const auto &followCreature = getFollowCreature(); if (prevChaseMode != chaseMode) { if (chaseMode) { @@ -4469,6 +5339,22 @@ void Player::setChaseMode(bool mode) { } } +void Player::setFightMode(FightMode_t mode) { + fightMode = mode; +} + +void Player::setSecureMode(bool mode) { + secureMode = mode; +} + +Faction_t Player::getFaction() const { + return faction; +} + +void Player::setFaction(Faction_t factionId) { + faction = factionId; +} + void Player::onWalkAborted() { setNextWalkActionTask(nullptr); sendCancelWalk(); @@ -4483,8 +5369,10 @@ void Player::onWalkComplete() { */ g_logger().debug("[Player::onWalkComplete] Executing feared conditions as players completed it's walk."); - std::shared_ptr<Condition> f = getCondition(CONDITION_FEARED); - f->executeCondition(static_self_cast<Player>(), 0); + const auto &fearedCondition = getCondition(CONDITION_FEARED); + if (fearedCondition) { + fearedCondition->executeCondition(static_self_cast<Player>(), 0); + } } if (walkTask) { @@ -4508,9 +5396,9 @@ void Player::updateItemsLight(bool internal /*=false*/) { LightInfo maxLight; for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; + const auto &item = inventory[i]; if (item) { - LightInfo curLight = item->getLightInfo(); + const auto &curLight = item->getLightInfo(); if (curLight.level > maxLight.level) { maxLight = curLight; @@ -4616,12 +5504,16 @@ void Player::onEndCondition(ConditionType_t type) { sendIcons(); } -void Player::onCombatRemoveCondition(std::shared_ptr<Condition> condition) { +void Player::onCombatRemoveCondition(const std::shared_ptr<Condition> &condition) { + if (!condition) { + return; + } + // Creature::onCombatRemoveCondition(condition); if (condition->getId() > 0) { // Means the condition is from an item, id == slot if (g_game().getWorldType() == WORLD_TYPE_PVP_ENFORCED) { - std::shared_ptr<Item> item = getInventoryItem(static_cast<Slots_t>(condition->getId())); + const auto &item = getInventoryItem(static_cast<Slots_t>(condition->getId())); if (item) { // 25% chance to destroy the item if (25 >= uniform_random(1, 100)) { @@ -4644,9 +5536,13 @@ void Player::onCombatRemoveCondition(std::shared_ptr<Condition> condition) { } } -void Player::onAttackedCreature(std::shared_ptr<Creature> target) { +void Player::onAttackedCreature(const std::shared_ptr<Creature> &target) { Creature::onAttackedCreature(target); + if (!target) { + return; + } + if (target->getZoneType() == ZONE_PVP) { return; } @@ -4660,7 +5556,7 @@ void Player::onAttackedCreature(std::shared_ptr<Creature> target) { return; } - auto targetPlayer = target->getPlayer(); + const auto &targetPlayer = target->getPlayer(); if (targetPlayer && !isPartner(targetPlayer) && !isGuildMate(targetPlayer)) { if (!pzLocked && g_game().getWorldType() == WORLD_TYPE_PVP_ENFORCED) { pzLocked = true; @@ -4718,12 +5614,12 @@ void Player::onPlacedCreature() { sendUnjustifiedPoints(); } -void Player::onAttackedCreatureDrainHealth(std::shared_ptr<Creature> target, int32_t points) { +void Player::onAttackedCreatureDrainHealth(const std::shared_ptr<Creature> &target, int32_t points) { Creature::onAttackedCreatureDrainHealth(target, points); if (target) { if (m_party && !Combat::isPlayerCombat(target)) { - auto tmpMonster = target->getMonster(); + const auto &tmpMonster = target->getMonster(); if (tmpMonster && tmpMonster->isHostile()) { // We have fulfilled a requirement for shared experience m_party->updatePlayerTicks(static_self_cast<Player>(), points); @@ -4732,14 +5628,14 @@ void Player::onAttackedCreatureDrainHealth(std::shared_ptr<Creature> target, int } } -void Player::onTargetCreatureGainHealth(std::shared_ptr<Creature> target, int32_t points) { +void Player::onTargetCreatureGainHealth(const std::shared_ptr<Creature> &target, int32_t points) { if (target && m_party) { std::shared_ptr<Player> tmpPlayer = nullptr; if (isPartner(tmpPlayer) && (tmpPlayer != getPlayer())) { tmpPlayer = target->getPlayer(); - } else if (std::shared_ptr<Creature> targetMaster = target->getMaster()) { - if (std::shared_ptr<Player> targetMasterPlayer = targetMaster->getPlayer()) { + } else if (const auto &targetMaster = target->getMaster()) { + if (const auto &targetMasterPlayer = targetMaster->getPlayer()) { tmpPlayer = targetMasterPlayer; } } @@ -4772,7 +5668,7 @@ bool Player::onKilledPlayer(const std::shared_ptr<Player> &target, bool lastHit) if (lastHit && hasCondition(CONDITION_INFIGHT)) { pzLocked = true; - std::shared_ptr<Condition> condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_INFIGHT, g_configManager().getNumber(WHITE_SKULL_TIME, __FUNCTION__), 0); + const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_INFIGHT, g_configManager().getNumber(WHITE_SKULL_TIME), 0); addCondition(condition); } } @@ -4790,7 +5686,7 @@ void Player::addHuntingTaskKill(const std::shared_ptr<MonsterType> &mType) { taskSlot->currentKills += 1; if ((taskSlot->upgrade && taskSlot->currentKills >= option->secondKills) || (!taskSlot->upgrade && taskSlot->currentKills >= option->firstKills)) { taskSlot->state = PreyTaskDataState_Completed; - std::string message = "You succesfully finished your hunting task. Your reward is ready to be claimed!"; + const std::string message = "You succesfully finished your hunting task. Your reward is ready to be claimed!"; sendTextMessage(MESSAGE_STATUS, message); } reloadTaskSlot(taskSlot->id); @@ -4801,7 +5697,7 @@ void Player::addBestiaryKill(const std::shared_ptr<MonsterType> &mType) { if (mType->isBoss()) { return; } - uint32_t kills = g_configManager().getNumber(BESTIARY_KILL_MULTIPLIER, __FUNCTION__); + uint32_t kills = g_configManager().getNumber(BESTIARY_KILL_MULTIPLIER); if (isConcoctionActive(Concoction_t::BestiaryBetterment)) { kills *= 2; } @@ -4812,9 +5708,9 @@ void Player::addBosstiaryKill(const std::shared_ptr<MonsterType> &mType) { if (!mType->isBoss()) { return; } - uint32_t kills = g_configManager().getNumber(BOSSTIARY_KILL_MULTIPLIER, __FUNCTION__); + uint32_t kills = g_configManager().getNumber(BOSSTIARY_KILL_MULTIPLIER); if (g_ioBosstiary().getBoostedBossId() == mType->info.raceid) { - kills *= g_configManager().getNumber(BOOSTED_BOSS_KILL_BONUS, __FUNCTION__); + kills *= g_configManager().getNumber(BOOSTED_BOSS_KILL_BONUS); } g_ioBosstiary().addBosstiaryKill(getPlayer(), mType, kills); } @@ -4826,14 +5722,18 @@ bool Player::onKilledMonster(const std::shared_ptr<Monster> &monster) { if (monster->hasBeenSummoned()) { return false; } - auto mType = monster->getMonsterType(); + const auto &mType = monster->getMonsterType(); + if (mType == nullptr) { + g_logger().error("[{}] Monster type is null.", __FUNCTION__); + return false; + } addHuntingTaskKill(mType); addBestiaryKill(mType); addBosstiaryKill(mType); return false; } -void Player::gainExperience(uint64_t gainExp, std::shared_ptr<Creature> target) { +void Player::gainExperience(uint64_t gainExp, const std::shared_ptr<Creature> &target) { if (hasFlag(PlayerFlags_t::NotGainExperience) || gainExp == 0 || staminaMinutes == 0) { return; } @@ -4841,7 +5741,7 @@ void Player::gainExperience(uint64_t gainExp, std::shared_ptr<Creature> target) addExperience(target, gainExp, true); } -void Player::onGainExperience(uint64_t gainExp, std::shared_ptr<Creature> target) { +void Player::onGainExperience(uint64_t gainExp, const std::shared_ptr<Creature> &target) { if (hasFlag(PlayerFlags_t::NotGainExperience)) { return; } @@ -4856,7 +5756,7 @@ void Player::onGainExperience(uint64_t gainExp, std::shared_ptr<Creature> target gainExperience(gainExp, target); } -void Player::onGainSharedExperience(uint64_t gainExp, std::shared_ptr<Creature> target) { +void Player::onGainSharedExperience(uint64_t gainExp, const std::shared_ptr<Creature> &target) { gainExperience(gainExp, target); } @@ -4879,7 +5779,7 @@ bool Player::isAttackable() const { return !hasFlag(PlayerFlags_t::CannotBeAttacked); } -bool Player::lastHitIsPlayer(std::shared_ptr<Creature> lastHitCreature) { +bool Player::lastHitIsPlayer(const std::shared_ptr<Creature> &lastHitCreature) { if (!lastHitCreature) { return false; } @@ -4888,7 +5788,7 @@ bool Player::lastHitIsPlayer(std::shared_ptr<Creature> lastHitCreature) { return true; } - std::shared_ptr<Creature> lastHitMaster = lastHitCreature->getMaster(); + const auto &lastHitMaster = lastHitCreature->getMaster(); return lastHitMaster && lastHitMaster->getPlayer(); } @@ -4907,7 +5807,7 @@ void Player::changeMana(int32_t manaChange) { void Player::changeSoul(int32_t soulChange) { if (soulChange > 0) { - soul += std::min<int32_t>(soulChange * g_configManager().getFloat(RATE_SOUL_REGEN, __FUNCTION__), vocation->getSoulMax() - soul); + soul += std::min<int32_t>(soulChange * g_configManager().getFloat(RATE_SOUL_REGEN), vocation->getSoulMax() - soul); } else { soul = std::max<int32_t>(0, soul + soulChange); } @@ -4916,7 +5816,7 @@ void Player::changeSoul(int32_t soulChange) { } bool Player::canWear(uint16_t lookType, uint8_t addons) const { - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && lookType != 0 && !g_game().isLookTypeRegistered(lookType)) { g_logger().warn("[Player::canWear] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", lookType); return false; } @@ -4938,7 +5838,7 @@ bool Player::canWear(uint16_t lookType, uint8_t addons) const { return true; } - for (const OutfitEntry &outfitEntry : outfits) { + for (const auto &outfitEntry : outfits) { if (outfitEntry.lookType != lookType) { continue; } @@ -4947,42 +5847,39 @@ bool Player::canWear(uint16_t lookType, uint8_t addons) const { return false; } -bool Player::canLogout() { - if (isConnecting) { - return false; - } - - auto tile = getTile(); - if (!tile) { - return false; - } - - if (tile->hasFlag(TILESTATE_NOLOGOUT)) { - return false; - } - - if (tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - return true; - } - - return !isPzLocked() && !hasCondition(CONDITION_INFIGHT); -} - void Player::genReservedStorageRange() { // generate outfits range uint32_t outfits_key = PSTRG_OUTFITS_RANGE_START; - for (const OutfitEntry &entry : outfits) { + for (const auto &entry : outfits) { storageMap[++outfits_key] = (entry.lookType << 16) | entry.addons; } // generate familiars range uint32_t familiar_key = PSTRG_FAMILIARS_RANGE_START; - for (const FamiliarEntry &entry : familiars) { + for (const auto &entry : familiars) { storageMap[++familiar_key] = (entry.lookType << 16); } } +void Player::setSpecialMenuAvailable(bool supplyStashBool, bool marketMenuBool, bool depotSearchBool) { + // Closing depot search when player have special container disabled and it's still open. + if (isDepotSearchOpen() && !depotSearchBool && depotSearch) { + depotSearchOnItem = { 0, 0 }; + sendCloseDepotSearch(); + } + + // Menu option 'stow, stow container ...' + // Menu option 'show in market' + // Menu option to open depot search + supplyStash = supplyStashBool; + marketMenu = marketMenuBool; + depotSearch = depotSearchBool; + if (client) { + client->sendSpecialContainersAvailable(); + } +} + void Player::addOutfit(uint16_t lookType, uint8_t addons) { - for (OutfitEntry &outfitEntry : outfits) { + for (auto &outfitEntry : outfits) { if (outfitEntry.lookType == lookType) { outfitEntry.addons |= addons; return; @@ -4993,7 +5890,7 @@ void Player::addOutfit(uint16_t lookType, uint8_t addons) { bool Player::removeOutfit(uint16_t lookType) { for (auto it = outfits.begin(), end = outfits.end(); it != end; ++it) { - OutfitEntry &entry = *it; + const auto &entry = *it; if (entry.lookType == lookType) { outfits.erase(it); return true; @@ -5057,32 +5954,29 @@ bool Player::canFamiliar(uint16_t lookType) const { return true; } - for (const FamiliarEntry &familiarEntry : familiars) { - if (familiarEntry.lookType == lookType) { - return true; - } + if (std::ranges::any_of(familiars, [&](const FamiliarEntry &familiarEntry) { + return familiarEntry.lookType == lookType; + })) { + return true; } + return false; } void Player::addFamiliar(uint16_t lookType) { - for (FamiliarEntry &familiarEntry : familiars) { - if (familiarEntry.lookType == lookType) { - return; - } + if (std::ranges::none_of(familiars, [&](const FamiliarEntry &familiarEntry) { + return familiarEntry.lookType == lookType; + })) { + familiars.emplace_back(lookType); } - familiars.emplace_back(lookType); } bool Player::removeFamiliar(uint16_t lookType) { - for (auto it = familiars.begin(), end = familiars.end(); it != end; ++it) { - FamiliarEntry &entry = *it; - if (entry.lookType == lookType) { - familiars.erase(it); - return true; - } - } - return false; + const auto initialSize = familiars.size(); + std::erase_if(familiars, [lookType](const FamiliarEntry &entry) { + return entry.lookType == lookType; + }); + return familiars.size() != initialSize; } bool Player::getFamiliar(const std::shared_ptr<Familiar> &familiar) const { @@ -5094,11 +5988,9 @@ bool Player::getFamiliar(const std::shared_ptr<Familiar> &familiar) const { return false; } - for (const FamiliarEntry &familiarEntry : familiars) { - if (familiarEntry.lookType != familiar->lookType) { - continue; - } - + if (std::ranges::any_of(familiars, [&](const FamiliarEntry &familiarEntry) { + return familiarEntry.lookType == familiar->lookType; + })) { return true; } @@ -5109,62 +6001,156 @@ bool Player::getFamiliar(const std::shared_ptr<Familiar> &familiar) const { return true; } -void Player::setSex(PlayerSex_t newSex) { - sex = newSex; +void Player::setFamiliarLooktype(uint16_t familiarLooktype) { + this->defaultOutfit.lookFamiliarsType = familiarLooktype; } -void Player::setPronoun(PlayerPronoun_t newPronoun) { - pronoun = newPronoun; -} +bool Player::canLogout() { + if (isConnecting) { + return false; + } -Skulls_t Player::getSkull() const { - if (hasFlag(PlayerFlags_t::NotGainInFight)) { - return SKULL_NONE; + const auto &tile = getTile(); + if (!tile) { + return false; } - return skull; -} -Skulls_t Player::getSkullClient(std::shared_ptr<Creature> creature) { - if (!creature || g_game().getWorldType() != WORLD_TYPE_PVP) { - return SKULL_NONE; + if (tile->hasFlag(TILESTATE_NOLOGOUT)) { + return false; } - std::shared_ptr<Player> player = creature->getPlayer(); - if (player && player->getSkull() == SKULL_NONE) { - if (player.get() == this) { - for (const auto &kill : unjustifiedKills) { - if (kill.unavenged && (time(nullptr) - kill.time) < g_configManager().getNumber(ORANGE_SKULL_DURATION, __FUNCTION__) * 24 * 60 * 60) { - return SKULL_ORANGE; - } - } - } + if (tile->hasFlag(TILESTATE_PROTECTIONZONE)) { + return true; + } - if (player->hasKilled(getPlayer())) { - return SKULL_ORANGE; - } + return !isPzLocked() && !hasCondition(CONDITION_INFIGHT); +} - if (player->hasAttacked(getPlayer())) { - return SKULL_YELLOW; - } +bool Player::hasKilled(const std::shared_ptr<Player> &player) const { + return std::ranges::any_of(unjustifiedKills, [&](const auto &kill) { + return kill.target == player->getGUID() && (getTimeNow() - kill.time) < g_configManager().getNumber(ORANGE_SKULL_DURATION) * 24 * 60 * 60 && kill.unavenged; + }); +} - if (m_party && m_party == player->m_party) { - return SKULL_GREEN; - } +size_t Player::getMaxDepotItems() const { + if (group->maxDepotItems != 0) { + return group->maxDepotItems; } - return Creature::getSkullClient(creature); + if (isPremium()) { + return g_configManager().getNumber(PREMIUM_DEPOT_LIMIT); + } + return g_configManager().getNumber(FREE_DEPOT_LIMIT); } -bool Player::hasKilled(std::shared_ptr<Player> player) const { - for (const auto &kill : unjustifiedKills) { - if (kill.target == player->getGUID() && (time(nullptr) - kill.time) < g_configManager().getNumber(ORANGE_SKULL_DURATION, __FUNCTION__) * 24 * 60 * 60 && kill.unavenged) { - return true; +// tile +// send methods +// tile +// send methods + +void Player::sendAddTileItem(const std::shared_ptr<Tile> &itemTile, const Position &pos, const std::shared_ptr<Item> &item) { + if (client) { + int32_t stackpos = itemTile->getStackposOfItem(static_self_cast<Player>(), item); + if (stackpos != -1) { + client->sendAddTileItem(pos, stackpos, item); } } +} - return false; +void Player::sendUpdateTileItem(const std::shared_ptr<Tile> &updateTile, const Position &pos, const std::shared_ptr<Item> &item) { + if (client) { + int32_t stackpos = updateTile->getStackposOfItem(static_self_cast<Player>(), item); + if (stackpos != -1) { + client->sendUpdateTileItem(pos, stackpos, item); + } + } +} + +void Player::sendRemoveTileThing(const Position &pos, int32_t stackpos) const { + if (stackpos != -1 && client) { + client->sendRemoveTileThing(pos, stackpos); + } +} + +void Player::sendUpdateTileCreature(const std::shared_ptr<Creature> &creature) { + if (client) { + client->sendUpdateTileCreature(creature->getPosition(), creature->getTile()->getClientIndexOfCreature(static_self_cast<Player>(), creature), creature); + } +} + +std::string Player::getObjectPronoun() const { + return getPlayerObjectPronoun(pronoun, sex, name); +} + +std::string Player::getSubjectPronoun() const { + return getPlayerSubjectPronoun(pronoun, sex, name); +} + +std::string Player::getPossessivePronoun() const { + return getPlayerPossessivePronoun(pronoun, sex, name); +} + +std::string Player::getReflexivePronoun() const { + return getPlayerReflexivePronoun(pronoun, sex, name); +} + +std::string Player::getSubjectVerb(bool past) const { + return getVerbForPronoun(pronoun, past); +} + +void Player::setSex(PlayerSex_t newSex) { + sex = newSex; +} + +void Player::setPronoun(PlayerPronoun_t newPronoun) { + pronoun = newPronoun; +} + +Skulls_t Player::getSkull() const { + if (hasFlag(PlayerFlags_t::NotGainInFight)) { + return SKULL_NONE; + } + return skull; +} + +Skulls_t Player::getSkullClient(const std::shared_ptr<Creature> &creature) { + if (!creature || g_game().getWorldType() != WORLD_TYPE_PVP) { + return SKULL_NONE; + } + + const auto &player = creature->getPlayer(); + if (player && player->getSkull() == SKULL_NONE) { + if (player.get() == this) { + if (std::ranges::any_of(unjustifiedKills, [&](const auto &kill) { + return kill.unavenged && (getTimeNow() - kill.time) < g_configManager().getNumber(ORANGE_SKULL_DURATION) * 24 * 60 * 60; + })) { + return SKULL_ORANGE; + } + } + + if (player->hasKilled(getPlayer())) { + return SKULL_ORANGE; + } + + if (player->hasAttacked(getPlayer())) { + return SKULL_YELLOW; + } + + if (m_party && m_party == player->m_party) { + return SKULL_GREEN; + } + } + return Creature::getSkullClient(creature); +} + +int64_t Player::getSkullTicks() const { + return skullTicks; +} + +void Player::setSkullTicks(int64_t ticks) { + skullTicks = ticks; } -bool Player::hasAttacked(std::shared_ptr<Player> attacked) const { +bool Player::hasAttacked(const std::shared_ptr<Player> &attacked) const { if (hasFlag(PlayerFlags_t::NotGainInFight) || !attacked) { return false; } @@ -5172,7 +6158,7 @@ bool Player::hasAttacked(std::shared_ptr<Player> attacked) const { return attackedSet.contains(attacked->guid); } -void Player::addAttacked(std::shared_ptr<Player> attacked) { +void Player::addAttacked(const std::shared_ptr<Player> &attacked) { if (hasFlag(PlayerFlags_t::NotGainInFight) || !attacked || attacked == getPlayer()) { return; } @@ -5180,7 +6166,7 @@ void Player::addAttacked(std::shared_ptr<Player> attacked) { attackedSet.emplace(attacked->guid); } -void Player::removeAttacked(std::shared_ptr<Player> attacked) { +void Player::removeAttacked(const std::shared_ptr<Player> &attacked) { if (!attacked || attacked == getPlayer()) { return; } @@ -5192,7 +6178,7 @@ void Player::clearAttacked() { attackedSet.clear(); } -void Player::addUnjustifiedDead(std::shared_ptr<Player> attacked) { +void Player::addUnjustifiedDead(const std::shared_ptr<Player> &attacked) { if (hasFlag(PlayerFlags_t::NotGainInFight) || attacked == getPlayer() || g_game().getWorldType() == WORLD_TYPE_PVP_ENFORCED) { return; } @@ -5219,22 +6205,34 @@ void Player::addUnjustifiedDead(std::shared_ptr<Player> attacked) { } if (getSkull() != SKULL_BLACK) { - if (dayKills >= 2 * g_configManager().getNumber(DAY_KILLS_TO_RED, __FUNCTION__) || weekKills >= 2 * g_configManager().getNumber(WEEK_KILLS_TO_RED, __FUNCTION__) || monthKills >= 2 * g_configManager().getNumber(MONTH_KILLS_TO_RED, __FUNCTION__)) { + if (dayKills >= 2 * g_configManager().getNumber(DAY_KILLS_TO_RED) || weekKills >= 2 * g_configManager().getNumber(WEEK_KILLS_TO_RED) || monthKills >= 2 * g_configManager().getNumber(MONTH_KILLS_TO_RED)) { setSkull(SKULL_BLACK); // start black skull time - skullTicks = static_cast<int64_t>(g_configManager().getNumber(BLACK_SKULL_DURATION, __FUNCTION__)) * 24 * 60 * 60; - } else if (dayKills >= g_configManager().getNumber(DAY_KILLS_TO_RED, __FUNCTION__) || weekKills >= g_configManager().getNumber(WEEK_KILLS_TO_RED, __FUNCTION__) || monthKills >= g_configManager().getNumber(MONTH_KILLS_TO_RED, __FUNCTION__)) { + skullTicks = static_cast<int64_t>(g_configManager().getNumber(BLACK_SKULL_DURATION)) * 24 * 60 * 60; + } else if (dayKills >= g_configManager().getNumber(DAY_KILLS_TO_RED) || weekKills >= g_configManager().getNumber(WEEK_KILLS_TO_RED) || monthKills >= g_configManager().getNumber(MONTH_KILLS_TO_RED)) { setSkull(SKULL_RED); // reset red skull time - skullTicks = static_cast<int64_t>(g_configManager().getNumber(RED_SKULL_DURATION, __FUNCTION__)) * 24 * 60 * 60; + skullTicks = static_cast<int64_t>(g_configManager().getNumber(RED_SKULL_DURATION)) * 24 * 60 * 60; } } sendUnjustifiedPoints(); } +void Player::sendCreatureEmblem(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendCreatureEmblem(creature); + } +} + +void Player::sendCreatureSkull(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendCreatureSkull(creature); + } +} + void Player::checkSkullTicks(int64_t ticks) { - int64_t newTicks = skullTicks - ticks; + const int64_t newTicks = skullTicks - ticks; if (newTicks < 0) { skullTicks = 0; } else { @@ -5246,21 +6244,51 @@ void Player::checkSkullTicks(int64_t ticks) { } } +void Player::updateBaseSpeed() { + if (baseSpeed >= PLAYER_MAX_SPEED) { + return; + } + + if (!hasFlag(PlayerFlags_t::SetMaxSpeed)) { + baseSpeed = static_cast<uint16_t>(vocation->getBaseSpeed() + (level - 1)); + } else { + baseSpeed = PLAYER_MAX_SPEED; + } +} + bool Player::isPromoted() const { - uint16_t promotedVocation = g_vocations().getPromotedVocation(vocation->getId()); + const uint16_t promotedVocation = g_vocations().getPromotedVocation(vocation->getId()); return promotedVocation == VOCATION_NONE && vocation->getId() != promotedVocation; } +uint32_t Player::getAttackSpeed() const { + bool onFistAttackSpeed = g_configManager().getBoolean(TOGGLE_ATTACK_SPEED_ONFIST); + uint32_t MAX_ATTACK_SPEED = g_configManager().getNumber(MAX_SPEED_ATTACKONFIST); + if (onFistAttackSpeed) { + uint32_t baseAttackSpeed = vocation->getAttackSpeed(); + uint32_t skillLevel = getSkillLevel(SKILL_FIST); + uint32_t attackSpeed = baseAttackSpeed - (skillLevel * g_configManager().getNumber(MULTIPLIER_ATTACKONFIST)); + + if (attackSpeed < MAX_ATTACK_SPEED) { + attackSpeed = MAX_ATTACK_SPEED; + } + + return attackSpeed; + } else { + return vocation->getAttackSpeed(); + } +} + double Player::getLostPercent() const { int32_t blessingCount = 0; - uint8_t maxBlessing = (operatingSystem == CLIENTOS_NEW_WINDOWS || operatingSystem == CLIENTOS_NEW_MAC) ? 8 : 6; + const uint8_t maxBlessing = (operatingSystem == CLIENTOS_NEW_WINDOWS || operatingSystem == CLIENTOS_NEW_MAC) ? 8 : 6; for (int i = 2; i <= maxBlessing; i++) { if (hasBlessing(i)) { blessingCount++; } } - int32_t deathLosePercent = g_configManager().getNumber(DEATH_LOSE_PERCENT, __FUNCTION__); + int32_t deathLosePercent = g_configManager().getNumber(DEATH_LOSE_PERCENT); if (deathLosePercent != -1) { if (isPromoted()) { deathLosePercent -= 3; @@ -5272,7 +6300,7 @@ double Player::getLostPercent() const { double lossPercent; if (level >= 24) { - double tmpLevel = level + (levelPercent / 100.); + const double tmpLevel = level + (levelPercent / 100.); lossPercent = ((tmpLevel + 50) * 50 * ((tmpLevel * tmpLevel) - (5 * tmpLevel) + 8)) / experience; } else { lossPercent = 5; @@ -5287,34 +6315,15 @@ double Player::getLostPercent() const { return lossPercent * (1 - (percentReduction / 100.)) / 100.; } -void Player::learnInstantSpell(const std::string &spellName) { - if (!hasLearnedInstantSpell(spellName)) { - learnedInstantSpellList.emplace_back(spellName); - } -} - -void Player::forgetInstantSpell(const std::string &spellName) { - std::erase(learnedInstantSpellList, spellName); +[[nodiscard]] const std::string &Player::getGuildNick() const { + return guildNick; } -bool Player::hasLearnedInstantSpell(const std::string &spellName) const { - if (hasFlag(PlayerFlags_t::CannotUseSpells)) { - return false; - } - - if (hasFlag(PlayerFlags_t::IgnoreSpellCheck)) { - return true; - } - - for (const auto &learnedSpellName : learnedInstantSpellList) { - if (strcasecmp(learnedSpellName.c_str(), spellName.c_str()) == 0) { - return true; - } - } - return false; +void Player::setGuildNick(std::string nick) { + guildNick = std::move(nick); } -bool Player::isInWar(std::shared_ptr<Player> player) const { +bool Player::isInWar(const std::shared_ptr<Player> &player) const { if (!player || !guild) { return false; } @@ -5328,7 +6337,7 @@ bool Player::isInWar(std::shared_ptr<Player> player) const { } bool Player::isInWarList(uint32_t guildId) const { - return std::find(guildWarVector.begin(), guildWarVector.end(), guildId) != guildWarVector.end(); + return std::ranges::find(guildWarVector, guildId) != guildWarVector.end(); } uint32_t Player::getMagicLevel() const { @@ -5349,7 +6358,7 @@ uint32_t Player::getLoyaltyMagicLevel() const { } absl::uint128 spent = manaSpent; - absl::uint128 totalMana = vocation->getTotalMana(level) + spent; + const absl::uint128 totalMana = vocation->getTotalMana(level) + spent; absl::uint128 loyaltyMana = (totalMana * getLoyaltyBonus()) / 100; while ((spent + loyaltyMana) >= nextReqMana) { loyaltyMana -= nextReqMana - spent; @@ -5366,15 +6375,6 @@ uint32_t Player::getLoyaltyMagicLevel() const { return level; } -uint32_t Player::getCapacity() const { - if (hasFlag(PlayerFlags_t::CannotPickupItem)) { - return 0; - } else if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { - return std::numeric_limits<uint32_t>::max(); - } - return capacity + bonusCapacity + varStats[STAT_CAPACITY] + m_wheelPlayer->getStat(WheelStat_t::CAPACITY); -} - int32_t Player::getMaxHealth() const { return std::max<int32_t>(1, healthMax + varStats[STAT_MAXHITPOINTS] + m_wheelPlayer->getStat(WheelStat_t::HEALTH)); } @@ -5383,11 +6383,16 @@ uint32_t Player::getMaxMana() const { return std::max<int32_t>(0, manaMax + varStats[STAT_MAXMANAPOINTS] + m_wheelPlayer->getStat(WheelStat_t::MANA)); } +bool Player::hasExtraSwing() { + return lastAttack > 0 && !checkLastAttackWithin(getAttackSpeed()); +} + uint16_t Player::getSkillLevel(skills_t skill) const { auto skillLevel = getLoyaltySkill(skill); skillLevel = std::max<int32_t>(0, skillLevel + varSkills[skill]); - if (auto it = maxValuePerSkill.find(skill); + const auto &maxValuePerSkill = getMaxValuePerSkill(); + if (const auto it = maxValuePerSkill.find(skill); it != maxValuePerSkill.end()) { skillLevel = std::min<int32_t>(it->second, skillLevel); } @@ -5415,7 +6420,7 @@ uint16_t Player::getSkillLevel(skills_t skill) const { skillLevel += m_wheelPlayer->checkAvatarSkill(WheelAvatarSkill_t::CRITICAL_DAMAGE); } - int32_t avatarCritChance = m_wheelPlayer->checkAvatarSkill(WheelAvatarSkill_t::CRITICAL_CHANCE); + const int32_t avatarCritChance = m_wheelPlayer->checkAvatarSkill(WheelAvatarSkill_t::CRITICAL_CHANCE); if (skill == SKILL_CRITICAL_HIT_CHANCE && avatarCritChance > 0) { skillLevel = avatarCritChance; // 100% } @@ -5432,7 +6437,7 @@ bool Player::isPlayerGroup() const { } bool Player::isPremium() const { - if (g_configManager().getBoolean(FREE_PREMIUM, __FUNCTION__) || hasFlag(PlayerFlags_t::IsAlwaysPremium)) { + if (g_configManager().getBoolean(FREE_PREMIUM) || hasFlag(PlayerFlags_t::IsAlwaysPremium)) { return true; } @@ -5451,29 +6456,16 @@ time_t Player::getPremiumLastDay() const { return account->getPremiumLastDay(); } +bool Player::isVip() const { + return g_configManager().getBoolean(VIP_SYSTEM_ENABLED) && (getPremiumDays() > 0 || getPremiumLastDay() > getTimeNow()); +} + void Player::setTibiaCoins(int32_t v) { coinBalance = v; } -int32_t Player::getCleavePercent(bool useCharges) const { - int32_t result = cleavePercent; - for (const auto &item : getEquippedItems()) { - const ItemType &it = Item::items[item->getID()]; - if (!it.abilities) { - continue; - } - - const int32_t &cleave_percent = it.abilities->cleavePercent; - if (cleave_percent != 0) { - result += cleave_percent; - uint16_t charges = item->getCharges(); - if (useCharges && charges != 0) { - g_game().transformItem(item, item->getID(), charges - 1); - } - } - } - - return result; +void Player::setCleavePercent(int32_t value) { + cleavePercent = std::max(0, cleavePercent + value); } int32_t Player::getPerfectShotDamage(uint8_t range, bool useCharges) const { @@ -5495,7 +6487,7 @@ int32_t Player::getPerfectShotDamage(uint8_t range, bool useCharges) const { if (itemType.abilities->perfectShotRange == range) { result += itemType.abilities->perfectShotDamage; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5505,6 +6497,17 @@ int32_t Player::getPerfectShotDamage(uint8_t range, bool useCharges) const { return result; } +void Player::setPerfectShotDamage(uint8_t range, int32_t damage) { + int32_t actualDamage = getPerfectShotDamage(range); + const bool aboveZero = (actualDamage != 0); + actualDamage += damage; + if (actualDamage == 0 && aboveZero) { + perfectShot.erase(range); + } else { + perfectShot[range] = actualDamage; + } +} + int32_t Player::getSpecializedMagicLevel(CombatType_t combat, bool useCharges) const { int32_t result = specializedMagicLevel[combatTypeToIndex(combat)]; for (const auto &item : getEquippedItems()) { @@ -5513,10 +6516,10 @@ int32_t Player::getSpecializedMagicLevel(CombatType_t combat, bool useCharges) c continue; } - int32_t specialized_magic_level = itemType.abilities->specializedMagicLevel[combatTypeToIndex(combat)]; + const int32_t specialized_magic_level = itemType.abilities->specializedMagicLevel[combatTypeToIndex(combat)]; if (specialized_magic_level > 0) { result += specialized_magic_level; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5526,6 +6529,10 @@ int32_t Player::getSpecializedMagicLevel(CombatType_t combat, bool useCharges) c return result; } +void Player::setSpecializedMagicLevel(CombatType_t combat, int32_t value) { + specializedMagicLevel[combatTypeToIndex(combat)] = std::max(0, specializedMagicLevel[combatTypeToIndex(combat)] + value); +} + int32_t Player::getMagicShieldCapacityFlat(bool useCharges) const { int32_t result = magicShieldCapacityFlat; for (const auto &item : getEquippedItems()) { @@ -5534,10 +6541,10 @@ int32_t Player::getMagicShieldCapacityFlat(bool useCharges) const { continue; } - int32_t magicCapacity = itemType.abilities->magicShieldCapacityFlat; + const int32_t magicCapacity = itemType.abilities->magicShieldCapacityFlat; if (magicCapacity != 0) { result += magicCapacity; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5547,6 +6554,10 @@ int32_t Player::getMagicShieldCapacityFlat(bool useCharges) const { return result; } +void Player::setMagicShieldCapacityFlat(int32_t value) { + magicShieldCapacityFlat += value; +} + int32_t Player::getMagicShieldCapacityPercent(bool useCharges) const { int32_t result = magicShieldCapacityPercent; for (const auto &item : getEquippedItems()) { @@ -5555,10 +6566,10 @@ int32_t Player::getMagicShieldCapacityPercent(bool useCharges) const { continue; } - int32_t magicPercent = itemType.abilities->magicShieldCapacityPercent; + const int32_t magicPercent = itemType.abilities->magicShieldCapacityPercent; if (magicPercent != 0) { result += magicPercent; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5568,18 +6579,22 @@ int32_t Player::getMagicShieldCapacityPercent(bool useCharges) const { return result; } -int32_t Player::getReflectPercent(CombatType_t combat, bool useCharges) const { - int32_t result = reflectPercent[combatTypeToIndex(combat)]; +void Player::setMagicShieldCapacityPercent(int32_t value) { + magicShieldCapacityPercent += value; +} + +double_t Player::getReflectPercent(CombatType_t combat, bool useCharges) const { + double_t result = reflectPercent[combatTypeToIndex(combat)]; for (const auto &item : getEquippedItems()) { const ItemType &itemType = Item::items[item->getID()]; if (!itemType.abilities) { continue; } - int32_t reflectPercent = itemType.abilities->reflectPercent[combatTypeToIndex(combat)]; + double_t reflectPercent = itemType.abilities->reflectPercent[combatTypeToIndex(combat)]; if (reflectPercent != 0) { result += reflectPercent; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5597,10 +6612,10 @@ int32_t Player::getReflectFlat(CombatType_t combat, bool useCharges) const { continue; } - int32_t reflectFlat = itemType.abilities->reflectFlat[combatTypeToIndex(combat)]; + const int32_t reflectFlat = itemType.abilities->reflectFlat[combatTypeToIndex(combat)]; if (reflectFlat != 0) { result += reflectFlat; - uint16_t charges = item->getCharges(); + const uint16_t charges = item->getCharges(); if (useCharges && charges != 0) { g_game().transformItem(item, item->getID(), charges - 1); } @@ -5614,7 +6629,7 @@ void Player::setTransferableTibiaCoins(int32_t v) { coinTransferableBalance = v; } -PartyShields_t Player::getPartyShield(std::shared_ptr<Player> player) { +PartyShields_t Player::getPartyShield(const std::shared_ptr<Player> &player) { if (!player) { return SHIELD_NONE; } @@ -5668,34 +6683,27 @@ PartyShields_t Player::getPartyShield(std::shared_ptr<Player> player) { return SHIELD_NONE; } -bool Player::isInviting(std::shared_ptr<Player> player) const { +bool Player::isInviting(const std::shared_ptr<Player> &player) const { if (!player || !m_party || m_party->getLeader().get() != this) { return false; } return m_party->isPlayerInvited(player); } -bool Player::isPartner(std::shared_ptr<Player> player) const { +bool Player::isPartner(const std::shared_ptr<Player> &player) const { if (!player || !m_party || player.get() == this) { return false; } return m_party == player->m_party; } -bool Player::isGuildMate(std::shared_ptr<Player> player) const { - if (!player || !guild) { - return false; - } - return guild == player->guild; -} - -void Player::sendPlayerPartyIcons(std::shared_ptr<Player> player) { +void Player::sendPlayerPartyIcons(const std::shared_ptr<Player> &player) const { sendPartyCreatureShield(player); sendPartyCreatureSkull(player); } -bool Player::addPartyInvitation(std::shared_ptr<Party> newParty) { - auto it = std::find(invitePartyList.begin(), invitePartyList.end(), newParty); +bool Player::addPartyInvitation(const std::shared_ptr<Party> &newParty) { + auto it = std::ranges::find(invitePartyList, newParty); if (it != invitePartyList.end()) { return false; } @@ -5704,7 +6712,7 @@ bool Player::addPartyInvitation(std::shared_ptr<Party> newParty) { return true; } -void Player::removePartyInvitation(std::shared_ptr<Party> remParty) { +void Player::removePartyInvitation(const std::shared_ptr<Party> &remParty) { std::erase(invitePartyList, remParty); } @@ -5715,12 +6723,12 @@ void Player::clearPartyInvitations() { invitePartyList.clear(); } -GuildEmblems_t Player::getGuildEmblem(std::shared_ptr<Player> player) const { +GuildEmblems_t Player::getGuildEmblem(const std::shared_ptr<Player> &player) const { if (!player) { return GUILDEMBLEM_NONE; } - const auto playerGuild = player->getGuild(); + const auto &playerGuild = player->getGuild(); if (!playerGuild) { return GUILDEMBLEM_NONE; } @@ -5728,19 +6736,44 @@ GuildEmblems_t Player::getGuildEmblem(std::shared_ptr<Player> player) const { if (player->getGuildWarVector().empty()) { if (guild == playerGuild) { return GUILDEMBLEM_MEMBER; - } else { - return GUILDEMBLEM_OTHER; } - } else if (guild == playerGuild) { + return GUILDEMBLEM_OTHER; + } + if (guild == playerGuild) { return GUILDEMBLEM_ALLY; - } else if (isInWar(player)) { + } + if (isInWar(player)) { return GUILDEMBLEM_ENEMY; } return GUILDEMBLEM_NEUTRAL; } -void Player::sendUnjustifiedPoints() { +uint64_t Player::getSpentMana() const { + return manaSpent; +} + +bool Player::hasFlag(PlayerFlags_t flag) const { + return group->flags[static_cast<std::size_t>(flag)]; +} + +void Player::setFlag(PlayerFlags_t flag) const { + group->flags[static_cast<std::size_t>(flag)] = true; +} + +void Player::removeFlag(PlayerFlags_t flag) const { + group->flags[static_cast<std::size_t>(flag)] = false; +} + +std::shared_ptr<BedItem> Player::getBedItem() { + return bedItem; +} + +void Player::setBedItem(std::shared_ptr<BedItem> b) { + bedItem = std::move(b); +} + +void Player::sendUnjustifiedPoints() const { if (client) { double dayKills = 0; double weekKills = 0; @@ -5759,15 +6792,15 @@ void Player::sendUnjustifiedPoints() { } } - bool isRed = getSkull() == SKULL_RED; + const bool isRed = getSkull() == SKULL_RED; - auto dayMax = ((isRed ? 2 : 1) * g_configManager().getNumber(DAY_KILLS_TO_RED, __FUNCTION__)); - auto weekMax = ((isRed ? 2 : 1) * g_configManager().getNumber(WEEK_KILLS_TO_RED, __FUNCTION__)); - auto monthMax = ((isRed ? 2 : 1) * g_configManager().getNumber(MONTH_KILLS_TO_RED, __FUNCTION__)); + auto dayMax = ((isRed ? 2 : 1) * g_configManager().getNumber(DAY_KILLS_TO_RED)); + auto weekMax = ((isRed ? 2 : 1) * g_configManager().getNumber(WEEK_KILLS_TO_RED)); + auto monthMax = ((isRed ? 2 : 1) * g_configManager().getNumber(MONTH_KILLS_TO_RED)); - uint8_t dayProgress = std::min(std::round(dayKills / dayMax * 100), 100.0); - uint8_t weekProgress = std::min(std::round(weekKills / weekMax * 100), 100.0); - uint8_t monthProgress = std::min(std::round(monthKills / monthMax * 100), 100.0); + const uint8_t dayProgress = std::min(std::round(dayKills / dayMax * 100), 100.0); + const uint8_t weekProgress = std::min(std::round(weekKills / weekMax * 100), 100.0); + const uint8_t monthProgress = std::min(std::round(monthKills / monthMax * 100), 100.0); uint8_t skullDuration = 0; if (skullTicks != 0) { skullDuration = std::floor<uint8_t>(skullTicks / (24 * 60 * 60 * 1000)); @@ -5777,7 +6810,7 @@ void Player::sendUnjustifiedPoints() { } uint8_t Player::getLastMount() const { - int32_t value = getStorageValue(PSTRG_MOUNTS_CURRENTMOUNT); + const int32_t value = getStorageValue(PSTRG_MOUNTS_CURRENTMOUNT); if (value > 0) { return value; } @@ -5785,7 +6818,7 @@ uint8_t Player::getLastMount() const { } uint8_t Player::getCurrentMount() const { - int32_t value = getStorageValue(PSTRG_MOUNTS_CURRENTMOUNT); + const int32_t value = getStorageValue(PSTRG_MOUNTS_CURRENTMOUNT); if (value > 0) { return value; } @@ -5797,26 +6830,23 @@ void Player::setCurrentMount(uint8_t mount) { } bool Player::hasAnyMount() const { - const auto mounts = g_game().mounts.getMounts(); - for (const auto &mount : mounts) { - if (hasMount(mount)) { - return true; - } - } - return false; + const auto &mounts = g_game().mounts->getMounts(); + return std::ranges::any_of(mounts, [&](const auto &mount) { + return hasMount(mount); + }); } uint8_t Player::getRandomMountId() const { std::vector<uint8_t> playerMounts; - const auto mounts = g_game().mounts.getMounts(); + const auto mounts = g_game().mounts->getMounts(); for (const auto &mount : mounts) { if (hasMount(mount)) { - playerMounts.push_back(mount->id); + playerMounts.emplace_back(mount->id); } } - auto playerMountsSize = static_cast<int32_t>(playerMounts.size() - 1); - auto randomIndex = uniform_random(0, std::max<int32_t>(0, playerMountsSize)); + const auto playerMountsSize = static_cast<int32_t>(playerMounts.size() - 1); + const auto randomIndex = uniform_random(0, std::max<int32_t>(0, playerMountsSize)); return playerMounts.at(randomIndex); } @@ -5835,8 +6865,8 @@ bool Player::toggleMount(bool mount) { return false; } - auto tile = getTile(); - if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ, __FUNCTION__) && !group->access && tile && tile->hasFlag(TILESTATE_PROTECTIONZONE)) { + const auto &tile = getTile(); + if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ) && !group->access && tile && tile->hasFlag(TILESTATE_PROTECTIONZONE)) { sendCancelMessage(RETURNVALUE_ACTIONNOTPERMITTEDINPROTECTIONZONE); return false; } @@ -5856,7 +6886,7 @@ bool Player::toggleMount(bool mount) { currentMountId = getRandomMountId(); } - const auto currentMount = g_game().mounts.getMountByID(currentMountId); + const auto ¤tMount = g_game().mounts->getMountByID(currentMountId); if (!currentMount) { return false; } @@ -5899,7 +6929,7 @@ bool Player::toggleMount(bool mount) { } bool Player::tameMount(uint8_t mountId) { - if (!g_game().mounts.getMountByID(mountId)) { + if (!g_game().mounts->getMountByID(mountId)) { return false; } @@ -5918,7 +6948,7 @@ bool Player::tameMount(uint8_t mountId) { } bool Player::untameMount(uint8_t mountId) { - if (!g_game().mounts.getMountByID(mountId)) { + if (!g_game().mounts->getMountByID(mountId)) { return false; } @@ -5946,7 +6976,7 @@ bool Player::untameMount(uint8_t mountId) { return true; } -bool Player::hasMount(const std::shared_ptr<Mount> mount) const { +bool Player::hasMount(const std::shared_ptr<Mount> &mount) const { if (isAccessPlayer()) { return true; } @@ -5957,7 +6987,7 @@ bool Player::hasMount(const std::shared_ptr<Mount> mount) const { const uint8_t tmpMountId = mount->id - 1; - int32_t value = getStorageValue(PSTRG_MOUNTS_RANGE_START + (tmpMountId / 31)); + const int32_t value = getStorageValue(PSTRG_MOUNTS_RANGE_START + (tmpMountId / 31)); if (value == -1) { return false; } @@ -5966,7 +6996,7 @@ bool Player::hasMount(const std::shared_ptr<Mount> mount) const { } void Player::dismount() { - const auto mount = g_game().mounts.getMountByID(getCurrentMount()); + const auto &mount = g_game().mounts->getMountByID(getCurrentMount()); if (mount && mount->speed > 0) { g_game().changeSpeed(static_self_cast<Player>(), -mount->speed); } @@ -5995,7 +7025,7 @@ bool Player::addOfflineTrainingTries(skills_t skill, uint64_t tries) { oldPercentToNextLevel = static_cast<long double>(manaSpent * 100) / nextReqMana; g_events().eventPlayerOnGainSkillTries(static_self_cast<Player>(), SKILL_MAGLEVEL, tries); - g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), SKILL_MAGLEVEL, tries); + g_callbacks().executeCallback(EventCallback_t::playerOnGainSkillTries, &EventCallback::playerOnGainSkillTries, getPlayer(), SKILL_MAGLEVEL, std::ref(tries)); uint32_t currMagLevel = magLevel; while ((manaSpent + tries) >= nextReqMana) { @@ -6123,21 +7153,56 @@ bool Player::addOfflineTrainingTries(skills_t skill, uint64_t tries) { return sendUpdate; } +void Player::addOfflineTrainingTime(int32_t addTime) { + offlineTrainingTime = std::min<int32_t>(12 * 3600 * 1000, offlineTrainingTime + addTime); +} + +void Player::removeOfflineTrainingTime(int32_t removeTime) { + offlineTrainingTime = std::max<int32_t>(0, offlineTrainingTime - removeTime); +} + +int32_t Player::getOfflineTrainingTime() const { + return offlineTrainingTime; +} + +int8_t Player::getOfflineTrainingSkill() const { + return offlineTrainingSkill; +} + +void Player::setOfflineTrainingSkill(int8_t skill) { + offlineTrainingSkill = skill; +} + +uint64_t Player::getBankBalance() const { + return bankBalance; +} + +void Player::setBankBalance(uint64_t balance) { + bankBalance = balance; +} + +std::shared_ptr<Town> Player::getTown() const { + return town; +} +void Player::setTown(const std::shared_ptr<Town> &newTown) { + this->town = newTown; +} + bool Player::hasModalWindowOpen(uint32_t modalWindowId) const { - return find(modalWindows.begin(), modalWindows.end(), modalWindowId) != modalWindows.end(); + return std::ranges::find(modalWindows, modalWindowId) != modalWindows.end(); } void Player::onModalWindowHandled(uint32_t modalWindowId) { std::erase(modalWindows, modalWindowId); } -void Player::sendModalWindow(const ModalWindow &modalWindow) { - if (!client) { - return; +const Position &Player::getTemplePosition() const { + if (!town) { + static auto emptyPosition = Position(); + return emptyPosition; } - modalWindows.emplace_back(modalWindow.id); - client->sendModalWindow(modalWindow); + return town->getTemplePosition(); } void Player::clearModalWindows() { @@ -6169,1660 +7234,2814 @@ uint16_t Player::getHelpers() const { return 0u; } -void Player::sendClosePrivate(uint16_t channelId) { - if (channelId == CHANNEL_GUILD || channelId == CHANNEL_PARTY) { - g_chat().removeUserFromChannel(getPlayer(), channelId); +void Player::sendImbuementResult(const std::string &message) const { + if (client) { + client->sendImbuementResult(message); } +} +void Player::closeImbuementWindow() const { if (client) { - client->sendClosePrivate(channelId); + client->closeImbuementWindow(); } } -void Player::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, std::vector<std::pair<Achievement, uint32_t>> achievementsUnlocked) { +void Player::sendPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos) const { if (client) { - client->sendCyclopediaCharacterAchievements(secretsUnlocked, achievementsUnlocked); + client->sendPodiumWindow(podium, position, itemId, stackpos); } } -uint64_t Player::getMoney() const { - std::vector<std::shared_ptr<Container>> containers; - uint64_t moneyCount = 0; - - for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; ++i) { - std::shared_ptr<Item> item = inventory[i]; - if (!item) { - continue; - } - - std::shared_ptr<Container> container = item->getContainer(); - if (container) { - containers.push_back(container); - } else { - moneyCount += item->getWorth(); - } +void Player::sendCloseContainer(uint8_t cid) const { + if (client) { + client->sendCloseContainer(cid); } +} - size_t i = 0; - while (i < containers.size()) { - std::shared_ptr<Container> container = containers[i++]; - for (const std::shared_ptr<Item> &item : container->getItemList()) { - std::shared_ptr<Container> tmpContainer = item->getContainer(); - if (tmpContainer) { - containers.push_back(tmpContainer); - } else { - moneyCount += item->getWorth(); - } - } +void Player::sendChannel(uint16_t channelId, const std::string &channelName, const UsersMap* channelUsers, const InvitedMap* invitedUsers) const { + if (client) { + client->sendChannel(channelId, channelName, channelUsers, invitedUsers); } - return moneyCount; } -std::pair<uint64_t, uint64_t> Player::getForgeSliversAndCores() const { - uint64_t sliverCount = 0; - uint64_t coreCount = 0; - - // Check items from inventory - for (const auto &item : getAllInventoryItems()) { - if (!item) { - continue; - } - - sliverCount += item->getForgeSlivers(); - coreCount += item->getForgeCores(); +void Player::sendTutorial(uint8_t tutorialId) const { + if (client) { + client->sendTutorial(tutorialId); } +} - // Check items from stash - for (StashItemList stashToSend = getStashItems(); - auto [itemId, itemCount] : stashToSend) { - if (itemId == ITEM_FORGE_SLIVER) { - sliverCount += itemCount; - } - if (itemId == ITEM_FORGE_CORE) { - coreCount += itemCount; - } +void Player::sendAddMarker(const Position &pos, uint8_t markType, const std::string &desc) const { + if (client) { + client->sendAddMarker(pos, markType, desc); } +} - return std::make_pair(sliverCount, coreCount); +void Player::sendItemInspection(uint16_t itemId, uint8_t itemCount, const std::shared_ptr<Item> &item, bool cyclopedia) const { + if (client) { + client->sendItemInspection(itemId, itemCount, item, cyclopedia); + } } -size_t Player::getMaxDepotItems() const { - if (group->maxDepotItems != 0) { - return group->maxDepotItems; - } else if (isPremium()) { - return g_configManager().getNumber(PREMIUM_DEPOT_LIMIT, __FUNCTION__); +void Player::sendCyclopediaCharacterNoData(CyclopediaCharacterInfoType_t characterInfoType, uint8_t errorCode) const { + if (client) { + client->sendCyclopediaCharacterNoData(characterInfoType, errorCode); } - return g_configManager().getNumber(FREE_DEPOT_LIMIT, __FUNCTION__); } -std::vector<std::shared_ptr<Condition>> Player::getMuteConditions() const { - std::vector<std::shared_ptr<Condition>> muteConditions; - muteConditions.reserve(conditions.size()); - - for (const std::shared_ptr<Condition> &condition : conditions) { - if (condition->getTicks() <= 0) { - continue; - } - - ConditionType_t type = condition->getType(); - if (type != CONDITION_MUTED && type != CONDITION_CHANNELMUTEDTICKS && type != CONDITION_YELLTICKS) { - continue; - } - - muteConditions.emplace_back(condition); +void Player::sendCyclopediaCharacterBaseInformation() const { + if (client) { + client->sendCyclopediaCharacterBaseInformation(); } - return muteConditions; } -void Player::setGuild(const std::shared_ptr<Guild> newGuild) { - if (newGuild == guild) { - return; +void Player::sendCyclopediaCharacterGeneralStats() const { + if (client) { + client->sendCyclopediaCharacterGeneralStats(); } +} - if (guild) { - guild->removeMember(static_self_cast<Player>()); - guild = nullptr; +void Player::sendCyclopediaCharacterCombatStats() const { + if (client) { + client->sendCyclopediaCharacterCombatStats(); } +} - guildNick.clear(); - guildRank = nullptr; - - if (newGuild) { - const auto rank = newGuild->getRankByLevel(1); - if (!rank) { - return; - } - - guild = newGuild; - guildRank = rank; - newGuild->addMember(static_self_cast<Player>()); +void Player::sendCyclopediaCharacterRecentDeaths(uint16_t page, uint16_t pages, const std::vector<RecentDeathEntry> &entries) const { + if (client) { + client->sendCyclopediaCharacterRecentDeaths(page, pages, entries); } } -void Player::updateRegeneration() { - if (!vocation) { - return; +void Player::sendCyclopediaCharacterRecentPvPKills(uint16_t page, uint16_t pages, const std::vector<RecentPvPKillEntry> &entries) const { + if (client) { + client->sendCyclopediaCharacterRecentPvPKills(page, pages, entries); } +} - std::shared_ptr<Condition> condition = getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT); - if (condition) { - condition->setParam(CONDITION_PARAM_HEALTHGAIN, vocation->getHealthGainAmount()); - condition->setParam(CONDITION_PARAM_HEALTHTICKS, vocation->getHealthGainTicks()); - condition->setParam(CONDITION_PARAM_MANAGAIN, vocation->getManaGainAmount()); - condition->setParam(CONDITION_PARAM_MANATICKS, vocation->getManaGainTicks()); +void Player::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, const std::vector<std::pair<Achievement, uint32_t>> &achievementsUnlocked) const { + if (client) { + client->sendCyclopediaCharacterAchievements(secretsUnlocked, achievementsUnlocked); } } -// User Interface action exhaustion -bool Player::isUIExhausted(uint32_t exhaustionTime /*= 250*/) const { - return (OTSYS_TIME() - lastUIInteraction < exhaustionTime); +void Player::sendCyclopediaCharacterItemSummary(const ItemsTierCountList &inventoryItems, const ItemsTierCountList &storeInboxItems, const StashItemList &supplyStashItems, const ItemsTierCountList &depotBoxItems, const ItemsTierCountList &inboxItems) const { + if (client) { + client->sendCyclopediaCharacterItemSummary(inventoryItems, storeInboxItems, supplyStashItems, depotBoxItems, inboxItems); + } } -void Player::updateUIExhausted() { - lastUIInteraction = OTSYS_TIME(); +void Player::sendCyclopediaCharacterOutfitsMounts() const { + if (client) { + client->sendCyclopediaCharacterOutfitsMounts(); + } } -void Player::setImmuneFear() { - m_fearCondition.first = CONDITION_FEARED; - m_fearCondition.second = OTSYS_TIME() + 10000; +void Player::sendCyclopediaCharacterStoreSummary() const { + if (client) { + client->sendCyclopediaCharacterStoreSummary(); + } } -bool Player::isImmuneFear() const { - uint64_t timenow = OTSYS_TIME(); - return (m_fearCondition.first == CONDITION_FEARED) && (timenow <= m_fearCondition.second); +void Player::sendCyclopediaCharacterInspection() const { + if (client) { + client->sendCyclopediaCharacterInspection(); + } } -uint64_t Player::getItemCustomPrice(uint16_t itemId, bool buyPrice /* = false*/) const { - auto it = itemPriceMap.find(itemId); - if (it != itemPriceMap.end()) { - return it->second; +void Player::sendCyclopediaCharacterBadges() const { + if (client) { + client->sendCyclopediaCharacterBadges(); } +} - std::map<uint16_t, uint64_t> itemMap { { itemId, 1 } }; - return g_game().getItemMarketPrice(itemMap, buyPrice); +void Player::sendCyclopediaCharacterTitles() const { + if (client) { + client->sendCyclopediaCharacterTitles(); + } } -uint16_t Player::getFreeBackpackSlots() const { - std::shared_ptr<Thing> thing = getThing(CONST_SLOT_BACKPACK); - if (!thing) { - return 0; +void Player::sendHighscoresNoData() const { + if (client) { + client->sendHighscoresNoData(); } +} - std::shared_ptr<Container> backpack = thing->getContainer(); - if (!backpack) { - return 0; +void Player::sendHighscores(const std::vector<HighscoreCharacter> &characters, uint8_t categoryId, uint32_t vocationId, uint16_t page, uint16_t pages, uint32_t updateTimer) const { + if (client) { + client->sendHighscores(characters, categoryId, vocationId, page, pages, updateTimer); } +} - uint16_t counter = std::max<uint16_t>(0, backpack->getFreeSlots()); +void Player::addAsyncOngoingTask(uint64_t flags) { + asyncOngoingTasks |= flags; +} - return counter; +bool Player::hasAsyncOngoingTask(uint64_t flags) const { + return (asyncOngoingTasks & flags); } -void Player::addItemImbuementStats(const Imbuement* imbuement) { - bool requestUpdate = false; - // Check imbuement skills - for (int32_t skill = SKILL_FIRST; skill <= SKILL_LAST; ++skill) { - if (imbuement->skills[skill]) { - requestUpdate = true; - setVarSkill(static_cast<skills_t>(skill), imbuement->skills[skill]); - } - } +void Player::resetAsyncOngoingTask(uint64_t flags) { + asyncOngoingTasks &= ~flags; +} - // Check imbuement magic level - for (int32_t stat = STAT_FIRST; stat <= STAT_LAST; ++stat) { - if (imbuement->stats[stat]) { - requestUpdate = true; - setVarStats(static_cast<stats_t>(stat), imbuement->stats[stat]); - } +void Player::sendEnterWorld() const { + if (client) { + client->sendEnterWorld(); } +} - // Add imbuement speed - if (imbuement->speed != 0) { - g_game().changeSpeed(static_self_cast<Player>(), imbuement->speed); +void Player::sendFightModes() const { + if (client) { + client->sendFightModes(); } +} - // Add imbuement capacity - if (imbuement->capacity != 0) { - requestUpdate = true; - bonusCapacity = (capacity * imbuement->capacity) / 100; +void Player::sendNetworkMessage(const NetworkMessage &message) const { + if (client) { + client->writeToOutputBuffer(message); } +} - if (requestUpdate) { - sendStats(); - sendSkills(); +void Player::receivePing() { + lastPong = OTSYS_TIME(); +} + +void Player::sendOpenStash(bool isNpc) const { + if (client && ((getLastDepotId() != -1) || isNpc)) { + client->sendOpenStash(); } } -void Player::removeItemImbuementStats(const Imbuement* imbuement) { - if (!imbuement) { - return; +void Player::sendTakeScreenshot(Screenshot_t screenshotType) const { + if (client) { + client->sendTakeScreenshot(screenshotType); } +} - bool requestUpdate = false; +void Player::onThink(uint32_t interval) { + Creature::onThink(interval); - for (int32_t skill = SKILL_FIRST; skill <= SKILL_LAST; ++skill) { - if (imbuement->skills[skill]) { - requestUpdate = true; - setVarSkill(static_cast<skills_t>(skill), -imbuement->skills[skill]); - } - } + sendPing(); - // Check imbuement magic level - for (int32_t stat = STAT_FIRST; stat <= STAT_LAST; ++stat) { - if (imbuement->stats[stat]) { - requestUpdate = true; - setVarStats(static_cast<stats_t>(stat), -imbuement->stats[stat]); - } + MessageBufferTicks += interval; + if (MessageBufferTicks >= 1500) { + MessageBufferTicks = 0; + addMessageBuffer(); } - // Remove imbuement speed - if (imbuement->speed != 0) { - g_game().changeSpeed(static_self_cast<Player>(), -imbuement->speed); + // Transcendance (avatar trigger) + triggerTranscendance(); + // Momentum (cooldown resets) + triggerMomentum(); + const auto &playerTile = getTile(); + const bool vipStaysOnline = isVip() && g_configManager().getBoolean(VIP_STAY_ONLINE); + idleTime += interval; + if (playerTile && !playerTile->hasFlag(TILESTATE_NOLOGOUT) && !isAccessPlayer() && !isExerciseTraining() && !vipStaysOnline) { + const int32_t kickAfterMinutes = g_configManager().getNumber(KICK_AFTER_MINUTES); + if (idleTime > (kickAfterMinutes * 60000) + 60000) { + removePlayer(true); + } else if (client && idleTime == 60000 * kickAfterMinutes) { + std::ostringstream ss; + ss << "There was no variation in your behaviour for " << kickAfterMinutes << " minutes. You will be disconnected in one minute if there is no change in your actions until then."; + client->sendTextMessage(TextMessage(MESSAGE_ADMINISTRATOR, ss.str())); + } } - // Remove imbuement capacity - if (imbuement->capacity != 0) { - requestUpdate = true; - bonusCapacity = 0; + if (g_game().getWorldType() != WORLD_TYPE_PVP_ENFORCED) { + checkSkullTicks(interval / 1000); } - if (requestUpdate) { + addOfflineTrainingTime(interval); + if (lastStatsTrainingTime != getOfflineTrainingTime() / 60 / 1000) { sendStats(); - sendSkills(); } + + // Wheel of destiny major spells + wheel()->onThink(); + + g_callbacks().executeCallback(EventCallback_t::playerOnThink, &EventCallback::playerOnThink, getPlayer(), interval); } -void Player::updateImbuementTrackerStats() const { - if (imbuementTrackerWindowOpen) { - g_game().playerRequestInventoryImbuements(getID(), true); +void Player::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link) { + if (link == LINK_OWNER) { + // calling movement scripts + g_moveEvents().onPlayerEquip(getPlayer(), thing->getItem(), static_cast<Slots_t>(index), false); } -} -bool Player::addItemFromStash(uint16_t itemId, uint32_t itemCount) { - uint32_t stackCount = 100u; + bool requireListUpdate = true; + if (link == LINK_OWNER || link == LINK_TOPPARENT) { + const auto &item = oldParent ? oldParent->getItem() : nullptr; + const auto &container = item ? item->getContainer() : nullptr; + if (container) { + requireListUpdate = container->getHoldingPlayer() != getPlayer(); + } else { + requireListUpdate = oldParent != getPlayer(); + } - while (itemCount > 0) { - auto addValue = itemCount > stackCount ? stackCount : itemCount; - itemCount -= addValue; - std::shared_ptr<Item> newItem = Item::CreateItem(itemId, addValue); + updateInventoryWeight(); + updateItemsLight(); + sendInventoryIds(); + sendStats(); + } - if (!g_game().tryRetrieveStashItems(static_self_cast<Player>(), newItem)) { - g_game().internalPlayerAddItem(static_self_cast<Player>(), newItem, true); + if (const auto &item = thing->getItem()) { + if (const auto &container = item->getContainer()) { + onSendContainer(container); } - } - // This check is necessary because we need to block it when we retrieve an item from depot search. - if (!isDepotSearchOpenOnItem(itemId)) { - sendOpenStash(); - } + if (shopOwner && !scheduledSaleUpdate && requireListUpdate) { + updateSaleShopList(item); + } + } else if (const auto &creature = thing->getCreature()) { + if (creature == getPlayer()) { + // check containers + std::vector<std::shared_ptr<Container>> containers; - return true; -} + for (const auto &[containerId, containerInfo] : openContainers) { + const auto &container = containerInfo.container; + if (container == nullptr) { + continue; + } -void sendStowItems(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &stowItem, StashContainerList &itemDict) { - if (stowItem->getID() == item->getID()) { - itemDict.push_back(std::pair<std::shared_ptr<Item>, uint32_t>(stowItem, stowItem->getItemCount())); - } + if (!Position::areInRange<1, 1, 0>(container->getPosition(), getPosition())) { + containers.emplace_back(container); + } + } - if (auto container = stowItem->getContainer()) { - for (const auto &stowable_it : container->getStowableItems()) { - if ((stowable_it.first)->getID() == item->getID()) { - itemDict.push_back(stowable_it); + for (const auto &container : containers) { + autoCloseContainers(container); } } } } -void Player::stowItem(std::shared_ptr<Item> item, uint32_t count, bool allItems) { - if (!item || !item->isItemStorable()) { - sendCancelMessage("This item cannot be stowed here."); +void Player::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link) { + if (!thing) { return; } - StashContainerList itemDict; - if (allItems) { - if (!item->isInsideDepot(true)) { - // Stow "all items" from player backpack - if (auto backpack = getInventoryItem(CONST_SLOT_BACKPACK)) { - sendStowItems(item, backpack, itemDict); - } + const auto copyThing = thing; + const auto copyNewParent = newParent; - // Stow "all items" from loot pouch - auto itemParent = item->getParent(); - auto lootPouch = itemParent->getItem(); - if (itemParent && lootPouch && lootPouch->getID() == ITEM_GOLD_POUCH) { - sendStowItems(item, lootPouch, itemDict); - } + if (link == LINK_OWNER) { + if (const auto &item = copyThing->getItem()) { + g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast<Slots_t>(index)); } + } + bool requireListUpdate = true; - // Stow locker items - std::shared_ptr<DepotLocker> depotLocker = getDepotLocker(getLastDepotId()); - auto [itemVector, itemMap] = requestLockerItems(depotLocker); - for (const auto &lockerItem : itemVector) { - if (lockerItem == nullptr) { - break; - } - - if (item->isInsideDepot(true)) { - sendStowItems(item, lockerItem, itemDict); - } + if (link == LINK_OWNER || link == LINK_TOPPARENT) { + const auto &item = copyNewParent ? copyNewParent->getItem() : nullptr; + const auto &container = item ? item->getContainer() : nullptr; + if (container) { + requireListUpdate = container->getHoldingPlayer() != getPlayer(); + } else { + requireListUpdate = copyNewParent != getPlayer(); } - } else if (item->getContainer()) { - itemDict = item->getContainer()->getStowableItems(); - for (const std::shared_ptr<Item> &containerItem : item->getContainer()->getItems(true)) { - uint32_t depotChest = g_configManager().getNumber(DEPOTCHEST, __FUNCTION__); - bool validDepot = depotChest > 0 && depotChest < 21; - if (g_configManager().getBoolean(STASH_MOVING, __FUNCTION__) && containerItem && !containerItem->isStackable() && validDepot) { - g_game().internalMoveItem(containerItem->getParent(), getDepotChest(depotChest, true), INDEX_WHEREEVER, containerItem, containerItem->getItemCount(), nullptr); - movedItems++; - moved = true; - } - } - } else { - itemDict.emplace_back(item, count); - } - if (itemDict.empty()) { - sendCancelMessage("There is no stowable items on this container."); - return; + updateInventoryWeight(); + updateItemsLight(); + sendInventoryIds(); + sendStats(); } - stashContainer(itemDict); -} + if (const auto &item = copyThing->getItem()) { + if (const auto &container = item->getContainer()) { + checkLootContainers(container); -void Player::openPlayerContainers() { - std::vector<std::pair<uint8_t, std::shared_ptr<Container>>> openContainersList; + if (container->isRemoved() || !Position::areInRange<1, 1, 0>(getPosition(), container->getPosition())) { + autoCloseContainers(container); + } else if (container->getTopParent() == getPlayer()) { + onSendContainer(container); + } else if (const auto &topContainer = std::dynamic_pointer_cast<Container>(container->getTopParent())) { + if (const auto &depotChest = std::dynamic_pointer_cast<DepotChest>(topContainer)) { + bool isOwner = false; - for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; i++) { - std::shared_ptr<Item> item = inventory[i]; - if (!item) { - continue; - } + for (const auto &[depotId, depotChestMap] : depotChests) { + if (depotId == 0) { + continue; + } - std::shared_ptr<Container> itemContainer = item->getContainer(); - if (itemContainer) { - auto cid = item->getAttribute<int64_t>(ItemAttribute_t::OPENCONTAINER); - if (cid > 0) { - openContainersList.emplace_back(cid, itemContainer); - } - for (ContainerIterator it = itemContainer->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Container> subContainer = (*it)->getContainer(); - if (subContainer) { - auto subcid = (*it)->getAttribute<uint8_t>(ItemAttribute_t::OPENCONTAINER); - if (subcid > 0) { - openContainersList.emplace_back(subcid, subContainer); + if (depotChestMap == depotChest) { + isOwner = true; + onSendContainer(container); + } + } + + if (!isOwner) { + autoCloseContainers(container); } + } else { + onSendContainer(container); } + } else { + autoCloseContainers(container); } } - } - std::sort(openContainersList.begin(), openContainersList.end(), [](const std::pair<uint8_t, std::shared_ptr<Container>> &left, const std::pair<uint8_t, std::shared_ptr<Container>> &right) { - return left.first < right.first; - }); + // force list update if item exists tier + if (item->getTier() > 0 && !requireListUpdate) { + requireListUpdate = true; + } - for (auto &it : openContainersList) { - addContainer(it.first - 1, it.second); - onSendContainer(it.second); + if (shopOwner && !scheduledSaleUpdate && requireListUpdate) { + updateSaleShopList(item); + } } } -void Player::initializePrey() { - if (preys.empty()) { - for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { - auto slot = std::make_unique<PreySlot>(static_cast<PreySlot_t>(slotId)); - if (!g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { - slot->state = PreyDataState_Inactive; - } else if (slot->id == PreySlot_Three && !g_configManager().getBoolean(PREY_FREE_THIRD_SLOT, __FUNCTION__)) { - slot->state = PreyDataState_Locked; - } else if (slot->id == PreySlot_Two && !isPremium()) { - slot->state = PreyDataState_Locked; - } else { - slot->state = PreyDataState_Selection; - slot->reloadMonsterGrid(getPreyBlackList(), getLevel()); - } - - setPreySlotClass(slot); - } +void Player::sendUpdateTile(const std::shared_ptr<Tile> &updateTile, const Position &pos) const { + if (client) { + client->sendUpdateTile(updateTile, pos); } } -void Player::removePreySlotById(PreySlot_t slotid) { - auto it = std::remove_if(preys.begin(), preys.end(), [slotid](const std::unique_ptr<PreySlot> &preyIt) { - return preyIt->id == slotid; - }); +void Player::sendChannelMessage(const std::string &author, const std::string &text, SpeakClasses type, uint16_t channel) const { + if (client) { + client->sendChannelMessage(author, text, type, channel); + } +} - preys.erase(it, preys.end()); +void Player::sendChannelEvent(uint16_t channelId, const std::string &playerName, ChannelEvent_t channelEvent) const { + if (client) { + client->sendChannelEvent(channelId, playerName, channelEvent); + } } -void Player::initializeTaskHunting() { - if (taskHunting.empty()) { - for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { - auto slot = std::make_unique<TaskHuntingSlot>(static_cast<PreySlot_t>(slotId)); - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { - slot->state = PreyTaskDataState_Inactive; - } else if (slot->id == PreySlot_Three && !g_configManager().getBoolean(TASK_HUNTING_FREE_THIRD_SLOT, __FUNCTION__)) { - slot->state = PreyTaskDataState_Locked; - } else if (slot->id == PreySlot_Two && !isPremium()) { - slot->state = PreyTaskDataState_Locked; - } else { - slot->state = PreyTaskDataState_Selection; - slot->reloadMonsterGrid(getTaskHuntingBlackList(), getLevel()); - } +void Player::sendCreatureAppear(const std::shared_ptr<Creature> &creature, const Position &pos, bool isLogin) { + if (!creature) { + return; + } - setTaskHuntingSlotClass(slot); - } + auto tile = creature->getTile(); + if (!tile) { + return; } - if (client && g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__) && !client->oldProtocol) { - client->writeToOutputBuffer(g_ioprey().getTaskHuntingBaseDate()); + if (client) { + client->sendAddCreature(creature, pos, tile->getStackposOfCreature(static_self_cast<Player>(), creature), isLogin); } } -std::string Player::getBlessingsName() const { - uint8_t count = 0; - std::for_each(blessings.begin(), blessings.end(), [&count](uint8_t amount) { - if (amount != 0) { - count++; - } - }); +void Player::sendCreatureMove(const std::shared_ptr<Creature> &creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport) const { + if (client) { + client->sendMoveCreature(creature, newPos, newStackPos, oldPos, oldStackPos, teleport); + } +} - auto BlessingNames = g_game().getBlessingNames(); - std::ostringstream os; - for (uint8_t i = 1; i <= 8; i++) { - if (hasBlessing(i)) { - if (auto blessName = BlessingNames.find(static_cast<Blessings_t>(i)); - blessName != BlessingNames.end()) { - os << (*blessName).second; - } else { - continue; - } +void Player::sendCreatureTurn(const std::shared_ptr<Creature> &creature) { + if (!creature) { + return; + } - --count; - if (count > 1) { - os << ", "; - } else if (count == 1) { - os << " and "; - } else { - os << "."; - } + auto tile = creature->getTile(); + if (!tile) { + return; + } + + if (client && canSeeCreature(creature)) { + int32_t stackpos = tile->getStackposOfCreature(static_self_cast<Player>(), creature); + if (stackpos != -1) { + client->sendCreatureTurn(creature, stackpos); } } +} + +void Player::sendCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, const Position* pos) const { + if (client) { + client->sendCreatureSay(creature, type, text, pos); + } +} - return os.str(); +void Player::sendCreatureReload(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->reloadCreature(creature); + } } -bool Player::isCreatureUnlockedOnTaskHunting(const std::shared_ptr<MonsterType> mtype) const { - if (!mtype) { - return false; +void Player::sendPrivateMessage(const std::shared_ptr<Player> &speaker, SpeakClasses type, const std::string &text) const { + if (client) { + client->sendPrivateMessage(speaker, type, text); } +} - return getBestiaryKillCount(mtype->info.raceid) >= mtype->info.bestiaryToUnlock; +void Player::sendCreatureSquare(const std::shared_ptr<Creature> &creature, SquareColor_t color) const { + if (client) { + client->sendCreatureSquare(creature, color); + } } -void Player::triggerMomentum() { - auto item = getInventoryItem(CONST_SLOT_HEAD); - if (item == nullptr) { +void Player::sendCreatureChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) const { + if (client) { + client->sendCreatureOutfit(creature, outfit); + } +} + +void Player::sendCreatureChangeVisible(const std::shared_ptr<Creature> &creature, bool visible) { + if (!client || !creature) { return; } - double_t chance = item->getMomentumChance(); - double_t randomChance = uniform_random(0, 10000) / 100.; - if (getZoneType() != ZONE_PROTECTION && hasCondition(CONDITION_INFIGHT) && ((OTSYS_TIME() / 1000) % 2) == 0 && chance > 0 && randomChance < chance) { - bool triggered = false; - auto it = conditions.begin(); - while (it != conditions.end()) { - auto condItem = *it; - ConditionType_t type = condItem->getType(); - auto maxu16 = std::numeric_limits<uint16_t>::max(); - auto checkSpellId = condItem->getSubId(); - auto spellId = checkSpellId > maxu16 ? 0u : static_cast<uint16_t>(checkSpellId); - int32_t ticks = condItem->getTicks(); - int32_t newTicks = (ticks <= 2000) ? 0 : ticks - 2000; - triggered = true; - if (type == CONDITION_SPELLCOOLDOWN || (type == CONDITION_SPELLGROUPCOOLDOWN && spellId > SPELLGROUP_SUPPORT)) { - condItem->setTicks(newTicks); - type == CONDITION_SPELLGROUPCOOLDOWN ? sendSpellGroupCooldown(static_cast<SpellGroup_t>(spellId), newTicks) : sendSpellCooldown(spellId, newTicks); - } - ++it; + if (creature->getPlayer()) { + if (visible) { + client->sendCreatureOutfit(creature, creature->getCurrentOutfit()); + } else { + static Outfit_t outfit; + client->sendCreatureOutfit(creature, outfit); } - if (triggered) { - g_game().addMagicEffect(getPosition(), CONST_ME_HOURGLASS); - sendTextMessage(MESSAGE_ATTENTION, "Momentum was triggered."); + } else if (canSeeInvisibility()) { + client->sendCreatureOutfit(creature, creature->getCurrentOutfit()); + } else { + auto tile = creature->getTile(); + if (!tile) { + return; + } + int32_t stackpos = tile->getStackposOfCreature(static_self_cast<Player>(), creature); + if (stackpos == -1) { + return; + } + + if (visible) { + client->sendAddCreature(creature, creature->getPosition(), stackpos, false); + } else { + client->sendRemoveTileThing(creature->getPosition(), stackpos); } } } -void Player::clearCooldowns() { - auto it = conditions.begin(); - while (it != conditions.end()) { - auto condItem = *it; - ConditionType_t type = condItem->getType(); - auto maxu16 = std::numeric_limits<uint16_t>::max(); - auto checkSpellId = condItem->getSubId(); - auto spellId = checkSpellId > maxu16 ? 0u : static_cast<uint16_t>(checkSpellId); - if (type == CONDITION_SPELLCOOLDOWN || type == CONDITION_SPELLGROUPCOOLDOWN) { - condItem->setTicks(0); - type == CONDITION_SPELLGROUPCOOLDOWN ? sendSpellGroupCooldown(static_cast<SpellGroup_t>(spellId), 0) : sendSpellCooldown(spellId, 0); - } - ++it; +void Player::sendCreatureLight(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendCreatureLight(creature); } } -void Player::triggerTranscendance() { - if (wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR_FORGE) > OTSYS_TIME()) { - return; +void Player::sendCreatureIcon(const std::shared_ptr<Creature> &creature) const { + if (client && !client->oldProtocol) { + client->sendCreatureIcon(creature); } +} - auto item = getInventoryItem(CONST_SLOT_LEGS); - if (item == nullptr) { - return; +void Player::sendUpdateCreature(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendUpdateCreature(creature); } +} - double_t chance = item->getTranscendenceChance(); - double_t randomChance = uniform_random(0, 10000) / 100.; - if (getZoneType() != ZONE_PROTECTION && checkLastAggressiveActionWithin(2000) && ((OTSYS_TIME() / 1000) % 2) == 0 && chance > 0 && randomChance < chance) { - int64_t duration = g_configManager().getNumber(TRANSCENDANCE_AVATAR_DURATION, __FUNCTION__); - auto outfitCondition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_OUTFIT, duration, 0)->static_self_cast<ConditionOutfit>(); - Outfit_t outfit; - outfit.lookType = getVocation()->getAvatarLookType(); - outfitCondition->setOutfit(outfit); - addCondition(outfitCondition); - wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR_FORGE, OTSYS_TIME() + duration); - g_game().addMagicEffect(getPosition(), CONST_ME_AVATAR_APPEAR); +void Player::sendCreatureWalkthrough(const std::shared_ptr<Creature> &creature, bool walkthrough) const { + if (client) { + client->sendCreatureWalkthrough(creature, walkthrough); + } +} - sendSkills(); - sendStats(); - sendBasicData(); +void Player::sendCreatureShield(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->sendCreatureShield(creature); + } +} - sendTextMessage(MESSAGE_ATTENTION, "Transcendance was triggered."); +void Player::sendCreatureType(const std::shared_ptr<Creature> &creature, uint8_t creatureType) const { + if (client) { + client->sendCreatureType(creature, creatureType); + } +} - // Send player data after transcendance timer expire - const auto &task = createPlayerTask( - std::max<uint32_t>(SCHEDULER_MINTICKS, duration), - [playerId = getID()] { - auto player = g_game().getPlayerByID(playerId); - if (player) { - player->sendSkills(); - player->sendStats(); - player->sendBasicData(); - } - }, - "Player::triggerTranscendance" - ); - g_dispatcher().scheduleEvent(task); +void Player::sendSpellCooldown(uint16_t spellId, uint32_t time) const { + if (client) { + client->sendSpellCooldown(spellId, time); + } +} - wheel()->sendGiftOfLifeCooldown(); - g_game().reloadCreature(getPlayer()); +void Player::sendSpellGroupCooldown(SpellGroup_t groupId, uint32_t time) const { + if (client) { + client->sendSpellGroupCooldown(groupId, time); } } -/******************************************************************************* - * Depot search system - ******************************************************************************/ -void Player::requestDepotItems() { - ItemsTierCountList itemMap; - uint16_t count = 0; - std::shared_ptr<DepotLocker> depotLocker = getDepotLocker(getLastDepotId()); - if (!depotLocker) { +void Player::sendUseItemCooldown(uint32_t time) const { + if (client) { + client->sendUseItemCooldown(time); + } +} + +void Player::reloadCreature(const std::shared_ptr<Creature> &creature) const { + if (client) { + client->reloadCreature(creature); + } +} + +void Player::sendModalWindow(const ModalWindow &modalWindow) { + if (!client) { return; } - for (const std::shared_ptr<Item> &locker : depotLocker->getItemList()) { - std::shared_ptr<Container> c = locker->getContainer(); - if (!c || c->empty()) { - continue; - } + modalWindows.emplace_back(modalWindow.id); + client->sendModalWindow(modalWindow); +} - for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { - auto itemMap_it = itemMap.find((*it)->getID()); +// container - uint8_t itemTier = Item::items[(*it)->getID()].upgradeClassification > 0 ? (*it)->getTier() + 1 : 0; - if (itemMap_it == itemMap.end()) { - std::map<uint8_t, uint32_t> itemTierMap; - itemTierMap[itemTier] = Item::countByType((*it), -1); - itemMap[(*it)->getID()] = itemTierMap; - count++; - } else if (auto itemTier_it = itemMap[(*it)->getID()].find(itemTier); itemTier_it == itemMap[(*it)->getID()].end()) { - itemMap[(*it)->getID()][itemTier] = Item::countByType((*it), -1); - count++; - } else { - itemMap[(*it)->getID()][itemTier] += Item::countByType((*it), -1); - } - } +void Player::closeAllExternalContainers() { + if (openContainers.empty()) { + return; } - for (const auto &[itemId, itemCount] : getStashItems()) { - auto itemMap_it = itemMap.find(itemId); - // Stackable items not have upgrade classification - if (Item::items[itemId].upgradeClassification > 0) { - g_logger().error("{} - Player {} have wrong item with id {} on stash with upgrade classification", __FUNCTION__, getName(), itemId); + std::vector<std::shared_ptr<Container>> containerToClose; + for (const auto &[containerId, containerInfo] : openContainers) { + const auto &container = containerInfo.container; + if (!container) { continue; } - if (itemMap_it == itemMap.end()) { - std::map<uint8_t, uint32_t> itemTierMap; - itemTierMap[0] = itemCount; - itemMap[itemId] = itemTierMap; - count++; - } else if (auto itemTier_it = itemMap[itemId].find(0); itemTier_it == itemMap[itemId].end()) { - itemMap[itemId][0] = itemCount; - count++; - } else { - itemMap[itemId][0] += itemCount; + if (container->getHoldingPlayer() != getPlayer()) { + containerToClose.emplace_back(container); } } - setDepotSearchIsOpen(1, 0); - sendDepotItems(itemMap, count); + for (const auto &container : containerToClose) { + autoCloseContainers(container); + } } -void Player::requestDepotSearchItem(uint16_t itemId, uint8_t tier) { - ItemVector depotItems; - ItemVector inboxItems; - uint32_t depotCount = 0; - uint32_t inboxCount = 0; - uint32_t stashCount = 0; +// container - if (const ItemType &iType = Item::items[itemId]; - iType.stackable && iType.wareId > 0) { - stashCount = getStashItemCount(itemId); +void Player::sendAddContainerItem(const std::shared_ptr<Container> &container, std::shared_ptr<Item> item) { + if (!client) { + return; } - std::shared_ptr<DepotLocker> depotLocker = getDepotLocker(getLastDepotId()); - if (!depotLocker) { + if (!container) { return; } - for (const std::shared_ptr<Item> &locker : depotLocker->getItemList()) { - std::shared_ptr<Container> c = locker->getContainer(); - if (!c || c->empty()) { + for (const auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container != container) { continue; } - for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; - if (!item || item->getID() != itemId || item->getTier() != tier) { - continue; - } - - if (c->isInbox()) { - if (inboxItems.size() < 255) { - inboxItems.push_back(item); - } - inboxCount += Item::countByType(item, -1); + uint16_t slot = containerInfo.index; + if (container->getID() == ITEM_BROWSEFIELD) { + const uint16_t containerSize = container->size() - 1; + const uint16_t pageEnd = containerInfo.index + container->capacity() - 1; + if (containerSize > pageEnd) { + slot = pageEnd; + item = container->getItemByIndex(pageEnd); } else { - if (depotItems.size() < 255) { - depotItems.push_back(item); - } - depotCount += Item::countByType(item, -1); + slot = containerSize; } + } else if (containerInfo.index >= container->capacity()) { + item = container->getItemByIndex(containerInfo.index - 1); } + client->sendAddContainerItem(containerId, slot, item); } - - setDepotSearchIsOpen(itemId, tier); - sendDepotSearchResultDetail(itemId, tier, depotCount, depotItems, inboxCount, inboxItems, stashCount); } -void Player::retrieveAllItemsFromDepotSearch(uint16_t itemId, uint8_t tier, bool isDepot) { - std::shared_ptr<DepotLocker> depotLocker = getDepotLocker(getLastDepotId()); - if (!depotLocker) { +void Player::sendUpdateContainerItem(const std::shared_ptr<Container> &container, uint16_t slot, const std::shared_ptr<Item> &newItem) { + if (!client) { return; } - std::vector<std::shared_ptr<Item>> itemsVector; - for (const std::shared_ptr<Item> &locker : depotLocker->getItemList()) { - std::shared_ptr<Container> c = locker->getContainer(); - if (!c || c->empty() || - // Retrieve from inbox. - (c->isInbox() && isDepot) || - // Retrieve from depot. - (!c->isInbox() && !isDepot)) { + for (const auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container != container) { continue; } - for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; - if (!item) { - continue; - } + if (slot < containerInfo.index) { + continue; + } - if (item->getID() == itemId && item->getTier() == depotSearchOnItem.second) { - itemsVector.push_back(item); - } + const uint16_t pageEnd = containerInfo.index + container->capacity(); + if (slot >= pageEnd) { + continue; } + + client->sendUpdateContainerItem(containerId, slot, newItem); } +} - ReturnValue ret = RETURNVALUE_NOERROR; - for (const std::shared_ptr<Item> &item : itemsVector) { - // First lets try to retrieve the item to the stash retrieve container. - if (g_game().tryRetrieveStashItems(static_self_cast<Player>(), item)) { +void Player::sendRemoveContainerItem(const std::shared_ptr<Container> &container, uint16_t slot) { + if (!client) { + return; + } + + if (!container) { + return; + } + + for (auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container != container) { continue; } - // If the retrieve fails to move the item to the stash retrieve container, let's add the item anywhere. - if (ret = g_game().internalMoveItem(item->getParent(), getPlayer(), INDEX_WHEREEVER, item, item->getItemCount(), nullptr); ret == RETURNVALUE_NOERROR) { - continue; + uint16_t &firstIndex = containerInfo.index; + if (firstIndex > 0 && firstIndex >= container->size() - 1) { + firstIndex -= container->capacity(); + sendContainer(containerId, container, false, firstIndex); } - sendCancelMessage(ret); - return; + client->sendRemoveContainerItem(containerId, std::max<uint16_t>(slot, firstIndex), container->getItemByIndex(container->capacity() + firstIndex)); } +} - requestDepotSearchItem(itemId, tier); +void Player::sendContainer(uint8_t cid, const std::shared_ptr<Container> &container, bool hasParent, uint16_t firstIndex) const { + if (client) { + client->sendContainer(cid, container, hasParent, firstIndex); + } } -void Player::openContainerFromDepotSearch(const Position &pos) { - if (!isDepotSearchOpen()) { - sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); - return; +// inventory + +void Player::sendDepotItems(const ItemsTierCountList &itemMap, uint16_t count) const { + if (client) { + client->sendDepotItems(itemMap, count); } +} - std::shared_ptr<Item> item = getItemFromDepotSearch(depotSearchOnItem.first, pos); - if (!item) { - sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); - return; +void Player::sendCloseDepotSearch() const { + if (client) { + client->sendCloseDepotSearch(); } +} - std::shared_ptr<Container> container = item->getParent() ? item->getParent()->getContainer() : nullptr; - if (!container) { - sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); - return; +void Player::sendDepotSearchResultDetail(uint16_t itemId, uint8_t tier, uint32_t depotCount, const ItemVector &depotItems, uint32_t inboxCount, const ItemVector &inboxItems, uint32_t stashCount) const { + if (client) { + client->sendDepotSearchResultDetail(itemId, tier, depotCount, depotItems, inboxCount, inboxItems, stashCount); } +} - g_actions().useItem(static_self_cast<Player>(), pos, 0, container, false); +void Player::sendCoinBalance() const { + if (client) { + client->sendCoinBalance(); + } } -std::shared_ptr<Item> Player::getItemFromDepotSearch(uint16_t itemId, const Position &pos) { - std::shared_ptr<DepotLocker> depotLocker = getDepotLocker(getLastDepotId()); - if (!depotLocker) { - return nullptr; +void Player::sendInventoryItem(Slots_t slot, const std::shared_ptr<Item> &item) const { + if (client) { + client->sendInventoryItem(slot, item); } +} - uint8_t index = 0; - for (const std::shared_ptr<Item> &locker : depotLocker->getItemList()) { - std::shared_ptr<Container> c = locker->getContainer(); - if (!c || c->empty() || (c->isInbox() && pos.y != 0x21) || // From inbox. - (!c->isInbox() && pos.y != 0x20)) { // From depot. +void Player::sendInventoryIds() const { + if (client) { + client->sendInventoryIds(); + } +} + +std::vector<std::shared_ptr<Condition>> Player::getMuteConditions() const { + std::vector<std::shared_ptr<Condition>> muteConditions; + muteConditions.reserve(conditions.size()); + + for (const auto &condition : conditions) { + if (condition->getTicks() <= 0) { continue; } - for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; - if (!item || item->getID() != itemId || item->getTier() != depotSearchOnItem.second) { - continue; - } - - if (pos.z == index) { - return item; - } - index++; + const auto &type = condition->getType(); + if (type != CONDITION_MUTED && type != CONDITION_CHANNELMUTEDTICKS && type != CONDITION_YELLTICKS) { + continue; } + + muteConditions.emplace_back(condition); } + return muteConditions; +} - return nullptr; +[[nodiscard]] std::shared_ptr<Guild> Player::getGuild() const { + return guild; } -std::pair<std::vector<std::shared_ptr<Item>>, std::map<uint16_t, std::map<uint8_t, uint32_t>>> -Player::requestLockerItems(std::shared_ptr<DepotLocker> depotLocker, bool sendToClient /*= false*/, uint8_t tier /*= 0*/) const { - if (!depotLocker) { - g_logger().error("{} - Depot locker is nullptr", __FUNCTION__); - return {}; +void Player::setGuild(const std::shared_ptr<Guild> &newGuild) { + if (newGuild == guild) { + return; } - std::map<uint16_t, std::map<uint8_t, uint32_t>> lockerItems; - std::vector<std::shared_ptr<Item>> itemVector; - std::vector<std::shared_ptr<Container>> containers { depotLocker }; + if (guild) { + guild->removeMember(static_self_cast<Player>()); + guild = nullptr; + } - for (size_t i = 0; i < containers.size(); ++i) { - std::shared_ptr<Container> container = containers[i]; + guildNick.clear(); + guildRank = nullptr; - for (const auto &item : container->getItemList()) { - std::shared_ptr<Container> lockerContainers = item->getContainer(); - if (lockerContainers && !lockerContainers->empty()) { - containers.push_back(lockerContainers); - continue; - } + if (newGuild) { + const auto &rank = newGuild->getRankByLevel(1); + if (!rank) { + return; + } - const ItemType &itemType = Item::items[item->getID()]; - if (item->isStoreItem() || itemType.wareId == 0) { - continue; - } + guild = newGuild; + guildRank = rank; + newGuild->addMember(static_self_cast<Player>()); + } +} - if (lockerContainers && (!itemType.isContainer() || lockerContainers->capacity() != itemType.maxItems)) { - continue; - } +[[nodiscard]] GuildRank_ptr Player::getGuildRank() const { + return guildRank; +} - if (!item->hasMarketAttributes() || (!sendToClient && item->getTier() != tier)) { - continue; - } +void Player::setGuildRank(GuildRank_ptr newGuildRank) { + guildRank = std::move(newGuildRank); +} - lockerItems[itemType.wareId][item->getTier()] += Item::countByType(item, -1); - itemVector.push_back(item); - } +bool Player::isGuildMate(const std::shared_ptr<Player> &player) const { + if (!player || !guild) { + return false; } + return guild == player->guild; +} - StashItemList stashToSend = getStashItems(); - for (const auto &[itemId, itemCount] : stashToSend) { - const ItemType &itemType = Item::items[itemId]; - if (itemType.wareId != 0) { - lockerItems[itemType.wareId][0] += itemCount; - } - } +bool Player::addItemFromStash(uint16_t itemId, uint32_t itemCount) { + const uint32_t stackCount = 100u; - return { itemVector, lockerItems }; -} + while (itemCount > 0) { + const auto addValue = itemCount > stackCount ? stackCount : itemCount; + itemCount -= addValue; + const auto &newItem = Item::CreateItem(itemId, addValue); -std::pair<std::vector<std::shared_ptr<Item>>, uint16_t> Player::getLockerItemsAndCountById(const std::shared_ptr<DepotLocker> &depotLocker, uint8_t tier, uint16_t itemId) { - std::vector<std::shared_ptr<Item>> lockerItems; - auto [itemVector, itemMap] = requestLockerItems(depotLocker, false, tier); - uint16_t totalCount = 0; - for (const auto &item : itemVector) { - if (!item || item->getID() != itemId) { - continue; + if (!g_game().tryRetrieveStashItems(static_self_cast<Player>(), newItem)) { + g_game().internalPlayerAddItem(static_self_cast<Player>(), newItem, true); } + } - totalCount++; - lockerItems.push_back(item); + // This check is necessary because we need to block it when we retrieve an item from depot search. + if (!isDepotSearchOpenOnItem(itemId)) { + sendOpenStash(); } - return std::make_pair(lockerItems, totalCount); + return true; } -bool Player::saySpell( - SpeakClasses type, - const std::string &text, - bool ghostMode, - Spectators* spectatorsPtr /* = nullptr*/, - const Position* pos /* = nullptr*/ -) { - if (text.empty()) { - g_logger().debug("{} - Spell text is empty for player {}", __FUNCTION__, getName()); - return false; +void sendStowItems(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &stowItem, StashContainerList &itemDict) { + if (stowItem->getID() == item->getID()) { + itemDict.emplace_back(stowItem, stowItem->getItemCount()); } - if (!pos) { - pos = &getPosition(); + if (const auto &container = stowItem->getContainer()) { + std::ranges::copy_if(container->getStowableItems(), std::back_inserter(itemDict), [&item](const auto &stowable_it) { + return stowable_it.first->getID() == item->getID(); + }); } +} - Spectators spectators; +void Player::stowItem(const std::shared_ptr<Item> &item, uint32_t count, bool allItems) { + if (!item || !item->isItemStorable()) { + sendCancelMessage("This item cannot be stowed here."); + return; + } - if (!spectatorsPtr || spectatorsPtr->empty()) { - // This somewhat complex construct ensures that the cached Spectators - // is used if available and if it can be used, else a local vector is - // used (hopefully the compiler will optimize away the construction of - // the temporary when it's not used). - if (type != TALKTYPE_YELL && type != TALKTYPE_MONSTER_YELL) { - spectators.find<Creature>(*pos, false, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_Y, MAP_MAX_CLIENT_VIEW_PORT_Y); - } else { - spectators.find<Creature>(*pos, true, (MAP_MAX_CLIENT_VIEW_PORT_X + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_X + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_Y + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_Y + 1) * 2); + StashContainerList itemDict; + if (allItems) { + if (!item->isInsideDepot(true)) { + // Stow "all items" from player backpack + if (const auto &backpack = getInventoryItem(CONST_SLOT_BACKPACK)) { + sendStowItems(item, backpack, itemDict); + } + + // Stow "all items" from loot pouch + const auto &itemParent = item->getParent(); + const auto &lootPouch = itemParent->getItem(); + if (itemParent && lootPouch && lootPouch->getID() == ITEM_GOLD_POUCH) { + sendStowItems(item, lootPouch, itemDict); + } } - } else { - spectators = (*spectatorsPtr); - } - int32_t valueEmote = 0; - // Send to client - for (const std::shared_ptr<Creature> &spectator : spectators) { - if (std::shared_ptr<Player> tmpPlayer = spectator->getPlayer()) { - if (g_configManager().getBoolean(EMOTE_SPELLS, __FUNCTION__)) { - valueEmote = tmpPlayer->getStorageValue(STORAGEVALUE_EMOTE); + // Stow locker items + const auto &depotLocker = getDepotLocker(getLastDepotId()); + const auto &[itemVector, itemMap] = requestLockerItems(depotLocker); + for (const auto &lockerItem : itemVector) { + if (lockerItem == nullptr) { + break; } - if (!ghostMode || tmpPlayer->canSeeCreature(static_self_cast<Player>())) { - if (valueEmote == 1) { - tmpPlayer->sendCreatureSay(static_self_cast<Player>(), TALKTYPE_MONSTER_SAY, text, pos); - } else { - tmpPlayer->sendCreatureSay(static_self_cast<Player>(), TALKTYPE_SPELL_USE, text, pos); - } + + if (item->isInsideDepot(true)) { + sendStowItems(item, lockerItem, itemDict); + } + } + } else if (item->getContainer()) { + itemDict = item->getContainer()->getStowableItems(); + for (const std::shared_ptr<Item> &containerItem : item->getContainer()->getItems(true)) { + uint32_t depotChest = g_configManager().getNumber(DEPOTCHEST); + bool validDepot = depotChest > 0 && depotChest < 21; + if (g_configManager().getBoolean(STASH_MOVING) && containerItem && !containerItem->isStackable() && validDepot) { + g_game().internalMoveItem(containerItem->getParent(), getDepotChest(depotChest, true), INDEX_WHEREEVER, containerItem, containerItem->getItemCount(), nullptr); + movedItems++; + moved = true; } } + } else { + itemDict.emplace_back(item, count); } - // Execute lua event method - for (const std::shared_ptr<Creature> &spectator : spectators) { - auto tmpPlayer = spectator->getPlayer(); - if (!tmpPlayer) { - continue; - } + if (itemDict.empty()) { + sendCancelMessage("There is no stowable items on this container."); + return; + } - tmpPlayer->onCreatureSay(static_self_cast<Player>(), type, text); - if (static_self_cast<Player>() != tmpPlayer) { - g_events().eventCreatureOnHear(tmpPlayer, getPlayer(), text, type); - g_callbacks().executeCallback(EventCallback_t::creatureOnHear, &EventCallback::creatureOnHear, tmpPlayer, getPlayer(), text, type); + stashContainer(itemDict); +} + +void Player::sendPreyData() const { + if (client) { + for (const std::unique_ptr<PreySlot> &slot : preys) { + client->sendPreyData(slot); } + + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards()); } - return true; } -// Forge system -void Player::forgeFuseItems(ForgeAction_t actionType, uint16_t firstItemId, uint8_t tier, uint16_t secondItemId, bool success, bool reduceTierLoss, bool convergence, uint8_t bonus, uint8_t coreCount) { - if (getFreeBackpackSlots() == 0) { - sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); - return; +void Player::sendPreyTimeLeft(const std::unique_ptr<PreySlot> &slot) const { + if (g_configManager().getBoolean(PREY_ENABLED) && client) { + client->sendPreyTimeLeft(slot); } +} - ForgeHistory history; - history.actionType = actionType; - history.tier = tier; - history.success = success; - history.tierLoss = reduceTierLoss; +void Player::reloadPreySlot(PreySlot_t slotid) { + if (g_configManager().getBoolean(PREY_ENABLED) && client) { + client->sendPreyData(getPreySlotById(slotid)); + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); + } +} - auto firstForgingItem = getForgeItemFromId(firstItemId, tier); - if (!firstForgingItem) { - g_logger().error("[Log 1] Player with name {} failed to fuse item with id {}", getName(), firstItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; +const std::unique_ptr<PreySlot> &Player::getPreySlotById(PreySlot_t slotid) { + if (auto it = std::ranges::find_if(preys, [slotid](const std::unique_ptr<PreySlot> &preyIt) { + return preyIt->id == slotid; + }); + it != preys.end()) { + return *it; } - auto returnValue = g_game().internalRemoveItem(firstForgingItem, 1); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 1] Failed to remove forge item {} from player with name {}", firstItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + + return PreySlotNull; +} + +bool Player::setPreySlotClass(std::unique_ptr<PreySlot> &slot) { + if (getPreySlotById(slot->id)) { + return false; } - auto secondForgingItem = getForgeItemFromId(secondItemId, tier); - if (!secondForgingItem) { - g_logger().error("[Log 2] Player with name {} failed to fuse item with id {}", getName(), secondItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + + preys.emplace_back(std::move(slot)); + return true; +} + +bool Player::usePreyCards(uint16_t amount) { + if (preyCards < amount) { + return false; } - if (returnValue = g_game().internalRemoveItem(secondForgingItem, 1); - 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); - return; + + preyCards -= amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); } + return true; +} - auto exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1); - if (!exaltationChest) { - g_logger().error("Failed to create exaltation chest"); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; +void Player::addPreyCards(uint64_t amount) { + preyCards += amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); } - auto exaltationContainer = exaltationChest->getContainer(); - if (!exaltationContainer) { - g_logger().error("Failed to create exaltation container"); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; +} + +uint64_t Player::getPreyCards() const { + return preyCards; +} + +uint32_t Player::getPreyRerollPrice() const { + return getLevel() * g_configManager().getNumber(PREY_REROLL_PRICE_LEVEL); +} + +std::vector<uint16_t> Player::getPreyBlackList() const { + std::vector<uint16_t> rt; + for (const std::unique_ptr<PreySlot> &slot : preys) { + if (slot) { + if (slot->isOccupied()) { + rt.push_back(slot->selectedRaceId); + } + for (uint16_t raceId : slot->raceIdList) { + rt.push_back(raceId); + } + } } - std::shared_ptr<Item> firstForgedItem = Item::CreateItem(firstItemId, 1); - if (!firstForgedItem) { - g_logger().error("[Log 3] Player with name {} failed to fuse item with id {}", getName(), firstItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + return rt; +} + +const std::unique_ptr<PreySlot> &Player::getPreyWithMonster(uint16_t raceId) const { + if (!g_configManager().getBoolean(PREY_ENABLED)) { + return PreySlotNull; } - returnValue = g_game().internalAddItem(exaltationContainer, firstForgedItem, INDEX_WHEREEVER); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 1] Failed to add forge item {} from player with name {}", firstItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + + if (auto it = std::ranges::find_if(preys, [raceId](const std::unique_ptr<PreySlot> &preyPtr) { + return preyPtr->selectedRaceId == raceId; + }); + it != preys.end()) { + return *it; } - auto configKey = convergence ? FORGE_CONVERGENCE_FUSION_DUST_COST : FORGE_FUSION_DUST_COST; - auto dustCost = static_cast<uint64_t>(g_configManager().getNumber(configKey, __FUNCTION__)); - if (convergence) { - firstForgedItem->setTier(tier + 1); - history.dustCost = dustCost; - setForgeDusts(getForgeDusts() - dustCost); + return PreySlotNull; +} - uint64_t cost = 0; - for (const auto* itemClassification : g_game().getItemsClassifications()) { - if (itemClassification->id != firstForgingItem->getClassification()) { - continue; - } +// Task hunting system - for (const auto &[mapTier, mapPrice] : itemClassification->tiers) { - if (mapTier == firstForgingItem->getTier()) { - cost = mapPrice.convergenceFusionPrice; - break; - } +void Player::initializeTaskHunting() { + if (taskHunting.empty()) { + for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { + auto slot = std::make_unique<TaskHuntingSlot>(static_cast<PreySlot_t>(slotId)); + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { + slot->state = PreyTaskDataState_Inactive; + } else if (slot->id == PreySlot_Three && !g_configManager().getBoolean(TASK_HUNTING_FREE_THIRD_SLOT)) { + slot->state = PreyTaskDataState_Locked; + } else if (slot->id == PreySlot_Two && !isPremium()) { + slot->state = PreyTaskDataState_Locked; + } else { + slot->state = PreyTaskDataState_Selection; + slot->reloadMonsterGrid(getTaskHuntingBlackList(), getLevel()); } - break; + + setTaskHuntingSlotClass(slot); } - if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { - g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + } + + if (client && g_configManager().getBoolean(TASK_HUNTING_ENABLED) && !client->oldProtocol) { + client->writeToOutputBuffer(g_ioprey().getTaskHuntingBaseDate()); + } +} + +bool Player::isCreatureUnlockedOnTaskHunting(const std::shared_ptr<MonsterType> &mtype) const { + if (!mtype) { + return false; + } + + return getBestiaryKillCount(mtype->info.raceid) >= mtype->info.bestiaryToUnlock; +} + +bool Player::setTaskHuntingSlotClass(std::unique_ptr<TaskHuntingSlot> &slot) { + if (getTaskHuntingSlotById(slot->id)) { + return false; + } + + taskHunting.emplace_back(std::move(slot)); + return true; +} + +uint8_t Player::getBlessingCount(uint8_t index, bool storeCount) const { + if (!storeCount) { + if (index > 0 && index <= blessings.size()) { + return blessings[index - 1]; + } else { + g_logger().error("[{}] - index outside range 0-10.", __FUNCTION__); + return 0; } - g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_convergence_fuse" } }); - history.cost = cost; - } else { - firstForgedItem->setTier(tier); - std::shared_ptr<Item> secondForgedItem = Item::CreateItem(secondItemId, 1); - if (!secondForgedItem) { - g_logger().error("[Log 4] Player with name {} failed to fuse item with id {}", getName(), secondItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + } + auto amount = kv()->scoped("summary")->scoped("blessings")->scoped(fmt::format("{}", index))->get("amount"); + return amount ? static_cast<uint8_t>(amount->getNumber()) : 0; +} + +std::string Player::getBlessingsName() const { + std::vector<std::string> blessingNames; + for (const auto &bless : magic_enum::enum_values<Blessings>()) { + if (hasBlessing(enumToValue(bless))) { + std::string name = toStartCaseWithSpace(magic_enum::enum_name(bless).data()); + blessingNames.emplace_back(name); } + } - secondForgedItem->setTier(tier); - returnValue = g_game().internalAddItem(exaltationContainer, secondForgedItem, INDEX_WHEREEVER); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 2] Failed to add forge item {} from player with name {}", secondItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + std::ostringstream os; + if (!blessingNames.empty()) { + // Join all elements but the last with ", " and add the last one with " and " + for (size_t i = 0; i < blessingNames.size() - 1; ++i) { + os << blessingNames[i] << ", "; + } + if (blessingNames.size() > 1) { + os << "and "; } + os << blessingNames.back() << "."; + } - if (success) { - firstForgedItem->setTier(tier + 1); + return os.str(); +} - if (bonus != 1) { - history.dustCost = dustCost; - setForgeDusts(getForgeDusts() - dustCost); - } - if (bonus != 2) { - if (coreCount != 0 && !removeItemCountById(ITEM_FORGE_CORE, coreCount)) { - g_logger().error("[{}][Log 1] Failed to remove item 'id :{} count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), coreCount, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - history.coresCost = coreCount; - } - if (bonus != 3) { - uint64_t cost = 0; - for (const auto* itemClassification : g_game().getItemsClassifications()) { - if (itemClassification->id != firstForgedItem->getClassification()) { - continue; - } - if (!itemClassification->tiers.contains(firstForgedItem->getTier())) { - g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, firstForgedItem->getTier(), firstForgedItem->getClassification(), itemClassification->id); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - break; - } - cost = itemClassification->tiers.at(firstForgedItem->getTier()).regularPrice; - break; - } - if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { - g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_fuse" } }); - history.cost = cost; +void Player::disconnect() const { + if (client) { + client->disconnect(); + } +} + +uint32_t Player::getIP() const { + return client ? client->getIP() : 0; +} + +void Player::reloadTaskSlot(PreySlot_t slotid) { + if (g_configManager().getBoolean(TASK_HUNTING_ENABLED) && client) { + client->sendTaskHuntingData(getTaskHuntingSlotById(slotid)); + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); + } +} + +const std::unique_ptr<TaskHuntingSlot> &Player::getTaskHuntingSlotById(PreySlot_t slotid) { + if (auto it = std::ranges::find_if(taskHunting, [slotid](const std::unique_ptr<TaskHuntingSlot> &itTask) { + return itTask->id == slotid; + }); + it != taskHunting.end()) { + return *it; + } + + return TaskHuntingSlotNull; +} + +std::vector<uint16_t> Player::getTaskHuntingBlackList() const { + std::vector<uint16_t> rt; + + std::ranges::for_each(taskHunting, [&rt](const std::unique_ptr<TaskHuntingSlot> &slot) { + if (slot->isOccupied()) { + rt.push_back(slot->selectedRaceId); + } else { + std::ranges::for_each(slot->raceIdList, [&rt](uint16_t raceId) { + rt.push_back(raceId); + }); + } + }); + + return rt; +} + +void Player::sendTaskHuntingData() const { + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); + for (const std::unique_ptr<TaskHuntingSlot> &slot : taskHunting) { + if (slot) { + client->sendTaskHuntingData(slot); } + } + } +} - if (bonus == 4) { - if (tier > 0) { - secondForgedItem->setTier(tier - 1); - } - } else if (bonus == 6) { - secondForgedItem->setTier(tier + 1); - } else if (bonus == 7 && tier + 2 <= firstForgedItem->getClassification()) { - firstForgedItem->setTier(tier + 2); - } +void Player::addTaskHuntingPoints(uint64_t amount) { + taskHuntingPoints += amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); + } +} - if (bonus != 4 && bonus != 5 && bonus != 6 && bonus != 8) { - returnValue = g_game().internalRemoveItem(secondForgedItem, 1); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 6] Failed to remove forge item {} from player with name {}", secondItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - } - } else { - auto isTierLost = uniform_random(1, 100) <= (reduceTierLoss ? g_configManager().getNumber(FORGE_TIER_LOSS_REDUCTION, __FUNCTION__) : 100); - if (isTierLost) { - if (secondForgedItem->getTier() >= 1) { - secondForgedItem->setTier(tier - 1); - } else { - returnValue = g_game().internalRemoveItem(secondForgedItem, 1); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 7] Failed to remove forge item {} from player with name {}", secondItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - } - } - bonus = (isTierLost ? 0 : 8); - history.coresCost = coreCount; +bool Player::useTaskHuntingPoints(uint64_t amount) { + if (taskHuntingPoints < amount) { + return false; + } - if (getForgeDusts() < dustCost) { - g_logger().error("[Log 7] Failed to remove fuse dusts from player with name {}", getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } else { - setForgeDusts(getForgeDusts() - dustCost); - } + taskHuntingPoints -= amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); + } + return true; +} - if (coreCount != 0 && !removeItemCountById(ITEM_FORGE_CORE, coreCount)) { - g_logger().error("[{}][Log 2] Failed to remove item 'id: {}, count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), coreCount, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } +uint64_t Player::getTaskHuntingPoints() const { + return taskHuntingPoints; +} - uint64_t cost = 0; - for (const auto* itemClassification : g_game().getItemsClassifications()) { - if (itemClassification->id != firstForgingItem->getClassification()) { - continue; - } - if (!itemClassification->tiers.contains(firstForgingItem->getTier() + 1)) { - g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, firstForgingItem->getTier() + 1, firstForgingItem->getClassification(), itemClassification->id); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - break; - } - cost = itemClassification->tiers.at(firstForgingItem->getTier() + 1).regularPrice; - break; - } - if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { - g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_fuse" } }); +uint32_t Player::getTaskHuntingRerollPrice() const { + return getLevel() * g_configManager().getNumber(TASK_HUNTING_REROLL_PRICE_LEVEL); +} - history.cost = cost; - } +const std::unique_ptr<TaskHuntingSlot> &Player::getTaskHuntingWithCreature(uint16_t raceId) const { + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { + return TaskHuntingSlotNull; } - returnValue = g_game().internalAddItem(static_self_cast<Player>(), exaltationContainer, INDEX_WHEREEVER); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("Failed to add exaltation chest to player with name {}", fmt::underlying(ITEM_EXALTATION_CHEST), getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + if (auto it = std::ranges::find_if(taskHunting, [raceId](const std::unique_ptr<TaskHuntingSlot> &itTask) { + return itTask->selectedRaceId == raceId; + }); + it != taskHunting.end()) { + return *it; } - history.firstItemName = firstForgingItem->getName(); - history.secondItemName = secondForgingItem->getName(); - history.bonus = bonus; - history.createdAt = getTimeNow(); - history.convergence = convergence; - registerForgeHistoryDescription(history); + return TaskHuntingSlotNull; +} - sendForgeResult(actionType, firstItemId, tier, secondItemId, tier + 1, success, bonus, coreCount, convergence); +uint32_t Player::getLoyaltyPoints() const { + return loyaltyPoints; } -void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemId, uint8_t tier, uint16_t receiveItemId, bool convergence) { - if (getFreeBackpackSlots() == 0) { - sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); - return; - } +void Player::setLoyaltyBonus(uint16_t bonus) { + loyaltyBonusPercent = bonus; + sendSkills(); +} - ForgeHistory history; - history.actionType = actionType; - history.tier = tier; - history.success = true; +void Player::setLoyaltyTitle(std::string title) { + loyaltyTitle = std::move(title); +} - auto donorItem = getForgeItemFromId(donorItemId, tier); - if (!donorItem) { - g_logger().error("[Log 1] Player with name {} failed to transfer item with id {}", getName(), donorItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - auto returnValue = g_game().internalRemoveItem(donorItem, 1); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 1] Failed to remove transfer item {} from player with name {}", donorItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } +std::string Player::getLoyaltyTitle() const { + return loyaltyTitle; +} - auto receiveItem = getForgeItemFromId(receiveItemId, 0); - if (!receiveItem) { - g_logger().error("[Log 2] Player with name {} failed to transfer item with id {}", getName(), receiveItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - if (returnValue = g_game().internalRemoveItem(receiveItem, 1); - 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); - return; - } +uint16_t Player::getLoyaltyBonus() const { + return loyaltyBonusPercent; +} - auto exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1); - if (!exaltationChest) { - g_logger().error("Exaltation chest is nullptr"); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } - auto exaltationContainer = exaltationChest->getContainer(); - if (!exaltationContainer) { - g_logger().error("Exaltation container is nullptr"); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } +// Depot search system +/******************************************************************************* + * Depot search system + ******************************************************************************/ - std::shared_ptr<Item> newReceiveItem = Item::CreateItem(receiveItemId, 1); - if (!newReceiveItem) { - g_logger().error("[Log 6] Player with name {} failed to fuse item with id {}", getName(), receiveItemId); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); +void Player::requestDepotItems() { + ItemsTierCountList itemMap; + uint16_t count = 0; + const auto &depotLocker = getDepotLocker(getLastDepotId()); + if (!depotLocker) { return; } - auto configKey = convergence ? FORGE_CONVERGENCE_TRANSFER_DUST_COST : FORGE_TRANSFER_DUST_COST; - if (getForgeDusts() < g_configManager().getNumber(configKey, __FUNCTION__)) { - g_logger().error("[Log 8] Failed to remove transfer dusts from player with name {}", getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; - } else { - setForgeDusts(getForgeDusts() - g_configManager().getNumber(configKey, __FUNCTION__)); - } + for (const auto &locker : depotLocker->getItemList()) { + const auto &c = locker->getContainer(); + if (!c || c->empty()) { + continue; + } - if (convergence) { - newReceiveItem->setTier(tier); - } else { - newReceiveItem->setTier(tier - 1); - } - returnValue = g_game().internalAddItem(exaltationContainer, newReceiveItem, INDEX_WHEREEVER); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 7] Failed to add forge item {} from player with name {}", receiveItemId, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { + auto itemMap_it = itemMap.find((*it)->getID()); + + uint8_t itemTier = Item::items[(*it)->getID()].upgradeClassification > 0 ? (*it)->getTier() + 1 : 0; + if (itemMap_it == itemMap.end()) { + std::map<uint8_t, uint32_t> itemTierMap; + itemTierMap[itemTier] = Item::countByType((*it), -1); + itemMap[(*it)->getID()] = itemTierMap; + count++; + } else if (auto itemTier_it = itemMap[(*it)->getID()].find(itemTier); itemTier_it == itemMap[(*it)->getID()].end()) { + itemMap[(*it)->getID()][itemTier] = Item::countByType((*it), -1); + count++; + } else { + itemMap[(*it)->getID()][itemTier] += Item::countByType((*it), -1); + } + } } - uint8_t coresAmount = 0; - uint64_t cost = 0; - for (const auto &itemClassification : g_game().getItemsClassifications()) { - if (itemClassification->id != donorItem->getClassification()) { + for (const auto &[itemId, itemCount] : getStashItems()) { + auto itemMap_it = itemMap.find(itemId); + // Stackable items not have upgrade classification + if (Item::items[itemId].upgradeClassification > 0) { + g_logger().error("{} - Player {} have wrong item with id {} on stash with upgrade classification", __FUNCTION__, getName(), itemId); continue; } - if (!itemClassification->tiers.contains(donorItem->getTier())) { - g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, donorItem->getTier(), donorItem->getClassification(), itemClassification->id); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - break; + + if (itemMap_it == itemMap.end()) { + std::map<uint8_t, uint32_t> itemTierMap; + itemTierMap[0] = itemCount; + itemMap[itemId] = itemTierMap; + count++; + } else if (auto itemTier_it = itemMap[itemId].find(0); itemTier_it == itemMap[itemId].end()) { + itemMap[itemId][0] = itemCount; + count++; + } else { + itemMap[itemId][0] += itemCount; } - auto tierPriecs = itemClassification->tiers.at(donorItem->getTier()); - cost = convergence ? tierPriecs.convergenceTransferPrice : tierPriecs.regularPrice; - coresAmount = tierPriecs.corePrice; - break; } - if (!removeItemCountById(ITEM_FORGE_CORE, coresAmount)) { - g_logger().error("[{}] Failed to remove item 'id: {}, count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), 1, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + setDepotSearchIsOpen(1, 0); + sendDepotItems(itemMap, count); +} + +void Player::requestDepotSearchItem(uint16_t itemId, uint8_t tier) { + ItemVector depotItems; + ItemVector inboxItems; + uint32_t depotCount = 0; + uint32_t inboxCount = 0; + uint32_t stashCount = 0; + + if (const ItemType &iType = Item::items[itemId]; + iType.stackable && iType.wareId > 0) { + stashCount = getStashItemCount(itemId); + } + + const auto &depotLocker = getDepotLocker(getLastDepotId()); + if (!depotLocker) { return; } - if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { - g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + for (const auto &locker : depotLocker->getItemList()) { + const auto &c = locker->getContainer(); + if (!c || c->empty()) { + continue; + } + + inboxItems.reserve(inboxItems.size()); + depotItems.reserve(depotItems.size()); + + for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { + const auto item = *it; + if (!item || item->getID() != itemId || item->getTier() != tier) { + continue; + } + + if (c->isInbox()) { + if (inboxItems.size() < 255) { + inboxItems.emplace_back(item); + } + inboxCount += Item::countByType(item, -1); + } else { + if (depotItems.size() < 255) { + depotItems.emplace_back(item); + } + depotCount += Item::countByType(item, -1); + } + } } - history.cost = cost; - g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_transfer" } }); - returnValue = g_game().internalAddItem(static_self_cast<Player>(), exaltationContainer, INDEX_WHEREEVER); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("[Log 10] Failed to add forge item {} from player with name {}", fmt::underlying(ITEM_EXALTATION_CHEST), getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + setDepotSearchIsOpen(itemId, tier); + sendDepotSearchResultDetail(itemId, tier, depotCount, depotItems, inboxCount, inboxItems, stashCount); +} + +void Player::retrieveAllItemsFromDepotSearch(uint16_t itemId, uint8_t tier, bool isDepot) { + const auto &depotLocker = getDepotLocker(getLastDepotId()); + if (!depotLocker) { return; } - history.firstItemName = Item::items[donorItemId].name; - history.secondItemName = newReceiveItem->getName(); - history.createdAt = getTimeNow(); - history.convergence = convergence; - registerForgeHistoryDescription(history); + std::vector<std::shared_ptr<Item>> itemsVector; + for (const auto &locker : depotLocker->getItemList()) { + const auto &c = locker->getContainer(); + if (!c || c->empty() || + // Retrieve from inbox. + (c->isInbox() && isDepot) || + // Retrieve from depot. + (!c->isInbox() && !isDepot)) { + continue; + } - sendForgeResult(actionType, donorItemId, tier, receiveItemId, convergence ? tier : tier - 1, true, 0, 0, convergence); -} + for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { + const auto &item = *it; + if (!item) { + continue; + } -void Player::forgeResourceConversion(ForgeAction_t actionType) { - ForgeHistory history; - history.actionType = actionType; - history.success = true; + if (item->getID() == itemId && item->getTier() == depotSearchOnItem.second) { + itemsVector.emplace_back(item); + } + } + } - ReturnValue returnValue = RETURNVALUE_NOERROR; - if (actionType == ForgeAction_t::DUSTTOSLIVERS) { - auto dusts = getForgeDusts(); - auto cost = static_cast<uint16_t>(g_configManager().getNumber(FORGE_COST_ONE_SLIVER, __FUNCTION__) * g_configManager().getNumber(FORGE_SLIVER_AMOUNT, __FUNCTION__)); - if (cost > dusts) { - g_logger().error("[{}] Not enough dust", __FUNCTION__); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + ReturnValue ret = RETURNVALUE_NOERROR; + for (const auto &item : itemsVector) { + if (!item) { + continue; } - auto itemCount = static_cast<uint16_t>(g_configManager().getNumber(FORGE_SLIVER_AMOUNT, __FUNCTION__)); - std::shared_ptr<Item> item = Item::CreateItem(ITEM_FORGE_SLIVER, itemCount); - returnValue = g_game().internalPlayerAddItem(static_self_cast<Player>(), item); - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("Failed to add {} slivers to player with name {}", itemCount, getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + // First lets try to retrieve the item to the stash retrieve container. + if (g_game().tryRetrieveStashItems(static_self_cast<Player>(), item)) { + continue; } - history.cost = cost; - history.gained = 3; - setForgeDusts(dusts - cost); - } else if (actionType == ForgeAction_t::SLIVERSTOCORES) { - auto [sliverCount, coreCount] = getForgeSliversAndCores(); - auto cost = static_cast<uint16_t>(g_configManager().getNumber(FORGE_CORE_COST, __FUNCTION__)); - if (cost > sliverCount) { - g_logger().error("[{}] Not enough sliver", __FUNCTION__); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + + // If the retrieve fails to move the item to the stash retrieve container, let's add the item anywhere. + if (ret = g_game().internalMoveItem(item->getParent(), getPlayer(), INDEX_WHEREEVER, item, item->getItemCount(), nullptr); ret == RETURNVALUE_NOERROR) { + continue; } - if (!removeItemCountById(ITEM_FORGE_SLIVER, cost)) { - g_logger().error("[{}] Failed to remove item 'id: {}, count {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_SLIVER), cost, getName()); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + sendCancelMessage(ret); + return; + } + + requestDepotSearchItem(itemId, tier); +} + +void Player::openContainerFromDepotSearch(const Position &pos) { + if (!isDepotSearchOpen()) { + sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } + + const auto &item = getItemFromDepotSearch(depotSearchOnItem.first, pos); + if (!item) { + sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } + + const auto &container = item->getParent() ? item->getParent()->getContainer() : nullptr; + if (!container) { + sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } + + g_actions().useItem(static_self_cast<Player>(), pos, 0, container, false); +} + +std::shared_ptr<Item> Player::getItemFromDepotSearch(uint16_t itemId, const Position &pos) { + const auto &depotLocker = getDepotLocker(getLastDepotId()); + if (!depotLocker) { + return nullptr; + } + + uint8_t index = 0; + for (const auto &locker : depotLocker->getItemList()) { + const auto &c = locker->getContainer(); + if (!c || c->empty() || (c->isInbox() && pos.y != 0x21) || // From inbox. + (!c->isInbox() && pos.y != 0x20)) { // From depot. + continue; } - if (std::shared_ptr<Item> item = Item::CreateItem(ITEM_FORGE_CORE, 1); - item) { - returnValue = g_game().internalPlayerAddItem(static_self_cast<Player>(), item); + for (ContainerIterator it = c->iterator(); it.hasNext(); it.advance()) { + const auto &item = *it; + if (!item || item->getID() != itemId || item->getTier() != depotSearchOnItem.second) { + continue; + } + + if (pos.z == index) { + return item; + } + index++; } - if (returnValue != RETURNVALUE_NOERROR) { - g_logger().error("Failed to add one core to player with name {}", getName()); - sendCancelMessage(getReturnMessage(returnValue)); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + } + + return nullptr; +} + +std::pair<std::vector<std::shared_ptr<Item>>, std::map<uint16_t, std::map<uint8_t, uint32_t>>> Player::requestLockerItems(const std::shared_ptr<DepotLocker> &depotLocker, bool sendToClient, uint8_t tier) const { + if (!depotLocker) { + g_logger().error("{} - Depot locker is nullptr", __FUNCTION__); + return {}; + } + + std::map<uint16_t, std::map<uint8_t, uint32_t>> lockerItems; + std::vector<std::shared_ptr<Item>> itemVector; + std::vector<std::shared_ptr<Container>> containers { depotLocker }; + + for (size_t i = 0; i < containers.size(); ++i) { + const auto &container = containers[i]; + + for (const auto &item : container->getItemList()) { + const auto &lockerContainers = item->getContainer(); + if (lockerContainers && !lockerContainers->empty()) { + containers.emplace_back(lockerContainers); + continue; + } + + const ItemType &itemType = Item::items[item->getID()]; + if (item->isStoreItem() || itemType.wareId == 0) { + continue; + } + + if (lockerContainers && (!itemType.isContainer() || lockerContainers->capacity() != itemType.maxItems)) { + continue; + } + + if (!item->hasMarketAttributes() || (!sendToClient && item->getTier() != tier)) { + continue; + } + + lockerItems[itemType.wareId][item->getTier()] += Item::countByType(item, -1); + itemVector.emplace_back(item); } + } - history.cost = cost; - history.gained = 1; - } else { - auto dustLevel = getForgeDustLevel(); - if (dustLevel >= g_configManager().getNumber(FORGE_MAX_DUST, __FUNCTION__)) { - g_logger().error("[{}] Maximum level reached", __FUNCTION__); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + StashItemList stashToSend = getStashItems(); + for (const auto &[itemId, itemCount] : stashToSend) { + const ItemType &itemType = Item::items[itemId]; + if (itemType.wareId != 0) { + lockerItems[itemType.wareId][0] += itemCount; } + } - auto upgradeCost = dustLevel - 75; - if (auto dusts = getForgeDusts(); - upgradeCost > dusts) { - g_logger().error("[{}] Not enough dust", __FUNCTION__); - sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); - return; + return { itemVector, lockerItems }; +} + +/** + This function returns a pair of an array of items and a 16-bit integer from a DepotLocker instance, a 8-bit byte and a 16-bit integer. + @param depotLocker The instance of DepotLocker from which to retrieve items. + @param tier The 8-bit byte that specifies the level of the tier to search. + @param itemId The 16-bit integer that specifies the ID of the item to search for. + @return A pair of an array of items and a 16-bit integer, where the array of items is filled with all items from the + locker with the specified id and the 16-bit integer is the total items found. + */ + +std::pair<std::vector<std::shared_ptr<Item>>, uint16_t> Player::getLockerItemsAndCountById(const std::shared_ptr<DepotLocker> &depotLocker, uint8_t tier, uint16_t itemId) const { + std::vector<std::shared_ptr<Item>> lockerItems; + const auto &[itemVector, itemMap] = requestLockerItems(depotLocker, false, tier); + uint16_t totalCount = 0; + for (const auto &item : itemVector) { + if (!item || item->getID() != itemId) { + continue; } - history.cost = upgradeCost; - history.gained = dustLevel; - removeForgeDusts(upgradeCost); - addForgeDustLevel(1); + totalCount++; + lockerItems.emplace_back(item); } - history.createdAt = getTimeNow(); - registerForgeHistoryDescription(history); - sendForgingData(); + return std::make_pair(lockerItems, totalCount); } -void Player::forgeHistory(uint8_t page) const { - sendForgeHistory(page); -} +bool Player::saySpell(SpeakClasses type, const std::string &text, bool isGhostMode, const Spectators* spectatorsPtr, const Position* pos) { + if (text.empty()) { + g_logger().debug("{} - Spell text is empty for player {}", __FUNCTION__, getName()); + return false; + } -void Player::registerForgeHistoryDescription(ForgeHistory history) { - std::string successfulString = history.success ? "Successful" : "Unsuccessful"; - std::string historyTierString = history.tier > 0 ? "tier - 1" : "consumed"; - std::string price = history.bonus != 3 ? formatPrice(std::to_string(history.cost), true) : "0"; - std::stringstream detailsResponse; - auto itemId = Item::items.getItemIdByName(history.firstItemName); - const ItemType &itemType = Item::items[itemId]; - if (history.actionType == ForgeAction_t::FUSION) { - if (history.success) { - detailsResponse << fmt::format( - "{:s}{:s} <br><br>" - "Fusion partners:" - "<ul> " - "<li>" - "First item: {:s} {:s}, tier {:s}" - "</li>" - "<li>" - "Second item: {:s} {:s}, tier {:s}" - "</li>" - "</ul>" - "<br>" - "Result:" - "<ul> " - "<li>" - "First item: tier + 1" - "</li>" - "<li>" - "Second item: {:s}" - "</li>" - "</ul>" - "<br>" - "Invested:" - "<ul>" - "<li>" - "{:d} cores" - "</li>" - "<li>" - "{:d} dust" - "</li>" - "<li>" - "{:s} gold" - "</li>" - "</ul>", - successfulString, - history.convergence ? " (convergence)" : "", - itemType.article, itemType.name, std::to_string(history.tier), - itemType.article, itemType.name, std::to_string(history.tier), - history.bonus == 8 ? "unchanged" : "consumed", - history.coresCost, history.dustCost, price - ); + if (!pos) { + pos = &getPosition(); + } + + Spectators spectators; + + if (!spectatorsPtr || spectatorsPtr->empty()) { + // This somewhat complex construct ensures that the cached Spectators + // is used if available and if it can be used, else a local vector is + // used (hopefully the compiler will optimize away the construction of + // the temporary when it's not used). + if (type != TALKTYPE_YELL && type != TALKTYPE_MONSTER_YELL) { + spectators.find<Creature>(*pos, false, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_Y, MAP_MAX_CLIENT_VIEW_PORT_Y); } else { - detailsResponse << fmt::format( - "{:s}{:s} <br><br>" - "Fusion partners:" - "<ul> " - "<li>" - "First item: {:s} {:s}, tier {:s}" - "</li>" - "<li>" - "Second item: {:s} {:s}, tier {:s}" - "</li>" - "</ul>" - "<br>" - "Result:" - "<ul> " - "<li>" - "First item: unchanged" - "</li>" - "<li>" - "Second item: {:s}" - "</li>" - "</ul>" - "<br>" - "Invested:" - "<ul>" - "<li>" - "{:d} cores" - "</li>" - "<li>" - "100 dust" - "</li>" - "<li>" - "{:s} gold" - "</li>" - "</ul>", - successfulString, - history.convergence ? " (convergence)" : "", - itemType.article, itemType.name, std::to_string(history.tier), - itemType.article, itemType.name, std::to_string(history.tier), - history.bonus == 8 ? "unchanged" : historyTierString, - history.coresCost, price - ); + spectators.find<Creature>(*pos, true, (MAP_MAX_CLIENT_VIEW_PORT_X + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_X + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_Y + 1) * 2, (MAP_MAX_CLIENT_VIEW_PORT_Y + 1) * 2); } - } else if (history.actionType == ForgeAction_t::TRANSFER) { - detailsResponse << fmt::format( - "{:s}{:s} <br><br>" - "Transfer partners:" - "<ul> " - "<li>" - "First item: {:s} {:s}, tier {:s}" - "</li>" - "<li>" - "Second item: {:s} {:s}, tier {:s}" - "</li>" - "</ul>" - "<br>" - "Result:" - "<ul> " - "<li>" - "First item: {:s} {:s}, tier {:s}" - "</li>" - "<li>" - "Second item: {:s} {:s}, {:s}" - "</li>" - "</ul>" - "<br>" - "Invested:" - "<ul>" - "<li>" - "1 cores" - "</li>" - "<li>" - "100 dust" - "</li>" - "<li>" - "{:s} gold" - "</li>" - "</ul>", - successfulString, - history.convergence ? " (convergence)" : "", - itemType.article, itemType.name, std::to_string(history.tier), - itemType.article, itemType.name, std::to_string(history.tier), - itemType.article, itemType.name, std::to_string(history.tier), - itemType.article, itemType.name, std::to_string(history.tier), - price - ); - } else if (history.actionType == ForgeAction_t::DUSTTOSLIVERS) { - detailsResponse << fmt::format("Converted {:d} dust to {:d} slivers.", history.cost, history.gained); - } else if (history.actionType == ForgeAction_t::SLIVERSTOCORES) { - history.actionType = ForgeAction_t::DUSTTOSLIVERS; - detailsResponse << fmt::format("Converted {:d} slivers to {:d} exalted core.", history.cost, history.gained); - } else if (history.actionType == ForgeAction_t::INCREASELIMIT) { - history.actionType = ForgeAction_t::DUSTTOSLIVERS; - detailsResponse << fmt::format("Spent {:d} dust to increase the dust limit to {:d}.", history.cost, history.gained + 1); } else { - detailsResponse << "(unknown)"; + spectators = (*spectatorsPtr); } - history.description = detailsResponse.str(); + int32_t valueEmote = 0; + // Send to client + for (const auto &spectator : spectators) { + if (const auto &tmpPlayer = spectator->getPlayer()) { + if (g_configManager().getBoolean(EMOTE_SPELLS)) { + valueEmote = tmpPlayer->getStorageValue(STORAGEVALUE_EMOTE); + } + if (!isGhostMode || tmpPlayer->canSeeCreature(static_self_cast<Player>())) { + if (valueEmote == 1) { + tmpPlayer->sendCreatureSay(static_self_cast<Player>(), TALKTYPE_MONSTER_SAY, text, pos); + } else { + tmpPlayer->sendCreatureSay(static_self_cast<Player>(), TALKTYPE_SPELL_USE, text, pos); + } + } + } + } - setForgeHistory(history); + // Execute lua event method + for (const auto &spectator : spectators) { + const auto &tmpPlayer = spectator->getPlayer(); + if (!tmpPlayer) { + continue; + } + + tmpPlayer->onCreatureSay(static_self_cast<Player>(), type, text); + if (static_self_cast<Player>() != tmpPlayer) { + g_events().eventCreatureOnHear(tmpPlayer, getPlayer(), text, type); + g_callbacks().executeCallback(EventCallback_t::creatureOnHear, &EventCallback::creatureOnHear, tmpPlayer, getPlayer(), text, type); + } + } + return true; } -void Player::closeAllExternalContainers() { - if (openContainers.empty()) { - return; +void Player::triggerMomentum() { + double_t chance = 0; + if (const auto &item = getInventoryItem(CONST_SLOT_HEAD)) { + chance += item->getMomentumChance(); } - std::vector<std::shared_ptr<Container>> containerToClose; - for (const auto &it : openContainers) { - std::shared_ptr<Container> container = it.second.container; - if (!container) { + chance += m_wheelPlayer->getBonusData().momentum; + double_t randomChance = uniform_random(0, 10000) / 100.; + if (getZoneType() != ZONE_PROTECTION && hasCondition(CONDITION_INFIGHT) && ((OTSYS_TIME() / 1000) % 2) == 0 && chance > 0 && randomChance < chance) { + bool triggered = false; + auto it = conditions.begin(); + while (it != conditions.end()) { + const auto condItem = *it; + const ConditionType_t type = condItem->getType(); + constexpr auto maxu16 = std::numeric_limits<uint16_t>::max(); + const auto checkSpellId = condItem->getSubId(); + auto spellId = checkSpellId > maxu16 ? 0u : static_cast<uint16_t>(checkSpellId); + const int32_t ticks = condItem->getTicks(); + const int32_t newTicks = (ticks <= 2000) ? 0 : ticks - 2000; + triggered = true; + if (type == CONDITION_SPELLCOOLDOWN || (type == CONDITION_SPELLGROUPCOOLDOWN && spellId > SPELLGROUP_SUPPORT)) { + condItem->setTicks(newTicks); + type == CONDITION_SPELLGROUPCOOLDOWN ? sendSpellGroupCooldown(static_cast<SpellGroup_t>(spellId), newTicks) : sendSpellCooldown(spellId, newTicks); + } + ++it; + } + if (triggered) { + g_game().addMagicEffect(getPosition(), CONST_ME_HOURGLASS); + sendTextMessage(MESSAGE_ATTENTION, "Momentum was triggered."); + } + } +} + +void Player::clearCooldowns() { + auto it = conditions.begin(); + while (it != conditions.end()) { + const auto &condItem = *it; + if (!condItem) { + ++it; continue; } - if (container->getHoldingPlayer() != getPlayer()) { - containerToClose.push_back(container); - } + const ConditionType_t type = condItem->getType(); + constexpr auto maxu16 = std::numeric_limits<uint16_t>::max(); + const auto checkSpellId = condItem->getSubId(); + auto spellId = checkSpellId > maxu16 ? 0u : static_cast<uint16_t>(checkSpellId); + if (type == CONDITION_SPELLCOOLDOWN || type == CONDITION_SPELLGROUPCOOLDOWN) { + condItem->setTicks(0); + type == CONDITION_SPELLGROUPCOOLDOWN ? sendSpellGroupCooldown(static_cast<SpellGroup_t>(spellId), 0) : sendSpellCooldown(spellId, 0); + } + ++it; + } +} + +void Player::triggerTranscendance() { + if (wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR_FORGE) > OTSYS_TIME()) { + return; + } + + const auto &item = getInventoryItem(CONST_SLOT_LEGS); + if (item == nullptr) { + return; + } + + const double_t chance = item->getTranscendenceChance(); + const double_t randomChance = uniform_random(0, 10000) / 100.; + if (getZoneType() != ZONE_PROTECTION && checkLastAggressiveActionWithin(2000) && ((OTSYS_TIME() / 1000) % 2) == 0 && chance > 0 && randomChance < chance) { + int64_t duration = g_configManager().getNumber(TRANSCENDANCE_AVATAR_DURATION); + const auto &outfitCondition = Condition::createCondition(CONDITIONID_COMBAT, CONDITION_OUTFIT, duration, 0)->static_self_cast<ConditionOutfit>(); + Outfit_t outfit; + outfit.lookType = getVocation()->getAvatarLookType(); + outfitCondition->setOutfit(outfit); + addCondition(outfitCondition); + wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR_FORGE, OTSYS_TIME() + duration); + g_game().addMagicEffect(getPosition(), CONST_ME_AVATAR_APPEAR); + + sendSkills(); + sendStats(); + sendBasicData(); + + sendTextMessage(MESSAGE_ATTENTION, "Transcendance was triggered."); + + // Send player data after transcendance timer expire + const auto &task = createPlayerTask( + std::max<uint32_t>(SCHEDULER_MINTICKS, duration), + [playerId = getID()] { + const auto &player = g_game().getPlayerByID(playerId); + if (player) { + player->sendSkills(); + player->sendStats(); + player->sendBasicData(); + } + }, + __FUNCTION__ + ); + g_dispatcher().scheduleEvent(task); + + wheel()->sendGiftOfLifeCooldown(); + g_game().reloadCreature(getPlayer()); + } +} + +// Forge system +// Forge system + +void Player::forgeFuseItems(ForgeAction_t actionType, uint16_t firstItemId, uint8_t tier, uint16_t secondItemId, bool success, bool reduceTierLoss, bool convergence, uint8_t bonus, uint8_t coreCount) { + if (getFreeBackpackSlots() == 0) { + sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); + return; + } + + ForgeHistory history; + history.actionType = actionType; + history.tier = tier; + history.success = success; + history.tierLoss = reduceTierLoss; + + const auto &firstForgingItem = getForgeItemFromId(firstItemId, tier); + if (!firstForgingItem) { + g_logger().error("[Log 1] Player with name {} failed to fuse item with id {}", getName(), firstItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + auto returnValue = g_game().internalRemoveItem(firstForgingItem, 1); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 1] Failed to remove forge item {} from player with name {}", firstItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + const auto &secondForgingItem = getForgeItemFromId(secondItemId, tier); + if (!secondForgingItem) { + g_logger().error("[Log 2] Player with name {} failed to fuse item with id {}", getName(), secondItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + if (returnValue = g_game().internalRemoveItem(secondForgingItem, 1); + 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); + return; + } + + const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1); + if (!exaltationChest) { + g_logger().error("Failed to create exaltation chest"); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + const auto &exaltationContainer = exaltationChest->getContainer(); + if (!exaltationContainer) { + g_logger().error("Failed to create exaltation container"); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + const auto &firstForgedItem = Item::CreateItem(firstItemId, 1); + if (!firstForgedItem) { + g_logger().error("[Log 3] Player with name {} failed to fuse item with id {}", getName(), firstItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + returnValue = g_game().internalAddItem(exaltationContainer, firstForgedItem, INDEX_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 1] Failed to add forge item {} from player with name {}", firstItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + auto configKey = convergence ? FORGE_CONVERGENCE_FUSION_DUST_COST : FORGE_FUSION_DUST_COST; + auto dustCost = static_cast<uint64_t>(g_configManager().getNumber(configKey)); + if (convergence) { + firstForgedItem->setTier(tier + 1); + history.dustCost = dustCost; + setForgeDusts(getForgeDusts() - dustCost); + + uint64_t cost = 0; + for (const auto* itemClassification : g_game().getItemsClassifications()) { + if (itemClassification->id != firstForgingItem->getClassification()) { + continue; + } + + for (const auto &[mapTier, mapPrice] : itemClassification->tiers) { + if (mapTier == firstForgingItem->getTier() + 1) { + cost = mapPrice.convergenceFusionPrice; + break; + } + } + break; + } + if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { + g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_convergence_fuse" } }); + history.cost = cost; + } else { + firstForgedItem->setTier(tier); + const auto &secondForgedItem = Item::CreateItem(secondItemId, 1); + if (!secondForgedItem) { + g_logger().error("[Log 4] Player with name {} failed to fuse item with id {}", getName(), secondItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + secondForgedItem->setTier(tier); + returnValue = g_game().internalAddItem(exaltationContainer, secondForgedItem, INDEX_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 2] Failed to add forge item {} from player with name {}", secondItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + if (success) { + firstForgedItem->setTier(tier + 1); + + if (bonus != 1) { + history.dustCost = dustCost; + setForgeDusts(getForgeDusts() - dustCost); + } + if (bonus != 2) { + if (coreCount != 0 && !removeItemCountById(ITEM_FORGE_CORE, coreCount)) { + g_logger().error("[{}][Log 1] Failed to remove item 'id :{} count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), coreCount, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + history.coresCost = coreCount; + } + if (bonus != 3) { + uint64_t cost = 0; + for (const auto* itemClassification : g_game().getItemsClassifications()) { + if (itemClassification->id != firstForgedItem->getClassification()) { + continue; + } + if (!itemClassification->tiers.contains(firstForgedItem->getTier())) { + g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, firstForgedItem->getTier(), firstForgedItem->getClassification(), itemClassification->id); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + break; + } + cost = itemClassification->tiers.at(firstForgedItem->getTier()).regularPrice; + break; + } + if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { + g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_fuse" } }); + history.cost = cost; + } + + if (bonus == 4) { + if (tier > 0) { + secondForgedItem->setTier(tier - 1); + } + } else if (bonus == 6) { + secondForgedItem->setTier(tier + 1); + } else if (bonus == 7 && tier + 2 <= firstForgedItem->getClassification()) { + firstForgedItem->setTier(tier + 2); + } + + if (bonus != 4 && bonus != 5 && bonus != 6 && bonus != 8) { + returnValue = g_game().internalRemoveItem(secondForgedItem, 1); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 6] Failed to remove forge item {} from player with name {}", secondItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + } + } else { + auto isTierLost = uniform_random(1, 100) <= (reduceTierLoss ? g_configManager().getNumber(FORGE_TIER_LOSS_REDUCTION) : 100); + if (isTierLost) { + if (secondForgedItem->getTier() >= 1) { + secondForgedItem->setTier(tier - 1); + } else { + returnValue = g_game().internalRemoveItem(secondForgedItem, 1); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 7] Failed to remove forge item {} from player with name {}", secondItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + } + } + bonus = (isTierLost ? 0 : 8); + history.coresCost = coreCount; + + if (getForgeDusts() < dustCost) { + g_logger().error("[Log 7] Failed to remove fuse dusts from player with name {}", getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } else { + setForgeDusts(getForgeDusts() - dustCost); + } + + if (coreCount != 0 && !removeItemCountById(ITEM_FORGE_CORE, coreCount)) { + g_logger().error("[{}][Log 2] Failed to remove item 'id: {}, count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), coreCount, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + uint64_t cost = 0; + for (const auto* itemClassification : g_game().getItemsClassifications()) { + if (itemClassification->id != firstForgingItem->getClassification()) { + continue; + } + if (!itemClassification->tiers.contains(firstForgingItem->getTier() + 1)) { + g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, firstForgingItem->getTier() + 1, firstForgingItem->getClassification(), itemClassification->id); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + break; + } + cost = itemClassification->tiers.at(firstForgingItem->getTier() + 1).regularPrice; + break; + } + if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { + g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_fuse" } }); + + history.cost = cost; + } + } + + returnValue = g_game().internalAddItem(static_self_cast<Player>(), exaltationContainer, INDEX_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("Failed to add exaltation chest to player with name {}", fmt::underlying(ITEM_EXALTATION_CHEST), getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + history.firstItemName = firstForgingItem->getName(); + history.secondItemName = secondForgingItem->getName(); + history.bonus = bonus; + history.createdAt = getTimeNow(); + history.convergence = convergence; + registerForgeHistoryDescription(history); + + sendForgeResult(actionType, firstItemId, tier, secondItemId, tier + 1, success, bonus, coreCount, convergence); +} + +void Player::forgeTransferItemTier(ForgeAction_t actionType, uint16_t donorItemId, uint8_t tier, uint16_t receiveItemId, bool convergence) { + if (getFreeBackpackSlots() == 0) { + sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); + return; + } + + ForgeHistory history; + history.actionType = actionType; + history.tier = tier; + history.success = true; + + const auto &donorItem = getForgeItemFromId(donorItemId, tier); + if (!donorItem) { + g_logger().error("[Log 1] Player with name {} failed to transfer item with id {}", getName(), donorItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + auto returnValue = g_game().internalRemoveItem(donorItem, 1); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 1] Failed to remove transfer item {} from player with name {}", donorItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + const auto &receiveItem = getForgeItemFromId(receiveItemId, 0); + if (!receiveItem) { + g_logger().error("[Log 2] Player with name {} failed to transfer item with id {}", getName(), receiveItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + if (returnValue = g_game().internalRemoveItem(receiveItem, 1); + 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); + return; + } + + const auto &exaltationChest = Item::CreateItem(ITEM_EXALTATION_CHEST, 1); + if (!exaltationChest) { + g_logger().error("Exaltation chest is nullptr"); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + const auto &exaltationContainer = exaltationChest->getContainer(); + if (!exaltationContainer) { + g_logger().error("Exaltation container is nullptr"); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + const auto &newReceiveItem = Item::CreateItem(receiveItemId, 1); + if (!newReceiveItem) { + g_logger().error("[Log 6] Player with name {} failed to fuse item with id {}", getName(), receiveItemId); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + auto configKey = convergence ? FORGE_CONVERGENCE_TRANSFER_DUST_COST : FORGE_TRANSFER_DUST_COST; + if (getForgeDusts() < g_configManager().getNumber(configKey)) { + g_logger().error("[Log 8] Failed to remove transfer dusts from player with name {}", getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + setForgeDusts(getForgeDusts() - g_configManager().getNumber(configKey)); + + if (convergence) { + newReceiveItem->setTier(tier); + } else { + newReceiveItem->setTier(tier - 1); + } + returnValue = g_game().internalAddItem(exaltationContainer, newReceiveItem, INDEX_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 7] Failed to add forge item {} from player with name {}", receiveItemId, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + uint8_t coresAmount = 0; + uint64_t cost = 0; + for (const auto &itemClassification : g_game().getItemsClassifications()) { + if (itemClassification->id != donorItem->getClassification()) { + continue; + } + if (!itemClassification->tiers.contains(donorItem->getTier())) { + g_logger().error("[{}] Failed to find tier {} for item {} in classification {}", __FUNCTION__, donorItem->getTier(), donorItem->getClassification(), itemClassification->id); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + break; + } + + const uint8_t toTier = convergence ? donorItem->getTier() : donorItem->getTier() - 1; + auto tierPriecs = itemClassification->tiers.at(toTier); + cost = convergence ? tierPriecs.convergenceTransferPrice : tierPriecs.regularPrice; + coresAmount = tierPriecs.corePrice; + break; + } + + if (!removeItemCountById(ITEM_FORGE_CORE, coresAmount)) { + g_logger().error("[{}] Failed to remove item 'id: {}, count: {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_CORE), 1, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + if (!g_game().removeMoney(static_self_cast<Player>(), cost, 0, true)) { + g_logger().error("[{}] Failed to remove {} gold from player with name {}", __FUNCTION__, cost, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + history.cost = cost; + g_metrics().addCounter("balance_decrease", cost, { { "player", getName() }, { "context", "forge_transfer" } }); + + returnValue = g_game().internalAddItem(static_self_cast<Player>(), exaltationContainer, INDEX_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("[Log 10] Failed to add forge item {} from player with name {}", fmt::underlying(ITEM_EXALTATION_CHEST), getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + history.firstItemName = Item::items[donorItemId].name; + history.secondItemName = newReceiveItem->getName(); + history.createdAt = getTimeNow(); + history.convergence = convergence; + registerForgeHistoryDescription(history); + + sendForgeResult(actionType, donorItemId, tier, receiveItemId, convergence ? tier : tier - 1, true, 0, 0, convergence); +} + +void Player::forgeResourceConversion(ForgeAction_t actionType) { + ForgeHistory history; + history.actionType = actionType; + history.success = true; + + ReturnValue returnValue = RETURNVALUE_NOERROR; + if (actionType == ForgeAction_t::DUSTTOSLIVERS) { + auto dusts = getForgeDusts(); + auto cost = static_cast<uint16_t>(g_configManager().getNumber(FORGE_COST_ONE_SLIVER) * g_configManager().getNumber(FORGE_SLIVER_AMOUNT)); + if (cost > dusts) { + g_logger().error("[{}] Not enough dust", __FUNCTION__); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + auto itemCount = static_cast<uint16_t>(g_configManager().getNumber(FORGE_SLIVER_AMOUNT)); + const auto &item = Item::CreateItem(ITEM_FORGE_SLIVER, itemCount); + returnValue = g_game().internalPlayerAddItem(static_self_cast<Player>(), item); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("Failed to add {} slivers to player with name {}", itemCount, getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + history.cost = cost; + history.gained = 3; + setForgeDusts(dusts - cost); + } else if (actionType == ForgeAction_t::SLIVERSTOCORES) { + const auto &[sliverCount, coreCount] = getForgeSliversAndCores(); + auto cost = static_cast<uint16_t>(g_configManager().getNumber(FORGE_CORE_COST)); + if (cost > sliverCount) { + g_logger().error("[{}] Not enough sliver", __FUNCTION__); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + if (!removeItemCountById(ITEM_FORGE_SLIVER, cost)) { + g_logger().error("[{}] Failed to remove item 'id: {}, count {}' from player {}", __FUNCTION__, fmt::underlying(ITEM_FORGE_SLIVER), cost, getName()); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + if (const auto &item = Item::CreateItem(ITEM_FORGE_CORE, 1); + item) { + returnValue = g_game().internalPlayerAddItem(static_self_cast<Player>(), item); + } + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("Failed to add one core to player with name {}", getName()); + sendCancelMessage(getReturnMessage(returnValue)); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + history.cost = cost; + history.gained = 1; + } else { + auto dustLevel = getForgeDustLevel(); + if (dustLevel >= g_configManager().getNumber(FORGE_MAX_DUST)) { + g_logger().error("[{}] Maximum level reached", __FUNCTION__); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + const auto upgradeCost = dustLevel - 75; + if (const auto dusts = getForgeDusts(); + upgradeCost > dusts) { + g_logger().error("[{}] Not enough dust", __FUNCTION__); + sendForgeError(RETURNVALUE_CONTACTADMINISTRATOR); + return; + } + + history.cost = upgradeCost; + history.gained = dustLevel; + removeForgeDusts(upgradeCost); + addForgeDustLevel(1); + } + + history.createdAt = getTimeNow(); + registerForgeHistoryDescription(history); + sendForgingData(); +} + +void Player::forgeHistory(uint8_t page) const { + sendForgeHistory(page); +} + +void Player::sendOpenForge() const { + if (client) { + client->sendOpenForge(); + } +} + +void Player::sendForgeError(ReturnValue returnValue) const { + if (client) { + client->sendForgeError(returnValue); + } +} + +void Player::sendForgeResult(ForgeAction_t actionType, uint16_t leftItemId, uint8_t leftTier, uint16_t rightItemId, uint8_t rightTier, bool success, uint8_t bonus, uint8_t coreCount, bool convergence) const { + if (client) { + client->sendForgeResult(actionType, leftItemId, leftTier, rightItemId, rightTier, success, bonus, coreCount, convergence); + } +} + +void Player::sendForgeHistory(uint8_t page) const { + if (client) { + client->sendForgeHistory(page); + } +} + +void Player::closeForgeWindow() const { + if (client) { + client->closeForgeWindow(); + } +} + +void Player::setForgeDusts(uint64_t amount) { + forgeDusts = amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); + } +} + +void Player::addForgeDusts(uint64_t amount) { + forgeDusts += amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); + } +} + +void Player::removeForgeDusts(uint64_t amount) { + forgeDusts = std::max<uint64_t>(0, forgeDusts - amount); + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); + } +} + +uint64_t Player::getForgeDusts() const { + return forgeDusts; +} + +void Player::addForgeDustLevel(uint64_t amount) { + forgeDustLevel += amount; + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); + } +} + +void Player::removeForgeDustLevel(uint64_t amount) { + forgeDustLevel = std::max<uint64_t>(0, forgeDustLevel - amount); + if (client) { + client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); + } +} + +uint64_t Player::getForgeDustLevel() const { + return forgeDustLevel; +} + +std::vector<ForgeHistory> &Player::getForgeHistory() { + return forgeHistoryVector; +} + +void Player::setForgeHistory(const ForgeHistory &history) { + forgeHistoryVector.emplace_back(history); +} + +void Player::registerForgeHistoryDescription(ForgeHistory history) { + std::string successfulString = history.success ? "Successful" : "Unsuccessful"; + std::string historyTierString = history.tier > 0 ? "tier - 1" : "consumed"; + std::string price = history.bonus != 3 ? formatPrice(std::to_string(history.cost), true) : "0"; + std::stringstream detailsResponse; + auto itemId = Item::items.getItemIdByName(history.firstItemName); + const ItemType &itemType = Item::items[itemId]; + if (history.actionType == ForgeAction_t::FUSION) { + if (history.success) { + detailsResponse << fmt::format( + "{:s}{:s} <br><br>" + "Fusion partners:" + "<ul> " + "<li>" + "First item: {:s} {:s}, tier {:s}" + "</li>" + "<li>" + "Second item: {:s} {:s}, tier {:s}" + "</li>" + "</ul>" + "<br>" + "Result:" + "<ul> " + "<li>" + "First item: tier + 1" + "</li>" + "<li>" + "Second item: {:s}" + "</li>" + "</ul>" + "<br>" + "Invested:" + "<ul>" + "<li>" + "{:d} cores" + "</li>" + "<li>" + "{:d} dust" + "</li>" + "<li>" + "{:s} gold" + "</li>" + "</ul>", + successfulString, + history.convergence ? " (convergence)" : "", + itemType.article, itemType.name, std::to_string(history.tier), + itemType.article, itemType.name, std::to_string(history.tier), + history.bonus == 8 ? "unchanged" : "consumed", + history.coresCost, history.dustCost, price + ); + } else { + detailsResponse << fmt::format( + "{:s}{:s} <br><br>" + "Fusion partners:" + "<ul> " + "<li>" + "First item: {:s} {:s}, tier {:s}" + "</li>" + "<li>" + "Second item: {:s} {:s}, tier {:s}" + "</li>" + "</ul>" + "<br>" + "Result:" + "<ul> " + "<li>" + "First item: unchanged" + "</li>" + "<li>" + "Second item: {:s}" + "</li>" + "</ul>" + "<br>" + "Invested:" + "<ul>" + "<li>" + "{:d} cores" + "</li>" + "<li>" + "100 dust" + "</li>" + "<li>" + "{:s} gold" + "</li>" + "</ul>", + successfulString, + history.convergence ? " (convergence)" : "", + itemType.article, itemType.name, std::to_string(history.tier), + itemType.article, itemType.name, std::to_string(history.tier), + history.bonus == 8 ? "unchanged" : historyTierString, + history.coresCost, price + ); + } + } else if (history.actionType == ForgeAction_t::TRANSFER) { + detailsResponse << fmt::format( + "{:s}{:s} <br><br>" + "Transfer partners:" + "<ul> " + "<li>" + "First item: {:s} {:s}, tier {:s}" + "</li>" + "<li>" + "Second item: {:s} {:s}, tier {:s}" + "</li>" + "</ul>" + "<br>" + "Result:" + "<ul> " + "<li>" + "First item: {:s} {:s}, tier {:s}" + "</li>" + "<li>" + "Second item: {:s} {:s}, {:s}" + "</li>" + "</ul>" + "<br>" + "Invested:" + "<ul>" + "<li>" + "1 cores" + "</li>" + "<li>" + "100 dust" + "</li>" + "<li>" + "{:s} gold" + "</li>" + "</ul>", + successfulString, + history.convergence ? " (convergence)" : "", + itemType.article, itemType.name, std::to_string(history.tier), + itemType.article, itemType.name, std::to_string(history.tier), + itemType.article, itemType.name, std::to_string(history.tier), + itemType.article, itemType.name, std::to_string(history.tier), + price + ); + } else if (history.actionType == ForgeAction_t::DUSTTOSLIVERS) { + detailsResponse << fmt::format("Converted {:d} dust to {:d} slivers.", history.cost, history.gained); + } else if (history.actionType == ForgeAction_t::SLIVERSTOCORES) { + history.actionType = ForgeAction_t::DUSTTOSLIVERS; + detailsResponse << fmt::format("Converted {:d} slivers to {:d} exalted core.", history.cost, history.gained); + } else if (history.actionType == ForgeAction_t::INCREASELIMIT) { + history.actionType = ForgeAction_t::DUSTTOSLIVERS; + detailsResponse << fmt::format("Spent {:d} dust to increase the dust limit to {:d}.", history.cost, history.gained + 1); + } else { + detailsResponse << "(unknown)"; + } + + history.description = detailsResponse.str(); + + setForgeHistory(history); +} + +// Quickloot + +void Player::openPlayerContainers() { + std::vector<std::pair<uint8_t, std::shared_ptr<Container>>> openContainersList; + + for (int32_t i = CONST_SLOT_FIRST; i <= CONST_SLOT_LAST; i++) { + const auto &item = inventory[i]; + if (!item) { + continue; + } + + const auto &itemContainer = item->getContainer(); + if (itemContainer) { + const auto &cid = item->getAttribute<int64_t>(ItemAttribute_t::OPENCONTAINER); + if (cid > 0) { + openContainersList.emplace_back(cid, itemContainer); + } + for (ContainerIterator it = itemContainer->iterator(); it.hasNext(); it.advance()) { + const auto &subContainer = (*it)->getContainer(); + if (subContainer) { + const auto &subcid = (*it)->getAttribute<uint8_t>(ItemAttribute_t::OPENCONTAINER); + if (subcid > 0) { + openContainersList.emplace_back(subcid, subContainer); + } + } + } + } + } + + std::ranges::sort(openContainersList, [](const std::pair<uint8_t, std::shared_ptr<Container>> &left, const std::pair<uint8_t, std::shared_ptr<Container>> &right) { + return left.first < right.first; + }); + + for (const auto &[containerId, container] : openContainersList) { + addContainer(containerId - 1, container); + onSendContainer(container); + } +} + +// Quickloot + +void Player::sendLootContainers() const { + if (client) { + client->sendLootContainers(); + } +} + +void Player::sendSingleSoundEffect(const Position &pos, SoundEffect_t id, SourceEffect_t source) const { + if (client) { + client->sendSingleSoundEffect(pos, id, source); + } +} + +void Player::sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundId, SourceEffect_t mainSource, SoundEffect_t secondarySoundId, SourceEffect_t secondarySource) const { + if (client) { + client->sendDoubleSoundEffect(pos, mainSoundId, mainSource, secondarySoundId, secondarySource); + } +} + +SoundEffect_t Player::getAttackSoundEffect() const { + const auto &tool = getWeapon(); + if (tool == nullptr) { + return SoundEffect_t::HUMAN_CLOSE_ATK_FIST; + } + + const ItemType &it = Item::items[tool->getID()]; + if (it.weaponType == WEAPON_NONE || it.weaponType == WEAPON_SHIELD) { + return SoundEffect_t::HUMAN_CLOSE_ATK_FIST; + } + + switch (it.weaponType) { + case WEAPON_AXE: { + return SoundEffect_t::MELEE_ATK_AXE; + } + case WEAPON_SWORD: { + return SoundEffect_t::MELEE_ATK_SWORD; + } + case WEAPON_CLUB: { + return SoundEffect_t::MELEE_ATK_CLUB; + } + case WEAPON_AMMO: + case WEAPON_DISTANCE: { + if (tool->getAmmoType() == AMMO_BOLT) { + return SoundEffect_t::DIST_ATK_CROSSBOW; + } + if (tool->getAmmoType() == AMMO_ARROW) { + return SoundEffect_t::DIST_ATK_BOW; + } + return SoundEffect_t::DIST_ATK_THROW; + + break; + } + case WEAPON_WAND: { + return SoundEffect_t::MAGICAL_RANGE_ATK; + } + default: { + return SoundEffect_t::SILENCE; + } + } + + return SoundEffect_t::SILENCE; +} + +SoundEffect_t Player::getHitSoundEffect() const { + // Distance sound effects + const auto &tool = getWeapon(); + if (tool == nullptr) { + return SoundEffect_t::SILENCE; + } + + switch (const auto &it = Item::items[tool->getID()]; it.weaponType) { + case WEAPON_AMMO: { + if (it.ammoType == AMMO_BOLT) { + return SoundEffect_t::DIST_ATK_CROSSBOW_SHOT; + } + if (it.ammoType == AMMO_ARROW) { + if (it.shootType == CONST_ANI_BURSTARROW) { + return SoundEffect_t::BURST_ARROW_EFFECT; + } + if (it.shootType == CONST_ANI_DIAMONDARROW) { + return SoundEffect_t::DIAMOND_ARROW_EFFECT; + } + } else { + return SoundEffect_t::DIST_ATK_THROW_SHOT; + } + } + case WEAPON_DISTANCE: { + if (tool->getAmmoType() == AMMO_BOLT) { + return SoundEffect_t::DIST_ATK_CROSSBOW_SHOT; + } + if (tool->getAmmoType() == AMMO_ARROW) { + return SoundEffect_t::DIST_ATK_BOW_SHOT; + } + return SoundEffect_t::DIST_ATK_THROW_SHOT; + } + case WEAPON_WAND: { + // Separate between wand and rod here + // return SoundEffect_t::DIST_ATK_ROD_SHOT; + return SoundEffect_t::DIST_ATK_WAND_SHOT; + } + default: { + return SoundEffect_t::SILENCE; + } + } // switch + + return SoundEffect_t::SILENCE; +} + +// event methods + +void Player::onUpdateTileItem(const std::shared_ptr<Tile> &updateTile, const Position &pos, const std::shared_ptr<Item> &oldItem, const ItemType &oldType, const std::shared_ptr<Item> &newItem, const ItemType &newType) { + Creature::onUpdateTileItem(updateTile, pos, oldItem, oldType, newItem, newType); + + if (oldItem != newItem) { + onRemoveTileItem(updateTile, pos, oldType, oldItem); + } + + if (tradeState != TRADE_TRANSFER) { + if (tradeItem && oldItem == tradeItem) { + g_game().internalCloseTrade(getPlayer()); + } + } +} + +void Player::onRemoveTileItem(const std::shared_ptr<Tile> &fromTile, const Position &pos, const ItemType &iType, const std::shared_ptr<Item> &item) { + Creature::onRemoveTileItem(fromTile, pos, iType, item); + + if (tradeState != TRADE_TRANSFER) { + checkTradeState(item); + + if (tradeItem) { + const auto &container = item->getContainer(); + if (container && container->isHoldingItem(tradeItem)) { + g_game().internalCloseTrade(static_self_cast<Player>()); + } + } + } + + checkLootContainers(item->getContainer()); +} + +void Player::onCreatureAppear(const std::shared_ptr<Creature> &creature, bool isLogin) { + Creature::onCreatureAppear(creature, isLogin); + + if (isLogin && creature == getPlayer()) { + onEquipInventory(); + + // Refresh bosstiary tracker onLogin + refreshCyclopediaMonsterTracker(true); + // Refresh bestiary tracker onLogin + refreshCyclopediaMonsterTracker(false); + + for (const auto &condition : storedConditionList) { + addCondition(condition); + } + storedConditionList.clear(); + + updateRegeneration(); + + const auto &bed = g_game().getBedBySleeper(guid); + if (bed) { + bed->wakeUp(static_self_cast<Player>()); + } + + auto version = client->oldProtocol ? getProtocolVersion() : CLIENT_VERSION; + g_logger().info("{} has logged in. (Protocol: {})", name, version); + + if (guild) { + guild->addMember(static_self_cast<Player>()); + } + + int32_t offlineTime; + if (getLastLogout() != 0) { + // Not counting more than 21 days to prevent overflow when multiplying with 1000 (for milliseconds). + offlineTime = std::min<int32_t>(time(nullptr) - getLastLogout(), 86400 * 21); + } else { + offlineTime = 0; + } + + for (const auto &condition : getMuteConditions()) { + condition->setTicks(condition->getTicks() - (offlineTime * 1000)); + if (condition->getTicks() <= 0) { + removeCondition(condition); + } + } + + g_game().checkPlayersRecord(); + if (getLevel() < g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL) && getVocationId() > VOCATION_NONE) { + for (uint8_t i = 2; i <= 6; i++) { + if (!hasBlessing(i)) { + addBlessing(i, 1); + } + } + sendBlessStatus(); + } + + if (getCurrentMount() != 0) { + toggleMount(true); + } + + g_game().changePlayerSpeed(static_self_cast<Player>(), 0); + } +} + +void Player::onRemoveCreature(const std::shared_ptr<Creature> &creature, bool isLogout) { + Creature::onRemoveCreature(creature, isLogout); + + if (const auto &player = getPlayer(); player == creature) { + if (isLogout) { + onDeEquipInventory(); + + if (m_party) { + m_party->leaveParty(player, true); + } + if (guild) { + guild->removeMember(player); + } + + g_game().removePlayerUniqueLogin(player); + loginPosition = getPosition(); + lastLogout = time(nullptr); + g_logger().info("{} has logged out", getName()); + g_chat().removeUserFromAllChannels(player); + clearPartyInvitations(); + } + + if (eventWalk != 0) { + setFollowCreature(nullptr); + } + + if (tradePartner) { + g_game().internalCloseTrade(player); + } + + closeShopWindow(); + + g_saveManager().savePlayer(player); + } + + if (creature == shopOwner) { + setShopOwner(nullptr); + sendCloseShop(); + } +} + +void Player::onCreatureMove(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &newTile, const Position &newPos, const std::shared_ptr<Tile> &oldTile, const Position &oldPos, bool teleport) { + Creature::onCreatureMove(creature, newTile, newPos, oldTile, oldPos, teleport); + + const auto &followCreature = getFollowCreature(); + if (hasFollowPath && (creature == followCreature || (creature.get() == this && followCreature))) { + isUpdatingPath = false; + g_game().updateCreatureWalk(getID()); // internally uses addEventWalk. + } + + if (creature != getPlayer()) { + return; + } + + if (tradeState != TRADE_TRANSFER) { + // check if we should close trade + if (tradeItem && !Position::areInRange<1, 1, 0>(tradeItem->getPosition(), getPosition())) { + g_game().internalCloseTrade(getPlayer()); + } + + if (tradePartner && !Position::areInRange<2, 2, 0>(tradePartner->getPosition(), getPosition())) { + g_game().internalCloseTrade(getPlayer()); + } + } + + // close modal windows + if (!modalWindows.empty()) { + // TODO: This shouldn't be hardcoded + for (const uint32_t modalWindowId : modalWindows) { + if (modalWindowId == std::numeric_limits<uint32_t>::max()) { + sendTextMessage(MESSAGE_EVENT_ADVANCE, "Offline training aborted."); + break; + } + } + modalWindows.clear(); + } + + // leave market + if (inMarket) { + inMarket = false; + } + + if (m_party) { + m_party->updateSharedExperience(); + m_party->updatePlayerStatus(getPlayer(), oldPos, newPos); + } + + if (teleport || oldPos.z != newPos.z) { + int32_t ticks = g_configManager().getNumber(STAIRHOP_DELAY); + if (ticks > 0) { + if (const auto &condition = Condition::createCondition(CONDITIONID_DEFAULT, CONDITION_PACIFIED, ticks, 0)) { + addCondition(condition); + } + } + } +} + +void Player::onEquipInventory() { + for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { + const auto &item = inventory[slot]; + if (item) { + item->startDecaying(); + g_moveEvents().onPlayerEquip(getPlayer(), item, static_cast<Slots_t>(slot), false); + } + } +} + +void Player::onDeEquipInventory() { + for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { + const auto &item = inventory[slot]; + if (item) { + g_moveEvents().onPlayerDeEquip(getPlayer(), item, static_cast<Slots_t>(slot)); + } + } +} + +void Player::onAttackedCreatureDisappear(bool isLogout) { + sendCancelTarget(); + + if (!isLogout) { + sendTextMessage(MESSAGE_FAILURE, "Target lost."); + } +} + +void Player::onFollowCreatureDisappear(bool isLogout) { + sendCancelTarget(); + + if (!isLogout) { + sendTextMessage(MESSAGE_FAILURE, "Target lost."); + } +} + +// container +// container + +void Player::onAddContainerItem(const std::shared_ptr<Item> &item) { + checkTradeState(item); +} + +void Player::onUpdateContainerItem(const std::shared_ptr<Container> &container, const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem) { + if (oldItem != newItem) { + onRemoveContainerItem(container, oldItem); + } + + if (tradeState != TRADE_TRANSFER) { + checkTradeState(oldItem); + } +} + +void Player::onRemoveContainerItem(const std::shared_ptr<Container> &container, const std::shared_ptr<Item> &item) { + if (tradeState != TRADE_TRANSFER) { + checkTradeState(item); + + if (tradeItem) { + if (tradeItem->getParent() != container && container->isHoldingItem(tradeItem)) { + g_game().internalCloseTrade(static_self_cast<Player>()); + } + } + } + + checkLootContainers(item->getContainer()); +} + +void Player::onCloseContainer(const std::shared_ptr<Container> &container) { + if (!client) { + return; + } + + for (const auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container == container) { + client->sendCloseContainer(containerId); + } + } +} + +void Player::onSendContainer(const std::shared_ptr<Container> &container) { + if (!client || !container) { + return; + } + + const bool hasParent = container->hasParent(); + for (const auto &[containerId, containerInfo] : openContainers) { + if (containerInfo.container == container) { + client->sendContainer(containerId, container, hasParent, containerInfo.index); + } + } +} + +// close container and its child containers + +void Player::autoCloseContainers(const std::shared_ptr<Container> &container) { + std::vector<uint32_t> closeList; + for (const auto &[containerId, containerInfo] : openContainers) { + auto tmpContainer = containerInfo.container; + while (tmpContainer) { + if (tmpContainer->isRemoved() || tmpContainer == container) { + closeList.emplace_back(containerId); + break; + } + + tmpContainer = std::dynamic_pointer_cast<Container>(tmpContainer->getParent()); + } + } + + for (const uint32_t containerId : closeList) { + closeContainer(containerId); + if (client) { + client->sendCloseContainer(containerId); + } + } +} + +// inventory +// inventory + +void Player::onUpdateInventoryItem(const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem) { + if (oldItem != newItem) { + onRemoveInventoryItem(oldItem); } - for (const std::shared_ptr<Container> &container : containerToClose) { - autoCloseContainers(container); + if (tradeState != TRADE_TRANSFER) { + checkTradeState(oldItem); } } -SoundEffect_t Player::getHitSoundEffect() const { - // Distance sound effects - std::shared_ptr<Item> tool = getWeapon(); - if (tool == nullptr) { - return SoundEffect_t::SILENCE; - } +void Player::onRemoveInventoryItem(const std::shared_ptr<Item> &item) { + if (tradeState != TRADE_TRANSFER) { + checkTradeState(item); - switch (const auto &it = Item::items[tool->getID()]; it.weaponType) { - case WEAPON_AMMO: { - if (it.ammoType == AMMO_BOLT) { - return SoundEffect_t::DIST_ATK_CROSSBOW_SHOT; - } else if (it.ammoType == AMMO_ARROW) { - if (it.shootType == CONST_ANI_BURSTARROW) { - return SoundEffect_t::BURST_ARROW_EFFECT; - } else if (it.shootType == CONST_ANI_DIAMONDARROW) { - return SoundEffect_t::DIAMOND_ARROW_EFFECT; - } - } else { - return SoundEffect_t::DIST_ATK_THROW_SHOT; - } - } - case WEAPON_DISTANCE: { - if (tool->getAmmoType() == AMMO_BOLT) { - return SoundEffect_t::DIST_ATK_CROSSBOW_SHOT; - } else if (tool->getAmmoType() == AMMO_ARROW) { - return SoundEffect_t::DIST_ATK_BOW_SHOT; - } else { - return SoundEffect_t::DIST_ATK_THROW_SHOT; + if (tradeItem) { + const auto &container = item->getContainer(); + if (container && container->isHoldingItem(tradeItem)) { + g_game().internalCloseTrade(static_self_cast<Player>()); } } - case WEAPON_WAND: { - // Separate between wand and rod here - // return SoundEffect_t::DIST_ATK_ROD_SHOT; - return SoundEffect_t::DIST_ATK_WAND_SHOT; - } - default: { - return SoundEffect_t::SILENCE; - } - } // switch + } - return SoundEffect_t::SILENCE; + checkLootContainers(item->getContainer()); } -SoundEffect_t Player::getAttackSoundEffect() const { - std::shared_ptr<Item> tool = getWeapon(); - if (tool == nullptr) { - return SoundEffect_t::HUMAN_CLOSE_ATK_FIST; +uint64_t Player::getItemCustomPrice(uint16_t itemId, bool buyPrice) const { + auto it = itemPriceMap.find(itemId); + if (it != itemPriceMap.end()) { + return it->second; } - const ItemType &it = Item::items[tool->getID()]; - if (it.weaponType == WEAPON_NONE || it.weaponType == WEAPON_SHIELD) { - return SoundEffect_t::HUMAN_CLOSE_ATK_FIST; - } + const std::map<uint16_t, uint64_t> itemMap { { itemId, 1 } }; + return g_game().getItemMarketPrice(itemMap, buyPrice); +} - switch (it.weaponType) { - case WEAPON_AXE: { - return SoundEffect_t::MELEE_ATK_AXE; - } - case WEAPON_SWORD: { - return SoundEffect_t::MELEE_ATK_SWORD; - } - case WEAPON_CLUB: { - return SoundEffect_t::MELEE_ATK_CLUB; - } - case WEAPON_AMMO: - case WEAPON_DISTANCE: { - if (tool->getAmmoType() == AMMO_BOLT) { - return SoundEffect_t::DIST_ATK_CROSSBOW; - } else if (tool->getAmmoType() == AMMO_ARROW) { - return SoundEffect_t::DIST_ATK_BOW; - } else { - return SoundEffect_t::DIST_ATK_THROW; - } +uint16_t Player::getFreeBackpackSlots() const { + const auto &thing = getThing(CONST_SLOT_BACKPACK); + if (!thing) { + return 0; + } - break; - } - case WEAPON_WAND: { - return SoundEffect_t::MAGICAL_RANGE_ATK; - } - default: { - return SoundEffect_t::SILENCE; - } + const auto &backpack = thing->getContainer(); + if (!backpack) { + return 0; } - return SoundEffect_t::SILENCE; + const uint16_t counter = std::max<uint16_t>(0, backpack->getFreeSlots()); + + return counter; } -bool Player::canAutoWalk(const Position &toPosition, const std::function<void()> &function, uint32_t delay /* = 500*/) { +bool Player::canAutoWalk(const Position &toPosition, const std::function<void()> &function, uint32_t delay) { if (!Position::areInRange<1, 1>(getPosition(), toPosition)) { // Check if can walk to the toPosition and send event to use function std::vector<Direction> listDir; if (getPathTo(toPosition, listDir, 0, 1, true, true)) { g_dispatcher().addEvent([creatureId = getID(), listDir] { g_game().playerAutoWalk(creatureId, listDir); }, __FUNCTION__); - - std::shared_ptr<Task> task = createPlayerTask(delay, function, __FUNCTION__); + const auto &task = createPlayerTask(delay, function, __FUNCTION__); setNextWalkActionTask(task); return true; } else { @@ -7832,7 +10051,15 @@ bool Player::canAutoWalk(const Position &toPosition, const std::function<void()> return false; } +void Player::sendMessageDialog(const std::string &message) const { + if (client) { + client->sendMessageDialog(message); + } +} + // Account +// Account + bool Player::setAccount(uint32_t accountId) { if (account) { g_logger().warn("Account was already set!"); @@ -7840,11 +10067,11 @@ bool Player::setAccount(uint32_t accountId) { } account = std::make_shared<Account>(accountId); - return AccountErrors_t::Ok == enumFromValue<AccountErrors_t>(account->load()); + return AccountErrors_t::Ok == account->load(); } uint8_t Player::getAccountType() const { - return static_cast<uint8_t>(account ? account->getAccountType() : static_cast<uint8_t>(AccountType::ACCOUNT_TYPE_NORMAL)); + return account ? account->getAccountType() : AccountType::ACCOUNT_TYPE_NORMAL; } uint32_t Player::getAccountId() const { @@ -7855,133 +10082,108 @@ std::shared_ptr<Account> Player::getAccount() const { return account; } -/******************************************************************************* - * Hazard system - ******************************************************************************/ +// Prey system -void Player::setHazardSystemPoints(int32_t count) { - if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM, __FUNCTION__)) { - return; - } - addStorageValue(STORAGEVALUE_HAZARDCOUNT, std::max<int32_t>(0, std::min<int32_t>(0xFFFF, count)), true); - reloadHazardSystemPointsCounter = true; - if (count > 0) { - setIcon("hazard", CreatureIcon(CreatureIconQuests_t::Hazard, count)); - } else { - removeIcon("hazard"); +void Player::initializePrey() { + if (preys.empty()) { + for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { + auto slot = std::make_unique<PreySlot>(static_cast<PreySlot_t>(slotId)); + if (!g_configManager().getBoolean(PREY_ENABLED)) { + slot->state = PreyDataState_Inactive; + } else if (slot->id == PreySlot_Three && !g_configManager().getBoolean(PREY_FREE_THIRD_SLOT)) { + slot->state = PreyDataState_Locked; + } else if (slot->id == PreySlot_Two && !isPremium()) { + slot->state = PreyDataState_Locked; + } else { + slot->state = PreyDataState_Selection; + slot->reloadMonsterGrid(getPreyBlackList(), getLevel()); + } + + setPreySlotClass(slot); + } } } -void Player::parseAttackRecvHazardSystem(CombatDamage &damage, std::shared_ptr<Monster> monster) { - if (!monster || !monster->getHazard()) { - return; - } +void Player::removePreySlotById(PreySlot_t slotid) { + const auto it = std::ranges::remove_if(preys, [slotid](const auto &preyIt) { + return preyIt->id == slotid; + }).begin(); - if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM, __FUNCTION__)) { - return; - } + preys.erase(it, preys.end()); +} - if (damage.primary.type == COMBAT_HEALING) { - return; - } +/******************************************************************************* + * Hazard system + ******************************************************************************/ - auto points = getHazardSystemPoints(); - if (m_party) { - for (const auto &partyMember : m_party->getMembers()) { - if (partyMember && partyMember->getHazardSystemPoints() < points) { - points = partyMember->getHazardSystemPoints(); - } - } +void Player::setBossPoints(uint32_t amount) { + bossPoints = amount; +} - if (m_party->getLeader() && m_party->getLeader()->getHazardSystemPoints() < points) { - points = m_party->getLeader()->getHazardSystemPoints(); - } - } +void Player::addBossPoints(uint32_t amount) { + bossPoints += amount; +} - if (points == 0) { - return; - } +void Player::removeBossPoints(uint32_t amount) { + bossPoints = std::max<uint32_t>(0, bossPoints - amount); +} - uint16_t stage = 0; - auto chance = static_cast<uint16_t>(normal_random(1, 10000)); - auto critChance = g_configManager().getNumber(HAZARD_CRITICAL_CHANCE, __FUNCTION__); - // Critical chance - if (monster->getHazardSystemCrit() && (lastHazardSystemCriticalHit + g_configManager().getNumber(HAZARD_CRITICAL_INTERVAL, __FUNCTION__)) <= OTSYS_TIME() && chance <= critChance && !damage.critical) { - damage.critical = true; - damage.extension = true; - damage.exString = "(Hazard)"; +uint32_t Player::getBossPoints() const { + return bossPoints; +} - stage = (points - 1) * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_CRITICAL_MULTIPLIER, __FUNCTION__)); - damage.primary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * (5000 + stage)) / 10000)); - damage.secondary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * (5000 + stage)) / 10000)); - lastHazardSystemCriticalHit = OTSYS_TIME(); +void Player::sendBosstiaryCooldownTimer() const { + if (client) { + client->sendBosstiaryCooldownTimer(); } +} - // To prevent from punish the player twice with critical + damage boost, just uncomment code from the if - if (monster->getHazardSystemDamageBoost() /* && !damage.critical*/) { - stage = points * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_DAMAGE_MULTIPLIER, __FUNCTION__)); - if (stage != 0) { - damage.extension = true; - damage.exString = "(Hazard)"; - damage.primary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * stage) / 10000)); - if (damage.secondary.value != 0) { - damage.secondary.value += static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * stage) / 10000)); - } - } +void Player::setSlotBossId(uint8_t slotId, uint32_t bossId) { + if (slotId == 1) { + bossIdSlotOne = bossId; + } else { + bossIdSlotTwo = bossId; + } + if (client) { + client->parseSendBosstiarySlots(); } } -void Player::parseAttackDealtHazardSystem(CombatDamage &damage, std::shared_ptr<Monster> monster) { - if (!g_configManager().getBoolean(TOGGLE_HAZARDSYSTEM, __FUNCTION__)) { - return; +uint32_t Player::getSlotBossId(uint8_t slotId) const { + if (slotId == 1) { + return bossIdSlotOne; + } else { + return bossIdSlotTwo; } +} - if (!monster || !monster->getHazard()) { - return; - } +void Player::addRemoveTime() { + bossRemoveTimes = bossRemoveTimes + 1; +} - if (damage.primary.type == COMBAT_HEALING) { - return; - } +void Player::setRemoveBossTime(uint8_t newRemoveTimes) { + bossRemoveTimes = newRemoveTimes; +} - auto points = getHazardSystemPoints(); - if (m_party) { - for (const auto &partyMember : m_party->getMembers()) { - if (partyMember && partyMember->getHazardSystemPoints() < points) { - points = partyMember->getHazardSystemPoints(); - } - } +uint8_t Player::getRemoveTimes() const { + return bossRemoveTimes; +} - if (m_party->getLeader() && m_party->getLeader()->getHazardSystemPoints() < points) { - points = m_party->getLeader()->getHazardSystemPoints(); - } +void Player::sendMonsterPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos) const { + if (client) { + client->sendMonsterPodiumWindow(podium, position, itemId, stackpos); } +} - if (points == 0) { - return; +void Player::sendBosstiaryEntryChanged(uint32_t bossid) const { + if (client) { + client->sendBosstiaryEntryChanged(bossid); } +} - // Dodge chance - uint16_t stage; - if (monster->getHazardSystemDodge()) { - stage = points * g_configManager().getNumber(HAZARD_DODGE_MULTIPLIER, __FUNCTION__); - auto chance = static_cast<uint16_t>(normal_random(1, 10000)); - if (chance <= stage) { - damage.primary.value = 0; - damage.secondary.value = 0; - return; - } - } - if (monster->getHazardSystemDefenseBoost()) { - stage = points * static_cast<uint16_t>(g_configManager().getNumber(HAZARD_DEFENSE_MULTIPLIER, __FUNCTION__)); - if (stage != 0) { - damage.exString = fmt::format("(hazard -{}%)", stage / 100.); - damage.primary.value -= static_cast<int32_t>(std::ceil((static_cast<double>(damage.primary.value) * stage) / 10000)); - if (damage.secondary.value != 0) { - damage.secondary.value -= static_cast<int32_t>(std::ceil((static_cast<double>(damage.secondary.value) * stage) / 10000)); - } - return; - } +void Player::sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> &items) const { + if (client) { + client->sendInventoryImbuements(items); } } @@ -8044,13 +10246,13 @@ const std::unique_ptr<PlayerCyclopedia> &Player::cyclopedia() const { } void Player::sendLootMessage(const std::string &message) const { - auto party = getParty(); + const auto &party = getParty(); if (!party) { sendTextMessage(MESSAGE_LOOT, message); return; } - if (auto partyLeader = party->getLeader()) { + if (const auto &partyLeader = party->getLeader()) { partyLeader->sendTextMessage(MESSAGE_LOOT, message); } for (const auto &partyMember : party->getMembers()) { @@ -8062,20 +10264,20 @@ void Player::sendLootMessage(const std::string &message) const { std::shared_ptr<Container> Player::getLootPouch() { // Allow players with CM access or higher have the loot pouch anywhere - auto parentItem = getParent() ? getParent()->getItem() : nullptr; + const auto &parentItem = getParent() ? getParent()->getItem() : nullptr; if (isPlayerGroup() && parentItem && parentItem->getID() != ITEM_STORE_INBOX) { return nullptr; } - auto inventoryItems = getInventoryItemsFromId(ITEM_GOLD_POUCH); + const auto &inventoryItems = getInventoryItemsFromId(ITEM_GOLD_POUCH); if (inventoryItems.empty()) { return nullptr; } - auto containerItem = inventoryItems.front(); + const auto &containerItem = inventoryItems.front(); if (!containerItem) { return nullptr; } - auto container = containerItem->getContainer(); + const auto &container = containerItem->getContainer(); if (!container) { return nullptr; } @@ -8084,12 +10286,12 @@ std::shared_ptr<Container> Player::getLootPouch() { } std::shared_ptr<Container> Player::getStoreInbox() const { - auto thing = getThing(CONST_SLOT_STORE_INBOX); + const auto &thing = getThing(CONST_SLOT_STORE_INBOX); if (!thing) { return nullptr; } - auto storeInbox = thing->getContainer(); + const auto &storeInbox = thing->getContainer(); return storeInbox ? storeInbox : nullptr; } @@ -8104,7 +10306,11 @@ bool Player::hasPermittedConditionInPZ() const { }; bool hasPermittedCondition = false; - for (auto condition : allowedConditions) { + for (const auto &condition : allowedConditions) { + if (!condition) { + continue; + } + if (getCondition(condition)) { hasPermittedCondition = true; break; @@ -8116,7 +10322,7 @@ bool Player::hasPermittedConditionInPZ() const { uint16_t Player::getDodgeChance() const { uint16_t chance = 0; - if (auto playerArmor = getInventoryItem(CONST_SLOT_ARMOR); + if (const auto &playerArmor = getInventoryItem(CONST_SLOT_ARMOR); playerArmor != nullptr && playerArmor->getTier()) { chance += static_cast<uint16_t>(playerArmor->getDodgeChance() * 100); } @@ -8126,8 +10332,52 @@ uint16_t Player::getDodgeChance() const { return chance; } +uint8_t Player::isRandomMounted() const { + return randomMount; +} + +void Player::setRandomMount(uint8_t isMountRandomized) { + randomMount = isMountRandomized; +} + +void Player::sendFYIBox(const std::string &message) const { + if (client) { + client->sendFYIBox(message); + } +} + +void Player::BestiarysendCharms() const { + if (client) { + client->BestiarysendCharms(); + } +} + +void Player::addBestiaryKillCount(uint16_t raceid, uint32_t amount) { + const uint32_t oldCount = getBestiaryKillCount(raceid); + const uint32_t key = STORAGEVALUE_BESTIARYKILLCOUNT + raceid; + addStorageValue(key, static_cast<int32_t>(oldCount + amount), true); +} + +uint32_t Player::getBestiaryKillCount(uint16_t raceid) const { + const uint32_t key = STORAGEVALUE_BESTIARYKILLCOUNT + raceid; + const auto value = getStorageValue(key); + return value > 0 ? static_cast<uint32_t>(value) : 0; +} + +void Player::setGUID(uint32_t newGuid) { + this->guid = newGuid; +} + +uint32_t Player::getGUID() const { + return guid; +} + +bool Player::canSeeInvisibility() const { + return hasFlag(PlayerFlags_t::CanSenseInvisibility) || group->access; +} + void Player::checkAndShowBlessingMessage() { - auto adventurerBlessingLevel = g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL, __FUNCTION__); + auto adventurerBlessingLevel = g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL); auto willNotLoseBless = getLevel() < adventurerBlessingLevel && getVocationId() > VOCATION_NONE; std::string bless = getBlessingsName(); std::ostringstream blessOutput; @@ -8164,7 +10414,7 @@ bool Player::canSpeakWithHireling(uint8_t speechbubble) { } uint16_t Player::getPlayerVocationEnum() const { - int cipTibiaId = getVocation()->getClientId(); + const int cipTibiaId = getVocation()->getClientId(); if (cipTibiaId == 1 || cipTibiaId == 11) { return Vocation_t::VOCATION_KNIGHT_CIP; // Knight } else if (cipTibiaId == 2 || cipTibiaId == 12) { diff --git a/src/creatures/players/player.hpp b/src/creatures/players/player.hpp index bfaad14cf..03f248cfa 100644 --- a/src/creatures/players/player.hpp +++ b/src/creatures/players/player.hpp @@ -9,36 +9,13 @@ #pragma once -#include "items/containers/container.hpp" #include "creatures/creature.hpp" -#include "items/cylinder.hpp" -#include "declarations.hpp" -#include "items/containers/depot/depotchest.hpp" -#include "items/containers/depot/depotlocker.hpp" -#include "grouping/familiars.hpp" #include "enums/forge_conversion.hpp" -#include "grouping/groups.hpp" -#include "grouping/guild.hpp" -#include "imbuements/imbuements.hpp" -#include "items/containers/inbox/inbox.hpp" -#include "io/ioguild.hpp" -#include "io/ioprey.hpp" -#include "creatures/appearance/mounts/mounts.hpp" -#include "creatures/appearance/outfit/outfit.hpp" -#include "grouping/party.hpp" -#include "server/network/protocol/protocolgame.hpp" -#include "items/containers/rewards/reward.hpp" -#include "items/containers/rewards/rewardchest.hpp" -#include "map/town.hpp" -#include "vocations/vocation.hpp" -#include "creatures/npcs/npc.hpp" #include "game/bank/bank.hpp" -#include "enums/object_category.hpp" -#include "enums/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_badge.hpp" -#include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_title.hpp" -#include "creatures/players/vip/player_vip.hpp" +#include "grouping/guild.hpp" +#include "items/cylinder.hpp" +#include "game/movement/position.hpp" +#include "creatures/creatures_definitions.hpp" class House; class NetworkMessage; @@ -46,7 +23,6 @@ class Weapon; class ProtocolGame; class Party; class Task; -class Bed; class Guild; class Imbuement; class PreySlot; @@ -60,12 +36,45 @@ class PlayerTitle; class PlayerVIP; class Spectators; class Account; +class RewardChest; +class Cylinder; +class Town; +class Reward; +class DepotChest; +class DepotLocker; +class Inbox; +class Vocation; +class Container; +class KV; +class BedItem; +class Npc; struct ModalWindow; struct Achievement; -struct Badge; -struct Title; struct VIPGroup; +struct Mount; +struct OutfitEntry; +struct Outfit; +struct FamiliarEntry; +struct Familiar; +struct Group; +struct Outfit_t; +struct TextMessage; +struct HighscoreCharacter; + +enum class PlayerIcon : uint8_t; +enum class IconBakragore : uint8_t; +enum ObjectCategory_t : uint8_t; +enum PreySlot_t : uint8_t; +enum SpeakClasses : uint8_t; +enum ChannelEvent_t : uint8_t; +enum SquareColor_t : uint8_t; + +using GuildWarVector = std::vector<uint32_t>; +using StashContainerList = std::vector<std::pair<std::shared_ptr<Item>, uint32_t>>; +using ItemVector = std::vector<std::shared_ptr<Item>>; +using UsersMap = std::map<uint32_t, std::shared_ptr<Player>>; +using InvitedMap = std::map<uint32_t, std::shared_ptr<Player>>; struct ForgeHistory { ForgeAction_t actionType = ForgeAction_t::FUSION; @@ -122,8 +131,8 @@ class Player final : public Creature, public Cylinder, public Bankable { const std::shared_ptr<Player> &player; }; - explicit Player(ProtocolGame_ptr p); - ~Player(); + explicit Player(std::shared_ptr<ProtocolGame> p); + ~Player() override; // non-copyable Player(const Player &) = delete; @@ -136,7 +145,7 @@ class Player final : public Creature, public Cylinder, public Bankable { return static_self_cast<Player>(); } - static std::shared_ptr<Task> createPlayerTask(uint32_t delay, std::function<void(void)> f, std::string context); + static std::shared_ptr<Task> createPlayerTask(uint32_t delay, std::function<void(void)> f, const std::string &context); void setID() override; @@ -179,360 +188,196 @@ class Player final : public Creature, public Cylinder, public Bankable { bool toggleMount(bool mount); bool tameMount(uint8_t mountId); bool untameMount(uint8_t mountId); - bool hasMount(const std::shared_ptr<Mount> mount) const; + bool hasMount(const std::shared_ptr<Mount> &mount) const; bool hasAnyMount() const; uint8_t getRandomMountId() const; void dismount(); uint16_t getDodgeChance() const; - uint8_t isRandomMounted() const { - return randomMount; - } - void setRandomMount(uint8_t isMountRandomized) { - randomMount = isMountRandomized; - } + uint8_t isRandomMounted() const; + void setRandomMount(uint8_t isMountRandomized); - void sendFYIBox(const std::string &message) { - if (client) { - client->sendFYIBox(message); - } - } + void sendFYIBox(const std::string &message) const; - void BestiarysendCharms() { - if (client) { - client->BestiarysendCharms(); - } - } - void addBestiaryKillCount(uint16_t raceid, uint32_t amount) { - uint32_t oldCount = getBestiaryKillCount(raceid); - uint32_t key = STORAGEVALUE_BESTIARYKILLCOUNT + raceid; - addStorageValue(key, static_cast<int32_t>(oldCount + amount), true); - } - uint32_t getBestiaryKillCount(uint16_t raceid) const { - uint32_t key = STORAGEVALUE_BESTIARYKILLCOUNT + raceid; - auto value = getStorageValue(key); - return value > 0 ? static_cast<uint32_t>(value) : 0; - } + void BestiarysendCharms() const; + void addBestiaryKillCount(uint16_t raceid, uint32_t amount); + uint32_t getBestiaryKillCount(uint16_t raceid) const; - void setGUID(uint32_t newGuid) { - this->guid = newGuid; - } - uint32_t getGUID() const { - return guid; - } - bool canSeeInvisibility() const override { - return hasFlag(PlayerFlags_t::CanSenseInvisibility) || group->access; - } + void setGUID(uint32_t newGuid); + uint32_t getGUID() const; + bool canSeeInvisibility() const override; - void setDailyReward(uint8_t reward) { - this->isDailyReward = reward; - } + void setDailyReward(uint8_t reward); void removeList() override; void addList() override; void removePlayer(bool displayEffect, bool forced = true); - static uint64_t getExpForLevel(const uint32_t level) { - return (((level - 6ULL) * level + 17ULL) * level - 12ULL) / 6ULL * 100ULL; - } + static uint64_t getExpForLevel(const uint32_t level); - uint16_t getStaminaMinutes() const { - return staminaMinutes; - } + uint16_t getStaminaMinutes() const; - void sendItemsPrice() { - if (client) { - client->sendItemsPrice(); - } - } + void sendItemsPrice() const; - void sendForgingData() const { - if (client) { - client->sendForgingData(); - } - } + void sendForgingData() const; bool addOfflineTrainingTries(skills_t skill, uint64_t tries); - void addOfflineTrainingTime(int32_t addTime) { - offlineTrainingTime = std::min<int32_t>(12 * 3600 * 1000, offlineTrainingTime + addTime); - } - void removeOfflineTrainingTime(int32_t removeTime) { - offlineTrainingTime = std::max<int32_t>(0, offlineTrainingTime - removeTime); - } - int32_t getOfflineTrainingTime() const { - return offlineTrainingTime; - } + void addOfflineTrainingTime(int32_t addTime); + void removeOfflineTrainingTime(int32_t removeTime); + int32_t getOfflineTrainingTime() const; - int8_t getOfflineTrainingSkill() const { - return offlineTrainingSkill; - } - void setOfflineTrainingSkill(int8_t skill) { - offlineTrainingSkill = skill; - } + int8_t getOfflineTrainingSkill() const; + void setOfflineTrainingSkill(int8_t skill); - uint64_t getBankBalance() const override { - return bankBalance; - } - void setBankBalance(uint64_t balance) override { - bankBalance = balance; - } + uint64_t getBankBalance() const override; + void setBankBalance(uint64_t balance) override; - [[nodiscard]] std::shared_ptr<Guild> getGuild() const { - return guild; - } - void setGuild(const std::shared_ptr<Guild> guild); + [[nodiscard]] std::shared_ptr<Guild> getGuild() const; + void setGuild(const std::shared_ptr<Guild> &guild); - [[nodiscard]] GuildRank_ptr getGuildRank() const { - return guildRank; - } - void setGuildRank(GuildRank_ptr newGuildRank) { - guildRank = newGuildRank; - } + [[nodiscard]] GuildRank_ptr getGuildRank() const; + void setGuildRank(GuildRank_ptr newGuildRank); - bool isGuildMate(std::shared_ptr<Player> player) const; + bool isGuildMate(const std::shared_ptr<Player> &player) const; - [[nodiscard]] const std::string &getGuildNick() const { - return guildNick; - } - void setGuildNick(std::string nick) { - guildNick = nick; - } + [[nodiscard]] const std::string &getGuildNick() const; + void setGuildNick(std::string nick); - bool isInWar(std::shared_ptr<Player> player) const; + bool isInWar(const std::shared_ptr<Player> &player) const; bool isInWarList(uint32_t guild_id) const; - void setLastWalkthroughAttempt(int64_t walkthroughAttempt) { - lastWalkthroughAttempt = walkthroughAttempt; - } - void setLastWalkthroughPosition(Position walkthroughPosition) { - lastWalkthroughPosition = walkthroughPosition; - } + void setLastWalkthroughAttempt(int64_t walkthroughAttempt); + void setLastWalkthroughPosition(Position walkthroughPosition); - std::shared_ptr<Inbox> getInbox() const { - return inbox; - } + std::shared_ptr<Inbox> getInbox() const; - uint32_t getClientIcons(); + std::unordered_set<PlayerIcon> getClientIcons(); const GuildWarVector &getGuildWarVector() const { return guildWarVector; } - const std::unordered_set<std::shared_ptr<MonsterType>> &getCyclopediaMonsterTrackerSet(bool isBoss) const { - return isBoss ? m_bosstiaryMonsterTracker : m_bestiaryMonsterTracker; - } + const std::unordered_set<std::shared_ptr<MonsterType>> &getCyclopediaMonsterTrackerSet(bool isBoss) const; - void addMonsterToCyclopediaTrackerList(const std::shared_ptr<MonsterType> mtype, bool isBoss, bool reloadClient = false); + void addMonsterToCyclopediaTrackerList(const std::shared_ptr<MonsterType> &mtype, bool isBoss, bool reloadClient = false); - void removeMonsterFromCyclopediaTrackerList(std::shared_ptr<MonsterType> mtype, bool isBoss, bool reloadClient = false); + void removeMonsterFromCyclopediaTrackerList(const std::shared_ptr<MonsterType> &mtype, bool isBoss, bool reloadClient = false); - void sendBestiaryEntryChanged(uint16_t raceid) { - if (client) { - client->sendBestiaryEntryChanged(raceid); - } - } + void sendBestiaryEntryChanged(uint16_t raceid) const; - void refreshCyclopediaMonsterTracker(bool isBoss = false) { + void refreshCyclopediaMonsterTracker(bool isBoss = false) const { refreshCyclopediaMonsterTracker(getCyclopediaMonsterTrackerSet(isBoss), isBoss); } - void refreshCyclopediaMonsterTracker(const std::unordered_set<std::shared_ptr<MonsterType>> &trackerList, bool isBoss) const { - if (client) { - client->refreshCyclopediaMonsterTracker(trackerList, isBoss); - } - } + void refreshCyclopediaMonsterTracker(const std::unordered_set<std::shared_ptr<MonsterType>> &trackerList, bool isBoss) const; bool isBossOnBosstiaryTracker(const std::shared_ptr<MonsterType> &monsterType) const; - std::shared_ptr<Vocation> getVocation() const { - return vocation; - } - - OperatingSystem_t getOperatingSystem() const { - return operatingSystem; - } - void setOperatingSystem(OperatingSystem_t clientos) { - operatingSystem = clientos; - } + std::shared_ptr<Vocation> getVocation() const; - bool isOldProtocol() { - return client && client->oldProtocol; - } + OperatingSystem_t getOperatingSystem() const; + void setOperatingSystem(OperatingSystem_t clientos); - uint32_t getProtocolVersion() const { - if (!client) { - return 0; - } + bool isOldProtocol() const; - return client->getVersion(); - } + uint32_t getProtocolVersion() const; - bool hasSecureMode() const { - return secureMode; - } + bool hasSecureMode() const; - void setParty(std::shared_ptr<Party> newParty) { - m_party = newParty; - } - std::shared_ptr<Party> getParty() const { - return m_party; - } + void setParty(std::shared_ptr<Party> newParty); + std::shared_ptr<Party> getParty() const; int32_t getCleavePercent(bool useCharges = false) const; - void setCleavePercent(int32_t value) { - cleavePercent = std::max(0, cleavePercent + value); - } + void setCleavePercent(int32_t value); int32_t getPerfectShotDamage(uint8_t range, bool useCharges = false) const; - void setPerfectShotDamage(uint8_t range, int32_t damage) { - int32_t actualDamage = getPerfectShotDamage(range); - bool aboveZero = (actualDamage != 0); - actualDamage += damage; - if (actualDamage == 0 && aboveZero) { - perfectShot.erase(range); - } else { - perfectShot[range] = actualDamage; - } - } + void setPerfectShotDamage(uint8_t range, int32_t damage); int32_t getSpecializedMagicLevel(CombatType_t combat, bool useCharges = false) const; - void setSpecializedMagicLevel(CombatType_t combat, int32_t value) { - specializedMagicLevel[combatTypeToIndex(combat)] = std::max(0, specializedMagicLevel[combatTypeToIndex(combat)] + value); - } + void setSpecializedMagicLevel(CombatType_t combat, int32_t value); int32_t getMagicShieldCapacityFlat(bool useCharges = false) const; - void setMagicShieldCapacityFlat(int32_t value) { - magicShieldCapacityFlat += value; - } + void setMagicShieldCapacityFlat(int32_t value); int32_t getMagicShieldCapacityPercent(bool useCharges = false) const; - void setMagicShieldCapacityPercent(int32_t value) { - magicShieldCapacityPercent += value; - } + void setMagicShieldCapacityPercent(int32_t value); - int32_t getReflectPercent(CombatType_t combat, bool useCharges = false) const override; + double_t getReflectPercent(CombatType_t combat, bool useCharges = false) const override; int32_t getReflectFlat(CombatType_t combat, bool useCharges = false) const override; - PartyShields_t getPartyShield(std::shared_ptr<Player> player); - bool isInviting(std::shared_ptr<Player> player) const; - bool isPartner(std::shared_ptr<Player> player) const; - void sendPlayerPartyIcons(std::shared_ptr<Player> player); - bool addPartyInvitation(std::shared_ptr<Party> party); - void removePartyInvitation(std::shared_ptr<Party> party); + PartyShields_t getPartyShield(const std::shared_ptr<Player> &player); + bool isInviting(const std::shared_ptr<Player> &player) const; + bool isPartner(const std::shared_ptr<Player> &player) const; + void sendPlayerPartyIcons(const std::shared_ptr<Player> &player) const; + bool addPartyInvitation(const std::shared_ptr<Party> &party); + void removePartyInvitation(const std::shared_ptr<Party> &party); void clearPartyInvitations(); - void sendUnjustifiedPoints(); - - GuildEmblems_t getGuildEmblem(std::shared_ptr<Player> player) const; - - uint64_t getSpentMana() const { - return manaSpent; - } + void sendUnjustifiedPoints() const; - bool hasFlag(PlayerFlags_t flag) const { - return group->flags[static_cast<std::size_t>(flag)]; - } + GuildEmblems_t getGuildEmblem(const std::shared_ptr<Player> &player) const; - void setFlag(PlayerFlags_t flag) const { - group->flags[static_cast<std::size_t>(flag)] = true; - } + uint64_t getSpentMana() const; - void removeFlag(PlayerFlags_t flag) const { - group->flags[static_cast<std::size_t>(flag)] = false; - } + bool hasFlag(PlayerFlags_t flag) const; - std::shared_ptr<BedItem> getBedItem() { - return bedItem; - } - void setBedItem(std::shared_ptr<BedItem> b) { - bedItem = b; - } + void setFlag(PlayerFlags_t flag) const; - bool hasImbuingItem() { - return imbuingItem != nullptr; - } - void setImbuingItem(std::shared_ptr<Item> item); + void removeFlag(PlayerFlags_t flag) const; - void addBlessing(uint8_t index, uint8_t count) { - if (blessings[index - 1] == 255) { - return; - } + std::shared_ptr<BedItem> getBedItem(); + void setBedItem(std::shared_ptr<BedItem> b); - blessings[index - 1] += count; - } - void removeBlessing(uint8_t index, uint8_t count) { - if (blessings[index - 1] == 0) { - return; - } + bool hasImbuingItem() const; + void setImbuingItem(const std::shared_ptr<Item> &item); - blessings[index - 1] -= count; - } - bool hasBlessing(uint8_t index) const { - return blessings[index - 1] != 0; - } + void addBlessing(uint8_t index, uint8_t count); + void removeBlessing(uint8_t index, uint8_t count); + bool hasBlessing(uint8_t index) const; - uint8_t getBlessingCount(uint8_t index, bool storeCount = false) const { - if (!storeCount) { - if (index > 0 && index <= blessings.size()) { - return blessings[index - 1]; - } else { - g_logger().error("[{}] - index outside range 0-10.", __FUNCTION__); - return 0; - } - } - auto amount = kv()->scoped("summary")->scoped("blessings")->scoped(fmt::format("{}", index))->get("amount"); - return amount ? static_cast<uint8_t>(amount->getNumber()) : 0; - } + uint8_t getBlessingCount(uint8_t index, bool storeCount = false) const; std::string getBlessingsName() const; bool isOffline() const { return (getID() == 0); } - void disconnect() { - if (client) { - client->disconnect(); - } - } + void disconnect() const; - uint32_t getIP() const { - return client ? client->getIP() : 0; - } + uint32_t getIP() const; bool isDisconnected() const { return getIP() == 0; } - void addContainer(uint8_t cid, std::shared_ptr<Container> container); + void addContainer(uint8_t cid, const std::shared_ptr<Container> &container); void closeContainer(uint8_t cid); void setContainerIndex(uint8_t cid, uint16_t index); std::shared_ptr<Container> getContainerByID(uint8_t cid); - int8_t getContainerID(std::shared_ptr<Container> container) const; + int8_t getContainerID(const std::shared_ptr<Container> &container) const; uint16_t getContainerIndex(uint8_t cid) const; bool canOpenCorpse(uint32_t ownerId) const; - void addStorageValue(const uint32_t key, const int32_t value, const bool isLogin = false); - int32_t getStorageValue(const uint32_t key) const; + void addStorageValue(uint32_t key, int32_t value, bool isLogin = false); + int32_t getStorageValue(uint32_t key) const; int32_t getStorageValueByName(const std::string &storageName) const; - void addStorageValueByName(const std::string &storageName, const int32_t value, const bool isLogin = false); + void addStorageValueByName(const std::string &storageName, int32_t value, bool isLogin = false); - std::shared_ptr<KV> kv() const { - return g_kv().scoped("player")->scoped(fmt::format("{}", getGUID())); - } + std::shared_ptr<KV> kv() const; void genReservedStorageRange(); void setGroup(std::shared_ptr<Group> newGroup) { - group = newGroup; + group = std::move(newGroup); } std::shared_ptr<Group> getGroup() const { return group; @@ -544,23 +389,7 @@ class Player final : public Creature, public Cylinder, public Bankable { bool isInMarket() const { return inMarket; } - void setSpecialMenuAvailable(bool supplyStashBool, bool marketMenuBool, bool depotSearchBool) { - // Closing depot search when player have special container disabled and it's still open. - if (isDepotSearchOpen() && !depotSearchBool && depotSearch) { - depotSearchOnItem = { 0, 0 }; - sendCloseDepotSearch(); - } - - // Menu option 'stow, stow container ...' - // Menu option 'show in market' - // Menu option to open depot search - supplyStash = supplyStashBool; - marketMenu = marketMenuBool; - depotSearch = depotSearchBool; - if (client) { - client->sendSpecialContainersAvailable(); - } - } + void setSpecialMenuAvailable(bool supplyStashBool, bool marketMenuBool, bool depotSearchBool); bool isDepotSearchOpen() const { return depotSearchOnItem.first != 0; } @@ -573,13 +402,13 @@ class Player final : public Creature, public Cylinder, public Bankable { bool isDepotSearchAvailable() const { return depotSearch; } - bool isSupplyStashMenuAvailable() { + bool isSupplyStashMenuAvailable() const { return supplyStash; } - bool isMarketMenuAvailable() { + bool isMarketMenuAvailable() const { return marketMenu; } - bool isExerciseTraining() { + bool isExerciseTraining() const { return exerciseTraining; } void setExerciseTraining(bool isTraining) { @@ -605,6 +434,9 @@ class Player final : public Creature, public Cylinder, public Bankable { uint32_t getLevel() const { return level; } + void setLevel(uint32_t newLevel) { + level = newLevel; + } uint8_t getLevelPercent() const { return levelPercent; } @@ -625,9 +457,7 @@ class Player final : public Creature, public Cylinder, public Bankable { uint32_t getPremiumDays() const; time_t getPremiumLastDay() const; - bool isVip() const { - return g_configManager().getBoolean(VIP_SYSTEM_ENABLED, __FUNCTION__) && (getPremiumDays() > 0 || getPremiumLastDay() > getTimeNow()); - } + bool isVip() const; void setTibiaCoins(int32_t v); void setTransferableTibiaCoins(int32_t v); @@ -635,9 +465,7 @@ class Player final : public Creature, public Cylinder, public Bankable { uint16_t getHelpers() const; bool setVocation(uint16_t vocId); - uint16_t getVocationId() const { - return vocation->getId(); - } + uint16_t getVocationId() const; PlayerSex_t getSex() const { return sex; @@ -645,21 +473,11 @@ class Player final : public Creature, public Cylinder, public Bankable { PlayerPronoun_t getPronoun() const { return pronoun; } - std::string getObjectPronoun() const { - return getPlayerObjectPronoun(pronoun, sex, name); - } - std::string getSubjectPronoun() const { - return getPlayerSubjectPronoun(pronoun, sex, name); - } - std::string getPossessivePronoun() const { - return getPlayerPossessivePronoun(pronoun, sex, name); - } - std::string getReflexivePronoun() const { - return getPlayerReflexivePronoun(pronoun, sex, name); - } - std::string getSubjectVerb(bool past = false) const { - return getVerbForPronoun(pronoun, past); - } + std::string getObjectPronoun() const; + std::string getSubjectPronoun() const; + std::string getPossessivePronoun() const; + std::string getReflexivePronoun() const; + std::string getSubjectVerb(bool past = false) const; void setSex(PlayerSex_t); void setPronoun(PlayerPronoun_t); uint64_t getExperience() const { @@ -677,20 +495,9 @@ class Player final : public Creature, public Cylinder, public Bankable { const Position &getLoginPosition() const { return loginPosition; } - const Position &getTemplePosition() const { - if (!town) { - static auto emptyPosition = Position(); - return emptyPosition; - } - - return town->getTemplePosition(); - } - std::shared_ptr<Town> getTown() const { - return town; - } - void setTown(const std::shared_ptr<Town> &newTown) { - this->town = newTown; - } + const Position &getTemplePosition() const; + std::shared_ptr<Town> getTown() const; + void setTown(const std::shared_ptr<Town> &newTown); void clearModalWindows(); bool hasModalWindowOpen(uint32_t modalWindowId) const; @@ -701,7 +508,7 @@ class Player final : public Creature, public Cylinder, public Bankable { void addMessageBuffer(); void removeMessageBuffer(); - bool removeItemOfType(uint16_t itemId, uint32_t itemAmount, int32_t subType, bool ignoreEquipped = false); + bool removeItemOfType(uint16_t itemId, uint32_t itemAmount, int32_t subType, bool ignoreEquipped = false) const; /** * @param itemAmount is uint32_t because stash item is uint32_t max */ @@ -711,83 +518,28 @@ class Player final : public Creature, public Cylinder, public Bankable { */ bool removeItemCountById(uint16_t itemId, uint32_t itemAmount, bool removeFromStash = true); - void addItemOnStash(uint16_t itemId, uint32_t amount) { - auto it = stashItems.find(itemId); - if (it != stashItems.end()) { - stashItems[itemId] += amount; - return; - } - - stashItems[itemId] = amount; - } - uint32_t getStashItemCount(uint16_t itemId) const { - auto it = stashItems.find(itemId); - if (it != stashItems.end()) { - return it->second; - } - return 0; - } - bool withdrawItem(uint16_t itemId, uint32_t amount) { - auto it = stashItems.find(itemId); - if (it != stashItems.end()) { - if (it->second > amount) { - stashItems[itemId] -= amount; - } else if (it->second == amount) { - stashItems.erase(itemId); - } else { - return false; - } - return true; - } - return false; - } - StashItemList getStashItems() const { - return stashItems; - } + void addItemOnStash(uint16_t itemId, uint32_t amount); + uint32_t getStashItemCount(uint16_t itemId) const; + bool withdrawItem(uint16_t itemId, uint32_t amount); + StashItemList getStashItems() const; - uint32_t getBaseCapacity() const { - if (hasFlag(PlayerFlags_t::CannotPickupItem)) { - return 0; - } else if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { - return std::numeric_limits<uint32_t>::max(); - } - return capacity; - } + uint32_t getBaseCapacity() const; uint32_t getCapacity() const; - uint32_t getBonusCapacity() const { - if (hasFlag(PlayerFlags_t::CannotPickupItem) || hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { - return std::numeric_limits<uint32_t>::max(); - } - return bonusCapacity; - } + uint32_t getBonusCapacity() const; - uint32_t getFreeCapacity() const { - if (hasFlag(PlayerFlags_t::CannotPickupItem)) { - return 0; - } else if (hasFlag(PlayerFlags_t::HasInfiniteCapacity)) { - return std::numeric_limits<uint32_t>::max(); - } else { - return std::max<int32_t>(0, getCapacity() - inventoryWeight); - } - } + uint32_t getFreeCapacity() const; int32_t getMaxHealth() const override; uint32_t getMaxMana() const override; std::shared_ptr<Item> getInventoryItem(Slots_t slot) const; - bool isItemAbilityEnabled(Slots_t slot) const { - return inventoryAbilities[slot]; - } - void setItemAbility(Slots_t slot, bool enabled) { - inventoryAbilities[slot] = enabled; - } + bool isItemAbilityEnabled(Slots_t slot) const; + void setItemAbility(Slots_t slot, bool enabled); - void setVarSkill(skills_t skill, int32_t modifier) { - varSkills[skill] += modifier; - } + void setVarSkill(skills_t skill, int32_t modifier); void setVarStats(stats_t stat, int32_t modifier); int32_t getDefaultStats(stats_t stat) const; @@ -795,57 +547,45 @@ class Player final : public Creature, public Cylinder, public Bankable { void addConditionSuppressions(const std::array<ConditionType_t, ConditionType_t::CONDITION_COUNT> &addCondition); void removeConditionSuppressions(); - std::shared_ptr<Reward> getReward(const uint64_t rewardId, const bool autoCreate); + std::shared_ptr<Reward> getReward(uint64_t rewardId, bool autoCreate); void removeReward(uint64_t rewardId); void getRewardList(std::vector<uint64_t> &rewards) const; std::shared_ptr<RewardChest> getRewardChest(); - std::vector<std::shared_ptr<Item>> getRewardsFromContainer(std::shared_ptr<Container> container) const; + std::vector<std::shared_ptr<Item>> getRewardsFromContainer(const std::shared_ptr<Container> &container) const; std::shared_ptr<DepotChest> getDepotChest(uint32_t depotId, bool autoCreate); std::shared_ptr<DepotLocker> getDepotLocker(uint32_t depotId); void onReceiveMail(); bool isNearDepotBox(); - std::shared_ptr<Container> refreshManagedContainer(ObjectCategory_t category, std::shared_ptr<Container> container, bool isLootContainer, bool loading = false); + std::shared_ptr<Container> refreshManagedContainer(ObjectCategory_t category, const std::shared_ptr<Container> &container, bool isLootContainer, bool loading = false); std::shared_ptr<Container> getManagedContainer(ObjectCategory_t category, bool isLootContainer) const; - void setMainBackpackUnassigned(std::shared_ptr<Container> container); + void setMainBackpackUnassigned(const std::shared_ptr<Container> &container); bool canSee(const Position &pos) override; - bool canSeeCreature(std::shared_ptr<Creature> creature) const override; + bool canSeeCreature(const std::shared_ptr<Creature> &creature) const override; - bool canWalkthrough(std::shared_ptr<Creature> creature); - bool canWalkthroughEx(std::shared_ptr<Creature> creature); + bool canWalkthrough(const std::shared_ptr<Creature> &creature); + bool canWalkthroughEx(const std::shared_ptr<Creature> &creature) const; - RaceType_t getRace() const override { - return RACE_BLOOD; - } + RaceType_t getRace() const override; uint64_t getMoney() const; std::pair<uint64_t, uint64_t> getForgeSliversAndCores() const; // safe-trade functions - void setTradeState(TradeState_t state) { - tradeState = state; - } - TradeState_t getTradeState() const { - return tradeState; - } - std::shared_ptr<Item> getTradeItem() { - return tradeItem; - } + void setTradeState(TradeState_t state); + TradeState_t getTradeState() const; + std::shared_ptr<Item> getTradeItem(); // shop functions - void setShopOwner(std::shared_ptr<Npc> owner) { - shopOwner = owner; - } + void setShopOwner(std::shared_ptr<Npc> owner); - std::shared_ptr<Npc> getShopOwner() const { - return shopOwner; - } + std::shared_ptr<Npc> getShopOwner() const; // follow functions - bool setFollowCreature(std::shared_ptr<Creature> creature) override; + bool setFollowCreature(const std::shared_ptr<Creature> &creature) override; void goToFollowCreature() override; // follow events @@ -857,125 +597,74 @@ class Player final : public Creature, public Cylinder, public Bankable { void onWalkComplete() override; void stopWalk(); - bool openShopWindow(std::shared_ptr<Npc> npc, const std::vector<ShopBlock> &shopItems = {}); + bool openShopWindow(const std::shared_ptr<Npc> &npc, const std::vector<ShopBlock> &shopItems = {}); bool closeShopWindow(); - bool updateSaleShopList(std::shared_ptr<Item> item); + bool updateSaleShopList(const std::shared_ptr<Item> &item); bool hasShopItemForSale(uint16_t itemId, uint8_t subType) const; void setChaseMode(bool mode); - void setFightMode(FightMode_t mode) { - fightMode = mode; - } - void setSecureMode(bool mode) { - secureMode = mode; - } + void setFightMode(FightMode_t mode); + void setSecureMode(bool mode); - Faction_t getFaction() const override { - return faction; - } + Faction_t getFaction() const override; - void setFaction(Faction_t factionId) { - faction = factionId; - } + void setFaction(Faction_t factionId); // combat functions - bool setAttackedCreature(std::shared_ptr<Creature> creature) override; + bool setAttackedCreature(const std::shared_ptr<Creature> &creature) override; bool isImmune(CombatType_t type) const override; bool isImmune(ConditionType_t type) const override; bool hasShield() const; bool isAttackable() const override; - static bool lastHitIsPlayer(std::shared_ptr<Creature> lastHitCreature); + static bool lastHitIsPlayer(const std::shared_ptr<Creature> &lastHitCreature); // stash functions bool addItemFromStash(uint16_t itemId, uint32_t itemCount); - void stowItem(std::shared_ptr<Item> item, uint32_t count, bool allItems); + void stowItem(const std::shared_ptr<Item> &item, uint32_t count, bool allItems); void changeHealth(int32_t healthChange, bool sendHealthChange = true) override; void changeMana(int32_t manaChange) override; void changeSoul(int32_t soulChange); - bool isPzLocked() const { - return pzLocked; - } - BlockType_t blockHit(std::shared_ptr<Creature> attacker, CombatType_t combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false) override; + bool isPzLocked() const; + BlockType_t blockHit(const std::shared_ptr<Creature> &attacker, const CombatType_t &combatType, int32_t &damage, bool checkDefense = false, bool checkArmor = false, bool field = false) override; void doAttacking(uint32_t interval) override; - bool hasExtraSwing() override { - return lastAttack > 0 && !checkLastAttackWithin(getAttackSpeed()); - } + bool hasExtraSwing() override; uint16_t getSkillLevel(skills_t skill) const; uint16_t getLoyaltySkill(skills_t skill) const; - uint16_t getBaseSkill(uint8_t skill) const { - return skills[skill].level; - } - double_t getSkillPercent(skills_t skill) const { - return skills[skill].percent; - } - - bool getAddAttackSkill() const { - return addAttackSkillPoint; - } + uint16_t getBaseSkill(uint8_t skill) const; + double_t getSkillPercent(skills_t skill) const; - BlockType_t getLastAttackBlockType() const { - return lastAttackBlockType; - } + bool getAddAttackSkill() const; - uint64_t getLastConditionTime(ConditionType_t type) const { - if (!lastConditionTime.contains(static_cast<uint8_t>(type))) { - return 0; - } - return lastConditionTime.at(static_cast<uint8_t>(type)); - } + BlockType_t getLastAttackBlockType() const; - void updateLastConditionTime(ConditionType_t type) { - lastConditionTime[static_cast<uint8_t>(type)] = OTSYS_TIME(); - } + uint64_t getLastConditionTime(ConditionType_t type) const; - bool checkLastConditionTimeWithin(ConditionType_t type, uint32_t interval) const { - if (!lastConditionTime.contains(static_cast<uint8_t>(type))) { - return false; - } - auto last = lastConditionTime.at(static_cast<uint8_t>(type)); - return last > 0 && ((OTSYS_TIME() - last) < interval); - } + void updateLastConditionTime(ConditionType_t type); - uint64_t getLastAttack() const { - return lastAttack; - } + bool checkLastConditionTimeWithin(ConditionType_t type, uint32_t interval) const; - bool checkLastAttackWithin(uint32_t interval) const { - return lastAttack > 0 && ((OTSYS_TIME() - lastAttack) < interval); - } + uint64_t getLastAttack() const; - void updateLastAttack() { - if (lastAttack == 0) { - lastAttack = OTSYS_TIME() - getAttackSpeed() - 1; - return; - } - lastAttack = OTSYS_TIME(); - } + bool checkLastAttackWithin(uint32_t interval) const; - uint64_t getLastAggressiveAction() const { - return lastAggressiveAction; - } + void updateLastAttack(); - bool checkLastAggressiveActionWithin(uint32_t interval) const { - return lastAggressiveAction > 0 && ((OTSYS_TIME() - lastAggressiveAction) < interval); - } + uint64_t getLastAggressiveAction() const; - void updateLastAggressiveAction() { - lastAggressiveAction = OTSYS_TIME(); - } + bool checkLastAggressiveActionWithin(uint32_t interval) const; - std::unordered_set<std::string> getNPCSkips(); + void updateLastAggressiveAction(); std::shared_ptr<Item> getWeapon(Slots_t slot, bool ignoreAmmo) const; std::shared_ptr<Item> getWeapon(bool ignoreAmmo = false) const; WeaponType_t getWeaponType() const; - int32_t getWeaponSkill(std::shared_ptr<Item> item) const; + int32_t getWeaponSkill(const std::shared_ptr<Item> &item) const; void getShieldAndWeapon(std::shared_ptr<Item> &shield, std::shared_ptr<Item> &weapon) const; - void drainHealth(std::shared_ptr<Creature> attacker, int32_t damage) override; - void drainMana(std::shared_ptr<Creature> attacker, int32_t manaLoss) override; + void drainHealth(const std::shared_ptr<Creature> &attacker, int32_t damage) override; + void drainMana(const std::shared_ptr<Creature> &attacker, int32_t manaLoss) override; void addManaSpent(uint64_t amount); void addSkillAdvance(skills_t skill, uint64_t count); @@ -984,28 +673,27 @@ class Player final : public Creature, public Cylinder, public Bankable { float getAttackFactor() const override; float getDefenseFactor() const override; float getMitigation() const override; - double getMitigationMultiplier() const; void addInFightTicks(bool pzlock = false); - uint64_t getGainedExperience(std::shared_ptr<Creature> attacker) const override; + uint64_t getGainedExperience(const std::shared_ptr<Creature> &attacker) const override; // combat event functions void onAddCondition(ConditionType_t type) override; void onAddCombatCondition(ConditionType_t type) override; void onEndCondition(ConditionType_t type) override; - void onCombatRemoveCondition(std::shared_ptr<Condition> condition) override; - void onAttackedCreature(std::shared_ptr<Creature> target) override; + void onCombatRemoveCondition(const std::shared_ptr<Condition> &condition) override; + void onAttackedCreature(const std::shared_ptr<Creature> &target) override; void onAttacked() override; - void onAttackedCreatureDrainHealth(std::shared_ptr<Creature> target, int32_t points) override; - void onTargetCreatureGainHealth(std::shared_ptr<Creature> target, int32_t points) override; + void onAttackedCreatureDrainHealth(const std::shared_ptr<Creature> &target, int32_t points) override; + void onTargetCreatureGainHealth(const std::shared_ptr<Creature> &target, int32_t points) override; bool onKilledPlayer(const std::shared_ptr<Player> &target, bool lastHit) override; bool onKilledMonster(const std::shared_ptr<Monster> &target) override; - void onGainExperience(uint64_t gainExp, std::shared_ptr<Creature> target) override; - void onGainSharedExperience(uint64_t gainExp, std::shared_ptr<Creature> target); - void onAttackedCreatureBlockHit(BlockType_t blockType) override; + void onGainExperience(uint64_t gainExp, const std::shared_ptr<Creature> &target) override; + void onGainSharedExperience(uint64_t gainExp, const std::shared_ptr<Creature> &target); + void onAttackedCreatureBlockHit(const BlockType_t &blockType) override; void onBlockHit() override; - void onTakeDamage(std::shared_ptr<Creature> attacker, int32_t damage) override; + void onTakeDamage(const std::shared_ptr<Creature> &attacker, int32_t damage) override; void onChangeZone(ZoneType_t zone) override; void onAttackedCreatureChangeZone(ZoneType_t zone) override; void onIdleStatus() override; @@ -1014,29 +702,17 @@ class Player final : public Creature, public Cylinder, public Bankable { LightInfo getCreatureLight() const override; Skulls_t getSkull() const override; - Skulls_t getSkullClient(std::shared_ptr<Creature> creature) override; - int64_t getSkullTicks() const { - return skullTicks; - } - void setSkullTicks(int64_t ticks) { - skullTicks = ticks; - } + Skulls_t getSkullClient(const std::shared_ptr<Creature> &creature) override; + int64_t getSkullTicks() const; + void setSkullTicks(int64_t ticks); - bool hasAttacked(std::shared_ptr<Player> attacked) const; - void addAttacked(std::shared_ptr<Player> attacked); - void removeAttacked(std::shared_ptr<Player> attacked); + bool hasAttacked(const std::shared_ptr<Player> &attacked) const; + void addAttacked(const std::shared_ptr<Player> &attacked); + void removeAttacked(const std::shared_ptr<Player> &attacked); void clearAttacked(); - void addUnjustifiedDead(std::shared_ptr<Player> attacked); - void sendCreatureEmblem(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendCreatureEmblem(creature); - } - } - void sendCreatureSkull(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendCreatureSkull(creature); - } - } + void addUnjustifiedDead(const std::shared_ptr<Player> &attacked); + void sendCreatureEmblem(const std::shared_ptr<Creature> &creature) const; + void sendCreatureSkull(const std::shared_ptr<Creature> &creature) const; void checkSkullTicks(int64_t ticks); bool canWear(uint16_t lookType, uint8_t addons) const; @@ -1049,277 +725,81 @@ class Player final : public Creature, public Cylinder, public Bankable { void addFamiliar(uint16_t lookType); bool removeFamiliar(uint16_t lookType); bool getFamiliar(const std::shared_ptr<Familiar> &familiar) const; - void setFamiliarLooktype(uint16_t familiarLooktype) { - this->defaultOutfit.lookFamiliarsType = familiarLooktype; - } + void setFamiliarLooktype(uint16_t familiarLooktype); bool canLogout(); - bool hasKilled(std::shared_ptr<Player> player) const; + bool hasKilled(const std::shared_ptr<Player> &player) const; size_t getMaxDepotItems() const; // tile // send methods - void sendAddTileItem(std::shared_ptr<Tile> itemTile, const Position &pos, std::shared_ptr<Item> item) { - if (client) { - int32_t stackpos = itemTile->getStackposOfItem(static_self_cast<Player>(), item); - if (stackpos != -1) { - client->sendAddTileItem(pos, stackpos, item); - } - } - } - void sendUpdateTileItem(std::shared_ptr<Tile> updateTile, const Position &pos, std::shared_ptr<Item> item) { - if (client) { - int32_t stackpos = updateTile->getStackposOfItem(static_self_cast<Player>(), item); - if (stackpos != -1) { - client->sendUpdateTileItem(pos, stackpos, item); - } - } - } - void sendRemoveTileThing(const Position &pos, int32_t stackpos) { - if (stackpos != -1 && client) { - client->sendRemoveTileThing(pos, stackpos); - } - } - void sendUpdateTileCreature(const std::shared_ptr<Creature> creature) { - if (client) { - client->sendUpdateTileCreature(creature->getPosition(), creature->getTile()->getClientIndexOfCreature(static_self_cast<Player>(), creature), creature); - } - } - void sendUpdateTile(std::shared_ptr<Tile> updateTile, const Position &pos) { - if (client) { - client->sendUpdateTile(updateTile, pos); - } - } - - void sendChannelMessage(const std::string &author, const std::string &text, SpeakClasses type, uint16_t channel) { - if (client) { - client->sendChannelMessage(author, text, type, channel); - } - } - void sendChannelEvent(uint16_t channelId, const std::string &playerName, ChannelEvent_t channelEvent) { - if (client) { - client->sendChannelEvent(channelId, playerName, channelEvent); - } - } - void sendCreatureAppear(std::shared_ptr<Creature> creature, const Position &pos, bool isLogin) { - if (!creature) { - return; - } - - auto tile = creature->getTile(); - if (!tile) { - return; - } - - if (client) { - client->sendAddCreature(creature, pos, tile->getStackposOfCreature(static_self_cast<Player>(), creature), isLogin); - } - } - void sendCreatureMove(std::shared_ptr<Creature> creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport) { - if (client) { - client->sendMoveCreature(creature, newPos, newStackPos, oldPos, oldStackPos, teleport); - } - } - void sendCreatureTurn(std::shared_ptr<Creature> creature) { - if (!creature) { - return; - } - - auto tile = creature->getTile(); - if (!tile) { - return; - } - - if (client && canSeeCreature(creature)) { - int32_t stackpos = tile->getStackposOfCreature(static_self_cast<Player>(), creature); - if (stackpos != -1) { - client->sendCreatureTurn(creature, stackpos); - } - } - } - void sendCreatureSay(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, const Position* pos = nullptr) { - if (client) { - client->sendCreatureSay(creature, type, text, pos); - } - } - void sendCreatureReload(std::shared_ptr<Creature> creature) { - if (client) { - client->reloadCreature(creature); - } - } - void sendPrivateMessage(std::shared_ptr<Player> speaker, SpeakClasses type, const std::string &text) { - if (client) { - client->sendPrivateMessage(speaker, type, text); - } - } - void sendCreatureSquare(std::shared_ptr<Creature> creature, SquareColor_t color) { - if (client) { - client->sendCreatureSquare(creature, color); - } - } - void sendCreatureChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) { - if (client) { - client->sendCreatureOutfit(creature, outfit); - } - } - void sendCreatureChangeVisible(std::shared_ptr<Creature> creature, bool visible) { - if (!client || !creature) { - return; - } - - if (creature->getPlayer()) { - if (visible) { - client->sendCreatureOutfit(creature, creature->getCurrentOutfit()); - } else { - static Outfit_t outfit; - client->sendCreatureOutfit(creature, outfit); - } - } else if (canSeeInvisibility()) { - client->sendCreatureOutfit(creature, creature->getCurrentOutfit()); - } else { - auto tile = creature->getTile(); - if (!tile) { - return; - } - int32_t stackpos = tile->getStackposOfCreature(static_self_cast<Player>(), creature); - if (stackpos == -1) { - return; - } - - if (visible) { - client->sendAddCreature(creature, creature->getPosition(), stackpos, false); - } else { - client->sendRemoveTileThing(creature->getPosition(), stackpos); - } - } - } - void sendCreatureLight(std::shared_ptr<Creature> creature) { - if (client) { - client->sendCreatureLight(creature); - } - } - void sendCreatureIcon(std::shared_ptr<Creature> creature) { - if (client && !client->oldProtocol) { - client->sendCreatureIcon(creature); - } - } - void sendUpdateCreature(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendUpdateCreature(creature); - } - } - void sendCreatureWalkthrough(std::shared_ptr<Creature> creature, bool walkthrough) { - if (client) { - client->sendCreatureWalkthrough(creature, walkthrough); - } - } - void sendCreatureShield(std::shared_ptr<Creature> creature) { - if (client) { - client->sendCreatureShield(creature); - } - } - void sendCreatureType(std::shared_ptr<Creature> creature, uint8_t creatureType) { - if (client) { - client->sendCreatureType(creature, creatureType); - } - } - void sendSpellCooldown(uint16_t spellId, uint32_t time) { - if (client) { - client->sendSpellCooldown(spellId, time); - } - } - void sendSpellGroupCooldown(SpellGroup_t groupId, uint32_t time) { - if (client) { - client->sendSpellGroupCooldown(groupId, time); - } - } - void sendUseItemCooldown(uint32_t time) const { - if (client) { - client->sendUseItemCooldown(time); - } - } - void reloadCreature(std::shared_ptr<Creature> creature) { - if (client) { - client->reloadCreature(creature); - } - } + // tile + // send methods + void sendAddTileItem(const std::shared_ptr<Tile> &itemTile, const Position &pos, const std::shared_ptr<Item> &item); + void sendUpdateTileItem(const std::shared_ptr<Tile> &updateTile, const Position &pos, const std::shared_ptr<Item> &item); + void sendRemoveTileThing(const Position &pos, int32_t stackpos) const; + void sendUpdateTileCreature(const std::shared_ptr<Creature> &creature); + void sendUpdateTile(const std::shared_ptr<Tile> &updateTile, const Position &pos) const; + + void sendChannelMessage(const std::string &author, const std::string &text, SpeakClasses type, uint16_t channel) const; + void sendChannelEvent(uint16_t channelId, const std::string &playerName, ChannelEvent_t channelEvent) const; + void sendCreatureAppear(const std::shared_ptr<Creature> &creature, const Position &pos, bool isLogin); + void sendCreatureMove(const std::shared_ptr<Creature> &creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport) const; + void sendCreatureTurn(const std::shared_ptr<Creature> &creature); + void sendCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, const Position* pos = nullptr) const; + void sendCreatureReload(const std::shared_ptr<Creature> &creature) const; + void sendPrivateMessage(const std::shared_ptr<Player> &speaker, SpeakClasses type, const std::string &text) const; + void sendCreatureSquare(const std::shared_ptr<Creature> &creature, SquareColor_t color) const; + void sendCreatureChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) const; + void sendCreatureChangeVisible(const std::shared_ptr<Creature> &creature, bool visible); + void sendCreatureLight(const std::shared_ptr<Creature> &creature) const; + void sendCreatureIcon(const std::shared_ptr<Creature> &creature) const; + void sendUpdateCreature(const std::shared_ptr<Creature> &creature) const; + void sendCreatureWalkthrough(const std::shared_ptr<Creature> &creature, bool walkthrough) const; + void sendCreatureShield(const std::shared_ptr<Creature> &creature) const; + void sendCreatureType(const std::shared_ptr<Creature> &creature, uint8_t creatureType) const; + void sendSpellCooldown(uint16_t spellId, uint32_t time) const; + void sendSpellGroupCooldown(SpellGroup_t groupId, uint32_t time) const; + void sendUseItemCooldown(uint32_t time) const; + void reloadCreature(const std::shared_ptr<Creature> &creature) const; void sendModalWindow(const ModalWindow &modalWindow); // container void closeAllExternalContainers(); - void sendAddContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> item); - void sendUpdateContainerItem(std::shared_ptr<Container> container, uint16_t slot, std::shared_ptr<Item> newItem); - void sendRemoveContainerItem(std::shared_ptr<Container> container, uint16_t slot); - void sendContainer(uint8_t cid, std::shared_ptr<Container> container, bool hasParent, uint16_t firstIndex) { - if (client) { - client->sendContainer(cid, container, hasParent, firstIndex); - } - } + // container + void sendAddContainerItem(const std::shared_ptr<Container> &container, std::shared_ptr<Item> item); + void sendUpdateContainerItem(const std::shared_ptr<Container> &container, uint16_t slot, const std::shared_ptr<Item> &newItem); + void sendRemoveContainerItem(const std::shared_ptr<Container> &container, uint16_t slot); + void sendContainer(uint8_t cid, const std::shared_ptr<Container> &container, bool hasParent, uint16_t firstIndex) const; // inventory - void sendDepotItems(const ItemsTierCountList &itemMap, uint16_t count) const { - if (client) { - client->sendDepotItems(itemMap, count); - } - } - void sendCloseDepotSearch() const { - if (client) { - client->sendCloseDepotSearch(); - } - } - void sendDepotSearchResultDetail(uint16_t itemId, uint8_t tier, uint32_t depotCount, const ItemVector &depotItems, uint32_t inboxCount, const ItemVector &inboxItems, uint32_t stashCount) const { - if (client) { - client->sendDepotSearchResultDetail(itemId, tier, depotCount, depotItems, inboxCount, inboxItems, stashCount); - } - } - void sendCoinBalance() { - if (client) { - client->sendCoinBalance(); - } - } - void sendInventoryItem(Slots_t slot, std::shared_ptr<Item> item) { - if (client) { - client->sendInventoryItem(slot, item); - } - } - void sendInventoryIds() { - if (client) { - client->sendInventoryIds(); - } - } + void sendDepotItems(const ItemsTierCountList &itemMap, uint16_t count) const; + void sendCloseDepotSearch() const; + void sendDepotSearchResultDetail(uint16_t itemId, uint8_t tier, uint32_t depotCount, const ItemVector &depotItems, uint32_t inboxCount, const ItemVector &inboxItems, uint32_t stashCount) const; + void sendCoinBalance() const; + void sendInventoryItem(Slots_t slot, const std::shared_ptr<Item> &item) const; + void sendInventoryIds() const; void openPlayerContainers(); // Quickloot - void sendLootContainers() { - if (client) { - client->sendLootContainers(); - } - } + void sendLootContainers() const; - void sendSingleSoundEffect(const Position &pos, SoundEffect_t id, SourceEffect_t source) { - if (client) { - client->sendSingleSoundEffect(pos, id, source); - } - } + void sendSingleSoundEffect(const Position &pos, SoundEffect_t id, SourceEffect_t source) const; - void sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundId, SourceEffect_t mainSource, SoundEffect_t secondarySoundId, SourceEffect_t secondarySource) { - if (client) { - client->sendDoubleSoundEffect(pos, mainSoundId, mainSource, secondarySoundId, secondarySource); - } - } + void sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundId, SourceEffect_t mainSource, SoundEffect_t secondarySoundId, SourceEffect_t secondarySource) const; SoundEffect_t getAttackSoundEffect() const; SoundEffect_t getHitSoundEffect() const; // event methods - void onUpdateTileItem(std::shared_ptr<Tile> tile, const Position &pos, std::shared_ptr<Item> oldItem, const ItemType &oldType, std::shared_ptr<Item> newItem, const ItemType &newType) override; - void onRemoveTileItem(std::shared_ptr<Tile> tile, const Position &pos, const ItemType &iType, std::shared_ptr<Item> item) override; + void onUpdateTileItem(const std::shared_ptr<Tile> &tile, const Position &pos, const std::shared_ptr<Item> &oldItem, const ItemType &oldType, const std::shared_ptr<Item> &newItem, const ItemType &newType) override; + void onRemoveTileItem(const std::shared_ptr<Tile> &tile, const Position &pos, const ItemType &iType, const std::shared_ptr<Item> &item) override; - void onCreatureAppear(std::shared_ptr<Creature> creature, bool isLogin) override; - void onRemoveCreature(std::shared_ptr<Creature> creature, bool isLogout) override; + void onCreatureAppear(const std::shared_ptr<Creature> &creature, bool isLogin) override; + void onRemoveCreature(const std::shared_ptr<Creature> &creature, bool isLogout) override; void onCreatureMove(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &newTile, const Position &newPos, const std::shared_ptr<Tile> &oldTile, const Position &oldPos, bool teleport) override; void onEquipInventory(); @@ -1329,543 +809,180 @@ class Player final : public Creature, public Cylinder, public Bankable { void onFollowCreatureDisappear(bool isLogout) override; // container - void onAddContainerItem(std::shared_ptr<Item> item); - void onUpdateContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem); - void onRemoveContainerItem(std::shared_ptr<Container> container, std::shared_ptr<Item> item); + // container + void onAddContainerItem(const std::shared_ptr<Item> &item); + void onUpdateContainerItem(const std::shared_ptr<Container> &container, const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem); + void onRemoveContainerItem(const std::shared_ptr<Container> &container, const std::shared_ptr<Item> &item); - void onCloseContainer(std::shared_ptr<Container> container); - void onSendContainer(std::shared_ptr<Container> container); - void autoCloseContainers(std::shared_ptr<Container> container); + void onCloseContainer(const std::shared_ptr<Container> &container); + void onSendContainer(const std::shared_ptr<Container> &container); + // close container and its child containers + void autoCloseContainers(const std::shared_ptr<Container> &container); // inventory - void onUpdateInventoryItem(std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem); - void onRemoveInventoryItem(std::shared_ptr<Item> item); + // inventory + void onUpdateInventoryItem(const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem); + void onRemoveInventoryItem(const std::shared_ptr<Item> &item); - void sendCancelMessage(const std::string &msg) const { - if (client) { - client->sendTextMessage(TextMessage(MESSAGE_FAILURE, msg)); - } - } + void sendCancelMessage(const std::string &msg) const; void sendCancelMessage(ReturnValue message) const; - void sendCancelTarget() const { - if (client) { - client->sendCancelTarget(); - } - } - void sendCancelWalk() const { - if (client) { - client->sendCancelWalk(); - } - } - void sendChangeSpeed(std::shared_ptr<Creature> creature, uint16_t newSpeed) const { - if (client) { - client->sendChangeSpeed(creature, newSpeed); - } - } - void sendCreatureHealth(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendCreatureHealth(creature); - } - } - void sendPartyCreatureUpdate(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendPartyCreatureUpdate(creature); - } - } - void sendPartyCreatureShield(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendPartyCreatureShield(creature); - } - } - void sendPartyCreatureSkull(std::shared_ptr<Creature> creature) const { - if (client) { - client->sendPartyCreatureSkull(creature); - } - } - void sendPartyCreatureHealth(std::shared_ptr<Creature> creature, uint8_t healthPercent) const { - if (client) { - client->sendPartyCreatureHealth(creature, healthPercent); - } - } - void sendPartyPlayerMana(std::shared_ptr<Player> player, uint8_t manaPercent) const { - if (client) { - client->sendPartyPlayerMana(player, manaPercent); - } - } - void sendPartyCreatureShowStatus(std::shared_ptr<Creature> creature, bool showStatus) const { - if (client) { - client->sendPartyCreatureShowStatus(creature, showStatus); - } - } - void sendPartyPlayerVocation(std::shared_ptr<Player> player) const { - if (client) { - client->sendPartyPlayerVocation(player); - } - } - void sendPlayerVocation(std::shared_ptr<Player> player) const { - if (client) { - client->sendPlayerVocation(player); - } - } - void sendDistanceShoot(const Position &from, const Position &to, uint16_t type) const { - if (client) { - client->sendDistanceShoot(from, to, type); - } - } - void sendHouseWindow(std::shared_ptr<House> house, uint32_t listId) const; - void sendCreatePrivateChannel(uint16_t channelId, const std::string &channelName) { - if (client) { - client->sendCreatePrivateChannel(channelId, channelName); - } - } + void sendCancelTarget() const; + void sendCancelWalk() const; + void sendChangeSpeed(const std::shared_ptr<Creature> &creature, uint16_t newSpeed) const; + void sendCreatureHealth(const std::shared_ptr<Creature> &creature) const; + void sendPartyCreatureUpdate(const std::shared_ptr<Creature> &creature) const; + void sendPartyCreatureShield(const std::shared_ptr<Creature> &creature) const; + void sendPartyCreatureSkull(const std::shared_ptr<Creature> &creature) const; + void sendPartyCreatureHealth(const std::shared_ptr<Creature> &creature, uint8_t healthPercent) const; + void sendPartyPlayerMana(const std::shared_ptr<Player> &player, uint8_t manaPercent) const; + void sendPartyCreatureShowStatus(const std::shared_ptr<Creature> &creature, bool showStatus) const; + void sendPartyPlayerVocation(const std::shared_ptr<Player> &player) const; + void sendPlayerVocation(const std::shared_ptr<Player> &player) const; + void sendDistanceShoot(const Position &from, const Position &to, uint16_t type) const; + void sendHouseWindow(const std::shared_ptr<House> &house, uint32_t listId) const; + void sendCreatePrivateChannel(uint16_t channelId, const std::string &channelName) const; void sendClosePrivate(uint16_t channelId); - void sendIcons() { - if (client) { - client->sendIcons(getClientIcons()); - } - } - void sendClientCheck() const { - if (client) { - client->sendClientCheck(); - } - } - void sendGameNews() const { - if (client) { - client->sendGameNews(); - } - } - void sendMagicEffect(const Position &pos, uint16_t type) const { - if (client) { - client->sendMagicEffect(pos, type); - } - } - void removeMagicEffect(const Position &pos, uint16_t type) const { - if (client) { - client->removeMagicEffect(pos, type); - } - } + void sendIcons(); + void sendIconBakragore(IconBakragore icon) const; + void removeBakragoreIcons(); + void removeBakragoreIcon(const IconBakragore icon); + void sendClientCheck() const; + void sendGameNews() const; + void sendMagicEffect(const Position &pos, uint16_t type) const; + void removeMagicEffect(const Position &pos, uint16_t type) const; void sendPing(); - void sendPingBack() const { - if (client) { - client->sendPingBack(); - } - } + void sendPingBack() const; void sendStats(); - void sendBasicData() const { - if (client) { - client->sendBasicData(); - } - } - void sendBlessStatus() const { - if (client) { - client->sendBlessStatus(); - } - } - void sendSkills() const { - if (client) { - client->sendSkills(); - } - } - void sendTextMessage(MessageClasses mclass, const std::string &message) const { - if (client) { - client->sendTextMessage(TextMessage(mclass, message)); - } - } - void sendTextMessage(const TextMessage &message) const { - if (client) { - client->sendTextMessage(message); - } - } - void sendReLoginWindow(uint8_t unfairFightReduction) const { - if (client) { - client->sendReLoginWindow(unfairFightReduction); - } - } - void sendTextWindow(std::shared_ptr<Item> item, uint16_t maxlen, bool canWrite) const { - if (client) { - client->sendTextWindow(windowTextId, item, maxlen, canWrite); - } - } - void sendToChannel(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, uint16_t channelId) const { - if (client) { - client->sendToChannel(creature, type, text, channelId); - } - } - void sendShop(std::shared_ptr<Npc> npc) const { - if (client) { - client->sendShop(npc); - } - } + void sendBasicData() const; + void sendBlessStatus() const; + void sendSkills() const; + void sendTextMessage(MessageClasses mclass, const std::string &message) const; + void sendTextMessage(const TextMessage &message) const; + void sendReLoginWindow(uint8_t unfairFightReduction) const; + void sendTextWindow(const std::shared_ptr<Item> &item, uint16_t maxlen, bool canWrite) const; + void sendToChannel(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, uint16_t channelId) const; + void sendShop(const std::shared_ptr<Npc> &npc) const; void sendSaleItemList(const std::map<uint16_t, uint16_t> &inventoryMap) const; - void sendCloseShop() const { - if (client) { - client->sendCloseShop(); - } - } - void sendMarketEnter(uint32_t depotId); - void sendMarketLeave() { - inMarket = false; - if (client) { - client->sendMarketLeave(); - } - } - void sendMarketBrowseItem(uint16_t itemId, const MarketOfferList &buyOffers, const MarketOfferList &sellOffers, uint8_t tier) const { - if (client) { - client->sendMarketBrowseItem(itemId, buyOffers, sellOffers, tier); - } - } - void sendMarketBrowseOwnOffers(const MarketOfferList &buyOffers, const MarketOfferList &sellOffers) const { - if (client) { - client->sendMarketBrowseOwnOffers(buyOffers, sellOffers); - } - } - void sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyOffers, const HistoryMarketOfferList &sellOffers) const { - if (client) { - client->sendMarketBrowseOwnHistory(buyOffers, sellOffers); - } - } - void sendMarketDetail(uint16_t itemId, uint8_t tier) const { - if (client) { - client->sendMarketDetail(itemId, tier); - } - } - void sendMarketAcceptOffer(const MarketOfferEx &offer) const { - if (client) { - client->sendMarketAcceptOffer(offer); - } - } - void sendMarketCancelOffer(const MarketOfferEx &offer) const { - if (client) { - client->sendMarketCancelOffer(offer); - } - } - void sendTradeItemRequest(const std::string &traderName, std::shared_ptr<Item> item, bool ack) const { - if (client) { - client->sendTradeItemRequest(traderName, item, ack); - } - } - void sendTradeClose() const { - if (client) { - client->sendCloseTrade(); - } - } - void sendWorldLight(LightInfo lightInfo) { - if (client) { - client->sendWorldLight(lightInfo); - } - } - void sendTibiaTime(int32_t time) { - if (client) { - client->sendTibiaTime(time); - } - } - void sendChannelsDialog() { - if (client) { - client->sendChannelsDialog(); - } - } - void sendOpenPrivateChannel(const std::string &receiver) { - if (client) { - client->sendOpenPrivateChannel(receiver); - } - } - void sendExperienceTracker(int64_t rawExp, int64_t finalExp) const { - if (client) { - client->sendExperienceTracker(rawExp, finalExp); - } - } - void sendOutfitWindow() { - if (client) { - client->sendOutfitWindow(); - } - } + void sendCloseShop() const; + void sendMarketEnter(uint32_t depotId) const; + void sendMarketLeave(); + void sendMarketBrowseItem(uint16_t itemId, const MarketOfferList &buyOffers, const MarketOfferList &sellOffers, uint8_t tier) const; + void sendMarketBrowseOwnOffers(const MarketOfferList &buyOffers, const MarketOfferList &sellOffers) const; + void sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyOffers, const HistoryMarketOfferList &sellOffers) const; + void sendMarketDetail(uint16_t itemId, uint8_t tier) const; + void sendMarketAcceptOffer(const MarketOfferEx &offer) const; + void sendMarketCancelOffer(const MarketOfferEx &offer) const; + void sendTradeItemRequest(const std::string &traderName, const std::shared_ptr<Item> &item, bool ack) const; + void sendTradeClose() const; + void sendWorldLight(LightInfo lightInfo) const; + void sendTibiaTime(int32_t time) const; + void sendChannelsDialog() const; + void sendOpenPrivateChannel(const std::string &receiver) const; + void sendExperienceTracker(int64_t rawExp, int64_t finalExp) const; + void sendOutfitWindow() const; // Imbuements - void onApplyImbuement(Imbuement* imbuement, std::shared_ptr<Item> item, uint8_t slot, bool protectionCharm); - void onClearImbuement(std::shared_ptr<Item> item, uint8_t slot); - void openImbuementWindow(std::shared_ptr<Item> item); - void sendImbuementResult(const std::string message) { - if (client) { - client->sendImbuementResult(message); - } - } - void closeImbuementWindow() const { - if (client) { - client->closeImbuementWindow(); - } - } - void sendPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackpos) { - if (client) { - client->sendPodiumWindow(podium, position, itemId, stackpos); - } - } - void sendCloseContainer(uint8_t cid) { - if (client) { - client->sendCloseContainer(cid); - } - } - - void sendChannel(uint16_t channelId, const std::string &channelName, const UsersMap* channelUsers, const InvitedMap* invitedUsers) { - if (client) { - client->sendChannel(channelId, channelName, channelUsers, invitedUsers); - } - } - void sendTutorial(uint8_t tutorialId) { - if (client) { - client->sendTutorial(tutorialId); - } - } - void sendAddMarker(const Position &pos, uint8_t markType, const std::string &desc) { - if (client) { - client->sendAddMarker(pos, markType, desc); - } - } - void sendItemInspection(uint16_t itemId, uint8_t itemCount, std::shared_ptr<Item> item, bool cyclopedia) { - if (client) { - client->sendItemInspection(itemId, itemCount, item, cyclopedia); - } - } - void sendCyclopediaCharacterNoData(CyclopediaCharacterInfoType_t characterInfoType, uint8_t errorCode) { - if (client) { - client->sendCyclopediaCharacterNoData(characterInfoType, errorCode); - } - } - void sendCyclopediaCharacterBaseInformation() { - if (client) { - client->sendCyclopediaCharacterBaseInformation(); - } - } - void sendCyclopediaCharacterGeneralStats() { - if (client) { - client->sendCyclopediaCharacterGeneralStats(); - } - } - void sendCyclopediaCharacterCombatStats() { - if (client) { - client->sendCyclopediaCharacterCombatStats(); - } - } - void sendCyclopediaCharacterRecentDeaths(uint16_t page, uint16_t pages, const std::vector<RecentDeathEntry> &entries) { - if (client) { - client->sendCyclopediaCharacterRecentDeaths(page, pages, entries); - } - } - void sendCyclopediaCharacterRecentPvPKills(uint16_t page, uint16_t pages, const std::vector<RecentPvPKillEntry> &entries) { - if (client) { - client->sendCyclopediaCharacterRecentPvPKills(page, pages, entries); - } - } - void sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, std::vector<std::pair<Achievement, uint32_t>> achievementsUnlocked); - void sendCyclopediaCharacterItemSummary(const ItemsTierCountList &inventoryItems, const ItemsTierCountList &storeInboxItems, const StashItemList &supplyStashItems, const ItemsTierCountList &depotBoxItems, const ItemsTierCountList &inboxItems) { - if (client) { - client->sendCyclopediaCharacterItemSummary(inventoryItems, storeInboxItems, supplyStashItems, depotBoxItems, inboxItems); - } - } - void sendCyclopediaCharacterOutfitsMounts() { - if (client) { - client->sendCyclopediaCharacterOutfitsMounts(); - } - } - void sendCyclopediaCharacterStoreSummary() { - if (client) { - client->sendCyclopediaCharacterStoreSummary(); - } - } - void sendCyclopediaCharacterInspection() { - if (client) { - client->sendCyclopediaCharacterInspection(); - } - } - void sendCyclopediaCharacterBadges() { - if (client) { - client->sendCyclopediaCharacterBadges(); - } - } - void sendCyclopediaCharacterTitles() { - if (client) { - client->sendCyclopediaCharacterTitles(); - } - } - void sendHighscoresNoData() { - if (client) { - client->sendHighscoresNoData(); - } - } - void sendHighscores(const std::vector<HighscoreCharacter> &characters, uint8_t categoryId, uint32_t vocationId, uint16_t page, uint16_t pages, uint32_t updateTimer) { - if (client) { - client->sendHighscores(characters, categoryId, vocationId, page, pages, updateTimer); - } - } - void addAsyncOngoingTask(uint64_t flags) { - asyncOngoingTasks |= flags; - } - bool hasAsyncOngoingTask(uint64_t flags) const { - return (asyncOngoingTasks & flags); - } - void resetAsyncOngoingTask(uint64_t flags) { - asyncOngoingTasks &= ~(flags); - } - void sendEnterWorld() { - if (client) { - client->sendEnterWorld(); - } - } - void sendFightModes() { - if (client) { - client->sendFightModes(); - } - } - void sendNetworkMessage(const NetworkMessage &message) { - if (client) { - client->writeToOutputBuffer(message); - } - } - - void receivePing() { - lastPong = OTSYS_TIME(); - } - - void sendOpenStash(bool isNpc = false) { - if (client && ((getLastDepotId() != -1) || isNpc)) { - client->sendOpenStash(); - } - } - - void sendTakeScreenshot(Screenshot_t screenshotType) { - if (client) { - client->sendTakeScreenshot(screenshotType); - } - } + void onApplyImbuement(const Imbuement* imbuement, const std::shared_ptr<Item> &item, uint8_t slot, bool protectionCharm); + void onClearImbuement(const std::shared_ptr<Item> &item, uint8_t slot); + void openImbuementWindow(const std::shared_ptr<Item> &item); + void sendImbuementResult(const std::string &message) const; + void closeImbuementWindow() const; + void sendPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos) const; + void sendCloseContainer(uint8_t cid) const; + + void sendChannel(uint16_t channelId, const std::string &channelName, const UsersMap* channelUsers, const InvitedMap* invitedUsers) const; + void sendTutorial(uint8_t tutorialId) const; + void sendAddMarker(const Position &pos, uint8_t markType, const std::string &desc) const; + void sendItemInspection(uint16_t itemId, uint8_t itemCount, const std::shared_ptr<Item> &item, bool cyclopedia) const; + void sendCyclopediaCharacterNoData(CyclopediaCharacterInfoType_t characterInfoType, uint8_t errorCode) const; + void sendCyclopediaCharacterBaseInformation() const; + void sendCyclopediaCharacterGeneralStats() const; + void sendCyclopediaCharacterCombatStats() const; + void sendCyclopediaCharacterRecentDeaths(uint16_t page, uint16_t pages, const std::vector<RecentDeathEntry> &entries) const; + void sendCyclopediaCharacterRecentPvPKills(uint16_t page, uint16_t pages, const std::vector<RecentPvPKillEntry> &entries) const; + void sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, const std::vector<std::pair<Achievement, uint32_t>> &achievementsUnlocked) const; + void sendCyclopediaCharacterItemSummary(const ItemsTierCountList &inventoryItems, const ItemsTierCountList &storeInboxItems, const StashItemList &supplyStashItems, const ItemsTierCountList &depotBoxItems, const ItemsTierCountList &inboxItems) const; + void sendCyclopediaCharacterOutfitsMounts() const; + void sendCyclopediaCharacterStoreSummary() const; + void sendCyclopediaCharacterInspection() const; + void sendCyclopediaCharacterBadges() const; + void sendCyclopediaCharacterTitles() const; + void sendHighscoresNoData() const; + void sendHighscores(const std::vector<HighscoreCharacter> &characters, uint8_t categoryId, uint32_t vocationId, uint16_t page, uint16_t pages, uint32_t updateTimer) const; + void addAsyncOngoingTask(uint64_t flags); + bool hasAsyncOngoingTask(uint64_t flags) const; + void resetAsyncOngoingTask(uint64_t flags); + void sendEnterWorld() const; + void sendFightModes() const; + void sendNetworkMessage(const NetworkMessage &message) const; + + void receivePing(); + + void sendOpenStash(bool isNpc = false) const; + + void sendTakeScreenshot(Screenshot_t screenshotType) const; void onThink(uint32_t interval) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void setNextAction(int64_t time) { - if (time > nextAction) { - nextAction = time; - } - } - bool canDoAction() const { - return nextAction <= OTSYS_TIME(); - } + void setNextAction(int64_t time); + bool canDoAction() const; - void setNextPotionAction(int64_t time) { - if (time > nextPotionAction) { - nextPotionAction = time; - } - } - bool canDoPotionAction() const { - return nextPotionAction <= OTSYS_TIME(); - } + void setNextPotionAction(int64_t time); + bool canDoPotionAction() const; void cancelPush(); - void setModuleDelay(uint8_t byteortype, int16_t delay) { - moduleDelayMap[byteortype] = OTSYS_TIME() + delay; - } + void setModuleDelay(uint8_t byteortype, int16_t delay); - bool canRunModule(uint8_t byteortype) { - if (!moduleDelayMap[byteortype]) { - return true; - } - return moduleDelayMap[byteortype] <= OTSYS_TIME(); - } + bool canRunModule(uint8_t byteortype); uint32_t getNextActionTime() const; uint32_t getNextPotionActionTime() const; std::shared_ptr<Item> getWriteItem(uint32_t &windowTextId, uint16_t &maxWriteLen); - void setWriteItem(std::shared_ptr<Item> item, uint16_t maxWriteLen = 0); + void setWriteItem(const std::shared_ptr<Item> &item, uint16_t maxWriteLen = 0); std::shared_ptr<House> getEditHouse(uint32_t &windowTextId, uint32_t &listId); - void setEditHouse(std::shared_ptr<House> house, uint32_t listId = 0); + void setEditHouse(const std::shared_ptr<House> &house, uint32_t listId = 0); void learnInstantSpell(const std::string &spellName); void forgetInstantSpell(const std::string &spellName); bool hasLearnedInstantSpell(const std::string &spellName) const; - void updateRegeneration(); + void updateRegeneration() const; - void setScheduledSaleUpdate(bool scheduled) { - scheduledSaleUpdate = scheduled; - } + void setScheduledSaleUpdate(bool scheduled); - bool getScheduledSaleUpdate() { - return scheduledSaleUpdate; - } + bool getScheduledSaleUpdate() const; - bool inPushEvent() { - return inEventMovePush; - } + bool inPushEvent() const; - void pushEvent(bool b) { - inEventMovePush = b; - } + void pushEvent(bool b); - bool walkExhausted() { - if (hasCondition(CONDITION_PARALYZE)) { - return lastWalking > OTSYS_TIME(); - } + bool walkExhausted() const; - return false; - } + void setWalkExhaust(int64_t value); - void setWalkExhaust(int64_t value) { - lastWalking = OTSYS_TIME() + value; - } - - const std::map<uint8_t, OpenContainer> &getOpenContainers() const { - return openContainers; - } + const std::map<uint8_t, OpenContainer> &getOpenContainers() const; - uint16_t getBaseXpGain() const { - return baseXpGain; - } - void setBaseXpGain(uint16_t value) { - baseXpGain = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); - } - uint16_t getVoucherXpBoost() const { - return voucherXpBoost; - } - void setVoucherXpBoost(uint16_t value) { - voucherXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); - } - uint16_t getGrindingXpBoost() const { - return grindingXpBoost; - } - void setGrindingXpBoost(uint16_t value) { - grindingXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); - } - uint16_t getXpBoostPercent() const { - return xpBoostPercent; - } - void setXpBoostPercent(uint16_t percent) { - xpBoostPercent = percent; - } - uint16_t getStaminaXpBoost() const { - return staminaXpBoost; - } - void setStaminaXpBoost(uint16_t value) { - staminaXpBoost = std::min<uint16_t>(std::numeric_limits<uint16_t>::max(), value); - } + uint16_t getBaseXpGain() const; + void setBaseXpGain(uint16_t value); + uint16_t getVoucherXpBoost() const; + void setVoucherXpBoost(uint16_t value); + uint16_t getGrindingXpBoost() const; + void setGrindingXpBoost(uint16_t value); + uint16_t getXpBoostPercent() const; + void setXpBoostPercent(uint16_t percent); + uint16_t getStaminaXpBoost() const; + void setStaminaXpBoost(uint16_t value); - void setXpBoostTime(uint16_t timeLeft) { - // only allow time boosts of 12 hours or less - if (timeLeft > 12 * 3600) { - xpBoostTime = 12 * 3600; - return; - } - xpBoostTime = timeLeft; - } + void setXpBoostTime(uint16_t timeLeft); - uint16_t getXpBoostTime() { - return xpBoostTime; - } + uint16_t getXpBoostTime() const; - int32_t getIdleTime() const { - return idleTime; - } + int32_t getIdleTime() const; void setTraining(bool value); @@ -1873,258 +990,48 @@ class Player final : public Creature, public Cylinder, public Bankable { void removeItemImbuementStats(const Imbuement* imbuement); void updateImbuementTrackerStats() const; + // User Interface action exhaustion bool isUIExhausted(uint32_t exhaustionTime = 250) const; void updateUIExhausted(); - bool isQuickLootListedItem(std::shared_ptr<Item> item) const { - if (!item) { - return false; - } - - auto it = std::find(quickLootListItemIds.begin(), quickLootListItemIds.end(), item->getID()); - return it != quickLootListItemIds.end(); - } + bool isQuickLootListedItem(const std::shared_ptr<Item> &item) const; - bool updateKillTracker(std::shared_ptr<Container> corpse, const std::string &playerName, const Outfit_t creatureOutfit) const { - if (client) { - client->sendKillTrackerUpdate(corpse, playerName, creatureOutfit); - return true; - } + bool updateKillTracker(const std::shared_ptr<Container> &corpse, const std::string &playerName, const Outfit_t &creatureOutfit) const; - return false; - } + void updatePartyTrackerAnalyzer() const; - void updatePartyTrackerAnalyzer() const { - if (client && m_party) { - client->updatePartyTrackerAnalyzer(m_party); - } - } - - void sendLootStats(std::shared_ptr<Item> item, uint8_t count); - void updateSupplyTracker(std::shared_ptr<Item> item); + void sendLootStats(const std::shared_ptr<Item> &item, uint8_t count); + void updateSupplyTracker(const std::shared_ptr<Item> &item); void updateImpactTracker(CombatType_t type, int32_t amount) const; - void updateInputAnalyzer(CombatType_t type, int32_t amount, std::string target) { - if (client) { - client->sendUpdateInputAnalyzer(type, amount, target); - } - } - - void createLeaderTeamFinder(NetworkMessage &msg) { - if (client) { - client->createLeaderTeamFinder(msg); - } - } - void sendLeaderTeamFinder(bool reset) { - if (client) { - client->sendLeaderTeamFinder(reset); - } - } - void sendTeamFinderList() { - if (client) { - client->sendTeamFinderList(); - } - } - void sendCreatureHelpers(uint32_t creatureId, uint16_t helpers) { - if (client) { - client->sendCreatureHelpers(creatureId, helpers); - } - } - - void setItemCustomPrice(uint16_t itemId, uint64_t price) { - itemPriceMap[itemId] = price; - } - uint32_t getCharmPoints() { - return charmPoints; - } - void setCharmPoints(uint32_t points) { - charmPoints = points; - } - bool hasCharmExpansion() { - return charmExpansion; - } - void setCharmExpansion(bool onOff) { - charmExpansion = onOff; - } - void setUsedRunesBit(int32_t bit) { - UsedRunesBit = bit; - } - int32_t getUsedRunesBit() { - return UsedRunesBit; - } - void setUnlockedRunesBit(int32_t bit) { - UnlockedRunesBit = bit; - } - int32_t getUnlockedRunesBit() { - return UnlockedRunesBit; - } - void setImmuneCleanse(ConditionType_t conditiontype) { - cleanseCondition.first = conditiontype; - cleanseCondition.second = OTSYS_TIME() + 10000; - } - bool isImmuneCleanse(ConditionType_t conditiontype) { - uint64_t timenow = OTSYS_TIME(); - if ((cleanseCondition.first == conditiontype) - && (timenow <= cleanseCondition.second)) { - return true; - } - return false; - } + void updateInputAnalyzer(CombatType_t type, int32_t amount, const std::string &target) const; + + void createLeaderTeamFinder(NetworkMessage &msg) const; + void sendLeaderTeamFinder(bool reset) const; + void sendTeamFinderList() const; + void sendCreatureHelpers(uint32_t creatureId, uint16_t helpers) const; + + void setItemCustomPrice(uint16_t itemId, uint64_t price); + uint32_t getCharmPoints() const; + void setCharmPoints(uint32_t points); + bool hasCharmExpansion() const; + void setCharmExpansion(bool onOff); + void setUsedRunesBit(int32_t bit); + int32_t getUsedRunesBit() const; + void setUnlockedRunesBit(int32_t bit); + int32_t getUnlockedRunesBit() const; + void setImmuneCleanse(ConditionType_t conditiontype); + bool isImmuneCleanse(ConditionType_t conditiontype) const; void setImmuneFear(); bool isImmuneFear() const; - uint16_t parseRacebyCharm(charmRune_t charmId, bool set, uint16_t newRaceid) { - uint16_t raceid = 0; - switch (charmId) { - case CHARM_WOUND: - if (set) { - charmRuneWound = newRaceid; - } else { - raceid = charmRuneWound; - } - break; - case CHARM_ENFLAME: - if (set) { - charmRuneEnflame = newRaceid; - } else { - raceid = charmRuneEnflame; - } - break; - case CHARM_POISON: - if (set) { - charmRunePoison = newRaceid; - } else { - raceid = charmRunePoison; - } - break; - case CHARM_FREEZE: - if (set) { - charmRuneFreeze = newRaceid; - } else { - raceid = charmRuneFreeze; - } - break; - case CHARM_ZAP: - if (set) { - charmRuneZap = newRaceid; - } else { - raceid = charmRuneZap; - } - break; - case CHARM_CURSE: - if (set) { - charmRuneCurse = newRaceid; - } else { - raceid = charmRuneCurse; - } - break; - case CHARM_CRIPPLE: - if (set) { - charmRuneCripple = newRaceid; - } else { - raceid = charmRuneCripple; - } - break; - case CHARM_PARRY: - if (set) { - charmRuneParry = newRaceid; - } else { - raceid = charmRuneParry; - } - break; - case CHARM_DODGE: - if (set) { - charmRuneDodge = newRaceid; - } else { - raceid = charmRuneDodge; - } - break; - case CHARM_ADRENALINE: - if (set) { - charmRuneAdrenaline = newRaceid; - } else { - raceid = charmRuneAdrenaline; - } - break; - case CHARM_NUMB: - if (set) { - charmRuneNumb = newRaceid; - } else { - raceid = charmRuneNumb; - } - break; - case CHARM_CLEANSE: - if (set) { - charmRuneCleanse = newRaceid; - } else { - raceid = charmRuneCleanse; - } - break; - case CHARM_BLESS: - if (set) { - charmRuneBless = newRaceid; - } else { - raceid = charmRuneBless; - } - break; - case CHARM_SCAVENGE: - if (set) { - charmRuneScavenge = newRaceid; - } else { - raceid = charmRuneScavenge; - } - break; - case CHARM_GUT: - if (set) { - charmRuneGut = newRaceid; - } else { - raceid = charmRuneGut; - } - break; - case CHARM_LOW: - if (set) { - charmRuneLowBlow = newRaceid; - } else { - raceid = charmRuneLowBlow; - } - break; - case CHARM_DIVINE: - if (set) { - charmRuneDivine = newRaceid; - } else { - raceid = charmRuneDivine; - } - break; - case CHARM_VAMP: - if (set) { - charmRuneVamp = newRaceid; - } else { - raceid = charmRuneVamp; - } - break; - case CHARM_VOID: - if (set) { - charmRuneVoid = newRaceid; - } else { - raceid = charmRuneVoid; - } - break; - default: - raceid = 0; - break; - } - return raceid; - } + uint16_t parseRacebyCharm(charmRune_t charmId, bool set, uint16_t newRaceid); uint64_t getItemCustomPrice(uint16_t itemId, bool buyPrice = false) const; uint16_t getFreeBackpackSlots() const; bool canAutoWalk(const Position &toPosition, const std::function<void()> &function, uint32_t delay = 500); - void sendMessageDialog(const std::string &message) const { - if (client) { - client->sendMessageDialog(message); - } - } + void sendMessageDialog(const std::string &message) const; // Account bool setAccount(uint32_t accountId); @@ -2136,233 +1043,69 @@ class Player final : public Creature, public Cylinder, public Bankable { void initializePrey(); void removePreySlotById(PreySlot_t slotid); - void sendPreyData() const { - if (client) { - for (const std::unique_ptr<PreySlot> &slot : preys) { - client->sendPreyData(slot); - } - - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards()); - } - } - - void sendPreyTimeLeft(const std::unique_ptr<PreySlot> &slot) const { - if (g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__) && client) { - client->sendPreyTimeLeft(slot); - } - } - - void reloadPreySlot(PreySlot_t slotid) { - if (g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__) && client) { - client->sendPreyData(getPreySlotById(slotid)); - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - } + void sendPreyData() const; - const std::unique_ptr<PreySlot> &getPreySlotById(PreySlot_t slotid) { - if (auto it = std::find_if(preys.begin(), preys.end(), [slotid](const std::unique_ptr<PreySlot> &preyIt) { - return preyIt->id == slotid; - }); - it != preys.end()) { - return *it; - } + void sendPreyTimeLeft(const std::unique_ptr<PreySlot> &slot) const; - return PreySlotNull; - } + void reloadPreySlot(PreySlot_t slotid); - bool setPreySlotClass(std::unique_ptr<PreySlot> &slot) { - if (getPreySlotById(slot->id)) { - return false; - } + const std::unique_ptr<PreySlot> &getPreySlotById(PreySlot_t slotid); - preys.emplace_back(std::move(slot)); - return true; - } + bool setPreySlotClass(std::unique_ptr<PreySlot> &slot); - bool usePreyCards(uint16_t amount) { - if (preyCards < amount) { - return false; - } + bool usePreyCards(uint16_t amount); - preyCards -= amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - return true; - } + void addPreyCards(uint64_t amount); - void addPreyCards(uint64_t amount) { - preyCards += amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - } + uint64_t getPreyCards() const; - uint64_t getPreyCards() const { - return preyCards; - } - - uint32_t getPreyRerollPrice() const { - return getLevel() * g_configManager().getNumber(PREY_REROLL_PRICE_LEVEL, __FUNCTION__); - } - - std::vector<uint16_t> getPreyBlackList() const { - std::vector<uint16_t> rt; - for (const std::unique_ptr<PreySlot> &slot : preys) { - if (slot) { - if (slot->isOccupied()) { - rt.push_back(slot->selectedRaceId); - } - for (uint16_t raceId : slot->raceIdList) { - rt.push_back(raceId); - } - } - } + uint32_t getPreyRerollPrice() const; - return rt; - } - - const std::unique_ptr<PreySlot> &getPreyWithMonster(uint16_t raceId) const { - if (!g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { - return PreySlotNull; - } - - if (auto it = std::find_if(preys.begin(), preys.end(), [raceId](const std::unique_ptr<PreySlot> &it) { - return it->selectedRaceId == raceId; - }); - it != preys.end()) { - return *it; - } + std::vector<uint16_t> getPreyBlackList() const; - return PreySlotNull; - } + const std::unique_ptr<PreySlot> &getPreyWithMonster(uint16_t raceId) const; // Task hunting system void initializeTaskHunting(); - bool isCreatureUnlockedOnTaskHunting(const std::shared_ptr<MonsterType> mtype) const; + bool isCreatureUnlockedOnTaskHunting(const std::shared_ptr<MonsterType> &mtype) const; - bool setTaskHuntingSlotClass(std::unique_ptr<TaskHuntingSlot> &slot) { - if (getTaskHuntingSlotById(slot->id)) { - return false; - } + bool setTaskHuntingSlotClass(std::unique_ptr<TaskHuntingSlot> &slot); - taskHunting.emplace_back(std::move(slot)); - return true; - } + void reloadTaskSlot(PreySlot_t slotid); - void reloadTaskSlot(PreySlot_t slotid) { - if (g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__) && client) { - client->sendTaskHuntingData(getTaskHuntingSlotById(slotid)); - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - } + const std::unique_ptr<TaskHuntingSlot> &getTaskHuntingSlotById(PreySlot_t slotid); - const std::unique_ptr<TaskHuntingSlot> &getTaskHuntingSlotById(PreySlot_t slotid) { - if (auto it = std::find_if(taskHunting.begin(), taskHunting.end(), [slotid](const std::unique_ptr<TaskHuntingSlot> &itTask) { - return itTask->id == slotid; - }); - it != taskHunting.end()) { - return *it; - } + std::vector<uint16_t> getTaskHuntingBlackList() const; - return TaskHuntingSlotNull; - } + void sendTaskHuntingData() const; - std::vector<uint16_t> getTaskHuntingBlackList() const { - std::vector<uint16_t> rt; + void addTaskHuntingPoints(uint64_t amount); - std::for_each(taskHunting.begin(), taskHunting.end(), [&rt](const std::unique_ptr<TaskHuntingSlot> &slot) { - if (slot->isOccupied()) { - rt.push_back(slot->selectedRaceId); - } else { - std::for_each(slot->raceIdList.begin(), slot->raceIdList.end(), [&rt](uint16_t raceId) { - rt.push_back(raceId); - }); - } - }); + bool useTaskHuntingPoints(uint64_t amount); - return rt; - } + uint64_t getTaskHuntingPoints() const; - void sendTaskHuntingData() const { - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - for (const std::unique_ptr<TaskHuntingSlot> &slot : taskHunting) { - if (slot) { - client->sendTaskHuntingData(slot); - } - } - } - } + uint32_t getTaskHuntingRerollPrice() const; - void addTaskHuntingPoints(uint64_t amount) { - taskHuntingPoints += amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - } - - bool useTaskHuntingPoints(uint64_t amount) { - if (taskHuntingPoints < amount) { - return false; - } - - taskHuntingPoints -= amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints()); - } - return true; - } + const std::unique_ptr<TaskHuntingSlot> &getTaskHuntingWithCreature(uint16_t raceId) const; - uint64_t getTaskHuntingPoints() const { - return taskHuntingPoints; - } + uint32_t getLoyaltyPoints() const; - uint32_t getTaskHuntingRerollPrice() const { - return getLevel() * g_configManager().getNumber(TASK_HUNTING_REROLL_PRICE_LEVEL, __FUNCTION__); - } - - const std::unique_ptr<TaskHuntingSlot> &getTaskHuntingWithCreature(uint16_t raceId) const { - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { - return TaskHuntingSlotNull; - } + void setLoyaltyBonus(uint16_t bonus); + void setLoyaltyTitle(std::string title); + std::string getLoyaltyTitle() const; + uint16_t getLoyaltyBonus() const; - if (auto it = std::find_if(taskHunting.begin(), taskHunting.end(), [raceId](const std::unique_ptr<TaskHuntingSlot> &itTask) { - return itTask->selectedRaceId == raceId; - }); - it != taskHunting.end()) { - return *it; - } - - return TaskHuntingSlotNull; - } - - uint32_t getLoyaltyPoints() const { - return loyaltyPoints; - } - - void setLoyaltyBonus(uint16_t bonus) { - loyaltyBonusPercent = bonus; - sendSkills(); - } - void setLoyaltyTitle(std::string title) { - loyaltyTitle = title; - } - std::string getLoyaltyTitle() const { - return loyaltyTitle; - } - uint16_t getLoyaltyBonus() const { - return loyaltyBonusPercent; - } - - // Depot search system + /******************************************************************************* + * Depot search system + ******************************************************************************/ void requestDepotItems(); void requestDepotSearchItem(uint16_t itemId, uint8_t tier); void retrieveAllItemsFromDepotSearch(uint16_t itemId, uint8_t tier, bool isDepot); void openContainerFromDepotSearch(const Position &pos); std::shared_ptr<Item> getItemFromDepotSearch(uint16_t itemId, const Position &pos); - std::pair<std::vector<std::shared_ptr<Item>>, std::map<uint16_t, std::map<uint8_t, uint32_t>>> requestLockerItems(std::shared_ptr<DepotLocker> depotLocker, bool sendToClient = false, uint8_t tier = 0) const; + std::pair<std::vector<std::shared_ptr<Item>>, std::map<uint16_t, std::map<uint8_t, uint32_t>>> requestLockerItems(const std::shared_ptr<DepotLocker> &depotLocker, bool sendToClient = false, uint8_t tier = 0) const; /** This function returns a pair of an array of items and a 16-bit integer from a DepotLocker instance, a 8-bit byte and a 16-bit integer. @@ -2376,13 +1119,13 @@ class Player final : public Creature, public Cylinder, public Bankable { const std::shared_ptr<DepotLocker> &depotLocker, uint8_t tier, uint16_t itemId - ); + ) const; bool saySpell( SpeakClasses type, const std::string &text, bool ghostMode, - Spectators* spectatorsPtr = nullptr, + const Spectators* spectatorsPtr = nullptr, const Position* pos = nullptr ); @@ -2392,205 +1135,67 @@ class Player final : public Creature, public Cylinder, public Bankable { void forgeResourceConversion(ForgeAction_t actionType); void forgeHistory(uint8_t page) const; - void sendOpenForge() const { - if (client) { - client->sendOpenForge(); - } - } - void sendForgeError(ReturnValue returnValue) const { - if (client) { - client->sendForgeError(returnValue); - } - } - void sendForgeResult(ForgeAction_t actionType, uint16_t leftItemId, uint8_t leftTier, uint16_t rightItemId, uint8_t rightTier, bool success, uint8_t bonus, uint8_t coreCount, bool convergence) const { - if (client) { - client->sendForgeResult(actionType, leftItemId, leftTier, rightItemId, rightTier, success, bonus, coreCount, convergence); - } - } - void sendForgeHistory(uint8_t page) const { - if (client) { - client->sendForgeHistory(page); - } - } - void closeForgeWindow() const { - if (client) { - client->closeForgeWindow(); - } - } + void sendOpenForge() const; + void sendForgeError(ReturnValue returnValue) const; + void sendForgeResult(ForgeAction_t actionType, uint16_t leftItemId, uint8_t leftTier, uint16_t rightItemId, uint8_t rightTier, bool success, uint8_t bonus, uint8_t coreCount, bool convergence) const; + void sendForgeHistory(uint8_t page) const; + void closeForgeWindow() const; - void setForgeDusts(uint64_t amount) { - forgeDusts = amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); - } - } - void addForgeDusts(uint64_t amount) { - forgeDusts += amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); - } - } - void removeForgeDusts(uint64_t amount) { - forgeDusts = std::max<uint64_t>(0, forgeDusts - amount); - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); - } - } - uint64_t getForgeDusts() const { - return forgeDusts; - } + void setForgeDusts(uint64_t amount); + void addForgeDusts(uint64_t amount); + void removeForgeDusts(uint64_t amount); + uint64_t getForgeDusts() const; - void addForgeDustLevel(uint64_t amount) { - forgeDustLevel += amount; - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); - } - } - void removeForgeDustLevel(uint64_t amount) { - forgeDustLevel = std::max<uint64_t>(0, forgeDustLevel - amount); - if (client) { - client->sendResourcesBalance(getMoney(), getBankBalance(), getPreyCards(), getTaskHuntingPoints(), getForgeDusts()); - } - } - uint64_t getForgeDustLevel() const { - return forgeDustLevel; - } + void addForgeDustLevel(uint64_t amount); + void removeForgeDustLevel(uint64_t amount); + uint64_t getForgeDustLevel() const; - std::vector<ForgeHistory> &getForgeHistory() { - return forgeHistoryVector; - } + std::vector<ForgeHistory> &getForgeHistory(); - void setForgeHistory(const ForgeHistory &history) { - forgeHistoryVector.push_back(history); - } + void setForgeHistory(const ForgeHistory &history); void registerForgeHistoryDescription(ForgeHistory history); - void setBossPoints(uint32_t amount) { - bossPoints = amount; - } - void addBossPoints(uint32_t amount) { - bossPoints += amount; - } - void removeBossPoints(uint32_t amount) { - bossPoints = std::max<uint32_t>(0, bossPoints - amount); - } - uint32_t getBossPoints() const { - return bossPoints; - } - void sendBosstiaryCooldownTimer() const { - if (client) { - client->sendBosstiaryCooldownTimer(); - } - } + void setBossPoints(uint32_t amount); + void addBossPoints(uint32_t amount); + void removeBossPoints(uint32_t amount); + uint32_t getBossPoints() const; + void sendBosstiaryCooldownTimer() const; - void setSlotBossId(uint8_t slotId, uint32_t bossId) { - if (slotId == 1) { - bossIdSlotOne = bossId; - } else { - bossIdSlotTwo = bossId; - } - if (client) { - client->parseSendBosstiarySlots(); - } - } - uint32_t getSlotBossId(uint8_t slotId) const { - if (slotId == 1) { - return bossIdSlotOne; - } else { - return bossIdSlotTwo; - } - } + void setSlotBossId(uint8_t slotId, uint32_t bossId); + uint32_t getSlotBossId(uint8_t slotId) const; - void addRemoveTime() { - bossRemoveTimes = bossRemoveTimes + 1; - } - void setRemoveBossTime(uint8_t newRemoveTimes) { - bossRemoveTimes = newRemoveTimes; - } - uint8_t getRemoveTimes() const { - return bossRemoveTimes; - } + void addRemoveTime(); + void setRemoveBossTime(uint8_t newRemoveTimes); + uint8_t getRemoveTimes() const; - void sendMonsterPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackpos) const { - if (client) { - client->sendMonsterPodiumWindow(podium, position, itemId, stackpos); - } - } + void sendMonsterPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos) const; - void sendBosstiaryEntryChanged(uint32_t bossid) { - if (client) { - client->sendBosstiaryEntryChanged(bossid); - } - } + void sendBosstiaryEntryChanged(uint32_t bossid) const; - void sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> items) const { - if (client) { - client->sendInventoryImbuements(items); - } - } + void sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> &items) const; /******************************************************************************* * Hazard system ******************************************************************************/ // Parser - void parseAttackRecvHazardSystem(CombatDamage &damage, std::shared_ptr<Monster> monster); - void parseAttackDealtHazardSystem(CombatDamage &damage, std::shared_ptr<Monster> monster); + void parseAttackRecvHazardSystem(CombatDamage &damage, const std::shared_ptr<Monster> &monster); + void parseAttackDealtHazardSystem(CombatDamage &damage, const std::shared_ptr<Monster> &monster) const; // Points increase: void setHazardSystemPoints(int32_t amount); // Points get: - uint16_t getHazardSystemPoints() const { - int32_t points = 0; - points = getStorageValue(STORAGEVALUE_HAZARDCOUNT); - if (points <= 0) { - return 0; - } - return static_cast<uint16_t>(std::max<int32_t>(0, std::min<int32_t>(0xFFFF, points))); - } + uint16_t getHazardSystemPoints() const; /*******************************************************************************/ // Concoction system - void updateConcoction(uint16_t itemId, uint16_t timeLeft) { - if (timeLeft == 0) { - activeConcoctions.erase(itemId); - } else { - activeConcoctions[itemId] = timeLeft; - } - } - std::map<uint16_t, uint16_t> getActiveConcoctions() const { - return activeConcoctions; - } - bool isConcoctionActive(Concoction_t concotion) const { - uint16_t itemId = static_cast<uint16_t>(concotion); - if (!activeConcoctions.contains(itemId)) { - return false; - } - auto timeLeft = activeConcoctions.at(itemId); - return timeLeft > 0; - } - - bool checkAutoLoot(bool isBoss) const { - 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()) { - return false; - } + void updateConcoction(uint16_t itemId, uint16_t timeLeft); + std::map<uint16_t, uint16_t> getActiveConcoctions() const; + bool isConcoctionActive(Concoction_t concotion) const; - auto featureKV = kv()->scoped("features")->get("autoloot"); - auto value = featureKV.has_value() ? featureKV->getNumber() : 0; - if (value == 2) { - return true; - } else if (value == 1) { - return !isBoss; - } - return false; - } + bool checkAutoLoot(bool isBoss) const; - QuickLootFilter_t getQuickLootFilter() const { - return quickLootFilter; - } + QuickLootFilter_t getQuickLootFilter() const; // Get specific inventory item from itemid std::vector<std::shared_ptr<Item>> getInventoryItemsFromId(uint16_t itemId, bool ignore = true) const; @@ -2666,13 +1271,13 @@ class Player final : public Creature, public Cylinder, public Bankable { std::vector<std::shared_ptr<Condition>> getMuteConditions() const; - void checkTradeState(std::shared_ptr<Item> item); - bool hasCapacity(std::shared_ptr<Item> item, uint32_t count) const; + void checkTradeState(const std::shared_ptr<Item> &item); + bool hasCapacity(const std::shared_ptr<Item> &item, uint32_t count) const; - void checkLootContainers(std::shared_ptr<Container> item); + void checkLootContainers(const std::shared_ptr<Container> &item); - void gainExperience(uint64_t exp, std::shared_ptr<Creature> target); - void addExperience(std::shared_ptr<Creature> target, uint64_t exp, bool sendText = false); + void gainExperience(uint64_t exp, const std::shared_ptr<Creature> &target); + void addExperience(const std::shared_ptr<Creature> &target, uint64_t exp, bool sendText = false); void removeExperience(uint64_t exp, bool sendText = false); void updateInventoryWeight(); @@ -2682,37 +1287,37 @@ class Player final : public Creature, public Cylinder, public Bankable { */ void updateInventoryImbuement(); - void setNextWalkActionTask(std::shared_ptr<Task> task); - void setNextWalkTask(std::shared_ptr<Task> task); - void setNextActionTask(std::shared_ptr<Task> task, bool resetIdleTime = true); - void setNextActionPushTask(std::shared_ptr<Task> task); - void setNextPotionActionTask(std::shared_ptr<Task> task); + void setNextWalkActionTask(const std::shared_ptr<Task> &task); + void setNextWalkTask(const std::shared_ptr<Task> &task); + void setNextActionTask(const std::shared_ptr<Task> &task, bool resetIdleTime = true); + void setNextActionPushTask(const std::shared_ptr<Task> &task); + void setNextPotionActionTask(const std::shared_ptr<Task> &task); - void death(std::shared_ptr<Creature> lastHitCreature) override; + void death(const std::shared_ptr<Creature> &lastHitCreature) override; bool spawn(); void despawn(); - bool dropCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared_ptr<Creature> mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) override; - std::shared_ptr<Item> getCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared_ptr<Creature> mostDamageCreature) override; + bool dropCorpse(const std::shared_ptr<Creature> &lastHitCreature, const std::shared_ptr<Creature> &mostDamageCreature, bool lastHitUnjustified, bool mostDamageUnjustified) override; + std::shared_ptr<Item> getCorpse(const std::shared_ptr<Creature> &lastHitCreature, const std::shared_ptr<Creature> &mostDamageCreature) override; // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; - void addThing(std::shared_ptr<Thing>) override { } - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; + void addThing(const std::shared_ptr<Thing> &) override { } + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) override; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) override; - int32_t getThingIndex(std::shared_ptr<Thing> thing) const override; + int32_t getThingIndex(const std::shared_ptr<Thing> &thing) const override; size_t getFirstIndex() const override; size_t getLastIndex() const override; uint32_t getItemTypeCount(uint16_t itemId, int32_t subType = -1) const override; - void stashContainer(StashContainerList itemDict); + void stashContainer(const StashContainerList &itemDict); ItemsTierCountList getInventoryItemsId(bool ignoreStoreInbox = false) const; // This function is a override function of base class @@ -2720,17 +1325,17 @@ class Player final : public Creature, public Cylinder, public Bankable { // Function from player class with correct type sizes (uint16_t) std::map<uint16_t, uint16_t> &getAllSaleItemIdAndCount(std::map<uint16_t, uint16_t> &countMap) const; void getAllItemTypeCountAndSubtype(std::map<uint32_t, uint32_t> &countMap) const; - std::shared_ptr<Item> getForgeItemFromId(uint16_t itemId, uint8_t tier); + std::shared_ptr<Item> getForgeItemFromId(uint16_t itemId, uint8_t tier) const; std::shared_ptr<Thing> getThing(size_t index) const override; - void internalAddThing(std::shared_ptr<Thing> thing) override; - void internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void internalAddThing(const std::shared_ptr<Thing> &thing) override; + void internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; void addHuntingTaskKill(const std::shared_ptr<MonsterType> &mType); void addBestiaryKill(const std::shared_ptr<MonsterType> &mType); void addBosstiaryKill(const std::shared_ptr<MonsterType> &mType); - phmap::flat_hash_set<uint32_t> attackedSet; + phmap::flat_hash_set<uint32_t> attackedSet {}; std::map<uint8_t, OpenContainer> openContainers; std::map<uint32_t, std::shared_ptr<DepotLocker>> depotLockerMap; @@ -2739,12 +1344,6 @@ class Player final : public Creature, public Cylinder, public Bankable { std::map<uint32_t, int32_t> storageMap; std::map<uint16_t, uint64_t> itemPriceMap; - std::map<uint8_t, uint16_t> maxValuePerSkill = { - { SKILL_LIFE_LEECH_CHANCE, 100 }, - { SKILL_MANA_LEECH_CHANCE, 100 }, - { SKILL_CRITICAL_HIT_CHANCE, 100 * g_configManager().getNumber(CRITICALCHANCE, "std::map::maxValuePerSkill") } - }; - std::map<uint64_t, std::shared_ptr<Reward>> rewardMap; std::map<ObjectCategory_t, std::pair<std::shared_ptr<Container>, std::shared_ptr<Container>>> m_managedContainers; @@ -2824,7 +1423,7 @@ class Player final : public Creature, public Cylinder, public Bankable { std::shared_ptr<Npc> shopOwner = nullptr; std::shared_ptr<Party> m_party = nullptr; std::shared_ptr<Player> tradePartner = nullptr; - ProtocolGame_ptr client; + std::shared_ptr<ProtocolGame> client = nullptr; std::shared_ptr<Task> walkTask; std::shared_ptr<Town> town; std::shared_ptr<Vocation> vocation = nullptr; @@ -2924,7 +1523,7 @@ class Player final : public Creature, public Cylinder, public Bankable { TradeState_t tradeState = TRADE_NONE; FightMode_t fightMode = FIGHTMODE_ATTACK; Faction_t faction = FACTION_PLAYER; - QuickLootFilter_t quickLootFilter; + QuickLootFilter_t quickLootFilter {}; PlayerPronoun_t pronoun = PLAYERPRONOUN_THEY; bool chaseMode = false; @@ -2944,7 +1543,7 @@ class Player final : public Creature, public Cylinder, public Bankable { bool marketMenu = false; // Menu option 'show in market' bool exerciseTraining = false; bool moved = false; - bool dead = false; + bool m_isDead = false; bool imbuementTrackerWindowOpen = false; // Hazard system @@ -2968,38 +1567,11 @@ class Player final : public Creature, public Cylinder, public Bankable { uint16_t getStepSpeed() const override { return std::max<uint16_t>(PLAYER_MIN_SPEED, std::min<uint16_t>(PLAYER_MAX_SPEED, getSpeed())); } - void updateBaseSpeed() { - if (baseSpeed >= PLAYER_MAX_SPEED) { - return; - } - - if (!hasFlag(PlayerFlags_t::SetMaxSpeed)) { - baseSpeed = static_cast<uint16_t>(vocation->getBaseSpeed() + (level - 1)); - } else { - baseSpeed = PLAYER_MAX_SPEED; - } - } + void updateBaseSpeed(); bool isPromoted() const; - bool onFistAttackSpeed = g_configManager().getBoolean(TOGGLE_ATTACK_SPEED_ONFIST, "Player.hpp::onFistAttackSpeed"); - uint32_t MAX_ATTACK_SPEED = g_configManager().getNumber(MAX_SPEED_ATTACKONFIST, "Player.hpp::MAX_ATTACK_SPEED"); - - uint32_t getAttackSpeed() const { - if (onFistAttackSpeed) { - uint32_t baseAttackSpeed = vocation->getAttackSpeed(); - uint32_t skillLevel = getSkillLevel(SKILL_FIST); - uint32_t attackSpeed = baseAttackSpeed - (skillLevel * g_configManager().getNumber(MULTIPLIER_ATTACKONFIST, __FUNCTION__)); - - if (attackSpeed < MAX_ATTACK_SPEED) { - attackSpeed = MAX_ATTACK_SPEED; - } - - return static_cast<uint32_t>(attackSpeed); - } else { - return vocation->getAttackSpeed(); - } - } + uint32_t getAttackSpeed() const; static double_t getPercentLevel(uint64_t count, uint64_t nextLevelCount); double getLostPercent() const; @@ -3008,16 +1580,15 @@ class Player final : public Creature, public Cylinder, public Bankable { } bool isSuppress(ConditionType_t conditionType, bool attackerPlayer) const override; - void addConditionSuppression(const std::array<ConditionType_t, ConditionType_t::CONDITION_COUNT> &addConditions); uint16_t getLookCorpse() const override; void getPathSearchParams(const std::shared_ptr<Creature> &creature, FindPathParams &fpp) override; void setDead(bool isDead) { - dead = isDead; + m_isDead = isDead; } - bool isDead() const { - return dead; + bool isDead() const override { + return m_isDead; } void triggerMomentum(); @@ -3064,13 +1635,13 @@ class Player final : public Creature, public Cylinder, public Bankable { std::array<double_t, COMBAT_COUNT> getFinalDamageReduction() const; void calculateDamageReductionFromEquipedItems(std::array<double_t, COMBAT_COUNT> &combatReductionMap) const; - void calculateDamageReductionFromItem(std::array<double_t, COMBAT_COUNT> &combatReductionMap, std::shared_ptr<Item> item) const; - void updateDamageReductionFromItemImbuement(std::array<double_t, COMBAT_COUNT> &combatReductionMap, std::shared_ptr<Item> item, uint16_t combatTypeIndex) const; - void updateDamageReductionFromItemAbility(std::array<double_t, COMBAT_COUNT> &combatReductionMap, std::shared_ptr<Item> item, uint16_t combatTypeIndex) const; + void calculateDamageReductionFromItem(std::array<double_t, COMBAT_COUNT> &combatReductionMap, const std::shared_ptr<Item> &item) const; + void updateDamageReductionFromItemImbuement(std::array<double_t, COMBAT_COUNT> &combatReductionMap, const std::shared_ptr<Item> &item, uint16_t combatTypeIndex) const; + void updateDamageReductionFromItemAbility(std::array<double_t, COMBAT_COUNT> &combatReductionMap, const std::shared_ptr<Item> &item, uint16_t combatTypeIndex) const; double_t calculateDamageReduction(double_t currentTotal, int16_t resistance) const; void removeEmptyRewards(); - bool hasOtherRewardContainerOpen(const std::shared_ptr<Container> container) const; + bool hasOtherRewardContainerOpen(const std::shared_ptr<Container> &container) const; void checkAndShowBlessingMessage(); diff --git a/src/creatures/players/storages/storages.cpp b/src/creatures/players/storages/storages.cpp index 7fe925ce9..64aab5e44 100644 --- a/src/creatures/players/storages/storages.cpp +++ b/src/creatures/players/storages/storages.cpp @@ -7,15 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/storages/storages.hpp" #include "config/configmanager.hpp" +#include "lib/di/container.hpp" + +Storages &Storages::getInstance() { + return inject<Storages>(); +} bool Storages::loadFromXML() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/storages.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/storages.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { @@ -27,12 +30,12 @@ bool Storages::loadFromXML() { std::vector<std::pair<uint32_t, uint32_t>> ranges; - for (pugi::xml_node range : doc.child("storages").children("range")) { + for (const auto &range : doc.child("storages").children("range")) { uint32_t start = range.attribute("start").as_uint(); uint32_t end = range.attribute("end").as_uint(); - for (const auto &existingRange : ranges) { - if ((start >= existingRange.first && start <= existingRange.second) || (end >= existingRange.first && end <= existingRange.second)) { + for (const auto &[rangeStart, rangeEnd] : ranges) { + if ((start >= rangeStart && start <= rangeEnd) || (end >= rangeStart && end <= rangeEnd)) { g_logger().warn("[{}] Storage range from {} to {} conflicts with a previously defined range", __func__, start, end); continue; } @@ -40,11 +43,11 @@ bool Storages::loadFromXML() { ranges.emplace_back(start, end); - for (pugi::xml_node storage : range.children("storage")) { + for (const auto &storage : range.children("storage")) { std::string name = storage.attribute("name").as_string(); uint32_t key = storage.attribute("key").as_uint(); - for (char c : name) { + for (const char &c : name) { if (std::isupper(c)) { g_logger().warn("[{}] Storage from storages.xml with name: {}, contains uppercase letters. Please use dot notation pattern", __func__, name); break; diff --git a/src/creatures/players/storages/storages.hpp b/src/creatures/players/storages/storages.hpp index afc9fe14f..70e099988 100644 --- a/src/creatures/players/storages/storages.hpp +++ b/src/creatures/players/storages/storages.hpp @@ -9,8 +9,6 @@ #pragma once -#include "lib/di/container.hpp" - class Storages { public: Storages() = default; @@ -19,9 +17,7 @@ class Storages { Storages(const Storages &) = delete; void operator=(const Storages &) = delete; - static Storages &getInstance() { - return inject<Storages>(); - } + static Storages &getInstance(); bool loadFromXML(); diff --git a/src/creatures/players/vip/player_vip.cpp b/src/creatures/players/vip/player_vip.cpp index 95ebe91ad..195480ca5 100644 --- a/src/creatures/players/vip/player_vip.cpp +++ b/src/creatures/players/vip/player_vip.cpp @@ -7,14 +7,12 @@ * 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/grouping/groups.hpp" #include "creatures/players/player.hpp" +#include "io/iologindata.hpp" +#include "server/network/protocol/protocolgame.hpp" const uint8_t PlayerVIP::firstID = 1; const uint8_t PlayerVIP::lastID = 8; @@ -25,7 +23,8 @@ PlayerVIP::PlayerVIP(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()) { + } + if (m_player.isPremium()) { return 100; } return 20; @@ -38,7 +37,7 @@ uint8_t PlayerVIP::getMaxGroupEntries() const { return 0; } -void PlayerVIP::notifyStatusChange(std::shared_ptr<Player> loginPlayer, VipStatus_t status, bool message) const { +void PlayerVIP::notifyStatusChange(const std::shared_ptr<Player> &loginPlayer, VipStatus_t vipStatus, bool message) const { if (!m_player.client) { return; } @@ -47,12 +46,12 @@ void PlayerVIP::notifyStatusChange(std::shared_ptr<Player> loginPlayer, VipStatu return; } - m_player.client->sendUpdatedVIPStatus(loginPlayer->getGUID(), status); + m_player.client->sendUpdatedVIPStatus(loginPlayer->getGUID(), vipStatus); if (message) { - if (status == VipStatus_t::Online) { + if (vipStatus == VipStatus_t::Online) { m_player.sendTextMessage(TextMessage(MESSAGE_FAILURE, fmt::format("{} has logged in.", loginPlayer->getName()))); - } else if (status == VipStatus_t::Offline) { + } else if (vipStatus == VipStatus_t::Offline) { m_player.sendTextMessage(TextMessage(MESSAGE_FAILURE, fmt::format("{} has logged out.", loginPlayer->getName()))); } } @@ -101,8 +100,8 @@ bool PlayerVIP::addInternal(uint32_t vipGuid) { return vipGuids.insert(vipGuid).second; } -bool PlayerVIP::edit(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify, std::vector<uint8_t> groupsId) const { - const auto it = vipGuids.find(vipGuid); +bool PlayerVIP::edit(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify, const std::vector<uint8_t> &groupsId) const { + auto it = vipGuids.find(vipGuid); if (it == vipGuids.end()) { return false; // player is not in VIP } @@ -113,7 +112,7 @@ bool PlayerVIP::edit(uint32_t vipGuid, const std::string &description, uint32_t IOLoginData::removeGuidVIPGroupEntry(m_player.account->getID(), vipGuid); - for (const auto groupId : groupsId) { + for (const auto &groupId : groupsId) { const auto &group = getGroupByID(groupId); if (group) { group->vipGroupGuids.insert(vipGuid); @@ -125,7 +124,7 @@ bool PlayerVIP::edit(uint32_t vipGuid, const std::string &description, uint32_t } std::shared_ptr<VIPGroup> PlayerVIP::getGroupByID(uint8_t groupId) const { - auto it = std::find_if(vipGroups.begin(), vipGroups.end(), [groupId](const std::shared_ptr<VIPGroup> vipGroup) { + auto it = std::ranges::find_if(vipGroups, [groupId](const auto &vipGroup) { return vipGroup->id == groupId; }); @@ -134,7 +133,7 @@ std::shared_ptr<VIPGroup> PlayerVIP::getGroupByID(uint8_t groupId) const { std::shared_ptr<VIPGroup> 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> vipGroup) { + auto it = std::ranges::find_if(vipGroups, [groupName](const auto &vipGroup) { return strcmp(groupName, vipGroup->name.c_str()) == 0; }); @@ -157,7 +156,7 @@ void PlayerVIP::addGroupInternal(uint8_t groupId, const std::string &name, bool } void PlayerVIP::removeGroup(uint8_t groupId) { - auto it = std::find_if(vipGroups.begin(), vipGroups.end(), [groupId](const std::shared_ptr<VIPGroup> vipGroup) { + auto it = std::ranges::find_if(vipGroups, [groupId](const auto &vipGroup) { return vipGroup->id == groupId; }); @@ -188,7 +187,7 @@ void PlayerVIP::addGroup(const std::string &name, bool customizable /*= true */) return; } - std::shared_ptr<VIPGroup> vipGroup = std::make_shared<VIPGroup>(freeId, name, customizable); + auto vipGroup = std::make_shared<VIPGroup>(freeId, name, customizable); vipGroups.emplace_back(vipGroup); if (m_player.account) { @@ -200,7 +199,7 @@ void PlayerVIP::addGroup(const std::string &name, bool customizable /*= true */) } } -void PlayerVIP::editGroup(uint8_t groupId, const std::string &newName, bool customizable /*= true*/) { +void PlayerVIP::editGroup(uint8_t groupId, const std::string &newName, bool customizable /*= true*/) const { if (getGroupByName(newName) != nullptr) { m_player.sendCancelMessage("A group with this name already exists. Please choose another name."); return; @@ -229,7 +228,7 @@ uint8_t PlayerVIP::getFreeId() const { return 0; } -const std::vector<uint8_t> PlayerVIP::getGroupsIdGuidBelongs(uint32_t guid) { +std::vector<uint8_t> PlayerVIP::getGroupsIdGuidBelongs(uint32_t guid) const { std::vector<uint8_t> guidBelongs; for (const auto &vipGroup : vipGroups) { if (vipGroup->vipGroupGuids.contains(guid)) { @@ -239,7 +238,7 @@ const std::vector<uint8_t> PlayerVIP::getGroupsIdGuidBelongs(uint32_t guid) { return guidBelongs; } -void PlayerVIP::addGuidToGroupInternal(uint8_t groupId, uint32_t guid) { +void PlayerVIP::addGuidToGroupInternal(uint8_t groupId, uint32_t guid) const { 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 index e9aeaf853..0eb46b076 100644 --- a/src/creatures/players/vip/player_vip.hpp +++ b/src/creatures/players/vip/player_vip.hpp @@ -13,18 +13,19 @@ class Player; -struct VIPGroup { +class VIPGroup { +public: uint8_t id = 0; - std::string name = ""; + std::string name; bool customizable = false; phmap::flat_hash_set<uint32_t> vipGroupGuids; VIPGroup() = default; - VIPGroup(uint8_t id, const std::string &name, bool customizable) : + VIPGroup(uint8_t id, std::string name, bool customizable) : id(id), name(std::move(name)), customizable(customizable) { } }; -class PlayerVIP { +class PlayerVIP { public: explicit PlayerVIP(Player &player); @@ -41,11 +42,11 @@ class PlayerVIP { status = newStatus; } - void notifyStatusChange(std::shared_ptr<Player> loginPlayer, VipStatus_t status, bool message = true) const; + void notifyStatusChange(const std::shared_ptr<Player> &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<uint8_t> groupsId) const; + bool edit(uint32_t vipGuid, const std::string &description, uint32_t icon, bool notify, const std::vector<uint8_t> &groupsId) const; // VIP Group std::shared_ptr<VIPGroup> getGroupByID(uint8_t groupId) const; @@ -54,12 +55,12 @@ class PlayerVIP { 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 editGroup(uint8_t groupId, const std::string &newName, bool customizable = true) const; - void addGuidToGroupInternal(uint8_t groupId, uint32_t guid); + void addGuidToGroupInternal(uint8_t groupId, uint32_t guid) const; uint8_t getFreeId() const; - const std::vector<uint8_t> getGroupsIdGuidBelongs(uint32_t guid); + std::vector<uint8_t> getGroupsIdGuidBelongs(uint32_t guid) const; [[nodiscard]] const std::vector<std::shared_ptr<VIPGroup>> &getGroups() const { return vipGroups; diff --git a/src/creatures/players/vocations/vocation.cpp b/src/creatures/players/vocations/vocation.cpp index 6fec27251..f36494895 100644 --- a/src/creatures/players/vocations/vocation.cpp +++ b/src/creatures/players/vocations/vocation.cpp @@ -7,38 +7,44 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "creatures/players/vocations/vocation.hpp" +#include "config/configmanager.hpp" +#include "items/item.hpp" +#include "lib/di/container.hpp" #include "utils/pugicast.hpp" #include "utils/tools.hpp" +#include "enums/player_wheel.hpp" bool Vocations::reload() { vocationsMap.clear(); return loadFromXml(); } +Vocations &Vocations::getInstance() { + return inject<Vocations>(); +} + bool Vocations::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/vocations.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/vocations.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); return false; } - for (auto vocationNode : doc.child("vocations").children()) { + for (const auto &vocationNode : doc.child("vocations").children()) { pugi::xml_attribute attr; - if (!(attr = vocationNode.attribute("id"))) { + if (!((attr = vocationNode.attribute("id")))) { g_logger().warn("[{}] - Missing vocation id", __FUNCTION__); continue; } - uint16_t id = pugi::cast<uint16_t>(attr.value()); + auto id = pugi::cast<uint16_t>(attr.value()); - auto res = vocationsMap.emplace(std::piecewise_construct, std::forward_as_tuple(id), std::forward_as_tuple(std::make_shared<Vocation>(id))); - auto voc = res.first->second; + auto [fst, snd] = vocationsMap.emplace(std::piecewise_construct, std::forward_as_tuple(id), std::forward_as_tuple(std::make_shared<Vocation>(id))); + const auto voc = fst->second; if ((attr = vocationNode.attribute("name"))) { voc->name = attr.as_string(); @@ -120,11 +126,11 @@ bool Vocations::loadFromXml() { voc->avatarLookType = pugi::cast<uint16_t>(attr.value()); } - for (auto childNode : vocationNode.children()) { + for (const auto &childNode : vocationNode.children()) { if (strcasecmp(childNode.name(), "skill") == 0) { pugi::xml_attribute skillIdAttribute = childNode.attribute("id"); if (skillIdAttribute) { - uint16_t skill_id = pugi::cast<uint16_t>(skillIdAttribute.value()); + auto skill_id = pugi::cast<uint16_t>(skillIdAttribute.value()); if (skill_id <= SKILL_LAST) { voc->skillMultipliers[skill_id] = pugi::cast<float>(childNode.attribute("multiplier").value()); } else { @@ -186,7 +192,7 @@ bool Vocations::loadFromXml() { pugi::xml_attribute qualityAttr = childNode.attribute("quality"); pugi::xml_attribute nameAttr = childNode.attribute("name"); auto quality = pugi::cast<uint8_t>(qualityAttr.value()); - auto name = nameAttr.as_string(); + const auto name = nameAttr.as_string(); voc->wheelGems[static_cast<WheelGemQuality_t>(quality)] = name; } } @@ -205,26 +211,38 @@ std::shared_ptr<Vocation> Vocations::getVocation(uint16_t id) { return it->second; } +const std::map<uint16_t, std::shared_ptr<Vocation>> &Vocations::getVocations() const { + return vocationsMap; +} + uint16_t Vocations::getVocationId(const std::string &name) const { - for (const auto &it : vocationsMap) { - if (strcasecmp(it.second->name.c_str(), name.c_str()) == 0) { - return it.first; + for (const auto &[vocationId, vocationPtr] : vocationsMap) { + if (caseInsensitiveCompare(vocationPtr->name, name)) { + return vocationId; } } - return -1; + return VOCATION_NONE; } uint16_t Vocations::getPromotedVocation(uint16_t vocationId) const { - for (const auto &it : vocationsMap) { - if (it.second->fromVocation == vocationId && it.first != vocationId) { - return it.first; + for (const auto &[currentVocationId, vocationPtr] : vocationsMap) { + if (vocationPtr->fromVocation == vocationId && currentVocationId != vocationId) { + return currentVocationId; } } return VOCATION_NONE; } uint32_t Vocation::skillBase[SKILL_LAST + 1] = { 50, 50, 50, 50, 30, 100, 20 }; -const uint16_t minSkillLevel = 10; +constexpr uint16_t minSkillLevel = 10; + +const std::string &Vocation::getVocName() const { + return name; +} + +const std::string &Vocation::getVocDescription() const { + return description; +} absl::uint128 Vocation::getTotalSkillTries(uint8_t skill, uint16_t level) { if (skill > SKILL_LAST) { @@ -254,7 +272,7 @@ uint64_t Vocation::getReqSkillTries(uint8_t skill, uint16_t level) { return it->second; } - uint64_t tries = static_cast<uint64_t>(skillBase[skill] * std::pow(static_cast<double>(skillMultipliers[skill]), level - (minSkillLevel + 1))); + const auto tries = static_cast<uint64_t>(skillBase[skill] * std::pow(static_cast<double>(skillMultipliers[skill]), level - (minSkillLevel + 1))); cacheSkill[skill][level] = tries; return tries; } @@ -283,26 +301,111 @@ uint64_t Vocation::getReqMana(uint32_t magLevel) { return it->second; } - uint64_t reqMana = std::floor<uint64_t>(1600 * std::pow<double>(manaMultiplier, static_cast<int32_t>(magLevel) - 1)); + const uint64_t reqMana = std::floor<uint64_t>(1600 * std::pow<double>(manaMultiplier, static_cast<int32_t>(magLevel) - 1)); cacheMana[magLevel] = reqMana; return reqMana; } +uint16_t Vocation::getId() const { + return id; +} + +uint8_t Vocation::getClientId() const { + return clientId; +} + +uint8_t Vocation::getBaseId() const { + return baseId; +} + +uint16_t Vocation::getAvatarLookType() const { + return avatarLookType; +} + +uint32_t Vocation::getHPGain() const { + return gainHP; +} + +uint32_t Vocation::getManaGain() const { + return gainMana; +} + +uint32_t Vocation::getCapGain() const { + return gainCap; +} + +uint32_t Vocation::getManaGainTicks() const { + return gainManaTicks / g_configManager().getFloat(RATE_MANA_REGEN_SPEED); +} + +uint32_t Vocation::getManaGainAmount() const { + return gainManaAmount * g_configManager().getFloat(RATE_MANA_REGEN); +} + +uint32_t Vocation::getHealthGainTicks() const { + return gainHealthTicks / g_configManager().getFloat(RATE_HEALTH_REGEN_SPEED); +} + +uint32_t Vocation::getHealthGainAmount() const { + return gainHealthAmount * g_configManager().getFloat(RATE_HEALTH_REGEN); +} + +uint8_t Vocation::getSoulMax() const { + return soulMax; +} + +uint32_t Vocation::getSoulGainTicks() const { + return gainSoulTicks / g_configManager().getFloat(RATE_SOUL_REGEN_SPEED); +} + +uint32_t Vocation::getBaseAttackSpeed() const { + return attackSpeed; +} + +uint32_t Vocation::getAttackSpeed() const { + return attackSpeed / g_configManager().getFloat(RATE_ATTACK_SPEED); +} + +uint32_t Vocation::getBaseSpeed() const { + return baseSpeed; +} + +uint32_t Vocation::getFromVocation() const { + return fromVocation; +} + +bool Vocation::getMagicShield() const { + return magicShield; +} + +bool Vocation::canCombat() const { + return combat; +} + std::vector<WheelGemSupremeModifier_t> Vocation::getSupremeGemModifiers() { if (!m_supremeGemModifiers.empty()) { return m_supremeGemModifiers; } - auto baseVocation = g_vocations().getVocation(getBaseId()); + const auto baseVocation = g_vocations().getVocation(getBaseId()); auto vocationName = asLowerCaseString(baseVocation->getVocName()); auto allModifiers = magic_enum::enum_entries<WheelGemSupremeModifier_t>(); g_logger().debug("Loading supreme gem modifiers for vocation: {}", vocationName); + for (const auto &[value, modifierName] : allModifiers) { std::string targetVocation(modifierName.substr(0, modifierName.find('_'))); toLowerCaseString(targetVocation); g_logger().debug("Checking supreme gem modifier: {}, targetVocation: {}", modifierName, targetVocation); if (targetVocation == "general" || targetVocation.find(vocationName) != std::string::npos) { - m_supremeGemModifiers.push_back(value); + m_supremeGemModifiers.emplace_back(value); } } return m_supremeGemModifiers; } + +uint16_t Vocation::getWheelGemId(WheelGemQuality_t quality) { + if (!wheelGems.contains(quality)) { + return 0; + } + const auto &gemName = wheelGems[quality]; + return Item::items.getItemIdByName(gemName); +} diff --git a/src/creatures/players/vocations/vocation.hpp b/src/creatures/players/vocations/vocation.hpp index 0ad95ac0f..21a4ea797 100644 --- a/src/creatures/players/vocations/vocation.hpp +++ b/src/creatures/players/vocations/vocation.hpp @@ -9,99 +9,57 @@ #pragma once -#include "declarations.hpp" -#include "items/item.hpp" -#include "lib/di/container.hpp" -#include "creatures/players/wheel/wheel_gems.hpp" +#include "creatures/creatures_definitions.hpp" + +enum class WheelGemQuality_t : uint8_t; +enum class WheelGemSupremeModifier_t : uint8_t; class Vocation { public: explicit Vocation(uint16_t initId) : id(initId) { } - const std::string &getVocName() const { - return name; - } - const std::string &getVocDescription() const { - return description; - } + const std::string &getVocName() const; + const std::string &getVocDescription() const; absl::uint128 getTotalSkillTries(uint8_t skill, uint16_t level); uint64_t getReqSkillTries(uint8_t skill, uint16_t level); absl::uint128 getTotalMana(uint32_t magLevel); uint64_t getReqMana(uint32_t magLevel); - uint16_t getId() const { - return id; - } - - uint8_t getClientId() const { - return clientId; - } - - uint8_t getBaseId() const { - return baseId; - } - - uint16_t getAvatarLookType() const { - return avatarLookType; - } - - uint32_t getHPGain() const { - return gainHP; - } - uint32_t getManaGain() const { - return gainMana; - } - uint32_t getCapGain() const { - return gainCap; - } - - uint32_t getManaGainTicks() const { - return gainManaTicks / g_configManager().getFloat(RATE_MANA_REGEN_SPEED, __FUNCTION__); - } - - uint32_t getManaGainAmount() const { - return gainManaAmount * g_configManager().getFloat(RATE_MANA_REGEN, __FUNCTION__); - } - - uint32_t getHealthGainTicks() const { - return gainHealthTicks / g_configManager().getFloat(RATE_HEALTH_REGEN_SPEED, __FUNCTION__); - } - - uint32_t getHealthGainAmount() const { - return gainHealthAmount * g_configManager().getFloat(RATE_HEALTH_REGEN, __FUNCTION__); - } - - uint8_t getSoulMax() const { - return soulMax; - } - - uint32_t getSoulGainTicks() const { - return gainSoulTicks / g_configManager().getFloat(RATE_SOUL_REGEN_SPEED, __FUNCTION__); - } - - uint32_t getBaseAttackSpeed() const { - return attackSpeed; - } - - uint32_t getAttackSpeed() const { - return attackSpeed / g_configManager().getFloat(RATE_ATTACK_SPEED, __FUNCTION__); - } - - uint32_t getBaseSpeed() const { - return baseSpeed; - } - - uint32_t getFromVocation() const { - return fromVocation; - } - - bool getMagicShield() const { - return magicShield; - } - bool canCombat() const { - return combat; - } + uint16_t getId() const; + + uint8_t getClientId() const; + + uint8_t getBaseId() const; + + uint16_t getAvatarLookType() const; + + uint32_t getHPGain() const; + uint32_t getManaGain() const; + uint32_t getCapGain() const; + + uint32_t getManaGainTicks() const; + + uint32_t getManaGainAmount() const; + + uint32_t getHealthGainTicks() const; + + uint32_t getHealthGainAmount() const; + + uint8_t getSoulMax() const; + + uint32_t getSoulGainTicks() const; + + uint32_t getBaseAttackSpeed() const; + + uint32_t getAttackSpeed() const; + + uint32_t getBaseSpeed() const; + + uint32_t getFromVocation() const; + + bool getMagicShield() const; + bool canCombat() const; float meleeDamageMultiplier = 1.0f; float distDamageMultiplier = 1.0f; @@ -117,13 +75,7 @@ class Vocation { std::vector<WheelGemSupremeModifier_t> getSupremeGemModifiers(); - uint16_t getWheelGemId(WheelGemQuality_t quality) { - if (!wheelGems.contains(quality)) { - return 0; - } - const auto &name = wheelGems[quality]; - return Item::items.getItemIdByName(name); - } + uint16_t getWheelGemId(WheelGemQuality_t quality); private: friend class Vocations; @@ -174,17 +126,13 @@ class Vocations { Vocations(const Vocations &) = delete; void operator=(const Vocations &) = delete; - static Vocations &getInstance() { - return inject<Vocations>(); - } + static Vocations &getInstance(); bool loadFromXml(); bool reload(); std::shared_ptr<Vocation> getVocation(uint16_t id); - const std::map<uint16_t, std::shared_ptr<Vocation>> &getVocations() const { - return vocationsMap; - } + const std::map<uint16_t, std::shared_ptr<Vocation>> &getVocations() const; uint16_t getVocationId(const std::string &name) const; uint16_t getPromotedVocation(uint16_t vocationId) const; diff --git a/src/creatures/players/wheel/player_wheel.cpp b/src/creatures/players/wheel/player_wheel.cpp index 2a3e13664..6d3ee2713 100644 --- a/src/creatures/players/wheel/player_wheel.cpp +++ b/src/creatures/players/wheel/player_wheel.cpp @@ -7,17 +7,23 @@ * Website: https://docs.opentibiabr.org/ */ -#include "pch.hpp" - #include "creatures/players/wheel/player_wheel.hpp" -#include "io/io_wheel.hpp" - -#include "game/game.hpp" -#include "creatures/players/player.hpp" +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" #include "creatures/combat/spells.hpp" +#include "creatures/players/player.hpp" +#include "creatures/players/vocations/vocation.hpp" +#include "creatures/players/wheel/wheel_gems.hpp" +#include "enums/player_wheel.hpp" +#include "game/game.hpp" +#include "io/io_wheel.hpp" +#include "kv/kv.hpp" +#include "kv/kv_definitions.hpp" +#include "server/network/message/networkmessage.hpp" +#include "server/network/protocol/protocolgame.hpp" -#include "config/configmanager.hpp" +std::array<int32_t, COMBAT_COUNT> m_resistance = { 0 }; const static std::vector<WheelGemBasicModifier_t> wheelGemBasicSlot1Allowed = { WheelGemBasicModifier_t::General_FireResistance, @@ -75,6 +81,175 @@ const static std::vector<WheelGemBasicModifier_t> wheelGemBasicSlot2Allowed = { WheelGemBasicModifier_t::General_MitigationMultiplier, }; +const static std::vector<WheelGemBasicModifier_t> modsBasicPosition = { + WheelGemBasicModifier_t::General_PhysicalResistance, + WheelGemBasicModifier_t::General_HolyResistance, + WheelGemBasicModifier_t::General_DeathResistance, + WheelGemBasicModifier_t::General_FireResistance, + WheelGemBasicModifier_t::General_EarthResistance, + WheelGemBasicModifier_t::General_IceResistance, + WheelGemBasicModifier_t::General_EnergyResistance, + + WheelGemBasicModifier_t::General_HolyResistance_DeathWeakness, + WheelGemBasicModifier_t::General_DeathResistance_HolyWeakness, + WheelGemBasicModifier_t::General_FireResistance_EarthResistance, + WheelGemBasicModifier_t::General_FireResistance_IceResistance, + WheelGemBasicModifier_t::General_FireResistance_EnergyResistance, + WheelGemBasicModifier_t::General_EarthResistance_IceResistance, + WheelGemBasicModifier_t::General_EarthResistance_EnergyResistance, + WheelGemBasicModifier_t::General_IceResistance_EnergyResistance, + + WheelGemBasicModifier_t::General_FireResistance_EarthWeakness, + WheelGemBasicModifier_t::General_FireResistance_IceWeakness, + WheelGemBasicModifier_t::General_FireResistance_EnergyWeakness, + WheelGemBasicModifier_t::General_EarthResistance_FireWeakness, + WheelGemBasicModifier_t::General_EarthResistance_IceWeakness, + WheelGemBasicModifier_t::General_EarthResistance_EnergyWeakness, + WheelGemBasicModifier_t::General_IceResistance_EarthWeakness, + WheelGemBasicModifier_t::General_IceResistance_FireWeakness, + WheelGemBasicModifier_t::General_IceResistance_EnergyWeakness, + WheelGemBasicModifier_t::General_EnergyResistance_EarthWeakness, + WheelGemBasicModifier_t::General_EnergyResistance_IceWeakness, + WheelGemBasicModifier_t::General_EnergyResistance_FireWeakness, + WheelGemBasicModifier_t::General_ManaDrainResistance, + WheelGemBasicModifier_t::General_LifeDrainResistance, + WheelGemBasicModifier_t::General_ManaDrainResistance_LifeDrainResistance, + WheelGemBasicModifier_t::General_MitigationMultiplier, + + WheelGemBasicModifier_t::Vocation_Health, + WheelGemBasicModifier_t::Vocation_Mana_FireResistance, + WheelGemBasicModifier_t::Vocation_Mana_EnergyResistance, + WheelGemBasicModifier_t::Vocation_Mana_Earth_Resistance, + WheelGemBasicModifier_t::Vocation_Mana_Ice_Resistance, + WheelGemBasicModifier_t::Vocation_Mana, + WheelGemBasicModifier_t::Vocation_Health_FireResistance, + WheelGemBasicModifier_t::Vocation_Health_EnergyResistance, + WheelGemBasicModifier_t::Vocation_Health_EarthResistance, + WheelGemBasicModifier_t::Vocation_Health_IceResistance, + + WheelGemBasicModifier_t::Vocation_Capacity_FireResistance, + WheelGemBasicModifier_t::Vocation_Capacity_EnergyResistance, + WheelGemBasicModifier_t::Vocation_Capacity_EarthResistance, + WheelGemBasicModifier_t::Vocation_Capacity_IceResistance, + WheelGemBasicModifier_t::Vocation_Capacity, +}; + +const static std::vector<WheelGemSupremeModifier_t> modsSupremeKnightPosition = { + WheelGemSupremeModifier_t::General_Dodge, + WheelGemSupremeModifier_t::General_CriticalDamage, + WheelGemSupremeModifier_t::General_LifeLeech, + WheelGemSupremeModifier_t::General_ManaLeech, + WheelGemSupremeModifier_t::General_RevelationMastery_GiftOfLife, + + WheelGemSupremeModifier_t::Knight_AvatarOfSteel_Cooldown, + WheelGemSupremeModifier_t::Knight_ExecutionersThrow_Cooldown, + WheelGemSupremeModifier_t::Knight_ExecutionersThrow_DamageIncrease, + WheelGemSupremeModifier_t::Knight_ExecutionersThrow_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Fierce_Berserk_DamageIncrease, + WheelGemSupremeModifier_t::Knight_Fierce_Berserk_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Berserk_DamageIncrease, + WheelGemSupremeModifier_t::Knight_Berserk_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Front_Sweep_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Front_Sweep_DamageIncrease, + WheelGemSupremeModifier_t::Knight_Groundshaker_DamageIncrease, + WheelGemSupremeModifier_t::Knight_Groundshaker_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Annihilation_CriticalExtraDamage, + WheelGemSupremeModifier_t::Knight_Annihilation_DamageIncrease, + WheelGemSupremeModifier_t::Knight_FairWoundCleansing_HealingIncrease, + WheelGemSupremeModifier_t::Knight_RevelationMastery_AvatarOfSteel, + WheelGemSupremeModifier_t::Knight_RevelationMastery_ExecutionersThrow, + WheelGemSupremeModifier_t::Knight_RevelationMastery_CombatMastery, +}; + +const static std::vector<WheelGemSupremeModifier_t> modsSupremePaladinPosition = { + WheelGemSupremeModifier_t::General_Dodge, + WheelGemSupremeModifier_t::General_CriticalDamage, + WheelGemSupremeModifier_t::General_LifeLeech, + WheelGemSupremeModifier_t::General_ManaLeech, + WheelGemSupremeModifier_t::General_RevelationMastery_GiftOfLife, + + WheelGemSupremeModifier_t::Paladin_AvatarOfLight_Cooldown, + WheelGemSupremeModifier_t::Paladin_DivineDazzle_Cooldown, + WheelGemSupremeModifier_t::Paladin_DivineGrenade_DamageIncrease, + WheelGemSupremeModifier_t::Paladin_DivineGrenade_CriticalExtraDamage, + WheelGemSupremeModifier_t::Paladin_DivineCaldera_DamageIncrease, + WheelGemSupremeModifier_t::Paladin_DivineCaldera_CriticalExtraDamage, + WheelGemSupremeModifier_t::Paladin_DivineMissile_DamageIncrease, + WheelGemSupremeModifier_t::Paladin_DivineMissile_CriticalExtraDamage, + WheelGemSupremeModifier_t::Paladin_EtherealSpear_DamageIncrease, + WheelGemSupremeModifier_t::Paladin_EtherealSpear_CriticalExtraDamage, + WheelGemSupremeModifier_t::Paladin_StrongEtherealSpear_DamageIncrease, + WheelGemSupremeModifier_t::Paladin_StrongEtherealSpear_CriticalExtraDamage, + WheelGemSupremeModifier_t::Paladin_DivineEmpowerment_Cooldown, + WheelGemSupremeModifier_t::Paladin_DivineGrenade_Cooldown, + WheelGemSupremeModifier_t::Paladin_Salvation_HealingIncrease, + WheelGemSupremeModifier_t::Paladin_RevelationMastery_AvatarOfLight, + WheelGemSupremeModifier_t::Paladin_RevelationMastery_DivineGrenade, + WheelGemSupremeModifier_t::Paladin_RevelationMastery_DivineEmpowerment, +}; + +const static std::vector<WheelGemSupremeModifier_t> modsSupremeSorcererPosition = { + WheelGemSupremeModifier_t::General_Dodge, + WheelGemSupremeModifier_t::General_CriticalDamage, + WheelGemSupremeModifier_t::General_LifeLeech, + WheelGemSupremeModifier_t::General_ManaLeech, + WheelGemSupremeModifier_t::SorcererDruid_UltimateHealing, + WheelGemSupremeModifier_t::General_RevelationMastery_GiftOfLife, + + WheelGemSupremeModifier_t::Sorcerer_AvatarOfStorm_Cooldown, + WheelGemSupremeModifier_t::Sorcerer_EnergyWave_Cooldown, + WheelGemSupremeModifier_t::Sorcerer_GreatDeathBeam_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_GreatDeathBeam_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_HellsCore_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_HellsCore_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_EnergyWave_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_EnergyWave_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_GreatFireWave_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_GreatFireWave_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_RageOfTheSkies_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_RageOfTheSkies_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_GreatEnergyBeam_DamageIncrease, + WheelGemSupremeModifier_t::Sorcerer_GreatEnergyBeam_CriticalExtraDamage, + WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_AvatarOfStorm, + WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_BeamMastery, + WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_DrainBody, +}; + +const static std::vector<WheelGemSupremeModifier_t> modsSupremeDruidPosition = { + WheelGemSupremeModifier_t::General_Dodge, + WheelGemSupremeModifier_t::General_CriticalDamage, + WheelGemSupremeModifier_t::General_LifeLeech, + WheelGemSupremeModifier_t::General_ManaLeech, + WheelGemSupremeModifier_t::SorcererDruid_UltimateHealing, + WheelGemSupremeModifier_t::General_RevelationMastery_GiftOfLife, + + WheelGemSupremeModifier_t::Druid_AvatarOfNature_Cooldown, + WheelGemSupremeModifier_t::Druid_NaturesEmbrace_Cooldown, + WheelGemSupremeModifier_t::Druid_TerraBurst_DamageIncrease, + WheelGemSupremeModifier_t::Druid_TerraBurst_CriticalExtraDamage, + WheelGemSupremeModifier_t::Druid_IceBurst_DamageIncrease, + WheelGemSupremeModifier_t::Druid_IceBurst_CriticalExtraDamage, + WheelGemSupremeModifier_t::Druid_EternalWinter_CriticalExtraDamage, + WheelGemSupremeModifier_t::Druid_EternalWinter_DamageIncrease, + WheelGemSupremeModifier_t::Druid_TerraWave_DamageIncrease, + WheelGemSupremeModifier_t::Druid_TerraWave_CriticalExtraDamage, + WheelGemSupremeModifier_t::Druid_StrongIceWave_DamageIncrease, + WheelGemSupremeModifier_t::Druid_StrongIceWave_CriticalExtraDamage, + WheelGemSupremeModifier_t::Druid_HealFriend_HealingIncrease, + WheelGemSupremeModifier_t::Druid_MassHealing_HealingIncrease, + WheelGemSupremeModifier_t::Druid_RevelationMastery_AvatarOfNature, + WheelGemSupremeModifier_t::Druid_RevelationMastery_BlessingOfTheGrove, + WheelGemSupremeModifier_t::Druid_RevelationMastery_TwinBursts, +}; + +// Using reference wrapper to avoid copying the vector to the map +const static std::unordered_map<uint8_t, std::reference_wrapper<const std::vector<WheelGemSupremeModifier_t>>> modsSupremePositionByVocation = { + { 1, std::cref(modsSupremeSorcererPosition) }, + { 2, std::cref(modsSupremeDruidPosition) }, + { 3, std::cref(modsSupremePaladinPosition) }, + { 4, std::cref(modsSupremeKnightPosition) } +}; + // To avoid conflict in other files that might use a function with the same name // Here are built-in helper functions namespace { @@ -97,7 +272,7 @@ namespace { } template <typename SpellType> - int checkSpellAdditionalTarget(const std::array<SpellType, 5> &spellsTable, const std::string_view &spellName, uint8_t stage) { + int checkSpellAdditionalTarget(const std::array<SpellType, 5> &spellsTable, std::string_view spellName, uint8_t stage) { for (const auto &spellTable : spellsTable) { auto size = std::ssize(spellTable.grade); g_logger().debug("spell target stage {}, grade {}", stage, size); @@ -113,7 +288,7 @@ namespace { } template <typename SpellType> - int checkSpellAdditionalDuration(const std::array<SpellType, 5> &spellsTable, const std::string_view &spellName, uint8_t stage) { + int checkSpellAdditionalDuration(const std::array<SpellType, 5> &spellsTable, std::string_view spellName, uint8_t stage) { for (const auto &spellTable : spellsTable) { auto size = std::ssize(spellTable.grade); g_logger().debug("spell duration stage {}, grade {}", stage, size); @@ -144,13 +319,11 @@ namespace { } // namespace PlayerWheel::PlayerWheel(Player &initPlayer) : - m_player(initPlayer) { - auto pointsPerLevel = (uint16_t)g_configManager().getNumber(WHEEL_POINTS_PER_LEVEL, __FUNCTION__); - m_pointsPerLevel = pointsPerLevel > 0 ? pointsPerLevel : 1; + m_pointsPerLevel(g_configManager().getNumber(WHEEL_POINTS_PER_LEVEL)), m_player(initPlayer) { } bool PlayerWheel::canPlayerSelectPointOnSlot(WheelSlots_t slot, bool recursive) const { - auto playerPoints = getWheelPoints(); + const auto playerPoints = getWheelPoints(); // Green quadrant if (slot == WheelSlots_t::SLOT_GREEN_200) { if (playerPoints < 375u) { @@ -672,10 +845,42 @@ bool PlayerWheel::canPlayerSelectPointOnSlot(WheelSlots_t slot, bool recursive) uint16_t PlayerWheel::getUnusedPoints() const { auto totalPoints = getWheelPoints(); + if (totalPoints == 0) { return 0; } + const auto vocationBaseId = m_player.getVocation()->getBaseId(); + const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId); + + for (const auto &modPosition : modsBasicPosition) { + const auto pos = static_cast<uint8_t>(modPosition); + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(WheelFragmentType_t::Lesser, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = static_cast<uint8_t>(gradeKV->get<IntType>()); + } + + totalPoints += grade == 3 ? 1 : 0; + } + + if (modsSupremeIt != modsSupremePositionByVocation.end()) { + for (const auto &modPosition : modsSupremeIt->second.get()) { + const auto pos = static_cast<uint8_t>(modPosition); + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = gradeKV->get<IntType>(); + } + + totalPoints += grade == 3 ? 1 : 0; + } + } else { + g_logger().error("[{}] supreme modifications not found for vocation base id: {}", std::source_location::current().function_name(), vocationBaseId); + } + for (uint8_t i = WheelSlots_t::SLOT_FIRST; i <= WheelSlots_t::SLOT_LAST; ++i) { totalPoints -= getPointsBySlotType(static_cast<WheelSlots_t>(i)); } @@ -684,19 +889,22 @@ uint16_t PlayerWheel::getUnusedPoints() const { } bool PlayerWheel::getSpellAdditionalArea(const std::string &spellName) const { - auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); + const auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); if (stage == 0) { return false; } - auto vocationEnum = m_player.getPlayerVocationEnum(); + const auto vocationEnum = m_player.getPlayerVocationEnum(); if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { return checkSpellArea(g_game().getIOWheel()->getWheelBonusData().spells.knight, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { return checkSpellArea(g_game().getIOWheel()->getWheelBonusData().spells.paladin, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { return checkSpellArea(g_game().getIOWheel()->getWheelBonusData().spells.druid, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { return checkSpellArea(g_game().getIOWheel()->getWheelBonusData().spells.sorcerer, spellName, stage); } @@ -704,19 +912,22 @@ bool PlayerWheel::getSpellAdditionalArea(const std::string &spellName) const { } int PlayerWheel::getSpellAdditionalTarget(const std::string &spellName) const { - auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); + const auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); if (stage == 0) { return 0; } - auto vocationEnum = m_player.getPlayerVocationEnum(); + const auto vocationEnum = m_player.getPlayerVocationEnum(); if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { return checkSpellAdditionalTarget(g_game().getIOWheel()->getWheelBonusData().spells.knight, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { return checkSpellAdditionalTarget(g_game().getIOWheel()->getWheelBonusData().spells.paladin, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { return checkSpellAdditionalTarget(g_game().getIOWheel()->getWheelBonusData().spells.druid, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { return checkSpellAdditionalTarget(g_game().getIOWheel()->getWheelBonusData().spells.sorcerer, spellName, stage); } @@ -724,19 +935,22 @@ int PlayerWheel::getSpellAdditionalTarget(const std::string &spellName) const { } int PlayerWheel::getSpellAdditionalDuration(const std::string &spellName) const { - auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); + const auto stage = static_cast<uint8_t>(getSpellUpgrade(spellName)); if (stage == 0) { return 0; } - auto vocationEnum = m_player.getPlayerVocationEnum(); + const auto vocationEnum = m_player.getPlayerVocationEnum(); if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { return checkSpellAdditionalDuration(g_game().getIOWheel()->getWheelBonusData().spells.knight, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { return checkSpellAdditionalDuration(g_game().getIOWheel()->getWheelBonusData().spells.paladin, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { return checkSpellAdditionalDuration(g_game().getIOWheel()->getWheelBonusData().spells.druid, spellName, stage); - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + } + if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { return checkSpellAdditionalDuration(g_game().getIOWheel()->getWheelBonusData().spells.sorcerer, spellName, stage); } @@ -746,15 +960,15 @@ int PlayerWheel::getSpellAdditionalDuration(const std::string &spellName) const void PlayerWheel::addPromotionScrolls(NetworkMessage &msg) const { std::vector<uint16_t> unlockedScrolls; - for (const auto &scroll : WheelOfDestinyPromotionScrolls) { + for (const auto &[itemId, name, extraPoints] : WheelOfDestinyPromotionScrolls) { const auto &scrollKv = m_player.kv()->scoped("wheel-of-destiny")->scoped("scrolls"); if (!scrollKv) { continue; } - auto scrollOpt = scrollKv->get(scroll.name); + const auto scrollOpt = scrollKv->get(name); if (scrollOpt && scrollOpt->get<bool>()) { - unlockedScrolls.push_back(scroll.itemId); + unlockedScrolls.emplace_back(itemId); } } @@ -768,18 +982,38 @@ std::shared_ptr<KV> PlayerWheel::gemsKV() const { return m_player.kv()->scoped("wheel-of-destiny")->scoped("gems"); } +std::shared_ptr<KV> PlayerWheel::gemsGradeKV(WheelFragmentType_t type, uint8_t pos) const { + return gemsKV()->scoped(std::string(magic_enum::enum_name(type)))->scoped(std::to_string(pos)); +} + +uint8_t PlayerWheel::getGemGrade(WheelFragmentType_t type, uint8_t pos) const { + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(type, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = static_cast<uint8_t>(gradeKV->get<IntType>()); + } + return grade; +} + std::vector<PlayerWheelGem> PlayerWheel::getRevealedGems() const { std::vector<PlayerWheelGem> unlockedGems; - auto unlockedGemUUIDs = gemsKV()->scoped("revealed")->keys(); + const auto unlockedGemUUIDs = gemsKV()->scoped("revealed")->keys(); if (unlockedGemUUIDs.empty()) { return unlockedGems; } + std::vector<std::string> sortedUnlockedGemGUIDs; for (const auto &uuid : unlockedGemUUIDs) { - sortedUnlockedGemGUIDs.push_back(uuid); + sortedUnlockedGemGUIDs.emplace_back(uuid); } + std::sort(sortedUnlockedGemGUIDs.begin(), sortedUnlockedGemGUIDs.end(), [](const std::string &a, const std::string &b) { - return std::stoull(a) < std::stoull(b); + if (std::ranges::all_of(a, ::isdigit) && std::ranges::all_of(b, ::isdigit)) { + return std::stoull(a) < std::stoull(b); + } else { + return a < b; + } }); for (const auto &uuid : sortedUnlockedGemGUIDs) { @@ -787,14 +1021,14 @@ std::vector<PlayerWheelGem> PlayerWheel::getRevealedGems() const { if (gem.uuid.empty()) { continue; } - unlockedGems.push_back(gem); + unlockedGems.emplace_back(gem); } return unlockedGems; } std::vector<PlayerWheelGem> PlayerWheel::getActiveGems() const { std::vector<PlayerWheelGem> activeGems; - for (auto affinity : magic_enum::enum_values<WheelGemAffinity_t>()) { + for (const auto &affinity : magic_enum::enum_values<WheelGemAffinity_t>()) { std::string key(magic_enum::enum_name(affinity)); auto uuidKV = gemsKV()->scoped("active")->get(key); if (!uuidKV.has_value()) { @@ -809,7 +1043,7 @@ std::vector<PlayerWheelGem> PlayerWheel::getActiveGems() const { if (gem.uuid.empty()) { continue; } - activeGems.push_back(gem); + activeGems.emplace_back(gem); } return activeGems; } @@ -829,7 +1063,7 @@ uint64_t PlayerWheel::getGemRotateCost(WheelGemQuality_t quality) { default: return 0; } - return static_cast<uint64_t>(g_configManager().getNumber(key, __FUNCTION__)); + return static_cast<uint64_t>(g_configManager().getNumber(key)); } uint64_t PlayerWheel::getGemRevealCost(WheelGemQuality_t quality) { @@ -847,10 +1081,10 @@ uint64_t PlayerWheel::getGemRevealCost(WheelGemQuality_t quality) { default: return 0; } - return static_cast<uint64_t>(g_configManager().getNumber(key, __FUNCTION__)); + return static_cast<uint64_t>(g_configManager().getNumber(key)); } -void PlayerWheel::revealGem(WheelGemQuality_t quality) { +void PlayerWheel::revealGem(WheelGemQuality_t quality) const { uint16_t gemId = m_player.getVocation()->getWheelGemId(quality); if (gemId == 0) { g_logger().error("[{}] Failed to get gem id for quality {} and vocation {}", __FUNCTION__, fmt::underlying(quality), m_player.getVocation()->getVocName()); @@ -869,7 +1103,7 @@ void PlayerWheel::revealGem(WheelGemQuality_t quality) { g_logger().error("[{}] Failed to remove gem with id {} from player with name {}", __FUNCTION__, gemId, m_player.getName()); return; } - auto supremeModifiers = m_player.getVocation()->getSupremeGemModifiers(); + const auto supremeModifiers = m_player.getVocation()->getSupremeGemModifiers(); PlayerWheelGem gem; gem.uuid = KV::generateUUID(); gem.locked = false; @@ -889,7 +1123,7 @@ void PlayerWheel::revealGem(WheelGemQuality_t quality) { sendOpenWheelWindow(m_player.getID()); } -PlayerWheelGem PlayerWheel::getGem(uint8_t index) const { +PlayerWheelGem PlayerWheel::getGem(uint16_t index) const { auto gems = getRevealedGems(); if (gems.size() <= index) { g_logger().error("[{}] Player {} trying to get gem with index {} but has only {} gems", __FUNCTION__, m_player.getName(), index, gems.size()); @@ -907,9 +1141,9 @@ PlayerWheelGem PlayerWheel::getGem(const std::string &uuid) const { return gem; } -uint8_t PlayerWheel::getGemIndex(const std::string &uuid) const { - auto gems = getRevealedGems(); - for (uint8_t i = 0; i < gems.size(); ++i) { +uint16_t PlayerWheel::getGemIndex(const std::string &uuid) const { + const auto gems = getRevealedGems(); + for (uint16_t i = 0; i < gems.size(); ++i) { if (gems[i].uuid == uuid) { return i; } @@ -918,17 +1152,62 @@ uint8_t PlayerWheel::getGemIndex(const std::string &uuid) const { return 0xFF; } -void PlayerWheel::destroyGem(uint8_t index) { - auto gem = getGem(index); +void PlayerWheel::destroyGem(uint16_t index) const { + const auto gem = getGem(index); if (gem.locked) { - g_logger().error("[{}] Player {} trying to destroy locked gem with index {}", __FUNCTION__, m_player.getName(), index); + g_logger().error("[{}] Player {} destroyed locked gem with index {}", std::source_location::current().function_name(), m_player.getName(), index); return; } + + const auto &backpack = m_player.getInventoryItem(CONST_SLOT_BACKPACK); + const auto &mainBackpack = backpack ? backpack->getContainer() : nullptr; + + uint8_t lesserFragments = 0; + uint8_t greaterFragments = 0; + + switch (gem.quality) { + case WheelGemQuality_t::Lesser: + lesserFragments = normal_random(1, 5); + break; + case WheelGemQuality_t::Regular: + lesserFragments = normal_random(2, 10); + break; + case WheelGemQuality_t::Greater: + greaterFragments = normal_random(1, 5); + break; + } + + if (lesserFragments > 0) { + const auto &fragmentsItem = Item::CreateItem(ITEM_LESSER_FRAGMENT, lesserFragments); + auto returnValue = g_game().internalPlayerAddItem(m_player.getPlayer(), fragmentsItem, false, CONST_SLOT_WHEREEVER); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("Failed to add {} lesser fragments to player with name {}", lesserFragments, m_player.getName()); + m_player.sendCancelMessage(getReturnMessage(RETURNVALUE_CONTACTADMINISTRATOR)); + return; + } + g_logger().debug("[{}] Player {} destroyed a gem and received {} lesser fragments", std::source_location::current().function_name(), m_player.getName(), lesserFragments); + } + + if (greaterFragments > 0) { + const auto &fragmentsItem = Item::CreateItem(ITEM_GREATER_FRAGMENT, greaterFragments); + auto returnValue = g_game().internalPlayerAddItem(m_player.getPlayer(), fragmentsItem, false, CONST_SLOT_BACKPACK); + if (returnValue != RETURNVALUE_NOERROR) { + g_logger().error("Failed to add {} greater fragments to player with name {}", greaterFragments, m_player.getName()); + m_player.sendCancelMessage(getReturnMessage(RETURNVALUE_CONTACTADMINISTRATOR)); + return; + } + g_logger().debug("[{}] Player {} destroyed a gem and received {} greater fragments", std::source_location::current().function_name(), m_player.getName(), greaterFragments); + } + gem.remove(gemsKV()); + + m_player.client->sendResourceBalance(RESOURCE_LESSER_FRAGMENT, m_player.getItemTypeCount(ITEM_LESSER_FRAGMENT)); + m_player.client->sendResourceBalance(RESOURCE_GREATER_FRAGMENT, m_player.getItemTypeCount(ITEM_GREATER_FRAGMENT)); + sendOpenWheelWindow(m_player.getID()); } -void PlayerWheel::switchGemDomain(uint8_t index) { +void PlayerWheel::switchGemDomain(uint16_t index) const { auto gem = getGem(index); if (gem.locked) { g_logger().error("[{}] Player {} trying to destroy locked gem with index {}", __FUNCTION__, m_player.getName(), index); @@ -946,15 +1225,15 @@ void PlayerWheel::switchGemDomain(uint8_t index) { sendOpenWheelWindow(m_player.getID()); } -void PlayerWheel::toggleGemLock(uint8_t index) { +void PlayerWheel::toggleGemLock(uint16_t index) const { auto gem = getGem(index); gem.locked = !gem.locked; gem.save(gemsKV()); sendOpenWheelWindow(m_player.getID()); } -void PlayerWheel::setActiveGem(WheelGemAffinity_t affinity, uint8_t index) { - auto gem = getGem(index); +void PlayerWheel::setActiveGem(WheelGemAffinity_t affinity, uint16_t index) const { + const auto gem = getGem(index); if (gem.uuid.empty()) { g_logger().error("[{}] Failed to load gem with index {}", __FUNCTION__, index); return; @@ -963,35 +1242,31 @@ void PlayerWheel::setActiveGem(WheelGemAffinity_t affinity, uint8_t index) { g_logger().error("[{}] Gem with index {} has affinity {} but trying to set it to {}", __FUNCTION__, index, fmt::underlying(gem.affinity), fmt::underlying(affinity)); return; } - std::string key(magic_enum::enum_name(affinity)); + const std::string key(magic_enum::enum_name(affinity)); gemsKV()->scoped("active")->set(key, gem.uuid); } -void PlayerWheel::removeActiveGem(WheelGemAffinity_t affinity) { - std::string key(magic_enum::enum_name(affinity)); +void PlayerWheel::removeActiveGem(WheelGemAffinity_t affinity) const { + const std::string key(magic_enum::enum_name(affinity)); gemsKV()->scoped("active")->remove(key); } void PlayerWheel::addGems(NetworkMessage &msg) const { - auto activeGems = getActiveGems(); + const auto activeGems = getActiveGems(); msg.addByte(activeGems.size()); g_logger().debug("[{}] Player {} has {} active gems", __FUNCTION__, m_player.getName(), activeGems.size()); for (const auto &gem : activeGems) { auto index = getGemIndex(gem.uuid); g_logger().debug("[{}] Adding active gem: {} with index {}", __FUNCTION__, gem.toString(), index); - msg.addByte(getGemIndex(gem.uuid)); + msg.add<uint16_t>(getGemIndex(gem.uuid)); } - auto revealedGems = getRevealedGems(); - if (revealedGems.size() > 225) { - g_logger().error("[{}] Player {} has more than 225 gems unlocked", __FUNCTION__, m_player.getName()); - revealedGems.resize(225); - } - msg.addByte(revealedGems.size()); - int index = 0; + const auto revealedGems = getRevealedGems(); + msg.add<uint16_t>(revealedGems.size()); + uint16_t index = 0; for (const auto &gem : revealedGems) { g_logger().debug("[{}] Adding revealed gem: {}", __FUNCTION__, gem.toString()); - msg.addByte(index++); + msg.add<uint16_t>(index++); msg.addByte(gem.locked); msg.addByte(static_cast<uint8_t>(gem.affinity)); msg.addByte(static_cast<uint8_t>(gem.quality)); @@ -1005,19 +1280,129 @@ void PlayerWheel::addGems(NetworkMessage &msg) const { } } -void PlayerWheel::sendOpenWheelWindow(NetworkMessage &msg, uint32_t ownerId) const { +void PlayerWheel::addGradeModifiers(NetworkMessage &msg) const { + msg.addByte(0x2E); // Modifiers for all Vocations + for (const auto &modPosition : modsBasicPosition) { + const auto pos = static_cast<uint8_t>(modPosition); + msg.addByte(pos); + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(WheelFragmentType_t::Lesser, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = static_cast<uint8_t>(gradeKV->get<IntType>()); + } + msg.addByte(grade); + } + + msg.addByte(0x17); // Modifiers for specific per Vocations + + const auto vocationBaseId = m_player.getVocation()->getBaseId(); + const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId); + + if (modsSupremeIt != modsSupremePositionByVocation.end()) { + for (const auto &modPosition : modsSupremeIt->second.get()) { + const auto pos = static_cast<uint8_t>(modPosition); + msg.addByte(pos); + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = gradeKV->get<IntType>(); + } + msg.addByte(grade); + } + } else { + g_logger().error("[{}] vocation base id: {}", std::source_location::current().function_name(), m_player.getVocation()->getBaseId()); + } +} + +void PlayerWheel::improveGemGrade(WheelFragmentType_t fragmentType, uint8_t pos) { + uint16_t fragmentId = 0; + uint32_t value = 0; + uint8_t quantity = 0; + uint8_t grade = 0; + + auto gradeKV = gemsGradeKV(fragmentType, pos)->get("grade"); + if (gradeKV.has_value()) { + grade = gradeKV->get<IntType>(); + } + + ++grade; + + switch (fragmentType) { + case WheelFragmentType_t::Lesser: + fragmentId = ITEM_LESSER_FRAGMENT; + std::tie(value, quantity) = getLesserGradeCost(grade); + break; + case WheelFragmentType_t::Greater: + fragmentId = ITEM_GREATER_FRAGMENT; + std::tie(value, quantity) = getGreaterGradeCost(grade); + break; + default: + g_logger().error("[{}] Invalid Fragment Type: {}", std::source_location::current().function_name(), static_cast<uint8_t>(fragmentType)); + return; + } + + if (!m_player.hasItemCountById(fragmentId, quantity, false)) { + g_logger().error("[{}] Player {} does not have the required {} fragments with id {}", __FUNCTION__, m_player.getName(), quantity, fragmentId); + return; + } + + if (!g_game().removeMoney(m_player.getPlayer(), value, 0, true)) { + g_logger().error("[{}] Failed to remove {} gold from player {}", std::source_location::current().function_name(), value, m_player.getName()); + return; + } + + if (!m_player.removeItemCountById(fragmentId, quantity, false)) { + g_logger().error("[{}] Failed to remove {} fragments with id {} from player {}", std::source_location::current().function_name(), quantity, fragmentId, m_player.getName()); + return; + } + + gemsGradeKV(fragmentType, pos)->set("grade", grade); + loadPlayerBonusData(); + sendOpenWheelWindow(m_player.getID()); +} + +std::tuple<int, int> PlayerWheel::getLesserGradeCost(uint8_t grade) const { + switch (grade) { + case 1: + return std::make_tuple(2000000, 5); + case 2: + return std::make_tuple(5000000, 15); + case 3: + return std::make_tuple(30000000, 30); + default: + throw std::invalid_argument("Invalid level for Lesser Fragment."); + } +} + +std::tuple<int, int> PlayerWheel::getGreaterGradeCost(uint8_t grade) const { + switch (grade) { + case 1: + return std::make_tuple(5000000, 5); + case 2: + return std::make_tuple(12000000, 15); + case 3: + return std::make_tuple(75000000, 30); + default: + throw std::invalid_argument("Invalid level for Greater Fragment."); + } +} + +void PlayerWheel::sendOpenWheelWindow(NetworkMessage &msg, uint32_t ownerId) { if (m_player.client && m_player.client->oldProtocol) { return; } msg.addByte(0x5F); - bool canUse = canOpenWheel(); + const bool canUse = canOpenWheel(); msg.add<uint32_t>(ownerId); // Player ID msg.addByte(canUse ? 1 : 0); // Can Use if (!canUse) { return; } + addInitialGems(); msg.addByte(getOptions(ownerId)); // Options msg.addByte(m_player.getPlayerVocationEnum()); // Vocation id @@ -1028,13 +1413,21 @@ void PlayerWheel::sendOpenWheelWindow(NetworkMessage &msg, uint32_t ownerId) con } addPromotionScrolls(msg); addGems(msg); + addGradeModifiers(msg); // TODO: read items from inventory - auto voc = m_player.getVocation(); + const auto &voc = m_player.getVocation(); + if (!voc) { + g_logger().error("[{}] Failed to get vocation for player {}", __FUNCTION__, m_player.getName()); + return; + } + m_player.client->sendResourceBalance(RESOURCE_BANK, m_player.getBankBalance()); m_player.client->sendResourceBalance(RESOURCE_INVENTORY_MONEY, m_player.getMoney()); m_player.client->sendResourceBalance(RESOURCE_LESSER_GEMS, m_player.getItemTypeCount(voc->getWheelGemId(WheelGemQuality_t::Lesser))); m_player.client->sendResourceBalance(RESOURCE_REGULAR_GEMS, m_player.getItemTypeCount(voc->getWheelGemId(WheelGemQuality_t::Regular))); m_player.client->sendResourceBalance(RESOURCE_GREATER_GEMS, m_player.getItemTypeCount(voc->getWheelGemId(WheelGemQuality_t::Greater))); + m_player.client->sendResourceBalance(RESOURCE_LESSER_FRAGMENT, m_player.getItemTypeCount(ITEM_LESSER_FRAGMENT)); + m_player.client->sendResourceBalance(RESOURCE_GREATER_FRAGMENT, m_player.getItemTypeCount(ITEM_GREATER_FRAGMENT)); } void PlayerWheel::sendGiftOfLifeCooldown() const { @@ -1066,7 +1459,7 @@ bool PlayerWheel::checkSavePointsBySlotType(WheelSlots_t slotType, uint16_t poin setPointsBySlotType(static_cast<uint8_t>(slotType), 0); - auto unusedPoints = getUnusedPoints(); + const auto unusedPoints = getUnusedPoints(); if (points > unusedPoints) { return false; } @@ -1078,7 +1471,7 @@ bool PlayerWheel::checkSavePointsBySlotType(WheelSlots_t slotType, uint16_t poin void PlayerWheel::saveSlotPointsHandleRetryErrors(std::vector<SlotInfo> &retryTable, int &errors) { std::vector<SlotInfo> temporaryTable; for (const auto &data : retryTable) { - auto saved = checkSavePointsBySlotType(static_cast<WheelSlots_t>(data.slot), data.points); + const auto saved = checkSavePointsBySlotType(static_cast<WheelSlots_t>(data.slot), data.points); if (saved) { errors--; } else { @@ -1112,13 +1505,13 @@ void PlayerWheel::saveSlotPointsOnPressSaveButton(NetworkMessage &msg) { return; } - auto order = g_game().getIOWheel()->getSlotPrioritaryOrder(static_cast<WheelSlots_t>(slot)); + const auto order = g_game().getIOWheel()->getSlotPrioritaryOrder(static_cast<WheelSlots_t>(slot)); if (order == -1) { continue; } // The slot information is then added to the vector in order. - sortedTable.push_back({ order, slot, slotPoints }); + sortedTable.emplace_back(order, slot, slotPoints); } // After iterating over all slots, the vector is sorted according to the slot order. @@ -1131,7 +1524,7 @@ void PlayerWheel::saveSlotPointsOnPressSaveButton(NetworkMessage &msg) { // Processes the vector in the correct order. If it is not possible to save points for a slot, for (const auto &data : sortedTable) { - auto canSave = checkSavePointsBySlotType(static_cast<WheelSlots_t>(data.slot), data.points); + const auto canSave = checkSavePointsBySlotType(static_cast<WheelSlots_t>(data.slot), data.points); if (!canSave) { sortedTableRetry.emplace_back(data); errors++; @@ -1155,20 +1548,18 @@ void PlayerWheel::saveSlotPointsOnPressSaveButton(NetworkMessage &msg) { } // Gem Vessels - for (auto affinity : magic_enum::enum_values<WheelGemAffinity_t>()) { - bool hasGem = msg.getByte(); + for (const auto &affinity : magic_enum::enum_values<WheelGemAffinity_t>()) { + const bool hasGem = msg.getByte(); if (!hasGem) { removeActiveGem(affinity); continue; } - uint8_t gemIndex = msg.getByte(); + const auto gemIndex = msg.get<uint16_t>(); setActiveGem(affinity, gemIndex); } - // Player's bonus data is loaded, initialized, and registered, and the function logs + // Player's bonus data is loaded, initialized, registered, and the function logs loadPlayerBonusData(); - initializePlayerData(); - registerPlayerBonusData(); g_logger().debug("Player: {} is saved the all slots info in: {} milliseconds", m_player.getName(), bm_saveSlot.duration()); } @@ -1178,14 +1569,14 @@ void PlayerWheel::saveSlotPointsOnPressSaveButton(NetworkMessage &msg) { */ void PlayerWheel::loadDBPlayerSlotPointsOnLogin() { auto resultString = fmt::format("SELECT `slot` FROM `player_wheeldata` WHERE `player_id` = {}", m_player.getGUID()); - DBResult_ptr result = Database::getInstance().storeQuery(resultString); + const DBResult_ptr &result = Database::getInstance().storeQuery(resultString); // Ignore if player not have nothing inserted in the table if (!result) { return; } unsigned long size; - auto attribute = result->getStream("slot", size); + const auto attribute = result->getStream("slot", size); PropStream propStream; propStream.init(attribute, size); for (size_t i = 0; i < size; i++) { @@ -1199,7 +1590,7 @@ void PlayerWheel::loadDBPlayerSlotPointsOnLogin() { } bool PlayerWheel::saveDBPlayerSlotPointsOnLogout() const { - Database &db = Database::getInstance(); + const Database &db = Database::getInstance(); std::ostringstream query; DBInsert insertWheelData("INSERT INTO `player_wheeldata` (`player_id`, `slot`) VALUES "); insertWheelData.upsert({ "slot" }); @@ -1219,7 +1610,7 @@ bool PlayerWheel::saveDBPlayerSlotPointsOnLogout() const { size_t attributesSize; const char* attributes = stream.getStream(attributesSize); if (attributesSize > 0) { - query << m_player.getGUID() << ',' << db.escapeBlob(attributes, (uint32_t)attributesSize); + query << m_player.getGUID() << ',' << db.escapeBlob(attributes, static_cast<uint32_t>(attributesSize)); if (!insertWheelData.addRow(query)) { g_logger().debug("[{}] failed to insert row data", __FUNCTION__); return false; @@ -1241,15 +1632,19 @@ uint16_t PlayerWheel::getExtraPoints() const { } uint16_t totalBonus = 0; - for (const auto &scroll : WheelOfDestinyPromotionScrolls) { + for (const auto &[itemId, name, extraPoints] : WheelOfDestinyPromotionScrolls) { + if (itemId == 0) { + continue; + } + const auto &scrollKv = m_player.kv()->scoped("wheel-of-destiny")->scoped("scrolls"); if (!scrollKv) { continue; } - auto scrollKV = scrollKv->get(scroll.name); + const auto scrollKV = scrollKv->get(name); if (scrollKV && scrollKV->get<bool>()) { - totalBonus += scroll.extraPoints; + totalBonus += extraPoints; } } @@ -1257,7 +1652,7 @@ uint16_t PlayerWheel::getExtraPoints() const { } uint16_t PlayerWheel::getWheelPoints(bool includeExtraPoints /* = true*/) const { - uint32_t level = m_player.getLevel(); + const uint32_t level = m_player.getLevel(); auto totalPoints = std::max(0u, (level - m_minLevelToStartCountPoints)) * m_pointsPerLevel; if (includeExtraPoints) { @@ -1268,6 +1663,35 @@ uint16_t PlayerWheel::getWheelPoints(bool includeExtraPoints /* = true*/) const return totalPoints; } +void PlayerWheel::addInitialGems() { + auto initialsGems = gemsKV()->get("initialGems"); + + if (!initialsGems.has_value()) { + for (auto gemAffinity : magic_enum::enum_values<WheelGemAffinity_t>()) { + for (auto gemQuality : magic_enum::enum_values<WheelGemQuality_t>()) { + if (gemQuality == WheelGemQuality_t::Greater) { + continue; + } + + PlayerWheelGem gem; + gem.uuid = KV::generateUUID(); + gem.locked = false; + gem.affinity = gemAffinity; + gem.quality = gemQuality; + + gem.basicModifier1 = wheelGemBasicSlot1Allowed[uniform_random(0, wheelGemBasicSlot1Allowed.size() - 1)]; + gem.basicModifier2 = {}; + gem.supremeModifier = {}; + if (gemQuality >= WheelGemQuality_t::Regular) { + gem.basicModifier2 = selectBasicModifier2(gem.basicModifier1); + } + gem.save(gemsKV()); + } + } + gemsKV()->set("initialGems", true); + } +} + bool PlayerWheel::canOpenWheel() const { // Vocation check if (m_player.getPlayerVocationEnum() == Vocation_t::VOCATION_NONE) { @@ -1302,7 +1726,7 @@ uint8_t PlayerWheel::getOptions(uint32_t ownerId) const { // Check if is in the temple range (we assume the temple is within the range of 10 sqms) if (m_player.getZoneType() == ZONE_PROTECTION) { - for (auto [townid, town] : g_game().map.towns.getTowns()) { + for (const auto &[townid, town] : g_game().map.towns.getTowns()) { if (Position::areInRange<1, 10>(town->getTemplePosition(), m_player.getPosition())) { return 1; } @@ -1346,8 +1770,13 @@ uint8_t PlayerWheel::getMaxPointsPerSlot(WheelSlots_t slot) const { return 0u; } -void PlayerWheel::resetPlayerBonusData() { +void PlayerWheel::resetPlayerData() { m_playerBonusData = PlayerWheelMethodsBonusData(); + + resetUpgradedSpells(); + resetResistance(); + resetStats(); + resetRevelationState(); } void PlayerWheel::initializePlayerData() { @@ -1355,7 +1784,6 @@ void PlayerWheel::initializePlayerData() { return; } - resetPlayerBonusData(); loadPlayerBonusData(); } @@ -1375,7 +1803,7 @@ void PlayerWheel::setPlayerCombatStats(CombatType_t type, int32_t leechAmount) { } } -void PlayerWheel::reloadPlayerData() { +void PlayerWheel::reloadPlayerData() const { // Maybe it's not really necessary, but it doesn't hurt to validate if (!m_player.getTile()) { return; @@ -1389,16 +1817,6 @@ void PlayerWheel::reloadPlayerData() { } void PlayerWheel::registerPlayerBonusData() { - resetUpgradedSpells(); - resetResistance(); - resetStats(); - resetRevelationBonus(); - if (!m_modifierContext) { - m_modifierContext = std::make_unique<WheelModifierContext>(*this, static_cast<Vocation_t>(m_player.getVocation()->getBaseId())); - } - m_modifierContext->resetStrategies(); - m_spellsBonuses.clear(); - addStat(WheelStat_t::HEALTH, m_playerBonusData.stats.health); addStat(WheelStat_t::MANA, m_playerBonusData.stats.mana); addStat(WheelStat_t::CAPACITY, m_playerBonusData.stats.capacity * 100); @@ -1406,28 +1824,6 @@ void PlayerWheel::registerPlayerBonusData() { addStat(WheelStat_t::DAMAGE, m_playerBonusData.stats.damage); addStat(WheelStat_t::HEALING, m_playerBonusData.stats.healing); - auto activeGems = getActiveGems(); - std::string playerName = m_player.getName(); - for (const auto &gem : activeGems) { - auto count = m_playerBonusData.unlockedVesselResonances[static_cast<uint8_t>(gem.affinity)]; - if (count >= 1) { - std::string modifierName(magic_enum::enum_name(gem.basicModifier1)); - g_logger().debug("[{}] Adding basic modifier 1 {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(gem.quality), magic_enum::enum_name(gem.affinity)); - m_modifierContext->addStrategies(gem.basicModifier1); - } - if (count >= 2 && gem.quality >= WheelGemQuality_t::Regular) { - std::string modifierName(magic_enum::enum_name(gem.basicModifier2)); - g_logger().debug("[{}] Adding basic modifier 2 {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(gem.quality), magic_enum::enum_name(gem.affinity)); - m_modifierContext->addStrategies(gem.basicModifier2); - } - if (count >= 3 && gem.quality >= WheelGemQuality_t::Greater) { - std::string modifierName(magic_enum::enum_name(gem.supremeModifier)); - g_logger().debug("[{}] Adding supreme modifier {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(gem.quality), magic_enum::enum_name(gem.affinity)); - m_modifierContext->addStrategies(gem.supremeModifier); - } - } - m_modifierContext->executeStrategies(); - // Skills addStat(WheelStat_t::MELEE, m_playerBonusData.skills.melee); addStat(WheelStat_t::DISTANCE, m_playerBonusData.skills.distance); @@ -1635,9 +2031,12 @@ void PlayerWheel::loadPlayerBonusData() { return; } + // Reset data to prevent stats from accumulating + resetPlayerData(); + // Initialize the relevant IOWheel data in the PlayerWheel loadDedicationAndConvictionPerks(); - loadRevelationPerks(); + registerPlayerBonusData(); printPlayerWheelMethodsBonusData(m_playerBonusData); @@ -1665,12 +2064,12 @@ void PlayerWheel::printPlayerWheelMethodsBonusData(const PlayerWheelMethodsBonus g_logger().debug("Vessel Resonance:"); for (size_t i = 0; i < bonusData.unlockedVesselResonances.size(); ++i) { - auto count = bonusData.unlockedVesselResonances[i]; + const auto count = bonusData.unlockedVesselResonances[i]; if (count == 0) { continue; } - WheelGemAffinity_t affinity = static_cast<WheelGemAffinity_t>(i); + const auto affinity = static_cast<WheelGemAffinity_t>(i); std::string affinityName(magic_enum::enum_name(affinity)); g_logger().debug(" Affinity: {} count: {}", affinityName, bonusData.unlockedVesselResonances[i]); } @@ -1760,6 +2159,10 @@ void PlayerWheel::printPlayerWheelMethodsBonusData(const PlayerWheelMethodsBonus g_logger().debug(" storm: {}", bonusData.avatar.storm); } + if (bonusData.momentum > 0) { + g_logger().debug("bonus: {}", bonusData.momentum); + } + if (bonusData.mitigation > 0) { g_logger().debug("mitigation: {}", bonusData.mitigation); } @@ -1778,13 +2181,13 @@ void PlayerWheel::printPlayerWheelMethodsBonusData(const PlayerWheelMethodsBonus void PlayerWheel::loadDedicationAndConvictionPerks() { using VocationBonusFunction = std::function<void(const std::shared_ptr<Player> &, uint16_t, uint8_t, PlayerWheelMethodsBonusData &)>; auto wheelFunctions = g_game().getIOWheel()->getWheelMapFunctions(); - auto vocationCipId = m_player.getPlayerVocationEnum(); + const auto vocationCipId = m_player.getPlayerVocationEnum(); if (vocationCipId < VOCATION_KNIGHT_CIP || vocationCipId > VOCATION_DRUID_CIP) { return; } for (uint8_t i = WheelSlots_t::SLOT_FIRST; i <= WheelSlots_t::SLOT_LAST; ++i) { - uint16_t points = getPointsBySlotType(static_cast<WheelSlots_t>(i)); + const uint16_t points = getPointsBySlotType(static_cast<WheelSlots_t>(i)); if (points > 0) { VocationBonusFunction internalData = nullptr; auto it = wheelFunctions.find(static_cast<WheelSlots_t>(i)); @@ -1803,108 +2206,155 @@ void PlayerWheel::addSpellToVector(const std::string &spellName) { } void PlayerWheel::loadRevelationPerks() { - // Stats (Damage and Healing) - WheelStageEnum_t greenStage = getPlayerSliceStage("green"); - if (greenStage != WheelStageEnum_t::NONE) { - auto [statsDamage, statsHealing] = g_game().getIOWheel()->getRevelationStatByStage(greenStage); - m_playerBonusData.stats.damage += statsDamage; - m_playerBonusData.stats.healing += statsHealing; - m_playerBonusData.stages.giftOfLife = static_cast<int>(greenStage); - } - - WheelStageEnum_t redStageEnum = getPlayerSliceStage("red"); - if (redStageEnum != WheelStageEnum_t::NONE) { - auto [statsDamage, statsHealing] = g_game().getIOWheel()->getRevelationStatByStage(redStageEnum); - m_playerBonusData.stats.damage += statsDamage; - m_playerBonusData.stats.healing += statsHealing; - - auto redStageValue = static_cast<uint8_t>(redStageEnum); - auto vocationEnum = m_player.getPlayerVocationEnum(); - if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { - m_playerBonusData.stages.blessingOfTheGrove = redStageValue; - } else if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { - m_playerBonusData.stages.executionersThrow = redStageValue; - for (uint8_t i = 0; i < redStageValue; ++i) { - addSpellToVector("Executioner's Throw"); - } - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { - m_playerBonusData.stages.beamMastery = redStageValue; - for (uint8_t i = 0; i < redStageValue; ++i) { - addSpellToVector("Great Death Beam"); - } - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { - m_playerBonusData.stages.divineGrenade = redStageValue; - for (uint8_t i = 0; i < redStageValue; ++i) { - addSpellToVector("Divine Grenade"); - } + processActiveGems(); + applyStageBonuses(); +} + +void PlayerWheel::resetRevelationState() { + // First we reset the information + resetRevelationBonus(); + if (!m_modifierContext) { + m_modifierContext = std::make_unique<WheelModifierContext>(*this, static_cast<Vocation_t>(m_player.getVocation()->getBaseId())); + } + m_modifierContext->resetStrategies(); + m_spellsBonuses.clear(); +} + +void PlayerWheel::processActiveGems() { + auto activeGems = getActiveGems(); + std::string playerName = m_player.getName(); + for (const auto &[uuid, locked, affinity, quality, basicModifier1, basicModifier2, supremeModifier] : activeGems) { + if (uuid.empty()) { + g_logger().error("[{}] Player {} has an empty gem uuid", __FUNCTION__, playerName); + continue; + } + + auto count = m_playerBonusData.unlockedVesselResonances[static_cast<uint8_t>(affinity)]; + if (count >= 1) { + uint8_t grade = getGemGrade(WheelFragmentType_t::Lesser, static_cast<uint8_t>(basicModifier1)); + std::string modifierName(magic_enum::enum_name(basicModifier1)); + g_logger().debug("[{}] Adding basic modifier 1 {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(quality), magic_enum::enum_name(affinity)); + m_modifierContext->addStrategies(basicModifier1, grade); + } + if (count >= 2 && quality >= WheelGemQuality_t::Regular) { + uint8_t grade = getGemGrade(WheelFragmentType_t::Lesser, static_cast<uint8_t>(basicModifier2)); + std::string modifierName(magic_enum::enum_name(basicModifier2)); + g_logger().debug("[{}] Adding basic modifier 2 {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(quality), magic_enum::enum_name(affinity)); + m_modifierContext->addStrategies(basicModifier2, grade); + } + if (count >= 3 && quality >= WheelGemQuality_t::Greater) { + uint8_t grade = getGemGrade(WheelFragmentType_t::Greater, static_cast<uint8_t>(supremeModifier)); + std::string modifierName(magic_enum::enum_name(supremeModifier)); + g_logger().info("[{}] Adding supreme modifier {} to player {} from {} gem affinity {}", __FUNCTION__, modifierName, playerName, magic_enum::enum_name(quality), magic_enum::enum_name(affinity)); + m_modifierContext->addStrategies(supremeModifier, grade); } } - WheelStageEnum_t purpleStageEnum = getPlayerSliceStage("purple"); - if (purpleStageEnum != WheelStageEnum_t::NONE) { - auto [statsDamage, statsHealing] = g_game().getIOWheel()->getRevelationStatByStage(purpleStageEnum); - m_playerBonusData.stats.damage += statsDamage; - m_playerBonusData.stats.healing += statsHealing; + g_logger().debug("[{}] active gems: {} ", __FUNCTION__, activeGems.size()); + m_modifierContext->executeStrategies(); +} - auto purpleStage = static_cast<uint8_t>(purpleStageEnum); - auto vocationEnum = m_player.getPlayerVocationEnum(); - if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { - m_playerBonusData.avatar.steel = purpleStage; - for (uint8_t i = 0; i < purpleStage; ++i) { - addSpellToVector("Avatar of Steel"); - } - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { - m_playerBonusData.avatar.light = purpleStage; - for (uint8_t i = 0; i < purpleStage; ++i) { - addSpellToVector("Avatar of Light"); - } - } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { - m_playerBonusData.avatar.nature = purpleStage; - for (uint8_t i = 0; i < purpleStage; ++i) { - addSpellToVector("Avatar of Nature"); - } - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { - m_playerBonusData.avatar.storm = purpleStage; - for (uint8_t i = 0; i < purpleStage; ++i) { - addSpellToVector("Avatar of Storm"); - } +void PlayerWheel::applyStageBonuses() { + applyStageBonusForColor("green"); + applyStageBonusForColor("red"); + applyStageBonusForColor("purple"); + applyStageBonusForColor("blue"); +} + +void PlayerWheel::applyStageBonusForColor(const std::string &color) { + WheelStageEnum_t stageEnum = getPlayerSliceStage(color); + if (stageEnum == WheelStageEnum_t::NONE) { + return; + } + + auto [statsDamage, statsHealing] = g_game().getIOWheel()->getRevelationStatByStage(stageEnum); + m_playerBonusData.stats.damage += statsDamage; + m_playerBonusData.stats.healing += statsHealing; + + auto stageValue = static_cast<uint8_t>(stageEnum); + auto vocationEnum = static_cast<Vocation_t>(m_player.getPlayerVocationEnum()); + if (color == "green") { + m_playerBonusData.stages.giftOfLife = stageValue; + } else if (color == "red") { + applyRedStageBonus(stageValue, vocationEnum); + } else if (color == "purple") { + applyPurpleStageBonus(stageValue, vocationEnum); + } else if (color == "blue") { + applyBlueStageBonus(stageValue, vocationEnum); + } +} + +void PlayerWheel::applyRedStageBonus(uint8_t stageValue, Vocation_t vocationEnum) { + if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + m_playerBonusData.stages.blessingOfTheGrove = stageValue; + } else if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { + m_playerBonusData.stages.executionersThrow = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Executioner's Throw"); + } + } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + m_playerBonusData.stages.beamMastery = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Great Death Beam"); + } + } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + m_playerBonusData.stages.divineGrenade = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Divine Grenade"); } } +} - WheelStageEnum_t blueStageEnum = getPlayerSliceStage("blue"); - if (blueStageEnum != WheelStageEnum_t::NONE) { - auto [statsDamage, statsHealing] = g_game().getIOWheel()->getRevelationStatByStage(blueStageEnum); - m_playerBonusData.stats.damage += statsDamage; - m_playerBonusData.stats.healing += statsHealing; +void PlayerWheel::applyPurpleStageBonus(uint8_t stageValue, Vocation_t vocationEnum) { + if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { + m_playerBonusData.avatar.steel = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Avatar of Steel"); + } + } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + m_playerBonusData.avatar.light = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Avatar of Light"); + } + } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + m_playerBonusData.avatar.nature = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Avatar of Nature"); + } + } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + m_playerBonusData.avatar.storm = stageValue; + for (uint8_t i = 0; i < stageValue; ++i) { + addSpellToVector("Avatar of Storm"); + } + } +} - auto blueStage = static_cast<uint8_t>(blueStageEnum); - auto vocationEnum = m_player.getPlayerVocationEnum(); - if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { - m_playerBonusData.stages.combatMastery = blueStage; - } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { - m_playerBonusData.stages.drainBody = blueStage; - for (uint8_t i = 0; i <= blueStage; ++i) { - addSpellToVector("Drain_Body_Spells"); - } - } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { - m_playerBonusData.stages.divineEmpowerment = blueStage; - for (uint8_t i = 0; i <= blueStage; ++i) { - addSpellToVector("Divine Empowerment"); - } - } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { - m_playerBonusData.stages.twinBurst = blueStage; - for (uint8_t i = 1; i <= blueStage; ++i) { - addSpellToVector("Twin Burst"); - addSpellToVector("Terra Burst"); - addSpellToVector("Ice Burst"); - } +void PlayerWheel::applyBlueStageBonus(uint8_t stageValue, Vocation_t vocationEnum) { + if (vocationEnum == Vocation_t::VOCATION_KNIGHT_CIP) { + m_playerBonusData.stages.combatMastery = stageValue; + } else if (vocationEnum == Vocation_t::VOCATION_SORCERER_CIP) { + m_playerBonusData.stages.drainBody = stageValue; + for (uint8_t i = 0; i <= stageValue; ++i) { + addSpellToVector("Drain_Body_Spells"); + } + } else if (vocationEnum == Vocation_t::VOCATION_PALADIN_CIP) { + m_playerBonusData.stages.divineEmpowerment = stageValue; + for (uint8_t i = 0; i <= stageValue; ++i) { + addSpellToVector("Divine Empowerment"); + } + } else if (vocationEnum == Vocation_t::VOCATION_DRUID_CIP) { + m_playerBonusData.stages.twinBurst = stageValue; + for (uint8_t i = 1; i <= stageValue; ++i) { + addSpellToVector("Twin Burst"); + addSpellToVector("Terra Burst"); + addSpellToVector("Ice Burst"); } } } WheelStageEnum_t PlayerWheel::getPlayerSliceStage(const std::string &color) const { std::vector<WheelSlots_t> slots; - WheelGemAffinity_t affinity = WheelGemAffinity_t::Green; + auto affinity = WheelGemAffinity_t::Green; if (color == "green") { affinity = WheelGemAffinity_t::Green; slots = { @@ -1965,13 +2415,42 @@ WheelStageEnum_t PlayerWheel::getPlayerSliceStage(const std::string &color) cons for (const auto &slot : slots) { totalPoints += getPointsBySlotType(slot); } - totalPoints += m_bonusRevelationPoints[static_cast<uint8_t>(affinity)]; + + auto affinityNumber = static_cast<uint8_t>(affinity); + if (affinityNumber < m_bonusRevelationPoints.size()) { + auto bonusRevelationPoints = m_bonusRevelationPoints[affinityNumber]; + if (bonusRevelationPoints > 0) { + totalPoints += bonusRevelationPoints; + g_logger().debug("[{}] Player: {}, has affinity: {}, revelation points: {} total points: {}, relations: {}", __FUNCTION__, m_player.getName(), magic_enum::enum_name(affinity), bonusRevelationPoints, totalPoints, m_bonusRevelationPoints.size()); + } + } + + const auto vocationBaseId = m_player.getVocation()->getBaseId(); + const auto modsSupremeIt = modsSupremePositionByVocation.find(vocationBaseId); + + if (modsSupremeIt != modsSupremePositionByVocation.end()) { + for (auto modPosition : modsSupremeIt->second.get()) { + const auto pos = static_cast<uint8_t>(modPosition); + uint8_t grade = 0; + auto gradeKV = gemsGradeKV(WheelFragmentType_t::Greater, pos)->get("grade"); + + if (gradeKV.has_value()) { + grade = gradeKV->get<IntType>(); + } + + totalPoints += grade == 3 ? 1 : 0; + } + } else { + g_logger().error("[{}] supreme modifications not found for vocation base id: {}", std::source_location::current().function_name(), vocationBaseId); + } if (totalPoints >= static_cast<int>(WheelStagePointsEnum_t::THREE)) { return WheelStageEnum_t::THREE; - } else if (totalPoints >= static_cast<int>(WheelStagePointsEnum_t::TWO)) { + } + if (totalPoints >= static_cast<int>(WheelStagePointsEnum_t::TWO)) { return WheelStageEnum_t::TWO; - } else if (totalPoints >= static_cast<uint8_t>(WheelStagePointsEnum_t::ONE)) { + } + if (totalPoints >= static_cast<uint8_t>(WheelStagePointsEnum_t::ONE)) { return WheelStageEnum_t::ONE; } @@ -2018,12 +2497,12 @@ bool PlayerWheel::checkBattleInstinct() { m_player.getPosition().y + offsetY, m_player.getPosition().z ); - std::shared_ptr<Tile> tile = g_game().map.getTile(playerPositionOffSet); + const auto &tile = g_game().map.getTile(playerPositionOffSet); if (!tile) { continue; } - std::shared_ptr<Creature> creature = tile->getTopVisibleCreature(m_player.getPlayer()); + const auto &creature = tile->getTopVisibleCreature(m_player.getPlayer()); if (!creature || creature == m_player.getPlayer() || (creature->getMaster() && creature->getMaster()->getPlayer() == m_player.getPlayer())) { continue; } @@ -2035,8 +2514,8 @@ bool PlayerWheel::checkBattleInstinct() { if (creaturesNearby >= 5) { m_creaturesNearby = creaturesNearby; creaturesNearby -= 4; - uint16_t meleeSkill = 1 * creaturesNearby; - uint16_t shieldSkill = 6 * creaturesNearby; + const uint16_t meleeSkill = 1 * creaturesNearby; + const uint16_t shieldSkill = 6 * creaturesNearby; if (getMajorStat(WheelMajor_t::MELEE) != meleeSkill || getMajorStat(WheelMajor_t::SHIELD) != shieldSkill) { setMajorStat(WheelMajor_t::MELEE, meleeSkill); setMajorStat(WheelMajor_t::SHIELD, shieldSkill); @@ -2066,12 +2545,12 @@ bool PlayerWheel::checkPositionalTatics() { m_player.getPosition().y + offsetY, m_player.getPosition().z ); - std::shared_ptr<Tile> tile = g_game().map.getTile(playerPositionOffSet); + const auto &tile = g_game().map.getTile(playerPositionOffSet); if (!tile) { continue; } - std::shared_ptr<Creature> creature = tile->getTopVisibleCreature(m_player.getPlayer()); + const auto &creature = tile->getTopVisibleCreature(m_player.getPlayer()); if (!creature || creature == m_player.getPlayer() || !creature->getMonster() || (creature->getMaster() && creature->getMaster()->getPlayer())) { continue; } @@ -2080,8 +2559,8 @@ bool PlayerWheel::checkPositionalTatics() { break; } } - uint16_t magicSkill = 3; - uint16_t distanceSkill = 3; + constexpr uint16_t magicSkill = 3; + constexpr uint16_t distanceSkill = 3; if (creaturesNearby == 0) { m_creaturesNearby = creaturesNearby; if (getMajorStat(WheelMajor_t::DISTANCE) != distanceSkill) { @@ -2109,11 +2588,11 @@ bool PlayerWheel::checkPositionalTatics() { bool PlayerWheel::checkBallisticMastery() { setOnThinkTimer(WheelOnThink_t::BALLISTIC_MASTERY, OTSYS_TIME() + 2000); bool updateClient = false; - int32_t newCritical = 1000; - uint16_t newHolyBonus = 2; // 2% - uint16_t newPhysicalBonus = 2; // 2% + constexpr int32_t newCritical = 1000; + constexpr uint16_t newHolyBonus = 2; // 2% + constexpr uint16_t newPhysicalBonus = 2; // 2% - std::shared_ptr<Item> item = m_player.getWeapon(); + const auto &item = m_player.getWeapon(); if (item && item->getAmmoType() == AMMO_BOLT) { if (getMajorStat(WheelMajor_t::CRITICAL_DMG) != newCritical) { setMajorStat(WheelMajor_t::CRITICAL_DMG, newCritical); @@ -2152,9 +2631,9 @@ bool PlayerWheel::checkBallisticMastery() { bool PlayerWheel::checkCombatMastery() { setOnThinkTimer(WheelOnThink_t::COMBAT_MASTERY, OTSYS_TIME() + 2000); bool updateClient = false; - uint8_t stage = getStage(WheelStage_t::COMBAT_MASTERY); + const uint8_t stage = getStage(WheelStage_t::COMBAT_MASTERY); - std::shared_ptr<Item> item = m_player.getWeapon(); + const auto &item = m_player.getWeapon(); if (item && item->getSlotPosition() & SLOTP_TWO_HAND) { int32_t criticalSkill = 0; if (stage >= 3) { @@ -2199,12 +2678,12 @@ bool PlayerWheel::checkDivineEmpowerment() { bool updateClient = false; setOnThinkTimer(WheelOnThink_t::DIVINE_EMPOWERMENT, OTSYS_TIME() + 1000); - const auto tile = m_player.getTile(); + const auto &tile = m_player.getTile(); if (!tile) { return updateClient; } - const auto items = tile->getItemList(); + const auto &items = tile->getItemList(); if (!items) { return updateClient; } @@ -2219,7 +2698,7 @@ bool PlayerWheel::checkDivineEmpowerment() { } if (isOwner) { - uint8_t stage = getStage(WheelStage_t::DIVINE_EMPOWERMENT); + const uint8_t stage = getStage(WheelStage_t::DIVINE_EMPOWERMENT); if (stage >= 3) { damageBonus = 7; } else if (stage >= 2) { @@ -2237,13 +2716,13 @@ bool PlayerWheel::checkDivineEmpowerment() { return updateClient; } -int32_t PlayerWheel::checkDivineGrenade(std::shared_ptr<Creature> target) const { +int32_t PlayerWheel::checkDivineGrenade(const std::shared_ptr<Creature> &target) const { if (!target || target == m_player.getPlayer()) { return 0; } int32_t damageBonus = 0; - uint8_t stage = getStage(WheelStage_t::DIVINE_GRENADE); + const uint8_t stage = getStage(WheelStage_t::DIVINE_GRENADE); if (stage >= 3) { damageBonus = 100; @@ -2265,7 +2744,7 @@ void PlayerWheel::checkGiftOfLife() { g_game().addMagicEffect(m_player.getPosition(), CONST_ME_WATER_DROP); g_game().combatChangeHealth(m_player.getPlayer(), m_player.getPlayer(), giftDamage); // Condition cooldown reduction - uint16_t reductionTimer = 60000; + constexpr uint16_t reductionTimer = 60000; reduceAllSpellsCooldownTimer(reductionTimer); // Set cooldown @@ -2273,14 +2752,14 @@ void PlayerWheel::checkGiftOfLife() { sendGiftOfLifeCooldown(); } -int32_t PlayerWheel::checkBlessingGroveHealingByTarget(std::shared_ptr<Creature> target) const { +int32_t PlayerWheel::checkBlessingGroveHealingByTarget(const std::shared_ptr<Creature> &target) const { if (!target || target == m_player.getPlayer()) { return 0; } int32_t healingBonus = 0; - uint8_t stage = getStage(WheelStage_t::BLESSING_OF_THE_GROVE); - int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); + const uint8_t stage = getStage(WheelStage_t::BLESSING_OF_THE_GROVE); + const int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); if (healthPercent <= 30) { if (stage >= 3) { healingBonus = 24; @@ -2302,14 +2781,14 @@ int32_t PlayerWheel::checkBlessingGroveHealingByTarget(std::shared_ptr<Creature> return healingBonus; } -int32_t PlayerWheel::checkTwinBurstByTarget(std::shared_ptr<Creature> target) const { +int32_t PlayerWheel::checkTwinBurstByTarget(const std::shared_ptr<Creature> &target) const { if (!target || target == m_player.getPlayer()) { return 0; } int32_t damageBonus = 0; - uint8_t stage = getStage(WheelStage_t::TWIN_BURST); - int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); + const uint8_t stage = getStage(WheelStage_t::TWIN_BURST); + const int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); if (healthPercent > 60) { if (stage >= 3) { damageBonus = 60; @@ -2323,14 +2802,14 @@ int32_t PlayerWheel::checkTwinBurstByTarget(std::shared_ptr<Creature> target) co return damageBonus; } -int32_t PlayerWheel::checkExecutionersThrow(std::shared_ptr<Creature> target) const { +int32_t PlayerWheel::checkExecutionersThrow(const std::shared_ptr<Creature> &target) const { if (!target || target == m_player.getPlayer()) { return 0; } int32_t damageBonus = 0; - uint8_t stage = getStage(WheelStage_t::EXECUTIONERS_THROW); - int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); + const uint8_t stage = getStage(WheelStage_t::EXECUTIONERS_THROW); + const int32_t healthPercent = std::round((static_cast<double>(target->getHealth()) * 100) / static_cast<double>(target->getMaxHealth())); if (healthPercent <= 30) { if (stage >= 3) { damageBonus = 150; @@ -2346,7 +2825,7 @@ int32_t PlayerWheel::checkExecutionersThrow(std::shared_ptr<Creature> target) co int32_t PlayerWheel::checkBeamMasteryDamage() const { int32_t damageBoost = 0; - uint8_t stage = getStage(WheelStage_t::BEAM_MASTERY); + const uint8_t stage = getStage(WheelStage_t::BEAM_MASTERY); if (stage >= 3) { damageBoost = 14; } else if (stage >= 2) { @@ -2358,12 +2837,12 @@ int32_t PlayerWheel::checkBeamMasteryDamage() const { return damageBoost; } -int32_t PlayerWheel::checkDrainBodyLeech(std::shared_ptr<Creature> target, skills_t skill) const { +int32_t PlayerWheel::checkDrainBodyLeech(const std::shared_ptr<Creature> &target, skills_t skill) const { if (!target || !target->getMonster() || target->getWheelOfDestinyDrainBodyDebuff() == 0) { return 0; } - uint8_t stage = target->getWheelOfDestinyDrainBodyDebuff(); + const uint8_t stage = target->getWheelOfDestinyDrainBodyDebuff(); if (target->getBuff(BUFF_DAMAGERECEIVED) > 100 && skill == SKILL_MANA_LEECH_AMOUNT) { int32_t manaLeechSkill = 0; if (stage >= 3) { @@ -2392,14 +2871,14 @@ int32_t PlayerWheel::checkDrainBodyLeech(std::shared_ptr<Creature> target, skill } int32_t PlayerWheel::checkBattleHealingAmount() const { - double amount = (double)m_player.getSkillLevel(SKILL_SHIELD) * 0.2; - uint8_t healthPercent = (m_player.getHealth() * 100) / m_player.getMaxHealth(); + double amount = static_cast<double>(m_player.getSkillLevel(SKILL_SHIELD)) * 0.2; + const uint8_t healthPercent = (m_player.getHealth() * 100) / m_player.getMaxHealth(); if (healthPercent <= 30) { amount *= 3; } else if (healthPercent <= 60) { amount *= 2; } - return (int32_t)amount; + return static_cast<int32_t>(amount); } int32_t PlayerWheel::checkAvatarSkill(WheelAvatarSkill_t skill) const { @@ -2427,9 +2906,11 @@ int32_t PlayerWheel::checkAvatarSkill(WheelAvatarSkill_t skill) const { if (skill == WheelAvatarSkill_t::DAMAGE_REDUCTION) { if (stage >= 3) { return 15; - } else if (stage >= 2) { + } + if (stage >= 2) { return 10; - } else if (stage >= 1) { + } + if (stage >= 1) { return 5; } } else if (skill == WheelAvatarSkill_t::CRITICAL_CHANCE) { @@ -2437,9 +2918,11 @@ int32_t PlayerWheel::checkAvatarSkill(WheelAvatarSkill_t skill) const { } else if (skill == WheelAvatarSkill_t::CRITICAL_DAMAGE) { if (stage >= 3) { return 1500; - } else if (stage >= 2) { + } + if (stage >= 2) { return 1000; - } else if (stage >= 1) { + } + if (stage >= 1) { return 500; } } @@ -2518,7 +3001,7 @@ void PlayerWheel::onThink(bool force /* = false*/) { } } -void PlayerWheel::reduceAllSpellsCooldownTimer(int32_t value) { +void PlayerWheel::reduceAllSpellsCooldownTimer(int32_t value) const { for (const auto &condition : m_player.getConditionsByType(CONDITION_SPELLCOOLDOWN)) { if (condition->getTicks() <= value) { m_player.sendSpellCooldown(condition->getSubId(), 0); @@ -2542,7 +3025,7 @@ void PlayerWheel::resetUpgradedSpells() { for (int i = 0; i < static_cast<int>(WheelMajor_t::TOTAL_COUNT); i++) { setMajorStat(static_cast<WheelMajor_t>(i), 0); } - for (int i = 0; i < static_cast<int>(WheelStage_t::TOTAL_COUNT); i++) { + for (int i = 0; i < static_cast<int>(WheelStage_t::STAGE_COUNT); i++) { setStage(static_cast<WheelStage_t>(i), 0); } setOnThinkTimer(WheelOnThink_t::FOCUS_MASTERY, 0); @@ -2574,7 +3057,7 @@ void PlayerWheel::downgradeSpell(const std::string &name) { std::shared_ptr<Spell> PlayerWheel::getCombatDataSpell(CombatDamage &damage) { std::shared_ptr<Spell> spell = nullptr; - WheelSpellGrade_t spellGrade = WheelSpellGrade_t::NONE; + auto spellGrade = WheelSpellGrade_t::NONE; if (!(damage.instantSpellName).empty()) { spellGrade = getSpellUpgrade(damage.instantSpellName); spell = g_spells().getInstantSpellByName(damage.instantSpellName); @@ -2582,8 +3065,10 @@ std::shared_ptr<Spell> PlayerWheel::getCombatDataSpell(CombatDamage &damage) { spell = g_spells().getRuneSpellByName(damage.runeSpellName); } if (spell) { + const auto &spellName = spell->getName(); + damage.damageMultiplier += checkFocusMasteryDamage(); - if (getHealingLinkUpgrade(spell->getName())) { + if (getHealingLinkUpgrade(spellName)) { damage.healingLink += 10; } if (spell->getSecondaryGroup() == SPELLGROUP_FOCUS && getInstant("Focus Mastery")) { @@ -2591,15 +3076,27 @@ std::shared_ptr<Spell> PlayerWheel::getCombatDataSpell(CombatDamage &damage) { } if (spell->getWheelOfDestinyUpgraded()) { - damage.criticalDamage += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_DAMAGE, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::CRITICAL_DAMAGE); - damage.criticalChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_CHANCE, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::CRITICAL_CHANCE); - damage.damageMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::DAMAGE); - damage.damageReductionMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE_REDUCTION, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::DAMAGE_REDUCTION); - damage.healingMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::HEAL, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::HEAL); - damage.manaLeech += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::MANA_LEECH); - damage.manaLeechChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH_CHANCE, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::LIFE_LEECH_CHANCE); - damage.lifeLeech += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::LIFE_LEECH); - damage.lifeLeechChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH_CHANCE, spellGrade) + getSpellBonus(spell->getName(), WheelSpellBoost_t::LIFE_LEECH_CHANCE); + damage.criticalDamage += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_DAMAGE, spellGrade) * 100; + damage.criticalChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_CHANCE, spellGrade); + damage.damageMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE, spellGrade); + damage.damageReductionMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE_REDUCTION, spellGrade); + damage.healingMultiplier += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::HEAL, spellGrade); + damage.manaLeech += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH, spellGrade); + damage.manaLeechChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH_CHANCE, spellGrade); + damage.lifeLeech += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH, spellGrade); + damage.lifeLeechChance += spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH_CHANCE, spellGrade); + } + + if (m_spellsBonuses.contains(spellName)) { + damage.criticalDamage += (getSpellBonus(spellName, WheelSpellBoost_t::CRITICAL_DAMAGE) * 100); + damage.criticalChance += getSpellBonus(spellName, WheelSpellBoost_t::CRITICAL_CHANCE); + damage.damageMultiplier += getSpellBonus(spellName, WheelSpellBoost_t::DAMAGE); + damage.damageReductionMultiplier += getSpellBonus(spellName, WheelSpellBoost_t::DAMAGE_REDUCTION); + damage.healingMultiplier += getSpellBonus(spellName, WheelSpellBoost_t::HEAL); + damage.manaLeech += getSpellBonus(spellName, WheelSpellBoost_t::MANA_LEECH); + damage.manaLeechChance += getSpellBonus(spellName, WheelSpellBoost_t::MANA_LEECH_CHANCE); + damage.lifeLeech += getSpellBonus(spellName, WheelSpellBoost_t::LIFE_LEECH); + damage.lifeLeechChance += getSpellBonus(spellName, WheelSpellBoost_t::LIFE_LEECH_CHANCE); } } @@ -2796,47 +3293,68 @@ bool PlayerWheel::getInstant(WheelInstant_t type) const { return false; } -uint8_t PlayerWheel::getStage(const std::string name) const { +uint8_t PlayerWheel::getStage(std::string_view name) const { + using enum WheelInstant_t; + using enum WheelStage_t; if (name == "Battle Instinct") { - return PlayerWheel::getInstant(WheelInstant_t::BATTLE_INSTINCT); - } else if (name == "Battle Healing") { - return PlayerWheel::getInstant(WheelInstant_t::BATTLE_HEALING); - } else if (name == "Positional Tatics") { - return PlayerWheel::getInstant(WheelInstant_t::POSITIONAL_TATICS); - } else if (name == "Ballistic Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::BALLISTIC_MASTERY); - } else if (name == "Healing Link") { - return PlayerWheel::getInstant(WheelInstant_t::HEALING_LINK); - } else if (name == "Runic Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::RUNIC_MASTERY); - } else if (name == "Focus Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::FOCUS_MASTERY); - } else if (name == "Beam Mastery") { - return PlayerWheel::getStage(WheelStage_t::BEAM_MASTERY); - } else if (name == "Combat Mastery") { - return PlayerWheel::getStage(WheelStage_t::COMBAT_MASTERY); - } else if (name == "Gift of Life") { - return PlayerWheel::getStage(WheelStage_t::GIFT_OF_LIFE); - } else if (name == "Blessing of the Grove") { - return PlayerWheel::getStage(WheelStage_t::BLESSING_OF_THE_GROVE); - } else if (name == "Drain Body") { - return PlayerWheel::getStage(WheelStage_t::DRAIN_BODY); - } else if (name == "Divine Empowerment") { - return PlayerWheel::getStage(WheelStage_t::DIVINE_EMPOWERMENT); - } else if (name == "Divine Grenade") { - return PlayerWheel::getStage(WheelStage_t::DIVINE_GRENADE); - } else if (name == "Twin Burst") { - return PlayerWheel::getStage(WheelStage_t::TWIN_BURST); - } else if (name == "Executioner's Throw") { - return PlayerWheel::getStage(WheelStage_t::EXECUTIONERS_THROW); - } else if (name == "Avatar of Light") { - return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_LIGHT); - } else if (name == "Avatar of Nature") { - return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_NATURE); - } else if (name == "Avatar of Steel") { - return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_STEEL); - } else if (name == "Avatar of Storm") { - return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_STORM); + return PlayerWheel::getInstant(BATTLE_INSTINCT); + } + if (name == "Battle Healing") { + return PlayerWheel::getInstant(BATTLE_HEALING); + } + if (name == "Positional Tatics") { + return PlayerWheel::getInstant(POSITIONAL_TATICS); + } + if (name == "Ballistic Mastery") { + return PlayerWheel::getInstant(BALLISTIC_MASTERY); + } + if (name == "Healing Link") { + return PlayerWheel::getInstant(HEALING_LINK); + } + if (name == "Runic Mastery") { + return PlayerWheel::getInstant(RUNIC_MASTERY); + } + if (name == "Focus Mastery") { + return PlayerWheel::getInstant(FOCUS_MASTERY); + } + if (name == "Beam Mastery") { + return PlayerWheel::getStage(BEAM_MASTERY); + } + if (name == "Combat Mastery") { + return PlayerWheel::getStage(COMBAT_MASTERY); + } + if (name == "Gift of Life") { + return PlayerWheel::getStage(GIFT_OF_LIFE); + } + if (name == "Blessing of the Grove") { + return PlayerWheel::getStage(BLESSING_OF_THE_GROVE); + } + if (name == "Drain Body") { + return PlayerWheel::getStage(DRAIN_BODY); + } + if (name == "Divine Empowerment") { + return PlayerWheel::getStage(DIVINE_EMPOWERMENT); + } + if (name == "Divine Grenade") { + return PlayerWheel::getStage(DIVINE_GRENADE); + } + if (name == "Twin Burst") { + return PlayerWheel::getStage(TWIN_BURST); + } + if (name == "Executioner's Throw") { + return PlayerWheel::getStage(EXECUTIONERS_THROW); + } + if (name == "Avatar of Light") { + return PlayerWheel::getStage(AVATAR_OF_LIGHT); + } + if (name == "Avatar of Nature") { + return PlayerWheel::getStage(AVATAR_OF_NATURE); + } + if (name == "Avatar of Steel") { + return PlayerWheel::getStage(AVATAR_OF_STEEL); + } + if (name == "Avatar of Storm") { + return PlayerWheel::getStage(AVATAR_OF_STORM); } return false; @@ -2920,46 +3438,66 @@ int64_t PlayerWheel::getOnThinkTimer(WheelOnThink_t type) const { return 0; } -bool PlayerWheel::getInstant(const std::string name) const { +bool PlayerWheel::getInstant(std::string_view name) const { + using enum WheelInstant_t; if (name == "Battle Instinct") { - return PlayerWheel::getInstant(WheelInstant_t::BATTLE_INSTINCT); - } else if (name == "Battle Healing") { - return PlayerWheel::getInstant(WheelInstant_t::BATTLE_HEALING); - } else if (name == "Positional Tatics") { - return PlayerWheel::getInstant(WheelInstant_t::POSITIONAL_TATICS); - } else if (name == "Ballistic Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::BALLISTIC_MASTERY); - } else if (name == "Healing Link") { - return PlayerWheel::getInstant(WheelInstant_t::HEALING_LINK); - } else if (name == "Runic Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::RUNIC_MASTERY); - } else if (name == "Focus Mastery") { - return PlayerWheel::getInstant(WheelInstant_t::FOCUS_MASTERY); - } else if (name == "Beam Mastery") { + return PlayerWheel::getInstant(BATTLE_INSTINCT); + } + if (name == "Battle Healing") { + return PlayerWheel::getInstant(BATTLE_HEALING); + } + if (name == "Positional Tatics") { + return PlayerWheel::getInstant(POSITIONAL_TATICS); + } + if (name == "Ballistic Mastery") { + return PlayerWheel::getInstant(BALLISTIC_MASTERY); + } + if (name == "Healing Link") { + return PlayerWheel::getInstant(HEALING_LINK); + } + if (name == "Runic Mastery") { + return PlayerWheel::getInstant(RUNIC_MASTERY); + } + if (name == "Focus Mastery") { + return PlayerWheel::getInstant(FOCUS_MASTERY); + } + if (name == "Beam Mastery") { return PlayerWheel::getStage(WheelStage_t::BEAM_MASTERY); - } else if (name == "Combat Mastery") { + } + if (name == "Combat Mastery") { return PlayerWheel::getStage(WheelStage_t::COMBAT_MASTERY); - } else if (name == "Gift of Life") { + } + if (name == "Gift of Life") { return PlayerWheel::getStage(WheelStage_t::GIFT_OF_LIFE); - } else if (name == "Blessing of the Grove") { + } + if (name == "Blessing of the Grove") { return PlayerWheel::getStage(WheelStage_t::BLESSING_OF_THE_GROVE); - } else if (name == "Drain Body") { + } + if (name == "Drain Body") { return PlayerWheel::getStage(WheelStage_t::DRAIN_BODY); - } else if (name == "Divine Empowerment") { + } + if (name == "Divine Empowerment") { return PlayerWheel::getStage(WheelStage_t::DIVINE_EMPOWERMENT); - } else if (name == "Divine Grenade") { + } + if (name == "Divine Grenade") { return PlayerWheel::getStage(WheelStage_t::DIVINE_GRENADE); - } else if (name == "Twin Burst") { + } + if (name == "Twin Burst") { return PlayerWheel::getStage(WheelStage_t::TWIN_BURST); - } else if (name == "Executioner's Throw") { + } + if (name == "Executioner's Throw") { return PlayerWheel::getStage(WheelStage_t::EXECUTIONERS_THROW); - } else if (name == "Avatar of Light") { + } + if (name == "Avatar of Light") { return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_LIGHT); - } else if (name == "Avatar of Nature") { + } + if (name == "Avatar of Nature") { return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_NATURE); - } else if (name == "Avatar of Steel") { + } + if (name == "Avatar of Steel") { return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_STEEL); - } else if (name == "Avatar of Storm") { + } + if (name == "Avatar of Storm") { return PlayerWheel::getStage(WheelStage_t::AVATAR_OF_STORM); } @@ -2970,9 +3508,11 @@ bool PlayerWheel::getInstant(const std::string name) const { uint32_t PlayerWheel::getGiftOfLifeTotalCooldown() const { if (getStage(WheelStage_t::GIFT_OF_LIFE) == 1) { return 1 * 60 * 60 * 30; - } else if (getStage(WheelStage_t::GIFT_OF_LIFE) == 2) { + } + if (getStage(WheelStage_t::GIFT_OF_LIFE) == 2) { return 1 * 60 * 60 * 20; - } else if (getStage(WheelStage_t::GIFT_OF_LIFE) == 3) { + } + if (getStage(WheelStage_t::GIFT_OF_LIFE) == 3) { return 1 * 60 * 60 * 10; } return 0; @@ -2981,9 +3521,11 @@ uint32_t PlayerWheel::getGiftOfLifeTotalCooldown() const { uint8_t PlayerWheel::getGiftOfLifeValue() const { if (getStage(WheelStage_t::GIFT_OF_LIFE) == 1) { return 20; - } else if (getStage(WheelStage_t::GIFT_OF_LIFE) == 2) { + } + if (getStage(WheelStage_t::GIFT_OF_LIFE) == 2) { return 25; - } else if (getStage(WheelStage_t::GIFT_OF_LIFE) == 3) { + } + if (getStage(WheelStage_t::GIFT_OF_LIFE) == 3) { return 30; } @@ -2991,7 +3533,7 @@ uint8_t PlayerWheel::getGiftOfLifeValue() const { } int32_t PlayerWheel::getGiftOfCooldown() const { - int32_t value = m_player.getStorageValue(STORAGEVALUE_GIFT_OF_LIFE_COOLDOWN_WOD); + const int32_t value = m_player.getStorageValue(STORAGEVALUE_GIFT_OF_LIFE_COOLDOWN_WOD); if (value <= 0) { return 0; } @@ -3006,7 +3548,7 @@ void PlayerWheel::setGiftOfCooldown(int32_t value, bool isOnThink) { } void PlayerWheel::decreaseGiftOfCooldown(int32_t value) { - int32_t cooldown = getGiftOfCooldown() - value; + const int32_t cooldown = getGiftOfCooldown() - value; if (cooldown <= 0) { setOnThinkTimer(WheelOnThink_t::GIFT_OF_LIFE, OTSYS_TIME() + 3600000); return; @@ -3081,7 +3623,7 @@ void PlayerWheel::healIfBattleHealingActive() const { } void PlayerWheel::adjustDamageBasedOnResistanceAndSkill(int32_t &damage, CombatType_t combatType) const { - int32_t wheelOfDestinyElementAbsorb = getResistance(combatType); + const int32_t wheelOfDestinyElementAbsorb = getResistance(combatType); if (wheelOfDestinyElementAbsorb > 0) { damage -= std::ceil((damage * wheelOfDestinyElementAbsorb) / 10000.); } @@ -3090,11 +3632,8 @@ void PlayerWheel::adjustDamageBasedOnResistanceAndSkill(int32_t &damage, CombatT } float PlayerWheel::calculateMitigation() const { - int32_t skill = m_player.getSkillLevel(SKILL_SHIELD); + const int32_t skill = m_player.getSkillLevel(SKILL_SHIELD); int32_t defenseValue = 0; - std::shared_ptr<Item> weapon = m_player.inventory[CONST_SLOT_LEFT]; - std::shared_ptr<Item> shield = m_player.inventory[CONST_SLOT_RIGHT]; - float fightFactor = 1.0f; float shieldFactor = 1.0f; float distanceFactor = 1.0f; @@ -3115,6 +3654,7 @@ float PlayerWheel::calculateMitigation() const { break; } + const auto &shield = m_player.inventory[CONST_SLOT_RIGHT]; if (shield) { if (shield->isSpellBook() || shield->isQuiver()) { distanceFactor = m_player.vocation->mitigationSecondaryShield; @@ -3128,6 +3668,7 @@ float PlayerWheel::calculateMitigation() const { } } + const auto &weapon = m_player.inventory[CONST_SLOT_LEFT]; if (weapon) { if (weapon->getAmmoType() == AMMO_BOLT || weapon->getAmmoType() == AMMO_ARROW) { distanceFactor = m_player.vocation->mitigationSecondaryShield; @@ -3140,8 +3681,8 @@ float PlayerWheel::calculateMitigation() const { } } - float mitigation = std::ceil(((((skill * m_player.vocation->mitigationFactor) + (shieldFactor * (float)defenseValue)) / 100.0f) * fightFactor * distanceFactor) * 100.0f) / 100.0f; - mitigation += (mitigation * (float)getMitigationMultiplier()) / 100.f; + float mitigation = std::ceil(((((skill * m_player.vocation->mitigationFactor) + (shieldFactor * static_cast<float>(defenseValue))) / 100.0f) * fightFactor * distanceFactor) * 100.0f) / 100.0f; + mitigation += (mitigation * static_cast<float>(getMitigationMultiplier())) / 100.f; return mitigation; } @@ -3152,3 +3693,50 @@ WheelGemBasicModifier_t PlayerWheel::selectBasicModifier2(WheelGemBasicModifier_ } return modifier; } + +std::string PlayerWheelGem::toString() const { + return fmt::format("[PlayerWheelGem] uuid: {}, locked: {}, affinity: {}, quality: {}, basicModifier1: {}, basicModifier2: {}, supremeModifier: {}", uuid, locked, static_cast<IntType>(affinity), static_cast<IntType>(quality), static_cast<IntType>(basicModifier1), static_cast<IntType>(basicModifier2), static_cast<IntType>(supremeModifier)); +} + +void PlayerWheelGem::save(const std::shared_ptr<KV> &kv) const { + kv->scoped("revealed")->set(uuid, serialize()); +} +void PlayerWheelGem::remove(const std::shared_ptr<KV> &kv) const { + kv->scoped("revealed")->remove(uuid); +} + +PlayerWheelGem PlayerWheelGem::load(const std::shared_ptr<KV> &kv, const std::string &uuid) { + auto val = kv->scoped("revealed")->get(uuid); + if (!val || !val.has_value()) { + return {}; + } + return deserialize(uuid, val.value()); +} + +ValueWrapper PlayerWheelGem::serialize() const { + return { + { "uuid", uuid }, + { "locked", locked }, + { "affinity", static_cast<IntType>(affinity) }, + { "quality", static_cast<IntType>(quality) }, + { "basicModifier1", static_cast<IntType>(basicModifier1) }, + { "basicModifier2", static_cast<IntType>(basicModifier2) }, + { "supremeModifier", static_cast<IntType>(supremeModifier) } + }; +} + +PlayerWheelGem PlayerWheelGem::deserialize(const std::string &uuid, const ValueWrapper &val) { + auto map = val.get<MapType>(); + if (map.empty()) { + return {}; + } + return { + uuid, + map["locked"]->get<BooleanType>(), + static_cast<WheelGemAffinity_t>(map["affinity"]->get<IntType>()), + static_cast<WheelGemQuality_t>(map["quality"]->get<IntType>()), + static_cast<WheelGemBasicModifier_t>(map["basicModifier1"]->get<IntType>()), + static_cast<WheelGemBasicModifier_t>(map["basicModifier2"]->get<IntType>()), + static_cast<WheelGemSupremeModifier_t>(map["supremeModifier"]->get<IntType>()) + }; +} diff --git a/src/creatures/players/wheel/player_wheel.hpp b/src/creatures/players/wheel/player_wheel.hpp index 14f922e95..840cc72d8 100644 --- a/src/creatures/players/wheel/player_wheel.hpp +++ b/src/creatures/players/wheel/player_wheel.hpp @@ -9,16 +9,28 @@ #pragma once -#include "io/io_wheel.hpp" -#include "utils/utils_definitions.hpp" -#include "kv/kv.hpp" -#include "wheel_gems.hpp" +#include "creatures/creatures_definitions.hpp" +#include "creatures/players/wheel/wheel_definitions.hpp" -class Spell; -class Player; class Creature; -class NetworkMessage; class IOWheel; +class KV; +class NetworkMessage; +class Player; +class Spell; +class WheelModifierContext; +class ValueWrapper; + +struct CombatDamage; + +enum class WheelFragmentType_t : uint8_t; +enum class WheelGemAffinity_t : uint8_t; +enum class WheelGemBasicModifier_t : uint8_t; +enum class WheelGemQuality_t : uint8_t; +enum class WheelGemSupremeModifier_t : uint8_t; +enum CombatType_t : uint8_t; +enum skills_t : int8_t; +enum Vocation_t : uint16_t; struct PlayerWheelGem { std::string uuid; @@ -29,54 +41,18 @@ struct PlayerWheelGem { WheelGemBasicModifier_t basicModifier2; WheelGemSupremeModifier_t supremeModifier; - std::string toString() const { - return fmt::format("[PlayerWheelGem] uuid: {}, locked: {}, affinity: {}, quality: {}, basicModifier1: {}, basicModifier2: {}, supremeModifier: {}", uuid, locked, static_cast<IntType>(affinity), static_cast<IntType>(quality), static_cast<IntType>(basicModifier1), static_cast<IntType>(basicModifier2), static_cast<IntType>(supremeModifier)); - } + std::string toString() const; - void save(const std::shared_ptr<KV> &kv) const { - kv->scoped("revealed")->set(uuid, serialize()); - } + void save(const std::shared_ptr<KV> &kv) const; - void remove(const std::shared_ptr<KV> &kv) const { - kv->scoped("revealed")->remove(uuid); - } + void remove(const std::shared_ptr<KV> &kv) const; - static PlayerWheelGem load(const std::shared_ptr<KV> &kv, const std::string &uuid) { - auto val = kv->scoped("revealed")->get(uuid); - if (!val || !val.has_value()) { - return {}; - } - return deserialize(uuid, val.value()); - } + static PlayerWheelGem load(const std::shared_ptr<KV> &kv, const std::string &uuid); private: - ValueWrapper serialize() const { - return { - { "uuid", uuid }, - { "locked", locked }, - { "affinity", static_cast<IntType>(affinity) }, - { "quality", static_cast<IntType>(quality) }, - { "basicModifier1", static_cast<IntType>(basicModifier1) }, - { "basicModifier2", static_cast<IntType>(basicModifier2) }, - { "supremeModifier", static_cast<IntType>(supremeModifier) } - }; - } + ValueWrapper serialize() const; - static PlayerWheelGem deserialize(const std::string &uuid, const ValueWrapper &val) { - auto map = val.get<MapType>(); - if (map.empty()) { - return {}; - } - return { - uuid, - map["locked"]->get<BooleanType>(), - static_cast<WheelGemAffinity_t>(map["affinity"]->get<IntType>()), - static_cast<WheelGemQuality_t>(map["quality"]->get<IntType>()), - static_cast<WheelGemBasicModifier_t>(map["basicModifier1"]->get<IntType>()), - static_cast<WheelGemBasicModifier_t>(map["basicModifier2"]->get<IntType>()), - static_cast<WheelGemSupremeModifier_t>(map["supremeModifier"]->get<IntType>()) - }; - } + static PlayerWheelGem deserialize(const std::string &uuid, const ValueWrapper &val); }; class PlayerWheel { @@ -114,7 +90,9 @@ class PlayerWheel { void saveSlotPointsOnPressSaveButton(NetworkMessage &msg); void addPromotionScrolls(NetworkMessage &msg) const; void addGems(NetworkMessage &msg) const; - void sendOpenWheelWindow(NetworkMessage &msg, uint32_t ownerId) const; + void addGradeModifiers(NetworkMessage &msg) const; + void improveGemGrade(WheelFragmentType_t fragmentType, uint8_t pos); + void sendOpenWheelWindow(NetworkMessage &msg, uint32_t ownerId); void sendGiftOfLifeCooldown() const; /* @@ -154,11 +132,9 @@ class PlayerWheel { uint8_t getMaxPointsPerSlot(WheelSlots_t slot) const; uint16_t getUnusedPoints() const; - void resetPlayerBonusData(); - void setPlayerCombatStats(CombatType_t type, int32_t leechAmount); - void reloadPlayerData(); + void reloadPlayerData() const; void registerPlayerBonusData(); @@ -176,9 +152,13 @@ class PlayerWheel { WheelStageEnum_t getPlayerSliceStage(const std::string &color) const; + std::tuple<int, int> getLesserGradeCost(uint8_t grade) const; + std::tuple<int, int> getGreaterGradeCost(uint8_t grade) const; + void printPlayerWheelMethodsBonusData(const PlayerWheelMethodsBonusData &bonusData) const; private: + void addInitialGems(); /* * Open wheel functions helpers */ @@ -207,6 +187,8 @@ class PlayerWheel { uint8_t getOptions(uint32_t ownerId) const; std::shared_ptr<KV> gemsKV() const; + std::shared_ptr<KV> gemsGradeKV(WheelFragmentType_t quality, uint8_t pos) const; + uint8_t getGemGrade(WheelFragmentType_t quality, uint8_t pos) const; std::vector<PlayerWheelGem> getRevealedGems() const; std::vector<PlayerWheelGem> getActiveGems() const; @@ -215,6 +197,8 @@ class PlayerWheel { static uint64_t getGemRevealCost(WheelGemQuality_t quality); + void resetPlayerData(); + // Members variables const uint16_t m_minLevelToStartCountPoints = 50; uint16_t m_pointsPerLevel = 1; @@ -229,18 +213,18 @@ class PlayerWheel { bool checkBallisticMastery(); bool checkCombatMastery(); bool checkDivineEmpowerment(); - int32_t checkDrainBodyLeech(std::shared_ptr<Creature> target, skills_t skill) const; + int32_t checkDrainBodyLeech(const std::shared_ptr<Creature> &target, skills_t skill) const; int32_t checkBeamMasteryDamage() const; int32_t checkBattleHealingAmount() const; - int32_t checkBlessingGroveHealingByTarget(std::shared_ptr<Creature> target) const; - int32_t checkTwinBurstByTarget(std::shared_ptr<Creature> target) const; - int32_t checkExecutionersThrow(std::shared_ptr<Creature> target) const; - int32_t checkDivineGrenade(std::shared_ptr<Creature> target) const; + int32_t checkBlessingGroveHealingByTarget(const std::shared_ptr<Creature> &target) const; + int32_t checkTwinBurstByTarget(const std::shared_ptr<Creature> &target) const; + int32_t checkExecutionersThrow(const std::shared_ptr<Creature> &target) const; + int32_t checkDivineGrenade(const std::shared_ptr<Creature> &target) const; int32_t checkAvatarSkill(WheelAvatarSkill_t skill) const; int32_t checkFocusMasteryDamage(); int32_t checkElementSensitiveReduction(CombatType_t type) const; // Wheel of destiny - General functions: - void reduceAllSpellsCooldownTimer(int32_t value); + void reduceAllSpellsCooldownTimer(int32_t value) const; void resetUpgradedSpells(); void upgradeSpell(const std::string &name); void downgradeSpell(const std::string &name); @@ -322,7 +306,7 @@ class PlayerWheel { // Wheel of destiny - Header get: bool getInstant(WheelInstant_t type) const; bool getHealingLinkUpgrade(const std::string &spell) const; - uint8_t getStage(const std::string name) const; + uint8_t getStage(std::string_view name) const; uint8_t getStage(WheelStage_t type) const; WheelSpellGrade_t getSpellUpgrade(const std::string &name) const; int32_t getMajorStat(WheelMajor_t type) const; @@ -330,7 +314,7 @@ class PlayerWheel { int32_t getResistance(CombatType_t type) const; int32_t getMajorStatConditional(const std::string &instant, WheelMajor_t major) const; int64_t getOnThinkTimer(WheelOnThink_t type) const; - bool getInstant(const std::string name) const; + bool getInstant(std::string_view name) const; double getMitigationMultiplier() const; // Wheel of destiny - Specific functions @@ -386,15 +370,15 @@ class PlayerWheel { * @return The calculated mitigation value. */ float calculateMitigation() const; - PlayerWheelGem getGem(uint8_t index) const; + PlayerWheelGem getGem(uint16_t index) const; PlayerWheelGem getGem(const std::string &uuid) const; - uint8_t getGemIndex(const std::string &uuid) const; - void revealGem(WheelGemQuality_t quality); - void destroyGem(uint8_t index); - void switchGemDomain(uint8_t index); - void toggleGemLock(uint8_t index); - void setActiveGem(WheelGemAffinity_t affinity, uint8_t index); - void removeActiveGem(WheelGemAffinity_t affinity); + uint16_t getGemIndex(const std::string &uuid) const; + void revealGem(WheelGemQuality_t quality) const; + void destroyGem(uint16_t index) const; + void switchGemDomain(uint16_t index) const; + void toggleGemLock(uint16_t index) const; + void setActiveGem(WheelGemAffinity_t affinity, uint16_t index) const; + void removeActiveGem(WheelGemAffinity_t affinity) const; void addRevelationBonus(WheelGemAffinity_t affinity, uint16_t points) { m_bonusRevelationPoints[static_cast<size_t>(affinity)] += points; } @@ -402,7 +386,7 @@ class PlayerWheel { m_bonusRevelationPoints = { 0, 0, 0, 0 }; } - void addSpellBonus(const std::string &spellName, WheelSpells::Bonus bonus) { + void addSpellBonus(const std::string &spellName, const WheelSpells::Bonus &bonus) { if (m_spellsBonuses.contains(spellName)) { m_spellsBonuses[spellName].decrease.cooldown += bonus.decrease.cooldown; m_spellsBonuses[spellName].decrease.manaCost += bonus.decrease.manaCost; @@ -426,28 +410,28 @@ class PlayerWheel { if (!m_spellsBonuses.contains(spellName)) { return 0; } - auto bonus = m_spellsBonuses.at(spellName); + auto [leech, increase, decrease] = m_spellsBonuses.at(spellName); switch (boost) { case WheelSpellBoost_t::COOLDOWN: - return bonus.decrease.cooldown; + return decrease.cooldown; case WheelSpellBoost_t::MANA: - return bonus.decrease.manaCost; + return decrease.manaCost; case WheelSpellBoost_t::SECONDARY_GROUP_COOLDOWN: - return bonus.decrease.secondaryGroupCooldown; + return decrease.secondaryGroupCooldown; case WheelSpellBoost_t::CRITICAL_CHANCE: - return bonus.increase.criticalChance; + return increase.criticalChance; case WheelSpellBoost_t::CRITICAL_DAMAGE: - return bonus.increase.criticalDamage; + return increase.criticalDamage; case WheelSpellBoost_t::DAMAGE: - return bonus.increase.damage; + return increase.damage; case WheelSpellBoost_t::DAMAGE_REDUCTION: - return bonus.increase.damageReduction; + return increase.damageReduction; case WheelSpellBoost_t::HEAL: - return bonus.increase.heal; + return increase.heal; case WheelSpellBoost_t::LIFE_LEECH: - return bonus.leech.life; + return leech.life; case WheelSpellBoost_t::MANA_LEECH: - return bonus.leech.mana; + return leech.mana; default: return 0; } @@ -456,6 +440,14 @@ class PlayerWheel { WheelGemBasicModifier_t selectBasicModifier2(WheelGemBasicModifier_t modifier1) const; private: + void resetRevelationState(); + void processActiveGems(); + void applyStageBonuses(); + void applyStageBonusForColor(const std::string &color); + void applyRedStageBonus(uint8_t stageValue, Vocation_t vocationEnum); + void applyPurpleStageBonus(uint8_t stageValue, Vocation_t vocationEnum); + void applyBlueStageBonus(uint8_t stageValue, Vocation_t vocationEnum); + friend class Player; // Reference to the player Player &m_player; @@ -467,11 +459,11 @@ class PlayerWheel { PlayerWheelMethodsBonusData m_playerBonusData; std::unique_ptr<WheelModifierContext> m_modifierContext; - std::array<uint8_t, static_cast<size_t>(WheelStage_t::TOTAL_COUNT)> m_stages = { 0 }; + std::array<uint8_t, static_cast<size_t>(WheelStage_t::STAGE_COUNT)> m_stages = { 0 }; std::array<int64_t, static_cast<size_t>(WheelOnThink_t::TOTAL_COUNT)> m_onThink = { 0 }; std::array<int32_t, static_cast<size_t>(WheelStat_t::TOTAL_COUNT)> m_stats = { 0 }; std::array<int32_t, static_cast<size_t>(WheelMajor_t::TOTAL_COUNT)> m_majorStats = { 0 }; - std::array<bool, static_cast<size_t>(WheelInstant_t::TOTAL_COUNT)> m_instant = { false }; + std::array<bool, static_cast<size_t>(WheelInstant_t::INSTANT_COUNT)> m_instant = { false }; std::array<int32_t, COMBAT_COUNT> m_resistance = { 0 }; int32_t m_creaturesNearby = 0; diff --git a/src/creatures/players/wheel/wheel_definitions.hpp b/src/creatures/players/wheel/wheel_definitions.hpp index c23d2adf5..0aa22c5a7 100644 --- a/src/creatures/players/wheel/wheel_definitions.hpp +++ b/src/creatures/players/wheel/wheel_definitions.hpp @@ -9,8 +9,6 @@ #pragma once -#include "creatures/creatures_definitions.hpp" - enum WheelSlots_t : uint8_t { SLOT_GREEN_200 = 1, SLOT_GREEN_TOP_150 = 2, @@ -94,7 +92,7 @@ enum class WheelStage_t : uint8_t { AVATAR_OF_STORM = 11, DIVINE_GRENADE = 12, - TOTAL_COUNT = 13 + STAGE_COUNT = 13 }; enum class WheelOnThink_t : uint8_t { @@ -156,7 +154,7 @@ enum class WheelInstant_t : uint8_t { RUNIC_MASTERY = 5, FOCUS_MASTERY = 6, - TOTAL_COUNT = 7 + INSTANT_COUNT = 7 }; enum class WheelAvatarSkill_t : uint8_t { @@ -253,6 +251,7 @@ struct PlayerWheelMethodsBonusData { Stages stages; Avatar avatar; + float momentum = 0; float mitigation = 0; std::vector<std::string> spells; }; diff --git a/src/creatures/players/wheel/wheel_gems.cpp b/src/creatures/players/wheel/wheel_gems.cpp index c3653298c..a2c7a8987 100644 --- a/src/creatures/players/wheel/wheel_gems.cpp +++ b/src/creatures/players/wheel/wheel_gems.cpp @@ -7,9 +7,11 @@ * Website: https://docs.opentibiabr.org/ */ -#include "pch.hpp" +#include "creatures/players/wheel/wheel_gems.hpp" +#include "creatures/creatures_definitions.hpp" #include "creatures/players/wheel/player_wheel.hpp" +#include "enums/player_wheel.hpp" void GemModifierResistanceStrategy::execute() { m_wheel.addResistance(m_combatType, m_resistance); @@ -27,184 +29,193 @@ void GemModifierSpellBonusStrategy::execute() { m_wheel.addSpellBonus(m_spellName, m_bonus); } -void WheelModifierContext::addStrategies(WheelGemBasicModifier_t modifier) { +void WheelModifierContext::addStrategies(WheelGemBasicModifier_t modifier, uint8_t grade) { + float gradeMultiplier = 1.0; + if (grade == 1) { + gradeMultiplier = 1.1; + } else if (grade == 2) { + gradeMultiplier = 1.2; + } else if (grade == 3) { + gradeMultiplier = 1.5; + } + switch (modifier) { case WheelGemBasicModifier_t::General_PhysicalResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_PHYSICALDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_PHYSICALDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_HolyResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_DeathResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_FireResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 200 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_EarthResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 200 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_IceResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 200 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 200 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_HolyResistance_DeathWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, 150)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, -100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, 150 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, -100)); break; case WheelGemBasicModifier_t::General_DeathResistance_HolyWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, 150)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, -100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_DEATHDAMAGE, 150 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_HOLYDAMAGE, -100)); break; case WheelGemBasicModifier_t::General_FireResistance_EarthResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_FireResistance_IceResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_FireResistance_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_EarthResistance_IceResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_EarthResistance_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_IceResistance_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_FireResistance_EarthWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_FireResistance_IceWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_FireResistance_EnergyWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EarthResistance_FireWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EarthResistance_IceWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EarthResistance_EnergyWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_IceResistance_EarthWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_IceResistance_FireWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_IceResistance_EnergyWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EnergyResistance_EarthWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EnergyResistance_IceWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_EnergyResistance_FireWeakness: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 300 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, -200)); break; case WheelGemBasicModifier_t::General_ManaDrainResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_MANADRAIN, 300)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_MANADRAIN, 300 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_LifeDrainResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_LIFEDRAIN, 300)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_LIFEDRAIN, 300 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_ManaDrainResistance_LifeDrainResistance: - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_MANADRAIN, 150)); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_LIFEDRAIN, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_MANADRAIN, 150 * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_LIFEDRAIN, 150 * gradeMultiplier)); break; case WheelGemBasicModifier_t::General_MitigationMultiplier: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MITIGATION, 500)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MITIGATION, 500 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Health: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mana_FireResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mana_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mana_Earth_Resistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mana_Ice_Resistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mana: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Health_FireResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Health_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Health_EarthResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Health_IceResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Mixed: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, getHealthValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, getManaValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::HEALTH, WheelGemUtils::getHealthValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA, WheelGemUtils::getManaValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Capacity_FireResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_FIREDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Capacity_EnergyResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ENERGYDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Capacity_EarthResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_EARTHDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Capacity_IceResistance: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); - m_strategies.push_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); + m_strategies.emplace_back(std::make_unique<GemModifierResistanceStrategy>(m_wheel, CombatType_t::COMBAT_ICEDAMAGE, 100 * gradeMultiplier)); break; case WheelGemBasicModifier_t::Vocation_Capacity: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, getCapacityValue(m_vocation, modifier))); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CAPACITY, WheelGemUtils::getCapacityValue(m_vocation, modifier) * gradeMultiplier)); break; default: @@ -212,313 +223,573 @@ void WheelModifierContext::addStrategies(WheelGemBasicModifier_t modifier) { } } -void WheelModifierContext::addStrategies(WheelGemSupremeModifier_t modifier) { +void WheelModifierContext::addStrategies(WheelGemSupremeModifier_t modifier, uint8_t grade) { WheelSpells::Bonus bonus; + auto &wheelBonus = m_wheel.getBonusData(); + + float gradeMultiplier = 1.0; + if (grade == 1) { + gradeMultiplier = 1.1; + } else if (grade == 2) { + gradeMultiplier = 1.2; + } else if (grade == 3) { + gradeMultiplier = 1.5; + } switch (modifier) { case WheelGemSupremeModifier_t::General_Dodge: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::DODGE, 25)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::DODGE, 25 * gradeMultiplier)); break; case WheelGemSupremeModifier_t::General_LifeLeech: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::LIFE_LEECH, 120)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::LIFE_LEECH, 120 * gradeMultiplier)); break; case WheelGemSupremeModifier_t::General_ManaLeech: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA_LEECH, 40)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::MANA_LEECH, 40 * gradeMultiplier)); break; case WheelGemSupremeModifier_t::General_CriticalDamage: - m_strategies.push_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CRITICAL_DAMAGE, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierStatStrategy>(m_wheel, WheelStat_t::CRITICAL_DAMAGE, 150 * gradeMultiplier)); break; case WheelGemSupremeModifier_t::General_RevelationMastery_GiftOfLife: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Green, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Green, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Green, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::SorcererDruid_UltimateHealing: - bonus.increase.heal = 10; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ultimate Healing", bonus)); + bonus.increase.heal = 10 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ultimate Healing", bonus)); break; case WheelGemSupremeModifier_t::Knight_RevelationMastery_ExecutionersThrow: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Red, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Knight_RevelationMastery_AvatarOfSteel: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Purple, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Knight_RevelationMastery_CombatMastery: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Blue, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Paladin_RevelationMastery_DivineGrenade: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Red, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Paladin_RevelationMastery_AvatarOfLight: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Purple, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Paladin_RevelationMastery_DivineEmpowerment: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Blue, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Druid_RevelationMastery_BlessingOfTheGrove: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Red, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Druid_RevelationMastery_AvatarOfNature: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Purple, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Druid_RevelationMastery_TwinBursts: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Blue, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_BeamMastery: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Red, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Red, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_AvatarOfStorm: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Purple, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Purple, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Sorcerer_RevelationMastery_DrainBody: - m_strategies.push_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150)); + m_strategies.emplace_back(std::make_unique<GemModifierRevelationStrategy>(m_wheel, WheelGemAffinity_t::Blue, 150 * gradeMultiplier)); + m_wheel.addRevelationBonus(WheelGemAffinity_t::Blue, 150 * gradeMultiplier); break; case WheelGemSupremeModifier_t::Knight_AvatarOfSteel_Cooldown: bonus.decrease.cooldown = 300 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Steel", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Steel", bonus)); break; case WheelGemSupremeModifier_t::Knight_ExecutionersThrow_Cooldown: bonus.decrease.cooldown = 1 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); break; case WheelGemSupremeModifier_t::Knight_ExecutionersThrow_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); break; case WheelGemSupremeModifier_t::Knight_ExecutionersThrow_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Executioner's Throw", bonus)); break; case WheelGemSupremeModifier_t::Knight_Fierce_Berserk_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fierce Berserk", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fierce Berserk", bonus)); break; case WheelGemSupremeModifier_t::Knight_Fierce_Berserk_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fierce Berserk", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fierce Berserk", bonus)); break; case WheelGemSupremeModifier_t::Knight_Berserk_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Berserk", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Berserk", bonus)); break; case WheelGemSupremeModifier_t::Knight_Berserk_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Berserk", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Berserk", bonus)); break; case WheelGemSupremeModifier_t::Knight_Front_Sweep_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Front Sweep", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Front Sweep", bonus)); break; case WheelGemSupremeModifier_t::Knight_Front_Sweep_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Front Sweep", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Front Sweep", bonus)); break; case WheelGemSupremeModifier_t::Knight_Groundshaker_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Groundshaker", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Groundshaker", bonus)); break; case WheelGemSupremeModifier_t::Knight_Groundshaker_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Groundshaker", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Groundshaker", bonus)); break; case WheelGemSupremeModifier_t::Knight_Annihilation_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Annihilation", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Annihilation", bonus)); break; case WheelGemSupremeModifier_t::Knight_Annihilation_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Annihilation", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Annihilation", bonus)); break; case WheelGemSupremeModifier_t::Knight_FairWoundCleansing_HealingIncrease: - bonus.increase.heal = 10; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fair Wound Cleansing", bonus)); + bonus.increase.heal = 10 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Fair Wound Cleansing", bonus)); break; case WheelGemSupremeModifier_t::Paladin_AvatarOfLight_Cooldown: bonus.decrease.cooldown = 300 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Light", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Light", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineDazzle_Cooldown: bonus.decrease.cooldown = 2 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Dazzle", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Dazzle", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineGrenade_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineGrenade_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineCaldera_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Caldera", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Caldera", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineCaldera_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Caldera", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Caldera", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineMissile_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Missile", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Missile", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineMissile_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Missile", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Missile", bonus)); break; case WheelGemSupremeModifier_t::Paladin_EtherealSpear_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ethereal Spear", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ethereal Spear", bonus)); break; case WheelGemSupremeModifier_t::Paladin_EtherealSpear_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ethereal Spear", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ethereal Spear", bonus)); break; case WheelGemSupremeModifier_t::Paladin_StrongEtherealSpear_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ethereal Spear", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ethereal Spear", bonus)); break; case WheelGemSupremeModifier_t::Paladin_StrongEtherealSpear_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ethereal Spear", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ethereal Spear", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineEmpowerment_Cooldown: bonus.decrease.cooldown = 3 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Empowerment", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Empowerment", bonus)); break; case WheelGemSupremeModifier_t::Paladin_DivineGrenade_Cooldown: bonus.decrease.cooldown = 1 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Divine Grenade", bonus)); break; case WheelGemSupremeModifier_t::Paladin_Salvation_HealingIncrease: - bonus.increase.heal = 10; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Salvation", bonus)); + bonus.increase.heal = 10 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Salvation", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_AvatarOfStorm_Cooldown: bonus.decrease.cooldown = 300 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Storm", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Storm", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_EnergyWave_Cooldown: bonus.decrease.cooldown = 1 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatDeathBeam_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Death Beam", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Death Beam", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatDeathBeam_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Death Beam", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Death Beam", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_HellsCore_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Hell's Core", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Hell's Core", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_HellsCore_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Hell's Core", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Hell's Core", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_EnergyWave_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_EnergyWave_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Energy Wave", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatFireWave_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Fire Wave", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Fire Wave", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatFireWave_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Fire Wave", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Fire Wave", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_RageOfTheSkies_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Rage of the Skies", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Rage of the Skies", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_RageOfTheSkies_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Rage of the Skies", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Rage of the Skies", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatEnergyBeam_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Energy Beam", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Energy Beam", bonus)); break; case WheelGemSupremeModifier_t::Sorcerer_GreatEnergyBeam_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Energy Beam", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Great Energy Beam", bonus)); break; case WheelGemSupremeModifier_t::Druid_AvatarOfNature_Cooldown: bonus.decrease.cooldown = 300 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Nature", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Avatar of Nature", bonus)); break; case WheelGemSupremeModifier_t::Druid_NaturesEmbrace_Cooldown: bonus.decrease.cooldown = 5 * 1000; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Nature's Embrace", bonus)); + wheelBonus.momentum += grade < 3 ? 0.33 * grade : 1; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Nature's Embrace", bonus)); break; case WheelGemSupremeModifier_t::Druid_TerraBurst_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Burst", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Burst", bonus)); break; case WheelGemSupremeModifier_t::Druid_TerraBurst_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Burst", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Burst", bonus)); break; case WheelGemSupremeModifier_t::Druid_IceBurst_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ice Burst", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ice Burst", bonus)); break; case WheelGemSupremeModifier_t::Druid_IceBurst_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ice Burst", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Ice Burst", bonus)); break; case WheelGemSupremeModifier_t::Druid_EternalWinter_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Eternal Winter", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Eternal Winter", bonus)); break; case WheelGemSupremeModifier_t::Druid_EternalWinter_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Eternal Winter", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Eternal Winter", bonus)); break; case WheelGemSupremeModifier_t::Druid_TerraWave_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Wave", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Wave", bonus)); break; case WheelGemSupremeModifier_t::Druid_TerraWave_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Wave", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Terra Wave", bonus)); break; case WheelGemSupremeModifier_t::Druid_StrongIceWave_DamageIncrease: - bonus.increase.damage = 25; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ice Wave", bonus)); + bonus.increase.damage = 25 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ice Wave", bonus)); break; case WheelGemSupremeModifier_t::Druid_StrongIceWave_CriticalExtraDamage: - bonus.increase.criticalDamage = 8; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ice Wave", bonus)); + bonus.increase.criticalDamage = 8 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Strong Ice Wave", bonus)); break; case WheelGemSupremeModifier_t::Druid_HealFriend_HealingIncrease: - bonus.increase.heal = 10; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Heal Friend", bonus)); + bonus.increase.heal = 10 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Heal Friend", bonus)); break; case WheelGemSupremeModifier_t::Druid_MassHealing_HealingIncrease: - bonus.increase.heal = 10; - m_strategies.push_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Mass Healing", bonus)); + bonus.increase.heal = 10 * gradeMultiplier; + m_strategies.emplace_back(std::make_unique<GemModifierSpellBonusStrategy>(m_wheel, "Mass Healing", bonus)); break; default: g_logger().error("WheelModifierContext::setStrategy: Invalid supreme modifier: {}", static_cast<uint8_t>(modifier)); } } -void WheelModifierContext::executeStrategies() { - for (auto &strategy : m_strategies) { +void WheelModifierContext::executeStrategies() const { + for (const auto &strategy : m_strategies) { strategy->execute(); } } + +int32_t WheelGemUtils::getHealthValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { + static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { + { + WheelGemBasicModifier_t::Vocation_Health, + { + { Vocation_t::VOCATION_KNIGHT, 300 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Health_FireResistance, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Health_EnergyResistance, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Health_EarthResistance, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Health_IceResistance, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mixed, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mixed2, + { + { Vocation_t::VOCATION_KNIGHT, 150 }, + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 50 }, + { Vocation_t::VOCATION_DRUID, 50 }, + }, + }, + }; + + auto modifierIt = stats.find(modifier); + if (modifierIt != stats.end()) { + auto vocationIt = modifierIt->second.find(vocation); + if (vocationIt != modifierIt->second.end()) { + return vocationIt->second; + } + } + return 0; +} + +int32_t WheelGemUtils::getManaValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { + static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { + { + WheelGemBasicModifier_t::Vocation_Mana_FireResistance, + { + { Vocation_t::VOCATION_KNIGHT, 50 }, + { Vocation_t::VOCATION_PALADIN, 150 }, + { Vocation_t::VOCATION_SORCERER, 300 }, + { Vocation_t::VOCATION_DRUID, 300 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mana_EnergyResistance, + { + { Vocation_t::VOCATION_KNIGHT, 50 }, + { Vocation_t::VOCATION_PALADIN, 150 }, + { Vocation_t::VOCATION_SORCERER, 300 }, + { Vocation_t::VOCATION_DRUID, 300 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mana_Earth_Resistance, + { + { Vocation_t::VOCATION_KNIGHT, 50 }, + { Vocation_t::VOCATION_PALADIN, 150 }, + { Vocation_t::VOCATION_SORCERER, 300 }, + { Vocation_t::VOCATION_DRUID, 300 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mana_Ice_Resistance, + { + { Vocation_t::VOCATION_KNIGHT, 50 }, + { Vocation_t::VOCATION_PALADIN, 150 }, + { Vocation_t::VOCATION_SORCERER, 300 }, + { Vocation_t::VOCATION_DRUID, 300 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mana, + { + { Vocation_t::VOCATION_KNIGHT, 100 }, + { Vocation_t::VOCATION_PALADIN, 300 }, + { Vocation_t::VOCATION_SORCERER, 600 }, + { Vocation_t::VOCATION_DRUID, 600 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mixed, + { + { Vocation_t::VOCATION_PALADIN, 100 }, + { Vocation_t::VOCATION_SORCERER, 150 }, + { Vocation_t::VOCATION_DRUID, 150 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Capacity, + { + { Vocation_t::VOCATION_KNIGHT, 50 }, + { Vocation_t::VOCATION_PALADIN, 150 }, + { Vocation_t::VOCATION_SORCERER, 300 }, + { Vocation_t::VOCATION_DRUID, 300 }, + }, + } + }; + + auto modifierIt = stats.find(modifier); + if (modifierIt != stats.end()) { + auto vocationIt = modifierIt->second.find(vocation); + if (vocationIt != modifierIt->second.end()) { + return vocationIt->second; + } + } + return 0; +} + +int32_t WheelGemUtils::getCapacityValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { + static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { + { + WheelGemBasicModifier_t::Vocation_Capacity_FireResistance, + { + { Vocation_t::VOCATION_KNIGHT, 250 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Capacity_EnergyResistance, + { + { Vocation_t::VOCATION_KNIGHT, 250 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Capacity_EarthResistance, + { + { Vocation_t::VOCATION_KNIGHT, 250 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Capacity_IceResistance, + { + { Vocation_t::VOCATION_KNIGHT, 250 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Capacity, + { + { Vocation_t::VOCATION_KNIGHT, 500 }, + { Vocation_t::VOCATION_PALADIN, 400 }, + { Vocation_t::VOCATION_SORCERER, 200 }, + { Vocation_t::VOCATION_DRUID, 200 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mixed, + { + { Vocation_t::VOCATION_KNIGHT, 125 }, + }, + }, + { + WheelGemBasicModifier_t::Vocation_Mixed2, + { + { Vocation_t::VOCATION_KNIGHT, 250 }, + { Vocation_t::VOCATION_PALADIN, 200 }, + { Vocation_t::VOCATION_SORCERER, 100 }, + { Vocation_t::VOCATION_DRUID, 100 }, + }, + } + }; + + auto modifierIt = stats.find(modifier); + if (modifierIt != stats.end()) { + auto vocationIt = modifierIt->second.find(vocation); + if (vocationIt != modifierIt->second.end()) { + return vocationIt->second; + } + } + return 0; +} diff --git a/src/creatures/players/wheel/wheel_gems.hpp b/src/creatures/players/wheel/wheel_gems.hpp index 668d8fe05..7b7482667 100644 --- a/src/creatures/players/wheel/wheel_gems.hpp +++ b/src/creatures/players/wheel/wheel_gems.hpp @@ -9,166 +9,17 @@ #pragma once -#include "wheel_definitions.hpp" +#include "creatures/players/wheel/wheel_definitions.hpp" class PlayerWheel; -enum class WheelGemAction_t : uint8_t { - Destroy, - Reveal, - SwitchDomain, - ToggleLock, -}; - -enum class WheelGemAffinity_t : uint8_t { - Green, - Red, - Blue, - Purple, -}; - -enum class WheelGemQuality_t : uint8_t { - Lesser, - Regular, - Greater, -}; - -enum class WheelGemBasicModifier_t : uint8_t { - General_PhysicalResistance, - General_HolyResistance, - General_DeathResistance, - General_FireResistance, - General_EarthResistance, - General_IceResistance, - General_EnergyResistance, - - General_HolyResistance_DeathWeakness, - General_DeathResistance_HolyWeakness, - General_FireResistance_EarthResistance, - General_FireResistance_IceResistance, - General_FireResistance_EnergyResistance, - General_EarthResistance_IceResistance, - General_EarthResistance_EnergyResistance, - General_IceResistance_EnergyResistance, - - General_FireResistance_EarthWeakness, - General_FireResistance_IceWeakness, - General_FireResistance_EnergyWeakness, - General_EarthResistance_FireWeakness, - General_EarthResistance_IceWeakness, - General_EarthResistance_EnergyWeakness, - General_IceResistance_EarthWeakness, - General_IceResistance_FireWeakness, - General_IceResistance_EnergyWeakness, - General_EnergyResistance_EarthWeakness, - General_EnergyResistance_IceWeakness, - General_EnergyResistance_FireWeakness, - General_ManaDrainResistance, - General_LifeDrainResistance, - General_ManaDrainResistance_LifeDrainResistance, - General_MitigationMultiplier, - - Vocation_Health, - Vocation_Capacity, - Vocation_Mana_FireResistance, - Vocation_Mana_EnergyResistance, - Vocation_Mana_Earth_Resistance, - Vocation_Mana_Ice_Resistance, - Vocation_Mana, - Vocation_Health_FireResistance, - Vocation_Health_EnergyResistance, - Vocation_Health_EarthResistance, - Vocation_Health_IceResistance, - Vocation_Mixed, - Vocation_Mixed2, - Vocation_Capacity_FireResistance, - Vocation_Capacity_EnergyResistance, - Vocation_Capacity_EarthResistance, - Vocation_Capacity_IceResistance, -}; - -enum class WheelGemSupremeModifier_t : uint8_t { - General_Dodge, - General_CriticalDamage, - General_LifeLeech, - General_ManaLeech, - SorcererDruid_UltimateHealing, - General_RevelationMastery_GiftOfLife, - - Knight_AvatarOfSteel_Cooldown, - Knight_ExecutionersThrow_Cooldown, - Knight_ExecutionersThrow_DamageIncrease, - Knight_ExecutionersThrow_CriticalExtraDamage, - Knight_Fierce_Berserk_DamageIncrease, - Knight_Fierce_Berserk_CriticalExtraDamage, - Knight_Berserk_DamageIncrease, - Knight_Berserk_CriticalExtraDamage, - Knight_Front_Sweep_CriticalExtraDamage, - Knight_Front_Sweep_DamageIncrease, - Knight_Groundshaker_DamageIncrease, - Knight_Groundshaker_CriticalExtraDamage, - Knight_Annihilation_CriticalExtraDamage, - Knight_Annihilation_DamageIncrease, - Knight_FairWoundCleansing_HealingIncrease, - Knight_RevelationMastery_AvatarOfSteel, - Knight_RevelationMastery_ExecutionersThrow, - Knight_RevelationMastery_CombatMastery, - - Paladin_AvatarOfLight_Cooldown, - Paladin_DivineDazzle_Cooldown, - Paladin_DivineGrenade_DamageIncrease, - Paladin_DivineGrenade_CriticalExtraDamage, - Paladin_DivineCaldera_DamageIncrease, - Paladin_DivineCaldera_CriticalExtraDamage, - Paladin_DivineMissile_DamageIncrease, - Paladin_DivineMissile_CriticalExtraDamage, - Paladin_EtherealSpear_DamageIncrease, - Paladin_EtherealSpear_CriticalExtraDamage, - Paladin_StrongEtherealSpear_DamageIncrease, - Paladin_StrongEtherealSpear_CriticalExtraDamage, - Paladin_DivineEmpowerment_Cooldown, - Paladin_DivineGrenade_Cooldown, - Paladin_Salvation_HealingIncrease, - Paladin_RevelationMastery_AvatarOfLight, - Paladin_RevelationMastery_DivineGrenade, - Paladin_RevelationMastery_DivineEmpowerment, +enum CombatType_t : uint8_t; +enum Vocation_t : uint16_t; - Sorcerer_AvatarOfStorm_Cooldown, - Sorcerer_EnergyWave_Cooldown, - Sorcerer_GreatDeathBeam_DamageIncrease, - Sorcerer_GreatDeathBeam_CriticalExtraDamage, - Sorcerer_HellsCore_DamageIncrease, - Sorcerer_HellsCore_CriticalExtraDamage, - Sorcerer_EnergyWave_DamageIncrease, - Sorcerer_EnergyWave_CriticalExtraDamage, - Sorcerer_GreatFireWave_DamageIncrease, - Sorcerer_GreatFireWave_CriticalExtraDamage, - Sorcerer_RageOfTheSkies_DamageIncrease, - Sorcerer_RageOfTheSkies_CriticalExtraDamage, - Sorcerer_GreatEnergyBeam_DamageIncrease, - Sorcerer_GreatEnergyBeam_CriticalExtraDamage, - Sorcerer_RevelationMastery_AvatarOfStorm, - Sorcerer_RevelationMastery_BeamMastery, - Sorcerer_RevelationMastery_DrainBody, - - Druid_AvatarOfNature_Cooldown, - Druid_NaturesEmbrace_Cooldown, - Druid_TerraBurst_DamageIncrease, - Druid_TerraBurst_CriticalExtraDamage, - Druid_IceBurst_DamageIncrease, - Druid_IceBurst_CriticalExtraDamage, - Druid_EternalWinter_CriticalExtraDamage, - Druid_EternalWinter_DamageIncrease, - Druid_TerraWave_DamageIncrease, - Druid_TerraWave_CriticalExtraDamage, - Druid_StrongIceWave_DamageIncrease, - Druid_StrongIceWave_CriticalExtraDamage, - Druid_HealFriend_HealingIncrease, - Druid_MassHealing_HealingIncrease, - Druid_RevelationMastery_AvatarOfNature, - Druid_RevelationMastery_BlessingOfTheGrove, - Druid_RevelationMastery_TwinBursts, -}; +enum class WheelGemAffinity_t : uint8_t; +enum class WheelGemBasicModifier_t : uint8_t; +enum class WheelGemSupremeModifier_t : uint8_t; +enum class WheelStat_t : uint8_t; class GemModifierStrategy { public: @@ -181,7 +32,7 @@ class GemModifierStrategy { PlayerWheel &m_wheel; }; -class GemModifierResistanceStrategy : public GemModifierStrategy { +class GemModifierResistanceStrategy final : public GemModifierStrategy { public: explicit GemModifierResistanceStrategy(PlayerWheel &wheel, CombatType_t combatType, int32_t resistance) : GemModifierStrategy(wheel), @@ -195,7 +46,7 @@ class GemModifierResistanceStrategy : public GemModifierStrategy { int32_t m_resistance; }; -class GemModifierStatStrategy : public GemModifierStrategy { +class GemModifierStatStrategy final : public GemModifierStrategy { public: explicit GemModifierStatStrategy(PlayerWheel &wheel, WheelStat_t stat, int32_t value) : GemModifierStrategy(wheel), @@ -206,25 +57,26 @@ class GemModifierStatStrategy : public GemModifierStrategy { private: WheelStat_t m_stat; - int32_t m_value; + int32_t m_value {}; }; -class GemModifierRevelationStrategy : public GemModifierStrategy { +class GemModifierRevelationStrategy final : public GemModifierStrategy { public: explicit GemModifierRevelationStrategy(PlayerWheel &wheel, WheelGemAffinity_t affinity, [[maybe_unused]] uint16_t value) : GemModifierStrategy(wheel), - m_affinity(affinity) { } + m_affinity(affinity), + m_value(value) { } void execute() override; private: WheelGemAffinity_t m_affinity; - uint16_t m_value; + uint16_t m_value {}; }; -class GemModifierSpellBonusStrategy : public GemModifierStrategy { +class GemModifierSpellBonusStrategy final : public GemModifierStrategy { public: - explicit GemModifierSpellBonusStrategy(PlayerWheel &wheel, std::string spellName, WheelSpells::Bonus bonus) : + explicit GemModifierSpellBonusStrategy(PlayerWheel &wheel, std::string spellName, const WheelSpells::Bonus &bonus) : GemModifierStrategy(wheel), m_spellName(std::move(spellName)), m_bonus(bonus) { } @@ -241,14 +93,14 @@ class WheelModifierContext { explicit WheelModifierContext(PlayerWheel &wheel, Vocation_t vocation) : m_wheel(wheel), m_vocation(vocation) { } - void addStrategies(WheelGemBasicModifier_t modifier); - void addStrategies(WheelGemSupremeModifier_t modifier); + void addStrategies(WheelGemBasicModifier_t modifier, uint8_t grade); + void addStrategies(WheelGemSupremeModifier_t modifier, uint8_t grade); void resetStrategies() { m_strategies.clear(); } - void executeStrategies(); + void executeStrategies() const; private: std::vector<std::unique_ptr<GemModifierStrategy>> m_strategies; @@ -256,229 +108,9 @@ class WheelModifierContext { Vocation_t m_vocation; }; -[[maybe_unused]] static int32_t getHealthValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { - static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { - { - WheelGemBasicModifier_t::Vocation_Health, - { - { Vocation_t::VOCATION_KNIGHT, 300 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Health_FireResistance, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Health_EnergyResistance, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Health_EarthResistance, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Health_IceResistance, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mixed, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mixed2, - { - { Vocation_t::VOCATION_KNIGHT, 150 }, - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 50 }, - { Vocation_t::VOCATION_DRUID, 50 }, - }, - }, - }; - - auto modifierIt = stats.find(modifier); - if (modifierIt != stats.end()) { - auto vocationIt = modifierIt->second.find(vocation); - if (vocationIt != modifierIt->second.end()) { - return vocationIt->second; - } - } - return 0; -} - -[[maybe_unused]] static int32_t getManaValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { - static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { - { - WheelGemBasicModifier_t::Vocation_Mana_FireResistance, - { - { Vocation_t::VOCATION_KNIGHT, 50 }, - { Vocation_t::VOCATION_PALADIN, 150 }, - { Vocation_t::VOCATION_SORCERER, 300 }, - { Vocation_t::VOCATION_DRUID, 300 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mana_EnergyResistance, - { - { Vocation_t::VOCATION_KNIGHT, 50 }, - { Vocation_t::VOCATION_PALADIN, 150 }, - { Vocation_t::VOCATION_SORCERER, 300 }, - { Vocation_t::VOCATION_DRUID, 300 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mana_Earth_Resistance, - { - { Vocation_t::VOCATION_KNIGHT, 50 }, - { Vocation_t::VOCATION_PALADIN, 150 }, - { Vocation_t::VOCATION_SORCERER, 300 }, - { Vocation_t::VOCATION_DRUID, 300 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mana_Ice_Resistance, - { - { Vocation_t::VOCATION_KNIGHT, 50 }, - { Vocation_t::VOCATION_PALADIN, 150 }, - { Vocation_t::VOCATION_SORCERER, 300 }, - { Vocation_t::VOCATION_DRUID, 300 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mana, - { - { Vocation_t::VOCATION_KNIGHT, 100 }, - { Vocation_t::VOCATION_PALADIN, 300 }, - { Vocation_t::VOCATION_SORCERER, 600 }, - { Vocation_t::VOCATION_DRUID, 600 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mixed, - { - { Vocation_t::VOCATION_PALADIN, 100 }, - { Vocation_t::VOCATION_SORCERER, 150 }, - { Vocation_t::VOCATION_DRUID, 150 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Capacity, - { - { Vocation_t::VOCATION_KNIGHT, 50 }, - { Vocation_t::VOCATION_PALADIN, 150 }, - { Vocation_t::VOCATION_SORCERER, 300 }, - { Vocation_t::VOCATION_DRUID, 300 }, - }, - } - }; - - auto modifierIt = stats.find(modifier); - if (modifierIt != stats.end()) { - auto vocationIt = modifierIt->second.find(vocation); - if (vocationIt != modifierIt->second.end()) { - return vocationIt->second; - } - } - return 0; -} - -[[maybe_unused]] static int32_t getCapacityValue(Vocation_t vocation, WheelGemBasicModifier_t modifier) { - static const std::unordered_map<WheelGemBasicModifier_t, std::unordered_map<Vocation_t, int32_t>> stats = { - { - WheelGemBasicModifier_t::Vocation_Capacity_FireResistance, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Capacity_EnergyResistance, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Capacity_EarthResistance, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Capacity_IceResistance, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Capacity, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mixed, - { - { Vocation_t::VOCATION_KNIGHT, 125 }, - }, - }, - { - WheelGemBasicModifier_t::Vocation_Mixed2, - { - { Vocation_t::VOCATION_KNIGHT, 250 }, - { Vocation_t::VOCATION_PALADIN, 200 }, - { Vocation_t::VOCATION_SORCERER, 100 }, - { Vocation_t::VOCATION_DRUID, 100 }, - }, - } - }; - - auto modifierIt = stats.find(modifier); - if (modifierIt != stats.end()) { - auto vocationIt = modifierIt->second.find(vocation); - if (vocationIt != modifierIt->second.end()) { - return vocationIt->second; - } - } - return 0; -} +class WheelGemUtils { +public: + [[maybe_unused]] static int32_t getHealthValue(Vocation_t vocation, WheelGemBasicModifier_t modifier); + [[maybe_unused]] static int32_t getManaValue(Vocation_t vocation, WheelGemBasicModifier_t modifier); + [[maybe_unused]] static int32_t getCapacityValue(Vocation_t vocation, WheelGemBasicModifier_t modifier); +}; diff --git a/src/database/database.cpp b/src/database/database.cpp index f226587c5..fcb737170 100644 --- a/src/database/database.cpp +++ b/src/database/database.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "database/database.hpp" #include "config/configmanager.hpp" -#include "database/database.hpp" #include "lib/di/container.hpp" #include "lib/metrics/metrics.hpp" @@ -25,7 +24,7 @@ Database &Database::getInstance() { } bool Database::connect() { - return connect(&g_configManager().getString(MYSQL_HOST, __FUNCTION__), &g_configManager().getString(MYSQL_USER, __FUNCTION__), &g_configManager().getString(MYSQL_PASS, __FUNCTION__), &g_configManager().getString(MYSQL_DB, __FUNCTION__), g_configManager().getNumber(SQL_PORT, __FUNCTION__), &g_configManager().getString(MYSQL_SOCK, __FUNCTION__)); + return connect(&g_configManager().getString(MYSQL_HOST), &g_configManager().getString(MYSQL_USER), &g_configManager().getString(MYSQL_PASS), &g_configManager().getString(MYSQL_DB), g_configManager().getNumber(SQL_PORT), &g_configManager().getString(MYSQL_SOCK)); } bool Database::connect(const std::string* host, const std::string* user, const std::string* password, const std::string* database, uint32_t port, const std::string* sock) { @@ -44,6 +43,10 @@ bool Database::connect(const std::string* host, const std::string* user, const s bool reconnect = true; mysql_options(handle, MYSQL_OPT_RECONNECT, &reconnect); + // Remove ssl verification + bool ssl_enabled = false; + mysql_options(handle, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &ssl_enabled); + // connects to database if (!mysql_real_connect(handle, host->c_str(), user->c_str(), password->c_str(), database->c_str(), port, sock->c_str(), 0)) { g_logger().error("MySQL Error Message: {}", mysql_error(handle)); @@ -99,11 +102,11 @@ bool Database::commit() { return true; } -bool Database::isRecoverableError(unsigned int error) const { +bool Database::isRecoverableError(unsigned int error) { return error == CR_SERVER_LOST || error == CR_SERVER_GONE_ERROR || error == CR_CONN_HOST_ERROR || error == 1053 /*ER_SERVER_SHUTDOWN*/ || error == CR_CONNECTION_ERROR; } -bool Database::retryQuery(const std::string_view &query, int retries) { +bool Database::retryQuery(std::string_view query, int retries) { while (retries > 0 && mysql_query(handle, query.data()) != 0) { g_logger().error("Query: {}", query.substr(0, 256)); g_logger().error("MySQL error [{}]: {}", mysql_errno(handle), mysql_error(handle)); @@ -121,7 +124,7 @@ bool Database::retryQuery(const std::string_view &query, int retries) { return true; } -bool Database::executeQuery(const std::string_view &query) { +bool Database::executeQuery(std::string_view query) { if (!handle) { g_logger().error("Database not initialized!"); return false; @@ -140,7 +143,7 @@ bool Database::executeQuery(const std::string_view &query) { return success; } -DBResult_ptr Database::storeQuery(const std::string_view &query) { +DBResult_ptr Database::storeQuery(std::string_view query) { if (!handle) { g_logger().error("Database not initialized!"); return nullptr; @@ -223,10 +226,10 @@ std::string DBResult::getString(const std::string &s) const { auto it = listNames.find(s); if (it == listNames.end()) { g_logger().error("Column '{}' does not exist in result set", s); - return std::string(); + return {}; } if (row[it->second] == nullptr) { - return std::string(); + return {}; } return std::string(row[it->second]); } @@ -248,7 +251,7 @@ const char* DBResult::getStream(const std::string &s, unsigned long &size) const return row[it->second]; } -uint8_t DBResult::getU8FromString(const std::string &string, const std::string &function) const { +uint8_t DBResult::getU8FromString(const std::string &string, const std::string &function) { auto result = static_cast<uint8_t>(std::atoi(string.c_str())); if (result > std::numeric_limits<uint8_t>::max()) { g_logger().error("[{}] Failed to get number value {} for tier table result, on function call: {}", __FUNCTION__, result, function); @@ -258,7 +261,7 @@ uint8_t DBResult::getU8FromString(const std::string &string, const std::string & return result; } -int8_t DBResult::getInt8FromString(const std::string &string, const std::string &function) const { +int8_t DBResult::getInt8FromString(const std::string &string, const std::string &function) { auto result = static_cast<int8_t>(std::atoi(string.c_str())); if (result > std::numeric_limits<int8_t>::max()) { g_logger().error("[{}] Failed to get number value {} for tier table result, on function call: {}", __FUNCTION__, result, function); diff --git a/src/database/database.hpp b/src/database/database.hpp index 2a27c3015..69c47d324 100644 --- a/src/database/database.hpp +++ b/src/database/database.hpp @@ -10,11 +10,11 @@ #pragma once #include "declarations.hpp" -#include "lib/logging/log_with_spd_log.hpp" #ifndef USE_PRECOMPILED_HEADERS #include <mysql/mysql.h> #include <mutex> + #include <utility> #endif class DBResult; @@ -37,10 +37,10 @@ class Database { bool connect(const std::string* host, const std::string* user, const std::string* password, const std::string* database, uint32_t port, const std::string* sock); - bool retryQuery(const std::string_view &query, int retries); - bool executeQuery(const std::string_view &query); + bool retryQuery(std::string_view query, int retries); + bool executeQuery(std::string_view query); - DBResult_ptr storeQuery(const std::string_view &query); + DBResult_ptr storeQuery(std::string_view query); std::string escapeString(const std::string &s) const; @@ -63,7 +63,7 @@ class Database { bool rollback(); bool commit(); - bool isRecoverableError(unsigned int error) const; + static bool isRecoverableError(unsigned int error); MYSQL* handle = nullptr; std::recursive_mutex databaseLock; @@ -95,8 +95,19 @@ class DBResult { return T(); } - T data = 0; + T data {}; try { + // Check if the type T is a enum + if constexpr (std::is_enum_v<T>) { + using underlying_type = std::underlying_type_t<T>; + underlying_type value = 0; + if constexpr (std::is_signed_v<underlying_type>) { + value = static_cast<underlying_type>(std::stoll(row[it->second])); + } else { + value = static_cast<underlying_type>(std::stoull(row[it->second])); + } + return static_cast<T>(value); + } // Check if the type T is signed or unsigned if constexpr (std::is_signed_v<T>) { // Check if the type T is int8_t or int16_t @@ -149,8 +160,8 @@ class DBResult { std::string getString(const std::string &s) const; const char* getStream(const std::string &s, unsigned long &size) const; - uint8_t getU8FromString(const std::string &string, const std::string &function) const; - int8_t getInt8FromString(const std::string &string, const std::string &function) const; + static uint8_t getU8FromString(const std::string &string, const std::string &function); + static int8_t getInt8FromString(const std::string &string, const std::string &function); size_t countResults() const; bool hasNext() const; @@ -172,7 +183,7 @@ class DBInsert { public: explicit DBInsert(std::string query); void upsert(const std::vector<std::string> &columns); - bool addRow(const std::string_view row); + bool addRow(std::string_view row); bool addRow(std::ostringstream &row); bool execute(); @@ -199,16 +210,20 @@ class DBTransaction { template <typename Func> static bool executeWithinTransaction(const Func &toBeExecuted) { - DBTransaction transaction; - try { - transaction.begin(); - bool result = toBeExecuted(); - transaction.commit(); - return result; - } catch (const std::exception &exception) { - transaction.rollback(); - g_logger().error("[{}] Error occurred committing transaction, error: {}", __FUNCTION__, exception.what()); - return false; + bool changesExpected = toBeExecuted(); + if (changesExpected) { + DBTransaction transaction; + try { + transaction.begin(); + transaction.commit(); + return changesExpected; + } catch (const std::exception &exception) { + transaction.rollback(); + g_logger().error("[{}] Error occurred during transaction, error: {}", __FUNCTION__, exception.what()); + return false; + } + } else { + return true; } } @@ -280,10 +295,10 @@ class DBTransaction { class DatabaseException : public std::exception { public: - explicit DatabaseException(const std::string &message) : - message(message) { } + explicit DatabaseException(std::string message) : + message(std::move(message)) { } - virtual const char* what() const throw() { + const char* what() const noexcept override { return message.c_str(); } diff --git a/src/database/databasemanager.cpp b/src/database/databasemanager.cpp index dfbb7d9a6..2941172f3 100644 --- a/src/database/databasemanager.cpp +++ b/src/database/databasemanager.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "database/databasemanager.hpp" #include "config/configmanager.hpp" -#include "database/databasemanager.hpp" #include "lua/functions/core/libs/core_libs_functions.hpp" #include "lua/scripts/luascript.hpp" @@ -18,7 +17,7 @@ bool DatabaseManager::optimizeTables() { Database &db = Database::getInstance(); std::ostringstream query; - query << "SELECT `TABLE_NAME` FROM `information_schema`.`TABLES` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB, __FUNCTION__)) << " AND `DATA_FREE` > 0"; + query << "SELECT `TABLE_NAME` FROM `information_schema`.`TABLES` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB)) << " AND `DATA_FREE` > 0"; DBResult_ptr result = db.storeQuery(query.str()); if (!result) { return false; @@ -47,14 +46,14 @@ bool DatabaseManager::tableExists(const std::string &tableName) { Database &db = Database::getInstance(); std::ostringstream query; - query << "SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB, __FUNCTION__)) << " AND `TABLE_NAME` = " << db.escapeString(tableName) << " LIMIT 1"; + query << "SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB)) << " AND `TABLE_NAME` = " << db.escapeString(tableName) << " LIMIT 1"; return db.storeQuery(query.str()).get() != nullptr; } bool DatabaseManager::isDatabaseSetup() { Database &db = Database::getInstance(); std::ostringstream query; - query << "SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB, __FUNCTION__)); + query << "SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `TABLE_SCHEMA` = " << db.escapeString(g_configManager().getString(MYSQL_DB)); return db.storeQuery(query.str()).get() != nullptr; } @@ -86,7 +85,7 @@ void DatabaseManager::updateDatabase() { int32_t version = getDatabaseVersion(); do { std::ostringstream ss; - ss << g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/migrations/" << version << ".lua"; + ss << g_configManager().getString(DATA_DIRECTORY) + "/migrations/" << version << ".lua"; if (luaL_dofile(L, ss.str().c_str()) != 0) { g_logger().error("DatabaseManager::updateDatabase - Version: {}" "] {}", diff --git a/src/database/databasetasks.cpp b/src/database/databasetasks.cpp index 06cfda93f..afc4c3608 100644 --- a/src/database/databasetasks.cpp +++ b/src/database/databasetasks.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "database/databasetasks.hpp" + #include "game/scheduling/dispatcher.hpp" #include "lib/thread/thread_pool.hpp" #include "lib/di/container.hpp" @@ -22,20 +21,20 @@ DatabaseTasks &DatabaseTasks::getInstance() { return inject<DatabaseTasks>(); } -void DatabaseTasks::execute(const std::string &query, std::function<void(DBResult_ptr, bool)> callback /* nullptr */) { +void DatabaseTasks::execute(const std::string &query, const std::function<void(DBResult_ptr, bool)> &callback /* nullptr */) { threadPool.detach_task([this, query, callback]() { bool success = db.executeQuery(query); if (callback != nullptr) { - g_dispatcher().addEvent([callback, success]() { callback(nullptr, success); }, "DatabaseTasks::execute"); + g_dispatcher().addEvent([callback, success]() { callback(nullptr, success); }, __FUNCTION__); } }); } -void DatabaseTasks::store(const std::string &query, std::function<void(DBResult_ptr, bool)> callback /* nullptr */) { +void DatabaseTasks::store(const std::string &query, const std::function<void(DBResult_ptr, bool)> &callback /* nullptr */) { 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"); + g_dispatcher().addEvent([callback, result]() { callback(result, true); }, __FUNCTION__); } }); } diff --git a/src/database/databasetasks.hpp b/src/database/databasetasks.hpp index 6922dfc56..a9c86583d 100644 --- a/src/database/databasetasks.hpp +++ b/src/database/databasetasks.hpp @@ -22,8 +22,8 @@ class DatabaseTasks { static DatabaseTasks &getInstance(); - void execute(const std::string &query, std::function<void(DBResult_ptr, bool)> callback = nullptr); - void store(const std::string &query, std::function<void(DBResult_ptr, bool)> callback = nullptr); + void execute(const std::string &query, const std::function<void(DBResult_ptr, bool)> &callback = nullptr); + void store(const std::string &query, const std::function<void(DBResult_ptr, bool)> &callback = nullptr); private: Database &db; diff --git a/src/enums/account_type.hpp b/src/enums/account_type.hpp index df76c4a28..4929a32cf 100644 --- a/src/enums/account_type.hpp +++ b/src/enums/account_type.hpp @@ -14,6 +14,7 @@ #endif enum AccountType : uint8_t { + ACCOUNT_TYPE_NONE = 0, ACCOUNT_TYPE_NORMAL = 1, ACCOUNT_TYPE_TUTOR = 2, ACCOUNT_TYPE_SENIORTUTOR = 3, diff --git a/src/enums/item_attribute.hpp b/src/enums/item_attribute.hpp index be7b74457..a3d76fde7 100644 --- a/src/enums/item_attribute.hpp +++ b/src/enums/item_attribute.hpp @@ -9,7 +9,7 @@ #pragma once -enum ItemAttribute_t : uint64_t { +enum class ItemAttribute_t : uint64_t { NONE = 0, ACTIONID = 1, UNIQUEID = 2, diff --git a/src/enums/object_category.hpp b/src/enums/object_category.hpp index 74191bf9b..87f6b7e00 100644 --- a/src/enums/object_category.hpp +++ b/src/enums/object_category.hpp @@ -9,7 +9,7 @@ #pragma once -enum ObjectCategory_t { +enum ObjectCategory_t : uint8_t { OBJECTCATEGORY_NONE = 0, OBJECTCATEGORY_ARMORS = 1, OBJECTCATEGORY_NECKLACES = 2, diff --git a/src/enums/player_blessings.hpp b/src/enums/player_blessings.hpp new file mode 100644 index 000000000..086f04a64 --- /dev/null +++ b/src/enums/player_blessings.hpp @@ -0,0 +1,25 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +#ifndef USE_PRECOMPILED_HEADERS + #include <cstdint> +#endif + +enum class Blessings : uint8_t { + TwistOfFate = 1, + TheWisdomOfSolitude = 2, + TheSparkOfThePhoenix = 3, + TheFireOfTheSuns = 4, + TheSpiritualShielding = 5, + TheEmbraceOfTibia = 6, + BloodOfTheMountain = 7, + HearthOfTheMountain = 8 +}; diff --git a/src/enums/player_cyclopedia.hpp b/src/enums/player_cyclopedia.hpp index 295e57398..af7ea1701 100644 --- a/src/enums/player_cyclopedia.hpp +++ b/src/enums/player_cyclopedia.hpp @@ -13,7 +13,7 @@ #include <cstdint> #endif -enum CyclopediaBadge_t : uint8_t { +enum class CyclopediaBadge_t : uint8_t { ACCOUNT_AGE = 1, LOYALTY, ACCOUNT_ALL_LEVEL, diff --git a/src/enums/player_icons.hpp b/src/enums/player_icons.hpp new file mode 100644 index 000000000..7878d9e50 --- /dev/null +++ b/src/enums/player_icons.hpp @@ -0,0 +1,61 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +#ifndef USE_PRECOMPILED_HEADERS + #include <cstdint> +#endif + +enum class PlayerIcon : uint8_t { + Poison = 0, + Burn = 1, + Energy = 2, + Drunk = 3, + ManaShield = 4, + Paralyze = 5, + Haste = 6, + Swords = 7, + Drowning = 8, + Freezing = 9, + Dazzled = 10, + Cursed = 11, + PartyBuff = 12, + RedSwords = 13, + Pigeon = 14, + Bleeding = 15, + LesserHex = 16, + IntenseHex = 17, + GreaterHex = 18, + Rooted = 19, + Feared = 20, + GoshnarTaint1 = 21, + GoshnarTaint2 = 22, + GoshnarTaint3 = 23, + GoshnarTaint4 = 24, + GoshnarTaint5 = 25, + NewManaShield = 26, + Agony = 27, + + // Must always be the last + Count +}; + +enum class IconBakragore : uint8_t { + None = 0, + Taint1 = 1, + Taint2 = 2, + Taint3 = 3, + Taint4 = 4, + Taint5 = 5, + Taint6 = 6, + Taint7 = 7, + Taint8 = 8, + Taint9 = 9, +}; diff --git a/src/enums/player_wheel.hpp b/src/enums/player_wheel.hpp new file mode 100644 index 000000000..6133f1915 --- /dev/null +++ b/src/enums/player_wheel.hpp @@ -0,0 +1,185 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +#ifndef USE_PRECOMPILED_HEADERS + #include <cstdint> +#endif + +enum class WheelGemAction_t : uint8_t { + Destroy, + Reveal, + SwitchDomain, + ToggleLock, + ImproveGrade +}; + +enum class WheelImproveGemGrade_t : uint8_t { + Grade1, + Grade2, + Grade3, + Grade4, +}; + +enum class WheelFragmentType_t : uint8_t { + Greater, + Lesser, +}; + +enum class WheelGemAffinity_t : uint8_t { + Green, + Red, + Blue, + Purple, +}; + +enum class WheelGemQuality_t : uint8_t { + Lesser, + Regular, + Greater, +}; + +enum class WheelGemBasicModifier_t : uint8_t { + General_PhysicalResistance, + General_HolyResistance, + General_DeathResistance, + General_FireResistance, + General_EarthResistance, + General_IceResistance, + General_EnergyResistance, + + General_HolyResistance_DeathWeakness, + General_DeathResistance_HolyWeakness, + General_FireResistance_EarthResistance, + General_FireResistance_IceResistance, + General_FireResistance_EnergyResistance, + General_EarthResistance_IceResistance, + General_EarthResistance_EnergyResistance, + General_IceResistance_EnergyResistance, + + General_FireResistance_EarthWeakness, + General_FireResistance_IceWeakness, + General_FireResistance_EnergyWeakness, + General_EarthResistance_FireWeakness, + General_EarthResistance_IceWeakness, + General_EarthResistance_EnergyWeakness, + General_IceResistance_EarthWeakness, + General_IceResistance_FireWeakness, + General_IceResistance_EnergyWeakness, + General_EnergyResistance_EarthWeakness, + General_EnergyResistance_IceWeakness, + General_EnergyResistance_FireWeakness, + General_ManaDrainResistance, + General_LifeDrainResistance, + General_ManaDrainResistance_LifeDrainResistance, + General_MitigationMultiplier, + + Vocation_Health, + // Vocation_Mana_Capacity = 32, INVALID MODIFIER, WILL BE DISPLAYED AS (UNKNOWN) + Vocation_Mana_FireResistance = 33, + Vocation_Mana_EnergyResistance, + Vocation_Mana_Earth_Resistance, + Vocation_Mana_Ice_Resistance, + Vocation_Mana, + Vocation_Health_FireResistance, + Vocation_Health_EnergyResistance, + Vocation_Health_EarthResistance, + Vocation_Health_IceResistance, + Vocation_Mixed, + Vocation_Mixed2, + Vocation_Capacity_FireResistance, + Vocation_Capacity_EnergyResistance, + Vocation_Capacity_EarthResistance, + Vocation_Capacity_IceResistance, + Vocation_Capacity, +}; + +enum class WheelGemSupremeModifier_t : uint8_t { + General_Dodge, + General_CriticalDamage, + General_LifeLeech, + General_ManaLeech, + SorcererDruid_UltimateHealing, + General_RevelationMastery_GiftOfLife, + + Knight_AvatarOfSteel_Cooldown, + Knight_ExecutionersThrow_Cooldown, + Knight_ExecutionersThrow_DamageIncrease, + Knight_ExecutionersThrow_CriticalExtraDamage, + Knight_Fierce_Berserk_DamageIncrease, + Knight_Fierce_Berserk_CriticalExtraDamage, + Knight_Berserk_DamageIncrease, + Knight_Berserk_CriticalExtraDamage, + Knight_Front_Sweep_DamageIncrease, + Knight_Front_Sweep_CriticalExtraDamage, + Knight_Groundshaker_DamageIncrease, + Knight_Groundshaker_CriticalExtraDamage, + Knight_Annihilation_DamageIncrease, + Knight_Annihilation_CriticalExtraDamage, + Knight_FairWoundCleansing_HealingIncrease, + Knight_RevelationMastery_AvatarOfSteel, + Knight_RevelationMastery_ExecutionersThrow, + Knight_RevelationMastery_CombatMastery, + + Paladin_AvatarOfLight_Cooldown, + Paladin_DivineDazzle_Cooldown, + Paladin_DivineGrenade_DamageIncrease, + Paladin_DivineGrenade_CriticalExtraDamage, + Paladin_DivineCaldera_DamageIncrease, + Paladin_DivineCaldera_CriticalExtraDamage, + Paladin_DivineMissile_DamageIncrease, + Paladin_DivineMissile_CriticalExtraDamage, + Paladin_EtherealSpear_DamageIncrease, + Paladin_EtherealSpear_CriticalExtraDamage, + Paladin_StrongEtherealSpear_DamageIncrease, + Paladin_StrongEtherealSpear_CriticalExtraDamage, + Paladin_DivineEmpowerment_Cooldown, + Paladin_DivineGrenade_Cooldown, + Paladin_Salvation_HealingIncrease, + Paladin_RevelationMastery_AvatarOfLight, + Paladin_RevelationMastery_DivineGrenade, + Paladin_RevelationMastery_DivineEmpowerment, + + Sorcerer_AvatarOfStorm_Cooldown, + Sorcerer_EnergyWave_Cooldown, + Sorcerer_GreatDeathBeam_DamageIncrease, + Sorcerer_GreatDeathBeam_CriticalExtraDamage, + Sorcerer_HellsCore_DamageIncrease, + Sorcerer_HellsCore_CriticalExtraDamage, + Sorcerer_EnergyWave_DamageIncrease, + Sorcerer_EnergyWave_CriticalExtraDamage, + Sorcerer_GreatFireWave_DamageIncrease, + Sorcerer_GreatFireWave_CriticalExtraDamage, + Sorcerer_RageOfTheSkies_DamageIncrease, + Sorcerer_RageOfTheSkies_CriticalExtraDamage, + Sorcerer_GreatEnergyBeam_DamageIncrease, + Sorcerer_GreatEnergyBeam_CriticalExtraDamage, + Sorcerer_RevelationMastery_AvatarOfStorm, + Sorcerer_RevelationMastery_BeamMastery, + Sorcerer_RevelationMastery_DrainBody, + + Druid_AvatarOfNature_Cooldown, + Druid_NaturesEmbrace_Cooldown, + Druid_TerraBurst_DamageIncrease, + Druid_TerraBurst_CriticalExtraDamage, + Druid_IceBurst_DamageIncrease, + Druid_IceBurst_CriticalExtraDamage, + Druid_EternalWinter_DamageIncrease, + Druid_EternalWinter_CriticalExtraDamage, + Druid_TerraWave_DamageIncrease, + Druid_TerraWave_CriticalExtraDamage, + Druid_StrongIceWave_DamageIncrease, + Druid_StrongIceWave_CriticalExtraDamage, + Druid_HealFriend_HealingIncrease, + Druid_MassHealing_HealingIncrease, + Druid_RevelationMastery_AvatarOfNature, + Druid_RevelationMastery_BlessingOfTheGrove, + Druid_RevelationMastery_TwinBursts, +}; diff --git a/src/game/bank/bank.cpp b/src/game/bank/bank.cpp index d9a056396..c60852fe1 100644 --- a/src/game/bank/bank.cpp +++ b/src/game/bank/bank.cpp @@ -7,16 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "game/bank/bank.hpp" -#include "bank.hpp" -#include "game/game.hpp" +#include "config/configmanager.hpp" #include "creatures/players/player.hpp" -#include "io/iologindata.hpp" +#include "game/game.hpp" #include "game/scheduling/save_manager.hpp" #include "lib/metrics/metrics.hpp" -Bank::Bank(const std::shared_ptr<Bankable> bankable) : +Bank::Bank(const std::shared_ptr<Bankable> &bankable) : m_bankable(bankable) { } @@ -25,7 +24,7 @@ Bank::~Bank() { if (bankable == nullptr || bankable->isOnline()) { return; } - std::shared_ptr<Player> player = bankable->getPlayer(); + const auto &player = bankable->getPlayer(); if (player && !player->isOnline()) { g_saveManager().savePlayer(player); @@ -53,7 +52,7 @@ bool Bank::debit(uint64_t amount) { bool Bank::balance(uint64_t amount) const { auto bankable = getBankable(); if (!bankable) { - return 0; + return false; } bankable->setBankBalance(amount); return true; @@ -80,26 +79,28 @@ const std::set<std::string> deniedNames = { "paladinsample" }; -bool Bank::transferTo(const std::shared_ptr<Bank> destination, uint64_t amount) { +bool Bank::transferTo(const std::shared_ptr<Bank> &destination, uint64_t amount) { if (!destination) { g_logger().error("Bank::transferTo: destination is nullptr"); return false; } - auto bankable = getBankable(); + const auto bankable = getBankable(); if (!bankable) { g_logger().error("Bank::transferTo: bankable is nullptr"); return false; } - auto destinationBankable = destination->getBankable(); + const auto destinationBankable = destination->getBankable(); if (!destinationBankable) { g_logger().error("Bank::transferTo: destinationBankable is nullptr"); return false; } - auto destinationPlayer = destinationBankable->getPlayer(); - if (destinationPlayer != nullptr) { + const auto &destinationPlayer = destinationBankable->getPlayer(); + const auto &bankablePlayer = bankable->getPlayer(); + + if (destinationPlayer && bankablePlayer) { auto name = asLowerCaseString(destinationPlayer->getName()); replaceString(name, " ", ""); @@ -108,8 +109,17 @@ bool Bank::transferTo(const std::shared_ptr<Bank> destination, uint64_t amount) return false; } - if (destinationPlayer->getTown()->getID() < g_configManager().getNumber(MIN_TOWN_ID_TO_BANK_TRANSFER, __FUNCTION__)) { - g_logger().warn("Bank::transferTo: denied town: {}", destinationPlayer->getTown()->getID()); + const auto destinationTownId = destinationPlayer->getTown()->getID(); + const auto bankableTownId = bankablePlayer->getTown()->getID(); + const auto minTownIdToTransferFromMain = g_configManager().getNumber(MIN_TOWN_ID_TO_BANK_TRANSFER_FROM_MAIN); + + if (destinationTownId < minTownIdToTransferFromMain && bankableTownId >= minTownIdToTransferFromMain) { + g_logger().warn("[{}] Player {} is from main town, trying to transfer money to player {} in {} town.", __FUNCTION__, bankablePlayer->getName(), destinationPlayer->getName(), destinationTownId); + return false; + } + + if (bankableTownId < minTownIdToTransferFromMain && destinationTownId >= minTownIdToTransferFromMain) { + g_logger().warn("[{}] Player {} is not from main town, trying to transfer money to player {} in {} town.", __FUNCTION__, bankablePlayer->getName(), destinationPlayer->getName(), destinationTownId); return false; } } @@ -122,14 +132,17 @@ bool Bank::transferTo(const std::shared_ptr<Bank> destination, uint64_t amount) g_metrics().addCounter("balance_increase", amount, { { "player", destinationPlayer->getName() }, { "context", "bank_transfer" } }); } - if (bankable->getPlayer()) { - g_metrics().addCounter("balance_decrease", amount, { { "player", bankable->getPlayer()->getName() }, { "context", "bank_transfer" } }); + if (bankablePlayer) { + g_metrics().addCounter("balance_decrease", amount, { { "player", bankablePlayer->getName() }, { "context", "bank_transfer" } }); } return true; } -bool Bank::withdraw(std::shared_ptr<Player> player, uint64_t amount) { +bool Bank::withdraw(const std::shared_ptr<Player> &player, uint64_t amount) { + if (!player) { + return false; + } if (!debit(amount)) { return false; } @@ -138,7 +151,7 @@ bool Bank::withdraw(std::shared_ptr<Player> player, uint64_t amount) { return true; } -bool Bank::deposit(const std::shared_ptr<Bank> destination) { +bool Bank::deposit(const std::shared_ptr<Bank> &destination) { auto bankable = getBankable(); if (!bankable) { return false; @@ -150,7 +163,7 @@ bool Bank::deposit(const std::shared_ptr<Bank> destination) { return deposit(destination, amount); } -bool Bank::deposit(const std::shared_ptr<Bank> destination, uint64_t amount) { +bool Bank::deposit(const std::shared_ptr<Bank> &destination, uint64_t amount) { if (!destination) { return false; } diff --git a/src/game/bank/bank.hpp b/src/game/bank/bank.hpp index 9e65a55ae..7149d8ab0 100644 --- a/src/game/bank/bank.hpp +++ b/src/game/bank/bank.hpp @@ -29,7 +29,7 @@ class Bankable { class Bank : public SharedObject { public: - explicit Bank(const std::shared_ptr<Bankable> bankable); + explicit Bank(const std::shared_ptr<Bankable> &bankable); ~Bank() override; // Deleted copy constructor and assignment operator. @@ -42,10 +42,10 @@ class Bank : public SharedObject { bool balance(uint64_t amount) const; uint64_t balance(); bool hasBalance(uint64_t amount); - bool transferTo(const std::shared_ptr<Bank> destination, uint64_t amount); - bool withdraw(std::shared_ptr<Player> player, uint64_t amount); - bool deposit(const std::shared_ptr<Bank> destination); - bool deposit(const std::shared_ptr<Bank> destination, uint64_t amount); + bool transferTo(const std::shared_ptr<Bank> &destination, uint64_t amount); + bool withdraw(const std::shared_ptr<Player> &player, uint64_t amount); + bool deposit(const std::shared_ptr<Bank> &destination); + bool deposit(const std::shared_ptr<Bank> &destination, uint64_t amount); private: std::shared_ptr<Bankable> getBankable() const { diff --git a/src/game/functions/game_reload.cpp b/src/game/functions/game_reload.cpp index d9d9eb1f4..10f205950 100644 --- a/src/game/functions/game_reload.cpp +++ b/src/game/functions/game_reload.cpp @@ -7,21 +7,29 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "game/functions/game_reload.hpp" #include "config/configmanager.hpp" -#include "lua/creature/events.hpp" +#include "creatures/appearance/mounts/mounts.hpp" +#include "creatures/interactions/chat.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/npcs/npcs.hpp" #include "creatures/players/imbuements/imbuements.hpp" -#include "lua/scripts/lua_environment.hpp" +#include "game/game.hpp" +#include "game/zones/zone.hpp" +#include "lib/di/container.hpp" +#include "lua/creature/events.hpp" #include "lua/modules/modules.hpp" +#include "lua/scripts/lua_environment.hpp" #include "lua/scripts/scripts.hpp" -#include "game/zones/zone.hpp" GameReload::GameReload() = default; GameReload::~GameReload() = default; +GameReload &GameReload::getInstance() { + return inject<GameReload>(); +} + bool GameReload::init(Reload_t reloadTypes) { switch (reloadTypes) { case Reload_t::RELOAD_TYPE_ALL: @@ -128,7 +136,7 @@ bool GameReload::reloadOutfits() { } bool GameReload::reloadMounts() { - const bool result = g_game().mounts.reload(); + const bool result = g_game().mounts->reload(); logReloadStatus("Mounts", result); return result; } @@ -153,7 +161,7 @@ bool GameReload::reloadVocations() { } bool GameReload::reloadCore() { - const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY); const bool coreLoaded = g_luaEnvironment().loadFile(coreFolder + "/core.lua", "core.lua") == 0; if (coreLoaded) { @@ -177,8 +185,8 @@ 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__); + const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY); + const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY); g_scripts().loadScripts(coreFolder + "/scripts/lib", true, false); g_scripts().loadScripts(datapackFolder + "/scripts", false, true); @@ -200,8 +208,8 @@ bool GameReload::reloadItems() { bool GameReload::reloadMonsters() { g_monsters().clear(); - const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__); - const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + const auto &datapackFolder = g_configManager().getString(DATA_DIRECTORY); + const auto &coreFolder = g_configManager().getString(CORE_DIRECTORY); const bool scriptsLoaded = g_scripts().loadScripts(coreFolder + "/scripts/lib", true, false); const bool monsterScriptsLoaded = g_scripts().loadScripts(datapackFolder + "/monster", false, true); diff --git a/src/game/functions/game_reload.hpp b/src/game/functions/game_reload.hpp index 0f59046a9..4ef141c10 100644 --- a/src/game/functions/game_reload.hpp +++ b/src/game/functions/game_reload.hpp @@ -9,10 +9,6 @@ #pragma once -#include "game/game.hpp" - -class Game; - enum class Reload_t : uint8_t { RELOAD_TYPE_NONE, RELOAD_TYPE_ALL, @@ -37,7 +33,7 @@ enum class Reload_t : uint8_t { RELOAD_TYPE_LAST }; -class GameReload : public Game { +class GameReload { public: GameReload(); ~GameReload(); @@ -46,9 +42,7 @@ class GameReload : public Game { GameReload(const GameReload &) = delete; GameReload &operator=(const GameReload &) = delete; - static GameReload &getInstance() { - return inject<GameReload>(); - } + static GameReload &getInstance(); static bool init(Reload_t reloadType); static uint8_t getReloadNumber(Reload_t reloadTypes); diff --git a/src/game/game.cpp b/src/game/game.cpp index 8cc675439..49f8bf21d 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -7,57 +7,74 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "game/game.hpp" -#include "lua/creature/actions.hpp" -#include "items/bed.hpp" +#include "config/configmanager.hpp" +#include "creatures/appearance/mounts/mounts.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/combat/spells.hpp" #include "creatures/creature.hpp" -#include "database/databasetasks.hpp" -#include "lua/creature/events.hpp" -#include "lua/callbacks/event_callback.hpp" -#include "lua/callbacks/events_callbacks.hpp" +#include "creatures/interactions/chat.hpp" +#include "creatures/monsters/monster.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/npcs/npc.hpp" +#include "creatures/players/achievement/player_achievement.hpp" +#include "creatures/players/cyclopedia/player_badge.hpp" +#include "creatures/players/cyclopedia/player_cyclopedia.hpp" +#include "creatures/players/grouping/party.hpp" +#include "creatures/players/grouping/team_finder.hpp" #include "creatures/players/highscore_category.hpp" +#include "creatures/players/imbuements/imbuements.hpp" +#include "creatures/players/player.hpp" +#include "creatures/players/vip/player_vip.hpp" +#include "creatures/players/wheel/player_wheel.hpp" +#include "enums/player_wheel.hpp" +#include "database/databasetasks.hpp" +#include "game/scheduling/dispatcher.hpp" +#include "game/scheduling/save_manager.hpp" #include "game/zones/zone.hpp" -#include "lua/global/globalevent.hpp" -#include "io/iologindata.hpp" +#include "io/io_bosstiary.hpp" #include "io/io_wheel.hpp" +#include "io/iobestiary.hpp" +#include "io/ioguild.hpp" +#include "io/iologindata.hpp" #include "io/iomarket.hpp" +#include "io/ioprey.hpp" +#include "items/bed.hpp" +#include "items/containers/inbox/inbox.hpp" +#include "items/containers/rewards/reward.hpp" +#include "items/containers/rewards/rewardchest.hpp" #include "items/items.hpp" -#include "lua/scripts/lua_environment.hpp" -#include "creatures/monsters/monster.hpp" -#include "lua/creature/movement.hpp" -#include "game/scheduling/dispatcher.hpp" -#include "game/scheduling/save_manager.hpp" -#include "server/server.hpp" -#include "creatures/combat/spells.hpp" +#include "items/items_classification.hpp" +#include "lua/callbacks/event_callback.hpp" +#include "lua/callbacks/events_callbacks.hpp" +#include "lua/creature/actions.hpp" +#include "lua/creature/creatureevent.hpp" +#include "lua/creature/events.hpp" #include "lua/creature/talkaction.hpp" -#include "items/weapons/weapons.hpp" -#include "creatures/players/imbuements/imbuements.hpp" -#include "creatures/players/wheel/player_wheel.hpp" -#include "creatures/players/achievement/player_achievement.hpp" -#include "creatures/players/cyclopedia/player_badge.hpp" -#include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_title.hpp" -#include "creatures/npcs/npc.hpp" -#include "server/network/webhook/webhook.hpp" +#include "lua/global/globalevent.hpp" +#include "lua/scripts/lua_environment.hpp" +#include "map/spectators.hpp" #include "server/network/protocol/protocollogin.hpp" #include "server/network/protocol/protocolstatus.hpp" -#include "map/spectators.hpp" +#include "server/network/protocol/protocolgame.hpp" +#include "server/network/webhook/webhook.hpp" +#include "server/server.hpp" #include "utils/tools.hpp" -#include "kv/kv.hpp" +#include "utils/wildcardtree.hpp" -#include "enums/object_category.hpp" -#include "enums/account_type.hpp" -#include "enums/account_group_type.hpp" -#include "enums/account_errors.hpp" #include "enums/account_coins.hpp" +#include "enums/account_errors.hpp" +#include "enums/account_group_type.hpp" +#include "enums/account_type.hpp" +#include "enums/object_category.hpp" #include <appearances.pb.h> +std::vector<std::shared_ptr<Creature>> checkCreatureLists[EVENT_CREATURECOUNT]; + namespace InternalGame { - void sendBlockEffect(BlockType_t blockType, CombatType_t combatType, const Position &targetPos, std::shared_ptr<Creature> source) { + void sendBlockEffect(BlockType_t blockType, CombatType_t combatType, const Position &targetPos, const std::shared_ptr<Creature> &source) { if (blockType == BLOCK_DEFENSE) { g_game().addMagicEffect(targetPos, CONST_ME_POFF); } else if (blockType == BLOCK_ARMOR) { @@ -95,11 +112,11 @@ namespace InternalGame { } if (blockType != BLOCK_NONE) { - g_game().sendSingleSoundEffect(targetPos, SoundEffect_t::NO_DAMAGE, std::move(source)); + g_game().sendSingleSoundEffect(targetPos, SoundEffect_t::NO_DAMAGE, source); } } - bool playerCanUseItemOnHouseTile(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { + bool playerCanUseItemOnHouseTile(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { if (!player || !item) { return false; } @@ -136,7 +153,7 @@ namespace InternalGame { return true; } - bool playerCanUseItemWithOnHouseTile(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const Position &toPos, int toStackPos, int toItemId) { + bool playerCanUseItemWithOnHouseTile(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const Position &toPos, int toStackPos, int toItemId) { if (!player || !item) { return false; } @@ -146,7 +163,7 @@ namespace InternalGame { return false; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS)) { if (std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(itemTile)) { const auto &house = houseTile->getHouse(); std::shared_ptr<Thing> targetThing = g_game().internalGetThing(player, toPos, toStackPos, toItemId, STACKPOS_FIND_THING); @@ -164,7 +181,7 @@ namespace InternalGame { } template <typename T> - T getCustomAttributeValue(std::shared_ptr<Item> item, const std::string &attributeName) { + T getCustomAttributeValue(const auto item, const std::string &attributeName) { static_assert(std::is_integral<T>::value, "T must be an integral type"); auto attribute = item->getCustomAttribute(attributeName); @@ -199,156 +216,162 @@ Game::Game() { wildcardTree = std::make_shared<WildcardTreeNode>(false); + mounts = std::make_unique<Mounts>(); + + using enum CyclopediaBadge_t; + using enum CyclopediaTitle_t; + using enum HighscoreCategories_t; + using enum BestiaryType_t; m_badges = { - Badge(1, CyclopediaBadge_t::ACCOUNT_AGE, "Fledegeling Hero", 1), - Badge(2, CyclopediaBadge_t::ACCOUNT_AGE, "Veteran Hero", 5), - Badge(3, CyclopediaBadge_t::ACCOUNT_AGE, "Senior Hero", 10), - Badge(4, CyclopediaBadge_t::ACCOUNT_AGE, "Ancient Hero", 15), - Badge(5, CyclopediaBadge_t::ACCOUNT_AGE, "Exalted Hero", 20), - - Badge(6, CyclopediaBadge_t::LOYALTY, "Tibia Loyalist (Grade 1)", 100), - Badge(7, CyclopediaBadge_t::LOYALTY, "Tibia Loyalist (Grade 2)", 1000), - Badge(8, CyclopediaBadge_t::LOYALTY, "Tibia Loyalist (Grade 3)", 5000), - - Badge(9, CyclopediaBadge_t::ACCOUNT_ALL_LEVEL, "Global Player (Grade 1)", 500), - Badge(10, CyclopediaBadge_t::ACCOUNT_ALL_LEVEL, "Global Player (Grade 2)", 1000), - Badge(11, CyclopediaBadge_t::ACCOUNT_ALL_LEVEL, "Global Player (Grade 3)", 2000), - - Badge(12, CyclopediaBadge_t::ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 1)", 100), - Badge(13, CyclopediaBadge_t::ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 2)", 250), - Badge(14, CyclopediaBadge_t::ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 3)", 500), - - Badge(15, CyclopediaBadge_t::TOURNAMENT_PARTICIPATION, "Freshman of the Tournament", 1), - Badge(16, CyclopediaBadge_t::TOURNAMENT_PARTICIPATION, "Regular of the Tournament", 5), - Badge(17, CyclopediaBadge_t::TOURNAMENT_PARTICIPATION, "Hero of the Tournament", 10), - - Badge(18, CyclopediaBadge_t::TOURNAMENT_POINTS, "Tournament Competitor", 1000), - Badge(19, CyclopediaBadge_t::TOURNAMENT_POINTS, "Tournament Challenger", 2500), - Badge(20, CyclopediaBadge_t::TOURNAMENT_POINTS, "Tournament Master", 5000), - Badge(21, CyclopediaBadge_t::TOURNAMENT_POINTS, "Tournament Champion", 10000), + Badge(1, ACCOUNT_AGE, "Fledegeling Hero", 1), + Badge(2, ACCOUNT_AGE, "Veteran Hero", 5), + Badge(3, ACCOUNT_AGE, "Senior Hero", 10), + Badge(4, ACCOUNT_AGE, "Ancient Hero", 15), + Badge(5, ACCOUNT_AGE, "Exalted Hero", 20), + + Badge(6, LOYALTY, "Tibia Loyalist (Grade 1)", 100), + Badge(7, LOYALTY, "Tibia Loyalist (Grade 2)", 1000), + Badge(8, LOYALTY, "Tibia Loyalist (Grade 3)", 5000), + + Badge(9, ACCOUNT_ALL_LEVEL, "Global Player (Grade 1)", 500), + Badge(10, ACCOUNT_ALL_LEVEL, "Global Player (Grade 2)", 1000), + Badge(11, ACCOUNT_ALL_LEVEL, "Global Player (Grade 3)", 2000), + + Badge(12, ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 1)", 100), + Badge(13, ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 2)", 250), + Badge(14, ACCOUNT_ALL_VOCATIONS, "Master Class (Grade 3)", 500), + + Badge(15, TOURNAMENT_PARTICIPATION, "Freshman of the Tournament", 1), + Badge(16, TOURNAMENT_PARTICIPATION, "Regular of the Tournament", 5), + Badge(17, TOURNAMENT_PARTICIPATION, "Hero of the Tournament", 10), + + Badge(18, TOURNAMENT_POINTS, "Tournament Competitor", 1000), + Badge(19, TOURNAMENT_POINTS, "Tournament Challenger", 2500), + Badge(20, TOURNAMENT_POINTS, "Tournament Master", 5000), + Badge(21, TOURNAMENT_POINTS, "Tournament Champion", 10000), }; m_titles = { - Title(1, CyclopediaTitle_t::GOLD, "Gold Hoarder", "Earned at least 1,000,000 gold.", 1000000, false), - Title(2, CyclopediaTitle_t::GOLD, "Platinum Hoarder", "Earned at least 10,000,000 gold.", 10000000, false), - Title(3, CyclopediaTitle_t::GOLD, "Crystal Hoarder", "Earned at least 100,000,000 gold.", 100000000, false), - - Title(4, CyclopediaTitle_t::MOUNTS, "Beaststrider (Grade 1)", "Unlocked 10 or more Mounts.", 10, true), - Title(5, CyclopediaTitle_t::MOUNTS, "Beaststrider (Grade 2)", "Unlocked 20 or more Mounts.", 20, true), - Title(6, CyclopediaTitle_t::MOUNTS, "Beaststrider (Grade 3)", "Unlocked 30 or more Mounts.", 30, true), - Title(7, CyclopediaTitle_t::MOUNTS, "Beaststrider (Grade 4)", "Unlocked 40 or more Mounts.", 40, true), - Title(8, CyclopediaTitle_t::MOUNTS, "Beaststrider (Grade 5)", "Unlocked 50 or more Mounts.", 50, true), - - Title(9, CyclopediaTitle_t::OUTFITS, "Tibia's Topmodel (Grade 1)", "Unlocked 10 or more Outfits.", 10, true), - Title(10, CyclopediaTitle_t::OUTFITS, "Tibia's Topmodel (Grade 2)", "Unlocked 20 or more Outfits.", 20, true), - Title(11, CyclopediaTitle_t::OUTFITS, "Tibia's Topmodel (Grade 3)", "Unlocked 30 or more Outfits.", 30, true), - Title(12, CyclopediaTitle_t::OUTFITS, "Tibia's Topmodel (Grade 4)", "Unlocked 40 or more Outfits.", 40, true), - Title(13, CyclopediaTitle_t::OUTFITS, "Tibia's Topmodel (Grade 5)", "Unlocked 50 or more Outfits.", 50, true), - - Title(14, CyclopediaTitle_t::LEVEL, "Trolltrasher", "Reached level 50.", 50, false), - Title(15, CyclopediaTitle_t::LEVEL, "Cyclopscamper", "Reached level 100.", 100, false), - Title(16, CyclopediaTitle_t::LEVEL, "Dragondouser", "Reached level 200.", 200, false), - Title(17, CyclopediaTitle_t::LEVEL, "Demondoom", "Reached level 300.", 300, false), - Title(18, CyclopediaTitle_t::LEVEL, "Drakenbane", "Reached level 400.", 400, false), - Title(19, CyclopediaTitle_t::LEVEL, "Silencer", "Reached level 500.", 500, false), - Title(20, CyclopediaTitle_t::LEVEL, "Exalted", "Reached level 1000.", 1000, false), - - Title(21, CyclopediaTitle_t::HIGHSCORES, "Apex Predator", "", "Highest Level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::EXPERIENCE)), - Title(22, CyclopediaTitle_t::HIGHSCORES, "Big Boss", "", "Highest score of accumulated boss points on character's world.", static_cast<uint8_t>(HighscoreCategories_t::BOSS_POINTS)), - Title(23, CyclopediaTitle_t::HIGHSCORES, "Jack of all Taints", "", "Highest score for killing Goshnar and his aspects on character's world.", static_cast<uint8_t>(HighscoreCategories_t::GOSHNAR)), - Title(24, CyclopediaTitle_t::HIGHSCORES, "Legend of Fishing", "", "Highest fishing level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::FISHING)), - Title(25, CyclopediaTitle_t::HIGHSCORES, "Legend of Magic", "", "Highest magic level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::MAGIC_LEVEL)), - Title(26, CyclopediaTitle_t::HIGHSCORES, "Legend of Marksmanship", "", "Highest distance level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::DISTANCE_FIGHTING)), - Title(27, CyclopediaTitle_t::HIGHSCORES, "Legend of the Axe", "", "Highest axe level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::AXE_FIGHTING)), - Title(28, CyclopediaTitle_t::HIGHSCORES, "Legend of the Club", "", "Highest club level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::CLUB_FIGHTING)), - Title(29, CyclopediaTitle_t::HIGHSCORES, "Legend of the Fist", "", "Highest fist level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::FIST_FIGHTING)), - Title(30, CyclopediaTitle_t::HIGHSCORES, "Legend of the Shield", "", "Highest shielding level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::SHIELDING)), - Title(31, CyclopediaTitle_t::HIGHSCORES, "Legend of the Sword", "", "Highest sword level on character's world.", static_cast<uint8_t>(HighscoreCategories_t::SWORD_FIGHTING)), - Title(32, CyclopediaTitle_t::HIGHSCORES, "Prince Charming", "Princess Charming", "Highest score of accumulated charm points on character's world.", static_cast<uint8_t>(HighscoreCategories_t::CHARMS)), - Title(33, CyclopediaTitle_t::HIGHSCORES, "Reigning Drome Champion", "", "Finished most recent Tibiadrome rota ranked in the top 5.", static_cast<uint8_t>(HighscoreCategories_t::DROME)), - - Title(34, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_HUMANOID), "Bipedantic", "", "Unlocked All Humanoid Bestiary entries."), - Title(35, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_LYCANTHROPE), "Blood Moon Hunter", "Blood Moon Huntress", "Unlocked All Lycanthrope Bestiary entries."), - Title(36, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_AMPHIBIC), "Coldblooded", "", "Unlocked All Amphibic Bestiary entries."), - Title(37, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_BIRD), "Death from Below", "", "Unlocked all Bird Bestiary entries."), - Title(38, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_DEMON), "Demonator", "", "Unlocked all Demon Bestiary entries."), - Title(39, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_DRAGON), "Dragonslayer", "", "Unlocked all Dragon Bestiary entries."), - Title(40, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_ELEMENTAL), "Elementalist", "", "Unlocked all Elemental Bestiary entries."), - Title(41, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_VERMIN), "Exterminator", "", "Unlocked all Vermin Bestiary entries."), - Title(42, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_FEY), "Fey Swatter", "", "Unlocked all Fey Bestiary entries."), - Title(43, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_UNDEAD), "Ghosthunter", "Ghosthuntress", "Unlocked all Undead Bestiary entries."), - Title(44, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_CONSTRUCT), "Handyman", "Handywoman", "Unlocked all Construct Bestiary entries."), - Title(45, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_MAMMAL), "Huntsman", "Huntress", "Unlocked all Mammal Bestiary entries."), - Title(46, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_EXTRA_DIMENSIONAL), "Interdimensional Destroyer", "", "Unlocked all Extra Dimensional Bestiary entries."), - Title(47, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_HUMAN), "Manhunter", "Manhuntress", "Unlocked all Human Bestiary entries."), - Title(48, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_MAGICAL), "Master of Illusion", "Mistress of Illusion", "Unlocked all Magical Bestiary entries."), - Title(49, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_SLIME), "Ooze Blues", "", "Unlocked all Slime Bestiary entries."), - Title(50, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_AQUATIC), "Sea Bane", "", "Unlocked all Aquatic Bestiary entries."), - Title(51, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_REPTILE), "Snake Charmer", "", "Unlocked all Reptile Bestiary entries."), - Title(52, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_GIANT), "Tumbler", "", "Unlocked all Giant Bestiary entries."), - Title(53, CyclopediaTitle_t::BESTIARY, static_cast<uint16_t>(BestiaryType_t::BESTY_RACE_PLANT), "Weedkiller", "", "Unlocked all Plant Bestiary entries."), - Title(54, CyclopediaTitle_t::BESTIARY, 0, "Executioner", "", "Unlocked all Bestiary entries."), - - Title(55, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Annihilator", "", "Unlocked all Nemesis bosses.", 0, false), - Title(56, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Destroyer", "", "Unlocked 10 or more Archfoe bosses.", 10, true), - Title(57, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Devastator", "", "Unlocked 10 or more Nemesis bosses.", 10, true), - Title(58, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Eraser", "", "Unlocked all Archfoe bosses.", 0, false), - Title(59, CyclopediaTitle_t::BOSSTIARY, 0, "Boss Executioner", "", "Unlocked all bosses.", 0, false), - Title(60, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Hunter", "", "Unlocked 10 or more Bane bosses.", 10, true), - Title(61, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Obliterator", "", "Unlocked 40 or more Nemesis bosses.", 40, true), - Title(62, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Slayer", "", "Unlocked all Bane bosses.", 0, false), - Title(63, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Smiter", "", "Unlocked 40 or more Archfoe bosses.", 40, true), - Title(64, CyclopediaTitle_t::BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Veteran", "", "Unlocked 40 or more Bane bosses.", 40, true), - - Title(65, CyclopediaTitle_t::DAILY_REWARD, "Creature of Habit (Grade 1)", "Reward Streak of at least 7 days of consecutive logins.", 7, true), - Title(66, CyclopediaTitle_t::DAILY_REWARD, "Creature of Habit (Grade 2)", "Reward Streak of at least 30 days of consecutive logins.", 30, true), - Title(67, CyclopediaTitle_t::DAILY_REWARD, "Creature of Habit (Grade 3)", "Reward Streak of at least 90 days of consecutive logins.", 90, true), - Title(68, CyclopediaTitle_t::DAILY_REWARD, "Creature of Habit (Grade 4)", "Reward Streak of at least 180 days of consecutive logins.", 180, true), - Title(69, CyclopediaTitle_t::DAILY_REWARD, "Creature of Habit (Grade 5)", "Reward Streak of at least 365 days of consecutive logins.", 365, true), - - Title(70, CyclopediaTitle_t::TASK, "Aspiring Huntsman", "Invested 160,000 tasks points.", 160000, true, "Aspiring Huntswoman"), - Title(71, CyclopediaTitle_t::TASK, "Competent Beastslayer", "Invested 320,000 tasks points.", 320000, true), - Title(72, CyclopediaTitle_t::TASK, "Feared Bountyhunter", "Invested 430,000 tasks points.", 430000, true), - - Title(73, CyclopediaTitle_t::MAP, "Dedicated Entrepreneur", "Explored 50% of all the map areas.", 50, false), - Title(74, CyclopediaTitle_t::MAP, "Globetrotter", "Explored all map areas.", 100, false), - - Title(75, CyclopediaTitle_t::OTHERS, "Guild Leader", "Leading a Guild.", false), - Title(76, CyclopediaTitle_t::OTHERS, "Proconsul of Iksupan", "Only a true devotee to the cause of the ancient Iks and their lost legacy may step up to the rank of proconsul.", true), - Title(77, CyclopediaTitle_t::OTHERS, "Admirer of the Crown", "Adjust your crown and handle it.", true), - Title(78, CyclopediaTitle_t::OTHERS, "Big Spender", "Unlocked the full Golden Outfit.", true), - Title(79, CyclopediaTitle_t::OTHERS, "Challenger of the Iks", "Challenged Ahau, guardian of Iksupan, in traditional Iks warrior attire.", true), - Title(80, CyclopediaTitle_t::OTHERS, "Royal Bounacean Advisor", "Called to the court of Bounac by Kesar the Younger himself.", true), - Title(81, CyclopediaTitle_t::OTHERS, "Aeternal", "Awarded exclusively to stalwart heroes keeping the faith under all circumstances.", true), - Title(82, CyclopediaTitle_t::OTHERS, "Robinson Crusoe", "Some discoveries are reserved to only the most experienced adventurers. Until the next frontier opens on the horizon.", true), - Title(83, CyclopediaTitle_t::OTHERS, "Chompmeister", "Awarded only to true connoisseurs undertaking even the most exotic culinary escapades.", true), - Title(84, CyclopediaTitle_t::OTHERS, "Bringer of Rain", "Forging through battle after battle like a true gladiator.", true), - Title(85, CyclopediaTitle_t::OTHERS, "Beastly", "Reached 2000 charm points. Quite beastly!", true), - Title(86, CyclopediaTitle_t::OTHERS, "Midnight Hunter", "When the hunter becomes the hunted, perseverance decides the game.", true), - Title(87, CyclopediaTitle_t::OTHERS, "Ratinator", "Killing some snarky cave rats is helpful, killing over ten thousand of them is a statement.", true), - Title(88, CyclopediaTitle_t::OTHERS, "Doomsday Nemesis", "Awarded for great help in the battle against Gaz'haragoth.", true), - Title(89, CyclopediaTitle_t::OTHERS, "Hero of Bounac", "You prevailed during the battle of Bounac and broke the siege that held Bounac's people in its firm grasp.", true), // Derrotar o boss Drume. - Title(90, CyclopediaTitle_t::OTHERS, "King of Demon", "Defeat Morshabaal 5 times.", 0, true, "Queen of Demon"), - Title(91, CyclopediaTitle_t::OTHERS, "Planegazer", "Followed the trail of the Planestrider to the end.", true), // Derrotar o boss Planestrider - Title(92, CyclopediaTitle_t::OTHERS, "Time Traveller", "Anywhere in time or space.", true), // Derrotar o boss Lord Retro - Title(93, CyclopediaTitle_t::OTHERS, "Truly Boss", "Reach 15,000 boss points.", true), + Title(1, GOLD, "Gold Hoarder", "Earned at least 1,000,000 gold.", 1000000, false), + Title(2, GOLD, "Platinum Hoarder", "Earned at least 10,000,000 gold.", 10000000, false), + Title(3, GOLD, "Crystal Hoarder", "Earned at least 100,000,000 gold.", 100000000, false), + + Title(4, MOUNTS, "Beaststrider (Grade 1)", "Unlocked 10 or more Mounts.", 10, true), + Title(5, MOUNTS, "Beaststrider (Grade 2)", "Unlocked 20 or more Mounts.", 20, true), + Title(6, MOUNTS, "Beaststrider (Grade 3)", "Unlocked 30 or more Mounts.", 30, true), + Title(7, MOUNTS, "Beaststrider (Grade 4)", "Unlocked 40 or more Mounts.", 40, true), + Title(8, MOUNTS, "Beaststrider (Grade 5)", "Unlocked 50 or more Mounts.", 50, true), + + Title(9, OUTFITS, "Tibia's Topmodel (Grade 1)", "Unlocked 10 or more Outfits.", 10, true), + Title(10, OUTFITS, "Tibia's Topmodel (Grade 2)", "Unlocked 20 or more Outfits.", 20, true), + Title(11, OUTFITS, "Tibia's Topmodel (Grade 3)", "Unlocked 30 or more Outfits.", 30, true), + Title(12, OUTFITS, "Tibia's Topmodel (Grade 4)", "Unlocked 40 or more Outfits.", 40, true), + Title(13, OUTFITS, "Tibia's Topmodel (Grade 5)", "Unlocked 50 or more Outfits.", 50, true), + + Title(14, LEVEL, "Trolltrasher", "Reached level 50.", 50, false), + Title(15, LEVEL, "Cyclopscamper", "Reached level 100.", 100, false), + Title(16, LEVEL, "Dragondouser", "Reached level 200.", 200, false), + Title(17, LEVEL, "Demondoom", "Reached level 300.", 300, false), + Title(18, LEVEL, "Drakenbane", "Reached level 400.", 400, false), + Title(19, LEVEL, "Silencer", "Reached level 500.", 500, false), + Title(20, LEVEL, "Exalted", "Reached level 1000.", 1000, false), + + Title(21, HIGHSCORES, "Apex Predator", "", "Highest Level on character's world.", static_cast<uint8_t>(EXPERIENCE)), + Title(22, HIGHSCORES, "Big Boss", "", "Highest score of accumulated boss points on character's world.", static_cast<uint8_t>(BOSS_POINTS)), + Title(23, HIGHSCORES, "Jack of all Taints", "", "Highest score for killing Goshnar and his aspects on character's world.", static_cast<uint8_t>(GOSHNAR)), + Title(24, HIGHSCORES, "Legend of Fishing", "", "Highest fishing level on character's world.", static_cast<uint8_t>(FISHING)), + Title(25, HIGHSCORES, "Legend of Magic", "", "Highest magic level on character's world.", static_cast<uint8_t>(MAGIC_LEVEL)), + Title(26, HIGHSCORES, "Legend of Marksmanship", "", "Highest distance level on character's world.", static_cast<uint8_t>(DISTANCE_FIGHTING)), + Title(27, HIGHSCORES, "Legend of the Axe", "", "Highest axe level on character's world.", static_cast<uint8_t>(AXE_FIGHTING)), + Title(28, HIGHSCORES, "Legend of the Club", "", "Highest club level on character's world.", static_cast<uint8_t>(CLUB_FIGHTING)), + Title(29, HIGHSCORES, "Legend of the Fist", "", "Highest fist level on character's world.", static_cast<uint8_t>(FIST_FIGHTING)), + Title(30, HIGHSCORES, "Legend of the Shield", "", "Highest shielding level on character's world.", static_cast<uint8_t>(SHIELDING)), + Title(31, HIGHSCORES, "Legend of the Sword", "", "Highest sword level on character's world.", static_cast<uint8_t>(SWORD_FIGHTING)), + Title(32, HIGHSCORES, "Prince Charming", "Princess Charming", "Highest score of accumulated charm points on character's world.", static_cast<uint8_t>(CHARMS)), + Title(33, HIGHSCORES, "Reigning Drome Champion", "", "Finished most recent Tibiadrome rota ranked in the top 5.", static_cast<uint8_t>(DROME)), + + Title(34, BESTIARY, static_cast<uint16_t>(BESTY_RACE_HUMANOID), "Bipedantic", "", "Unlocked All Humanoid Bestiary entries."), + Title(35, BESTIARY, static_cast<uint16_t>(BESTY_RACE_LYCANTHROPE), "Blood Moon Hunter", "Blood Moon Huntress", "Unlocked All Lycanthrope Bestiary entries."), + Title(36, BESTIARY, static_cast<uint16_t>(BESTY_RACE_AMPHIBIC), "Coldblooded", "", "Unlocked All Amphibic Bestiary entries."), + Title(37, BESTIARY, static_cast<uint16_t>(BESTY_RACE_BIRD), "Death from Below", "", "Unlocked all Bird Bestiary entries."), + Title(38, BESTIARY, static_cast<uint16_t>(BESTY_RACE_DEMON), "Demonator", "", "Unlocked all Demon Bestiary entries."), + Title(39, BESTIARY, static_cast<uint16_t>(BESTY_RACE_DRAGON), "Dragonslayer", "", "Unlocked all Dragon Bestiary entries."), + Title(40, BESTIARY, static_cast<uint16_t>(BESTY_RACE_ELEMENTAL), "Elementalist", "", "Unlocked all Elemental Bestiary entries."), + Title(41, BESTIARY, static_cast<uint16_t>(BESTY_RACE_VERMIN), "Exterminator", "", "Unlocked all Vermin Bestiary entries."), + Title(42, BESTIARY, static_cast<uint16_t>(BESTY_RACE_FEY), "Fey Swatter", "", "Unlocked all Fey Bestiary entries."), + Title(43, BESTIARY, static_cast<uint16_t>(BESTY_RACE_UNDEAD), "Ghosthunter", "Ghosthuntress", "Unlocked all Undead Bestiary entries."), + Title(44, BESTIARY, static_cast<uint16_t>(BESTY_RACE_CONSTRUCT), "Handyman", "Handywoman", "Unlocked all Construct Bestiary entries."), + Title(45, BESTIARY, static_cast<uint16_t>(BESTY_RACE_MAMMAL), "Huntsman", "Huntress", "Unlocked all Mammal Bestiary entries."), + Title(46, BESTIARY, static_cast<uint16_t>(BESTY_RACE_EXTRA_DIMENSIONAL), "Interdimensional Destroyer", "", "Unlocked all Extra Dimensional Bestiary entries."), + Title(47, BESTIARY, static_cast<uint16_t>(BESTY_RACE_HUMAN), "Manhunter", "Manhuntress", "Unlocked all Human Bestiary entries."), + Title(48, BESTIARY, static_cast<uint16_t>(BESTY_RACE_MAGICAL), "Master of Illusion", "Mistress of Illusion", "Unlocked all Magical Bestiary entries."), + Title(49, BESTIARY, static_cast<uint16_t>(BESTY_RACE_SLIME), "Ooze Blues", "", "Unlocked all Slime Bestiary entries."), + Title(50, BESTIARY, static_cast<uint16_t>(BESTY_RACE_AQUATIC), "Sea Bane", "", "Unlocked all Aquatic Bestiary entries."), + Title(51, BESTIARY, static_cast<uint16_t>(BESTY_RACE_REPTILE), "Snake Charmer", "", "Unlocked all Reptile Bestiary entries."), + Title(52, BESTIARY, static_cast<uint16_t>(BESTY_RACE_GIANT), "Tumbler", "", "Unlocked all Giant Bestiary entries."), + Title(53, BESTIARY, static_cast<uint16_t>(BESTY_RACE_PLANT), "Weedkiller", "", "Unlocked all Plant Bestiary entries."), + Title(54, BESTIARY, 0, "Executioner", "", "Unlocked all Bestiary entries."), + + Title(55, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Annihilator", "", "Unlocked all Nemesis bosses.", 0, false), + Title(56, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Destroyer", "", "Unlocked 10 or more Archfoe bosses.", 10, true), + Title(57, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Devastator", "", "Unlocked 10 or more Nemesis bosses.", 10, true), + Title(58, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Eraser", "", "Unlocked all Archfoe bosses.", 0, false), + Title(59, BOSSTIARY, 0, "Boss Executioner", "", "Unlocked all bosses.", 0, false), + Title(60, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Hunter", "", "Unlocked 10 or more Bane bosses.", 10, true), + Title(61, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_NEMESIS), "Boss Obliterator", "", "Unlocked 40 or more Nemesis bosses.", 40, true), + Title(62, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Slayer", "", "Unlocked all Bane bosses.", 0, false), + Title(63, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_ARCHFOE), "Boss Smiter", "", "Unlocked 40 or more Archfoe bosses.", 40, true), + Title(64, BOSSTIARY, static_cast<uint16_t>(BosstiaryRarity_t::RARITY_BANE), "Boss Veteran", "", "Unlocked 40 or more Bane bosses.", 40, true), + + Title(65, DAILY_REWARD, "Creature of Habit (Grade 1)", "Reward Streak of at least 7 days of consecutive logins.", 7, true), + Title(66, DAILY_REWARD, "Creature of Habit (Grade 2)", "Reward Streak of at least 30 days of consecutive logins.", 30, true), + Title(67, DAILY_REWARD, "Creature of Habit (Grade 3)", "Reward Streak of at least 90 days of consecutive logins.", 90, true), + Title(68, DAILY_REWARD, "Creature of Habit (Grade 4)", "Reward Streak of at least 180 days of consecutive logins.", 180, true), + Title(69, DAILY_REWARD, "Creature of Habit (Grade 5)", "Reward Streak of at least 365 days of consecutive logins.", 365, true), + + Title(70, TASK, "Aspiring Huntsman", "Invested 160,000 tasks points.", 160000, true, "Aspiring Huntswoman"), + Title(71, TASK, "Competent Beastslayer", "Invested 320,000 tasks points.", 320000, true), + Title(72, TASK, "Feared Bountyhunter", "Invested 430,000 tasks points.", 430000, true), + + Title(73, MAP, "Dedicated Entrepreneur", "Explored 50% of all the map areas.", 50, false), + Title(74, MAP, "Globetrotter", "Explored all map areas.", 100, false), + + Title(75, OTHERS, "Guild Leader", "Leading a Guild.", false), + Title(76, OTHERS, "Proconsul of Iksupan", "Only a true devotee to the cause of the ancient Iks and their lost legacy may step up to the rank of proconsul.", true), + Title(77, OTHERS, "Admirer of the Crown", "Adjust your crown and handle it.", true), + Title(78, OTHERS, "Big Spender", "Unlocked the full Golden Outfit.", true), + Title(79, OTHERS, "Challenger of the Iks", "Challenged Ahau, guardian of Iksupan, in traditional Iks warrior attire.", true), + Title(80, OTHERS, "Royal Bounacean Advisor", "Called to the court of Bounac by Kesar the Younger himself.", true), + Title(81, OTHERS, "Aeternal", "Awarded exclusively to stalwart heroes keeping the faith under all circumstances.", true), + Title(82, OTHERS, "Robinson Crusoe", "Some discoveries are reserved to only the most experienced adventurers. Until the next frontier opens on the horizon.", true), + Title(83, OTHERS, "Chompmeister", "Awarded only to true connoisseurs undertaking even the most exotic culinary escapades.", true), + Title(84, OTHERS, "Bringer of Rain", "Forging through battle after battle like a true gladiator.", true), + Title(85, OTHERS, "Beastly", "Reached 2000 charm points. Quite beastly!", true), + Title(86, OTHERS, "Midnight Hunter", "When the hunter becomes the hunted, perseverance decides the game.", true), + Title(87, OTHERS, "Ratinator", "Killing some snarky cave rats is helpful, killing over ten thousand of them is a statement.", true), + Title(88, OTHERS, "Doomsday Nemesis", "Awarded for great help in the battle against Gaz'haragoth.", true), + Title(89, OTHERS, "Hero of Bounac", "You prevailed during the battle of Bounac and broke the siege that held Bounac's people in its firm grasp.", true), // Derrotar o boss Drume. + Title(90, OTHERS, "King of Demon", "Defeat Morshabaal 5 times.", 0, true, "Queen of Demon"), + Title(91, OTHERS, "Planegazer", "Followed the trail of the Planestrider to the end.", true), // Derrotar o boss Planestrider + Title(92, OTHERS, "Time Traveller", "Anywhere in time or space.", true), // Derrotar o boss Lord Retro + Title(93, OTHERS, "Truly Boss", "Reach 15,000 boss points.", true), }; m_highscoreCategoriesNames = { - { static_cast<uint8_t>(HighscoreCategories_t::ACHIEVEMENTS), "Achievement Points" }, - { static_cast<uint8_t>(HighscoreCategories_t::AXE_FIGHTING), "Axe Fighting" }, - { static_cast<uint8_t>(HighscoreCategories_t::BOSS_POINTS), "Boss Points" }, - { static_cast<uint8_t>(HighscoreCategories_t::CHARMS), "Charm Points" }, - { static_cast<uint8_t>(HighscoreCategories_t::CLUB_FIGHTING), "Club Fighting" }, - { static_cast<uint8_t>(HighscoreCategories_t::DISTANCE_FIGHTING), "Distance Fighting" }, - { static_cast<uint8_t>(HighscoreCategories_t::DROME), "Drome Score" }, - { static_cast<uint8_t>(HighscoreCategories_t::EXPERIENCE), "Experience Points" }, - { static_cast<uint8_t>(HighscoreCategories_t::FISHING), "Fishing" }, - { static_cast<uint8_t>(HighscoreCategories_t::FIST_FIGHTING), "Fist Fighting" }, - { static_cast<uint8_t>(HighscoreCategories_t::GOSHNAR), "Goshnar's Taint" }, - { static_cast<uint8_t>(HighscoreCategories_t::LOYALTY), "Loyalty Points" }, - { static_cast<uint8_t>(HighscoreCategories_t::MAGIC_LEVEL), "Magic Level" }, - { static_cast<uint8_t>(HighscoreCategories_t::SHIELDING), "Shielding" }, + { static_cast<uint8_t>(ACHIEVEMENTS), "Achievement Points" }, + { static_cast<uint8_t>(AXE_FIGHTING), "Axe Fighting" }, + { static_cast<uint8_t>(BOSS_POINTS), "Boss Points" }, + { static_cast<uint8_t>(CHARMS), "Charm Points" }, + { static_cast<uint8_t>(CLUB_FIGHTING), "Club Fighting" }, + { static_cast<uint8_t>(DISTANCE_FIGHTING), "Distance Fighting" }, + { static_cast<uint8_t>(DROME), "Drome Score" }, + { static_cast<uint8_t>(EXPERIENCE), "Experience Points" }, + { static_cast<uint8_t>(FISHING), "Fishing" }, + { static_cast<uint8_t>(FIST_FIGHTING), "Fist Fighting" }, + { static_cast<uint8_t>(GOSHNAR), "Goshnar's Taint" }, + { static_cast<uint8_t>(LOYALTY_POINTS), "Loyalty Points" }, + { static_cast<uint8_t>(MAGIC_LEVEL), "Magic Level" }, + { static_cast<uint8_t>(SHIELDING), "Shielding" }, { static_cast<uint8_t>(HighscoreCategories_t::SWORD_FIGHTING), "Sword Fighting" }, }; @@ -364,17 +387,6 @@ Game::Game() { HighscoreCategory("Magic Level", static_cast<uint8_t>(HighscoreCategories_t::MAGIC_LEVEL)) }; - m_blessingNames = { - { static_cast<uint8_t>(TWIST_OF_FATE), "Twist of Fate" }, - { static_cast<uint8_t>(WISDOM_OF_SOLITUDE), "The Wisdom of Solitude" }, - { static_cast<uint8_t>(SPARK_OF_THE_PHOENIX), "The Spark of the Phoenix" }, - { static_cast<uint8_t>(FIRE_OF_THE_SUNS), "The Fire of the Suns" }, - { static_cast<uint8_t>(SPIRITUAL_SHIELDING), "The Spiritual Shielding" }, - { static_cast<uint8_t>(EMBRACE_OF_TIBIA), "The Embrace of Tibia" }, - { static_cast<uint8_t>(BLOOD_OF_THE_MOUNTAIN), "Blood of the Mountain" }, - { static_cast<uint8_t>(HEARTH_OF_THE_MOUNTAIN), "Heart of the Mountain" }, - }; - m_summaryCategories = { { static_cast<uint8_t>(Summary_t::HOUSE_ITEMS), "house-items" }, { static_cast<uint8_t>(Summary_t::BOOSTS), "xp-boosts" }, @@ -406,6 +418,10 @@ Game::Game() { Game::~Game() = default; +Game &Game::getInstance() { + return inject<Game>(); +} + void Game::resetMonsters() const { for (const auto &[monsterId, monster] : getMonsters()) { monster->clearTargetList(); @@ -430,8 +446,8 @@ void Game::loadBoostedCreature() { return; } - const uint16_t date = result->getNumber<uint16_t>("date"); - const time_t now = time(0); + const auto date = result->getNumber<uint16_t>("date"); + const auto now = getTimeNow(); tm* ltm = localtime(&now); if (date == ltm->tm_mday) { @@ -439,7 +455,7 @@ void Game::loadBoostedCreature() { return; } - const uint16_t oldRace = result->getNumber<uint16_t>("raceid"); + const auto oldRace = result->getNumber<uint16_t>("raceid"); const auto monsterlist = getBestiaryList(); struct MonsterRace { @@ -497,14 +513,14 @@ void Game::loadBoostedCreature() { void Game::start(ServiceManager* manager) { // Game client protocols - manager->add<ProtocolGame>(static_cast<uint16_t>(g_configManager().getNumber(GAME_PORT, __FUNCTION__))); - manager->add<ProtocolLogin>(static_cast<uint16_t>(g_configManager().getNumber(LOGIN_PORT, __FUNCTION__))); + manager->add<ProtocolGame>(static_cast<uint16_t>(g_configManager().getNumber(GAME_PORT))); + manager->add<ProtocolLogin>(static_cast<uint16_t>(g_configManager().getNumber(LOGIN_PORT))); // OT protocols - manager->add<ProtocolStatus>(static_cast<uint16_t>(g_configManager().getNumber(STATUS_PORT, __FUNCTION__))); + manager->add<ProtocolStatus>(static_cast<uint16_t>(g_configManager().getNumber(STATUS_PORT))); serviceManager = manager; - time_t now = time(0); + const auto now = getTimeNow(); const tm* tms = localtime(&now); int minutes = tms->tm_min; lightHour = (minutes * LIGHT_DAY_LENGTH) / 60; @@ -530,7 +546,7 @@ void Game::start(ServiceManager* manager) { g_dispatcher().cycleEvent( EVENT_LUA_GARBAGE_COLLECTION, [this] { g_luaEnvironment().collectGarbage(); }, "Calling GC" ); - auto marketItemsPriceIntervalMinutes = g_configManager().getNumber(MARKET_REFRESH_PRICES, __FUNCTION__); + auto marketItemsPriceIntervalMinutes = g_configManager().getNumber(MARKET_REFRESH_PRICES); if (marketItemsPriceIntervalMinutes > 0) { auto marketItemsPriceIntervalMS = marketItemsPriceIntervalMinutes * 60000; if (marketItemsPriceIntervalMS < 60000) { @@ -540,6 +556,10 @@ void Game::start(ServiceManager* manager) { marketItemsPriceIntervalMS, [this] { loadItemsPrice(); }, "Game::loadItemsPrice" ); } + + g_dispatcher().cycleEvent( + UPDATE_PLAYERS_ONLINE_DB, [this] { updatePlayersOnline(); }, "Game::updatePlayersOnline" + ); } GameState_t Game::getGameState() const { @@ -550,6 +570,28 @@ void Game::setWorldType(WorldType_t type) { worldType = type; } +const std::unique_ptr<TeamFinder> &Game::getTeamFinder(const std::shared_ptr<Player> &player) const { + auto it = teamFinderMap.find(player->getGUID()); + if (it != teamFinderMap.end()) { + return it->second; + } + + return TeamFinderNull; +} + +const std::unique_ptr<TeamFinder> &Game::getOrCreateTeamFinder(const std::shared_ptr<Player> &player) { + auto it = teamFinderMap.find(player->getGUID()); + if (it != teamFinderMap.end()) { + return it->second; + } + + return teamFinderMap[player->getGUID()] = std::make_unique<TeamFinder>(); +} + +void Game::removeTeamFinderListed(uint32_t leaderGuid) { + teamFinderMap.erase(leaderGuid); +} + void Game::setGameState(GameState_t newState) { if (gameState == GAME_STATE_SHUTDOWN) { return; // this cannot be stopped @@ -580,7 +622,7 @@ void Game::setGameState(GameState_t newState) { raids.loadFromXml(); raids.startup(); - mounts.loadFromXml(); + mounts->loadFromXml(); loadMotdNum(); loadPlayersRecord(); @@ -606,7 +648,7 @@ void Game::setGameState(GameState_t newState) { saveMotdNum(); g_saveManager().saveAll(); - g_dispatcher().addEvent([this] { shutdown(); }, "Game::shutdown"); + g_dispatcher().addEvent([this] { shutdown(); }, __FUNCTION__); break; } @@ -649,21 +691,21 @@ void Game::loadItemsPrice() { } // Update active buy offers (market_offers) - auto offers = IOMarket::getInstance().getActiveOffers(MARKETACTION_BUY); + auto offers = IOMarket::getActiveOffers(MARKETACTION_BUY); for (const auto &offer : offers) { itemsPriceMap[offer.itemId][offer.tier] = std::max(itemsPriceMap[offer.itemId][offer.tier], offer.price); } } void Game::loadMainMap(const std::string &filename) { - Monster::despawnRange = g_configManager().getNumber(DEFAULT_DESPAWNRANGE, __FUNCTION__); - Monster::despawnRadius = g_configManager().getNumber(DEFAULT_DESPAWNRADIUS, __FUNCTION__); - map.loadMap(g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/world/" + filename + ".otbm", true, true, true, true, true); + Monster::despawnRange = g_configManager().getNumber(DEFAULT_DESPAWNRANGE); + Monster::despawnRadius = g_configManager().getNumber(DEFAULT_DESPAWNRADIUS); + map.loadMap(g_configManager().getString(DATA_DIRECTORY) + "/world/" + filename + ".otbm", true, true, true, true, true); } void Game::loadCustomMaps(const std::filesystem::path &customMapPath) { - Monster::despawnRange = g_configManager().getNumber(DEFAULT_DESPAWNRANGE, __FUNCTION__); - Monster::despawnRadius = g_configManager().getNumber(DEFAULT_DESPAWNRADIUS, __FUNCTION__); + Monster::despawnRange = g_configManager().getNumber(DEFAULT_DESPAWNRANGE); + Monster::despawnRadius = g_configManager().getNumber(DEFAULT_DESPAWNRADIUS); namespace fs = std::filesystem; @@ -694,7 +736,7 @@ void Game::loadCustomMaps(const std::filesystem::path &customMapPath) { } // Avoid loading main map again. - if (filename == g_configManager().getString(MAP_NAME, __FUNCTION__)) { + if (filename == g_configManager().getString(MAP_NAME)) { g_logger().warn("Custom map {} is main map", filename); continue; } @@ -712,7 +754,7 @@ void Game::loadMap(const std::string &path, const Position &pos) { map.loadMap(path, false, false, false, false, false, pos); } -std::shared_ptr<Cylinder> Game::internalGetCylinder(std::shared_ptr<Player> player, const Position &pos) { +std::shared_ptr<Cylinder> Game::internalGetCylinder(const std::shared_ptr<Player> &player, const Position &pos) { if (pos.x != 0xFFFF) { return map.getTile(pos); } @@ -727,7 +769,7 @@ std::shared_ptr<Cylinder> Game::internalGetCylinder(std::shared_ptr<Player> play return player; } -std::shared_ptr<Thing> Game::internalGetThing(std::shared_ptr<Player> player, const Position &pos, int32_t index, uint32_t itemId, StackPosType_t type) { +std::shared_ptr<Thing> Game::internalGetThing(const std::shared_ptr<Player> &player, const Position &pos, int32_t index, uint32_t itemId, StackPosType_t type) { if (pos.x != 0xFFFF) { std::shared_ptr<Tile> tile = map.getTile(pos); if (!tile) { @@ -741,7 +783,7 @@ std::shared_ptr<Thing> Game::internalGetThing(std::shared_ptr<Player> player, co } case STACKPOS_MOVE: { - std::shared_ptr<Item> item = tile->getTopDownItem(); + const auto &item = tile->getTopDownItem(); if (item && item->isMovable()) { thing = item; } else { @@ -808,13 +850,13 @@ std::shared_ptr<Thing> Game::internalGetThing(std::shared_ptr<Player> player, co if (pos.y & 0x40) { uint8_t fromCid = pos.y & 0x0F; - std::shared_ptr<Container> parentContainer = player->getContainerByID(fromCid); + const std::shared_ptr<Container> &parentContainer = player->getContainerByID(fromCid); if (!parentContainer) { return nullptr; } if (parentContainer->getID() == ITEM_BROWSEFIELD) { - std::shared_ptr<Tile> tile = parentContainer->getTile(); + const std::shared_ptr<Tile> &tile = parentContainer->getTile(); if (tile && tile->hasFlag(TILESTATE_SUPPORTS_HANGABLE)) { if (tile->hasProperty(CONST_PROP_ISVERTICAL)) { if (player->getPosition().x + 1 == tile->getPosition().x) { @@ -862,11 +904,11 @@ std::shared_ptr<Thing> Game::internalGetThing(std::shared_ptr<Player> player, co } // inventory - Slots_t slot = static_cast<Slots_t>(pos.y); + auto slot = static_cast<Slots_t>(pos.y); return player->getInventoryItem(slot); } -void Game::internalGetPosition(std::shared_ptr<Item> item, Position &pos, uint8_t &stackpos) { +void Game::internalGetPosition(const std::shared_ptr<Item> &item, Position &pos, uint8_t &stackpos) { pos.x = 0; pos.y = 0; pos.z = 0; @@ -874,10 +916,10 @@ void Game::internalGetPosition(std::shared_ptr<Item> item, Position &pos, uint8_ std::shared_ptr<Cylinder> topParent = item->getTopParent(); if (topParent) { - if (std::shared_ptr<Player> player = std::dynamic_pointer_cast<Player>(topParent)) { + if (const auto &player = std::dynamic_pointer_cast<Player>(topParent)) { pos.x = 0xFFFF; - std::shared_ptr<Container> container = std::dynamic_pointer_cast<Container>(item->getParent()); + const std::shared_ptr<Container> &container = std::dynamic_pointer_cast<Container>(item->getParent()); if (container) { pos.y = static_cast<uint16_t>(0x40) | static_cast<uint16_t>(player->getContainerID(container)); pos.z = container->getThingIndex(item); @@ -886,7 +928,7 @@ void Game::internalGetPosition(std::shared_ptr<Item> item, Position &pos, uint8_ pos.y = player->getThingIndex(item); stackpos = pos.y; } - } else if (std::shared_ptr<Tile> tile = topParent->getTile()) { + } else if (const std::shared_ptr<Tile> &tile = topParent->getTile()) { pos = tile->getPosition(); stackpos = tile->getThingIndex(item); } @@ -1039,7 +1081,7 @@ std::string Game::getPlayerNameByGUID(const uint32_t &guid) { if (m_playerNameCache.contains(guid)) { return m_playerNameCache.at(guid); } - auto player = getPlayerByGUID(guid, true); + const auto &player = getPlayerByGUID(guid, true); auto name = player ? player->getName() : ""; if (!name.empty()) { m_playerNameCache[guid] = name; @@ -1073,14 +1115,14 @@ ReturnValue Game::getPlayerByNameWildcard(const std::string &s, std::shared_ptr< return RETURNVALUE_NOERROR; } -std::vector<std::shared_ptr<Player>> Game::getPlayersByAccount(std::shared_ptr<Account> acc, bool allowOffline /* = false */) { +std::vector<std::shared_ptr<Player>> Game::getPlayersByAccount(const std::shared_ptr<Account> &acc, bool allowOffline /* = false */) { auto [accountPlayers, error] = acc->getAccountPlayers(); - if (error != enumToValue(AccountErrors_t::Ok)) { + if (error != AccountErrors_t::Ok) { return {}; } std::vector<std::shared_ptr<Player>> ret; for (const auto &[name, _] : accountPlayers) { - auto player = getPlayerByName(name, allowOffline); + const auto &player = getPlayerByName(name, allowOffline); if (player) { ret.push_back(player); } @@ -1088,7 +1130,7 @@ std::vector<std::shared_ptr<Player>> Game::getPlayersByAccount(std::shared_ptr<A return ret; } -bool Game::internalPlaceCreature(std::shared_ptr<Creature> creature, const Position &pos, bool extendedPos /*=false*/, bool forced /*= false*/, bool creatureCheck /*= false*/) { +bool Game::internalPlaceCreature(const std::shared_ptr<Creature> &creature, const Position &pos, bool extendedPos /*=false*/, bool forced /*= false*/, bool creatureCheck /*= false*/) { if (creature->getParent() != nullptr) { return false; } @@ -1117,7 +1159,7 @@ bool Game::internalPlaceCreature(std::shared_ptr<Creature> creature, const Posit return true; } -bool Game::placeCreature(std::shared_ptr<Creature> creature, const Position &pos, bool extendedPos /*=false*/, bool forced /*= false*/) { +bool Game::placeCreature(const std::shared_ptr<Creature> &creature, const Position &pos, bool extendedPos /*=false*/, bool forced /*= false*/) { metrics::method_latency measure(__METHOD_NAME__); if (!internalPlaceCreature(creature, pos, extendedPos, forced)) { return false; @@ -1144,7 +1186,7 @@ bool Game::placeCreature(std::shared_ptr<Creature> creature, const Position &pos return true; } -bool Game::removeCreature(std::shared_ptr<Creature> creature, bool isLogout /* = true*/) { +bool Game::removeCreature(const std::shared_ptr<Creature> &creature, bool isLogout /* = true*/) { metrics::method_latency measure(__METHOD_NAME__); if (!creature || creature->isRemoved()) { return false; @@ -1223,7 +1265,7 @@ void Game::executeDeath(uint32_t creatureId) { void Game::playerTeleport(uint32_t playerId, const Position &newPosition) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->hasFlag(PlayerFlags_t::CanMapClickTeleport)) { return; } @@ -1234,15 +1276,15 @@ void Game::playerTeleport(uint32_t playerId, const Position &newPosition) { } } -void Game::playerInspectItem(std::shared_ptr<Player> player, const Position &pos) { +void Game::playerInspectItem(const std::shared_ptr<Player> &player, const Position &pos) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Thing> thing = internalGetThing(player, pos, 0, 0, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, 0, 0, STACKPOS_TOPDOWN_ITEM); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -1251,7 +1293,7 @@ void Game::playerInspectItem(std::shared_ptr<Player> player, const Position &pos player->sendItemInspection(item->getID(), static_cast<uint8_t>(item->getItemCount()), item, false); } -void Game::playerInspectItem(std::shared_ptr<Player> player, uint16_t itemId, uint8_t itemCount, bool cyclopedia) { +void Game::playerInspectItem(const std::shared_ptr<Player> &player, uint16_t itemId, uint8_t itemCount, bool cyclopedia) { metrics::method_latency measure(__METHOD_NAME__); player->sendItemInspection(itemId, itemCount, nullptr, cyclopedia); } @@ -1280,7 +1322,7 @@ FILELOADER_ERRORS Game::loadAppearanceProtobuf(const std::string &file) { Item::items.loadFromProtobuf(); // Only iterate other objects if necessary - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS)) { // Registering distance effects for (uint32_t it = 0; it < m_appearancesPtr->effect_size(); it++) { registeredMagicEffects.push_back(static_cast<uint16_t>(m_appearancesPtr->effect(it).id())); @@ -1307,7 +1349,7 @@ FILELOADER_ERRORS Game::loadAppearanceProtobuf(const std::string &file) { void Game::playerMoveThing(uint32_t playerId, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -1334,14 +1376,14 @@ void Game::playerMoveThing(uint32_t playerId, const Position &fromPos, uint16_t fromIndex = fromStackPos; } - std::shared_ptr<Thing> thing = internalGetThing(player, fromPos, fromIndex, itemId, STACKPOS_MOVE); + const std::shared_ptr<Thing> &thing = internalGetThing(player, fromPos, fromIndex, itemId, STACKPOS_MOVE); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - if (std::shared_ptr<Creature> movingCreature = thing->getCreature()) { - std::shared_ptr<Tile> tile = map.getTile(toPos); + if (const std::shared_ptr<Creature> &movingCreature = thing->getCreature()) { + const std::shared_ptr<Tile> &tile = map.getTile(toPos); if (!tile) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -1349,11 +1391,11 @@ void Game::playerMoveThing(uint32_t playerId, const Position &fromPos, uint16_t if (Position::areInRange<1, 1, 0>(movingCreature->getPosition(), player->getPosition())) { const auto &task = createPlayerTask( - g_configManager().getNumber(PUSH_DELAY, __FUNCTION__), + g_configManager().getNumber(PUSH_DELAY), [this, player, movingCreature, tile] { playerMoveCreatureByID(player->getID(), movingCreature->getID(), movingCreature->getPosition(), tile->getPosition()); }, - "Game::playerMoveCreatureByID" + __FUNCTION__ ); player->setNextActionPushTask(task); } else { @@ -1371,7 +1413,7 @@ void Game::playerMoveThing(uint32_t playerId, const Position &fromPos, uint16_t } void Game::playerMoveCreatureByID(uint32_t playerId, uint32_t movingCreatureId, const Position &movingCreatureOrigPos, const Position &toPos) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -1390,106 +1432,121 @@ void Game::playerMoveCreatureByID(uint32_t playerId, uint32_t movingCreatureId, playerMoveCreature(player, movingCreature, movingCreatureOrigPos, toTile); } -void Game::playerMoveCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> movingCreature, const Position &movingCreatureOrigPos, std::shared_ptr<Tile> toTile) { +void Game::playerMoveCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &movingCreature, const Position &movingCreatureOrigPos, const std::shared_ptr<Tile> &toTile) { metrics::method_latency measure(__METHOD_NAME__); - if (!player->canDoAction()) { - const auto &task = createPlayerTask( - 600, [this, player, movingCreature, toTile, movingCreatureOrigPos] { playerMoveCreatureByID(player->getID(), movingCreature->getID(), movingCreatureOrigPos, toTile->getPosition()); }, "Game::playerMoveCreatureByID" - ); - - player->setNextActionPushTask(task); - return; - } - - player->setNextActionTask(nullptr); - if (!Position::areInRange<1, 1, 0>(movingCreatureOrigPos, player->getPosition())) { - // need to walk to the creature first before moving it - std::vector<Direction> listDir; - if (player->getPathTo(movingCreatureOrigPos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); + g_dispatcher().addWalkEvent([=, this] { + if (!player->canDoAction()) { const auto &task = createPlayerTask( - 600, [this, player, movingCreature, toTile, movingCreatureOrigPos] { playerMoveCreatureByID(player->getID(), movingCreature->getID(), movingCreatureOrigPos, toTile->getPosition()); }, "Game::playerMoveCreatureByID" + 600, + [this, player, movingCreature, toTile, movingCreatureOrigPos] { + playerMoveCreatureByID(player->getID(), movingCreature->getID(), movingCreatureOrigPos, toTile->getPosition()); + }, + __FUNCTION__ ); - player->pushEvent(true); + player->setNextActionPushTask(task); - } else { - player->sendCancelMessage(RETURNVALUE_THEREISNOWAY); + return; } - return; - } - player->pushEvent(false); - std::shared_ptr<Monster> monster = movingCreature->getMonster(); - bool isFamiliar = false; - if (monster) { - isFamiliar = monster->isFamiliar(); - } + player->setNextActionTask(nullptr); - if (!isFamiliar && ((!movingCreature->isPushable() && !player->hasFlag(PlayerFlags_t::CanPushAllCreatures)) || (movingCreature->isInGhostMode() && !player->isAccessPlayer()))) { - player->sendCancelMessage(RETURNVALUE_NOTMOVABLE); - return; - } + if (!Position::areInRange<1, 1, 0>(movingCreatureOrigPos, player->getPosition())) { + // need to walk to the creature first before moving it + std::vector<Direction> listDir; + if (player->getPathTo(movingCreatureOrigPos, listDir, 0, 1, true, true)) { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 600, + [this, player, movingCreature, toTile, movingCreatureOrigPos] { + playerMoveCreatureByID(player->getID(), movingCreature->getID(), movingCreatureOrigPos, toTile->getPosition()); + }, + __FUNCTION__ + ); + player->pushEvent(true); + player->setNextActionPushTask(task); + } else { + player->sendCancelMessage(RETURNVALUE_THEREISNOWAY); + } + return; + } - // check throw distance - const Position &movingCreaturePos = movingCreature->getPosition(); - const Position &toPos = toTile->getPosition(); - if ((Position::getDistanceX(movingCreaturePos, toPos) > movingCreature->getThrowRange()) || (Position::getDistanceY(movingCreaturePos, toPos) > movingCreature->getThrowRange()) || (Position::getDistanceZ(movingCreaturePos, toPos) * 4 > movingCreature->getThrowRange())) { - player->sendCancelMessage(RETURNVALUE_DESTINATIONOUTOFREACH); - return; - } + player->pushEvent(false); + std::shared_ptr<Monster> monster = movingCreature->getMonster(); + bool isFamiliar = false; + if (monster) { + isFamiliar = monster->isFamiliar(); + } - if (player != movingCreature) { - if (toTile->hasFlag(TILESTATE_BLOCKPATH)) { - player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); + if (!isFamiliar && ((!movingCreature->isPushable() && !player->hasFlag(PlayerFlags_t::CanPushAllCreatures)) || (movingCreature->isInGhostMode() && !player->isAccessPlayer()))) { + player->sendCancelMessage(RETURNVALUE_NOTMOVABLE); return; - } else if ((movingCreature->getZoneType() == ZONE_PROTECTION && !toTile->hasFlag(TILESTATE_PROTECTIONZONE)) || (movingCreature->getZoneType() == ZONE_NOPVP && !toTile->hasFlag(TILESTATE_NOPVPZONE))) { - player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + } + + // check throw distance + const Position &movingCreaturePos = movingCreature->getPosition(); + const Position &toPos = toTile->getPosition(); + if ((Position::getDistanceX(movingCreaturePos, toPos) > movingCreature->getThrowRange()) || (Position::getDistanceY(movingCreaturePos, toPos) > movingCreature->getThrowRange()) || (Position::getDistanceZ(movingCreaturePos, toPos) * 4 > movingCreature->getThrowRange())) { + player->sendCancelMessage(RETURNVALUE_DESTINATIONOUTOFREACH); return; - } else { - if (CreatureVector* tileCreatures = toTile->getCreatures()) { - for (auto &tileCreature : *tileCreatures) { - if (!tileCreature->isInGhostMode()) { - player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); - return; - } - } - } + } - auto movingNpc = movingCreature->getNpc(); - if (movingNpc && movingNpc->canInteract(toPos)) { + if (player != movingCreature) { + if (toTile->hasFlag(TILESTATE_BLOCKPATH)) { player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); return; + } else if ((movingCreature->getZoneType() == ZONE_PROTECTION && !toTile->hasFlag(TILESTATE_PROTECTIONZONE)) || (movingCreature->getZoneType() == ZONE_NOPVP && !toTile->hasFlag(TILESTATE_NOPVPZONE))) { + player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } else { + if (CreatureVector* tileCreatures = toTile->getCreatures()) { + for (auto &tileCreature : *tileCreatures) { + if (!tileCreature->isInGhostMode()) { + player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); + return; + } + } + } + + auto movingNpc = movingCreature->getNpc(); + if (movingNpc && movingNpc->canInteract(toPos)) { + player->sendCancelMessage(RETURNVALUE_NOTENOUGHROOM); + return; + } } - } - movingCreature->setLastPosition(movingCreature->getPosition()); - } + movingCreature->setLastPosition(movingCreature->getPosition()); + } - if (!g_events().eventPlayerOnMoveCreature(player, movingCreature, movingCreaturePos, toPos)) { - return; - } + if (!g_events().eventPlayerOnMoveCreature(player, movingCreature, movingCreaturePos, toPos)) { + return; + } - if (!g_callbacks().checkCallback(EventCallback_t::playerOnMoveCreature, &EventCallback::playerOnMoveCreature, player, movingCreature, movingCreaturePos, toPos)) { - return; - } + if (!g_callbacks().checkCallback(EventCallback_t::playerOnMoveCreature, &EventCallback::playerOnMoveCreature, player, movingCreature, movingCreaturePos, toPos)) { + return; + } - ReturnValue ret = internalMoveCreature(movingCreature, toTile); - if (ret != RETURNVALUE_NOERROR) { - player->sendCancelMessage(ret); - } - player->setLastPosition(player->getPosition()); + ReturnValue ret = internalMoveCreature(movingCreature, toTile); + if (ret != RETURNVALUE_NOERROR) { + player->sendCancelMessage(ret); + } + player->setLastPosition(player->getPosition()); + }); } -ReturnValue Game::internalMoveCreature(std::shared_ptr<Creature> creature, Direction direction, uint32_t flags /*= 0*/) { +ReturnValue Game::internalMoveCreature(const std::shared_ptr<Creature> &creature, Direction direction, uint32_t flags /*= 0*/) { if (!creature) { return RETURNVALUE_NOTPOSSIBLE; } + if (creature->getBaseSpeed() == 0) { + return RETURNVALUE_NOTMOVABLE; + } + creature->setLastPosition(creature->getPosition()); const Position ¤tPos = creature->getPosition(); Position destPos = getNextPosition(direction, currentPos); - std::shared_ptr<Player> player = creature->getPlayer(); + const auto &player = creature->getPlayer(); bool diagonalMovement = (direction & DIRECTION_DIAGONAL_MASK) != 0; if (player && !diagonalMovement) { @@ -1562,7 +1619,11 @@ ReturnValue Game::internalMoveCreature(const std::shared_ptr<Creature> &creature std::shared_ptr<Tile> fromCylinder = nullptr; uint32_t n = 0; - while ((subCylinder = toCylinder->queryDestination(index, creature, &toItem, flags)->getTile()) != toCylinder) { + while ((subCylinder = toCylinder->queryDestination(index, creature, toItem, flags)->getTile()) != toCylinder) { + if (subCylinder == nullptr) { + break; + } + map.moveCreature(creature, subCylinder); if (creature->getParent() != subCylinder) { @@ -1596,21 +1657,22 @@ ReturnValue Game::internalMoveCreature(const std::shared_ptr<Creature> &creature } void Game::playerMoveItemByPlayerID(uint32_t playerId, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } playerMoveItem(player, fromPos, itemId, fromStackPos, toPos, count, nullptr, nullptr); } -void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count, std::shared_ptr<Item> item, std::shared_ptr<Cylinder> toCylinder) { +void Game::playerMoveItem(const std::shared_ptr<Player> &player, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count, std::shared_ptr<Item> item, std::shared_ptr<Cylinder> toCylinder) { if (!player->canDoAction()) { uint32_t delay = player->getNextActionTime(); - std::shared_ptr<Task> task = createPlayerTask( - delay, [this, playerId = player->getID(), fromPos, itemId, fromStackPos, toPos, count] { + const auto &task = createPlayerTask( + delay, + [this, playerId = player->getID(), fromPos, itemId, fromStackPos, toPos, count] { playerMoveItemByPlayerID(playerId, fromPos, itemId, fromStackPos, toPos, count); }, - "Game::playerMoveItemByPlayerID" + __FUNCTION__ ); player->setNextActionTask(task); return; @@ -1636,7 +1698,7 @@ void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPo fromIndex = fromStackPos; } - std::shared_ptr<Thing> thing = internalGetThing(player, fromPos, fromIndex, itemId, STACKPOS_MOVE); + const auto &thing = internalGetThing(player, fromPos, fromIndex, itemId, STACKPOS_MOVE); if (!thing || !thing->getItem()) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -1684,9 +1746,9 @@ void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPo return; } - const Position &playerPos = player->getPosition(); - auto cylinderTile = fromCylinder->getTile(); - const Position &mapFromPos = cylinderTile ? cylinderTile->getPosition() : item->getPosition(); + const auto &playerPos = player->getPosition(); + const auto &cylinderTile = fromCylinder->getTile(); + const auto &mapFromPos = cylinderTile ? cylinderTile->getPosition() : item->getPosition(); if (playerPos.z != mapFromPos.z) { player->sendCancelMessage(playerPos.z > mapFromPos.z ? RETURNVALUE_FIRSTGOUPSTAIRS : RETURNVALUE_FIRSTGODOWNSTAIRS); return; @@ -1696,13 +1758,13 @@ void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPo // need to walk to the item first before using it std::vector<Direction> listDir; if (player->getPathTo(item->getPosition(), listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId = player->getID(), fromPos, itemId, fromStackPos, toPos, count] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId = player->getID(), fromPos, itemId, fromStackPos, toPos, count] { playerMoveItemByPlayerID(playerId, fromPos, itemId, fromStackPos, toPos, count); }, - "Game::playerMoveItemByPlayerID" + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -1758,13 +1820,13 @@ void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPo std::vector<Direction> listDir; if (player->getPathTo(walkPos, listDir, 0, 0, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId = player->getID(), itemPos, itemId, itemStackPos, toPos, count] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId = player->getID(), itemPos, itemId, itemStackPos, toPos, count] { playerMoveItemByPlayerID(playerId, itemPos, itemId, itemStackPos, toPos, count); }, - "Game::playerMoveItemByPlayerID" + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -1833,11 +1895,11 @@ void Game::playerMoveItem(std::shared_ptr<Player> player, const Position &fromPo g_callbacks().executeCallback(EventCallback_t::playerOnItemMoved, &EventCallback::playerOnItemMoved, player, item, count, fromPos, toPos, fromCylinder, toCylinder); } -bool Game::isTryingToStow(const Position &toPos, std::shared_ptr<Cylinder> toCylinder) const { +bool Game::isTryingToStow(const Position &toPos, const std::shared_ptr<Cylinder> &toCylinder) const { return toCylinder->getContainer() && toCylinder->getItem()->getID() == ITEM_LOCKER && toPos.getZ() == ITEM_SUPPLY_STASH_INDEX; } -ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr<Player> player, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, Position toPos) { +ReturnValue Game::checkMoveItemToCylinder(const std::shared_ptr<Player> &player, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder, const std::shared_ptr<Item> &item, Position toPos) { if (!player || !toCylinder || !item) { return RETURNVALUE_NOTPOSSIBLE; } @@ -1854,11 +1916,11 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr<Player> player, std::s } if (containerID == ITEM_GOLD_POUCH) { - if (g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY, __FUNCTION__)) { + if (g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY)) { return RETURNVALUE_CONTAINERNOTENOUGHROOM; } - bool allowAnything = g_configManager().getBoolean(TOGGLE_GOLD_POUCH_ALLOW_ANYTHING, __FUNCTION__); + bool allowAnything = g_configManager().getBoolean(TOGGLE_GOLD_POUCH_ALLOW_ANYTHING); if (!allowAnything && item->getID() != ITEM_GOLD_COIN && item->getID() != ITEM_PLATINUM_COIN && item->getID() != ITEM_CRYSTAL_COIN) { return RETURNVALUE_ITEMCANNOTBEMOVEDPOUCH; @@ -1941,7 +2003,7 @@ ReturnValue Game::checkMoveItemToCylinder(std::shared_ptr<Player> player, std::s return RETURNVALUE_NOERROR; } -ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, int32_t index, std::shared_ptr<Item> item, uint32_t count, std::shared_ptr<Item>* movedItem, uint32_t flags /*= 0*/, std::shared_ptr<Creature> actor /*=nullptr*/, std::shared_ptr<Item> tradeItem /* = nullptr*/, bool checkTile /* = true*/) { +ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, int32_t index, const std::shared_ptr<Item> &item, uint32_t count, std::shared_ptr<Item>* movedItem, uint32_t flags /*= 0*/, const std::shared_ptr<Creature> &actor /*=nullptr*/, const std::shared_ptr<Item> &tradeItem /* = nullptr*/, bool checkTile /* = true*/) { metrics::method_latency measure(__METHOD_NAME__); if (fromCylinder == nullptr) { g_logger().error("[{}] fromCylinder is nullptr", __FUNCTION__); @@ -1953,7 +2015,7 @@ ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std:: } if (checkTile) { - if (std::shared_ptr<Tile> fromTile = fromCylinder->getTile()) { + if (const std::shared_ptr<Tile> &fromTile = fromCylinder->getTile()) { if (fromTile && browseFields.contains(fromTile) && browseFields[fromTile].lock() == fromCylinder) { fromCylinder = fromTile; } @@ -1962,10 +2024,14 @@ ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std:: std::shared_ptr<Item> toItem = nullptr; - std::shared_ptr<Cylinder> subCylinder; + std::shared_ptr<Cylinder> subCylinder = nullptr; int floorN = 0; - while ((subCylinder = toCylinder->queryDestination(index, item, &toItem, flags)) != toCylinder) { + while ((subCylinder = toCylinder->queryDestination(index, item, toItem, flags)) != toCylinder) { + if (subCylinder == nullptr) { + break; + } + toCylinder = subCylinder; flags = 0; @@ -2173,10 +2239,10 @@ ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std:: return ret; } - if (std::shared_ptr<Player> player = actor->getPlayer()) { + if (const auto &playerActor = actor->getPlayer()) { // Refresh depot search window if necessary - if (player->isDepotSearchOpenOnItem(item->getID()) && ((fromCylinder->getItem() && fromCylinder->getItem()->isInsideDepot(true)) || (toCylinder->getItem() && toCylinder->getItem()->isInsideDepot(true)))) { - player->requestDepotSearchItem(item->getID(), item->getTier()); + if (playerActor->isDepotSearchOpenOnItem(item->getID()) && ((fromCylinder->getItem() && fromCylinder->getItem()->isInsideDepot(true)) || (toCylinder->getItem() && toCylinder->getItem()->isInsideDepot(true)))) { + playerActor->requestDepotSearchItem(item->getID(), item->getTier()); } const ItemType &it = Item::items[fromCylinder->getItem()->getID()]; @@ -2185,8 +2251,8 @@ ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std:: } // Looting analyser - if (it.isCorpse && toContainer->getTopParent() == player && item->getIsLootTrackeable()) { - player->sendLootStats(item, static_cast<uint8_t>(item->getItemCount())); + if (it.isCorpse && toContainer->getTopParent() == playerActor && item->getIsLootTrackeable()) { + playerActor->sendLootStats(item, static_cast<uint8_t>(item->getItemCount())); } } } @@ -2194,12 +2260,12 @@ ReturnValue Game::internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std:: return ret; } -ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, int32_t index /*= INDEX_WHEREEVER*/, uint32_t flags /* = 0*/, bool test /* = false*/) { +ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, const std::shared_ptr<Item> &item, int32_t index /*= INDEX_WHEREEVER*/, uint32_t flags /* = 0*/, bool test /* = false*/) { uint32_t remainderCount = 0; - return internalAddItem(std::move(toCylinder), std::move(item), index, flags, test, remainderCount); + return internalAddItem(std::move(toCylinder), item, index, flags, test, remainderCount); } -ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, int32_t index, uint32_t flags, bool test, uint32_t &remainderCount) { +ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, const std::shared_ptr<Item> &item, int32_t index, uint32_t flags, bool test, uint32_t &remainderCount) { metrics::method_latency measure(__METHOD_NAME__); if (toCylinder == nullptr) { g_logger().error("[{}] fromCylinder is nullptr", __FUNCTION__); @@ -2214,7 +2280,7 @@ ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::sha std::shared_ptr<Cylinder> destCylinder = toCylinder; std::shared_ptr<Item> toItem = nullptr; - toCylinder = toCylinder->queryDestination(index, item, &toItem, flags); + toCylinder = toCylinder->queryDestination(index, item, toItem, flags); // check if we can add this item ReturnValue ret = toCylinder->queryAdd(index, item, item->getItemCount(), flags); @@ -2286,7 +2352,8 @@ ReturnValue Game::internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::sha return RETURNVALUE_NOERROR; } -ReturnValue Game::internalRemoveItem(std::shared_ptr<Item> item, int32_t count /*= -1*/, bool test /*= false*/, uint32_t flags /*= 0*/, bool force /*= false*/) { +ReturnValue Game::internalRemoveItem(const std::shared_ptr<Item> &items, int32_t count /*= -1*/, bool test /*= false*/, uint32_t flags /*= 0*/, bool force /*= false*/) { + auto item = items; metrics::method_latency measure(__METHOD_NAME__); if (item == nullptr) { g_logger().debug("{} - Item is nullptr", __FUNCTION__); @@ -2297,7 +2364,7 @@ ReturnValue Game::internalRemoveItem(std::shared_ptr<Item> item, int32_t count / g_logger().debug("{} - Cylinder is nullptr", __FUNCTION__); return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Tile> fromTile = cylinder->getTile(); + const auto &fromTile = cylinder->getTile(); if (fromTile) { if (fromTile && browseFields.contains(fromTile) && browseFields[fromTile].lock() == cylinder) { cylinder = fromTile; @@ -2337,7 +2404,7 @@ ReturnValue Game::internalRemoveItem(std::shared_ptr<Item> item, int32_t count / cylinder->postRemoveNotification(item, nullptr, index); } - std::shared_ptr<Item> quiver = cylinder->getItem(); + const auto &quiver = cylinder->getItem(); if (quiver && quiver->isQuiver() && quiver->getHoldingPlayer() && quiver->getHoldingPlayer()->getThing(CONST_SLOT_RIGHT) == quiver) { @@ -2368,7 +2435,7 @@ std::tuple<ReturnValue, uint32_t, uint32_t> Game::addItemBatch(const std::shared } metrics::method_latency measure(__METHOD_NAME__); - const auto player = toCylinder->getPlayer(); + const auto &player = toCylinder->getPlayer(); bool dropping = false; auto setupDestination = [&]() -> std::shared_ptr<Cylinder> { if (autoContainerId == 0) { @@ -2480,7 +2547,7 @@ std::tuple<ReturnValue, uint32_t, uint32_t> Game::createItem(const std::shared_p return createItemBatch(toCylinder, { std::make_tuple(itemId, count, subType) }, flags, dropOnMap, autoContainerId); } -ReturnValue Game::internalPlayerAddItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, bool dropOnMap /*= true*/, Slots_t slot /*= CONST_SLOT_WHEREEVER*/) { +ReturnValue Game::internalPlayerAddItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, bool dropOnMap /*= true*/, Slots_t slot /*= CONST_SLOT_WHEREEVER*/) { metrics::method_latency measure(__METHOD_NAME__); uint32_t remainderCount = 0; ReturnValue ret; @@ -2512,7 +2579,7 @@ ReturnValue Game::internalPlayerAddItem(std::shared_ptr<Player> player, std::sha return ret; } -std::shared_ptr<Item> Game::findItemOfType(std::shared_ptr<Cylinder> cylinder, uint16_t itemId, bool depthSearch /*= true*/, int32_t subType /*= -1*/) const { +std::shared_ptr<Item> Game::findItemOfType(const std::shared_ptr<Cylinder> &cylinder, uint16_t itemId, bool depthSearch /*= true*/, int32_t subType /*= -1*/) const { metrics::method_latency measure(__METHOD_NAME__); if (cylinder == nullptr) { g_logger().error("[{}] Cylinder is nullptr", __FUNCTION__); @@ -2521,12 +2588,12 @@ std::shared_ptr<Item> Game::findItemOfType(std::shared_ptr<Cylinder> cylinder, u std::vector<std::shared_ptr<Container>> containers; for (size_t i = cylinder->getFirstIndex(), j = cylinder->getLastIndex(); i < j; ++i) { - std::shared_ptr<Thing> thing = cylinder->getThing(i); + const std::shared_ptr<Thing> &thing = cylinder->getThing(i); if (!thing) { continue; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { continue; } @@ -2536,7 +2603,7 @@ std::shared_ptr<Item> Game::findItemOfType(std::shared_ptr<Cylinder> cylinder, u } if (depthSearch) { - std::shared_ptr<Container> container = item->getContainer(); + const std::shared_ptr<Container> &container = item->getContainer(); if (container) { containers.push_back(container); } @@ -2545,13 +2612,13 @@ std::shared_ptr<Item> Game::findItemOfType(std::shared_ptr<Cylinder> cylinder, u size_t i = 0; while (i < containers.size()) { - std::shared_ptr<Container> container = containers[i++]; - for (std::shared_ptr<Item> item : container->getItemList()) { + const std::shared_ptr<Container> &container = containers[i++]; + for (const auto &item : container->getItemList()) { if (item->getID() == itemId && (subType == -1 || subType == item->getSubType())) { return item; } - std::shared_ptr<Container> subContainer = item->getContainer(); + const std::shared_ptr<Container> &subContainer = item->getContainer(); if (subContainer) { containers.push_back(subContainer); } @@ -2560,7 +2627,7 @@ std::shared_ptr<Item> Game::findItemOfType(std::shared_ptr<Cylinder> cylinder, u return nullptr; } -bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint32_t flags /*= 0*/, bool useBalance /*= false*/) { +bool Game::removeMoney(const std::shared_ptr<Cylinder> &cylinder, uint64_t money, uint32_t flags /*= 0*/, bool useBalance /*= false*/) { if (cylinder == nullptr) { g_logger().error("[{}] cylinder is nullptr", __FUNCTION__); return false; @@ -2572,15 +2639,15 @@ bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint3 std::multimap<uint32_t, std::shared_ptr<Item>> moneyMap; uint64_t moneyCount = 0; for (size_t i = cylinder->getFirstIndex(), j = cylinder->getLastIndex(); i < j; ++i) { - std::shared_ptr<Thing> thing = cylinder->getThing(i); + const std::shared_ptr<Thing> &thing = cylinder->getThing(i); if (!thing) { continue; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { continue; } - std::shared_ptr<Container> container = item->getContainer(); + const std::shared_ptr<Container> &container = item->getContainer(); if (container) { containers.push_back(container); } else { @@ -2593,9 +2660,9 @@ bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint3 } size_t i = 0; while (i < containers.size()) { - std::shared_ptr<Container> container = containers[i++]; + const std::shared_ptr<Container> &container = containers[i++]; for (const std::shared_ptr<Item> &item : container->getItemList()) { - std::shared_ptr<Container> tmpContainer = item->getContainer(); + const std::shared_ptr<Container> &tmpContainer = item->getContainer(); if (tmpContainer) { containers.push_back(tmpContainer); } else { @@ -2608,7 +2675,7 @@ bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint3 } } - std::shared_ptr<Player> player = useBalance ? std::dynamic_pointer_cast<Player>(cylinder) : nullptr; + const auto &player = useBalance ? std::dynamic_pointer_cast<Player>(cylinder) : nullptr; uint64_t balance = 0; if (useBalance && player) { balance = player->getBankBalance(); @@ -2619,7 +2686,7 @@ bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint3 } for (const auto &moneyEntry : moneyMap) { - std::shared_ptr<Item> item = moneyEntry.second; + const std::shared_ptr<Item> &item = moneyEntry.second; if (moneyEntry.first < money) { internalRemoveItem(item); money -= moneyEntry.first; @@ -2642,7 +2709,7 @@ bool Game::removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint3 return true; } -void Game::addMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint32_t flags /*= 0*/) { +void Game::addMoney(const std::shared_ptr<Cylinder> &cylinder, uint64_t money, uint32_t flags /*= 0*/) { if (cylinder == nullptr) { g_logger().error("[{}] cylinder is nullptr", __FUNCTION__); return; @@ -2651,40 +2718,30 @@ void Game::addMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint32_t return; } - uint32_t crystalCoins = money / 10000; - money -= crystalCoins * 10000; - while (crystalCoins > 0) { - const uint16_t count = std::min<uint32_t>(100, crystalCoins); + auto addCoins = [&](uint16_t itemId, uint32_t count) { + while (count > 0) { + const uint16_t createCount = std::min<uint32_t>(100, count); + const std::shared_ptr<Item> &remaindItem = Item::CreateItem(itemId, createCount); - std::shared_ptr<Item> remaindItem = Item::CreateItem(ITEM_CRYSTAL_COIN, count); + ReturnValue ret = internalAddItem(cylinder, remaindItem, INDEX_WHEREEVER, flags); + if (ret != RETURNVALUE_NOERROR) { + internalAddItem(cylinder->getTile(), remaindItem, INDEX_WHEREEVER, FLAG_NOLIMIT); + } - ReturnValue ret = internalAddItem(cylinder, remaindItem, INDEX_WHEREEVER, flags); - if (ret != RETURNVALUE_NOERROR) { - internalAddItem(cylinder->getTile(), remaindItem, INDEX_WHEREEVER, FLAG_NOLIMIT); + count -= createCount; } + }; - crystalCoins -= count; - } + uint32_t crystalCoins = money / 10000; + money -= crystalCoins * 10000; + addCoins(ITEM_CRYSTAL_COIN, crystalCoins); uint16_t platinumCoins = money / 100; - if (platinumCoins != 0) { - std::shared_ptr<Item> remaindItem = Item::CreateItem(ITEM_PLATINUM_COIN, platinumCoins); - - ReturnValue ret = internalAddItem(cylinder, remaindItem, INDEX_WHEREEVER, flags); - if (ret != RETURNVALUE_NOERROR) { - internalAddItem(cylinder->getTile(), remaindItem, INDEX_WHEREEVER, FLAG_NOLIMIT); - } + money -= platinumCoins * 100; + addCoins(ITEM_PLATINUM_COIN, platinumCoins); - money -= platinumCoins * 100; - } - - if (money != 0) { - std::shared_ptr<Item> remaindItem = Item::CreateItem(ITEM_GOLD_COIN, money); - - ReturnValue ret = internalAddItem(cylinder, remaindItem, INDEX_WHEREEVER, flags); - if (ret != RETURNVALUE_NOERROR) { - internalAddItem(cylinder->getTile(), remaindItem, INDEX_WHEREEVER, FLAG_NOLIMIT); - } + if (money > 0) { + addCoins(ITEM_GOLD_COIN, money); } } @@ -2850,15 +2907,18 @@ ReturnValue Game::internalTeleport(const std::shared_ptr<Thing> &thing, const Po return ret; } - map.moveCreature(creature, toTile, !pushMove); + g_dispatcher().addWalkEvent([=] { + g_game().map.moveCreature(creature, toTile, !pushMove); + }); + return RETURNVALUE_NOERROR; - } else if (std::shared_ptr<Item> item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { return internalMoveItem(item->getParent(), toTile, INDEX_WHEREEVER, item, item->getItemCount(), nullptr, flags); } return RETURNVALUE_NOTPOSSIBLE; } -void Game::playerQuickLootCorpse(std::shared_ptr<Player> player, std::shared_ptr<Container> corpse, const Position &position) { +void Game::playerQuickLootCorpse(const std::shared_ptr<Player> &player, const std::shared_ptr<Container> &corpse, const Position &position) { if (!player || !corpse) { return; } @@ -2870,7 +2930,7 @@ void Game::playerQuickLootCorpse(std::shared_ptr<Player> player, std::shared_ptr bool missedAnyItem = false; for (ContainerIterator it = corpse->iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; + const auto &item = *it; bool listed = player->isQuickLootListedItem(item); if ((listed && ignoreListItems) || (!listed && !ignoreListItems)) { if (item->getWorth() != 0) { @@ -2997,7 +3057,7 @@ void Game::playerQuickLootCorpse(std::shared_ptr<Player> player, std::shared_ptr player->lastQuickLootNotification = OTSYS_TIME(); } -std::shared_ptr<Container> Game::findManagedContainer(std::shared_ptr<Player> player, bool &fallbackConsumed, ObjectCategory_t category, bool isLootContainer) { +std::shared_ptr<Container> Game::findManagedContainer(const std::shared_ptr<Player> &player, bool &fallbackConsumed, ObjectCategory_t category, bool isLootContainer) { auto lootContainer = player->getManagedContainer(category, isLootContainer); if (!lootContainer && player->quickLootFallbackToMainContainer && !fallbackConsumed) { auto fallbackItem = player->getInventoryItem(CONST_SLOT_BACKPACK); @@ -3038,7 +3098,7 @@ std::shared_ptr<Container> Game::findNextAvailableContainer(ContainerIterator &c return nullptr; } -bool Game::handleFallbackLogic(std::shared_ptr<Player> player, std::shared_ptr<Container> &lootContainer, ContainerIterator &containerIterator, const bool &fallbackConsumed) { +bool Game::handleFallbackLogic(const std::shared_ptr<Player> &player, std::shared_ptr<Container> &lootContainer, ContainerIterator &containerIterator, const bool &fallbackConsumed) { if (fallbackConsumed || !player->quickLootFallbackToMainContainer) { return false; } @@ -3054,7 +3114,7 @@ bool Game::handleFallbackLogic(std::shared_ptr<Player> player, std::shared_ptr<C return true; } -ReturnValue Game::processMoveOrAddItemToLootContainer(std::shared_ptr<Item> item, std::shared_ptr<Container> lootContainer, uint32_t &remainderCount, std::shared_ptr<Player> player) { +ReturnValue Game::processMoveOrAddItemToLootContainer(const std::shared_ptr<Item> &item, const std::shared_ptr<Container> &lootContainer, uint32_t &remainderCount, const std::shared_ptr<Player> &player) { std::shared_ptr<Item> moveItem = nullptr; ReturnValue ret; if (item->getParent()) { @@ -3068,7 +3128,7 @@ ReturnValue Game::processMoveOrAddItemToLootContainer(std::shared_ptr<Item> item return ret; } -ReturnValue Game::processLootItems(std::shared_ptr<Player> player, std::shared_ptr<Container> lootContainer, std::shared_ptr<Item> item, bool &fallbackConsumed) { +ReturnValue Game::processLootItems(const std::shared_ptr<Player> &player, std::shared_ptr<Container> lootContainer, const std::shared_ptr<Item> &item, bool &fallbackConsumed) { std::shared_ptr<Container> lastSubContainer = nullptr; uint32_t remainderCount = item->getItemCount(); ContainerIterator containerIterator = lootContainer->iterator(); @@ -3090,13 +3150,13 @@ ReturnValue Game::processLootItems(std::shared_ptr<Player> player, std::shared_p return ret; } -ReturnValue Game::internalCollectManagedItems(std::shared_ptr<Player> player, std::shared_ptr<Item> item, ObjectCategory_t category /* = OBJECTCATEGORY_DEFAULT*/, bool isLootContainer /* = true*/) { +ReturnValue Game::internalCollectManagedItems(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, ObjectCategory_t category, bool isLootContainer /* = true*/) { if (!player || !item) { return RETURNVALUE_NOTPOSSIBLE; } // Send money to the bank - if (g_configManager().getBoolean(AUTOBANK, __FUNCTION__)) { + if (g_configManager().getBoolean(AUTOBANK)) { if (item->getID() == ITEM_GOLD_COIN || item->getID() == ITEM_PLATINUM_COIN || item->getID() == ITEM_CRYSTAL_COIN) { uint64_t money = 0; if (item->getID() == ITEM_PLATINUM_COIN) { @@ -3128,7 +3188,7 @@ ReturnValue Game::internalCollectManagedItems(std::shared_ptr<Player> player, st return processLootItems(player, lootContainer, item, fallbackConsumed); } -ReturnValue Game::collectRewardChestItems(std::shared_ptr<Player> player, uint32_t maxMoveItems /* = 0*/) { +ReturnValue Game::collectRewardChestItems(const std::shared_ptr<Player> &player, uint32_t maxMoveItems /* = 0*/) { // Check if have item on player reward chest std::shared_ptr<RewardChest> rewardChest = player->getRewardChest(); if (rewardChest->empty()) { @@ -3171,7 +3231,7 @@ ReturnValue Game::collectRewardChestItems(std::shared_ptr<Player> player, uint32 return RETURNVALUE_NOERROR; } -ObjectCategory_t Game::getObjectCategory(std::shared_ptr<Item> item) { +ObjectCategory_t Game::getObjectCategory(const std::shared_ptr<Item> &item) { ObjectCategory_t category = OBJECTCATEGORY_DEFAULT; if (!item) { return OBJECTCATEGORY_NONE; @@ -3274,7 +3334,7 @@ uint64_t Game::getItemMarketPrice(const std::map<uint16_t, uint64_t> &itemMap, b return total; } -std::shared_ptr<Item> searchForItem(std::shared_ptr<Container> container, uint16_t itemId, bool hasTier /* = false*/, uint8_t tier /* = 0*/) { +std::shared_ptr<Item> searchForItem(const std::shared_ptr<Container> &container, uint16_t itemId, bool hasTier /* = false*/, uint8_t tier /* = 0*/) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { if ((*it)->getID() == itemId && (!hasTier || (*it)->getTier() == tier)) { return *it; @@ -3311,9 +3371,8 @@ Slots_t getSlotType(const ItemType &it) { return slot; } -// Implementation of player invoked events void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* = false*/, uint8_t tier /* = 0*/) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3326,12 +3385,12 @@ void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* = return; } - std::shared_ptr<Item> item = player->getInventoryItem(CONST_SLOT_BACKPACK); + const auto &item = player->getInventoryItem(CONST_SLOT_BACKPACK); if (!item) { return; } - std::shared_ptr<Container> backpack = item->getContainer(); + const std::shared_ptr<Container> &backpack = item->getContainer(); if (!backpack) { return; } @@ -3344,8 +3403,8 @@ void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* = const ItemType &it = Item::items[itemId]; Slots_t slot = getSlotType(it); - auto slotItem = player->getInventoryItem(slot); - auto equipItem = searchForItem(backpack, it.id, hasTier, tier); + const auto &slotItem = player->getInventoryItem(slot); + const auto &equipItem = searchForItem(backpack, it.id, hasTier, tier); ReturnValue ret = RETURNVALUE_NOERROR; if (slotItem && slotItem->getID() == it.id && (!it.stackable || slotItem->getItemCount() == slotItem->getStackSize() || !equipItem)) { ret = internalMoveItem(slotItem->getParent(), player, CONST_SLOT_WHEREEVER, slotItem, slotItem->getItemCount(), nullptr); @@ -3389,7 +3448,7 @@ void Game::playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier /* = } void Game::playerMove(uint32_t playerId, Direction direction) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3402,7 +3461,7 @@ void Game::playerMove(uint32_t playerId, Direction direction) { } void Game::forcePlayerMove(uint32_t playerId, Direction direction) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3414,7 +3473,7 @@ void Game::forcePlayerMove(uint32_t playerId, Direction direction) { player->startAutoWalk(std::vector<Direction> { direction }, true); } -bool Game::playerBroadcastMessage(std::shared_ptr<Player> player, const std::string &text) const { +bool Game::playerBroadcastMessage(const std::shared_ptr<Player> &player, const std::string &text) const { if (!player->hasFlag(PlayerFlags_t::CanBroadcast)) { return false; } @@ -3429,7 +3488,7 @@ bool Game::playerBroadcastMessage(std::shared_ptr<Player> player, const std::str } void Game::playerCreatePrivateChannel(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isPremium()) { return; } @@ -3443,7 +3502,7 @@ void Game::playerCreatePrivateChannel(uint32_t playerId) { } void Game::playerChannelInvite(uint32_t playerId, const std::string &name) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3466,7 +3525,7 @@ void Game::playerChannelInvite(uint32_t playerId, const std::string &name) { } void Game::playerChannelExclude(uint32_t playerId, const std::string &name) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3489,7 +3548,7 @@ void Game::playerChannelExclude(uint32_t playerId, const std::string &name) { } void Game::playerRequestChannels(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3498,7 +3557,7 @@ void Game::playerRequestChannels(uint32_t playerId) { } void Game::playerOpenChannel(uint32_t playerId, uint16_t channelId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3520,7 +3579,7 @@ void Game::playerOpenChannel(uint32_t playerId, uint16_t channelId) { } void Game::playerCloseChannel(uint32_t playerId, uint16_t channelId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3529,7 +3588,7 @@ void Game::playerCloseChannel(uint32_t playerId, uint16_t channelId) { } void Game::playerOpenPrivateChannel(uint32_t playerId, std::string &receiver) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3559,7 +3618,7 @@ void Game::playerCloseNpcChannel(uint32_t playerId) { } void Game::playerReceivePing(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3568,7 +3627,7 @@ void Game::playerReceivePing(uint32_t playerId) { } void Game::playerReceivePingBack(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3577,7 +3636,7 @@ void Game::playerReceivePingBack(uint32_t playerId) { } void Game::playerAutoWalk(uint32_t playerId, const std::vector<Direction> &listDir) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3588,7 +3647,7 @@ void Game::playerAutoWalk(uint32_t playerId, const std::vector<Direction> &listD } void Game::forcePlayerAutoWalk(uint32_t playerId, const std::vector<Direction> &listDir) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3605,7 +3664,7 @@ void Game::forcePlayerAutoWalk(uint32_t playerId, const std::vector<Direction> & } void Game::playerStopAutoWalk(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -3615,29 +3674,29 @@ void Game::playerStopAutoWalk(uint32_t playerId) { void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t fromStackPos, uint16_t fromItemId, const Position &toPos, uint8_t toStackPos, uint16_t toItemId) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } bool isHotkey = (fromPos.x == 0xFFFF && fromPos.y == 0 && fromPos.z == 0); - if (isHotkey && !g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED, __FUNCTION__)) { + if (isHotkey && !g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED)) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, fromPos, fromStackPos, fromItemId, STACKPOS_FIND_THING); + const std::shared_ptr<Thing> &thing = internalGetThing(player, fromPos, fromStackPos, fromItemId, STACKPOS_FIND_THING); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || !item->isMultiUse() || item->getID() != fromItemId) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } - bool canUseHouseItem = !g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) || InternalGame::playerCanUseItemOnHouseTile(player, item); + bool canUseHouseItem = !g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) || InternalGame::playerCanUseItemOnHouseTile(player, item); if (!canUseHouseItem && item->hasOwner() && !item->isOwner(player)) { player->sendCancelMessage(RETURNVALUE_ITEMISNOTYOURS); return; @@ -3683,10 +3742,13 @@ void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t f std::vector<Direction> listDir; if (player->getPathTo(walkToPos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, itemPos, itemStackPos, fromItemId, toPos, toStackPos, toItemId] { playerUseItemEx(playerId, itemPos, itemStackPos, fromItemId, toPos, toStackPos, toItemId); }, "Game::playerUseItemEx" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, itemPos, itemStackPos, fromItemId, toPos, toStackPos, toItemId] { + playerUseItemEx(playerId, itemPos, itemStackPos, fromItemId, toPos, toStackPos, toItemId); + }, + __FUNCTION__ ); if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); @@ -3713,8 +3775,12 @@ void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t f if (it.isRune() || it.type == ITEM_TYPE_POTION) { delay = player->getNextPotionActionTime(); } - std::shared_ptr<Task> task = createPlayerTask( - delay, [this, playerId, fromPos, fromStackPos, fromItemId, toPos, toStackPos, toItemId] { playerUseItemEx(playerId, fromPos, fromStackPos, fromItemId, toPos, toStackPos, toItemId); }, "Game::playerUseItemEx" + const auto &task = createPlayerTask( + delay, + [this, playerId, fromPos, fromStackPos, fromItemId, toPos, toStackPos, toItemId] { + playerUseItemEx(playerId, fromPos, fromStackPos, fromItemId, toPos, toStackPos, toItemId); + }, + __FUNCTION__ ); if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); @@ -3753,29 +3819,29 @@ void Game::playerUseItemEx(uint32_t playerId, const Position &fromPos, uint8_t f void Game::playerUseItem(uint32_t playerId, const Position &pos, uint8_t stackPos, uint8_t index, uint16_t itemId) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } bool isHotkey = (pos.x == 0xFFFF && pos.y == 0 && pos.z == 0); - if (isHotkey && !g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED, __FUNCTION__)) { + if (isHotkey && !g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED)) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); + const auto &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->isMultiUse() || item->getID() != itemId) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } - bool canUseHouseItem = !g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) || InternalGame::playerCanUseItemOnHouseTile(player, item); + bool canUseHouseItem = !g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) || InternalGame::playerCanUseItemOnHouseTile(player, item); if (!canUseHouseItem && item->hasOwner() && !item->isOwner(player)) { player->sendCancelMessage(RETURNVALUE_ITEMISNOTYOURS); return; @@ -3797,10 +3863,13 @@ void Game::playerUseItem(uint32_t playerId, const Position &pos, uint8_t stackPo if (ret == RETURNVALUE_TOOFARAWAY) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos, stackPos, index, itemId] { playerUseItem(playerId, pos, stackPos, index, itemId); }, "Game::playerUseItem" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos, stackPos, index, itemId] { + playerUseItem(playerId, pos, stackPos, index, itemId); + }, + __FUNCTION__ ); if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); @@ -3827,8 +3896,12 @@ void Game::playerUseItem(uint32_t playerId, const Position &pos, uint8_t stackPo if (it.isRune() || it.type == ITEM_TYPE_POTION) { delay = player->getNextPotionActionTime(); } - std::shared_ptr<Task> task = createPlayerTask( - delay, [this, playerId, pos, stackPos, index, itemId] { playerUseItem(playerId, pos, stackPos, index, itemId); }, "Game::playerUseItem" + const auto &task = createPlayerTask( + delay, + [this, playerId, pos, stackPos, index, itemId] { + playerUseItem(playerId, pos, stackPos, index, itemId); + }, + __FUNCTION__ ); if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); @@ -3856,12 +3929,12 @@ void Game::playerUseItem(uint32_t playerId, const Position &pos, uint8_t stackPo void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uint8_t fromStackPos, uint32_t creatureId, uint16_t itemId) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Creature> creature = getCreatureByID(creatureId); + const std::shared_ptr<Creature> &creature = getCreatureByID(creatureId); if (!creature) { return; } @@ -3871,20 +3944,20 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin } bool isHotkey = (fromPos.x == 0xFFFF && fromPos.y == 0 && fromPos.z == 0); - if (!g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(AIMBOT_HOTKEY_ENABLED)) { if (creature->getPlayer() || isHotkey) { player->sendCancelMessage(RETURNVALUE_DIRECTPLAYERSHOOT); return; } } - std::shared_ptr<Thing> thing = internalGetThing(player, fromPos, fromStackPos, itemId, STACKPOS_FIND_THING); + const std::shared_ptr<Thing> &thing = internalGetThing(player, fromPos, fromStackPos, itemId, STACKPOS_FIND_THING); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || !item->isMultiUse() || item->getID() != itemId) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; @@ -3895,7 +3968,7 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS)) { if (std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(item->getTile())) { const auto &house = houseTile->getHouse(); if (house && item->getRealParent() && item->getRealParent() != player && (!house->isInvited(player) || house->getHouseAccessLevel(player) == HOUSE_GUEST)) { @@ -3914,11 +3987,11 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin } const std::shared_ptr<Monster> monster = creature->getMonster(); - if (monster && monster->isFamiliar() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) { - player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + if (monster && monster->isFamiliar() && creature->getMaster() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) { + player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL)); if (it.isMultiUse()) { - player->sendUseItemCooldown(g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->sendUseItemCooldown(g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL)); } player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); @@ -3954,13 +4027,13 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin std::vector<Direction> listDir; if (player->getPathTo(walkToPos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, itemPos, itemStackPos, creatureId, itemId] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, itemPos, itemStackPos, creatureId, itemId] { playerUseWithCreature(playerId, itemPos, itemStackPos, creatureId, itemId); }, - "Game::playerUseWithCreature" + __FUNCTION__ ); if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); @@ -3987,10 +4060,13 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin if (it.isRune() || it.type == ITEM_TYPE_POTION) { delay = player->getNextPotionActionTime(); } - std::shared_ptr<Task> task = createPlayerTask( - delay, [this, playerId, fromPos, fromStackPos, creatureId, itemId] { playerUseWithCreature(playerId, fromPos, fromStackPos, creatureId, itemId); }, "Game::playerUseWithCreature" + const auto &task = createPlayerTask( + delay, + [this, playerId, fromPos, fromStackPos, creatureId, itemId] { + playerUseWithCreature(playerId, fromPos, fromStackPos, creatureId, itemId); + }, + __FUNCTION__ ); - if (it.isRune() || it.type == ITEM_TYPE_POTION) { player->setNextPotionActionTask(task); } else { @@ -4010,7 +4086,7 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin } void Game::playerCloseContainer(uint32_t playerId, uint8_t cid) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4020,7 +4096,7 @@ void Game::playerCloseContainer(uint32_t playerId, uint8_t cid) { } void Game::playerMoveUpContainer(uint32_t playerId, uint8_t cid) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4047,7 +4123,7 @@ void Game::playerMoveUpContainer(uint32_t playerId, uint8_t cid) { auto it = browseFields.find(tile); if (it == browseFields.end() || it->second.expired()) { - parentContainer = Container::create(tile); + parentContainer = Container::createBrowseField(tile); browseFields[tile] = parentContainer; } else { parentContainer = it->second.lock(); @@ -4072,7 +4148,7 @@ void Game::playerMoveUpContainer(uint32_t playerId, uint8_t cid) { } void Game::playerUpdateContainer(uint32_t playerId, uint8_t cid) { - std::shared_ptr<Player> player = getPlayerByGUID(playerId); + const auto &player = getPlayerByGUID(playerId); if (!player) { return; } @@ -4086,17 +4162,17 @@ void Game::playerUpdateContainer(uint32_t playerId, uint8_t cid) { } void Game::playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); + const auto &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || !item->isRotatable() || item->hasAttribute(ItemAttribute_t::UNIQUEID)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -4107,7 +4183,7 @@ void Game::playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stac return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } @@ -4115,13 +4191,13 @@ void Game::playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stac if (pos.x != 0xFFFF && !Position::areInRange<1, 1, 0>(pos, player->getPosition())) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos, stackPos, itemId] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos, stackPos, itemId] { playerRotateItem(playerId, pos, stackPos, itemId); }, - "Game::playerRotateItem" + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -4141,17 +4217,17 @@ void Game::playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stac } void Game::playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || pos.x == 0xFFFF) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || !item->isPodium() || item->hasAttribute(ItemAttribute_t::UNIQUEID)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -4162,7 +4238,7 @@ void Game::playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } @@ -4171,18 +4247,26 @@ void Game::playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, if (!Position::areInRange<1, 1, 0>(pos, player->getPosition())) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, false)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task; + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); if (isPodiumOfRenown) { - task = createPlayerTask( - 400, [player, item, pos, itemId, stackPos] { player->sendPodiumWindow(item, pos, itemId, stackPos); }, "Game::playerConfigureShowOffSocket" + const auto &task = createPlayerTask( + 400, + [player, item, pos, itemId, stackPos] { + player->sendPodiumWindow(item, pos, itemId, stackPos); + }, + __FUNCTION__ ); + player->setNextWalkActionTask(task); } else { - task = createPlayerTask( - 400, [player, item, pos, itemId, stackPos] { player->sendMonsterPodiumWindow(item, pos, itemId, stackPos); }, "Game::playerConfigureShowOffSocket" + const auto &task = createPlayerTask( + 400, + [player, item, pos, itemId, stackPos] { + player->sendMonsterPodiumWindow(item, pos, itemId, stackPos); + }, + __FUNCTION__ ); + player->setNextWalkActionTask(task); } - player->setNextWalkActionTask(task); } else { player->sendCancelMessage(RETURNVALUE_THEREISNOWAY); } @@ -4197,17 +4281,17 @@ void Game::playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, } void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Position &pos, uint8_t stackPos, const uint16_t itemId, uint8_t podiumVisible, uint8_t direction) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || pos.x == 0xFFFF) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || !item->isPodium() || item->hasAttribute(ItemAttribute_t::UNIQUEID)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -4218,12 +4302,12 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } - const auto tile = item->getParent() ? item->getParent()->getTile() : nullptr; + const auto &tile = item->getParent() ? item->getParent()->getTile() : nullptr; if (!tile) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -4232,9 +4316,13 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos if (!Position::areInRange<1, 1, 0>(pos, player->getPosition())) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, false)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos] { playerBrowseField(playerId, pos); }, "Game::playerBrowseField" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos] { + playerBrowseField(playerId, pos); + }, + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -4243,7 +4331,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } @@ -4261,7 +4349,7 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos outfit.lookAddons = 0; } - const auto mount = mounts.getMountByClientID(outfit.lookMount); + const auto mount = mounts->getMountByClientID(outfit.lookMount); if (!mount || !player->hasMount(mount) || player->isWearingSupportOutfit()) { outfit.lookMount = 0; } @@ -4327,24 +4415,35 @@ void Game::playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Pos } void Game::playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); + const auto &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); if (!thing) { return; } - const auto item = thing->getItem(); - const auto tile = map.getTile(item->getPosition()); + const auto &item = thing->getItem(); + if (!item) { + g_logger().error("Game::playerWrapableItem: Invalid item on position: {}", pos.toString()); + player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } + const auto &tile = map.getTile(item->getPosition()); + if (!tile) { + g_logger().error("Game::playerWrapableItem: Invalid tile on position: {}", pos.toString()); + player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); + return; + } + const auto houseTile = tile->dynamic_self_cast<HouseTile>(); if (!tile->hasFlag(TILESTATE_PROTECTIONZONE) || !houseTile) { player->sendCancelMessage("You may construct this only inside a house."); return; } - const auto house = houseTile->getHouse(); + const auto &house = houseTile->getHouse(); if (!house) { player->sendCancelMessage("You may construct this only inside a house."); return; @@ -4365,7 +4464,7 @@ void Game::playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t st return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_CANNOTUSETHISOBJECT); return; } @@ -4373,10 +4472,13 @@ void Game::playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t st if (pos.x != 0xFFFF && !Position::areInRange<1, 1, 0>(pos, player->getPosition())) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos, stackPos, itemId] { playerWrapableItem(playerId, pos, stackPos, itemId); }, "Game::playerWrapableItem" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos, stackPos, itemId] { + playerWrapableItem(playerId, pos, stackPos, itemId); + }, + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -4421,7 +4523,7 @@ void Game::playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t st addMagicEffect(pos, CONST_ME_POFF); } -std::shared_ptr<Item> Game::wrapItem(std::shared_ptr<Item> item, std::shared_ptr<House> house) { +std::shared_ptr<Item> Game::wrapItem(const std::shared_ptr<Item> &item, const std::shared_ptr<House> &house) { uint16_t hiddenCharges = 0; uint16_t amount = item->getItemCount(); if (isCaskItem(item->getID())) { @@ -4437,27 +4539,27 @@ std::shared_ptr<Item> Game::wrapItem(std::shared_ptr<Item> item, std::shared_ptr newItem->setCustomAttribute("unWrapId", static_cast<int64_t>(oldItemID)); newItem->setAttribute(ItemAttribute_t::DESCRIPTION, "Unwrap it in your own house to create a <" + itemName + ">."); if (hiddenCharges > 0) { - newItem->setAttribute(DATE, hiddenCharges); + newItem->setAttribute(ItemAttribute_t::DATE, hiddenCharges); } if (amount > 0) { - newItem->setAttribute(AMOUNT, amount); + newItem->setAttribute(ItemAttribute_t::AMOUNT, amount); } newItem->startDecaying(); return newItem; } -void Game::unwrapItem(std::shared_ptr<Item> item, uint16_t unWrapId, std::shared_ptr<House> house, std::shared_ptr<Player> player) { +void Game::unwrapItem(const std::shared_ptr<Item> &item, uint16_t unWrapId, const std::shared_ptr<House> &house, const std::shared_ptr<Player> &player) { if (item->hasOwner() && !item->isOwner(player)) { player->sendCancelMessage(RETURNVALUE_ITEMISNOTYOURS); return; } - auto hiddenCharges = item->getAttribute<uint16_t>(DATE); + auto hiddenCharges = item->getAttribute<uint16_t>(ItemAttribute_t::DATE); const ItemType &newiType = Item::items.getItemType(unWrapId); if (player != nullptr && house != nullptr && newiType.isBed() && house->getMaxBeds() > -1 && house->getBedCount() >= house->getMaxBeds()) { player->sendCancelMessage("You reached the maximum beds in this house"); return; } - auto amount = item->getAttribute<uint16_t>(AMOUNT); + auto amount = item->getAttribute<uint16_t>(ItemAttribute_t::AMOUNT); if (!amount) { amount = 1; } @@ -4470,13 +4572,13 @@ void Game::unwrapItem(std::shared_ptr<Item> item, uint16_t unWrapId, std::shared newItem->setSubType(hiddenCharges); } newItem->removeCustomAttribute("unWrapId"); - newItem->removeAttribute(DESCRIPTION); + newItem->removeAttribute(ItemAttribute_t::DESCRIPTION); newItem->startDecaying(); } } void Game::playerWriteItem(uint32_t playerId, uint32_t windowTextId, const std::string &text) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4540,7 +4642,7 @@ void Game::playerWriteItem(uint32_t playerId, uint32_t windowTextId, const std:: } void Game::playerBrowseField(uint32_t playerId, const Position &pos) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4554,9 +4656,13 @@ void Game::playerBrowseField(uint32_t playerId, const Position &pos) { if (!Position::areInRange<1, 1>(playerPos, pos)) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos] { playerBrowseField(playerId, pos); }, "Game::playerBrowseField" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos] { + playerBrowseField(playerId, pos); + }, + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -4582,7 +4688,7 @@ void Game::playerBrowseField(uint32_t playerId, const Position &pos) { auto it = browseFields.find(tile); if (it == browseFields.end() || it->second.expired()) { - container = Container::create(tile); + container = Container::createBrowseField(tile); browseFields[tile] = container; } else { container = it->second.lock(); @@ -4600,7 +4706,7 @@ void Game::playerBrowseField(uint32_t playerId, const Position &pos) { } void Game::playerStowItem(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackpos, uint8_t count, bool allItems) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4610,12 +4716,12 @@ void Game::playerStowItem(uint32_t playerId, const Position &pos, uint16_t itemI return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackpos, itemId, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackpos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || item->getItemCount() < count || item->isStoreItem()) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -4641,7 +4747,7 @@ void Game::playerStowItem(uint32_t playerId, const Position &pos, uint16_t itemI } void Game::playerStashWithdraw(uint32_t playerId, uint16_t itemId, uint32_t count, uint8_t) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4716,7 +4822,7 @@ void Game::playerStashWithdraw(uint32_t playerId, uint16_t itemId, uint32_t coun } void Game::playerSeekInContainer(uint32_t playerId, uint8_t containerId, uint16_t index, uint8_t containerCategory) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4741,7 +4847,7 @@ void Game::playerSeekInContainer(uint32_t playerId, uint8_t containerId, uint16_ } void Game::playerUpdateHouseWindow(uint32_t playerId, uint8_t listId, uint32_t windowTextId, const std::string &text) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4758,7 +4864,7 @@ void Game::playerUpdateHouseWindow(uint32_t playerId, uint8_t listId, uint32_t w } void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t stackPos, uint32_t tradePlayerId, uint16_t itemId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4776,7 +4882,7 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st return; } - if (!canThrowObjectTo(tradePartner->getPosition(), player->getPosition())) { + if (!canThrowObjectTo(tradePartner->getPosition(), player->getPosition(), SightLine_CheckSightLineAndFloor)) { player->sendCancelMessage(RETURNVALUE_CREATUREISNOTREACHABLE); return; } @@ -4797,7 +4903,7 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS)) { if (std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(tradeItem->getTile())) { const auto &house = houseTile->getHouse(); if (house && tradeItem->getRealParent() != player && (!house->isInvited(player) || house->getHouseAccessLevel(player) == HOUSE_GUEST)) { @@ -4817,10 +4923,13 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st if (!Position::areInRange<1, 1>(tradeItemPosition, playerPosition)) { std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos, stackPos, tradePlayerId, itemId] { playerRequestTrade(playerId, pos, stackPos, tradePlayerId, itemId); }, "Game::playerRequestTrade" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos, stackPos, tradePlayerId, itemId] { + playerRequestTrade(playerId, pos, stackPos, tradePlayerId, itemId); + }, + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -4829,10 +4938,10 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st return; } - std::shared_ptr<Container> tradeItemContainer = tradeItem->getContainer(); + const std::shared_ptr<Container> &tradeItemContainer = tradeItem->getContainer(); if (tradeItemContainer) { for (const auto &it : tradeItems) { - std::shared_ptr<Item> item = it.first; + const auto &item = it.first; if (tradeItem == item) { player->sendTextMessage(MESSAGE_TRADE, "This item is already being traded."); return; @@ -4843,7 +4952,7 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st return; } - std::shared_ptr<Container> container = item->getContainer(); + const std::shared_ptr<Container> &container = item->getContainer(); if (container && container->isHoldingItem(tradeItem)) { player->sendTextMessage(MESSAGE_TRADE, "This item is already being traded."); return; @@ -4851,13 +4960,13 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st } } else { for (const auto &it : tradeItems) { - std::shared_ptr<Item> item = it.first; + const auto &item = it.first; if (tradeItem == item) { player->sendTextMessage(MESSAGE_TRADE, "This item is already being traded."); return; } - std::shared_ptr<Container> container = item->getContainer(); + const std::shared_ptr<Container> &container = item->getContainer(); if (container && container->isHoldingItem(tradeItem)) { player->sendTextMessage(MESSAGE_TRADE, "This item is already being traded."); return; @@ -4865,8 +4974,7 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st } } - auto tradeContainer = tradeItem->getContainer(); - if (tradeContainer && tradeContainer->getItemHoldingCount() + 1 > 100) { + if (tradeItemContainer && tradeItemContainer->getItemHoldingCount() + 1 > 100) { player->sendTextMessage(MESSAGE_TRADE, "You can not trade more than 100 items."); return; } @@ -4896,7 +5004,7 @@ void Game::playerRequestTrade(uint32_t playerId, const Position &pos, uint8_t st internalStartTrade(player, tradePartner, tradeItem); } -bool Game::internalStartTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> tradePartner, std::shared_ptr<Item> tradeItem) { +bool Game::internalStartTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &tradePartner, const std::shared_ptr<Item> &tradeItem) { if (player->tradeState != TRADE_NONE && !(player->tradeState == TRADE_ACKNOWLEDGE && player->tradePartner == tradePartner)) { player->sendCancelMessage(RETURNVALUE_YOUAREALREADYTRADING); return false; @@ -4932,7 +5040,7 @@ bool Game::internalStartTrade(std::shared_ptr<Player> player, std::shared_ptr<Pl } void Game::playerAcceptTrade(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -4946,7 +5054,7 @@ void Game::playerAcceptTrade(uint32_t playerId) { return; } - if (!canThrowObjectTo(tradePartner->getPosition(), player->getPosition())) { + if (!canThrowObjectTo(tradePartner->getPosition(), player->getPosition(), SightLine_CheckSightLineAndFloor)) { player->sendCancelMessage(RETURNVALUE_CREATUREISNOTREACHABLE); return; } @@ -5033,7 +5141,7 @@ void Game::playerAcceptTrade(uint32_t playerId) { } } -std::string Game::getTradeErrorDescription(ReturnValue ret, std::shared_ptr<Item> item) { +std::string Game::getTradeErrorDescription(ReturnValue ret, const std::shared_ptr<Item> &item) { if (item) { if (ret == RETURNVALUE_NOTENOUGHCAPACITY) { std::ostringstream ss; @@ -5065,7 +5173,7 @@ std::string Game::getTradeErrorDescription(ReturnValue ret, std::shared_ptr<Item } void Game::playerLookInTrade(uint32_t playerId, bool lookAtCounterOffer, uint8_t index) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5124,7 +5232,7 @@ void Game::playerLookInTrade(uint32_t playerId, bool lookAtCounterOffer, uint8_t } void Game::playerCloseTrade(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5132,7 +5240,7 @@ void Game::playerCloseTrade(uint32_t playerId) { internalCloseTrade(player); } -void Game::internalCloseTrade(std::shared_ptr<Player> player) { +void Game::internalCloseTrade(const std::shared_ptr<Player> &player) { std::shared_ptr<Player> tradePartner = player->tradePartner; if ((tradePartner && tradePartner->getTradeState() == TRADE_TRANSFER) || player->getTradeState() == TRADE_TRANSFER) { return; @@ -5179,7 +5287,7 @@ void Game::playerBuyItem(uint32_t playerId, uint16_t itemId, uint8_t count, uint return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5209,7 +5317,7 @@ void Game::playerBuyItem(uint32_t playerId, uint16_t itemId, uint8_t count, uint } if (inBackpacks || it.isContainer()) { - uint32_t maxContainer = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER, __FUNCTION__)); + uint32_t maxContainer = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER)); auto backpack = player->getInventoryItem(CONST_SLOT_BACKPACK); auto mainBackpack = backpack ? backpack->getContainer() : nullptr; @@ -5235,7 +5343,7 @@ void Game::playerSellItem(uint32_t playerId, uint16_t itemId, uint8_t count, uin return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5265,7 +5373,7 @@ void Game::playerSellItem(uint32_t playerId, uint16_t itemId, uint8_t count, uin } void Game::playerCloseShop(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5274,7 +5382,7 @@ void Game::playerCloseShop(uint32_t playerId) { } void Game::playerLookInShop(uint32_t playerId, uint16_t itemId, uint8_t count) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5304,12 +5412,12 @@ void Game::playerLookInShop(uint32_t playerId, uint16_t itemId, uint8_t count) { } void Game::playerLookAt(uint32_t playerId, uint16_t itemId, const Position &pos, uint8_t stackPos) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_LOOK); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_LOOK); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -5339,7 +5447,7 @@ void Game::playerLookAt(uint32_t playerId, uint16_t itemId, const Position &pos, } void Game::playerLookInBattleList(uint32_t playerId, uint32_t creatureId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5373,19 +5481,20 @@ void Game::playerLookInBattleList(uint32_t playerId, uint32_t creatureId) { g_callbacks().executeCallback(EventCallback_t::playerOnLookInBattleList, &EventCallback::playerOnLookInBattleList, player, creature, lookDistance); } -void Game::playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, std::shared_ptr<Item> defaultItem, bool lootAllCorpses, bool autoLoot) { - std::shared_ptr<Player> player = getPlayerByID(playerId); +void Game::playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, const std::shared_ptr<Item> &defaultItem, bool lootAllCorpses, bool autoLoot) { + const auto &player = getPlayerByID(playerId); if (!player) { return; } if (!autoLoot && !player->canDoAction()) { - uint32_t delay = player->getNextActionTime(); - std::shared_ptr<Task> task = createPlayerTask( - delay, [this, playerId = player->getID(), pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot] { + const uint32_t delay = player->getNextActionTime(); + const auto &task = createPlayerTask( + delay, + [this, playerId = player->getID(), pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot] { playerQuickLoot(playerId, pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot); }, - "Game::playerQuickLoot" + __FUNCTION__ ); player->setNextActionTask(task); return; @@ -5396,12 +5505,13 @@ void Game::playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t item // need to walk to the corpse first before looting it std::vector<Direction> listDir; if (player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task = createPlayerTask( - 0, [this, playerId = player->getID(), pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 300, + [this, playerId = player->getID(), pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot] { playerQuickLoot(playerId, pos, itemId, stackPos, defaultItem, lootAllCorpses, autoLoot); }, - "Game::playerQuickLoot" + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -5422,7 +5532,7 @@ void Game::playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t item std::shared_ptr<Item> item = nullptr; if (!defaultItem) { - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -5514,7 +5624,7 @@ void Game::playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t item } } -void Game::playerLootAllCorpses(std::shared_ptr<Player> player, const Position &pos, bool lootAllCorpses) { +void Game::playerLootAllCorpses(const std::shared_ptr<Player> &player, const Position &pos, bool lootAllCorpses) { if (lootAllCorpses) { std::shared_ptr<Tile> tile = g_game().map.getTile(pos.x, pos.y, pos.z); if (!tile) { @@ -5564,19 +5674,19 @@ void Game::playerLootAllCorpses(std::shared_ptr<Player> player, const Position & } void Game::playerSetManagedContainer(uint32_t playerId, ObjectCategory_t category, const Position &pos, uint16_t itemId, uint8_t stackPos, bool isLootContainer) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || pos.x != 0xffff) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_USEITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_USEITEM); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - std::shared_ptr<Container> container = thing->getContainer(); - auto allowConfig = g_configManager().getBoolean(TOGGLE_GOLD_POUCH_ALLOW_ANYTHING, __FUNCTION__) || g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY, __FUNCTION__); + const std::shared_ptr<Container> &container = thing->getContainer(); + auto allowConfig = g_configManager().getBoolean(TOGGLE_GOLD_POUCH_ALLOW_ANYTHING) || g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY); if (!container || ((container->getID() == ITEM_GOLD_POUCH && category != OBJECTCATEGORY_GOLD) && !allowConfig)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -5609,7 +5719,7 @@ void Game::playerSetManagedContainer(uint32_t playerId, ObjectCategory_t categor } void Game::playerClearManagedContainer(uint32_t playerId, ObjectCategory_t category, bool isLootContainer) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5626,7 +5736,7 @@ void Game::playerClearManagedContainer(uint32_t playerId, ObjectCategory_t categ } void Game::playerOpenManagedContainer(uint32_t playerId, ObjectCategory_t category, bool isLootContainer) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5640,7 +5750,7 @@ void Game::playerOpenManagedContainer(uint32_t playerId, ObjectCategory_t catego } void Game::playerSetQuickLootFallback(uint32_t playerId, bool fallback) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5648,8 +5758,8 @@ void Game::playerSetQuickLootFallback(uint32_t playerId, bool fallback) { player->quickLootFallbackToMainContainer = fallback; } -void Game::playerQuickLootBlackWhitelist(uint32_t playerId, QuickLootFilter_t filter, const std::vector<uint16_t> itemIds) { - std::shared_ptr<Player> player = getPlayerByID(playerId); +void Game::playerQuickLootBlackWhitelist(uint32_t playerId, QuickLootFilter_t filter, const std::vector<uint16_t> &itemIds) { + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5662,7 +5772,7 @@ void Game::playerQuickLootBlackWhitelist(uint32_t playerId, QuickLootFilter_t fi * Depot search system ******************************************************************************/ void Game::playerRequestDepotItems(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isDepotSearchAvailable()) { return; } @@ -5677,7 +5787,7 @@ void Game::playerRequestDepotItems(uint32_t playerId) { } void Game::playerRequestCloseDepotSearch(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isDepotSearchOpen()) { return; } @@ -5687,7 +5797,7 @@ void Game::playerRequestCloseDepotSearch(uint32_t playerId) { } void Game::playerRequestDepotSearchItem(uint32_t playerId, uint16_t itemId, uint8_t tier) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isDepotSearchOpen()) { return; } @@ -5702,7 +5812,7 @@ void Game::playerRequestDepotSearchItem(uint32_t playerId, uint16_t itemId, uint } void Game::playerRequestDepotSearchRetrieve(uint32_t playerId, uint16_t itemId, uint8_t tier, uint8_t type) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isDepotSearchOpenOnItem(itemId)) { return; } @@ -5717,7 +5827,7 @@ void Game::playerRequestDepotSearchRetrieve(uint32_t playerId, uint16_t itemId, } void Game::playerRequestOpenContainerFromDepotSearch(uint32_t playerId, const Position &pos) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->isDepotSearchOpen()) { return; } @@ -5732,7 +5842,7 @@ void Game::playerRequestOpenContainerFromDepotSearch(uint32_t playerId, const Po } void Game::playerCancelAttackAndFollow(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5743,7 +5853,7 @@ void Game::playerCancelAttackAndFollow(uint32_t playerId) { } void Game::playerSetAttackedCreature(uint32_t playerId, uint32_t creatureId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5770,22 +5880,22 @@ void Game::playerSetAttackedCreature(uint32_t playerId, uint32_t creatureId) { } player->setAttackedCreature(attackCreature); - g_dispatcher().addEvent([this, plyerId = player->getID()] { updateCreatureWalk(plyerId); }, "Game::updateCreatureWalk"); + updateCreatureWalk(player->getID()); // internally uses addEventWalk. } void Game::playerFollowCreature(uint32_t playerId, uint32_t creatureId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } player->setAttackedCreature(nullptr); - g_dispatcher().addEvent([this, plyerId = player->getID()] { updateCreatureWalk(plyerId); }, "Game::updateCreatureWalk"); + updateCreatureWalk(player->getID()); // internally uses addEventWalk. player->setFollowCreature(getCreatureByID(creatureId)); } void Game::playerSetFightModes(uint32_t playerId, FightMode_t fightMode, bool chaseMode, bool secureMode) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5800,7 +5910,7 @@ void Game::playerRequestAddVip(uint32_t playerId, const std::string &name) { return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5836,7 +5946,7 @@ void Game::playerRequestAddVip(uint32_t playerId, const std::string &name) { } void Game::playerRequestRemoveVip(uint32_t playerId, uint32_t guid) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5845,7 +5955,7 @@ void Game::playerRequestRemoveVip(uint32_t playerId, uint32_t guid) { } void Game::playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::string &description, uint32_t icon, bool notify, std::vector<uint8_t> vipGroupsId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5854,7 +5964,7 @@ void Game::playerRequestEditVip(uint32_t playerId, uint32_t guid, const std::str } void Game::playerApplyImbuement(uint32_t playerId, uint16_t imbuementid, uint8_t slot, bool protectionCharm) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5868,7 +5978,7 @@ void Game::playerApplyImbuement(uint32_t playerId, uint16_t imbuementid, uint8_t return; } - std::shared_ptr<Item> item = player->imbuingItem; + const auto &item = player->imbuingItem; if (!item) { return; } @@ -5883,7 +5993,7 @@ void Game::playerApplyImbuement(uint32_t playerId, uint16_t imbuementid, uint8_t } void Game::playerClearImbuement(uint32_t playerid, uint8_t slot) { - std::shared_ptr<Player> player = getPlayerByID(playerid); + const auto &player = getPlayerByID(playerid); if (!player) { return; } @@ -5892,7 +6002,7 @@ void Game::playerClearImbuement(uint32_t playerid, uint8_t slot) { return; } - std::shared_ptr<Item> item = player->imbuingItem; + const auto &item = player->imbuingItem; if (!item) { return; } @@ -5901,7 +6011,7 @@ void Game::playerClearImbuement(uint32_t playerid, uint8_t slot) { } void Game::playerCloseImbuementWindow(uint32_t playerid) { - std::shared_ptr<Player> player = getPlayerByID(playerid); + const auto &player = getPlayerByID(playerid); if (!player) { return; } @@ -5910,7 +6020,7 @@ void Game::playerCloseImbuementWindow(uint32_t playerid) { } void Game::playerTurn(uint32_t playerId, Direction dir) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5928,11 +6038,11 @@ void Game::playerTurn(uint32_t playerId, Direction dir) { } void Game::playerRequestOutfit(uint32_t playerId) { - if (!g_configManager().getBoolean(ALLOW_CHANGEOUTFIT, __FUNCTION__)) { + if (!g_configManager().getBoolean(ALLOW_CHANGEOUTFIT)) { return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5941,7 +6051,7 @@ void Game::playerRequestOutfit(uint32_t playerId) { } void Game::playerToggleMount(uint32_t playerId, bool mount) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5950,11 +6060,11 @@ void Game::playerToggleMount(uint32_t playerId, bool mount) { } void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMountRandomized /* = 0*/) { - if (!g_configManager().getBoolean(ALLOW_CHANGEOUTFIT, __FUNCTION__)) { + if (!g_configManager().getBoolean(ALLOW_CHANGEOUTFIT)) { return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -5967,7 +6077,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun player->setRandomMount(isMountRandomized); if (isMountRandomized && outfit.lookMount != 0 && player->hasAnyMount()) { - auto randomMount = mounts.getMountByID(player->getRandomMountId()); + auto randomMount = mounts->getMountByID(player->getRandomMountId()); outfit.lookMount = randomMount->clientId; } @@ -5977,7 +6087,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun } if (outfit.lookMount != 0) { - const auto mount = mounts.getMountByClientID(outfit.lookMount); + const auto mount = mounts->getMountByClientID(outfit.lookMount); if (!mount) { return; } @@ -5991,13 +6101,13 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun return; } - if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ, __FUNCTION__) && playerTile->hasFlag(TILESTATE_PROTECTIONZONE)) { + if (!g_configManager().getBoolean(TOGGLE_MOUNT_IN_PZ) && playerTile->hasFlag(TILESTATE_PROTECTIONZONE)) { outfit.lookMount = 0; } auto deltaSpeedChange = mount->speed; if (player->isMounted()) { - const auto prevMount = mounts.getMountByID(player->getLastMount()); + const auto prevMount = mounts->getMountByID(player->getLastMount()); if (prevMount) { deltaSpeedChange -= prevMount->speed; } @@ -6021,7 +6131,7 @@ void Game::playerChangeOutfit(uint32_t playerId, Outfit_t outfit, uint8_t isMoun } void Game::playerShowQuestLog(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -6031,7 +6141,7 @@ void Game::playerShowQuestLog(uint32_t playerId) { } void Game::playerShowQuestLine(uint32_t playerId, uint16_t questId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -6041,7 +6151,7 @@ void Game::playerShowQuestLine(uint32_t playerId, uint16_t questId) { } void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type, const std::string &receiver, const std::string &text) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -6105,7 +6215,7 @@ void Game::playerSay(uint32_t playerId, uint16_t channelId, SpeakClasses type, c } } -bool Game::playerSaySpell(std::shared_ptr<Player> player, SpeakClasses type, const std::string &text) { +bool Game::playerSaySpell(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &text) { if (player->walkExhausted()) { return true; } @@ -6118,7 +6228,7 @@ bool Game::playerSaySpell(std::shared_ptr<Player> player, SpeakClasses type, con result = g_spells().playerSaySpell(player, words); if (result == TALKACTION_BREAK) { - if (!g_configManager().getBoolean(PUSH_WHEN_ATTACKING, __FUNCTION__)) { + if (!g_configManager().getBoolean(PUSH_WHEN_ATTACKING)) { player->cancelPush(); } return player->saySpell(type, words, false); @@ -6129,7 +6239,7 @@ bool Game::playerSaySpell(std::shared_ptr<Player> player, SpeakClasses type, con return false; } -void Game::playerWhisper(std::shared_ptr<Player> player, const std::string &text) { +void Game::playerWhisper(const std::shared_ptr<Player> &player, const std::string &text) { auto spectators = Spectators().find<Player>(player->getPosition(), false, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_X, MAP_MAX_CLIENT_VIEW_PORT_Y, MAP_MAX_CLIENT_VIEW_PORT_Y); // Send to client @@ -6149,7 +6259,7 @@ void Game::playerWhisper(std::shared_ptr<Player> player, const std::string &text } } -bool Game::playerYell(std::shared_ptr<Player> player, const std::string &text) { +bool Game::playerYell(const std::shared_ptr<Player> &player, const std::string &text) { if (player->getLevel() == 1) { player->sendTextMessage(MESSAGE_FAILURE, "You may not yell as long as you are on level 1."); return false; @@ -6169,7 +6279,7 @@ bool Game::playerYell(std::shared_ptr<Player> player, const std::string &text) { return true; } -bool Game::playerSpeakTo(std::shared_ptr<Player> player, SpeakClasses type, const std::string &receiver, const std::string &text) { +bool Game::playerSpeakTo(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &receiver, const std::string &text) { std::shared_ptr<Player> toPlayer = getPlayerByName(receiver); if (!toPlayer) { player->sendTextMessage(MESSAGE_FAILURE, "A player with this name is not online."); @@ -6195,7 +6305,7 @@ bool Game::playerSpeakTo(std::shared_ptr<Player> player, SpeakClasses type, cons return true; } -void Game::playerSpeakToNpc(std::shared_ptr<Player> player, const std::string &text) { +void Game::playerSpeakToNpc(const std::shared_ptr<Player> &player, const std::string &text) { if (player == nullptr) { g_logger().error("[Game::playerSpeakToNpc] - Player is nullptr"); return; @@ -6218,20 +6328,20 @@ void Game::playerSpeakToNpc(std::shared_ptr<Player> player, const std::string &t player->updateUIExhausted(); } -std::shared_ptr<Task> Game::createPlayerTask(uint32_t delay, std::function<void(void)> f, std::string context) const { - return Player::createPlayerTask(delay, std::move(f), std::move(context)); +std::shared_ptr<Task> Game::createPlayerTask(uint32_t delay, std::function<void(void)> f, const std::string &context) const { + return Player::createPlayerTask(delay, std::move(f), context); } //-- -bool Game::canThrowObjectTo(const Position &fromPos, const Position &toPos, bool checkLineOfSight /*= true*/, int32_t rangex /*= MAP_MAX_CLIENT_VIEW_PORT_X*/, int32_t rangey /*= MAP_MAX_CLIENT_VIEW_PORT_Y*/) { - return map.canThrowObjectTo(fromPos, toPos, checkLineOfSight, rangex, rangey); +bool Game::canThrowObjectTo(const Position &fromPos, const Position &toPos, const SightLines_t lineOfSight /*= SightLine_CheckSightLine*/, const int32_t rangex /*= Map::maxClientViewportX*/, const int32_t rangey /*= Map::maxClientViewportY*/) { + return map.canThrowObjectTo(fromPos, toPos, lineOfSight, rangex, rangey); } bool Game::isSightClear(const Position &fromPos, const Position &toPos, bool floorCheck) { return map.isSightClear(fromPos, toPos, floorCheck); } -bool Game::internalCreatureTurn(std::shared_ptr<Creature> creature, Direction dir) { +bool Game::internalCreatureTurn(const std::shared_ptr<Creature> &creature, Direction dir) { if (creature->getDirection() == dir) { return false; } @@ -6250,7 +6360,7 @@ bool Game::internalCreatureTurn(std::shared_ptr<Creature> creature, Direction di return true; } -bool Game::internalCreatureSay(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, bool ghostMode, Spectators* spectatorsPtr /* = nullptr*/, const Position* pos /* = nullptr*/) { +bool Game::internalCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, bool ghostMode, Spectators* spectatorsPtr /* = nullptr*/, const Position* pos /* = nullptr*/) { if (text.empty()) { return false; } @@ -6317,21 +6427,29 @@ void Game::checkCreatureAttack(uint32_t creatureId) { } void Game::addCreatureCheck(const std::shared_ptr<Creature> &creature) { - creature->creatureCheck = true; + if (creature->isRemoved()) { + return; + } + + creature->creatureCheck.store(true); - if (creature->inCheckCreaturesVector) { + if (creature->inCheckCreaturesVector.load()) { // already in a vector return; } - creature->inCheckCreaturesVector = true; - checkCreatureLists[uniform_random(0, EVENT_CREATURECOUNT - 1)].emplace_back(creature); + creature->inCheckCreaturesVector.store(true); + + g_dispatcher().context().tryAddEvent([creature] { + checkCreatureLists[uniform_random(0, EVENT_CREATURECOUNT - 1)].emplace_back(creature); + }, + "addCreatureCheck"); } void Game::removeCreatureCheck(const std::shared_ptr<Creature> &creature) { metrics::method_latency measure(__METHOD_NAME__); - if (creature->inCheckCreaturesVector) { - creature->creatureCheck = false; + if (creature->inCheckCreaturesVector.load()) { + creature->creatureCheck.store(false); } } @@ -6339,33 +6457,22 @@ void Game::checkCreatures() { metrics::method_latency measure(__METHOD_NAME__); static size_t index = 0; - auto &checkCreatureList = checkCreatureLists[index]; - size_t it = 0, end = checkCreatureList.size(); - while (it < end) { - auto creature = checkCreatureList[it]; - if (creature && creature->creatureCheck) { - if (creature->getHealth() > 0) { - creature->onThink(EVENT_CREATURE_THINK_INTERVAL); - creature->onAttacking(EVENT_CREATURE_THINK_INTERVAL); - creature->executeConditions(EVENT_CREATURE_THINK_INTERVAL); - } else { - afterCreatureZoneChange(creature, creature->getZones(), {}); - creature->onDeath(); - } - ++it; - } else { - creature->inCheckCreaturesVector = false; - - checkCreatureList[it] = checkCreatureList.back(); - checkCreatureList.pop_back(); - --end; + std::erase_if(checkCreatureLists[index], [this](const std::shared_ptr<Creature> &creature) { + if (creature->creatureCheck && creature->isAlive()) { + creature->onThink(EVENT_CREATURE_THINK_INTERVAL); + creature->onAttacking(EVENT_CREATURE_THINK_INTERVAL); + creature->executeConditions(EVENT_CREATURE_THINK_INTERVAL); + return false; } - } + + creature->inCheckCreaturesVector = false; + return true; + }); index = (index + 1) % EVENT_CREATURECOUNT; } -void Game::changeSpeed(std::shared_ptr<Creature> creature, int32_t varSpeedDelta) { +void Game::changeSpeed(const std::shared_ptr<Creature> &creature, int32_t varSpeedDelta) { int32_t varSpeed = creature->getSpeed() - creature->getBaseSpeed(); varSpeed += varSpeedDelta; @@ -6377,7 +6484,7 @@ void Game::changeSpeed(std::shared_ptr<Creature> creature, int32_t varSpeedDelta } } -void Game::setCreatureSpeed(std::shared_ptr<Creature> creature, int32_t speed) { +void Game::setCreatureSpeed(const std::shared_ptr<Creature> &creature, int32_t speed) { creature->setBaseSpeed(static_cast<uint16_t>(speed)); // Send creature speed to client @@ -6398,7 +6505,7 @@ void Game::changePlayerSpeed(const std::shared_ptr<Player> &player, int32_t varS } } -void Game::internalCreatureChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) { +void Game::internalCreatureChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) { if (!g_events().eventCreatureOnChangeOutfit(creature, outfit)) { return; } @@ -6419,28 +6526,28 @@ void Game::internalCreatureChangeOutfit(std::shared_ptr<Creature> creature, cons } } -void Game::internalCreatureChangeVisible(std::shared_ptr<Creature> creature, bool visible) { +void Game::internalCreatureChangeVisible(const std::shared_ptr<Creature> &creature, bool visible) { // Send to clients for (const auto &spectator : Spectators().find<Player>(creature->getPosition(), true)) { spectator->getPlayer()->sendCreatureChangeVisible(creature, visible); } } -void Game::changeLight(std::shared_ptr<Creature> creature) { +void Game::changeLight(const std::shared_ptr<Creature> &creature) { // Send to clients for (const auto &spectator : Spectators().find<Player>(creature->getPosition(), true)) { spectator->getPlayer()->sendCreatureLight(creature); } } -void Game::updateCreatureIcon(std::shared_ptr<Creature> creature) { +void Game::updateCreatureIcon(const std::shared_ptr<Creature> &creature) { // Send to clients for (const auto &spectator : Spectators().find<Player>(creature->getPosition(), true)) { spectator->getPlayer()->sendCreatureIcon(creature); } } -void Game::reloadCreature(std::shared_ptr<Creature> creature) { +void Game::reloadCreature(const std::shared_ptr<Creature> &creature) { if (!creature) { g_logger().error("[{}] Creature is nullptr", __FUNCTION__); return; @@ -6451,7 +6558,7 @@ void Game::reloadCreature(std::shared_ptr<Creature> creature) { } } -void Game::sendSingleSoundEffect(const Position &pos, SoundEffect_t soundId, std::shared_ptr<Creature> actor /* = nullptr*/) { +void Game::sendSingleSoundEffect(const Position &pos, SoundEffect_t soundId, const std::shared_ptr<Creature> &actor /* = nullptr*/) { if (soundId == SoundEffect_t::SILENCE) { return; } @@ -6471,7 +6578,7 @@ void Game::sendSingleSoundEffect(const Position &pos, SoundEffect_t soundId, std } } -void Game::sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundEffect, SoundEffect_t secondarySoundEffect, std::shared_ptr<Creature> actor /* = nullptr*/) { +void Game::sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundEffect, SoundEffect_t secondarySoundEffect, const std::shared_ptr<Creature> &actor /* = nullptr*/) { if (secondarySoundEffect == SoundEffect_t::SILENCE) { sendSingleSoundEffect(pos, mainSoundEffect, actor); return; @@ -6492,7 +6599,7 @@ void Game::sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundEff } } -bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, bool checkDefense, bool checkArmor, bool field) { +bool Game::combatBlockHit(CombatDamage &damage, const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, bool checkDefense, bool checkArmor, bool field) { if (damage.primary.type == COMBAT_NONE && damage.secondary.type == COMBAT_NONE) { return true; } @@ -6680,7 +6787,7 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack return (primaryBlockType != BLOCK_NONE) && (secondaryBlockType != BLOCK_NONE); } -void Game::combatGetTypeInfo(CombatType_t combatType, std::shared_ptr<Creature> target, TextColor_t &color, uint16_t &effect) { +void Game::combatGetTypeInfo(CombatType_t combatType, const std::shared_ptr<Creature> &target, TextColor_t &color, uint16_t &effect) { switch (combatType) { case COMBAT_PHYSICALDAMAGE: { std::shared_ptr<Item> splash = nullptr; @@ -6791,7 +6898,7 @@ void Game::combatGetTypeInfo(CombatType_t combatType, std::shared_ptr<Creature> } // Hazard combat helpers -void Game::handleHazardSystemAttack(CombatDamage &damage, std::shared_ptr<Player> player, std::shared_ptr<Monster> monster, bool isPlayerAttacker) { +void Game::handleHazardSystemAttack(CombatDamage &damage, const std::shared_ptr<Player> &player, const std::shared_ptr<Monster> &monster, bool isPlayerAttacker) { if (damage.primary.value != 0 && monster->getHazard()) { if (isPlayerAttacker) { player->parseAttackDealtHazardSystem(damage, monster); @@ -6801,7 +6908,7 @@ void Game::handleHazardSystemAttack(CombatDamage &damage, std::shared_ptr<Player } } -void Game::notifySpectators(const CreatureVector &spectators, const Position &targetPos, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster) { +void Game::notifySpectators(const CreatureVector &spectators, const Position &targetPos, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster) { if (!spectators.empty()) { for (const auto &spectator : spectators) { if (!spectator) { @@ -6830,7 +6937,7 @@ void Game::notifySpectators(const CreatureVector &spectators, const Position &ta } // Custom PvP System combat helpers -void Game::applyPvPDamage(CombatDamage &damage, std::shared_ptr<Player> attacker, std::shared_ptr<Player> target) { +void Game::applyPvPDamage(CombatDamage &damage, const std::shared_ptr<Player> &attacker, const std::shared_ptr<Player> &target) { float targetDamageReceivedMultiplier = target->vocation->pvpDamageReceivedMultiplier; float attackerDamageDealtMultiplier = attacker->vocation->pvpDamageDealtMultiplier; float levelDifferenceDamageMultiplier = this->pvpLevelDifferenceDamageMultiplier(attacker, target); @@ -6841,20 +6948,20 @@ void Game::applyPvPDamage(CombatDamage &damage, std::shared_ptr<Player> attacker damage.secondary.value = std::round(damage.secondary.value * pvpDamageMultiplier); } -float Game::pvpLevelDifferenceDamageMultiplier(std::shared_ptr<Player> attacker, std::shared_ptr<Player> target) { +float Game::pvpLevelDifferenceDamageMultiplier(const std::shared_ptr<Player> &attacker, const std::shared_ptr<Player> &target) { int32_t levelDifference = target->getLevel() - attacker->getLevel(); levelDifference = std::abs(levelDifference); bool isLowerLevel = target->getLevel() < attacker->getLevel(); - int32_t maxLevelDifference = g_configManager().getNumber(PVP_MAX_LEVEL_DIFFERENCE, __FUNCTION__); + int32_t maxLevelDifference = g_configManager().getNumber(PVP_MAX_LEVEL_DIFFERENCE); levelDifference = std::min(levelDifference, maxLevelDifference); float levelDiffRate = 1.0; if (isLowerLevel) { - float rateDamageTakenByLevel = g_configManager().getFloat(PVP_RATE_DAMAGE_TAKEN_PER_LEVEL, __FUNCTION__) / 100; + float rateDamageTakenByLevel = g_configManager().getFloat(PVP_RATE_DAMAGE_TAKEN_PER_LEVEL) / 100; levelDiffRate += levelDifference * rateDamageTakenByLevel; } else { - float rateDamageReductionByLevel = g_configManager().getFloat(PVP_RATE_DAMAGE_REDUCTION_PER_LEVEL, __FUNCTION__) / 100; + float rateDamageReductionByLevel = g_configManager().getFloat(PVP_RATE_DAMAGE_REDUCTION_PER_LEVEL) / 100; levelDiffRate -= levelDifference * rateDamageReductionByLevel; } @@ -6862,7 +6969,7 @@ float Game::pvpLevelDifferenceDamageMultiplier(std::shared_ptr<Player> attacker, } // Wheel of destiny combat helpers -void Game::applyWheelOfDestinyHealing(CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target) { +void Game::applyWheelOfDestinyHealing(CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, std::shared_ptr<Creature> target) { damage.primary.value += (damage.primary.value * damage.healingMultiplier) / 100.; if (attackerPlayer) { @@ -6885,7 +6992,7 @@ void Game::applyWheelOfDestinyHealing(CombatDamage &damage, std::shared_ptr<Play } } -void Game::applyWheelOfDestinyEffectsToDamage(CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target) const { +void Game::applyWheelOfDestinyEffectsToDamage(CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Creature> &target) const { // If damage is 0, it means the target is immune to the damage type, or that we missed. if (damage.primary.value == 0 && damage.secondary.value == 0) { return; @@ -6925,7 +7032,7 @@ void Game::applyWheelOfDestinyEffectsToDamage(CombatDamage &damage, std::shared_ } } -int32_t Game::applyHealthChange(CombatDamage &damage, std::shared_ptr<Creature> target) const { +int32_t Game::applyHealthChange(const CombatDamage &damage, const std::shared_ptr<Creature> &target) const { int32_t targetHealth = target->getHealth(); // Wheel of destiny (Gift of Life) @@ -6942,7 +7049,7 @@ int32_t Game::applyHealthChange(CombatDamage &damage, std::shared_ptr<Creature> return targetHealth; } -bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage, bool isEvent /*= false*/) { +bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, CombatDamage &damage, bool isEvent /*= false*/) { using namespace std; const Position &targetPos = target->getPosition(); if (damage.primary.value > 0) { @@ -7089,7 +7196,7 @@ bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_pt int32_t distanceY = Position::getDistanceY(targetPos, attackerPos); int32_t damageX = attackerPlayer->getPerfectShotDamage(distanceX, true); int32_t damageY = attackerPlayer->getPerfectShotDamage(distanceY, true); - std::shared_ptr<Item> item = attackerPlayer->getWeapon(); + const auto &item = attackerPlayer->getWeapon(); if (item && item->getWeaponType() == WEAPON_DISTANCE) { std::shared_ptr<Item> quiver = attackerPlayer->getInventoryItem(CONST_SLOT_RIGHT); if (quiver && quiver->getWeaponType()) { @@ -7119,7 +7226,7 @@ bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_pt if (!isEvent) { g_events().eventCreatureOnDrainHealth(target, attacker, damage.primary.type, damage.primary.value, damage.secondary.type, damage.secondary.value, message.primary.color, message.secondary.color); - g_callbacks().executeCallback(EventCallback_t::creatureOnDrainHealth, &EventCallback::creatureOnDrainHealth, target, attacker, damage.primary.type, damage.primary.value, damage.secondary.type, damage.secondary.value, message.primary.color, message.secondary.color); + g_callbacks().executeCallback(EventCallback_t::creatureOnDrainHealth, &EventCallback::creatureOnDrainHealth, target, attacker, std::ref(damage.primary.type), std::ref(damage.primary.value), std::ref(damage.secondary.type), std::ref(damage.secondary.value), std::ref(message.primary.color), std::ref(message.secondary.color)); } if (damage.origin != ORIGIN_NONE && attacker && damage.primary.type != COMBAT_HEALING) { damage.primary.value *= attacker->getBuff(BUFF_DAMAGEDEALT) / 100.; @@ -7307,7 +7414,7 @@ bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_pt return true; } else if (realDamage >= targetHealth) { for (const auto &creatureEvent : target->getCreatureEvents(CREATURE_EVENT_PREPAREDEATH)) { - if (!creatureEvent->executeOnPrepareDeath(target, attacker)) { + if (!creatureEvent->executeOnPrepareDeath(target, attacker, std::ref(realDamage))) { return false; } } @@ -7364,7 +7471,7 @@ bool Game::combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_pt return true; } -void Game::updatePlayerPartyHuntAnalyzer(const CombatDamage &damage, std::shared_ptr<Player> player) const { +void Game::updatePlayerPartyHuntAnalyzer(const CombatDamage &damage, const std::shared_ptr<Player> &player) const { if (!player) { return; } @@ -7380,8 +7487,8 @@ void Game::updatePlayerPartyHuntAnalyzer(const CombatDamage &damage, std::shared } void Game::sendDamageMessageAndEffects( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, - const Position &targetPos, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Player> targetPlayer, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, + const Position &targetPos, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Player> &targetPlayer, TextMessage &message, const CreatureVector &spectators, int32_t realDamage ) { message.primary.value = damage.primary.value; @@ -7390,7 +7497,7 @@ void Game::sendDamageMessageAndEffects( sendEffects(target, damage, targetPos, message, spectators); if (shouldSendMessage(message)) { - sendMessages(std::move(attacker), target, damage, targetPos, std::move(attackerPlayer), std::move(targetPlayer), message, spectators, realDamage); + sendMessages(attacker, target, damage, targetPos, attackerPlayer, targetPlayer, message, spectators, realDamage); } } @@ -7399,8 +7506,8 @@ bool Game::shouldSendMessage(const TextMessage &message) const { } void Game::sendMessages( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, - const Position &targetPos, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Player> targetPlayer, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, + const Position &targetPos, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Player> &targetPlayer, TextMessage &message, const CreatureVector &spectators, int32_t realDamage ) const { if (attackerPlayer) { @@ -7447,8 +7554,8 @@ void Game::sendMessages( } void Game::buildMessageAsSpectator( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, - std::shared_ptr<Player> targetPlayer, TextMessage &message, std::stringstream &ss, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, + const std::shared_ptr<Player> &targetPlayer, TextMessage &message, std::stringstream &ss, const std::string &damageString, std::string &spectatorMessage ) const { if (spectatorMessage.empty()) { @@ -7480,8 +7587,8 @@ void Game::buildMessageAsSpectator( } void Game::buildMessageAsTarget( - std::shared_ptr<Creature> attacker, const CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, - std::shared_ptr<Player> targetPlayer, TextMessage &message, std::stringstream &ss, + const std::shared_ptr<Creature> &attacker, const CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, + const std::shared_ptr<Player> &targetPlayer, TextMessage &message, std::stringstream &ss, const std::string &damageString ) const { ss.str({}); @@ -7503,7 +7610,7 @@ void Game::buildMessageAsTarget( } void Game::buildMessageAsAttacker( - std::shared_ptr<Creature> target, const CombatDamage &damage, TextMessage &message, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, TextMessage &message, std::stringstream &ss, const std::string &damageString ) const { ss.str({}); @@ -7519,7 +7626,7 @@ void Game::buildMessageAsAttacker( } void Game::sendEffects( - std::shared_ptr<Creature> target, const CombatDamage &damage, const Position &targetPos, TextMessage &message, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, const Position &targetPos, TextMessage &message, const CreatureVector &spectators ) { uint16_t hitEffect; @@ -7539,7 +7646,7 @@ void Game::sendEffects( } void Game::applyCharmRune( - std::shared_ptr<Monster> targetMonster, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target, const int32_t &realDamage + const std::shared_ptr<Monster> &targetMonster, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Creature> &target, const int32_t &realDamage ) const { if (!targetMonster || !attackerPlayer) { return; @@ -7550,14 +7657,14 @@ void Game::applyCharmRune( 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()); if (charm->type == CHARM_OFFENSIVE && (chance >= normal_random(0, 100))) { - g_iobestiary().parseCharmCombat(charm, attackerPlayer, std::move(target), realDamage); + g_iobestiary().parseCharmCombat(charm, attackerPlayer, target, realDamage); } } } // Mana leech void Game::applyManaLeech( - std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster, std::shared_ptr<Creature> target, const CombatDamage &damage, const int32_t &realDamage + const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster, const std::shared_ptr<Creature> &target, const CombatDamage &damage, const int32_t &realDamage ) const { // Wheel of destiny bonus - mana leech chance and amount auto wheelLeechChance = attackerPlayer->wheel()->checkDrainBodyLeech(target, SKILL_MANA_LEECH_CHANCE); @@ -7590,7 +7697,7 @@ void Game::applyManaLeech( // Life leech void Game::applyLifeLeech( - std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster, std::shared_ptr<Creature> target, const CombatDamage &damage, const int32_t &realDamage + const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster, const std::shared_ptr<Creature> &target, const CombatDamage &damage, const int32_t &realDamage ) const { // Wheel of destiny bonus - life leech chance and amount auto wheelLeechChance = attackerPlayer->wheel()->checkDrainBodyLeech(target, SKILL_LIFE_LEECH_CHANCE); @@ -7624,7 +7731,7 @@ int32_t Game::calculateLeechAmount(const int32_t &realDamage, const uint16_t &sk return std::clamp<int32_t>(static_cast<int32_t>(std::lround(intermediateResult)), 0, realDamage); } -bool Game::combatChangeMana(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage) { +bool Game::combatChangeMana(const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, CombatDamage &damage) { const Position &targetPos = target->getPosition(); auto manaChange = damage.primary.value + damage.secondary.value; if (manaChange > 0) { @@ -7823,12 +7930,12 @@ bool Game::combatChangeMana(std::shared_ptr<Creature> attacker, std::shared_ptr< return true; } -void Game::addCreatureHealth(std::shared_ptr<Creature> target) { +void Game::addCreatureHealth(const std::shared_ptr<Creature> &target) { auto spectators = Spectators().find<Player>(target->getPosition(), true); addCreatureHealth(spectators.data(), target); } -void Game::addCreatureHealth(const CreatureVector &spectators, std::shared_ptr<Creature> target) { +void Game::addCreatureHealth(const CreatureVector &spectators, const std::shared_ptr<Creature> &target) { uint8_t healthPercent = std::ceil((static_cast<double>(target->getHealth()) / std::max<int32_t>(target->getMaxHealth(), 1)) * 100); if (const auto &targetPlayer = target->getPlayer()) { if (const auto &party = targetPlayer->getParty()) { @@ -7848,14 +7955,14 @@ void Game::addCreatureHealth(const CreatureVector &spectators, std::shared_ptr<C } } -void Game::addPlayerMana(std::shared_ptr<Player> target) { +void Game::addPlayerMana(const std::shared_ptr<Player> &target) { if (const auto &party = target->getParty()) { uint8_t manaPercent = std::ceil((static_cast<double>(target->getMana()) / std::max<int32_t>(target->getMaxMana(), 1)) * 100); party->updatePlayerMana(target, manaPercent); } } -void Game::addPlayerVocation(std::shared_ptr<Player> target) { +void Game::addPlayerVocation(const std::shared_ptr<Player> &target) { if (const auto &party = target->getParty()) { party->updatePlayerVocation(target); } @@ -7904,7 +8011,7 @@ void Game::addDistanceEffect(const CreatureVector &spectators, const Position &f } } -void Game::checkImbuements() { +void Game::checkImbuements() const { for (const auto &[mapPlayerId, mapPlayer] : getPlayers()) { if (!mapPlayer) { continue; @@ -7975,6 +8082,22 @@ void Game::checkLight() { } } +ItemClassification* Game::getItemsClassification(uint8_t id, bool create) { + auto it = std::ranges::find_if(itemsClassifications, [id](ItemClassification* classification) { + return classification->id == id; + }); + + if (it != itemsClassifications.end()) { + return *it; + } else if (create) { + auto itemClassification = new ItemClassification(id); + addItemsClassification(itemClassification); + return itemClassification; + } + + return nullptr; +} + LightInfo Game::getWorldLightInfo() const { return { lightLevel, 0xD7 }; } @@ -8013,7 +8136,7 @@ void Game::shutdown() { g_logger().info("Done!"); } -void Game::addBestiaryList(uint16_t raceid, std::string name) { +void Game::addBestiaryList(uint16_t raceid, const std::string &name) { auto it = BestiaryList.find(raceid); if (it != BestiaryList.end()) { return; @@ -8031,7 +8154,7 @@ void Game::broadcastMessage(const std::string &text, MessageClasses type) const } } -void Game::updateCreatureWalkthrough(std::shared_ptr<Creature> creature) { +void Game::updateCreatureWalkthrough(const std::shared_ptr<Creature> &creature) { // Send to clients for (const auto &spectator : Spectators().find<Player>(creature->getPosition(), true)) { const auto &tmpPlayer = spectator->getPlayer(); @@ -8039,7 +8162,7 @@ void Game::updateCreatureWalkthrough(std::shared_ptr<Creature> creature) { } } -void Game::updateCreatureSkull(std::shared_ptr<Creature> creature) { +void Game::updateCreatureSkull(const std::shared_ptr<Creature> &creature) const { if (getWorldType() != WORLD_TYPE_PVP) { return; } @@ -8049,13 +8172,13 @@ void Game::updateCreatureSkull(std::shared_ptr<Creature> creature) { } } -void Game::updatePlayerShield(std::shared_ptr<Player> player) { +void Game::updatePlayerShield(const std::shared_ptr<Player> &player) { for (const auto &spectator : Spectators().find<Player>(player->getPosition(), true)) { spectator->getPlayer()->sendCreatureShield(player); } } -void Game::updateCreatureType(std::shared_ptr<Creature> creature) { +void Game::updateCreatureType(const std::shared_ptr<Creature> &creature) { if (!creature) { return; } @@ -8101,7 +8224,7 @@ void Game::loadMotdNum() { result = db.storeQuery("SELECT `value` FROM `server_config` WHERE `config` = 'motd_hash'"); if (result) { motdHash = result->getString("value"); - if (motdHash != transformToSHA1(g_configManager().getString(SERVER_MOTD, __FUNCTION__))) { + if (motdHash != transformToSHA1(g_configManager().getString(SERVER_MOTD))) { ++motdNum; } } else { @@ -8117,7 +8240,7 @@ void Game::saveMotdNum() const { db.executeQuery(query.str()); query.str(std::string()); - query << "UPDATE `server_config` SET `value` = '" << transformToSHA1(g_configManager().getString(SERVER_MOTD, __FUNCTION__)) << "' WHERE `config` = 'motd_hash'"; + query << "UPDATE `server_config` SET `value` = '" << transformToSHA1(g_configManager().getString(SERVER_MOTD)) << "' WHERE `config` = 'motd_hash'"; db.executeQuery(query.str()); } @@ -8159,7 +8282,7 @@ void Game::playerInviteToParty(uint32_t playerId, uint32_t invitedId) { return; } - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8186,7 +8309,7 @@ void Game::playerInviteToParty(uint32_t playerId, uint32_t invitedId) { party->invitePlayer(invitedPlayer); } -void Game::updatePlayerHelpers(std::shared_ptr<Player> player) { +void Game::updatePlayerHelpers(const std::shared_ptr<Player> &player) { if (!player) { return; } @@ -8198,7 +8321,7 @@ void Game::updatePlayerHelpers(std::shared_ptr<Player> player) { } void Game::playerJoinParty(uint32_t playerId, uint32_t leaderId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8222,7 +8345,7 @@ void Game::playerJoinParty(uint32_t playerId, uint32_t leaderId) { } void Game::playerRevokePartyInvitation(uint32_t playerId, uint32_t invitedId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8241,7 +8364,7 @@ void Game::playerRevokePartyInvitation(uint32_t playerId, uint32_t invitedId) { } void Game::playerPassPartyLeadership(uint32_t playerId, uint32_t newLeaderId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8260,7 +8383,7 @@ void Game::playerPassPartyLeadership(uint32_t playerId, uint32_t newLeaderId) { } void Game::playerLeaveParty(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8275,7 +8398,7 @@ void Game::playerLeaveParty(uint32_t playerId) { } void Game::playerEnableSharedPartyExperience(uint32_t playerId, bool sharedExpActive) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8290,7 +8413,7 @@ void Game::playerEnableSharedPartyExperience(uint32_t playerId, bool sharedExpAc } void Game::sendGuildMotd(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8302,7 +8425,7 @@ void Game::sendGuildMotd(uint32_t playerId) { } void Game::kickPlayer(uint32_t playerId, bool displayEffect) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8310,7 +8433,7 @@ void Game::kickPlayer(uint32_t playerId, bool displayEffect) { player->removePlayer(displayEffect); } -void Game::playerFriendSystemAction(std::shared_ptr<Player> player, uint8_t type, uint8_t titleId) { +void Game::playerFriendSystemAction(const std::shared_ptr<Player> &player, uint8_t type, uint8_t titleId) { if (type == 0x0E) { player->title()->setCurrentTitle(titleId); player->sendCyclopediaCharacterBaseInformation(); @@ -8319,7 +8442,7 @@ void Game::playerFriendSystemAction(std::shared_ptr<Player> player, uint8_t type } } -void Game::playerCyclopediaCharacterInfo(std::shared_ptr<Player> player, uint32_t characterID, CyclopediaCharacterInfoType_t characterInfoType, uint16_t entriesPerPage, uint16_t page) { +void Game::playerCyclopediaCharacterInfo(const std::shared_ptr<Player> &player, uint32_t characterID, CyclopediaCharacterInfoType_t characterInfoType, uint16_t entriesPerPage, uint16_t page) { uint32_t playerGUID = player->getGUID(); if (characterID != playerGUID) { // For now allow viewing only our character since we don't have tournaments supported @@ -8432,8 +8555,8 @@ std::string Game::generateVocationConditionHighscore(uint32_t vocation) { return queryPart.str(); } -void Game::processHighscoreResults(DBResult_ptr result, uint32_t playerID, uint8_t category, uint32_t vocation, uint8_t entriesPerPage) { - std::shared_ptr<Player> player = g_game().getPlayerByID(playerID); +void Game::processHighscoreResults(const DBResult_ptr &result, uint32_t playerID, uint8_t category, uint32_t vocation, uint8_t entriesPerPage) { + const auto &player = g_game().getPlayerByID(playerID); if (!player) { return; } @@ -8445,8 +8568,8 @@ void Game::processHighscoreResults(DBResult_ptr result, uint32_t playerID, uint8 return; } - uint16_t page = result->getNumber<uint16_t>("page"); - uint32_t pages = result->getNumber<uint32_t>("entries"); + auto page = result->getNumber<uint16_t>("page"); + auto pages = result->getNumber<uint32_t>("entries"); pages += entriesPerPage - 1; pages /= entriesPerPage; @@ -8470,7 +8593,7 @@ void Game::processHighscoreResults(DBResult_ptr result, uint32_t playerID, uint8 do { const auto &voc = g_vocations().getVocation(result->getNumber<uint16_t>("vocation")); uint8_t characterVocation = voc ? voc->getClientId() : 0; - std::string loyaltyTitle = ""; // todo get loyalty title from player + std::string loyaltyTitle; // todo get loyalty title from player characters.emplace_back(std::move(result->getString("name")), result->getNumber<uint64_t>("points"), result->getNumber<uint32_t>("id"), result->getNumber<uint32_t>("rank"), result->getNumber<uint16_t>("level"), characterVocation, loyaltyTitle); } while (result->next()); } @@ -8521,7 +8644,7 @@ std::string Game::generateHighscoreOrGetCachedQueryForOurRank(const std::string return newQuery; } -void Game::playerHighscores(std::shared_ptr<Player> player, HighscoreType_t type, uint8_t category, uint32_t vocation, const std::string &, uint16_t page, uint8_t entriesPerPage) { +void Game::playerHighscores(const std::shared_ptr<Player> &player, HighscoreType_t type, uint8_t category, uint32_t vocation, const std::string &, uint16_t page, uint8_t entriesPerPage) { if (player->hasAsyncOngoingTask(PlayerAsyncTask_Highscore)) { return; } @@ -8536,8 +8659,8 @@ void Game::playerHighscores(std::shared_ptr<Player> player, HighscoreType_t type } uint32_t playerID = player->getID(); - std::function<void(DBResult_ptr, bool)> callback = [this, playerID, category, vocation, entriesPerPage](DBResult_ptr result, bool) { - processHighscoreResults(std::move(result), playerID, category, vocation, entriesPerPage); + std::function<void(DBResult_ptr, bool)> callback = [this, playerID, category, vocation, entriesPerPage](const DBResult_ptr &result, bool) { + processHighscoreResults(result, playerID, category, vocation, entriesPerPage); }; g_databaseTasks().store(query, callback); @@ -8571,7 +8694,7 @@ std::string Game::getSkillNameById(uint8_t &skill) { } void Game::playerReportRuleViolationReport(uint32_t playerId, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8581,7 +8704,7 @@ void Game::playerReportRuleViolationReport(uint32_t playerId, const std::string } void Game::playerReportBug(uint32_t playerId, const std::string &message, const Position &position, uint8_t category) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8591,7 +8714,7 @@ void Game::playerReportBug(uint32_t playerId, const std::string &message, const } void Game::playerDebugAssert(uint32_t playerId, const std::string &assertLine, const std::string &date, const std::string &description, const std::string &comment) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8606,7 +8729,7 @@ void Game::playerDebugAssert(uint32_t playerId, const std::string &assertLine, c } void Game::playerPreyAction(uint32_t playerId, uint8_t slot, uint8_t action, uint8_t option, int8_t index, uint16_t raceId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8615,7 +8738,7 @@ void Game::playerPreyAction(uint32_t playerId, uint8_t slot, uint8_t action, uin } void Game::playerTaskHuntingAction(uint32_t playerId, uint8_t slot, uint8_t action, bool upgrade, uint16_t raceId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8660,7 +8783,7 @@ void Game::playerNpcGreet(uint32_t playerId, uint32_t npcId) { } void Game::playerLeaveMarket(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8669,7 +8792,7 @@ void Game::playerLeaveMarket(uint32_t playerId) { } void Game::playerBrowseMarket(uint32_t playerId, uint16_t itemId, uint8_t tier) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8694,7 +8817,7 @@ void Game::playerBrowseMarket(uint32_t playerId, uint16_t itemId, uint8_t tier) } void Game::playerBrowseMarketOwnOffers(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8709,7 +8832,7 @@ void Game::playerBrowseMarketOwnOffers(uint32_t playerId) { } void Game::playerBrowseMarketOwnHistory(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -8795,7 +8918,7 @@ namespace { } } // namespace -bool checkCanInitCreateMarketOffer(std::shared_ptr<Player> player, uint8_t type, const ItemType &it, uint16_t amount, uint64_t price, std::ostringstream &offerStatus) { +bool checkCanInitCreateMarketOffer(const std::shared_ptr<Player> &player, uint8_t type, const ItemType &it, uint16_t amount, uint64_t price, std::ostringstream &offerStatus) { if (!player) { offerStatus << "Failed to load player"; return false; @@ -8843,12 +8966,12 @@ bool checkCanInitCreateMarketOffer(std::shared_ptr<Player> player, uint8_t type, g_logger().debug("{} - Offer amount: {}", __FUNCTION__, amount); - if (g_configManager().getBoolean(MARKET_PREMIUM, __FUNCTION__) && !player->isPremium()) { + if (g_configManager().getBoolean(MARKET_PREMIUM) && !player->isPremium()) { player->sendTextMessage(MESSAGE_MARKET, "Only premium accounts may create offers for that object."); return false; } - const uint32_t maxOfferCount = g_configManager().getNumber(MAX_MARKET_OFFERS_AT_A_TIME_PER_PLAYER, __FUNCTION__); + const uint32_t maxOfferCount = g_configManager().getNumber(MAX_MARKET_OFFERS_AT_A_TIME_PER_PLAYER); if (maxOfferCount != 0 && IOMarket::getPlayerOfferCount(player->getGUID()) >= maxOfferCount) { offerStatus << "Player " << player->getName() << "excedeed max offer count " << maxOfferCount; return false; @@ -8861,7 +8984,7 @@ void Game::playerCreateMarketOffer(uint32_t playerId, uint8_t type, uint16_t ite // Initialize variables // Before creating the offer we will compare it with the RETURN VALUE ERROR std::ostringstream offerStatus; - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); const ItemType &it = Item::items[itemId]; // Make sure everything is ok before the create market offer starts @@ -8887,7 +9010,7 @@ void Game::playerCreateMarketOffer(uint32_t playerId, uint8_t type, uint16_t ite } if (it.id == ITEM_STORE_COIN) { - auto [transferableCoins, result] = player->getAccount()->getCoins(enumToValue(CoinType::Transferable)); + auto [transferableCoins, result] = player->getAccount()->getCoins(CoinType::Transferable); if (amount > transferableCoins) { offerStatus << "Amount is greater than coins for player " << player->getName(); @@ -8895,7 +9018,7 @@ void Game::playerCreateMarketOffer(uint32_t playerId, uint8_t type, uint16_t ite } // Do not register a transaction for coins creating an offer - player->getAccount()->removeCoins(enumToValue(CoinType::Transferable), static_cast<uint32_t>(amount), ""); + player->getAccount()->removeCoins(CoinType::Transferable, static_cast<uint32_t>(amount), ""); } else { if (!removeOfferItems(player, depotLocker, it, amount, tier, offerStatus)) { g_logger().error("[{}] failed to remove item with id {}, from player {}, errorcode: {}", __FUNCTION__, it.id, player->getName(), offerStatus.str()); @@ -8944,7 +9067,7 @@ void Game::playerCreateMarketOffer(uint32_t playerId, uint8_t type, uint16_t ite } void Game::playerCancelMarketOffer(uint32_t playerId, uint32_t timestamp, uint16_t counter) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->getAccount()) { return; } @@ -8976,12 +9099,12 @@ void Game::playerCancelMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 if (it.id == ITEM_STORE_COIN) { // Do not register a transaction for coins upon cancellation - player->getAccount()->addCoins(enumToValue(CoinType::Transferable), offer.amount, ""); + player->getAccount()->addCoins(CoinType::Transferable, offer.amount, ""); } else if (it.stackable) { uint16_t tmpAmount = offer.amount; while (tmpAmount > 0) { int32_t stackCount = std::min<int32_t>(it.stackSize, tmpAmount); - std::shared_ptr<Item> item = Item::CreateItem(it.id, stackCount); + const auto &item = Item::CreateItem(it.id, stackCount); if (internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { break; } @@ -9001,7 +9124,7 @@ void Game::playerCancelMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } for (uint16_t i = 0; i < offer.amount; ++i) { - std::shared_ptr<Item> item = Item::CreateItem(it.id, subType); + const auto &item = Item::CreateItem(it.id, subType); if (internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { break; } @@ -9016,7 +9139,7 @@ void Game::playerCancelMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 IOMarket::moveOfferToHistory(offer.id, OFFERSTATE_CANCELLED); offer.amount = 0; - offer.timestamp += g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + offer.timestamp += g_configManager().getNumber(MARKET_OFFER_DURATION); player->sendMarketCancelOffer(offer); // Send market window again for update stats player->sendMarketEnter(player->getLastDepotId()); @@ -9027,7 +9150,7 @@ void Game::playerCancelMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16_t counter, uint16_t amount) { std::ostringstream offerStatus; - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || !player->getAccount()) { offerStatus << "Failed to load player"; return; @@ -9088,9 +9211,9 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } if (it.id == ITEM_STORE_COIN) { - auto [transferableCoins, error] = player->getAccount()->getCoins(enumToValue(CoinType::Transferable)); + auto [transferableCoins, error] = player->getAccount()->getCoins(CoinType::Transferable); - if (error != enumToValue(AccountErrors_t::Ok)) { + if (error != AccountErrors_t::Ok) { offerStatus << "Failed to load transferable coins for player " << player->getName(); return; } @@ -9101,7 +9224,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } player->getAccount()->removeCoins( - enumToValue(CoinType::Transferable), + CoinType::Transferable, amount, "Sold on Market" ); @@ -9129,12 +9252,12 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 g_metrics().addCounter("balance_increase", totalPrice, { { "player", player->getName() }, { "context", "market_sale" } }); if (it.id == ITEM_STORE_COIN) { - buyerPlayer->getAccount()->addCoins(enumToValue(CoinType::Transferable), amount, "Purchased on Market"); + buyerPlayer->getAccount()->addCoins(CoinType::Transferable, amount, "Purchased on Market"); } else if (it.stackable) { uint16_t tmpAmount = amount; while (tmpAmount > 0) { uint16_t stackCount = std::min<uint16_t>(it.stackSize, tmpAmount); - std::shared_ptr<Item> item = Item::CreateItem(it.id, stackCount); + const auto &item = Item::CreateItem(it.id, stackCount); if (internalAddItem(buyerPlayer->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { offerStatus << "Failed to add player inbox stackable item for buy offer for player " << player->getName(); @@ -9156,7 +9279,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } for (uint16_t i = 0; i < amount; ++i) { - std::shared_ptr<Item> item = Item::CreateItem(it.id, subType); + const auto &item = Item::CreateItem(it.id, subType); if (internalAddItem(buyerPlayer->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { offerStatus << "Failed to add player inbox item for buy offer for player " << player->getName(); @@ -9200,12 +9323,12 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 g_metrics().addCounter("balance_decrease", totalPrice, { { "player", player->getName() }, { "context", "market_purchase" } }); if (it.id == ITEM_STORE_COIN) { - player->getAccount()->addCoins(enumToValue(CoinType::Transferable), amount, "Purchased on Market"); + player->getAccount()->addCoins(CoinType::Transferable, amount, "Purchased on Market"); } else if (it.stackable) { uint16_t tmpAmount = amount; while (tmpAmount > 0) { uint16_t stackCount = std::min<uint16_t>(it.stackSize, tmpAmount); - std::shared_ptr<Item> item = Item::CreateItem(it.id, stackCount); + const auto &item = Item::CreateItem(it.id, stackCount); if ( // Init-statement auto ret = internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT); @@ -9233,7 +9356,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } for (uint16_t i = 0; i < amount; ++i) { - std::shared_ptr<Item> item = Item::CreateItem(it.id, subType); + const auto &item = Item::CreateItem(it.id, subType); if ( // Init-statement auto ret = internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT); @@ -9254,9 +9377,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 sellerPlayer->setBankBalance(sellerPlayer->getBankBalance() + totalPrice); g_metrics().addCounter("balance_increase", totalPrice, { { "player", sellerPlayer->getName() }, { "context", "market_sale" } }); if (it.id == ITEM_STORE_COIN) { - const auto &tranferable = enumToValue(CoinType::Transferable); - const auto &removeCoin = enumToValue(CoinTransactionType::Remove); - sellerPlayer->getAccount()->registerCoinTransaction(removeCoin, tranferable, amount, "Sold on Market"); + sellerPlayer->getAccount()->registerCoinTransaction(CoinTransactionType::Remove, CoinType::Transferable, amount, "Sold on Market"); } if (it.id != ITEM_STORE_COIN) { @@ -9277,7 +9398,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 return; } - const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION); IOMarket::appendHistory(player->getGUID(), (offer.type == MARKETACTION_BUY ? MARKETACTION_SELL : MARKETACTION_BUY), offer.itemId, amount, offer.price, time(nullptr), offer.tier, OFFERSTATE_ACCEPTEDEX); @@ -9299,7 +9420,7 @@ void Game::playerAcceptMarketOffer(uint32_t playerId, uint32_t timestamp, uint16 } void Game::parsePlayerExtendedOpcode(uint32_t playerId, uint8_t opcode, const std::string &buffer) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9318,7 +9439,7 @@ void Game::forceRemoveCondition(uint32_t creatureId, ConditionType_t conditionTy creature->removeCondition(conditionType, conditionId, true); } -void Game::sendOfflineTrainingDialog(std::shared_ptr<Player> player) { +void Game::sendOfflineTrainingDialog(const std::shared_ptr<Player> &player) { if (!player) { return; } @@ -9329,7 +9450,7 @@ void Game::sendOfflineTrainingDialog(std::shared_ptr<Player> player) { } void Game::playerAnswerModalWindow(uint32_t playerId, uint32_t modalWindowId, uint8_t button, uint8_t choice) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9364,7 +9485,7 @@ void Game::playerAnswerModalWindow(uint32_t playerId, uint32_t modalWindowId, ui void Game::playerForgeFuseItems(uint32_t playerId, ForgeAction_t actionType, uint16_t firstItemId, uint8_t tier, uint16_t secondItemId, bool usedCore, bool reduceTierLoss, bool convergence) { metrics::method_latency measure(__METHOD_NAME__); - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9377,8 +9498,8 @@ void Game::playerForgeFuseItems(uint32_t playerId, ForgeAction_t actionType, uin player->updateUIExhausted(); uint8_t coreCount = (usedCore ? 1 : 0) + (reduceTierLoss ? 1 : 0); - auto baseSuccess = static_cast<uint8_t>(g_configManager().getNumber(FORGE_BASE_SUCCESS_RATE, __FUNCTION__)); - auto coreSuccess = usedCore ? g_configManager().getNumber(FORGE_BONUS_SUCCESS_RATE, __FUNCTION__) : 0; + auto baseSuccess = static_cast<uint8_t>(g_configManager().getNumber(FORGE_BASE_SUCCESS_RATE)); + auto coreSuccess = usedCore ? g_configManager().getNumber(FORGE_BONUS_SUCCESS_RATE) : 0; auto finalRate = baseSuccess + coreSuccess; auto roll = static_cast<uint8_t>(uniform_random(1, 100)) <= finalRate; @@ -9391,7 +9512,7 @@ void Game::playerForgeFuseItems(uint32_t playerId, ForgeAction_t actionType, uin } void Game::playerForgeTransferItemTier(uint32_t playerId, ForgeAction_t actionType, uint16_t donorItemId, uint8_t tier, uint16_t receiveItemId, bool convergence) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9406,7 +9527,7 @@ void Game::playerForgeTransferItemTier(uint32_t playerId, ForgeAction_t actionTy } void Game::playerForgeResourceConversion(uint32_t playerId, ForgeAction_t actionType) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9421,7 +9542,7 @@ void Game::playerForgeResourceConversion(uint32_t playerId, ForgeAction_t action } void Game::playerBrowseForgeHistory(uint32_t playerId, uint8_t page) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9436,7 +9557,7 @@ void Game::playerBrowseForgeHistory(uint32_t playerId, uint8_t page) { } void Game::playerBosstiarySlot(uint32_t playerId, uint8_t slotId, uint32_t selectedBossId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9463,23 +9584,23 @@ void Game::playerBosstiarySlot(uint32_t playerId, uint8_t slotId, uint32_t selec } void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, const Position &pos, uint8_t stackPos, const uint16_t itemId, uint8_t direction, const std::pair<uint8_t, uint8_t> &podiumAndMonsterVisible) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || pos.x == 0xFFFF) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || !item->isPodium() || item->hasAttribute(ItemAttribute_t::UNIQUEID)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - const auto tile = item->getParent() ? item->getParent()->getTile() : nullptr; + const auto &tile = item->getParent() ? item->getParent()->getTile() : nullptr; if (!tile) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -9488,9 +9609,13 @@ void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, con if (!Position::areInRange<1, 1, 0>(pos, player->getPosition())) { if (std::vector<Direction> listDir; player->getPathTo(pos, listDir, 0, 1, true, false)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos] { playerBrowseField(playerId, pos); }, "Game::playerBrowseField" + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos] { + playerBrowseField(playerId, pos); + }, + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -9504,7 +9629,7 @@ void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, con return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } @@ -9569,17 +9694,17 @@ void Game::playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, con } void Game::playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); + const std::shared_ptr<Thing> &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_TOPDOWN_ITEM); if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != itemId || item->hasAttribute(ItemAttribute_t::UNIQUEID)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -9588,12 +9713,13 @@ 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 (std::vector<Direction> listDir; player->getPathTo(pos, listDir, 0, 1, true, true)) { - g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, "Game::playerAutoWalk"); - std::shared_ptr<Task> task = createPlayerTask( - 400, [this, playerId, pos, stackPos, itemId] { + g_dispatcher().addEvent([this, playerId = player->getID(), listDir] { playerAutoWalk(playerId, listDir); }, __FUNCTION__); + const auto &task = createPlayerTask( + 400, + [this, playerId, pos, stackPos, itemId] { playerRotatePodium(playerId, pos, stackPos, itemId); }, - "Game::playerRotatePodium" + __FUNCTION__ ); player->setNextWalkActionTask(task); } else { @@ -9602,7 +9728,7 @@ void Game::playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t st return; } - if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { + if (g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS) && !InternalGame::playerCanUseItemOnHouseTile(player, item)) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } @@ -9658,7 +9784,7 @@ void Game::playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t st } void Game::playerRequestInventoryImbuements(uint32_t playerId, bool isTrackerOpen) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player || player->isRemoved()) { return; } @@ -9670,7 +9796,7 @@ void Game::playerRequestInventoryImbuements(uint32_t playerId, bool isTrackerOpe std::map<Slots_t, std::shared_ptr<Item>> itemsWithImbueSlotMap; for (uint8_t inventorySlot = CONST_SLOT_FIRST; inventorySlot <= CONST_SLOT_LAST; ++inventorySlot) { - auto item = player->getInventoryItem(static_cast<Slots_t>(inventorySlot)); + const auto &item = player->getInventoryItem(static_cast<Slots_t>(inventorySlot)); if (!item) { continue; } @@ -9690,7 +9816,7 @@ void Game::playerRequestInventoryImbuements(uint32_t playerId, bool isTrackerOpe } void Game::playerOpenWheel(uint32_t playerId, uint32_t ownerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9710,7 +9836,7 @@ void Game::playerOpenWheel(uint32_t playerId, uint32_t ownerId) { } void Game::playerSaveWheel(uint32_t playerId, NetworkMessage &msg) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9725,7 +9851,7 @@ void Game::playerSaveWheel(uint32_t playerId, NetworkMessage &msg) { } void Game::playerWheelGemAction(uint32_t playerId, NetworkMessage &msg) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9735,8 +9861,9 @@ void Game::playerWheelGemAction(uint32_t playerId, NetworkMessage &msg) { return; } - auto action = msg.get<uint8_t>(); - auto param = msg.get<uint8_t>(); + const auto action = msg.getByte(); + const auto param = msg.getByte(); + uint8_t pos = 0; switch (static_cast<WheelGemAction_t>(action)) { case WheelGemAction_t::Destroy: @@ -9751,6 +9878,10 @@ void Game::playerWheelGemAction(uint32_t playerId, NetworkMessage &msg) { case WheelGemAction_t::ToggleLock: player->wheel()->toggleGemLock(param); break; + case WheelGemAction_t::ImproveGrade: + pos = msg.getByte(); + player->wheel()->improveGemGrade(static_cast<WheelFragmentType_t>(param), pos); + break; default: g_logger().error("[{}] player {} is trying to do invalid action {} on wheel", __FUNCTION__, player->getName(), action); break; @@ -9762,7 +9893,7 @@ void Game::playerWheelGemAction(uint32_t playerId, NetworkMessage &msg) { ********************/ void Game::updatePlayerSaleItems(uint32_t playerId) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } @@ -9772,33 +9903,33 @@ void Game::updatePlayerSaleItems(uint32_t playerId) { player->setScheduledSaleUpdate(false); } -void Game::addPlayer(std::shared_ptr<Player> player) { +void Game::addPlayer(const std::shared_ptr<Player> &player) { const std::string &lowercase_name = asLowerCaseString(player->getName()); mappedPlayerNames[lowercase_name] = player; wildcardTree->insert(lowercase_name); players[player->getID()] = player; } -void Game::removePlayer(std::shared_ptr<Player> player) { +void Game::removePlayer(const std::shared_ptr<Player> &player) { const std::string &lowercase_name = asLowerCaseString(player->getName()); mappedPlayerNames.erase(lowercase_name); wildcardTree->remove(lowercase_name); players.erase(player->getID()); } -void Game::addNpc(std::shared_ptr<Npc> npc) { +void Game::addNpc(const std::shared_ptr<Npc> &npc) { npcs[npc->getID()] = npc; } -void Game::removeNpc(std::shared_ptr<Npc> npc) { +void Game::removeNpc(const std::shared_ptr<Npc> &npc) { npcs.erase(npc->getID()); } -void Game::addMonster(std::shared_ptr<Monster> monster) { +void Game::addMonster(const std::shared_ptr<Monster> &monster) { monsters[monster->getID()] = monster; } -void Game::removeMonster(std::shared_ptr<Monster> monster) { +void Game::removeMonster(const std::shared_ptr<Monster> &monster) { monsters.erase(monster->getID()); } @@ -9825,7 +9956,7 @@ std::shared_ptr<Guild> Game::getGuildByName(const std::string &name, bool allowO return it->second; } -void Game::addGuild(const std::shared_ptr<Guild> guild) { +void Game::addGuild(const std::shared_ptr<Guild> &guild) { if (!guild) { return; } @@ -9842,7 +9973,7 @@ void Game::removeGuild(uint32_t guildId) { void Game::internalRemoveItems(const std::vector<std::shared_ptr<Item>> &itemVector, uint32_t amount, bool stackable) { if (stackable) { - for (const std::shared_ptr<Item> &item : itemVector) { + for (const auto &item : itemVector) { if (item->getItemCount() > amount) { internalRemoveItem(item, amount); break; @@ -9852,7 +9983,7 @@ void Game::internalRemoveItems(const std::vector<std::shared_ptr<Item>> &itemVec } } } else { - for (const std::shared_ptr<Item> &item : itemVector) { + for (const auto &item : itemVector) { internalRemoveItem(item); } } @@ -9902,7 +10033,7 @@ void Game::removeUniqueItem(uint16_t uniqueId) { bool Game::hasEffect(uint16_t effectId) { for (uint16_t i = CONST_ME_NONE; i < CONST_ME_LAST; i++) { - MagicEffectClasses effect = static_cast<MagicEffectClasses>(i); + auto effect = static_cast<MagicEffectClasses>(i); if (effect == effectId) { return true; } @@ -9912,7 +10043,7 @@ bool Game::hasEffect(uint16_t effectId) { bool Game::hasDistanceEffect(uint16_t effectId) { for (uint16_t i = CONST_ANI_NONE; i <= CONST_ANI_LAST; i++) { - ShootType_t effect = static_cast<ShootType_t>(i); + auto effect = static_cast<ShootType_t>(i); if (effect == effectId) { return true; } @@ -9922,14 +10053,14 @@ bool Game::hasDistanceEffect(uint16_t effectId) { void Game::createLuaItemsOnMap() { for (const auto [position, itemId] : mapLuaItemsStored) { - std::shared_ptr<Item> item = Item::CreateItem(itemId, 1); + const auto &item = Item::CreateItem(itemId, 1); if (!item) { g_logger().warn("[Game::createLuaItemsOnMap] - Cannot create item with id {}", itemId); continue; } if (position.x != 0) { - std::shared_ptr<Tile> tile = g_game().map.getTile(position); + const auto &tile = g_game().map.getTile(position); if (!tile) { g_logger().warn("[Game::createLuaItemsOnMap] - Tile is wrong or not found position: {}", position.toString()); @@ -9947,7 +10078,7 @@ void Game::createLuaItemsOnMap() { } } -void Game::sendUpdateCreature(std::shared_ptr<Creature> creature) { +void Game::sendUpdateCreature(const std::shared_ptr<Creature> &creature) { if (!creature) { return; } @@ -9958,16 +10089,12 @@ void Game::sendUpdateCreature(std::shared_ptr<Creature> creature) { } uint32_t Game::makeInfluencedMonster() { - if (auto influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT, __FUNCTION__); + if (auto influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT); // Condition forgeableMonsters.empty() || influencedMonsters.size() >= influencedLimit) { return 0; } - if (forgeableMonsters.empty()) { - return 0; - } - auto maxTries = forgeableMonsters.size(); uint16_t tries = 0; std::shared_ptr<Monster> monster = nullptr; @@ -10000,7 +10127,7 @@ uint32_t Game::makeInfluencedMonster() { if (monster && monster->canBeForgeMonster()) { monster->setMonsterForgeClassification(ForgeClassifications_t::FORGE_INFLUENCED_MONSTER); monster->configureForgeSystem(); - influencedMonsters.insert(monster->getID()); + influencedMonsters.emplace(monster->getID()); return monster->getID(); } @@ -10012,7 +10139,7 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr forgeableMonsters.clear(); // If the forgeable monsters haven't been created // Then we'll create them so they don't return in the next if (forgeableMonsters.empty()) - for (auto [monsterId, monster] : monsters) { + for (const auto &[monsterId, monster] : monsters) { auto monsterTile = monster->getTile(); if (!monster || !monsterTile) { continue; @@ -10031,7 +10158,9 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr } // If you're trying to create a new fiendish and it's already max size, let's remove one of them - if (getFiendishMonsters().size() >= 3) { + if (auto fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT); + // Condition + getFiendishMonsters().size() >= fiendishLimit) { monster->clearFiendishStatus(); removeFiendishMonster(monsterId); break; @@ -10039,7 +10168,7 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr } } - if (auto fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT, __FUNCTION__); + if (auto fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT); // Condition forgeableMonsters.empty() || fiendishMonsters.size() >= fiendishLimit) { return 0; @@ -10078,8 +10207,8 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr } // Get interval time to fiendish - std::string saveIntervalType = g_configManager().getString(FORGE_FIENDISH_INTERVAL_TYPE, __FUNCTION__); - auto saveIntervalConfigTime = std::atoi(g_configManager().getString(FORGE_FIENDISH_INTERVAL_TIME, __FUNCTION__).c_str()); + std::string saveIntervalType = g_configManager().getString(FORGE_FIENDISH_INTERVAL_TYPE); + auto saveIntervalConfigTime = std::atoi(g_configManager().getString(FORGE_FIENDISH_INTERVAL_TIME).c_str()); int intervalTime = 0; time_t timeToChangeFiendish; if (saveIntervalType == "second") { @@ -10107,12 +10236,12 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr monster->setMonsterForgeClassification(ForgeClassifications_t::FORGE_FIENDISH_MONSTER); monster->configureForgeSystem(); monster->setTimeToChangeFiendish(timeToChangeFiendish + getTimeNow()); - fiendishMonsters.insert(monster->getID()); + fiendishMonsters.emplace(monster->getID()); auto schedulerTask = createPlayerTask( finalTime, [this, monster] { updateFiendishMonsterStatus(monster->getID(), monster->getName()); }, - "Game::updateFiendishMonsterStatus" + __FUNCTION__ ); forgeMonsterEventIds[monster->getID()] = g_dispatcher().scheduleEvent(schedulerTask); return monster->getID(); @@ -10122,7 +10251,7 @@ uint32_t Game::makeFiendishMonster(uint32_t forgeableMonsterId /* = 0*/, bool cr } void Game::updateFiendishMonsterStatus(uint32_t monsterId, const std::string &monsterName) { - std::shared_ptr<Monster> monster = getMonsterByID(monsterId); + const auto &monster = getMonsterByID(monsterId); if (!monster) { g_logger().warn("[{}] Failed to update monster with id {} and name {}, monster not found", __FUNCTION__, monsterId, monsterName); return; @@ -10151,7 +10280,7 @@ bool Game::removeInfluencedMonster(uint32_t id, bool create /* = false*/) { if (create) { g_dispatcher().scheduleEvent( - 200 * 1000, [this] { makeInfluencedMonster(); }, "Game::makeInfluencedMonster" + 10 * 1000, [this] { makeInfluencedMonster(); }, "Game::makeInfluencedMonster" ); } } else { @@ -10169,7 +10298,7 @@ bool Game::removeFiendishMonster(uint32_t id, bool create /* = true*/) { if (create) { g_dispatcher().scheduleEvent( - 300 * 1000, [this] { makeFiendishMonster(0, false); }, "Game::makeFiendishMonster" + 270 * 1000, [this] { makeFiendishMonster(0, false); }, "Game::makeFiendishMonster" ); } } else { @@ -10180,25 +10309,28 @@ bool Game::removeFiendishMonster(uint32_t id, bool create /* = true*/) { } void Game::updateForgeableMonsters() { - forgeableMonsters.clear(); - for (auto [monsterId, monster] : monsters) { - auto monsterTile = monster->getTile(); - if (!monsterTile) { - continue; - } + if (auto influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT); + forgeableMonsters.size() < influencedLimit) { + forgeableMonsters.clear(); + for (const auto &[monsterId, monster] : monsters) { + const auto &monsterTile = monster->getTile(); + if (!monsterTile) { + continue; + } - if (monster->canBeForgeMonster() && !monsterTile->hasFlag(TILESTATE_NOLOGOUT)) { - forgeableMonsters.push_back(monster->getID()); + if (monster->canBeForgeMonster() && !monsterTile->hasFlag(TILESTATE_NOLOGOUT)) { + forgeableMonsters.emplace_back(monster->getID()); + } } } - for (const auto monsterId : getFiendishMonsters()) { + for (const auto &monsterId : getFiendishMonsters()) { if (!getMonsterByID(monsterId)) { removeFiendishMonster(monsterId); } } - uint32_t fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT, __FUNCTION__); // Fiendish Creatures limit + uint32_t fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT); // Fiendish Creatures limit if (fiendishMonsters.size() < fiendishLimit) { createFiendishMonsters(); } @@ -10206,7 +10338,7 @@ void Game::updateForgeableMonsters() { void Game::createFiendishMonsters() { uint32_t created = 0; - uint32_t fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT, __FUNCTION__); // Fiendish Creatures limit + uint32_t fiendishLimit = g_configManager().getNumber(FORGE_FIENDISH_CREATURES_LIMIT); // Fiendish Creatures limit while (fiendishMonsters.size() < fiendishLimit) { if (fiendishMonsters.size() >= fiendishLimit) { g_logger().warn("[{}] - Returning in creation of Fiendish, size: {}, max is: {}.", __FUNCTION__, fiendishMonsters.size(), fiendishLimit); @@ -10225,16 +10357,14 @@ void Game::createFiendishMonsters() { void Game::createInfluencedMonsters() { uint32_t created = 0; - uint32_t influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT, __FUNCTION__); + uint32_t influencedLimit = g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT); while (created < influencedLimit) { if (influencedMonsters.size() >= influencedLimit) { g_logger().warn("[{}] - Returning in creation of Influenced, size: {}, max is: {}.", __FUNCTION__, influencedMonsters.size(), influencedLimit); break; } - if (auto ret = makeInfluencedMonster(); - // If condition - ret == 0) { + if (makeInfluencedMonster() == 0) { return; } @@ -10250,9 +10380,9 @@ void Game::checkForgeEventId(uint32_t monsterId) { } } -bool Game::addInfluencedMonster(std::shared_ptr<Monster> monster) { +bool Game::addInfluencedMonster(const std::shared_ptr<Monster> &monster) { if (monster && monster->canBeForgeMonster()) { - if (auto maxInfluencedMonsters = static_cast<uint32_t>(g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT, __FUNCTION__)); + if (auto maxInfluencedMonsters = static_cast<uint32_t>(g_configManager().getNumber(FORGE_INFLUENCED_CREATURES_LIMIT)); // If condition (influencedMonsters.size() + 1) > maxInfluencedMonsters) { return false; @@ -10260,14 +10390,14 @@ bool Game::addInfluencedMonster(std::shared_ptr<Monster> monster) { monster->setMonsterForgeClassification(ForgeClassifications_t::FORGE_INFLUENCED_MONSTER); monster->configureForgeSystem(); - influencedMonsters.insert(monster->getID()); + influencedMonsters.emplace(monster->getID()); return true; } return false; } -bool Game::addItemStoreInbox(std::shared_ptr<Player> player, uint32_t itemId) { - std::shared_ptr<Item> decoKit = Item::CreateItem(ITEM_DECORATION_KIT, 1); +bool Game::addItemStoreInbox(const std::shared_ptr<Player> &player, uint32_t itemId) { + const auto &decoKit = Item::CreateItem(ITEM_DECORATION_KIT, 1); if (!decoKit) { return false; } @@ -10276,17 +10406,17 @@ bool Game::addItemStoreInbox(std::shared_ptr<Player> player, uint32_t itemId) { decoKit->setAttribute(ItemAttribute_t::DESCRIPTION, description); decoKit->setCustomAttribute("unWrapId", static_cast<int64_t>(itemId)); - std::shared_ptr<Thing> thing = player->getThing(CONST_SLOT_STORE_INBOX); + const auto &thing = player->getThing(CONST_SLOT_STORE_INBOX); if (!thing) { return false; } - std::shared_ptr<Item> inboxItem = thing->getItem(); + const auto &inboxItem = thing->getItem(); if (!inboxItem) { return false; } - std::shared_ptr<Container> inboxContainer = inboxItem->getContainer(); + const auto &inboxContainer = inboxItem->getContainer(); if (!inboxContainer) { return false; } @@ -10298,7 +10428,7 @@ bool Game::addItemStoreInbox(std::shared_ptr<Player> player, uint32_t itemId) { return true; } -void Game::addPlayerUniqueLogin(std::shared_ptr<Player> player) { +void Game::addPlayerUniqueLogin(const std::shared_ptr<Player> &player) { if (!player) { g_logger().error("Attempted to add null player to unique player names list"); return; @@ -10328,7 +10458,7 @@ void Game::removePlayerUniqueLogin(const std::string &playerName) { m_uniqueLoginPlayerNames.erase(lowercase_name); } -void Game::removePlayerUniqueLogin(std::shared_ptr<Player> player) { +void Game::removePlayerUniqueLogin(const std::shared_ptr<Player> &player) { if (!player) { g_logger().error("Attempted to remove null player from unique player names list."); return; @@ -10339,14 +10469,13 @@ void Game::removePlayerUniqueLogin(std::shared_ptr<Player> player) { } void Game::playerCheckActivity(const std::string &playerName, int interval) { - std::shared_ptr<Player> player = getPlayerUniqueLogin(playerName); + const auto &player = getPlayerUniqueLogin(playerName); if (!player) { return; } if (player->getIP() == 0) { g_game().removePlayerUniqueLogin(playerName); - IOLoginData::updateOnlineStatus(player->guid, false); g_logger().info("Player with name '{}' has logged out due to exited in death screen", player->getName()); player->disconnect(); return; @@ -10358,11 +10487,10 @@ void Game::playerCheckActivity(const std::string &playerName, int interval) { if (!player->isAccessPlayer()) { player->m_deathTime += interval; - const int32_t kickAfterMinutes = g_configManager().getNumber(KICK_AFTER_MINUTES, __FUNCTION__); + const int32_t kickAfterMinutes = g_configManager().getNumber(KICK_AFTER_MINUTES); if (player->m_deathTime > (kickAfterMinutes * 60000) + 60000) { g_logger().info("Player with name '{}' has logged out due to inactivity after death", player->getName()); g_game().removePlayerUniqueLogin(playerName); - IOLoginData::updateOnlineStatus(player->guid, false); player->disconnect(); return; } @@ -10374,18 +10502,18 @@ void Game::playerCheckActivity(const std::string &playerName, int interval) { } void Game::playerRewardChestCollect(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, uint32_t maxMoveItems /* = 0*/) { - std::shared_ptr<Player> player = getPlayerByID(playerId); + const auto &player = getPlayerByID(playerId); if (!player) { return; } - std::shared_ptr<Thing> thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); + const auto &thing = internalGetThing(player, pos, stackPos, itemId, STACKPOS_FIND_THING); if (!thing) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; } - auto item = thing->getItem(); + const auto &item = thing->getItem(); if (!item || item->getID() != ITEM_REWARD_CHEST || !item->getContainer()) { player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE); return; @@ -10419,9 +10547,9 @@ void Game::playerRewardChestCollect(uint32_t playerId, const Position &pos, uint } } -bool Game::tryRetrieveStashItems(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { +bool Game::tryRetrieveStashItems(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { ObjectCategory_t category = getObjectCategory(item); - return internalCollectManagedItems(std::move(player), item, category, false) == RETURNVALUE_NOERROR; + return internalCollectManagedItems(player, item, category, false) == RETURNVALUE_NOERROR; } std::unique_ptr<IOWheel> &Game::getIOWheel() { @@ -10433,7 +10561,7 @@ const std::unique_ptr<IOWheel> &Game::getIOWheel() const { } void Game::transferHouseItemsToDepot() { - if (!g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__)) { + if (!g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART)) { return; } @@ -10486,7 +10614,7 @@ std::vector<T> setDifference(const std::unordered_set<T> &setA, const std::unord return setResult; } -ReturnValue Game::beforeCreatureZoneChange(std::shared_ptr<Creature> creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones, bool force /* = false*/) const { +ReturnValue Game::beforeCreatureZoneChange(const std::shared_ptr<Creature> &creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones, bool force /* = false*/) const { if (!creature) { return RETURNVALUE_NOTPOSSIBLE; } @@ -10516,7 +10644,8 @@ ReturnValue Game::beforeCreatureZoneChange(std::shared_ptr<Creature> creature, c return RETURNVALUE_NOERROR; } -void Game::afterCreatureZoneChange(std::shared_ptr<Creature> creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones) const { +void Game::afterCreatureZoneChange(const std::shared_ptr<Creature> &creatures, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones) const { + auto creature = creatures; if (!creature) { return; } @@ -10549,7 +10678,7 @@ const std::vector<HighscoreCategory> &Game::getHighscoreCategories() const { return m_highscoreCategories; } -void Game::registerAchievement(uint16_t id, std::string name, std::string description, bool secret, uint8_t grade, uint8_t points) { +void Game::registerAchievement(uint16_t id, const std::string &name, std::string description, bool secret, uint8_t grade, uint8_t points) { m_achievements[id] = Achievement(); m_achievements[id].id = id; m_achievements[id].name = name; @@ -10565,7 +10694,7 @@ Achievement Game::getAchievementById(uint16_t id) { return m_achievements[id]; } -Achievement Game::getAchievementByName(std::string name) { +Achievement Game::getAchievementByName(const std::string &name) { auto it = m_achievementsNameToId.find(name); if (it != m_achievementsNameToId.end()) { return getAchievementById(it->second); @@ -10601,7 +10730,7 @@ std::map<uint16_t, Achievement> Game::getAchievements() { void Game::logCyclopediaStats() { g_logger().info("Loaded {} badges from Badge System", m_badges.size()); - g_logger().info("Loaded {} titles from Title system", m_titles.size()); + g_logger().info("Loaded {} titles from Title System", m_titles.size()); } std::unordered_set<Badge> Game::getBadges() { @@ -10668,10 +10797,6 @@ const std::string &Game::getSummaryKeyByType(uint8_t type) { return m_summaryCategories[type]; } -const std::map<uint8_t, std::string> &Game::getBlessingNames() { - return m_blessingNames; -} - const std::unordered_map<uint16_t, std::string> &Game::getHirelingSkills() { return m_hirelingSkills; } @@ -10679,3 +10804,51 @@ const std::unordered_map<uint16_t, std::string> &Game::getHirelingSkills() { const std::unordered_map<uint16_t, std::string> &Game::getHirelingOutfits() { return m_hirelingOutfits; } + +void Game::updatePlayersOnline() const { + // Function to be executed within the transaction + auto updateOperation = [this]() { + const auto &m_players = getPlayers(); + bool changesMade = false; + + // g_metrics().addUpDownCounter("players_online", 1); + // g_metrics().addUpDownCounter("players_online", -1); + + if (m_players.empty()) { + std::string query = "SELECT COUNT(*) AS count FROM players_online;"; + auto result = g_database().storeQuery(query); + int count = result->getNumber<int>("count"); + if (count > 0) { + g_database().executeQuery("DELETE FROM `players_online`;"); + changesMade = true; + } + } else { + // Insert the current players + DBInsert stmt("INSERT IGNORE INTO `players_online` (player_id) VALUES "); + for (const auto &[key, player] : m_players) { + std::ostringstream playerQuery; + playerQuery << "(" << player->getGUID() << ")"; + stmt.addRow(playerQuery.str()); + } + stmt.execute(); + changesMade = true; + + // Remove players who are no longer online + std::ostringstream cleanupQuery; + cleanupQuery << "DELETE FROM `players_online` WHERE `player_id` NOT IN ("; + for (const auto &[key, player] : m_players) { + cleanupQuery << player->getGUID() << ","; + } + cleanupQuery.seekp(-1, std::ostringstream::cur); // Remove the last comma + cleanupQuery << ");"; + g_database().executeQuery(cleanupQuery.str()); + } + + return changesMade; + }; + + const bool success = DBTransaction::executeWithinTransaction(updateOperation); + if (!success) { + g_logger().error("[Game::updatePlayersOnline] Failed to update players online."); + } +} diff --git a/src/game/game.hpp b/src/game/game.hpp index 0537ee030..b1afd8101 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -9,22 +9,15 @@ #pragma once -#include "account/account.hpp" -#include "creatures/combat/combat.hpp" -#include "items/containers/container.hpp" +#include "creatures/appearance/outfit/outfit.hpp" +#include "creatures/players/cyclopedia/player_badge.hpp" +#include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/players/grouping/familiars.hpp" #include "creatures/players/grouping/groups.hpp" -#include "io/iobestiary.hpp" -#include "items/item.hpp" -#include "map/map.hpp" -#include "creatures/npcs/npc.hpp" -#include "movement/position.hpp" -#include "creatures/players/player.hpp" #include "lua/creature/raids.hpp" -#include "creatures/players/grouping/team_finder.hpp" -#include "utils/wildcardtree.hpp" -#include "items/items_classification.hpp" +#include "map/map.hpp" #include "modal_window/modal_window.hpp" -#include "enums/object_category.hpp" +#include "movement/position.hpp" // Forward declaration for protobuf class namespace Canary { @@ -39,7 +32,6 @@ class ServiceManager; class Creature; class Monster; class Npc; -class CombatInfo; class Charm; class IOPrey; class IOWheel; @@ -47,11 +39,25 @@ class ItemClassification; class Guild; class Mounts; class Spectators; +class Player; +class Account; +class TeamFinder; +class NetworkMessage; +class Task; +class Container; +class ContainerIterator; +class Item; +class BedItem; +class WildcardTreeNode; struct Achievement; struct HighscoreCategory; -struct Badge; -struct Title; +struct TextMessage; + +enum ObjectCategory_t : uint8_t; +enum class ForgeAction_t : uint8_t; + +using CreatureVector = std::vector<std::shared_ptr<Creature>>; static constexpr uint16_t SERVER_BEAT = 0x32; static constexpr int32_t EVENT_MS = 10000; @@ -63,6 +69,7 @@ static constexpr int32_t EVENT_LUA_GARBAGE_COLLECTION = 60000 * 10; // 10min static constexpr std::chrono::minutes CACHE_EXPIRATION_TIME { 10 }; // 10min static constexpr std::chrono::minutes HIGHSCORE_CACHE_EXPIRATION_TIME { 10 }; // 10min +static constexpr int32_t UPDATE_PLAYERS_ONLINE_DB = 60000 * 10; // 10min struct QueryHighscoreCacheEntry { std::string query; @@ -87,9 +94,7 @@ class Game { Game(const Game &) = delete; Game &operator=(const Game &) = delete; - static Game &getInstance() { - return inject<Game>(); - } + static Game &getInstance(); void resetMonsters() const; void resetNpcs() const; @@ -129,33 +134,17 @@ class Game { return teamFinderMap; } - const std::unique_ptr<TeamFinder> &getTeamFinder(const std::shared_ptr<Player> &player) const { - auto it = teamFinderMap.find(player->getGUID()); - if (it != teamFinderMap.end()) { - return it->second; - } + const std::unique_ptr<TeamFinder> &getTeamFinder(const std::shared_ptr<Player> &player) const; - return TeamFinderNull; - } + const std::unique_ptr<TeamFinder> &getOrCreateTeamFinder(const std::shared_ptr<Player> &player); - const std::unique_ptr<TeamFinder> &getOrCreateTeamFinder(const std::shared_ptr<Player> &player) { - auto it = teamFinderMap.find(player->getGUID()); - if (it != teamFinderMap.end()) { - return it->second; - } + void removeTeamFinderListed(uint32_t leaderGuid); - return teamFinderMap[player->getGUID()] = std::make_unique<TeamFinder>(); - } + std::shared_ptr<Cylinder> internalGetCylinder(const std::shared_ptr<Player> &player, const Position &pos); + std::shared_ptr<Thing> internalGetThing(const std::shared_ptr<Player> &player, const Position &pos, int32_t index, uint32_t itemId, StackPosType_t type); + static void internalGetPosition(const std::shared_ptr<Item> &item, Position &pos, uint8_t &stackpos); - void removeTeamFinderListed(uint32_t leaderGuid) { - teamFinderMap.erase(leaderGuid); - } - - std::shared_ptr<Cylinder> internalGetCylinder(std::shared_ptr<Player> player, const Position &pos); - std::shared_ptr<Thing> internalGetThing(std::shared_ptr<Player> player, const Position &pos, int32_t index, uint32_t itemId, StackPosType_t type); - static void internalGetPosition(std::shared_ptr<Item> item, Position &pos, uint8_t &stackpos); - - static std::string getTradeErrorDescription(ReturnValue ret, std::shared_ptr<Item> item); + static std::string getTradeErrorDescription(ReturnValue ret, const std::shared_ptr<Item> &item); std::shared_ptr<Creature> getCreatureByID(uint32_t id); @@ -177,13 +166,13 @@ class Game { ReturnValue getPlayerByNameWildcard(const std::string &s, std::shared_ptr<Player> &player); - std::vector<std::shared_ptr<Player>> getPlayersByAccount(std::shared_ptr<Account> acc, bool allowOffline = false); + std::vector<std::shared_ptr<Player>> getPlayersByAccount(const std::shared_ptr<Account> &acc, bool allowOffline = false); - bool internalPlaceCreature(std::shared_ptr<Creature> creature, const Position &pos, bool extendedPos = false, bool forced = false, bool creatureCheck = false); + bool internalPlaceCreature(const std::shared_ptr<Creature> &creature, const Position &pos, bool extendedPos = false, bool forced = false, bool creatureCheck = false); - bool placeCreature(std::shared_ptr<Creature> creature, const Position &pos, bool extendedPos = false, bool force = false); + bool placeCreature(const std::shared_ptr<Creature> &creature, const Position &pos, bool extendedPos = false, bool force = false); - bool removeCreature(std::shared_ptr<Creature> creature, bool isLogout = true); + bool removeCreature(const std::shared_ptr<Creature> &creature, bool isLogout = true); void executeDeath(uint32_t creatureId); void addCreatureCheck(const std::shared_ptr<Creature> &creature); @@ -205,58 +194,44 @@ class Game { void addItemsClassification(ItemClassification* itemsClassification) { itemsClassifications.push_back(itemsClassification); } - ItemClassification* getItemsClassification(uint8_t id, bool create) { - auto it = std::find_if(itemsClassifications.begin(), itemsClassifications.end(), [id](ItemClassification* it) { - return it->id == id; - }); - - if (it != itemsClassifications.end()) { - return *it; - } else if (create) { - ItemClassification* itemClassification = new ItemClassification(id); - addItemsClassification(itemClassification); - return itemClassification; - } - - return nullptr; - } + ItemClassification* getItemsClassification(uint8_t id, bool create); LightInfo getWorldLightInfo() const; bool gameIsDay(); - ReturnValue internalMoveCreature(std::shared_ptr<Creature> creature, Direction direction, uint32_t flags = 0); + ReturnValue internalMoveCreature(const std::shared_ptr<Creature> &creature, Direction direction, uint32_t flags = 0); ReturnValue internalMoveCreature(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &toTile, uint32_t flags = 0); - ReturnValue checkMoveItemToCylinder(std::shared_ptr<Player> player, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, Position toPos); - ReturnValue internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, int32_t index, std::shared_ptr<Item> item, uint32_t count, std::shared_ptr<Item>* movedItem, uint32_t flags = 0, std::shared_ptr<Creature> actor = nullptr, std::shared_ptr<Item> tradeItem = nullptr, bool checkTile = true); + ReturnValue checkMoveItemToCylinder(const std::shared_ptr<Player> &player, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder, const std::shared_ptr<Item> &item, Position toPos); + ReturnValue internalMoveItem(std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder, int32_t index, const std::shared_ptr<Item> &item, uint32_t count, std::shared_ptr<Item>* movedItem, uint32_t flags = 0, const std::shared_ptr<Creature> &actor = nullptr, const std::shared_ptr<Item> &tradeItem = nullptr, bool checkTile = true); std::tuple<ReturnValue, uint32_t, uint32_t> addItemBatch(const std::shared_ptr<Cylinder> &toCylinder, const std::vector<std::shared_ptr<Item>> &items, uint32_t flags = 0, bool dropOnMap = true, uint32_t autoContainerId = 0); std::tuple<ReturnValue, uint32_t, uint32_t> createItemBatch(const std::shared_ptr<Cylinder> &toCylinder, const std::vector<std::tuple<uint16_t, uint32_t, uint16_t>> &itemCounts, uint32_t flags = 0, bool dropOnMap = true, uint32_t autoContainerId = 0); std::tuple<ReturnValue, uint32_t, uint32_t> createItem(const std::shared_ptr<Cylinder> &toCylinder, uint16_t itemId, uint32_t count, uint16_t subType, uint32_t flags = 0, bool dropOnMap = true, uint32_t autoContainerId = 0); - ReturnValue internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, int32_t index = INDEX_WHEREEVER, uint32_t flags = 0, bool test = false); - ReturnValue internalAddItem(std::shared_ptr<Cylinder> toCylinder, std::shared_ptr<Item> item, int32_t index, uint32_t flags, bool test, uint32_t &remainderCount); - ReturnValue internalRemoveItem(std::shared_ptr<Item> item, int32_t count = -1, bool test = false, uint32_t flags = 0, bool force = false); + ReturnValue internalAddItem(std::shared_ptr<Cylinder> toCylinder, const std::shared_ptr<Item> &item, int32_t index = INDEX_WHEREEVER, uint32_t flags = 0, bool test = false); + ReturnValue internalAddItem(std::shared_ptr<Cylinder> toCylinder, const std::shared_ptr<Item> &item, int32_t index, uint32_t flags, bool test, uint32_t &remainderCount); + ReturnValue internalRemoveItem(const std::shared_ptr<Item> &item, int32_t count = -1, bool test = false, uint32_t flags = 0, bool force = false); - ReturnValue internalPlayerAddItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, bool dropOnMap = true, Slots_t slot = CONST_SLOT_WHEREEVER); + ReturnValue internalPlayerAddItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, bool dropOnMap = true, Slots_t slot = CONST_SLOT_WHEREEVER); - std::shared_ptr<Item> findItemOfType(std::shared_ptr<Cylinder> cylinder, uint16_t itemId, bool depthSearch = true, int32_t subType = -1) const; + std::shared_ptr<Item> findItemOfType(const std::shared_ptr<Cylinder> &cylinder, uint16_t itemId, bool depthSearch = true, int32_t subType = -1) const; void createLuaItemsOnMap(); - bool removeMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint32_t flags = 0, bool useBank = false); + bool removeMoney(const std::shared_ptr<Cylinder> &cylinder, uint64_t money, uint32_t flags = 0, bool useBank = false); - void addMoney(std::shared_ptr<Cylinder> cylinder, uint64_t money, uint32_t flags = 0); + void addMoney(const std::shared_ptr<Cylinder> &cylinder, uint64_t money, uint32_t flags = 0); std::shared_ptr<Item> transformItem(std::shared_ptr<Item> item, uint16_t newId, int32_t newCount = -1); ReturnValue internalTeleport(const std::shared_ptr<Thing> &thing, const Position &newPos, bool pushMove = true, uint32_t flags = 0); - bool internalCreatureTurn(std::shared_ptr<Creature> creature, Direction dir); + bool internalCreatureTurn(const std::shared_ptr<Creature> &creature, Direction dir); - bool internalCreatureSay(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, bool ghostMode, Spectators* spectatorsPtr = nullptr, const Position* pos = nullptr); + bool internalCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, bool ghostMode, Spectators* spectatorsPtr = nullptr, const Position* pos = nullptr); - ObjectCategory_t getObjectCategory(const std::shared_ptr<Item> item); + ObjectCategory_t getObjectCategory(const std::shared_ptr<Item> &item); ObjectCategory_t getObjectCategory(const ItemType &it); uint64_t getItemMarketPrice(const std::map<uint16_t, uint64_t> &itemMap, bool buyPrice) const; @@ -264,8 +239,8 @@ class Game { void loadPlayersRecord(); void checkPlayersRecord(); - void sendSingleSoundEffect(const Position &pos, SoundEffect_t soundId, std::shared_ptr<Creature> actor = nullptr); - void sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundEffect, SoundEffect_t secondarySoundEffect, std::shared_ptr<Creature> actor = nullptr); + void sendSingleSoundEffect(const Position &pos, SoundEffect_t soundId, const std::shared_ptr<Creature> &actor = nullptr); + void sendDoubleSoundEffect(const Position &pos, SoundEffect_t mainSoundEffect, SoundEffect_t secondarySoundEffect, const std::shared_ptr<Creature> &actor = nullptr); void sendGuildMotd(uint32_t playerId); void kickPlayer(uint32_t playerId, bool displayEffect); @@ -297,38 +272,38 @@ class Game { void playerBrowseForgeHistory(uint32_t playerId, uint8_t page); void playerBosstiarySlot(uint32_t playerId, uint8_t slotId, uint32_t selectedBossId); - void playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, const Position &pos, uint8_t stackPos, const uint16_t itemId, uint8_t direction, const std::pair<uint8_t, uint8_t> &podiumAndMonsterVisible); - void playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId); + void playerSetMonsterPodium(uint32_t playerId, uint32_t monsterRaceId, const Position &pos, uint8_t stackPos, uint16_t itemId, uint8_t direction, const std::pair<uint8_t, uint8_t> &podiumAndMonsterVisible); + void playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t stackPos, uint16_t itemId); void playerRequestInventoryImbuements(uint32_t playerId, bool isTrackerOpen); - bool addItemStoreInbox(std::shared_ptr<Player> player, uint32_t itemId); + bool addItemStoreInbox(const std::shared_ptr<Player> &player, uint32_t itemId); void playerRewardChestCollect(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, uint32_t maxMoveItems = 0); void playerReportRuleViolationReport(uint32_t playerId, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation); - void playerFriendSystemAction(std::shared_ptr<Player> player, uint8_t type, uint8_t titleId); + void playerFriendSystemAction(const std::shared_ptr<Player> &player, uint8_t type, uint8_t titleId); - void playerCyclopediaCharacterInfo(std::shared_ptr<Player> player, uint32_t characterID, CyclopediaCharacterInfoType_t characterInfoType, uint16_t entriesPerPage, uint16_t page); + void playerCyclopediaCharacterInfo(const std::shared_ptr<Player> &player, uint32_t characterID, CyclopediaCharacterInfoType_t characterInfoType, uint16_t entriesPerPage, uint16_t page); - void playerHighscores(std::shared_ptr<Player> player, HighscoreType_t type, uint8_t category, uint32_t vocation, const std::string &worldName, uint16_t page, uint8_t entriesPerPage); + void playerHighscores(const std::shared_ptr<Player> &player, HighscoreType_t type, uint8_t category, uint32_t vocation, const std::string &worldName, uint16_t page, uint8_t entriesPerPage); static std::string getSkillNameById(uint8_t &skill); void updatePlayerSaleItems(uint32_t playerId); - bool internalStartTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> partner, std::shared_ptr<Item> tradeItem); - void internalCloseTrade(std::shared_ptr<Player> player); - bool playerBroadcastMessage(std::shared_ptr<Player> player, const std::string &text) const; + bool internalStartTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &partner, const std::shared_ptr<Item> &tradeItem); + void internalCloseTrade(const std::shared_ptr<Player> &player); + bool playerBroadcastMessage(const std::shared_ptr<Player> &player, const std::string &text) const; void broadcastMessage(const std::string &text, MessageClasses type) const; // Implementation of player invoked events void playerTeleport(uint32_t playerId, const Position &pos); void playerMoveThing(uint32_t playerId, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count); void playerMoveCreatureByID(uint32_t playerId, uint32_t movingCreatureId, const Position &movingCreatureOrigPos, const Position &toPos); - void playerMoveCreature(std::shared_ptr<Player> playerId, std::shared_ptr<Creature> movingCreature, const Position &movingCreatureOrigPos, std::shared_ptr<Tile> toTile); + void playerMoveCreature(const std::shared_ptr<Player> &playerId, const std::shared_ptr<Creature> &movingCreature, const Position &movingCreatureOrigPos, const std::shared_ptr<Tile> &toTile); void playerMoveItemByPlayerID(uint32_t playerId, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count); - void playerMoveItem(std::shared_ptr<Player> player, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count, std::shared_ptr<Item> item, std::shared_ptr<Cylinder> toCylinder); + void playerMoveItem(const std::shared_ptr<Player> &player, const Position &fromPos, uint16_t itemId, uint8_t fromStackPos, const Position &toPos, uint8_t count, std::shared_ptr<Item> item, std::shared_ptr<Cylinder> toCylinder); void playerEquipItem(uint32_t playerId, uint16_t itemId, bool hasTier = false, uint8_t tier = 0); void playerMove(uint32_t playerId, Direction direction); void forcePlayerMove(uint32_t playerId, Direction direction); @@ -353,10 +328,10 @@ class Game { void playerCloseContainer(uint32_t playerId, uint8_t cid); void playerMoveUpContainer(uint32_t playerId, uint8_t cid); void playerUpdateContainer(uint32_t playerId, uint8_t cid); - void playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId); - void playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId); - void playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Position &pos, uint8_t stackPos, const uint16_t itemId, uint8_t podiumVisible, uint8_t direction); - void playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t stackPos, const uint16_t itemId); + void playerRotateItem(uint32_t playerId, const Position &pos, uint8_t stackPos, uint16_t itemId); + void playerConfigureShowOffSocket(uint32_t playerId, const Position &pos, uint8_t stackPos, uint16_t itemId); + void playerSetShowOffSocket(uint32_t playerId, Outfit_t &outfit, const Position &pos, uint8_t stackPos, uint16_t itemId, uint8_t podiumVisible, uint8_t direction); + void playerWrapableItem(uint32_t playerId, const Position &pos, uint8_t stackPos, uint16_t itemId); void playerWriteItem(uint32_t playerId, uint32_t windowTextId, const std::string &text); void playerBrowseField(uint32_t playerId, const Position &pos); void playerSeekInContainer(uint32_t playerId, uint8_t containerId, uint16_t index, uint8_t containerCategory); @@ -375,21 +350,21 @@ class Game { void playerSetFightModes(uint32_t playerId, FightMode_t fightMode, bool chaseMode, bool secureMode); void playerLookAt(uint32_t playerId, uint16_t itemId, const Position &pos, uint8_t stackPos); void playerLookInBattleList(uint32_t playerId, uint32_t creatureId); - void playerQuickLootCorpse(std::shared_ptr<Player> player, std::shared_ptr<Container> corpse, const Position &position); - void playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, std::shared_ptr<Item> defaultItem = nullptr, bool lootAllCorpses = false, bool autoLoot = false); - void playerLootAllCorpses(std::shared_ptr<Player> player, const Position &pos, bool lootAllCorpses); + void playerQuickLootCorpse(const std::shared_ptr<Player> &player, const std::shared_ptr<Container> &corpse, const Position &position); + void playerQuickLoot(uint32_t playerId, const Position &pos, uint16_t itemId, uint8_t stackPos, const std::shared_ptr<Item> &defaultItem = nullptr, bool lootAllCorpses = false, bool autoLoot = false); + void playerLootAllCorpses(const std::shared_ptr<Player> &player, const Position &pos, bool lootAllCorpses); void playerSetManagedContainer(uint32_t playerId, ObjectCategory_t category, const Position &pos, uint16_t itemId, uint8_t stackPos, bool isLootContainer); void playerClearManagedContainer(uint32_t playerId, ObjectCategory_t category, bool isLootContainer); void playerOpenManagedContainer(uint32_t playerId, ObjectCategory_t category, bool isLootContainer); void playerSetQuickLootFallback(uint32_t playerId, bool fallback); - void playerQuickLootBlackWhitelist(uint32_t playerId, QuickLootFilter_t filter, const std::vector<uint16_t> itemIds); + void playerQuickLootBlackWhitelist(uint32_t playerId, QuickLootFilter_t filter, const std::vector<uint16_t> &itemIds); void playerRequestDepotItems(uint32_t playerId); void playerRequestCloseDepotSearch(uint32_t playerId); void playerRequestDepotSearchItem(uint32_t playerId, uint16_t itemId, uint8_t tier); void playerRequestDepotSearchRetrieve(uint32_t playerId, uint16_t itemId, uint8_t tier, uint8_t type); void playerRequestOpenContainerFromDepotSearch(uint32_t playerId, const Position &pos); - void playerMoveThingFromDepotSearch(std::shared_ptr<Player> player, uint16_t itemId, uint8_t tier, uint8_t count, const Position &fromPos, const Position &toPos, bool allItems = false); + void playerMoveThingFromDepotSearch(const std::shared_ptr<Player> &player, uint16_t itemId, uint8_t tier, uint8_t count, const Position &fromPos, const Position &toPos, bool allItems = false); void playerRequestAddVip(uint32_t playerId, const std::string &name); void playerRequestRemoveVip(uint32_t playerId, uint32_t guid); @@ -424,11 +399,11 @@ class Game { void playerSaveWheel(uint32_t playerId, NetworkMessage &msg); void playerWheelGemAction(uint32_t playerId, NetworkMessage &msg); - void updatePlayerHelpers(std::shared_ptr<Player> player); + void updatePlayerHelpers(const std::shared_ptr<Player> &player); void shutdown(); void dieSafely(const std::string &errorMsg); - void addBestiaryList(uint16_t raceid, std::string name); + void addBestiaryList(uint16_t raceid, const std::string &name); const std::map<uint16_t, std::string> &getBestiaryList() const { return BestiaryList; } @@ -442,21 +417,21 @@ class Game { return boostedCreature; } - bool canThrowObjectTo(const Position &fromPos, const Position &toPos, bool checkLineOfSight = true, int32_t rangex = MAP_MAX_CLIENT_VIEW_PORT_X, int32_t rangey = MAP_MAX_CLIENT_VIEW_PORT_Y); + bool canThrowObjectTo(const Position &fromPos, const Position &toPos, SightLines_t lineOfSight = SightLine_CheckSightLine, int32_t rangex = MAP_MAX_CLIENT_VIEW_PORT_X, int32_t rangey = MAP_MAX_CLIENT_VIEW_PORT_Y); bool isSightClear(const Position &fromPos, const Position &toPos, bool sameFloor); - void changeSpeed(std::shared_ptr<Creature> creature, int32_t varSpeedDelta); - void setCreatureSpeed(std::shared_ptr<Creature> creature, int32_t speed); // setCreatureSpeed + void changeSpeed(const std::shared_ptr<Creature> &creature, int32_t varSpeedDelta); + void setCreatureSpeed(const std::shared_ptr<Creature> &creature, int32_t speed); // setCreatureSpeed void changePlayerSpeed(const std::shared_ptr<Player> &player, int32_t varSpeedDelta); - void internalCreatureChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &oufit); - void internalCreatureChangeVisible(std::shared_ptr<Creature> creature, bool visible); - void changeLight(const std::shared_ptr<Creature> creature); - void updateCreatureIcon(const std::shared_ptr<Creature> creature); - void reloadCreature(const std::shared_ptr<Creature> creature); - void updateCreatureSkull(std::shared_ptr<Creature> player); - void updatePlayerShield(std::shared_ptr<Player> player); - void updateCreatureType(std::shared_ptr<Creature> creature); - void updateCreatureWalkthrough(const std::shared_ptr<Creature> creature); + void internalCreatureChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &oufit); + void internalCreatureChangeVisible(const std::shared_ptr<Creature> &creature, bool visible); + void changeLight(const std::shared_ptr<Creature> &creature); + void updateCreatureIcon(const std::shared_ptr<Creature> &creature); + void reloadCreature(const std::shared_ptr<Creature> &creature); + void updateCreatureSkull(const std::shared_ptr<Creature> &player) const; + void updatePlayerShield(const std::shared_ptr<Player> &player); + void updateCreatureType(const std::shared_ptr<Creature> &creature); + void updateCreatureWalkthrough(const std::shared_ptr<Creature> &creature); GameState_t getGameState() const; void setGameState(GameState_t newState); @@ -468,41 +443,41 @@ class Game { void checkCreatures(); void checkLight(); - bool combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, bool checkDefense, bool checkArmor, bool field); + bool combatBlockHit(CombatDamage &damage, const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, bool checkDefense, bool checkArmor, bool field); - void combatGetTypeInfo(CombatType_t combatType, std::shared_ptr<Creature> target, TextColor_t &color, uint16_t &effect); + void combatGetTypeInfo(CombatType_t combatType, const std::shared_ptr<Creature> &target, TextColor_t &color, uint16_t &effect); // Hazard combat helpers - void handleHazardSystemAttack(CombatDamage &damage, std::shared_ptr<Player> player, const std::shared_ptr<Monster> monster, bool isPlayerAttacker); - void notifySpectators(const CreatureVector &spectators, const Position &targetPos, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster); + void handleHazardSystemAttack(CombatDamage &damage, const std::shared_ptr<Player> &player, const std::shared_ptr<Monster> &monster, bool isPlayerAttacker); + void notifySpectators(const CreatureVector &spectators, const Position &targetPos, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster); // Custom PvP System combat helpers - void applyPvPDamage(CombatDamage &damage, std::shared_ptr<Player> attacker, std::shared_ptr<Player> target); - float pvpLevelDifferenceDamageMultiplier(std::shared_ptr<Player> attacker, std::shared_ptr<Player> target); + void applyPvPDamage(CombatDamage &damage, const std::shared_ptr<Player> &attacker, const std::shared_ptr<Player> &target); + float pvpLevelDifferenceDamageMultiplier(const std::shared_ptr<Player> &attacker, const std::shared_ptr<Player> &target); // Wheel of destiny combat helpers - void applyWheelOfDestinyHealing(CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target); - void applyWheelOfDestinyEffectsToDamage(CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target) const; - int32_t applyHealthChange(CombatDamage &damage, std::shared_ptr<Creature> target) const; + void applyWheelOfDestinyHealing(CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, std::shared_ptr<Creature> target); + void applyWheelOfDestinyEffectsToDamage(CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Creature> &target) const; + int32_t applyHealthChange(const CombatDamage &damage, const std::shared_ptr<Creature> &target) const; - bool combatChangeHealth(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage, bool isEvent = false); - void applyCharmRune(std::shared_ptr<Monster> targetMonster, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Creature> target, const int32_t &realDamage) const; + bool combatChangeHealth(const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, CombatDamage &damage, bool isEvent = false); + void applyCharmRune(const std::shared_ptr<Monster> &targetMonster, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Creature> &target, const int32_t &realDamage) const; void applyManaLeech( - std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster, - std::shared_ptr<Creature> target, const CombatDamage &damage, const int32_t &realDamage + const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, const int32_t &realDamage ) const; void applyLifeLeech( - std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Monster> targetMonster, - std::shared_ptr<Creature> target, const CombatDamage &damage, const int32_t &realDamage + const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Monster> &targetMonster, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, const int32_t &realDamage ) const; int32_t calculateLeechAmount(const int32_t &realDamage, const uint16_t &skillAmount, int targetsAffected) const; - bool combatChangeMana(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage); + bool combatChangeMana(const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, CombatDamage &damage); // Animation help functions - void addCreatureHealth(const std::shared_ptr<Creature> target); - static void addCreatureHealth(const CreatureVector &spectators, const std::shared_ptr<Creature> target); - void addPlayerMana(const std::shared_ptr<Player> target); - void addPlayerVocation(const std::shared_ptr<Player> target); + void addCreatureHealth(const std::shared_ptr<Creature> &target); + static void addCreatureHealth(const CreatureVector &spectators, const std::shared_ptr<Creature> &target); + void addPlayerMana(const std::shared_ptr<Player> &target); + void addPlayerVocation(const std::shared_ptr<Player> &target); void addMagicEffect(const Position &pos, uint16_t effect); static void addMagicEffect(const std::vector<std::shared_ptr<Player>> &players, const Position &pos, uint16_t effect); static void addMagicEffect(const CreatureVector &spectators, const Position &pos, uint16_t effect); @@ -529,7 +504,7 @@ class Game { motdNum++; } - void sendOfflineTrainingDialog(std::shared_ptr<Player> player); + void sendOfflineTrainingDialog(const std::shared_ptr<Player> &player); const std::map<uint16_t, std::map<uint8_t, uint64_t>> &getItemsPrice() const { return itemsPriceMap; @@ -551,18 +526,18 @@ class Game { return itemsClassifications; } - void addPlayer(std::shared_ptr<Player> player); - void removePlayer(std::shared_ptr<Player> player); + void addPlayer(const std::shared_ptr<Player> &player); + void removePlayer(const std::shared_ptr<Player> &player); - void addNpc(std::shared_ptr<Npc> npc); - void removeNpc(std::shared_ptr<Npc> npc); + void addNpc(const std::shared_ptr<Npc> &npc); + void removeNpc(const std::shared_ptr<Npc> &npc); - void addMonster(std::shared_ptr<Monster> npc); - void removeMonster(std::shared_ptr<Monster> npc); + void addMonster(const std::shared_ptr<Monster> &npc); + void removeMonster(const std::shared_ptr<Monster> &npc); std::shared_ptr<Guild> getGuild(uint32_t id, bool allowOffline = false) const; std::shared_ptr<Guild> getGuildByName(const std::string &name, bool allowOffline = false) const; - void addGuild(const std::shared_ptr<Guild> guild); + void addGuild(const std::shared_ptr<Guild> &guild); void removeGuild(uint32_t guildId); phmap::flat_hash_map<std::shared_ptr<Tile>, std::weak_ptr<Container>> browseFields; @@ -581,30 +556,30 @@ class Game { bool hasDistanceEffect(uint16_t effectId); Groups groups; - Familiars familiars; + [[no_unique_address]] Familiars familiars; Map map; - Mounts mounts; - Outfits outfits; + std::unique_ptr<Mounts> mounts; + [[no_unique_address]] Outfits outfits; Raids raids; std::unique_ptr<Canary::protobuf::appearances::Appearances> m_appearancesPtr; auto getTilesToClean() const { return tilesToClean; } - void addTileToClean(std::shared_ptr<Tile> tile) { + void addTileToClean(const std::shared_ptr<Tile> &tile) { tilesToClean.emplace(tile); } - void removeTileToClean(std::shared_ptr<Tile> tile) { + void removeTileToClean(const std::shared_ptr<Tile> &tile) { tilesToClean.erase(tile); } void clearTilesToClean() { tilesToClean.clear(); } - void playerInspectItem(std::shared_ptr<Player> player, const Position &pos); - void playerInspectItem(std::shared_ptr<Player> player, uint16_t itemId, uint8_t itemCount, bool cyclopedia); + void playerInspectItem(const std::shared_ptr<Player> &player, const Position &pos); + void playerInspectItem(const std::shared_ptr<Player> &player, uint16_t itemId, uint8_t itemCount, bool cyclopedia); - void addCharmRune(const std::shared_ptr<Charm> charm) { + void addCharmRune(const std::shared_ptr<Charm> &charm) { CharmList.push_back(charm); CharmList.shrink_to_fit(); } @@ -615,15 +590,15 @@ class Game { FILELOADER_ERRORS loadAppearanceProtobuf(const std::string &file); bool isMagicEffectRegistered(uint16_t type) const { - return std::find(registeredMagicEffects.begin(), registeredMagicEffects.end(), type) != registeredMagicEffects.end(); + return std::ranges::find(registeredMagicEffects, type) != registeredMagicEffects.end(); } bool isDistanceEffectRegistered(uint16_t type) const { - return std::find(registeredDistanceEffects.begin(), registeredDistanceEffects.end(), type) != registeredDistanceEffects.end(); + return std::ranges::find(registeredDistanceEffects, type) != registeredDistanceEffects.end(); } bool isLookTypeRegistered(uint16_t type) const { - return std::find(registeredLookTypes.begin(), registeredLookTypes.end(), type) != registeredLookTypes.end(); + return std::ranges::find(registeredLookTypes, type) != registeredLookTypes.end(); } void setCreateLuaItems(Position position, uint16_t itemId) { @@ -649,9 +624,9 @@ class Game { uint32_t makeFiendishMonster(uint32_t forgeableMonsterId = 0, bool createForgeableMonsters = false); uint32_t makeInfluencedMonster(); - bool addInfluencedMonster(std::shared_ptr<Monster> monster); - void sendUpdateCreature(std::shared_ptr<Creature> creature); - std::shared_ptr<Item> wrapItem(std::shared_ptr<Item> item, std::shared_ptr<House> house); + bool addInfluencedMonster(const std::shared_ptr<Monster> &monster); + void sendUpdateCreature(const std::shared_ptr<Creature> &creature); + std::shared_ptr<Item> wrapItem(const std::shared_ptr<Item> &item, const std::shared_ptr<House> &house); /** * @brief Adds a player to the unique login map. @@ -660,7 +635,7 @@ class Game { * * @param player A pointer to the Player object to add. */ - void addPlayerUniqueLogin(std::shared_ptr<Player> player); + void addPlayerUniqueLogin(const std::shared_ptr<Player> &player); /** * @brief Gets a player from the unique login map using their name. @@ -689,7 +664,7 @@ class Game { * * @param player A pointer to the Player object to remove. */ - void removePlayerUniqueLogin(std::shared_ptr<Player> player); + void removePlayerUniqueLogin(const std::shared_ptr<Player> &player); void playerCheckActivity(const std::string &playerName, int interval); /** @@ -702,10 +677,10 @@ class Game { * @param item Pointer to the item to be checked. * @return True if stash items can be retrieved, false otherwise. */ - bool tryRetrieveStashItems(std::shared_ptr<Player> player, std::shared_ptr<Item> item); + bool tryRetrieveStashItems(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item); - ReturnValue beforeCreatureZoneChange(std::shared_ptr<Creature> creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones, bool force = false) const; - void afterCreatureZoneChange(std::shared_ptr<Creature> creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones) const; + ReturnValue beforeCreatureZoneChange(const std::shared_ptr<Creature> &creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones, bool force = false) const; + void afterCreatureZoneChange(const std::shared_ptr<Creature> &creature, const std::unordered_set<std::shared_ptr<Zone>> &fromZones, const std::unordered_set<std::shared_ptr<Zone>> &toZones) const; std::unique_ptr<IOWheel> &getIOWheel(); const std::unique_ptr<IOWheel> &getIOWheel() const; @@ -717,9 +692,9 @@ class Game { const std::vector<HighscoreCategory> &getHighscoreCategories() const; - void registerAchievement(uint16_t id, std::string name, std::string description, bool secret, uint8_t grade, uint8_t points); + void registerAchievement(uint16_t id, const std::string &name, std::string description, bool secret, uint8_t grade, uint8_t points); Achievement getAchievementById(uint16_t id); - Achievement getAchievementByName(std::string name); + Achievement getAchievementByName(const std::string &name); std::vector<Achievement> getSecretAchievements(); std::vector<Achievement> getPublicAchievements(); std::map<uint16_t, Achievement> getAchievements(); @@ -748,8 +723,6 @@ class Game { std::vector<HighscoreCategory> m_highscoreCategories; std::unordered_map<uint8_t, std::string> m_highscoreCategoriesNames; - std::map<uint8_t, std::string> m_blessingNames; - std::unordered_map<uint8_t, std::string> m_summaryCategories; std::unordered_map<uint16_t, std::string> m_hirelingSkills; std::unordered_map<uint16_t, std::string> m_hirelingOutfits; @@ -757,13 +730,13 @@ class Game { std::map<uint32_t, int32_t> forgeMonsterEventIds; std::unordered_set<uint32_t> fiendishMonsters; std::unordered_set<uint32_t> influencedMonsters; - void checkImbuements(); - bool playerSaySpell(std::shared_ptr<Player> player, SpeakClasses type, const std::string &text); - void playerWhisper(std::shared_ptr<Player> player, const std::string &text); - bool playerYell(std::shared_ptr<Player> player, const std::string &text); - bool playerSpeakTo(std::shared_ptr<Player> player, SpeakClasses type, const std::string &receiver, const std::string &text); - void playerSpeakToNpc(std::shared_ptr<Player> player, const std::string &text); - std::shared_ptr<Task> createPlayerTask(uint32_t delay, std::function<void(void)> f, std::string context) const; + void checkImbuements() const; + bool playerSaySpell(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &text); + void playerWhisper(const std::shared_ptr<Player> &player, const std::string &text); + bool playerYell(const std::shared_ptr<Player> &player, const std::string &text); + bool playerSpeakTo(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &receiver, const std::string &text); + void playerSpeakToNpc(const std::shared_ptr<Player> &player, const std::string &text); + std::shared_ptr<Task> createPlayerTask(uint32_t delay, std::function<void(void)> f, const std::string &context) const; /** * @brief Finds the managed container for loot or obtain based on the given parameters. @@ -777,7 +750,7 @@ class Game { * * @return Pointer to the managed container or nullptr if not found. */ - std::shared_ptr<Container> findManagedContainer(std::shared_ptr<Player> player, bool &fallbackConsumed, ObjectCategory_t category, bool isLootContainer); + std::shared_ptr<Container> findManagedContainer(const std::shared_ptr<Player> &player, bool &fallbackConsumed, ObjectCategory_t category, bool isLootContainer); /** * @brief Finds the next available sub-container within a container. @@ -798,7 +771,7 @@ class Game { * @param fallbackConsumed Reference to a boolean flag indicating whether a fallback has been consumed. * @return True if fallback logic was handled, false otherwise. */ - bool handleFallbackLogic(std::shared_ptr<Player> player, std::shared_ptr<Container> &lootContainer, ContainerIterator &containerIterator, const bool &fallbackConsumed); + bool handleFallbackLogic(const std::shared_ptr<Player> &player, std::shared_ptr<Container> &lootContainer, ContainerIterator &containerIterator, const bool &fallbackConsumed); /** * @brief Processes the movement or addition of an item to a loot container. @@ -809,7 +782,7 @@ class Game { * @param player Pointer to the player object. * @return Return value indicating success or error. */ - ReturnValue processMoveOrAddItemToLootContainer(std::shared_ptr<Item> item, std::shared_ptr<Container> lootContainer, uint32_t &remainderCount, std::shared_ptr<Player> player); + ReturnValue processMoveOrAddItemToLootContainer(const std::shared_ptr<Item> &item, const std::shared_ptr<Container> &lootContainer, uint32_t &remainderCount, const std::shared_ptr<Player> &player); /** * @brief Processes loot items and places them into the appropriate containers. @@ -820,7 +793,7 @@ class Game { * @param fallbackConsumed Reference to a boolean flag indicating whether a fallback has been consumed. * @return Return value indicating success or error. */ - ReturnValue processLootItems(std::shared_ptr<Player> player, std::shared_ptr<Container> lootContainer, std::shared_ptr<Item> item, bool &fallbackConsumed); + ReturnValue processLootItems(const std::shared_ptr<Player> &player, std::shared_ptr<Container> lootContainer, const std::shared_ptr<Item> &item, bool &fallbackConsumed); /** * @brief Internally collects loot or obtain items from a given item and places them into the managed container. @@ -830,7 +803,7 @@ class Game { * @param category Category of the item (default is OBJECTCATEGORY_DEFAULT). * @return Return value indicating success or error. */ - ReturnValue internalCollectManagedItems(std::shared_ptr<Player> player, std::shared_ptr<Item> item, ObjectCategory_t category = OBJECTCATEGORY_DEFAULT, bool isLootContainer = true); + ReturnValue internalCollectManagedItems(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, ObjectCategory_t category, bool isLootContainer = true); /** * @brief Collects items from the reward chest. @@ -839,7 +812,7 @@ class Game { * @param maxMoveItems Maximum number of items to move (default is 0, which means no limit). * @return Return value indicating success or error. */ - ReturnValue collectRewardChestItems(std::shared_ptr<Player> player, uint32_t maxMoveItems = 0); + ReturnValue collectRewardChestItems(const std::shared_ptr<Player> &player, uint32_t maxMoveItems = 0); phmap::flat_hash_map<std::string, QueryHighscoreCacheEntry> queryCache; phmap::flat_hash_map<std::string, HighscoreCacheEntry> highscoreCache; @@ -858,10 +831,9 @@ class Game { std::map<Position, uint16_t> mapLuaItemsStored; std::map<uint16_t, std::string> BestiaryList; - std::string boostedCreature = ""; + std::string boostedCreature; std::vector<std::shared_ptr<Charm>> CharmList; - std::vector<std::shared_ptr<Creature>> checkCreatureLists[EVENT_CREATURECOUNT]; std::vector<uint16_t> registeredMagicEffects; std::vector<uint16_t> registeredDistanceEffects; @@ -870,7 +842,7 @@ class Game { size_t lastBucket = 0; size_t lastImbuedBucket = 0; - std::shared_ptr<WildcardTreeNode> wildcardTree; + std::shared_ptr<WildcardTreeNode> wildcardTree = nullptr; std::map<uint32_t, std::shared_ptr<Npc>> npcs; std::map<uint32_t, std::shared_ptr<Monster>> monsters; @@ -921,59 +893,61 @@ class Game { std::vector<ItemClassification*> itemsClassifications; - bool isTryingToStow(const Position &toPos, std::shared_ptr<Cylinder> toCylinder) const; + bool isTryingToStow(const Position &toPos, const std::shared_ptr<Cylinder> &toCylinder) const; void sendDamageMessageAndEffects( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, const Position &targetPos, - std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Player> targetPlayer, TextMessage &message, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, const Position &targetPos, + const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Player> &targetPlayer, TextMessage &message, const CreatureVector &spectators, int32_t realDamage ); - void updatePlayerPartyHuntAnalyzer(const CombatDamage &damage, std::shared_ptr<Player> player) const; + void updatePlayerPartyHuntAnalyzer(const CombatDamage &damage, const std::shared_ptr<Player> &player) const; void sendEffects( - std::shared_ptr<Creature> target, const CombatDamage &damage, const Position &targetPos, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, const Position &targetPos, TextMessage &message, const CreatureVector &spectators ); void sendMessages( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, - const Position &targetPos, std::shared_ptr<Player> attackerPlayer, std::shared_ptr<Player> targetPlayer, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, + const Position &targetPos, const std::shared_ptr<Player> &attackerPlayer, const std::shared_ptr<Player> &targetPlayer, TextMessage &message, const CreatureVector &spectators, int32_t realDamage ) const; bool shouldSendMessage(const TextMessage &message) const; void buildMessageAsAttacker( - std::shared_ptr<Creature> target, const CombatDamage &damage, TextMessage &message, + const std::shared_ptr<Creature> &target, const CombatDamage &damage, TextMessage &message, std::stringstream &ss, const std::string &damageString ) const; void buildMessageAsTarget( - std::shared_ptr<Creature> attacker, const CombatDamage &damage, std::shared_ptr<Player> attackerPlayer, - std::shared_ptr<Player> targetPlayer, TextMessage &message, std::stringstream &ss, + const std::shared_ptr<Creature> &attacker, const CombatDamage &damage, const std::shared_ptr<Player> &attackerPlayer, + const std::shared_ptr<Player> &targetPlayer, TextMessage &message, std::stringstream &ss, const std::string &damageString ) const; void buildMessageAsSpectator( - std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, const CombatDamage &damage, - std::shared_ptr<Player> targetPlayer, TextMessage &message, std::stringstream &ss, + const std::shared_ptr<Creature> &attacker, const std::shared_ptr<Creature> &target, const CombatDamage &damage, + const std::shared_ptr<Player> &targetPlayer, TextMessage &message, std::stringstream &ss, const std::string &damageString, std::string &spectatorMessage ) const; - void unwrapItem(std::shared_ptr<Item> item, uint16_t unWrapId, std::shared_ptr<House> house, std::shared_ptr<Player> player); + void unwrapItem(const std::shared_ptr<Item> &item, uint16_t unWrapId, const std::shared_ptr<House> &house, const std::shared_ptr<Player> &player); // Variable members (m_) std::unique_ptr<IOWheel> m_IOWheel; void cacheQueryHighscore(const std::string &key, const std::string &query, uint32_t page, uint8_t entriesPerPage); - void processHighscoreResults(DBResult_ptr result, uint32_t playerID, uint8_t category, uint32_t vocation, uint8_t entriesPerPage); + void processHighscoreResults(const DBResult_ptr &result, uint32_t playerID, uint8_t category, uint32_t vocation, uint8_t entriesPerPage); std::string generateVocationConditionHighscore(uint32_t vocation); std::string generateHighscoreQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation); std::string generateHighscoreQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation); std::string generateHighscoreOrGetCachedQueryForEntries(const std::string &categoryName, uint32_t page, uint8_t entriesPerPage, uint32_t vocation); std::string generateHighscoreOrGetCachedQueryForOurRank(const std::string &categoryName, uint8_t entriesPerPage, uint32_t playerGUID, uint32_t vocation); + + void updatePlayersOnline() const; }; constexpr auto g_game = Game::getInstance; diff --git a/src/game/game_definitions.hpp b/src/game/game_definitions.hpp index 8b165bc72..e122cdf97 100644 --- a/src/game/game_definitions.hpp +++ b/src/game/game_definitions.hpp @@ -94,7 +94,7 @@ enum class HighscoreCategories_t : uint8_t { SHIELDING = 6, FISHING = 7, MAGIC_LEVEL = 8, - LOYALTY = 9, + LOYALTY_POINTS = 9, ACHIEVEMENTS = 10, CHARMS = 11, DROME = 12, @@ -102,17 +102,6 @@ enum class HighscoreCategories_t : uint8_t { BOSS_POINTS = 14, }; -enum Blessings_t : uint8_t { - TWIST_OF_FATE = 1, - WISDOM_OF_SOLITUDE = 2, - SPARK_OF_THE_PHOENIX = 3, - FIRE_OF_THE_SUNS = 4, - SPIRITUAL_SHIELDING = 5, - EMBRACE_OF_TIBIA = 6, - BLOOD_OF_THE_MOUNTAIN = 7, - HEARTH_OF_THE_MOUNTAIN = 8, -}; - enum HighscoreType_t : uint8_t { HIGHSCORE_GETENTRIES = 0, HIGHSCORE_OURRANK = 1 diff --git a/src/game/movement/position.cpp b/src/game/movement/position.cpp index 807a65ad4..1972f1c25 100644 --- a/src/game/movement/position.cpp +++ b/src/game/movement/position.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "game/movement/position.hpp" + #include "utils/tools.hpp" double Position::getEuclideanDistance(const Position &p1, const Position &p2) { diff --git a/src/game/movement/position.hpp b/src/game/movement/position.hpp index 87e74ee3e..9e298ee47 100644 --- a/src/game/movement/position.hpp +++ b/src/game/movement/position.hpp @@ -119,7 +119,7 @@ struct Position { namespace std { template <> struct hash<Position> { - std::size_t operator()(const Position &p) const { + std::size_t operator()(const Position &p) const noexcept { return static_cast<std::size_t>(p.x) | (static_cast<std::size_t>(p.y) << 16) | (static_cast<std::size_t>(p.z) << 32); } }; diff --git a/src/game/movement/teleport.cpp b/src/game/movement/teleport.cpp index 44050100e..935ec4436 100644 --- a/src/game/movement/teleport.cpp +++ b/src/game/movement/teleport.cpp @@ -7,10 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "game/movement/teleport.hpp" +#include "creatures/creature.hpp" #include "game/game.hpp" -#include "game/movement/teleport.hpp" +#include "game/scheduling/dispatcher.hpp" Attr_ReadValue Teleport::readAttr(AttrTypes_t attr, PropStream &propStream) { if (attr == ATTR_TELE_DEST) { @@ -31,7 +32,7 @@ void Teleport::serializeAttr(PropWriteStream &propWriteStream) const { propWriteStream.write<uint8_t>(destPos.z); } -ReturnValue Teleport::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature>) { +ReturnValue Teleport::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> &) { return RETURNVALUE_NOTPOSSIBLE; } @@ -39,15 +40,15 @@ ReturnValue Teleport::queryMaxCount(int32_t, const std::shared_ptr<Thing> &, uin return RETURNVALUE_NOTPOSSIBLE; } -ReturnValue Teleport::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> /*= nullptr */) { +ReturnValue Teleport::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> & /*= nullptr */) { return RETURNVALUE_NOERROR; } -std::shared_ptr<Cylinder> Teleport::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item>*, uint32_t &) { +std::shared_ptr<Cylinder> Teleport::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item> &, uint32_t &) { return getTeleport(); } -bool Teleport::checkInfinityLoop(std::shared_ptr<Tile> destTile) { +bool Teleport::checkInfinityLoop(const std::shared_ptr<Tile> &destTile) { if (!destTile) { return false; } @@ -62,16 +63,16 @@ bool Teleport::checkInfinityLoop(std::shared_ptr<Tile> destTile) { return false; } -void Teleport::addThing(std::shared_ptr<Thing> thing) { +void Teleport::addThing(const std::shared_ptr<Thing> &thing) { return addThing(0, thing); } -void Teleport::addThing(int32_t, std::shared_ptr<Thing> thing) { +void Teleport::addThing(int32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { return; } - std::shared_ptr<Tile> destTile = g_game().map.getTile(destPos); + const std::shared_ptr<Tile> &destTile = g_game().map.getTile(destPos); if (!destTile) { return; } @@ -87,15 +88,17 @@ void Teleport::addThing(int32_t, std::shared_ptr<Thing> thing) { const MagicEffectClasses effect = Item::items[id].magicEffect; - if (std::shared_ptr<Creature> creature = thing->getCreature()) { + if (const std::shared_ptr<Creature> &creature = thing->getCreature()) { Position origPos = creature->getPosition(); g_game().internalCreatureTurn(creature, origPos.x > destPos.x ? DIRECTION_WEST : DIRECTION_EAST); - g_game().map.moveCreature(creature, destTile); + g_dispatcher().addWalkEvent([=] { + g_game().map.moveCreature(creature, destTile); + }); if (effect != CONST_ME_NONE) { g_game().addMagicEffect(origPos, effect); g_game().addMagicEffect(destTile->getPosition(), effect); } - } else if (std::shared_ptr<Item> item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { if (effect != CONST_ME_NONE) { g_game().addMagicEffect(destTile->getPosition(), effect); g_game().addMagicEffect(item->getPosition(), effect); @@ -104,22 +107,22 @@ void Teleport::addThing(int32_t, std::shared_ptr<Thing> thing) { } } -void Teleport::updateThing(std::shared_ptr<Thing>, uint16_t, uint32_t) { +void Teleport::updateThing(const std::shared_ptr<Thing> &, uint16_t, uint32_t) { // } -void Teleport::replaceThing(uint32_t, std::shared_ptr<Thing>) { +void Teleport::replaceThing(uint32_t, const std::shared_ptr<Thing> &) { // } -void Teleport::removeThing(std::shared_ptr<Thing>, uint32_t) { +void Teleport::removeThing(const std::shared_ptr<Thing> &, uint32_t) { // } -void Teleport::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { +void Teleport::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { getParent()->postAddNotification(thing, oldParent, index, LINK_PARENT); } -void Teleport::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { +void Teleport::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { getParent()->postRemoveNotification(thing, newParent, index, LINK_PARENT); } diff --git a/src/game/movement/teleport.hpp b/src/game/movement/teleport.hpp index 9e26e1864..893cca261 100644 --- a/src/game/movement/teleport.hpp +++ b/src/game/movement/teleport.hpp @@ -9,7 +9,10 @@ #pragma once -#include "items/tile.hpp" +#include "items/cylinder.hpp" +#include "items/item.hpp" + +class Tile; class Teleport final : public Item, public Cylinder { public: @@ -20,7 +23,7 @@ class Teleport final : public Item, public Cylinder { return static_self_cast<Teleport>(); } - std::shared_ptr<Cylinder> getCylinder() override final { + std::shared_ptr<Cylinder> getCylinder() override { return getTeleport(); } @@ -32,27 +35,27 @@ class Teleport final : public Item, public Cylinder { return destPos; } void setDestPos(Position pos) { - destPos = std::move(pos); + destPos = pos; } - bool checkInfinityLoop(std::shared_ptr<Tile> destTile); + bool checkInfinityLoop(const std::shared_ptr<Tile> &destTile); // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; - void addThing(std::shared_ptr<Thing> thing) override; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; + void addThing(const std::shared_ptr<Thing> &thing) override; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) override; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; private: Position destPos; diff --git a/src/game/scheduling/dispatcher.cpp b/src/game/scheduling/dispatcher.cpp index dbbfc020b..e716e9867 100644 --- a/src/game/scheduling/dispatcher.cpp +++ b/src/game/scheduling/dispatcher.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "game/scheduling/dispatcher.hpp" + #include "lib/thread/thread_pool.hpp" #include "lib/di/container.hpp" #include "utils/tools.hpp" @@ -40,8 +39,13 @@ void Dispatcher::init() { }); } -void Dispatcher::executeSerialEvents(std::vector<Task> &tasks) { - dispacherContext.group = TaskGroup::Serial; +void Dispatcher::executeSerialEvents(const uint8_t groupId) { + auto &tasks = m_tasks[groupId]; + if (tasks.empty()) { + return; + } + + dispacherContext.group = static_cast<TaskGroup>(groupId); dispacherContext.type = DispatcherType::Event; for (const auto &task : tasks) { @@ -55,7 +59,12 @@ void Dispatcher::executeSerialEvents(std::vector<Task> &tasks) { dispacherContext.reset(); } -void Dispatcher::executeParallelEvents(std::vector<Task> &tasks, const uint8_t groupId) { +void Dispatcher::executeParallelEvents(const uint8_t groupId) { + auto &tasks = m_tasks[groupId]; + if (tasks.empty()) { + return; + } + asyncWait(tasks.size(), [groupId, &tasks](size_t i) { dispacherContext.type = DispatcherType::AsyncEvent; dispacherContext.group = static_cast<TaskGroup>(groupId); @@ -105,16 +114,14 @@ void Dispatcher::asyncWait(size_t requestSize, std::function<void(size_t i)> &&f void Dispatcher::executeEvents(const TaskGroup startGroup) { for (uint_fast8_t groupId = static_cast<uint8_t>(startGroup); groupId < static_cast<uint8_t>(TaskGroup::Last); ++groupId) { - auto &tasks = m_tasks[groupId]; - if (tasks.empty()) { - return; - } + const auto isWalk = groupId == static_cast<uint8_t>(TaskGroup::Walk); - if (groupId == static_cast<uint8_t>(TaskGroup::Serial)) { - executeSerialEvents(tasks); + if (groupId == static_cast<uint8_t>(TaskGroup::Serial) || isWalk) { + mergeEvents(); + executeSerialEvents(groupId); mergeAsyncEvents(); } else { - executeParallelEvents(tasks, groupId); + executeParallelEvents(groupId); } } } @@ -153,39 +160,40 @@ void Dispatcher::executeScheduledEvents() { executeEvents(TaskGroup::GenericParallel); // execute async events requested by scheduled events } -// Merge only async thread events with main dispatch events -void Dispatcher::mergeAsyncEvents() { - constexpr uint8_t start = static_cast<uint8_t>(TaskGroup::GenericParallel); - constexpr uint8_t end = static_cast<uint8_t>(TaskGroup::Last); - +void Dispatcher::__mergeEvents(const std::array<uint8_t, 2> &groups, const bool mergeScheduledEvents) { for (const auto &thread : threads) { std::scoped_lock lock(thread->mutex); - for (uint_fast8_t i = start; i < end; ++i) { - if (!thread->tasks[i].empty()) { - m_tasks[i].insert(m_tasks[i].end(), make_move_iterator(thread->tasks[i].begin()), make_move_iterator(thread->tasks[i].end())); - thread->tasks[i].clear(); - } - } - } -} + for (const auto group : groups) { + auto &threadTasks = thread->tasks[group]; + auto &tasks = m_tasks[group]; -// Merge thread events with main dispatch events -void Dispatcher::mergeEvents() { - constexpr uint8_t serial = static_cast<uint8_t>(TaskGroup::Serial); + if (threadTasks.size() > tasks.size()) { + tasks.swap(threadTasks); + } - for (const auto &thread : threads) { - std::scoped_lock lock(thread->mutex); - if (!thread->tasks[serial].empty()) { - m_tasks[serial].insert(m_tasks[serial].end(), make_move_iterator(thread->tasks[serial].begin()), make_move_iterator(thread->tasks[serial].end())); - thread->tasks[serial].clear(); + if (!threadTasks.empty()) { + tasks.insert(tasks.end(), make_move_iterator(threadTasks.begin()), make_move_iterator(threadTasks.end())); + threadTasks.clear(); + } } - if (!thread->scheduledTasks.empty()) { + if (mergeScheduledEvents && !thread->scheduledTasks.empty()) { scheduledTasks.insert(make_move_iterator(thread->scheduledTasks.begin()), make_move_iterator(thread->scheduledTasks.end())); thread->scheduledTasks.clear(); } } +} + +// Merge only async thread events with main dispatch events +void Dispatcher::mergeAsyncEvents() { + static constexpr auto groups = std::to_array({ static_cast<uint8_t>(TaskGroup::WalkParallel), static_cast<uint8_t>(TaskGroup::GenericParallel) }); + __mergeEvents(groups, false); +} +// Merge thread events with main dispatch events +void Dispatcher::mergeEvents() { + static constexpr auto groups = std::to_array({ static_cast<uint8_t>(TaskGroup::Walk), static_cast<uint8_t>(TaskGroup::Serial) }); + __mergeEvents(groups, true); checkPendingTasks(); } @@ -209,6 +217,13 @@ void Dispatcher::addEvent(std::function<void(void)> &&f, std::string_view contex notify(); } +void Dispatcher::addWalkEvent(std::function<void(void)> &&f, uint32_t expiresAfterMs) { + const auto &thread = getThreadTask(); + std::scoped_lock lock(thread->mutex); + thread->tasks[static_cast<uint8_t>(TaskGroup::Walk)].emplace_back(expiresAfterMs, std::move(f), this->context().taskName); + notify(); +} + uint64_t Dispatcher::scheduleEvent(const std::shared_ptr<Task> &task) { const auto &thread = getThreadTask(); std::scoped_lock lock(thread->mutex); @@ -229,25 +244,29 @@ void Dispatcher::asyncEvent(std::function<void(void)> &&f, TaskGroup group) { } void Dispatcher::stopEvent(uint64_t eventId) { - const auto &it = scheduledTasksRef.find(eventId); + auto it = scheduledTasksRef.find(eventId); if (it != scheduledTasksRef.end()) { it->second->cancel(); scheduledTasksRef.erase(it); } } -void DispatcherContext::addEvent(std::function<void(void)> &&f) const { - g_dispatcher().addEvent(std::move(f), taskName); +void DispatcherContext::addEvent(std::function<void(void)> &&f, std::string_view context) const { + g_dispatcher().addEvent(std::move(f), context); } -void DispatcherContext::tryAddEvent(std::function<void(void)> &&f) const { +void DispatcherContext::tryAddEvent(std::function<void(void)> &&f, std::string_view context) const { if (!f) { return; } if (isAsync()) { - g_dispatcher().addEvent(std::move(f), taskName); + g_dispatcher().addEvent(std::move(f), context); } else { f(); } } + +bool DispatcherContext::isOn() { + return OTSYS_TIME() != 0; +} diff --git a/src/game/scheduling/dispatcher.hpp b/src/game/scheduling/dispatcher.hpp index 94b284c93..5e84d5d5f 100644 --- a/src/game/scheduling/dispatcher.hpp +++ b/src/game/scheduling/dispatcher.hpp @@ -17,6 +17,8 @@ static constexpr uint16_t SCHEDULER_MINTICKS = 50; enum class TaskGroup : int8_t { ThreadPool = -1, + Walk, + WalkParallel, Serial, GenericParallel, Last @@ -31,16 +33,14 @@ enum class DispatcherType : uint8_t { }; struct DispatcherContext { - bool isOn() const { - return OTSYS_TIME() != 0; - } + static bool isOn(); bool isGroup(const TaskGroup _group) const { return group == _group; } bool isAsync() const { - return group != TaskGroup::Serial; + return type == DispatcherType::AsyncEvent; } auto getGroup() const { @@ -56,10 +56,10 @@ struct DispatcherContext { } // postpone the event - void addEvent(std::function<void(void)> &&f) const; + void addEvent(std::function<void(void)> &&f, std::string_view context) const; // if the context is async, the event will be postponed, if not, it will be executed immediately. - void tryAddEvent(std::function<void(void)> &&f) const; + void tryAddEvent(std::function<void(void)> &&f, std::string_view context) const; private: void reset() { @@ -70,7 +70,7 @@ struct DispatcherContext { DispatcherType type = DispatcherType::None; TaskGroup group = TaskGroup::ThreadPool; - std::string_view taskName = ""; + std::string_view taskName; friend class Dispatcher; }; @@ -88,7 +88,9 @@ class Dispatcher { for (uint_fast16_t i = 0; i < threads.capacity(); ++i) { threads.emplace_back(std::make_unique<ThreadTask>()); } - }; + + scheduledTasksRef.reserve(2000); + } // Ensures that we don't accidentally copy it Dispatcher(const Dispatcher &) = delete; @@ -97,6 +99,7 @@ class Dispatcher { static Dispatcher &getInstance(); void addEvent(std::function<void(void)> &&f, std::string_view context, uint32_t expiresAfterMs = 0); + void addWalkEvent(std::function<void(void)> &&f, uint32_t expiresAfterMs = 0); // No need context name uint64_t cycleEvent(uint32_t delay, std::function<void(void)> &&f, std::string_view context) { return scheduleEvent(delay, std::move(f), context, true); @@ -150,11 +153,13 @@ class Dispatcher { inline void mergeAsyncEvents(); inline void mergeEvents(); - inline void executeEvents(const TaskGroup startGroup = TaskGroup::Serial); + inline void __mergeEvents(const std::array<uint8_t, 2> &groups, const bool mergeScheduledEvents); + + inline void executeEvents(const TaskGroup startGroup = TaskGroup::Walk); inline void executeScheduledEvents(); - inline void executeSerialEvents(std::vector<Task> &tasks); - inline void executeParallelEvents(std::vector<Task> &tasks, const uint8_t groupId); + inline void executeSerialEvents(const uint8_t groupId); + inline void executeParallelEvents(const uint8_t groupId); inline std::chrono::milliseconds timeUntilNextScheduledTask() const; inline void checkPendingTasks() { @@ -210,12 +215,13 @@ class Dispatcher { std::vector<std::shared_ptr<Task>> scheduledTasks; std::mutex mutex; }; + std::vector<std::unique_ptr<ThreadTask>> threads; // Main Events std::array<std::vector<Task>, static_cast<uint8_t>(TaskGroup::Last)> m_tasks; - phmap::btree_multiset<std::shared_ptr<Task>, Task::Compare> scheduledTasks; - phmap::parallel_flat_hash_map_m<uint64_t, std::shared_ptr<Task>> scheduledTasksRef; + phmap::btree_multiset<std::shared_ptr<Task>, Task::Compare> scheduledTasks {}; + phmap::parallel_flat_hash_map_m<uint64_t, std::shared_ptr<Task>> scheduledTasksRef {}; bool asyncWaitDisabled = false; diff --git a/src/game/scheduling/events_scheduler.cpp b/src/game/scheduling/events_scheduler.cpp index a86254fa3..4a9bb0173 100644 --- a/src/game/scheduling/events_scheduler.cpp +++ b/src/game/scheduling/events_scheduler.cpp @@ -7,15 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "game/scheduling/events_scheduler.hpp" #include "config/configmanager.hpp" -#include "game/scheduling/events_scheduler.hpp" #include "lua/scripts/scripts.hpp" bool EventsScheduler::loadScheduleEventFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/XML/events.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/XML/events.xml"; if (!doc.load_file(folder.c_str())) { printXMLError(__FUNCTION__, folder, doc.load_file(folder.c_str())); consoleHandlerExit(); diff --git a/src/game/scheduling/events_scheduler.hpp b/src/game/scheduling/events_scheduler.hpp index 6c8233d8b..fe56aeb9a 100644 --- a/src/game/scheduling/events_scheduler.hpp +++ b/src/game/scheduling/events_scheduler.hpp @@ -87,7 +87,7 @@ class EventsScheduler { std::vector<EventScheduler> eventScheduler; - std::string join(const std::vector<std::string> &vec, const std::string &delim); + static std::string join(const std::vector<std::string> &vec, const std::string &delim); }; constexpr auto g_eventsScheduler = EventsScheduler::getInstance; diff --git a/src/game/scheduling/save_manager.cpp b/src/game/scheduling/save_manager.cpp index fbad52859..9cccc4052 100644 --- a/src/game/scheduling/save_manager.cpp +++ b/src/game/scheduling/save_manager.cpp @@ -1,8 +1,21 @@ -#include "pch.hpp" +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 "game/game.hpp" #include "game/scheduling/save_manager.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/grouping/guild.hpp" +#include "game/game.hpp" +#include "io/ioguild.hpp" #include "io/iologindata.hpp" +#include "kv/kv.hpp" +#include "lib/di/container.hpp" SaveManager::SaveManager(ThreadPool &threadPool, KVStore &kvStore, Logger &logger, Game &game) : threadPool(threadPool), kv(kvStore), logger(logger), game(game) { } @@ -36,7 +49,7 @@ void SaveManager::scheduleAll() { m_scheduledAt = scheduledAt; // Disable save async if the config is set to false - if (!g_configManager().getBoolean(TOGGLE_SAVE_ASYNC, __FUNCTION__)) { + if (!g_configManager().getBoolean(TOGGLE_SAVE_ASYNC)) { saveAll(); return; } @@ -58,7 +71,7 @@ void SaveManager::schedulePlayer(std::weak_ptr<Player> playerPtr) { } // Disable save async if the config is set to false - if (!g_configManager().getBoolean(TOGGLE_SAVE_ASYNC, __FUNCTION__)) { + if (!g_configManager().getBoolean(TOGGLE_SAVE_ASYNC)) { if (g_game().getGameState() == GAME_STATE_NORMAL) { logger.debug("Saving player {}.", playerToSave->getName()); } diff --git a/src/game/scheduling/save_manager.hpp b/src/game/scheduling/save_manager.hpp index 745231c00..4bd66a796 100644 --- a/src/game/scheduling/save_manager.hpp +++ b/src/game/scheduling/save_manager.hpp @@ -10,7 +10,12 @@ #pragma once #include "lib/thread/thread_pool.hpp" -#include "kv/kv.hpp" + +class KVStore; +class Logger; +class Game; +class Player; +class Guild; class SaveManager { public: diff --git a/src/game/scheduling/task.cpp b/src/game/scheduling/task.cpp index 96355968b..b3a79f7ab 100644 --- a/src/game/scheduling/task.cpp +++ b/src/game/scheduling/task.cpp @@ -7,35 +7,40 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "game/scheduling/task.hpp" -#include "task.hpp" - -#include "lib/logging/log_with_spd_log.hpp" #include "lib/metrics/metrics.hpp" +#include "utils/tools.hpp" + std::atomic_uint_fast64_t Task::LAST_EVENT_ID = 0; -Task::Task(uint32_t expiresAfterMs, std::function<void(void)> &&f, std::string_view context) : - func(std::move(f)), context(context), utime(OTSYS_TIME()), expiration(expiresAfterMs > 0 ? OTSYS_TIME() + expiresAfterMs : 0) { +Task::Task(uint32_t expiresAfterMs, std::function<void(void)> &&f, std::string_view context, const std::source_location &location) : + func(std::move(f)), context(context), functionName(location.function_name()), utime(OTSYS_TIME()), + expiration(expiresAfterMs > 0 ? OTSYS_TIME() + expiresAfterMs : 0) { if (this->context.empty()) { - g_logger().error("[{}]: task context cannot be empty!", __FUNCTION__); + g_logger().error("[{}]: task context cannot be empty! Function: {}", __FUNCTION__, functionName); return; } assert(!this->context.empty() && "Context cannot be empty!"); } -Task::Task(std::function<void(void)> &&f, std::string_view context, uint32_t delay, bool cycle /* = false*/, bool log /*= true*/) : - func(std::move(f)), context(context), utime(OTSYS_TIME() + delay), delay(delay), cycle(cycle), log(log) { +Task::Task(std::function<void(void)> &&f, std::string_view context, uint32_t delay, bool cycle /* = false*/, bool log /*= true*/, const std::source_location &location) : + func(std::move(f)), context(context), functionName(location.function_name()), utime(OTSYS_TIME() + delay), delay(delay), + cycle(cycle), log(log) { if (this->context.empty()) { - g_logger().error("[{}]: task context cannot be empty!", __FUNCTION__); + g_logger().error("[{}]: task context cannot be empty! Function: {}", __FUNCTION__, functionName); return; } assert(!this->context.empty() && "Context cannot be empty!"); } +[[nodiscard]] bool Task::hasExpired() const { + return expiration != 0 && expiration < OTSYS_TIME(); +} + bool Task::execute() const { metrics::task_latency measure(context); if (isCanceled()) { @@ -43,19 +48,22 @@ bool Task::execute() const { } if (hasExpired()) { - g_logger().info("The task '{}' has expired, it has not been executed in {}.", getContext(), expiration - utime); + g_logger().info("The task '{}' has expired, it has not been executed in {}. Function: {}", getContext(), expiration - utime, functionName); return false; } if (log) { if (hasTraceableContext()) { - g_logger().trace("Executing task {}.", getContext()); + g_logger().trace("Executing task {}. Function: {}", getContext(), functionName); } else { - g_logger().debug("Executing task {}.", getContext()); + g_logger().debug("Executing task {}. Function: {}", getContext(), functionName); } } func(); - return true; } + +void Task::updateTime() { + utime = OTSYS_TIME() + delay; +} diff --git a/src/game/scheduling/task.hpp b/src/game/scheduling/task.hpp index 9c561b413..948bdea02 100644 --- a/src/game/scheduling/task.hpp +++ b/src/game/scheduling/task.hpp @@ -8,14 +8,14 @@ */ #pragma once -#include "utils/tools.hpp" -#include <unordered_set> + +class Dispatcher; class Task { public: - Task(uint32_t expiresAfterMs, std::function<void(void)> &&f, std::string_view context); + Task(uint32_t expiresAfterMs, std::function<void(void)> &&f, std::string_view context, const std::source_location &location = std::source_location::current()); - Task(std::function<void(void)> &&f, std::string_view context, uint32_t delay, bool cycle = false, bool log = true); + Task(std::function<void(void)> &&f, std::string_view context, uint32_t delay, bool cycle = false, bool log = true, const std::source_location &location = std::source_location::current()); ~Task() = default; @@ -24,34 +24,34 @@ class Task { if (++LAST_EVENT_ID == 0) { LAST_EVENT_ID = 1; } - id = LAST_EVENT_ID; } - return id; } - uint32_t getDelay() const { + [[nodiscard]] uint32_t getDelay() const { return delay; } - std::string_view getContext() const { + [[nodiscard]] std::string_view getContext() const { return context; } - auto getTime() const { - return utime; + [[nodiscard]] std::string_view getFunctionName() const { + return functionName; } - bool hasExpired() const { - return expiration != 0 && expiration < OTSYS_TIME(); + [[nodiscard]] auto getTime() const { + return utime; } - bool isCycle() const { + [[nodiscard]] bool hasExpired() const; + + [[nodiscard]] bool isCycle() const { return cycle; } - bool isCanceled() const { + [[nodiscard]] bool isCanceled() const { return func == nullptr; } @@ -64,54 +64,54 @@ class Task { private: static std::atomic_uint_fast64_t LAST_EVENT_ID; - void updateTime() { - utime = OTSYS_TIME() + delay; - } + void updateTime(); bool hasTraceableContext() const { - const static auto tasksContext = std::unordered_set<std::string_view>({ "Decay::checkDecay", - "Dispatcher::asyncEvent", - "Game::checkCreatureAttack", - "Game::checkCreatureWalk", - "Game::checkCreatures", - "Game::checkImbuements", - "Game::checkLight", - "Game::createFiendishMonsters", - "Game::createInfluencedMonsters", - "Game::updateCreatureWalk", - "Game::updateForgeableMonsters", - "GlobalEvents::think", - "LuaEnvironment::executeTimerEvent", - "Modules::executeOnRecvbyte", - "OutputMessagePool::sendAll", - "ProtocolGame::addGameTask", - "ProtocolGame::parsePacketFromDispatcher", - "Raids::checkRaids", - "SpawnMonster::checkSpawnMonster", - "SpawnMonster::scheduleSpawn", - "SpawnMonster::startup", - "SpawnNpc::checkSpawnNpc", - "Webhook::run", - "Protocol::sendRecvMessageCallback" }); + const static std::unordered_set<std::string_view> tasksContext = { + "Decay::checkDecay", + "Dispatcher::asyncEvent", + "Game::checkCreatureAttack", + "Game::checkCreatureWalk", + "Game::checkCreatures", + "Game::checkImbuements", + "Game::checkLight", + "Game::createFiendishMonsters", + "Game::createInfluencedMonsters", + "Game::updateCreatureWalk", + "Game::updateForgeableMonsters", + "GlobalEvents::think", + "LuaEnvironment::executeTimerEvent", + "Modules::executeOnRecvbyte", + "OutputMessagePool::sendAll", + "ProtocolGame::addGameTask", + "ProtocolGame::parsePacketFromDispatcher", + "Raids::checkRaids", + "SpawnMonster::checkSpawnMonster", + "SpawnMonster::scheduleSpawn", + "SpawnMonster::startup", + "SpawnNpc::checkSpawnNpc", + "Webhook::run", + "Protocol::sendRecvMessageCallback", + "Player::addInFightTicks" + }; return tasksContext.contains(context); } struct Compare { bool operator()(const std::shared_ptr<Task> &a, const std::shared_ptr<Task> &b) const { - return a->utime < b->utime; + return a->getTime() < b->getTime(); } }; - std::function<void(void)> func = nullptr; + std::function<void(void)> func; std::string context; + std::string functionName; int64_t utime = 0; int64_t expiration = 0; - uint64_t id = 0; uint32_t delay = 0; - bool cycle = false; bool log = true; diff --git a/src/game/zones/zone.cpp b/src/game/zones/zone.cpp index b6c1191aa..6f9f36886 100644 --- a/src/game/zones/zone.cpp +++ b/src/game/zones/zone.cpp @@ -7,14 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "game/zones/zone.hpp" -#include "zone.hpp" #include "game/game.hpp" #include "creatures/monsters/monster.hpp" #include "creatures/npcs/npc.hpp" #include "creatures/players/player.hpp" #include "utils/pugicast.hpp" +#include "kv/kv.hpp" phmap::parallel_flat_hash_map<std::string, std::shared_ptr<Zone>> Zone::zones = {}; phmap::parallel_flat_hash_map<uint32_t, std::shared_ptr<Zone>> Zone::zonesByID = {}; @@ -122,6 +122,10 @@ std::vector<std::shared_ptr<Item>> Zone::getItems() { void Zone::removePlayers() { for (const auto &player : getPlayers()) { g_game().internalTeleport(player, getRemoveDestination(player)); + // Remove icon from player (soul war quest) + if (player->hasIcon("goshnars-hatred-damage")) { + player->removeIcon("goshnars-hatred-damage"); + } } } @@ -250,11 +254,11 @@ void Zone::refresh() { void Zone::setMonsterVariant(const std::string &variant) { monsterVariant = variant; g_logger().debug("Zone {} monster variant set to {}", name, variant); - for (auto &spawnMonster : g_game().map.spawnsMonster.getspawnMonsterList()) { - if (!contains(spawnMonster.getCenterPos())) { + for (const auto &spawnMonster : g_game().map.spawnsMonster.getspawnMonsterList()) { + if (!contains(spawnMonster->getCenterPos())) { continue; } - spawnMonster.setMonsterVariant(variant); + spawnMonster->setMonsterVariant(variant); } removeMonsters(); diff --git a/src/game/zones/zone.hpp b/src/game/zones/zone.hpp index 82969a257..a3af961bd 100644 --- a/src/game/zones/zone.hpp +++ b/src/game/zones/zone.hpp @@ -143,8 +143,8 @@ namespace weak { class Zone { public: - explicit Zone(const std::string &name, uint32_t id = 0) : - name(name), id(id) { } + explicit Zone(std::string name, uint32_t id = 0) : + name(std::move(name)), id(id) { } explicit Zone(uint32_t id) : id(id) { } @@ -199,7 +199,7 @@ class Zone { static std::shared_ptr<Zone> addZone(const std::string &name, uint32_t id = 0); static std::shared_ptr<Zone> getZone(const std::string &name); static std::shared_ptr<Zone> getZone(uint32_t id); - static std::vector<std::shared_ptr<Zone>> getZones(const Position position); + static std::vector<std::shared_ptr<Zone>> getZones(Position position); static std::vector<std::shared_ptr<Zone>> getZones(); static void refreshAll() { for (const auto &[_, zone] : zones) { diff --git a/src/io/fileloader.cpp b/src/io/fileloader.cpp index 38bf2be19..c62901f5c 100644 --- a/src/io/fileloader.cpp +++ b/src/io/fileloader.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/fileloader.hpp" namespace OTB { @@ -22,7 +20,9 @@ namespace OTB { } Identifier fileIdentifier; - std::copy(fileContents.begin(), fileContents.begin() + fileIdentifier.size(), fileIdentifier.begin()); + + std::ranges::copy(fileContents | std::views::take(fileIdentifier.size()), fileIdentifier.begin()); + if (fileIdentifier != acceptedIdentifier && fileIdentifier != wildcard) { throw InvalidOTBFormat {}; } diff --git a/src/io/fileloader.hpp b/src/io/fileloader.hpp index 206948720..863837464 100644 --- a/src/io/fileloader.hpp +++ b/src/io/fileloader.hpp @@ -22,9 +22,9 @@ namespace OTB { Node &operator=(const Node &) = delete; std::list<Node> children; - mio::mmap_source::const_iterator propsBegin; - mio::mmap_source::const_iterator propsEnd; - uint8_t type; + mio::mmap_source::const_iterator propsBegin {}; + mio::mmap_source::const_iterator propsEnd {}; + uint8_t type {}; enum NodeChar : uint8_t { ESCAPE = 0xFD, START = 0xFE, @@ -67,12 +67,22 @@ class PropStream { template <typename T> bool read(T &ret) { + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); + if (size() < sizeof(T)) { return false; } - memcpy(&ret, p, sizeof(T)); + std::span<const char> charSpan { p, sizeof(T) }; + auto byteSpan = std::as_bytes(charSpan); + + std::array<std::byte, sizeof(T)> tempBuffer; + std::ranges::copy(byteSpan, tempBuffer.begin()); + + ret = std::bit_cast<T>(tempBuffer); + p += sizeof(T); + return true; } @@ -86,12 +96,14 @@ class PropStream { return false; } - char* str = new char[strLen + 1]; - memcpy(str, p, strLen); - str[strLen] = 0; - ret.assign(str, strLen); - delete[] str; + std::vector<char> tempBuffer(strLen); + std::span<const char> sourceSpan(p, strLen); + std::ranges::copy(sourceSpan, tempBuffer.begin()); + + ret.assign(tempBuffer.begin(), tempBuffer.end()); + p += strLen; + return true; } @@ -128,8 +140,11 @@ class PropWriteStream { template <typename T> void write(T add) { - char* addr = reinterpret_cast<char*>(&add); - std::copy(addr, addr + sizeof(T), std::back_inserter(buffer)); + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); + + auto byteArray = std::bit_cast<std::array<char, sizeof(T)>>(add); + std::span<const char> charSpan(byteArray); + std::ranges::copy(charSpan, std::back_inserter(buffer)); } void writeString(const std::string &str) { @@ -140,7 +155,7 @@ class PropWriteStream { } write(static_cast<uint16_t>(strLength)); - std::copy(str.begin(), str.end(), std::back_inserter(buffer)); + std::ranges::copy(str, std::back_inserter(buffer)); } private: diff --git a/src/io/filestream.cpp b/src/io/filestream.cpp index fc8ae6116..687c2501d 100644 --- a/src/io/filestream.cpp +++ b/src/io/filestream.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/filestream.hpp" #include "io/fileloader.hpp" @@ -19,7 +17,8 @@ uint32_t FileStream::tell() const { void FileStream::seek(uint32_t pos) { if (pos > m_data.size()) { - throw std::ios_base::failure("Seek failed"); + g_logger().error("Seek failed"); + return; } m_pos = pos; } @@ -31,7 +30,8 @@ void FileStream::skip(uint32_t len) { uint32_t FileStream::size() const { std::size_t size = m_data.size(); if (size > std::numeric_limits<uint32_t>::max()) { - throw std::overflow_error("File size exceeds uint32_t range"); + g_logger().error("File size exceeds uint32_t range"); + return {}; } return static_cast<uint32_t>(size); @@ -39,27 +39,31 @@ uint32_t FileStream::size() const { template <typename T> bool FileStream::read(T &ret, bool escape) { + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); + const auto size = sizeof(T); if (m_pos + size > m_data.size()) { - throw std::ios_base::failure("Read failed"); + g_logger().error("Read failed"); + return false; } std::array<uint8_t, sizeof(T)> array; if (escape) { - for (int_fast8_t i = -1; ++i < size;) { + for (int_fast8_t i = 0; i < size; ++i) { if (m_data[m_pos] == OTB::Node::ESCAPE) { ++m_pos; } array[i] = m_data[m_pos]; ++m_pos; } - memcpy(&ret, array.data(), size); } else { - memcpy(&ret, &m_data[m_pos], size); + std::span<const uint8_t> sourceSpan(m_data.data() + m_pos, size); + std::ranges::copy(sourceSpan, array.begin()); m_pos += size; } + ret = std::bit_cast<T>(array); return true; } @@ -67,7 +71,8 @@ uint8_t FileStream::getU8() { uint8_t v = 0; if (m_pos + 1 > m_data.size()) { - throw std::ios_base::failure("Failed to getU8"); + g_logger().error("Failed to getU8"); + return {}; } // Fast Escape Val @@ -103,13 +108,14 @@ std::string FileStream::getString() { std::string str; if (const uint16_t len = getU16(); len > 0 && len < 8192) { if (m_pos + len > m_data.size()) { - throw std::ios_base::failure("[FileStream::getString] - Read failed"); + g_logger().error("[FileStream::getString] - Read failed"); + return {}; } str = { (char*)&m_data[m_pos], len }; m_pos += len; } else if (len != 0) { - throw std::ios_base::failure("[FileStream::getString] - Read failed because string is too big"); + g_logger().error("[FileStream::getString] - Read failed because string is too big"); } return str; } diff --git a/src/io/functions/iologindata_load_player.cpp b/src/io/functions/iologindata_load_player.cpp index 764d46414..477572dfb 100644 --- a/src/io/functions/iologindata_load_player.cpp +++ b/src/io/functions/iologindata_load_player.cpp @@ -7,31 +7,44 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "io/functions/iologindata_load_player.hpp" -#include "creatures/players/wheel/player_wheel.hpp" +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/monsters/monsters.hpp" #include "creatures/players/achievement/player_achievement.hpp" -#include "io/functions/iologindata_load_player.hpp" -#include "game/game.hpp" -#include "enums/object_category.hpp" +#include "creatures/players/cyclopedia/player_badge.hpp" +#include "creatures/players/cyclopedia/player_cyclopedia.hpp" +#include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/players/vip/player_vip.hpp" +#include "creatures/players/vocations/vocation.hpp" +#include "creatures/players/wheel/player_wheel.hpp" #include "enums/account_coins.hpp" #include "enums/account_errors.hpp" +#include "enums/object_category.hpp" +#include "game/game.hpp" +#include "io/ioguild.hpp" +#include "io/ioprey.hpp" +#include "items/containers/depot/depotchest.hpp" +#include "items/containers/inbox/inbox.hpp" +#include "items/containers/rewards/reward.hpp" +#include "items/containers/rewards/rewardchest.hpp" #include "utils/tools.hpp" -void IOLoginDataLoad::loadItems(ItemsMap &itemsMap, DBResult_ptr result, const std::shared_ptr<Player> &player) { +void IOLoginDataLoad::loadItems(ItemsMap &itemsMap, const DBResult_ptr &result, const std::shared_ptr<Player> &player) { try { do { - uint32_t sid = result->getNumber<uint32_t>("sid"); - uint32_t pid = result->getNumber<uint32_t>("pid"); - uint16_t type = result->getNumber<uint16_t>("itemtype"); - uint16_t count = result->getNumber<uint16_t>("count"); + auto sid = result->getNumber<uint32_t>("sid"); + auto pid = result->getNumber<uint32_t>("pid"); + auto type = result->getNumber<uint16_t>("itemtype"); + auto count = result->getNumber<uint16_t>("count"); unsigned long attrSize; const char* attr = result->getStream("attributes", attrSize); PropStream propStream; propStream.init(attr, attrSize); try { - std::shared_ptr<Item> item = Item::CreateItem(type, count); + const auto &item = Item::CreateItem(type, count); if (item) { if (!item->unserializeAttr(propStream)) { g_logger().warn("[{}] - Failed to deserialize item attributes {}, from player {}, from account id {}", __FUNCTION__, item->getID(), player->getName(), player->getAccountId()); @@ -51,7 +64,7 @@ void IOLoginDataLoad::loadItems(ItemsMap &itemsMap, DBResult_ptr result, const s } } -bool IOLoginDataLoad::preLoadPlayer(std::shared_ptr<Player> player, const std::string &name) { +bool IOLoginDataLoad::preLoadPlayer(const std::shared_ptr<Player> &player, const std::string &name) { Database &db = Database::getInstance(); std::ostringstream query; @@ -79,16 +92,16 @@ bool IOLoginDataLoad::preLoadPlayer(std::shared_ptr<Player> player, const std::s return false; } - auto [coins, error] = player->account->getCoins(enumToValue(CoinType::Normal)); - if (error != enumToValue(AccountErrors_t::Ok)) { + auto [coins, error] = player->account->getCoins(CoinType::Normal); + if (error != AccountErrors_t::Ok) { g_logger().error("Failed to get coins for player {}, error {}", player->name, static_cast<uint8_t>(error)); return false; } player->coinBalance = coins; - auto [transferableCoins, errorT] = player->account->getCoins(enumToValue(CoinType::Transferable)); - if (errorT != enumToValue(AccountErrors_t::Ok)) { + auto [transferableCoins, errorT] = player->account->getCoins(CoinType::Transferable); + if (errorT != AccountErrors_t::Ok) { g_logger().error("Failed to get transferable coins for player {}, error {}", player->name, static_cast<uint8_t>(errorT)); return false; } @@ -98,16 +111,16 @@ bool IOLoginDataLoad::preLoadPlayer(std::shared_ptr<Player> player, const std::s uint32_t premiumDays = player->getAccount()->getPremiumRemainingDays(); uint32_t premiumDaysPurchased = player->getAccount()->getPremiumDaysPurchased(); - player->loyaltyPoints = player->getAccount()->getAccountAgeInDays() * g_configManager().getNumber(LOYALTY_POINTS_PER_CREATION_DAY, __FUNCTION__) - + (premiumDaysPurchased - premiumDays) * g_configManager().getNumber(LOYALTY_POINTS_PER_PREMIUM_DAY_SPENT, __FUNCTION__) - + premiumDaysPurchased * g_configManager().getNumber(LOYALTY_POINTS_PER_PREMIUM_DAY_PURCHASED, __FUNCTION__); + player->loyaltyPoints = player->getAccount()->getAccountAgeInDays() * g_configManager().getNumber(LOYALTY_POINTS_PER_CREATION_DAY) + + (premiumDaysPurchased - premiumDays) * g_configManager().getNumber(LOYALTY_POINTS_PER_PREMIUM_DAY_SPENT) + + premiumDaysPurchased * g_configManager().getNumber(LOYALTY_POINTS_PER_PREMIUM_DAY_PURCHASED); return true; } -bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr<Player> player, DBResult_ptr result) { +bool IOLoginDataLoad::loadPlayerBasicInfo(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return false; } @@ -141,7 +154,7 @@ bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr<Player> player, DBResult_p player->manaMax = result->getNumber<uint32_t>("manamax"); player->magLevel = result->getNumber<uint32_t>("maglevel"); uint64_t nextManaCount = player->vocation->getReqMana(player->magLevel + 1); - uint64_t manaSpent = result->getNumber<uint64_t>("manaspent"); + auto manaSpent = result->getNumber<uint64_t>("manaspent"); if (manaSpent > nextManaCount) { manaSpent = 0; } @@ -166,10 +179,28 @@ bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr<Player> player, DBResult_p player->setOfflineTrainingSkill(skill); const auto &town = g_game().map.towns.getTown(result->getNumber<uint32_t>("town_id")); if (!town) { - g_logger().error("Player {} has town id {} which doesn't exist", player->name, result->getNumber<uint16_t>("town_id")); - return false; + g_logger().error("Player {} has invalid town id {}. Attempting to set the correct town.", player->name, result->getNumber<uint16_t>("town_id")); + + const auto &thaisTown = g_game().map.towns.getTown("Thais"); + if (thaisTown) { + player->town = thaisTown; + g_logger().warn("Assigned town 'Thais' to player {}", player->name); + } else { + for (const auto &[townId, currentTown] : g_game().map.towns.getTowns()) { + if (townId != 0 && currentTown) { + player->town = currentTown; + g_logger().warn("Assigned first valid town {} (id: {}) to player {}", currentTown->getName(), townId, player->name); + } + } + + if (!player->town) { + g_logger().error("Player {} has invalid town id {}. No valid town found to assign.", player->name, result->getNumber<uint16_t>("town_id")); + return false; + } + } + } else { + player->town = town; } - player->town = town; const Position &loginPos = player->loginPosition; if (loginPos.x == 0 && loginPos.y == 0 && loginPos.z == 0) { @@ -187,13 +218,13 @@ bool IOLoginDataLoad::loadPlayerFirst(std::shared_ptr<Player> player, DBResult_p return true; } -void IOLoginDataLoad::loadPlayerExperience(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerExperience(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - uint64_t experience = result->getNumber<uint64_t>("experience"); + auto experience = result->getNumber<uint64_t>("experience"); uint64_t currExpCount = Player::getExpForLevel(player->level); uint64_t nextExpCount = Player::getExpForLevel(player->level + 1); @@ -210,9 +241,9 @@ void IOLoginDataLoad::loadPlayerExperience(std::shared_ptr<Player> player, DBRes } } -void IOLoginDataLoad::loadPlayerBlessings(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerBlessings(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -221,9 +252,9 @@ void IOLoginDataLoad::loadPlayerBlessings(std::shared_ptr<Player> player, DBResu } } -void IOLoginDataLoad::loadPlayerConditions(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerConditions(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -241,15 +272,15 @@ void IOLoginDataLoad::loadPlayerConditions(std::shared_ptr<Player> player, DBRes } } -void IOLoginDataLoad::loadPlayerDefaultOutfit(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerDefaultOutfit(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } player->defaultOutfit.lookType = result->getNumber<uint16_t>("looktype"); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && player->defaultOutfit.lookType != 0 && !g_game().isLookTypeRegistered(player->defaultOutfit.lookType)) { - g_logger().warn("[IOLoginData::loadPlayer] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", player->defaultOutfit.lookType); + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && player->defaultOutfit.lookType != 0 && !g_game().isLookTypeRegistered(player->defaultOutfit.lookType)) { + g_logger().warn("[{}] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", __FUNCTION__, player->defaultOutfit.lookType); return; } @@ -264,17 +295,17 @@ void IOLoginDataLoad::loadPlayerDefaultOutfit(std::shared_ptr<Player> player, DB player->defaultOutfit.lookMountFeet = static_cast<uint8_t>(result->getNumber<uint16_t>("lookmountfeet")); player->defaultOutfit.lookFamiliarsType = result->getNumber<uint16_t>("lookfamiliarstype"); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && player->defaultOutfit.lookFamiliarsType != 0 && !g_game().isLookTypeRegistered(player->defaultOutfit.lookFamiliarsType)) { - g_logger().warn("[IOLoginData::loadPlayer] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", player->defaultOutfit.lookFamiliarsType); + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && player->defaultOutfit.lookFamiliarsType != 0 && !g_game().isLookTypeRegistered(player->defaultOutfit.lookFamiliarsType)) { + g_logger().warn("[{}] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", __FUNCTION__, player->defaultOutfit.lookFamiliarsType); return; } player->currentOutfit = player->defaultOutfit; } -void IOLoginDataLoad::loadPlayerSkullSystem(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerSkullSystem(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -284,7 +315,7 @@ void IOLoginDataLoad::loadPlayerSkullSystem(std::shared_ptr<Player> player, DBRe // ensure that we round up the number of ticks player->skullTicks = (skullSeconds + 2); - uint16_t skull = result->getNumber<uint16_t>("skull"); + auto skull = result->getNumber<uint16_t>("skull"); if (skull == SKULL_RED) { player->skull = SKULL_RED; } else if (skull == SKULL_BLACK) { @@ -294,17 +325,17 @@ void IOLoginDataLoad::loadPlayerSkullSystem(std::shared_ptr<Player> player, DBRe } } -void IOLoginDataLoad::loadPlayerSkill(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerSkill(const std::shared_ptr<Player> &player, const DBResult_ptr &result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } static const std::array<std::string, 13> skillNames = { "skill_fist", "skill_club", "skill_sword", "skill_axe", "skill_dist", "skill_shielding", "skill_fishing", "skill_critical_hit_chance", "skill_critical_hit_damage", "skill_life_leech_chance", "skill_life_leech_amount", "skill_mana_leech_chance", "skill_mana_leech_amount" }; static const std::array<std::string, 13> skillNameTries = { "skill_fist_tries", "skill_club_tries", "skill_sword_tries", "skill_axe_tries", "skill_dist_tries", "skill_shielding_tries", "skill_fishing_tries", "skill_critical_hit_chance_tries", "skill_critical_hit_damage_tries", "skill_life_leech_chance_tries", "skill_life_leech_amount_tries", "skill_mana_leech_chance_tries", "skill_mana_leech_amount_tries" }; for (size_t i = 0; i < skillNames.size(); ++i) { - uint16_t skillLevel = result->getNumber<uint16_t>(skillNames[i]); - uint64_t skillTries = result->getNumber<uint64_t>(skillNameTries[i]); + auto skillLevel = result->getNumber<uint16_t>(skillNames[i]); + auto skillTries = result->getNumber<uint64_t>(skillNameTries[i]); uint64_t nextSkillTries = player->vocation->getReqSkillTries(static_cast<uint8_t>(i), skillLevel + 1); if (skillTries > nextSkillTries) { skillTries = 0; @@ -316,9 +347,9 @@ void IOLoginDataLoad::loadPlayerSkill(std::shared_ptr<Player> player, DBResult_p } } -void IOLoginDataLoad::loadPlayerKills(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerKills(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -327,17 +358,17 @@ void IOLoginDataLoad::loadPlayerKills(std::shared_ptr<Player> player, DBResult_p query << "SELECT `player_id`, `time`, `target`, `unavenged` FROM `player_kills` WHERE `player_id` = " << player->getGUID(); if ((result = db.storeQuery(query.str()))) { do { - time_t killTime = result->getNumber<time_t>("time"); - if ((time(nullptr) - killTime) <= g_configManager().getNumber(FRAG_TIME, __FUNCTION__)) { + auto killTime = result->getNumber<time_t>("time"); + if ((time(nullptr) - killTime) <= g_configManager().getNumber(FRAG_TIME)) { player->unjustifiedKills.emplace_back(result->getNumber<uint32_t>("target"), killTime, result->getNumber<bool>("unavenged")); } } while (result->next()); } } -void IOLoginDataLoad::loadPlayerGuild(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerGuild(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -345,8 +376,8 @@ void IOLoginDataLoad::loadPlayerGuild(std::shared_ptr<Player> player, DBResult_p std::ostringstream query; query << "SELECT `guild_id`, `rank_id`, `nick` FROM `guild_membership` WHERE `player_id` = " << player->getGUID(); if ((result = db.storeQuery(query.str()))) { - uint32_t guildId = result->getNumber<uint32_t>("guild_id"); - uint32_t playerRankId = result->getNumber<uint32_t>("rank_id"); + auto guildId = result->getNumber<uint32_t>("guild_id"); + auto playerRankId = result->getNumber<uint32_t>("rank_id"); player->guildNick = result->getString("nick"); auto guild = g_game().getGuild(guildId); @@ -385,9 +416,9 @@ void IOLoginDataLoad::loadPlayerGuild(std::shared_ptr<Player> player, DBResult_p } } -void IOLoginDataLoad::loadPlayerStashItems(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerStashItems(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -401,9 +432,9 @@ void IOLoginDataLoad::loadPlayerStashItems(std::shared_ptr<Player> player, DBRes } } -void IOLoginDataLoad::loadPlayerBestiaryCharms(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerBestiaryCharms(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -454,9 +485,9 @@ void IOLoginDataLoad::loadPlayerBestiaryCharms(std::shared_ptr<Player> player, D } } -void IOLoginDataLoad::loadPlayerInstantSpellList(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerInstantSpellList(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } @@ -470,33 +501,31 @@ void IOLoginDataLoad::loadPlayerInstantSpellList(std::shared_ptr<Player> player, } } -void IOLoginDataLoad::loadPlayerInventoryItems(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerInventoryItems(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - bool oldProtocol = g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__) && player->getProtocolVersion() < 1200; - Database &db = Database::getInstance(); - std::ostringstream query; - query << "SELECT `pid`, `sid`, `itemtype`, `count`, `attributes` FROM `player_items` WHERE `player_id` = " << player->getGUID() << " ORDER BY `sid` DESC"; + bool oldProtocol = g_configManager().getBoolean(OLD_PROTOCOL) && player->getProtocolVersion() < 1200; + auto query = fmt::format("SELECT pid, sid, itemtype, count, attributes FROM player_items WHERE player_id = {} ORDER BY sid DESC", player->getGUID()); ItemsMap inventoryItems; std::vector<std::pair<uint8_t, std::shared_ptr<Container>>> openContainersList; + std::vector<std::shared_ptr<Item>> itemsToStartDecaying; try { - if ((result = db.storeQuery(query.str()))) { + if ((result = g_database().storeQuery(query))) { loadItems(inventoryItems, result, player); - for (ItemsMap::const_reverse_iterator it = inventoryItems.rbegin(), end = inventoryItems.rend(); it != end; ++it) { + for (auto it = inventoryItems.rbegin(), end = inventoryItems.rend(); it != end; ++it) { const std::pair<std::shared_ptr<Item>, int32_t> &pair = it->second; - std::shared_ptr<Item> item = pair.first; + const auto &item = pair.first; if (!item) { continue; } int32_t pid = pair.second; - if (pid >= CONST_SLOT_FIRST && pid <= CONST_SLOT_LAST) { player->internalAddThing(pid, item); item->startDecaying(); @@ -506,25 +535,26 @@ void IOLoginDataLoad::loadPlayerInventoryItems(std::shared_ptr<Player> player, D continue; } - std::shared_ptr<Container> container = it2->second.first->getContainer(); + const std::shared_ptr<Container> &container = it2->second.first->getContainer(); if (container) { container->internalAddThing(item); - item->startDecaying(); + // Here, the sub-containers do not yet have a parent, since the main backpack has not yet been added to the player, so we need to postpone + itemsToStartDecaying.emplace_back(item); } } - std::shared_ptr<Container> itemContainer = item->getContainer(); + const std::shared_ptr<Container> &itemContainer = item->getContainer(); if (itemContainer) { if (!oldProtocol) { auto cid = item->getAttribute<int64_t>(ItemAttribute_t::OPENCONTAINER); if (cid > 0) { - openContainersList.emplace_back(std::make_pair(cid, itemContainer)); + openContainersList.emplace_back(cid, itemContainer); } } - for (bool isLootContainer : { true, false }) { - auto checkAttribute = isLootContainer ? ItemAttribute_t::QUICKLOOTCONTAINER : ItemAttribute_t::OBTAINCONTAINER; + for (const bool isLootContainer : { true, false }) { + const auto checkAttribute = isLootContainer ? ItemAttribute_t::QUICKLOOTCONTAINER : ItemAttribute_t::OBTAINCONTAINER; if (item->hasAttribute(checkAttribute)) { - auto flags = item->getAttribute<uint32_t>(checkAttribute); + const auto flags = item->getAttribute<uint32_t>(checkAttribute); for (uint8_t category = OBJECTCATEGORY_FIRST; category <= OBJECTCATEGORY_LAST; category++) { if (hasBitSet(1 << category, flags)) { @@ -537,6 +567,11 @@ void IOLoginDataLoad::loadPlayerInventoryItems(std::shared_ptr<Player> player, D } } + // Now that all items and containers have been added and parent chain is established, start decay + for (const auto &item : itemsToStartDecaying) { + item->startDecaying(); + } + if (!oldProtocol) { std::ranges::sort(openContainersList.begin(), openContainersList.end(), [](const std::pair<uint8_t, std::shared_ptr<Container>> &left, const std::pair<uint8_t, std::shared_ptr<Container>> &right) { return left.first < right.first; @@ -547,14 +582,15 @@ void IOLoginDataLoad::loadPlayerInventoryItems(std::shared_ptr<Player> player, D player->onSendContainer(it.second); } } + } catch (const std::exception &e) { - g_logger().error("[IOLoginDataLoad::loadPlayerInventoryItems] - ExceçÃĢo durante o carregamento do inventÃĄrio: {}", e.what()); + g_logger().error("[IOLoginDataLoad::loadPlayerInventoryItems] - Exception during inventory loading: {}", e.what()); } } -void IOLoginDataLoad::loadPlayerStoreInbox(std::shared_ptr<Player> player) { +void IOLoginDataLoad::loadPlayerStoreInbox(const std::shared_ptr<Player> &player) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } @@ -563,9 +599,9 @@ void IOLoginDataLoad::loadPlayerStoreInbox(std::shared_ptr<Player> player) { } } -void IOLoginDataLoad::loadRewardItems(std::shared_ptr<Player> player) { +void IOLoginDataLoad::loadRewardItems(const std::shared_ptr<Player> &player) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } @@ -581,84 +617,100 @@ void IOLoginDataLoad::loadRewardItems(std::shared_ptr<Player> player) { } } -void IOLoginDataLoad::loadPlayerDepotItems(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerDepotItems(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - Database &db = Database::getInstance(); ItemsMap depotItems; - std::ostringstream query; - query << "SELECT `pid`, `sid`, `itemtype`, `count`, `attributes` FROM `player_depotitems` WHERE `player_id` = " << player->getGUID() << " ORDER BY `sid` DESC"; - if ((result = db.storeQuery(query.str()))) { + std::vector<std::shared_ptr<Item>> itemsToStartDecaying; + auto query = fmt::format("SELECT pid, sid, itemtype, count, attributes FROM player_depotitems WHERE player_id = {} ORDER BY sid DESC", player->getGUID()); + if ((result = g_database().storeQuery(query))) { loadItems(depotItems, result, player); - for (ItemsMap::const_reverse_iterator it = depotItems.rbegin(), end = depotItems.rend(); it != end; ++it) { + for (auto it = depotItems.rbegin(), end = depotItems.rend(); it != end; ++it) { const std::pair<std::shared_ptr<Item>, int32_t> &pair = it->second; - std::shared_ptr<Item> item = pair.first; + const auto &item = pair.first; + if (!item) { + continue; + } int32_t pid = pair.second; if (pid >= 0 && pid < 100) { - std::shared_ptr<DepotChest> depotChest = player->getDepotChest(pid, true); + const std::shared_ptr<DepotChest> &depotChest = player->getDepotChest(pid, true); if (depotChest) { depotChest->internalAddThing(item); item->startDecaying(); } } else { - ItemsMap::const_iterator it2 = depotItems.find(pid); - if (it2 == depotItems.end()) { + auto depotIt = depotItems.find(pid); + if (depotIt == depotItems.end()) { continue; } - std::shared_ptr<Container> container = it2->second.first->getContainer(); + const std::shared_ptr<Container> &container = depotIt->second.first->getContainer(); if (container) { container->internalAddThing(item); - item->startDecaying(); + // Here, the sub-containers do not yet have a parent, since the main backpack has not yet been added to the player, so we need to postpone + itemsToStartDecaying.emplace_back(item); } } } } + + // Now that all items and containers have been added and parent chain is established, start decay + for (const auto &item : itemsToStartDecaying) { + item->startDecaying(); + } } -void IOLoginDataLoad::loadPlayerInboxItems(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerInboxItems(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - Database &db = Database::getInstance(); - std::ostringstream query; - query << "SELECT `pid`, `sid`, `itemtype`, `count`, `attributes` FROM `player_inboxitems` WHERE `player_id` = " << player->getGUID() << " ORDER BY `sid` DESC"; - if ((result = db.storeQuery(query.str()))) { + std::vector<std::shared_ptr<Item>> itemsToStartDecaying; + auto query = fmt::format("SELECT pid, sid, itemtype, count, attributes FROM player_inboxitems WHERE player_id = {} ORDER BY sid DESC", player->getGUID()); + if ((result = g_database().storeQuery(query))) { ItemsMap inboxItems; loadItems(inboxItems, result, player); - for (ItemsMap::const_reverse_iterator it = inboxItems.rbegin(), end = inboxItems.rend(); it != end; ++it) { + for (auto it = inboxItems.rbegin(), end = inboxItems.rend(); it != end; ++it) { const std::pair<std::shared_ptr<Item>, int32_t> &pair = it->second; - std::shared_ptr<Item> item = pair.first; + const auto &item = pair.first; + if (!item) { + continue; + } + int32_t pid = pair.second; if (pid >= 0 && pid < 100) { player->getInbox()->internalAddThing(item); item->startDecaying(); } else { - ItemsMap::const_iterator it2 = inboxItems.find(pid); - if (it2 == inboxItems.end()) { + auto inboxIt = inboxItems.find(pid); + if (inboxIt == inboxItems.end()) { continue; } - std::shared_ptr<Container> container = it2->second.first->getContainer(); + const std::shared_ptr<Container> &container = inboxIt->second.first->getContainer(); if (container) { container->internalAddThing(item); - item->startDecaying(); + itemsToStartDecaying.emplace_back(item); } } } } + + // Now that all items and containers have been added and parent chain is established, start decay + for (const auto &item : itemsToStartDecaying) { + item->startDecaying(); + } } -void IOLoginDataLoad::loadPlayerStorageMap(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerStorageMap(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -672,9 +724,9 @@ void IOLoginDataLoad::loadPlayerStorageMap(std::shared_ptr<Player> player, DBRes } } -void IOLoginDataLoad::loadPlayerVip(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerVip(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } @@ -710,17 +762,17 @@ void IOLoginDataLoad::loadPlayerVip(std::shared_ptr<Player> player, DBResult_ptr } } -void IOLoginDataLoad::loadPlayerPreyClass(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerPreyClass(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - if (g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { + if (g_configManager().getBoolean(PREY_ENABLED)) { Database &db = Database::getInstance(); std::ostringstream query; query << "SELECT * FROM `player_prey` WHERE `player_id` = " << player->getGUID(); - if (result = db.storeQuery(query.str())) { + if ((result = db.storeQuery(query.str()))) { do { auto slot = std::make_unique<PreySlot>(static_cast<PreySlot_t>(result->getNumber<uint16_t>("slot"))); auto state = static_cast<PreyDataState_t>(result->getNumber<uint16_t>("state")); @@ -757,17 +809,17 @@ void IOLoginDataLoad::loadPlayerPreyClass(std::shared_ptr<Player> player, DBResu } } -void IOLoginDataLoad::loadPlayerTaskHuntingClass(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerTaskHuntingClass(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } - if (g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { Database &db = Database::getInstance(); std::ostringstream query; query << "SELECT * FROM `player_taskhunt` WHERE `player_id` = " << player->getGUID(); - if (result = db.storeQuery(query.str())) { + if ((result = db.storeQuery(query.str()))) { do { auto slot = std::make_unique<TaskHuntingSlot>(static_cast<PreySlot_t>(result->getNumber<uint16_t>("slot"))); auto state = static_cast<PreyTaskDataState_t>(result->getNumber<uint16_t>("state")); @@ -807,15 +859,15 @@ void IOLoginDataLoad::loadPlayerTaskHuntingClass(std::shared_ptr<Player> player, } } -void IOLoginDataLoad::loadPlayerForgeHistory(std::shared_ptr<Player> player, DBResult_ptr result) { +void IOLoginDataLoad::loadPlayerForgeHistory(const std::shared_ptr<Player> &player, DBResult_ptr result) { if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player or Result nullptr", __FUNCTION__); return; } std::ostringstream query; query << "SELECT * FROM `forge_history` WHERE `player_id` = " << player->getGUID(); - if (result = Database::getInstance().storeQuery(query.str())) { + if ((result = Database::getInstance().storeQuery(query.str()))) { do { auto actionEnum = magic_enum::enum_value<ForgeAction_t>(result->getNumber<uint16_t>("action_type")); ForgeHistory history; @@ -828,15 +880,20 @@ void IOLoginDataLoad::loadPlayerForgeHistory(std::shared_ptr<Player> player, DBR } } -void IOLoginDataLoad::loadPlayerBosstiary(std::shared_ptr<Player> player, DBResult_ptr result) { - if (!result || !player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__); +void IOLoginDataLoad::loadPlayerBosstiary(const std::shared_ptr<Player> &player, DBResult_ptr result) { + if (!result) { + g_logger().warn("[{}] - Result nullptr", __FUNCTION__); + return; + } + + if (!player) { + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } std::ostringstream query; query << "SELECT * FROM `player_bosstiary` WHERE `player_id` = " << player->getGUID(); - if (result = Database::getInstance().storeQuery(query.str())) { + if ((result = Database::getInstance().storeQuery(query.str()))) { do { player->setSlotBossId(1, result->getNumber<uint16_t>("bossIdSlotOne")); player->setSlotBossId(2, result->getNumber<uint16_t>("bossIdSlotTwo")); @@ -860,9 +917,9 @@ void IOLoginDataLoad::loadPlayerBosstiary(std::shared_ptr<Player> player, DBResu } } -void IOLoginDataLoad::bindRewardBag(std::shared_ptr<Player> player, ItemsMap &rewardItemsMap) { +void IOLoginDataLoad::bindRewardBag(const std::shared_ptr<Player> &player, ItemsMap &rewardItemsMap) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } @@ -882,27 +939,31 @@ void IOLoginDataLoad::bindRewardBag(std::shared_ptr<Player> player, ItemsMap &re void IOLoginDataLoad::insertItemsIntoRewardBag(const ItemsMap &rewardItemsMap) { for (const auto &it : std::views::reverse(rewardItemsMap)) { const std::pair<std::shared_ptr<Item>, int32_t> &pair = it.second; - std::shared_ptr<Item> item = pair.first; + const auto &item = pair.first; + if (!item) { + continue; + } + int32_t pid = pair.second; if (pid == 0) { break; } - ItemsMap::const_iterator it2 = rewardItemsMap.find(pid); - if (it2 == rewardItemsMap.end()) { + auto rewardIt = rewardItemsMap.find(pid); + if (rewardIt == rewardItemsMap.end()) { continue; } - std::shared_ptr<Container> container = it2->second.first->getContainer(); + const std::shared_ptr<Container> &container = rewardIt->second.first->getContainer(); if (container) { container->internalAddThing(item); } } } -void IOLoginDataLoad::loadPlayerInitializeSystem(std::shared_ptr<Player> player) { +void IOLoginDataLoad::loadPlayerInitializeSystem(const std::shared_ptr<Player> &player) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } @@ -919,9 +980,9 @@ void IOLoginDataLoad::loadPlayerInitializeSystem(std::shared_ptr<Player> player) player->initializeTaskHunting(); } -void IOLoginDataLoad::loadPlayerUpdateSystem(std::shared_ptr<Player> player) { +void IOLoginDataLoad::loadPlayerUpdateSystem(const std::shared_ptr<Player> &player) { if (!player) { - g_logger().warn("[IOLoginData::loadPlayer] - Player nullptr: {}", __FUNCTION__); + g_logger().warn("[{}] - Player nullptr", __FUNCTION__); return; } diff --git a/src/io/functions/iologindata_load_player.hpp b/src/io/functions/iologindata_load_player.hpp index 07a478d2d..2d1a4305c 100644 --- a/src/io/functions/iologindata_load_player.hpp +++ b/src/io/functions/iologindata_load_player.hpp @@ -13,38 +13,38 @@ class IOLoginDataLoad : public IOLoginData { public: - static bool loadPlayerFirst(std::shared_ptr<Player> player, DBResult_ptr result); - static bool preLoadPlayer(std::shared_ptr<Player> player, const std::string &name); - static void loadPlayerExperience(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerBlessings(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerConditions(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerDefaultOutfit(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerSkullSystem(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerSkill(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerKills(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerGuild(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerStashItems(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerBestiaryCharms(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerInstantSpellList(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerInventoryItems(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerStoreInbox(std::shared_ptr<Player> player); - static void loadPlayerDepotItems(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadRewardItems(std::shared_ptr<Player> player); - static void loadPlayerInboxItems(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerStorageMap(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerVip(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerPreyClass(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerTaskHuntingClass(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerForgeHistory(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerBosstiary(std::shared_ptr<Player> player, DBResult_ptr result); - static void loadPlayerInitializeSystem(std::shared_ptr<Player> player); - static void loadPlayerUpdateSystem(std::shared_ptr<Player> player); + static bool loadPlayerBasicInfo(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static bool preLoadPlayer(const std::shared_ptr<Player> &player, const std::string &name); + static void loadPlayerExperience(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerBlessings(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerConditions(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerDefaultOutfit(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerSkullSystem(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerSkill(const std::shared_ptr<Player> &player, const DBResult_ptr &result); + static void loadPlayerKills(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerGuild(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerStashItems(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerBestiaryCharms(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerInstantSpellList(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerInventoryItems(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerStoreInbox(const std::shared_ptr<Player> &player); + static void loadPlayerDepotItems(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadRewardItems(const std::shared_ptr<Player> &player); + static void loadPlayerInboxItems(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerStorageMap(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerVip(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerPreyClass(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerTaskHuntingClass(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerForgeHistory(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerBosstiary(const std::shared_ptr<Player> &player, DBResult_ptr result); + static void loadPlayerInitializeSystem(const std::shared_ptr<Player> &player); + static void loadPlayerUpdateSystem(const std::shared_ptr<Player> &player); private: using ItemsMap = std::map<uint32_t, std::pair<std::shared_ptr<Item>, uint32_t>>; - static void bindRewardBag(std::shared_ptr<Player> player, ItemsMap &rewardItemsMap); + static void bindRewardBag(const std::shared_ptr<Player> &player, ItemsMap &rewardItemsMap); static void insertItemsIntoRewardBag(const ItemsMap &rewardItemsMap); - static void loadItems(ItemsMap &itemsMap, DBResult_ptr result, const std::shared_ptr<Player> &player); + static void loadItems(ItemsMap &itemsMap, const DBResult_ptr &result, const std::shared_ptr<Player> &player); }; diff --git a/src/io/functions/iologindata_save_player.cpp b/src/io/functions/iologindata_save_player.cpp index eccb88c82..b38e6e2b8 100644 --- a/src/io/functions/iologindata_save_player.cpp +++ b/src/io/functions/iologindata_save_player.cpp @@ -7,12 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/functions/iologindata_save_player.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/monsters/monsters.hpp" #include "game/game.hpp" +#include "io/ioprey.hpp" +#include "items/containers/depot/depotchest.hpp" +#include "items/containers/inbox/inbox.hpp" +#include "items/containers/rewards/reward.hpp" -bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockList &itemList, DBInsert &query_insert, PropWriteStream &propWriteStream) { +bool IOLoginDataSave::saveItems(const std::shared_ptr<Player> &player, const ItemBlockList &itemList, DBInsert &query_insert, PropWriteStream &propWriteStream) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -27,16 +33,21 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL int32_t runningId = 100; // Loop through each item in itemList - const auto openContainers = player->getOpenContainers(); + const auto &openContainers = player->getOpenContainers(); for (const auto &it : itemList) { + const auto &item = it.second; + if (!item) { + continue; + } + int32_t pid = it.first; - std::shared_ptr<Item> item = it.second; + ++runningId; // Update container attributes if necessary - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const std::shared_ptr<Container> &container = item->getContainer()) { if (!container) { - continue; // Check for null container + continue; } if (container->getAttribute<int64_t>(ItemAttribute_t::OPENCONTAINER) > 0) { @@ -60,13 +71,8 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL } // Serialize item attributes - try { - propWriteStream.clear(); - item->serializeAttr(propWriteStream); - } catch (...) { - g_logger().error("Error serializing item attributes."); - return false; - } + propWriteStream.clear(); + item->serializeAttr(propWriteStream); size_t attributesSize; const char* attributes = propWriteStream.getStream(attributesSize); @@ -82,24 +88,23 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL // Loop through containers in queue while (!queue.empty()) { const ContainerBlock &cb = queue.front(); - std::shared_ptr<Container> container = cb.first; - int32_t parentId = cb.second; - queue.pop_front(); - + const std::shared_ptr<Container> &container = cb.first; if (!container) { - continue; // Check for null container + continue; } + int32_t parentId = cb.second; + // Loop through items in container - for (std::shared_ptr<Item> item : container->getItemList()) { + for (auto &item : container->getItemList()) { if (!item) { - continue; // Check for null item + continue; } ++runningId; // Update sub-container attributes if necessary - std::shared_ptr<Container> subContainer = item->getContainer(); + const auto &subContainer = item->getContainer(); if (subContainer) { queue.emplace_back(subContainer, runningId); if (subContainer->getAttribute<int64_t>(ItemAttribute_t::OPENCONTAINER) > 0) { @@ -120,13 +125,8 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL } // Serialize item attributes - try { - propWriteStream.clear(); - item->serializeAttr(propWriteStream); - } catch (...) { - g_logger().error("Error serializing item attributes in container."); - return false; - } + propWriteStream.clear(); + item->serializeAttr(propWriteStream); size_t attributesSize; const char* attributes = propWriteStream.getStream(attributesSize); @@ -138,6 +138,9 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL return false; } } + + // Removes the object after processing everything, avoiding memory usage after freeing + queue.pop_front(); } // Execute query @@ -148,7 +151,7 @@ bool IOLoginDataSave::saveItems(std::shared_ptr<Player> player, const ItemBlockL return true; } -bool IOLoginDataSave::savePlayerFirst(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerFirst(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -201,7 +204,9 @@ bool IOLoginDataSave::savePlayerFirst(std::shared_ptr<Player> player) { query << "`manamax` = " << player->manaMax << ","; query << "`manaspent` = " << player->manaSpent << ","; query << "`soul` = " << static_cast<uint16_t>(player->soul) << ","; - query << "`town_id` = " << player->town->getID() << ","; + if (player->town) { + query << "`town_id` = " << player->town->getID() << ","; + } const Position &loginPosition = player->getLoginPosition(); query << "`posx` = " << loginPosition.getX() << ","; @@ -314,7 +319,7 @@ bool IOLoginDataSave::savePlayerFirst(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerStash(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerStash(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -343,7 +348,7 @@ bool IOLoginDataSave::savePlayerStash(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerSpells(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerSpells(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -372,7 +377,7 @@ bool IOLoginDataSave::savePlayerSpells(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerKills(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerKills(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -401,7 +406,7 @@ bool IOLoginDataSave::savePlayerKills(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerBestiarySystem(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerBestiarySystem(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -451,7 +456,7 @@ bool IOLoginDataSave::savePlayerBestiarySystem(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerItem(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerItem(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -470,7 +475,7 @@ bool IOLoginDataSave::savePlayerItem(std::shared_ptr<Player> player) { ItemBlockList itemList; for (int32_t slotId = CONST_SLOT_FIRST; slotId <= CONST_SLOT_LAST; ++slotId) { - std::shared_ptr<Item> item = player->inventory[slotId]; + const auto &item = player->inventory[slotId]; if (item) { itemList.emplace_back(slotId, item); } @@ -483,7 +488,7 @@ bool IOLoginDataSave::savePlayerItem(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerDepotItems(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerDepotItems(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -505,7 +510,7 @@ bool IOLoginDataSave::savePlayerDepotItems(std::shared_ptr<Player> player) { DBInsert depotQuery("INSERT INTO `player_depotitems` (`player_id`, `pid`, `sid`, `itemtype`, `count`, `attributes`) VALUES "); for (const auto &[pid, depotChest] : player->depotChests) { - for (std::shared_ptr<Item> item : depotChest->getItemList()) { + for (const std::shared_ptr<Item> &item : depotChest->getItemList()) { depotList.emplace_back(pid, item); } } @@ -518,7 +523,7 @@ bool IOLoginDataSave::savePlayerDepotItems(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::saveRewardItems(std::shared_ptr<Player> player) { +bool IOLoginDataSave::saveRewardItems(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -552,7 +557,7 @@ bool IOLoginDataSave::saveRewardItems(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerInbox(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerInbox(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -580,14 +585,14 @@ bool IOLoginDataSave::savePlayerInbox(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerPreyClass(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerPreyClass(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; } Database &db = Database::getInstance(); - if (g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { + if (g_configManager().getBoolean(PREY_ENABLED)) { std::ostringstream query; for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { if (const auto &slot = player->getPreySlotById(static_cast<PreySlot_t>(slotId))) { @@ -605,7 +610,7 @@ bool IOLoginDataSave::savePlayerPreyClass(std::shared_ptr<Player> player) { << slot->freeRerollTimeStamp << ", "; PropWriteStream propPreyStream; - std::ranges::for_each(slot->raceIdList.begin(), slot->raceIdList.end(), [&propPreyStream](uint16_t raceId) { + std::ranges::for_each(slot->raceIdList, [&propPreyStream](uint16_t raceId) { propPreyStream.write<uint16_t>(raceId); }); @@ -634,14 +639,14 @@ bool IOLoginDataSave::savePlayerPreyClass(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerTaskHuntingClass(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerTaskHuntingClass(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; } Database &db = Database::getInstance(); - if (g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { std::ostringstream query; for (uint8_t slotId = PreySlot_First; slotId <= PreySlot_Last; slotId++) { if (const auto &slot = player->getTaskHuntingSlotById(static_cast<PreySlot_t>(slotId))) { @@ -658,7 +663,7 @@ bool IOLoginDataSave::savePlayerTaskHuntingClass(std::shared_ptr<Player> player) query << slot->freeRerollTimeStamp << ", "; PropWriteStream propTaskHuntingStream; - std::ranges::for_each(slot->raceIdList.begin(), slot->raceIdList.end(), [&propTaskHuntingStream](uint16_t raceId) { + std::ranges::for_each(slot->raceIdList, [&propTaskHuntingStream](uint16_t raceId) { propTaskHuntingStream.write<uint16_t>(raceId); }); @@ -686,7 +691,7 @@ bool IOLoginDataSave::savePlayerTaskHuntingClass(std::shared_ptr<Player> player) return true; } -bool IOLoginDataSave::savePlayerForgeHistory(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerForgeHistory(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -720,7 +725,7 @@ bool IOLoginDataSave::savePlayerForgeHistory(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerBosstiary(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerBosstiary(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; @@ -764,7 +769,7 @@ bool IOLoginDataSave::savePlayerBosstiary(std::shared_ptr<Player> player) { return true; } -bool IOLoginDataSave::savePlayerStorage(std::shared_ptr<Player> player) { +bool IOLoginDataSave::savePlayerStorage(const std::shared_ptr<Player> &player) { if (!player) { g_logger().warn("[IOLoginData::savePlayer] - Player nullptr: {}", __FUNCTION__); return false; diff --git a/src/io/functions/iologindata_save_player.hpp b/src/io/functions/iologindata_save_player.hpp index bbd44105d..abafc2c18 100644 --- a/src/io/functions/iologindata_save_player.hpp +++ b/src/io/functions/iologindata_save_player.hpp @@ -11,22 +11,24 @@ #include "io/iologindata.hpp" +class PropWriteStream; + class IOLoginDataSave : public IOLoginData { public: - static bool savePlayerFirst(std::shared_ptr<Player> player); - static bool savePlayerStash(std::shared_ptr<Player> player); - static bool savePlayerSpells(std::shared_ptr<Player> player); - static bool savePlayerKills(std::shared_ptr<Player> player); - static bool savePlayerBestiarySystem(std::shared_ptr<Player> player); - static bool savePlayerItem(std::shared_ptr<Player> player); - static bool savePlayerDepotItems(std::shared_ptr<Player> player); - static bool saveRewardItems(std::shared_ptr<Player> player); - static bool savePlayerInbox(std::shared_ptr<Player> player); - static bool savePlayerPreyClass(std::shared_ptr<Player> player); - static bool savePlayerTaskHuntingClass(std::shared_ptr<Player> player); - static bool savePlayerForgeHistory(std::shared_ptr<Player> player); - static bool savePlayerBosstiary(std::shared_ptr<Player> player); - static bool savePlayerStorage(std::shared_ptr<Player> player); + static bool savePlayerFirst(const std::shared_ptr<Player> &player); + static bool savePlayerStash(const std::shared_ptr<Player> &player); + static bool savePlayerSpells(const std::shared_ptr<Player> &player); + static bool savePlayerKills(const std::shared_ptr<Player> &player); + static bool savePlayerBestiarySystem(const std::shared_ptr<Player> &player); + static bool savePlayerItem(const std::shared_ptr<Player> &player); + static bool savePlayerDepotItems(const std::shared_ptr<Player> &player); + static bool saveRewardItems(const std::shared_ptr<Player> &player); + static bool savePlayerInbox(const std::shared_ptr<Player> &player); + static bool savePlayerPreyClass(const std::shared_ptr<Player> &player); + static bool savePlayerTaskHuntingClass(const std::shared_ptr<Player> &player); + static bool savePlayerForgeHistory(const std::shared_ptr<Player> &player); + static bool savePlayerBosstiary(const std::shared_ptr<Player> &player); + static bool savePlayerStorage(const std::shared_ptr<Player> &player); protected: using ItemBlockList = std::list<std::pair<int32_t, std::shared_ptr<Item>>>; @@ -34,5 +36,5 @@ class IOLoginDataSave : public IOLoginData { using ItemRewardList = std::list<std::pair<int32_t, std::shared_ptr<Item>>>; using ItemInboxList = std::list<std::pair<int32_t, std::shared_ptr<Item>>>; - static bool saveItems(std::shared_ptr<Player> player, const ItemBlockList &itemList, DBInsert &query_insert, PropWriteStream &stream); + static bool saveItems(const std::shared_ptr<Player> &player, const ItemBlockList &itemList, DBInsert &query_insert, PropWriteStream &stream); }; diff --git a/src/io/io_bosstiary.cpp b/src/io/io_bosstiary.cpp index 2f625cdb7..3e8a05524 100644 --- a/src/io/io_bosstiary.cpp +++ b/src/io/io_bosstiary.cpp @@ -7,15 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/io_bosstiary.hpp" #include "creatures/monsters/monsters.hpp" #include "creatures/players/player.hpp" #include "game/game.hpp" +#include "lib/di/container.hpp" #include "utils/tools.hpp" -#include "items/item.hpp" + +IOBosstiary &IOBosstiary::getInstance() { + return inject<IOBosstiary>(); +} void IOBosstiary::loadBoostedBoss() { Database &database = Database::getInstance(); @@ -27,7 +29,7 @@ void IOBosstiary::loadBoostedBoss() { return; } - uint16_t date = result->getNumber<uint16_t>("date"); + auto date = result->getNumber<uint16_t>("date"); auto timeNow = getTimeNow(); auto time = localtime(&timeNow); auto today = time->tm_mday; @@ -61,12 +63,12 @@ void IOBosstiary::loadBoostedBoss() { } // Check if not have archfoe registered boss - if (bossInfo.size() == 0) { + if (bossInfo.empty()) { g_logger().error("Failed to boost a boss. There is no boss registered with the Archfoe Rarity."); return; } - uint16_t oldBossRace = result->getNumber<uint16_t>("raceid"); + auto oldBossRace = result->getNumber<uint16_t>("raceid"); while (true) { uint32_t randomIndex = uniform_random(0, static_cast<int32_t>(bossInfo.size())); auto it = std::next(bossInfo.begin(), randomIndex); @@ -137,7 +139,7 @@ const std::map<uint16_t, std::string> &IOBosstiary::getBosstiaryMap() const { return bosstiaryMap; } -void IOBosstiary::setBossBoostedName(const std::string_view &name) { +void IOBosstiary::setBossBoostedName(std::string_view name) { boostedBoss = name; } @@ -169,7 +171,7 @@ std::shared_ptr<MonsterType> IOBosstiary::getMonsterTypeByBossRaceId(uint16_t ra return nullptr; } -void IOBosstiary::addBosstiaryKill(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype, uint32_t amount /*= 1*/) const { +void IOBosstiary::addBosstiaryKill(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype, uint32_t amount /*= 1*/) const { if (!player || !mtype) { return; } @@ -249,6 +251,7 @@ std::vector<uint16_t> IOBosstiary::getBosstiaryFinished(const std::shared_ptr<Pl const auto mType = g_monsters().getMonsterType(bossName); if (!mType) { + g_logger().error("[{}] Boss with id {} and name {} not found in boss map", __FUNCTION__, bossId, bossName); continue; } @@ -268,7 +271,7 @@ std::vector<uint16_t> IOBosstiary::getBosstiaryFinished(const std::shared_ptr<Pl return unlockedMonsters.data(); } -uint8_t IOBosstiary::getBossCurrentLevel(std::shared_ptr<Player> player, uint16_t bossId) const { +uint8_t IOBosstiary::getBossCurrentLevel(const std::shared_ptr<Player> &player, uint16_t bossId) const { if (bossId == 0 || !player) { return 0; } diff --git a/src/io/io_bosstiary.hpp b/src/io/io_bosstiary.hpp index 84d9f0955..92a8bf0b6 100644 --- a/src/io/io_bosstiary.hpp +++ b/src/io/io_bosstiary.hpp @@ -9,11 +9,6 @@ #pragma once -#include <map> -#include <string> -#include <vector> -#include "lib/di/container.hpp" - enum class BosstiaryRarity_t : uint8_t { RARITY_BANE = 0, RARITY_ARCHFOE = 1, @@ -39,9 +34,7 @@ class IOBosstiary { IOBosstiary(const IOBosstiary &) = delete; void operator=(const IOBosstiary &) = delete; - static IOBosstiary &getInstance() { - return inject<IOBosstiary>(); - } + static IOBosstiary &getInstance(); void loadBoostedBoss(); @@ -54,17 +47,17 @@ class IOBosstiary { { BosstiaryRarity_t::RARITY_NEMESIS, { { 1, 10 }, { 3, 30 }, { 5, 60 } } } }; - void setBossBoostedName(const std::string_view &name); + void setBossBoostedName(std::string_view name); std::string getBoostedBossName() const; void setBossBoostedId(uint16_t raceId); uint16_t getBoostedBossId() const; std::shared_ptr<MonsterType> getMonsterTypeByBossRaceId(uint16_t raceId) const; - void addBosstiaryKill(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype, uint32_t amount = 1) const; + void addBosstiaryKill(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype, uint32_t amount = 1) const; uint16_t calculateLootBonus(uint32_t bossPoints) const; uint32_t calculateBossPoints(uint16_t lootBonus) const; std::vector<uint16_t> getBosstiaryFinished(const std::shared_ptr<Player> &player, uint8_t level = 1) const; - uint8_t getBossCurrentLevel(std::shared_ptr<Player> player, uint16_t bossId) const; + uint8_t getBossCurrentLevel(const std::shared_ptr<Player> &player, uint16_t bossId) const; uint32_t calculteRemoveBoss(uint8_t removeTimes) const; const std::vector<LevelInfo> &getBossRaceKillStages(BosstiaryRarity_t race) const; diff --git a/src/io/io_wheel.cpp b/src/io/io_wheel.cpp index e8ad30a5d..72d5e207d 100644 --- a/src/io/io_wheel.cpp +++ b/src/io/io_wheel.cpp @@ -7,14 +7,13 @@ * Website: https://docs.opentibiabr.org/ */ -#include "pch.hpp" - #include "io/io_wheel.hpp" +#include "enums/player_wheel.hpp" +#include "kv/kv.hpp" #include "creatures/players/wheel/player_wheel.hpp" #include "creatures/players/player.hpp" #include "creatures/combat/spells.hpp" - #include "utils/tools.hpp" #define MITIGATION_INCREASE 0.03 diff --git a/src/io/iobestiary.cpp b/src/io/iobestiary.cpp index 9cd964e7c..b18ed1814 100644 --- a/src/io/iobestiary.cpp +++ b/src/io/iobestiary.cpp @@ -7,18 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "declarations.hpp" -#include "game/game.hpp" #include "io/iobestiary.hpp" + +#include "creatures/combat/combat.hpp" +#include "creatures/combat/condition.hpp" #include "creatures/monsters/monsters.hpp" #include "creatures/players/player.hpp" +#include "game/game.hpp" #include "lib/metrics/metrics.hpp" SoftSingleton IOBestiary::instanceTracker("IOBestiary"); -bool IOBestiary::parseCharmCombat(const std::shared_ptr<Charm> charm, std::shared_ptr<Player> player, std::shared_ptr<Creature> target, int32_t realDamage, bool dueToPotion, bool checkArmor) { +bool IOBestiary::parseCharmCombat(const std::shared_ptr<Charm> &charm, const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, int32_t realDamage, bool dueToPotion, bool checkArmor) { if (!charm || !player || !target) { return false; } @@ -95,6 +95,10 @@ bool IOBestiary::parseCharmCombat(const std::shared_ptr<Charm> charm, std::share return false; } +IOBestiary &IOBestiary::getInstance() { + return inject<IOBestiary>(); +} + std::shared_ptr<Charm> IOBestiary::getBestiaryCharm(charmRune_t activeCharm, bool force /*= false*/) const { const auto charmInternal = g_game().getCharmList(); for (const auto &tmpCharm : charmInternal) { @@ -115,7 +119,7 @@ std::shared_ptr<Charm> IOBestiary::getBestiaryCharm(charmRune_t activeCharm, boo } std::map<uint16_t, std::string> IOBestiary::findRaceByName(const std::string &race, bool Onlystring /*= true*/, BestiaryType_t raceNumber /*= BESTY_RACE_NONE*/) const { - std::map<uint16_t, std::string> best_list = g_game().getBestiaryList(); + const std::map<uint16_t, std::string> &best_list = g_game().getBestiaryList(); std::map<uint16_t, std::string> race_list; if (Onlystring) { @@ -136,7 +140,7 @@ std::map<uint16_t, std::string> IOBestiary::findRaceByName(const std::string &ra return race_list; } -uint8_t IOBestiary::getKillStatus(const std::shared_ptr<MonsterType> mtype, uint32_t killAmount) const { +uint8_t IOBestiary::getKillStatus(const std::shared_ptr<MonsterType> &mtype, uint32_t killAmount) const { if (killAmount < mtype->info.bestiaryFirstUnlock) { return 1; } else if (killAmount < mtype->info.bestiarySecondUnlock) { @@ -147,7 +151,7 @@ uint8_t IOBestiary::getKillStatus(const std::shared_ptr<MonsterType> mtype, uint return 4; } -void IOBestiary::resetCharmRuneCreature(std::shared_ptr<Player> player, const std::shared_ptr<Charm> charm) { +void IOBestiary::resetCharmRuneCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Charm> &charm) const { if (!player || !charm) { return; } @@ -157,7 +161,7 @@ void IOBestiary::resetCharmRuneCreature(std::shared_ptr<Player> player, const st player->parseRacebyCharm(charm->id, true, 0); } -void IOBestiary::setCharmRuneCreature(std::shared_ptr<Player> player, const std::shared_ptr<Charm> charm, uint16_t raceid) { +void IOBestiary::setCharmRuneCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Charm> &charm, uint16_t raceid) const { if (!player || !charm) { return; } @@ -167,14 +171,14 @@ void IOBestiary::setCharmRuneCreature(std::shared_ptr<Player> player, const std: player->setUsedRunesBit(Toggle); } -std::list<charmRune_t> IOBestiary::getCharmUsedRuneBitAll(std::shared_ptr<Player> player) { +std::list<charmRune_t> IOBestiary::getCharmUsedRuneBitAll(const std::shared_ptr<Player> &player) { int32_t input = player->getUsedRunesBit(); int8_t i = 0; std::list<charmRune_t> rtn; while (input != 0) { if ((input & 1) == 1) { - charmRune_t tmpcharm = static_cast<charmRune_t>(i); + auto tmpcharm = static_cast<charmRune_t>(i); rtn.push_front(tmpcharm); } input = input >> 1; @@ -183,7 +187,7 @@ std::list<charmRune_t> IOBestiary::getCharmUsedRuneBitAll(std::shared_ptr<Player return rtn; } -uint16_t IOBestiary::getBestiaryRaceUnlocked(std::shared_ptr<Player> player, BestiaryType_t race) const { +uint16_t IOBestiary::getBestiaryRaceUnlocked(const std::shared_ptr<Player> &player, BestiaryType_t race) const { if (!player) { return 0; } @@ -200,7 +204,7 @@ uint16_t IOBestiary::getBestiaryRaceUnlocked(std::shared_ptr<Player> player, Bes return count; } -void IOBestiary::addCharmPoints(std::shared_ptr<Player> player, uint16_t amount, bool negative /*= false*/) { +void IOBestiary::addCharmPoints(const std::shared_ptr<Player> &player, uint16_t amount, bool negative /*= false*/) { if (!player) { return; } @@ -214,7 +218,7 @@ void IOBestiary::addCharmPoints(std::shared_ptr<Player> player, uint16_t amount, player->setCharmPoints(myCharms); } -void IOBestiary::addBestiaryKill(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype, uint32_t amount /*= 1*/) { +void IOBestiary::addBestiaryKill(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype, uint32_t amount /*= 1*/) { uint16_t raceid = mtype->info.raceid; if (raceid == 0 || !player || !mtype) { return; @@ -241,7 +245,7 @@ void IOBestiary::addBestiaryKill(std::shared_ptr<Player> player, const std::shar player->refreshCyclopediaMonsterTracker(); } -charmRune_t IOBestiary::getCharmFromTarget(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype) { +charmRune_t IOBestiary::getCharmFromTarget(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype) { if (!player || !mtype) { return CHARM_NONE; } @@ -258,7 +262,7 @@ charmRune_t IOBestiary::getCharmFromTarget(std::shared_ptr<Player> player, const return CHARM_NONE; } -bool IOBestiary::hasCharmUnlockedRuneBit(const std::shared_ptr<Charm> charm, int32_t input) const { +bool IOBestiary::hasCharmUnlockedRuneBit(const std::shared_ptr<Charm> &charm, int32_t input) const { if (!charm) { return false; } @@ -266,7 +270,7 @@ bool IOBestiary::hasCharmUnlockedRuneBit(const std::shared_ptr<Charm> charm, int return ((input & charm->binary) != 0); } -int32_t IOBestiary::bitToggle(int32_t input, const std::shared_ptr<Charm> charm, bool on) const { +int32_t IOBestiary::bitToggle(int32_t input, const std::shared_ptr<Charm> &charm, bool on) const { if (!charm) { return CHARM_NONE; } @@ -283,7 +287,7 @@ int32_t IOBestiary::bitToggle(int32_t input, const std::shared_ptr<Charm> charm, } } -void IOBestiary::sendBuyCharmRune(std::shared_ptr<Player> player, charmRune_t runeID, uint8_t action, uint16_t raceid) { +void IOBestiary::sendBuyCharmRune(const std::shared_ptr<Player> &player, charmRune_t runeID, uint8_t action, uint16_t raceid) { const auto charm = getBestiaryCharm(runeID); if (!player || !charm) { return; @@ -345,7 +349,7 @@ void IOBestiary::sendBuyCharmRune(std::shared_ptr<Player> player, charmRune_t ru player->BestiarysendCharms(); } -std::map<uint8_t, int16_t> IOBestiary::getMonsterElements(const std::shared_ptr<MonsterType> mtype) const { +std::map<uint8_t, int16_t> IOBestiary::getMonsterElements(const std::shared_ptr<MonsterType> &mtype) const { std::map<uint8_t, int16_t> defaultMap = {}; for (uint8_t i = 0; i <= 7; i++) { defaultMap[i] = 100; @@ -383,7 +387,7 @@ std::map<uint8_t, int16_t> IOBestiary::getMonsterElements(const std::shared_ptr< return defaultMap; } -std::map<uint16_t, uint32_t> IOBestiary::getBestiaryKillCountByMonsterIDs(std::shared_ptr<Player> player, std::map<uint16_t, std::string> mtype_list) const { +std::map<uint16_t, uint32_t> IOBestiary::getBestiaryKillCountByMonsterIDs(const std::shared_ptr<Player> &player, const std::map<uint16_t, std::string> &mtype_list) const { std::map<uint16_t, uint32_t> raceMonsters = {}; for (const auto &it : mtype_list) { uint16_t raceid = it.first; diff --git a/src/io/iobestiary.hpp b/src/io/iobestiary.hpp index a521ce688..4eb576327 100644 --- a/src/io/iobestiary.hpp +++ b/src/io/iobestiary.hpp @@ -9,12 +9,16 @@ #pragma once -#include "declarations.hpp" #include "lib/di/soft_singleton.hpp" -#include "lua/scripts/luascript.hpp" -#include "creatures/players/player.hpp" +#include "creatures/creatures_definitions.hpp" + +class Player; class Game; +class SoftSingleton; +class SoftSingletonGuard; +class MonsterType; +class Creature; class Charm { public: @@ -26,14 +30,14 @@ class Charm { std::string name; charmRune_t id = CHARM_NONE; std::string description; - charm_t type; + charm_t type {}; uint16_t points = 0; int32_t binary = 0; std::string cancelMsg; std::string logMsg; CombatType_t dmgtype = COMBAT_NONE; - uint16_t effect = CONST_ME_NONE; + uint16_t effect = 0; SoundEffect_t soundImpactEffect = SoundEffect_t::SILENCE; SoundEffect_t soundCastEffect = SoundEffect_t::SILENCE; @@ -50,34 +54,32 @@ class IOBestiary { IOBestiary(const IOBestiary &) = delete; void operator=(const IOBestiary &) = delete; - static IOBestiary &getInstance() { - return inject<IOBestiary>(); - } + static IOBestiary &getInstance(); std::shared_ptr<Charm> getBestiaryCharm(charmRune_t activeCharm, bool force = false) const; - void addBestiaryKill(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype, uint32_t amount = 1); - bool parseCharmCombat(const std::shared_ptr<Charm> charm, std::shared_ptr<Player> player, std::shared_ptr<Creature> target, int32_t realDamage, bool dueToPotion = false, bool checkArmor = false); - void addCharmPoints(std::shared_ptr<Player> player, uint16_t amount, bool negative = false); - void sendBuyCharmRune(std::shared_ptr<Player> player, charmRune_t runeID, uint8_t action, uint16_t raceid); - void setCharmRuneCreature(std::shared_ptr<Player> player, const std::shared_ptr<Charm> charm, uint16_t raceid); - void resetCharmRuneCreature(std::shared_ptr<Player> player, const std::shared_ptr<Charm> charm); + void addBestiaryKill(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype, uint32_t amount = 1); + bool parseCharmCombat(const std::shared_ptr<Charm> &charm, const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, int32_t realDamage, bool dueToPotion = false, bool checkArmor = false); + void addCharmPoints(const std::shared_ptr<Player> &player, uint16_t amount, bool negative = false); + void sendBuyCharmRune(const std::shared_ptr<Player> &player, charmRune_t runeID, uint8_t action, uint16_t raceid); + void setCharmRuneCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Charm> &charm, uint16_t raceid) const; + void resetCharmRuneCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Charm> &charm) const; int8_t calculateDifficult(uint32_t chance) const; - uint8_t getKillStatus(const std::shared_ptr<MonsterType> mtype, uint32_t killAmount) const; + uint8_t getKillStatus(const std::shared_ptr<MonsterType> &mtype, uint32_t killAmount) const; - uint16_t getBestiaryRaceUnlocked(std::shared_ptr<Player> player, BestiaryType_t race) const; + uint16_t getBestiaryRaceUnlocked(const std::shared_ptr<Player> &player, BestiaryType_t race) const; - int32_t bitToggle(int32_t input, const std::shared_ptr<Charm> charm, bool on) const; + int32_t bitToggle(int32_t input, const std::shared_ptr<Charm> &charm, bool on) const; - bool hasCharmUnlockedRuneBit(const std::shared_ptr<Charm> charm, int32_t input) const; + bool hasCharmUnlockedRuneBit(const std::shared_ptr<Charm> &charm, int32_t input) const; - std::list<charmRune_t> getCharmUsedRuneBitAll(std::shared_ptr<Player> player); + std::list<charmRune_t> getCharmUsedRuneBitAll(const std::shared_ptr<Player> &player); std::vector<uint16_t> getBestiaryFinished(const std::shared_ptr<Player> &player) const; - charmRune_t getCharmFromTarget(std::shared_ptr<Player> player, const std::shared_ptr<MonsterType> mtype); + charmRune_t getCharmFromTarget(const std::shared_ptr<Player> &player, const std::shared_ptr<MonsterType> &mtype); - std::map<uint16_t, uint32_t> getBestiaryKillCountByMonsterIDs(std::shared_ptr<Player> player, std::map<uint16_t, std::string> mtype_list) const; - std::map<uint8_t, int16_t> getMonsterElements(const std::shared_ptr<MonsterType> mtype) const; + std::map<uint16_t, uint32_t> getBestiaryKillCountByMonsterIDs(const std::shared_ptr<Player> &player, const std::map<uint16_t, std::string> &mtype_list) const; + std::map<uint8_t, int16_t> getMonsterElements(const std::shared_ptr<MonsterType> &mtype) const; std::map<uint16_t, std::string> findRaceByName(const std::string &race, bool Onlystring = true, BestiaryType_t raceNumber = BESTY_RACE_NONE) const; private: diff --git a/src/io/ioguild.cpp b/src/io/ioguild.cpp index 99e1e7506..55c29b415 100644 --- a/src/io/ioguild.cpp +++ b/src/io/ioguild.cpp @@ -7,11 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "io/ioguild.hpp" #include "database/database.hpp" #include "creatures/players/grouping/guild.hpp" -#include "io/ioguild.hpp" std::shared_ptr<Guild> IOGuild::loadGuild(uint32_t guildId) { Database &db = Database::getInstance(); @@ -33,7 +32,7 @@ std::shared_ptr<Guild> IOGuild::loadGuild(uint32_t guildId) { return nullptr; } -void IOGuild::saveGuild(const std::shared_ptr<Guild> guild) { +void IOGuild::saveGuild(const std::shared_ptr<Guild> &guild) { if (!guild) { return; } @@ -68,7 +67,7 @@ void IOGuild::getWarList(uint32_t guildId, GuildWarVector &guildWarVector) { } do { - uint32_t guild1 = result->getNumber<uint32_t>("guild1"); + auto guild1 = result->getNumber<uint32_t>("guild1"); if (guildId != guild1) { guildWarVector.push_back(guild1); } else { diff --git a/src/io/ioguild.hpp b/src/io/ioguild.hpp index cc450841b..52a8e7c1c 100644 --- a/src/io/ioguild.hpp +++ b/src/io/ioguild.hpp @@ -15,7 +15,7 @@ using GuildWarVector = std::vector<uint32_t>; class IOGuild { public: static std::shared_ptr<Guild> loadGuild(uint32_t guildId); - static void saveGuild(const std::shared_ptr<Guild> guild); + static void saveGuild(const std::shared_ptr<Guild> &guild); static uint32_t getGuildIdByName(const std::string &name); static void getWarList(uint32_t guildId, GuildWarVector &guildWarVector); }; diff --git a/src/io/iologindata.cpp b/src/io/iologindata.cpp index 132cead64..0249d70a5 100644 --- a/src/io/iologindata.cpp +++ b/src/io/iologindata.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/iologindata.hpp" + +#include "config/configmanager.hpp" #include "io/functions/iologindata_load_player.hpp" #include "io/functions/iologindata_save_player.hpp" #include "game/game.hpp" @@ -19,16 +19,16 @@ #include "enums/account_type.hpp" #include "enums/account_errors.hpp" -bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor, const std::string &password, std::string &characterName, uint32_t &accountId, bool oldProtocol) { +bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor, const std::string &password, std::string &characterName, uint32_t &accountId, bool oldProtocol, const uint32_t ip) { Account account(accountDescriptor); account.setProtocolCompat(oldProtocol); - if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(account.load())) { + if (AccountErrors_t::Ok != account.load()) { g_logger().error("Couldn't load account [{}].", account.getDescriptor()); return false; } - if (g_configManager().getString(AUTH_TYPE, __FUNCTION__) == "session") { + if (g_configManager().getString(AUTH_TYPE) == "session") { if (!account.authenticate()) { return false; } @@ -38,13 +38,18 @@ bool IOLoginData::gameWorldAuthentication(const std::string &accountDescriptor, } } - if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(account.load())) { + if (!g_accountRepository().getCharacterByAccountIdAndName(account.getID(), characterName)) { + g_logger().warn("IP [{}] trying to connect into another account character", convertIPToString(ip)); + return false; + } + + if (AccountErrors_t::Ok != account.load()) { g_logger().error("Failed to load account [{}]", accountDescriptor); return false; } auto [players, result] = account.getAccountPlayers(); - if (AccountErrors_t::Ok != enumFromValue<AccountErrors_t>(result)) { + if (AccountErrors_t::Ok != result) { g_logger().error("Failed to load account [{}] players", accountDescriptor); return false; } @@ -70,41 +75,22 @@ uint8_t IOLoginData::getAccountType(uint32_t accountId) { return result->getNumber<uint8_t>("type"); } -void IOLoginData::updateOnlineStatus(uint32_t guid, bool login) { - static phmap::flat_hash_map<uint32_t, bool> updateOnline; - if ((login && updateOnline.find(guid) != updateOnline.end()) || guid <= 0) { - return; - } - - std::ostringstream query; - if (login) { - g_metrics().addUpDownCounter("players_online", 1); - query << "INSERT INTO `players_online` VALUES (" << guid << ')'; - updateOnline[guid] = true; - } else { - g_metrics().addUpDownCounter("players_online", -1); - query << "DELETE FROM `players_online` WHERE `player_id` = " << guid; - updateOnline.erase(guid); - } - Database::getInstance().executeQuery(query.str()); -} - // The boolean "disableIrrelevantInfo" will deactivate the loading of information that is not relevant to the preload, for example, forge, bosstiary, etc. None of this we need to access if the player is offline -bool IOLoginData::loadPlayerById(std::shared_ptr<Player> player, uint32_t id, bool disableIrrelevantInfo /* = true*/) { +bool IOLoginData::loadPlayerById(const std::shared_ptr<Player> &player, uint32_t id, bool disableIrrelevantInfo /* = true*/) { Database &db = Database::getInstance(); std::ostringstream query; query << "SELECT * FROM `players` WHERE `id` = " << id; return loadPlayer(player, db.storeQuery(query.str()), disableIrrelevantInfo); } -bool IOLoginData::loadPlayerByName(std::shared_ptr<Player> player, const std::string &name, bool disableIrrelevantInfo /* = true*/) { +bool IOLoginData::loadPlayerByName(const std::shared_ptr<Player> &player, const std::string &name, bool disableIrrelevantInfo /* = true*/) { Database &db = Database::getInstance(); std::ostringstream query; query << "SELECT * FROM `players` WHERE `name` = " << db.escapeString(name); return loadPlayer(player, db.storeQuery(query.str()), disableIrrelevantInfo); } -bool IOLoginData::loadPlayer(std::shared_ptr<Player> player, DBResult_ptr result, bool disableIrrelevantInfo /* = false*/) { +bool IOLoginData::loadPlayer(const std::shared_ptr<Player> &player, const DBResult_ptr &result, bool disableIrrelevantInfo /* = false*/) { if (!result || !player) { std::string nullptrType = !result ? "Result" : "Player"; g_logger().warn("[{}] - {} is nullptr", __FUNCTION__, nullptrType); @@ -113,7 +99,7 @@ bool IOLoginData::loadPlayer(std::shared_ptr<Player> player, DBResult_ptr result try { // First - IOLoginDataLoad::loadPlayerFirst(player, result); + IOLoginDataLoad::loadPlayerBasicInfo(player, result); // Experience load IOLoginDataLoad::loadPlayerExperience(player, result); @@ -198,19 +184,25 @@ bool IOLoginData::loadPlayer(std::shared_ptr<Player> player, DBResult_ptr result } } -bool IOLoginData::savePlayer(std::shared_ptr<Player> player) { - bool success = DBTransaction::executeWithinTransaction([player]() { - return savePlayerGuard(player); - }); +bool IOLoginData::savePlayer(const std::shared_ptr<Player> &player) { + try { + bool success = DBTransaction::executeWithinTransaction([player]() { + return savePlayerGuard(player); + }); + + if (!success) { + g_logger().error("[{}] Error occurred saving player", __FUNCTION__); + } - if (!success) { - g_logger().error("[{}] Error occurred saving player", __FUNCTION__); + return success; + } catch (const DatabaseException &e) { + g_logger().error("[{}] Exception occurred: {}", __FUNCTION__, e.what()); } - return success; + return false; } -bool IOLoginData::savePlayerGuard(std::shared_ptr<Player> player) { +bool IOLoginData::savePlayerGuard(const std::shared_ptr<Player> &player) { if (!player) { throw DatabaseException("Player nullptr in function: " + std::string(__FUNCTION__)); } @@ -283,7 +275,7 @@ std::string IOLoginData::getNameByGuid(uint32_t guid) { query << "SELECT `name` FROM `players` WHERE `id` = " << guid; DBResult_ptr result = Database::getInstance().storeQuery(query.str()); if (!result) { - return std::string(); + return {}; } return result->getString("name"); } diff --git a/src/io/iologindata.hpp b/src/io/iologindata.hpp index 1451cf897..29eac0c81 100644 --- a/src/io/iologindata.hpp +++ b/src/io/iologindata.hpp @@ -17,13 +17,12 @@ using ItemBlockList = std::list<std::pair<int32_t, std::shared_ptr<Item>>>; class IOLoginData { public: - static bool gameWorldAuthentication(const std::string &accountDescriptor, const std::string &sessionOrPassword, std::string &characterName, uint32_t &accountId, bool oldProcotol); + static bool gameWorldAuthentication(const std::string &accountDescriptor, const std::string &sessionOrPassword, std::string &characterName, uint32_t &accountId, bool oldProcotol, const uint32_t ip); static uint8_t getAccountType(uint32_t accountId); - static void updateOnlineStatus(uint32_t guid, bool login); - static bool loadPlayerById(std::shared_ptr<Player> player, uint32_t id, bool disableIrrelevantInfo = true); - static bool loadPlayerByName(std::shared_ptr<Player> player, const std::string &name, bool disableIrrelevantInfo = true); - static bool loadPlayer(std::shared_ptr<Player> player, DBResult_ptr result, bool disableIrrelevantInfo = false); - static bool savePlayer(std::shared_ptr<Player> player); + static bool loadPlayerById(const std::shared_ptr<Player> &player, uint32_t id, bool disableIrrelevantInfo = true); + static bool loadPlayerByName(const std::shared_ptr<Player> &player, const std::string &name, bool disableIrrelevantInfo = true); + static bool loadPlayer(const std::shared_ptr<Player> &player, const DBResult_ptr &result, bool disableIrrelevantInfo = false); + static bool savePlayer(const std::shared_ptr<Player> &player); static uint32_t getGuidByName(const std::string &name); static bool getGuidByNameEx(uint32_t &guid, bool &specialVip, std::string &name); static std::string getNameByGuid(uint32_t guid); @@ -44,5 +43,5 @@ class IOLoginData { static void removeGuidVIPGroupEntry(uint32_t accountId, uint32_t guid); private: - static bool savePlayerGuard(std::shared_ptr<Player> player); + static bool savePlayerGuard(const std::shared_ptr<Player> &player); }; diff --git a/src/io/iomap.cpp b/src/io/iomap.cpp index c17978e8d..922613c03 100644 --- a/src/io/iomap.cpp +++ b/src/io/iomap.cpp @@ -7,8 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" #include "io/iomap.hpp" + #include "game/movement/teleport.hpp" #include "game/game.hpp" #include "io/filestream.hpp" @@ -77,7 +77,7 @@ void IOMap::loadMap(Map* map, const Position &pos) { map->flush(); - g_logger().info("Map Loaded {} ({}x{}) in {} milliseconds", map->path.filename().string(), map->width, map->height, bm_mapLoad.duration()); + g_logger().debug("Map Loaded {} ({}x{}) in {} milliseconds", map->path.filename().string(), map->width, map->height, bm_mapLoad.duration()); } void IOMap::parseMapDataAttributes(FileStream &stream, Map* map) { @@ -135,7 +135,7 @@ void IOMap::parseTileArea(FileStream &stream, Map &map, const Position &pos) { const uint16_t x = base_x + tileCoordsX + pos.x; const uint16_t y = base_y + tileCoordsY + pos.y; - const uint8_t z = static_cast<uint8_t>(base_z + pos.z); + const auto z = static_cast<uint8_t>(base_z + pos.z); if (tileType == OTBM_HOUSETILE) { tile->houseId = stream.getU32(); diff --git a/src/io/iomap.hpp b/src/io/iomap.hpp index 78fcc2319..6ac746904 100644 --- a/src/io/iomap.hpp +++ b/src/io/iomap.hpp @@ -11,6 +11,7 @@ #include "declarations.hpp" +// TODO: move to .cpp for avoid circular dependencies #include "config/configmanager.hpp" #include "map/house/house.hpp" #include "items/item.hpp" @@ -32,7 +33,7 @@ class IOMap { if (map->monsterfile.empty()) { // OTBM file doesn't tell us about the monsterfile, // Lets guess it is mapname-monster.xml. - map->monsterfile = g_configManager().getString(MAP_NAME, __FUNCTION__); + map->monsterfile = g_configManager().getString(MAP_NAME); map->monsterfile += "-monster.xml"; } @@ -48,7 +49,7 @@ class IOMap { if (map->zonesfile.empty()) { // OTBM file doesn't tell us about the zonesfile, // Lets guess it is mapname-zone.xml. - map->zonesfile = g_configManager().getString(MAP_NAME, __FUNCTION__); + map->zonesfile = g_configManager().getString(MAP_NAME); map->zonesfile += "-zones.xml"; } @@ -64,7 +65,7 @@ class IOMap { if (map->npcfile.empty()) { // OTBM file doesn't tell us about the npcfile, // Lets guess it is mapname-npc.xml. - map->npcfile = g_configManager().getString(MAP_NAME, __FUNCTION__); + map->npcfile = g_configManager().getString(MAP_NAME); map->npcfile += "-npc.xml"; } @@ -80,7 +81,7 @@ class IOMap { if (map->housefile.empty()) { // OTBM file doesn't tell us about the housefile, // Lets guess it is mapname-house.xml. - map->housefile = g_configManager().getString(MAP_NAME, __FUNCTION__); + map->housefile = g_configManager().getString(MAP_NAME); map->housefile += "-house.xml"; } @@ -157,8 +158,8 @@ class IOMap { class IOMapException : public std::exception { public: - explicit IOMapException(const std::string &msg) : - message(msg) { } + explicit IOMapException(std::string msg) : + message(std::move(msg)) { } const char* what() const noexcept override { return message.c_str(); diff --git a/src/io/iomapserialize.cpp b/src/io/iomapserialize.cpp index e2a367c4e..b1de604dd 100644 --- a/src/io/iomapserialize.cpp +++ b/src/io/iomapserialize.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/iomapserialize.hpp" + +#include "config/configmanager.hpp" #include "io/iologindata.hpp" #include "game/game.hpp" #include "items/bed.hpp" @@ -48,7 +48,7 @@ void IOMapSerialize::loadHouseItems(Map* map) { while (item_count--) { if (auto houseTile = std::dynamic_pointer_cast<HouseTile>(tile)) { const auto &house = houseTile->getHouse(); - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (!isTransferOnRestart && house->getOwner() == 0) { g_logger().trace("Skipping load item from house id: {}, position: {}, house does not have owner", house->getId(), house->getEntryPosition().toString()); house->clearHouseInfo(false); @@ -110,7 +110,7 @@ bool IOMapSerialize::SaveHouseItemsGuard() { return true; } -bool IOMapSerialize::loadContainer(PropStream &propStream, std::shared_ptr<Container> container) { +bool IOMapSerialize::loadContainer(PropStream &propStream, const std::shared_ptr<Container> &container) { while (container->serializationCount > 0) { if (!loadItem(propStream, container)) { g_logger().warn("Deserialization error for container item: {}", container->getID()); @@ -127,7 +127,7 @@ bool IOMapSerialize::loadContainer(PropStream &propStream, std::shared_ptr<Conta return true; } -bool IOMapSerialize::loadItem(PropStream &propStream, std::shared_ptr<Cylinder> parent, bool isHouseItem /*= false*/) { +bool IOMapSerialize::loadItem(PropStream &propStream, const std::shared_ptr<Cylinder> &parent, bool isHouseItem /*= false*/) { uint16_t id; if (!propStream.read<uint16_t>(id)) { return false; @@ -216,8 +216,8 @@ bool IOMapSerialize::loadItem(PropStream &propStream, std::shared_ptr<Cylinder> return true; } -void IOMapSerialize::saveItem(PropWriteStream &stream, std::shared_ptr<Item> item) { - std::shared_ptr<Container> container = item->getContainer(); +void IOMapSerialize::saveItem(PropWriteStream &stream, const std::shared_ptr<Item> &item) { + const auto &container = item->getContainer(); // Write ID & props stream.write<uint16_t>(item->getID()); @@ -235,27 +235,25 @@ void IOMapSerialize::saveItem(PropWriteStream &stream, std::shared_ptr<Item> ite stream.write<uint8_t>(0x00); // attr end } -void IOMapSerialize::saveTile(PropWriteStream &stream, std::shared_ptr<Tile> tile) { +void IOMapSerialize::saveTile(PropWriteStream &stream, const std::shared_ptr<Tile> &tile) { const TileItemVector* tileItems = tile->getItemList(); if (!tileItems) { return; } - std::vector<std::shared_ptr<Item>> items; - items.reserve(32); - + std::list<std::shared_ptr<Item>> items; uint16_t count = 0; for (auto &item : *tileItems) { if (item->getID() == ITEM_BATHTUB_FILLED_NOTMOVABLE) { std::shared_ptr<Item> tub = Item::CreateItem(ITEM_BATHTUB_FILLED); - items.emplace_back(tub); + items.push_front(tub); ++count; continue; } else if (!item->isSavedToHouses()) { continue; } - items.emplace_back(item); + items.push_front(item); ++count; } @@ -266,7 +264,7 @@ void IOMapSerialize::saveTile(PropWriteStream &stream, std::shared_ptr<Tile> til stream.write<uint8_t>(tilePosition.z); stream.write<uint32_t>(count); - for (std::shared_ptr<Item> item : items) { + for (const std::shared_ptr<Item> &item : items) { saveItem(stream, item); } } @@ -284,10 +282,10 @@ bool IOMapSerialize::loadHouseInfo() { auto houseId = result->getNumber<uint32_t>("id"); const auto house = g_game().map.houses.getHouse(houseId); if (house) { - uint32_t owner = result->getNumber<uint32_t>("owner"); - int32_t newOwner = result->getNumber<int32_t>("new_owner"); + auto owner = result->getNumber<uint32_t>("owner"); + auto newOwner = result->getNumber<int32_t>("new_owner"); // Transfer house owner - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (isTransferOnRestart && newOwner >= 0) { g_game().setTransferPlayerHouseItems(houseId, owner); if (newOwner == 0) { @@ -372,7 +370,7 @@ bool IOMapSerialize::SaveHouseInfoGuard() { listText.clear(); } - for (std::shared_ptr<Door> door : house->getDoors()) { + for (const std::shared_ptr<Door> &door : house->getDoors()) { if (door->getAccessList(listText) && !listText.empty()) { query << house->getId() << ',' << door->getDoorId() << ',' << db.escapeString(listText) << ',' << version; if (!listUpdate.addRow(query)) { diff --git a/src/io/iomapserialize.hpp b/src/io/iomapserialize.hpp index 08cbac011..ae1c9ccb5 100644 --- a/src/io/iomapserialize.hpp +++ b/src/io/iomapserialize.hpp @@ -21,9 +21,9 @@ class IOMapSerialize { private: static bool SaveHouseInfoGuard(); static bool SaveHouseItemsGuard(); - static void saveItem(PropWriteStream &stream, std::shared_ptr<Item> item); - static void saveTile(PropWriteStream &stream, std::shared_ptr<Tile> tile); + static void saveItem(PropWriteStream &stream, const std::shared_ptr<Item> &item); + static void saveTile(PropWriteStream &stream, const std::shared_ptr<Tile> &tile); - static bool loadContainer(PropStream &propStream, std::shared_ptr<Container> container); - static bool loadItem(PropStream &propStream, std::shared_ptr<Cylinder> parent, bool isHouseItem = false); + static bool loadContainer(PropStream &propStream, const std::shared_ptr<Container> &container); + static bool loadItem(PropStream &propStream, const std::shared_ptr<Cylinder> &parent, bool isHouseItem = false); }; diff --git a/src/io/iomarket.cpp b/src/io/iomarket.cpp index a0253e2ea..3332ffab1 100644 --- a/src/io/iomarket.cpp +++ b/src/io/iomarket.cpp @@ -7,18 +7,19 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "io/iomarket.hpp" + +#include "config/configmanager.hpp" #include "database/databasetasks.hpp" -#include "io/iologindata.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/save_manager.hpp" +#include "io/iologindata.hpp" +#include "items/containers/inbox/inbox.hpp" uint8_t IOMarket::getTierFromDatabaseTable(const std::string &string) { auto tier = static_cast<uint8_t>(std::atoi(string.c_str())); - if (tier > g_configManager().getNumber(FORGE_MAX_ITEM_TIER, __FUNCTION__)) { + if (tier > g_configManager().getNumber(FORGE_MAX_ITEM_TIER)) { g_logger().error("{} - Failed to get number value {} for tier table result", __FUNCTION__, tier); return 0; } @@ -41,7 +42,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action) { return offerList; } - const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION); do { MarketOffer offer; @@ -72,7 +73,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action, uint16_t itemId return offerList; } - const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION); do { MarketOffer offer; @@ -95,7 +96,7 @@ MarketOfferList IOMarket::getActiveOffers(MarketAction_t action, uint16_t itemId MarketOfferList IOMarket::getOwnOffers(MarketAction_t action, uint32_t playerId) { MarketOfferList offerList; - const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const int32_t marketOfferDuration = g_configManager().getNumber(MARKET_OFFER_DURATION); std::ostringstream query; query << "SELECT `id`, `amount`, `price`, `created`, `itemtype`, `tier` FROM `market_offers` WHERE `player_id` = " << playerId << " AND `sale` = " << action; @@ -130,7 +131,7 @@ HistoryMarketOfferList IOMarket::getOwnHistory(MarketAction_t action, uint32_t p } do { - HistoryMarketOffer offer; + HistoryMarketOffer offer {}; offer.itemId = result->getNumber<uint16_t>("itemtype"); offer.amount = result->getNumber<uint16_t>("amount"); offer.price = result->getNumber<uint64_t>("price"); @@ -149,7 +150,7 @@ HistoryMarketOfferList IOMarket::getOwnHistory(MarketAction_t action, uint32_t p return offerList; } -void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { +void IOMarket::processExpiredOffers(const DBResult_ptr &result, bool) { if (!result) { return; } @@ -159,8 +160,8 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { continue; } - const uint32_t playerId = result->getNumber<uint32_t>("player_id"); - const uint16_t amount = result->getNumber<uint16_t>("amount"); + const auto playerId = result->getNumber<uint32_t>("player_id"); + const auto amount = result->getNumber<uint16_t>("amount"); auto tier = getTierFromDatabaseTable(result->getString("tier")); if (result->getNumber<uint16_t>("sale") == 1) { const ItemType &itemType = Item::items[result->getNumber<uint16_t>("itemtype")]; @@ -168,7 +169,7 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { continue; } - std::shared_ptr<Player> player = g_game().getPlayerByGUID(playerId, true); + const auto &player = g_game().getPlayerByGUID(playerId, true); if (!player) { continue; } @@ -177,7 +178,7 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { uint16_t tmpAmount = amount; while (tmpAmount > 0) { uint16_t stackCount = std::min<uint16_t>(100, tmpAmount); - std::shared_ptr<Item> item = Item::CreateItem(itemType.id, stackCount); + const auto &item = Item::CreateItem(itemType.id, stackCount); if (g_game().internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { g_logger().error("[{}] Ocurred an error to add item with id {} to player {}", __FUNCTION__, itemType.id, player->getName()); @@ -199,7 +200,7 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { } for (uint16_t i = 0; i < amount; ++i) { - std::shared_ptr<Item> item = Item::CreateItem(itemType.id, subType); + const auto &item = Item::CreateItem(itemType.id, subType); if (g_game().internalAddItem(player->getInbox(), item, INDEX_WHEREEVER, FLAG_NOLIMIT) != RETURNVALUE_NOERROR) { break; } @@ -216,7 +217,7 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { } else { uint64_t totalPrice = result->getNumber<uint64_t>("price") * amount; - std::shared_ptr<Player> player = g_game().getPlayerByGUID(playerId); + const auto &player = g_game().getPlayerByGUID(playerId); if (player) { player->setBankBalance(player->getBankBalance() + totalPrice); } else { @@ -227,13 +228,13 @@ void IOMarket::processExpiredOffers(DBResult_ptr result, bool) { } void IOMarket::checkExpiredOffers() { - const time_t lastExpireDate = getTimeNow() - g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const time_t lastExpireDate = getTimeNow() - g_configManager().getNumber(MARKET_OFFER_DURATION); std::ostringstream query; query << "SELECT `id`, `amount`, `price`, `itemtype`, `player_id`, `sale`, `tier` FROM `market_offers` WHERE `created` <= " << lastExpireDate; g_databaseTasks().store(query.str(), IOMarket::processExpiredOffers); - int32_t checkExpiredMarketOffersEachMinutes = g_configManager().getNumber(CHECK_EXPIRED_MARKET_OFFERS_EACH_MINUTES, __FUNCTION__); + int32_t checkExpiredMarketOffersEachMinutes = g_configManager().getNumber(CHECK_EXPIRED_MARKET_OFFERS_EACH_MINUTES); if (checkExpiredMarketOffersEachMinutes <= 0) { return; } @@ -255,7 +256,7 @@ uint32_t IOMarket::getPlayerOfferCount(uint32_t playerId) { MarketOfferEx IOMarket::getOfferByCounter(uint32_t timestamp, uint16_t counter) { MarketOfferEx offer; - const int32_t created = timestamp - g_configManager().getNumber(MARKET_OFFER_DURATION, __FUNCTION__); + const int32_t created = timestamp - g_configManager().getNumber(MARKET_OFFER_DURATION); std::ostringstream query; query << "SELECT `id`, `sale`, `itemtype`, `amount`, `created`, `price`, `player_id`, `anonymous`, `tier`, (SELECT `name` FROM `players` WHERE `id` = `player_id`) AS `player_name` FROM `market_offers` WHERE `created` = " << created << " AND (`id` & 65535) = " << counter << " LIMIT 1"; diff --git a/src/io/iomarket.hpp b/src/io/iomarket.hpp index 4292651fb..5a078bbc1 100644 --- a/src/io/iomarket.hpp +++ b/src/io/iomarket.hpp @@ -26,7 +26,7 @@ class IOMarket { static MarketOfferList getOwnOffers(MarketAction_t action, uint32_t playerId); static HistoryMarketOfferList getOwnHistory(MarketAction_t action, uint32_t playerId); - static void processExpiredOffers(DBResult_ptr result, bool); + static void processExpiredOffers(const DBResult_ptr &result, bool); static void checkExpiredOffers(); static uint32_t getPlayerOfferCount(uint32_t playerId); diff --git a/src/io/ioprey.cpp b/src/io/ioprey.cpp index 6b2816355..65838a166 100644 --- a/src/io/ioprey.cpp +++ b/src/io/ioprey.cpp @@ -7,14 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "io/ioprey.hpp" -#include "creatures/monsters/monster.hpp" -#include "creatures/players/player.hpp" #include "config/configmanager.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "io/ioprey.hpp" +#include "lib/di/container.hpp" #include "lib/metrics/metrics.hpp" +#include "server/network/message/networkmessage.hpp" // Prey class PreySlot::PreySlot(PreySlot_t id) : @@ -22,7 +23,7 @@ PreySlot::PreySlot(PreySlot_t id) : eraseBonus(); reloadBonusValue(); reloadBonusType(); - freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(PREY_FREE_REROLL_TIME, __FUNCTION__) * 1000; + freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(PREY_FREE_REROLL_TIME) * 1000; } void PreySlot::reloadBonusType() { @@ -56,15 +57,16 @@ void PreySlot::reloadBonusValue() { void PreySlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_t level) { raceIdList.clear(); - if (!g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(PREY_ENABLED)) { return; } // Disabling prey system if the server have less then 36 registered monsters on bestiary because: // - Impossible to generate random lists without duplications on slots. // - Stress the server with unnecessary loops. - std::map<uint16_t, std::string> bestiary = g_game().getBestiaryList(); + const std::map<uint16_t, std::string> &bestiary = g_game().getBestiaryList(); if (bestiary.size() < 36) { + g_logger().error("[PreySlot::reloadMonsterGrid] - Bestiary size is less than 36, disabling prey system."); return; } @@ -107,7 +109,7 @@ void PreySlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_t level blackList.push_back(raceId); const auto mtype = g_monsters().getMonsterTypeByRaceId(raceId); - if (!mtype || mtype->info.experience == 0) { + if (!mtype || mtype->info.experience == 0 || !mtype->info.isPreyable || mtype->info.isPreyExclusive) { continue; } else if (stageOne != 0 && mtype->info.bestiaryStars <= 1) { raceIdList.push_back(raceId); @@ -131,13 +133,13 @@ void PreySlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_t level // Task hunting class TaskHuntingSlot::TaskHuntingSlot(PreySlot_t id) : id(id) { - freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_FREE_REROLL_TIME, __FUNCTION__) * 1000; + freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_FREE_REROLL_TIME) * 1000; } void TaskHuntingSlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_t level) { raceIdList.clear(); - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { return; } @@ -188,7 +190,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_ blackList.push_back(raceId); const auto mtype = g_monsters().getMonsterTypeByRaceId(raceId); - if (!mtype || mtype->info.experience == 0) { + if (!mtype || mtype->info.experience == 0 || !mtype->info.isPreyable || mtype->info.isPreyExclusive) { continue; } else if (stageOne != 0 && mtype->info.bestiaryStars <= 1) { raceIdList.push_back(raceId); @@ -210,7 +212,7 @@ void TaskHuntingSlot::reloadMonsterGrid(std::vector<uint16_t> blackList, uint32_ } void TaskHuntingSlot::reloadReward() { - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { return; } @@ -245,8 +247,12 @@ void TaskHuntingSlot::reloadReward() { } } +IOPrey &IOPrey::getInstance() { + return inject<IOPrey>(); +} + // Prey/Task hunting global class -void IOPrey::checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) const { +void IOPrey::checkPlayerPreys(const std::shared_ptr<Player> &player, uint8_t amount) const { if (!player) { return; } @@ -256,10 +262,10 @@ void IOPrey::checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) co slot && slot->isOccupied()) { if (slot->bonusTimeLeft <= amount) { if (slot->option == PreyOption_AutomaticReroll) { - if (player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE, __FUNCTION__)))) { + if (player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE)))) { slot->reloadBonusType(); slot->reloadBonusValue(); - slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME, __FUNCTION__)); + slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME)); player->sendTextMessage(MESSAGE_STATUS, "Your prey bonus type and time has been succesfully reseted."); player->reloadPreySlot(static_cast<PreySlot_t>(slotId)); continue; @@ -267,8 +273,8 @@ void IOPrey::checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) co player->sendTextMessage(MESSAGE_STATUS, "You don't have enought prey cards to enable automatic reroll when your slot expire."); } else if (slot->option == PreyOption_Locked) { - if (player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE, __FUNCTION__)))) { - slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME, __FUNCTION__)); + if (player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { + slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME)); player->sendTextMessage(MESSAGE_STATUS, "Your prey bonus time has been succesfully reseted."); player->reloadPreySlot(static_cast<PreySlot_t>(slotId)); continue; @@ -276,6 +282,7 @@ void IOPrey::checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) co player->sendTextMessage(MESSAGE_STATUS, "You don't have enought prey cards to lock monster and bonus when the slot expire."); } else { + slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); player->sendTextMessage(MESSAGE_STATUS, "Your prey bonus has expired."); } @@ -289,7 +296,7 @@ void IOPrey::checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) co } } -void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, PreyAction_t action, PreyOption_t option, int8_t index, uint16_t raceId) const { +void IOPrey::parsePreyAction(const std::shared_ptr<Player> &player, PreySlot_t slotId, PreyAction_t action, PreyOption_t option, int8_t index, uint16_t raceId) const { const auto &slot = player->getPreySlotById(slotId); if (!slot || slot->state == PreyDataState_Locked) { player->sendMessageDialog("To unlock this prey slot first you must buy it on store."); @@ -301,7 +308,7 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, player->sendMessageDialog("You don't have enought money to reroll the prey slot."); return; } else if (slot->freeRerollTimeStamp <= OTSYS_TIME()) { - slot->freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(PREY_FREE_REROLL_TIME, __FUNCTION__) * 1000; + slot->freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(PREY_FREE_REROLL_TIME) * 1000; } else { g_metrics().addCounter("balance_decrease", player->getPreyRerollPrice(), { { "player", player->getName() }, { "context", "prey_reroll" } }); } @@ -312,7 +319,7 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, } slot->reloadMonsterGrid(player->getPreyBlackList(), player->getLevel()); } else if (action == PreyAction_ListAll_Cards) { - if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE, __FUNCTION__)))) { + if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE)))) { player->sendMessageDialog("You don't have enought prey cards to choose a monsters on the list."); return; } @@ -321,6 +328,7 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, slot->selectedRaceId = 0; slot->state = PreyDataState_ListSelection; } else if (action == PreyAction_ListAll_Selection) { + const auto mtype = g_monsters().getMonsterTypeByRaceId(raceId); if (slot->isOccupied()) { player->sendMessageDialog("You already have an active monster on this prey slot."); return; @@ -330,6 +338,9 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, } else if (player->getPreyWithMonster(raceId)) { player->sendMessageDialog("This creature is already selected on another slot."); return; + } else if (mtype && !mtype->info.isPreyable) { + player->sendMessageDialog("This creature can't be select on prey. Please choose another one."); + return; } if (slot->bonus == PreyBonus_None) { @@ -340,19 +351,19 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, slot->state = PreyDataState_Active; slot->selectedRaceId = raceId; slot->removeMonsterType(raceId); - slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME, __FUNCTION__)); + slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME)); } else if (action == PreyAction_BonusReroll) { if (!slot->isOccupied()) { player->sendMessageDialog("You don't have any active monster on this prey slot."); return; - } else if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE, __FUNCTION__)))) { + } else if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE)))) { player->sendMessageDialog("You don't have enought prey cards to reroll this prey slot bonus type."); return; } slot->reloadBonusType(); slot->reloadBonusValue(); - slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME, __FUNCTION__)); + slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME)); } else if (action == PreyAction_MonsterSelection) { if (slot->isOccupied()) { player->sendMessageDialog("You already have an active monster on this prey slot."); @@ -372,12 +383,12 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, slot->state = PreyDataState_Active; slot->selectedRaceId = slot->raceIdList[index]; slot->removeMonsterType(slot->selectedRaceId); - slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME, __FUNCTION__)); + slot->bonusTimeLeft = static_cast<uint16_t>(g_configManager().getNumber(PREY_BONUS_TIME)); } else if (action == PreyAction_Option) { - if (option == PreyOption_AutomaticReroll && player->getPreyCards() < static_cast<uint64_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE, __FUNCTION__))) { + if (option == PreyOption_AutomaticReroll && player->getPreyCards() < static_cast<uint64_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE))) { player->sendMessageDialog("You don't have enought prey cards to enable automatic reroll when your slot expire."); return; - } else if (option == PreyOption_Locked && player->getPreyCards() < static_cast<uint64_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE, __FUNCTION__))) { + } else if (option == PreyOption_Locked && player->getPreyCards() < static_cast<uint64_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE))) { player->sendMessageDialog("You don't have enought prey cards to lock monster and bonus when the slot expire."); return; } @@ -391,7 +402,7 @@ void IOPrey::parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, player->reloadPreySlot(slotId); } -void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t slotId, PreyTaskAction_t action, bool upgrade, uint16_t raceId) const { +void IOPrey::parseTaskHuntingAction(const std::shared_ptr<Player> &player, PreySlot_t slotId, PreyTaskAction_t action, bool upgrade, uint16_t raceId) const { const auto &slot = player->getTaskHuntingSlotById(slotId); if (!slot || slot->state == PreyTaskDataState_Locked) { player->sendMessageDialog("To unlock this task hunting slot first you must buy it on store."); @@ -408,7 +419,7 @@ void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t s player->sendMessageDialog("You don't have enought money to reroll the task hunting slot."); return; } else if (slot->freeRerollTimeStamp <= OTSYS_TIME()) { - slot->freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_FREE_REROLL_TIME, __FUNCTION__) * 1000; + slot->freeRerollTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_FREE_REROLL_TIME) * 1000; } else { g_metrics().addCounter("balance_decrease", player->getTaskHuntingRerollPrice(), { { "player", player->getName() }, { "context", "hunting_task_reroll" } }); } @@ -418,7 +429,7 @@ void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t s slot->state = PreyTaskDataState_Selection; slot->reloadMonsterGrid(player->getTaskHuntingBlackList(), player->getLevel()); } else if (action == PreyTaskAction_RewardsReroll) { - if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(TASK_HUNTING_BONUS_REROLL_PRICE, __FUNCTION__)))) { + if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(TASK_HUNTING_BONUS_REROLL_PRICE)))) { player->sendMessageDialog("You don't have enought prey cards to reroll you task reward rarity."); return; } @@ -430,7 +441,7 @@ void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t s ss << "You need to wait " << ((slot->disabledUntilTimeStamp - OTSYS_TIME()) / 60000) << " minutes to select a new creature on task."; player->sendMessageDialog(ss.str()); return; - } else if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(TASK_HUNTING_SELECTION_LIST_PRICE, __FUNCTION__)))) { + } else if (!player->usePreyCards(static_cast<uint16_t>(g_configManager().getNumber(TASK_HUNTING_SELECTION_LIST_PRICE)))) { player->sendMessageDialog("You don't have enought prey cards to choose a creature on list for you task hunting slot."); return; } @@ -518,7 +529,7 @@ void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t s player->addTaskHuntingPoints(reward); player->sendMessageDialog(ss.str()); slot->reloadMonsterGrid(player->getTaskHuntingBlackList(), player->getLevel()); - slot->disabledUntilTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_LIMIT_EXHAUST, __FUNCTION__) * 1000; + slot->disabledUntilTimeStamp = OTSYS_TIME() + g_configManager().getNumber(TASK_HUNTING_LIMIT_EXHAUST) * 1000; } } else { g_logger().warn("[IOPrey::parseTaskHuntingAction] - Unknown task action: {}", fmt::underlying(action)); @@ -528,7 +539,7 @@ void IOPrey::parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t s } void IOPrey::initializeTaskHuntOptions() { - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { return; } @@ -590,7 +601,11 @@ void IOPrey::initializeTaskHuntOptions() { msg.add<uint16_t>(option->secondKills); msg.add<uint16_t>(option->secondReward); }); - baseDataMessage = msg; + m_baseDataMessage = msg; +} + +NetworkMessage IOPrey::getTaskHuntingBaseDate() const { + return m_baseDataMessage; } const std::unique_ptr<TaskHuntingOption> &IOPrey::getTaskRewardOption(const std::unique_ptr<TaskHuntingSlot> &slot) const { diff --git a/src/io/ioprey.hpp b/src/io/ioprey.hpp index 221f2ce55..b7470563d 100644 --- a/src/io/ioprey.hpp +++ b/src/io/ioprey.hpp @@ -9,12 +9,14 @@ #pragma once -#include "lib/di/container.hpp" -#include "server/network/protocol/protocolgame.hpp" +// TODO: Remove circular includes (maybe shared_ptr?) +#include "server/network/message/networkmessage.hpp" class PreySlot; class TaskHuntingSlot; class TaskHuntingOption; +class NetworkMessage; +class Player; static const std::unique_ptr<PreySlot> &PreySlotNull {}; static const std::unique_ptr<TaskHuntingSlot> &TaskHuntingSlotNull {}; @@ -221,23 +223,19 @@ class IOPrey { IOPrey(const IOPrey &) = delete; void operator=(const IOPrey &) = delete; - static IOPrey &getInstance() { - return inject<IOPrey>(); - } + static IOPrey &getInstance(); - void checkPlayerPreys(std::shared_ptr<Player> player, uint8_t amount) const; - void parsePreyAction(std::shared_ptr<Player> player, PreySlot_t slotId, PreyAction_t action, PreyOption_t option, int8_t index, uint16_t raceId) const; + void checkPlayerPreys(const std::shared_ptr<Player> &player, uint8_t amount) const; + void parsePreyAction(const std::shared_ptr<Player> &player, PreySlot_t slotId, PreyAction_t action, PreyOption_t option, int8_t index, uint16_t raceId) const; - void parseTaskHuntingAction(std::shared_ptr<Player> player, PreySlot_t slotId, PreyTaskAction_t action, bool upgrade, uint16_t raceId) const; + void parseTaskHuntingAction(const std::shared_ptr<Player> &player, PreySlot_t slotId, PreyTaskAction_t action, bool upgrade, uint16_t raceId) const; void initializeTaskHuntOptions(); const std::unique_ptr<TaskHuntingOption> &getTaskRewardOption(const std::unique_ptr<TaskHuntingSlot> &slot) const; - NetworkMessage getTaskHuntingBaseDate() const { - return baseDataMessage; - } + NetworkMessage getTaskHuntingBaseDate() const; - NetworkMessage baseDataMessage; + NetworkMessage m_baseDataMessage; std::vector<std::unique_ptr<TaskHuntingOption>> taskOption; }; diff --git a/src/items/bed.cpp b/src/items/bed.cpp index 4b38be3b4..25e95318e 100644 --- a/src/items/bed.cpp +++ b/src/items/bed.cpp @@ -7,13 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/bed.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" #include "game/game.hpp" -#include "io/iologindata.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/save_manager.hpp" +#include "io/iologindata.hpp" +#include "server/network/protocol/protocolgame.hpp" BedItem::BedItem(uint16_t id) : Item(id) { @@ -29,7 +31,7 @@ Attr_ReadValue BedItem::readAttr(AttrTypes_t attr, PropStream &propStream) { } if (guid != 0) { - std::string name = IOLoginData::getNameByGuid(guid); + const std::string name = IOLoginData::getNameByGuid(guid); if (!name.empty()) { setAttribute(ItemAttribute_t::DESCRIPTION, name + " is sleeping there."); g_game().setBedSleeper(static_self_cast<BedItem>(), guid); @@ -69,22 +71,22 @@ void BedItem::serializeAttr(PropWriteStream &propWriteStream) const { } std::shared_ptr<BedItem> BedItem::getNextBedItem() { - Direction dir = Item::items[id].bedPartnerDir; - Position targetPos = getNextPosition(dir, getPosition()); + const Direction dir = Item::items[id].bedPartnerDir; + const Position targetPos = getNextPosition(dir, getPosition()); - std::shared_ptr<Tile> tile = g_game().map.getTile(targetPos); + const auto &tile = g_game().map.getTile(targetPos); if (tile == nullptr) { return nullptr; } return tile->getBedItem(); } -bool BedItem::canUse(std::shared_ptr<Player> player) { +bool BedItem::canUse(const std::shared_ptr<Player> &player) { if ((player == nullptr) || (house == nullptr) || !player->isPremium()) { return false; } - auto nextBedItem = getNextBedItem(); + const auto &nextBedItem = getNextBedItem(); if (nextBedItem == nullptr) { return false; } @@ -106,7 +108,7 @@ bool BedItem::canUse(std::shared_ptr<Player> player) { return true; } - auto sleeper = std::make_shared<Player>(nullptr); + const auto sleeper = std::make_shared<Player>(nullptr); if (!IOLoginData::loadPlayerById(sleeper, sleeperGUID)) { return false; } @@ -117,7 +119,7 @@ bool BedItem::canUse(std::shared_ptr<Player> player) { return true; } -bool BedItem::isBedComplete(std::shared_ptr<BedItem> nextBedItem) { +bool BedItem::isBedComplete(const std::shared_ptr<BedItem> &nextBedItem) const { const ItemType &it = Item::items[id]; if (nextBedItem == nullptr) { @@ -134,7 +136,7 @@ bool BedItem::isBedComplete(std::shared_ptr<BedItem> nextBedItem) { return it.bedPartOf == nextBedItem->getID(); } -bool BedItem::trySleep(std::shared_ptr<Player> player) { +bool BedItem::trySleep(const std::shared_ptr<Player> &player) { if (!house || player->isRemoved()) { return false; } @@ -150,7 +152,7 @@ bool BedItem::trySleep(std::shared_ptr<Player> player) { return true; } -bool BedItem::sleep(std::shared_ptr<Player> player) { +bool BedItem::sleep(const std::shared_ptr<Player> &player) { if (house == nullptr) { return false; } @@ -159,7 +161,7 @@ bool BedItem::sleep(std::shared_ptr<Player> player) { return false; } - std::shared_ptr<BedItem> nextBedItem = getNextBedItem(); + const auto &nextBedItem = getNextBedItem(); internalSetSleeper(player); @@ -171,7 +173,9 @@ bool BedItem::sleep(std::shared_ptr<Player> player) { g_game().setBedSleeper(static_self_cast<BedItem>(), player->getGUID()); // make the player walk onto the bed - g_game().map.moveCreature(player, getTile()); + g_dispatcher().addWalkEvent([player, this] { + g_game().map.moveCreature(player, getTile()); + }); // display 'Zzzz'/sleep effect g_game().addMagicEffect(player->getPosition(), CONST_ME_SLEEP); @@ -191,7 +195,7 @@ bool BedItem::sleep(std::shared_ptr<Player> player) { return true; } -void BedItem::wakeUp(std::shared_ptr<Player> player) { +void BedItem::wakeUp(const std::shared_ptr<Player> &player) { if (house == nullptr) { return; } @@ -215,7 +219,7 @@ void BedItem::wakeUp(std::shared_ptr<Player> player) { // update the bedSleepersMap g_game().removeBedSleeper(sleeperGUID); - std::shared_ptr<BedItem> nextBedItem = getNextBedItem(); + const auto &nextBedItem = getNextBedItem(); // unset sleep info internalRemoveSleeper(); @@ -232,10 +236,10 @@ void BedItem::wakeUp(std::shared_ptr<Player> player) { } } -void BedItem::regeneratePlayer(std::shared_ptr<Player> player) const { +void BedItem::regeneratePlayer(const std::shared_ptr<Player> &player) const { const uint32_t sleptTime = time(nullptr) - sleepStart; - std::shared_ptr<Condition> condition = player->getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT); + const auto &condition = player->getCondition(CONDITION_REGENERATION, CONDITIONID_DEFAULT); if (condition != nullptr) { uint32_t regen; if (condition->getTicks() != -1) { @@ -250,15 +254,15 @@ void BedItem::regeneratePlayer(std::shared_ptr<Player> player) const { regen = sleptTime / 30; } - player->changeHealth(regen * g_configManager().getFloat(RATE_HEALTH_REGEN, __FUNCTION__), false); - player->changeMana(regen * g_configManager().getFloat(RATE_MANA_REGEN, __FUNCTION__)); + player->changeHealth(regen * g_configManager().getFloat(RATE_HEALTH_REGEN), false); + player->changeMana(regen * g_configManager().getFloat(RATE_MANA_REGEN)); } const int32_t soulRegen = sleptTime / (60 * 15); // RATE_SOUL_REGEN_SPEED? player->changeSoul(soulRegen); } -void BedItem::updateAppearance(std::shared_ptr<Player> player) { +void BedItem::updateAppearance(const std::shared_ptr<Player> &player) { const ItemType &it = Item::items[id]; if (it.type == ITEM_TYPE_BED) { if ((player != nullptr) && it.transformToOnUse[player->getSex()] != 0) { @@ -275,8 +279,8 @@ void BedItem::updateAppearance(std::shared_ptr<Player> player) { } } -void BedItem::internalSetSleeper(std::shared_ptr<Player> player) { - std::string desc_str = player->getName() + " is sleeping there."; +void BedItem::internalSetSleeper(const std::shared_ptr<Player> &player) { + const std::string desc_str = player->getName() + " is sleeping there."; sleeperGUID = player->getGUID(); sleepStart = time(nullptr); diff --git a/src/items/bed.hpp b/src/items/bed.hpp index 2aeb6e38e..725db01ea 100644 --- a/src/items/bed.hpp +++ b/src/items/bed.hpp @@ -37,25 +37,25 @@ class BedItem final : public Item { house = h; } - bool canUse(std::shared_ptr<Player> player); + bool canUse(const std::shared_ptr<Player> &player); - bool isBedComplete(std::shared_ptr<BedItem> nextBedItem); + bool isBedComplete(const std::shared_ptr<BedItem> &nextBedItem) const; - bool trySleep(std::shared_ptr<Player> player); - bool sleep(std::shared_ptr<Player> player); - void wakeUp(std::shared_ptr<Player> player); + bool trySleep(const std::shared_ptr<Player> &player); + bool sleep(const std::shared_ptr<Player> &player); + void wakeUp(const std::shared_ptr<Player> &player); std::shared_ptr<BedItem> getNextBedItem(); friend class MapCache; private: - void updateAppearance(std::shared_ptr<Player> player); - void regeneratePlayer(std::shared_ptr<Player> player) const; - void internalSetSleeper(std::shared_ptr<Player> player); + void updateAppearance(const std::shared_ptr<Player> &player); + void regeneratePlayer(const std::shared_ptr<Player> &player) const; + void internalSetSleeper(const std::shared_ptr<Player> &player); void internalRemoveSleeper(); std::shared_ptr<House> house; - uint64_t sleepStart; - uint32_t sleeperGUID; + uint64_t sleepStart {}; + uint32_t sleeperGUID {}; }; diff --git a/src/items/containers/container.cpp b/src/items/containers/container.cpp index 6c526a850..70ad1cbab 100644 --- a/src/items/containers/container.cpp +++ b/src/items/containers/container.cpp @@ -7,26 +7,25 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/container.hpp" -#include "items/decay/decay.hpp" -#include "io/iomap.hpp" + +#include "config/configmanager.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" #include "map/spectators.hpp" Container::Container(uint16_t type) : Container(type, items[type].maxItems) { - m_maxItems = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER_ITEM, __FUNCTION__)); + m_maxItems = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER_ITEM)); if (getID() == ITEM_GOLD_POUCH) { pagination = true; - m_maxItems = g_configManager().getNumber(LOOTPOUCH_MAXLIMIT, __FUNCTION__); + m_maxItems = g_configManager().getNumber(LOOTPOUCH_MAXLIMIT); maxSize = 32; } if (isStoreInbox()) { pagination = true; - m_maxItems = g_configManager().getNumber(STOREINBOX_MAXLIMIT, __FUNCTION__); + m_maxItems = g_configManager().getNumber(STOREINBOX_MAXLIMIT); maxSize = 32; } } @@ -45,37 +44,62 @@ std::shared_ptr<Container> Container::create(uint16_t type, uint16_t size, bool return std::make_shared<Container>(type, size, unlocked, pagination); } -std::shared_ptr<Container> Container::create(std::shared_ptr<Tile> tile) { - auto container = std::make_shared<Container>(ITEM_BROWSEFIELD, 30, false, true); - TileItemVector* itemVector = tile->getItemList(); +std::shared_ptr<Container> Container::createBrowseField(const std::shared_ptr<Tile> &tile) { + const auto &newContainer = create(ITEM_BROWSEFIELD, 30, false, true); + if (!newContainer || !tile) { + return nullptr; + } + + const TileItemVector* itemVector = tile->getItemList(); if (itemVector) { - for (auto &item : *itemVector) { - if (((item->getContainer() || item->hasProperty(CONST_PROP_MOVABLE)) || (item->isWrapable() && !item->hasProperty(CONST_PROP_MOVABLE) && !item->hasProperty(CONST_PROP_BLOCKPATH))) && !item->hasAttribute(ItemAttribute_t::UNIQUEID)) { - container->itemlist.push_front(item); - item->setParent(container); + for (const auto &item : *itemVector) { + if (!item) { + continue; } + + // Checks if the item has an internal container, is movable, or is packable without blocking the path. + bool isItemValid = item->getContainer() || item->hasProperty(CONST_PROP_MOVABLE) || (item->isWrapable() && !item->hasProperty(CONST_PROP_MOVABLE) && !item->hasProperty(CONST_PROP_BLOCKPATH)); + + // If the item has a unique ID or is not valid, skip to the next item. + if (item->hasAttribute(ItemAttribute_t::UNIQUEID) || !isItemValid) { + continue; + } + + // Add the item to the new container and set its parent. + newContainer->itemlist.push_front(item); + item->setParent(newContainer); } } - container->setParent(tile); - return container; + // Set the parent of the new container to be the tile. + newContainer->setParent(tile); + return newContainer; } Container::~Container() { if (getID() == ITEM_BROWSEFIELD) { - if (getParent() && getParent()->getTile()) { - g_game().browseFields.erase(getParent()->getTile()); - } + auto parent = getParent(); + if (parent) { + auto tile = parent->getTile(); + if (tile) { + auto browseField = g_game().browseFields.find(tile); + if (browseField != g_game().browseFields.end()) { + g_game().browseFields.erase(browseField); + } + } - for (std::shared_ptr<Item> item : itemlist) { - item->setParent(getParent()); + for (auto &item : itemlist) { + if (item) { + item->setParent(parent); + } + } } } } std::shared_ptr<Item> Container::clone() const { - std::shared_ptr<Container> clone = std::static_pointer_cast<Container>(Item::clone()); - for (std::shared_ptr<Item> item : itemlist) { + const std::shared_ptr<Container> &clone = std::static_pointer_cast<Container>(Item::clone()); + for (const std::shared_ptr<Item> &item : itemlist) { clone->addItem(item->clone()); } clone->totalWeight = totalWeight; @@ -83,7 +107,7 @@ std::shared_ptr<Item> Container::clone() const { } std::shared_ptr<Container> Container::getParentContainer() { - std::shared_ptr<Thing> thing = getParent(); + const std::shared_ptr<Thing> &thing = getParent(); if (!thing) { return nullptr; } @@ -114,31 +138,31 @@ std::shared_ptr<Container> Container::getRootContainer() { } bool Container::hasParent() { - auto parent = getParent(); + const auto &parent = getParent(); if (!parent) { return false; } - auto creature = parent->getCreature(); - bool isPlayer = creature && creature->getPlayer() != nullptr; + const auto &creature = parent->getCreature(); + const bool &isPlayer = creature && creature->getPlayer() != nullptr; return getID() != ITEM_BROWSEFIELD && !isPlayer; } -void Container::addItem(std::shared_ptr<Item> item) { +void Container::addItem(const std::shared_ptr<Item> &item) { itemlist.push_back(item); item->setParent(getContainer()); } StashContainerList Container::getStowableItems() const { StashContainerList toReturnList; - for (auto item : itemlist) { - if (item->getContainer() != NULL) { - auto subContainer = item->getContainer()->getStowableItems(); - for (auto subContItem : subContainer) { - std::shared_ptr<Item> containerItem = subContItem.first; - toReturnList.push_back(std::pair<std::shared_ptr<Item>, uint32_t>(containerItem, static_cast<uint32_t>(containerItem->getItemCount()))); + for (const auto &item : itemlist) { + if (item->getContainer() != nullptr) { + const auto &subContainer = item->getContainer()->getStowableItems(); + for (const auto &key : subContainer | std::views::keys) { + const auto &containerItem = key; + toReturnList.emplace_back(containerItem, static_cast<uint32_t>(containerItem->getItemCount())); } } else if (item->isItemStorable()) { - toReturnList.push_back(std::pair<std::shared_ptr<Item>, uint32_t>(item, static_cast<uint32_t>(item->getItemCount()))); + toReturnList.emplace_back(item, static_cast<uint32_t>(item->getItemCount())); } } @@ -156,12 +180,12 @@ Attr_ReadValue Container::readAttr(AttrTypes_t attr, PropStream &propStream) { } bool Container::unserializeItemNode(OTB::Loader &loader, const OTB::Node &node, PropStream &propStream, Position &itemPosition) { - bool ret = Item::unserializeItemNode(loader, node, propStream, itemPosition); + const bool ret = Item::unserializeItemNode(loader, node, propStream, itemPosition); if (!ret) { return false; } - for (auto &itemNode : node.children) { + for (const auto &itemNode : node.children) { // load container items if (itemNode.type != OTBM_ITEM) { // unknown type @@ -178,7 +202,7 @@ bool Container::unserializeItemNode(OTB::Loader &loader, const OTB::Node &node, return false; } - std::shared_ptr<Item> item = Item::CreateItem(id, itemPosition); + const auto &item = Item::CreateItem(id, itemPosition); if (!item) { continue; } @@ -193,7 +217,7 @@ bool Container::unserializeItemNode(OTB::Loader &loader, const OTB::Node &node, return true; } -bool Container::countsToLootAnalyzerBalance() { +bool Container::countsToLootAnalyzerBalance() const { if (isCorpse()) { return true; } @@ -225,9 +249,12 @@ std::string Container::getContentDescription(bool oldProtocol) { std::ostringstream &Container::getContentDescription(std::ostringstream &os, bool sendColoredMessage) { bool firstitem = true; for (ContainerIterator it = iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; + const auto &item = *it; + if (!item) { + continue; + } - std::shared_ptr<Container> container = item->getContainer(); + const auto &container = item->getContainer(); if (container && !container->empty()) { continue; } @@ -260,7 +287,7 @@ bool Container::isStoreInbox() const { } bool Container::isStoreInboxFiltered() const { - auto attribute = getAttribute<std::string>(ItemAttribute_t::STORE_INBOX_CATEGORY); + const auto attribute = getAttribute<std::string>(ItemAttribute_t::STORE_INBOX_CATEGORY); if (isStoreInbox() && !attribute.empty() && attribute != "All") { return true; } @@ -272,10 +299,10 @@ std::deque<std::shared_ptr<Item>> Container::getStoreInboxFilteredItems() const const auto enumName = getAttribute<std::string>(ItemAttribute_t::STORE_INBOX_CATEGORY); ItemDeque storeInboxFilteredList; if (isStoreInboxFiltered()) { - for (std::shared_ptr<Item> item : getItemList()) { + for (const std::shared_ptr<Item> &item : getItemList()) { auto itemId = item->getID(); - auto attribute = item->getCustomAttribute("unWrapId"); - uint16_t unWrapId = attribute ? static_cast<uint16_t>(attribute->getInteger()) : 0; + const auto attribute = item->getCustomAttribute("unWrapId"); + const uint16_t unWrapId = attribute ? static_cast<uint16_t>(attribute->getInteger()) : 0; if (unWrapId != 0) { itemId = unWrapId; } @@ -296,8 +323,8 @@ std::vector<ContainerCategory_t> Container::getStoreInboxValidCategories() const stdext::vector_set<ContainerCategory_t> validCategories; for (const auto &item : itemlist) { auto itemId = item->getID(); - auto attribute = item->getCustomAttribute("unWrapId"); - uint16_t unWrapId = attribute ? static_cast<uint16_t>(attribute->getInteger()) : 0; + const auto attribute = item->getCustomAttribute("unWrapId"); + const uint16_t unWrapId = attribute ? static_cast<uint16_t>(attribute->getInteger()) : 0; if (unWrapId != 0) { itemId = unWrapId; } @@ -315,14 +342,14 @@ std::vector<ContainerCategory_t> Container::getStoreInboxValidCategories() const } std::shared_ptr<Item> Container::getFilteredItemByIndex(size_t index) const { - const auto filteredItems = getStoreInboxFilteredItems(); + const auto &filteredItems = getStoreInboxFilteredItems(); if (index >= filteredItems.size()) { return nullptr; } - auto item = filteredItems[index]; + const auto &item = filteredItems[index]; - auto it = std::find(itemlist.begin(), itemlist.end(), item); + const auto it = std::ranges::find(itemlist, item); if (it == itemlist.end()) { return nullptr; } @@ -356,7 +383,7 @@ uint32_t Container::getContainerHoldingCount() { return counter; } -bool Container::isHoldingItem(std::shared_ptr<Item> item) { +bool Container::isHoldingItem(const std::shared_ptr<Item> &item) { for (ContainerIterator it = iterator(); it.hasNext(); it.advance()) { if (*it == item) { return true; @@ -367,8 +394,8 @@ bool Container::isHoldingItem(std::shared_ptr<Item> item) { bool Container::isHoldingItemWithId(const uint16_t id) { for (ContainerIterator it = iterator(); it.hasNext(); it.advance()) { - std::shared_ptr<Item> item = *it; - if (item->getID() == id) { + const auto &item = *it; + if (item && item->getID() == id) { return true; } } @@ -398,8 +425,8 @@ bool Container::isBrowseFieldAndHoldsRewardChest() { return getID() == ITEM_BROWSEFIELD && isHoldingItemWithId(ITEM_REWARD_CHEST); } -void Container::onAddContainerItem(std::shared_ptr<Item> item) { - auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); +void Container::onAddContainerItem(const std::shared_ptr<Item> &item) { + const auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); // send to client for (const auto &spectator : spectators) { @@ -412,8 +439,8 @@ void Container::onAddContainerItem(std::shared_ptr<Item> item) { } } -void Container::onUpdateContainerItem(uint32_t index, std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem) { - auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); +void Container::onUpdateContainerItem(uint32_t index, const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem) { + const auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); // send to client for (const auto &spectator : spectators) { @@ -426,8 +453,8 @@ void Container::onUpdateContainerItem(uint32_t index, std::shared_ptr<Item> oldI } } -void Container::onRemoveContainerItem(uint32_t index, std::shared_ptr<Item> item) { - auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); +void Container::onRemoveContainerItem(uint32_t index, const std::shared_ptr<Item> &item) { + const auto spectators = Spectators().find<Player>(getPosition(), false, 2, 2, 2, 2); // send change to client for (const auto &spectator : spectators) { @@ -440,8 +467,8 @@ void Container::onRemoveContainerItem(uint32_t index, std::shared_ptr<Item> item } } -ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> &addThing, uint32_t addCount, uint32_t flags, std::shared_ptr<Creature> actor /* = nullptr*/) { - bool childIsOwner = hasBitSet(FLAG_CHILDISOWNER, flags); +ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> &addThing, uint32_t addCount, uint32_t flags, const std::shared_ptr<Creature> &actor /* = nullptr*/) { + const bool childIsOwner = hasBitSet(FLAG_CHILDISOWNER, flags); if (childIsOwner) { // a child container is querying, since we are the top container (not carried by a player) // just return with no error. @@ -452,7 +479,7 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Item> item = addThing->getItem(); + const auto &item = addThing->getItem(); if (item == nullptr) { return RETURNVALUE_NOTPOSSIBLE; } @@ -466,7 +493,7 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & } if (item->hasOwner()) { // a non-owner can move the item around but not pick it up - auto toPlayer = getTopParent()->getPlayer(); + const auto &toPlayer = getTopParent()->getPlayer(); if (toPlayer && !item->isOwner(toPlayer)) { return RETURNVALUE_ITEMISNOTYOURS; } @@ -478,16 +505,16 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & } std::shared_ptr<Cylinder> cylinder = getParent(); - auto noLimit = hasBitSet(FLAG_NOLIMIT, flags); + const auto noLimit = hasBitSet(FLAG_NOLIMIT, flags); while (cylinder) { if (cylinder == addThing) { return RETURNVALUE_THISISIMPOSSIBLE; } - std::shared_ptr<Container> container = cylinder->getContainer(); + const std::shared_ptr<Container> &container = cylinder->getContainer(); if (!noLimit && container && container->isInbox()) { return RETURNVALUE_CONTAINERNOTENOUGHROOM; } - std::shared_ptr<Cylinder> parent = cylinder->getParent(); + const std::shared_ptr<Cylinder> &parent = cylinder->getParent(); if (cylinder == parent) { g_logger().error("Container::queryAdd: parent == cylinder. Preventing infinite loop."); return RETURNVALUE_NOTPOSSIBLE; @@ -499,15 +526,15 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & return RETURNVALUE_CONTAINERNOTENOUGHROOM; } - if (const auto topParentContainer = getTopParentContainer()) { - if (const auto addContainer = item->getContainer()) { + if (const auto &topParentContainer = getTopParentContainer()) { + if (const auto &addContainer = item->getContainer()) { uint32_t addContainerCount = addContainer->getContainerHoldingCount() + 1; - uint32_t maxContainer = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER, __FUNCTION__)); + uint32_t maxContainer = static_cast<uint32_t>(g_configManager().getNumber(MAX_CONTAINER)); if (addContainerCount + topParentContainer->getContainerHoldingCount() > maxContainer) { return RETURNVALUE_CONTAINERISFULL; } - uint32_t addItemCount = addContainer->getItemHoldingCount() + 1; + const uint32_t addItemCount = addContainer->getItemHoldingCount() + 1; if (addItemCount + topParentContainer->getItemHoldingCount() > m_maxItems) { return RETURNVALUE_CONTAINERISFULL; } @@ -522,7 +549,7 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & return RETURNVALUE_ONLYAMMOINQUIVER; } - std::shared_ptr<Cylinder> topParent = getTopParent(); + const std::shared_ptr<Cylinder> &topParent = getTopParent(); if (topParent != getContainer()) { return topParent->queryAdd(INDEX_WHEREEVER, item, addCount, flags | FLAG_CHILDISOWNER, actor); } else { @@ -531,7 +558,7 @@ ReturnValue Container::queryAdd(int32_t addIndex, const std::shared_ptr<Thing> & } ReturnValue Container::queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { maxQueryCount = 0; return RETURNVALUE_NOTPOSSIBLE; @@ -542,7 +569,7 @@ ReturnValue Container::queryMaxCount(int32_t index, const std::shared_ptr<Thing> return RETURNVALUE_NOERROR; } - int32_t freeSlots = std::max<int32_t>(capacity() - size(), 0); + const int32_t freeSlots = std::max<int32_t>(capacity() - size(), 0); if (item->isStackable()) { uint32_t n = 0; @@ -550,16 +577,16 @@ ReturnValue Container::queryMaxCount(int32_t index, const std::shared_ptr<Thing> if (index == INDEX_WHEREEVER) { // Iterate through every item and check how much free stackable slots there is. uint32_t slotIndex = 0; - for (std::shared_ptr<Item> containerItem : itemlist) { + for (const auto &containerItem : itemlist) { if (containerItem != item && containerItem->equals(item) && containerItem->getItemCount() < containerItem->getStackSize()) { - uint32_t remainder = (containerItem->getStackSize() - containerItem->getItemCount()); + const uint32_t remainder = (containerItem->getStackSize() - containerItem->getItemCount()); if (queryAdd(slotIndex++, item, remainder, flags) == RETURNVALUE_NOERROR) { n += remainder; } } } } else { - std::shared_ptr<Item> destItem = getItemByIndex(index); + const auto &destItem = getItemByIndex(index); if (item->equals(destItem) && destItem->getItemCount() < destItem->getStackSize()) { n = destItem->getStackSize() - destItem->getItemCount(); } @@ -579,14 +606,14 @@ ReturnValue Container::queryMaxCount(int32_t index, const std::shared_ptr<Thing> return RETURNVALUE_NOERROR; } -ReturnValue Container::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor /*= nullptr */) { - int32_t index = getThingIndex(thing); +ReturnValue Container::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor /*= nullptr */) { + const int32_t index = getThingIndex(thing); if (index == -1) { g_logger().debug("{} - Failed to get thing index", __FUNCTION__); return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { g_logger().debug("{} - Item is nullptr", __FUNCTION__); return RETURNVALUE_NOTPOSSIBLE; @@ -601,24 +628,24 @@ ReturnValue Container::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t g_logger().debug("{} - Item is not movable", __FUNCTION__); return RETURNVALUE_NOTMOVABLE; } - std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(getTopParent()); + const std::shared_ptr<HouseTile> &houseTile = std::dynamic_pointer_cast<HouseTile>(getTopParent()); if (houseTile) { return houseTile->queryRemove(thing, count, flags, actor); } return RETURNVALUE_NOERROR; } -std::shared_ptr<Cylinder> Container::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) { +std::shared_ptr<Cylinder> Container::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) { if (!unlocked) { - *destItem = nullptr; + destItem = nullptr; return getContainer(); } if (index == 254 /*move up*/) { index = INDEX_WHEREEVER; - *destItem = nullptr; + destItem = nullptr; - std::shared_ptr<Container> parentContainer = std::dynamic_pointer_cast<Container>(getParent()); + const auto &parentContainer = std::dynamic_pointer_cast<Container>(getParent()); if (parentContainer) { return parentContainer; } @@ -627,7 +654,7 @@ std::shared_ptr<Cylinder> Container::queryDestination(int32_t &index, const std: if (index == 255 /*add wherever*/) { index = INDEX_WHEREEVER; - *destItem = nullptr; + destItem = nullptr; } else if (index >= static_cast<int32_t>(capacity()) && !hasPagination()) { /* if you have a container, maximize it to show all 20 slots @@ -637,39 +664,39 @@ std::shared_ptr<Cylinder> Container::queryDestination(int32_t &index, const std: the client calculates the slot position as if the bag has 20 slots */ index = INDEX_WHEREEVER; - *destItem = nullptr; + destItem = nullptr; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return getContainer(); } if (index != INDEX_WHEREEVER) { - std::shared_ptr<Item> itemFromIndex = getItemByIndex(index); + const auto &itemFromIndex = getItemByIndex(index); if (itemFromIndex) { - *destItem = itemFromIndex; + destItem = itemFromIndex; } - std::shared_ptr<Cylinder> subCylinder = std::dynamic_pointer_cast<Cylinder>(*destItem); + const auto &subCylinder = std::dynamic_pointer_cast<Cylinder>(destItem); if (subCylinder) { index = INDEX_WHEREEVER; - *destItem = nullptr; + destItem = nullptr; return subCylinder; } } - bool autoStack = !hasBitSet(FLAG_IGNOREAUTOSTACK, flags); + const bool autoStack = !hasBitSet(FLAG_IGNOREAUTOSTACK, flags); if (autoStack && item->isStackable() && item->getParent() != getContainer()) { - if (*destItem && (*destItem)->equals(item) && (*destItem)->getItemCount() < (*destItem)->getStackSize()) { + if (destItem && destItem->equals(item) && destItem->getItemCount() < destItem->getStackSize()) { return getContainer(); } // try find a suitable item to stack with uint32_t n = 0; - for (std::shared_ptr<Item> listItem : itemlist) { + for (const auto &listItem : itemlist) { if (listItem != item && listItem->equals(item) && listItem->getItemCount() < listItem->getStackSize()) { - *destItem = listItem; + destItem = listItem; index = n; return getContainer(); } @@ -679,11 +706,11 @@ std::shared_ptr<Cylinder> Container::queryDestination(int32_t &index, const std: return getContainer(); } -void Container::addThing(std::shared_ptr<Thing> thing) { +void Container::addThing(const std::shared_ptr<Thing> &thing) { return addThing(0, thing); } -void Container::addThing(int32_t index, std::shared_ptr<Thing> thing) { +void Container::addThing(int32_t index, const std::shared_ptr<Thing> &thing) { if (!thing) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -692,7 +719,7 @@ void Container::addThing(int32_t index, std::shared_ptr<Thing> thing) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -707,7 +734,7 @@ void Container::addThing(int32_t index, std::shared_ptr<Thing> thing) { } } -void Container::addItemBack(std::shared_ptr<Item> item) { +void Container::addItemBack(const std::shared_ptr<Item> &item) { addItem(item); updateItemWeight(item->getWeight()); @@ -717,13 +744,13 @@ void Container::addItemBack(std::shared_ptr<Item> item) { } } -void Container::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) { - int32_t index = getThingIndex(thing); +void Container::updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) { + const int32_t index = getThingIndex(thing); if (index == -1) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -739,13 +766,13 @@ void Container::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint3 } } -void Container::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { - std::shared_ptr<Item> item = thing->getItem(); +void Container::replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) { + const auto &item = thing->getItem(); if (!item) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> replacedItem = getItemByIndex(index); + const auto &replacedItem = getItemByIndex(index); if (!replacedItem) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -762,19 +789,19 @@ void Container::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { replacedItem->resetParent(); } -void Container::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { - std::shared_ptr<Item> item = thing->getItem(); +void Container::removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) { + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - int32_t index = getThingIndex(thing); + const int32_t index = getThingIndex(thing); if (index == -1) { return /*RETURNVALUE_NOTPOSSIBLE*/; } if (item->isStackable() && count != item->getItemCount()) { - uint8_t newCount = static_cast<uint8_t>(std::max<int32_t>(0, item->getItemCount() - count)); + const auto newCount = static_cast<uint8_t>(std::max<int32_t>(0, item->getItemCount() - count)); const int32_t oldWeight = item->getWeight(); item->setItemCount(newCount); updateItemWeight(-oldWeight + item->getWeight()); @@ -796,9 +823,9 @@ void Container::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { } } -int32_t Container::getThingIndex(std::shared_ptr<Thing> thing) const { +int32_t Container::getThingIndex(const std::shared_ptr<Thing> &thing) const { int32_t index = 0; - for (std::shared_ptr<Item> item : itemlist) { + for (const std::shared_ptr<Item> &item : itemlist) { if (item == thing) { return index; } @@ -817,7 +844,7 @@ size_t Container::getLastIndex() const { uint32_t Container::getItemTypeCount(uint16_t itemId, int32_t subType /* = -1*/) const { uint32_t count = 0; - for (std::shared_ptr<Item> item : itemlist) { + for (const std::shared_ptr<Item> &item : itemlist) { if (item->getID() == itemId) { count += countByType(item, subType); } @@ -826,7 +853,7 @@ uint32_t Container::getItemTypeCount(uint16_t itemId, int32_t subType /* = -1*/) } std::map<uint32_t, uint32_t> &Container::getAllItemTypeCount(std::map<uint32_t, uint32_t> &countMap) const { - for (std::shared_ptr<Item> item : itemlist) { + for (const std::shared_ptr<Item> &item : itemlist) { countMap[item->getID()] += item->getItemCount(); } return countMap; @@ -843,15 +870,15 @@ ItemVector Container::getItems(bool recursive /*= false*/) { containerItems.push_back(*it); } } else { - for (std::shared_ptr<Item> item : itemlist) { + for (const std::shared_ptr<Item> &item : itemlist) { containerItems.push_back(item); } } return containerItems; } -void Container::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> topParent = getTopParent(); +void Container::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &topParent = getTopParent(); if (topParent->getCreature()) { topParent->postAddNotification(thing, oldParent, index, LINK_TOPPARENT); } else if (topParent == getContainer()) { @@ -864,8 +891,8 @@ void Container::postAddNotification(std::shared_ptr<Thing> thing, std::shared_pt } } -void Container::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> topParent = getTopParent(); +void Container::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &topParent = getTopParent(); if (topParent->getCreature()) { topParent->postRemoveNotification(thing, newParent, index, LINK_TOPPARENT); } else if (topParent == getContainer()) { @@ -878,16 +905,16 @@ void Container::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared } } -void Container::internalAddThing(std::shared_ptr<Thing> thing) { +void Container::internalAddThing(const std::shared_ptr<Thing> &thing) { internalAddThing(0, thing); } -void Container::internalAddThing(uint32_t, std::shared_ptr<Thing> thing) { +void Container::internalAddThing(uint32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return; } @@ -897,25 +924,11 @@ void Container::internalAddThing(uint32_t, std::shared_ptr<Thing> thing) { updateItemWeight(item->getWeight()); } -void Container::startDecaying() { - g_decay().startDecay(getContainer()); - for (ContainerIterator it = iterator(); it.hasNext(); it.advance()) { - g_decay().startDecay(*it); - } -} - -void Container::stopDecaying() { - g_decay().stopDecay(getContainer()); - for (ContainerIterator it = iterator(); it.hasNext(); it.advance()) { - g_decay().stopDecay(*it); - } -} - -uint16_t Container::getFreeSlots() { +uint16_t Container::getFreeSlots() const { uint16_t counter = std::max<uint16_t>(0, capacity() - size()); - for (std::shared_ptr<Item> item : itemlist) { - if (std::shared_ptr<Container> container = item->getContainer()) { + for (const auto &item : itemlist) { + if (const auto &container = item->getContainer()) { counter += std::max<uint16_t>(0, container->getFreeSlots()); } } @@ -924,28 +937,23 @@ uint16_t Container::getFreeSlots() { } ContainerIterator Container::iterator() { - ContainerIterator cit; - if (!itemlist.empty()) { - cit.over.push_back(getContainer()); - cit.cur = itemlist.begin(); - } - return cit; + return { getContainer(), static_cast<size_t>(g_configManager().getNumber(MAX_CONTAINER_DEPTH)) }; } -void Container::removeItem(std::shared_ptr<Thing> thing, bool sendUpdateToClient /* = false*/) { +void Container::removeItem(const std::shared_ptr<Thing> &thing, bool sendUpdateToClient /* = false*/) { if (thing == nullptr) { return; } - auto itemToRemove = thing->getItem(); + const auto &itemToRemove = thing->getItem(); if (itemToRemove == nullptr) { return; } - auto it = std::ranges::find(itemlist.begin(), itemlist.end(), itemToRemove); + const auto it = std::ranges::find(itemlist.begin(), itemlist.end(), itemToRemove); if (it != itemlist.end()) { // Send change to client - if (auto thingIndex = getThingIndex(thing); sendUpdateToClient && thingIndex != -1 && getParent()) { + if (const auto thingIndex = getThingIndex(thing); sendUpdateToClient && thingIndex != -1 && getParent()) { onRemoveContainerItem(thingIndex, itemToRemove); } @@ -954,39 +962,125 @@ void Container::removeItem(std::shared_ptr<Thing> thing, bool sendUpdateToClient } } -std::shared_ptr<Item> ContainerIterator::operator*() { - return *cur; +uint32_t Container::getOwnerId() const { + uint32_t ownerId = Item::getOwnerId(); + if (ownerId > 0) { + return ownerId; + } + for (const auto &item : itemlist) { + ownerId = item->getOwnerId(); + if (ownerId > 0) { + return ownerId; + } + } + return 0; +} + +/** + * ContainerIterator + * @brief Iterator for iterating over the items in a container + */ +ContainerIterator::ContainerIterator(const std::shared_ptr<Container> &container, size_t maxDepth) : + maxTraversalDepth(maxDepth) { + if (container) { + states.reserve(maxDepth); + visitedContainers.reserve(g_configManager().getNumber(MAX_CONTAINER)); + (void)states.emplace_back(container, 0, 1); + (void)visitedContainers.insert(container); + } +} + +bool ContainerIterator::hasNext() const { + while (!states.empty()) { + const auto &top = states.back(); + const auto &container = top.container.lock(); + if (!container) { + // Container has been deleted + states.pop_back(); + } else if (top.index < container->itemlist.size()) { + return true; + } else { + states.pop_back(); + } + } + return false; } void ContainerIterator::advance() { - if (std::shared_ptr<Item> i = *cur) { - if (std::shared_ptr<Container> c = i->getContainer()) { - if (!c->empty()) { - over.push_back(c); + if (states.empty()) { + return; + } + + auto &top = states.back(); + const auto &container = top.container.lock(); + if (!container) { + // Container has been deleted + states.pop_back(); + return; + } + + if (top.index >= container->itemlist.size()) { + states.pop_back(); + return; + } + + auto currentItem = container->itemlist[top.index]; + if (currentItem) { + auto subContainer = currentItem->getContainer(); + if (subContainer && !subContainer->itemlist.empty()) { + size_t newDepth = top.depth + 1; + if (newDepth <= maxTraversalDepth) { + if (visitedContainers.find(subContainer) == visitedContainers.end()) { + states.emplace_back(subContainer, 0, newDepth); + visitedContainers.insert(subContainer); + } else { + if (!m_cycleDetected) { + g_logger().trace("[{}] Cycle detected in container: {}", __FUNCTION__, subContainer->getName()); + m_cycleDetected = true; + } + } + } else { + if (!m_maxDepthReached) { + g_logger().trace("[{}] Maximum iteration depth reached", __FUNCTION__); + m_maxDepthReached = true; + } } } } - ++cur; + ++top.index; +} + +std::shared_ptr<Item> ContainerIterator::operator*() const { + if (states.empty()) { + return nullptr; + } - if (cur == over.front()->itemlist.end()) { - over.pop_front(); - if (!over.empty()) { - cur = over.front()->itemlist.begin(); + const auto &top = states.back(); + if (const auto &container = top.container.lock()) { + if (top.index < container->itemlist.size()) { + return container->itemlist[top.index]; } } + return nullptr; } -uint32_t Container::getOwnerId() const { - uint32_t ownerId = Item::getOwnerId(); - if (ownerId > 0) { - return ownerId; +bool ContainerIterator::hasReachedMaxDepth() const { + return m_maxDepthReached; +} + +std::shared_ptr<Container> ContainerIterator::getCurrentContainer() const { + if (states.empty()) { + return nullptr; } - for (const auto &item : itemlist) { - ownerId = item->getOwnerId(); - if (ownerId > 0) { - return ownerId; - } + const auto &top = states.back(); + return top.container.lock(); +} + +size_t ContainerIterator::getCurrentIndex() const { + if (states.empty()) { + return 0; } - return 0; + const auto &top = states.back(); + return top.index; } diff --git a/src/items/containers/container.hpp b/src/items/containers/container.hpp index 6bfb509b8..f7e1b5c42 100644 --- a/src/items/containers/container.hpp +++ b/src/items/containers/container.hpp @@ -21,16 +21,111 @@ class Reward; class ContainerIterator { public: - bool hasNext() const { - return !over.empty(); - } - + /** + * @brief Constructs a ContainerIterator with a specified container and maximum traversal depth. + * + * This constructor initializes the iterator to start iterating over the specified container + * and ensures that it will not traverse deeper than the specified maxDepth. + * + * @param container The root container to start iterating from. + * @param maxDepth The maximum depth of nested containers to traverse. + */ + ContainerIterator(const std::shared_ptr<Container> &container, size_t maxDepth); + + /** + * @brief Checks if there are more items to iterate over in the container. + * + * This function checks if there are more items to iterate over in the current container or + * in any of the nested sub-containers. If no items are left, the function will return false. + * + * @return true if there are more items to iterate over; false otherwise. + */ + bool hasNext() const; + + /** + * @brief Advances the iterator to the next item in the container. + * + * This function moves the iterator to the next item. If the current item is a sub-container, + * it adds that sub-container to the stack to iterate over its items as well. + * It also handles maximum depth and cycle detection to prevent infinite loops. + */ void advance(); - std::shared_ptr<Item> operator*(); + + /** + * @brief Returns the current item pointed to by the iterator. + * + * This function returns the current item in the container that the iterator points to. + * If there are no more items to iterate over, it returns nullptr. + * + * @return A shared pointer to the current item, or nullptr if no items are left. + */ + std::shared_ptr<Item> operator*() const; + + bool hasReachedMaxDepth() const; + + std::shared_ptr<Container> getCurrentContainer() const; + size_t getCurrentIndex() const; private: - std::list<std::shared_ptr<Container>> over; - ItemDeque::const_iterator cur; + /** + * @brief Represents the state of the iterator at a given point in time. + * + * This structure is used to keep track of the current container, + * the index of the current item within that container, and the depth + * of traversal for nested containers. It is primarily used in the + * ContainerIterator to manage the state of the iteration as it traverses + * through containers and their sub-containers. + */ + struct IteratorState { + /** + * @brief The container being iterated over. + */ + std::weak_ptr<Container> container; + + /** + * @brief The current index within the container's item list. + */ + size_t index; + + /** + * @brief The depth of traversal, indicating how deep the iteration is + * within nested sub-containers. + */ + size_t depth; + + /** + * @brief Constructs an IteratorState with the given container, index, and depth. + * + * @param c The container to iterate over. + * @param i The starting index within the container. + * @param d The depth of traversal. + */ + IteratorState(std::shared_ptr<Container> c, size_t i, size_t d) : + container(c), index(i), depth(d) { } + }; + + /** + * @brief Stack of IteratorState objects representing the state of the iteration. + * + * This stack keeps track of the current position in each container and is + * used to traverse containers and their nested sub-containers in a depth-first manner. + * Each element in the stack represents a different level in the container hierarchy. + */ + mutable std::vector<IteratorState> states; + + /** + * @brief Set of containers that have already been visited during the iteration. + * + * This set is used to keep track of all containers that have been visited + * to avoid revisiting them and causing infinite loops or cycles. It ensures + * that each container is processed only once, preventing redundant processing + * and potential crashes due to cyclic references. + */ + mutable std::unordered_set<std::shared_ptr<Container>> visitedContainers; + size_t maxTraversalDepth = 0; + + bool m_maxDepthReached = false; + bool m_cycleDetected = false; friend class Container; }; @@ -39,27 +134,41 @@ class Container : public Item, public Cylinder { public: explicit Container(uint16_t type); Container(uint16_t type, uint16_t size, bool unlocked = true, bool pagination = false); - ~Container(); + ~Container() override; static std::shared_ptr<Container> create(uint16_t type); static std::shared_ptr<Container> create(uint16_t type, uint16_t size, bool unlocked = true, bool pagination = false); - static std::shared_ptr<Container> create(std::shared_ptr<Tile> type); + + /** + * @brief Creates a container for browse field functionality with items from a specified tile. + * + * This function generates a new container specifically for browse field use, + * populating it with items that meet certain criteria from the provided tile. Items + * that can be included must either have an internal container, be movable, or be + * wrapable without blocking path and without a unique ID. + * + * @param tile A shared pointer to the Tile from which items will be sourced. + * @return std::shared_ptr<Container> Returns a shared pointer to the newly created Container if successful; otherwise, returns nullptr. + * + * @note This function will return nullptr if the newContainer could not be created or if the tile pointer is null. + */ + static std::shared_ptr<Container> createBrowseField(const std::shared_ptr<Tile> &type); // non-copyable Container(const Container &) = delete; Container &operator=(const Container &) = delete; - std::shared_ptr<Item> clone() const override final; + std::shared_ptr<Item> clone() const final; - std::shared_ptr<Container> getContainer() override final { + std::shared_ptr<Container> getContainer() final { return static_self_cast<Container>(); } - std::shared_ptr<const Container> getContainer() const override final { + std::shared_ptr<const Container> getContainer() const final { return static_self_cast<Container>(); } - std::shared_ptr<Cylinder> getCylinder() override final { + std::shared_ptr<Cylinder> getCylinder() final { return getContainer(); } @@ -112,9 +221,9 @@ class Container : public Item, public Cylinder { return itemlist.rend(); } - bool countsToLootAnalyzerBalance(); + bool countsToLootAnalyzerBalance() const; bool hasParent(); - void addItem(std::shared_ptr<Item> item); + void addItem(const std::shared_ptr<Item> &item); StashContainerList getStowableItems() const; bool isStoreInbox() const; bool isStoreInboxFiltered() const; @@ -122,13 +231,13 @@ class Container : public Item, public Cylinder { std::vector<ContainerCategory_t> getStoreInboxValidCategories() const; std::shared_ptr<Item> getFilteredItemByIndex(size_t index) const; std::shared_ptr<Item> getItemByIndex(size_t index) const; - bool isHoldingItem(std::shared_ptr<Item> item); - bool isHoldingItemWithId(const uint16_t id); + bool isHoldingItem(const std::shared_ptr<Item> &item); + bool isHoldingItemWithId(uint16_t id); uint32_t getItemHoldingCount(); uint32_t getContainerHoldingCount(); - uint16_t getFreeSlots(); - uint32_t getWeight() const override final; + uint16_t getFreeSlots() const; + uint32_t getWeight() const final; bool isUnlocked() const { return !this->isCorpse() && unlocked; @@ -138,64 +247,62 @@ class Container : public Item, public Cylinder { } // cylinder implementations - virtual ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override final; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override final; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override final; + virtual ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) final; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) final; - void addThing(std::shared_ptr<Thing> thing) override final; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override final; - void addItemBack(std::shared_ptr<Item> item); + void addThing(const std::shared_ptr<Thing> &thing) final; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) final; + void addItemBack(const std::shared_ptr<Item> &item); - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override final; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override final; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) final; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) final; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override final; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) final; - int32_t getThingIndex(std::shared_ptr<Thing> thing) const override final; - size_t getFirstIndex() const override final; - size_t getLastIndex() const override final; - uint32_t getItemTypeCount(uint16_t itemId, int32_t subType = -1) const override final; - std::map<uint32_t, uint32_t> &getAllItemTypeCount(std::map<uint32_t, uint32_t> &countMap) const override final; - std::shared_ptr<Thing> getThing(size_t index) const override final; + int32_t getThingIndex(const std::shared_ptr<Thing> &thing) const final; + size_t getFirstIndex() const final; + size_t getLastIndex() const final; + uint32_t getItemTypeCount(uint16_t itemId, int32_t subType = -1) const final; + std::map<uint32_t, uint32_t> &getAllItemTypeCount(std::map<uint32_t, uint32_t> &countMap) const final; + std::shared_ptr<Thing> getThing(size_t index) const final; ItemVector getItems(bool recursive = false); - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void internalAddThing(std::shared_ptr<Thing> thing) override final; - void internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) override final; - void startDecaying() override; - void stopDecaying() override; + void internalAddThing(const std::shared_ptr<Thing> &thing) final; + void internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) final; - virtual void removeItem(std::shared_ptr<Thing> thing, bool sendUpdateToClient = false); + virtual void removeItem(const std::shared_ptr<Thing> &thing, bool sendUpdateToClient = false); - uint32_t getOwnerId() const override final; + uint32_t getOwnerId() const final; bool isAnyKindOfRewardChest(); bool isAnyKindOfRewardContainer(); bool isBrowseFieldAndHoldsRewardChest(); - bool isInsideContainerWithId(const uint16_t id); + bool isInsideContainerWithId(uint16_t id); protected: std::ostringstream &getContentDescription(std::ostringstream &os, bool oldProtocol); - uint32_t m_maxItems; - uint32_t maxSize; - uint32_t totalWeight = 0; + uint32_t m_maxItems {}; + uint32_t maxSize {}; + uint32_t totalWeight {}; ItemDeque itemlist; - uint32_t serializationCount = 0; + uint32_t serializationCount = {}; - bool unlocked; - bool pagination; + bool unlocked {}; + bool pagination {}; friend class MapCache; private: - void onAddContainerItem(std::shared_ptr<Item> item); - void onUpdateContainerItem(uint32_t index, std::shared_ptr<Item> oldItem, std::shared_ptr<Item> newItem); - void onRemoveContainerItem(uint32_t index, std::shared_ptr<Item> item); + void onAddContainerItem(const std::shared_ptr<Item> &item); + void onUpdateContainerItem(uint32_t index, const std::shared_ptr<Item> &oldItem, const std::shared_ptr<Item> &newItem); + void onRemoveContainerItem(uint32_t index, const std::shared_ptr<Item> &item); std::shared_ptr<Container> getParentContainer(); std::shared_ptr<Container> getTopParentContainer(); diff --git a/src/items/containers/depot/depotchest.cpp b/src/items/containers/depot/depotchest.cpp index 15488267f..ea5a5d389 100644 --- a/src/items/containers/depot/depotchest.cpp +++ b/src/items/containers/depot/depotchest.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/depot/depotchest.hpp" + #include "utils/tools.hpp" DepotChest::DepotChest(uint16_t type) : @@ -19,8 +18,8 @@ DepotChest::DepotChest(uint16_t type) : pagination = true; } -ReturnValue DepotChest::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor /* = nullptr*/) { - std::shared_ptr<Item> item = thing->getItem(); +ReturnValue DepotChest::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor /* = nullptr*/) { + const auto &item = thing->getItem(); if (item == nullptr) { return RETURNVALUE_NOTPOSSIBLE; } @@ -28,7 +27,7 @@ ReturnValue DepotChest::queryAdd(int32_t index, const std::shared_ptr<Thing> &th return RETURNVALUE_ITEMISNOTYOURS; } - bool skipLimit = hasBitSet(FLAG_NOLIMIT, flags); + const bool skipLimit = hasBitSet(FLAG_NOLIMIT, flags); if (!skipLimit) { int32_t addCount = 0; @@ -37,14 +36,14 @@ ReturnValue DepotChest::queryAdd(int32_t index, const std::shared_ptr<Thing> &th } if (item->getTopParent().get() != this) { - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const std::shared_ptr<Container> &container = item->getContainer()) { addCount = container->getItemHoldingCount() + 1; } else { addCount = 1; } } - if (std::shared_ptr<Cylinder> localParent = getRealParent()) { + if (const std::shared_ptr<Cylinder> &localParent = getRealParent()) { if (localParent->getContainer()->getItemHoldingCount() + addCount > maxDepotItems) { return RETURNVALUE_DEPOTISFULL; } @@ -56,22 +55,22 @@ ReturnValue DepotChest::queryAdd(int32_t index, const std::shared_ptr<Thing> &th return Container::queryAdd(index, thing, count, flags, actor); } -void DepotChest::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void DepotChest::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postAddNotification(thing, oldParent, index, LINK_PARENT); } } -void DepotChest::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void DepotChest::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postRemoveNotification(thing, newParent, index, LINK_PARENT); } } std::shared_ptr<Cylinder> DepotChest::getParent() { - auto parentLocked = m_parent.lock(); + const auto &parentLocked = m_parent.lock(); if (parentLocked && parentLocked->getParent()) { return parentLocked->getParent()->getParent(); } diff --git a/src/items/containers/depot/depotchest.hpp b/src/items/containers/depot/depotchest.hpp index 6b64ca2b8..7b357540d 100644 --- a/src/items/containers/depot/depotchest.hpp +++ b/src/items/containers/depot/depotchest.hpp @@ -21,10 +21,10 @@ class DepotChest final : public Container { } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; bool isDepotChest() const override { return true; diff --git a/src/items/containers/depot/depotlocker.cpp b/src/items/containers/depot/depotlocker.cpp index 0be000794..c5da2beaa 100644 --- a/src/items/containers/depot/depotlocker.cpp +++ b/src/items/containers/depot/depotlocker.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/depot/depotlocker.hpp" DepotLocker::DepotLocker(uint16_t type, uint16_t size) : @@ -24,26 +22,26 @@ Attr_ReadValue DepotLocker::readAttr(AttrTypes_t attr, PropStream &propStream) { return Item::readAttr(attr, propStream); } -ReturnValue DepotLocker::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature>) { +ReturnValue DepotLocker::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> &) { return RETURNVALUE_NOTENOUGHROOM; } -void DepotLocker::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - auto parentLocked = m_parent.lock(); +void DepotLocker::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const auto &parentLocked = m_parent.lock(); if (parentLocked) { parentLocked->postAddNotification(thing, oldParent, index, LINK_PARENT); } } -void DepotLocker::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - auto parentLocked = m_parent.lock(); +void DepotLocker::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const auto &parentLocked = m_parent.lock(); if (parentLocked) { parentLocked->postRemoveNotification(thing, newParent, index, LINK_PARENT); } } -void DepotLocker::removeInbox(std::shared_ptr<Inbox> inbox) { - auto cit = std::find(itemlist.begin(), itemlist.end(), inbox); +void DepotLocker::removeInbox(const std::shared_ptr<Inbox> &inbox) { + const auto cit = std::ranges::find(itemlist, inbox); if (cit == itemlist.end()) { return; } diff --git a/src/items/containers/depot/depotlocker.hpp b/src/items/containers/depot/depotlocker.hpp index 09d794c44..a4b2a3f48 100644 --- a/src/items/containers/depot/depotlocker.hpp +++ b/src/items/containers/depot/depotlocker.hpp @@ -20,7 +20,7 @@ class DepotLocker final : public Container { return static_self_cast<DepotLocker>(); } - void removeInbox(std::shared_ptr<Inbox> inbox); + void removeInbox(const std::shared_ptr<Inbox> &inbox); // serialization Attr_ReadValue readAttr(AttrTypes_t attr, PropStream &propStream) override; @@ -33,10 +33,10 @@ class DepotLocker final : public Container { } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; bool canRemove() const override { return false; diff --git a/src/items/containers/inbox/inbox.cpp b/src/items/containers/inbox/inbox.cpp index 9b22c5374..92b113f19 100644 --- a/src/items/containers/inbox/inbox.cpp +++ b/src/items/containers/inbox/inbox.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/inbox/inbox.hpp" + #include "utils/tools.hpp" Inbox::Inbox(uint16_t type) : @@ -17,14 +16,14 @@ Inbox::Inbox(uint16_t type) : maxInboxItems = std::numeric_limits<uint16_t>::max(); } -ReturnValue Inbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t flags, std::shared_ptr<Creature>) { +ReturnValue Inbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t flags, const std::shared_ptr<Creature> &) { int32_t addCount = 0; if (!hasBitSet(FLAG_NOLIMIT, flags)) { return RETURNVALUE_CONTAINERNOTENOUGHROOM; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return RETURNVALUE_NOTPOSSIBLE; } @@ -38,7 +37,7 @@ ReturnValue Inbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32 } if (item->getTopParent().get() != this) { // MY - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const std::shared_ptr<Container> &container = item->getContainer()) { addCount = container->getItemHoldingCount() + 1; } else { addCount = 1; @@ -52,22 +51,22 @@ ReturnValue Inbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32 return RETURNVALUE_NOERROR; } -void Inbox::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void Inbox::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postAddNotification(thing, oldParent, index, LINK_PARENT); } } -void Inbox::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void Inbox::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postRemoveNotification(thing, newParent, index, LINK_PARENT); } } std::shared_ptr<Cylinder> Inbox::getParent() { - auto parentLocked = m_parent.lock(); + const auto &parentLocked = m_parent.lock(); if (parentLocked) { return parentLocked->getParent(); } diff --git a/src/items/containers/inbox/inbox.hpp b/src/items/containers/inbox/inbox.hpp index 79eb126ed..731920f1d 100644 --- a/src/items/containers/inbox/inbox.hpp +++ b/src/items/containers/inbox/inbox.hpp @@ -20,10 +20,10 @@ class Inbox final : public Container { } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; bool isInbox() const override { return true; diff --git a/src/items/containers/mailbox/mailbox.cpp b/src/items/containers/mailbox/mailbox.cpp index c2c9b2f61..9abe6d0f6 100644 --- a/src/items/containers/mailbox/mailbox.cpp +++ b/src/items/containers/mailbox/mailbox.cpp @@ -7,16 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/mailbox/mailbox.hpp" + +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "io/iologindata.hpp" #include "game/scheduling/save_manager.hpp" +#include "items/containers/inbox/inbox.hpp" #include "map/spectators.hpp" -ReturnValue Mailbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, std::shared_ptr<Creature>) { - std::shared_ptr<Item> item = thing->getItem(); +ReturnValue Mailbox::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, const std::shared_ptr<Creature> &) { + const auto &item = thing->getItem(); if (item && Mailbox::canSend(item)) { return RETURNVALUE_NOERROR; } @@ -28,50 +28,50 @@ ReturnValue Mailbox::queryMaxCount(int32_t, const std::shared_ptr<Thing> &, uint return RETURNVALUE_NOERROR; } -ReturnValue Mailbox::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> /*= nullptr */) { +ReturnValue Mailbox::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> & /*= nullptr */) { return RETURNVALUE_NOTPOSSIBLE; } -std::shared_ptr<Cylinder> Mailbox::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item>*, uint32_t &) { +std::shared_ptr<Cylinder> Mailbox::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item> &, uint32_t &) { return getMailbox(); } -void Mailbox::addThing(std::shared_ptr<Thing> thing) { +void Mailbox::addThing(const std::shared_ptr<Thing> &thing) { return addThing(0, thing); } -void Mailbox::addThing(int32_t, std::shared_ptr<Thing> thing) { +void Mailbox::addThing(int32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item && Mailbox::canSend(item)) { sendItem(item); } } -void Mailbox::updateThing(std::shared_ptr<Thing>, uint16_t, uint32_t) { +void Mailbox::updateThing(const std::shared_ptr<Thing> &, uint16_t, uint32_t) { // } -void Mailbox::replaceThing(uint32_t, std::shared_ptr<Thing>) { +void Mailbox::replaceThing(uint32_t, const std::shared_ptr<Thing> &) { // } -void Mailbox::removeThing(std::shared_ptr<Thing>, uint32_t) { +void Mailbox::removeThing(const std::shared_ptr<Thing> &, uint32_t) { // } -void Mailbox::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { +void Mailbox::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { getParent()->postAddNotification(thing, oldParent, index, LINK_PARENT); } -void Mailbox::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { +void Mailbox::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { getParent()->postRemoveNotification(thing, newParent, index, LINK_PARENT); } -bool Mailbox::sendItem(std::shared_ptr<Item> item) const { +bool Mailbox::sendItem(const std::shared_ptr<Item> &item) const { std::string receiver; if (!getReceiver(item, receiver)) { return false; @@ -88,9 +88,9 @@ bool Mailbox::sendItem(std::shared_ptr<Item> item) const { } } - std::shared_ptr<Player> player = g_game().getPlayerByName(receiver, true); + const auto &player = g_game().getPlayerByName(receiver, true); std::string writer; - time_t date = time(0); + time_t date = getTimeNow(); std::string text; if (item && item->getID() == ITEM_LETTER && !item->getAttribute<std::string>(ItemAttribute_t::WRITER).empty()) { writer = item->getAttribute<std::string>(ItemAttribute_t::WRITER); @@ -99,8 +99,8 @@ bool Mailbox::sendItem(std::shared_ptr<Item> item) const { } if (player && item) { if (g_game().internalMoveItem(item->getParent(), player->getInbox(), INDEX_WHEREEVER, item, item->getItemCount(), nullptr, FLAG_NOLIMIT) == RETURNVALUE_NOERROR) { - auto newItem = g_game().transformItem(item, item->getID() + 1); - if (newItem && newItem->getID() == ITEM_LETTER_STAMPED && writer != "") { + const auto &newItem = g_game().transformItem(item, item->getID() + 1); + if (newItem && newItem->getID() == ITEM_LETTER_STAMPED && !writer.empty()) { newItem->setAttribute(ItemAttribute_t::WRITER, writer); newItem->setAttribute(ItemAttribute_t::DATE, date); newItem->setAttribute(ItemAttribute_t::TEXT, text); @@ -116,10 +116,10 @@ bool Mailbox::sendItem(std::shared_ptr<Item> item) const { return false; } -bool Mailbox::getReceiver(std::shared_ptr<Item> item, std::string &name) const { - std::shared_ptr<Container> container = item->getContainer(); +bool Mailbox::getReceiver(const std::shared_ptr<Item> &item, std::string &name) const { + const std::shared_ptr<Container> &container = item->getContainer(); if (container) { - for (std::shared_ptr<Item> containerItem : container->getItemList()) { + for (const std::shared_ptr<Item> &containerItem : container->getItemList()) { if (containerItem->getID() == ITEM_LABEL && getReceiver(containerItem, name)) { return true; } @@ -137,6 +137,6 @@ bool Mailbox::getReceiver(std::shared_ptr<Item> item, std::string &name) const { return true; } -bool Mailbox::canSend(std::shared_ptr<Item> item) { +bool Mailbox::canSend(const std::shared_ptr<Item> &item) { return !item->hasOwner() && (item->getID() == ITEM_PARCEL || item->getID() == ITEM_LETTER); } diff --git a/src/items/containers/mailbox/mailbox.hpp b/src/items/containers/mailbox/mailbox.hpp index 116cd0ee1..8891c0033 100644 --- a/src/items/containers/mailbox/mailbox.hpp +++ b/src/items/containers/mailbox/mailbox.hpp @@ -21,30 +21,30 @@ class Mailbox final : public Item, public Cylinder { return static_self_cast<Mailbox>(); } - std::shared_ptr<Cylinder> getCylinder() override final { + std::shared_ptr<Cylinder> getCylinder() override { return getMailbox(); } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; - void addThing(std::shared_ptr<Thing> thing) override; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; + void addThing(const std::shared_ptr<Thing> &thing) override; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) override; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; private: - bool getReceiver(std::shared_ptr<Item> item, std::string &name) const; - bool sendItem(std::shared_ptr<Item> item) const; + bool getReceiver(const std::shared_ptr<Item> &item, std::string &name) const; + bool sendItem(const std::shared_ptr<Item> &item) const; - static bool canSend(std::shared_ptr<Item> item); + static bool canSend(const std::shared_ptr<Item> &item); }; diff --git a/src/items/containers/rewards/reward.cpp b/src/items/containers/rewards/reward.cpp index 4b1757bd6..f3e431354 100644 --- a/src/items/containers/rewards/reward.cpp +++ b/src/items/containers/rewards/reward.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/rewards/reward.hpp" Reward::Reward() : @@ -18,12 +16,12 @@ Reward::Reward() : pagination = true; } -ReturnValue Reward::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, std::shared_ptr<Creature> actor /* = nullptr*/) { - if (actor) { +ReturnValue Reward::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, const std::shared_ptr<Creature> &actor /* = nullptr*/) { + if (actor || !thing) { return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return RETURNVALUE_NOTPOSSIBLE; } @@ -39,15 +37,15 @@ ReturnValue Reward::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint3 return RETURNVALUE_NOERROR; } -void Reward::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void Reward::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postAddNotification(thing, oldParent, index, LINK_PARENT); } } -void Reward::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - std::shared_ptr<Cylinder> localParent = getParent(); +void Reward::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const std::shared_ptr<Cylinder> &localParent = getParent(); if (localParent != nullptr) { localParent->postRemoveNotification(thing, newParent, index, LINK_PARENT); } diff --git a/src/items/containers/rewards/reward.hpp b/src/items/containers/rewards/reward.hpp index 1ab3c8f9b..afdcd1c0d 100644 --- a/src/items/containers/rewards/reward.hpp +++ b/src/items/containers/rewards/reward.hpp @@ -11,27 +11,27 @@ #include "items/containers/container.hpp" -class Reward : public Container { +class Reward final : public Container { public: explicit Reward(); - std::shared_ptr<Reward> getReward() final { + std::shared_ptr<Reward> getReward() override { return static_self_cast<Reward>(); } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) final; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; // overrides - bool canRemove() const final { + bool canRemove() const override { return true; } - std::shared_ptr<Cylinder> getParent() final; - std::shared_ptr<Cylinder> getRealParent() final { + std::shared_ptr<Cylinder> getParent() override; + std::shared_ptr<Cylinder> getRealParent() override { return m_parent.lock(); } }; diff --git a/src/items/containers/rewards/rewardchest.cpp b/src/items/containers/rewards/rewardchest.cpp index c9bb8112f..32019b0ce 100644 --- a/src/items/containers/rewards/rewardchest.cpp +++ b/src/items/containers/rewards/rewardchest.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/containers/rewards/rewardchest.hpp" RewardChest::RewardChest(uint16_t type) : @@ -18,7 +16,7 @@ RewardChest::RewardChest(uint16_t type) : pagination = true; } -ReturnValue RewardChest::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> actor /* = nullptr*/) { +ReturnValue RewardChest::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> &actor /* = nullptr*/) { if (actor) { return RETURNVALUE_NOTPOSSIBLE; } @@ -26,32 +24,32 @@ ReturnValue RewardChest::queryAdd(int32_t, const std::shared_ptr<Thing> &, uint3 return RETURNVALUE_NOERROR; } -void RewardChest::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { - auto parentLocked = m_parent.lock(); +void RewardChest::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { + const auto &parentLocked = m_parent.lock(); if (parentLocked) { parentLocked->postAddNotification(thing, oldParent, index, LINK_PARENT); } } -void RewardChest::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { - auto parentLocked = m_parent.lock(); +void RewardChest::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + const auto &parentLocked = m_parent.lock(); if (parentLocked) { parentLocked->postRemoveNotification(thing, newParent, index, LINK_PARENT); } } // Second argument is disabled by default because not need to send to client in the RewardChest -void RewardChest::removeItem(std::shared_ptr<Thing> thing, bool /* sendToClient = false*/) { +void RewardChest::removeItem(const std::shared_ptr<Thing> &thing, bool /* sendToClient = false*/) { if (thing == nullptr) { return; } - auto itemToRemove = thing->getItem(); + const auto &itemToRemove = thing->getItem(); if (itemToRemove == nullptr) { return; } - auto it = std::ranges::find(itemlist.begin(), itemlist.end(), itemToRemove); + const auto it = std::ranges::find(itemlist.begin(), itemlist.end(), itemToRemove); if (it != itemlist.end()) { itemlist.erase(it); itemToRemove->resetParent(); diff --git a/src/items/containers/rewards/rewardchest.hpp b/src/items/containers/rewards/rewardchest.hpp index 2960128eb..6c6686569 100644 --- a/src/items/containers/rewards/rewardchest.hpp +++ b/src/items/containers/rewards/rewardchest.hpp @@ -15,19 +15,19 @@ class RewardChest final : public Container { public: explicit RewardChest(uint16_t type); - std::shared_ptr<RewardChest> getRewardChest() final { + std::shared_ptr<RewardChest> getRewardChest() override { return static_self_cast<RewardChest>(); } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) final; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - bool canRemove() const final { + bool canRemove() const override { return false; } - void removeItem(std::shared_ptr<Thing> thing, bool sendToClient = false) override; + void removeItem(const std::shared_ptr<Thing> &thing, bool sendToClient = false) override; }; diff --git a/src/items/cylinder.cpp b/src/items/cylinder.cpp index 0636e5ff3..4a4acbdf1 100644 --- a/src/items/cylinder.cpp +++ b/src/items/cylinder.cpp @@ -7,13 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/cylinder.hpp" std::shared_ptr<VirtualCylinder> VirtualCylinder::virtualCylinder = std::make_shared<VirtualCylinder>(); -int32_t Cylinder::getThingIndex(std::shared_ptr<Thing>) const { +int32_t Cylinder::getThingIndex(const std::shared_ptr<Thing> &) const { return -1; } @@ -37,11 +35,11 @@ std::shared_ptr<Thing> Cylinder::getThing(size_t) const { return nullptr; } -void Cylinder::internalAddThing(std::shared_ptr<Thing>) { +void Cylinder::internalAddThing(const std::shared_ptr<Thing> &) { // } -void Cylinder::internalAddThing(uint32_t, std::shared_ptr<Thing>) { +void Cylinder::internalAddThing(uint32_t, const std::shared_ptr<Thing> &) { // } diff --git a/src/items/cylinder.hpp b/src/items/cylinder.hpp index f6c149dd5..c858d3986 100644 --- a/src/items/cylinder.hpp +++ b/src/items/cylinder.hpp @@ -9,7 +9,7 @@ #pragma once -#include "declarations.hpp" +#include "items/items_definitions.hpp" #include "items/thing.hpp" class Item; @@ -30,7 +30,7 @@ class Cylinder : virtual public Thing { * \param actor the creature trying to add the thing * \returns ReturnValue holds the return value */ - virtual ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) = 0; + virtual ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) = 0; /** * Query the cylinder how much it can accept @@ -51,7 +51,7 @@ class Cylinder : virtual public Thing { * \param flags optional flags to modify the default behaviour * \returns ReturnValue holds the return value */ - virtual ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> = nullptr) = 0; + virtual ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) = 0; /** * Query the destination cylinder @@ -63,20 +63,20 @@ class Cylinder : virtual public Thing { * this method can modify the flags * \returns Cylinder returns the destination cylinder */ - virtual std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) = 0; + virtual std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) = 0; /** * Add the object to the cylinder * \param thing is the object to add */ - virtual void addThing(std::shared_ptr<Thing> thing) = 0; + virtual void addThing(const std::shared_ptr<Thing> &thing) = 0; /** * Add the object to the cylinder * \param index points to the destination index (inventory slot/container position) * \param thing is the object to add */ - virtual void addThing(int32_t index, std::shared_ptr<Thing> thing) = 0; + virtual void addThing(int32_t index, const std::shared_ptr<Thing> &thing) = 0; /** * Update the item count or type for an object @@ -84,21 +84,21 @@ class Cylinder : virtual public Thing { * \param itemId is the new item id * \param count is the new count value */ - virtual void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) = 0; + virtual void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) = 0; /** * Replace an object with a new * \param index is the position to change (inventory slot/container position) * \param thing is the object to update */ - virtual void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) = 0; + virtual void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) = 0; /** * Remove an object * \param thing is the object to delete * \param count is the new count value */ - virtual void removeThing(std::shared_ptr<Thing> thing, uint32_t count) = 0; + virtual void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) = 0; /** * Is sent after an operation (move/add) to update internal values @@ -106,7 +106,7 @@ class Cylinder : virtual public Thing { * \param index is the objects new index value * \param link holds the relation the object has to the cylinder */ - virtual void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) = 0; + virtual void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, const CylinderLink_t link = LINK_OWNER) = 0; /** * Is sent after an operation (move/remove) to update internal values @@ -114,14 +114,14 @@ class Cylinder : virtual public Thing { * \param index is the previous index of the removed object * \param link holds the relation the object has to the cylinder */ - virtual void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) = 0; + virtual void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) = 0; /** * Gets the index of an object * \param thing the object to get the index value from * \returns the index of the object, returns -1 if not found */ - virtual int32_t getThingIndex(std::shared_ptr<Thing> thing) const; + virtual int32_t getThingIndex(const std::shared_ptr<Thing> &thing) const; /** * Returns the first index @@ -160,14 +160,14 @@ class Cylinder : virtual public Thing { * Adds an object to the cylinder without sending to the client(s) * \param thing is the object to add */ - virtual void internalAddThing(std::shared_ptr<Thing> thing); + virtual void internalAddThing(const std::shared_ptr<Thing> &thing); /** * Adds an object to the cylinder without sending to the client(s) * \param thing is the object to add * \param index points to the destination index (inventory slot/container position) */ - virtual void internalAddThing(uint32_t index, std::shared_ptr<Thing> thing); + virtual void internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing); virtual void startDecaying(); }; @@ -176,27 +176,27 @@ class VirtualCylinder final : public Cylinder { public: static std::shared_ptr<VirtualCylinder> virtualCylinder; - virtual ReturnValue queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> = nullptr) override { + virtual ReturnValue queryAdd(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> & = nullptr) override { return RETURNVALUE_NOTPOSSIBLE; } virtual ReturnValue queryMaxCount(int32_t, const std::shared_ptr<Thing> &, uint32_t, uint32_t &, uint32_t) override { return RETURNVALUE_NOTPOSSIBLE; } - virtual ReturnValue queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> = nullptr) override { + virtual ReturnValue queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> &actor = nullptr) override { return RETURNVALUE_NOTPOSSIBLE; } - virtual std::shared_ptr<Cylinder> queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item>*, uint32_t &) override { + virtual std::shared_ptr<Cylinder> queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item> &, uint32_t &) override { return nullptr; } - virtual void addThing(std::shared_ptr<Thing>) override { } - virtual void addThing(int32_t, std::shared_ptr<Thing>) override { } - virtual void updateThing(std::shared_ptr<Thing>, uint16_t, uint32_t) override { } - virtual void replaceThing(uint32_t, std::shared_ptr<Thing>) override { } - virtual void removeThing(std::shared_ptr<Thing>, uint32_t) override { } + virtual void addThing(const std::shared_ptr<Thing> &) override { } + virtual void addThing(int32_t, const std::shared_ptr<Thing> &) override { } + virtual void updateThing(const std::shared_ptr<Thing> &, uint16_t, uint32_t) override { } + virtual void replaceThing(uint32_t, const std::shared_ptr<Thing> &) override { } + virtual void removeThing(const std::shared_ptr<Thing> &, uint32_t) override { } - virtual void postAddNotification(std::shared_ptr<Thing>, std::shared_ptr<Cylinder>, int32_t, CylinderLink_t = LINK_OWNER) override { } - virtual void postRemoveNotification(std::shared_ptr<Thing>, std::shared_ptr<Cylinder>, int32_t, CylinderLink_t = LINK_OWNER) override { } + virtual void postAddNotification(const std::shared_ptr<Thing> &, const std::shared_ptr<Cylinder> &, int32_t, CylinderLink_t = LINK_OWNER) override { } + virtual void postRemoveNotification(const std::shared_ptr<Thing> &, const std::shared_ptr<Cylinder> &, int32_t, CylinderLink_t = LINK_OWNER) override { } bool isPushable() override { return false; diff --git a/src/items/decay/decay.cpp b/src/items/decay/decay.cpp index 5eaff61a7..5421340d9 100644 --- a/src/items/decay/decay.cpp +++ b/src/items/decay/decay.cpp @@ -7,19 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/decay/decay.hpp" -#include "lib/di/container.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" +#include "lib/di/container.hpp" Decay &Decay::getInstance() { return inject<Decay>(); } -void Decay::startDecay(std::shared_ptr<Item> item) { +void Decay::startDecay(const std::shared_ptr<Item> &item) { if (!item) { return; } @@ -34,6 +33,8 @@ void Decay::startDecay(std::shared_ptr<Item> item) { return; } + g_logger().trace("Try decay item {}", item->getName()); + const auto duration = item->getAttribute<int64_t>(ItemAttribute_t::DURATION); if (duration <= 0 && item->hasAttribute(ItemAttribute_t::DURATION)) { internalDecayItem(item); @@ -45,7 +46,7 @@ void Decay::startDecay(std::shared_ptr<Item> item) { stopDecay(item); } - int64_t timestamp = OTSYS_TIME() + duration; + const int64_t timestamp = OTSYS_TIME() + duration; if (decayMap.empty()) { eventId = g_dispatcher().scheduleEvent( std::max<int32_t>(SCHEDULER_MINTICKS, duration), [this] { checkDecay(); }, "Decay::checkDecay" @@ -65,15 +66,19 @@ void Decay::startDecay(std::shared_ptr<Item> item) { } } -void Decay::stopDecay(std::shared_ptr<Item> item) { +void Decay::stopDecay(const std::shared_ptr<Item> &item) { + if (!item) { + return; + } if (item->hasAttribute(ItemAttribute_t::DECAYSTATE)) { - auto timestamp = item->getAttribute<int64_t>(ItemAttribute_t::DURATION_TIMESTAMP); + const auto timestamp = item->getAttribute<int64_t>(ItemAttribute_t::DURATION_TIMESTAMP); if (item->hasAttribute(ItemAttribute_t::DURATION_TIMESTAMP)) { - auto it = decayMap.find(timestamp); + const auto it = decayMap.find(timestamp); if (it != decayMap.end()) { auto &decayItems = it->second; - size_t i = 0, end = decayItems.size(); + size_t i = 0; + const size_t end = decayItems.size(); auto decayItem = decayItems[i]; if (end == 1) { if (item == decayItem) { @@ -111,12 +116,13 @@ void Decay::stopDecay(std::shared_ptr<Item> item) { } void Decay::checkDecay() { - int64_t timestamp = OTSYS_TIME(); + const int64_t timestamp = OTSYS_TIME(); std::vector<std::shared_ptr<Item>> tempItems; tempItems.reserve(32); // Small preallocation - auto it = decayMap.begin(), end = decayMap.end(); + auto it = decayMap.begin(); + const auto end = decayMap.end(); while (it != end) { if (it->first > timestamp) { break; @@ -126,7 +132,7 @@ void Decay::checkDecay() { auto &decayItems = it->second; tempItems.reserve(tempItems.size() + decayItems.size()); for (auto &decayItem : decayItems) { - tempItems.push_back(decayItem); + tempItems.emplace_back(decayItem); } it = decayMap.erase(it); } @@ -148,12 +154,16 @@ void Decay::checkDecay() { } } -void Decay::internalDecayItem(std::shared_ptr<Item> item) { +void Decay::internalDecayItem(const std::shared_ptr<Item> &item) { + if (!item) { + return; + } + const ItemType &it = Item::items[item->getID()]; // Remove the item and halt the decay process if a player triggers a bug where the item's decay ID matches its equip or de-equip transformation ID if (it.id == it.transformEquipTo || it.id == it.transformDeEquipTo) { g_game().internalRemoveItem(item); - auto player = item->getHoldingPlayer(); + const 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 '{}'", @@ -163,7 +173,7 @@ void Decay::internalDecayItem(std::shared_ptr<Item> item) { } if (it.decayTo != 0) { - std::shared_ptr<Player> player = item->getHoldingPlayer(); + const auto &player = item->getHoldingPlayer(); if (player) { bool needUpdateSkills = false; for (int32_t i = SKILL_FIRST; i <= SKILL_LAST; ++i) { diff --git a/src/items/decay/decay.hpp b/src/items/decay/decay.hpp index e2916f613..2a91b3601 100644 --- a/src/items/decay/decay.hpp +++ b/src/items/decay/decay.hpp @@ -20,12 +20,12 @@ class Decay { static Decay &getInstance(); - void startDecay(std::shared_ptr<Item> item); - void stopDecay(std::shared_ptr<Item> item); + void startDecay(const std::shared_ptr<Item> &item); + void stopDecay(const std::shared_ptr<Item> &item); private: void checkDecay(); - void internalDecayItem(std::shared_ptr<Item> item); + static void internalDecayItem(const std::shared_ptr<Item> &item); uint32_t eventId { 0 }; // order is important, so we use an std::map diff --git a/src/items/functions/item/attribute.cpp b/src/items/functions/item/attribute.cpp index c67c6ce38..3c205f83a 100644 --- a/src/items/functions/item/attribute.cpp +++ b/src/items/functions/item/attribute.cpp @@ -7,10 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/functions/item/attribute.hpp" +#include "utils/tools.hpp" + /* ============================= * ItemAttribute class (Attributes methods) @@ -22,12 +22,12 @@ const std::string &ItemAttribute::getAttributeString(ItemAttribute_t type) const return emptyString; } - auto attribute = getAttribute(type); + const auto attribute = getAttribute(type); if (!attribute) { return emptyString; } - return *attribute->getString().get(); + return *attribute->getString(); } const int64_t &ItemAttribute::getAttributeValue(ItemAttribute_t type) const { @@ -36,7 +36,7 @@ const int64_t &ItemAttribute::getAttributeValue(ItemAttribute_t type) const { return emptyInt; } - auto attribute = getAttribute(type); + const auto attribute = getAttribute(type); if (!attribute) { return emptyInt; } @@ -119,22 +119,22 @@ const CustomAttribute* ItemAttribute::getCustomAttribute(const std::string &attr } void ItemAttribute::setCustomAttribute(const std::string &key, const int64_t value) { - CustomAttribute attribute(key, value); + const CustomAttribute attribute(key, value); customAttributeMap[asLowerCaseString(key)] = attribute; } void ItemAttribute::setCustomAttribute(const std::string &key, const std::string &value) { - CustomAttribute attribute(key, value); + const CustomAttribute attribute(key, value); customAttributeMap[asLowerCaseString(key)] = attribute; } void ItemAttribute::setCustomAttribute(const std::string &key, const double value) { - CustomAttribute attribute(key, value); + const CustomAttribute attribute(key, value); customAttributeMap[asLowerCaseString(key)] = attribute; } void ItemAttribute::setCustomAttribute(const std::string &key, const bool value) { - CustomAttribute attribute(key, value); + const CustomAttribute attribute(key, value); customAttributeMap[asLowerCaseString(key)] = attribute; } @@ -143,7 +143,7 @@ void ItemAttribute::addCustomAttribute(const std::string &key, const CustomAttri } bool ItemAttribute::removeCustomAttribute(const std::string &attributeName) { - auto it = customAttributeMap.find(asLowerCaseString(attributeName)); + const auto it = customAttributeMap.find(asLowerCaseString(attributeName)); if (it == customAttributeMap.end()) { return false; } diff --git a/src/items/functions/item/attribute.hpp b/src/items/functions/item/attribute.hpp index a2d3ba128..3d99187d9 100644 --- a/src/items/functions/item/attribute.hpp +++ b/src/items/functions/item/attribute.hpp @@ -11,11 +11,10 @@ #include "enums/item_attribute.hpp" #include "items/functions/item/custom_attribute.hpp" -#include "utils/tools.hpp" class ItemAttributeHelper { public: - bool isAttributeInteger(ItemAttribute_t type) const { + static bool isAttributeInteger(ItemAttribute_t type) { switch (type) { case ItemAttribute_t::STORE: case ItemAttribute_t::ACTIONID: @@ -48,7 +47,7 @@ class ItemAttributeHelper { } } - bool isAttributeString(ItemAttribute_t type) const { + static bool isAttributeString(ItemAttribute_t type) { switch (type) { case ItemAttribute_t::DESCRIPTION: case ItemAttribute_t::TEXT: @@ -88,10 +87,9 @@ class Attributes : public ItemAttributeHelper { } std::variant<int64_t, std::shared_ptr<std::string>> getDefaultValueForType(ItemAttribute_t attributeType) const { - ItemAttributeHelper helper; - if (helper.isAttributeInteger(attributeType)) { + if (ItemAttributeHelper::isAttributeInteger(attributeType)) { return 0; - } else if (helper.isAttributeString(attributeType)) { + } else if (ItemAttributeHelper::isAttributeString(attributeType)) { return std::make_shared<std::string>(); } else { return {}; @@ -116,7 +114,7 @@ class Attributes : public ItemAttributeHelper { return emptyValue; } - const std::shared_ptr<std::string> getString() const { + std::shared_ptr<std::string> getString() const { if (std::holds_alternative<std::shared_ptr<std::string>>(value)) { return std::get<std::shared_ptr<std::string>>(value); } @@ -138,10 +136,10 @@ class ItemAttribute : public ItemAttributeHelper { // CustomAttribute object methods const CustomAttribute* getCustomAttribute(const std::string &attributeName) const; - void setCustomAttribute(const std::string &key, const int64_t value); + void setCustomAttribute(const std::string &key, int64_t value); void setCustomAttribute(const std::string &key, const std::string &value); - void setCustomAttribute(const std::string &key, const double value); - void setCustomAttribute(const std::string &key, const bool value); + void setCustomAttribute(const std::string &key, double value); + void setCustomAttribute(const std::string &key, bool value); void addCustomAttribute(const std::string &key, const CustomAttribute &customAttribute); bool removeCustomAttribute(const std::string &attributeName); @@ -158,12 +156,9 @@ class ItemAttribute : public ItemAttributeHelper { } bool hasAttribute(ItemAttribute_t type) const { - for (const auto &attr : attributeVector) { - if (attr.getAttributeType() == type) { - return true; - } - } - return false; + return std::ranges::any_of(attributeVector, [type](const auto &attr) { + return attr.getAttributeType() == type; + }); } const Attributes* getAttribute(ItemAttribute_t type) const; diff --git a/src/items/functions/item/custom_attribute.cpp b/src/items/functions/item/custom_attribute.cpp index 202c57c09..ffe479307 100644 --- a/src/items/functions/item/custom_attribute.cpp +++ b/src/items/functions/item/custom_attribute.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/functions/item/custom_attribute.hpp" #include "lua/scripts/luascript.hpp" @@ -17,20 +15,20 @@ CustomAttribute::CustomAttribute() = default; CustomAttribute::~CustomAttribute() = default; // Constructor for int64_t -CustomAttribute::CustomAttribute(const std::string &initStringKey, const int64_t initInt64) : - stringKey(initStringKey), value(initInt64) { +CustomAttribute::CustomAttribute(std::string initStringKey, const int64_t initInt64) : + stringKey(std::move(initStringKey)), value(initInt64) { } // Constructor for string -CustomAttribute::CustomAttribute(const std::string &initStringKey, const std::string &initStringValue) : - stringKey(initStringKey), value(initStringValue) { +CustomAttribute::CustomAttribute(std::string initStringKey, const std::string &initStringValue) : + stringKey(std::move(initStringKey)), value(initStringValue) { } // Constructor for double -CustomAttribute::CustomAttribute(const std::string &initStringKey, const double initDoubleValue) : - stringKey(initStringKey), value(initDoubleValue) { +CustomAttribute::CustomAttribute(std::string initStringKey, const double initDoubleValue) : + stringKey(std::move(initStringKey)), value(initDoubleValue) { } // Constructor for boolean -CustomAttribute::CustomAttribute(const std::string &initStringKey, const bool initBoolValue) : - stringKey(initStringKey), value(initBoolValue) { +CustomAttribute::CustomAttribute(std::string initStringKey, const bool initBoolValue) : + stringKey(std::move(initStringKey)), value(initBoolValue) { } const std::string &CustomAttribute::getStringKey() const { diff --git a/src/items/functions/item/custom_attribute.hpp b/src/items/functions/item/custom_attribute.hpp index e91832c6b..b44e20bf4 100644 --- a/src/items/functions/item/custom_attribute.hpp +++ b/src/items/functions/item/custom_attribute.hpp @@ -16,10 +16,10 @@ class CustomAttribute { CustomAttribute(); ~CustomAttribute(); - CustomAttribute(const std::string &initStringKey, const int64_t initInt64Value); - CustomAttribute(const std::string &initStringKey, const std::string &initStringValue); - CustomAttribute(const std::string &initStringKey, const double initDoubleValue); - CustomAttribute(const std::string &initStringKey, const bool initBoolValue); + CustomAttribute(std::string initStringKey, int64_t initInt64Value); + CustomAttribute(std::string initStringKey, const std::string &initStringValue); + CustomAttribute(std::string initStringKey, double initDoubleValue); + CustomAttribute(std::string initStringKey, bool initBoolValue); const std::string &getStringKey() const; diff --git a/src/items/functions/item/item_parse.cpp b/src/items/functions/item/item_parse.cpp index 9b63b9aee..761740bfc 100644 --- a/src/items/functions/item/item_parse.cpp +++ b/src/items/functions/item/item_parse.cpp @@ -7,82 +7,83 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/functions/item/item_parse.hpp" + +#include "config/configmanager.hpp" #include "items/weapons/weapons.hpp" #include "lua/creature/movement.hpp" #include "utils/pugicast.hpp" +#include "utils/tools.hpp" #include "creatures/combat/combat.hpp" -void ItemParse::initParse(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { +void ItemParse::initParse(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { // Parse all item attributes - ItemParse::parseType(tmpStrValue, attributeNode, valueAttribute, itemType); - ItemParse::parseDescription(tmpStrValue, valueAttribute, itemType); - ItemParse::parseRuneSpellName(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWeight(tmpStrValue, valueAttribute, itemType); - ItemParse::parseShowCount(tmpStrValue, valueAttribute, itemType); - ItemParse::parseArmor(tmpStrValue, valueAttribute, itemType); - ItemParse::parseDefense(tmpStrValue, valueAttribute, itemType); - ItemParse::parseExtraDefense(tmpStrValue, valueAttribute, itemType); - ItemParse::parseAttack(tmpStrValue, valueAttribute, itemType); - ItemParse::parseRotateTo(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWrapContainer(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWrapableTo(tmpStrValue, valueAttribute, itemType); - ItemParse::parseMovable(tmpStrValue, valueAttribute, itemType); - ItemParse::parseBlockProjectTile(tmpStrValue, valueAttribute, itemType); - ItemParse::parsePickupable(tmpStrValue, valueAttribute, itemType); - ItemParse::parseFloorChange(tmpStrValue, valueAttribute, itemType); - ItemParse::parseContainerSize(tmpStrValue, valueAttribute, itemType); - ItemParse::parseFluidSource(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWriteables(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWeaponType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseSlotType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseAmmoType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseShootType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseMagicEffect(tmpStrValue, valueAttribute, itemType); - ItemParse::parseLootType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseRange(tmpStrValue, valueAttribute, itemType); - ItemParse::parseDecayTo(tmpStrValue, valueAttribute, itemType); - ItemParse::parseDuration(tmpStrValue, valueAttribute, itemType); - ItemParse::parseTransform(tmpStrValue, valueAttribute, itemType); - ItemParse::parseCharges(tmpStrValue, valueAttribute, itemType); - ItemParse::parseShowAttributes(tmpStrValue, valueAttribute, itemType); - ItemParse::parseHitChance(tmpStrValue, valueAttribute, itemType); - ItemParse::parseInvisible(tmpStrValue, valueAttribute, itemType); - ItemParse::parseSpeed(tmpStrValue, valueAttribute, itemType); - ItemParse::parseHealthAndMana(tmpStrValue, valueAttribute, itemType); - ItemParse::parseSkills(tmpStrValue, valueAttribute, itemType); - ItemParse::parseCriticalHit(tmpStrValue, valueAttribute, itemType); - ItemParse::parseLifeAndManaLeech(tmpStrValue, valueAttribute, itemType); - ItemParse::parseMaxHitAndManaPoints(tmpStrValue, valueAttribute, itemType); - ItemParse::parseMagicLevelPoint(tmpStrValue, valueAttribute, itemType); - ItemParse::parseFieldAbsorbPercent(tmpStrValue, valueAttribute, itemType); - ItemParse::parseAbsorbPercent(tmpStrValue, valueAttribute, itemType); - ItemParse::parseSupressDrunk(tmpStrValue, valueAttribute, itemType); - ItemParse::parseField(tmpStrValue, attributeNode, valueAttribute, itemType); - ItemParse::parseReplaceable(tmpStrValue, valueAttribute, itemType); - ItemParse::parseLevelDoor(tmpStrValue, valueAttribute, itemType); - ItemParse::parseBeds(tmpStrValue, valueAttribute, itemType); - ItemParse::parseElement(tmpStrValue, valueAttribute, itemType); - ItemParse::parseWalk(tmpStrValue, valueAttribute, itemType); - ItemParse::parseAllowDistanceRead(tmpStrValue, valueAttribute, itemType); - ItemParse::parseImbuement(tmpStrValue, attributeNode, valueAttribute, itemType); - ItemParse::parseAugment(tmpStrValue, attributeNode, valueAttribute, itemType); - ItemParse::parseStackSize(tmpStrValue, valueAttribute, itemType); - ItemParse::parseSpecializedMagicLevelPoint(tmpStrValue, valueAttribute, itemType); - ItemParse::parseMagicShieldCapacity(tmpStrValue, valueAttribute, itemType); - ItemParse::parsePerfecShot(tmpStrValue, valueAttribute, itemType); - ItemParse::parseCleavePercent(tmpStrValue, valueAttribute, itemType); - ItemParse::parseReflectDamage(tmpStrValue, valueAttribute, itemType); - ItemParse::parseTransformOnUse(tmpStrValue, valueAttribute, itemType); - ItemParse::parsePrimaryType(tmpStrValue, valueAttribute, itemType); - ItemParse::parseHouseRelated(tmpStrValue, valueAttribute, itemType); - ItemParse::parseUnscriptedItems(tmpStrValue, attributeNode, valueAttribute, itemType); + ItemParse::parseType(stringValue, attributeNode, valueAttribute, itemType); + ItemParse::parseDescription(stringValue, valueAttribute, itemType); + ItemParse::parseRuneSpellName(stringValue, valueAttribute, itemType); + ItemParse::parseWeight(stringValue, valueAttribute, itemType); + ItemParse::parseShowCount(stringValue, valueAttribute, itemType); + ItemParse::parseArmor(stringValue, valueAttribute, itemType); + ItemParse::parseDefense(stringValue, valueAttribute, itemType); + ItemParse::parseExtraDefense(stringValue, valueAttribute, itemType); + ItemParse::parseAttack(stringValue, valueAttribute, itemType); + ItemParse::parseRotateTo(stringValue, valueAttribute, itemType); + ItemParse::parseWrapContainer(stringValue, valueAttribute, itemType); + ItemParse::parseWrapableTo(stringValue, valueAttribute, itemType); + ItemParse::parseMovable(stringValue, valueAttribute, itemType); + ItemParse::parseBlockProjectTile(stringValue, valueAttribute, itemType); + ItemParse::parsePickupable(stringValue, valueAttribute, itemType); + ItemParse::parseFloorChange(stringValue, valueAttribute, itemType); + ItemParse::parseContainerSize(stringValue, valueAttribute, itemType); + ItemParse::parseFluidSource(stringValue, valueAttribute, itemType); + ItemParse::parseWriteables(stringValue, valueAttribute, itemType); + ItemParse::parseWeaponType(stringValue, valueAttribute, itemType); + ItemParse::parseSlotType(stringValue, valueAttribute, itemType); + ItemParse::parseAmmoType(stringValue, valueAttribute, itemType); + ItemParse::parseShootType(stringValue, valueAttribute, itemType); + ItemParse::parseMagicEffect(stringValue, valueAttribute, itemType); + ItemParse::parseLootType(stringValue, valueAttribute, itemType); + ItemParse::parseRange(stringValue, valueAttribute, itemType); + ItemParse::parseDecayTo(stringValue, valueAttribute, itemType); + ItemParse::parseDuration(stringValue, valueAttribute, itemType); + ItemParse::parseTransform(stringValue, valueAttribute, itemType); + ItemParse::parseCharges(stringValue, valueAttribute, itemType); + ItemParse::parseShowAttributes(stringValue, valueAttribute, itemType); + ItemParse::parseHitChance(stringValue, valueAttribute, itemType); + ItemParse::parseInvisible(stringValue, valueAttribute, itemType); + ItemParse::parseSpeed(stringValue, valueAttribute, itemType); + ItemParse::parseHealthAndMana(stringValue, valueAttribute, itemType); + ItemParse::parseSkills(stringValue, valueAttribute, itemType); + ItemParse::parseCriticalHit(stringValue, valueAttribute, itemType); + ItemParse::parseLifeAndManaLeech(stringValue, valueAttribute, itemType); + ItemParse::parseMaxHitAndManaPoints(stringValue, valueAttribute, itemType); + ItemParse::parseMagicLevelPoint(stringValue, valueAttribute, itemType); + ItemParse::parseFieldAbsorbPercent(stringValue, valueAttribute, itemType); + ItemParse::parseAbsorbPercent(stringValue, valueAttribute, itemType); + ItemParse::parseSupressDrunk(stringValue, valueAttribute, itemType); + ItemParse::parseField(stringValue, attributeNode, valueAttribute, itemType); + ItemParse::parseReplaceable(stringValue, valueAttribute, itemType); + ItemParse::parseLevelDoor(stringValue, valueAttribute, itemType); + ItemParse::parseBeds(stringValue, valueAttribute, itemType); + ItemParse::parseElement(stringValue, valueAttribute, itemType); + ItemParse::parseWalk(stringValue, valueAttribute, itemType); + ItemParse::parseAllowDistanceRead(stringValue, valueAttribute, itemType); + ItemParse::parseImbuement(stringValue, attributeNode, valueAttribute, itemType); + ItemParse::parseAugment(stringValue, attributeNode, valueAttribute, itemType); + ItemParse::parseStackSize(stringValue, valueAttribute, itemType); + ItemParse::parseSpecializedMagicLevelPoint(stringValue, valueAttribute, itemType); + ItemParse::parseMagicShieldCapacity(stringValue, valueAttribute, itemType); + ItemParse::parsePerfecShot(stringValue, valueAttribute, itemType); + ItemParse::parseCleavePercent(stringValue, valueAttribute, itemType); + ItemParse::parseReflectDamage(stringValue, valueAttribute, itemType); + ItemParse::parseTransformOnUse(stringValue, valueAttribute, itemType); + ItemParse::parsePrimaryType(stringValue, valueAttribute, itemType); + ItemParse::parseHouseRelated(stringValue, valueAttribute, itemType); + ItemParse::parseUnscriptedItems(stringValue, attributeNode, valueAttribute, itemType); } void ItemParse::parseDummyRate(pugi::xml_node attributeNode, ItemType &itemType) { - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; @@ -95,17 +96,16 @@ void ItemParse::parseDummyRate(pugi::xml_node attributeNode, ItemType &itemType) auto stringValue = asLowerCaseString(subKeyAttribute.as_string()); if (stringValue == "rate") { - uint16_t rate = subValueAttribute.as_uint(); + const uint16_t rate = subValueAttribute.as_uint(); Item::items.addDummyId(itemType.id, rate); } } } -void ItemParse::parseType(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseType(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "type") { - stringValue = asLowerCaseString(valueAttribute.as_string()); - auto itemMap = ItemTypesMap.find(stringValue); + auto stringValue = asLowerCaseString(valueAttribute.as_string()); + const auto &itemMap = ItemTypesMap.find(stringValue); if (itemMap != ItemTypesMap.end()) { itemType.type = itemMap->second; if (itemType.type == ITEM_TYPE_CONTAINER) { @@ -123,115 +123,100 @@ void ItemParse::parseType(const std::string &tmpStrValue, pugi::xml_node attribu } } -void ItemParse::parseDescription(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseDescription(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "description") { itemType.description = valueAttribute.as_string(); - if (g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY, __FUNCTION__) && itemType.id == ITEM_GOLD_POUCH) { - auto pouchLimit = g_configManager().getNumber(LOOTPOUCH_MAXLIMIT, __FUNCTION__); + if (g_configManager().getBoolean(TOGGLE_GOLD_POUCH_QUICKLOOT_ONLY) && itemType.id == ITEM_GOLD_POUCH) { + auto pouchLimit = g_configManager().getNumber(LOOTPOUCH_MAXLIMIT); itemType.description = fmt::format("A bag with {} slots where you can hold your loots.", pouchLimit); itemType.name = "loot pouch"; } } } -void ItemParse::parseRuneSpellName(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseRuneSpellName(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "runespellname") { itemType.runeSpellName = valueAttribute.as_string(); } } -void ItemParse::parseWeight(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWeight(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "weight") { itemType.weight = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseShowCount(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseShowCount(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "showcount") { itemType.showCount = valueAttribute.as_bool(); } } -void ItemParse::parseArmor(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseArmor(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "armor") { itemType.armor = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseDefense(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseDefense(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "defense") { itemType.defense = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseExtraDefense(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseExtraDefense(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "extradef") { itemType.extraDefense = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseAttack(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseAttack(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "attack") { itemType.attack = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseRotateTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseRotateTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "rotateto") { itemType.rotateTo = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseWrapContainer(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWrapContainer(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "wrapcontainer") { itemType.wrapContainer = valueAttribute.as_bool(); } } -void ItemParse::parseWrapableTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWrapableTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "wrapableto") { itemType.wrapableTo = pugi::cast<int32_t>(valueAttribute.value()); itemType.wrapable = true; } } -void ItemParse::parseMovable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseMovable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "movable") { itemType.movable = valueAttribute.as_bool(); } } -void ItemParse::parseBlockProjectTile(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseBlockProjectTile(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "blockprojectile") { itemType.blockProjectile = valueAttribute.as_bool(); } } -void ItemParse::parsePickupable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parsePickupable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "allowpickupable" || stringValue == "pickupable") { itemType.pickupable = valueAttribute.as_bool(); } } -void ItemParse::parseFloorChange(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseFloorChange(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "floorchange") { - stringValue = asLowerCaseString(valueAttribute.as_string()); - auto itemMap = TileStatesMap.find(stringValue); + auto lowerString = asLowerCaseString(valueAttribute.as_string()); + const auto &itemMap = TileStatesMap.find(lowerString); if (itemMap != TileStatesMap.end()) { itemType.floorChange = itemMap->second; } else { @@ -240,18 +225,16 @@ void ItemParse::parseFloorChange(const std::string &tmpStrValue, pugi::xml_attri } } -void ItemParse::parseContainerSize(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseContainerSize(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "containersize") { itemType.maxItems = pugi::cast<uint16_t>(valueAttribute.value()); } } -void ItemParse::parseFluidSource(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseFluidSource(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "fluidsource") { - stringValue = asLowerCaseString(valueAttribute.as_string()); - auto itemMap = FluidTypesMap.find(stringValue); + auto lowerString = asLowerCaseString(valueAttribute.as_string()); + const auto &itemMap = FluidTypesMap.find(lowerString); if (itemMap != FluidTypesMap.end()) { itemType.fluidSource = itemMap->second; } else { @@ -260,8 +243,7 @@ void ItemParse::parseFluidSource(const std::string &tmpStrValue, pugi::xml_attri } } -void ItemParse::parseWriteables(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWriteables(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "readable") { itemType.canReadText = valueAttribute.as_bool(); } else if (stringValue == "writeable") { @@ -274,13 +256,12 @@ void ItemParse::parseWriteables(const std::string &tmpStrValue, pugi::xml_attrib } } -void ItemParse::parseWeaponType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWeaponType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "weapontype") { - stringValue = asLowerCaseString(valueAttribute.as_string()); - auto itemMap = WeaponTypesMap.find(stringValue); + auto lowerString = asLowerCaseString(valueAttribute.as_string()); + const auto &itemMap = WeaponTypesMap.find(lowerString); if (itemMap != WeaponTypesMap.end()) { - if (tmpStrValue == "spellbook") { + if (stringValue == "spellbook") { itemType.spellbook = true; } itemType.weaponType = itemMap->second; @@ -290,34 +271,33 @@ void ItemParse::parseWeaponType(const std::string &tmpStrValue, pugi::xml_attrib } } -void ItemParse::parseSlotType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseSlotType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "slottype") { itemType.slotPosition = SLOTP_HAND; - stringValue = asLowerCaseString(valueAttribute.as_string()); - if (stringValue == "head") { + auto subStringValue = asLowerCaseString(valueAttribute.as_string()); + if (subStringValue == "head") { itemType.slotPosition |= SLOTP_HEAD; - } else if (stringValue == "body") { + } else if (subStringValue == "body") { itemType.slotPosition |= SLOTP_ARMOR; - } else if (stringValue == "legs") { + } else if (subStringValue == "legs") { itemType.slotPosition |= SLOTP_LEGS; - } else if (stringValue == "feet") { + } else if (subStringValue == "feet") { itemType.slotPosition |= SLOTP_FEET; - } else if (stringValue == "backpack") { + } else if (subStringValue == "backpack") { itemType.slotPosition |= SLOTP_BACKPACK; - } else if (stringValue == "two-handed") { + } else if (subStringValue == "two-handed") { itemType.slotPosition |= SLOTP_TWO_HAND; - } else if (stringValue == "right-hand") { + } else if (subStringValue == "right-hand") { itemType.slotPosition &= ~SLOTP_LEFT; - } else if (stringValue == "left-hand") { + } else if (subStringValue == "left-hand") { itemType.slotPosition &= ~SLOTP_RIGHT; - } else if (stringValue == "necklace") { + } else if (subStringValue == "necklace") { itemType.slotPosition |= SLOTP_NECKLACE; - } else if (stringValue == "ring") { + } else if (subStringValue == "ring") { itemType.slotPosition |= SLOTP_RING; - } else if (stringValue == "ammo") { + } else if (subStringValue == "ammo") { itemType.slotPosition |= SLOTP_AMMO; - } else if (stringValue == "hand") { + } else if (subStringValue == "hand") { itemType.slotPosition |= SLOTP_HAND; } else { g_logger().warn("[itemParseSlotType - Items::parseItemNode] - Unknown slotType {}", valueAttribute.as_string()); @@ -325,8 +305,7 @@ void ItemParse::parseSlotType(const std::string &tmpStrValue, pugi::xml_attribut } } -void ItemParse::parseAmmoType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseAmmoType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "ammotype") { itemType.ammoType = getAmmoType(asLowerCaseString(valueAttribute.as_string())); if (itemType.ammoType == AMMO_NONE) { @@ -335,10 +314,9 @@ void ItemParse::parseAmmoType(const std::string &tmpStrValue, pugi::xml_attribut } } -void ItemParse::parseShootType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseShootType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "shoottype") { - ShootType_t shoot = getShootType(asLowerCaseString(valueAttribute.as_string())); + const ShootType_t &shoot = getShootType(asLowerCaseString(valueAttribute.as_string())); if (shoot != CONST_ANI_NONE) { itemType.shootType = shoot; } else { @@ -347,10 +325,9 @@ void ItemParse::parseShootType(const std::string &tmpStrValue, pugi::xml_attribu } } -void ItemParse::parseMagicEffect(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseMagicEffect(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "effect") { - MagicEffectClasses effect = getMagicEffect(asLowerCaseString(valueAttribute.as_string())); + const MagicEffectClasses &effect = getMagicEffect(asLowerCaseString(valueAttribute.as_string())); if (effect != CONST_ME_NONE) { itemType.magicEffect = effect; } else { @@ -359,29 +336,25 @@ void ItemParse::parseMagicEffect(const std::string &tmpStrValue, pugi::xml_attri } } -void ItemParse::parseLootType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseLootType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "loottype") { itemType.type = Item::items.getLootType(valueAttribute.as_string()); } } -void ItemParse::parseRange(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseRange(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "range") { itemType.shootRange = pugi::cast<uint8_t>(valueAttribute.value()); } } -void ItemParse::parseDecayTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseDecayTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "decayto") { itemType.decayTo = pugi::cast<uint16_t>(valueAttribute.value()); } } -void ItemParse::parseDuration(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseDuration(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "duration") { itemType.decayTime = pugi::cast<uint32_t>(valueAttribute.value()); } else if (stringValue == "stopduration") { @@ -391,8 +364,7 @@ void ItemParse::parseDuration(const std::string &tmpStrValue, pugi::xml_attribut } } -void ItemParse::parseTransform(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseTransform(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "transformequipto") { itemType.transformEquipTo = pugi::cast<uint16_t>(valueAttribute.value()); if (itemType.transformEquipTo == itemType.decayTo) { @@ -417,8 +389,7 @@ void ItemParse::parseTransform(const std::string &tmpStrValue, pugi::xml_attribu } } -void ItemParse::parseCharges(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseCharges(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "charges") { itemType.charges = pugi::cast<uint32_t>(valueAttribute.value()); } else if (stringValue == "showcharges") { @@ -426,15 +397,13 @@ void ItemParse::parseCharges(const std::string &tmpStrValue, pugi::xml_attribute } } -void ItemParse::parseShowAttributes(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string lowerStringValue = asLowerCaseString(tmpStrValue); - if (lowerStringValue == "showattributes") { +void ItemParse::parseShowAttributes(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "showattributes") { itemType.showAttributes = valueAttribute.as_bool(); } } -void ItemParse::parseHitChance(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseHitChance(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "hitchance") { itemType.hitChance = std::min<int8_t>(100, std::max<int8_t>(-100, pugi::cast<int8_t>(valueAttribute.value()))); } else if (stringValue == "maxhitchance") { @@ -442,22 +411,19 @@ void ItemParse::parseHitChance(const std::string &tmpStrValue, pugi::xml_attribu } } -void ItemParse::parseInvisible(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseInvisible(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "invisible") { itemType.getAbilities().invisible = valueAttribute.as_bool(); } } -void ItemParse::parseSpeed(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseSpeed(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "speed") { itemType.getAbilities().speed = pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseHealthAndMana(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseHealthAndMana(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "healthgain") { Abilities &abilities = itemType.getAbilities(); abilities.regeneration = true; @@ -479,8 +445,7 @@ void ItemParse::parseHealthAndMana(const std::string &tmpStrValue, pugi::xml_att } } -void ItemParse::parseSkills(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseSkills(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "skillsword") { itemType.getAbilities().skills[SKILL_SWORD] = pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "skillaxe") { @@ -498,8 +463,7 @@ void ItemParse::parseSkills(const std::string &tmpStrValue, pugi::xml_attribute } } -void ItemParse::parseCriticalHit(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseCriticalHit(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "criticalhitchance") { itemType.getAbilities().skills[SKILL_CRITICAL_HIT_CHANCE] = pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "criticalhitdamage") { @@ -507,8 +471,7 @@ void ItemParse::parseCriticalHit(const std::string &tmpStrValue, pugi::xml_attri } } -void ItemParse::parseLifeAndManaLeech(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseLifeAndManaLeech(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "lifeleechchance") { itemType.getAbilities().skills[SKILL_LIFE_LEECH_CHANCE] = pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "lifeleechamount") { @@ -520,8 +483,7 @@ void ItemParse::parseLifeAndManaLeech(const std::string &tmpStrValue, pugi::xml_ } } -void ItemParse::parseMaxHitAndManaPoints(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseMaxHitAndManaPoints(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "maxhitpoints") { itemType.getAbilities().stats[STAT_MAXHITPOINTS] = pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "maxhitpointspercent") { @@ -533,8 +495,7 @@ void ItemParse::parseMaxHitAndManaPoints(const std::string &tmpStrValue, pugi::x } } -void ItemParse::parseMagicLevelPoint(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseMagicLevelPoint(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "magiclevelpoints" || stringValue == "magicpoints") { itemType.getAbilities().stats[STAT_MAGICPOINTS] = pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "magiclevelpointspercent") { @@ -542,8 +503,7 @@ void ItemParse::parseMagicLevelPoint(const std::string &tmpStrValue, pugi::xml_a } } -void ItemParse::parseFieldAbsorbPercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseFieldAbsorbPercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "fieldabsorbpercentenergy") { itemType.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value()); } else if (stringValue == "fieldabsorbpercentfire") { @@ -553,23 +513,22 @@ void ItemParse::parseFieldAbsorbPercent(const std::string &tmpStrValue, pugi::xm } } -void ItemParse::parseAbsorbPercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseAbsorbPercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "absorbpercentall") { - int16_t value = pugi::cast<int16_t>(valueAttribute.value()); + const auto value = pugi::cast<int16_t>(valueAttribute.value()); Abilities &abilities = itemType.getAbilities(); for (auto &i : abilities.absorbPercent) { i += value; } } else if (stringValue == "absorbpercentelements") { - int16_t value = pugi::cast<int16_t>(valueAttribute.value()); + const auto value = pugi::cast<int16_t>(valueAttribute.value()); Abilities &abilities = itemType.getAbilities(); abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value; abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value; abilities.absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += value; abilities.absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += value; } else if (stringValue == "absorbpercentmagic") { - int16_t value = pugi::cast<int16_t>(valueAttribute.value()); + const auto value = pugi::cast<int16_t>(valueAttribute.value()); Abilities &abilities = itemType.getAbilities(); abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value; abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value; @@ -602,8 +561,7 @@ void ItemParse::parseAbsorbPercent(const std::string &tmpStrValue, pugi::xml_att } } -void ItemParse::parseSupressDrunk(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseSupressDrunk(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (valueAttribute.as_bool()) { ConditionType_t conditionType = CONDITION_NONE; if (stringValue == "suppressdrunk") { @@ -630,8 +588,8 @@ void ItemParse::parseSupressDrunk(const std::string &tmpStrValue, pugi::xml_attr } } -std::tuple<ConditionId_t, ConditionType_t> ItemParse::parseFieldConditions(std::string lowerStringValue, pugi::xml_attribute valueAttribute) { - lowerStringValue = asLowerCaseString(valueAttribute.as_string()); +std::tuple<ConditionId_t, ConditionType_t> ItemParse::parseFieldConditions(pugi::xml_attribute valueAttribute) { + auto lowerStringValue = asLowerCaseString(valueAttribute.as_string()); ConditionId_t conditionId = CONDITIONID_COMBAT; ConditionType_t conditionType = CONDITION_NONE; if (lowerStringValue == "fire") { @@ -655,8 +613,8 @@ std::tuple<ConditionId_t, ConditionType_t> ItemParse::parseFieldConditions(std:: return std::make_tuple(CONDITIONID_DEFAULT, CONDITION_NONE); } -CombatType_t ItemParse::parseFieldCombatType(std::string lowerStringValue, pugi::xml_attribute valueAttribute) { - lowerStringValue = asLowerCaseString(valueAttribute.as_string()); +CombatType_t ItemParse::parseFieldCombatType(pugi::xml_attribute valueAttribute) { + auto lowerStringValue = asLowerCaseString(valueAttribute.as_string()); if (lowerStringValue == "fire") { return COMBAT_FIREDAMAGE; } else if (lowerStringValue == "energy") { @@ -673,13 +631,13 @@ CombatType_t ItemParse::parseFieldCombatType(std::string lowerStringValue, pugi: return COMBAT_NONE; } -void ItemParse::parseFieldCombatDamage(std::shared_ptr<ConditionDamage> conditionDamage, std::string stringValue, pugi::xml_node attributeNode) { +void ItemParse::parseFieldCombatDamage(const std::shared_ptr<ConditionDamage> &conditionDamage, pugi::xml_node attributeNode) { uint32_t combatTicks = 0; int32_t combatDamage = 0; int32_t combatStart = 0; int32_t combatCount = 1; - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; @@ -690,7 +648,7 @@ void ItemParse::parseFieldCombatDamage(std::shared_ptr<ConditionDamage> conditio continue; } - stringValue = asLowerCaseString(subKeyAttribute.as_string()); + auto stringValue = asLowerCaseString(subKeyAttribute.as_string()); if (stringValue == "ticks") { combatTicks = pugi::cast<uint32_t>(subValueAttribute.value()); } else if (stringValue == "count") { @@ -705,7 +663,7 @@ void ItemParse::parseFieldCombatDamage(std::shared_ptr<ConditionDamage> conditio std::list<int32_t> damageList; ConditionDamage::generateDamageList(combatDamage, combatStart, damageList); - for (int32_t damageValue : damageList) { + for (const int32_t damageValue : damageList) { conditionDamage->addDamage(1, combatTicks, -damageValue); } @@ -714,14 +672,14 @@ void ItemParse::parseFieldCombatDamage(std::shared_ptr<ConditionDamage> conditio } } -void ItemParse::parseField(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue == "field") { +void ItemParse::parseField(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "field") { CombatType_t combatType = COMBAT_NONE; std::shared_ptr<ConditionDamage> conditionDamage = nullptr; // Parse fields conditions (fire/energy/poison/drown/physical) - combatType = parseFieldCombatType(tmpStrValue, valueAttribute); - auto [conditionId, conditionType] = parseFieldConditions(tmpStrValue, valueAttribute); + combatType = parseFieldCombatType(valueAttribute); + auto [conditionId, conditionType] = parseFieldConditions(valueAttribute); if (combatType != COMBAT_NONE) { if (conditionDamage) { @@ -732,7 +690,7 @@ void ItemParse::parseField(const std::string &tmpStrValue, pugi::xml_node attrib itemType.combatType = combatType; itemType.conditionDamage = conditionDamage; - parseFieldCombatDamage(conditionDamage, tmpStrValue, attributeNode); + parseFieldCombatDamage(conditionDamage, attributeNode); conditionDamage->setParam(CONDITION_PARAM_FIELD, 1); @@ -743,28 +701,25 @@ void ItemParse::parseField(const std::string &tmpStrValue, pugi::xml_node attrib } } -void ItemParse::parseReplaceable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseReplaceable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "replaceable") { itemType.replaceable = valueAttribute.as_bool(); } } -void ItemParse::parseLevelDoor(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseLevelDoor(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "leveldoor") { itemType.levelDoor = pugi::cast<uint32_t>(valueAttribute.value()); } } -void ItemParse::parseBeds(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseBeds(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "partnerdirection") { itemType.bedPartnerDir = getDirection(valueAttribute.as_string()); } if (stringValue == "maletransformto") { - uint16_t valueMale = pugi::cast<uint16_t>(valueAttribute.value()); + const auto valueMale = pugi::cast<uint16_t>(valueAttribute.value()); ItemType &other = Item::items.getItemType(valueMale); itemType.transformToOnUse[PLAYERSEX_MALE] = valueMale; if (other.transformToFree == 0) { @@ -775,7 +730,7 @@ void ItemParse::parseBeds(const std::string &tmpStrValue, pugi::xml_attribute va itemType.transformToOnUse[PLAYERSEX_FEMALE] = valueMale; } } else if (stringValue == "femaletransformto") { - uint16_t valueFemale = pugi::cast<uint16_t>(valueAttribute.value()); + const auto valueFemale = pugi::cast<uint16_t>(valueAttribute.value()); ItemType &other = Item::items.getItemType(valueFemale); itemType.transformToOnUse[PLAYERSEX_FEMALE] = valueFemale; @@ -796,8 +751,7 @@ void ItemParse::parseBeds(const std::string &tmpStrValue, pugi::xml_attribute va } } -void ItemParse::parseElement(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseElement(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "elementice") { Abilities &abilities = itemType.getAbilities(); abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value()); @@ -825,8 +779,7 @@ void ItemParse::parseElement(const std::string &tmpStrValue, pugi::xml_attribute } } -void ItemParse::parseWalk(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseWalk(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "walkstack") { itemType.walkStack = valueAttribute.as_bool(); } else if (stringValue == "blocking") { @@ -834,20 +787,19 @@ void ItemParse::parseWalk(const std::string &tmpStrValue, pugi::xml_attribute va } } -void ItemParse::parseAllowDistanceRead(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseAllowDistanceRead(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "allowdistread") { itemType.allowDistRead = booleanString(valueAttribute.as_string()); } } -void ItemParse::parseImbuement(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue != "imbuementslot") { +void ItemParse::parseImbuement(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue != "imbuementslot") { return; } itemType.imbuementSlot = pugi::cast<uint8_t>(valueAttribute.value()); - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; @@ -858,9 +810,9 @@ void ItemParse::parseImbuement(const std::string &tmpStrValue, pugi::xml_node at continue; } - auto itemMap = ImbuementsTypeMap.find(asLowerCaseString(subKeyAttribute.as_string())); + const auto &itemMap = ImbuementsTypeMap.find(asLowerCaseString(subKeyAttribute.as_string())); if (itemMap != ImbuementsTypeMap.end()) { - ImbuementTypes_t imbuementType = getImbuementType(asLowerCaseString(subKeyAttribute.as_string())); + const ImbuementTypes_t imbuementType = getImbuementType(asLowerCaseString(subKeyAttribute.as_string())); if (imbuementType != IMBUEMENT_NONE) { itemType.setImbuementType(imbuementType, pugi::cast<uint16_t>(subValueAttribute.value())); continue; @@ -871,8 +823,8 @@ void ItemParse::parseImbuement(const std::string &tmpStrValue, pugi::xml_node at } } -void ItemParse::parseAugment(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue != "augments") { +void ItemParse::parseAugment(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue != "augments") { return; } @@ -899,7 +851,7 @@ void ItemParse::parseAugment(const std::string &tmpStrValue, pugi::xml_node attr if (hasValueDescrition) { const auto it = AugmentWithoutValueDescriptionDefaultKeys.find(augmentType); if (it != AugmentWithoutValueDescriptionDefaultKeys.end()) { - augmentValue = g_configManager().getNumber(it->second, __FUNCTION__); + augmentValue = g_configManager().getNumber(it->second); } } @@ -923,8 +875,7 @@ void ItemParse::parseAugment(const std::string &tmpStrValue, pugi::xml_node attr } } -void ItemParse::parseStackSize(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseStackSize(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { if (stringValue == "stacksize") { auto stackSize = pugi::cast<uint16_t>(valueAttribute.value()); if (stackSize > 255) { @@ -935,8 +886,7 @@ void ItemParse::parseStackSize(const std::string &tmpStrValue, pugi::xml_attribu } } -void ItemParse::parseSpecializedMagicLevelPoint(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseSpecializedMagicLevelPoint(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { Abilities &abilities = itemType.getAbilities(); if (stringValue == "deathmagiclevelpoints") { abilities.specializedMagicLevel[combatTypeToIndex(COMBAT_DEATHDAMAGE)] += pugi::cast<int32_t>(valueAttribute.value()); @@ -965,8 +915,7 @@ void ItemParse::parseSpecializedMagicLevelPoint(const std::string &tmpStrValue, } } -void ItemParse::parseMagicShieldCapacity(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseMagicShieldCapacity(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { Abilities &abilities = itemType.getAbilities(); if (stringValue == "magicshieldcapacitypercent") { abilities.magicShieldCapacityPercent += pugi::cast<int32_t>(valueAttribute.value()); @@ -975,8 +924,7 @@ void ItemParse::parseMagicShieldCapacity(const std::string &tmpStrValue, pugi::x } } -void ItemParse::parsePerfecShot(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parsePerfecShot(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { Abilities &abilities = itemType.getAbilities(); if (stringValue == "perfectshotdamage") { abilities.perfectShotDamage = pugi::cast<int32_t>(valueAttribute.value()); @@ -985,41 +933,39 @@ void ItemParse::parsePerfecShot(const std::string &tmpStrValue, pugi::xml_attrib } } -void ItemParse::parseCleavePercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseCleavePercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { Abilities &abilities = itemType.getAbilities(); if (stringValue == "cleavepercent") { abilities.cleavePercent += pugi::cast<int32_t>(valueAttribute.value()); } } -void ItemParse::parseReflectDamage(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - std::string stringValue = tmpStrValue; +void ItemParse::parseReflectDamage(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { Abilities &abilities = itemType.getAbilities(); if (stringValue == "reflectdamage") { abilities.reflectFlat[combatTypeToIndex(COMBAT_PHYSICALDAMAGE)] += pugi::cast<int32_t>(valueAttribute.value()); } else if (stringValue == "reflectpercentall") { - int32_t value = pugi::cast<int32_t>(valueAttribute.value()); - std::transform(std::begin(abilities.reflectPercent), std::end(abilities.reflectPercent), std::begin(abilities.reflectPercent), [&](const auto &i) { + auto value = pugi::cast<int32_t>(valueAttribute.value()); + std::ranges::transform(abilities.reflectPercent, std::begin(abilities.reflectPercent), [&](const auto &i) { return i + value; }); } } -void ItemParse::parseTransformOnUse(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue == "transformonuse") { +void ItemParse::parseTransformOnUse(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "transformonuse") { itemType.m_transformOnUse = pugi::cast<uint16_t>(valueAttribute.value()); } } -void ItemParse::parsePrimaryType(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue == "primarytype") { +void ItemParse::parsePrimaryType(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "primarytype") { itemType.m_primaryType = asLowerCaseString(valueAttribute.as_string()); } } -void ItemParse::parseHouseRelated(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue == "usedbyhouseguests") { +void ItemParse::parseHouseRelated(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "usedbyhouseguests") { g_logger().debug("[{}] item {}, used by guests {}", __FUNCTION__, itemType.id, valueAttribute.as_bool()); itemType.m_canBeUsedByGuests = valueAttribute.as_bool(); } @@ -1031,7 +977,6 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri moveevent = std::make_shared<MoveEvent>(&g_moveEvents().getScriptInterface()); moveevent->setItemId(itemType.id); moveevent->setEventType(eventType); - moveevent->setFromXML(true); if (eventType == MOVE_EVENT_EQUIP) { moveevent->equipFunction = moveevent->EquipItem; @@ -1065,7 +1010,7 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri } uint32_t fromDamage = 0; uint32_t toDamage = 0; - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; @@ -1134,7 +1079,7 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri std::string token; while (std::getline(ss, token, ',')) { - token.erase(token.begin(), std::find_if(token.begin(), token.end(), [](unsigned char ch) { + token.erase(token.begin(), std::ranges::find_if(token, [](unsigned char ch) { return !std::isspace(ch); })); token.erase(std::find_if(token.rbegin(), token.rend(), [](unsigned char ch) { @@ -1233,14 +1178,14 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri } if (weapon) { - if (auto weaponWand = dynamic_pointer_cast<WeaponWand>(weapon)) { + if (const auto &weaponWand = dynamic_pointer_cast<WeaponWand>(weapon)) { g_logger().trace("Added weapon damage from '{}', to '{}'", fromDamage, toDamage); weaponWand->setMinChange(fromDamage); weaponWand->setMaxChange(toDamage); weaponWand->configureWeapon(itemType); } - auto combat = weapon->getCombat(); + const auto &combat = weapon->getCombat(); if (combat) { combat->setupChain(weapon); } @@ -1262,15 +1207,15 @@ void ItemParse::createAndRegisterScript(ItemType &itemType, pugi::xml_node attri } } -void ItemParse::parseUnscriptedItems(const std::string_view &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { - if (tmpStrValue == "script") { - std::string scriptName = valueAttribute.as_string(); - auto tokens = split(scriptName.data(), ';'); +void ItemParse::parseUnscriptedItems(std::string_view stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType) { + if (stringValue == "script") { + const std::string scriptName = valueAttribute.as_string(); + const auto tokens = split(scriptName, ';'); for (const auto &token : tokens) { if (token == "moveevent") { g_logger().trace("Registering moveevent for item id '{}', name '{}'", itemType.id, itemType.name); MoveEvent_t eventType = MOVE_EVENT_NONE; - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; @@ -1298,9 +1243,9 @@ void ItemParse::parseUnscriptedItems(const std::string_view &tmpStrValue, pugi:: createAndRegisterScript(itemType, attributeNode, eventType); } } else if (token == "weapon") { - WeaponType_t weaponType; + WeaponType_t weaponType = {}; g_logger().trace("Registering weapon for item id '{}', name '{}'", itemType.id, itemType.name); - for (auto subAttributeNode : attributeNode.children()) { + for (const auto &subAttributeNode : attributeNode.children()) { pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key"); if (!subKeyAttribute) { continue; diff --git a/src/items/functions/item/item_parse.hpp b/src/items/functions/item/item_parse.hpp index f63b6bc06..6fe6fbccc 100644 --- a/src/items/functions/item/item_parse.hpp +++ b/src/items/functions/item/item_parse.hpp @@ -213,6 +213,8 @@ const phmap::flat_hash_map<std::string, Fluids_t> FluidTypesMap = { { "tea", FLUID_TEA }, { "mead", FLUID_MEAD }, { "ink", FLUID_INK }, + { "candyfluid", FLUID_CANDY }, + { "chocolate", FLUID_CHOCOLATE }, }; const phmap::flat_hash_map<std::string, WeaponType_t> WeaponTypesMap = { @@ -256,77 +258,77 @@ const phmap::flat_hash_map<Augment_t, ConfigKey_t> AugmentWithoutValueDescriptio class ItemParse : public Items { public: - static void initParse(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void initParse(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); private: static void parseDummyRate(pugi::xml_node attributeNode, ItemType &itemType); - static void parseType(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseDescription(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseRuneSpellName(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWeight(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseShowCount(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseArmor(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseDefense(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseExtraDefense(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseAttack(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseRotateTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWrapContainer(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWrapableTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseMovable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseBlockProjectTile(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parsePickupable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseFloorChange(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseContainerSize(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseFluidSource(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWriteables(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWeaponType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseSlotType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseAmmoType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseShootType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseMagicEffect(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseLootType(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseRange(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseDecayTo(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseDuration(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseTransform(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseCharges(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseShowAttributes(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseHitChance(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseInvisible(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseSpeed(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseHealthAndMana(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseSkills(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseCriticalHit(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseLifeAndManaLeech(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseMaxHitAndManaPoints(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseMagicLevelPoint(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseFieldAbsorbPercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseAbsorbPercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseSupressDrunk(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseField(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseReplaceable(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseLevelDoor(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseBeds(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseElement(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseWalk(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseAllowDistanceRead(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseImbuement(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseAugment(const std::string &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseStackSize(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseSpecializedMagicLevelPoint(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseMagicShieldCapacity(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parsePerfecShot(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseCleavePercent(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseReflectDamage(const std::string &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseTransformOnUse(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parsePrimaryType(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseHouseRelated(const std::string_view &tmpStrValue, pugi::xml_attribute valueAttribute, ItemType &itemType); - static void parseUnscriptedItems(const std::string_view &tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseType(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseDescription(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseRuneSpellName(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWeight(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseShowCount(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseArmor(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseDefense(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseExtraDefense(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseAttack(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseRotateTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWrapContainer(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWrapableTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseMovable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseBlockProjectTile(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parsePickupable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseFloorChange(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseContainerSize(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseFluidSource(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWriteables(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWeaponType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseSlotType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseAmmoType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseShootType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseMagicEffect(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseLootType(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseRange(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseDecayTo(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseDuration(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseTransform(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseCharges(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseShowAttributes(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseHitChance(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseInvisible(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseSpeed(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseHealthAndMana(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseSkills(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseCriticalHit(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseLifeAndManaLeech(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseMaxHitAndManaPoints(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseMagicLevelPoint(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseFieldAbsorbPercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseAbsorbPercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseSupressDrunk(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseField(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseReplaceable(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseLevelDoor(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseBeds(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseElement(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseWalk(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseAllowDistanceRead(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseImbuement(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseAugment(const std::string &stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseStackSize(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseSpecializedMagicLevelPoint(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseMagicShieldCapacity(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parsePerfecShot(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseCleavePercent(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseReflectDamage(const std::string &stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseTransformOnUse(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parsePrimaryType(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseHouseRelated(std::string_view stringValue, pugi::xml_attribute valueAttribute, ItemType &itemType); + static void parseUnscriptedItems(std::string_view stringValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType &itemType); private: // Parent of the function: static void parseField - static std::tuple<ConditionId_t, ConditionType_t> parseFieldConditions(std::string lowerStringValue, pugi::xml_attribute valueAttribute); - static CombatType_t parseFieldCombatType(std::string string, pugi::xml_attribute valueAttribute); - static void parseFieldCombatDamage(std::shared_ptr<ConditionDamage> conditionDamage, std::string stringValue, pugi::xml_node attributeNode); + static std::tuple<ConditionId_t, ConditionType_t> parseFieldConditions(pugi::xml_attribute valueAttribute); + static CombatType_t parseFieldCombatType(pugi::xml_attribute valueAttribute); + static void parseFieldCombatDamage(const std::shared_ptr<ConditionDamage> &conditionDamage, pugi::xml_node attributeNode); static void createAndRegisterScript(ItemType &itemType, pugi::xml_node attributeNode, MoveEvent_t eventType = MOVE_EVENT_NONE, WeaponType_t weaponType = WEAPON_NONE); }; diff --git a/src/items/item.cpp b/src/items/item.cpp index dd2d5c965..14af2cfb4 100644 --- a/src/items/item.cpp +++ b/src/items/item.cpp @@ -7,21 +7,26 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/item.hpp" + +#include "config/configmanager.hpp" +#include "containers/rewards/rewardchest.hpp" +#include "creatures/combat/combat.hpp" +#include "creatures/combat/spells.hpp" +#include "creatures/players/imbuements/imbuements.hpp" +#include "creatures/players/player.hpp" +#include "creatures/players/vocations/vocation.hpp" +#include "enums/object_category.hpp" +#include "game/game.hpp" +#include "game/movement/teleport.hpp" +#include "items/bed.hpp" #include "items/containers/container.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "items/containers/mailbox/mailbox.hpp" #include "items/decay/decay.hpp" -#include "game/movement/teleport.hpp" #include "items/trashholder.hpp" -#include "items/containers/mailbox/mailbox.hpp" -#include "map/house/house.hpp" -#include "game/game.hpp" -#include "items/bed.hpp" -#include "containers/rewards/rewardchest.hpp" -#include "creatures/players/imbuements/imbuements.hpp" #include "lua/creature/actions.hpp" -#include "creatures/combat/spells.hpp" +#include "map/house/house.hpp" #define ITEM_IMBUEMENT_SLOT 500 @@ -69,7 +74,7 @@ std::shared_ptr<Item> Item::CreateItem(const uint16_t type, uint16_t count /*= 0 } else if (it.isBed()) { newItem = std::make_shared<BedItem>(type); } else { - auto itemMap = ItemTransformationMap.find(static_cast<ItemID_t>(it.id)); + const auto itemMap = ItemTransformationMap.find(static_cast<ItemID_t>(it.id)); if (itemMap != ItemTransformationMap.end()) { newItem = std::make_shared<Item>(itemMap->second, count); } else { @@ -77,7 +82,7 @@ std::shared_ptr<Item> Item::CreateItem(const uint16_t type, uint16_t count /*= 0 } } } else if (type > 0 && itemPosition) { - auto position = *itemPosition; + const auto position = *itemPosition; g_logger().warn("[Item::CreateItem] Item with id '{}', in position '{}' not exists in the appearances.dat and cannot be created.", type, position.toString()); } else { g_logger().warn("[Item::CreateItem] Item with id '{}' is not registered and cannot be created.", type); @@ -88,19 +93,19 @@ std::shared_ptr<Item> Item::CreateItem(const uint16_t type, uint16_t count /*= 0 bool Item::getImbuementInfo(uint8_t slot, ImbuementInfo* imbuementInfo) const { const CustomAttribute* attribute = getCustomAttribute(std::to_string(ITEM_IMBUEMENT_SLOT + slot)); - auto info = attribute ? attribute->getAttribute<uint32_t>() : 0; + const auto info = attribute ? attribute->getAttribute<uint32_t>() : 0; imbuementInfo->imbuement = g_imbuements().getImbuement(info & 0xFF); imbuementInfo->duration = info >> 8; return imbuementInfo->duration && imbuementInfo->imbuement; } void Item::setImbuement(uint8_t slot, uint16_t imbuementId, uint32_t duration) { - auto valueDuration = (static_cast<int64_t>(duration > 0 ? (duration << 8) | imbuementId : 0)); + const auto valueDuration = (static_cast<int64_t>(duration > 0 ? (duration << 8) | imbuementId : 0)); setCustomAttribute(std::to_string(ITEM_IMBUEMENT_SLOT + slot), valueDuration); } void Item::addImbuement(uint8_t slot, uint16_t imbuementId, uint32_t duration) { - std::shared_ptr<Player> player = getHoldingPlayer(); + const auto &player = getHoldingPlayer(); if (!player) { return; } @@ -140,6 +145,80 @@ bool Item::hasImbuementCategoryId(uint16_t categoryId) const { return false; } +double Item::getDodgeChance() const { + if (getTier() == 0) { + return 0; + } + return quadraticPoly( + g_configManager().getFloat(RUSE_CHANCE_FORMULA_A), + g_configManager().getFloat(RUSE_CHANCE_FORMULA_B), + g_configManager().getFloat(RUSE_CHANCE_FORMULA_C), + getTier() + ); +} + +double Item::getFatalChance() const { + if (getTier() == 0) { + return 0; + } + return quadraticPoly( + g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_A), + g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_B), + g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_C), + getTier() + ); +} + +double Item::getMomentumChance() const { + if (getTier() == 0) { + return 0; + } + return quadraticPoly( + g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_A), + g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_B), + g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_C), + getTier() + ); +} + +double Item::getTranscendenceChance() const { + if (getTier() == 0) { + return 0; + } + return quadraticPoly( + g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_A), + g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_B), + g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_C), + getTier() + ); +} + +uint8_t Item::getTier() const { + if (!hasAttribute(ItemAttribute_t::TIER)) { + return 0; + } + + auto tier = getAttribute<uint8_t>(ItemAttribute_t::TIER); + if (tier > g_configManager().getNumber(FORGE_MAX_ITEM_TIER)) { + g_logger().error("{} - Item {} have a wrong tier {}", __FUNCTION__, getName(), tier); + return 0; + } + + return tier; +} + +void Item::setTier(uint8_t tier) { + auto configTier = g_configManager().getNumber(FORGE_MAX_ITEM_TIER); + if (tier > configTier) { + g_logger().error("{} - It is not possible to set a tier higher than {}", __FUNCTION__, configTier); + return; + } + + if (items[id].upgradeClassification) { + setAttribute(ItemAttribute_t::TIER, tier); + } +} + std::shared_ptr<Container> Item::CreateItemAsContainer(const uint16_t type, uint16_t size) { if (const ItemType &it = Item::items[type]; it.id == 0 @@ -153,7 +232,7 @@ std::shared_ptr<Container> Item::CreateItemAsContainer(const uint16_t type, uint return nullptr; } - std::shared_ptr<Container> newItem = std::make_shared<Container>(type, size); + auto newItem = std::make_shared<Container>(type, size); return newItem; } @@ -197,9 +276,9 @@ std::shared_ptr<Item> Item::CreateItem(uint16_t itemId, Position &itemPosition) Item::Item(const uint16_t itemId, uint16_t itemCount /*= 0*/) : id(itemId) { const ItemType &it = items[id]; - auto itemCharges = it.charges; + const auto itemCharges = it.charges; if (it.isFluidContainer() || it.isSplash()) { - auto fluidType = std::clamp<uint16_t>(itemCount, 1, FLUID_INK); + const auto fluidType = std::clamp<uint16_t>(itemCount, 1, FLUID_INK); setAttribute(ItemAttribute_t::FLUIDTYPE, fluidType); } else if (it.stackable) { if (itemCount != 0) { @@ -226,7 +305,7 @@ Item::Item(const std::shared_ptr<Item> &i) : } std::shared_ptr<Item> Item::clone() const { - std::shared_ptr<Item> item = Item::CreateItem(id, count); + const auto &item = Item::CreateItem(id, count); if (item == nullptr) { g_logger().error("[{}] item is nullptr", __FUNCTION__); return nullptr; @@ -239,7 +318,7 @@ std::shared_ptr<Item> Item::clone() const { return item; } -bool Item::equals(std::shared_ptr<Item> compareItem) const { +bool Item::equals(const std::shared_ptr<Item> &compareItem) const { if (!compareItem) { return false; } @@ -284,7 +363,7 @@ void Item::setDefaultSubtype() { setItemCount(1); - auto itemCharges = it.charges; + const auto itemCharges = it.charges; if (itemCharges != 0) { if (it.stackable) { setItemCount(static_cast<uint8_t>(itemCharges)); @@ -307,7 +386,7 @@ void Item::setID(uint16_t newid) { id = newid; const ItemType &it = Item::items[newid]; - uint32_t newDuration = it.decayTime * 1000; + const uint32_t newDuration = it.decayTime * 1000; if (newDuration == 0 && !it.stopTime && it.decayTo < 0) { // We'll get called startDecay anyway so let's schedule it - actually not in all casses @@ -335,15 +414,15 @@ bool Item::isOwner(uint32_t ownerId) const { const auto &player = g_game().getPlayerByID(ownerId); return player && player->getGUID() == getOwnerId(); } - if (auto player = g_game().getPlayerByGUID(ownerId); player) { + if (const auto &player = g_game().getPlayerByGUID(ownerId); player) { return player->getID() == getOwnerId(); } return false; } std::shared_ptr<Cylinder> Item::getTopParent() { - std::shared_ptr<Cylinder> aux = getParent(); - std::shared_ptr<Cylinder> prevaux = std::dynamic_pointer_cast<Cylinder>(shared_from_this()); + auto aux = getParent(); + auto prevaux = std::dynamic_pointer_cast<Cylinder>(shared_from_this()); if (!aux) { return prevaux; } @@ -360,7 +439,7 @@ std::shared_ptr<Cylinder> Item::getTopParent() { } std::shared_ptr<Tile> Item::getTile() { - std::shared_ptr<Cylinder> cylinder = getTopParent(); + auto cylinder = getTopParent(); // get root cylinder if (cylinder && cylinder->getParent()) { cylinder = cylinder->getParent(); @@ -368,6 +447,14 @@ std::shared_ptr<Tile> Item::getTile() { return std::dynamic_pointer_cast<Tile>(cylinder); } +bool Item::isRemoved() { + auto parent = getParent(); + if (parent) { + return parent->isRemoved(); + } + return true; +} + uint16_t Item::getSubType() const { const ItemType &it = items[id]; if (it.isFluidContainer() || it.isSplash()) { @@ -381,7 +468,7 @@ uint16_t Item::getSubType() const { } std::shared_ptr<Player> Item::getHoldingPlayer() { - std::shared_ptr<Cylinder> p = getParent(); + auto p = getParent(); while (p) { if (p->getCreature()) { return p->getCreature()->getPlayer(); @@ -396,7 +483,7 @@ bool Item::isItemStorable() const { if (isStoreItem() || hasOwner()) { return false; } - auto isContainerAndHasSomethingInside = (getContainer() != NULL) && (getContainer()->getItemList().size() > 0); + const auto isContainerAndHasSomethingInside = (getContainer() != nullptr) && (!getContainer()->getItemList().empty()); return (isStowable() || isContainerAndHasSomethingInside); } @@ -773,7 +860,7 @@ Attr_ReadValue Item::readAttr(AttrTypes_t attr, PropStream &propStream) { return ATTR_READ_ERROR; } - setAttribute(AMOUNT, amount); + setAttribute(ItemAttribute_t::AMOUNT, amount); break; } @@ -821,7 +908,7 @@ Attr_ReadValue Item::readAttr(AttrTypes_t attr, PropStream &propStream) { return ATTR_READ_ERROR; } - setAttribute(OWNER, ownerId); + setAttribute(ItemAttribute_t::OWNER, ownerId); break; } @@ -845,7 +932,7 @@ Attr_ReadValue Item::readAttr(AttrTypes_t attr, PropStream &propStream) { bool Item::unserializeAttr(PropStream &propStream) { uint8_t attr_type; while (propStream.read<uint8_t>(attr_type) && attr_type != 0) { - Attr_ReadValue ret = readAttr(static_cast<AttrTypes_t>(attr_type), propStream); + const Attr_ReadValue ret = readAttr(static_cast<AttrTypes_t>(attr_type), propStream); if (ret == ATTR_READ_ERROR) { return false; } else if (ret == ATTR_READ_END) { @@ -861,7 +948,7 @@ bool Item::unserializeItemNode(OTB::Loader &, const OTB::Node &, PropStream &pro void Item::serializeAttr(PropWriteStream &propWriteStream) const { const ItemType &it = items[id]; - if (auto timeStamp = getAttribute<int64_t>(ItemAttribute_t::STORE)) { + if (const auto timeStamp = getAttribute<int64_t>(ItemAttribute_t::STORE)) { propWriteStream.write<uint8_t>(ATTR_STORE); propWriteStream.write<int64_t>(timeStamp); } @@ -870,13 +957,13 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { propWriteStream.write<uint8_t>(getSubType()); } - if (auto charges = getAttribute<uint16_t>(ItemAttribute_t::CHARGES)) { + if (const auto charges = getAttribute<uint16_t>(ItemAttribute_t::CHARGES)) { propWriteStream.write<uint8_t>(ATTR_CHARGES); propWriteStream.write<uint16_t>(charges); } if (it.movable) { - if (auto actionId = getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)) { + if (const auto actionId = getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)) { propWriteStream.write<uint8_t>(ATTR_ACTION_ID); propWriteStream.write<uint16_t>(actionId); } @@ -888,7 +975,7 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { propWriteStream.writeString(text); } - if (const uint64_t writtenDate = getAttribute<uint64_t>(ItemAttribute_t::DATE)) { + if (const auto writtenDate = getAttribute<uint64_t>(ItemAttribute_t::DATE)) { propWriteStream.write<uint8_t>(ATTR_WRITTENDATE); propWriteStream.write<uint64_t>(writtenDate); } @@ -910,7 +997,7 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { propWriteStream.write<int32_t>(getDuration()); } - if (auto decayState = getDecaying(); + if (const auto decayState = getDecaying(); decayState == DECAYING_TRUE || decayState == DECAYING_PENDING) { propWriteStream.write<uint8_t>(ATTR_DECAYING_STATE); propWriteStream.write<uint8_t>(decayState); @@ -991,17 +1078,17 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { propWriteStream.write<uint8_t>(getTier()); } - if (hasAttribute(AMOUNT)) { + if (hasAttribute(ItemAttribute_t::AMOUNT)) { propWriteStream.write<uint8_t>(ATTR_AMOUNT); - propWriteStream.write<uint16_t>(getAttribute<uint16_t>(AMOUNT)); + propWriteStream.write<uint16_t>(getAttribute<uint16_t>(ItemAttribute_t::AMOUNT)); } - if (hasAttribute(STORE_INBOX_CATEGORY)) { + if (hasAttribute(ItemAttribute_t::STORE_INBOX_CATEGORY)) { propWriteStream.write<uint8_t>(ATTR_STORE_INBOX_CATEGORY); propWriteStream.writeString(getString(ItemAttribute_t::STORE_INBOX_CATEGORY)); } - if (hasAttribute(OWNER)) { + if (hasAttribute(ItemAttribute_t::OWNER)) { propWriteStream.write<uint8_t>(ATTR_OWNER); propWriteStream.write<uint32_t>(getAttribute<uint32_t>(ItemAttribute_t::OWNER)); } @@ -1027,7 +1114,7 @@ void Item::serializeAttr(PropWriteStream &propWriteStream) const { } } -void Item::setOwner(std::shared_ptr<Creature> owner) { +void Item::setOwner(const std::shared_ptr<Creature> &owner) { auto ownerId = owner->getID(); if (owner->getPlayer()) { ownerId = owner->getPlayer()->getGUID(); @@ -1035,7 +1122,7 @@ void Item::setOwner(std::shared_ptr<Creature> owner) { setOwner(ownerId); } -bool Item::isOwner(std::shared_ptr<Creature> owner) const { +bool Item::isOwner(const std::shared_ptr<Creature> &owner) const { if (!owner) { return false; } @@ -1061,7 +1148,7 @@ std::string Item::getOwnerName() const { return ""; } - auto creature = g_game().getCreatureByID(getOwnerId()); + const auto &creature = g_game().getCreatureByID(getOwnerId()); if (creature) { return creature->getName(); } @@ -1125,15 +1212,27 @@ void Item::checkDecayMapItemOnMove() { } uint32_t Item::getWeight() const { - uint32_t baseWeight = getBaseWeight(); + const uint32_t baseWeight = getBaseWeight(); if (isStackable()) { return baseWeight * std::max<uint32_t>(1, getItemCount()); } return baseWeight; } +int32_t Item::getReflectionFlat(CombatType_t combatType) const { + return items[id].abilities->reflectFlat[combatTypeToIndex(combatType)]; +} + +int32_t Item::getReflectionPercent(CombatType_t combatType) const { + return items[id].abilities->reflectPercent[combatTypeToIndex(combatType)]; +} + +int32_t Item::getSpecializedMagicLevel(CombatType_t combat) const { + return items[id].abilities->specializedMagicLevel[combatTypeToIndex(combat)]; +} + std::vector<std::pair<std::string, std::string>> -Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr*/) { +Item::getDescriptions(const ItemType &it, const std::shared_ptr<Item> &item /*= nullptr*/) { std::ostringstream ss; std::vector<std::pair<std::string, std::string>> descriptions; bool isTradeable = true; @@ -1181,13 +1280,20 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr ss << static_cast<uint16_t>(shootRange) << " fields"; } descriptions.emplace_back("Attack", ss.str()); - } else if (!it.isRanged() && attack != 0) { + } else { + std::string attackDescription; if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) { - ss.str(""); - ss << attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); - descriptions.emplace_back("Attack", ss.str()); - } else { - descriptions.emplace_back("Attack", std::to_string(attack)); + attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType)); + } + + if (attack != 0 && !attackDescription.empty()) { + attackDescription = fmt::format("{} physical + {}", attack, attackDescription); + } else if (attack != 0 && attackDescription.empty()) { + attackDescription = std::to_string(attack); + } + + if (!attackDescription.empty()) { + descriptions.emplace_back("Attack", attackDescription); } } @@ -1253,6 +1359,10 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr skillBoost = true; } + if (it.abilities->regeneration) { + ss << ", faster regeneration"; + } + if (it.abilities->stats[STAT_MAGICPOINTS]) { if (skillBoost) { ss << ", "; @@ -1412,7 +1522,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr for (uint8_t i = 0; i < item->getImbuementSlot(); ++i) { slotName = fmt::format("Imbuement Slot {}", i + 1); ss.str(""); - const auto castItem = item; + const auto &castItem = item; if (!castItem) { continue; } @@ -1594,13 +1704,20 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr ss << static_cast<uint16_t>(shootRange) << " fields"; } descriptions.emplace_back("Attack", ss.str()); - } else if (!it.isRanged() && attack != 0) { + } else { + std::string attackDescription; if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) { - ss.str(""); - ss << attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); - descriptions.emplace_back("Attack", ss.str()); - } else { - descriptions.emplace_back("Attack", std::to_string(attack)); + attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType)); + } + + if (attack != 0 && !attackDescription.empty()) { + attackDescription = fmt::format("{} physical + {}", attack, attackDescription); + } else if (attack != 0 && attackDescription.empty()) { + attackDescription = std::to_string(attack); + } + + if (!attackDescription.empty()) { + descriptions.emplace_back("Attack", attackDescription); } } @@ -1907,7 +2024,7 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr return descriptions; } -std::string Item::parseImbuementDescription(std::shared_ptr<Item> item) { +std::string Item::parseImbuementDescription(const std::shared_ptr<Item> &item) { std::ostringstream s; if (item && item->getImbuementSlot() >= 1) { s << std::endl @@ -1929,7 +2046,7 @@ std::string Item::parseImbuementDescription(std::shared_ptr<Item> item) { continue; } - int minutes = imbuementInfo.duration / 60; + const int minutes = imbuementInfo.duration / 60; int hours = minutes / 60; s << fmt::format("{} {} {:02}:{:02}h", baseImbuement->name, imbuementInfo.imbuement->getName(), hours, minutes % 60); } @@ -1944,12 +2061,12 @@ bool Item::isSavedToHouses() { return it.movable || it.isWrappable() || it.isCarpet() || getDoor() || (getContainer() && !getContainer()->empty()) || it.canWriteText || getBed() || it.m_transformOnUse; } -SoundEffect_t Item::getMovementSound(std::shared_ptr<Cylinder> toCylinder) const { +SoundEffect_t Item::getMovementSound(const std::shared_ptr<Cylinder> &toCylinder) const { if (!toCylinder) { return SoundEffect_t::ITEM_MOVE_DEFAULT; } - if (std::shared_ptr<Container> toContainer = toCylinder->getContainer(); + if (const auto &toContainer = toCylinder->getContainer(); toContainer && toContainer->getHoldingPlayer()) { return SoundEffect_t::ITEM_MOVE_BACKPACK; } @@ -2006,7 +2123,7 @@ SoundEffect_t Item::getMovementSound(std::shared_ptr<Cylinder> toCylinder) const return SoundEffect_t::ITEM_MOVE_DEFAULT; } -std::string Item::parseClassificationDescription(std::shared_ptr<Item> item) { +std::string Item::parseClassificationDescription(const std::shared_ptr<Item> &item) { std::ostringstream string; if (item && item->getClassification() >= 1) { string << std::endl @@ -2039,35 +2156,35 @@ std::string Item::parseShowDurationSpeed(int32_t speed, bool &begin) { return description.str(); } -std::string Item::parseShowDuration(std::shared_ptr<Item> item) { +std::string Item::parseShowDuration(const std::shared_ptr<Item> &item) { if (!item) { return {}; } std::ostringstream description; - uint32_t duration = item->getDuration() / 1000; + const uint32_t duration = item->getDuration() / 1000; if (item && item->hasAttribute(ItemAttribute_t::DURATION) && duration > 0) { description << " that will expire in "; if (duration >= 86400) { - uint16_t days = duration / 86400; - uint16_t hours = (duration % 86400) / 3600; + const uint16_t days = duration / 86400; + const uint16_t hours = (duration % 86400) / 3600; description << days << " day" << (days != 1 ? "s" : ""); if (hours > 0) { description << " and " << hours << " hour" << (hours != 1 ? "s" : ""); } } else if (duration >= 3600) { - uint16_t hours = duration / 3600; - uint16_t minutes = (duration % 3600) / 60; + const uint16_t hours = duration / 3600; + const uint16_t minutes = (duration % 3600) / 60; description << hours << " hour" << (hours != 1 ? "s" : ""); if (minutes > 0) { description << " and " << minutes << " minute" << (minutes != 1 ? "s" : ""); } } else if (duration >= 60) { - uint16_t minutes = duration / 60; + const uint16_t minutes = duration / 60; description << minutes << " minute" << (minutes != 1 ? "s" : ""); - uint16_t seconds = duration % 60; + const uint16_t seconds = duration % 60; if (seconds > 0) { description << " and " << seconds << " second" << (seconds != 1 ? "s" : ""); @@ -2082,14 +2199,14 @@ std::string Item::parseShowDuration(std::shared_ptr<Item> item) { return description.str(); } -std::string Item::parseShowAttributesDescription(std::shared_ptr<Item> item, const uint16_t itemId) { +std::string Item::parseShowAttributesDescription(const std::shared_ptr<Item> &item, const uint16_t itemId) { std::ostringstream itemDescription; const ItemType &itemType = Item::items[itemId]; if (itemType.armor != 0 || (item && item->getArmor() != 0) || itemType.showAttributes) { bool begin = itemType.isQuiver() ? false : true; - int32_t armor = (item ? item->getArmor() : itemType.armor); + const int32_t armor = (item ? item->getArmor() : itemType.armor); if (armor != 0) { if (begin) { itemDescription << " (Arm:" << armor; @@ -2116,7 +2233,7 @@ std::string Item::parseShowAttributesDescription(std::shared_ptr<Item> item, con } for (uint8_t i = SKILL_CRITICAL_HIT_CHANCE; i <= SKILL_LAST; i++) { - auto skill = item ? item->getSkill(static_cast<skills_t>(i)) : itemType.getSkill(static_cast<skills_t>(i)); + const auto skill = item ? item->getSkill(static_cast<skills_t>(i)) : itemType.getSkill(static_cast<skills_t>(i)); if (!skill) { continue; } @@ -2310,8 +2427,8 @@ std::string Item::parseShowAttributesDescription(std::shared_ptr<Item> item, con return itemDescription.str(); } -std::string Item::getDescription(const ItemType &it, int32_t lookDistance, std::shared_ptr<Item> item /*= nullptr*/, int32_t subType /*= -1*/, bool addArticle /*= true*/) { - std::string text = ""; +std::string Item::getDescription(const ItemType &it, int32_t lookDistance, const std::shared_ptr<Item> &item /*= nullptr*/, int32_t subType /*= -1*/, bool addArticle /*= true*/) { + std::string text; std::ostringstream s; s << getNameDescription(it, item, subType, addArticle); @@ -2322,7 +2439,7 @@ std::string Item::getDescription(const ItemType &it, int32_t lookDistance, std:: if (it.isRune()) { if (it.runeLevel > 0 || it.runeMagLevel > 0) { - if (const auto rune = g_spells().getRuneSpell(it.id)) { + if (const auto &rune = g_spells().getRuneSpell(it.id)) { int32_t tmpSubType = subType; if (item) { tmpSubType = item->getSubType(); @@ -2642,13 +2759,17 @@ std::string Item::getDescription(const ItemType &it, int32_t lookDistance, std:: s << "Vol:" << volume; } } + if (attack != 0) { begin = false; s << " (Atk:" << attack; + } - if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) { - s << " physical + " << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); - } + if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0 && !begin) { + s << " physical + " << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); + } else if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0 && begin) { + begin = false; + s << " (" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); } if (defense != 0 || extraDefense != 0 || it.isMissile()) { @@ -2681,6 +2802,17 @@ std::string Item::getDescription(const ItemType &it, int32_t lookDistance, std:: s << getSkillName(i) << ' ' << std::showpos << it.abilities->skills[i] << std::noshowpos; } + if (it.abilities->regeneration) { + if (begin) { + begin = false; + s << " ("; + } else { + s << ", "; + } + + s << "faster regeneration"; + } + for (uint8_t i = SKILL_CRITICAL_HIT_CHANCE; i <= SKILL_LAST; i++) { auto skill = item ? item->getSkill(static_cast<skills_t>(i)) : it.getSkill(static_cast<skills_t>(i)); if (!skill) { @@ -3078,7 +3210,7 @@ std::string Item::getDescription(int32_t lookDistance) { return getDescription(it, lookDistance, getItem()); } -std::string Item::getNameDescription(const ItemType &it, std::shared_ptr<Item> item /*= nullptr*/, int32_t subType /*= -1*/, bool addArticle /*= true*/) { +std::string Item::getNameDescription(const ItemType &it, const std::shared_ptr<Item> &item /*= nullptr*/, int32_t subType /*= -1*/, bool addArticle /*= true*/) { if (item) { subType = item->getSubType(); } @@ -3142,9 +3274,9 @@ std::string Item::getWeightDescription(uint32_t weight) const { } std::string Item::getWeightDescription() const { - uint32_t weight = getWeight(); + const uint32_t weight = getWeight(); if (weight == 0) { - return std::string(); + return {}; } return getWeightDescription(weight); } @@ -3160,16 +3292,17 @@ void Item::addUniqueId(uint16_t uniqueId) { } bool Item::canDecay() { - if (isRemoved() || isDecayDisabled()) { + const ItemType &it = Item::items[id]; + if (it.decayTo < 0 || it.decayTime == 0 || isDecayDisabled()) { return false; } - const ItemType &it = Item::items[id]; - if (it.decayTo < 0 || it.decayTime == 0) { + if (hasAttribute(ItemAttribute_t::UNIQUEID)) { return false; } - if (hasAttribute(ItemAttribute_t::UNIQUEID)) { + // In certain conditions, such as depth nested containers, this can overload the CPU, so it is left last. + if (isRemoved()) { return false; } @@ -3228,9 +3361,9 @@ std::shared_ptr<Item> Item::transform(uint16_t itemId, uint16_t itemCount /*= -1 return nullptr; } - std::shared_ptr<Tile> fromTile = cylinder->getTile(); + const auto &fromTile = cylinder->getTile(); if (fromTile) { - auto it = g_game().browseFields.find(fromTile); + const auto it = g_game().browseFields.find(fromTile); if (it != g_game().browseFields.end() && it->second.lock() == cylinder) { cylinder = fromTile; } @@ -3243,8 +3376,8 @@ std::shared_ptr<Item> Item::transform(uint16_t itemId, uint16_t itemCount /*= -1 newItem = Item::CreateItem(itemId, itemCount); } - int32_t itemIndex = cylinder->getThingIndex(static_self_cast<Item>()); - auto duration = getDuration(); + const int32_t itemIndex = cylinder->getThingIndex(static_self_cast<Item>()); + const auto duration = getDuration(); if (duration > 0) { newItem->setDuration(duration); } @@ -3282,16 +3415,17 @@ bool Item::hasMarketAttributes() const { } bool Item::isInsideDepot(bool includeInbox /* = false*/) { - if (std::shared_ptr<Container> thisContainer = getContainer(); thisContainer && (thisContainer->getDepotLocker() || thisContainer->isDepotChest() || (includeInbox && thisContainer->isInbox()))) { + const auto &thisContainer = getContainer(); + if (thisContainer && (thisContainer->getDepotLocker() || thisContainer->isDepotChest() || (includeInbox && thisContainer->isInbox()))) { return true; } - std::shared_ptr<Cylinder> cylinder = getParent(); + const auto &cylinder = getParent(); if (!cylinder) { return false; } - std::shared_ptr<Container> container = cylinder->getContainer(); + auto container = cylinder->getContainer(); if (!container) { return false; } @@ -3308,7 +3442,26 @@ bool Item::isInsideDepot(bool includeInbox /* = false*/) { } void Item::updateTileFlags() { - if (auto tile = getTile()) { + if (const auto &tile = getTile()) { tile->updateTileFlags(static_self_cast<Item>()); } } + +// Custom Attributes + +const std::map<std::string, CustomAttribute, std::less<>> &ItemProperties::getCustomAttributeMap() const { + static std::map<std::string, CustomAttribute, std::less<>> map = {}; + if (!attributePtr) { + return map; + } + return attributePtr->getCustomAttributeMap(); +} + +int32_t ItemProperties::getDuration() const { + ItemDecayState_t decayState = getDecaying(); + if (decayState == DECAYING_TRUE || decayState == DECAYING_STOPPING) { + return std::max<int32_t>(0, getAttribute<int32_t>(ItemAttribute_t::DURATION_TIMESTAMP) - static_cast<int32_t>(OTSYS_TIME())); + } else { + return getAttribute<int32_t>(ItemAttribute_t::DURATION); + } +} diff --git a/src/items/item.hpp b/src/items/item.hpp index a9774c902..d199fab15 100644 --- a/src/items/item.hpp +++ b/src/items/item.hpp @@ -9,14 +9,11 @@ #pragma once -#include "items/cylinder.hpp" -#include "items/thing.hpp" #include "enums/item_attribute.hpp" -#include "items/items.hpp" -#include "items/functions/item/attribute.hpp" -#include "lua/scripts/luascript.hpp" -#include "utils/tools.hpp" #include "io/fileloader.hpp" +#include "items/functions/item/attribute.hpp" +#include "items/items.hpp" +#include "items/thing.hpp" class Creature; class Player; @@ -30,6 +27,7 @@ class MagicField; class BedItem; class Imbuement; class Item; +class Cylinder; // This class ItemProperties that serves as an interface to access and modify attributes of an item. The item's attributes are stored in an instance of ItemAttribute. The class ItemProperties has methods to get and set integer and string attributes, check if an attribute exists, remove an attribute, get the underlying attribute bits, and get a vector of attributes. It also has methods to get and set custom attributes, which are stored in a std::map<std::string, CustomAttribute, std::less<>>. The class has a data member attributePtr of type std::unique_ptr<ItemAttribute> that stores a pointer to the item's attributes methods. class ItemProperties { @@ -56,7 +54,7 @@ class ItemProperties { return attributePtr->hasAttribute(type); } - void removeAttribute(ItemAttribute_t type) { + void removeAttribute(ItemAttribute_t type) const { if (attributePtr) { attributePtr->removeAttribute(type); } @@ -76,13 +74,7 @@ class ItemProperties { } // Custom Attributes - const std::map<std::string, CustomAttribute, std::less<>> &getCustomAttributeMap() const { - static std::map<std::string, CustomAttribute, std::less<>> map = {}; - if (!attributePtr) { - return map; - } - return attributePtr->getCustomAttributeMap(); - } + const std::map<std::string, CustomAttribute, std::less<>> &getCustomAttributeMap() const; const CustomAttribute* getCustomAttribute(const std::string &attributeName) const { if (!attributePtr) { return nullptr; @@ -104,7 +96,7 @@ class ItemProperties { return !getCustomAttributeMap().empty(); } - bool removeCustomAttribute(const std::string &attributeName) { + bool removeCustomAttribute(const std::string &attributeName) const { if (!attributePtr) { return false; } @@ -116,14 +108,7 @@ class ItemProperties { return getAttribute<uint16_t>(ItemAttribute_t::CHARGES); } - int32_t getDuration() const { - ItemDecayState_t decayState = getDecaying(); - if (decayState == DECAYING_TRUE || decayState == DECAYING_STOPPING) { - return std::max<int32_t>(0, getAttribute<int32_t>(ItemAttribute_t::DURATION_TIMESTAMP) - static_cast<int32_t>(OTSYS_TIME())); - } else { - return getAttribute<int32_t>(ItemAttribute_t::DURATION); - } - } + int32_t getDuration() const; bool isStoreItem() const { return getAttribute<int64_t>(ItemAttribute_t::STORE) > 0; @@ -215,27 +200,27 @@ class ItemProperties { class Item : virtual public Thing, public ItemProperties, public SharedObject { public: // Factory member to create item of right type based on type - static std::shared_ptr<Item> CreateItem(const uint16_t type, uint16_t count = 0, Position* itemPosition = nullptr); - static std::shared_ptr<Container> CreateItemAsContainer(const uint16_t type, uint16_t size); + static std::shared_ptr<Item> CreateItem(uint16_t type, uint16_t count = 0, Position* itemPosition = nullptr); + static std::shared_ptr<Container> CreateItemAsContainer(uint16_t type, uint16_t size); static std::shared_ptr<Item> CreateItem(uint16_t itemId, Position &itemPosition); static Items items; // Constructor for items - Item(const uint16_t type, uint16_t count = 0); - Item(const std::shared_ptr<Item> &i); + explicit Item(uint16_t type, uint16_t count = 0); + explicit Item(const std::shared_ptr<Item> &i); virtual std::shared_ptr<Item> clone() const; - virtual ~Item() = default; + ~Item() override = default; // non-assignable Item &operator=(const Item &) = delete; - bool equals(std::shared_ptr<Item> compareItem) const; + bool equals(const std::shared_ptr<Item> &compareItem) const; - std::shared_ptr<Item> getItem() override final { + std::shared_ptr<Item> getItem() final { return static_self_cast<Item>(); } - std::shared_ptr<const Item> getItem() const override final { + std::shared_ptr<const Item> getItem() const final { return static_self_cast<Item>(); } virtual std::shared_ptr<Teleport> getTeleport() { @@ -259,13 +244,13 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { bool isSavedToHouses(); - SoundEffect_t getMovementSound(std::shared_ptr<Cylinder> toCylinder) const; + SoundEffect_t getMovementSound(const std::shared_ptr<Cylinder> &toCylinder) const; void setIsLootTrackeable(bool value) { isLootTrackeable = value; } - bool getIsLootTrackeable() { + bool getIsLootTrackeable() const { return isLootTrackeable; } @@ -273,7 +258,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { setAttribute(ItemAttribute_t::OWNER, owner); } - void setOwner(std::shared_ptr<Creature> owner); + void setOwner(const std::shared_ptr<Creature> &owner); virtual uint32_t getOwnerId() const; @@ -281,7 +266,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { std::string getOwnerName() const; - bool isOwner(std::shared_ptr<Creature> owner) const; + bool isOwner(const std::shared_ptr<Creature> &owner) const; bool hasOwner() const { return getOwnerId() != 0; @@ -291,24 +276,24 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return isStoreItem() || hasOwner(); } - static std::string parseAugmentDescription(std::shared_ptr<Item> item, bool inspect = false) { + static std::string parseAugmentDescription(const std::shared_ptr<Item> &item, bool inspect = false) { if (!item) { return ""; } return items[item->getID()].parseAugmentDescription(inspect); } - static std::string parseImbuementDescription(std::shared_ptr<Item> item); + static std::string parseImbuementDescription(const std::shared_ptr<Item> &item); static std::string parseShowDurationSpeed(int32_t speed, bool &begin); - static std::string parseShowDuration(std::shared_ptr<Item> item); - static std::string parseShowAttributesDescription(std::shared_ptr<Item> item, const uint16_t itemId); - static std::string parseClassificationDescription(std::shared_ptr<Item> item); + static std::string parseShowDuration(const std::shared_ptr<Item> &item); + static std::string parseShowAttributesDescription(const std::shared_ptr<Item> &item, uint16_t itemId); + static std::string parseClassificationDescription(const std::shared_ptr<Item> &item); - static std::vector<std::pair<std::string, std::string>> getDescriptions(const ItemType &it, std::shared_ptr<Item> item = nullptr); - static std::string getDescription(const ItemType &it, int32_t lookDistance, std::shared_ptr<Item> item = nullptr, int32_t subType = -1, bool addArticle = true); - static std::string getNameDescription(const ItemType &it, std::shared_ptr<Item> item = nullptr, int32_t subType = -1, bool addArticle = true); + static std::vector<std::pair<std::string, std::string>> getDescriptions(const ItemType &it, const std::shared_ptr<Item> &item = nullptr); + static std::string getDescription(const ItemType &it, int32_t lookDistance, const std::shared_ptr<Item> &item = nullptr, int32_t subType = -1, bool addArticle = true); + static std::string getNameDescription(const ItemType &it, const std::shared_ptr<Item> &item = nullptr, int32_t subType = -1, bool addArticle = true); static std::string getWeightDescription(const ItemType &it, uint32_t weight, uint32_t count = 1); - std::string getDescription(int32_t lookDistance) override final; + std::string getDescription(int32_t lookDistance) final; std::string getNameDescription(); std::string getWeightDescription() const; @@ -319,10 +304,10 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { virtual void serializeAttr(PropWriteStream &propWriteStream) const; - bool isPushable() override final { + bool isPushable() final { return isMovable(); } - int32_t getThrowRange() const override final { + int32_t getThrowRange() const final { return (isPickupable() ? 15 : 2); } @@ -366,13 +351,9 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return items[id].abilities->perfectShotRange; } - int32_t getReflectionFlat(CombatType_t combatType) const { - return items[id].abilities->reflectFlat[combatTypeToIndex(combatType)]; - } + int32_t getReflectionFlat(CombatType_t combatType) const; - int32_t getReflectionPercent(CombatType_t combatType) const { - return items[id].abilities->reflectPercent[combatTypeToIndex(combatType)]; - } + int32_t getReflectionPercent(CombatType_t combatType) const; int16_t getMagicShieldCapacityPercent() const { return items[id].abilities->magicShieldCapacityPercent; @@ -382,22 +363,20 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return items[id].abilities->magicShieldCapacityFlat; } - int32_t getSpecializedMagicLevel(CombatType_t combat) const { - return items[id].abilities->specializedMagicLevel[combatTypeToIndex(combat)]; - } + int32_t getSpecializedMagicLevel(CombatType_t combat) const; int32_t getSpeed() const { - int32_t value = items[id].getSpeed(); + const int32_t value = items[id].getSpeed(); return value; } int32_t getSkill(skills_t skill) const { - int32_t value = items[id].getSkill(skill); + const int32_t value = items[id].getSkill(skill); return value; } int32_t getStat(stats_t stat) const { - int32_t value = items[id].getStat(stat); + const int32_t value = items[id].getStat(stat); return value; } @@ -428,9 +407,9 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { std::vector<std::shared_ptr<AugmentInfo>> getAugments() const { return items[id].augments; } - std::vector<std::shared_ptr<AugmentInfo>> getAugmentsBySpellNameAndType(std::string spellName, Augment_t augmentType) const { + std::vector<std::shared_ptr<AugmentInfo>> getAugmentsBySpellNameAndType(const std::string &spellName, Augment_t augmentType) const { std::vector<std::shared_ptr<AugmentInfo>> augments; - for (auto &augment : items[id].augments) { + for (const auto &augment : items[id].augments) { if (strcasecmp(augment->spellName.c_str(), spellName.c_str()) == 0 && augment->type == augmentType) { augments.push_back(augment); } @@ -438,9 +417,9 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return augments; } - std::vector<std::shared_ptr<AugmentInfo>> getAugmentsBySpellName(std::string spellName) const { + std::vector<std::shared_ptr<AugmentInfo>> getAugmentsBySpellName(const std::string &spellName) const { std::vector<std::shared_ptr<AugmentInfo>> augments; - for (auto &augment : items[id].augments) { + for (const auto &augment : items[id].augments) { if (strcasecmp(augment->spellName.c_str(), spellName.c_str()) == 0) { augments.push_back(augment); } @@ -565,7 +544,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { } return items[id].name; } - const std::string getPluralName() const { + std::string getPluralName() const { if (hasAttribute(ItemAttribute_t::PLURALNAME)) { return getString(ItemAttribute_t::PLURALNAME); } @@ -597,7 +576,11 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { count = n; } - static uint32_t countByType(std::shared_ptr<Item> item, int32_t subType) { + static uint32_t countByType(const std::shared_ptr<Item> &item, int32_t subType) { + if (!item) { + return 0; + } + if (subType == -1 || subType == item->getSubType()) { return item->getItemCount(); } @@ -612,7 +595,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { void addUniqueId(uint16_t uniqueId); void setDefaultDuration() { - uint32_t duration = getDefaultDuration(); + const uint32_t duration = getDefaultDuration(); if (duration != 0) { setDuration(duration); } @@ -630,7 +613,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return true; } virtual void onRemoved(); - virtual void onTradeEvent(TradeEvents_t, std::shared_ptr<Player>) { } + virtual void onTradeEvent(TradeEvents_t, const std::shared_ptr<Player> &) { } virtual void startDecaying(); virtual void stopDecaying(); @@ -658,13 +641,7 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { } std::shared_ptr<Cylinder> getTopParent(); std::shared_ptr<Tile> getTile() override; - bool isRemoved() override { - auto parent = getParent(); - if (parent) { - return parent->isRemoved(); - } - return true; - } + bool isRemoved() override; bool isInsideDepot(bool includeInbox = false); @@ -691,8 +668,8 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { void clearImbuement(uint8_t slot, uint16_t imbuementId) { return setImbuement(slot, imbuementId, 0); } - bool hasImbuementType(ImbuementTypes_t imbuementType, uint16_t imbuementTier) { - auto it = items[id].imbuementTypes.find(imbuementType); + bool hasImbuementType(ImbuementTypes_t imbuementType, uint16_t imbuementTier) const { + const auto it = items[id].imbuementTypes.find(imbuementType); if (it != items[id].imbuementTypes.end()) { return (it->second >= imbuementTier); } @@ -710,78 +687,16 @@ class Item : virtual public Thing, public ItemProperties, public SharedObject { return false; } - double getDodgeChance() const { - if (getTier() == 0) { - return 0; - } - return quadraticPoly( - g_configManager().getFloat(RUSE_CHANCE_FORMULA_A, __FUNCTION__), - g_configManager().getFloat(RUSE_CHANCE_FORMULA_B, __FUNCTION__), - g_configManager().getFloat(RUSE_CHANCE_FORMULA_C, __FUNCTION__), - getTier() - ); - } - - double getFatalChance() const { - if (getTier() == 0) { - return 0; - } - return quadraticPoly( - g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_A, __FUNCTION__), - g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_B, __FUNCTION__), - g_configManager().getFloat(ONSLAUGHT_CHANCE_FORMULA_C, __FUNCTION__), - getTier() - ); - } - - double getMomentumChance() const { - if (getTier() == 0) { - return 0; - } - return quadraticPoly( - g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_A, __FUNCTION__), - g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_B, __FUNCTION__), - g_configManager().getFloat(MOMENTUM_CHANCE_FORMULA_C, __FUNCTION__), - getTier() - ); - } - - double getTranscendenceChance() const { - if (getTier() == 0) { - return 0; - } - return quadraticPoly( - g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_A, __FUNCTION__), - g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_B, __FUNCTION__), - g_configManager().getFloat(TRANSCENDANCE_CHANCE_FORMULA_C, __FUNCTION__), - getTier() - ); - } + double getDodgeChance() const; - uint8_t getTier() const { - if (!hasAttribute(ItemAttribute_t::TIER)) { - return 0; - } + double getFatalChance() const; - auto tier = getAttribute<uint8_t>(ItemAttribute_t::TIER); - if (tier > g_configManager().getNumber(FORGE_MAX_ITEM_TIER, __FUNCTION__)) { - g_logger().error("{} - Item {} have a wrong tier {}", __FUNCTION__, getName(), tier); - return 0; - } + double getMomentumChance() const; - return tier; - } - void setTier(uint8_t tier) { - auto configTier = g_configManager().getNumber(FORGE_MAX_ITEM_TIER, __FUNCTION__); - if (tier > configTier) { - g_logger().error("{} - It is not possible to set a tier higher than {}", __FUNCTION__, configTier); - return; - } + double getTranscendenceChance() const; - if (items[id].upgradeClassification) { - setAttribute(ItemAttribute_t::TIER, tier); - } - } + uint8_t getTier() const; + void setTier(uint8_t tier); uint8_t getClassification() const { return items[id].upgradeClassification; } diff --git a/src/items/items.cpp b/src/items/items.cpp index 2d4020c54..5aaf2129b 100644 --- a/src/items/items.cpp +++ b/src/items/items.cpp @@ -7,14 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "items/items.hpp" +#include "config/configmanager.hpp" +#include "game/game.hpp" #include "items/functions/item/item_parse.hpp" -#include "items/items.hpp" #include "items/weapons/weapons.hpp" #include "lua/creature/movement.hpp" -#include "game/game.hpp" #include "utils/pugicast.hpp" +#include "creatures/combat/spells.hpp" +#include "utils/tools.hpp" #include <appearances.pb.h> @@ -25,7 +27,7 @@ void Items::clear() { ladders.clear(); dummys.clear(); nameToItems.clear(); - g_moveEvents().clear(true); + g_moveEvents().clear(); g_weapons().clear(true); } @@ -59,15 +61,15 @@ LootTypeNames lootTypeNames = { { "unassigned", ITEM_TYPE_UNASSIGNED }, }; -ItemTypes_t Items::getLootType(const std::string &strValue) { - auto lootType = lootTypeNames.find(strValue); +ItemTypes_t Items::getLootType(const std::string &strValue) const { + const auto lootType = lootTypeNames.find(strValue); if (lootType != lootTypeNames.end()) { return lootType->second; } return ITEM_TYPE_NONE; } -const std::string Items::getAugmentNameByType(Augment_t augmentType) { +std::string Items::getAugmentNameByType(Augment_t augmentType) { std::string augmentTypeName = magic_enum::enum_name(augmentType).data(); augmentTypeName = toStartCaseWithSpace(augmentTypeName); if (!isAugmentWithoutValueDescription(augmentType)) { @@ -94,7 +96,7 @@ std::string ItemType::parseAugmentDescription(bool inspect /*= false*/) const { } std::string ItemType::getFormattedAugmentDescription(const std::shared_ptr<AugmentInfo> &augmentInfo) const { - const std::string augmentName = Items::getAugmentNameByType(augmentInfo->type); + const auto augmentName = Items::getAugmentNameByType(augmentInfo->type); std::string augmentSpellNameCapitalized = augmentInfo->spellName; capitalizeWordsIgnoringString(augmentSpellNameCapitalized, " of "); @@ -104,10 +106,23 @@ std::string ItemType::getFormattedAugmentDescription(const std::shared_ptr<Augme return fmt::format("{} -> {}", augmentSpellNameCapitalized, augmentName); } else if (augmentInfo->type == Augment_t::Cooldown) { return fmt::format("{} -> {}{}s {}", augmentSpellNameCapitalized, signal, augmentInfo->value / 1000, augmentName); + } else if (augmentInfo->type == Augment_t::Base) { + const auto &spell = g_spells().getSpellByName(augmentInfo->spellName); + return fmt::format("{} -> {:+}% {} {}", augmentSpellNameCapitalized, augmentInfo->value, augmentName, spell->getGroup() == SPELLGROUP_HEALING ? "healing" : "damage"); } + return fmt::format("{} -> {:+}% {}", augmentSpellNameCapitalized, augmentInfo->value, augmentName); } +void ItemType::addAugment(std::string spellName, Augment_t augmentType, int32_t value) { + auto augmentInfo = std::make_shared<AugmentInfo>(spellName, augmentType, value); + augments.emplace_back(augmentInfo); +} + +void ItemType::setImbuementType(ImbuementTypes_t imbuementType, uint16_t slotMaxTier) { + imbuementTypes[imbuementType] = std::min<uint16_t>(IMBUEMENT_MAX_TIER, slotMaxTier); +} + bool Items::reload() { clear(); loadFromProtobuf(); @@ -122,7 +137,7 @@ bool Items::reload() { void Items::loadFromProtobuf() { using namespace Canary::protobuf::appearances; - bool supportAnimation = g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__); + bool supportAnimation = g_configManager().getBoolean(OLD_PROTOCOL); for (uint32_t it = 0; it < g_game().m_appearancesPtr->object_size(); ++it) { Appearance object = g_game().m_appearancesPtr->object(it); @@ -155,7 +170,7 @@ void Items::loadFromProtobuf() { // This attribute is only used on 10x protocol, so we should not waste our time iterating it when it's disabled. if (supportAnimation) { for (uint32_t frame_it = 0; frame_it < object.frame_group_size(); ++frame_it) { - FrameGroup objectFrame = object.frame_group(frame_it); + const FrameGroup &objectFrame = object.frame_group(frame_it); if (!objectFrame.has_sprite_info()) { continue; } @@ -238,14 +253,14 @@ void Items::loadFromProtobuf() { bool Items::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/items/items.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/items/items.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); return false; } - for (auto itemNode : doc.child("items").children()) { + for (const auto itemNode : doc.child("items").children()) { if (auto idAttribute = itemNode.attribute("id")) { parseItemNode(itemNode, pugi::cast<uint16_t>(idAttribute.value())); continue; @@ -265,8 +280,8 @@ bool Items::loadFromXml() { continue; } - uint16_t id = pugi::cast<uint16_t>(fromIdAttribute.value()); - uint16_t toId = pugi::cast<uint16_t>(toIdAttribute.value()); + auto id = pugi::cast<uint16_t>(fromIdAttribute.value()); + const auto toId = pugi::cast<uint16_t>(toIdAttribute.value()); while (id <= toId) { parseItemNode(itemNode, id++); } @@ -282,7 +297,7 @@ void Items::buildInventoryList() { } } inventory.shrink_to_fit(); - std::sort(inventory.begin(), inventory.end()); + std::ranges::sort(inventory); } void Items::parseItemNode(const pugi::xml_node &itemNode, uint16_t id) { @@ -301,10 +316,10 @@ void Items::parseItemNode(const pugi::xml_node &itemNode, uint16_t id) { return; } - if (std::string xmlName = itemNode.attribute("name").as_string(); + if (const std::string xmlName = itemNode.attribute("name").as_string(); !xmlName.empty() && itemType.name != xmlName) { if (!itemType.name.empty()) { - if (auto it = std::find_if(nameToItems.begin(), nameToItems.end(), [id](const auto nameMapIt) { + if (const auto it = std::ranges::find_if(nameToItems, [id](const auto nameMapIt) { return nameMapIt.second == id; }); it != nameToItems.end()) { @@ -317,28 +332,28 @@ void Items::parseItemNode(const pugi::xml_node &itemNode, uint16_t id) { } itemType.loaded = true; - pugi::xml_attribute articleAttribute = itemNode.attribute("article"); + const pugi::xml_attribute articleAttribute = itemNode.attribute("article"); if (articleAttribute) { itemType.article = articleAttribute.as_string(); } - pugi::xml_attribute pluralAttribute = itemNode.attribute("plural"); + const pugi::xml_attribute pluralAttribute = itemNode.attribute("plural"); if (pluralAttribute) { itemType.pluralName = pluralAttribute.as_string(); } - for (auto attributeNode : itemNode.children()) { - pugi::xml_attribute keyAttribute = attributeNode.attribute("key"); + for (const auto &attributeNode : itemNode.children()) { + const pugi::xml_attribute keyAttribute = attributeNode.attribute("key"); if (!keyAttribute) { continue; } - pugi::xml_attribute valueAttribute = attributeNode.attribute("value"); + const pugi::xml_attribute valueAttribute = attributeNode.attribute("value"); if (!valueAttribute) { continue; } - std::string tmpStrValue = asLowerCaseString(keyAttribute.as_string()); + const std::string tmpStrValue = asLowerCaseString(keyAttribute.as_string()); auto parseAttribute = ItemParseAttributesMap.find(tmpStrValue); if (parseAttribute != ItemParseAttributesMap.end()) { ItemParse::initParse(tmpStrValue, attributeNode, valueAttribute, itemType); @@ -368,7 +383,7 @@ const ItemType &Items::getItemType(size_t id) const { } uint16_t Items::getItemIdByName(const std::string &name) { - auto result = nameToItems.find(asLowerCaseString(name)); + const auto result = nameToItems.find(asLowerCaseString(name)); if (result == nameToItems.end()) { return 0; @@ -383,3 +398,19 @@ bool Items::hasItemType(size_t hasId) const { } return false; } + +uint32_t Abilities::getHealthGain() const { + return healthGain * g_configManager().getFloat(RATE_HEALTH_REGEN); +} + +uint32_t Abilities::getHealthTicks() const { + return healthTicks / g_configManager().getFloat(RATE_HEALTH_REGEN_SPEED); +} + +uint32_t Abilities::getManaGain() const { + return manaGain * g_configManager().getFloat(RATE_MANA_REGEN); +} + +uint32_t Abilities::getManaTicks() const { + return manaTicks / g_configManager().getFloat(RATE_MANA_REGEN_SPEED); +} diff --git a/src/items/items.hpp b/src/items/items.hpp index e56678af6..b977f0bf7 100644 --- a/src/items/items.hpp +++ b/src/items/items.hpp @@ -9,13 +9,13 @@ #pragma once -#include "config/configmanager.hpp" -#include "utils/utils_definitions.hpp" -#include "declarations.hpp" +#include "creatures/creatures_definitions.hpp" #include "game/movement/position.hpp" +#include "items/items_definitions.hpp" +#include "utils/utils_definitions.hpp" +#include "enums/item_attribute.hpp" struct Abilities { -public: std::array<ConditionType_t, ConditionType_t::CONDITION_COUNT> conditionImmunities = {}; std::array<ConditionType_t, ConditionType_t::CONDITION_COUNT> conditionSuppressions = {}; @@ -65,35 +65,26 @@ struct Abilities { healthGain = value; } - uint32_t getHealthGain() const { - return healthGain * g_configManager().getFloat(RATE_HEALTH_REGEN, __FUNCTION__); - } + uint32_t getHealthGain() const; void setHealthTicks(uint32_t value) { healthTicks = value; } - uint32_t getHealthTicks() const { - return healthTicks / g_configManager().getFloat(RATE_HEALTH_REGEN_SPEED, __FUNCTION__); - } + uint32_t getHealthTicks() const; void setManaGain(uint32_t value) { manaGain = value; } - uint32_t getManaGain() const { - return manaGain * g_configManager().getFloat(RATE_MANA_REGEN, __FUNCTION__); - } + uint32_t getManaGain() const; void setManaTicks(uint32_t value) { manaTicks = value; } - uint32_t getManaTicks() const { - return manaTicks / g_configManager().getFloat(RATE_MANA_REGEN_SPEED, __FUNCTION__); - } + uint32_t getManaTicks() const; -private: uint32_t healthGain = 0; uint32_t healthTicks = 0; uint32_t manaGain = 0; @@ -110,7 +101,7 @@ class ItemType { ItemType(const ItemType &other) = delete; ItemType &operator=(const ItemType &other) = delete; - ItemType(ItemType &&other) = default; + ItemType(ItemType &&other) noexcept = default; ItemType &operator=(ItemType &&other) = default; bool isGroundTile() const { @@ -255,14 +246,9 @@ class ItemType { std::string parseAugmentDescription(bool inspect = false) const; std::string getFormattedAugmentDescription(const std::shared_ptr<AugmentInfo> &augmentInfo) const; - void addAugment(std::string spellName, Augment_t augmentType, int32_t value) { - auto augmentInfo = std::make_shared<AugmentInfo>(spellName, augmentType, value); - augments.emplace_back(augmentInfo); - } + void addAugment(std::string spellName, Augment_t augmentType, int32_t value); - void setImbuementType(ImbuementTypes_t imbuementType, uint16_t slotMaxTier) { - imbuementTypes[imbuementType] = std::min<uint16_t>(IMBUEMENT_MAX_TIER, slotMaxTier); - } + void setImbuementType(ImbuementTypes_t imbuementType, uint16_t slotMaxTier); ItemGroup_t group = ITEM_GROUP_NONE; ItemTypes_t type = ITEM_TYPE_NONE; @@ -415,7 +401,7 @@ class Items { uint16_t getItemIdByName(const std::string &name); - ItemTypes_t getLootType(const std::string &strValue); + ItemTypes_t getLootType(const std::string &strValue) const; bool loadFromXml(); void parseItemNode(const pugi::xml_node &itemNode, uint16_t id); @@ -445,7 +431,7 @@ class Items { return dummys; } - static const std::string getAugmentNameByType(Augment_t augmentType); + static std::string getAugmentNameByType(Augment_t augmentType); static bool isAugmentWithoutValueDescription(Augment_t augmentType) { static std::vector<Augment_t> vector = { @@ -454,7 +440,7 @@ class Items { Augment_t::StrongImpact, }; - return std::find(vector.begin(), vector.end(), augmentType) != vector.end(); + return std::ranges::find(vector, augmentType) != vector.end(); } private: diff --git a/src/items/items_classification.hpp b/src/items/items_classification.hpp index 601abd328..54521fd76 100644 --- a/src/items/items_classification.hpp +++ b/src/items/items_classification.hpp @@ -17,7 +17,7 @@ struct TierInfo { }; // Classification class for forging system and market. -class ItemClassification { +class ItemClassification final { public: ItemClassification() = default; explicit ItemClassification(uint8_t id) : @@ -32,6 +32,6 @@ class ItemClassification { table.convergenceTransferPrice = convergenceTransferPrice; } - uint8_t id; - std::map<uint8_t, TierInfo> tiers; + uint8_t id {}; + std::map<uint8_t, TierInfo> tiers {}; }; diff --git a/src/items/items_definitions.hpp b/src/items/items_definitions.hpp index badac5329..19d7f30b9 100644 --- a/src/items/items_definitions.hpp +++ b/src/items/items_definitions.hpp @@ -33,7 +33,7 @@ enum Attr_ReadValue { ATTR_READ_END, }; -enum ReturnValue { +enum ReturnValue : uint16_t { RETURNVALUE_NOERROR, RETURNVALUE_NOTBOUGHTINSTORE, RETURNVALUE_ITEMCANNOTBEMOVEDTHERE, @@ -272,6 +272,7 @@ enum ImbuementTypes_t : int64_t { enum class Augment_t : uint8_t { None, + Base, PowerfulImpact, StrongImpact, IncreasedDamage, @@ -458,7 +459,7 @@ enum TileFlags_t : uint32_t { TILESTATE_FLOORCHANGE = TILESTATE_FLOORCHANGE_DOWN | TILESTATE_FLOORCHANGE_NORTH | TILESTATE_FLOORCHANGE_SOUTH | TILESTATE_FLOORCHANGE_EAST | TILESTATE_FLOORCHANGE_WEST | TILESTATE_FLOORCHANGE_SOUTH_ALT | TILESTATE_FLOORCHANGE_EAST_ALT, }; -enum ZoneType_t { +enum ZoneType_t : uint8_t { ZONE_PROTECTION, ZONE_NOPVP, ZONE_PVP, @@ -621,7 +622,7 @@ enum ItemParseAttributes_t { }; struct ImbuementInfo { - Imbuement* imbuement; + Imbuement* imbuement {}; uint32_t duration = 0; }; @@ -629,7 +630,7 @@ struct AugmentInfo { AugmentInfo(std::string spellName, Augment_t type, int32_t value) : spellName(std::move(spellName)), type(type), value(value) { } - std::string spellName; + std::string spellName {}; Augment_t type; - int32_t value; + int32_t value {}; }; diff --git a/src/items/thing.cpp b/src/items/thing.cpp index 6eec7994d..4c2f1d5a8 100644 --- a/src/items/thing.cpp +++ b/src/items/thing.cpp @@ -7,13 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/thing.hpp" + #include "items/tile.hpp" const Position &Thing::getPosition() { - std::shared_ptr<Tile> tile = getTile(); + const auto &tile = getTile(); if (!tile) { return Tile::nullptr_tile->getPosition(); } diff --git a/src/items/tile.cpp b/src/items/tile.cpp index fc16dd579..f15e2bd8a 100644 --- a/src/items/tile.cpp +++ b/src/items/tile.cpp @@ -7,21 +7,22 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/tile.hpp" -#include "creatures/creature.hpp" + +#include "config/configmanager.hpp" #include "creatures/combat/combat.hpp" +#include "creatures/creature.hpp" +#include "creatures/monsters/monster.hpp" +#include "creatures/players/player.hpp" +#include "enums/account_type.hpp" #include "game/game.hpp" +#include "game/movement/teleport.hpp" #include "game/zones/zone.hpp" #include "items/containers/mailbox/mailbox.hpp" -#include "creatures/monsters/monster.hpp" -#include "lua/creature/movement.hpp" -#include "game/movement/teleport.hpp" #include "items/trashholder.hpp" -#include "io/iomap.hpp" +#include "lua/creature/movement.hpp" #include "map/spectators.hpp" -#include "enums/account_type.hpp" +#include "utils/tools.hpp" auto real_nullptr_tile = std::make_shared<StaticTile>(0xFFFF, 0xFFFF, 0xFF); const std::shared_ptr<Tile> &Tile::nullptr_tile = real_nullptr_tile; @@ -57,7 +58,7 @@ bool Tile::hasProperty(ItemProperty prop) const { } } -bool Tile::hasProperty(std::shared_ptr<Item> exclude, ItemProperty prop) const { +bool Tile::hasProperty(const std::shared_ptr<Item> &exclude, ItemProperty prop) const { if (!exclude) { g_logger().error("[{}]: exclude is nullptr", __FUNCTION__); return false; @@ -70,7 +71,7 @@ bool Tile::hasProperty(std::shared_ptr<Item> exclude, ItemProperty prop) const { } if (const TileItemVector* items = getItemList()) { - for (auto &item : *items) { + for (const auto &item : *items) { if (!item) { g_logger().error("Tile::hasProperty: tile {} has an item which is nullptr", tilePos.toString()); continue; @@ -84,6 +85,10 @@ bool Tile::hasProperty(std::shared_ptr<Item> exclude, ItemProperty prop) const { return false; } +bool Tile::hasFlag(uint32_t flag) const { + return hasBitSet(flag, this->flags); +} + bool Tile::hasHeight(uint32_t n) const { uint32_t height = 0; @@ -98,7 +103,7 @@ bool Tile::hasHeight(uint32_t n) const { } if (const TileItemVector* items = getItemList()) { - for (auto &item : *items) { + for (const auto &item : *items) { if (item->hasProperty(CONST_PROP_HASHEIGHT)) { ++height; } @@ -149,9 +154,9 @@ std::shared_ptr<Teleport> Tile::getTeleportItem() const { } if (const TileItemVector* items = getItemList()) { - for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) { - if ((*it)->getTeleport()) { - return (*it)->getTeleport(); + for (const auto &item : std::ranges::reverse_view(*items)) { + if (item->getTeleport()) { + return item->getTeleport(); } } } @@ -168,9 +173,9 @@ std::shared_ptr<MagicField> Tile::getFieldItem() const { } if (const TileItemVector* items = getItemList()) { - for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) { - if ((*it)->getMagicField()) { - return (*it)->getMagicField(); + for (const auto &item : std::ranges::reverse_view(*items)) { + if (item->getMagicField()) { + return item->getMagicField(); } } } @@ -187,9 +192,9 @@ std::shared_ptr<TrashHolder> Tile::getTrashHolder() const { } if (const TileItemVector* items = getItemList()) { - for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) { - if ((*it)->getTrashHolder()) { - return (*it)->getTrashHolder(); + for (const auto &item : std::ranges::reverse_view(*items)) { + if (item->getTrashHolder()) { + return item->getTrashHolder(); } } } @@ -206,9 +211,9 @@ std::shared_ptr<Mailbox> Tile::getMailbox() const { } if (const TileItemVector* items = getItemList()) { - for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) { - if ((*it)->getMailbox()) { - return (*it)->getMailbox(); + for (const auto &item : std::ranges::reverse_view(*items)) { + if (item->getMailbox()) { + return item->getMailbox(); } } } @@ -225,9 +230,9 @@ std::shared_ptr<BedItem> Tile::getBedItem() const { } if (const TileItemVector* items = getItemList()) { - for (auto it = items->rbegin(), end = items->rend(); it != end; ++it) { - if ((*it)->getBed()) { - return (*it)->getBed(); + for (const auto &item : std::ranges::reverse_view(*items)) { + if (item->getBed()) { + return item->getBed(); } } } @@ -252,23 +257,23 @@ std::shared_ptr<Creature> Tile::getBottomCreature() const { return nullptr; } -std::shared_ptr<Creature> Tile::getTopVisibleCreature(std::shared_ptr<Creature> creature) const { +std::shared_ptr<Creature> Tile::getTopVisibleCreature(const std::shared_ptr<Creature> &creature) const { if (const CreatureVector* creatures = getCreatures()) { if (creature) { - std::shared_ptr<Player> player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player && player->isAccessPlayer()) { return getTopCreature(); } - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (creature->canSeeCreature(tileCreature)) { return tileCreature; } } } else { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (!tileCreature->isInvisible()) { - std::shared_ptr<Player> player = tileCreature->getPlayer(); + const auto &player = tileCreature->getPlayer(); if (!player || !player->isInGhostMode()) { return tileCreature; } @@ -279,25 +284,25 @@ std::shared_ptr<Creature> Tile::getTopVisibleCreature(std::shared_ptr<Creature> return nullptr; } -std::shared_ptr<Creature> Tile::getBottomVisibleCreature(std::shared_ptr<Creature> creature) const { +std::shared_ptr<Creature> Tile::getBottomVisibleCreature(const std::shared_ptr<Creature> &creature) const { if (const CreatureVector* creatures = getCreatures()) { if (creature) { - std::shared_ptr<Player> player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player && player->isAccessPlayer()) { return getBottomCreature(); } - for (auto it = creatures->rbegin(), end = creatures->rend(); it != end; ++it) { - if (creature->canSeeCreature(*it)) { - return *it; + for (const auto &reverseCreature : std::ranges::reverse_view(*creatures)) { + if (creature->canSeeCreature(reverseCreature)) { + return reverseCreature; } } } else { - for (auto it = creatures->rbegin(), end = creatures->rend(); it != end; ++it) { - if (!(*it)->isInvisible()) { - std::shared_ptr<Player> player = (*it)->getPlayer(); + for (const auto &reverseCreature : std::ranges::reverse_view(*creatures)) { + if (!reverseCreature->isInvisible()) { + const auto &player = reverseCreature->getPlayer(); if (!player || !player->isInGhostMode()) { - return *it; + return reverseCreature; } } } @@ -336,8 +341,8 @@ std::shared_ptr<Item> Tile::getItemByTopOrder(int32_t topOrder) { return nullptr; } -std::shared_ptr<Thing> Tile::getTopVisibleThing(std::shared_ptr<Creature> creature) { - std::shared_ptr<Thing> thing = getTopVisibleCreature(creature); +std::shared_ptr<Thing> Tile::getTopVisibleThing(const std::shared_ptr<Creature> &creature) { + const auto &thing = getTopVisibleCreature(creature); if (thing) { return thing; } @@ -362,11 +367,16 @@ std::shared_ptr<Thing> Tile::getTopVisibleThing(std::shared_ptr<Creature> creatu return ground; } -void Tile::onAddTileItem(std::shared_ptr<Item> item) { +void Tile::onAddTileItem(const std::shared_ptr<Item> &item) { + if (!item) { + g_logger().error("Tile::onAddTileItem: item is nullptr"); + return; + } + if ((item->hasProperty(CONST_PROP_MOVABLE) || item->getContainer()) || (item->isWrapable() && !item->hasProperty(CONST_PROP_MOVABLE) && !item->hasProperty(CONST_PROP_BLOCKPATH))) { - auto it = g_game().browseFields.find(static_self_cast<Tile>()); + const auto it = g_game().browseFields.find(static_self_cast<Tile>()); if (it != g_game().browseFields.end()) { - auto lockedCylinder = it->second.lock(); + const auto &lockedCylinder = it->second.lock(); if (lockedCylinder) { lockedCylinder->addItemBack(item); item->setParent(getTile()); @@ -378,7 +388,7 @@ void Tile::onAddTileItem(std::shared_ptr<Item> item) { const Position &cylinderMapPos = getPosition(); - auto spectators = Spectators().find<Creature>(cylinderMapPos, true); + const auto spectators = Spectators().find<Creature>(cylinderMapPos, true); // send to client for (const auto &spectator : spectators) { @@ -392,7 +402,7 @@ void Tile::onAddTileItem(std::shared_ptr<Item> item) { spectator->onAddTileItem(static_self_cast<Tile>(), cylinderMapPos); } - if ((!hasFlag(TILESTATE_PROTECTIONZONE) || g_configManager().getBoolean(CLEAN_PROTECTION_ZONES, __FUNCTION__)) + if ((!hasFlag(TILESTATE_PROTECTIONZONE) || g_configManager().getBoolean(CLEAN_PROTECTION_ZONES)) && item->isCleanable()) { if (!this->getHouse()) { g_game().addTileToClean(static_self_cast<Tile>()); @@ -403,7 +413,7 @@ void Tile::onAddTileItem(std::shared_ptr<Item> item) { if (getTopTopItem() && getTopTopItem()->canReceiveAutoCarpet()) { return; } - auto house = getHouse(); + const auto &house = getHouse(); if (!house) { return; } @@ -412,36 +422,41 @@ void Tile::onAddTileItem(std::shared_ptr<Item> item) { if (!tile || !tile->getGround() || tile->getGround()->getID() != getGround()->getID()) { continue; } - auto topItem = tile->getTopTopItem(); + const auto &topItem = tile->getTopTopItem(); if (!topItem || !topItem->canReceiveAutoCarpet()) { continue; } // Check if tile is part of the same house - if (auto tileHouse = tile->getHouse(); !tileHouse || house != tileHouse) { + if (const auto &tileHouse = tile->getHouse(); !tileHouse || house != tileHouse) { continue; } // Clear any existing carpet - for (auto tileItem : *tile->getItemList()) { + for (const auto &tileItem : *tile->getItemList()) { if (tileItem && tileItem->isCarpet()) { tile->removeThing(tileItem, tileItem->getItemCount()); } } - auto carpet = item->clone(); + const auto &carpet = item->clone(); carpet->setAttribute(ItemAttribute_t::ACTIONID, IMMOVABLE_ACTION_ID); tile->addThing(carpet); } } } -void Tile::onUpdateTileItem(std::shared_ptr<Item> oldItem, const ItemType &oldType, std::shared_ptr<Item> newItem, const ItemType &newType) { +void Tile::onUpdateTileItem(const std::shared_ptr<Item> &oldItem, const ItemType &oldType, const std::shared_ptr<Item> &newItem, const ItemType &newType) { + if (!oldItem || !newItem) { + g_logger().error("Tile::onUpdateTileItem: oldItem or newItem is nullptr"); + return; + } + if ((newItem->hasProperty(CONST_PROP_MOVABLE) || newItem->getContainer()) || (newItem->isWrapable() && newItem->hasProperty(CONST_PROP_MOVABLE) && !oldItem->hasProperty(CONST_PROP_BLOCKPATH))) { - auto it = g_game().browseFields.find(getTile()); + const auto it = g_game().browseFields.find(getTile()); if (it != g_game().browseFields.end()) { - auto lockedCylinder = it->second.lock(); + const auto &lockedCylinder = it->second.lock(); if (lockedCylinder) { - int32_t index = lockedCylinder->getThingIndex(oldItem); + const int32_t index = lockedCylinder->getThingIndex(oldItem); if (index != -1) { lockedCylinder->replaceThing(index, newItem); newItem->setParent(static_self_cast<Tile>()); @@ -449,11 +464,11 @@ void Tile::onUpdateTileItem(std::shared_ptr<Item> oldItem, const ItemType &oldTy } } } else if ((oldItem->hasProperty(CONST_PROP_MOVABLE) || oldItem->getContainer()) || (oldItem->isWrapable() && !oldItem->hasProperty(CONST_PROP_MOVABLE) && !oldItem->hasProperty(CONST_PROP_BLOCKPATH))) { - auto it = g_game().browseFields.find(getTile()); + const auto it = g_game().browseFields.find(getTile()); if (it != g_game().browseFields.end()) { - auto lockedCylinder = it->second.lock(); + const auto &lockedCylinder = it->second.lock(); if (lockedCylinder) { - std::shared_ptr<Cylinder> oldParent = oldItem->getParent(); + const auto &oldParent = oldItem->getParent(); lockedCylinder->removeThing(oldItem, oldItem->getItemCount()); oldItem->setParent(oldParent); } @@ -462,7 +477,7 @@ void Tile::onUpdateTileItem(std::shared_ptr<Item> oldItem, const ItemType &oldTy const Position &cylinderMapPos = getPosition(); - auto spectators = Spectators().find<Creature>(cylinderMapPos, true); + const auto spectators = Spectators().find<Creature>(cylinderMapPos, true); // send to client for (const auto &spectator : spectators) { @@ -477,17 +492,22 @@ void Tile::onUpdateTileItem(std::shared_ptr<Item> oldItem, const ItemType &oldTy } } -void Tile::onRemoveTileItem(const CreatureVector &spectators, const std::vector<int32_t> &oldStackPosVector, std::shared_ptr<Item> item) { +void Tile::onRemoveTileItem(const CreatureVector &spectators, const std::vector<int32_t> &oldStackPosVector, const std::shared_ptr<Item> &item) { + if (!item) { + g_logger().error("Tile::onRemoveTileItem: item is nullptr"); + return; + } + if ((item->hasProperty(CONST_PROP_MOVABLE) || item->getContainer()) || (item->isWrapable() && !item->hasProperty(CONST_PROP_MOVABLE) && !item->hasProperty(CONST_PROP_BLOCKPATH))) { - auto it = g_game().browseFields.find(getTile()); + const auto it = g_game().browseFields.find(getTile()); if (it != g_game().browseFields.end()) { - auto lockedCylinder = it->second.lock(); + const auto &lockedCylinder = it->second.lock(); if (lockedCylinder) { lockedCylinder->removeThing(item, item->getItemCount()); } } } - for (auto &zone : getZones()) { + for (const auto &zone : getZones()) { zone->itemRemoved(item); } @@ -498,26 +518,26 @@ void Tile::onRemoveTileItem(const CreatureVector &spectators, const std::vector< // send to client size_t i = 0; - for (std::shared_ptr<Creature> spectator : spectators) { - if (std::shared_ptr<Player> tmpPlayer = spectator->getPlayer()) { + for (const auto &spectator : spectators) { + if (const auto &tmpPlayer = spectator->getPlayer()) { tmpPlayer->sendRemoveTileThing(cylinderMapPos, oldStackPosVector[i++]); } } // event methods - for (std::shared_ptr<Creature> spectator : spectators) { + for (const auto &spectator : spectators) { spectator->onRemoveTileItem(static_self_cast<Tile>(), cylinderMapPos, iType, item); } - if (!hasFlag(TILESTATE_PROTECTIONZONE) || g_configManager().getBoolean(CLEAN_PROTECTION_ZONES, __FUNCTION__)) { - auto items = getItemList(); + if (!hasFlag(TILESTATE_PROTECTIONZONE) || g_configManager().getBoolean(CLEAN_PROTECTION_ZONES)) { + const auto &items = getItemList(); if (!items || items->empty()) { g_game().removeTileToClean(static_self_cast<Tile>()); return; } bool ret = false; - for (auto toCheck : *items) { + for (const auto &toCheck : *items) { if (toCheck->isCleanable()) { ret = true; break; @@ -533,7 +553,7 @@ void Tile::onRemoveTileItem(const CreatureVector &spectators, const std::vector< if (getTopTopItem() && getTopTopItem()->canReceiveAutoCarpet()) { return; } - auto house = getHouse(); + const auto &house = getHouse(); if (!house) { return; } @@ -542,16 +562,16 @@ void Tile::onRemoveTileItem(const CreatureVector &spectators, const std::vector< if (!tile || !tile->getGround() || tile->getGround()->getID() != getGround()->getID()) { continue; } - auto topItem = tile->getTopTopItem(); + const auto &topItem = tile->getTopTopItem(); if (!topItem || !topItem->canReceiveAutoCarpet()) { continue; } // Check if tile is part of the same house - if (auto tileHouse = tile->getHouse(); !tileHouse || house != tileHouse) { + if (const auto &tileHouse = tile->getHouse(); !tileHouse || house != tileHouse) { continue; } - for (auto tileItem : *tile->getItemList()) { + for (const auto &tileItem : *tile->getItemList()) { if (tileItem && tileItem->getID() == item->getID()) { tile->removeThing(tileItem, tileItem->getItemCount()); } @@ -564,19 +584,23 @@ void Tile::onUpdateTile(const CreatureVector &spectators) { const Position &cylinderMapPos = getPosition(); // send to clients - for (std::shared_ptr<Creature> spectator : spectators) { + for (const auto &spectator : spectators) { spectator->getPlayer()->sendUpdateTile(getTile(), cylinderMapPos); } } -ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t tileFlags, std::shared_ptr<Creature>) { +ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t tileFlags, const std::shared_ptr<Creature> &) { + if (!thing) { + return RETURNVALUE_NOTPOSSIBLE; + } + if (hasBitSet(FLAG_NOLIMIT, tileFlags)) { return RETURNVALUE_NOERROR; } - if (auto creature = thing->getCreature()) { + if (const auto &creature = thing->getCreature()) { if (creature->getNpc()) { - ReturnValue returnValue = checkNpcCanWalkIntoTile(); + const ReturnValue returnValue = checkNpcCanWalkIntoTile(); if (returnValue != RETURNVALUE_NOERROR) { return returnValue; } @@ -590,7 +614,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ return RETURNVALUE_NOTPOSSIBLE; } - if (std::shared_ptr<Monster> monster = creature->getMonster()) { + if (const auto &monster = creature->getMonster()) { if (hasFlag(TILESTATE_PROTECTIONZONE | TILESTATE_FLOORCHANGE | TILESTATE_TELEPORT) && (!monster->isFamiliar() || (monster->isFamiliar() && monster->getMaster() && monster->getMaster()->getAttackedCreature()))) { return RETURNVALUE_NOTPOSSIBLE; } @@ -604,19 +628,19 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ const CreatureVector* creatures = getCreatures(); if (monster->canPushCreatures() && !monster->isSummon()) { if (creatures) { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (tileCreature->getPlayer() && tileCreature->getPlayer()->isInGhostMode()) { continue; } - std::shared_ptr<Monster> creatureMonster = tileCreature->getMonster(); + const auto &creatureMonster = tileCreature->getMonster(); if (!creatureMonster || !tileCreature->isPushable() || (creatureMonster->isSummon() && creatureMonster->getMaster()->getPlayer())) { return RETURNVALUE_NOTPOSSIBLE; } } } } else if (creatures && !creatures->empty()) { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (!tileCreature->isInGhostMode()) { return RETURNVALUE_NOTENOUGHROOM; } @@ -638,7 +662,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } if (hasHarmfulField()) { - CombatType_t combatType = getFieldItem()->getCombatType(); + const CombatType_t combatType = getFieldItem()->getCombatType(); // There is 3 options for a monster to enter a magic field // 1) Monster is immune @@ -659,9 +683,9 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } const CreatureVector* creatures = getCreatures(); - if (std::shared_ptr<Player> player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { if (creatures && !creatures->empty() && !hasBitSet(FLAG_IGNOREBLOCKCREATURE, tileFlags) && !player->isAccessPlayer()) { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (!player->canWalkthrough(tileCreature)) { return RETURNVALUE_NOTPOSSIBLE; } @@ -680,9 +704,9 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ const auto playerTile = player->getTile(); // moving from a pz tile to a non-pz tile if (playerTile && playerTile->hasFlag(TILESTATE_PROTECTIONZONE)) { - auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT, __FUNCTION__); + auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT); if (maxOnline > 1 && player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER && !hasFlag(TILESTATE_PROTECTIONZONE)) { - auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT, __FUNCTION__); + const auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT); auto accountPlayers = g_game().getPlayersByAccount(player->getAccount()); int countOutsizePZ = 0; for (const auto &accountPlayer : accountPlayers) { @@ -716,7 +740,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } } } else if (creatures && !creatures->empty() && !hasBitSet(FLAG_IGNOREBLOCKCREATURE, tileFlags)) { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (!tileCreature->isInGhostMode()) { return RETURNVALUE_NOTENOUGHROOM; } @@ -729,7 +753,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ // NO PVP magic wall or wild growth field check if (creature && creature->getPlayer()) { if (const auto fieldList = getItemList()) { - for (auto &findfield : *fieldList) { + for (const auto &findfield : *fieldList) { if (findfield && (findfield->getID() == ITEM_WILDGROWTH_SAFE || findfield->getID() == ITEM_MAGICWALL_SAFE)) { if (!creature->isInGhostMode()) { g_game().internalRemoveItem(findfield, 1); @@ -751,7 +775,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } if (const auto items = getItemList()) { - for (auto &item : *items) { + for (const auto &item : *items) { const ItemType &iiType = Item::items[item->getID()]; if (iiType.blockSolid && (!iiType.movable || item->hasAttribute(ItemAttribute_t::UNIQUEID))) { return RETURNVALUE_NOTPOSSIBLE; @@ -759,20 +783,20 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } } } - } else if (auto item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { const TileItemVector* items = getItemList(); if (items && items->size() >= 0x3E8) { return RETURNVALUE_NOTPOSSIBLE; } - bool itemIsHangable = item->isHangable(); + const bool itemIsHangable = item->isHangable(); if (ground == nullptr && !itemIsHangable) { return RETURNVALUE_NOTPOSSIBLE; } const CreatureVector* creatures = getCreatures(); if (creatures && !creatures->empty() && item->isBlocking() && !hasBitSet(FLAG_IGNOREBLOCKCREATURE, tileFlags)) { - for (auto &tileCreature : *creatures) { + for (const auto &tileCreature : *creatures) { if (!tileCreature->isInGhostMode()) { return RETURNVALUE_NOTENOUGHROOM; } @@ -781,7 +805,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ if (itemIsHangable && hasFlag(TILESTATE_SUPPORTS_HANGABLE)) { if (items) { - for (auto &tileItem : *items) { + for (const auto &tileItem : *items) { if (tileItem->isHangable()) { return RETURNVALUE_NEEDEXCHANGE; } @@ -804,7 +828,7 @@ ReturnValue Tile::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_ } if (items) { - for (auto &tileItem : *items) { + for (const auto &tileItem : *items) { const ItemType &iiType = Item::items[tileItem->getID()]; if (!iiType.blockSolid || iiType.type == ITEM_TYPE_TRASHHOLDER) { continue; @@ -845,13 +869,17 @@ ReturnValue Tile::queryMaxCount(int32_t, const std::shared_ptr<Thing> &, uint32_ return RETURNVALUE_NOERROR; } -ReturnValue Tile::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, std::shared_ptr<Creature> /*= nullptr */) { - int32_t index = getThingIndex(thing); +ReturnValue Tile::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, const std::shared_ptr<Creature> & /*= nullptr */) { + if (!thing) { + return RETURNVALUE_NOTPOSSIBLE; + } + + const int32_t index = getThingIndex(thing); if (index == -1) { return RETURNVALUE_NOTPOSSIBLE; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return RETURNVALUE_NOTPOSSIBLE; } @@ -867,26 +895,26 @@ ReturnValue Tile::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t coun return RETURNVALUE_NOERROR; } -std::shared_ptr<Cylinder> Tile::queryDestination(int32_t &, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &tileFlags) { +std::shared_ptr<Cylinder> Tile::queryDestination(int32_t &, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &tileFlags) { std::shared_ptr<Tile> destTile = nullptr; - *destItem = nullptr; + destItem = nullptr; if (hasFlag(TILESTATE_FLOORCHANGE_DOWN)) { uint16_t dx = tilePos.x; uint16_t dy = tilePos.y; - uint8_t dz = tilePos.z + 1; + const uint8_t dz = tilePos.z + 1; - std::shared_ptr<Tile> southDownTile = g_game().map.getTile(dx, dy - 1, dz); + const auto &southDownTile = g_game().map.getTile(dx, dy - 1, dz); if (southDownTile && southDownTile->hasFlag(TILESTATE_FLOORCHANGE_SOUTH_ALT)) { dy -= 2; destTile = g_game().map.getTile(dx, dy, dz); } else { - std::shared_ptr<Tile> eastDownTile = g_game().map.getTile(dx - 1, dy, dz); + const auto &eastDownTile = g_game().map.getTile(dx - 1, dy, dz); if (eastDownTile && eastDownTile->hasFlag(TILESTATE_FLOORCHANGE_EAST_ALT)) { dx -= 2; destTile = g_game().map.getTile(dx, dy, dz); } else { - std::shared_ptr<Tile> downTile = g_game().map.getTile(dx, dy, dz); + const auto &downTile = g_game().map.getTile(dx, dy, dz); if (downTile) { if (downTile->hasFlag(TILESTATE_FLOORCHANGE_NORTH)) { ++dy; @@ -919,7 +947,7 @@ std::shared_ptr<Cylinder> Tile::queryDestination(int32_t &, const std::shared_pt } else if (hasFlag(TILESTATE_FLOORCHANGE)) { uint16_t dx = tilePos.x; uint16_t dy = tilePos.y; - uint8_t dz = tilePos.z - 1; + const uint8_t dz = tilePos.z - 1; if (hasFlag(TILESTATE_FLOORCHANGE_NORTH)) { --dy; @@ -955,11 +983,11 @@ std::shared_ptr<Cylinder> Tile::queryDestination(int32_t &, const std::shared_pt } if (destTile) { - std::shared_ptr<Thing> destThing = destTile->getTopDownItem(); + const auto &destThing = destTile->getTopDownItem(); if (destThing) { - *destItem = destThing->getItem(); - if (thing->getItem()) { - auto destCylinder = destThing->getCylinder(); + destItem = destThing->getItem(); + if (thing && thing->getItem()) { + const auto &destCylinder = destThing->getCylinder(); if (destCylinder && !destCylinder->getContainer()) { return destThing->getCylinder(); } @@ -983,16 +1011,16 @@ std::vector<std::shared_ptr<Tile>> Tile::getSurroundingTiles() { }; } -void Tile::addThing(std::shared_ptr<Thing> thing) { +void Tile::addThing(const std::shared_ptr<Thing> &thing) { addThing(0, thing); } -void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { +void Tile::addThing(int32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { - return /*RETURNVALUE_NOTPOSSIBLE*/; + return; // RETURNVALUE_NOTPOSSIBLE } - std::shared_ptr<Creature> creature = thing->getCreature(); + const auto &creature = thing->getCreature(); if (creature) { Spectators::clearCache(); creature->setParent(static_self_cast<Tile>()); @@ -1000,7 +1028,7 @@ void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { CreatureVector* creatures = makeCreatures(); creatures->insert(creatures->begin(), creature); } else { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -1020,7 +1048,7 @@ void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { } else { const ItemType &oldType = Item::items[ground->getID()]; - std::shared_ptr<Item> oldGround = ground; + const auto &oldGround = ground; ground->resetParent(); ground = item; resetTileFlags(oldGround); @@ -1032,15 +1060,18 @@ void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { if (itemType.isSplash() && items) { // remove old splash if exists for (ItemVector::const_iterator it = items->getBeginTopItem(), end = items->getEndTopItem(); it != end; ++it) { - std::shared_ptr<Item> oldSplash = *it; - if (!Item::items[oldSplash->getID()].isSplash()) { - continue; - } + // Need to increment the counter to avoid crash + const std::weak_ptr<Item> &weakSplash = *it; + if (const auto oldSplash = weakSplash.lock()) { + if (!Item::items[oldSplash->getID()].isSplash()) { + continue; + } - removeThing(oldSplash, 1); - oldSplash->resetParent(); - postRemoveNotification(oldSplash, nullptr, 0); - break; + postRemoveNotification(oldSplash, nullptr, 0); + removeThing(oldSplash, 1); + oldSplash->resetParent(); + break; + } } } @@ -1068,19 +1099,21 @@ void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { if (itemType.isMagicField()) { // remove old field item if exists if (items) { - for (ItemVector::const_iterator it = items->getBeginDownItem(), end = items->getEndDownItem(); it != end; ++it) { - std::shared_ptr<MagicField> oldField = (*it)->getMagicField(); - if (oldField) { - if (oldField->isReplaceable()) { - removeThing(oldField, 1); - - oldField->resetParent(); - postRemoveNotification(oldField, nullptr, 0); - break; - } else { - // This magic field cannot be replaced. - item->resetParent(); - return; + for (auto it = items->getBeginDownItem(), end = items->getEndDownItem(); it != end; ++it) { + std::weak_ptr<Item> weakField = *it; + if (const auto oldField = weakField.lock()) { + auto magicField = oldField->getMagicField(); + if (magicField) { + if (magicField->isReplaceable()) { + postRemoveNotification(magicField, nullptr, 0); + removeThing(magicField, 1); + magicField->resetParent(); + break; + } else { + // This magic field cannot be replaced. + item->resetParent(); + return; + } } } } @@ -1095,13 +1128,17 @@ void Tile::addThing(int32_t, std::shared_ptr<Thing> thing) { } } -void Tile::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) { - int32_t index = getThingIndex(thing); +void Tile::updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) { + if (!thing) { + return /*RETURNVALUE_NOTPOSSIBLE*/; + } + + const int32_t index = getThingIndex(thing); if (index == -1) { return /*RETURNVALUE_NOTPOSSIBLE*/; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -1115,10 +1152,14 @@ void Tile::updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t c onUpdateTileItem(item, oldType, item, newType); } -void Tile::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { +void Tile::replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) { + if (!thing) { + return; + } + int32_t pos = index; - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return /*RETURNVALUE_NOTPOSSIBLE*/; } @@ -1138,7 +1179,7 @@ void Tile::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { TileItemVector* items = getItemList(); if (items && !isInserted) { - int32_t topItemSize = getTopItemCount(); + const int32_t topItemSize = getTopItemCount(); if (pos < topItemSize) { auto it = items->getBeginTopItem(); it += pos; @@ -1152,7 +1193,7 @@ void Tile::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { pos -= topItemSize; } - CreatureVector* creatures = getCreatures(); + const CreatureVector* creatures = getCreatures(); if (creatures) { if (!isInserted && pos < static_cast<int32_t>(creatures->size())) { return /*RETURNVALUE_NOTPOSSIBLE*/; @@ -1162,7 +1203,7 @@ void Tile::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { } if (items && !isInserted) { - int32_t downItemSize = getDownItemCount(); + const int32_t downItemSize = getDownItemCount(); if (pos < downItemSize) { auto it = items->getBeginDownItem() + pos; oldItem = *it; @@ -1186,12 +1227,16 @@ void Tile::replaceThing(uint32_t index, std::shared_ptr<Thing> thing) { } } -void Tile::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { - std::shared_ptr<Creature> creature = thing->getCreature(); +void Tile::removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) { + if (!thing) { + return; + } + + const auto &creature = thing->getCreature(); if (creature) { CreatureVector* creatures = getCreatures(); if (creatures) { - auto it = std::find(creatures->begin(), creatures->end(), thing); + const auto it = std::ranges::find(*creatures, thing); if (it != creatures->end()) { Spectators::clearCache(); creatures->erase(it); @@ -1200,12 +1245,12 @@ void Tile::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return; } - int32_t index = getThingIndex(item); + const int32_t index = getThingIndex(item); if (index == -1) { return; } @@ -1214,7 +1259,7 @@ void Tile::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { ground->resetParent(); ground = nullptr; - auto spectators = Spectators().find<Creature>(getPosition(), true); + const auto spectators = Spectators().find<Creature>(getPosition(), true); onRemoveTileItem(spectators.data(), std::vector<int32_t>(spectators.size(), 0), item); return; } @@ -1225,38 +1270,38 @@ void Tile::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { } if (item->isAlwaysOnTop()) { - auto it = std::find(items->getBeginTopItem(), items->getEndTopItem(), item); + const auto it = std::find(items->getBeginTopItem(), items->getEndTopItem(), item); if (it == items->getEndTopItem()) { return; } std::vector<int32_t> oldStackPosVector; - auto spectators = Spectators().find<Creature>(getPosition(), true); + const auto spectators = Spectators().find<Creature>(getPosition(), true); for (const auto &spectator : spectators) { if (const auto &tmpPlayer = spectator->getPlayer()) { oldStackPosVector.push_back(getStackposOfItem(tmpPlayer, item)); } } - item->resetParent(); items->erase(it); onRemoveTileItem(spectators.data(), oldStackPosVector, item); + item->resetParent(); } else { - auto it = std::find(items->getBeginDownItem(), items->getEndDownItem(), item); + const auto it = std::find(items->getBeginDownItem(), items->getEndDownItem(), item); if (it == items->getEndDownItem()) { return; } const ItemType &itemType = Item::items[item->getID()]; if (itemType.stackable && count != item->getItemCount()) { - uint8_t newCount = static_cast<uint8_t>(std::max<int32_t>(0, static_cast<int32_t>(item->getItemCount() - count))); + const uint8_t newCount = static_cast<uint8_t>(std::max<int32_t>(0, static_cast<int32_t>(item->getItemCount() - count))); item->setItemCount(newCount); onUpdateTileItem(item, itemType, item, itemType); } else { std::vector<int32_t> oldStackPosVector; - auto spectators = Spectators().find<Creature>(getPosition(), true); + const auto spectators = Spectators().find<Creature>(getPosition(), true); for (const auto &spectator : spectators) { if (const auto &tmpPlayer = spectator->getPlayer()) { oldStackPosVector.push_back(getStackposOfItem(spectator->getPlayer(), item)); @@ -1271,12 +1316,20 @@ void Tile::removeThing(std::shared_ptr<Thing> thing, uint32_t count) { } } -void Tile::removeCreature(std::shared_ptr<Creature> creature) { +void Tile::removeCreature(const std::shared_ptr<Creature> &creature) { + if (!creature) { + return; + } + g_game().map.getMapSector(tilePos.x, tilePos.y)->removeCreature(creature); removeThing(creature, 0); } -int32_t Tile::getThingIndex(std::shared_ptr<Thing> thing) const { +int32_t Tile::getThingIndex(const std::shared_ptr<Thing> &thing) const { + if (!thing) { + return -1; + } + int32_t n = -1; if (ground) { if (ground == thing) { @@ -1287,7 +1340,7 @@ int32_t Tile::getThingIndex(std::shared_ptr<Thing> thing) const { const TileItemVector* items = getItemList(); if (items) { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item && item->isAlwaysOnTop()) { for (auto it = items->getBeginTopItem(), end = items->getEndTopItem(); it != end; ++it) { ++n; @@ -1302,7 +1355,7 @@ int32_t Tile::getThingIndex(std::shared_ptr<Thing> thing) const { if (const CreatureVector* creatures = getCreatures()) { if (thing->getCreature()) { - for (auto &creature : *creatures) { + for (const auto &creature : *creatures) { ++n; if (creature == thing) { return n; @@ -1314,7 +1367,7 @@ int32_t Tile::getThingIndex(std::shared_ptr<Thing> thing) const { } if (items) { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item && !item->isAlwaysOnTop()) { for (auto it = items->getBeginDownItem(), end = items->getEndDownItem(); it != end; ++it) { ++n; @@ -1327,7 +1380,7 @@ int32_t Tile::getThingIndex(std::shared_ptr<Thing> thing) const { return -1; } -int32_t Tile::getClientIndexOfCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature) const { +int32_t Tile::getClientIndexOfCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature) const { int32_t n; if (ground) { n = 1; @@ -1341,10 +1394,10 @@ int32_t Tile::getClientIndexOfCreature(std::shared_ptr<Player> player, std::shar } if (const CreatureVector* creatures = getCreatures()) { - for (auto it = creatures->rbegin(); it != creatures->rend(); ++it) { - if (*it == creature) { + for (const auto &reverseCreature : std::ranges::reverse_view(*creatures)) { + if (reverseCreature == creature) { return n; - } else if (player->canSeeCreature(*it)) { + } else if (player->canSeeCreature(reverseCreature)) { ++n; } } @@ -1352,7 +1405,7 @@ int32_t Tile::getClientIndexOfCreature(std::shared_ptr<Player> player, std::shar return -1; } -int32_t Tile::getStackposOfCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature) const { +int32_t Tile::getStackposOfCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature) const { int32_t n; if (ground) { n = 1; @@ -1369,10 +1422,10 @@ int32_t Tile::getStackposOfCreature(std::shared_ptr<Player> player, std::shared_ } if (const CreatureVector* creatures = getCreatures()) { - for (auto it = creatures->rbegin(); it != creatures->rend(); ++it) { - if (*it == creature) { + for (const auto &reverseCreature : std::ranges::reverse_view(*creatures)) { + if (reverseCreature == creature) { return n; - } else if (player->canSeeCreature(*it)) { + } else if (player->canSeeCreature(reverseCreature)) { if (++n >= 10) { return -1; } @@ -1382,7 +1435,7 @@ int32_t Tile::getStackposOfCreature(std::shared_ptr<Player> player, std::shared_ return -1; } -int32_t Tile::getStackposOfItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item) const { +int32_t Tile::getStackposOfItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) const { int32_t n = 0; if (ground) { if (ground == item) { @@ -1410,7 +1463,7 @@ int32_t Tile::getStackposOfItem(std::shared_ptr<Player> player, std::shared_ptr< } if (const CreatureVector* creatures = getCreatures()) { - for (auto &creature : *creatures) { + for (const auto &creature : *creatures) { if (player->canSeeCreature(creature)) { if (++n >= 10) { return -1; @@ -1447,7 +1500,7 @@ uint32_t Tile::getItemTypeCount(uint16_t itemId, int32_t subType /*= -1*/) const const TileItemVector* items = getItemList(); if (items) { - for (auto &item : *items) { + for (const auto &item : *items) { if (item->getID() == itemId) { count += Item::countByType(item, subType); } @@ -1467,7 +1520,7 @@ std::shared_ptr<Thing> Tile::getThing(size_t index) const { const TileItemVector* items = getItemList(); if (items) { - uint32_t topItemSize = items->getTopItemCount(); + const uint32_t topItemSize = items->getTopItemCount(); if (index < topItemSize) { return items->at(items->getDownItemCount() + index); } @@ -1487,13 +1540,17 @@ std::shared_ptr<Thing> Tile::getThing(size_t index) const { return nullptr; } -void Tile::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link /*= LINK_OWNER*/) { +void Tile::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link /*= LINK_OWNER*/) { + if (!thing) { + return; + } + for (const auto &spectator : Spectators().find<Player>(getPosition(), true)) { spectator->getPlayer()->postAddNotification(thing, oldParent, index, LINK_NEAR); } // add a reference to this item, it may be deleted after being added (mailbox for example) - std::shared_ptr<Creature> creature = thing->getCreature(); + const auto &creature = thing->getCreature(); std::shared_ptr<Item> item; if (creature) { item = nullptr; @@ -1503,17 +1560,17 @@ void Tile::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cyl if (link == LINK_OWNER) { if (hasFlag(TILESTATE_TELEPORT)) { - std::shared_ptr<Teleport> teleport = getTeleportItem(); + const auto &teleport = getTeleportItem(); if (teleport) { teleport->addThing(thing); } } else if (hasFlag(TILESTATE_TRASHHOLDER)) { - std::shared_ptr<TrashHolder> trashholder = getTrashHolder(); + const auto &trashholder = getTrashHolder(); if (trashholder) { trashholder->addThing(thing); } } else if (hasFlag(TILESTATE_MAILBOX)) { - std::shared_ptr<Mailbox> mailbox = getMailbox(); + const auto &mailbox = getMailbox(); if (mailbox) { mailbox->addThing(thing); } @@ -1528,7 +1585,11 @@ void Tile::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cyl } } -void Tile::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { +void Tile::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { + if (!thing) { + return; + } + auto spectators = Spectators().find<Player>(getPosition(), true); if (getThingCount() > 8) { @@ -1540,30 +1601,30 @@ void Tile::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr< } // calling movement scripts - std::shared_ptr<Creature> creature = thing->getCreature(); + const auto &creature = thing->getCreature(); if (creature) { g_moveEvents().onCreatureMove(creature, static_self_cast<Tile>(), MOVE_EVENT_STEP_OUT); } else { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item) { g_moveEvents().onItemMove(item, static_self_cast<Tile>(), false); } } } -void Tile::internalAddThing(std::shared_ptr<Thing> thing) { +void Tile::internalAddThing(const std::shared_ptr<Thing> &thing) { internalAddThing(0, thing); if (!thing || !thing->getParent()) { return; } - if (auto house = thing->getTile()->getHouse()) { - if (std::shared_ptr<Item> item = thing->getItem()) { + if (const auto &house = thing->getTile()->getHouse()) { + if (const auto &item = thing->getItem()) { if (item->getParent().get() != this) { return; } - std::shared_ptr<Door> door = item->getDoor(); + const auto &door = item->getDoor(); if (door && door->getDoorId() != 0) { house->addDoor(door); } @@ -1571,7 +1632,7 @@ void Tile::internalAddThing(std::shared_ptr<Thing> thing) { } } -void Tile::internalAddThing(uint32_t, std::shared_ptr<Thing> thing) { +void Tile::internalAddThing(uint32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { return; } @@ -1581,14 +1642,14 @@ void Tile::internalAddThing(uint32_t, std::shared_ptr<Thing> thing) { thing->setParent(getTile()); - std::shared_ptr<Creature> creature = thing->getCreature(); + const auto &creature = thing->getCreature(); if (creature) { Spectators::clearCache(); CreatureVector* creatures = makeCreatures(); creatures->insert(creatures->begin(), creature); } else { - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item == nullptr) { return; } @@ -1808,11 +1869,11 @@ bool Tile::isMovableBlocking() const { std::shared_ptr<Item> Tile::getUseItem(int32_t index) const { const TileItemVector* items = getItemList(); - if (!items || items->size() == 0) { + if (!items || items->empty()) { return ground; } - if (std::shared_ptr<Thing> thing = getThing(index)) { + if (const auto &thing = getThing(index)) { return thing->getItem(); } @@ -1821,12 +1882,12 @@ std::shared_ptr<Item> Tile::getUseItem(int32_t index) const { std::shared_ptr<Item> Tile::getDoorItem() const { const TileItemVector* items = getItemList(); - if (!items || items->size() == 0) { + if (!items || items->empty()) { return ground; } if (items) { - for (auto &item : *items) { + for (const auto &item : *items) { const ItemType &it = Item::items[item->getID()]; if (it.isDoor()) { return item; @@ -1837,7 +1898,11 @@ std::shared_ptr<Item> Tile::getDoorItem() const { return nullptr; } -void Tile::addZone(std::shared_ptr<Zone> zone) { +void Tile::addZone(const std::shared_ptr<Zone> &zone) { + if (!zone) { + return; + } + zones.emplace(zone); const auto &items = getItemList(); if (items) { diff --git a/src/items/tile.hpp b/src/items/tile.hpp index 71f9d4ae0..4137b6e11 100644 --- a/src/items/tile.hpp +++ b/src/items/tile.hpp @@ -10,9 +10,6 @@ #pragma once #include "items/cylinder.hpp" -#include "declarations.hpp" -#include "items/item.hpp" -#include "utils/tools.hpp" class Creature; class Teleport; @@ -22,6 +19,9 @@ class MagicField; class BedItem; class House; class Zone; +class Cylinder; +class Item; +class ItemType; using CreatureVector = std::vector<std::shared_ptr<Creature>>; using ItemVector = std::vector<std::shared_ptr<Item>>; @@ -104,7 +104,7 @@ class Tile : public Cylinder, public SharedObject { static const std::shared_ptr<Tile> &nullptr_tile; Tile(uint16_t x, uint16_t y, uint8_t z) : tilePos(x, y, z) { } - virtual ~Tile() {}; + ~Tile() override = default; // non-copyable Tile(const Tile &) = delete; @@ -121,14 +121,14 @@ class Tile : public Cylinder, public SharedObject { return nullptr; } - int32_t getThrowRange() const override final { + int32_t getThrowRange() const final { return 0; } - bool isPushable() override final { + bool isPushable() final { return false; } - std::shared_ptr<Tile> getTile() override final { + std::shared_ptr<Tile> getTile() final { return static_self_cast<Tile>(); } @@ -144,13 +144,13 @@ class Tile : public Cylinder, public SharedObject { std::shared_ptr<Creature> getTopCreature() const; std::shared_ptr<Creature> getBottomCreature() const; - std::shared_ptr<Creature> getTopVisibleCreature(std::shared_ptr<Creature> creature) const; + std::shared_ptr<Creature> getTopVisibleCreature(const std::shared_ptr<Creature> &creature) const; - std::shared_ptr<Creature> getBottomVisibleCreature(std::shared_ptr<Creature> creature) const; + std::shared_ptr<Creature> getBottomVisibleCreature(const std::shared_ptr<Creature> &creature) const; std::shared_ptr<Item> getTopTopItem() const; std::shared_ptr<Item> getTopDownItem() const; bool isMovableBlocking() const; - std::shared_ptr<Thing> getTopVisibleThing(std::shared_ptr<Creature> creature); + std::shared_ptr<Thing> getTopVisibleThing(const std::shared_ptr<Creature> &creature); std::shared_ptr<Item> getItemByTopOrder(int32_t topOrder); size_t getThingCount() const { @@ -167,18 +167,16 @@ class Tile : public Cylinder, public SharedObject { uint32_t getDownItemCount() const; bool hasProperty(ItemProperty prop) const; - bool hasProperty(std::shared_ptr<Item> exclude, ItemProperty prop) const; + bool hasProperty(const std::shared_ptr<Item> &exclude, ItemProperty prop) const; - bool hasFlag(uint32_t flag) const { - return hasBitSet(flag, this->flags); - } + bool hasFlag(uint32_t flag) const; void setFlag(uint32_t flag) { this->flags |= flag; } void resetFlag(uint32_t flag) { this->flags &= ~flag; } - void addZone(std::shared_ptr<Zone> zone); + void addZone(const std::shared_ptr<Zone> &zone); void clearZones(); auto getZones() const { @@ -200,48 +198,48 @@ class Tile : public Cylinder, public SharedObject { bool hasHeight(uint32_t n) const; - std::string getDescription(int32_t lookDistance) override final; + std::string getDescription(int32_t lookDistance) final; - int32_t getClientIndexOfCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature) const; - int32_t getStackposOfCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature) const; - int32_t getStackposOfItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item) const; + int32_t getClientIndexOfCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature) const; + int32_t getStackposOfCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature) const; + int32_t getStackposOfItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) const; // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override final; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, std::shared_ptr<Creature> actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) final; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; std::vector<std::shared_ptr<Tile>> getSurroundingTiles(); - void addThing(std::shared_ptr<Thing> thing) override final; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; + void addThing(const std::shared_ptr<Thing> &thing) final; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; void updateTileFlags(const std::shared_ptr<Item> &item); - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override final; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override final; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) final; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) final; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override final; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) final; - void removeCreature(std::shared_ptr<Creature> creature); + void removeCreature(const std::shared_ptr<Creature> &creature); - int32_t getThingIndex(std::shared_ptr<Thing> thing) const override final; - size_t getFirstIndex() const override final; - size_t getLastIndex() const override final; - uint32_t getItemTypeCount(uint16_t itemId, int32_t subType = -1) const override final; - std::shared_ptr<Thing> getThing(size_t index) const override final; + int32_t getThingIndex(const std::shared_ptr<Thing> &thing) const final; + size_t getFirstIndex() const final; + size_t getLastIndex() const final; + uint32_t getItemTypeCount(uint16_t itemId, int32_t subType = -1) const final; + std::shared_ptr<Thing> getThing(size_t index) const final; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override final; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override final; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) final; - void internalAddThing(std::shared_ptr<Thing> thing) override; - void virtual internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void internalAddThing(const std::shared_ptr<Thing> &thing) override; + void internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; - const Position &getPosition() override final { + const Position &getPosition() final { return tilePos; } - bool isRemoved() override final { + bool isRemoved() final { return false; } @@ -256,15 +254,15 @@ class Tile : public Cylinder, public SharedObject { resetTileFlags(ground); } - if (ground = item) { + if ((ground = item)) { setTileFlags(item); } } private: - void onAddTileItem(std::shared_ptr<Item> item); - void onUpdateTileItem(std::shared_ptr<Item> oldItem, const ItemType &oldType, std::shared_ptr<Item> newItem, const ItemType &newType); - void onRemoveTileItem(const CreatureVector &spectators, const std::vector<int32_t> &oldStackPosVector, std::shared_ptr<Item> item); + void onAddTileItem(const std::shared_ptr<Item> &item); + void onUpdateTileItem(const std::shared_ptr<Item> &oldItem, const ItemType &oldType, const std::shared_ptr<Item> &newItem, const ItemType &newType); + void onRemoveTileItem(const CreatureVector &spectators, const std::vector<int32_t> &oldStackPosVector, const std::shared_ptr<Item> &item); void onUpdateTile(const CreatureVector &spectators); void setTileFlags(const std::shared_ptr<Item> &item); @@ -276,7 +274,7 @@ class Tile : public Cylinder, public SharedObject { std::shared_ptr<Item> ground = nullptr; Position tilePos; uint32_t flags = 0; - std::unordered_set<std::shared_ptr<Zone>> zones; + std::unordered_set<std::shared_ptr<Zone>> zones {}; }; // Used for walkable tiles, where there is high likeliness of diff --git a/src/items/trashholder.cpp b/src/items/trashholder.cpp index 65676a75a..193d29b79 100644 --- a/src/items/trashholder.cpp +++ b/src/items/trashholder.cpp @@ -7,13 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "items/trashholder.hpp" + #include "game/game.hpp" -ReturnValue TrashHolder::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, std::shared_ptr<Creature> actor) { - std::shared_ptr<Item> item = thing->getItem(); +ReturnValue TrashHolder::queryAdd(int32_t, const std::shared_ptr<Thing> &thing, uint32_t, uint32_t, const std::shared_ptr<Creature> &actor) { + if (!thing) { + return RETURNVALUE_NOERROR; + } + + const auto &item = thing->getItem(); if (item == nullptr) { return RETURNVALUE_NOERROR; } @@ -28,24 +31,24 @@ ReturnValue TrashHolder::queryMaxCount(int32_t, const std::shared_ptr<Thing> &, return RETURNVALUE_NOERROR; } -ReturnValue TrashHolder::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, std::shared_ptr<Creature> /*= nullptr*/) { +ReturnValue TrashHolder::queryRemove(const std::shared_ptr<Thing> &, uint32_t, uint32_t, const std::shared_ptr<Creature> & /*= nullptr */) { return RETURNVALUE_NOTPOSSIBLE; } -std::shared_ptr<Cylinder> TrashHolder::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item>*, uint32_t &) { +std::shared_ptr<Cylinder> TrashHolder::queryDestination(int32_t &, const std::shared_ptr<Thing> &, std::shared_ptr<Item> &, uint32_t &) { return static_self_cast<TrashHolder>(); } -void TrashHolder::addThing(std::shared_ptr<Thing> thing) { +void TrashHolder::addThing(const std::shared_ptr<Thing> &thing) { return addThing(0, thing); } -void TrashHolder::addThing(int32_t, std::shared_ptr<Thing> thing) { +void TrashHolder::addThing(int32_t, const std::shared_ptr<Thing> &thing) { if (!thing) { return; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (!item) { return; } @@ -56,7 +59,7 @@ void TrashHolder::addThing(int32_t, std::shared_ptr<Thing> thing) { const ItemType &it = Item::items[id]; if (item->isHangable() && it.isGroundTile()) { - std::shared_ptr<Tile> tile = std::dynamic_pointer_cast<Tile>(getParent()); + const std::shared_ptr<Tile> &tile = std::dynamic_pointer_cast<Tile>(getParent()); if (tile && tile->hasFlag(TILESTATE_SUPPORTS_HANGABLE)) { return; } @@ -72,22 +75,22 @@ void TrashHolder::addThing(int32_t, std::shared_ptr<Thing> thing) { } } -void TrashHolder::updateThing(std::shared_ptr<Thing>, uint16_t, uint32_t) { +void TrashHolder::updateThing(const std::shared_ptr<Thing> &, uint16_t, uint32_t) { // } -void TrashHolder::replaceThing(uint32_t, std::shared_ptr<Thing>) { +void TrashHolder::replaceThing(uint32_t, const std::shared_ptr<Thing> &) { // } -void TrashHolder::removeThing(std::shared_ptr<Thing>, uint32_t) { +void TrashHolder::removeThing(const std::shared_ptr<Thing> &, uint32_t) { // } -void TrashHolder::postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t) { +void TrashHolder::postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t) { getParent()->postAddNotification(thing, oldParent, index, LINK_PARENT); } -void TrashHolder::postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t) { +void TrashHolder::postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t) { getParent()->postRemoveNotification(thing, newParent, index, LINK_PARENT); } diff --git a/src/items/trashholder.hpp b/src/items/trashholder.hpp index 771c8687f..049260c57 100644 --- a/src/items/trashholder.hpp +++ b/src/items/trashholder.hpp @@ -21,24 +21,24 @@ class TrashHolder final : public Item, public Cylinder { return static_self_cast<TrashHolder>(); } - std::shared_ptr<Cylinder> getCylinder() override final { + std::shared_ptr<Cylinder> getCylinder() override { return getTrashHolder(); } // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; ReturnValue queryMaxCount(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t &maxQueryCount, uint32_t flags) override; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; - void addThing(std::shared_ptr<Thing> thing) override; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; + void addThing(const std::shared_ptr<Thing> &thing) override; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; - void updateThing(std::shared_ptr<Thing> thing, uint16_t itemId, uint32_t count) override; - void replaceThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId, uint32_t count) override; + void replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; - void removeThing(std::shared_ptr<Thing> thing, uint32_t count) override; + void removeThing(const std::shared_ptr<Thing> &thing, uint32_t count) override; - void postAddNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; - void postRemoveNotification(std::shared_ptr<Thing> thing, std::shared_ptr<Cylinder> newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postAddNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &oldParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; + void postRemoveNotification(const std::shared_ptr<Thing> &thing, const std::shared_ptr<Cylinder> &newParent, int32_t index, CylinderLink_t link = LINK_OWNER) override; }; diff --git a/src/items/weapons/weapons.cpp b/src/items/weapons/weapons.cpp index 69d20d43e..81e59f6a7 100644 --- a/src/items/weapons/weapons.cpp +++ b/src/items/weapons/weapons.cpp @@ -7,24 +7,24 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "items/weapons/weapons.hpp" +#include "config/configmanager.hpp" #include "creatures/combat/combat.hpp" #include "game/game.hpp" #include "lua/creature/events.hpp" -#include "items/weapons/weapons.hpp" #include "lua/global/lua_variant.hpp" Weapons::Weapons() = default; Weapons::~Weapons() = default; -const WeaponShared_ptr Weapons::getWeapon(std::shared_ptr<Item> item) const { +WeaponShared_ptr Weapons::getWeapon(const std::shared_ptr<Item> &item) const { if (!item) { return nullptr; } - auto it = weapons.find(item->getID()); + const auto it = weapons.find(item->getID()); if (it == weapons.end()) { return nullptr; } @@ -54,7 +54,7 @@ void Weapons::clear(bool isFromXML /*= false*/) { weapons.clear(); } -bool Weapons::registerLuaEvent(WeaponShared_ptr event, bool fromXML /*= false*/) { +bool Weapons::registerLuaEvent(const WeaponShared_ptr &event, bool fromXML /*= false*/) { weapons[event->getID()] = event; if (fromXML) { event->setFromXML(fromXML); @@ -81,7 +81,7 @@ void Weapon::configureWeapon(const ItemType &it) { id = it.id; } -int32_t Weapon::playerWeaponCheck(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint8_t shootRange) const { +int32_t Weapon::playerWeaponCheck(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint8_t shootRange) const { const Position &playerPos = player->getPosition(); const Position &targetPos = target->getPosition(); if (playerPos.z != targetPos.z) { @@ -131,8 +131,8 @@ int32_t Weapon::playerWeaponCheck(std::shared_ptr<Player> player, std::shared_pt return 100; } -bool Weapon::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const { - int32_t damageModifier = playerWeaponCheck(player, target, item->getShootRange()); +bool Weapon::useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const { + const int32_t damageModifier = playerWeaponCheck(player, target, item->getShootRange()); if (damageModifier == 0) { return false; } @@ -141,22 +141,22 @@ bool Weapon::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> ite return true; } -CombatDamage Weapon::getCombatDamage(CombatDamage combat, std::shared_ptr<Player> player, std::shared_ptr<Item> item, int32_t damageModifier) const { +CombatDamage Weapon::getCombatDamage(CombatDamage combat, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, int32_t damageModifier) const { // Local variables - uint32_t level = player->getLevel(); - int16_t elementalAttack = getElementDamageValue(); - int32_t weaponAttack = std::max<int32_t>(0, item->getAttack()); - int32_t playerSkill = player->getWeaponSkill(item); - float attackFactor = player->getAttackFactor(); // full atk, balanced or full defense + const uint32_t level = player->getLevel(); + const int16_t elementalAttack = getElementDamageValue(); + const int32_t weaponAttack = std::max<int32_t>(0, item->getAttack()); + const int32_t playerSkill = player->getWeaponSkill(item); + const float attackFactor = player->getAttackFactor(); // full atk, balanced or full defense // Getting values factores - int32_t totalAttack = elementalAttack + weaponAttack; - double weaponAttackProportion = (double)weaponAttack / (double)totalAttack; + const int32_t totalAttack = elementalAttack + weaponAttack; + const double weaponAttackProportion = static_cast<double>(weaponAttack) / static_cast<double>(totalAttack); // Calculating damage - int32_t maxDamage = static_cast<int32_t>(Weapons::getMaxWeaponDamage(level, playerSkill, totalAttack, attackFactor, true) * player->getVocation()->meleeDamageMultiplier * damageModifier / 100); - int32_t minDamage = level / 5; - int32_t realDamage = normal_random(minDamage, maxDamage); + const int32_t maxDamage = static_cast<int32_t>(Weapons::getMaxWeaponDamage(level, playerSkill, totalAttack, attackFactor, true) * player->getVocation()->meleeDamageMultiplier * damageModifier / 100); + const int32_t minDamage = level / 5; + const int32_t realDamage = normal_random(minDamage, maxDamage); // Setting damage to combat combat.primary.value = realDamage * weaponAttackProportion; @@ -164,16 +164,16 @@ CombatDamage Weapon::getCombatDamage(CombatDamage combat, std::shared_ptr<Player return combat; } -bool Weapon::useFist(std::shared_ptr<Player> player, std::shared_ptr<Creature> target) { +bool Weapon::useFist(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target) { if (!Position::areInRange<1, 1>(player->getPosition(), target->getPosition())) { return false; } - float attackFactor = player->getAttackFactor(); - int32_t attackSkill = player->getSkillLevel(SKILL_FIST); - int32_t attackValue = 7; + const float attackFactor = player->getAttackFactor(); + const int32_t attackSkill = player->getSkillLevel(SKILL_FIST); + constexpr int32_t attackValue = 7; - int32_t maxDamage = Weapons::getMaxWeaponDamage(player->getLevel(), attackSkill, attackValue, attackFactor, true); + const int32_t maxDamage = Weapons::getMaxWeaponDamage(player->getLevel(), attackSkill, attackValue, attackFactor, true); CombatParams params; params.combatType = COMBAT_PHYSICALDAMAGE; @@ -194,7 +194,7 @@ bool Weapon::useFist(std::shared_ptr<Player> player, std::shared_ptr<Creature> t return true; } -void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target, int32_t damageModifier, int32_t cleavePercent) const { +void Weapon::internalUseWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target, int32_t damageModifier, int32_t cleavePercent) const { if (player) { if (params.soundCastEffect == SoundEffect_t::SILENCE) { g_game().sendDoubleSoundEffect(player->getPosition(), player->getHitSoundEffect(), player->getAttackSoundEffect(), player); @@ -215,7 +215,7 @@ void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<I g_logger().debug("Weapon::internalUseWeapon - Lua callback executed."); } else { CombatDamage damage; - WeaponType_t weaponType = item->getWeaponType(); + const WeaponType_t weaponType = item->getWeaponType(); if (weaponType == WEAPON_AMMO || weaponType == WEAPON_DISTANCE || weaponType == WEAPON_MISSILE) { damage.origin = ORIGIN_RANGED; } else { @@ -245,7 +245,7 @@ void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<I damage.secondary.value = (getElementDamage(player, target, item) * damageModifier / 100) * damagePercent / 100; } - if (g_configManager().getBoolean(TOGGLE_CHAIN_SYSTEM, __FUNCTION__) && params.chainCallback) { + if (g_configManager().getBoolean(TOGGLE_CHAIN_SYSTEM) && params.chainCallback) { m_combat->doCombatChain(player, target, params.aggressive); g_logger().debug("Weapon::internalUseWeapon - Chain callback executed."); } else { @@ -258,7 +258,7 @@ void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<I onUsedWeapon(player, item, target->getTile()); } -void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Tile> tile) const { +void Weapon::internalUseWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Tile> &tile) const { if (isLoadedCallback()) { LuaVariant var; var.type = VARIANT_TARGETPOSITION; @@ -272,7 +272,7 @@ void Weapon::internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<I onUsedWeapon(player, item, tile); } -void Weapon::onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Tile> destTile) const { +void Weapon::onUsedWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Tile> &destTile) const { if (!player->hasFlag(PlayerFlags_t::NotGainSkill)) { skills_t skillType; uint32_t skillPoint; @@ -281,17 +281,17 @@ void Weapon::onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> } } - uint32_t manaCost = getManaCost(player); + const uint32_t manaCost = getManaCost(player); if (manaCost != 0) { player->addManaSpent(manaCost); player->changeMana(-static_cast<int32_t>(manaCost)); - if (g_configManager().getBoolean(REFUND_BEGINNING_WEAPON_MANA, __FUNCTION__) && (item->getName() == "wand of vortex" || item->getName() == "snakebite rod")) { + if (g_configManager().getBoolean(REFUND_BEGINNING_WEAPON_MANA) && (item->getName() == "wand of vortex" || item->getName() == "snakebite rod")) { player->changeMana(static_cast<int32_t>(manaCost)); } } - uint32_t healthCost = getHealthCost(player); + const uint32_t healthCost = getHealthCost(player); if (healthCost != 0) { player->changeHealth(-static_cast<int32_t>(healthCost)); } @@ -300,7 +300,7 @@ void Weapon::onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> player->changeSoul(-static_cast<int32_t>(soul)); } - bool skipRemoveBeginningWeaponAmmo = !g_configManager().getBoolean(REMOVE_BEGINNING_WEAPON_AMMO, __FUNCTION__) && (item->getName() == "arrow" || item->getName() == "bolt" || item->getName() == "spear"); + bool skipRemoveBeginningWeaponAmmo = !g_configManager().getBoolean(REMOVE_BEGINNING_WEAPON_AMMO) && (item->getName() == "arrow" || item->getName() == "bolt" || item->getName() == "spear"); if (!skipRemoveBeginningWeaponAmmo && breakChance != 0 && uniform_random(1, 100) <= breakChance) { Weapon::decrementItemCount(item); player->updateSupplyTracker(item); @@ -309,14 +309,14 @@ void Weapon::onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> switch (action) { case WEAPONACTION_REMOVECOUNT: - if (!skipRemoveBeginningWeaponAmmo && g_configManager().getBoolean(REMOVE_WEAPON_AMMO, __FUNCTION__)) { + if (!skipRemoveBeginningWeaponAmmo && g_configManager().getBoolean(REMOVE_WEAPON_AMMO)) { Weapon::decrementItemCount(item); player->updateSupplyTracker(item); } break; case WEAPONACTION_REMOVECHARGE: { - if (uint16_t charges = item->getCharges() != 0 && g_configManager().getBoolean(REMOVE_WEAPON_CHARGES, __FUNCTION__)) { + if (uint16_t charges = item->getCharges() != 0 && g_configManager().getBoolean(REMOVE_WEAPON_CHARGES)) { g_game().transformItem(item, item->getID(), charges - 1); } break; @@ -331,7 +331,7 @@ void Weapon::onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> } } -uint32_t Weapon::getManaCost(std::shared_ptr<Player> player) const { +uint32_t Weapon::getManaCost(const std::shared_ptr<Player> &player) const { if (mana != 0) { return mana; } @@ -343,7 +343,7 @@ uint32_t Weapon::getManaCost(std::shared_ptr<Player> player) const { return (player->getMaxMana() * manaPercent) / 100; } -int32_t Weapon::getHealthCost(std::shared_ptr<Player> player) const { +int32_t Weapon::getHealthCost(const std::shared_ptr<Player> &player) const { if (health != 0) { return health; } @@ -355,9 +355,9 @@ int32_t Weapon::getHealthCost(std::shared_ptr<Player> player) const { return (player->getMaxHealth() * healthPercent) / 100; } -bool Weapon::executeUseWeapon(std::shared_ptr<Player> player, const LuaVariant &var) const { +bool Weapon::executeUseWeapon(const std::shared_ptr<Player> &player, const LuaVariant &var) const { // onUseWeapon(player, var) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::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.", @@ -365,7 +365,7 @@ bool Weapon::executeUseWeapon(std::shared_ptr<Player> player, const LuaVariant & return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -373,13 +373,13 @@ bool Weapon::executeUseWeapon(std::shared_ptr<Player> player, const LuaVariant & getScriptInterface()->pushFunction(getScriptId()); LuaScriptInterface::pushUserdata<Player>(L, player); LuaScriptInterface::setMetatable(L, -1, "Player"); - getScriptInterface()->pushVariant(L, var); + LuaScriptInterface::pushVariant(L, var); return getScriptInterface()->callFunction(2); } -void Weapon::decrementItemCount(std::shared_ptr<Item> item) { - uint16_t count = item->getItemCount(); +void Weapon::decrementItemCount(const std::shared_ptr<Item> &item) { + const uint16_t count = item->getItemCount(); if (count > 1) { g_game().transformItem(item, item->getID(), count - 1); } else { @@ -388,7 +388,7 @@ void Weapon::decrementItemCount(std::shared_ptr<Item> item) { } bool Weapon::calculateSkillFormula(const std::shared_ptr<Player> &player, int32_t &attackSkill, int32_t &attackValue, float &attackFactor, int16_t &elementAttack, CombatDamage &damage, bool useCharges /* = false*/) const { - std::shared_ptr<Item> tool = player->getWeapon(); + const auto &tool = player->getWeapon(); if (!tool) { return false; } @@ -402,7 +402,7 @@ bool Weapon::calculateSkillFormula(const std::shared_ptr<Player> &player, int32_ } } - CombatType_t elementType = getElementType(); + const CombatType_t elementType = getElementType(); damage.secondary.type = elementType; bool shouldCalculateSecondaryDamage = false; @@ -413,7 +413,7 @@ bool Weapon::calculateSkillFormula(const std::shared_ptr<Player> &player, int32_ } if (useCharges) { - auto charges = tool->getAttribute<uint16_t>(ItemAttribute_t::CHARGES); + const auto charges = tool->getAttribute<uint16_t>(ItemAttribute_t::CHARGES); if (charges != 0) { g_game().transformItem(tool, tool->getID(), charges - 1); } @@ -445,13 +445,13 @@ void WeaponMelee::configureWeapon(const ItemType &it) { Weapon::configureWeapon(it); } -bool WeaponMelee::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const { - int32_t damageModifier = playerWeaponCheck(player, target, item->getShootRange()); +bool WeaponMelee::useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const { + const int32_t damageModifier = playerWeaponCheck(player, target, item->getShootRange()); if (damageModifier == 0) { return false; } - int32_t cleavePercent = player->getCleavePercent(true); + const int32_t cleavePercent = player->getCleavePercent(true); if (cleavePercent > 0) { const Position &targetPos = target->getPosition(); const Position &playerPos = player->getPosition(); @@ -477,12 +477,12 @@ bool WeaponMelee::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item secondCleaveTargetPos.y++; } } - std::shared_ptr<Tile> firstTile = g_game().map.getTile(firstCleaveTargetPos.x, firstCleaveTargetPos.y, firstCleaveTargetPos.z); - std::shared_ptr<Tile> secondTile = g_game().map.getTile(secondCleaveTargetPos.x, secondCleaveTargetPos.y, secondCleaveTargetPos.z); + const auto &firstTile = g_game().map.getTile(firstCleaveTargetPos.x, firstCleaveTargetPos.y, firstCleaveTargetPos.z); + const auto &secondTile = g_game().map.getTile(secondCleaveTargetPos.x, secondCleaveTargetPos.y, secondCleaveTargetPos.z); if (firstTile) { - if (CreatureVector* tileCreatures = firstTile->getCreatures()) { - for (auto &tileCreature : *tileCreatures) { + if (const CreatureVector* tileCreatures = firstTile->getCreatures()) { + for (const auto &tileCreature : *tileCreatures) { if (tileCreature->getMonster() || (tileCreature->getPlayer() && !player->hasSecureMode())) { internalUseWeapon(player, item, tileCreature, damageModifier, cleavePercent); } @@ -490,8 +490,8 @@ bool WeaponMelee::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item } } if (secondTile) { - if (CreatureVector* tileCreatures = secondTile->getCreatures()) { - for (auto &tileCreature : *tileCreatures) { + if (const CreatureVector* tileCreatures = secondTile->getCreatures()) { + for (const auto &tileCreature : *tileCreatures) { if (tileCreature->getMonster() || (tileCreature->getPlayer() && !player->hasSecureMode())) { internalUseWeapon(player, item, tileCreature, damageModifier, cleavePercent); } @@ -505,14 +505,14 @@ bool WeaponMelee::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item return true; } -bool WeaponMelee::getSkillType(std::shared_ptr<Player> player, std::shared_ptr<Item> item, skills_t &skill, uint32_t &skillpoint) const { +bool WeaponMelee::getSkillType(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, skills_t &skill, uint32_t &skillpoint) const { if (player->getAddAttackSkill() && player->getLastAttackBlockType() != BLOCK_IMMUNITY) { skillpoint = 1; } else { skillpoint = 0; } - WeaponType_t weaponType = item->getWeaponType(); + const WeaponType_t weaponType = item->getWeaponType(); switch (weaponType) { case WEAPON_SWORD: { skill = SKILL_SWORD; @@ -535,18 +535,18 @@ bool WeaponMelee::getSkillType(std::shared_ptr<Player> player, std::shared_ptr<I return false; } -int32_t WeaponMelee::getElementDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature>, std::shared_ptr<Item> item) const { +int32_t WeaponMelee::getElementDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &, const std::shared_ptr<Item> &item) const { if (elementType == COMBAT_NONE) { return 0; } - int32_t attackSkill = player->getWeaponSkill(item); - int32_t attackValue = elementDamage; - float attackFactor = player->getAttackFactor(); - uint32_t level = player->getLevel(); + const int32_t attackSkill = player->getWeaponSkill(item); + const int32_t attackValue = elementDamage; + const float attackFactor = player->getAttackFactor(); + const uint32_t level = player->getLevel(); - int32_t maxValue = Weapons::getMaxWeaponDamage(level, attackSkill, attackValue, attackFactor, true); - int32_t minValue = level / 5; + const int32_t maxValue = Weapons::getMaxWeaponDamage(level, attackSkill, attackValue, attackFactor, true); + const int32_t minValue = level / 5; return -normal_random(minValue, static_cast<int32_t>(maxValue * player->getVocation()->meleeDamageMultiplier)); } @@ -555,16 +555,16 @@ int16_t WeaponMelee::getElementDamageValue() const { return elementDamage; } -int32_t WeaponMelee::getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature>, std::shared_ptr<Item> item, bool maxDamage /*= false*/) const { +int32_t WeaponMelee::getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &, const std::shared_ptr<Item> &item, bool maxDamage /*= false*/) const { using namespace std; - int32_t attackSkill = player->getWeaponSkill(item); - int32_t attackValue = std::max<int32_t>(0, item->getAttack()); - float attackFactor = player->getAttackFactor(); - uint32_t level = player->getLevel(); + const int32_t attackSkill = player->getWeaponSkill(item); + const int32_t attackValue = std::max<int32_t>(0, item->getAttack()); + const float attackFactor = player->getAttackFactor(); + const uint32_t level = player->getLevel(); - int32_t maxValue = static_cast<int32_t>(Weapons::getMaxWeaponDamage(level, attackSkill, attackValue, attackFactor, true) * player->getVocation()->meleeDamageMultiplier); + const int32_t maxValue = static_cast<int32_t>(Weapons::getMaxWeaponDamage(level, attackSkill, attackValue, attackFactor, true) * player->getVocation()->meleeDamageMultiplier); - int32_t minValue = level / 5; + const int32_t minValue = level / 5; if (maxDamage) { return -maxValue; @@ -595,12 +595,12 @@ void WeaponDistance::configureWeapon(const ItemType &it) { Weapon::configureWeapon(it); } -bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const { +bool WeaponDistance::useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const { int32_t damageModifier; const ItemType &it = Item::items[id]; if (it.weaponType == WEAPON_AMMO) { - std::shared_ptr<Item> mainWeaponItem = player->getWeapon(true); - const WeaponShared_ptr mainWeapon = g_weapons().getWeapon(mainWeaponItem); + const auto &mainWeaponItem = player->getWeapon(true); + const WeaponShared_ptr &mainWeapon = g_weapons().getWeapon(mainWeaponItem); if (mainWeapon) { damageModifier = mainWeapon->playerWeaponCheck(player, target, mainWeaponItem->getShootRange()); } else { @@ -617,13 +617,13 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I bool perfectShot = false; const Position &playerPos = player->getPosition(); const Position &targetPos = target->getPosition(); - int32_t distanceX = Position::getDistanceX(targetPos, playerPos); - int32_t distanceY = Position::getDistanceY(targetPos, playerPos); + const int32_t distanceX = Position::getDistanceX(targetPos, playerPos); + const int32_t distanceY = Position::getDistanceY(targetPos, playerPos); int32_t damageX = player->getPerfectShotDamage(distanceX); int32_t damageY = player->getPerfectShotDamage(distanceY); if (it.weaponType == WEAPON_DISTANCE) { - std::shared_ptr<Item> quiver = player->getInventoryItem(CONST_SLOT_RIGHT); + const auto &quiver = player->getInventoryItem(CONST_SLOT_RIGHT); if (quiver && quiver->getWeaponType()) { if (quiver->getPerfectShotRange() == distanceX) { damageX -= quiver->getPerfectShotDamage(); @@ -639,8 +639,8 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I perfectShot = true; } else if (it.hitChance == 0) { // hit chance is based on distance to target and distance skill - uint32_t skill = player->getSkillLevel(SKILL_DISTANCE); - uint32_t distance = std::max<uint32_t>(distanceX, distanceY); + const uint32_t skill = player->getSkillLevel(SKILL_DISTANCE); + const uint32_t distance = std::max<uint32_t>(distanceX, distanceY); uint32_t maxHitChance; if (it.maxHitChance != -1) { @@ -736,7 +736,7 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I } if (!perfectShot && item->getWeaponType() == WEAPON_AMMO) { - std::shared_ptr<Item> bow = player->getWeapon(true); + const auto &bow = player->getWeapon(true); if (bow && bow->getHitChance() != 0) { chance += bow->getHitChance(); } @@ -746,7 +746,7 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I Weapon::internalUseWeapon(player, item, target, damageModifier); } else { // miss target - std::shared_ptr<Tile> destTile = target->getTile(); + auto destTile = target->getTile(); if (!Position::areInRange<1, 1, 0>(player->getPosition(), target->getPosition())) { static std::vector<std::pair<int32_t, int32_t>> destList { @@ -754,11 +754,11 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I }; std::ranges::shuffle(destList.begin(), destList.end(), getRandomGenerator()); - Position destPos = target->getPosition(); + const Position destPos = target->getPosition(); for (const auto &dir : destList) { // Blocking tiles or tiles without ground ain't valid targets for spears - auto tmpTile = g_game().map.getTile(static_cast<uint16_t>(destPos.x + dir.first), static_cast<uint16_t>(destPos.y + dir.second), destPos.z); + const auto &tmpTile = g_game().map.getTile(static_cast<uint16_t>(destPos.x + dir.first), static_cast<uint16_t>(destPos.y + dir.second), destPos.z); if (tmpTile && !tmpTile->hasFlag(TILESTATE_IMMOVABLEBLOCKSOLID) && tmpTile->getGround() != nullptr) { destTile = tmpTile; break; @@ -771,25 +771,25 @@ bool WeaponDistance::useWeapon(std::shared_ptr<Player> player, std::shared_ptr<I return true; } -int32_t WeaponDistance::getElementDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item) const { +int32_t WeaponDistance::getElementDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item) const { if (elementType == COMBAT_NONE) { return 0; } int32_t attackValue = elementDamage; - if (item->getWeaponType() == WEAPON_AMMO) { - std::shared_ptr<Item> weapon = player->getWeapon(true); + if (item && player && item->getWeaponType() == WEAPON_AMMO) { + const auto &weapon = player->getWeapon(true); if (weapon) { attackValue += item->getAttack(); attackValue += weapon->getAttack(); } } - int32_t attackSkill = player->getSkillLevel(SKILL_DISTANCE); - float attackFactor = player->getAttackFactor(); + const int32_t attackSkill = player->getSkillLevel(SKILL_DISTANCE); + const float attackFactor = player->getAttackFactor(); int32_t minValue = std::round(player->getLevel() / 5); - int32_t maxValue = std::round((0.09f * attackFactor) * attackSkill * attackValue + minValue) / 2; + const int32_t maxValue = std::round((0.09f * attackFactor) * attackSkill * attackValue + minValue) / 2; if (target) { if (target->getPlayer()) { @@ -806,12 +806,12 @@ int16_t WeaponDistance::getElementDamageValue() const { return elementDamage; } -int32_t WeaponDistance::getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, bool maxDamage /*= false*/) const { +int32_t WeaponDistance::getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, bool maxDamage /*= false*/) const { int32_t attackValue = item->getAttack(); bool hasElement = false; - if (item->getWeaponType() == WEAPON_AMMO) { - std::shared_ptr<Item> weapon = player->getWeapon(true); + if (player && item && item->getWeaponType() == WEAPON_AMMO) { + const auto &weapon = player->getWeapon(true); if (weapon) { const ItemType &it = Item::items[item->getID()]; if (it.abilities && it.abilities->elementDamage != 0) { @@ -823,8 +823,8 @@ int32_t WeaponDistance::getWeaponDamage(std::shared_ptr<Player> player, std::sha } } - int32_t attackSkill = player->getSkillLevel(SKILL_DISTANCE); - float attackFactor = player->getAttackFactor(); + const int32_t attackSkill = player->getSkillLevel(SKILL_DISTANCE); + const float attackFactor = player->getAttackFactor(); int32_t minValue = player->getLevel() / 5; int32_t maxValue = std::round((0.09f * attackFactor) * attackSkill * attackValue + minValue); @@ -832,7 +832,7 @@ int32_t WeaponDistance::getWeaponDamage(std::shared_ptr<Player> player, std::sha return -maxValue; } - if (target->getPlayer()) { + if (target && target->getPlayer()) { if (hasElement) { minValue /= 4; } else { @@ -848,10 +848,10 @@ int32_t WeaponDistance::getWeaponDamage(std::shared_ptr<Player> player, std::sha return -normal_random(minValue, (maxValue * static_cast<int32_t>(player->getVocation()->distDamageMultiplier))); } -bool WeaponDistance::getSkillType(std::shared_ptr<Player> player, std::shared_ptr<Item>, skills_t &skill, uint32_t &skillpoint) const { +bool WeaponDistance::getSkillType(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &, skills_t &skill, uint32_t &skillpoint) const { skill = SKILL_DISTANCE; - if (player->getAddAttackSkill()) { + if (player && player->getAddAttackSkill()) { switch (player->getLastAttackBlockType()) { case BLOCK_NONE: { skillpoint = 2; @@ -881,8 +881,8 @@ void WeaponWand::configureWeapon(const ItemType &it) { Weapon::configureWeapon(it); } -int32_t WeaponWand::getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature>, std::shared_ptr<Item>, bool maxDamage /* = false*/) const { - if (!g_configManager().getBoolean(TOGGLE_CHAIN_SYSTEM, __FUNCTION__)) { +int32_t WeaponWand::getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &, const std::shared_ptr<Item> &, bool maxDamage /* = false*/) const { + if (!g_configManager().getBoolean(TOGGLE_CHAIN_SYSTEM)) { // Returns maximum damage or a random value between minChange and maxChange return maxDamage ? -maxChange : -normal_random(minChange, maxChange); } @@ -895,19 +895,19 @@ int32_t WeaponWand::getWeaponDamage(std::shared_ptr<Player> player, std::shared_ [[maybe_unused]] CombatDamage combatDamage; calculateSkillFormula(player, attackSkill, attackValue, attackFactor, elementAttack, combatDamage); - auto magLevel = player->getMagicLevel(); - auto level = player->getLevel(); + const auto magLevel = player->getMagicLevel(); + const auto level = player->getLevel(); // Check if level is greater than zero before performing division - auto levelDivision = level > 0 ? level / 5.0 : 0.0; + const auto levelDivision = level > 0 ? level / 5.0 : 0.0; - auto totalAttackValue = magLevel + attackValue; + const auto totalAttackValue = magLevel + attackValue; // Check if magLevel is greater than zero before performing division - auto magicLevelDivision = totalAttackValue > 0 ? totalAttackValue / 3.0 : 0.0; + const auto magicLevelDivision = totalAttackValue > 0 ? totalAttackValue / 3.0 : 0.0; - double min = levelDivision + magicLevelDivision; - double max = levelDivision + totalAttackValue; + const double min = levelDivision + magicLevelDivision; + const double max = levelDivision + totalAttackValue; // Returns the calculated maximum damage or a random value between the calculated minimum and maximum return maxDamage ? -max : -normal_random(min, max); diff --git a/src/items/weapons/weapons.hpp b/src/items/weapons/weapons.hpp index 59cc23636..bbe15e12a 100644 --- a/src/items/weapons/weapons.hpp +++ b/src/items/weapons/weapons.hpp @@ -39,12 +39,12 @@ class Weapons final : public Scripts { return inject<Weapons>(); } - const WeaponShared_ptr getWeapon(std::shared_ptr<Item> item) const; + WeaponShared_ptr getWeapon(const std::shared_ptr<Item> &item) const; static int32_t getMaxMeleeDamage(int32_t attackSkill, int32_t attackValue); static int32_t getMaxWeaponDamage(uint32_t level, int32_t attackSkill, int32_t attackValue, float attackFactor, bool isMelee); - bool registerLuaEvent(WeaponShared_ptr event, bool fromXML = false); + bool registerLuaEvent(const WeaponShared_ptr &event, bool fromXML = false); void clear(bool isFromXML = false); private: @@ -62,15 +62,15 @@ class Weapon : public Script { return false; } - int32_t playerWeaponCheck(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint8_t shootRange) const; - static bool useFist(std::shared_ptr<Player> player, std::shared_ptr<Creature> target); - virtual bool useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const; + int32_t playerWeaponCheck(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint8_t shootRange) const; + static bool useFist(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target); + virtual bool useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const; - virtual int32_t getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, bool maxDamage = false) const = 0; - virtual int32_t getElementDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item) const = 0; + virtual int32_t getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, bool maxDamage = false) const = 0; + virtual int32_t getElementDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item) const = 0; virtual CombatType_t getElementType() const = 0; virtual int16_t getElementDamageValue() const = 0; - virtual CombatDamage getCombatDamage(CombatDamage combat, std::shared_ptr<Player> player, std::shared_ptr<Item> item, int32_t damageModifier) const; + virtual CombatDamage getCombatDamage(CombatDamage combat, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, int32_t damageModifier) const; uint16_t getID() const { return id; } @@ -162,8 +162,8 @@ class Weapon : public Script { wieldInfo |= info; } - void addVocWeaponMap(std::string vocName) { - int32_t vocationId = g_vocations().getVocationId(vocName); + void addVocWeaponMap(const std::string &vocName) { + const int32_t vocationId = g_vocations().getVocationId(vocName); if (vocationId != -1) { vocWeaponMap[vocationId] = true; } @@ -224,17 +224,17 @@ class Weapon : public Script { bool calculateSkillFormula(const std::shared_ptr<Player> &player, int32_t &attackSkill, int32_t &attackValue, float &attackFactor, int16_t &elementAttack, CombatDamage &damage, bool useCharges = false) const; protected: - void internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target, int32_t damageModifier, int32_t cleavePercent = 0) const; - void internalUseWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Tile> tile) const; + void internalUseWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target, int32_t damageModifier, int32_t cleavePercent = 0) const; + void internalUseWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Tile> &tile) const; private: - virtual bool getSkillType(std::shared_ptr<Player>, std::shared_ptr<Item>, skills_t &, uint32_t &) const { + virtual bool getSkillType(const std::shared_ptr<Player> &, const std::shared_ptr<Item> &, skills_t &, uint32_t &) const { return false; } - uint32_t getManaCost(std::shared_ptr<Player> player) const; - int32_t getHealthCost(std::shared_ptr<Player> player) const; - bool executeUseWeapon(std::shared_ptr<Player> player, const LuaVariant &var) const; + uint32_t getManaCost(const std::shared_ptr<Player> &player) const; + int32_t getHealthCost(const std::shared_ptr<Player> &player) const; + bool executeUseWeapon(const std::shared_ptr<Player> &player, const LuaVariant &var) const; uint16_t id = 0; @@ -252,11 +252,11 @@ class Weapon : public Script { bool premium = false; bool wieldUnproperly = false; bool m_isDisabledChain = false; - std::string vocationString = ""; + std::string vocationString; - void onUsedWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Tile> destTile) const; + void onUsedWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Tile> &destTile) const; - static void decrementItemCount(std::shared_ptr<Item> item); + static void decrementItemCount(const std::shared_ptr<Item> &item); WeaponAction_t action = WEAPONACTION_NONE; CombatParams params; @@ -284,17 +284,17 @@ class WeaponMelee final : public Weapon { void configureWeapon(const ItemType &it) override; - bool useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const override; + bool useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const override; - int32_t getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, bool maxDamage = false) const override; - int32_t getElementDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item) const override; + int32_t getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, bool maxDamage = false) const override; + int32_t getElementDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item) const override; CombatType_t getElementType() const override { return elementType; } virtual int16_t getElementDamageValue() const override; private: - bool getSkillType(std::shared_ptr<Player> player, std::shared_ptr<Item> item, skills_t &skill, uint32_t &skillpoint) const override; + bool getSkillType(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, skills_t &skill, uint32_t &skillpoint) const override; uint16_t elementDamage = 0; CombatType_t elementType = COMBAT_NONE; }; @@ -312,23 +312,23 @@ class WeaponDistance final : public Weapon { return true; } - bool useWeapon(std::shared_ptr<Player> player, std::shared_ptr<Item> item, std::shared_ptr<Creature> target) const override; + bool useWeapon(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::shared_ptr<Creature> &target) const override; - int32_t getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, bool maxDamage = false) const override; - int32_t getElementDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item) const override; + int32_t getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, bool maxDamage = false) const override; + int32_t getElementDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item) const override; CombatType_t getElementType() const override { return elementType; } virtual int16_t getElementDamageValue() const override; private: - bool getSkillType(std::shared_ptr<Player> player, std::shared_ptr<Item> item, skills_t &skill, uint32_t &skillpoint) const override; + bool getSkillType(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, skills_t &skill, uint32_t &skillpoint) const override; CombatType_t elementType = COMBAT_NONE; uint16_t elementDamage = 0; }; -class WeaponWand final : public Weapon { +class WeaponWand : public Weapon { public: using Weapon::Weapon; @@ -338,8 +338,8 @@ class WeaponWand final : public Weapon { void configureWeapon(const ItemType &it) override; - int32_t getWeaponDamage(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, bool maxDamage = false) const override; - int32_t getElementDamage(std::shared_ptr<Player>, std::shared_ptr<Creature>, std::shared_ptr<Item>) const override { + int32_t getWeaponDamage(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, bool maxDamage = false) const override; + int32_t getElementDamage(const std::shared_ptr<Player> &, const std::shared_ptr<Creature> &, const std::shared_ptr<Item> &) const override { return 0; } CombatType_t getElementType() const override { @@ -355,7 +355,7 @@ class WeaponWand final : public Weapon { } private: - bool getSkillType(std::shared_ptr<Player>, std::shared_ptr<Item>, skills_t &, uint32_t &) const override { + bool getSkillType(const std::shared_ptr<Player> &, const std::shared_ptr<Item> &, skills_t &, uint32_t &) const override { return false; } diff --git a/src/kv/kv.cpp b/src/kv/kv.cpp index 29a9787f7..95b19ca85 100644 --- a/src/kv/kv.cpp +++ b/src/kv/kv.cpp @@ -7,10 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "kv/kv.hpp" + #include "lib/di/container.hpp" +#include "database/database.hpp" int64_t KV::lastTimestamp_ = 0; uint64_t KV::counter_ = 0; @@ -21,12 +21,12 @@ KVStore &KVStore::getInstance() { } void KVStore::set(const std::string &key, const std::initializer_list<ValueWrapper> &init_list) { - ValueWrapper wrappedInitList(init_list); + const ValueWrapper wrappedInitList(init_list); set(key, wrappedInitList); } void KVStore::set(const std::string &key, const std::initializer_list<std::pair<const std::string, ValueWrapper>> &init_list) { - ValueWrapper wrappedInitList(init_list); + const ValueWrapper wrappedInitList(init_list); set(key, wrappedInitList); } @@ -37,7 +37,7 @@ void KVStore::set(const std::string &key, const ValueWrapper &value) { void KVStore::setLocked(const std::string &key, const ValueWrapper &value) { logger.trace("KVStore::set({})", key); - auto it = store_.find(key); + const auto it = store_.find(key); if (it != store_.end()) { it->second.first = value; lruQueue_.splice(lruQueue_.begin(), lruQueue_, it->second.second); diff --git a/src/kv/kv.hpp b/src/kv/kv.hpp index fa32461b2..eefc97d83 100644 --- a/src/kv/kv.hpp +++ b/src/kv/kv.hpp @@ -18,13 +18,14 @@ #include <unordered_set> #include <iomanip> #include <list> + #include <utility> #endif -#include "lib/logging/logger.hpp" #include "kv/value_wrapper.hpp" class KV : public std::enable_shared_from_this<KV> { public: + virtual ~KV() = default; virtual void set(const std::string &key, const std::initializer_list<ValueWrapper> &init_list) = 0; virtual void set(const std::string &key, const std::initializer_list<std::pair<const std::string, ValueWrapper>> &init_list) = 0; virtual void set(const std::string &key, const ValueWrapper &value) = 0; @@ -48,8 +49,8 @@ class KV : public std::enable_shared_from_this<KV> { static std::string generateUUID() { std::lock_guard<std::mutex> lock(mutex_); - auto now = std::chrono::system_clock::now().time_since_epoch(); - auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(now).count(); + const auto now = std::chrono::system_clock::now().time_since_epoch(); + const auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(now).count(); if (milliseconds != lastTimestamp_) { counter_ = 0; @@ -91,8 +92,8 @@ class KVStore : public KV { store_.clear(); } - std::shared_ptr<KV> scoped(const std::string &scope) override final; - std::unordered_set<std::string> keys(const std::string &prefix = ""); + std::shared_ptr<KV> scoped(const std::string &scope) final; + std::unordered_set<std::string> keys(const std::string &prefix = "") override; protected: phmap::parallel_flat_hash_map<std::string, std::pair<ValueWrapper, std::list<std::string>::iterator>> getStore() { @@ -121,8 +122,8 @@ class KVStore : public KV { class ScopedKV final : public KV { public: - ScopedKV(Logger &logger, KVStore &rootKV, const std::string &prefix) : - logger(logger), rootKV_(rootKV), prefix_(prefix) { } + ScopedKV(Logger &logger, KVStore &rootKV, std::string prefix) : + logger(logger), rootKV_(rootKV), prefix_(std::move(prefix)) { } void set(const std::string &key, const std::initializer_list<ValueWrapper> &init_list) override { rootKV_.set(buildKey(key), init_list); @@ -140,7 +141,7 @@ class ScopedKV final : public KV { template <typename T> T get(const std::string &key, bool forceLoad = false) { - auto optValue = get(key, forceLoad); + const auto optValue = get(key, forceLoad); if (optValue.has_value()) { return optValue->get<T>(); } @@ -151,7 +152,7 @@ class ScopedKV final : public KV { return rootKV_.saveAll(); } - std::shared_ptr<KV> scoped(const std::string &scope) override final { + std::shared_ptr<KV> scoped(const std::string &scope) override { logger.trace("ScopedKV::scoped({})", buildKey(scope)); return std::make_shared<ScopedKV>(logger, rootKV_, buildKey(scope)); } diff --git a/src/kv/kv_definitions.hpp b/src/kv/kv_definitions.hpp new file mode 100644 index 000000000..e53c8b0f2 --- /dev/null +++ b/src/kv/kv_definitions.hpp @@ -0,0 +1,29 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +class ValueWrapper; + +#ifndef USE_PRECOMPILED_HEADERS + #include <string> + #include <vector> + #include <memory> + #include <variant> + #include <parallel_hashmap/phmap.h> +#endif + +using StringType = std::string; +using BooleanType = bool; +using IntType = int; +using DoubleType = double; +using ArrayType = std::vector<ValueWrapper>; +using MapType = phmap::flat_hash_map<std::string, std::shared_ptr<ValueWrapper>>; + +using ValueVariant = std::variant<StringType, BooleanType, IntType, DoubleType, ArrayType, MapType>; diff --git a/src/kv/kv_sql.cpp b/src/kv/kv_sql.cpp index 57d2cc57a..0f3530488 100644 --- a/src/kv/kv_sql.cpp +++ b/src/kv/kv_sql.cpp @@ -7,29 +7,32 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "kv/kv_sql.hpp" + +#include "database/database.hpp" #include "kv/value_wrapper_proto.hpp" #include "utils/tools.hpp" #include <kv.pb.h> +KVSQL::KVSQL(Database &db, Logger &logger) : + KVStore(logger), db(db) { } + std::optional<ValueWrapper> KVSQL::load(const std::string &key) { - auto query = fmt::format("SELECT `key_name`, `timestamp`, `value` FROM `kv_store` WHERE `key_name` = {}", db.escapeString(key)); - auto result = db.storeQuery(query); + const auto query = fmt::format("SELECT `key_name`, `timestamp`, `value` FROM `kv_store` WHERE `key_name` = {}", db.escapeString(key)); + const auto result = db.storeQuery(query); if (result == nullptr) { return std::nullopt; } unsigned long size; - auto data = result->getStream("value", size); + const auto data = result->getStream("value", size); if (data == nullptr) { return std::nullopt; } ValueWrapper valueWrapper; - auto timestamp = result->getNumber<uint64_t>("timestamp"); + const auto timestamp = result->getNumber<uint64_t>("timestamp"); Canary::protobuf::kv::ValueWrapper protoValue; if (protoValue.ParseFromArray(data, static_cast<int>(size))) { valueWrapper = ProtoSerializable::fromProto(protoValue, timestamp); @@ -42,8 +45,8 @@ std::optional<ValueWrapper> KVSQL::load(const std::string &key) { std::vector<std::string> KVSQL::loadPrefix(const std::string &prefix /* = ""*/) { std::vector<std::string> keys; std::string keySearch = db.escapeString(prefix + "%"); - auto query = fmt::format("SELECT `key_name` FROM `kv_store` WHERE `key_name` LIKE {}", keySearch); - auto result = db.storeQuery(query); + const auto query = fmt::format("SELECT `key_name` FROM `kv_store` WHERE `key_name` LIKE {}", keySearch); + const auto result = db.storeQuery(query); if (result == nullptr) { return keys; } @@ -63,14 +66,14 @@ bool KVSQL::save(const std::string &key, const ValueWrapper &value) { return update.execute(); } -bool KVSQL::prepareSave(const std::string &key, const ValueWrapper &value, DBInsert &update) { - auto protoValue = ProtoSerializable::toProto(value); +bool KVSQL::prepareSave(const std::string &key, const ValueWrapper &value, DBInsert &update) const { + const auto protoValue = ProtoSerializable::toProto(value); std::string data; if (!protoValue.SerializeToString(&data)) { return false; } if (value.isDeleted()) { - auto query = fmt::format("DELETE FROM `kv_store` WHERE `key_name` = {}", db.escapeString(key)); + const auto query = fmt::format("DELETE FROM `kv_store` WHERE `key_name` = {}", db.escapeString(key)); return db.executeQuery(query); } @@ -80,7 +83,7 @@ bool KVSQL::prepareSave(const std::string &key, const ValueWrapper &value, DBIns bool KVSQL::saveAll() { auto store = getStore(); - bool success = DBTransaction::executeWithinTransaction([this, &store]() { + const bool success = DBTransaction::executeWithinTransaction([this, &store]() { auto update = dbUpdate(); if (!std::ranges::all_of(store, [this, &update](const auto &kv) { const auto &[key, value] = kv; @@ -97,3 +100,9 @@ bool KVSQL::saveAll() { return success; } + +DBInsert KVSQL::dbUpdate() { + auto insert = DBInsert("INSERT INTO `kv_store` (`key_name`, `timestamp`, `value`) VALUES"); + insert.upsert({ "key_name", "timestamp", "value" }); + return insert; +} diff --git a/src/kv/kv_sql.hpp b/src/kv/kv_sql.hpp index 1d7a6387d..f58f9cc47 100644 --- a/src/kv/kv_sql.hpp +++ b/src/kv/kv_sql.hpp @@ -11,16 +11,14 @@ #include "kv/kv.hpp" -#include "database/database.hpp" -#include "lib/logging/logger.hpp" - class Database; +class Logger; +class DBInsert; +class ValueWrapper; class KVSQL final : public KVStore { public: - explicit KVSQL(Database &db, Logger &logger) : - KVStore(logger), - db(db) { } + explicit KVSQL(Database &db, Logger &logger); bool saveAll() override; @@ -28,13 +26,9 @@ class KVSQL final : public KVStore { std::vector<std::string> loadPrefix(const std::string &prefix = "") override; std::optional<ValueWrapper> load(const std::string &key) override; bool save(const std::string &key, const ValueWrapper &value) override; - bool prepareSave(const std::string &key, const ValueWrapper &value, DBInsert &update); + bool prepareSave(const std::string &key, const ValueWrapper &value, DBInsert &update) const; - DBInsert dbUpdate() { - auto insert = DBInsert("INSERT INTO `kv_store` (`key_name`, `timestamp`, `value`) VALUES"); - insert.upsert({ "key_name", "timestamp", "value" }); - return insert; - } + DBInsert dbUpdate(); Database &db; }; diff --git a/src/kv/value_wrapper.cpp b/src/kv/value_wrapper.cpp index 78f828248..69fb942ba 100644 --- a/src/kv/value_wrapper.cpp +++ b/src/kv/value_wrapper.cpp @@ -7,16 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "kv/value_wrapper.hpp" + #include "utils/tools.hpp" ValueWrapper::ValueWrapper(uint64_t timestamp) : timestamp_(timestamp == 0 ? getTimeMsNow() : timestamp) { } -ValueWrapper::ValueWrapper(const ValueVariant &value, uint64_t timestamp) : - data_(value), timestamp_(timestamp == 0 ? getTimeMsNow() : timestamp) { } +ValueWrapper::ValueWrapper(ValueVariant value, uint64_t timestamp) : + data_(std::move(value)), timestamp_(timestamp == 0 ? getTimeMsNow() : timestamp) { } ValueWrapper::ValueWrapper(const std::string &value, uint64_t timestamp) : data_(value), timestamp_(timestamp == 0 ? getTimeMsNow() : timestamp) { } @@ -39,7 +38,7 @@ ValueWrapper::ValueWrapper(const std::initializer_list<std::pair<const std::stri timestamp_(timestamp == 0 ? getTimeMsNow() : timestamp) { } std::optional<ValueWrapper> ValueWrapper::get(const std::string &key) const { - auto pval = std::get_if<MapType>(&data_); + const auto pval = std::get_if<MapType>(&data_); if (!pval) { return std::nullopt; } @@ -57,7 +56,7 @@ std::optional<ValueWrapper> ValueWrapper::get(const std::string &key) const { } std::optional<ValueWrapper> ValueWrapper::get(size_t index) const { - if (auto pval = std::get_if<ArrayType>(&data_)) { + if (const auto pval = std::get_if<ArrayType>(&data_)) { if (index < pval->size()) { return (*pval)[index]; } diff --git a/src/kv/value_wrapper.hpp b/src/kv/value_wrapper.hpp index 0b388187d..4bb844dcb 100644 --- a/src/kv/value_wrapper.hpp +++ b/src/kv/value_wrapper.hpp @@ -19,21 +19,12 @@ #include <iterator> #include <type_traits> -class ValueWrapper; - -using StringType = std::string; -using BooleanType = bool; -using IntType = int; -using DoubleType = double; -using ArrayType = std::vector<ValueWrapper>; -using MapType = phmap::flat_hash_map<std::string, std::shared_ptr<ValueWrapper>>; - -using ValueVariant = std::variant<StringType, BooleanType, IntType, DoubleType, ArrayType, MapType>; +#include "kv/kv_definitions.hpp" class ValueWrapper { public: explicit ValueWrapper(uint64_t timestamp = 0); - explicit(false) ValueWrapper(const ValueVariant &value, uint64_t timestamp = 0); + explicit(false) ValueWrapper(ValueVariant value, uint64_t timestamp = 0); explicit(false) ValueWrapper(const std::string &value, uint64_t timestamp = 0); explicit(false) ValueWrapper(bool value, uint64_t timestamp = 0); explicit(false) ValueWrapper(int value, uint64_t timestamp = 0); @@ -178,7 +169,7 @@ inline bool ValueWrapper::operator==(const ValueWrapper &rhs) const { inline bool operator==(const ValueVariant &lhs, const ValueVariant &rhs) { return std::visit( - [](const auto &a, const auto &b) { + [](const auto &a, const auto &b) -> bool { using A = std::decay_t<decltype(a)>; using B = std::decay_t<decltype(b)>; @@ -199,6 +190,8 @@ inline bool operator==(const ValueVariant &lhs, const ValueVariant &rhs) { if constexpr (std::is_same_v<A, B>) { return a == b; } + + return false; }, lhs, rhs ); diff --git a/src/kv/value_wrapper_proto.cpp b/src/kv/value_wrapper_proto.cpp index 436210195..2235c56e1 100644 --- a/src/kv/value_wrapper_proto.cpp +++ b/src/kv/value_wrapper_proto.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "kv/value_wrapper_proto.hpp" #include "kv/value_wrapper.hpp" @@ -33,14 +31,14 @@ namespace ProtoHelpers { } void setProtoArrayValue(Canary::protobuf::kv::ValueWrapper &protoValue, const ArrayType &arg) { - auto arrayValue = protoValue.mutable_array_value(); + const auto arrayValue = protoValue.mutable_array_value(); for (const auto &elem : arg) { *arrayValue->add_values() = ProtoSerializable::toProto(elem); } } void setProtoMapValue(Canary::protobuf::kv::ValueWrapper &protoValue, const MapType &arg) { - auto mapValue = protoValue.mutable_map_value(); + const auto mapValue = protoValue.mutable_map_value(); for (const auto &[key, value] : arg) { auto* elem = mapValue->add_items(); elem->set_key(key); diff --git a/src/kv/value_wrapper_proto.hpp b/src/kv/value_wrapper_proto.hpp index 382b91a04..9d5a61865 100644 --- a/src/kv/value_wrapper_proto.hpp +++ b/src/kv/value_wrapper_proto.hpp @@ -21,13 +21,9 @@ using MapType = phmap::flat_hash_map<std::string, std::shared_ptr<ValueWrapper>> using ValueVariant = std::variant<StringType, BooleanType, IntType, DoubleType, ArrayType, MapType>; // Forward declaration for protobuf class -namespace Canary { - namespace protobuf { - namespace kv { - class ValueWrapper; - } // namespace kv - } // namespace protobuf -} // namespace Canary +namespace Canary::protobuf::kv { + class ValueWrapper; +} struct ProtoSerializable { static Canary::protobuf::kv::ValueWrapper toProto(const ValueWrapper &obj); diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 55709c59a..d24f72347 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,5 +1,6 @@ target_sources(${PROJECT_NAME}_lib PRIVATE di/soft_singleton.cpp + logging/logger.cpp logging/log_with_spd_log.cpp thread/thread_pool.cpp ) diff --git a/src/lib/di/runtime_provider.hpp b/src/lib/di/runtime_provider.hpp index 1c9292b5e..70fad336e 100644 --- a/src/lib/di/runtime_provider.hpp +++ b/src/lib/di/runtime_provider.hpp @@ -44,9 +44,9 @@ namespace extension { template <class T, class TInitialization, class TMemory, class... TArgs> auto get(const TInitialization &, const TMemory &, TArgs &&... args) const { - auto it = bindings_.find(std::type_index(typeid(T))); + const auto it = bindings_.find(std::type_index(typeid(T))); if (it == bindings_.end()) { - return get<T>(std::integral_constant < bool, !std::is_abstract<T>::value && std::is_constructible<T, TArgs...>::value > {}, std::forward<TArgs>(args)...); + return get<T>(std::integral_constant < bool, !std::is_abstract_v<T> && std::is_constructible_v<T, TArgs...> > {}, std::forward<TArgs>(args)...); } return static_cast<T*>(it->second()); } @@ -121,19 +121,19 @@ namespace extension { core::injector<runtime_provider<TErrorPolicy, TScopeTraits>> { core::init {} } { } template <class T> - /*non explicit*/ injector(const T &bindings) : + /*non explicit*/ explicit injector(const T &bindings) : injector() { install(bindings); } - template <class T, std::enable_if_t<!std::is_base_of<core::injector_base, T>::value, int> = 0> + template <class T, std::enable_if_t<!std::is_base_of_v<core::injector_base, T>, int> = 0> void install(const T &binding) { this->cfg().bindings()[std::type_index(typeid(typename T::expected))] = [this, binding] { return make<typename T::given>(binding); }; } - template <class T, std::enable_if_t<std::is_base_of<core::injector_base, T>::value, int> = 0> + template <class T, std::enable_if_t<std::is_base_of_v<core::injector_base, T>, int> = 0> void install(const T &injector) { install(typename T::deps {}, injector, aux::identity<typename T::config> {}); } diff --git a/src/lib/di/shared.hpp b/src/lib/di/shared.hpp index c1e2f0c67..f57257d7a 100644 --- a/src/lib/di/shared.hpp +++ b/src/lib/di/shared.hpp @@ -28,7 +28,7 @@ namespace extension { #if !defined(BOOST_DI_NOT_THREAD_SAFE) //<<lock mutex so that move will be synchronized>> - explicit scope(scope &&other) noexcept : + scope(scope &&other) noexcept : scope(std::move(other), std::scoped_lock<std::mutex>(other.mutex_)) { } //<<synchronized move constructor>> scope(scope &&other, const std::scoped_lock<std::mutex> &) noexcept : diff --git a/src/lib/di/soft_singleton.cpp b/src/lib/di/soft_singleton.cpp index 64ea514d1..8a2add1c0 100644 --- a/src/lib/di/soft_singleton.cpp +++ b/src/lib/di/soft_singleton.cpp @@ -6,8 +6,8 @@ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" #include "lib/di/soft_singleton.hpp" + #include "utils/tools.hpp" SoftSingleton::SoftSingleton(std::string id) : diff --git a/src/lib/di/soft_singleton.hpp b/src/lib/di/soft_singleton.hpp index 12d90aa3b..99ef85fe9 100644 --- a/src/lib/di/soft_singleton.hpp +++ b/src/lib/di/soft_singleton.hpp @@ -6,10 +6,8 @@ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors * Website: https://docs.opentibiabr.com/ */ -#pragma once -#include <iostream> -#include "lib/logging/log_with_spd_log.hpp" +#pragma once class SoftSingleton { public: diff --git a/src/lib/logging/log_with_spd_log.cpp b/src/lib/logging/log_with_spd_log.cpp index f8cfe1694..6e6f8a298 100644 --- a/src/lib/logging/log_with_spd_log.cpp +++ b/src/lib/logging/log_with_spd_log.cpp @@ -6,9 +6,8 @@ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors * Website: https://docs.opentibiabr.com/ */ -#include <spdlog/spdlog.h> -#include "pch.hpp" +#include <spdlog/spdlog.h> #include "lib/di/container.hpp" LogWithSpdLog::LogWithSpdLog() { @@ -24,17 +23,39 @@ Logger &LogWithSpdLog::getInstance() { return inject<Logger>(); } -void LogWithSpdLog::setLevel(const std::string &name) { +void LogWithSpdLog::setLevel(const std::string &name) const { debug("Setting log level to: {}.", name); - auto level = spdlog::level::from_str(name); + const auto level = spdlog::level::from_str(name); spdlog::set_level(level); } std::string LogWithSpdLog::getLevel() const { - auto level = spdlog::level::to_string_view(spdlog::get_level()); + const auto level = spdlog::level::to_string_view(spdlog::get_level()); return std::string { level.begin(), level.end() }; } -void LogWithSpdLog::log(const std::string &lvl, const fmt::basic_string_view<char> msg) const { - spdlog::log(spdlog::level::from_str(lvl), msg); +void LogWithSpdLog::info(const std::string &msg) const { + SPDLOG_INFO(msg); +} + +void LogWithSpdLog::warn(const std::string &msg) const { + SPDLOG_WARN(msg); } + +void LogWithSpdLog::error(const std::string &msg) const { + SPDLOG_ERROR(msg); +} + +void LogWithSpdLog::critical(const std::string &msg) const { + SPDLOG_CRITICAL(msg); +} + +#if defined(DEBUG_LOG) +void LogWithSpdLog::debug(const std::string &msg) const { + SPDLOG_DEBUG(msg); +} + +void LogWithSpdLog::trace(const std::string &msg) const { + SPDLOG_TRACE(msg); +} +#endif diff --git a/src/lib/logging/log_with_spd_log.hpp b/src/lib/logging/log_with_spd_log.hpp index 983ee716c..84dc09a1e 100644 --- a/src/lib/logging/log_with_spd_log.hpp +++ b/src/lib/logging/log_with_spd_log.hpp @@ -17,10 +17,37 @@ class LogWithSpdLog final : public Logger { static Logger &getInstance(); - void setLevel(const std::string &name) override; + void setLevel(const std::string &name) const override; std::string getLevel() const override; - void log(const std::string &lvl, fmt::basic_string_view<char> msg) const override; + void info(const std::string &msg) const override; + void warn(const std::string &msg) const override; + void error(const std::string &msg) const override; + void critical(const std::string &msg) const override; + +#if defined(DEBUG_LOG) + void debug(const std::string &msg) const override; + void trace(const std::string &msg) const override; + + template <typename... Args> + void debug(const fmt::format_string<Args...> &fmt, Args &&... args) const { + debug(fmt::format(fmt, std::forward<Args>(args)...)); + } + + template <typename... Args> + void trace(const fmt::format_string<Args...> &fmt, Args &&... args) const { + trace(fmt::format(fmt, std::forward<Args>(args)...)); + } +#else + void debug(const std::string &) const override { } + void trace(const std::string &) const override { } + + template <typename... Args> + void debug(const fmt::format_string<Args...> &, Args &&...) const { } + + template <typename... Args> + void trace(const fmt::format_string<Args...> &, Args &&...) const { } +#endif }; constexpr auto g_logger = LogWithSpdLog::getInstance; diff --git a/src/lib/logging/logger.cpp b/src/lib/logging/logger.cpp new file mode 100644 index 000000000..b9a3c889d --- /dev/null +++ b/src/lib/logging/logger.cpp @@ -0,0 +1,74 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 <spdlog/spdlog.h> +#include <spdlog/sinks/basic_file_sink.h> +#include <spdlog/sinks/stdout_color_sinks.h> +#include "lib/di/container.hpp" + +void Logger::setLevel(const std::string &name) const { + debug("Setting log level to: {}.", name); + const auto level = spdlog::level::from_str(name); + spdlog::set_level(level); +} + +std::string Logger::getLevel() const { + const auto level = spdlog::level::to_string_view(spdlog::get_level()); + return std::string { level.begin(), level.end() }; +} + +void Logger::logProfile(const std::string &name, double duration_ms) const { + std::string mutable_name = name; + + std::ranges::replace(mutable_name, ':', '_'); + std::ranges::replace(mutable_name, '\\', '_'); + std::ranges::replace(mutable_name, '/', '_'); + + std::string filename = "log/profile_log-" + mutable_name + ".txt"; + + const auto it = profile_loggers_.find(filename); + if (it == profile_loggers_.end()) { + try { + auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true); + const auto profile_logger = std::make_shared<spdlog::logger>(mutable_name, file_sink); + profile_loggers_[filename] = profile_logger; + profile_logger->info("Function {} executed in {} ms", name, duration_ms); + } catch (const spdlog::spdlog_ex &ex) { + error("Profile log initialization failed: {}", ex.what()); + } + } else { + it->second->info("Function {} executed in {} ms", mutable_name, duration_ms); + } +} + +void Logger::info(const std::string &msg) const { + SPDLOG_INFO(msg); +} + +void Logger::warn(const std::string &msg) const { + SPDLOG_WARN(msg); +} + +void Logger::error(const std::string &msg) const { + SPDLOG_ERROR(msg); +} + +void Logger::critical(const std::string &msg) const { + SPDLOG_CRITICAL(msg); +} + +#if defined(DEBUG_LOG) +void Logger::debug(const std::string &msg) const { + SPDLOG_DEBUG(msg); +} + +void Logger::trace(const std::string &msg) const { + SPDLOG_TRACE(msg); +} +#endif diff --git a/src/lib/logging/logger.hpp b/src/lib/logging/logger.hpp index bc6c455fb..05c4ba751 100644 --- a/src/lib/logging/logger.hpp +++ b/src/lib/logging/logger.hpp @@ -8,34 +8,11 @@ */ #pragma once -#ifndef USE_PRECOMPILED_HEADERS - #include <fmt/format.h> -#endif +#include "utils/transparent_string_hash.hpp" -#define LOG_LEVEL_TRACE \ - std::string { \ - "trace" \ - } -#define LOG_LEVEL_DEBUG \ - std::string { \ - "debug" \ - } -#define LOG_LEVEL_INFO \ - std::string { \ - "info" \ - } -#define LOG_LEVEL_WARNING \ - std::string { \ - "warning" \ - } -#define LOG_LEVEL_ERROR \ - std::string { \ - "error" \ - } -#define LOG_LEVEL_CRITICAL \ - std::string { \ - "critical" \ - } +namespace spdlog { + class logger; +} class Logger { public: @@ -46,67 +23,121 @@ class Logger { Logger(const Logger &) = delete; virtual Logger &operator=(const Logger &) = delete; - virtual void setLevel(const std::string &name) = 0; - [[nodiscard]] virtual std::string getLevel() const = 0; - virtual void log(const std::string &lvl, fmt::basic_string_view<char> msg) const = 0; + virtual void setLevel(const std::string &name) const = 0; + virtual std::string getLevel() const = 0; + + /** + * @brief Logs the execution time of a given operation to a profile log file. + * + * This function records the duration of a named operation in a log file specific + * to that operation. If the log file doesn't exist, it creates a new one. + * The log file name is derived from the provided operation name. + * + * @param name Name of the operation to profile. + * @param duration_ms Execution duration in milliseconds. + * + * Example usage: + * @code + * class ExampleClass { + * public: + * void run() { + * g_logger().profile("quickTask", [this]() { + * quickTask(); + * }); + * } + * + * private: + * void quickTask() { + * std::this_thread::sleep_for(std::chrono::milliseconds(100)); + * } + * }; + * @endcode + */ + void logProfile(const std::string &name, double duration_ms) const; + + virtual void info(const std::string &msg) const; + virtual void warn(const std::string &msg) const; + virtual void error(const std::string &msg) const; + virtual void critical(const std::string &msg) const; + + template <typename Func> + auto profile(const std::string &name, Func func) -> decltype(func()) { + const auto start = std::chrono::high_resolution_clock::now(); + auto result = func(); + const auto end = std::chrono::high_resolution_clock::now(); + + const std::chrono::duration<double, std::milli> duration = end - start; + logProfile(name, duration.count()); + info("Function {} executed in {} ms", name, duration.count()); + + return result; + } + +#if defined(DEBUG_LOG) + virtual void debug(const std::string &msg) const; template <typename... Args> - void trace(const fmt::format_string<Args...> &fmt, Args &&... args) { - trace(fmt::format(fmt, std::forward<Args>(args)...)); + void debug(const fmt::format_string<Args...> &fmt, Args &&... args) const { + debug(fmt::format(fmt, std::forward<Args>(args)...)); } + virtual void trace(const std::string &msg) const; + template <typename... Args> - void debug(const fmt::format_string<Args...> &fmt, Args &&... args) { - debug(fmt::format(fmt, std::forward<Args>(args)...)); + void trace(const fmt::format_string<Args...> &fmt, Args &&... args) const { + trace(fmt::format(fmt, std::forward<Args>(args)...)); } +#else + virtual void debug(const std::string &) const { } + + template <typename... Args> + void debug(const fmt::format_string<Args...> &, Args &&...) const { } + + virtual void trace(const std::string &) const { } template <typename... Args> - void info(fmt::format_string<Args...> fmt, Args &&... args) { + void trace(const fmt::format_string<Args...> &, Args &&...) const { } +#endif + + template <typename... Args> + void info(const fmt::format_string<Args...> &fmt, Args &&... args) const { info(fmt::format(fmt, std::forward<Args>(args)...)); } template <typename... Args> - void warn(const fmt::format_string<Args...> &fmt, Args &&... args) { + void warn(const fmt::format_string<Args...> &fmt, Args &&... args) const { warn(fmt::format(fmt, std::forward<Args>(args)...)); } template <typename... Args> - void error(const fmt::format_string<Args...> fmt, Args &&... args) { + void error(const fmt::format_string<Args...> &fmt, Args &&... args) const { error(fmt::format(fmt, std::forward<Args>(args)...)); } template <typename... Args> - void critical(const fmt::format_string<Args...> fmt, Args &&... args) { + void critical(const fmt::format_string<Args...> &fmt, Args &&... args) const { critical(fmt::format(fmt, std::forward<Args>(args)...)); } - template <typename T> - void trace(const T &msg) { - log(LOG_LEVEL_TRACE, msg); - } +private: + mutable std::unordered_map< + std::string, + std::shared_ptr<spdlog::logger>, + TransparentStringHasher, + std::equal_to<>> + profile_loggers_; - template <typename T> - void debug(const T &msg) { - log(LOG_LEVEL_DEBUG, msg); - } + std::tm get_local_time() const { + const auto now = std::chrono::system_clock::now(); + std::time_t now_time = std::chrono::system_clock::to_time_t(now); + std::tm local_tm {}; - template <typename T> - void info(const T &msg) { - log(LOG_LEVEL_INFO, msg); - } - - template <typename T> - void warn(const T &msg) { - log(LOG_LEVEL_WARNING, msg); - } - - template <typename T> - void error(const T &msg) { - log(LOG_LEVEL_ERROR, msg); - } +#if defined(_WIN32) || defined(_WIN64) + localtime_s(&local_tm, &now_time); +#else + localtime_r(&now_time, &local_tm); +#endif - template <typename T> - void critical(const T &msg) { - log(LOG_LEVEL_CRITICAL, msg); + return local_tm; } }; diff --git a/src/lib/metrics/metrics.cpp b/src/lib/metrics/metrics.cpp index f005c79c9..a6fa18063 100644 --- a/src/lib/metrics/metrics.cpp +++ b/src/lib/metrics/metrics.cpp @@ -8,7 +8,8 @@ * Website: https://docs.opentibiabr.com/ */ - #include "metrics.hpp" + #include "lib/metrics/metrics.hpp" + #include "lib/di/container.hpp" using namespace metrics; @@ -87,7 +88,7 @@ void Metrics::shutdown() { metrics_api::Provider::SetMeterProvider(none); } -ScopedLatency::ScopedLatency(const std::string_view &name, const std::string &histogramName, const std::string &scopeKey) : +ScopedLatency::ScopedLatency(std::string_view name, const std::string &histogramName, const std::string &scopeKey) : ScopedLatency(name, g_metrics().latencyHistograms[histogramName], { { scopeKey, std::string(name) } }, g_metrics().defaultContext) { if (histogram == nullptr) { stopped = true; diff --git a/src/lib/metrics/metrics.hpp b/src/lib/metrics/metrics.hpp index 1e3dbe310..428398f7c 100644 --- a/src/lib/metrics/metrics.hpp +++ b/src/lib/metrics/metrics.hpp @@ -54,8 +54,8 @@ namespace metrics { class ScopedLatency { public: - explicit ScopedLatency(const std::string_view &name, const std::string &histogramName, const std::string &scopeKey); - explicit ScopedLatency([[maybe_unused]] const std::string_view &name, Histogram<double> &histogram, std::map<std::string, std::string> attrs = {}, opentelemetry::context::Context context = opentelemetry::context::Context()) : + explicit ScopedLatency(std::string_view name, const std::string &histogramName, const std::string &scopeKey); + explicit ScopedLatency([[maybe_unused]] std::string_view name, Histogram<double> &histogram, std::map<std::string, std::string> attrs = {}, opentelemetry::context::Context context = opentelemetry::context::Context()) : begin(std::chrono::steady_clock::now()), histogram(histogram), attrs(std::move(attrs)), context(std::move(context)) { } @@ -171,7 +171,7 @@ class ScopedLatency { explicit ScopedLatency([[maybe_unused]] std::string_view name, [[maybe_unused]] const std::string &histogramName, [[maybe_unused]] const std::string &scopeKey) {}; explicit ScopedLatency([[maybe_unused]] std::string_view name, [[maybe_unused]] std::set<double> &histogram, [[maybe_unused]] const std::map<std::string, std::string> &attrs = {}, [[maybe_unused]] const std::string &context = std::string()) {}; - void stop() {}; + void stop() const {}; ~ScopedLatency() = default; }; @@ -203,17 +203,17 @@ namespace metrics { Metrics() = default; ~Metrics() = default; - void init([[maybe_unused]] Options opts) {}; - void initHistograms() {}; - void shutdown() {}; + void init([[maybe_unused]] Options opts) const {}; + void initHistograms() const {}; + void shutdown() const {}; static Metrics &getInstance() { return inject<Metrics>(); }; - void addCounter([[maybe_unused]] std::string_view name, [[maybe_unused]] double value, [[maybe_unused]] const std::map<std::string, std::string> &attrs = {}) { } + void addCounter([[maybe_unused]] std::string_view name, [[maybe_unused]] double value, [[maybe_unused]] const std::map<std::string, std::string> &attrs = {}) const { } - void addUpDownCounter([[maybe_unused]] std::string_view name, [[maybe_unused]] int value, [[maybe_unused]] const std::map<std::string, std::string> &attrs = {}) { } + void addUpDownCounter([[maybe_unused]] std::string_view name, [[maybe_unused]] int value, [[maybe_unused]] const std::map<std::string, std::string> &attrs = {}) const { } friend class ScopedLatency; }; diff --git a/src/lib/thread/thread_pool.cpp b/src/lib/thread/thread_pool.cpp index b2f51ef8f..0d6b6f5be 100644 --- a/src/lib/thread/thread_pool.cpp +++ b/src/lib/thread/thread_pool.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lib/thread/thread_pool.hpp" #include "game/game.hpp" @@ -30,12 +28,22 @@ ThreadPool::ThreadPool(Logger &logger) : start(); } -void ThreadPool::start() { +void ThreadPool::start() const { logger.info("Running with {} threads.", get_thread_count()); } void ThreadPool::shutdown() { + if (stopped) { + return; + } + logger.info("Shutting down thread pool..."); - stopped = true; + { + std::unique_lock<std::mutex> lock(mutex); + stopped = true; + condition.notify_all(); + } + wait(); + logger.info("Thread pool shutdown complete."); } diff --git a/src/lib/thread/thread_pool.hpp b/src/lib/thread/thread_pool.hpp index ea24d3486..ecdaaab40 100644 --- a/src/lib/thread/thread_pool.hpp +++ b/src/lib/thread/thread_pool.hpp @@ -6,9 +6,9 @@ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors * Website: https://docs.opentibiabr.com/ */ + #pragma once -#include "lib/logging/logger.hpp" #include "BS_thread_pool.hpp" class ThreadPool : public BS::thread_pool { @@ -17,9 +17,9 @@ class ThreadPool : public BS::thread_pool { // Ensures that we don't accidentally copy it ThreadPool(const ThreadPool &) = delete; - ThreadPool operator=(const ThreadPool &) = delete; + ThreadPool &operator=(const ThreadPool &) = delete; - void start(); + void start() const; void shutdown(); static int16_t getThreadId() { @@ -32,13 +32,16 @@ class ThreadPool : public BS::thread_pool { } return id; - }; + } bool isStopped() const { return stopped; } private: + std::mutex mutex; + std::condition_variable condition; + Logger &logger; bool stopped = false; }; diff --git a/src/lua/callbacks/callbacks_definitions.hpp b/src/lua/callbacks/callbacks_definitions.hpp index 3b8016f5f..6c19cc809 100644 --- a/src/lua/callbacks/callbacks_definitions.hpp +++ b/src/lua/callbacks/callbacks_definitions.hpp @@ -25,6 +25,7 @@ enum class EventCallback_t : uint16_t { creatureOnTargetCombat, creatureOnHear, creatureOnDrainHealth, + creatureOnCombat, // Party partyOnJoin, partyOnLeave, @@ -57,6 +58,7 @@ enum class EventCallback_t : uint16_t { playerOnInventoryUpdate, playerOnRotateItem, playerOnWalk, + playerOnThink, // Monster monsterOnDropLoot, monsterPostDropLoot, @@ -68,4 +70,5 @@ enum class EventCallback_t : uint16_t { zoneBeforeCreatureLeave, zoneAfterCreatureEnter, zoneAfterCreatureLeave, + mapOnLoad, }; diff --git a/src/lua/callbacks/creaturecallback.cpp b/src/lua/callbacks/creaturecallback.cpp index 11e33a9b1..6f279f46d 100644 --- a/src/lua/callbacks/creaturecallback.cpp +++ b/src/lua/callbacks/creaturecallback.cpp @@ -9,13 +9,16 @@ #include "lua/callbacks/creaturecallback.hpp" +#include "creatures/creature.hpp" +#include "lua/scripts/luascript.hpp" + bool CreatureCallback::startScriptInterface(int32_t scriptId) { if (scriptId == -1) { return false; } - if (!scriptInterface->reserveScriptEnv()) { - auto targetCreature = m_targetCreature.lock(); + if (!LuaScriptInterface::reserveScriptEnv()) { + const auto targetCreature = m_targetCreature.lock(); g_logger().error( "[CreatureCallback::startScriptInterface] - {} {} Call stack overflow. Too many lua script calls being nested.", getCreatureClass(targetCreature), @@ -24,8 +27,7 @@ bool CreatureCallback::startScriptInterface(int32_t scriptId) { return false; } - scriptInterface - ->getScriptEnv() + LuaScriptInterface::getScriptEnv() ->setScriptId(scriptId, scriptInterface); L = scriptInterface->getLuaState(); @@ -35,12 +37,12 @@ bool CreatureCallback::startScriptInterface(int32_t scriptId) { return true; } -void CreatureCallback::pushSpecificCreature(std::shared_ptr<Creature> creature) { - if (std::shared_ptr<Npc> npc = creature->getNpc()) { +void CreatureCallback::pushSpecificCreature(const std::shared_ptr<Creature> &creature) { + if (const auto &npc = creature->getNpc()) { LuaScriptInterface::pushUserdata<Npc>(L, npc); - } else if (std::shared_ptr<Monster> monster = creature->getMonster()) { + } else if (const auto &monster = creature->getMonster()) { LuaScriptInterface::pushUserdata<Monster>(L, monster); - } else if (std::shared_ptr<Player> player = creature->getPlayer()) { + } else if (const auto &player = creature->getPlayer()) { LuaScriptInterface::pushUserdata<Player>(L, player); } else { return; @@ -50,7 +52,37 @@ void CreatureCallback::pushSpecificCreature(std::shared_ptr<Creature> creature) LuaScriptInterface::setMetatable(L, -1, getCreatureClass(creature)); } -std::string CreatureCallback::getCreatureClass(std::shared_ptr<Creature> creature) { +bool CreatureCallback::persistLuaState() const { + return params > 0 && scriptInterface->callFunction(params); +} + +void CreatureCallback::pushCreature(const std::shared_ptr<Creature> &creature) { + params++; + LuaScriptInterface::pushUserdata<Creature>(L, creature); + LuaScriptInterface::setCreatureMetatable(L, -1, creature); +} + +void CreatureCallback::pushPosition(const Position &position, int32_t stackpos) { + params++; + LuaScriptInterface::pushPosition(L, position, stackpos); +} + +void CreatureCallback::pushNumber(int32_t number) { + params++; + lua_pushnumber(L, number); +} + +void CreatureCallback::pushString(const std::string &str) { + params++; + LuaScriptInterface::pushString(L, str); +} + +void CreatureCallback::pushBoolean(const bool str) { + params++; + LuaScriptInterface::pushBoolean(L, str); +} + +std::string CreatureCallback::getCreatureClass(const std::shared_ptr<Creature> &creature) { if (!creature) { return ""; } diff --git a/src/lua/callbacks/creaturecallback.hpp b/src/lua/callbacks/creaturecallback.hpp index f76657204..6922b43a8 100644 --- a/src/lua/callbacks/creaturecallback.hpp +++ b/src/lua/callbacks/creaturecallback.hpp @@ -9,52 +9,35 @@ #pragma once -#include "creatures/creature.hpp" - class Creature; +class LuaScriptInterface; + +struct Position; class CreatureCallback { public: - CreatureCallback(LuaScriptInterface* scriptInterface, std::shared_ptr<Creature> targetCreature) : + CreatureCallback(LuaScriptInterface* scriptInterface, const std::shared_ptr<Creature> &targetCreature) : scriptInterface(scriptInterface), m_targetCreature(targetCreature) {}; - ~CreatureCallback() { } + ~CreatureCallback() = default; bool startScriptInterface(int32_t scriptId); - void pushSpecificCreature(std::shared_ptr<Creature> creature); + void pushSpecificCreature(const std::shared_ptr<Creature> &creature); - bool persistLuaState() { - return params > 0 && scriptInterface->callFunction(params); - } + bool persistLuaState() const; - void pushCreature(std::shared_ptr<Creature> creature) { - params++; - LuaScriptInterface::pushUserdata<Creature>(L, creature); - LuaScriptInterface::setCreatureMetatable(L, -1, creature); - } + void pushCreature(const std::shared_ptr<Creature> &creature); - void pushPosition(const Position &position, int32_t stackpos = 0) { - params++; - LuaScriptInterface::pushPosition(L, position, stackpos); - } + void pushPosition(const Position &position, int32_t stackpos = 0); - void pushNumber(int32_t number) { - params++; - lua_pushnumber(L, number); - } + void pushNumber(int32_t number); - void pushString(const std::string &str) { - params++; - LuaScriptInterface::pushString(L, str); - } + void pushString(const std::string &str); - void pushBoolean(const bool str) { - params++; - LuaScriptInterface::pushBoolean(L, str); - } + void pushBoolean(const bool str); protected: - static std::string getCreatureClass(std::shared_ptr<Creature> creature); + static std::string getCreatureClass(const std::shared_ptr<Creature> &creature); private: LuaScriptInterface* scriptInterface; diff --git a/src/lua/callbacks/event_callback.cpp b/src/lua/callbacks/event_callback.cpp index 38e7654d8..3d95543f1 100644 --- a/src/lua/callbacks/event_callback.cpp +++ b/src/lua/callbacks/event_callback.cpp @@ -7,14 +7,13 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/callbacks/event_callback.hpp" -#include "utils/tools.hpp" -#include "items/item.hpp" +#include "creatures/players/grouping/party.hpp" #include "creatures/players/player.hpp" #include "game/zones/zone.hpp" +#include "items/containers/container.hpp" +#include "items/item.hpp" /** * @class EventCallback @@ -25,8 +24,16 @@ * * @see Script */ -EventCallback::EventCallback(LuaScriptInterface* scriptInterface) : - Script(scriptInterface) { +EventCallback::EventCallback(LuaScriptInterface* scriptInterface, const std::string &callbackName, bool skipDuplicationCheck) : + Script(scriptInterface), m_callbackName(callbackName), m_skipDuplicationCheck(skipDuplicationCheck) { +} + +std::string EventCallback::getName() const { + return m_callbackName; +} + +bool EventCallback::skipDuplicationCheck() const { + return m_skipDuplicationCheck; } std::string EventCallback::getScriptTypeName() const { @@ -47,15 +54,15 @@ void EventCallback::setType(EventCallback_t type) { // Lua functions // Creature -bool EventCallback::creatureOnChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::creatureOnChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnChangeOutfit - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -69,8 +76,8 @@ bool EventCallback::creatureOnChangeOutfit(std::shared_ptr<Creature> creature, c return getScriptInterface()->callFunction(2); } -ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Tile> tile, bool aggressive) const { - if (!getScriptInterface()->reserveScriptEnv()) { +ReturnValue EventCallback::creatureOnAreaCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile, bool aggressive) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnAreaCombat - " "Creature {} on tile position {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -78,7 +85,7 @@ ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr<Creature> creatu return RETURNVALUE_NOTPOSSIBLE; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -97,7 +104,7 @@ ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr<Creature> creatu LuaScriptInterface::pushBoolean(L, aggressive); ReturnValue returnValue; - if (getScriptInterface()->protectedCall(L, 3, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 3, 1) != 0) { returnValue = RETURNVALUE_NOTPOSSIBLE; LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { @@ -105,12 +112,12 @@ ReturnValue EventCallback::creatureOnAreaCombat(std::shared_ptr<Creature> creatu lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return returnValue; } -ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target) const { - if (!getScriptInterface()->reserveScriptEnv()) { +ReturnValue EventCallback::creatureOnTargetCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnTargetCombat - " "Creature {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -118,7 +125,7 @@ ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr<Creature> crea return RETURNVALUE_NOTPOSSIBLE; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -135,7 +142,7 @@ ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr<Creature> crea LuaScriptInterface::setCreatureMetatable(L, -1, target); ReturnValue returnValue; - if (getScriptInterface()->protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { returnValue = RETURNVALUE_NOTPOSSIBLE; LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { @@ -143,12 +150,12 @@ ReturnValue EventCallback::creatureOnTargetCombat(std::shared_ptr<Creature> crea lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return returnValue; } -void EventCallback::creatureOnHear(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> speaker, const std::string &words, SpeakClasses type) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::creatureOnHear(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &speaker, const std::string &words, SpeakClasses type) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnHear - " "Creature {} speaker {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -156,7 +163,7 @@ void EventCallback::creatureOnHear(std::shared_ptr<Creature> creature, std::shar return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -174,8 +181,8 @@ void EventCallback::creatureOnHear(std::shared_ptr<Creature> creature, std::shar getScriptInterface()->callVoidFunction(4); } -void EventCallback::creatureOnDrainHealth(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::creatureOnDrainHealth(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::creatureOnDrainHealth - " "Creature {} attacker {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -183,7 +190,7 @@ void EventCallback::creatureOnDrainHealth(std::shared_ptr<Creature> creature, st return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -210,7 +217,7 @@ void EventCallback::creatureOnDrainHealth(std::shared_ptr<Creature> creature, st lua_pushnumber(L, colorPrimary); lua_pushnumber(L, colorSecondary); - if (getScriptInterface()->protectedCall(L, 8, 6) != 0) { + if (LuaScriptInterface::protectedCall(L, 8, 6) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { typePrimary = LuaScriptInterface::getNumber<CombatType_t>(L, -6); @@ -222,12 +229,64 @@ void EventCallback::creatureOnDrainHealth(std::shared_ptr<Creature> creature, st lua_pop(L, 6); } + LuaScriptInterface::resetScriptEnv(); +} + +void EventCallback::creatureOnCombat(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage) const { + if (!getScriptInterface()->reserveScriptEnv()) { + g_logger().error("[{} - " + "Creature {} target {}] " + "Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__, attacker->getName(), target->getName()); + return; + } + + ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); + + lua_State* L = getScriptInterface()->getLuaState(); + getScriptInterface()->pushFunction(getScriptId()); + + LuaScriptInterface::pushUserdata<Creature>(L, attacker); + LuaScriptInterface::setCreatureMetatable(L, -1, attacker); + + LuaScriptInterface::pushUserdata<Creature>(L, target); + LuaScriptInterface::setCreatureMetatable(L, -1, target); + + LuaScriptInterface::pushCombatDamage(L, damage); + + if (getScriptInterface()->protectedCall(L, 7, 4) != 0) { + LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); + } else { + damage.primary.value = std::abs(LuaScriptInterface::getNumber<int32_t>(L, -4)); + damage.primary.type = LuaScriptInterface::getNumber<CombatType_t>(L, -3); + damage.secondary.value = std::abs(LuaScriptInterface::getNumber<int32_t>(L, -2)); + damage.secondary.type = LuaScriptInterface::getNumber<CombatType_t>(L, -1); + + lua_pop(L, 4); + if (damage.primary.type != COMBAT_HEALING) { + damage.primary.value = -damage.primary.value; + damage.secondary.value = -damage.secondary.value; + } + /* + Only EK with dealing physical damage will get elemental damage on skill + */ + if (damage.origin == ORIGIN_SPELL && attacker) { + const auto &player = attacker->getPlayer(); + if (player && player->getVocationId() != 4 && player->getVocationId() != 8) { + damage.primary.value = damage.primary.value + damage.secondary.value; + damage.secondary.type = COMBAT_NONE; + damage.secondary.value = 0; + } + } + } + getScriptInterface()->resetScriptEnv(); } // Party -bool EventCallback::partyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Player> player) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::partyOnJoin(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnJoin - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -235,7 +294,7 @@ bool EventCallback::partyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Pl return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -250,8 +309,8 @@ bool EventCallback::partyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Pl return getScriptInterface()->callFunction(2); } -bool EventCallback::partyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Player> player) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::partyOnLeave(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnLeave - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -259,7 +318,7 @@ bool EventCallback::partyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<P return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -274,15 +333,15 @@ bool EventCallback::partyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<P return getScriptInterface()->callFunction(2); } -bool EventCallback::partyOnDisband(std::shared_ptr<Party> party) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::partyOnDisband(const std::shared_ptr<Party> &party) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::partyOnDisband - Party leader {}] Call stack " "overflow. Too many lua script calls being nested.", party->getLeader() ? party->getLeader()->getName() : "unknown"); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -294,13 +353,13 @@ bool EventCallback::partyOnDisband(std::shared_ptr<Party> party) const { return getScriptInterface()->callFunction(1); } -void EventCallback::partyOnShareExperience(std::shared_ptr<Party> party, uint64_t &exp) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::partyOnShareExperience(const std::shared_ptr<Party> &party, uint64_t &exp) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("Party leader {}. Call stack overflow. Too many lua script calls being nested.", party->getLeader() ? party->getLeader()->getName() : "unknown"); return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -311,19 +370,19 @@ void EventCallback::partyOnShareExperience(std::shared_ptr<Party> party, uint64_ lua_pushnumber(L, exp); - if (getScriptInterface()->protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } // Player -bool EventCallback::playerOnBrowseField(std::shared_ptr<Player> player, const Position &position) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnBrowseField(const std::shared_ptr<Player> &player, const Position &position) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnBrowseField - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -331,7 +390,7 @@ bool EventCallback::playerOnBrowseField(std::shared_ptr<Player> player, const Po return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -345,8 +404,8 @@ bool EventCallback::playerOnBrowseField(std::shared_ptr<Player> player, const Po return getScriptInterface()->callFunction(2); } -void EventCallback::playerOnLook(std::shared_ptr<Player> player, const Position &position, std::shared_ptr<Thing> thing, uint8_t stackpos, int32_t lookDistance) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnLook(const std::shared_ptr<Player> &player, const Position &position, const std::shared_ptr<Thing> &thing, uint8_t stackpos, int32_t lookDistance) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLook - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -354,7 +413,7 @@ void EventCallback::playerOnLook(std::shared_ptr<Player> player, const Position return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -363,10 +422,10 @@ void EventCallback::playerOnLook(std::shared_ptr<Player> player, const Position LuaScriptInterface::pushUserdata<Player>(L, player); LuaScriptInterface::setMetatable(L, -1, "Player"); - if (std::shared_ptr<Creature> creature = thing->getCreature()) { + if (const auto &creature = thing->getCreature()) { LuaScriptInterface::pushUserdata<Creature>(L, creature); LuaScriptInterface::setCreatureMetatable(L, -1, creature); - } else if (std::shared_ptr<Item> item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { LuaScriptInterface::pushUserdata<Item>(L, item); LuaScriptInterface::setItemMetatable(L, -1, item); } else { @@ -379,8 +438,8 @@ void EventCallback::playerOnLook(std::shared_ptr<Player> player, const Position getScriptInterface()->callVoidFunction(4); } -void EventCallback::playerOnLookInBattleList(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, int32_t lookDistance) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnLookInBattleList(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, int32_t lookDistance) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInBattleList - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -388,7 +447,7 @@ void EventCallback::playerOnLookInBattleList(std::shared_ptr<Player> player, std return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -405,8 +464,8 @@ void EventCallback::playerOnLookInBattleList(std::shared_ptr<Player> player, std getScriptInterface()->callVoidFunction(3); } -void EventCallback::playerOnLookInTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> partner, std::shared_ptr<Item> item, int32_t lookDistance) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnLookInTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &partner, const std::shared_ptr<Item> &item, int32_t lookDistance) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInTrade - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -414,7 +473,7 @@ void EventCallback::playerOnLookInTrade(std::shared_ptr<Player> player, std::sha return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -434,8 +493,8 @@ void EventCallback::playerOnLookInTrade(std::shared_ptr<Player> player, std::sha getScriptInterface()->callVoidFunction(4); } -bool EventCallback::playerOnLookInShop(std::shared_ptr<Player> player, const ItemType* itemType, uint8_t count) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnLookInShop(const std::shared_ptr<Player> &player, const ItemType* itemType, uint8_t count) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLookInShop - " "Player {} itemType {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -443,7 +502,7 @@ bool EventCallback::playerOnLookInShop(std::shared_ptr<Player> player, const Ite return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -460,8 +519,8 @@ bool EventCallback::playerOnLookInShop(std::shared_ptr<Player> player, const Ite return getScriptInterface()->callFunction(3); } -void EventCallback::playerOnRemoveCount(std::shared_ptr<Player> player, std::shared_ptr<Item> item) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnRemoveCount(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnMove - " "Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -469,7 +528,7 @@ void EventCallback::playerOnRemoveCount(std::shared_ptr<Player> player, std::sha return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -484,20 +543,20 @@ void EventCallback::playerOnRemoveCount(std::shared_ptr<Player> player, std::sha getScriptInterface()->callFunction(2); } -bool EventCallback::playerOnMoveItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPos, const Position &toPos, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) const { +bool EventCallback::playerOnMoveItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPos, const Position &toPos, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) const { if (!getScriptInterface()) { g_logger().error("script interface nullptr"); return false; } - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Action::executeUse - Player {}, on item {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), item->getName()); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -519,8 +578,8 @@ bool EventCallback::playerOnMoveItem(std::shared_ptr<Player> player, std::shared return getScriptInterface()->callFunction(7); } -void EventCallback::playerOnItemMoved(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnItemMoved(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnItemMoved - " "Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -528,7 +587,7 @@ void EventCallback::playerOnItemMoved(std::shared_ptr<Player> player, std::share return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -550,8 +609,8 @@ void EventCallback::playerOnItemMoved(std::shared_ptr<Player> player, std::share getScriptInterface()->callVoidFunction(7); } -void EventCallback::playerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t zone) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnChangeZone(const std::shared_ptr<Player> &player, ZoneType_t zone) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnChangeZone - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -559,7 +618,7 @@ void EventCallback::playerOnChangeZone(std::shared_ptr<Player> player, ZoneType_ return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -572,8 +631,8 @@ void EventCallback::playerOnChangeZone(std::shared_ptr<Player> player, ZoneType_ getScriptInterface()->callVoidFunction(2); } -bool EventCallback::playerOnMoveCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, const Position &fromPosition, const Position &toPosition) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnMoveCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, const Position &fromPosition, const Position &toPosition) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnMoveCreature - " "Player {} creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -581,7 +640,7 @@ bool EventCallback::playerOnMoveCreature(std::shared_ptr<Player> player, std::sh return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -599,8 +658,8 @@ bool EventCallback::playerOnMoveCreature(std::shared_ptr<Player> player, std::sh return getScriptInterface()->callFunction(4); } -void EventCallback::playerOnReportRuleViolation(std::shared_ptr<Player> player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnReportRuleViolation(const std::shared_ptr<Player> &player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnReportRuleViolation - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -608,7 +667,7 @@ void EventCallback::playerOnReportRuleViolation(std::shared_ptr<Player> player, return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -628,8 +687,8 @@ void EventCallback::playerOnReportRuleViolation(std::shared_ptr<Player> player, getScriptInterface()->callVoidFunction(6); } -void EventCallback::playerOnReportBug(std::shared_ptr<Player> player, const std::string &message, const Position &position, uint8_t category) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnReportBug(const std::shared_ptr<Player> &player, const std::string &message, const Position &position, uint8_t category) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnReportBug - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -637,7 +696,7 @@ void EventCallback::playerOnReportBug(std::shared_ptr<Player> player, const std: return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -653,8 +712,8 @@ void EventCallback::playerOnReportBug(std::shared_ptr<Player> player, const std: getScriptInterface()->callFunction(4); } -bool EventCallback::playerOnTurn(std::shared_ptr<Player> player, Direction direction) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnTurn(const std::shared_ptr<Player> &player, Direction direction) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTurn - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -662,7 +721,7 @@ bool EventCallback::playerOnTurn(std::shared_ptr<Player> player, Direction direc return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -676,8 +735,8 @@ bool EventCallback::playerOnTurn(std::shared_ptr<Player> player, Direction direc return getScriptInterface()->callFunction(2); } -bool EventCallback::playerOnTradeRequest(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnTradeRequest(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTradeRequest - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -685,7 +744,7 @@ bool EventCallback::playerOnTradeRequest(std::shared_ptr<Player> player, std::sh return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -703,8 +762,8 @@ bool EventCallback::playerOnTradeRequest(std::shared_ptr<Player> player, std::sh return getScriptInterface()->callFunction(3); } -bool EventCallback::playerOnTradeAccept(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item, std::shared_ptr<Item> targetItem) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnTradeAccept(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &targetItem) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnTradeAccept - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -712,7 +771,7 @@ bool EventCallback::playerOnTradeAccept(std::shared_ptr<Player> player, std::sha return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -733,8 +792,8 @@ bool EventCallback::playerOnTradeAccept(std::shared_ptr<Player> player, std::sha return getScriptInterface()->callFunction(4); } -void EventCallback::playerOnGainExperience(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint64_t &exp, uint64_t rawExp) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnGainExperience(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint64_t &exp, uint64_t rawExp) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnGainExperience - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -742,7 +801,7 @@ void EventCallback::playerOnGainExperience(std::shared_ptr<Player> player, std:: return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -761,18 +820,18 @@ void EventCallback::playerOnGainExperience(std::shared_ptr<Player> player, std:: lua_pushnumber(L, exp); lua_pushnumber(L, rawExp); - if (getScriptInterface()->protectedCall(L, 4, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 4, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void EventCallback::playerOnLoseExperience(std::shared_ptr<Player> player, uint64_t &exp) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnLoseExperience(const std::shared_ptr<Player> &player, uint64_t &exp) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnLoseExperience - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -780,7 +839,7 @@ void EventCallback::playerOnLoseExperience(std::shared_ptr<Player> player, uint6 return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -791,18 +850,18 @@ void EventCallback::playerOnLoseExperience(std::shared_ptr<Player> player, uint6 lua_pushnumber(L, exp); - if (getScriptInterface()->protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void EventCallback::playerOnGainSkillTries(std::shared_ptr<Player> player, skills_t skill, uint64_t &tries) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnGainSkillTries(const std::shared_ptr<Player> &player, skills_t skill, uint64_t &tries) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnGainSkillTries - " "Player {} skill {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -810,7 +869,7 @@ void EventCallback::playerOnGainSkillTries(std::shared_ptr<Player> player, skill return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -822,18 +881,18 @@ void EventCallback::playerOnGainSkillTries(std::shared_ptr<Player> player, skill lua_pushnumber(L, skill); lua_pushnumber(L, tries); - if (getScriptInterface()->protectedCall(L, 3, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 3, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { tries = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void EventCallback::playerOnCombat(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, CombatDamage &damage) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnCombat(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, CombatDamage &damage) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnCombat - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -841,7 +900,7 @@ void EventCallback::playerOnCombat(std::shared_ptr<Player> player, std::shared_p return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -852,7 +911,7 @@ void EventCallback::playerOnCombat(std::shared_ptr<Player> player, std::shared_p if (target) { LuaScriptInterface::pushUserdata<Creature>(L, target); - LuaScriptInterface::setMetatable(L, -1, "Creature"); + LuaScriptInterface::setCreatureMetatable(L, -1, target); } else { lua_pushnil(L); } @@ -866,7 +925,7 @@ void EventCallback::playerOnCombat(std::shared_ptr<Player> player, std::shared_p LuaScriptInterface::pushCombatDamage(L, damage); - if (getScriptInterface()->protectedCall(L, 8, 4) != 0) { + if (LuaScriptInterface::protectedCall(L, 8, 4) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { damage.primary.value = std::abs(LuaScriptInterface::getNumber<int32_t>(L, -4)); @@ -891,11 +950,11 @@ void EventCallback::playerOnCombat(std::shared_ptr<Player> player, std::shared_p } } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void EventCallback::playerOnRequestQuestLog(std::shared_ptr<Player> player) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnRequestQuestLog(const std::shared_ptr<Player> &player) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnRequestQuestLog - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -903,7 +962,7 @@ void EventCallback::playerOnRequestQuestLog(std::shared_ptr<Player> player) cons return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -915,8 +974,8 @@ void EventCallback::playerOnRequestQuestLog(std::shared_ptr<Player> player) cons getScriptInterface()->callVoidFunction(1); } -void EventCallback::playerOnRequestQuestLine(std::shared_ptr<Player> player, uint16_t questId) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnRequestQuestLine(const std::shared_ptr<Player> &player, uint16_t questId) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::playerOnRequestQuestLine - " "Player {} questId {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -924,7 +983,7 @@ void EventCallback::playerOnRequestQuestLine(std::shared_ptr<Player> player, uin return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -938,13 +997,13 @@ void EventCallback::playerOnRequestQuestLine(std::shared_ptr<Player> player, uin getScriptInterface()->callVoidFunction(2); } -void EventCallback::playerOnInventoryUpdate(std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool equip) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnInventoryUpdate(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool equip) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[{}] Call stack overflow", __FUNCTION__); return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -962,13 +1021,13 @@ void EventCallback::playerOnInventoryUpdate(std::shared_ptr<Player> player, std: getScriptInterface()->callVoidFunction(4); } -bool EventCallback::playerOnRotateItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const Position &position) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::playerOnRotateItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const Position &position) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[{}] Call stack overflow", __FUNCTION__); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -985,8 +1044,8 @@ bool EventCallback::playerOnRotateItem(std::shared_ptr<Player> player, std::shar return getScriptInterface()->callFunction(3); } -void EventCallback::playerOnWalk(std::shared_ptr<Player> player, Direction &dir) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnWalk(const std::shared_ptr<Player> &player, const Direction &dir) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::eventOnWalk - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -994,7 +1053,7 @@ void EventCallback::playerOnWalk(std::shared_ptr<Player> player, Direction &dir) return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1008,8 +1067,8 @@ void EventCallback::playerOnWalk(std::shared_ptr<Player> player, Direction &dir) getScriptInterface()->callVoidFunction(2); } -void EventCallback::playerOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::playerOnStorageUpdate(const std::shared_ptr<Player> &player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::eventOnStorageUpdate - " "Player {} key {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1017,7 +1076,7 @@ void EventCallback::playerOnStorageUpdate(std::shared_ptr<Player> player, const return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1034,9 +1093,29 @@ void EventCallback::playerOnStorageUpdate(std::shared_ptr<Player> player, const getScriptInterface()->callVoidFunction(5); } -// Monster -void EventCallback::monsterOnDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse) const { +void EventCallback::playerOnThink(std::shared_ptr<Player> player, uint32_t interval) const { if (!getScriptInterface()->reserveScriptEnv()) { + g_logger().error("[{}] player {}. Call stack overflow. Too many lua script calls being nested.", __FUNCTION__, player->getName()); + return; + } + + ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); + + lua_State* L = getScriptInterface()->getLuaState(); + getScriptInterface()->pushFunction(getScriptId()); + + LuaScriptInterface::pushUserdata<Player>(L, player); + LuaScriptInterface::setMetatable(L, -1, "Player"); + + lua_pushnumber(L, interval); + + getScriptInterface()->callVoidFunction(2); +} + +// Monster +void EventCallback::monsterOnDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::monsterOnDropLoot - " "Monster corpse {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1044,7 +1123,7 @@ void EventCallback::monsterOnDropLoot(std::shared_ptr<Monster> monster, std::sha return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1059,8 +1138,8 @@ void EventCallback::monsterOnDropLoot(std::shared_ptr<Monster> monster, std::sha return getScriptInterface()->callVoidFunction(2); } -void EventCallback::monsterPostDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::monsterPostDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::monsterPostDropLoot - " "Monster corpse {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1068,7 +1147,7 @@ void EventCallback::monsterPostDropLoot(std::shared_ptr<Monster> monster, std::s return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1083,8 +1162,8 @@ void EventCallback::monsterPostDropLoot(std::shared_ptr<Monster> monster, std::s return getScriptInterface()->callVoidFunction(2); } -void EventCallback::monsterOnSpawn(std::shared_ptr<Monster> monster, const Position &position) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::monsterOnSpawn(const std::shared_ptr<Monster> &monster, const Position &position) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("{} - " "Position {}" ". Call stack overflow. Too many lua script calls being nested.", @@ -1092,7 +1171,7 @@ void EventCallback::monsterOnSpawn(std::shared_ptr<Monster> monster, const Posit return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1102,18 +1181,18 @@ void EventCallback::monsterOnSpawn(std::shared_ptr<Monster> monster, const Posit LuaScriptInterface::setMetatable(L, -1, "Monster"); LuaScriptInterface::pushPosition(L, position); - if (getScriptInterface()->protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } // Npc -void EventCallback::npcOnSpawn(std::shared_ptr<Npc> npc, const Position &position) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::npcOnSpawn(const std::shared_ptr<Npc> &npc, const Position &position) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("{} - " "Position {}" ". Call stack overflow. Too many lua script calls being nested.", @@ -1121,7 +1200,7 @@ void EventCallback::npcOnSpawn(std::shared_ptr<Npc> npc, const Position &positio return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1131,17 +1210,17 @@ void EventCallback::npcOnSpawn(std::shared_ptr<Npc> npc, const Position &positio LuaScriptInterface::setMetatable(L, -1, "Npc"); LuaScriptInterface::pushPosition(L, position); - if (getScriptInterface()->protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { lua_pop(L, 1); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -bool EventCallback::zoneBeforeCreatureEnter(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::zoneBeforeCreatureEnter(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::zoneBeforeCreatureEnter - " "Zone {} Creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1149,7 +1228,7 @@ bool EventCallback::zoneBeforeCreatureEnter(std::shared_ptr<Zone> zone, std::sha return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1164,8 +1243,8 @@ bool EventCallback::zoneBeforeCreatureEnter(std::shared_ptr<Zone> zone, std::sha return getScriptInterface()->callFunction(2); } -bool EventCallback::zoneBeforeCreatureLeave(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const { - if (!getScriptInterface()->reserveScriptEnv()) { +bool EventCallback::zoneBeforeCreatureLeave(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::zoneBeforeCreatureLeave - " "Zone {} Creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1173,7 +1252,7 @@ bool EventCallback::zoneBeforeCreatureLeave(std::shared_ptr<Zone> zone, std::sha return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1188,8 +1267,8 @@ bool EventCallback::zoneBeforeCreatureLeave(std::shared_ptr<Zone> zone, std::sha return getScriptInterface()->callFunction(2); } -void EventCallback::zoneAfterCreatureEnter(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::zoneAfterCreatureEnter(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::zoneAfterCreatureEnter - " "Zone {} Creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1197,7 +1276,7 @@ void EventCallback::zoneAfterCreatureEnter(std::shared_ptr<Zone> zone, std::shar return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1212,8 +1291,8 @@ void EventCallback::zoneAfterCreatureEnter(std::shared_ptr<Zone> zone, std::shar getScriptInterface()->callVoidFunction(2); } -void EventCallback::zoneAfterCreatureLeave(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const { - if (!getScriptInterface()->reserveScriptEnv()) { +void EventCallback::zoneAfterCreatureLeave(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[EventCallback::zoneAfterCreatureLeave - " "Zone {} Creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1221,7 +1300,7 @@ void EventCallback::zoneAfterCreatureLeave(std::shared_ptr<Zone> zone, std::shar return; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -1235,3 +1314,22 @@ void EventCallback::zoneAfterCreatureLeave(std::shared_ptr<Zone> zone, std::shar getScriptInterface()->callVoidFunction(2); } + +void EventCallback::mapOnLoad(const std::string &mapFullPath) const { + if (!getScriptInterface()->reserveScriptEnv()) { + g_logger().error("[{} - " + "Call stack overflow. Too many lua script calls being nested.", + __FUNCTION__); + return; + } + + ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); + + lua_State* L = getScriptInterface()->getLuaState(); + getScriptInterface()->pushFunction(getScriptId()); + + LuaScriptInterface::pushString(L, mapFullPath); + + getScriptInterface()->callVoidFunction(1); +} diff --git a/src/lua/callbacks/event_callback.hpp b/src/lua/callbacks/event_callback.hpp index 9141235a0..fb0eb760a 100644 --- a/src/lua/callbacks/event_callback.hpp +++ b/src/lua/callbacks/event_callback.hpp @@ -31,17 +31,31 @@ class Zone; * registration, and execution of custom behavior tied to specific game events. * @note It inherits from the Script class, providing scripting capabilities. */ -class EventCallback : public Script { +class EventCallback final : public Script { private: EventCallback_t m_callbackType = EventCallback_t::none; ///< The type of the event callback. std::string m_scriptTypeName; ///< The name associated with the script type. + std::string m_callbackName; ///< The name of the callback. + bool m_skipDuplicationCheck = false; ///< Whether the callback is silent error for already registered log error. public: /** * @brief Constructor that initializes the EventCallback with a given script interface. * @param scriptInterface Pointer to the LuaScriptInterface object. */ - explicit EventCallback(LuaScriptInterface* scriptInterface); + explicit EventCallback(LuaScriptInterface* scriptInterface, const std::string &callbackName, bool silentAlreadyRegistered); + + /** + * @brief Retrieves the callback name. + * @return The callback name as a string. + */ + std::string getName() const; + + /** + * @brief Retrieves the skip registration status of the callback. + * @return True if the callback is true for skip duplication check and register again the event, false otherwise. + */ + bool skipDuplicationCheck() const; /** * @brief Retrieves the script type name. @@ -53,7 +67,7 @@ class EventCallback : public Script { * @brief Sets a new script type name. * @param newName The new name to set for the script type. */ - void setScriptTypeName(const std::string_view newName); + void setScriptTypeName(std::string_view newName); /** * @brief Retrieves the type of the event callback. @@ -79,60 +93,60 @@ class EventCallback : public Script { */ // Creature - bool creatureOnChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) const; - ReturnValue creatureOnAreaCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Tile> tile, bool aggressive) const; - ReturnValue creatureOnTargetCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target) const; - void creatureOnHear(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> speaker, const std::string &words, SpeakClasses type) const; - void creatureOnDrainHealth(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) const; + bool creatureOnChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) const; + ReturnValue creatureOnAreaCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile, bool aggressive) const; + ReturnValue creatureOnTargetCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target) const; + void creatureOnHear(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &speaker, const std::string &words, SpeakClasses type) const; + void creatureOnDrainHealth(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) const; + void creatureOnCombat(std::shared_ptr<Creature> attacker, std::shared_ptr<Creature> target, CombatDamage &damage) const; // Party - bool partyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Player> player) const; - bool partyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Player> player) const; - bool partyOnDisband(std::shared_ptr<Party> party) const; - void partyOnShareExperience(std::shared_ptr<Party> party, uint64_t &exp) const; + bool partyOnJoin(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) const; + bool partyOnLeave(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) const; + bool partyOnDisband(const std::shared_ptr<Party> &party) const; + void partyOnShareExperience(const std::shared_ptr<Party> &party, uint64_t &exp) const; // Player - bool playerOnBrowseField(std::shared_ptr<Player> player, const Position &position) const; - void playerOnLook(std::shared_ptr<Player> player, const Position &position, std::shared_ptr<Thing> thing, uint8_t stackpos, int32_t lookDistance) const; - void playerOnLookInBattleList(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, int32_t lookDistance) const; - void playerOnLookInTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> partner, std::shared_ptr<Item> item, int32_t lookDistance) const; - bool playerOnLookInShop(std::shared_ptr<Player> player, const ItemType* itemType, uint8_t count) const; - bool playerOnMoveItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) const; - void playerOnItemMoved(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) const; - void playerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t zone) const; - bool playerOnMoveCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, const Position &fromPosition, const Position &toPosition) const; - void playerOnReportRuleViolation(std::shared_ptr<Player> player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) const; - void playerOnReportBug(std::shared_ptr<Player> player, const std::string &message, const Position &position, uint8_t category) const; - bool playerOnTurn(std::shared_ptr<Player> player, Direction direction) const; - bool playerOnTradeRequest(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item) const; - bool playerOnTradeAccept(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item, std::shared_ptr<Item> targetItem) const; - void playerOnGainExperience(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint64_t &exp, uint64_t rawExp) const; - void playerOnLoseExperience(std::shared_ptr<Player> player, uint64_t &exp) const; - void playerOnGainSkillTries(std::shared_ptr<Player> player, skills_t skill, uint64_t &tries) const; - void playerOnRemoveCount(std::shared_ptr<Player> player, std::shared_ptr<Item> item) const; - void playerOnRequestQuestLog(std::shared_ptr<Player> player) const; - void playerOnRequestQuestLine(std::shared_ptr<Player> player, uint16_t questId) const; - void playerOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) const; - void playerOnCombat(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, CombatDamage &damage) const; - void playerOnInventoryUpdate(std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool equip) const; - bool playerOnRotateItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const Position &position) const; - void playerOnWalk(std::shared_ptr<Player> player, Direction &dir) const; + bool playerOnBrowseField(const std::shared_ptr<Player> &player, const Position &position) const; + void playerOnLook(const std::shared_ptr<Player> &player, const Position &position, const std::shared_ptr<Thing> &thing, uint8_t stackpos, int32_t lookDistance) const; + void playerOnLookInBattleList(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, int32_t lookDistance) const; + void playerOnLookInTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &partner, const std::shared_ptr<Item> &item, int32_t lookDistance) const; + bool playerOnLookInShop(const std::shared_ptr<Player> &player, const ItemType* itemType, uint8_t count) const; + bool playerOnMoveItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) const; + void playerOnItemMoved(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) const; + void playerOnChangeZone(const std::shared_ptr<Player> &player, ZoneType_t zone) const; + bool playerOnMoveCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, const Position &fromPosition, const Position &toPosition) const; + void playerOnReportRuleViolation(const std::shared_ptr<Player> &player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) const; + void playerOnReportBug(const std::shared_ptr<Player> &player, const std::string &message, const Position &position, uint8_t category) const; + bool playerOnTurn(const std::shared_ptr<Player> &player, Direction direction) const; + bool playerOnTradeRequest(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item) const; + bool playerOnTradeAccept(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &targetItem) const; + void playerOnGainExperience(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint64_t &exp, uint64_t rawExp) const; + void playerOnLoseExperience(const std::shared_ptr<Player> &player, uint64_t &exp) const; + void playerOnGainSkillTries(const std::shared_ptr<Player> &player, skills_t skill, uint64_t &tries) const; + void playerOnRemoveCount(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) const; + void playerOnRequestQuestLog(const std::shared_ptr<Player> &player) const; + void playerOnRequestQuestLine(const std::shared_ptr<Player> &player, uint16_t questId) const; + void playerOnStorageUpdate(const std::shared_ptr<Player> &player, uint32_t key, int32_t value, int32_t oldValue, uint64_t currentTime) const; + void playerOnCombat(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, CombatDamage &damage) const; + void playerOnInventoryUpdate(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool equip) const; + bool playerOnRotateItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const Position &position) const; + void playerOnWalk(const std::shared_ptr<Player> &player, const Direction &dir) const; + void playerOnThink(std::shared_ptr<Player> player, uint32_t interval) const; // Monster - void monsterOnDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse) const; - void monsterPostDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse) const; - void monsterOnSpawn(std::shared_ptr<Monster> monster, const Position &position) const; + void monsterOnDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse) const; + void monsterPostDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse) const; + void monsterOnSpawn(const std::shared_ptr<Monster> &monster, const Position &position) const; // Npc - void npcOnSpawn(std::shared_ptr<Npc> npc, const Position &position) const; + void npcOnSpawn(const std::shared_ptr<Npc> &npc, const Position &position) const; // Zone - bool zoneBeforeCreatureEnter(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const; - bool zoneBeforeCreatureLeave(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const; - void zoneAfterCreatureEnter(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const; - void zoneAfterCreatureLeave(std::shared_ptr<Zone> zone, std::shared_ptr<Creature> creature) const; + bool zoneBeforeCreatureEnter(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const; + bool zoneBeforeCreatureLeave(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const; + void zoneAfterCreatureEnter(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const; + void zoneAfterCreatureLeave(const std::shared_ptr<Zone> &zone, const std::shared_ptr<Creature> &creature) const; - /** - * @note here end the lua binder functions } - */ + void mapOnLoad(const std::string &mapFullPath) const; }; diff --git a/src/lua/callbacks/events_callbacks.cpp b/src/lua/callbacks/events_callbacks.cpp index 4a1830f80..0cd223fbc 100644 --- a/src/lua/callbacks/events_callbacks.cpp +++ b/src/lua/callbacks/events_callbacks.cpp @@ -7,11 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/callbacks/events_callbacks.hpp" #include "lua/callbacks/event_callback.hpp" +#include "game/game.hpp" +#include "lib/di/container.hpp" /** * @class EventsCallbacks @@ -28,25 +28,36 @@ EventsCallbacks &EventsCallbacks::getInstance() { return inject<EventsCallbacks>(); } -void EventsCallbacks::addCallback(const std::shared_ptr<EventCallback> callback) { - m_callbacks.push_back(callback); -} +bool EventsCallbacks::isCallbackRegistered(const std::shared_ptr<EventCallback> &callback) { + auto it = m_callbacks.find(callback->getType()); + + if (it == m_callbacks.end()) { + return false; + } + + const auto &callbacks = it->second; -std::vector<std::shared_ptr<EventCallback>> EventsCallbacks::getCallbacks() const { - return m_callbacks; + auto isSameCallbackName = [&callback](const auto &pair) { + return pair.name == callback->getName(); + }; + + auto found = std::ranges::find_if(callbacks, isSameCallbackName); + + return (found != callbacks.end() && !callback->skipDuplicationCheck()); } -std::vector<std::shared_ptr<EventCallback>> EventsCallbacks::getCallbacksByType(EventCallback_t type) const { - std::vector<std::shared_ptr<EventCallback>> eventCallbacks; - for (auto callback : getCallbacks()) { - if (callback->getType() != type) { - continue; - } +void EventsCallbacks::addCallback(const std::shared_ptr<EventCallback> &callback) { + auto &callbackList = m_callbacks[callback->getType()]; - eventCallbacks.push_back(callback); + for (const auto &entry : callbackList) { + if (entry.name == callback->getName() && !callback->skipDuplicationCheck()) { + g_logger().trace("Event callback already registered: {}", callback->getName()); + return; + } } - return eventCallbacks; + g_logger().trace("Registering event callback: {}", callback->getName()); + callbackList.emplace_back(EventCallbackEntry { callback->getName(), callback }); } void EventsCallbacks::clear() { diff --git a/src/lua/callbacks/events_callbacks.hpp b/src/lua/callbacks/events_callbacks.hpp index f71103047..8913ee1dc 100644 --- a/src/lua/callbacks/events_callbacks.hpp +++ b/src/lua/callbacks/events_callbacks.hpp @@ -46,23 +46,21 @@ class EventsCallbacks { static EventsCallbacks &getInstance(); /** - * @brief Adds a new event callback to the list. - * @param callback Pointer to the EventCallback object to add. + * @brief Checks if an event callback is already registered. + * + * @details Determines if the game state is at startup and if a callback with the same name already exists. + * @details If both conditions are met, logs an error and indicates the callback is already registered. + * + * @param callback Shared pointer to the event callback being checked. + * @return True if the callback already exists during the game startup state, otherwise false. */ - void addCallback(const std::shared_ptr<EventCallback> callback); + bool isCallbackRegistered(const std::shared_ptr<EventCallback> &callback); /** - * @brief Gets all registered event callbacks. - * @return Vector of pointers to EventCallback objects. - */ - std::vector<std::shared_ptr<EventCallback>> getCallbacks() const; - - /** - * @brief Gets event callbacks by their type. - * @param type The type of callbacks to retrieve. - * @return Vector of pointers to EventCallback objects of the specified type. + * @brief Adds a new event callback to the list. + * @param callback Pointer to the EventCallback object to add. */ - std::vector<std::shared_ptr<EventCallback>> getCallbacksByType(EventCallback_t type) const; + void addCallback(const std::shared_ptr<EventCallback> &callback); /** * @brief Clears all registered event callbacks. @@ -77,18 +75,18 @@ class EventsCallbacks { */ template <typename CallbackFunc, typename... Args> void executeCallback(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) { - for (const auto &callback : getCallbacksByType(eventType)) { - auto argsCopy = std::make_tuple(args...); - if (callback && callback->isLoadedCallback()) { - std::apply( - [&callback, &callbackFunc](auto &&... args) { - ((*callback).*callbackFunc)(std::forward<decltype(args)>(args)...); - }, - argsCopy - ); + auto it = m_callbacks.find(eventType); + if (it == m_callbacks.end()) { + return; + } + + for (const auto &entry : it->second) { + if (entry.callback && entry.callback->isLoadedCallback()) { + std::invoke(callbackFunc, *entry.callback, args...); } } } + /** * @brief Checks if all registered callbacks of the specified event type succeed. * @param eventType The type of event to check. @@ -98,22 +96,20 @@ class EventsCallbacks { */ template <typename CallbackFunc, typename... Args> 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<decltype(args)>(args)...); - }, - argsCopy - ); + auto it = m_callbacks.find(eventType); + if (it == m_callbacks.end()) { + return RETURNVALUE_NOERROR; + } + + for (const auto &entry : it->second) { + if (entry.callback && entry.callback->isLoadedCallback()) { + ReturnValue callbackResult = std::invoke(callbackFunc, *entry.callback, args...); if (callbackResult != RETURNVALUE_NOERROR) { return callbackResult; } } } - return res; + return RETURNVALUE_NOERROR; } /** @@ -126,25 +122,28 @@ class EventsCallbacks { template <typename CallbackFunc, typename... Args> bool checkCallback(EventCallback_t eventType, CallbackFunc callbackFunc, Args &&... args) { bool allCallbacksSucceeded = true; + auto it = m_callbacks.find(eventType); + if (it == m_callbacks.end()) { + return allCallbacksSucceeded; + } - for (const auto &callback : getCallbacksByType(eventType)) { - auto argsCopy = std::make_tuple(args...); - if (callback && callback->isLoadedCallback()) { - bool callbackResult = std::apply( - [&callback, &callbackFunc](auto &&... args) { - return ((*callback).*callbackFunc)(std::forward<decltype(args)>(args)...); - }, - argsCopy - ); - allCallbacksSucceeded = allCallbacksSucceeded && callbackResult; + for (const auto &entry : it->second) { + if (entry.callback && entry.callback->isLoadedCallback()) { + bool callbackResult = std::invoke(callbackFunc, *entry.callback, args...); + allCallbacksSucceeded &= callbackResult; } } return allCallbacksSucceeded; } private: + struct EventCallbackEntry { + std::string name; + std::shared_ptr<EventCallback> callback; + }; + // Container for storing registered event callbacks. - std::vector<std::shared_ptr<EventCallback>> m_callbacks; + phmap::flat_hash_map<EventCallback_t, std::vector<EventCallbackEntry>> m_callbacks; }; constexpr auto g_callbacks = EventsCallbacks::getInstance; diff --git a/src/lua/creature/actions.cpp b/src/lua/creature/actions.cpp index 485509cae..b79cb5d03 100644 --- a/src/lua/creature/actions.cpp +++ b/src/lua/creature/actions.cpp @@ -7,15 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/creature/actions.hpp" + +#include "config/configmanager.hpp" +#include "creatures/combat/spells.hpp" +#include "creatures/players/player.hpp" +#include "enums/account_group_type.hpp" +#include "game/game.hpp" #include "items/bed.hpp" #include "items/containers/container.hpp" -#include "game/game.hpp" -#include "creatures/combat/spells.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "items/containers/rewards/reward.hpp" #include "items/containers/rewards/rewardchest.hpp" -#include "enums/account_group_type.hpp" Actions::Actions() = default; Actions::~Actions() = default; @@ -27,7 +30,7 @@ void Actions::clear() { actionPositionMap.clear(); } -bool Actions::registerLuaItemEvent(const std::shared_ptr<Action> action) { +bool Actions::registerLuaItemEvent(const std::shared_ptr<Action> &action) { auto itemIdVector = action->getItemIdsVector(); if (itemIdVector.empty()) { return false; @@ -60,7 +63,7 @@ bool Actions::registerLuaItemEvent(const std::shared_ptr<Action> action) { return !itemIdVector.empty(); } -bool Actions::registerLuaUniqueEvent(const std::shared_ptr<Action> action) { +bool Actions::registerLuaUniqueEvent(const std::shared_ptr<Action> &action) { auto uniqueIdVector = action->getUniqueIdsVector(); if (uniqueIdVector.empty()) { return false; @@ -91,7 +94,7 @@ bool Actions::registerLuaUniqueEvent(const std::shared_ptr<Action> action) { return !uniqueIdVector.empty(); } -bool Actions::registerLuaActionEvent(const std::shared_ptr<Action> action) { +bool Actions::registerLuaActionEvent(const std::shared_ptr<Action> &action) { auto actionIdVector = action->getActionIdsVector(); if (actionIdVector.empty()) { return false; @@ -122,7 +125,7 @@ bool Actions::registerLuaActionEvent(const std::shared_ptr<Action> action) { return !actionIdVector.empty(); } -bool Actions::registerLuaPositionEvent(const std::shared_ptr<Action> action) { +bool Actions::registerLuaPositionEvent(const std::shared_ptr<Action> &action) { auto positionVector = action->getPositionsVector(); if (positionVector.empty()) { return false; @@ -151,7 +154,7 @@ bool Actions::registerLuaPositionEvent(const std::shared_ptr<Action> action) { return !positionVector.empty(); } -bool Actions::registerLuaEvent(const std::shared_ptr<Action> action) { +bool Actions::registerLuaEvent(const std::shared_ptr<Action> &action) { // Call all register lua events if (registerLuaItemEvent(action) || registerLuaUniqueEvent(action) || registerLuaActionEvent(action) || registerLuaPositionEvent(action)) { return true; @@ -167,7 +170,7 @@ bool Actions::registerLuaEvent(const std::shared_ptr<Action> action) { return false; } -ReturnValue Actions::canUse(std::shared_ptr<Player> player, const Position &pos) { +ReturnValue Actions::canUse(const std::shared_ptr<Player> &player, const Position &pos) const { if (pos.x != 0xFFFF) { const Position &playerPos = player->getPosition(); if (playerPos.z != pos.z) { @@ -181,15 +184,15 @@ ReturnValue Actions::canUse(std::shared_ptr<Player> player, const Position &pos) return RETURNVALUE_NOERROR; } -ReturnValue Actions::canUse(std::shared_ptr<Player> player, const Position &pos, std::shared_ptr<Item> item) { - const std::shared_ptr<Action> action = getAction(item); +ReturnValue Actions::canUse(const std::shared_ptr<Player> &player, const Position &pos, const std::shared_ptr<Item> &item) { + const auto &action = getAction(item); if (action != nullptr) { return action->canExecuteAction(player, pos); } return RETURNVALUE_NOERROR; } -ReturnValue Actions::canUseFar(std::shared_ptr<Creature> creature, const Position &toPos, bool checkLineOfSight, bool checkFloor) { +ReturnValue Actions::canUseFar(const std::shared_ptr<Creature> &creature, const Position &toPos, bool checkLineOfSight, bool checkFloor) const { if (toPos.x == 0xFFFF) { return RETURNVALUE_NOERROR; } @@ -203,38 +206,37 @@ ReturnValue Actions::canUseFar(std::shared_ptr<Creature> creature, const Positio return RETURNVALUE_TOOFARAWAY; } - if (checkLineOfSight && !g_game().canThrowObjectTo(creaturePos, toPos)) { + if (checkLineOfSight && !g_game().canThrowObjectTo(creaturePos, toPos, checkFloor ? SightLine_CheckSightLineAndFloor : SightLine_CheckSightLine)) { return RETURNVALUE_CANNOTTHROW; } return RETURNVALUE_NOERROR; } -std::shared_ptr<Action> Actions::getAction(std::shared_ptr<Item> item) { +std::shared_ptr<Action> Actions::getAction(const std::shared_ptr<Item> &item) { if (item->hasAttribute(ItemAttribute_t::UNIQUEID)) { - auto it = uniqueItemMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::UNIQUEID)); + const auto it = uniqueItemMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::UNIQUEID)); if (it != uniqueItemMap.end()) { return it->second; } } if (item->hasAttribute(ItemAttribute_t::ACTIONID)) { - auto it = actionItemMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)); + const auto it = actionItemMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)); if (it != actionItemMap.end()) { return it->second; } } - auto it = useItemMap.find(item->getID()); + const auto it = useItemMap.find(item->getID()); if (it != useItemMap.end()) { return it->second; } - if (auto iteratePositions = actionPositionMap.find(item->getPosition()); + if (const auto iteratePositions = actionPositionMap.find(item->getPosition()); iteratePositions != actionPositionMap.end()) { - if (std::shared_ptr<Tile> tile = item->getTile(); - tile) { - if (std::shared_ptr<Player> player = item->getHoldingPlayer(); + if (const auto &tile = item->getTile()) { + if (const auto &player = item->getHoldingPlayer(); 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; @@ -248,8 +250,8 @@ std::shared_ptr<Action> Actions::getAction(std::shared_ptr<Item> item) { return g_spells().getRuneSpell(item->getID()); } -ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Position &pos, uint8_t index, std::shared_ptr<Item> item, bool isHotkey) { - if (std::shared_ptr<Door> door = item->getDoor()) { +ReturnValue Actions::internalUseItem(const std::shared_ptr<Player> &player, const Position &pos, uint8_t index, const std::shared_ptr<Item> &item, bool isHotkey) { + if (const auto &door = item->getDoor()) { if (!door->canUse(player)) { return RETURNVALUE_CANNOTUSETHISOBJECT; } @@ -258,7 +260,7 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit auto itemId = item->getID(); const ItemType &itemType = Item::items[itemId]; auto transformTo = itemType.m_transformOnUse; - const std::shared_ptr<Action> action = getAction(item); + const auto &action = getAction(item); if (!action && transformTo > 0 && itemId != transformTo) { if (g_game().transformItem(item, transformTo) == nullptr) { g_logger().warn("[{}] item with id {} failed to transform to item {}", __FUNCTION__, itemId, transformTo); @@ -283,7 +285,7 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit } } - if (std::shared_ptr<BedItem> bed = item->getBed()) { + if (const auto &bed = item->getBed()) { if (!bed->canUse(player)) { return RETURNVALUE_CANNOTUSETHISOBJECT; } @@ -296,12 +298,12 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit return RETURNVALUE_NOERROR; } - if (std::shared_ptr<Container> container = item->getContainer()) { + if (const auto &container = item->getContainer()) { std::shared_ptr<Container> openContainer; // depot container - if (std::shared_ptr<DepotLocker> depot = container->getDepotLocker()) { - std::shared_ptr<DepotLocker> myDepotLocker = player->getDepotLocker(depot->getDepotId()); + if (const auto &depot = container->getDepotLocker()) { + const auto &myDepotLocker = player->getDepotLocker(depot->getDepotId()); myDepotLocker->setParent(depot->getParent()->getTile()); openContainer = myDepotLocker; player->setLastDepotId(depot->getDepotId()); @@ -315,7 +317,7 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit player->removeEmptyRewards(); } - std::shared_ptr<RewardChest> playerRewardChest = player->getRewardChest(); + const auto &playerRewardChest = player->getRewardChest(); if (playerRewardChest->empty()) { return RETURNVALUE_REWARDCHESTISEMPTY; } @@ -328,10 +330,10 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit openContainer = playerRewardChest; } - auto rewardId = container->getAttribute<time_t>(ItemAttribute_t::DATE); + const auto rewardId = container->getAttribute<time_t>(ItemAttribute_t::DATE); // Reward container proxy created when the boss dies if (container->getID() == ITEM_REWARD_CONTAINER && !container->getReward()) { - auto reward = player->getReward(rewardId, false); + const auto &reward = player->getReward(rewardId, false); if (!reward) { return RETURNVALUE_THISISIMPOSSIBLE; } @@ -342,13 +344,13 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit openContainer = reward; } - uint32_t corpseOwner = container->getCorpseOwner(); + const uint32_t corpseOwner = container->getCorpseOwner(); if (container->isRewardCorpse()) { // only players who participated in the fight can open the corpse if (player->getGroup()->id >= GROUP_TYPE_GAMEMASTER) { return RETURNVALUE_YOUCANTOPENCORPSEADM; } - auto reward = player->getReward(rewardId, false); + const auto &reward = player->getReward(rewardId, false); if (!reward) { return RETURNVALUE_YOUARENOTTHEOWNER; } @@ -360,7 +362,7 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit } // open/close container - int32_t oldContainerId = player->getContainerID(openContainer); + const int32_t oldContainerId = player->getContainerID(openContainer); if (oldContainerId != -1) { player->onCloseContainer(openContainer); player->closeContainer(oldContainerId); @@ -388,7 +390,7 @@ ReturnValue Actions::internalUseItem(std::shared_ptr<Player> player, const Posit return RETURNVALUE_CANNOTUSETHISOBJECT; } -bool Actions::useItem(std::shared_ptr<Player> player, const Position &pos, uint8_t index, std::shared_ptr<Item> item, bool isHotkey) { +bool Actions::useItem(const std::shared_ptr<Player> &player, const Position &pos, uint8_t index, const std::shared_ptr<Item> &item, bool isHotkey) { const ItemType &it = Item::items[item->getID()]; if (it.isRune() || it.type == ITEM_TYPE_POTION) { if (player->walkExhausted()) { @@ -397,7 +399,7 @@ bool Actions::useItem(std::shared_ptr<Player> player, const Position &pos, uint8 } } if (isHotkey) { - uint16_t subType = item->getSubType(); + const uint16_t subType = item->getSubType(); showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), subType != item->getItemCount() ? subType : -1)); } @@ -408,19 +410,19 @@ bool Actions::useItem(std::shared_ptr<Player> player, const Position &pos, uint8 } if (it.isRune() || it.type == ITEM_TYPE_POTION) { - player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(ACTIONS_DELAY_INTERVAL)); } else { - player->setNextAction(OTSYS_TIME() + g_configManager().getNumber(ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->setNextAction(OTSYS_TIME() + g_configManager().getNumber(ACTIONS_DELAY_INTERVAL)); } // only send cooldown icon if it's an multi use item if (it.isMultiUse()) { - player->sendUseItemCooldown(g_configManager().getNumber(ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->sendUseItemCooldown(g_configManager().getNumber(ACTIONS_DELAY_INTERVAL)); } return true; } -bool Actions::useItemEx(std::shared_ptr<Player> player, const Position &fromPos, const Position &toPos, uint8_t toStackPos, std::shared_ptr<Item> item, bool isHotkey, std::shared_ptr<Creature> creature /* = nullptr*/) { +bool Actions::useItemEx(const std::shared_ptr<Player> &player, const Position &fromPos, const Position &toPos, uint8_t toStackPos, const std::shared_ptr<Item> &item, bool isHotkey, const std::shared_ptr<Creature> &creature /* = nullptr*/) { const ItemType &it = Item::items[item->getID()]; if (it.isRune() || it.type == ITEM_TYPE_POTION) { if (player->walkExhausted()) { @@ -442,7 +444,7 @@ bool Actions::useItemEx(std::shared_ptr<Player> player, const Position &fromPos, } if (isHotkey) { - uint16_t subType = item->getSubType(); + const uint16_t subType = item->getSubType(); showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), subType != item->getItemCount() ? subType : -1)); } @@ -461,18 +463,18 @@ bool Actions::useItemEx(std::shared_ptr<Player> player, const Position &fromPos, } if (it.isRune() || it.type == ITEM_TYPE_POTION) { - player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL)); } else { - player->setNextAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->setNextAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL)); } if (it.isMultiUse()) { - player->sendUseItemCooldown(g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__)); + player->sendUseItemCooldown(g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL)); } return true; } -void Actions::showUseHotkeyMessage(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint32_t count) { +void Actions::showUseHotkeyMessage(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint32_t count) { std::ostringstream ss; const ItemType &it = Item::items[item->getID()]; @@ -496,7 +498,7 @@ void Actions::showUseHotkeyMessage(std::shared_ptr<Player> player, std::shared_p Action::Action(LuaScriptInterface* interface) : Script(interface) { } -ReturnValue Action::canExecuteAction(std::shared_ptr<Player> player, const Position &toPos) { +ReturnValue Action::canExecuteAction(const std::shared_ptr<Player> &player, const Position &toPos) { if (!allowFarUse) { return g_actions().canUse(player, toPos); } @@ -504,23 +506,23 @@ ReturnValue Action::canExecuteAction(std::shared_ptr<Player> player, const Posit return g_actions().canUseFar(player, toPos, checkLineOfSight, checkFloor); } -std::shared_ptr<Thing> Action::getTarget(std::shared_ptr<Player> player, std::shared_ptr<Creature> targetCreature, const Position &toPosition, uint8_t toStackPos) const { +std::shared_ptr<Thing> Action::getTarget(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &targetCreature, const Position &toPosition, uint8_t toStackPos) const { if (targetCreature != nullptr) { return targetCreature; } return g_game().internalGetThing(player, toPosition, toStackPos, 0, STACKPOS_USETARGET); } -bool Action::executeUse(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const Position &fromPosition, std::shared_ptr<Thing> target, const Position &toPosition, bool isHotkey) { +bool Action::executeUse(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const Position &fromPosition, const std::shared_ptr<Thing> &target, const Position &toPosition, bool isHotkey) { // onUse(player, item, fromPosition, target, toPosition, isHotkey) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Action::executeUse - Player {}, on item {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), item->getName()); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); diff --git a/src/lua/creature/actions.hpp b/src/lua/creature/actions.hpp index 81a7754a5..ed5c6adc3 100644 --- a/src/lua/creature/actions.hpp +++ b/src/lua/creature/actions.hpp @@ -14,14 +14,14 @@ #include "lua/scripts/luascript.hpp" class Action; -class Position; +struct Position; class Action : public Script { public: explicit Action(LuaScriptInterface* interface); // Scripting - virtual bool executeUse(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const Position &fromPosition, std::shared_ptr<Thing> target, const Position &toPosition, bool isHotkey); + virtual bool executeUse(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const Position &fromPosition, const std::shared_ptr<Thing> &target, const Position &toPosition, bool isHotkey); bool getAllowFarUse() const { return allowFarUse; @@ -96,13 +96,13 @@ class Action : public Script { positions.emplace_back(pos); } - virtual ReturnValue canExecuteAction(std::shared_ptr<Player> player, const Position &toPos); + virtual ReturnValue canExecuteAction(const std::shared_ptr<Player> &player, const Position &toPos); virtual bool hasOwnErrorHandler() { return false; } - virtual std::shared_ptr<Thing> getTarget(std::shared_ptr<Player> player, std::shared_ptr<Creature> targetCreature, const Position &toPosition, uint8_t toStackPos) const; + virtual std::shared_ptr<Thing> getTarget(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &targetCreature, const Position &toPosition, uint8_t toStackPos) const; private: std::string getScriptTypeName() const override { @@ -110,8 +110,8 @@ class Action : public Script { } std::function<bool( - std::shared_ptr<Player> player, std::shared_ptr<Item> item, - const Position &fromPosition, std::shared_ptr<Thing> target, + const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, + const Position &fromPosition, const std::shared_ptr<Thing> &target, const Position &toPosition, bool isHotkey )> useFunction = nullptr; @@ -143,24 +143,24 @@ class Actions final : public Scripts { return inject<Actions>(); } - bool useItem(std::shared_ptr<Player> player, const Position &pos, uint8_t index, std::shared_ptr<Item> item, bool isHotkey); - bool useItemEx(std::shared_ptr<Player> player, const Position &fromPos, const Position &toPos, uint8_t toStackPos, std::shared_ptr<Item> item, bool isHotkey, std::shared_ptr<Creature> creature = nullptr); + bool useItem(const std::shared_ptr<Player> &player, const Position &pos, uint8_t index, const std::shared_ptr<Item> &item, bool isHotkey); + bool useItemEx(const std::shared_ptr<Player> &player, const Position &fromPos, const Position &toPos, uint8_t toStackPos, const std::shared_ptr<Item> &item, bool isHotkey, const std::shared_ptr<Creature> &creature = nullptr); - ReturnValue canUse(std::shared_ptr<Player> player, const Position &pos); - ReturnValue canUse(std::shared_ptr<Player> player, const Position &pos, std::shared_ptr<Item> item); - ReturnValue canUseFar(std::shared_ptr<Creature> creature, const Position &toPos, bool checkLineOfSight, bool checkFloor); + ReturnValue canUse(const std::shared_ptr<Player> &player, const Position &pos) const; + ReturnValue canUse(const std::shared_ptr<Player> &player, const Position &pos, const std::shared_ptr<Item> &item); + ReturnValue canUseFar(const std::shared_ptr<Creature> &creature, const Position &toPos, bool checkLineOfSight, bool checkFloor) const; - bool registerLuaItemEvent(const std::shared_ptr<Action> action); - bool registerLuaUniqueEvent(const std::shared_ptr<Action> action); - bool registerLuaActionEvent(const std::shared_ptr<Action> action); - bool registerLuaPositionEvent(const std::shared_ptr<Action> action); - bool registerLuaEvent(const std::shared_ptr<Action> action); + bool registerLuaItemEvent(const std::shared_ptr<Action> &action); + bool registerLuaUniqueEvent(const std::shared_ptr<Action> &action); + bool registerLuaActionEvent(const std::shared_ptr<Action> &action); + bool registerLuaPositionEvent(const std::shared_ptr<Action> &action); + bool registerLuaEvent(const std::shared_ptr<Action> &action); // Clear maps for reloading void clear(); private: - bool hasPosition(Position position) const { - if (auto it = actionPositionMap.find(position); + bool hasPosition(const Position &position) const { + if (const auto it = actionPositionMap.find(position); it != actionPositionMap.end()) { return true; } @@ -171,48 +171,48 @@ class Actions final : public Scripts { return actionPositionMap; } - void setPosition(Position position, std::shared_ptr<Action> action) { + void setPosition(const Position &position, const std::shared_ptr<Action> &action) { actionPositionMap.try_emplace(position, action); } bool hasItemId(uint16_t itemId) const { - if (auto it = useItemMap.find(itemId); + if (const auto it = useItemMap.find(itemId); it != useItemMap.end()) { return true; } return false; } - void setItemId(uint16_t itemId, const std::shared_ptr<Action> action) { + void setItemId(uint16_t itemId, const std::shared_ptr<Action> &action) { useItemMap.try_emplace(itemId, action); } bool hasUniqueId(uint16_t uniqueId) const { - if (auto it = uniqueItemMap.find(uniqueId); + if (const auto it = uniqueItemMap.find(uniqueId); it != uniqueItemMap.end()) { return true; } return false; } - void setUniqueId(uint16_t uniqueId, const std::shared_ptr<Action> action) { + void setUniqueId(uint16_t uniqueId, const std::shared_ptr<Action> &action) { uniqueItemMap.try_emplace(uniqueId, action); } bool hasActionId(uint16_t actionId) const { - if (auto it = actionItemMap.find(actionId); + if (const auto it = actionItemMap.find(actionId); it != actionItemMap.end()) { return true; } return false; } - void setActionId(uint16_t actionId, const std::shared_ptr<Action> action) { + void setActionId(uint16_t actionId, const std::shared_ptr<Action> &action) { actionItemMap.try_emplace(actionId, action); } - ReturnValue internalUseItem(std::shared_ptr<Player> player, const Position &pos, uint8_t index, std::shared_ptr<Item> item, bool isHotkey); - static void showUseHotkeyMessage(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint32_t count); + ReturnValue internalUseItem(const std::shared_ptr<Player> &player, const Position &pos, uint8_t index, const std::shared_ptr<Item> &item, bool isHotkey); + static void showUseHotkeyMessage(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint32_t count); using ActionUseMap = std::map<uint16_t, std::shared_ptr<Action>>; ActionUseMap useItemMap; @@ -220,7 +220,7 @@ class Actions final : public Scripts { ActionUseMap actionItemMap; std::map<Position, std::shared_ptr<Action>> actionPositionMap; - std::shared_ptr<Action> getAction(std::shared_ptr<Item> item); + std::shared_ptr<Action> getAction(const std::shared_ptr<Item> &item); }; constexpr auto g_actions = Actions::getInstance; diff --git a/src/lua/creature/creatureevent.cpp b/src/lua/creature/creatureevent.cpp index 09dbdf086..575394b60 100644 --- a/src/lua/creature/creatureevent.cpp +++ b/src/lua/creature/creatureevent.cpp @@ -7,19 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/creature/creatureevent.hpp" -#include "utils/tools.hpp" + #include "creatures/players/player.hpp" +#include "items/item.hpp" void CreatureEvents::clear() { - for (auto &[name, event] : creatureEvents) { + for (const auto &[name, event] : creatureEvents) { event->clearEvent(); } } -bool CreatureEvents::registerLuaEvent(const std::shared_ptr<CreatureEvent> creatureEvent) { +bool CreatureEvents::registerLuaEvent(const std::shared_ptr<CreatureEvent> &creatureEvent) { if (creatureEvent->getEventType() == CREATURE_EVENT_NONE) { g_logger().error( "[{}] - Trying to register event without type for script: {}", @@ -29,7 +28,7 @@ bool CreatureEvents::registerLuaEvent(const std::shared_ptr<CreatureEvent> creat return false; } - const std::shared_ptr<CreatureEvent> oldEvent = getEventByName(creatureEvent->getName(), false); + const auto &oldEvent = getEventByName(creatureEvent->getName(), false); if (oldEvent) { // if there was an event with the same that is not loaded //(happens when realoading), it is reused @@ -46,7 +45,7 @@ bool CreatureEvents::registerLuaEvent(const std::shared_ptr<CreatureEvent> creat } std::shared_ptr<CreatureEvent> CreatureEvents::getEventByName(const std::string &name, bool forceLoaded /*= true*/) { - auto it = creatureEvents.find(name); + const auto it = creatureEvents.find(name); if (it != creatureEvents.end()) { if (!forceLoaded || it->second->isLoaded()) { return it->second; @@ -55,7 +54,11 @@ std::shared_ptr<CreatureEvent> CreatureEvents::getEventByName(const std::string return nullptr; } -bool CreatureEvents::playerLogin(std::shared_ptr<Player> player) const { +CreatureEvents &CreatureEvents::getInstance() { + return inject<CreatureEvents>(); +} + +bool CreatureEvents::playerLogin(const std::shared_ptr<Player> &player) const { // fire global event if is registered for (const auto &it : creatureEvents) { if (it.second->getEventType() == CREATURE_EVENT_LOGIN) { @@ -67,7 +70,7 @@ bool CreatureEvents::playerLogin(std::shared_ptr<Player> player) const { return true; } -bool CreatureEvents::playerLogout(std::shared_ptr<Player> player) const { +bool CreatureEvents::playerLogout(const std::shared_ptr<Player> &player) const { // fire global event if is registered for (const auto &it : creatureEvents) { if (it.second->getEventType() == CREATURE_EVENT_LOGOUT) { @@ -80,7 +83,7 @@ bool CreatureEvents::playerLogout(std::shared_ptr<Player> player) const { } bool CreatureEvents::playerAdvance( - std::shared_ptr<Player> player, + const std::shared_ptr<Player> &player, skills_t skill, uint32_t oldLevel, uint32_t newLevel @@ -151,11 +154,11 @@ std::string CreatureEvent::getScriptTypeName() const { case CREATURE_EVENT_NONE: default: - return std::string(); + return {}; } } -void CreatureEvent::copyEvent(const std::shared_ptr<CreatureEvent> creatureEvent) { +void CreatureEvent::copyEvent(const std::shared_ptr<CreatureEvent> &creatureEvent) { setScriptId(creatureEvent->getScriptId()); setScriptInterface(creatureEvent->getScriptInterface()); setLoadedCallback(creatureEvent->isLoadedCallback()); @@ -169,16 +172,16 @@ void CreatureEvent::clearEvent() { loaded = false; } -bool CreatureEvent::executeOnLogin(std::shared_ptr<Player> player) const { +bool CreatureEvent::executeOnLogin(const std::shared_ptr<Player> &player) const { // onLogin(player) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnLogin - Player {} event {}]" "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -189,16 +192,16 @@ bool CreatureEvent::executeOnLogin(std::shared_ptr<Player> player) const { return getScriptInterface()->callFunction(1); } -bool CreatureEvent::executeOnLogout(std::shared_ptr<Player> player) const { +bool CreatureEvent::executeOnLogout(const std::shared_ptr<Player> &player) const { // onLogout(player) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnLogout - Player {} event {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -209,16 +212,16 @@ bool CreatureEvent::executeOnLogout(std::shared_ptr<Player> player) const { return getScriptInterface()->callFunction(1); } -bool CreatureEvent::executeOnThink(std::shared_ptr<Creature> creature, uint32_t interval) const { +bool CreatureEvent::executeOnThink(const std::shared_ptr<Creature> &creature, uint32_t interval) const { // onThink(creature, interval) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnThink - Creature {} event {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -231,16 +234,16 @@ bool CreatureEvent::executeOnThink(std::shared_ptr<Creature> creature, uint32_t return getScriptInterface()->callFunction(2); } -bool CreatureEvent::executeOnPrepareDeath(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> killer) const { +bool CreatureEvent::executeOnPrepareDeath(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &killer, int realDamage) const { // onPrepareDeath(creature, killer) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnPrepareDeath - Creature {} killer {}" " event {}] Call stack overflow. Too many lua script calls being nested.", creature->getName(), killer->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -257,19 +260,21 @@ bool CreatureEvent::executeOnPrepareDeath(std::shared_ptr<Creature> creature, st lua_pushnil(L); } - return getScriptInterface()->callFunction(2); + lua_pushnumber(L, realDamage); + + return getScriptInterface()->callFunction(3); } -bool CreatureEvent::executeOnDeath(std::shared_ptr<Creature> creature, std::shared_ptr<Item> corpse, std::shared_ptr<Creature> killer, std::shared_ptr<Creature> mostDamageKiller, bool lastHitUnjustified, bool mostDamageUnjustified) const { +bool CreatureEvent::executeOnDeath(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &corpse, const std::shared_ptr<Creature> &killer, const std::shared_ptr<Creature> &mostDamageKiller, bool lastHitUnjustified, bool mostDamageUnjustified) const { // onDeath(creature, corpse, lasthitkiller, mostdamagekiller, lasthitunjustified, mostdamageunjustified) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnDeath - Creature {} killer {} event {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName(), killer->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -300,16 +305,16 @@ bool CreatureEvent::executeOnDeath(std::shared_ptr<Creature> creature, std::shar return getScriptInterface()->callFunction(6); } -bool CreatureEvent::executeAdvance(std::shared_ptr<Player> player, skills_t skill, uint32_t oldLevel, uint32_t newLevel) const { +bool CreatureEvent::executeAdvance(const std::shared_ptr<Player> &player, skills_t skill, uint32_t oldLevel, uint32_t newLevel) const { // onAdvance(player, skill, oldLevel, newLevel) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeAdvance - Player {} event {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -327,19 +332,19 @@ bool CreatureEvent::executeAdvance(std::shared_ptr<Player> player, skills_t skil /** * @deprecated Prefer using registered onDeath events instead for better performance. */ -void CreatureEvent::executeOnKill(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target, bool lastHit) const { +void CreatureEvent::executeOnKill(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &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()); - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeOnKill - Creature {} target {} event {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName(), target->getName(), getName()); return; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -353,9 +358,9 @@ void CreatureEvent::executeOnKill(std::shared_ptr<Creature> creature, std::share getScriptInterface()->callVoidFunction(3); } -void CreatureEvent::executeModalWindow(std::shared_ptr<Player> player, uint32_t modalWindowId, uint8_t buttonId, uint8_t choiceId) const { +void CreatureEvent::executeModalWindow(const std::shared_ptr<Player> &player, uint32_t modalWindowId, uint8_t buttonId, uint8_t choiceId) const { // onModalWindow(player, modalWindowId, buttonId, choiceId) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeModalWindow - " "Player {} modaw window id {} event {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -363,7 +368,7 @@ void CreatureEvent::executeModalWindow(std::shared_ptr<Player> player, uint32_t return; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -379,16 +384,16 @@ void CreatureEvent::executeModalWindow(std::shared_ptr<Player> player, uint32_t getScriptInterface()->callVoidFunction(4); } -bool CreatureEvent::executeTextEdit(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const std::string &text) const { +bool CreatureEvent::executeTextEdit(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::string &text) const { // onTextEdit(player, item, text) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeTextEdit - Player {} event {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -403,9 +408,9 @@ bool CreatureEvent::executeTextEdit(std::shared_ptr<Player> player, std::shared_ return getScriptInterface()->callFunction(3); } -void CreatureEvent::executeHealthChange(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatDamage &damage) const { +void CreatureEvent::executeHealthChange(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatDamage &damage) const { // onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeHealthChange - " "Creature {} attacker {} event {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -413,7 +418,7 @@ void CreatureEvent::executeHealthChange(std::shared_ptr<Creature> creature, std: return; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -430,7 +435,7 @@ void CreatureEvent::executeHealthChange(std::shared_ptr<Creature> creature, std: LuaScriptInterface::pushCombatDamage(L, damage); - if (getScriptInterface()->protectedCall(L, 7, 4) != 0) { + if (LuaScriptInterface::protectedCall(L, 7, 4) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { damage.primary.value = std::abs(LuaScriptInterface::getNumber<int32_t>(L, -4)); @@ -445,12 +450,12 @@ void CreatureEvent::executeHealthChange(std::shared_ptr<Creature> creature, std: } } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void CreatureEvent::executeManaChange(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatDamage &damage) const { +void CreatureEvent::executeManaChange(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatDamage &damage) const { // onManaChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeManaChange - " "Creature {} attacker {} event {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -458,7 +463,7 @@ void CreatureEvent::executeManaChange(std::shared_ptr<Creature> creature, std::s return; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -475,7 +480,7 @@ void CreatureEvent::executeManaChange(std::shared_ptr<Creature> creature, std::s LuaScriptInterface::pushCombatDamage(L, damage); - if (getScriptInterface()->protectedCall(L, 7, 4) != 0) { + if (LuaScriptInterface::protectedCall(L, 7, 4) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { damage.primary.value = LuaScriptInterface::getNumber<int32_t>(L, -4); @@ -485,12 +490,12 @@ void CreatureEvent::executeManaChange(std::shared_ptr<Creature> creature, std::s lua_pop(L, 4); } - getScriptInterface()->resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void CreatureEvent::executeExtendedOpcode(std::shared_ptr<Player> player, uint8_t opcode, const std::string &buffer) const { +void CreatureEvent::executeExtendedOpcode(const std::shared_ptr<Player> &player, uint8_t opcode, const std::string &buffer) const { // onExtendedOpcode(player, opcode, buffer) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[CreatureEvent::executeExtendedOpcode - " "Player {} event {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -498,7 +503,7 @@ void CreatureEvent::executeExtendedOpcode(std::shared_ptr<Player> player, uint8_ return; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); diff --git a/src/lua/creature/creatureevent.hpp b/src/lua/creature/creatureevent.hpp index 8a208343e..5000a4b2e 100644 --- a/src/lua/creature/creatureevent.hpp +++ b/src/lua/creature/creatureevent.hpp @@ -9,12 +9,10 @@ #pragma once -#include "declarations.hpp" -#include "lib/di/container.hpp" -#include "lua/scripts/luascript.hpp" #include "lua/scripts/scripts.hpp" class CreatureEvent; +class LuaScriptInterface; class CreatureEvent final : public Script { public: @@ -40,21 +38,21 @@ class CreatureEvent final : public Script { } void clearEvent(); - void copyEvent(const std::shared_ptr<CreatureEvent> creatureEvent); + void copyEvent(const std::shared_ptr<CreatureEvent> &creatureEvent); // scripting - bool executeOnLogin(std::shared_ptr<Player> player) const; - bool executeOnLogout(std::shared_ptr<Player> player) const; - bool executeOnThink(std::shared_ptr<Creature> creature, uint32_t interval) const; - bool executeOnPrepareDeath(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> killer) const; - bool executeOnDeath(std::shared_ptr<Creature> creature, std::shared_ptr<Item> corpse, std::shared_ptr<Creature> killer, std::shared_ptr<Creature> mostDamageKiller, bool lastHitUnjustified, bool mostDamageUnjustified) const; - void executeOnKill(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target, bool lastHit) const; - bool executeAdvance(std::shared_ptr<Player> player, skills_t, uint32_t, uint32_t) const; - void executeModalWindow(std::shared_ptr<Player> player, uint32_t modalWindowId, uint8_t buttonId, uint8_t choiceId) const; - bool executeTextEdit(std::shared_ptr<Player> player, std::shared_ptr<Item> item, const std::string &text) const; - void executeHealthChange(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatDamage &damage) const; - void executeManaChange(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatDamage &damage) const; - void executeExtendedOpcode(std::shared_ptr<Player> player, uint8_t opcode, const std::string &buffer) const; + bool executeOnLogin(const std::shared_ptr<Player> &player) const; + bool executeOnLogout(const std::shared_ptr<Player> &player) const; + bool executeOnThink(const std::shared_ptr<Creature> &creature, uint32_t interval) const; + bool executeOnPrepareDeath(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &killer, int realDamage) const; + bool executeOnDeath(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &corpse, const std::shared_ptr<Creature> &killer, const std::shared_ptr<Creature> &mostDamageKiller, bool lastHitUnjustified, bool mostDamageUnjustified) const; + void executeOnKill(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target, bool lastHit) const; + bool executeAdvance(const std::shared_ptr<Player> &player, skills_t, uint32_t, uint32_t) const; + void executeModalWindow(const std::shared_ptr<Player> &player, uint32_t modalWindowId, uint8_t buttonId, uint8_t choiceId) const; + bool executeTextEdit(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, const std::string &text) const; + void executeHealthChange(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatDamage &damage) const; + void executeManaChange(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatDamage &damage) const; + void executeExtendedOpcode(const std::shared_ptr<Player> &player, uint8_t opcode, const std::string &buffer) const; // private: @@ -73,18 +71,16 @@ class CreatureEvents final : public Scripts { CreatureEvents(const CreatureEvents &) = delete; CreatureEvents &operator=(const CreatureEvents &) = delete; - static CreatureEvents &getInstance() { - return inject<CreatureEvents>(); - } + static CreatureEvents &getInstance(); // global events - bool playerLogin(std::shared_ptr<Player> player) const; - bool playerLogout(std::shared_ptr<Player> player) const; - bool playerAdvance(std::shared_ptr<Player> player, skills_t, uint32_t, uint32_t) const; + bool playerLogin(const std::shared_ptr<Player> &player) const; + bool playerLogout(const std::shared_ptr<Player> &player) const; + bool playerAdvance(const std::shared_ptr<Player> &player, skills_t, uint32_t, uint32_t) const; std::shared_ptr<CreatureEvent> getEventByName(const std::string &name, bool forceLoaded = true); - bool registerLuaEvent(const std::shared_ptr<CreatureEvent> event); + bool registerLuaEvent(const std::shared_ptr<CreatureEvent> &event); void removeInvalidEvents(); void clear(); diff --git a/src/lua/creature/events.cpp b/src/lua/creature/events.cpp index 8bdd53465..57a8ff45d 100644 --- a/src/lua/creature/events.cpp +++ b/src/lua/creature/events.cpp @@ -7,12 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/creature/events.hpp" -#include "utils/tools.hpp" -#include "items/item.hpp" + +#include "config/configmanager.hpp" +#include "creatures/monsters/monster.hpp" +#include "creatures/players/grouping/party.hpp" #include "creatures/players/player.hpp" +#include "game/movement/position.hpp" +#include "items/containers/container.hpp" +#include "items/item.hpp" +#include "lib/di/container.hpp" +#include "utils/tools.hpp" Events::Events() : scriptInterface("Event Interface") { @@ -21,7 +26,7 @@ Events::Events() : bool Events::loadFromXml() { pugi::xml_document doc; - auto folder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/events/events.xml"; + auto folder = g_configManager().getString(CORE_DIRECTORY) + "/events/events.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); @@ -31,17 +36,17 @@ bool Events::loadFromXml() { info = {}; phmap::flat_hash_set<std::string> classes; - for (auto eventNode : doc.child("events").children()) { + for (const auto &eventNode : doc.child("events").children()) { if (!eventNode.attribute("enabled").as_bool()) { continue; } const std::string &className = eventNode.attribute("class").as_string(); - auto res = classes.emplace(className); + const auto res = classes.emplace(className); if (res.second) { const std::string &lowercase = asLowerCaseString(className); const std::string &scriptName = lowercase + ".lua"; - auto coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + auto coreFolder = g_configManager().getString(CORE_DIRECTORY); if (scriptInterface.loadFile(coreFolder + "/events/scripts/" + scriptName, scriptName) != 0) { g_logger().warn("{} - Can not load script: {}.lua", __FUNCTION__, lowercase); g_logger().warn(scriptInterface.getLastLuaError()); @@ -150,13 +155,13 @@ bool Events::loadFromXml() { } // Monster -void Events::eventMonsterOnSpawn(std::shared_ptr<Monster> monster, const Position &position) { +void Events::eventMonsterOnSpawn(const std::shared_ptr<Monster> &monster, const Position &position) { // Monster:onSpawn(position) or Monster.onSpawn(self, position) if (info.monsterOnSpawn == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("{} - " "Position {}" ". Call stack overflow. Too many lua script calls being nested.", @@ -164,7 +169,7 @@ void Events::eventMonsterOnSpawn(std::shared_ptr<Monster> monster, const Positio return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.monsterOnSpawn, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -174,23 +179,23 @@ void Events::eventMonsterOnSpawn(std::shared_ptr<Monster> monster, const Positio LuaScriptInterface::setMetatable(L, -1, "Monster"); LuaScriptInterface::pushPosition(L, position); - if (scriptInterface.protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } // Npc -void Events::eventNpcOnSpawn(std::shared_ptr<Npc> npc, const Position &position) { +void Events::eventNpcOnSpawn(const std::shared_ptr<Npc> &npc, const Position &position) { // Npc:onSpawn(position) or Npc.onSpawn(self, position) if (info.npcOnSpawn == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("{} - " "Position {}" ". Call stack overflow. Too many lua script calls being nested.", @@ -198,7 +203,7 @@ void Events::eventNpcOnSpawn(std::shared_ptr<Npc> npc, const Position &position) return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.npcOnSpawn, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -208,30 +213,34 @@ void Events::eventNpcOnSpawn(std::shared_ptr<Npc> npc, const Position &position) LuaScriptInterface::setMetatable(L, -1, "Npc"); LuaScriptInterface::pushPosition(L, position); - if (scriptInterface.protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); +} + +Events &Events::getInstance() { + return inject<Events>(); } // Creature -bool Events::eventCreatureOnChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) { +bool Events::eventCreatureOnChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) { // Creature:onChangeOutfit(outfit) or Creature.onChangeOutfit(self, outfit) if (info.creatureOnChangeOutfit == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnChangeOutfit - Creature {}] " "Call stack overflow. Too many lua script calls being nested.", creature->getName()); return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.creatureOnChangeOutfit, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -245,13 +254,13 @@ bool Events::eventCreatureOnChangeOutfit(std::shared_ptr<Creature> creature, con return scriptInterface.callFunction(2); } -ReturnValue Events::eventCreatureOnAreaCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Tile> tile, bool aggressive) { +ReturnValue Events::eventCreatureOnAreaCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile, bool aggressive) { // Creature:onAreaCombat(tile, aggressive) or Creature.onAreaCombat(self, tile, aggressive) if (info.creatureOnAreaCombat == -1) { return RETURNVALUE_NOERROR; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnAreaCombat - " "Creature {} on tile position {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -259,7 +268,7 @@ ReturnValue Events::eventCreatureOnAreaCombat(std::shared_ptr<Creature> creature return RETURNVALUE_NOTPOSSIBLE; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.creatureOnAreaCombat, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -278,7 +287,7 @@ ReturnValue Events::eventCreatureOnAreaCombat(std::shared_ptr<Creature> creature LuaScriptInterface::pushBoolean(L, aggressive); ReturnValue returnValue; - if (scriptInterface.protectedCall(L, 3, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 3, 1) != 0) { returnValue = RETURNVALUE_NOTPOSSIBLE; LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { @@ -286,17 +295,17 @@ ReturnValue Events::eventCreatureOnAreaCombat(std::shared_ptr<Creature> creature lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return returnValue; } -ReturnValue Events::eventCreatureOnTargetCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target) { +ReturnValue Events::eventCreatureOnTargetCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target) { // Creature:onTargetCombat(target) or Creature.onTargetCombat(self, target) if (info.creatureOnTargetCombat == -1) { return RETURNVALUE_NOERROR; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnTargetCombat - " "Creature {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -304,7 +313,7 @@ ReturnValue Events::eventCreatureOnTargetCombat(std::shared_ptr<Creature> creatu return RETURNVALUE_NOTPOSSIBLE; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.creatureOnTargetCombat, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -321,7 +330,7 @@ ReturnValue Events::eventCreatureOnTargetCombat(std::shared_ptr<Creature> creatu LuaScriptInterface::setCreatureMetatable(L, -1, target); ReturnValue returnValue; - if (scriptInterface.protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { returnValue = RETURNVALUE_NOTPOSSIBLE; LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { @@ -329,17 +338,17 @@ ReturnValue Events::eventCreatureOnTargetCombat(std::shared_ptr<Creature> creatu lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); return returnValue; } -void Events::eventCreatureOnHear(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> speaker, const std::string &words, SpeakClasses type) { +void Events::eventCreatureOnHear(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &speaker, const std::string &words, SpeakClasses type) { // Creature:onHear(speaker, words, type) if (info.creatureOnHear == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnHear - " "Creature {} speaker {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -347,7 +356,7 @@ void Events::eventCreatureOnHear(std::shared_ptr<Creature> creature, std::shared return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.creatureOnHear, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -365,12 +374,12 @@ void Events::eventCreatureOnHear(std::shared_ptr<Creature> creature, std::shared scriptInterface.callVoidFunction(4); } -void Events::eventCreatureOnDrainHealth(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) { +void Events::eventCreatureOnDrainHealth(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary) { if (info.creatureOnDrainHealth == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventCreatureOnDrainHealth - " "Creature {} attacker {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -378,7 +387,7 @@ void Events::eventCreatureOnDrainHealth(std::shared_ptr<Creature> creature, std: return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.creatureOnDrainHealth, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -405,7 +414,7 @@ void Events::eventCreatureOnDrainHealth(std::shared_ptr<Creature> creature, std: lua_pushnumber(L, colorPrimary); lua_pushnumber(L, colorSecondary); - if (scriptInterface.protectedCall(L, 8, 6) != 0) { + if (LuaScriptInterface::protectedCall(L, 8, 6) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { typePrimary = LuaScriptInterface::getNumber<CombatType_t>(L, -6); @@ -417,17 +426,17 @@ void Events::eventCreatureOnDrainHealth(std::shared_ptr<Creature> creature, std: lua_pop(L, 6); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } // Party -bool Events::eventPartyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Player> player) { +bool Events::eventPartyOnJoin(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) { // Party:onJoin(player) or Party.onJoin(self, player) if (info.partyOnJoin == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPartyOnJoin - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -435,7 +444,7 @@ bool Events::eventPartyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Play return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.partyOnJoin, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -450,13 +459,13 @@ bool Events::eventPartyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Play return scriptInterface.callFunction(2); } -bool Events::eventPartyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Player> player) { +bool Events::eventPartyOnLeave(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player) { // Party:onLeave(player) or Party.onLeave(self, player) if (info.partyOnLeave == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPartyOnLeave - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -464,7 +473,7 @@ bool Events::eventPartyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Pla return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.partyOnLeave, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -479,20 +488,20 @@ bool Events::eventPartyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Pla return scriptInterface.callFunction(2); } -bool Events::eventPartyOnDisband(std::shared_ptr<Party> party) { +bool Events::eventPartyOnDisband(const std::shared_ptr<Party> &party) { // Party:onDisband() or Party.onDisband(self) if (info.partyOnDisband == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPartyOnDisband - Party leader {}] Call stack " "overflow. Too many lua script calls being nested.", party->getLeader() ? party->getLeader()->getName() : "unknown"); return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.partyOnDisband, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -504,18 +513,18 @@ bool Events::eventPartyOnDisband(std::shared_ptr<Party> party) { return scriptInterface.callFunction(1); } -void Events::eventPartyOnShareExperience(std::shared_ptr<Party> party, uint64_t &exp) { +void Events::eventPartyOnShareExperience(const std::shared_ptr<Party> &party, uint64_t &exp) { // Party:onShareExperience(exp) or Party.onShareExperience(self, exp) if (info.partyOnShareExperience == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("Party leader {}. Call stack overflow. Too many lua script calls being nested.", party->getLeader() ? party->getLeader()->getName() : "unknown"); return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.partyOnShareExperience, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -526,24 +535,24 @@ void Events::eventPartyOnShareExperience(std::shared_ptr<Party> party, uint64_t lua_pushnumber(L, exp); - if (scriptInterface.protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } // Player -bool Events::eventPlayerOnBrowseField(std::shared_ptr<Player> player, const Position &position) { +bool Events::eventPlayerOnBrowseField(const std::shared_ptr<Player> &player, const Position &position) { // Player:onBrowseField(position) or Player.onBrowseField(self, position) if (info.playerOnBrowseField == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnBrowseField - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -551,7 +560,7 @@ bool Events::eventPlayerOnBrowseField(std::shared_ptr<Player> player, const Posi return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnBrowseField, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -565,13 +574,13 @@ bool Events::eventPlayerOnBrowseField(std::shared_ptr<Player> player, const Posi return scriptInterface.callFunction(2); } -void Events::eventPlayerOnLook(std::shared_ptr<Player> player, const Position &position, std::shared_ptr<Thing> thing, uint8_t stackpos, int32_t lookDistance) { +void Events::eventPlayerOnLook(const std::shared_ptr<Player> &player, const Position &position, const std::shared_ptr<Thing> &thing, uint8_t stackpos, int32_t lookDistance) { // Player:onLook(thing, position, distance) or Player.onLook(self, thing, position, distance) if (info.playerOnLook == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLook - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -579,7 +588,7 @@ void Events::eventPlayerOnLook(std::shared_ptr<Player> player, const Position &p return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnLook, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -588,10 +597,10 @@ void Events::eventPlayerOnLook(std::shared_ptr<Player> player, const Position &p LuaScriptInterface::pushUserdata<Player>(L, player); LuaScriptInterface::setMetatable(L, -1, "Player"); - if (std::shared_ptr<Creature> creature = thing->getCreature()) { + if (const std::shared_ptr<Creature> &creature = thing->getCreature()) { LuaScriptInterface::pushUserdata<Creature>(L, creature); LuaScriptInterface::setCreatureMetatable(L, -1, creature); - } else if (std::shared_ptr<Item> item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { LuaScriptInterface::pushUserdata<Item>(L, item); LuaScriptInterface::setItemMetatable(L, -1, item); } else { @@ -604,13 +613,13 @@ void Events::eventPlayerOnLook(std::shared_ptr<Player> player, const Position &p scriptInterface.callVoidFunction(4); } -void Events::eventPlayerOnLookInBattleList(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, int32_t lookDistance) { +void Events::eventPlayerOnLookInBattleList(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, int32_t lookDistance) { // Player:onLookInBattleList(creature, position, distance) or Player.onLookInBattleList(self, creature, position, distance) if (info.playerOnLookInBattleList == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInBattleList - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -618,7 +627,7 @@ void Events::eventPlayerOnLookInBattleList(std::shared_ptr<Player> player, std:: return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnLookInBattleList, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -635,13 +644,13 @@ void Events::eventPlayerOnLookInBattleList(std::shared_ptr<Player> player, std:: scriptInterface.callVoidFunction(3); } -void Events::eventPlayerOnLookInTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> partner, std::shared_ptr<Item> item, int32_t lookDistance) { +void Events::eventPlayerOnLookInTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &partner, const std::shared_ptr<Item> &item, int32_t lookDistance) { // Player:onLookInTrade(partner, item, distance) or Player.onLookInTrade(self, partner, item, distance) if (info.playerOnLookInTrade == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInTrade - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -649,7 +658,7 @@ void Events::eventPlayerOnLookInTrade(std::shared_ptr<Player> player, std::share return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnLookInTrade, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -669,13 +678,13 @@ void Events::eventPlayerOnLookInTrade(std::shared_ptr<Player> player, std::share scriptInterface.callVoidFunction(4); } -bool Events::eventPlayerOnLookInShop(std::shared_ptr<Player> player, const ItemType* itemType, uint8_t count) { +bool Events::eventPlayerOnLookInShop(const std::shared_ptr<Player> &player, const ItemType* itemType, uint8_t count) { // Player:onLookInShop(itemType, count) or Player.onLookInShop(self, itemType, count) if (info.playerOnLookInShop == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLookInShop - " "Player {} itemType {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -683,7 +692,7 @@ bool Events::eventPlayerOnLookInShop(std::shared_ptr<Player> player, const ItemT return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnLookInShop, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -700,13 +709,13 @@ bool Events::eventPlayerOnLookInShop(std::shared_ptr<Player> player, const ItemT return scriptInterface.callFunction(3); } -bool Events::eventPlayerOnRemoveCount(std::shared_ptr<Player> player, std::shared_ptr<Item> item) { +bool Events::eventPlayerOnRemoveCount(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item) { // Player:onMove() if (info.playerOnRemoveCount == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMove - " "Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -714,7 +723,7 @@ bool Events::eventPlayerOnRemoveCount(std::shared_ptr<Player> player, std::share return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnRemoveCount, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -729,13 +738,13 @@ bool Events::eventPlayerOnRemoveCount(std::shared_ptr<Player> player, std::share return scriptInterface.callFunction(2); } -bool Events::eventPlayerOnMoveItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) { +bool Events::eventPlayerOnMoveItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) { // Player:onMoveItem(item, count, fromPosition, toPosition) or Player.onMoveItem(self, item, count, fromPosition, toPosition, fromCylinder, toCylinder) if (info.playerOnMoveItem == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMoveItem - " "Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -743,7 +752,7 @@ bool Events::eventPlayerOnMoveItem(std::shared_ptr<Player> player, std::shared_p return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnMoveItem, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -765,13 +774,13 @@ bool Events::eventPlayerOnMoveItem(std::shared_ptr<Player> player, std::shared_p return scriptInterface.callFunction(7); } -void Events::eventPlayerOnItemMoved(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder) { +void Events::eventPlayerOnItemMoved(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder) { // Player:onItemMoved(item, count, fromPosition, toPosition) or Player.onItemMoved(self, item, count, fromPosition, toPosition, fromCylinder, toCylinder) if (info.playerOnItemMoved == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnItemMoved - " "Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -779,7 +788,7 @@ void Events::eventPlayerOnItemMoved(std::shared_ptr<Player> player, std::shared_ return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnItemMoved, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -801,13 +810,13 @@ void Events::eventPlayerOnItemMoved(std::shared_ptr<Player> player, std::shared_ scriptInterface.callVoidFunction(7); } -void Events::eventPlayerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t zone) { +void Events::eventPlayerOnChangeZone(const std::shared_ptr<Player> &player, ZoneType_t zone) { // Player:onChangeZone(zone) if (info.playerOnChangeZone == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnChangeZone - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -815,7 +824,7 @@ void Events::eventPlayerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnChangeZone, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -828,13 +837,13 @@ void Events::eventPlayerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t scriptInterface.callVoidFunction(2); } -bool Events::eventPlayerOnMoveCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, const Position &fromPosition, const Position &toPosition) { +bool Events::eventPlayerOnMoveCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, const Position &fromPosition, const Position &toPosition) { // Player:onMoveCreature(creature, fromPosition, toPosition) or Player.onMoveCreature(self, creature, fromPosition, toPosition) if (info.playerOnMoveCreature == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnMoveCreature - " "Player {} creature {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -842,7 +851,7 @@ bool Events::eventPlayerOnMoveCreature(std::shared_ptr<Player> player, std::shar return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnMoveCreature, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -860,13 +869,13 @@ bool Events::eventPlayerOnMoveCreature(std::shared_ptr<Player> player, std::shar return scriptInterface.callFunction(4); } -void Events::eventPlayerOnReportRuleViolation(std::shared_ptr<Player> player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) { +void Events::eventPlayerOnReportRuleViolation(const std::shared_ptr<Player> &player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation) { // Player:onReportRuleViolation(targetName, reportType, reportReason, comment, translation) if (info.playerOnReportRuleViolation == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnReportRuleViolation - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -874,7 +883,7 @@ void Events::eventPlayerOnReportRuleViolation(std::shared_ptr<Player> player, co return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnReportRuleViolation, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -894,13 +903,13 @@ void Events::eventPlayerOnReportRuleViolation(std::shared_ptr<Player> player, co scriptInterface.callVoidFunction(6); } -bool Events::eventPlayerOnReportBug(std::shared_ptr<Player> player, const std::string &message, const Position &position, uint8_t category) { +bool Events::eventPlayerOnReportBug(const std::shared_ptr<Player> &player, const std::string &message, const Position &position, uint8_t category) { // Player:onReportBug(message, position, category) if (info.playerOnReportBug == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnReportBug - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -908,7 +917,7 @@ bool Events::eventPlayerOnReportBug(std::shared_ptr<Player> player, const std::s return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnReportBug, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -924,13 +933,13 @@ bool Events::eventPlayerOnReportBug(std::shared_ptr<Player> player, const std::s return scriptInterface.callFunction(4); } -bool Events::eventPlayerOnTurn(std::shared_ptr<Player> player, Direction direction) { +bool Events::eventPlayerOnTurn(const std::shared_ptr<Player> &player, Direction direction) { // Player:onTurn(direction) or Player.onTurn(self, direction) if (info.playerOnTurn == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTurn - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -938,7 +947,7 @@ bool Events::eventPlayerOnTurn(std::shared_ptr<Player> player, Direction directi return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnTurn, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -952,13 +961,13 @@ bool Events::eventPlayerOnTurn(std::shared_ptr<Player> player, Direction directi return scriptInterface.callFunction(2); } -bool Events::eventPlayerOnTradeRequest(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item) { +bool Events::eventPlayerOnTradeRequest(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item) { // Player:onTradeRequest(target, item) if (info.playerOnTradeRequest == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTradeRequest - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -966,7 +975,7 @@ bool Events::eventPlayerOnTradeRequest(std::shared_ptr<Player> player, std::shar return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnTradeRequest, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -984,13 +993,13 @@ bool Events::eventPlayerOnTradeRequest(std::shared_ptr<Player> player, std::shar return scriptInterface.callFunction(3); } -bool Events::eventPlayerOnTradeAccept(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item, std::shared_ptr<Item> targetItem) { +bool Events::eventPlayerOnTradeAccept(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &targetItem) { // Player:onTradeAccept(target, item, targetItem) if (info.playerOnTradeAccept == -1) { return true; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnTradeAccept - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -998,7 +1007,7 @@ bool Events::eventPlayerOnTradeAccept(std::shared_ptr<Player> player, std::share return false; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnTradeAccept, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1019,14 +1028,14 @@ bool Events::eventPlayerOnTradeAccept(std::shared_ptr<Player> player, std::share return scriptInterface.callFunction(4); } -void Events::eventPlayerOnGainExperience(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint64_t &exp, uint64_t rawExp) { +void Events::eventPlayerOnGainExperience(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint64_t &exp, uint64_t rawExp) { // Player:onGainExperience(target, exp, rawExp) // rawExp gives the original exp which is not multiplied if (info.playerOnGainExperience == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnGainExperience - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1034,7 +1043,7 @@ void Events::eventPlayerOnGainExperience(std::shared_ptr<Player> player, std::sh return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnGainExperience, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1053,23 +1062,23 @@ void Events::eventPlayerOnGainExperience(std::shared_ptr<Player> player, std::sh lua_pushnumber(L, exp); lua_pushnumber(L, rawExp); - if (scriptInterface.protectedCall(L, 4, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 4, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void Events::eventPlayerOnLoseExperience(std::shared_ptr<Player> player, uint64_t &exp) { +void Events::eventPlayerOnLoseExperience(const std::shared_ptr<Player> &player, uint64_t &exp) { // Player:onLoseExperience(exp) if (info.playerOnLoseExperience == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnLoseExperience - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1077,7 +1086,7 @@ void Events::eventPlayerOnLoseExperience(std::shared_ptr<Player> player, uint64_ return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnLoseExperience, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1088,23 +1097,23 @@ void Events::eventPlayerOnLoseExperience(std::shared_ptr<Player> player, uint64_ lua_pushnumber(L, exp); - if (scriptInterface.protectedCall(L, 2, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 2, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { exp = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void Events::eventPlayerOnGainSkillTries(std::shared_ptr<Player> player, skills_t skill, uint64_t &tries) { +void Events::eventPlayerOnGainSkillTries(const std::shared_ptr<Player> &player, skills_t skill, uint64_t &tries) { // Player:onGainSkillTries(skill, tries) if (info.playerOnGainSkillTries == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnGainSkillTries - " "Player {} skill {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1112,7 +1121,7 @@ void Events::eventPlayerOnGainSkillTries(std::shared_ptr<Player> player, skills_ return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnGainSkillTries, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1124,23 +1133,23 @@ void Events::eventPlayerOnGainSkillTries(std::shared_ptr<Player> player, skills_ lua_pushnumber(L, skill); lua_pushnumber(L, tries); - if (scriptInterface.protectedCall(L, 3, 1) != 0) { + if (LuaScriptInterface::protectedCall(L, 3, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { tries = LuaScriptInterface::getNumber<uint64_t>(L, -1); lua_pop(L, 1); } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void Events::eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, CombatDamage &damage) { +void Events::eventPlayerOnCombat(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, CombatDamage &damage) { // Player:onCombat(target, item, primaryDamage, primaryType, secondaryDamage, secondaryType) if (info.playerOnCombat == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnCombat - " "Player {} target {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1148,7 +1157,7 @@ void Events::eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnCombat, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1159,7 +1168,7 @@ void Events::eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr if (target) { LuaScriptInterface::pushUserdata<Creature>(L, target); - LuaScriptInterface::setMetatable(L, -1, "Creature"); + LuaScriptInterface::setCreatureMetatable(L, -1, target); } else { lua_pushnil(L); } @@ -1173,7 +1182,7 @@ void Events::eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr LuaScriptInterface::pushCombatDamage(L, damage); - if (scriptInterface.protectedCall(L, 8, 4) != 0) { + if (LuaScriptInterface::protectedCall(L, 8, 4) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(L)); } else { damage.primary.value = std::abs(LuaScriptInterface::getNumber<int32_t>(L, -4)); @@ -1188,16 +1197,16 @@ void Events::eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr } } - scriptInterface.resetScriptEnv(); + LuaScriptInterface::resetScriptEnv(); } -void Events::eventPlayerOnRequestQuestLog(std::shared_ptr<Player> player) { +void Events::eventPlayerOnRequestQuestLog(const std::shared_ptr<Player> &player) { // Player:onRequestQuestLog() if (info.playerOnRequestQuestLog == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnRequestQuestLog - " "Player {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1205,7 +1214,7 @@ void Events::eventPlayerOnRequestQuestLog(std::shared_ptr<Player> player) { return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnRequestQuestLog, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1217,13 +1226,13 @@ void Events::eventPlayerOnRequestQuestLog(std::shared_ptr<Player> player) { scriptInterface.callVoidFunction(1); } -void Events::eventPlayerOnRequestQuestLine(std::shared_ptr<Player> player, uint16_t questId) { +void Events::eventPlayerOnRequestQuestLine(const std::shared_ptr<Player> &player, uint16_t questId) { // Player::onRequestQuestLine() if (info.playerOnRequestQuestLine == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventPlayerOnRequestQuestLine - " "Player {} questId {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1231,7 +1240,7 @@ void Events::eventPlayerOnRequestQuestLine(std::shared_ptr<Player> player, uint1 return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnRequestQuestLine, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1245,18 +1254,18 @@ void Events::eventPlayerOnRequestQuestLine(std::shared_ptr<Player> player, uint1 scriptInterface.callVoidFunction(2); } -void Events::eventPlayerOnInventoryUpdate(std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool equip) { +void Events::eventPlayerOnInventoryUpdate(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool equip) { // Player:onInventoryUpdate(item, slot, equip) if (info.playerOnInventoryUpdate == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[{}] Call stack overflow", __FUNCTION__); return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnInventoryUpdate, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1274,13 +1283,13 @@ void Events::eventPlayerOnInventoryUpdate(std::shared_ptr<Player> player, std::s scriptInterface.callVoidFunction(4); } -void Events::eventOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) { +void Events::eventOnStorageUpdate(const std::shared_ptr<Player> &player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime) { // Player::onStorageUpdate(key, value, oldValue, currentTime) if (info.playerOnStorageUpdate == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventOnStorageUpdate - " "Player {} key {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1288,7 +1297,7 @@ void Events::eventOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.playerOnStorageUpdate, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); @@ -1306,13 +1315,13 @@ void Events::eventOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t } // Monster -void Events::eventMonsterOnDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse) { +void Events::eventMonsterOnDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse) { // Monster:onDropLoot(corpse) if (info.monsterOnDropLoot == -1) { return; } - if (!scriptInterface.reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[Events::eventMonsterOnDropLoot - " "Monster corpse {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -1320,7 +1329,7 @@ void Events::eventMonsterOnDropLoot(std::shared_ptr<Monster> monster, std::share return; } - ScriptEnvironment* env = scriptInterface.getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(info.monsterOnDropLoot, &scriptInterface); lua_State* L = scriptInterface.getLuaState(); diff --git a/src/lua/creature/events.hpp b/src/lua/creature/events.hpp index 1ec6d4ba8..a74cbaf3c 100644 --- a/src/lua/creature/events.hpp +++ b/src/lua/creature/events.hpp @@ -9,14 +9,31 @@ #pragma once -#include "creatures/players/imbuements/imbuements.hpp" #include "lua/scripts/luascript.hpp" -#include "creatures/combat/spells.hpp" +enum ReturnValue : uint16_t; +enum SpeakClasses : uint8_t; +enum TextColor_t : uint8_t; +enum CombatType_t : uint8_t; +enum Direction : uint8_t; +enum skills_t : int8_t; +enum Slots_t : uint8_t; +enum ZoneType_t : uint8_t; +struct Position; +struct Outfit_t; +struct CombatDamage; class Party; class ItemType; -class Tile; class Imbuements; +class Monster; +class Player; +class Item; +class Creature; +class Npc; +class Tile; +class Thing; +class Cylinder; +class Container; class Events { struct EventsInfo { @@ -76,54 +93,52 @@ class Events { Events(const Events &) = delete; void operator=(const Events &) = delete; - static Events &getInstance() { - return inject<Events>(); - } + static Events &getInstance(); // Creature - bool eventCreatureOnChangeOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit); - ReturnValue eventCreatureOnAreaCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Tile> tile, bool aggressive); - ReturnValue eventCreatureOnTargetCombat(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target); - void eventCreatureOnHear(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> speaker, const std::string &words, SpeakClasses type); - void eventCreatureOnDrainHealth(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary); + bool eventCreatureOnChangeOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit); + ReturnValue eventCreatureOnAreaCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile, bool aggressive); + ReturnValue eventCreatureOnTargetCombat(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &target); + void eventCreatureOnHear(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &speaker, const std::string &words, SpeakClasses type); + void eventCreatureOnDrainHealth(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Creature> &attacker, CombatType_t &typePrimary, int32_t &damagePrimary, CombatType_t &typeSecondary, int32_t &damageSecondary, TextColor_t &colorPrimary, TextColor_t &colorSecondary); // Party - bool eventPartyOnJoin(std::shared_ptr<Party> party, std::shared_ptr<Player> player); - bool eventPartyOnLeave(std::shared_ptr<Party> party, std::shared_ptr<Player> player); - bool eventPartyOnDisband(std::shared_ptr<Party> party); - void eventPartyOnShareExperience(std::shared_ptr<Party> party, uint64_t &exp); + bool eventPartyOnJoin(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player); + bool eventPartyOnLeave(const std::shared_ptr<Party> &party, const std::shared_ptr<Player> &player); + bool eventPartyOnDisband(const std::shared_ptr<Party> &party); + void eventPartyOnShareExperience(const std::shared_ptr<Party> &party, uint64_t &exp); // Player - bool eventPlayerOnBrowseField(std::shared_ptr<Player> player, const Position &position); - void eventPlayerOnLook(std::shared_ptr<Player> player, const Position &position, std::shared_ptr<Thing> thing, uint8_t stackpos, int32_t lookDistance); - void eventPlayerOnLookInBattleList(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, int32_t lookDistance); - void eventPlayerOnLookInTrade(std::shared_ptr<Player> player, std::shared_ptr<Player> partner, std::shared_ptr<Item> item, int32_t lookDistance); - bool eventPlayerOnLookInShop(std::shared_ptr<Player> player, const ItemType* itemType, uint8_t count); - bool eventPlayerOnMoveItem(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder); - void eventPlayerOnItemMoved(std::shared_ptr<Player> player, std::shared_ptr<Item> item, uint16_t count, const Position &fromPosition, const Position &toPosition, std::shared_ptr<Cylinder> fromCylinder, std::shared_ptr<Cylinder> toCylinder); - void eventPlayerOnChangeZone(std::shared_ptr<Player> player, ZoneType_t zone); - bool eventPlayerOnMoveCreature(std::shared_ptr<Player> player, std::shared_ptr<Creature> creature, const Position &fromPosition, const Position &toPosition); - void eventPlayerOnReportRuleViolation(std::shared_ptr<Player> player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation); - bool eventPlayerOnReportBug(std::shared_ptr<Player> player, const std::string &message, const Position &position, uint8_t category); - bool eventPlayerOnTurn(std::shared_ptr<Player> player, Direction direction); - bool eventPlayerOnTradeRequest(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item); - bool eventPlayerOnTradeAccept(std::shared_ptr<Player> player, std::shared_ptr<Player> target, std::shared_ptr<Item> item, std::shared_ptr<Item> targetItem); - void eventPlayerOnGainExperience(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, uint64_t &exp, uint64_t rawExp); - void eventPlayerOnLoseExperience(std::shared_ptr<Player> player, uint64_t &exp); - void eventPlayerOnGainSkillTries(std::shared_ptr<Player> player, skills_t skill, uint64_t &tries); - bool eventPlayerOnRemoveCount(std::shared_ptr<Player> player, std::shared_ptr<Item> item); - void eventPlayerOnRequestQuestLog(std::shared_ptr<Player> player); - void eventPlayerOnRequestQuestLine(std::shared_ptr<Player> player, uint16_t questId); - void eventOnStorageUpdate(std::shared_ptr<Player> player, const uint32_t key, const int32_t value, int32_t oldValue, uint64_t currentTime); - void eventPlayerOnCombat(std::shared_ptr<Player> player, std::shared_ptr<Creature> target, std::shared_ptr<Item> item, CombatDamage &damage); - void eventPlayerOnInventoryUpdate(std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool equip); + bool eventPlayerOnBrowseField(const std::shared_ptr<Player> &player, const Position &position); + void eventPlayerOnLook(const std::shared_ptr<Player> &player, const Position &position, const std::shared_ptr<Thing> &thing, uint8_t stackpos, int32_t lookDistance); + void eventPlayerOnLookInBattleList(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, int32_t lookDistance); + void eventPlayerOnLookInTrade(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &partner, const std::shared_ptr<Item> &item, int32_t lookDistance); + bool eventPlayerOnLookInShop(const std::shared_ptr<Player> &player, const ItemType* itemType, uint8_t count); + bool eventPlayerOnMoveItem(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder); + void eventPlayerOnItemMoved(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, uint16_t count, const Position &fromPosition, const Position &toPosition, const std::shared_ptr<Cylinder> &fromCylinder, const std::shared_ptr<Cylinder> &toCylinder); + void eventPlayerOnChangeZone(const std::shared_ptr<Player> &player, ZoneType_t zone); + bool eventPlayerOnMoveCreature(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &creature, const Position &fromPosition, const Position &toPosition); + void eventPlayerOnReportRuleViolation(const std::shared_ptr<Player> &player, const std::string &targetName, uint8_t reportType, uint8_t reportReason, const std::string &comment, const std::string &translation); + bool eventPlayerOnReportBug(const std::shared_ptr<Player> &player, const std::string &message, const Position &position, uint8_t category); + bool eventPlayerOnTurn(const std::shared_ptr<Player> &player, Direction direction); + bool eventPlayerOnTradeRequest(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item); + bool eventPlayerOnTradeAccept(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target, const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &targetItem); + void eventPlayerOnGainExperience(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, uint64_t &exp, uint64_t rawExp); + void eventPlayerOnLoseExperience(const std::shared_ptr<Player> &player, uint64_t &exp); + void eventPlayerOnGainSkillTries(const std::shared_ptr<Player> &player, skills_t skill, uint64_t &tries); + bool eventPlayerOnRemoveCount(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item); + void eventPlayerOnRequestQuestLog(const std::shared_ptr<Player> &player); + void eventPlayerOnRequestQuestLine(const std::shared_ptr<Player> &player, uint16_t questId); + void eventOnStorageUpdate(const std::shared_ptr<Player> &player, uint32_t key, int32_t value, int32_t oldValue, uint64_t currentTime); + void eventPlayerOnCombat(const std::shared_ptr<Player> &player, const std::shared_ptr<Creature> &target, const std::shared_ptr<Item> &item, CombatDamage &damage); + void eventPlayerOnInventoryUpdate(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool equip); // Monster - void eventMonsterOnDropLoot(std::shared_ptr<Monster> monster, std::shared_ptr<Container> corpse); - void eventMonsterOnSpawn(std::shared_ptr<Monster> monster, const Position &position); + void eventMonsterOnDropLoot(const std::shared_ptr<Monster> &monster, const std::shared_ptr<Container> &corpse); + void eventMonsterOnSpawn(const std::shared_ptr<Monster> &monster, const Position &position); // Monster - void eventNpcOnSpawn(std::shared_ptr<Npc> npc, const Position &position); + void eventNpcOnSpawn(const std::shared_ptr<Npc> &npc, const Position &position); private: LuaScriptInterface scriptInterface; diff --git a/src/lua/creature/movement.cpp b/src/lua/creature/movement.cpp index b75ff31c6..684f0844e 100644 --- a/src/lua/creature/movement.cpp +++ b/src/lua/creature/movement.cpp @@ -7,47 +7,24 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/creature/movement.hpp" +#include "creatures/combat/combat.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "lua/creature/events.hpp" #include "lua/callbacks/event_callback.hpp" #include "lua/callbacks/events_callbacks.hpp" -#include "lua/creature/movement.hpp" - -void MoveEvents::clear(bool isFromXML /*= false*/) { - if (isFromXML) { - int numRemoved = 0; - for (auto &pair : itemIdMap) { - MoveEventList &moveEventList = pair.second; - - for (int moveEventType = 0; moveEventType < MOVE_EVENT_LAST; ++moveEventType) { - auto &eventList = moveEventList.moveEvent[moveEventType]; - - eventList.remove_if([&](const std::shared_ptr<MoveEvent> &moveEvent) { - bool removed = moveEvent && moveEvent->isFromXML(); - if (removed) { - g_logger().debug("MoveEvent with id '{}' is from XML and will be removed.", pair.first); - ++numRemoved; - } - return removed; - }); - } - } - - if (numRemoved > 0) { - g_logger().debug("Removed '{}' MoveEvent from XML.", numRemoved); - } - return; - } +#include "lua/creature/events.hpp" +void MoveEvents::clear() { uniqueIdMap.clear(); actionIdMap.clear(); itemIdMap.clear(); positionsMap.clear(); } -bool MoveEvents::registerLuaItemEvent(const std::shared_ptr<MoveEvent> moveEvent) { +bool MoveEvents::registerLuaItemEvent(const std::shared_ptr<MoveEvent> &moveEvent) { auto itemIdVector = moveEvent->getItemIdsVector(); if (itemIdVector.empty()) { return false; @@ -73,7 +50,7 @@ bool MoveEvents::registerLuaItemEvent(const std::shared_ptr<MoveEvent> moveEvent return !itemIdVector.empty(); } -bool MoveEvents::registerLuaActionEvent(const std::shared_ptr<MoveEvent> moveEvent) { +bool MoveEvents::registerLuaActionEvent(const std::shared_ptr<MoveEvent> &moveEvent) { auto actionIdVector = moveEvent->getActionIdsVector(); if (actionIdVector.empty()) { return false; @@ -92,7 +69,7 @@ bool MoveEvents::registerLuaActionEvent(const std::shared_ptr<MoveEvent> moveEve return !actionIdVector.empty(); } -bool MoveEvents::registerLuaUniqueEvent(const std::shared_ptr<MoveEvent> moveEvent) { +bool MoveEvents::registerLuaUniqueEvent(const std::shared_ptr<MoveEvent> &moveEvent) { auto uniqueIdVector = moveEvent->getUniqueIdsVector(); if (uniqueIdVector.empty()) { return false; @@ -111,7 +88,7 @@ bool MoveEvents::registerLuaUniqueEvent(const std::shared_ptr<MoveEvent> moveEve return !uniqueIdVector.empty(); } -bool MoveEvents::registerLuaPositionEvent(const std::shared_ptr<MoveEvent> moveEvent) { +bool MoveEvents::registerLuaPositionEvent(const std::shared_ptr<MoveEvent> &moveEvent) { auto positionVector = moveEvent->getPositionsVector(); if (positionVector.empty()) { return false; @@ -130,7 +107,7 @@ bool MoveEvents::registerLuaPositionEvent(const std::shared_ptr<MoveEvent> moveE return !positionVector.empty(); } -bool MoveEvents::registerLuaEvent(const std::shared_ptr<MoveEvent> moveEvent) { +bool MoveEvents::registerLuaEvent(const std::shared_ptr<MoveEvent> &moveEvent) { // Check if event is correct if (registerLuaItemEvent(moveEvent) || registerLuaUniqueEvent(moveEvent) @@ -147,8 +124,8 @@ bool MoveEvents::registerLuaEvent(const std::shared_ptr<MoveEvent> moveEvent) { } } -bool MoveEvents::registerEvent(const std::shared_ptr<MoveEvent> moveEvent, int32_t id, std::map<int32_t, MoveEventList> &moveListMap) const { - auto it = moveListMap.find(id); +bool MoveEvents::registerEvent(const std::shared_ptr<MoveEvent> &moveEvent, int32_t id, std::map<int32_t, MoveEventList> &moveListMap) const { + const auto it = moveListMap.find(id); if (it == moveListMap.end()) { MoveEventList moveEventList; moveEventList.moveEvent[moveEvent->getEventType()].push_back(moveEvent); @@ -211,9 +188,9 @@ std::shared_ptr<MoveEvent> MoveEvents::getEvent(const std::shared_ptr<Item> &ite } if (item->hasAttribute(ItemAttribute_t::ACTIONID)) { - std::map<int32_t, MoveEventList>::iterator it = actionIdMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)); + auto it = actionIdMap.find(item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID)); if (it != actionIdMap.end()) { - std::list<std::shared_ptr<MoveEvent>> moveEventList = it->second.moveEvent[eventType]; + const std::list<std::shared_ptr<MoveEvent>> moveEventList = it->second.moveEvent[eventType]; for (const auto &moveEvent : moveEventList) { if ((moveEvent->getSlot() & slotp) != 0) { return moveEvent; @@ -224,7 +201,7 @@ std::shared_ptr<MoveEvent> MoveEvents::getEvent(const std::shared_ptr<Item> &ite auto it = itemIdMap.find(item->getID()); if (it != itemIdMap.end()) { - std::list<std::shared_ptr<MoveEvent>> &moveEventList = it->second.moveEvent[eventType]; + const std::list<std::shared_ptr<MoveEvent>> &moveEventList = it->second.moveEvent[eventType]; for (const auto &moveEvent : moveEventList) { if ((moveEvent->getSlot() & slotp) != 0) { return moveEvent; @@ -266,8 +243,8 @@ std::shared_ptr<MoveEvent> MoveEvents::getEvent(const std::shared_ptr<Item> &ite return nullptr; } -bool MoveEvents::registerEvent(const std::shared_ptr<MoveEvent> moveEvent, const Position &position, std::map<Position, MoveEventList> &moveListMap) const { - auto it = moveListMap.find(position); +bool MoveEvents::registerEvent(const std::shared_ptr<MoveEvent> &moveEvent, const Position &position, std::map<Position, MoveEventList> &moveListMap) const { + const auto it = moveListMap.find(position); if (it == moveListMap.end()) { MoveEventList moveEventList; moveEventList.moveEvent[moveEvent->getEventType()].push_back(moveEvent); @@ -291,7 +268,7 @@ bool MoveEvents::registerEvent(const std::shared_ptr<MoveEvent> moveEvent, const } std::shared_ptr<MoveEvent> MoveEvents::getEvent(const std::shared_ptr<Tile> &tile, MoveEvent_t eventType) { - if (auto it = positionsMap.find(tile->getPosition()); + if (const auto it = positionsMap.find(tile->getPosition()); it != positionsMap.end()) { std::list<std::shared_ptr<MoveEvent>> &moveEventList = it->second.moveEvent[eventType]; if (!moveEventList.empty()) { @@ -312,19 +289,19 @@ uint32_t MoveEvents::onCreatureMove(const std::shared_ptr<Creature> &creature, c } for (size_t i = tile->getFirstIndex(), j = tile->getLastIndex(); i < j; ++i) { - std::shared_ptr<Thing> thing = tile->getThing(i); + const auto &thing = tile->getThing(i); if (!thing) { continue; } - std::shared_ptr<Item> tileItem = thing->getItem(); + const auto &tileItem = thing->getItem(); if (!tileItem) { continue; } moveEvent = getEvent(tileItem, eventType); if (moveEvent) { - auto step = moveEvent->fireStepEvent(creature, tileItem, pos); + const auto step = moveEvent->fireStepEvent(creature, tileItem, pos); // If there is any problem in the function, we will kill the loop if (step == 0) { break; @@ -336,7 +313,7 @@ uint32_t MoveEvents::onCreatureMove(const std::shared_ptr<Creature> &creature, c } uint32_t MoveEvents::onPlayerEquip(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool isCheck) { - const auto moveEvent = getEvent(item, MOVE_EVENT_EQUIP, slot); + const auto &moveEvent = getEvent(item, MOVE_EVENT_EQUIP, slot); if (!moveEvent) { return 1; } @@ -346,7 +323,7 @@ uint32_t MoveEvents::onPlayerEquip(const std::shared_ptr<Player> &player, const } uint32_t MoveEvents::onPlayerDeEquip(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot) { - const auto moveEvent = getEvent(item, MOVE_EVENT_DEEQUIP, slot); + const auto &moveEvent = getEvent(item, MOVE_EVENT_DEEQUIP, slot); if (!moveEvent) { return 1; } @@ -379,19 +356,19 @@ uint32_t MoveEvents::onItemMove(const std::shared_ptr<Item> &item, const std::sh } for (size_t i = tile->getFirstIndex(), j = tile->getLastIndex(); i < j; ++i) { - std::shared_ptr<Thing> thing = tile->getThing(i); + const auto &thing = tile->getThing(i); if (!thing) { continue; } - std::shared_ptr<Item> tileItem = thing->getItem(); + const auto &tileItem = thing->getItem(); if (!tileItem) { continue; } moveEvent = getEvent(tileItem, eventType2); if (moveEvent) { - auto moveItem = moveEvent->fireAddRemItem(item, tileItem, tile->getPosition()); + const auto &moveItem = moveEvent->fireAddRemItem(item, tileItem, tile->getPosition()); // If there is any problem in the function, we will kill the loop if (moveItem == 0) { break; @@ -430,11 +407,11 @@ std::string MoveEvent::getScriptTypeName() const { __FUNCTION__, getScriptInterface()->getLoadingScriptName() ); - return std::string(); + return {}; } } -uint32_t MoveEvent::StepInField(std::shared_ptr<Creature> creature, std::shared_ptr<Item> item, const Position &) { +uint32_t MoveEvent::StepInField(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &) { if (creature == nullptr) { g_logger().error("[MoveEvent::StepInField] - Creature is nullptr"); return 0; @@ -445,7 +422,7 @@ uint32_t MoveEvent::StepInField(std::shared_ptr<Creature> creature, std::shared_ return 0; } - std::shared_ptr<MagicField> field = item->getMagicField(); + const auto &field = item->getMagicField(); if (field) { field->onStepInField(creature); return 1; @@ -454,18 +431,18 @@ uint32_t MoveEvent::StepInField(std::shared_ptr<Creature> creature, std::shared_ return LUA_ERROR_ITEM_NOT_FOUND; } -uint32_t MoveEvent::StepOutField(std::shared_ptr<Creature>, std::shared_ptr<Item>, const Position &) { +uint32_t MoveEvent::StepOutField(const std::shared_ptr<Creature> &, const std::shared_ptr<Item> &, const Position &) { return 1; } -uint32_t MoveEvent::AddItemField(std::shared_ptr<Item> item, std::shared_ptr<Item>, const Position &) { +uint32_t MoveEvent::AddItemField(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &, const Position &) { if (item == nullptr) { g_logger().error("[MoveEvent::AddItemField] - Item is nullptr"); return 0; } - if (std::shared_ptr<MagicField> field = item->getMagicField()) { - std::shared_ptr<Tile> tile = item->getTile(); + if (const auto &field = item->getMagicField()) { + const auto &tile = item->getTile(); if (tile == nullptr) { g_logger().debug("[MoveEvent::AddItemField] - Tile is nullptr"); return 0; @@ -488,11 +465,11 @@ uint32_t MoveEvent::AddItemField(std::shared_ptr<Item> item, std::shared_ptr<Ite return LUA_ERROR_ITEM_NOT_FOUND; } -uint32_t MoveEvent::RemoveItemField(std::shared_ptr<Item>, std::shared_ptr<Item>, const Position &) { +uint32_t MoveEvent::RemoveItemField(const std::shared_ptr<Item> &, const std::shared_ptr<Item> &, const Position &) { return 1; } -uint32_t MoveEvent::EquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool isCheck) { +uint32_t MoveEvent::EquipItem(const std::shared_ptr<MoveEvent> &moveEvent, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool isCheck) { if (player == nullptr) { g_logger().error("[MoveEvent::EquipItem] - Player is nullptr"); return 0; @@ -546,12 +523,12 @@ uint32_t MoveEvent::EquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::s if (it.abilities) { if (it.abilities->invisible) { - std::shared_ptr<Condition> condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_INVISIBLE, -1, 0); + const auto &condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_INVISIBLE, -1, 0); player->addCondition(condition); } if (it.abilities->manaShield) { - std::shared_ptr<Condition> condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_MANASHIELD, -1, 0); + const auto &condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_MANASHIELD, -1, 0); player->addCondition(condition); } @@ -563,7 +540,7 @@ uint32_t MoveEvent::EquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::s player->sendIcons(); if (it.abilities->regeneration) { - std::shared_ptr<Condition> condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_REGENERATION, -1, 0); + const auto &condition = Condition::createCondition(static_cast<ConditionId_t>(slot), CONDITION_REGENERATION, -1, 0); if (it.abilities->getHealthGain() != 0) { condition->setParam(CONDITION_PARAM_HEALTHGAIN, it.abilities->getHealthGain()); @@ -613,7 +590,7 @@ uint32_t MoveEvent::EquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::s return 1; } -uint32_t MoveEvent::DeEquipItem(const std::shared_ptr<MoveEvent> MoveEvent, std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool) { +uint32_t MoveEvent::DeEquipItem(const std::shared_ptr<MoveEvent> &, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool) { if (player == nullptr) { g_logger().error("[MoveEvent::EquipItem] - Player is nullptr"); return 0; @@ -698,7 +675,7 @@ void MoveEvent::setEventType(MoveEvent_t type) { eventType = type; } -uint32_t MoveEvent::fireStepEvent(const std::shared_ptr<Creature> &creature, std::shared_ptr<Item> item, const Position &pos) const { +uint32_t MoveEvent::fireStepEvent(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos) const { if (isLoadedCallback()) { return executeStep(creature, item, pos); } else { @@ -706,14 +683,14 @@ uint32_t MoveEvent::fireStepEvent(const std::shared_ptr<Creature> &creature, std } } -bool MoveEvent::executeStep(const std::shared_ptr<Creature> &creature, std::shared_ptr<Item> item, const Position &pos) const { +bool MoveEvent::executeStep(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos) const { // onStepIn(creature, item, pos, fromPosition) // onStepOut(creature, item, pos, fromPosition) // Check if the new position is the same as the old one // If it is, log a warning and either teleport the player to their temple position if item type is an teleport - auto fromPosition = creature->getLastPosition(); - if (auto player = creature->getPlayer(); item && fromPosition == pos && getEventType() == MOVE_EVENT_STEP_IN) { + const auto fromPosition = creature->getLastPosition(); + if (const auto &player = creature->getPlayer(); item && fromPosition == pos && getEventType() == MOVE_EVENT_STEP_IN) { if (const ItemType &itemType = Item::items[item->getID()]; player && itemType.isTeleport()) { g_logger().warn("[{}] cannot teleport player: {}, to the same position: {} of fromPosition: {}", __FUNCTION__, player->getName(), pos.toString(), fromPosition.toString()); g_game().internalTeleport(player, player->getTemplePosition()); @@ -724,7 +701,7 @@ bool MoveEvent::executeStep(const std::shared_ptr<Creature> &creature, std::shar return false; } - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { if (item != nullptr) { g_logger().error("[MoveEvent::executeStep - Creature {} item {}, position {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -737,7 +714,7 @@ bool MoveEvent::executeStep(const std::shared_ptr<Creature> &creature, std::shar return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -768,14 +745,14 @@ uint32_t MoveEvent::fireEquip(const std::shared_ptr<Player> &player, const std:: bool MoveEvent::executeEquip(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t onSlot, bool isCheck) const { // onEquip(player, item, slot, isCheck) // onDeEquip(player, item, slot, isCheck) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[MoveEvent::executeEquip - Player {} item {}] " "Call stack overflow. Too many lua script calls being nested.", player->getName(), item->getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -801,7 +778,7 @@ uint32_t MoveEvent::fireAddRemItem(const std::shared_ptr<Item> &item, const std: bool MoveEvent::executeAddRemItem(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &fromTile, const Position &pos) const { // onAddItem(moveitem, tileitem, pos) // onRemoveItem(moveitem, tileitem, pos) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[MoveEvent::executeAddRemItem - " "Item {} item on tile x: {} y: {} z: {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -809,7 +786,7 @@ bool MoveEvent::executeAddRemItem(const std::shared_ptr<Item> &item, const std:: return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -833,7 +810,7 @@ uint32_t MoveEvent::fireAddRemItem(const std::shared_ptr<Item> &item, const Posi bool MoveEvent::executeAddRemItem(const std::shared_ptr<Item> &item, const Position &pos) const { // onaddItem(moveitem, pos) // onRemoveItem(moveitem, pos) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[MoveEvent::executeAddRemItem - " "Item {} item on tile x: {} y: {} z: {}] " "Call stack overflow. Too many lua script calls being nested.", @@ -841,7 +818,7 @@ bool MoveEvent::executeAddRemItem(const std::shared_ptr<Item> &item, const Posit return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); diff --git a/src/lua/creature/movement.hpp b/src/lua/creature/movement.hpp index b8168f585..58f42296f 100644 --- a/src/lua/creature/movement.hpp +++ b/src/lua/creature/movement.hpp @@ -46,7 +46,7 @@ class MoveEvents final : public Scripts { } bool hasPosition(Position position) const { - if (auto it = positionsMap.find(position); + if (const auto it = positionsMap.find(position); it != positionsMap.end()) { return true; } @@ -62,7 +62,7 @@ class MoveEvents final : public Scripts { } bool hasItemId(int32_t itemId) const { - if (auto it = itemIdMap.find(itemId); + if (const auto it = itemIdMap.find(itemId); it != itemIdMap.end()) { return true; } @@ -78,7 +78,7 @@ class MoveEvents final : public Scripts { } bool hasUniqueId(int32_t uniqueId) const { - if (auto it = uniqueIdMap.find(uniqueId); + if (const auto it = uniqueIdMap.find(uniqueId); it != uniqueIdMap.end()) { return true; } @@ -94,7 +94,7 @@ class MoveEvents final : public Scripts { } bool hasActionId(int32_t actionId) const { - if (auto it = actionIdMap.find(actionId); + if (const auto it = actionIdMap.find(actionId); it != actionIdMap.end()) { return true; } @@ -107,19 +107,16 @@ class MoveEvents final : public Scripts { std::shared_ptr<MoveEvent> getEvent(const std::shared_ptr<Item> &item, MoveEvent_t eventType); - bool registerLuaItemEvent(const std::shared_ptr<MoveEvent> moveEvent); - bool registerLuaActionEvent(const std::shared_ptr<MoveEvent> moveEvent); - bool registerLuaUniqueEvent(const std::shared_ptr<MoveEvent> moveEvent); - bool registerLuaPositionEvent(const std::shared_ptr<MoveEvent> moveEvent); - bool registerLuaEvent(const std::shared_ptr<MoveEvent> event); - void clear(bool isFromXML = false); + bool registerLuaItemEvent(const std::shared_ptr<MoveEvent> &moveEvent); + bool registerLuaActionEvent(const std::shared_ptr<MoveEvent> &moveEvent); + bool registerLuaUniqueEvent(const std::shared_ptr<MoveEvent> &moveEvent); + bool registerLuaPositionEvent(const std::shared_ptr<MoveEvent> &moveEvent); + bool registerLuaEvent(const std::shared_ptr<MoveEvent> &event); + void clear(); private: - void clearMap(std::map<int32_t, MoveEventList> &map) const; - void clearPosMap(std::map<Position, MoveEventList> &map); - - bool registerEvent(const std::shared_ptr<MoveEvent> moveEvent, int32_t id, std::map<int32_t, MoveEventList> &moveListMap) const; - bool registerEvent(const std::shared_ptr<MoveEvent> moveEvent, const Position &position, std::map<Position, MoveEventList> &moveListMap) const; + bool registerEvent(const std::shared_ptr<MoveEvent> &moveEvent, int32_t id, std::map<int32_t, MoveEventList> &moveListMap) const; + bool registerEvent(const std::shared_ptr<MoveEvent> &moveEvent, const Position &position, std::map<Position, MoveEventList> &moveListMap) const; std::shared_ptr<MoveEvent> getEvent(const std::shared_ptr<Tile> &tile, MoveEvent_t eventType); std::shared_ptr<MoveEvent> getEvent(const std::shared_ptr<Item> &item, MoveEvent_t eventType, Slots_t slot); @@ -139,7 +136,7 @@ class MoveEvent final : public Script, public SharedObject { MoveEvent_t getEventType() const; void setEventType(MoveEvent_t type); - uint32_t fireStepEvent(const std::shared_ptr<Creature> &creature, std::shared_ptr<Item> item, const Position &pos) const; + uint32_t fireStepEvent(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos) const; uint32_t fireAddRemItem(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &tileItem, const Position &pos) const; uint32_t fireAddRemItem(const std::shared_ptr<Item> &item, const Position &pos) const; uint32_t fireEquip(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool isCheck); @@ -149,7 +146,7 @@ class MoveEvent final : public Script, public SharedObject { } // Scripting to lua interface - bool executeStep(const std::shared_ptr<Creature> &creature, std::shared_ptr<Item> item, const Position &pos) const; + bool executeStep(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos) const; bool executeEquip(const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool isCheck) const; bool executeAddRemItem(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &tileItem, const Position &pos) const; // No have tile item @@ -178,8 +175,8 @@ class MoveEvent final : public Script, public SharedObject { const std::map<uint16_t, bool> &getVocEquipMap() const { return vocEquipMap; } - void addVocEquipMap(std::string vocName) { - uint16_t vocationId = g_vocations().getVocationId(vocName); + void addVocEquipMap(const std::string &vocName) { + const uint16_t vocationId = g_vocations().getVocationId(vocName); if (vocationId != 65535) { vocEquipMap[vocationId] = true; } @@ -217,47 +214,36 @@ class MoveEvent final : public Script, public SharedObject { void setSlot(uint32_t s) { slot = s; } - uint32_t getRequiredLevel() { + uint32_t getRequiredLevel() const { return reqLevel; } void setRequiredLevel(uint32_t level) { reqLevel = level; } - uint32_t getRequiredMagLevel() { + uint32_t getRequiredMagLevel() const { return reqMagLevel; } void setRequiredMagLevel(uint32_t level) { reqMagLevel = level; } - bool needPremium() { + bool needPremium() const { return premium; } void setNeedPremium(bool b) { premium = b; } - uint32_t getWieldInfo() { - return wieldInfo; - } void setWieldInfo(WieldInfo_t info) { wieldInfo |= info; } - static uint32_t StepInField(std::shared_ptr<Creature> creature, std::shared_ptr<Item> item, const Position &pos); - static uint32_t StepOutField(std::shared_ptr<Creature> creature, std::shared_ptr<Item> item, const Position &pos); - - static uint32_t AddItemField(std::shared_ptr<Item> item, std::shared_ptr<Item> tileItem, const Position &pos); - static uint32_t RemoveItemField(std::shared_ptr<Item> item, std::shared_ptr<Item> tileItem, const Position &pos); + static uint32_t StepInField(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos); + static uint32_t StepOutField(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Item> &item, const Position &pos); - static uint32_t EquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool boolean); - static uint32_t DeEquipItem(const std::shared_ptr<MoveEvent> moveEvent, std::shared_ptr<Player> player, std::shared_ptr<Item> item, Slots_t slot, bool boolean); + static uint32_t AddItemField(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &tileItem, const Position &pos); + static uint32_t RemoveItemField(const std::shared_ptr<Item> &item, const std::shared_ptr<Item> &tileItem, const Position &pos); - void setFromXML(bool newFromXML) { - m_fromXML = newFromXML; - } - - bool isFromXML() const { - return m_fromXML; - } + static uint32_t EquipItem(const std::shared_ptr<MoveEvent> &moveEvent, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool boolean); + static uint32_t DeEquipItem(const std::shared_ptr<MoveEvent> &, const std::shared_ptr<Player> &player, const std::shared_ptr<Item> &item, Slots_t slot, bool boolean); private: std::string getScriptTypeName() const override; @@ -282,7 +268,7 @@ class MoveEvent final : public Script, public SharedObject { // equipFunction std::function<uint32_t( std::shared_ptr<MoveEvent> moveEvent, - std::shared_ptr<Player> player, + const std::shared_ptr<Player> &player, std::shared_ptr<Item> item, Slots_t slot, bool boolean @@ -298,8 +284,6 @@ class MoveEvent final : public Script, public SharedObject { std::map<uint16_t, bool> vocEquipMap; bool tileItem = false; - bool m_fromXML = false; - std::vector<uint32_t> itemIdVector; std::vector<uint32_t> actionIdVector; std::vector<uint32_t> uniqueIdVector; diff --git a/src/lua/creature/raids.cpp b/src/lua/creature/raids.cpp index 8064bf52b..2a9a174e6 100644 --- a/src/lua/creature/raids.cpp +++ b/src/lua/creature/raids.cpp @@ -7,33 +7,33 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/creature/raids.hpp" -#include "utils/pugicast.hpp" + +#include "config/configmanager.hpp" +#include "creatures/monsters/monster.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" -#include "creatures/monsters/monster.hpp" #include "server/network/webhook/webhook.hpp" +#include "utils/pugicast.hpp" Raids::Raids() { scriptInterface.initState(); } bool Raids::loadFromXml() { - if (g_configManager().getBoolean(DISABLE_LEGACY_RAIDS, __FUNCTION__) || isLoaded()) { + if (g_configManager().getBoolean(DISABLE_LEGACY_RAIDS) || isLoaded()) { return true; } pugi::xml_document doc; - auto folder = g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/raids/raids.xml"; + auto folder = g_configManager().getString(DATA_DIRECTORY) + "/raids/raids.xml"; pugi::xml_parse_result result = doc.load_file(folder.c_str()); if (!result) { printXMLError(__FUNCTION__, folder, result); return false; } - for (auto raidNode : doc.child("raids").children()) { + for (const auto &raidNode : doc.child("raids").children()) { std::string name, file; uint32_t interval, margin; @@ -82,7 +82,7 @@ bool Raids::loadFromXml() { } auto newRaid = std::make_shared<Raid>(name, interval, margin, repeat); - if (newRaid->loadFromXml(g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/raids/" + file)) { + if (newRaid->loadFromXml(g_configManager().getString(DATA_DIRECTORY) + "/raids/" + file)) { raidList.push_back(newRaid); } else { g_logger().error("{} - Failed to load raid: {}", __FUNCTION__, name); @@ -96,7 +96,7 @@ bool Raids::loadFromXml() { static constexpr int32_t MAX_RAND_RANGE = 10000000; bool Raids::startup() { - if (!isLoaded() || isStarted() || g_configManager().getBoolean(DISABLE_LEGACY_RAIDS, __FUNCTION__)) { + if (!isLoaded() || isStarted() || g_configManager().getBoolean(DISABLE_LEGACY_RAIDS)) { return false; } @@ -111,18 +111,18 @@ bool Raids::startup() { } void Raids::checkRaids() { - if (g_configManager().getBoolean(DISABLE_LEGACY_RAIDS, __FUNCTION__)) { + if (g_configManager().getBoolean(DISABLE_LEGACY_RAIDS)) { return; } if (!getRunning()) { - uint64_t now = OTSYS_TIME(); + const uint64_t now = OTSYS_TIME(); for (auto it = raidList.begin(), end = raidList.end(); it != end; ++it) { const auto &raid = *it; if (now >= (getLastRaidEnd() + raid->getMargin())) { - auto roll = static_cast<uint32_t>(uniform_random(0, MAX_RAND_RANGE)); - auto required = static_cast<uint32_t>(MAX_RAND_RANGE * raid->getInterval()) / CHECK_RAIDS_INTERVAL; - auto shouldStart = required >= roll; + const auto roll = static_cast<uint32_t>(uniform_random(0, MAX_RAND_RANGE)); + const auto required = static_cast<uint32_t>(MAX_RAND_RANGE * raid->getInterval()) / CHECK_RAIDS_INTERVAL; + const auto shouldStart = required >= roll; if (shouldStart) { setRunning(raid); raid->startRaid(); @@ -163,7 +163,7 @@ bool Raids::reload() { return loadFromXml(); } -std::shared_ptr<Raid> Raids::getRaidByName(const std::string &name) { +std::shared_ptr<Raid> Raids::getRaidByName(const std::string &name) const { for (const auto &raid : raidList) { if (strcasecmp(raid->getName().c_str(), name.c_str()) == 0) { return raid; @@ -178,13 +178,13 @@ bool Raid::loadFromXml(const std::string &filename) { } pugi::xml_document doc; - pugi::xml_parse_result result = doc.load_file(filename.c_str()); + const pugi::xml_parse_result result = doc.load_file(filename.c_str()); if (!result) { printXMLError(__FUNCTION__, filename, result); return false; } - for (auto eventNode : doc.child("raid").children()) { + for (const auto &eventNode : doc.child("raid").children()) { std::shared_ptr<RaidEvent> event; if (strcasecmp(eventNode.name(), "announce") == 0) { event = std::make_shared<AnnounceEvent>(); @@ -208,7 +208,7 @@ bool Raid::loadFromXml(const std::string &filename) { } // sort by delay time - std::sort(raidEvents.begin(), raidEvents.end(), [](const std::shared_ptr<RaidEvent> lhs, const std::shared_ptr<RaidEvent> rhs) { + std::ranges::sort(raidEvents, [](const std::shared_ptr<RaidEvent> &lhs, const std::shared_ptr<RaidEvent> &rhs) { return lhs->getDelay() < rhs->getDelay(); }); @@ -229,13 +229,13 @@ void Raid::startRaid() { } } -void Raid::executeRaidEvent(const std::shared_ptr<RaidEvent> raidEvent) { +void Raid::executeRaidEvent(const std::shared_ptr<RaidEvent> &raidEvent) { if (raidEvent->executeEvent()) { nextEvent++; const auto newRaidEvent = getNextRaidEvent(); if (newRaidEvent) { - uint32_t ticks = static_cast<uint32_t>(std::max<int32_t>(RAID_MINTICKS, newRaidEvent->getDelay() - raidEvent->getDelay())); + const uint32_t ticks = static_cast<uint32_t>(std::max<int32_t>(RAID_MINTICKS, newRaidEvent->getDelay() - raidEvent->getDelay())); nextEventEvent = g_dispatcher().scheduleEvent( ticks, [this, newRaidEvent] { executeRaidEvent(newRaidEvent); }, __FUNCTION__ ); @@ -270,7 +270,7 @@ std::shared_ptr<RaidEvent> Raid::getNextRaidEvent() { } bool RaidEvent::configureRaidEvent(const pugi::xml_node &eventNode) { - pugi::xml_attribute delayAttribute = eventNode.attribute("delay"); + const pugi::xml_attribute delayAttribute = eventNode.attribute("delay"); if (!delayAttribute) { g_logger().error("{} - 'delay' tag missing", __FUNCTION__); return false; @@ -285,7 +285,7 @@ bool AnnounceEvent::configureRaidEvent(const pugi::xml_node &eventNode) { return false; } - pugi::xml_attribute messageAttribute = eventNode.attribute("message"); + const pugi::xml_attribute messageAttribute = eventNode.attribute("message"); if (!messageAttribute) { g_logger().error("{} - " "'message' tag missing for announce event", @@ -294,9 +294,9 @@ bool AnnounceEvent::configureRaidEvent(const pugi::xml_node &eventNode) { } message = messageAttribute.as_string(); - pugi::xml_attribute typeAttribute = eventNode.attribute("type"); + const pugi::xml_attribute typeAttribute = eventNode.attribute("type"); if (typeAttribute) { - std::string tmpStrValue = asLowerCaseString(typeAttribute.as_string()); + const std::string tmpStrValue = asLowerCaseString(typeAttribute.as_string()); if (tmpStrValue == "warning") { messageType = MESSAGE_GAME_HIGHLIGHT; } else if (tmpStrValue == "event") { @@ -376,7 +376,7 @@ bool SingleSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { } bool SingleSpawnEvent::executeEvent() { - std::shared_ptr<Monster> monster = Monster::createMonster(monsterName); + const auto &monster = Monster::createMonster(monsterName); if (!monster) { g_logger().error("{} - Cant create monster {}", __FUNCTION__, monsterName); return false; @@ -398,7 +398,7 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { pugi::xml_attribute attr; if ((attr = eventNode.attribute("radius"))) { - int32_t radius = pugi::cast<int32_t>(attr.value()); + const auto radius = pugi::cast<int32_t>(attr.value()); Position centerPos; if ((attr = eventNode.attribute("centerx"))) { @@ -492,7 +492,7 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { } } - for (auto monsterNode : eventNode.children()) { + for (const auto &monsterNode : eventNode.children()) { const char* name; if ((attr = monsterNode.attribute("name"))) { @@ -537,26 +537,26 @@ bool AreaSpawnEvent::configureRaidEvent(const pugi::xml_node &eventNode) { bool AreaSpawnEvent::executeEvent() { for (const MonsterSpawn &spawn : spawnMonsterList) { - uint32_t amount = uniform_random(spawn.minAmount, spawn.maxAmount); + const uint32_t amount = uniform_random(spawn.minAmount, spawn.maxAmount); for (uint32_t i = 0; i < amount; ++i) { - std::shared_ptr<Monster> monster = Monster::createMonster(spawn.name); + const std::shared_ptr<Monster> &monster = Monster::createMonster(spawn.name); if (!monster) { g_logger().error("{} - Can't create monster {}", __FUNCTION__, spawn.name); return false; } - bool success = false; for (int32_t tries = 0; tries < MAXIMUM_TRIES_PER_MONSTER; tries++) { - std::shared_ptr<Tile> tile = g_game().map.getTile(static_cast<uint16_t>(uniform_random(fromPos.x, toPos.x)), static_cast<uint16_t>(uniform_random(fromPos.y, toPos.y)), static_cast<uint8_t>(uniform_random(fromPos.z, toPos.z))); - if (tile && !tile->isMovableBlocking() && !tile->hasFlag(TILESTATE_PROTECTIONZONE) && tile->getTopCreature() == nullptr && g_game().placeCreature(monster, tile->getPosition(), false, true)) { - success = true; + const auto &tile = g_game().map.getTile(static_cast<uint16_t>(uniform_random(fromPos.x, toPos.x)), static_cast<uint16_t>(uniform_random(fromPos.y, toPos.y)), static_cast<uint8_t>(uniform_random(fromPos.z, toPos.z))); + if (!tile) { + continue; + } + + const auto &topCreature = tile->getTopCreature(); + if (!tile->isMovableBlocking() && !tile->hasFlag(TILESTATE_PROTECTIONZONE) && topCreature == nullptr && g_game().placeCreature(monster, tile->getPosition(), false, true)) { monster->setForgeMonster(false); break; } } - - if (!success) { - } } } return true; @@ -567,7 +567,7 @@ bool ScriptEvent::configureRaidEvent(const pugi::xml_node &eventNode) { return false; } - pugi::xml_attribute scriptAttribute = eventNode.attribute("script"); + const pugi::xml_attribute scriptAttribute = eventNode.attribute("script"); if (!scriptAttribute) { g_logger().error("{} - " "No script file found for raid", @@ -577,7 +577,7 @@ bool ScriptEvent::configureRaidEvent(const pugi::xml_node &eventNode) { std::string scriptName = std::string(scriptAttribute.as_string()); - if (!loadScript(g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/raids/scripts/" + scriptName, scriptName)) { + if (!loadScript(g_configManager().getString(DATA_DIRECTORY) + "/raids/scripts/" + scriptName, scriptName)) { g_logger().error("[{}] can not load raid script: {}", __FUNCTION__, scriptName); return false; } @@ -593,14 +593,14 @@ std::string ScriptEvent::getScriptEventName() const { bool ScriptEvent::executeEvent() { // onRaid() - if (!scriptInterface->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("{} - Script with name {} " "Call stack overflow. Too many lua script calls being nested.", __FUNCTION__, getScriptName()); return false; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(scriptId, scriptInterface); scriptInterface->pushFunction(scriptId); diff --git a/src/lua/creature/raids.hpp b/src/lua/creature/raids.hpp index 0266641ed..d2f45536b 100644 --- a/src/lua/creature/raids.hpp +++ b/src/lua/creature/raids.hpp @@ -9,10 +9,11 @@ #pragma once -#include "utils/utils_definitions.hpp" -#include "declarations.hpp" -#include "game/movement/position.hpp" #include "lua/global/baseevents.hpp" +#include "lua/scripts/luascript.hpp" +#include "utils/utils_definitions.hpp" + +struct Position; struct MonsterSpawn { MonsterSpawn(std::string initName, uint32_t initMinAmount, uint32_t initMaxAmount) : @@ -56,11 +57,11 @@ class Raids { std::shared_ptr<Raid> getRunning() { return running; } - void setRunning(const std::shared_ptr<Raid> newRunning) { + void setRunning(const std::shared_ptr<Raid> &newRunning) { running = newRunning; } - std::shared_ptr<Raid> getRaidByName(const std::string &name); + std::shared_ptr<Raid> getRaidByName(const std::string &name) const; uint64_t getLastRaidEnd() const { return lastRaidEnd; @@ -100,7 +101,7 @@ class Raid { void startRaid(); - void executeRaidEvent(const std::shared_ptr<RaidEvent> raidEvent); + void executeRaidEvent(const std::shared_ptr<RaidEvent> &raidEvent); void resetRaid(); std::shared_ptr<RaidEvent> getNextRaidEvent(); @@ -150,7 +151,7 @@ class RaidEvent { } private: - uint32_t delay; + uint32_t delay {}; }; class AnnounceEvent final : public RaidEvent { @@ -202,7 +203,7 @@ class ScriptEvent final : public RaidEvent, public Event { return scriptName; } void setScriptName(std::string name) { - scriptName = name; + scriptName = std::move(name); } bool executeEvent() override; diff --git a/src/lua/creature/talkaction.cpp b/src/lua/creature/talkaction.cpp index c1b8c028d..77323d9ac 100644 --- a/src/lua/creature/talkaction.cpp +++ b/src/lua/creature/talkaction.cpp @@ -7,11 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/creature/talkaction.hpp" +#include "utils/tools.hpp" +#include "creatures/players/grouping/groups.hpp" #include "creatures/players/player.hpp" #include "lua/scripts/scripts.hpp" -#include "lua/creature/talkaction.hpp" TalkActions::TalkActions() = default; TalkActions::~TalkActions() = default; @@ -25,29 +26,29 @@ bool TalkActions::registerLuaEvent(const TalkAction_ptr &talkAction) { return inserted; } -bool TalkActions::checkWord(std::shared_ptr<Player> player, SpeakClasses type, const std::string &words, const std::string_view &word, const TalkAction_ptr &talkActionPtr) const { - auto spacePos = std::ranges::find_if(words.begin(), words.end(), ::isspace); - std::string firstWord = words.substr(0, spacePos - words.begin()); +bool TalkActions::checkWord(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &words, std::string_view word, const TalkAction_ptr &talkActionPtr) const { + const auto spacePos = std::ranges::find_if(words.begin(), words.end(), ::isspace); + const std::string firstWord = words.substr(0, spacePos - words.begin()); // Check for exact equality from saying word and talkaction stored word if (firstWord != word) { return false; } - auto groupId = player->getGroup()->id; + const auto groupId = player->getGroup()->id; if (groupId < talkActionPtr->getGroupType()) { return false; } std::string param; - size_t wordPos = words.find(word); - size_t talkactionLength = word.length(); + const size_t wordPos = words.find(word); + const size_t talkactionLength = word.length(); if (wordPos != std::string::npos && wordPos + talkactionLength < words.length()) { param = words.substr(wordPos + talkactionLength); trim_left(param, ' '); } - std::string separator = talkActionPtr->getSeparator(); + const std::string separator = talkActionPtr->getSeparator(); if (separator != " ") { if (!param.empty()) { if (param != separator) { @@ -61,7 +62,7 @@ bool TalkActions::checkWord(std::shared_ptr<Player> player, SpeakClasses type, c return talkActionPtr->executeSay(player, words, param, type); } -TalkActionResult_t TalkActions::checkPlayerCanSayTalkAction(std::shared_ptr<Player> player, SpeakClasses type, const std::string &words) const { +TalkActionResult_t TalkActions::checkPlayerCanSayTalkAction(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &words) const { for (const auto &[talkactionWords, talkActionPtr] : talkActions) { if (talkactionWords.find(',') != std::string::npos) { auto wordsList = split(talkactionWords); @@ -79,16 +80,16 @@ TalkActionResult_t TalkActions::checkPlayerCanSayTalkAction(std::shared_ptr<Play return TALKACTION_CONTINUE; } -bool TalkAction::executeSay(std::shared_ptr<Player> player, const std::string &words, const std::string ¶m, SpeakClasses type) const { +bool TalkAction::executeSay(const std::shared_ptr<Player> &player, const std::string &words, const std::string ¶m, SpeakClasses type) const { // onSay(player, words, param, type) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::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()); return false; } - ScriptEnvironment* scriptEnvironment = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* scriptEnvironment = LuaScriptInterface::getScriptEnv(); scriptEnvironment->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); diff --git a/src/lua/creature/talkaction.hpp b/src/lua/creature/talkaction.hpp index d4fd61654..d11a54879 100644 --- a/src/lua/creature/talkaction.hpp +++ b/src/lua/creature/talkaction.hpp @@ -19,7 +19,7 @@ class TalkAction; using TalkAction_ptr = std::shared_ptr<TalkAction>; -class TalkAction : public Script { +class TalkAction final : public Script { public: using Script::Script; @@ -48,11 +48,11 @@ class TalkAction : public Script { return separator; } void setSeparator(std::string sep) { - separator = sep; + separator = std::move(sep); } // scripting - bool executeSay(std::shared_ptr<Player> player, const std::string &words, const std::string ¶m, SpeakClasses type) const; + bool executeSay(const std::shared_ptr<Player> &player, const std::string &words, const std::string ¶m, SpeakClasses type) const; // void setGroupType(uint8_t newGroupType); @@ -82,8 +82,8 @@ class TalkActions final : public Scripts { return inject<TalkActions>(); } - bool checkWord(std::shared_ptr<Player> player, SpeakClasses type, const std::string &words, const std::string_view &word, const TalkAction_ptr &talkActionPtr) const; - TalkActionResult_t checkPlayerCanSayTalkAction(std::shared_ptr<Player> player, SpeakClasses type, const std::string &words) const; + bool checkWord(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &words, std::string_view word, const TalkAction_ptr &talkActionPtr) const; + TalkActionResult_t checkPlayerCanSayTalkAction(const std::shared_ptr<Player> &player, SpeakClasses type, const std::string &words) const; bool registerLuaEvent(const TalkAction_ptr &talkAction); void clear(); diff --git a/src/lua/functions/core/core_functions.hpp b/src/lua/functions/core/core_functions.hpp index c6c14121b..2a75d148c 100644 --- a/src/lua/functions/core/core_functions.hpp +++ b/src/lua/functions/core/core_functions.hpp @@ -16,6 +16,12 @@ class CoreFunctions final : LuaScriptInterface { public: + explicit CoreFunctions(lua_State* L) : + LuaScriptInterface("CoreFunctions") { + init(L); + } + ~CoreFunctions() override = default; + static void init(lua_State* L) { CoreGameFunctions::init(L); CoreLibsFunctions::init(L); diff --git a/src/lua/functions/core/game/bank_functions.cpp b/src/lua/functions/core/game/bank_functions.cpp index f6732b8bf..ce6089393 100644 --- a/src/lua/functions/core/game/bank_functions.cpp +++ b/src/lua/functions/core/game/bank_functions.cpp @@ -1,35 +1,45 @@ -#include "pch.hpp" +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 "lua/functions/core/game/bank_functions.hpp" + +#include "creatures/players/player.hpp" #include "game/bank/bank.hpp" #include "game/game.hpp" int BankFunctions::luaBankCredit(lua_State* L) { // Bank.credit(playerOrGuild, amount) - auto bank = getBank(L, 1); + const auto &bank = getBank(L, 1); if (bank == nullptr) { reportErrorFunc("Bank is nullptr"); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 2); + const uint64_t amount = getNumber<uint64_t>(L, 2); pushBoolean(L, bank->credit(amount)); return 1; } int BankFunctions::luaBankDebit(lua_State* L) { // Bank.debit(playerOrGuild, amount) - auto bank = getBank(L, 1); + const auto &bank = getBank(L, 1); if (bank == nullptr) { reportErrorFunc("Bank is nullptr"); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 2); + const uint64_t amount = getNumber<uint64_t>(L, 2); pushBoolean(L, bank->debit(amount)); return 1; } int BankFunctions::luaBankBalance(lua_State* L) { // Bank.balance(playerOrGuild[, amount]]) - auto bank = getBank(L, 1); + const auto &bank = getBank(L, 1); if (bank == nullptr) { reportErrorFunc("Bank is nullptr"); return 1; @@ -38,55 +48,55 @@ int BankFunctions::luaBankBalance(lua_State* L) { lua_pushnumber(L, bank->balance()); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 2); + const uint64_t amount = getNumber<uint64_t>(L, 2); pushBoolean(L, bank->balance(amount)); return 1; } int BankFunctions::luaBankHasBalance(lua_State* L) { // Bank.hasBalance(playerOrGuild, amount) - auto bank = getBank(L, 1); + const auto &bank = getBank(L, 1); if (bank == nullptr) { reportErrorFunc("Bank is nullptr"); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 2); + const uint64_t amount = getNumber<uint64_t>(L, 2); pushBoolean(L, bank->hasBalance(amount)); return 1; } int BankFunctions::luaBankTransfer(lua_State* L) { // Bank.transfer(fromPlayerOrGuild, toPlayerOrGuild, amount) - auto source = getBank(L, 1); + const auto &source = getBank(L, 1); if (source == nullptr) { g_logger().debug("BankFunctions::luaBankTransfer: source is null"); reportErrorFunc("Bank is nullptr"); return 1; } - std::shared_ptr<Bank> destination = getBank(L, 2); + const auto &destination = getBank(L, 2); if (destination == nullptr) { g_logger().debug("BankFunctions::luaBankTransfer: destination is null"); reportErrorFunc("Bank is nullptr"); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 3); + const uint64_t amount = getNumber<uint64_t>(L, 3); pushBoolean(L, source->transferTo(destination, amount)); return 1; } int BankFunctions::luaBankTransferToGuild(lua_State* L) { // Bank.transfer(fromPlayerOrGuild, toGuild, amount) - auto source = getBank(L, 1); + const auto &source = getBank(L, 1); if (source == nullptr) { reportErrorFunc("Source is nullptr"); return 1; } - std::shared_ptr<Bank> destination = getBank(L, 2, true /* isGuild */); + const auto &destination = getBank(L, 2, true /* isGuild */); if (destination == nullptr) { reportErrorFunc("Destination is nullptr"); return 1; } - uint64_t amount = getNumber<uint64_t>(L, 3); + const uint64_t amount = getNumber<uint64_t>(L, 3); pushBoolean(L, source->transferTo(destination, amount)); return 1; } @@ -99,13 +109,13 @@ int BankFunctions::luaBankWithdraw(lua_State* L) { return 1; } - uint64_t amount = getNumber<uint64_t>(L, 2); + const uint64_t amount = getNumber<uint64_t>(L, 2); if (lua_gettop(L) == 2) { - const auto bank = std::make_shared<Bank>(player); + auto bank = std::make_shared<Bank>(player); pushBoolean(L, bank->withdraw(player, amount)); return 1; } - auto source = getBank(L, 3); + const auto &source = getBank(L, 3); if (source == nullptr) { reportErrorFunc("Source is nullptr"); return 1; @@ -121,7 +131,7 @@ int BankFunctions::luaBankDeposit(lua_State* L) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); return 1; } - const auto bank = std::make_shared<Bank>(player); + auto bank = std::make_shared<Bank>(player); uint64_t amount = 0; if (lua_isnumber(L, 2)) { @@ -134,7 +144,7 @@ int BankFunctions::luaBankDeposit(lua_State* L) { pushBoolean(L, g_game().removeMoney(player, amount) && bank->credit(amount)); return 1; } - auto destination = getBank(L, 3); + const auto &destination = getBank(L, 3); if (destination == nullptr) { reportErrorFunc("Destination is nullptr"); return 1; @@ -148,13 +158,13 @@ std::shared_ptr<Bank> BankFunctions::getBank(lua_State* L, int32_t arg, bool isG return std::make_shared<Bank>(getGuild(L, arg)); } if (isGuild) { - const auto guild = getGuild(L, arg, true); + const auto &guild = getGuild(L, arg, true); if (!guild) { return nullptr; } return std::make_shared<Bank>(guild); } - std::shared_ptr<Player> player = getPlayer(L, arg, true); + const auto &player = getPlayer(L, arg, true); if (!player) { return nullptr; } diff --git a/src/lua/functions/core/game/bank_functions.hpp b/src/lua/functions/core/game/bank_functions.hpp index db450f494..f2a94a404 100644 --- a/src/lua/functions/core/game/bank_functions.hpp +++ b/src/lua/functions/core/game/bank_functions.hpp @@ -15,6 +15,12 @@ class Bank; class BankFunctions final : LuaScriptInterface { public: + explicit BankFunctions(lua_State* L) : + LuaScriptInterface("BankFunctions") { + init(L); + } + ~BankFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "Bank"); registerMethod(L, "Bank", "credit", BankFunctions::luaBankCredit); diff --git a/src/lua/functions/core/game/config_functions.cpp b/src/lua/functions/core/game/config_functions.cpp index d0e77a693..d8ee6e3ea 100644 --- a/src/lua/functions/core/game/config_functions.cpp +++ b/src/lua/functions/core/game/config_functions.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/game/config_functions.hpp" #include "config/configmanager.hpp" @@ -37,45 +35,54 @@ void ConfigFunctions::init(lua_State* L) { } int ConfigFunctions::luaConfigManagerGetString(lua_State* L) { - auto key = getNumber<ConfigKey_t>(L, -1); + const auto key = getNumber<ConfigKey_t>(L, -1); if (!key) { reportErrorFunc("Wrong enum"); return 1; } - pushString(L, g_configManager().getString(getNumber<ConfigKey_t>(L, -1), __FUNCTION__)); + pushString(L, g_configManager().getString(getNumber<ConfigKey_t>(L, -1))); return 1; } int ConfigFunctions::luaConfigManagerGetNumber(lua_State* L) { - auto key = getNumber<ConfigKey_t>(L, -1); + const auto key = getNumber<ConfigKey_t>(L, -1); if (!key) { reportErrorFunc("Wrong enum"); return 1; } - lua_pushnumber(L, g_configManager().getNumber(getNumber<ConfigKey_t>(L, -1), __FUNCTION__)); + lua_pushnumber(L, g_configManager().getNumber(getNumber<ConfigKey_t>(L, -1))); return 1; } int ConfigFunctions::luaConfigManagerGetBoolean(lua_State* L) { - auto key = getNumber<ConfigKey_t>(L, -1); + const auto key = getNumber<ConfigKey_t>(L, -1); if (!key) { reportErrorFunc("Wrong enum"); return 1; } - pushBoolean(L, g_configManager().getBoolean(getNumber<ConfigKey_t>(L, -1), __FUNCTION__)); + pushBoolean(L, g_configManager().getBoolean(getNumber<ConfigKey_t>(L, -1))); return 1; } int ConfigFunctions::luaConfigManagerGetFloat(lua_State* L) { - auto key = getNumber<ConfigKey_t>(L, -1); + // configManager.getFloat(key, shouldRound = true) + + // Ensure the first argument (key) is provided and is a valid enum + const auto key = getNumber<ConfigKey_t>(L, 1); if (!key) { reportErrorFunc("Wrong enum"); return 1; } - lua_pushnumber(L, g_configManager().getFloat(key, __FUNCTION__)); + // Check if the second argument (shouldRound) is provided and is a boolean; default to true if not provided + bool shouldRound = getBoolean(L, 2, true); + float value = g_configManager().getFloat(key); + double finalValue = shouldRound ? static_cast<double>(std::round(value * 100.0) / 100.0) : value; + + g_logger().debug("[{}] key: {}, finalValue: {}, shouldRound: {}", __METHOD_NAME__, magic_enum::enum_name(key), finalValue, shouldRound); + lua_pushnumber(L, finalValue); return 1; } diff --git a/src/lua/functions/core/game/config_functions.hpp b/src/lua/functions/core/game/config_functions.hpp index ae4952e96..973ed5c1d 100644 --- a/src/lua/functions/core/game/config_functions.hpp +++ b/src/lua/functions/core/game/config_functions.hpp @@ -14,9 +14,42 @@ class ConfigFunctions final : LuaScriptInterface { public: + explicit ConfigFunctions(lua_State* L) : + LuaScriptInterface("ConfigFunctions") { + init(L); + } + ~ConfigFunctions() override = default; + static void init(lua_State* L); private: + /** + * @brief Retrieves a float configuration value from the configuration manager, with an optional rounding. + * + * This function is a Lua binding used to get a float value from the configuration manager. It requires + * a key as the first argument, which should be a valid enumeration. An optional second boolean argument + * specifies whether the retrieved float should be rounded to two decimal places. + * + * @param L Pointer to the Lua state. The first argument must be a valid enum key, and the second argument (optional) + * can be a boolean indicating whether to round the result. + * + * @return Returns 1 after pushing the result onto the Lua stack, indicating the number of return values. + * + * @exception reportErrorFunc Throws an error if the first argument is not a valid enum. + * + * Usage: + * local result = ConfigManager.getFloat(ConfigKey.SomeKey) + * local result_rounded = ConfigManager.getFloat(ConfigKey.SomeKey, false) + * + * Detailed behavior: + * 1. Extracts the key from the first Lua stack argument as an enumeration of type `ConfigKey_t`. + * 2. Checks if the second argument is provided; if not, defaults to true for rounding. + * 3. Retrieves the float value associated with the key from the configuration manager. + * 4. If rounding is requested, rounds the value to two decimal places. + * 5. Logs the method call and the obtained value using the debug logger. + * 6. Pushes the final value (rounded or original) back onto the Lua stack. + * 7. Returns 1 to indicate a single return value. + */ static int luaConfigManagerGetFloat(lua_State* L); static int luaConfigManagerGetBoolean(lua_State* L); static int luaConfigManagerGetNumber(lua_State* L); diff --git a/src/lua/functions/core/game/core_game_functions.hpp b/src/lua/functions/core/game/core_game_functions.hpp index 03bcc236d..f5fe1c9da 100644 --- a/src/lua/functions/core/game/core_game_functions.hpp +++ b/src/lua/functions/core/game/core_game_functions.hpp @@ -19,6 +19,12 @@ class CoreGameFunctions final : LuaScriptInterface { public: + explicit CoreGameFunctions(lua_State* L) : + LuaScriptInterface("CoreGameFunctions") { + init(L); + } + ~CoreGameFunctions() override = default; + static void init(lua_State* L) { ConfigFunctions::init(L); GameFunctions::init(L); diff --git a/src/lua/functions/core/game/game_functions.cpp b/src/lua/functions/core/game/game_functions.cpp index 83ecd0918..16133833b 100644 --- a/src/lua/functions/core/game/game_functions.cpp +++ b/src/lua/functions/core/game/game_functions.cpp @@ -7,29 +7,26 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/core/game/game_functions.hpp" #include "core.hpp" #include "creatures/monsters/monster.hpp" +#include "creatures/monsters/monsters.hpp" +#include "creatures/npcs/npc.hpp" +#include "creatures/players/achievement/player_achievement.hpp" #include "game/functions/game_reload.hpp" #include "game/game.hpp" -#include "items/item.hpp" -#include "io/iobestiary.hpp" -#include "io/io_bosstiary.hpp" -#include "io/iologindata.hpp" -#include "lua/functions/core/game/game_functions.hpp" -#include "lua/functions/events/event_callback_functions.hpp" #include "game/scheduling/dispatcher.hpp" +#include "io/io_bosstiary.hpp" +#include "io/iobestiary.hpp" +#include "items/item.hpp" +#include "lua/callbacks/event_callback.hpp" +#include "lua/callbacks/events_callbacks.hpp" +#include "lua/creature/events.hpp" #include "lua/creature/talkaction.hpp" #include "lua/functions/creatures/npc/npc_type_functions.hpp" +#include "lua/functions/events/event_callback_functions.hpp" #include "lua/scripts/lua_environment.hpp" -#include "lua/creature/events.hpp" -#include "lua/callbacks/event_callback.hpp" -#include "lua/callbacks/events_callbacks.hpp" -#include "creatures/players/achievement/player_achievement.hpp" -#include "creatures/players/cyclopedia/player_badge.hpp" -#include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_title.hpp" #include "map/spectators.hpp" // Game @@ -41,7 +38,7 @@ int GameFunctions::luaGameCreateMonsterType(lua_State* L) { auto variant = getString(L, 2, ""); const auto alternateName = getString(L, 3, ""); std::set<std::string> names; - auto monsterType = std::make_shared<MonsterType>(name); + const auto monsterType = std::make_shared<MonsterType>(name); if (!monsterType) { lua_pushstring(L, "MonsterType is nullptr"); lua_error(L); @@ -90,12 +87,12 @@ int GameFunctions::luaGameCreateNpcType(lua_State* L) { int GameFunctions::luaGameGetSpectators(lua_State* L) { // Game.getSpectators(position[, multifloor = false[, onlyPlayer = false[, minRangeX = 0[, maxRangeX = 0[, minRangeY = 0[, maxRangeY = 0]]]]]]) const Position &position = getPosition(L, 1); - bool multifloor = getBoolean(L, 2, false); - bool onlyPlayers = getBoolean(L, 3, false); - int32_t minRangeX = getNumber<int32_t>(L, 4, 0); - int32_t maxRangeX = getNumber<int32_t>(L, 5, 0); - int32_t minRangeY = getNumber<int32_t>(L, 6, 0); - int32_t maxRangeY = getNumber<int32_t>(L, 7, 0); + const bool multifloor = getBoolean(L, 2, false); + const bool onlyPlayers = getBoolean(L, 3, false); + const auto minRangeX = getNumber<int32_t>(L, 4, 0); + const auto maxRangeX = getNumber<int32_t>(L, 5, 0); + const auto minRangeY = getNumber<int32_t>(L, 6, 0); + const auto maxRangeY = getNumber<int32_t>(L, 7, 0); Spectators spectators; @@ -108,7 +105,7 @@ int GameFunctions::luaGameGetSpectators(lua_State* L) { lua_createtable(L, spectators.size(), 0); int index = 0; - for (std::shared_ptr<Creature> creature : spectators) { + for (const auto &creature : spectators) { pushUserdata<Creature>(L, creature); setCreatureMetatable(L, -1, creature); lua_rawseti(L, -2, ++index); @@ -126,11 +123,11 @@ int GameFunctions::luaGameGetBestiaryList(lua_State* L) { // Game.getBestiaryList([bool[string or BestiaryType_t]]) lua_newtable(L); int index = 0; - bool name = getBoolean(L, 2, false); + const bool name = getBoolean(L, 2, false); if (lua_gettop(L) <= 2) { - std::map<uint16_t, std::string> mtype_list = g_game().getBestiaryList(); - for (auto ita : mtype_list) { + const std::map<uint16_t, std::string> &mtype_list = g_game().getBestiaryList(); + for (const auto &ita : mtype_list) { if (name) { pushString(L, ita.second); } else { @@ -140,8 +137,8 @@ int GameFunctions::luaGameGetBestiaryList(lua_State* L) { } } else { if (isNumber(L, 2)) { - std::map<uint16_t, std::string> tmplist = g_iobestiary().findRaceByName("CANARY", false, getNumber<BestiaryType_t>(L, 2)); - for (auto itb : tmplist) { + const std::map<uint16_t, std::string> tmplist = g_iobestiary().findRaceByName("CANARY", false, getNumber<BestiaryType_t>(L, 2)); + for (const auto &itb : tmplist) { if (name) { pushString(L, itb.second); } else { @@ -150,8 +147,8 @@ int GameFunctions::luaGameGetBestiaryList(lua_State* L) { lua_rawseti(L, -2, ++index); } } else { - std::map<uint16_t, std::string> tmplist = g_iobestiary().findRaceByName(getString(L, 2)); - for (auto itc : tmplist) { + const std::map<uint16_t, std::string> tmplist = g_iobestiary().findRaceByName(getString(L, 2)); + for (const auto &itc : tmplist) { if (name) { pushString(L, itc.second); } else { @@ -180,7 +177,7 @@ int GameFunctions::luaGameGetPlayers(lua_State* L) { int GameFunctions::luaGameLoadMap(lua_State* L) { // Game.loadMap(path) const std::string &path = getString(L, 1); - g_dispatcher().addEvent([path]() { g_game().loadMap(path); }, "GameFunctions::luaGameLoadMap"); + g_dispatcher().addEvent([path]() { g_game().loadMap(path); }, __FUNCTION__); return 0; } @@ -188,7 +185,7 @@ int GameFunctions::luaGameloadMapChunk(lua_State* L) { // Game.loadMapChunk(path, position, remove) const std::string &path = getString(L, 1); const Position &position = getPosition(L, 2); - g_dispatcher().addEvent([path, position]() { g_game().loadMap(path, position); }, "GameFunctions::luaGameloadMapChunk"); + g_dispatcher().addEvent([path, position]() { g_game().loadMap(path, position); }, __FUNCTION__); return 0; } @@ -240,7 +237,7 @@ int GameFunctions::luaGameGetTowns(lua_State* L) { lua_createtable(L, towns.size(), 0); int index = 0; - for (auto townEntry : towns) { + for (const auto &townEntry : towns) { pushUserdata<Town>(L, townEntry.second); setMetatable(L, -1, "Town"); lua_rawseti(L, -2, ++index); @@ -254,7 +251,7 @@ int GameFunctions::luaGameGetHouses(lua_State* L) { lua_createtable(L, houses.size(), 0); int index = 0; - for (auto houseEntry : houses) { + for (const auto &houseEntry : houses) { pushUserdata<House>(L, houseEntry.second); setMetatable(L, -1, "House"); lua_rawseti(L, -2, ++index); @@ -270,7 +267,7 @@ int GameFunctions::luaGameGetGameState(lua_State* L) { int GameFunctions::luaGameSetGameState(lua_State* L) { // Game.setGameState(state) - GameState_t state = getNumber<GameState_t>(L, 1); + const GameState_t state = getNumber<GameState_t>(L, 1); g_game().setGameState(state); pushBoolean(L, true); return 1; @@ -284,7 +281,7 @@ int GameFunctions::luaGameGetWorldType(lua_State* L) { int GameFunctions::luaGameSetWorldType(lua_State* L) { // Game.setWorldType(type) - WorldType_t type = getNumber<WorldType_t>(L, 1); + const WorldType_t type = getNumber<WorldType_t>(L, 1); g_game().setWorldType(type); pushBoolean(L, true); return 1; @@ -292,7 +289,7 @@ int GameFunctions::luaGameSetWorldType(lua_State* L) { int GameFunctions::luaGameGetReturnMessage(lua_State* L) { // Game.getReturnMessage(value) - ReturnValue value = getNumber<ReturnValue>(L, 1); + const ReturnValue value = getNumber<ReturnValue>(L, 1); pushString(L, getReturnMessage(value)); return 1; } @@ -310,14 +307,14 @@ int GameFunctions::luaGameCreateItem(lua_State* L) { } } - int32_t count = getNumber<int32_t>(L, 2, 1); + const auto count = getNumber<int32_t>(L, 2, 1); int32_t itemCount = 1; int32_t subType = 1; const ItemType &it = Item::items[itemId]; if (it.hasSubType()) { if (it.stackable) { - itemCount = std::ceil(count / (float_t)it.stackSize); + itemCount = std::ceil(count / static_cast<float_t>(it.stackSize)); } subType = count; @@ -330,7 +327,7 @@ int GameFunctions::luaGameCreateItem(lua_State* L) { position = getPosition(L, 3); } - bool hasTable = itemCount > 1; + const bool hasTable = itemCount > 1; if (hasTable) { lua_newtable(L); } else if (itemCount == 0) { @@ -345,7 +342,7 @@ int GameFunctions::luaGameCreateItem(lua_State* L) { subType -= stackCount; } - std::shared_ptr<Item> item = Item::CreateItem(itemId, stackCount); + const auto &item = Item::CreateItem(itemId, stackCount); if (!item) { if (!hasTable) { lua_pushnil(L); @@ -354,7 +351,7 @@ int GameFunctions::luaGameCreateItem(lua_State* L) { } if (position.x != 0) { - std::shared_ptr<Tile> tile = g_game().map.getTile(position); + const auto &tile = g_game().map.getTile(position); if (!tile) { if (!hasTable) { lua_pushnil(L); @@ -390,7 +387,7 @@ int GameFunctions::luaGameCreateItem(lua_State* L) { int GameFunctions::luaGameCreateContainer(lua_State* L) { // Game.createContainer(itemId, size[, position]) - uint16_t size = getNumber<uint16_t>(L, 2); + const uint16_t size = getNumber<uint16_t>(L, 2); uint16_t id; if (isNumber(L, 1)) { id = getNumber<uint16_t>(L, 1); @@ -402,7 +399,7 @@ int GameFunctions::luaGameCreateContainer(lua_State* L) { } } - std::shared_ptr<Container> container = Item::CreateItemAsContainer(id, size); + const auto &container = Item::CreateItemAsContainer(id, size); if (!container) { lua_pushnil(L); return 1; @@ -410,7 +407,7 @@ int GameFunctions::luaGameCreateContainer(lua_State* L) { if (lua_gettop(L) >= 3) { const Position &position = getPosition(L, 3); - std::shared_ptr<Tile> tile = g_game().map.getTile(position); + const auto &tile = g_game().map.getTile(position); if (!tile) { lua_pushnil(L); return 1; @@ -444,11 +441,12 @@ int GameFunctions::luaGameCreateMonster(lua_State* L) { } const Position &position = getPosition(L, 2); - bool extended = getBoolean(L, 3, false); - bool force = getBoolean(L, 4, false); + const bool extended = getBoolean(L, 3, false); + const bool force = getBoolean(L, 4, false); if (g_game().placeCreature(monster, position, extended, force)) { g_events().eventMonsterOnSpawn(monster, position); g_callbacks().executeCallback(EventCallback_t::monsterOnSpawn, &EventCallback::monsterOnSpawn, monster, position); + monster->onSpawn(); const auto &mtype = monster->getMonsterType(); if (mtype && mtype->info.raceid > 0 && mtype->info.bosstiaryRace == BosstiaryRarity_t::RARITY_ARCHFOE) { for (const auto &spectator : Spectators().find<Player>(monster->getPosition(), true)) { @@ -472,7 +470,7 @@ int GameFunctions::luaGameCreateMonster(lua_State* L) { int GameFunctions::luaGameGenerateNpc(lua_State* L) { // Game.generateNpc(npcName) - std::shared_ptr<Npc> npc = Npc::createNpc(getString(L, 1)); + const auto &npc = Npc::createNpc(getString(L, 1)); if (!npc) { lua_pushnil(L); return 1; @@ -485,15 +483,15 @@ int GameFunctions::luaGameGenerateNpc(lua_State* L) { int GameFunctions::luaGameCreateNpc(lua_State* L) { // Game.createNpc(npcName, position[, extended = false[, force = false]]) - std::shared_ptr<Npc> npc = Npc::createNpc(getString(L, 1)); + const auto &npc = Npc::createNpc(getString(L, 1)); if (!npc) { lua_pushnil(L); return 1; } const Position &position = getPosition(L, 2); - bool extended = getBoolean(L, 3, false); - bool force = getBoolean(L, 4, false); + const bool extended = getBoolean(L, 3, false); + const bool force = getBoolean(L, 4, false); if (g_game().placeCreature(npc, position, extended, force)) { pushUserdata<Npc>(L, npc); setMetatable(L, -1, "Npc"); @@ -539,7 +537,7 @@ int GameFunctions::luaGameGetBestiaryCharm(lua_State* L) { int GameFunctions::luaGameCreateBestiaryCharm(lua_State* L) { // Game.createBestiaryCharm(id) - if (const std::shared_ptr<Charm> charm = g_iobestiary().getBestiaryCharm(static_cast<charmRune_t>(getNumber<int8_t>(L, 1, 0)), true)) { + if (const std::shared_ptr<Charm> &charm = g_iobestiary().getBestiaryCharm(static_cast<charmRune_t>(getNumber<int8_t>(L, 1, 0)), true)) { pushUserdata<Charm>(L, charm); setMetatable(L, -1, "Charm"); } else { @@ -564,7 +562,7 @@ int GameFunctions::luaGameStartRaid(lua_State* L) { // Game.startRaid(raidName) const std::string &raidName = getString(L, 1); - const auto raid = g_game().raids.getRaidByName(raidName); + const auto &raid = g_game().raids.getRaidByName(raidName); if (!raid || !raid->isLoaded()) { lua_pushnumber(L, RETURNVALUE_NOSUCHRAIDEXISTS); return 1; @@ -586,41 +584,41 @@ int GameFunctions::luaGameGetClientVersion(lua_State* L) { lua_createtable(L, 0, 3); setField(L, "min", CLIENT_VERSION); setField(L, "max", CLIENT_VERSION); - std::string version = fmt::format("{}.{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER); + const std::string version = fmt::format("{}.{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER); setField(L, "string", version); return 1; } int GameFunctions::luaGameReload(lua_State* L) { // Game.reload(reloadType) - Reload_t reloadType = getNumber<Reload_t>(L, 1); - if (g_gameReload().getReloadNumber(reloadType) == g_gameReload().getReloadNumber(Reload_t::RELOAD_TYPE_NONE)) { + const Reload_t reloadType = getNumber<Reload_t>(L, 1); + if (GameReload::getReloadNumber(reloadType) == GameReload::getReloadNumber(Reload_t::RELOAD_TYPE_NONE)) { reportErrorFunc("Reload type is none"); pushBoolean(L, false); return 0; } - if (g_gameReload().getReloadNumber(reloadType) >= g_gameReload().getReloadNumber(Reload_t::RELOAD_TYPE_LAST)) { + if (GameReload::getReloadNumber(reloadType) >= GameReload::getReloadNumber(Reload_t::RELOAD_TYPE_LAST)) { reportErrorFunc("Reload type not exist"); pushBoolean(L, false); return 0; } - pushBoolean(L, g_gameReload().init(reloadType)); + pushBoolean(L, GameReload::init(reloadType)); lua_gc(g_luaEnvironment().getLuaState(), LUA_GCCOLLECT, 0); return 1; } int GameFunctions::luaGameHasEffect(lua_State* L) { // Game.hasEffect(effectId) - uint16_t effectId = getNumber<uint16_t>(L, 1); + const uint16_t effectId = getNumber<uint16_t>(L, 1); pushBoolean(L, g_game().hasEffect(effectId)); return 1; } int GameFunctions::luaGameHasDistanceEffect(lua_State* L) { // Game.hasDistanceEffect(effectId) - uint16_t effectId = getNumber<uint16_t>(L, 1); + const uint16_t effectId = getNumber<uint16_t>(L, 1); pushBoolean(L, g_game().hasDistanceEffect(effectId)); return 1; } @@ -629,14 +627,14 @@ int GameFunctions::luaGameGetOfflinePlayer(lua_State* L) { // Game.getOfflinePlayer(name or id) std::shared_ptr<Player> player = nullptr; if (isNumber(L, 1)) { - uint32_t id = getNumber<uint32_t>(L, 1); + const uint32_t id = getNumber<uint32_t>(L, 1); if (id >= Player::getFirstID() && id <= Player::getLastID()) { player = g_game().getPlayerByID(id, true); } else { player = g_game().getPlayerByGUID(id, true); } } else if (isString(L, 1)) { - auto name = getString(L, 1); + const auto name = getString(L, 1); player = g_game().getPlayerByName(name, true); } if (!player) { @@ -651,9 +649,9 @@ int GameFunctions::luaGameGetOfflinePlayer(lua_State* L) { int GameFunctions::luaGameGetNormalizedPlayerName(lua_State* L) { // Game.getNormalizedPlayerName(name[, isNewName = false]) - auto name = getString(L, 1); - auto isNewName = getBoolean(L, 2, false); - std::shared_ptr<Player> player = g_game().getPlayerByName(name, true, isNewName); + const auto name = getString(L, 1); + const auto isNewName = getBoolean(L, 2, false); + const auto &player = g_game().getPlayerByName(name, true, isNewName); if (player) { pushString(L, player->getName()); } else { @@ -664,8 +662,8 @@ int GameFunctions::luaGameGetNormalizedPlayerName(lua_State* L) { int GameFunctions::luaGameGetNormalizedGuildName(lua_State* L) { // Game.getNormalizedGuildName(name) - auto name = getString(L, 1); - const auto guild = g_game().getGuildByName(name, true); + const auto name = getString(L, 1); + const auto &guild = g_game().getGuildByName(name, true); if (guild) { pushString(L, guild->getName()); } else { @@ -676,7 +674,7 @@ int GameFunctions::luaGameGetNormalizedGuildName(lua_State* L) { int GameFunctions::luaGameAddInfluencedMonster(lua_State* L) { // Game.addInfluencedMonster(monster) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -689,18 +687,18 @@ int GameFunctions::luaGameAddInfluencedMonster(lua_State* L) { int GameFunctions::luaGameRemoveInfluencedMonster(lua_State* L) { // Game.removeInfluencedMonster(monsterId) - uint32_t monsterId = getNumber<uint32_t>(L, 1); - auto create = getBoolean(L, 2, false); + const uint32_t monsterId = getNumber<uint32_t>(L, 1); + const auto create = getBoolean(L, 2, false); lua_pushnumber(L, g_game().removeInfluencedMonster(monsterId, create)); return 1; } int GameFunctions::luaGameGetInfluencedMonsters(lua_State* L) { // Game.getInfluencedMonsters() - const auto monsters = g_game().getInfluencedMonsters(); + const auto &monsters = g_game().getInfluencedMonsters(); lua_createtable(L, static_cast<int>(monsters.size()), 0); int index = 0; - for (const auto &monsterId : monsters) { + for (const auto monsterId : monsters) { ++index; lua_pushnumber(L, monsterId); lua_rawseti(L, -2, index); @@ -714,7 +712,7 @@ int GameFunctions::luaGameGetLadderIds(lua_State* L) { const auto &ladders = Item::items.getLadders(); lua_createtable(L, static_cast<int>(ladders.size()), 0); int index = 0; - for (const auto ladderId : ladders) { + for (const auto &ladderId : ladders) { ++index; lua_pushnumber(L, static_cast<lua_Number>(ladderId)); lua_rawseti(L, -2, index); @@ -744,27 +742,27 @@ int GameFunctions::luaGameGetDummies(lua_State* L) { int GameFunctions::luaGameMakeFiendishMonster(lua_State* L) { // Game.makeFiendishMonster(monsterId[default= 0]) - uint32_t monsterId = getNumber<uint32_t>(L, 1, 0); - auto createForgeableMonsters = getBoolean(L, 2, false); + const auto monsterId = getNumber<uint32_t>(L, 1, 0); + const auto createForgeableMonsters = getBoolean(L, 2, false); lua_pushnumber(L, g_game().makeFiendishMonster(monsterId, createForgeableMonsters)); return 1; } int GameFunctions::luaGameRemoveFiendishMonster(lua_State* L) { // Game.removeFiendishMonster(monsterId) - uint32_t monsterId = getNumber<uint32_t>(L, 1); - auto create = getBoolean(L, 2, false); + const uint32_t monsterId = getNumber<uint32_t>(L, 1); + const auto create = getBoolean(L, 2, false); lua_pushnumber(L, g_game().removeFiendishMonster(monsterId, create)); return 1; } int GameFunctions::luaGameGetFiendishMonsters(lua_State* L) { // Game.getFiendishMonsters() - const auto monsters = g_game().getFiendishMonsters(); + const auto &monsters = g_game().getFiendishMonsters(); lua_createtable(L, static_cast<int>(monsters.size()), 0); int index = 0; - for (const auto &monsterId : monsters) { + for (const auto monsterId : monsters) { ++index; lua_pushnumber(L, monsterId); lua_rawseti(L, -2, index); @@ -795,7 +793,7 @@ int GameFunctions::luaGameGetTalkActions(lua_State* L) { int GameFunctions::luaGameGetEventCallbacks(lua_State* L) { lua_createtable(L, 0, 0); lua_pushcfunction(L, EventCallbackFunctions::luaEventCallbackLoad); - for (auto [value, name] : magic_enum::enum_entries<EventCallback_t>()) { + for (const auto &[value, name] : magic_enum::enum_entries<EventCallback_t>()) { if (value != EventCallback_t::none) { std::string methodName = magic_enum::enum_name(value).data(); lua_pushstring(L, methodName.c_str()); @@ -816,12 +814,12 @@ int GameFunctions::luaGameRegisterAchievement(lua_State* L) { return 1; } - uint16_t id = getNumber<uint16_t>(L, 1); - std::string name = getString(L, 2); - std::string description = getString(L, 3); - bool secret = getBoolean(L, 4); - uint8_t grade = getNumber<uint8_t>(L, 5); - uint8_t points = getNumber<uint8_t>(L, 6); + const uint16_t id = getNumber<uint16_t>(L, 1); + const std::string name = getString(L, 2); + const std::string description = getString(L, 3); + const bool secret = getBoolean(L, 4); + const uint8_t grade = getNumber<uint8_t>(L, 5); + const uint8_t points = getNumber<uint8_t>(L, 6); g_game().registerAchievement(id, name, description, secret, grade, points); pushBoolean(L, true); return 1; @@ -829,8 +827,8 @@ int GameFunctions::luaGameRegisterAchievement(lua_State* L) { int GameFunctions::luaGameGetAchievementInfoById(lua_State* L) { // Game.getAchievementInfoById(id) - uint16_t id = getNumber<uint16_t>(L, 1); - Achievement achievement = g_game().getAchievementById(id); + const uint16_t id = getNumber<uint16_t>(L, 1); + const Achievement achievement = g_game().getAchievementById(id); if (achievement.id == 0) { reportErrorFunc("Achievement id is wrong"); return 1; @@ -848,8 +846,8 @@ int GameFunctions::luaGameGetAchievementInfoById(lua_State* L) { int GameFunctions::luaGameGetAchievementInfoByName(lua_State* L) { // Game.getAchievementInfoByName(name) - std::string name = getString(L, 1); - Achievement achievement = g_game().getAchievementByName(name); + const std::string name = getString(L, 1); + const Achievement achievement = g_game().getAchievementByName(name); if (achievement.id == 0) { reportErrorFunc("Achievement name is wrong"); return 1; diff --git a/src/lua/functions/core/game/game_functions.hpp b/src/lua/functions/core/game/game_functions.hpp index 70e81061c..3c668c54f 100644 --- a/src/lua/functions/core/game/game_functions.hpp +++ b/src/lua/functions/core/game/game_functions.hpp @@ -13,6 +13,12 @@ class GameFunctions final : LuaScriptInterface { public: + explicit GameFunctions(lua_State* L) : + LuaScriptInterface("GameFunctions") { + init(L); + } + ~GameFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "Game"); diff --git a/src/lua/functions/core/game/global_functions.cpp b/src/lua/functions/core/game/global_functions.cpp index 6b5175b06..14d87e5af 100644 --- a/src/lua/functions/core/game/global_functions.cpp +++ b/src/lua/functions/core/game/global_functions.cpp @@ -7,40 +7,81 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/core/game/global_functions.hpp" +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" #include "creatures/interactions/chat.hpp" +#include "creatures/players/wheel/player_wheel.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/save_manager.hpp" -#include "lua/functions/core/game/global_functions.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "lua/global/globalevent.hpp" +#include "lua/global/lua_timer_event_descr.hpp" #include "lua/scripts/lua_environment.hpp" #include "lua/scripts/script_environment.hpp" -#include "lua/global/globalevent.hpp" #include "server/network/protocol/protocolstatus.hpp" -#include "creatures/players/wheel/player_wheel.hpp" -#include "lua/global/lua_timer_event_descr.hpp" -class Creature; +void GlobalFunctions::init(lua_State* L) { + lua_register(L, "addEvent", GlobalFunctions::luaAddEvent); + lua_register(L, "cleanMap", GlobalFunctions::luaCleanMap); + lua_register(L, "createCombatArea", GlobalFunctions::luaCreateCombatArea); + lua_register(L, "debugPrint", GlobalFunctions::luaDebugPrint); + lua_register(L, "doAddContainerItem", GlobalFunctions::luaDoAddContainerItem); + lua_register(L, "doAreaCombatCondition", GlobalFunctions::luaDoAreaCombatCondition); + lua_register(L, "doAreaCombatDispel", GlobalFunctions::luaDoAreaCombatDispel); + lua_register(L, "doAreaCombatHealth", GlobalFunctions::luaDoAreaCombatHealth); + lua_register(L, "doAreaCombatMana", GlobalFunctions::luaDoAreaCombatMana); + lua_register(L, "doChallengeCreature", GlobalFunctions::luaDoChallengeCreature); + lua_register(L, "doPlayerAddItem", GlobalFunctions::luaDoPlayerAddItem); + lua_register(L, "doTargetCombatCondition", GlobalFunctions::luaDoTargetCombatCondition); + lua_register(L, "doTargetCombatDispel", GlobalFunctions::luaDoTargetCombatDispel); + lua_register(L, "doTargetCombatHealth", GlobalFunctions::luaDoTargetCombatHealth); + lua_register(L, "doTargetCombatMana", GlobalFunctions::luaDoTargetCombatMana); + lua_register(L, "getDepotId", GlobalFunctions::luaGetDepotId); + lua_register(L, "getWaypointPositionByName", GlobalFunctions::luaGetWaypointPositionByName); + lua_register(L, "getWorldLight", GlobalFunctions::luaGetWorldLight); + lua_register(L, "getWorldTime", GlobalFunctions::luaGetWorldTime); + lua_register(L, "getWorldUpTime", GlobalFunctions::luaGetWorldUpTime); + lua_register(L, "isDepot", GlobalFunctions::luaIsDepot); + lua_register(L, "isInWar", GlobalFunctions::luaIsInWar); + lua_register(L, "isMovable", GlobalFunctions::luaIsMovable); + lua_register(L, "isValidUID", GlobalFunctions::luaIsValidUID); + lua_register(L, "saveServer", GlobalFunctions::luaSaveServer); + lua_register(L, "sendChannelMessage", GlobalFunctions::luaSendChannelMessage); + lua_register(L, "sendGuildChannelMessage", GlobalFunctions::luaSendGuildChannelMessage); + lua_register(L, "stopEvent", GlobalFunctions::luaStopEvent); + + registerGlobalVariable(L, "INDEX_WHEREEVER", INDEX_WHEREEVER); + registerGlobalBoolean(L, "VIRTUAL_PARENT", true); + registerGlobalMethod(L, "isType", GlobalFunctions::luaIsType); + registerGlobalMethod(L, "rawgetmetatable", GlobalFunctions::luaRawGetMetatable); + registerGlobalMethod(L, "createTable", GlobalFunctions::luaCreateTable); + registerGlobalMethod(L, "systemTime", GlobalFunctions::luaSystemTime); + registerGlobalMethod(L, "getFormattedTimeRemaining", GlobalFunctions::luaGetFormattedTimeRemaining); + registerGlobalMethod(L, "reportError", GlobalFunctions::luaReportError); +} + int GlobalFunctions::luaDoPlayerAddItem(lua_State* L) { // doPlayerAddItem(cid, itemid, <optional: default: 1> count/subtype, <optional: default: 1> canDropOnMap) // doPlayerAddItem(cid, itemid, <optional: default: 1> count, <optional: default: 1> canDropOnMap, <optional: default: 1>subtype) - std::shared_ptr<Player> player = getPlayer(L, 1); + const auto &player = getPlayer(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint16_t itemId = getNumber<uint16_t>(L, 2); - int32_t count = getNumber<int32_t>(L, 3, 1); - bool canDropOnMap = getBoolean(L, 4, true); - uint16_t subType = getNumber<uint16_t>(L, 5, 1); + const uint16_t itemId = getNumber<uint16_t>(L, 2); + const auto count = getNumber<int32_t>(L, 3, 1); + const bool canDropOnMap = getBoolean(L, 4, true); + auto subType = getNumber<uint16_t>(L, 5, 1); const ItemType &it = Item::items[itemId]; int32_t itemCount; - auto parameters = lua_gettop(L); + const auto parameters = lua_gettop(L); if (parameters > 4) { // subtype already supplied, count then is the amount itemCount = std::max<int32_t>(1, count); @@ -61,7 +102,7 @@ int GlobalFunctions::luaDoPlayerAddItem(lua_State* L) { stackCount = it.stackSize; } - std::shared_ptr<Item> newItem = Item::CreateItem(itemId, stackCount); + const auto &newItem = Item::CreateItem(itemId, stackCount); if (!newItem) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -80,7 +121,7 @@ int GlobalFunctions::luaDoPlayerAddItem(lua_State* L) { if (--itemCount == 0) { if (newItem->getParent()) { - uint32_t uid = getScriptEnv()->addThing(newItem); + const uint32_t uid = getScriptEnv()->addThing(newItem); lua_pushnumber(L, uid); return 1; } else { @@ -103,7 +144,7 @@ int GlobalFunctions::luaIsValidUID(lua_State* L) { int GlobalFunctions::luaIsDepot(lua_State* L) { // isDepot(uid) - std::shared_ptr<Container> container = getScriptEnv()->getContainerByUID(getNumber<uint32_t>(L, -1)); + const auto &container = getScriptEnv()->getContainerByUID(getNumber<uint32_t>(L, -1)); pushBoolean(L, container && container->getDepotLocker()); return 1; } @@ -111,29 +152,29 @@ int GlobalFunctions::luaIsDepot(lua_State* L) { int GlobalFunctions::luaIsMovable(lua_State* L) { // isMovable(uid) // isMovable(uid) - std::shared_ptr<Thing> thing = getScriptEnv()->getThingByUID(getNumber<uint32_t>(L, -1)); + const auto &thing = getScriptEnv()->getThingByUID(getNumber<uint32_t>(L, -1)); pushBoolean(L, thing && thing->isPushable()); return 1; } int GlobalFunctions::luaDoAddContainerItem(lua_State* L) { // doAddContainerItem(uid, itemid, <optional> count/subtype) - uint32_t uid = getNumber<uint32_t>(L, 1); + const uint32_t uid = getNumber<uint32_t>(L, 1); ScriptEnvironment* env = getScriptEnv(); - std::shared_ptr<Container> container = env->getContainerByUID(uid); + const auto &container = env->getContainerByUID(uid); if (!container) { reportErrorFunc(getErrorDesc(LUA_ERROR_CONTAINER_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint16_t itemId = getNumber<uint16_t>(L, 2); + const uint16_t itemId = getNumber<uint16_t>(L, 2); const ItemType &it = Item::items[itemId]; int32_t itemCount = 1; int32_t subType = 1; - uint32_t count = getNumber<uint32_t>(L, 3, 1); + const auto count = getNumber<uint32_t>(L, 3, 1); if (it.hasSubType()) { if (it.stackable) { @@ -146,8 +187,8 @@ int GlobalFunctions::luaDoAddContainerItem(lua_State* L) { } while (itemCount > 0) { - int32_t stackCount = std::min<int32_t>(it.stackSize, subType); - std::shared_ptr<Item> newItem = Item::CreateItem(itemId, stackCount); + const int32_t stackCount = std::min<int32_t>(it.stackSize, subType); + const auto &newItem = Item::CreateItem(itemId, stackCount); if (!newItem) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -181,16 +222,16 @@ int GlobalFunctions::luaDoAddContainerItem(lua_State* L) { int GlobalFunctions::luaGetDepotId(lua_State* L) { // getDepotId(uid) - uint32_t uid = getNumber<uint32_t>(L, -1); + const uint32_t uid = getNumber<uint32_t>(L, -1); - std::shared_ptr<Container> container = getScriptEnv()->getContainerByUID(uid); + const auto &container = getScriptEnv()->getContainerByUID(uid); if (!container) { reportErrorFunc(getErrorDesc(LUA_ERROR_CONTAINER_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<DepotLocker> depotLocker = container->getDepotLocker(); + const auto &depotLocker = container->getDepotLocker(); if (!depotLocker) { reportErrorFunc("Depot not found"); pushBoolean(L, false); @@ -203,14 +244,14 @@ int GlobalFunctions::luaGetDepotId(lua_State* L) { int GlobalFunctions::luaGetWorldTime(lua_State* L) { // getWorldTime() - uint32_t time = g_game().getLightHour(); + const uint32_t time = g_game().getLightHour(); lua_pushnumber(L, time); return 1; } int GlobalFunctions::luaGetWorldLight(lua_State* L) { // getWorldLight() - LightInfo lightInfo = g_game().getWorldLightInfo(); + const LightInfo lightInfo = g_game().getWorldLightInfo(); lua_pushnumber(L, lightInfo.level); lua_pushnumber(L, lightInfo.color); return 2; @@ -218,24 +259,24 @@ int GlobalFunctions::luaGetWorldLight(lua_State* L) { int GlobalFunctions::luaGetWorldUpTime(lua_State* L) { // getWorldUpTime() - uint64_t uptime = (OTSYS_TIME(true) - ProtocolStatus::start) / 1000; + const uint64_t uptime = (OTSYS_TIME(true) - ProtocolStatus::start) / 1000; lua_pushnumber(L, uptime); return 1; } int GlobalFunctions::luaCreateCombatArea(lua_State* L) { // createCombatArea( {area}, <optional> {extArea} ) - ScriptEnvironment* env = getScriptEnv(); + const ScriptEnvironment* env = getScriptEnv(); if (env->getScriptId() != EVENT_ID_LOADING) { reportErrorFunc("This function can only be used while loading the script."); pushBoolean(L, false); return 1; } - uint32_t areaId = g_luaEnvironment().createAreaObject(env->getScriptInterface()); + const uint32_t areaId = g_luaEnvironment().createAreaObject(env->getScriptInterface()); const auto &area = g_luaEnvironment().getAreaObject(areaId); - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); if (parameters >= 2) { uint32_t rowsExtArea; std::list<uint32_t> listExtArea; @@ -262,17 +303,17 @@ int GlobalFunctions::luaCreateCombatArea(lua_State* L) { int GlobalFunctions::luaDoAreaCombatHealth(lua_State* L) { // doAreaCombatHealth(cid, type, pos, area, min, max, effect[, origin = ORIGIN_SPELL]) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint32_t areaId = getNumber<uint32_t>(L, 4); + const uint32_t areaId = getNumber<uint32_t>(L, 4); const auto &area = g_luaEnvironment().getAreaObject(areaId); if (area || areaId == 0) { - CombatType_t combatType = getNumber<CombatType_t>(L, 2); + const CombatType_t combatType = getNumber<CombatType_t>(L, 2); CombatParams params; params.combatType = combatType; @@ -286,7 +327,7 @@ int GlobalFunctions::luaDoAreaCombatHealth(lua_State* L) { damage.instantSpellName = getString(L, 9); damage.runeSpellName = getString(L, 10); if (creature) { - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->wheel()->getCombatDataSpell(damage); } } @@ -302,21 +343,21 @@ int GlobalFunctions::luaDoAreaCombatHealth(lua_State* L) { int GlobalFunctions::luaDoTargetCombatHealth(lua_State* L) { // doTargetCombatHealth(cid, target, type, min, max, effect[, origin = ORIGIN_SPELL]) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); if (!target) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - CombatType_t combatType = getNumber<CombatType_t>(L, 3); + const CombatType_t combatType = getNumber<CombatType_t>(L, 3); CombatParams params; params.combatType = combatType; @@ -330,7 +371,7 @@ int GlobalFunctions::luaDoTargetCombatHealth(lua_State* L) { damage.instantSpellName = getString(L, 9); damage.runeSpellName = getString(L, 10); if (creature) { - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->wheel()->getCombatDataSpell(damage); } } @@ -347,14 +388,14 @@ int GlobalFunctions::luaDoTargetCombatHealth(lua_State* L) { int GlobalFunctions::luaDoAreaCombatMana(lua_State* L) { // doAreaCombatMana(cid, pos, area, min, max, effect[, origin = ORIGIN_SPELL]) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint32_t areaId = getNumber<uint32_t>(L, 3); + const uint32_t areaId = getNumber<uint32_t>(L, 3); const auto &area = g_luaEnvironment().getAreaObject(areaId); if (area || areaId == 0) { CombatParams params; @@ -368,12 +409,12 @@ int GlobalFunctions::luaDoAreaCombatMana(lua_State* L) { damage.instantSpellName = getString(L, 8); damage.runeSpellName = getString(L, 9); if (creature) { - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->wheel()->getCombatDataSpell(damage); } } - Position pos = getPosition(L, 2); + const Position pos = getPosition(L, 2); Combat::doCombatMana(creature, pos, area, damage, params); pushBoolean(L, true); } else { @@ -385,14 +426,14 @@ int GlobalFunctions::luaDoAreaCombatMana(lua_State* L) { int GlobalFunctions::luaDoTargetCombatMana(lua_State* L) { // doTargetCombatMana(cid, target, min, max, effect[, origin = ORIGIN_SPELL) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); if (!target) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -400,8 +441,8 @@ int GlobalFunctions::luaDoTargetCombatMana(lua_State* L) { } CombatParams params; - auto minval = getNumber<int32_t>(L, 3); - auto maxval = getNumber<int32_t>(L, 4); + const auto minval = getNumber<int32_t>(L, 3); + const auto maxval = getNumber<int32_t>(L, 4); params.aggressive = minval + maxval < 0; params.impactEffect = getNumber<uint16_t>(L, 5); @@ -413,7 +454,7 @@ int GlobalFunctions::luaDoTargetCombatMana(lua_State* L) { damage.instantSpellName = getString(L, 7); damage.runeSpellName = getString(L, 8); if (creature) { - if (auto player = creature->getPlayer()) { + if (const auto &player = creature->getPlayer()) { player->wheel()->getCombatDataSpell(damage); } } @@ -425,21 +466,21 @@ int GlobalFunctions::luaDoTargetCombatMana(lua_State* L) { int GlobalFunctions::luaDoAreaCombatCondition(lua_State* L) { // doAreaCombatCondition(cid, pos, area, condition, effect) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - const std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 4); + const auto &condition = getUserdataShared<Condition>(L, 4); if (!condition) { reportErrorFunc(getErrorDesc(LUA_ERROR_CONDITION_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint32_t areaId = getNumber<uint32_t>(L, 3); + const uint32_t areaId = getNumber<uint32_t>(L, 3); const auto &area = g_luaEnvironment().getAreaObject(areaId); if (area || areaId == 0) { CombatParams params; @@ -456,21 +497,21 @@ int GlobalFunctions::luaDoAreaCombatCondition(lua_State* L) { int GlobalFunctions::luaDoTargetCombatCondition(lua_State* L) { // doTargetCombatCondition(cid, target, condition, effect) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); if (!target) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - const std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 3); + const auto &condition = getUserdataShared<Condition>(L, 3); if (!condition) { reportErrorFunc(getErrorDesc(LUA_ERROR_CONDITION_NOT_FOUND)); pushBoolean(L, false); @@ -487,14 +528,14 @@ int GlobalFunctions::luaDoTargetCombatCondition(lua_State* L) { int GlobalFunctions::luaDoAreaCombatDispel(lua_State* L) { // doAreaCombatDispel(cid, pos, area, type, effect) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint32_t areaId = getNumber<uint32_t>(L, 3); + const uint32_t areaId = getNumber<uint32_t>(L, 3); const auto &area = g_luaEnvironment().getAreaObject(areaId); if (area || areaId == 0) { CombatParams params; @@ -512,14 +553,14 @@ int GlobalFunctions::luaDoAreaCombatDispel(lua_State* L) { int GlobalFunctions::luaDoTargetCombatDispel(lua_State* L) { // doTargetCombatDispel(cid, target, type, effect) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature && (!isNumber(L, 1) || getNumber<uint32_t>(L, 1) != 0)) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); if (!target) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -536,21 +577,21 @@ int GlobalFunctions::luaDoTargetCombatDispel(lua_State* L) { int GlobalFunctions::luaDoChallengeCreature(lua_State* L) { // doChallengeCreature(cid, target, targetChangeCooldown) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); if (!target) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - int targetChangeCooldown = getNumber<int32_t>(L, 3, 6000); + const int targetChangeCooldown = getNumber<int32_t>(L, 3, 6000); // This function must be defined to take and handle the targetChangeCooldown. target->challengeCreature(creature, targetChangeCooldown); @@ -569,14 +610,14 @@ int GlobalFunctions::luaAddEvent(lua_State* L) { lua_xmove(L, globalState, lua_gettop(L)); } - int parameters = lua_gettop(globalState); + const int parameters = lua_gettop(globalState); if (!isFunction(globalState, -parameters)) { // -parameters means the first parameter from left to right reportErrorFunc("callback parameter should be a function."); pushBoolean(L, false); return 1; } - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) || g_configManager().getBoolean(CONVERT_UNSAFE_SCRIPTS, __FUNCTION__)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) || g_configManager().getBoolean(CONVERT_UNSAFE_SCRIPTS)) { std::vector<std::pair<int32_t, LuaData_t>> indexes; for (int i = 3; i <= parameters; ++i) { if (lua_getmetatable(globalState, i) == 0) { @@ -586,13 +627,13 @@ int GlobalFunctions::luaAddEvent(lua_State* L) { LuaData_t type = getNumber<LuaData_t>(L, -1); if (type != LuaData_t::Unknown && type <= LuaData_t::Npc) { - indexes.push_back({ i, type }); + indexes.emplace_back(i, type); } lua_pop(globalState, 2); } if (!indexes.empty()) { - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS)) { bool plural = indexes.size() > 1; std::string warningString = "Argument"; @@ -621,7 +662,7 @@ int GlobalFunctions::luaAddEvent(lua_State* L) { reportErrorFunc(warningString); } - if (g_configManager().getBoolean(CONVERT_UNSAFE_SCRIPTS, __FUNCTION__)) { + if (g_configManager().getBoolean(CONVERT_UNSAFE_SCRIPTS)) { for (const auto &entry : indexes) { switch (entry.second) { case LuaData_t::Item: @@ -655,7 +696,7 @@ int GlobalFunctions::luaAddEvent(lua_State* L) { eventDesc.parameters.push_back(luaL_ref(globalState, LUA_REGISTRYINDEX)); } - uint32_t delay = std::max<uint32_t>(100, getNumber<uint32_t>(globalState, 2)); + const uint32_t delay = std::max<uint32_t>(100, getNumber<uint32_t>(globalState, 2)); lua_pop(globalState, 1); eventDesc.function = luaL_ref(globalState, LUA_REGISTRYINDEX); @@ -669,7 +710,7 @@ int GlobalFunctions::luaAddEvent(lua_State* L) { "LuaEnvironment::executeTimerEvent" ); - g_luaEnvironment().timerEvents.emplace(lastTimerEventId, std::move(eventDesc)); + g_luaEnvironment().timerEvents.try_emplace(lastTimerEventId, std::move(eventDesc)); lua_pushnumber(L, lastTimerEventId++); return 1; } @@ -683,22 +724,22 @@ int GlobalFunctions::luaStopEvent(lua_State* L) { return 1; } - uint32_t eventId = getNumber<uint32_t>(L, 1); + const uint32_t eventId = getNumber<uint32_t>(L, 1); auto &timerEvents = g_luaEnvironment().timerEvents; - auto it = timerEvents.find(eventId); + const auto it = timerEvents.find(eventId); if (it == timerEvents.end()) { pushBoolean(L, false); return 1; } - LuaTimerEventDesc timerEventDesc = std::move(it->second); + const LuaTimerEventDesc timerEventDesc = std::move(it->second); timerEvents.erase(it); g_dispatcher().stopEvent(timerEventDesc.eventId); luaL_unref(globalState, LUA_REGISTRYINDEX, timerEventDesc.function); - for (auto parameter : timerEventDesc.parameters) { + for (const auto parameter : timerEventDesc.parameters) { luaL_unref(globalState, LUA_REGISTRYINDEX, parameter); } @@ -748,7 +789,7 @@ int GlobalFunctions::luaGetWaypointPositionByName(lua_State* L) { // getWaypointPositionByName(name) auto &waypoints = g_game().map.waypoints; - auto it = waypoints.find(getString(L, -1)); + const auto it = waypoints.find(getString(L, -1)); if (it != waypoints.end()) { pushPosition(L, it->second); } else { @@ -759,15 +800,15 @@ int GlobalFunctions::luaGetWaypointPositionByName(lua_State* L) { int GlobalFunctions::luaSendChannelMessage(lua_State* L) { // sendChannelMessage(channelId, type, message) - uint16_t channelId = getNumber<uint16_t>(L, 1); + const uint16_t channelId = getNumber<uint16_t>(L, 1); const auto &channel = g_chat().getChannelById(channelId); if (!channel) { pushBoolean(L, false); return 1; } - SpeakClasses type = getNumber<SpeakClasses>(L, 2); - std::string message = getString(L, 3); + const SpeakClasses type = getNumber<SpeakClasses>(L, 2); + const std::string message = getString(L, 3); channel->sendToAll(message, type); pushBoolean(L, true); return 1; @@ -775,15 +816,15 @@ int GlobalFunctions::luaSendChannelMessage(lua_State* L) { int GlobalFunctions::luaSendGuildChannelMessage(lua_State* L) { // sendGuildChannelMessage(guildId, type, message) - uint32_t guildId = getNumber<uint32_t>(L, 1); + const uint32_t guildId = getNumber<uint32_t>(L, 1); const auto &channel = g_chat().getGuildChannelById(guildId); if (!channel) { pushBoolean(L, false); return 1; } - SpeakClasses type = getNumber<SpeakClasses>(L, 2); - std::string message = getString(L, 3); + const SpeakClasses type = getNumber<SpeakClasses>(L, 2); + const std::string message = getString(L, 3); channel->sendToAll(message, type); pushBoolean(L, true); return 1; @@ -795,20 +836,20 @@ int GlobalFunctions::luaIsType(lua_State* L) { lua_getmetatable(L, -2); lua_rawgeti(L, -2, 'p'); - uint_fast8_t parentsB = getNumber<uint_fast8_t>(L, 1); + const uint_fast8_t parentsB = getNumber<uint_fast8_t>(L, 1); lua_rawgeti(L, -3, 'h'); - size_t hashB = getNumber<size_t>(L, 1); + const size_t hashB = getNumber<size_t>(L, 1); lua_rawgeti(L, -3, 'p'); - uint_fast8_t parentsA = getNumber<uint_fast8_t>(L, 1); + const uint_fast8_t parentsA = getNumber<uint_fast8_t>(L, 1); for (uint_fast8_t i = parentsA; i < parentsB; ++i) { lua_getfield(L, -3, "__index"); lua_replace(L, -4); } lua_rawgeti(L, -4, 'h'); - size_t hashA = getNumber<size_t>(L, 1); + const size_t hashA = getNumber<size_t>(L, 1); pushBoolean(L, hashA == hashB); return 1; @@ -834,14 +875,14 @@ int GlobalFunctions::luaSystemTime(lua_State* L) { int GlobalFunctions::luaGetFormattedTimeRemaining(lua_State* L) { // getFormattedTimeRemaining(time) - time_t time = getNumber<uint32_t>(L, 1); + const time_t time = getNumber<uint32_t>(L, 1); lua_pushstring(L, getFormattedTimeRemaining(time).c_str()); return 1; } int GlobalFunctions::luaReportError(lua_State* L) { // reportError(errorDescription) - auto errorDescription = getString(L, 1); + const auto errorDescription = getString(L, 1); reportError(__func__, errorDescription, true); return 1; } diff --git a/src/lua/functions/core/game/global_functions.hpp b/src/lua/functions/core/game/global_functions.hpp index cef752c66..9d4ce14b1 100644 --- a/src/lua/functions/core/game/global_functions.hpp +++ b/src/lua/functions/core/game/global_functions.hpp @@ -13,45 +13,13 @@ class GlobalFunctions final : LuaScriptInterface { public: - static void init(lua_State* L) { - lua_register(L, "addEvent", GlobalFunctions::luaAddEvent); - lua_register(L, "cleanMap", GlobalFunctions::luaCleanMap); - lua_register(L, "createCombatArea", GlobalFunctions::luaCreateCombatArea); - lua_register(L, "debugPrint", GlobalFunctions::luaDebugPrint); - lua_register(L, "doAddContainerItem", GlobalFunctions::luaDoAddContainerItem); - lua_register(L, "doAreaCombatCondition", GlobalFunctions::luaDoAreaCombatCondition); - lua_register(L, "doAreaCombatDispel", GlobalFunctions::luaDoAreaCombatDispel); - lua_register(L, "doAreaCombatHealth", GlobalFunctions::luaDoAreaCombatHealth); - lua_register(L, "doAreaCombatMana", GlobalFunctions::luaDoAreaCombatMana); - lua_register(L, "doChallengeCreature", GlobalFunctions::luaDoChallengeCreature); - lua_register(L, "doPlayerAddItem", GlobalFunctions::luaDoPlayerAddItem); - lua_register(L, "doTargetCombatCondition", GlobalFunctions::luaDoTargetCombatCondition); - lua_register(L, "doTargetCombatDispel", GlobalFunctions::luaDoTargetCombatDispel); - lua_register(L, "doTargetCombatHealth", GlobalFunctions::luaDoTargetCombatHealth); - lua_register(L, "doTargetCombatMana", GlobalFunctions::luaDoTargetCombatMana); - lua_register(L, "getDepotId", GlobalFunctions::luaGetDepotId); - lua_register(L, "getWaypointPositionByName", GlobalFunctions::luaGetWaypointPositionByName); - lua_register(L, "getWorldLight", GlobalFunctions::luaGetWorldLight); - lua_register(L, "getWorldTime", GlobalFunctions::luaGetWorldTime); - lua_register(L, "getWorldUpTime", GlobalFunctions::luaGetWorldUpTime); - lua_register(L, "isDepot", GlobalFunctions::luaIsDepot); - lua_register(L, "isInWar", GlobalFunctions::luaIsInWar); - lua_register(L, "isMovable", GlobalFunctions::luaIsMovable); - lua_register(L, "isValidUID", GlobalFunctions::luaIsValidUID); - lua_register(L, "saveServer", GlobalFunctions::luaSaveServer); - lua_register(L, "sendChannelMessage", GlobalFunctions::luaSendChannelMessage); - lua_register(L, "sendGuildChannelMessage", GlobalFunctions::luaSendGuildChannelMessage); - lua_register(L, "stopEvent", GlobalFunctions::luaStopEvent); - - registerGlobalVariable(L, "INDEX_WHEREEVER", INDEX_WHEREEVER); - registerGlobalBoolean(L, "VIRTUAL_PARENT", true); - registerGlobalMethod(L, "isType", GlobalFunctions::luaIsType); - registerGlobalMethod(L, "rawgetmetatable", GlobalFunctions::luaRawGetMetatable); - registerGlobalMethod(L, "createTable", GlobalFunctions::luaCreateTable); - registerGlobalMethod(L, "systemTime", GlobalFunctions::luaSystemTime); - registerGlobalMethod(L, "getFormattedTimeRemaining", GlobalFunctions::luaGetFormattedTimeRemaining); - registerGlobalMethod(L, "reportError", GlobalFunctions::luaReportError); + explicit GlobalFunctions(lua_State* L) : + LuaScriptInterface("GlobalFunctions") { + init(L); } + ~GlobalFunctions() override = default; + + static void init(lua_State* L); private: static int luaAddEvent(lua_State* L); diff --git a/src/lua/functions/core/game/lua_enums.cpp b/src/lua/functions/core/game/lua_enums.cpp index d0be72158..5a03fa246 100644 --- a/src/lua/functions/core/game/lua_enums.cpp +++ b/src/lua/functions/core/game/lua_enums.cpp @@ -7,19 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/game/lua_enums.hpp" -#include "creatures/players/wheel/wheel_gems.hpp" #include "creatures/players/wheel/wheel_definitions.hpp" -#include "io/io_bosstiary.hpp" -#include "config/configmanager.hpp" -#include "creatures/creature.hpp" -#include "declarations.hpp" -#include "game/functions/game_reload.hpp" -#include "enums/account_type.hpp" #include "enums/account_group_type.hpp" +#include "enums/account_type.hpp" +#include "enums/item_attribute.hpp" +#include "game/functions/game_reload.hpp" +#include "io/io_bosstiary.hpp" + +constexpr const char* soundNamespace = "SOUND_EFFECT_TYPE_"; #define registerMagicEnum(luaState, enumClassType) \ { \ @@ -109,6 +106,9 @@ void LuaEnums::init(lua_State* L) { initWebhookEnums(L); initBosstiaryEnums(L); initSoundEnums(L); + spelltSoundEnums(L); + monsterSoundEnums(L); + effectsSoundEnums(L); initWheelEnums(L); initAttributeConditionSubIdEnums(L); initConcoctionsEnum(L); @@ -228,6 +228,7 @@ void LuaEnums::initOthersEnums(lua_State* L) { registerEnum(L, SCREENSHOT_TYPE_PLAYERATTACKING); registerEnum(L, SCREENSHOT_TYPE_TREASUREFOUND); registerEnum(L, SCREENSHOT_TYPE_SKILLUP); + registerEnum(L, SCREENSHOT_TYPE_GIFTOFLIFE); } void LuaEnums::initAccountEnums(lua_State* L) { @@ -330,37 +331,9 @@ void LuaEnums::initFactionEnums(lua_State* L) { } void LuaEnums::initConditionEnums(lua_State* L) { - registerEnum(L, CONDITION_NONE); - registerEnum(L, CONDITION_POISON); - registerEnum(L, CONDITION_FIRE); - registerEnum(L, CONDITION_ENERGY); - registerEnum(L, CONDITION_BLEEDING); - registerEnum(L, CONDITION_HASTE); - registerEnum(L, CONDITION_PARALYZE); - registerEnum(L, CONDITION_OUTFIT); - registerEnum(L, CONDITION_INVISIBLE); - registerEnum(L, CONDITION_LIGHT); - registerEnum(L, CONDITION_MANASHIELD); - registerEnum(L, CONDITION_INFIGHT); - registerEnum(L, CONDITION_DRUNK); - registerEnum(L, CONDITION_EXHAUST); - registerEnum(L, CONDITION_REGENERATION); - registerEnum(L, CONDITION_SOUL); - registerEnum(L, CONDITION_DROWN); - registerEnum(L, CONDITION_MUTED); - registerEnum(L, CONDITION_CHANNELMUTEDTICKS); - registerEnum(L, CONDITION_YELLTICKS); - registerEnum(L, CONDITION_ATTRIBUTES); - registerEnum(L, CONDITION_FREEZING); - registerEnum(L, CONDITION_DAZZLED); - registerEnum(L, CONDITION_CURSED); - registerEnum(L, CONDITION_EXHAUST_COMBAT); - registerEnum(L, CONDITION_EXHAUST_HEAL); - registerEnum(L, CONDITION_PACIFIED); - registerEnum(L, CONDITION_SPELLCOOLDOWN); - registerEnum(L, CONDITION_SPELLGROUPCOOLDOWN); - registerEnum(L, CONDITION_ROOTED); - registerEnum(L, CONDITION_FEARED); + for (const auto value : magic_enum::enum_values<ConditionType_t>()) { + registerMagicEnum(L, value); + } } void LuaEnums::initConditionIdEnums(lua_State* L) { @@ -864,7 +837,7 @@ void LuaEnums::initItemTypeEnums(lua_State* L) { } void LuaEnums::initFluidEnums(lua_State* L) { - for (auto value : magic_enum::enum_values<Fluids_t>()) { + for (const auto value : magic_enum::enum_values<Fluids_t>()) { registerMagicEnum(L, value); } } @@ -936,7 +909,7 @@ void LuaEnums::initItemIdEnums(lua_State* L) { } void LuaEnums::initPlayerFlagEnums(lua_State* L) { - for (auto value : magic_enum::enum_values<PlayerFlags_t>()) { + for (const auto value : magic_enum::enum_values<PlayerFlags_t>()) { registerMagicEnum(L, value); } } @@ -1226,18 +1199,16 @@ void LuaEnums::initReturnValueEnums(lua_State* L) { // Reload void LuaEnums::initReloadTypeEnums(lua_State* L) { - for (auto value : magic_enum::enum_values<Reload_t>()) { + for (const auto value : magic_enum::enum_values<Reload_t>()) { registerMagicEnum(L, value); } } void LuaEnums::initCreaturesEventEnums(lua_State* L) { // Monsters - registerEnum(L, MONSTERS_EVENT_THINK); - registerEnum(L, MONSTERS_EVENT_APPEAR); - registerEnum(L, MONSTERS_EVENT_DISAPPEAR); - registerEnum(L, MONSTERS_EVENT_MOVE); - registerEnum(L, MONSTERS_EVENT_SAY); + for (auto value : magic_enum::enum_values<MonstersEvent_t>()) { + registerMagicEnum(L, value); + } // Npcs registerEnum(L, NPCS_EVENT_THINK); @@ -1252,7 +1223,7 @@ void LuaEnums::initCreaturesEventEnums(lua_State* L) { } void LuaEnums::initForgeEnums(lua_State* L) { - for (auto value : magic_enum::enum_values<ForgeClassifications_t>()) { + for (const auto value : magic_enum::enum_values<ForgeClassifications_t>()) { registerMagicEnum(L, value); } } @@ -1266,14 +1237,13 @@ void LuaEnums::initWebhookEnums(lua_State* L) { } void LuaEnums::initBosstiaryEnums(lua_State* L) { - for (auto value : magic_enum::enum_values<BosstiaryRarity_t>()) { + for (const auto value : magic_enum::enum_values<BosstiaryRarity_t>()) { registerMagicEnum(L, value); } } // "SOUND_EFFECT_TYPE_" is the sound lua namespace void LuaEnums::initSoundEnums(lua_State* L) { - std::string soundNamespace = "SOUND_EFFECT_TYPE_"; registerEnumNamespace(L, soundNamespace, SoundEffect_t::SILENCE); registerEnumNamespace(L, soundNamespace, SoundEffect_t::HUMAN_CLOSE_ATK_FIST); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_CLOSE_ATK_FIST); @@ -1303,6 +1273,9 @@ void LuaEnums::initSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_MELEE_ATK_MAGIC); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_MELEE_ATK_ETHEREAL); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_MELEE_ATK_CONSTRUCT); +} + +void LuaEnums::spelltSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_LIGHT_HEALING); registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_INTENSE_HEALING); registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_ULTIMATE_HEALING); @@ -1454,6 +1427,9 @@ void LuaEnums::initSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_EXPOSE_WEAKNESS); registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_SAP_STRENGTH); registerEnumNamespace(L, soundNamespace, SoundEffect_t::SPELL_CANCEL_MAGIC_SHIELD); +} + +void LuaEnums::monsterSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_SINGLE_TARGET_FIRE); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_SINGLE_TARGET_ENERGY); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_SINGLE_TARGET_EARTH); @@ -1518,6 +1494,9 @@ void LuaEnums::initSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_HIGHRISK_TELEPORT); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_MINION); registerEnumNamespace(L, soundNamespace, SoundEffect_t::MONSTER_SPELL_AGONY); +} + +void LuaEnums::effectsSoundEnums(lua_State* L) { registerEnumNamespace(L, soundNamespace, SoundEffect_t::AMPHIBIC_BARK); registerEnumNamespace(L, soundNamespace, SoundEffect_t::AQUATIC_BEAST_BARK); registerEnumNamespace(L, soundNamespace, SoundEffect_t::AQUATIC_CRITTER_BARK); @@ -1790,31 +1769,31 @@ void LuaEnums::initSoundEnums(lua_State* L) { void LuaEnums::initWheelEnums(lua_State* L) { std::string wheelNamespace = "WHEEL_INSTANT_"; - for (auto value : magic_enum::enum_values<WheelInstant_t>()) { + for (const auto value : magic_enum::enum_values<WheelInstant_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } wheelNamespace = "WHEEL_STAGE_"; - for (auto value : magic_enum::enum_values<WheelStage_t>()) { + for (const auto value : magic_enum::enum_values<WheelStage_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } wheelNamespace = "WHEEL_GRADE_"; - for (auto value : magic_enum::enum_values<WheelSpellGrade_t>()) { + for (const auto value : magic_enum::enum_values<WheelSpellGrade_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } wheelNamespace = "WHEEL_AVATAR_SKILL_"; - for (auto value : magic_enum::enum_values<WheelAvatarSkill_t>()) { + for (const auto value : magic_enum::enum_values<WheelAvatarSkill_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } wheelNamespace = "WHEEL_STAT_"; - for (auto value : magic_enum::enum_values<WheelStat_t>()) { + for (const auto value : magic_enum::enum_values<WheelStat_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } wheelNamespace = "WHEEL_BOOST_"; - for (auto value : magic_enum::enum_values<WheelSpellBoost_t>()) { + for (const auto value : magic_enum::enum_values<WheelSpellBoost_t>()) { registerMagicEnumNamespace(L, wheelNamespace, value); } } diff --git a/src/lua/functions/core/game/lua_enums.hpp b/src/lua/functions/core/game/lua_enums.hpp index 8beabbbac..44c79da7a 100644 --- a/src/lua/functions/core/game/lua_enums.hpp +++ b/src/lua/functions/core/game/lua_enums.hpp @@ -9,12 +9,16 @@ #pragma once -#include "account/account.hpp" -#include "declarations.hpp" #include "lua/scripts/luascript.hpp" class LuaEnums final : LuaScriptInterface { public: + explicit LuaEnums(lua_State* L) : + LuaScriptInterface("LuaEnums") { + init(L); + } + ~LuaEnums() override = default; + static void init(lua_State* L); private: @@ -66,5 +70,8 @@ class LuaEnums final : LuaScriptInterface { static void initWebhookEnums(lua_State* L); static void initBosstiaryEnums(lua_State* L); static void initSoundEnums(lua_State* L); + static void spelltSoundEnums(lua_State* L); + static void monsterSoundEnums(lua_State* L); + static void effectsSoundEnums(lua_State* L); static void initWheelEnums(lua_State* L); }; diff --git a/src/lua/functions/core/game/modal_window_functions.cpp b/src/lua/functions/core/game/modal_window_functions.cpp index 0221a9e9a..959944504 100644 --- a/src/lua/functions/core/game/modal_window_functions.cpp +++ b/src/lua/functions/core/game/modal_window_functions.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/core/game/modal_window_functions.hpp" #include "creatures/players/player.hpp" -#include "lua/functions/core/game/modal_window_functions.hpp" #include "game/modal_window/modal_window.hpp" // ModalWindow diff --git a/src/lua/functions/core/game/modal_window_functions.hpp b/src/lua/functions/core/game/modal_window_functions.hpp index 9d6b91920..1e2242d85 100644 --- a/src/lua/functions/core/game/modal_window_functions.hpp +++ b/src/lua/functions/core/game/modal_window_functions.hpp @@ -13,6 +13,12 @@ class ModalWindowFunctions final : LuaScriptInterface { public: + explicit ModalWindowFunctions(lua_State* L) : + LuaScriptInterface("ModalWindowFunctions") { + init(L); + } + ~ModalWindowFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "ModalWindow", "", ModalWindowFunctions::luaModalWindowCreate); registerMetaMethod(L, "ModalWindow", "__eq", ModalWindowFunctions::luaUserdataCompare); diff --git a/src/lua/functions/core/game/zone_functions.cpp b/src/lua/functions/core/game/zone_functions.cpp index 5471d0189..e53c777d6 100644 --- a/src/lua/functions/core/game/zone_functions.cpp +++ b/src/lua/functions/core/game/zone_functions.cpp @@ -1,12 +1,21 @@ -#include "pch.hpp" +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 "lua/functions/core/game/zone_functions.hpp" + #include "game/zones/zone.hpp" #include "game/game.hpp" // Zone int ZoneFunctions::luaZoneCreate(lua_State* L) { // Zone(name) - auto name = getString(L, 2); + const auto name = getString(L, 2); auto zone = Zone::getZone(name); if (!zone) { zone = Zone::addZone(name); @@ -17,8 +26,8 @@ int ZoneFunctions::luaZoneCreate(lua_State* L) { } int ZoneFunctions::luaZoneCompare(lua_State* L) { - auto zone1 = getUserdataShared<Zone>(L, 1); - auto zone2 = getUserdataShared<Zone>(L, 2); + const auto &zone1 = getUserdataShared<Zone>(L, 1); + const auto &zone2 = getUserdataShared<Zone>(L, 2); if (!zone1) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); @@ -36,7 +45,7 @@ int ZoneFunctions::luaZoneCompare(lua_State* L) { int ZoneFunctions::luaZoneGetName(lua_State* L) { // Zone:getName() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); @@ -48,15 +57,15 @@ int ZoneFunctions::luaZoneGetName(lua_State* L) { int ZoneFunctions::luaZoneAddArea(lua_State* L) { // Zone:addArea(fromPos, toPos) - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto fromPos = getPosition(L, 2); - auto toPos = getPosition(L, 3); - auto area = Area(fromPos, toPos); + const auto fromPos = getPosition(L, 2); + const auto toPos = getPosition(L, 3); + const auto area = Area(fromPos, toPos); zone->addArea(area); pushBoolean(L, true); return 1; @@ -64,15 +73,15 @@ int ZoneFunctions::luaZoneAddArea(lua_State* L) { int ZoneFunctions::luaZoneSubtractArea(lua_State* L) { // Zone:subtractArea(fromPos, toPos) - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto fromPos = getPosition(L, 2); - auto toPos = getPosition(L, 3); - auto area = Area(fromPos, toPos); + const auto fromPos = getPosition(L, 2); + const auto toPos = getPosition(L, 3); + const auto area = Area(fromPos, toPos); zone->subtractArea(area); pushBoolean(L, true); return 1; @@ -80,7 +89,7 @@ int ZoneFunctions::luaZoneSubtractArea(lua_State* L) { int ZoneFunctions::luaZoneGetRemoveDestination(lua_State* L) { // Zone:getRemoveDestination() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); return 1; @@ -91,25 +100,25 @@ int ZoneFunctions::luaZoneGetRemoveDestination(lua_State* L) { int ZoneFunctions::luaZoneSetRemoveDestination(lua_State* L) { // Zone:setRemoveDestination(pos) - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); return 1; } - auto pos = getPosition(L, 2); + const auto pos = getPosition(L, 2); zone->setRemoveDestination(pos); return 1; } int ZoneFunctions::luaZoneGetPositions(lua_State* L) { // Zone:getPositions() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto positions = zone->getPositions(); + const auto positions = zone->getPositions(); lua_createtable(L, static_cast<int>(positions.size()), 0); int index = 0; @@ -123,20 +132,20 @@ int ZoneFunctions::luaZoneGetPositions(lua_State* L) { int ZoneFunctions::luaZoneGetCreatures(lua_State* L) { // Zone:getCreatures() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto creatures = zone->getCreatures(); + const auto &creatures = zone->getCreatures(); lua_createtable(L, static_cast<int>(creatures.size()), 0); int index = 0; - for (auto creature : creatures) { + for (const auto &creature : creatures) { index++; pushUserdata<Creature>(L, creature); - setMetatable(L, -1, "Creature"); + setCreatureMetatable(L, -1, creature); lua_rawseti(L, -2, index); } return 1; @@ -144,17 +153,17 @@ int ZoneFunctions::luaZoneGetCreatures(lua_State* L) { int ZoneFunctions::luaZoneGetPlayers(lua_State* L) { // Zone:getPlayers() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto players = zone->getPlayers(); + const auto &players = zone->getPlayers(); lua_createtable(L, static_cast<int>(players.size()), 0); int index = 0; - for (auto player : players) { + for (const auto &player : players) { index++; pushUserdata<Player>(L, player); setMetatable(L, -1, "Player"); @@ -165,17 +174,17 @@ int ZoneFunctions::luaZoneGetPlayers(lua_State* L) { int ZoneFunctions::luaZoneGetMonsters(lua_State* L) { // Zone:getMonsters() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto monsters = zone->getMonsters(); + const auto &monsters = zone->getMonsters(); lua_createtable(L, static_cast<int>(monsters.size()), 0); int index = 0; - for (auto monster : monsters) { + for (const auto &monster : monsters) { index++; pushUserdata<Monster>(L, monster); setMetatable(L, -1, "Monster"); @@ -186,17 +195,17 @@ int ZoneFunctions::luaZoneGetMonsters(lua_State* L) { int ZoneFunctions::luaZoneGetNpcs(lua_State* L) { // Zone:getNpcs() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto npcs = zone->getNpcs(); + const auto &npcs = zone->getNpcs(); lua_createtable(L, static_cast<int>(npcs.size()), 0); int index = 0; - for (auto npc : npcs) { + for (const auto &npc : npcs) { index++; pushUserdata<Npc>(L, npc); setMetatable(L, -1, "Npc"); @@ -207,17 +216,17 @@ int ZoneFunctions::luaZoneGetNpcs(lua_State* L) { int ZoneFunctions::luaZoneGetItems(lua_State* L) { // Zone:getItems() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto items = zone->getItems(); + const auto &items = zone->getItems(); lua_createtable(L, static_cast<int>(items.size()), 0); int index = 0; - for (auto item : items) { + for (const auto &item : items) { index++; pushUserdata<Item>(L, item); setMetatable(L, -1, "Item"); @@ -228,7 +237,7 @@ int ZoneFunctions::luaZoneGetItems(lua_State* L) { int ZoneFunctions::luaZoneRemovePlayers(lua_State* L) { // Zone:removePlayers() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); @@ -241,7 +250,7 @@ int ZoneFunctions::luaZoneRemovePlayers(lua_State* L) { int ZoneFunctions::luaZoneRemoveMonsters(lua_State* L) { // Zone:removeMonsters() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); @@ -253,7 +262,7 @@ int ZoneFunctions::luaZoneRemoveMonsters(lua_State* L) { int ZoneFunctions::luaZoneRemoveNpcs(lua_State* L) { // Zone:removeNpcs() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); @@ -265,13 +274,13 @@ int ZoneFunctions::luaZoneRemoveNpcs(lua_State* L) { int ZoneFunctions::luaZoneSetMonsterVariant(lua_State* L) { // Zone:setMonsterVariant(variant) - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto variant = getString(L, 2); + const auto variant = getString(L, 2); if (variant.empty()) { pushBoolean(L, false); return 1; @@ -283,8 +292,8 @@ int ZoneFunctions::luaZoneSetMonsterVariant(lua_State* L) { int ZoneFunctions::luaZoneGetByName(lua_State* L) { // Zone.getByName(name) - auto name = getString(L, 1); - auto zone = Zone::getZone(name); + const auto name = getString(L, 1); + const auto &zone = Zone::getZone(name); if (!zone) { lua_pushnil(L); return 1; @@ -296,16 +305,16 @@ int ZoneFunctions::luaZoneGetByName(lua_State* L) { int ZoneFunctions::luaZoneGetByPosition(lua_State* L) { // Zone.getByPosition(pos) - auto pos = getPosition(L, 1); - auto tile = g_game().map.getTile(pos); + const auto pos = getPosition(L, 1); + const auto &tile = g_game().map.getTile(pos); if (!tile) { lua_pushnil(L); return 1; } int index = 0; - auto zones = tile->getZones(); + const auto &zones = tile->getZones(); lua_createtable(L, static_cast<int>(zones.size()), 0); - for (auto zone : zones) { + for (const auto &zone : zones) { index++; pushUserdata<Zone>(L, zone); setMetatable(L, -1, "Zone"); @@ -316,10 +325,10 @@ int ZoneFunctions::luaZoneGetByPosition(lua_State* L) { int ZoneFunctions::luaZoneGetAll(lua_State* L) { // Zone.getAll() - auto zones = Zone::getZones(); + const auto &zones = Zone::getZones(); lua_createtable(L, static_cast<int>(zones.size()), 0); int index = 0; - for (auto zone : zones) { + for (const auto &zone : zones) { index++; pushUserdata<Zone>(L, zone); setMetatable(L, -1, "Zone"); @@ -330,7 +339,7 @@ int ZoneFunctions::luaZoneGetAll(lua_State* L) { int ZoneFunctions::luaZoneRefresh(lua_State* L) { // Zone:refresh() - auto zone = getUserdataShared<Zone>(L, 1); + const auto &zone = getUserdataShared<Zone>(L, 1); if (!zone) { reportErrorFunc(getErrorDesc(LUA_ERROR_ZONE_NOT_FOUND)); return 1; diff --git a/src/lua/functions/core/game/zone_functions.hpp b/src/lua/functions/core/game/zone_functions.hpp index 2a3bbd0f8..0860595f0 100644 --- a/src/lua/functions/core/game/zone_functions.hpp +++ b/src/lua/functions/core/game/zone_functions.hpp @@ -6,6 +6,12 @@ class Zone; class ZoneFunctions final : LuaScriptInterface { public: + explicit ZoneFunctions(lua_State* L) : + LuaScriptInterface("ZoneFunctions") { + init(L); + } + ~ZoneFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Zone", "", ZoneFunctions::luaZoneCreate); registerMetaMethod(L, "Zone", "__eq", ZoneFunctions::luaZoneCompare); diff --git a/src/lua/functions/core/libs/bit_functions.cpp b/src/lua/functions/core/libs/bit_functions.cpp index 86f76a77a..94e5f709b 100644 --- a/src/lua/functions/core/libs/bit_functions.cpp +++ b/src/lua/functions/core/libs/bit_functions.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/libs/bit_functions.hpp" #ifndef LUAJIT_VERSION diff --git a/src/lua/functions/core/libs/bit_functions.hpp b/src/lua/functions/core/libs/bit_functions.hpp index c2143fde1..3d117e74b 100644 --- a/src/lua/functions/core/libs/bit_functions.hpp +++ b/src/lua/functions/core/libs/bit_functions.hpp @@ -13,6 +13,12 @@ class BitFunctions final : LuaScriptInterface { public: + explicit BitFunctions(lua_State* L) : + LuaScriptInterface("BitFunctions") { + init(L); + } + ~BitFunctions() override = default; + static void init(lua_State* L) { #ifndef LUAJIT_VERSION registerTable(L, "bit"); diff --git a/src/lua/functions/core/libs/core_libs_functions.hpp b/src/lua/functions/core/libs/core_libs_functions.hpp index 614c59e6e..fdfa2d9de 100644 --- a/src/lua/functions/core/libs/core_libs_functions.hpp +++ b/src/lua/functions/core/libs/core_libs_functions.hpp @@ -19,6 +19,12 @@ class CoreLibsFunctions final : LuaScriptInterface { public: + explicit CoreLibsFunctions(lua_State* L) : + LuaScriptInterface("CoreLibsFunctions") { + init(L); + } + ~CoreLibsFunctions() override = default; + static void init(lua_State* L) { BitFunctions::init(L); DBFunctions::init(L); diff --git a/src/lua/functions/core/libs/db_functions.cpp b/src/lua/functions/core/libs/db_functions.cpp index d5f5a62e0..858b8faee 100644 --- a/src/lua/functions/core/libs/db_functions.cpp +++ b/src/lua/functions/core/libs/db_functions.cpp @@ -7,11 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/core/libs/db_functions.hpp" #include "database/databasemanager.hpp" #include "database/databasetasks.hpp" -#include "lua/functions/core/libs/db_functions.hpp" #include "lua/scripts/lua_environment.hpp" int DBFunctions::luaDatabaseExecute(lua_State* L) { @@ -24,7 +23,7 @@ int DBFunctions::luaDatabaseAsyncExecute(lua_State* L) { if (lua_gettop(L) > 1) { int32_t ref = luaL_ref(L, LUA_REGISTRYINDEX); auto scriptId = getScriptEnv()->getScriptId(); - callback = [ref, scriptId](DBResult_ptr, bool success) { + callback = [ref, scriptId](const DBResult_ptr &, bool success) { lua_State* luaState = g_luaEnvironment().getLuaState(); if (!luaState) { return; @@ -37,7 +36,7 @@ int DBFunctions::luaDatabaseAsyncExecute(lua_State* L) { lua_rawgeti(luaState, LUA_REGISTRYINDEX, ref); pushBoolean(luaState, success); - auto env = getScriptEnv(); + const auto env = getScriptEnv(); env->setScriptId(scriptId, &g_luaEnvironment()); g_luaEnvironment().callFunction(1); @@ -49,7 +48,7 @@ int DBFunctions::luaDatabaseAsyncExecute(lua_State* L) { } int DBFunctions::luaDatabaseStoreQuery(lua_State* L) { - if (DBResult_ptr res = Database::getInstance().storeQuery(getString(L, -1))) { + if (const DBResult_ptr &res = Database::getInstance().storeQuery(getString(L, -1))) { lua_pushnumber(L, ScriptEnvironment::addResult(res)); } else { pushBoolean(L, false); @@ -62,7 +61,7 @@ int DBFunctions::luaDatabaseAsyncStoreQuery(lua_State* L) { if (lua_gettop(L) > 1) { int32_t ref = luaL_ref(L, LUA_REGISTRYINDEX); auto scriptId = getScriptEnv()->getScriptId(); - callback = [ref, scriptId](DBResult_ptr result, bool) { + callback = [ref, scriptId](const DBResult_ptr &result, bool) { lua_State* luaState = g_luaEnvironment().getLuaState(); if (!luaState) { return; @@ -79,7 +78,7 @@ int DBFunctions::luaDatabaseAsyncStoreQuery(lua_State* L) { } else { pushBoolean(luaState, false); } - auto env = getScriptEnv(); + const auto env = getScriptEnv(); env->setScriptId(scriptId, &g_luaEnvironment()); g_luaEnvironment().callFunction(1); @@ -96,7 +95,7 @@ int DBFunctions::luaDatabaseEscapeString(lua_State* L) { } int DBFunctions::luaDatabaseEscapeBlob(lua_State* L) { - uint32_t length = getNumber<uint32_t>(L, 2); + const uint32_t length = getNumber<uint32_t>(L, 2); pushString(L, Database::getInstance().escapeBlob(getString(L, 1).c_str(), length)); return 1; } diff --git a/src/lua/functions/core/libs/db_functions.hpp b/src/lua/functions/core/libs/db_functions.hpp index 99b69f1f7..6d95acdea 100644 --- a/src/lua/functions/core/libs/db_functions.hpp +++ b/src/lua/functions/core/libs/db_functions.hpp @@ -13,6 +13,12 @@ class DBFunctions final : LuaScriptInterface { public: + explicit DBFunctions(lua_State* L) : + LuaScriptInterface("DBFunctions") { + init(L); + } + ~DBFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "db"); registerMethod(L, "db", "query", DBFunctions::luaDatabaseExecute); diff --git a/src/lua/functions/core/libs/kv_functions.cpp b/src/lua/functions/core/libs/kv_functions.cpp index 5ed9c9cfe..d18a30694 100644 --- a/src/lua/functions/core/libs/kv_functions.cpp +++ b/src/lua/functions/core/libs/kv_functions.cpp @@ -7,27 +7,26 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/core/libs/kv_functions.hpp" #include <variant> #include "kv/kv.hpp" -#include "lua/functions/core/libs/kv_functions.hpp" #include "lua/scripts/lua_environment.hpp" int KVFunctions::luaKVScoped(lua_State* L) { // KV.scoped(key) | KV:scoped(key) - auto key = getString(L, -1); + const auto key = getString(L, -1); if (isUserdata(L, 1)) { - auto scopedKV = getUserdataShared<KV>(L, 1); - auto newScope = scopedKV->scoped(key); + const auto &scopedKV = getUserdataShared<KV>(L, 1); + const auto &newScope = scopedKV->scoped(key); pushUserdata<KV>(L, newScope); setMetatable(L, -1, "KV"); return 1; } - auto scopedKV = g_kv().scoped(key); + const auto &scopedKV = g_kv().scoped(key); pushUserdata<KV>(L, scopedKV); setMetatable(L, -1, "KV"); return 1; @@ -35,8 +34,8 @@ int KVFunctions::luaKVScoped(lua_State* L) { int KVFunctions::luaKVSet(lua_State* L) { // KV.set(key, value) | scopedKV:set(key, value) - auto key = getString(L, -2); - auto valueWrapper = getValueWrapper(L); + const auto key = getString(L, -2); + const auto &valueWrapper = getValueWrapper(L); if (!valueWrapper) { g_logger().warn("[{}] invalid param type", __FUNCTION__); @@ -45,7 +44,7 @@ int KVFunctions::luaKVSet(lua_State* L) { } if (isUserdata(L, 1)) { - auto scopedKV = getUserdataShared<KV>(L, 1); + const auto &scopedKV = getUserdataShared<KV>(L, 1); scopedKV->set(key, valueWrapper.value()); pushBoolean(L, true); return 1; @@ -66,7 +65,7 @@ int KVFunctions::luaKVGet(lua_State* L) { key = getString(L, -2); } if (isUserdata(L, 1)) { - auto scopedKV = getUserdataShared<KV>(L, 1); + const auto &scopedKV = getUserdataShared<KV>(L, 1); valueWrapper = scopedKV->get(key, forceLoad); } else { valueWrapper = g_kv().get(key, forceLoad); @@ -82,9 +81,9 @@ int KVFunctions::luaKVGet(lua_State* L) { int KVFunctions::luaKVRemove(lua_State* L) { // KV.remove(key) | scopedKV:remove(key) - auto key = getString(L, -1); + const auto key = getString(L, -1); if (isUserdata(L, 1)) { - auto scopedKV = getUserdataShared<KV>(L, 1); + const auto &scopedKV = getUserdataShared<KV>(L, 1); scopedKV->remove(key); } else { g_kv().remove(key); @@ -96,14 +95,14 @@ int KVFunctions::luaKVRemove(lua_State* L) { int KVFunctions::luaKVKeys(lua_State* L) { // KV.keys([prefix = ""]) | scopedKV:keys([prefix = ""]) std::unordered_set<std::string> keys; - std::string prefix = ""; + std::string prefix; if (isString(L, -1)) { prefix = getString(L, -1); } if (isUserdata(L, 1)) { - auto scopedKV = getUserdataShared<KV>(L, 1); + const auto &scopedKV = getUserdataShared<KV>(L, 1); keys = scopedKV->keys(); } else { keys = g_kv().keys(prefix); @@ -133,7 +132,7 @@ std::optional<ValueWrapper> KVFunctions::getValueWrapper(lua_State* L) { ArrayType array; for (int i = 1; i <= lua_objlen(L, -1); ++i) { lua_rawgeti(L, -1, i); - auto value = getValueWrapper(L); + const auto &value = getValueWrapper(L); if (!value) { g_logger().warn("[{}] invalid param type", __FUNCTION__); return std::nullopt; @@ -148,7 +147,7 @@ std::optional<ValueWrapper> KVFunctions::getValueWrapper(lua_State* L) { MapType map; lua_pushnil(L); while (lua_next(L, -2) != 0) { - auto value = getValueWrapper(L); + const auto &value = getValueWrapper(L); if (!value) { g_logger().warn("[{}] invalid param type", __FUNCTION__); return std::nullopt; diff --git a/src/lua/functions/core/libs/kv_functions.hpp b/src/lua/functions/core/libs/kv_functions.hpp index 919901df7..4ef47333f 100644 --- a/src/lua/functions/core/libs/kv_functions.hpp +++ b/src/lua/functions/core/libs/kv_functions.hpp @@ -27,6 +27,12 @@ struct lua_State; class KVFunctions final : LuaScriptInterface { public: + explicit KVFunctions(lua_State* L) : + LuaScriptInterface("KVFunctions") { + init(L); + } + ~KVFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "kv"); registerMethod(L, "kv", "scoped", KVFunctions::luaKVScoped); diff --git a/src/lua/functions/core/libs/logger_functions.cpp b/src/lua/functions/core/libs/logger_functions.cpp index 1b2605f64..741d35fec 100644 --- a/src/lua/functions/core/libs/logger_functions.cpp +++ b/src/lua/functions/core/libs/logger_functions.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/libs/logger_functions.hpp" void LoggerFunctions::init(lua_State* L) { diff --git a/src/lua/functions/core/libs/logger_functions.hpp b/src/lua/functions/core/libs/logger_functions.hpp index 2c4dba46c..fb3c265f2 100644 --- a/src/lua/functions/core/libs/logger_functions.hpp +++ b/src/lua/functions/core/libs/logger_functions.hpp @@ -13,6 +13,12 @@ class LoggerFunctions final : public LuaScriptInterface { public: + explicit LoggerFunctions(lua_State* L) : + LuaScriptInterface("LoggerFunctions") { + init(L); + } + ~LoggerFunctions() override = default; + static void init(lua_State* L); private: diff --git a/src/lua/functions/core/libs/metrics_functions.cpp b/src/lua/functions/core/libs/metrics_functions.cpp index 9dc9fa528..84d81fd21 100644 --- a/src/lua/functions/core/libs/metrics_functions.cpp +++ b/src/lua/functions/core/libs/metrics_functions.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/libs/metrics_functions.hpp" + #include "lib/metrics/metrics.hpp" void MetricsFunctions::init(lua_State* L) { @@ -20,9 +19,9 @@ void MetricsFunctions::init(lua_State* L) { // Metrics int MetricsFunctions::luaMetricsAddCounter(lua_State* L) { // metrics.addCounter(name, value, attributes) - auto name = getString(L, 1); - auto value = getNumber<double>(L, 2); - auto attributes = getAttributes(L, 3); + const auto name = getString(L, 1); + const auto value = getNumber<double>(L, 2); + const auto attributes = getAttributes(L, 3); g_metrics().addCounter(name, value, attributes); return 1; } diff --git a/src/lua/functions/core/libs/metrics_functions.hpp b/src/lua/functions/core/libs/metrics_functions.hpp index e71f005aa..4155646cb 100644 --- a/src/lua/functions/core/libs/metrics_functions.hpp +++ b/src/lua/functions/core/libs/metrics_functions.hpp @@ -13,6 +13,12 @@ class MetricsFunctions final : public LuaScriptInterface { public: + explicit MetricsFunctions(lua_State* L) : + LuaScriptInterface("MetricsFunctions") { + init(L); + } + ~MetricsFunctions() override = default; + static void init(lua_State* L); private: diff --git a/src/lua/functions/core/libs/result_functions.cpp b/src/lua/functions/core/libs/result_functions.cpp index 512f90f7d..2c55645b3 100644 --- a/src/lua/functions/core/libs/result_functions.cpp +++ b/src/lua/functions/core/libs/result_functions.cpp @@ -7,12 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/libs/result_functions.hpp" int ResultFunctions::luaResultGetNumber(lua_State* L) { - DBResult_ptr res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); + const auto &res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); if (!res) { pushBoolean(L, false); return 1; @@ -24,7 +22,7 @@ int ResultFunctions::luaResultGetNumber(lua_State* L) { } int ResultFunctions::luaResultGetString(lua_State* L) { - DBResult_ptr res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); + const auto &res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); if (!res) { pushBoolean(L, false); return 1; @@ -36,7 +34,7 @@ int ResultFunctions::luaResultGetString(lua_State* L) { } int ResultFunctions::luaResultGetStream(lua_State* L) { - DBResult_ptr res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); + const auto &res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, 1)); if (!res) { pushBoolean(L, false); return 1; @@ -50,7 +48,7 @@ int ResultFunctions::luaResultGetStream(lua_State* L) { } int ResultFunctions::luaResultNext(lua_State* L) { - DBResult_ptr res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, -1)); + const auto &res = ScriptEnvironment::getResultByID(getNumber<uint32_t>(L, -1)); if (!res) { pushBoolean(L, false); return 1; diff --git a/src/lua/functions/core/libs/result_functions.hpp b/src/lua/functions/core/libs/result_functions.hpp index 4aa25173e..7e7f74f1a 100644 --- a/src/lua/functions/core/libs/result_functions.hpp +++ b/src/lua/functions/core/libs/result_functions.hpp @@ -13,6 +13,12 @@ class ResultFunctions final : LuaScriptInterface { public: + explicit ResultFunctions(lua_State* L) : + LuaScriptInterface("ResultFunctions") { + init(L); + } + ~ResultFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "Result"); registerMethod(L, "Result", "getNumber", ResultFunctions::luaResultGetNumber); diff --git a/src/lua/functions/core/network/core_network_functions.hpp b/src/lua/functions/core/network/core_network_functions.hpp index c1e65ec15..8f0c3b021 100644 --- a/src/lua/functions/core/network/core_network_functions.hpp +++ b/src/lua/functions/core/network/core_network_functions.hpp @@ -15,6 +15,12 @@ class CoreNetworkFunctions final : LuaScriptInterface { public: + explicit CoreNetworkFunctions(lua_State* L) : + LuaScriptInterface("CoreNetworkFunctions") { + init(L); + } + ~CoreNetworkFunctions() override = default; + static void init(lua_State* L) { NetworkMessageFunctions::init(L); WebhookFunctions::init(L); diff --git a/src/lua/functions/core/network/network_message_functions.cpp b/src/lua/functions/core/network/network_message_functions.cpp index a1b66264f..18bb454ee 100644 --- a/src/lua/functions/core/network/network_message_functions.cpp +++ b/src/lua/functions/core/network/network_message_functions.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/network/network_message_functions.hpp" + +#include "server/network/protocol/protocolgame.hpp" #include "creatures/players/player.hpp" #include "server/network/protocol/protocolstatus.hpp" @@ -88,7 +88,7 @@ int NetworkMessageFunctions::luaNetworkMessageGetPosition(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddByte(lua_State* L) { // networkMessage:addByte(number) - uint8_t number = getNumber<uint8_t>(L, 2); + const uint8_t number = getNumber<uint8_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->addByte(number); @@ -101,7 +101,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddByte(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddU16(lua_State* L) { // networkMessage:addU16(number) - uint16_t number = getNumber<uint16_t>(L, 2); + const uint16_t number = getNumber<uint16_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<uint16_t>(number); @@ -114,7 +114,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddU16(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddU32(lua_State* L) { // networkMessage:addU32(number) - uint32_t number = getNumber<uint32_t>(L, 2); + const uint32_t number = getNumber<uint32_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<uint32_t>(number); @@ -127,7 +127,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddU32(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddU64(lua_State* L) { // networkMessage:addU64(number) - uint64_t number = getNumber<uint64_t>(L, 2); + const uint64_t number = getNumber<uint64_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<uint64_t>(number); @@ -140,7 +140,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddU64(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAdd8(lua_State* L) { // networkMessage:add8(number) - auto number = getNumber<int8_t>(L, 2); + const auto number = getNumber<int8_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<int8_t>(number); @@ -153,7 +153,7 @@ int NetworkMessageFunctions::luaNetworkMessageAdd8(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAdd16(lua_State* L) { // networkMessage:add16(number) - auto number = getNumber<int16_t>(L, 2); + const auto number = getNumber<int16_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<int16_t>(number); @@ -166,7 +166,7 @@ int NetworkMessageFunctions::luaNetworkMessageAdd16(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAdd32(lua_State* L) { // networkMessage:add32(number) - auto number = getNumber<int32_t>(L, 2); + const auto number = getNumber<int32_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<int32_t>(number); @@ -179,7 +179,7 @@ int NetworkMessageFunctions::luaNetworkMessageAdd32(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAdd64(lua_State* L) { // networkMessage:add64(number) - auto number = getNumber<int64_t>(L, 2); + const auto number = getNumber<int64_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->add<int64_t>(number); @@ -196,7 +196,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddString(lua_State* L) { const std::string &function = getString(L, 3); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { - message->addString(string, function); + message->addString(string, std::source_location::current(), function); pushBoolean(L, true); } else { lua_pushnil(L); @@ -219,7 +219,7 @@ int NetworkMessageFunctions::luaNetworkMessageAddPosition(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddDouble(lua_State* L) { // networkMessage:addDouble(number) - double number = getNumber<double>(L, 2); + const double number = getNumber<double>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->addDouble(number); @@ -232,14 +232,14 @@ int NetworkMessageFunctions::luaNetworkMessageAddDouble(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageAddItem(lua_State* L) { // networkMessage:addItem(item, player) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); lua_pushnil(L); return 1; } - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 3); + const auto &player = getUserdataShared<Player>(L, 3); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); @@ -270,7 +270,7 @@ int NetworkMessageFunctions::luaNetworkMessageReset(lua_State* L) { int NetworkMessageFunctions::luaNetworkMessageSkipBytes(lua_State* L) { // networkMessage:skipBytes(number) - int16_t number = getNumber<int16_t>(L, 2); + const int16_t number = getNumber<int16_t>(L, 2); const auto &message = getUserdataShared<NetworkMessage>(L, 1); if (message) { message->skipBytes(number); @@ -289,7 +289,7 @@ int NetworkMessageFunctions::luaNetworkMessageSendToPlayer(lua_State* L) { return 1; } - std::shared_ptr<Player> player = getPlayer(L, 2); + const auto &player = getPlayer(L, 2); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); return 1; diff --git a/src/lua/functions/core/network/network_message_functions.hpp b/src/lua/functions/core/network/network_message_functions.hpp index 5a2982c0d..783e06aec 100644 --- a/src/lua/functions/core/network/network_message_functions.hpp +++ b/src/lua/functions/core/network/network_message_functions.hpp @@ -13,6 +13,12 @@ class NetworkMessageFunctions final : LuaScriptInterface { public: + explicit NetworkMessageFunctions(lua_State* L) : + LuaScriptInterface("NetworkMessageFunctions") { + init(L); + } + ~NetworkMessageFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "NetworkMessage", "", NetworkMessageFunctions::luaNetworkMessageCreate); registerMetaMethod(L, "NetworkMessage", "__eq", NetworkMessageFunctions::luaUserdataCompare); diff --git a/src/lua/functions/core/network/webhook_functions.cpp b/src/lua/functions/core/network/webhook_functions.cpp index 37372f8b2..23cba4495 100644 --- a/src/lua/functions/core/network/webhook_functions.cpp +++ b/src/lua/functions/core/network/webhook_functions.cpp @@ -7,18 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/core/network/webhook_functions.hpp" + #include "server/network/webhook/webhook.hpp" int WebhookFunctions::luaWebhookSendMessage(lua_State* L) { // Webhook.sendMessage(title, message, color, url = "WEBHOOK_DISCORD_URL") | // Webhook.sendMessage(message, url = "WEBHOOK_DISCORD_URL") - std::string title = getString(L, 1); - std::string message = getString(L, 2); - uint32_t color = getNumber<uint32_t>(L, 3, 0); - std::string url = getString(L, -1); + const std::string title = getString(L, 1); + const std::string message = getString(L, 2); + const auto color = getNumber<uint32_t>(L, 3, 0); + const std::string url = getString(L, -1); if (url == title) { g_webhook().sendMessage(title); } else if (url == message) { diff --git a/src/lua/functions/core/network/webhook_functions.hpp b/src/lua/functions/core/network/webhook_functions.hpp index 7d5f53ba4..83ecb377c 100644 --- a/src/lua/functions/core/network/webhook_functions.hpp +++ b/src/lua/functions/core/network/webhook_functions.hpp @@ -13,6 +13,12 @@ class WebhookFunctions final : LuaScriptInterface { public: + explicit WebhookFunctions(lua_State* L) : + LuaScriptInterface("WebhookFunctions") { + init(L); + } + ~WebhookFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "Webhook"); registerMethod(L, "Webhook", "sendMessage", WebhookFunctions::luaWebhookSendMessage); diff --git a/src/lua/functions/creatures/combat/combat_functions.cpp b/src/lua/functions/creatures/combat/combat_functions.cpp index 3bba21d17..27d3a76ef 100644 --- a/src/lua/functions/creatures/combat/combat_functions.cpp +++ b/src/lua/functions/creatures/combat/combat_functions.cpp @@ -7,13 +7,13 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/combat/combat_functions.hpp" #include "creatures/combat/combat.hpp" +#include "creatures/combat/condition.hpp" #include "game/game.hpp" -#include "lua/functions/creatures/combat/combat_functions.hpp" -#include "lua/scripts/lua_environment.hpp" #include "lua/global/lua_variant.hpp" +#include "lua/scripts/lua_environment.hpp" int CombatFunctions::luaCombatCreate(lua_State* L) { // Combat() @@ -30,7 +30,7 @@ int CombatFunctions::luaCombatSetParameter(lua_State* L) { return 1; } - CombatParam_t key = getNumber<CombatParam_t>(L, 2); + const CombatParam_t key = getNumber<CombatParam_t>(L, 2); uint32_t value; if (isBoolean(L, 3)) { value = getBoolean(L, 3) ? 1 : 0; @@ -50,11 +50,11 @@ int CombatFunctions::luaCombatSetFormula(lua_State* L) { return 1; } - formulaType_t type = getNumber<formulaType_t>(L, 2); - double mina = getNumber<double>(L, 3); - double minb = getNumber<double>(L, 4); - double maxa = getNumber<double>(L, 5); - double maxb = getNumber<double>(L, 6); + const formulaType_t type = getNumber<formulaType_t>(L, 2); + const double mina = getNumber<double>(L, 3); + const double minb = getNumber<double>(L, 4); + const double maxa = getNumber<double>(L, 5); + const double maxb = getNumber<double>(L, 6); combat->setPlayerCombatValues(type, mina, minb, maxa, maxb); pushBoolean(L, true); return 1; @@ -88,8 +88,8 @@ int CombatFunctions::luaCombatSetArea(lua_State* L) { int CombatFunctions::luaCombatSetCondition(lua_State* L) { // combat:addCondition(condition) - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 2); - Combat* combat = getUserdata<Combat>(L, 1); + const std::shared_ptr<Condition> &condition = getUserdataShared<Condition>(L, 2); + auto* combat = getUserdata<Combat>(L, 1); if (combat && condition) { combat->addCondition(condition->clone()); pushBoolean(L, true); @@ -107,7 +107,7 @@ int CombatFunctions::luaCombatSetCallback(lua_State* L) { return 1; } - CallBackParam_t key = getNumber<CallBackParam_t>(L, 2); + const CallBackParam_t key = getNumber<CallBackParam_t>(L, 2); if (!combat->setCallback(key)) { lua_pushnil(L); return 1; @@ -145,14 +145,18 @@ int CombatFunctions::luaCombatExecute(lua_State* L) { } if (isUserdata(L, 2)) { - LuaData_t type = getUserdataType(L, 2); + const LuaData_t type = getUserdataType(L, 2); if (type != LuaData_t::Player && type != LuaData_t::Monster && type != LuaData_t::Npc) { pushBoolean(L, false); return 1; } } - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); + if (!creature) { + pushBoolean(L, false); + return 1; + } const LuaVariant &variant = getVariant(L, 3); combat->setInstantSpellName(variant.instantName); @@ -160,7 +164,7 @@ int CombatFunctions::luaCombatExecute(lua_State* L) { bool result = true; switch (variant.type) { case VARIANT_NUMBER: { - std::shared_ptr<Creature> target = g_game().getCreatureByID(variant.number); + const std::shared_ptr<Creature> &target = g_game().getCreatureByID(variant.number); if (!target) { pushBoolean(L, false); return 1; @@ -190,7 +194,7 @@ int CombatFunctions::luaCombatExecute(lua_State* L) { } case VARIANT_STRING: { - std::shared_ptr<Player> target = g_game().getPlayerByName(variant.text); + const std::shared_ptr<Player> &target = g_game().getPlayerByName(variant.text); if (!target) { pushBoolean(L, false); return 1; diff --git a/src/lua/functions/creatures/combat/combat_functions.hpp b/src/lua/functions/creatures/combat/combat_functions.hpp index e031713e9..a24b7c63b 100644 --- a/src/lua/functions/creatures/combat/combat_functions.hpp +++ b/src/lua/functions/creatures/combat/combat_functions.hpp @@ -16,6 +16,12 @@ class CombatFunctions final : LuaScriptInterface { public: + explicit CombatFunctions(lua_State* L) : + LuaScriptInterface("CombatFunctions") { + init(L); + } + ~CombatFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Combat", "", CombatFunctions::luaCombatCreate); registerMetaMethod(L, "Combat", "__eq", CombatFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/combat/condition_functions.cpp b/src/lua/functions/creatures/combat/condition_functions.cpp index 7bc2535bd..1362f0f1f 100644 --- a/src/lua/functions/creatures/combat/condition_functions.cpp +++ b/src/lua/functions/creatures/combat/condition_functions.cpp @@ -7,19 +7,25 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/combat/condition_functions.hpp" #include "creatures/combat/condition.hpp" +#include "enums/player_icons.hpp" #include "game/game.hpp" -#include "lua/functions/creatures/combat/condition_functions.hpp" int ConditionFunctions::luaConditionCreate(lua_State* L) { - // Condition(conditionType[, conditionId = CONDITIONID_COMBAT[, subid = 0]]) - ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); - ConditionId_t conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); - uint32_t subId = getNumber<uint32_t>(L, 4, 0); + // Condition(conditionType, conditionId = CONDITIONID_COMBAT, subid = 0, isPersistent = false) + const ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); + if (conditionType == CONDITION_NONE) { + reportErrorFunc("Invalid condition type"); + return 1; + } + + const auto conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); + const auto subId = getNumber<uint32_t>(L, 4, 0); + const bool isPersistent = getBoolean(L, 5, false); - std::shared_ptr<Condition> condition = Condition::createCondition(conditionId, conditionType, 0, 0, false, subId); + const auto &condition = Condition::createCondition(conditionId, conditionType, 0, 0, false, subId, isPersistent); if (condition) { pushUserdata<Condition>(L, condition); setMetatable(L, -1, "Condition"); @@ -40,7 +46,7 @@ int ConditionFunctions::luaConditionDelete(lua_State* L) { int ConditionFunctions::luaConditionGetId(lua_State* L) { // condition:getId() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { lua_pushnumber(L, condition->getId()); } else { @@ -51,7 +57,7 @@ int ConditionFunctions::luaConditionGetId(lua_State* L) { int ConditionFunctions::luaConditionGetSubId(lua_State* L) { // condition:getSubId() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { lua_pushnumber(L, condition->getSubId()); } else { @@ -62,7 +68,7 @@ int ConditionFunctions::luaConditionGetSubId(lua_State* L) { int ConditionFunctions::luaConditionGetType(lua_State* L) { // condition:getType() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { lua_pushnumber(L, condition->getType()); } else { @@ -73,9 +79,15 @@ int ConditionFunctions::luaConditionGetType(lua_State* L) { int ConditionFunctions::luaConditionGetIcons(lua_State* L) { // condition:getIcons() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { - lua_pushnumber(L, condition->getIcons()); + const auto icons = condition->getIcons(); + lua_newtable(L); // Creates a new table on the Lua stack + int index = 1; + for (const auto &icon : icons) { + lua_pushstring(L, magic_enum::enum_name(icon).data()); // Converts the enum to a string + lua_rawseti(L, -2, index++); // Inserts into the Lua table array + } } else { lua_pushnil(L); } @@ -84,7 +96,7 @@ int ConditionFunctions::luaConditionGetIcons(lua_State* L) { int ConditionFunctions::luaConditionGetEndTime(lua_State* L) { // condition:getEndTime() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { lua_pushnumber(L, condition->getEndTime()); } else { @@ -95,7 +107,7 @@ int ConditionFunctions::luaConditionGetEndTime(lua_State* L) { int ConditionFunctions::luaConditionClone(lua_State* L) { // condition:clone() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { pushUserdata<Condition>(L, condition->clone()); setMetatable(L, -1, "Condition"); @@ -107,7 +119,7 @@ int ConditionFunctions::luaConditionClone(lua_State* L) { int ConditionFunctions::luaConditionGetTicks(lua_State* L) { // condition:getTicks() - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { lua_pushnumber(L, condition->getTicks()); } else { @@ -118,8 +130,8 @@ int ConditionFunctions::luaConditionGetTicks(lua_State* L) { int ConditionFunctions::luaConditionSetTicks(lua_State* L) { // condition:setTicks(ticks) - int32_t ticks = getNumber<int32_t>(L, 2); - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const int32_t ticks = getNumber<int32_t>(L, 2); + const auto &condition = getUserdataShared<Condition>(L, 1); if (condition) { condition->setTicks(ticks); pushBoolean(L, true); @@ -131,13 +143,13 @@ int ConditionFunctions::luaConditionSetTicks(lua_State* L) { int ConditionFunctions::luaConditionSetParameter(lua_State* L) { // condition:setParameter(key, value) - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 1); if (!condition) { lua_pushnil(L); return 1; } - ConditionParam_t key = getNumber<ConditionParam_t>(L, 2); + const ConditionParam_t key = getNumber<ConditionParam_t>(L, 2); int32_t value; if (isBoolean(L, 3)) { value = getBoolean(L, 3) ? 1 : 0; @@ -151,11 +163,11 @@ int ConditionFunctions::luaConditionSetParameter(lua_State* L) { int ConditionFunctions::luaConditionSetFormula(lua_State* L) { // condition:setFormula(mina, minb, maxa, maxb) - double maxb = getNumber<double>(L, 5); - double maxa = getNumber<double>(L, 4); - double minb = getNumber<double>(L, 3); - double mina = getNumber<double>(L, 2); - std::shared_ptr<ConditionSpeed> condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionSpeed>(); + const double maxb = getNumber<double>(L, 5); + const double maxa = getNumber<double>(L, 4); + const double minb = getNumber<double>(L, 3); + const double mina = getNumber<double>(L, 2); + const std::shared_ptr<ConditionSpeed> &condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionSpeed>(); if (condition) { condition->setFormulaVars(mina, minb, maxa, maxb); pushBoolean(L, true); @@ -188,7 +200,7 @@ int ConditionFunctions::luaConditionSetOutfit(lua_State* L) { outfit.lookTypeEx = getNumber<uint16_t>(L, 2); } - std::shared_ptr<ConditionOutfit> condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionOutfit>(); + const std::shared_ptr<ConditionOutfit> &condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionOutfit>(); if (condition) { condition->setOutfit(outfit); pushBoolean(L, true); @@ -200,10 +212,10 @@ int ConditionFunctions::luaConditionSetOutfit(lua_State* L) { int ConditionFunctions::luaConditionAddDamage(lua_State* L) { // condition:addDamage(rounds, time, value) - int32_t value = getNumber<int32_t>(L, 4); - int32_t time = getNumber<int32_t>(L, 3); - int32_t rounds = getNumber<int32_t>(L, 2); - std::shared_ptr<ConditionDamage> condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionDamage>(); + const int32_t value = getNumber<int32_t>(L, 4); + const int32_t time = getNumber<int32_t>(L, 3); + const int32_t rounds = getNumber<int32_t>(L, 2); + const std::shared_ptr<ConditionDamage> &condition = getUserdataShared<Condition>(L, 1)->dynamic_self_cast<ConditionDamage>(); if (condition) { pushBoolean(L, condition->addDamage(rounds, time, value)); } else { diff --git a/src/lua/functions/creatures/combat/condition_functions.hpp b/src/lua/functions/creatures/combat/condition_functions.hpp index 938c51705..931a4fc2f 100644 --- a/src/lua/functions/creatures/combat/condition_functions.hpp +++ b/src/lua/functions/creatures/combat/condition_functions.hpp @@ -13,6 +13,12 @@ class ConditionFunctions final : LuaScriptInterface { public: + explicit ConditionFunctions(lua_State* L) : + LuaScriptInterface("ConditionFunctions") { + init(L); + } + ~ConditionFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Condition", "", ConditionFunctions::luaConditionCreate); registerMetaMethod(L, "Condition", "__eq", ConditionFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/combat/spell_functions.cpp b/src/lua/functions/creatures/combat/spell_functions.cpp index a24407c16..1a19485af 100644 --- a/src/lua/functions/creatures/combat/spell_functions.cpp +++ b/src/lua/functions/creatures/combat/spell_functions.cpp @@ -7,11 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/combat/spell_functions.hpp" #include "creatures/combat/spells.hpp" #include "creatures/players/vocations/vocation.hpp" -#include "lua/functions/creatures/combat/spell_functions.hpp" +#include "items/item.hpp" +#include "utils/tools.hpp" int SpellFunctions::luaSpellCreate(lua_State* L) { // Spell(words, name or id) to get an existing spell @@ -27,7 +28,7 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { if (isNumber(L, 2)) { uint16_t id = getNumber<uint16_t>(L, 2); - std::shared_ptr<RuneSpell> rune = g_spells().getRuneSpell(id); + const auto &rune = g_spells().getRuneSpell(id); if (rune) { pushUserdata<Spell>(L, rune); @@ -37,8 +38,8 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { spellType = static_cast<SpellType_t>(id); } else if (isString(L, 2)) { - std::string arg = getString(L, 2); - std::shared_ptr<InstantSpell> instant = g_spells().getInstantSpellByName(arg); + const std::string arg = getString(L, 2); + auto instant = g_spells().getInstantSpellByName(arg); if (instant) { pushUserdata<Spell>(L, instant); setMetatable(L, -1, "Spell"); @@ -50,14 +51,14 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { setMetatable(L, -1, "Spell"); return 1; } - std::shared_ptr<RuneSpell> rune = g_spells().getRuneSpellByName(arg); + const auto &rune = g_spells().getRuneSpellByName(arg); if (rune) { pushUserdata<Spell>(L, rune); setMetatable(L, -1, "Spell"); return 1; } - std::string tmp = asLowerCaseString(arg); + const std::string tmp = asLowerCaseString(arg); if (tmp == "instant") { spellType = SPELL_INSTANT; } else if (tmp == "rune") { @@ -66,13 +67,13 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { } if (spellType == SPELL_INSTANT) { - auto spell = std::make_shared<InstantSpell>(getScriptEnv()->getScriptInterface()); + const auto &spell = std::make_shared<InstantSpell>(getScriptEnv()->getScriptInterface()); pushUserdata<Spell>(L, spell); setMetatable(L, -1, "Spell"); spell->spellType = SPELL_INSTANT; return 1; } else if (spellType == SPELL_RUNE) { - auto runeSpell = std::make_shared<RuneSpell>(getScriptEnv()->getScriptInterface()); + const auto &runeSpell = std::make_shared<RuneSpell>(getScriptEnv()->getScriptInterface()); pushUserdata<Spell>(L, runeSpell); setMetatable(L, -1, "Spell"); runeSpell->spellType = SPELL_RUNE; @@ -85,11 +86,10 @@ int SpellFunctions::luaSpellCreate(lua_State* L) { int SpellFunctions::luaSpellOnCastSpell(lua_State* L) { // spell:onCastSpell(callback) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (spell->spellType == SPELL_INSTANT) { - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto instant = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &instant = std::static_pointer_cast<InstantSpell>(spell); if (!instant->loadCallback()) { pushBoolean(L, false); return 1; @@ -97,8 +97,7 @@ int SpellFunctions::luaSpellOnCastSpell(lua_State* L) { instant->setLoadedCallback(true); pushBoolean(L, true); } else if (spell->spellType == SPELL_RUNE) { - std::shared_ptr<Spell> spellBase = getUserdataShared<Spell>(L, 1); - std::shared_ptr<RuneSpell> rune = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &rune = std::static_pointer_cast<RuneSpell>(spell); if (!rune->loadCallback()) { pushBoolean(L, false); return 1; @@ -114,7 +113,7 @@ int SpellFunctions::luaSpellOnCastSpell(lua_State* L) { int SpellFunctions::luaSpellRegister(lua_State* L) { // spell:register() - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (!spell) { reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); pushBoolean(L, false); @@ -122,16 +121,16 @@ int SpellFunctions::luaSpellRegister(lua_State* L) { } if (spell->spellType == SPELL_INSTANT) { - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto instant = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &instant = std::static_pointer_cast<InstantSpell>(spellBase); if (!instant->isLoadedCallback()) { pushBoolean(L, false); return 1; } pushBoolean(L, g_spells().registerInstantLuaEvent(instant)); } else if (spell->spellType == SPELL_RUNE) { - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto rune = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &rune = std::static_pointer_cast<RuneSpell>(spellBase); if (rune->getMagicLevel() != 0 || rune->getLevel() != 0) { // Change information in the ItemType to get accurate description ItemType &iType = Item::items.getItemType(rune->getRuneItemId()); @@ -155,7 +154,7 @@ int SpellFunctions::luaSpellRegister(lua_State* L) { int SpellFunctions::luaSpellName(lua_State* L) { // spell:name(name) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushString(L, spell->getName()); @@ -171,7 +170,7 @@ int SpellFunctions::luaSpellName(lua_State* L) { int SpellFunctions::luaSpellId(lua_State* L) { // spell:id(id) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (spell->spellType != SPELL_INSTANT && spell->spellType != SPELL_RUNE) { reportErrorFunc("The method: 'spell:id(id)' is only for use of instant spells and rune spells"); @@ -192,14 +191,14 @@ int SpellFunctions::luaSpellId(lua_State* L) { int SpellFunctions::luaSpellGroup(lua_State* L) { // spell:group(primaryGroup[, secondaryGroup]) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getGroup()); lua_pushnumber(L, spell->getSecondaryGroup()); return 2; } else if (lua_gettop(L) == 2) { - SpellGroup_t group = getNumber<SpellGroup_t>(L, 2); + auto group = getNumber<SpellGroup_t>(L, 2); if (group) { spell->setGroup(group); pushBoolean(L, true); @@ -223,8 +222,8 @@ int SpellFunctions::luaSpellGroup(lua_State* L) { return 1; } } else { - SpellGroup_t primaryGroup = getNumber<SpellGroup_t>(L, 2); - SpellGroup_t secondaryGroup = getNumber<SpellGroup_t>(L, 2); + auto primaryGroup = getNumber<SpellGroup_t>(L, 2); + auto secondaryGroup = getNumber<SpellGroup_t>(L, 2); if (primaryGroup && secondaryGroup) { spell->setGroup(primaryGroup); spell->setSecondaryGroup(secondaryGroup); @@ -267,7 +266,7 @@ int SpellFunctions::luaSpellGroup(lua_State* L) { int SpellFunctions::luaSpellCastSound(lua_State* L) { // get: spell:castSound() set: spell:castSound(effect) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<uint16_t>(spell->soundCastEffect)); @@ -283,7 +282,7 @@ int SpellFunctions::luaSpellCastSound(lua_State* L) { int SpellFunctions::luaSpellImpactSound(lua_State* L) { // get: spell:impactSound() set: spell:impactSound(effect) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<uint16_t>(spell->soundImpactEffect)); @@ -299,7 +298,7 @@ int SpellFunctions::luaSpellImpactSound(lua_State* L) { int SpellFunctions::luaSpellCooldown(lua_State* L) { // spell:cooldown(cooldown) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getCooldown()); @@ -315,7 +314,7 @@ int SpellFunctions::luaSpellCooldown(lua_State* L) { int SpellFunctions::luaSpellGroupCooldown(lua_State* L) { // spell:groupCooldown(primaryGroupCd[, secondaryGroupCd]) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getGroupCooldown()); @@ -337,7 +336,7 @@ int SpellFunctions::luaSpellGroupCooldown(lua_State* L) { int SpellFunctions::luaSpellLevel(lua_State* L) { // spell:level(lvl) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getLevel()); @@ -353,7 +352,7 @@ int SpellFunctions::luaSpellLevel(lua_State* L) { int SpellFunctions::luaSpellMagicLevel(lua_State* L) { // spell:magicLevel(lvl) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getMagicLevel()); @@ -369,7 +368,7 @@ int SpellFunctions::luaSpellMagicLevel(lua_State* L) { int SpellFunctions::luaSpellMana(lua_State* L) { // spell:mana(mana) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getMana()); @@ -385,7 +384,7 @@ int SpellFunctions::luaSpellMana(lua_State* L) { int SpellFunctions::luaSpellManaPercent(lua_State* L) { // spell:manaPercent(percent) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getManaPercent()); @@ -401,7 +400,7 @@ int SpellFunctions::luaSpellManaPercent(lua_State* L) { int SpellFunctions::luaSpellSoul(lua_State* L) { // spell:soul(soul) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getSoulCost()); @@ -417,7 +416,7 @@ int SpellFunctions::luaSpellSoul(lua_State* L) { int SpellFunctions::luaSpellRange(lua_State* L) { // spell:range(range) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_pushnumber(L, spell->getRange()); @@ -433,7 +432,7 @@ int SpellFunctions::luaSpellRange(lua_State* L) { int SpellFunctions::luaSpellPremium(lua_State* L) { // spell:isPremium(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->isPremium()); @@ -449,7 +448,7 @@ int SpellFunctions::luaSpellPremium(lua_State* L) { int SpellFunctions::luaSpellEnabled(lua_State* L) { // spell:isEnabled(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->isEnabled()); @@ -465,7 +464,7 @@ int SpellFunctions::luaSpellEnabled(lua_State* L) { int SpellFunctions::luaSpellNeedTarget(lua_State* L) { // spell:needTarget(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getNeedTarget()); @@ -481,7 +480,7 @@ int SpellFunctions::luaSpellNeedTarget(lua_State* L) { int SpellFunctions::luaSpellNeedWeapon(lua_State* L) { // spell:needWeapon(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getNeedWeapon()); @@ -497,7 +496,7 @@ int SpellFunctions::luaSpellNeedWeapon(lua_State* L) { int SpellFunctions::luaSpellNeedLearn(lua_State* L) { // spell:needLearn(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getNeedLearn()); @@ -513,7 +512,7 @@ int SpellFunctions::luaSpellNeedLearn(lua_State* L) { int SpellFunctions::luaSpellSelfTarget(lua_State* L) { // spell:isSelfTarget(bool) - if (const auto spell = getUserdataShared<Spell>(L, 1)) { + if (const auto &spell = getUserdataShared<Spell>(L, 1)) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getSelfTarget()); } else { @@ -528,7 +527,7 @@ int SpellFunctions::luaSpellSelfTarget(lua_State* L) { int SpellFunctions::luaSpellBlocking(lua_State* L) { // spell:isBlocking(blockingSolid, blockingCreature) - if (const auto spell = getUserdataShared<Spell>(L, 1)) { + if (const auto &spell = getUserdataShared<Spell>(L, 1)) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getBlockingSolid()); pushBoolean(L, spell->getBlockingCreature()); @@ -546,7 +545,7 @@ int SpellFunctions::luaSpellBlocking(lua_State* L) { int SpellFunctions::luaSpellAggressive(lua_State* L) { // spell:isAggressive(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getAggressive()); @@ -562,7 +561,7 @@ int SpellFunctions::luaSpellAggressive(lua_State* L) { int SpellFunctions::luaSpellAllowOnSelf(lua_State* L) { // spell:allowOnSelf(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getAllowOnSelf()); @@ -578,7 +577,7 @@ int SpellFunctions::luaSpellAllowOnSelf(lua_State* L) { int SpellFunctions::luaSpellPzLocked(lua_State* L) { // spell:isPzLocked(bool) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { pushBoolean(L, spell->getLockedPZ()); @@ -594,12 +593,12 @@ int SpellFunctions::luaSpellPzLocked(lua_State* L) { int SpellFunctions::luaSpellVocation(lua_State* L) { // spell:vocation(vocation) - const auto spell = getUserdataShared<Spell>(L, 1); + const auto &spell = getUserdataShared<Spell>(L, 1); if (spell) { if (lua_gettop(L) == 1) { lua_createtable(L, 0, 0); auto it = 0; - for (auto voc : spell->getVocMap()) { + for (const auto &voc : spell->getVocMap()) { ++it; std::string s = std::to_string(it); const char* pchar = s.c_str(); @@ -608,12 +607,12 @@ int SpellFunctions::luaSpellVocation(lua_State* L) { } setMetatable(L, -1, "Spell"); } else { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc for (int i = 0; i < parameters; ++i) { - if (getString(L, 2 + i).find(";") != std::string::npos) { + if (getString(L, 2 + i).find(';') != std::string::npos) { std::vector<std::string> vocList = explodeString(getString(L, 2 + i), ";"); - int32_t vocationId = g_vocations().getVocationId(vocList[0]); - if (vocList.size() > 0) { + const int32_t vocationId = g_vocations().getVocationId(vocList[0]); + if (!vocList.empty()) { if (vocList[1] == "true") { spell->addVocMap(vocationId, true); } else { @@ -621,7 +620,7 @@ int SpellFunctions::luaSpellVocation(lua_State* L) { } } } else { - int32_t vocationId = g_vocations().getVocationId(getString(L, 2 + i)); + const int32_t vocationId = g_vocations().getVocationId(getString(L, 2 + i)); spell->addVocMap(vocationId, false); } } @@ -636,8 +635,8 @@ int SpellFunctions::luaSpellVocation(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellWords(lua_State* L) { // spell:words(words[, separator = ""]) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -650,7 +649,7 @@ int SpellFunctions::luaSpellWords(lua_State* L) { pushString(L, spell->getSeparator()); return 2; } else { - std::string sep = ""; + std::string sep; if (lua_gettop(L) == 3) { sep = getString(L, 3); } @@ -667,8 +666,8 @@ int SpellFunctions::luaSpellWords(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellNeedDirection(lua_State* L) { // spell:needDirection(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -691,8 +690,8 @@ int SpellFunctions::luaSpellNeedDirection(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellHasParams(lua_State* L) { // spell:hasParams(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -715,8 +714,8 @@ int SpellFunctions::luaSpellHasParams(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellHasPlayerNameParam(lua_State* L) { // spell:hasPlayerNameParam(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -739,8 +738,8 @@ int SpellFunctions::luaSpellHasPlayerNameParam(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellNeedCasterTargetOrDirection(lua_State* L) { // spell:needCasterTargetOrDirection(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -763,8 +762,8 @@ int SpellFunctions::luaSpellNeedCasterTargetOrDirection(lua_State* L) { // only for InstantSpells int SpellFunctions::luaSpellIsBlockingWalls(lua_State* L) { // spell:blockWalls(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<InstantSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<InstantSpell>(spellBase); if (spell) { // if spell != SPELL_INSTANT, it means that this actually is no InstantSpell, so we return nil if (spell->spellType != SPELL_INSTANT) { @@ -787,8 +786,8 @@ int SpellFunctions::luaSpellIsBlockingWalls(lua_State* L) { // only for RuneSpells int SpellFunctions::luaSpellRuneId(lua_State* L) { // spell:runeId(id) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<RuneSpell>(spellBase); if (spell) { // if spell != SPELL_RUNE, it means that this actually is no RuneSpell, so we return nil if (spell->spellType != SPELL_RUNE) { @@ -811,8 +810,8 @@ int SpellFunctions::luaSpellRuneId(lua_State* L) { // only for RuneSpells int SpellFunctions::luaSpellCharges(lua_State* L) { // spell:charges(charges) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<RuneSpell>(spellBase); if (spell) { // if spell != SPELL_RUNE, it means that this actually is no RuneSpell, so we return nil if (spell->spellType != SPELL_RUNE) { @@ -835,8 +834,8 @@ int SpellFunctions::luaSpellCharges(lua_State* L) { // only for RuneSpells int SpellFunctions::luaSpellAllowFarUse(lua_State* L) { // spell:allowFarUse(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<RuneSpell>(spellBase); if (spell) { // if spell != SPELL_RUNE, it means that this actually is no RuneSpell, so we return nil if (spell->spellType != SPELL_RUNE) { @@ -859,8 +858,8 @@ int SpellFunctions::luaSpellAllowFarUse(lua_State* L) { // only for RuneSpells int SpellFunctions::luaSpellBlockWalls(lua_State* L) { // spell:blockWalls(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<RuneSpell>(spellBase); if (spell) { // if spell != SPELL_RUNE, it means that this actually is no RuneSpell, so we return nil if (spell->spellType != SPELL_RUNE) { @@ -883,8 +882,8 @@ int SpellFunctions::luaSpellBlockWalls(lua_State* L) { // only for RuneSpells int SpellFunctions::luaSpellCheckFloor(lua_State* L) { // spell:checkFloor(bool) - const auto spellBase = getUserdataShared<Spell>(L, 1); - const auto spell = std::static_pointer_cast<RuneSpell>(spellBase); + const auto &spellBase = getUserdataShared<Spell>(L, 1); + const auto &spell = std::static_pointer_cast<RuneSpell>(spellBase); if (spell) { // if spell != SPELL_RUNE, it means that this actually is no RuneSpell, so we return nil if (spell->spellType != SPELL_RUNE) { @@ -903,236 +902,3 @@ int SpellFunctions::luaSpellCheckFloor(lua_State* L) { } return 1; } - -// Wheel of destiny -int SpellFunctions::luaSpellManaWOD(lua_State* L) { - // spell:manaWOD(grade, mana) - const auto spell = getUserdataShared<Spell>(L, 1); - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::MANA, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::MANA, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellCooldownWOD(lua_State* L) { - // spell:cooldownWOD(grade, time) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::COOLDOWN, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::COOLDOWN, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellGroupCooldownWOD(lua_State* L) { - // spell:groupCooldownWOD(grade, time) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::GROUP_COOLDOWN, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::GROUP_COOLDOWN, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellSecondaryGroupCooldownWOD(lua_State* L) { - // spell:secondaryGroupCooldownWOD(grade, time) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::SECONDARY_GROUP_COOLDOWN, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::SECONDARY_GROUP_COOLDOWN, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseManaLeechWOD(lua_State* L) { - // spell:increaseManaLeechWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH, grade)); - } else { - int32_t value = getNumber<int32_t>(L, 3); - if (value > 0) { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH_CHANCE, grade, 100); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH_CHANCE, grade, 0); - } - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::MANA_LEECH, grade, value); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaselifeLeechWOD(lua_State* L) { - // spell:increaselifeLeechWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH, grade)); - } else { - int32_t value = getNumber<int32_t>(L, 3); - if (value > 0) { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH_CHANCE, grade, 100); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH_CHANCE, grade, 0); - } - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::LIFE_LEECH, grade, value); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseDamageWOD(lua_State* L) { - // spell:increaseDamageWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseDamageReductionWOD(lua_State* L) { - // spell:increaseDamageReductionWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE_REDUCTION, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::DAMAGE_REDUCTION, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseHealWOD(lua_State* L) { - // spell:increaseHealWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::HEAL, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::HEAL, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseCriticalDamageWOD(lua_State* L) { - // spell:increaseCriticalDamageWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_DAMAGE, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_DAMAGE, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} - -int SpellFunctions::luaSpellIncreaseCriticalChanceWOD(lua_State* L) { - // spell:increaseCriticalChanceWOD(grade, value) - const auto spell = getUserdataShared<Spell>(L, 1); - if (!spell) { - reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); - pushBoolean(L, false); - return 1; - } - - WheelSpellGrade_t grade = getNumber<WheelSpellGrade_t>(L, 2); - if (lua_gettop(L) == 2) { - lua_pushnumber(L, spell->getWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_CHANCE, grade)); - } else { - spell->setWheelOfDestinyBoost(WheelSpellBoost_t::CRITICAL_CHANCE, grade, getNumber<int32_t>(L, 3)); - spell->setWheelOfDestinyUpgraded(true); - pushBoolean(L, true); - } - return 1; -} diff --git a/src/lua/functions/creatures/combat/spell_functions.hpp b/src/lua/functions/creatures/combat/spell_functions.hpp index 7f2487ba1..429ebe112 100644 --- a/src/lua/functions/creatures/combat/spell_functions.hpp +++ b/src/lua/functions/creatures/combat/spell_functions.hpp @@ -13,6 +13,12 @@ class SpellFunctions final : LuaScriptInterface { public: + explicit SpellFunctions(lua_State* L) : + LuaScriptInterface("SpellFunctions") { + init(L); + } + ~SpellFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Spell", "", SpellFunctions::luaSpellCreate); registerMetaMethod(L, "Spell", "__eq", SpellFunctions::luaUserdataCompare); @@ -59,19 +65,6 @@ class SpellFunctions final : LuaScriptInterface { registerMethod(L, "Spell", "allowFarUse", SpellFunctions::luaSpellAllowFarUse); registerMethod(L, "Spell", "blockWalls", SpellFunctions::luaSpellBlockWalls); registerMethod(L, "Spell", "checkFloor", SpellFunctions::luaSpellCheckFloor); - - // Wheel of destiny - registerMethod(L, "Spell", "manaWOD", SpellFunctions::luaSpellManaWOD); - registerMethod(L, "Spell", "cooldownWOD", SpellFunctions::luaSpellCooldownWOD); - registerMethod(L, "Spell", "groupCooldownWOD", SpellFunctions::luaSpellGroupCooldownWOD); - registerMethod(L, "Spell", "secondaryGroupCooldownWOD", SpellFunctions::luaSpellSecondaryGroupCooldownWOD); - registerMethod(L, "Spell", "increaseManaLeechWOD", SpellFunctions::luaSpellIncreaseManaLeechWOD); - registerMethod(L, "Spell", "increaselifeLeechWOD", SpellFunctions::luaSpellIncreaselifeLeechWOD); - registerMethod(L, "Spell", "increaseDamageWOD", SpellFunctions::luaSpellIncreaseDamageWOD); - registerMethod(L, "Spell", "increaseDamageReductionWOD", SpellFunctions::luaSpellIncreaseDamageReductionWOD); - registerMethod(L, "Spell", "increaseHealWOD", SpellFunctions::luaSpellIncreaseHealWOD); - registerMethod(L, "Spell", "increaseCriticalDamageWOD", SpellFunctions::luaSpellIncreaseCriticalDamageWOD); - registerMethod(L, "Spell", "increaseCriticalChanceWOD", SpellFunctions::luaSpellIncreaseCriticalChanceWOD); } private: @@ -119,16 +112,4 @@ class SpellFunctions final : LuaScriptInterface { static int luaSpellAllowFarUse(lua_State* L); static int luaSpellBlockWalls(lua_State* L); static int luaSpellCheckFloor(lua_State* L); - - static int luaSpellManaWOD(lua_State* L); - static int luaSpellCooldownWOD(lua_State* L); - static int luaSpellGroupCooldownWOD(lua_State* L); - static int luaSpellSecondaryGroupCooldownWOD(lua_State* L); - static int luaSpellIncreaseManaLeechWOD(lua_State* L); - static int luaSpellIncreaselifeLeechWOD(lua_State* L); - static int luaSpellIncreaseDamageWOD(lua_State* L); - static int luaSpellIncreaseDamageReductionWOD(lua_State* L); - static int luaSpellIncreaseHealWOD(lua_State* L); - static int luaSpellIncreaseCriticalDamageWOD(lua_State* L); - static int luaSpellIncreaseCriticalChanceWOD(lua_State* L); }; diff --git a/src/lua/functions/creatures/combat/variant_functions.cpp b/src/lua/functions/creatures/combat/variant_functions.cpp index 3b0299983..19225017c 100644 --- a/src/lua/functions/creatures/combat/variant_functions.cpp +++ b/src/lua/functions/creatures/combat/variant_functions.cpp @@ -7,17 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/combat/variant_functions.hpp" #include "items/cylinder.hpp" -#include "lua/functions/creatures/combat/variant_functions.hpp" #include "lua/global/lua_variant.hpp" int VariantFunctions::luaVariantCreate(lua_State* L) { // Variant(number or string or position or thing) LuaVariant variant; if (isUserdata(L, 2)) { - if (std::shared_ptr<Thing> thing = getThing(L, 2)) { + if (const auto &thing = getThing(L, 2)) { variant.type = VARIANT_TARGETPOSITION; variant.pos = thing->getPosition(); } diff --git a/src/lua/functions/creatures/combat/variant_functions.hpp b/src/lua/functions/creatures/combat/variant_functions.hpp index c62bbc114..eba239b22 100644 --- a/src/lua/functions/creatures/combat/variant_functions.hpp +++ b/src/lua/functions/creatures/combat/variant_functions.hpp @@ -13,6 +13,12 @@ class VariantFunctions final : LuaScriptInterface { public: + explicit VariantFunctions(lua_State* L) : + LuaScriptInterface("VariantFunctions") { + init(L); + } + ~VariantFunctions() override = default; + static void init(lua_State* L) { registerClass(L, "Variant", "", VariantFunctions::luaVariantCreate); diff --git a/src/lua/functions/creatures/creature_functions.cpp b/src/lua/functions/creatures/creature_functions.cpp index 6b0994597..0da3b6cc0 100644 --- a/src/lua/functions/creatures/creature_functions.cpp +++ b/src/lua/functions/creatures/creature_functions.cpp @@ -7,11 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/creature_functions.hpp" -#include "game/game.hpp" +#include "config/configmanager.hpp" +#include "creatures/combat/condition.hpp" #include "creatures/creature.hpp" -#include "lua/functions/creatures/creature_functions.hpp" +#include "creatures/players/player.hpp" +#include "game/game.hpp" +#include "lua/creature/creatureevent.hpp" #include "map/spectators.hpp" int CreatureFunctions::luaCreatureCreate(lua_State* L) { @@ -22,7 +25,7 @@ int CreatureFunctions::luaCreatureCreate(lua_State* L) { } else if (isString(L, 2)) { creature = g_game().getCreatureByName(getString(L, 2)); } else if (isUserdata(L, 2)) { - LuaData_t type = getUserdataType(L, 2); + const LuaData_t type = getUserdataType(L, 2); if (type != LuaData_t::Player && type != LuaData_t::Monster && type != LuaData_t::Npc) { lua_pushnil(L); return 1; @@ -43,13 +46,13 @@ int CreatureFunctions::luaCreatureCreate(lua_State* L) { int CreatureFunctions::luaCreatureGetEvents(lua_State* L) { // creature:getEvents(type) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - CreatureEventType_t eventType = getNumber<CreatureEventType_t>(L, 2); + const CreatureEventType_t eventType = getNumber<CreatureEventType_t>(L, 2); const auto eventList = creature->getCreatureEvents(eventType); lua_createtable(L, static_cast<int>(eventList.size()), 0); @@ -63,7 +66,7 @@ int CreatureFunctions::luaCreatureGetEvents(lua_State* L) { int CreatureFunctions::luaCreatureRegisterEvent(lua_State* L) { // creature:registerEvent(name) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { const std::string &name = getString(L, 2); pushBoolean(L, creature->registerCreatureEvent(name)); @@ -76,7 +79,7 @@ int CreatureFunctions::luaCreatureRegisterEvent(lua_State* L) { int CreatureFunctions::luaCreatureUnregisterEvent(lua_State* L) { // creature:unregisterEvent(name) const std::string &name = getString(L, 2); - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->unregisterCreatureEvent(name)); } else { @@ -87,7 +90,7 @@ int CreatureFunctions::luaCreatureUnregisterEvent(lua_State* L) { int CreatureFunctions::luaCreatureIsRemoved(lua_State* L) { // creature:isRemoved() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->isRemoved()); } else { @@ -104,7 +107,7 @@ int CreatureFunctions::luaCreatureIsCreature(lua_State* L) { int CreatureFunctions::luaCreatureIsInGhostMode(lua_State* L) { // creature:isInGhostMode() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->isInGhostMode()); } else { @@ -115,7 +118,7 @@ int CreatureFunctions::luaCreatureIsInGhostMode(lua_State* L) { int CreatureFunctions::luaCreatureIsHealthHidden(lua_State* L) { // creature:isHealthHidden() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->isHealthHidden()); } else { @@ -126,7 +129,7 @@ int CreatureFunctions::luaCreatureIsHealthHidden(lua_State* L) { int CreatureFunctions::luaCreatureCanSee(lua_State* L) { // creature:canSee(position) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { const Position &position = getPosition(L, 2); pushBoolean(L, creature->canSee(position)); @@ -138,9 +141,9 @@ int CreatureFunctions::luaCreatureCanSee(lua_State* L) { int CreatureFunctions::luaCreatureCanSeeCreature(lua_State* L) { // creature:canSeeCreature(creature) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { - std::shared_ptr<Creature> otherCreature = getCreature(L, 2); + const auto &otherCreature = getCreature(L, 2); pushBoolean(L, creature->canSeeCreature(otherCreature)); } else { lua_pushnil(L); @@ -150,13 +153,13 @@ int CreatureFunctions::luaCreatureCanSeeCreature(lua_State* L) { int CreatureFunctions::luaCreatureGetParent(lua_State* L) { // creature:getParent() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Cylinder> parent = creature->getParent(); + const auto &parent = creature->getParent(); if (!parent) { lua_pushnil(L); return 1; @@ -168,7 +171,7 @@ int CreatureFunctions::luaCreatureGetParent(lua_State* L) { int CreatureFunctions::luaCreatureGetId(lua_State* L) { // creature:getId() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getID()); } else { @@ -179,7 +182,7 @@ int CreatureFunctions::luaCreatureGetId(lua_State* L) { int CreatureFunctions::luaCreatureGetName(lua_State* L) { // creature:getName() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushString(L, creature->getName()); } else { @@ -190,7 +193,7 @@ int CreatureFunctions::luaCreatureGetName(lua_State* L) { int CreatureFunctions::luaCreatureGetTypeName(lua_State* L) { // creature:getTypeName() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushString(L, creature->getTypeName()); } else { @@ -201,13 +204,13 @@ int CreatureFunctions::luaCreatureGetTypeName(lua_State* L) { int CreatureFunctions::luaCreatureGetTarget(lua_State* L) { // creature:getTarget() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> target = creature->getAttackedCreature(); + const auto &target = creature->getAttackedCreature(); if (target) { pushUserdata<Creature>(L, target); setCreatureMetatable(L, -1, target); @@ -219,9 +222,9 @@ int CreatureFunctions::luaCreatureGetTarget(lua_State* L) { int CreatureFunctions::luaCreatureSetTarget(lua_State* L) { // creature:setTarget(target) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { - std::shared_ptr<Creature> target = getCreature(L, 2); + const auto &target = getCreature(L, 2); pushBoolean(L, creature->setAttackedCreature(target)); } else { lua_pushnil(L); @@ -231,13 +234,13 @@ int CreatureFunctions::luaCreatureSetTarget(lua_State* L) { int CreatureFunctions::luaCreatureGetFollowCreature(lua_State* L) { // creature:getFollowCreature() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> followCreature = creature->getFollowCreature(); + const auto &followCreature = creature->getFollowCreature(); if (followCreature) { pushUserdata<Creature>(L, followCreature); setCreatureMetatable(L, -1, followCreature); @@ -249,9 +252,9 @@ int CreatureFunctions::luaCreatureGetFollowCreature(lua_State* L) { int CreatureFunctions::luaCreatureSetFollowCreature(lua_State* L) { // creature:setFollowCreature(followedCreature) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { - std::shared_ptr<Creature> followCreature = getCreature(L, 2); + const auto &followCreature = getCreature(L, 2); pushBoolean(L, creature->setFollowCreature(followCreature)); } else { lua_pushnil(L); @@ -261,13 +264,13 @@ int CreatureFunctions::luaCreatureSetFollowCreature(lua_State* L) { int CreatureFunctions::luaCreatureGetMaster(lua_State* L) { // creature:getMaster() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> master = creature->getMaster(); + const auto &master = creature->getMaster(); if (!master) { lua_pushnil(L); return 1; @@ -280,7 +283,7 @@ int CreatureFunctions::luaCreatureGetMaster(lua_State* L) { int CreatureFunctions::luaCreatureReload(lua_State* L) { // creature:reload() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -293,7 +296,7 @@ int CreatureFunctions::luaCreatureReload(lua_State* L) { int CreatureFunctions::luaCreatureSetMaster(lua_State* L) { // creature:setMaster(master) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -307,13 +310,13 @@ int CreatureFunctions::luaCreatureSetMaster(lua_State* L) { int CreatureFunctions::luaCreatureGetLight(lua_State* L) { // creature:getLight() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - LightInfo lightInfo = creature->getCreatureLight(); + const LightInfo lightInfo = creature->getCreatureLight(); lua_pushnumber(L, lightInfo.level); lua_pushnumber(L, lightInfo.color); return 2; @@ -321,7 +324,7 @@ int CreatureFunctions::luaCreatureGetLight(lua_State* L) { int CreatureFunctions::luaCreatureSetLight(lua_State* L) { // creature:setLight(color, level) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -338,7 +341,7 @@ int CreatureFunctions::luaCreatureSetLight(lua_State* L) { int CreatureFunctions::luaCreatureGetSpeed(lua_State* L) { // creature:getSpeed() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getSpeed()); } else { @@ -349,14 +352,14 @@ int CreatureFunctions::luaCreatureGetSpeed(lua_State* L) { int CreatureFunctions::luaCreatureSetSpeed(lua_State* L) { // creature:setSpeed(speed) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - int32_t speed = getNumber<int32_t>(L, 2); + const int32_t speed = getNumber<int32_t>(L, 2); g_game().setCreatureSpeed(creature, speed); pushBoolean(L, true); return 1; @@ -364,7 +367,7 @@ int CreatureFunctions::luaCreatureSetSpeed(lua_State* L) { int CreatureFunctions::luaCreatureGetBaseSpeed(lua_State* L) { // creature:getBaseSpeed() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getBaseSpeed()); } else { @@ -375,14 +378,14 @@ int CreatureFunctions::luaCreatureGetBaseSpeed(lua_State* L) { int CreatureFunctions::luaCreatureChangeSpeed(lua_State* L) { // creature:changeSpeed(delta) - std::shared_ptr<Creature> creature = getCreature(L, 1); + const auto &creature = getCreature(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - int32_t delta = getNumber<int32_t>(L, 2); + const int32_t delta = getNumber<int32_t>(L, 2); g_game().changeSpeed(creature, delta); pushBoolean(L, true); return 1; @@ -390,7 +393,7 @@ int CreatureFunctions::luaCreatureChangeSpeed(lua_State* L) { int CreatureFunctions::luaCreatureSetDropLoot(lua_State* L) { // creature:setDropLoot(doDrop) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setDropLoot(getBoolean(L, 2)); pushBoolean(L, true); @@ -402,7 +405,7 @@ int CreatureFunctions::luaCreatureSetDropLoot(lua_State* L) { int CreatureFunctions::luaCreatureSetSkillLoss(lua_State* L) { // creature:setSkillLoss(skillLoss) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setSkillLoss(getBoolean(L, 2)); pushBoolean(L, true); @@ -414,7 +417,7 @@ int CreatureFunctions::luaCreatureSetSkillLoss(lua_State* L) { int CreatureFunctions::luaCreatureGetPosition(lua_State* L) { // creature:getPosition() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushPosition(L, creature->getPosition()); } else { @@ -425,13 +428,13 @@ int CreatureFunctions::luaCreatureGetPosition(lua_State* L) { int CreatureFunctions::luaCreatureGetTile(lua_State* L) { // creature:getTile() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Tile> tile = creature->getTile(); + const auto &tile = creature->getTile(); if (tile) { pushUserdata<Tile>(L, tile); setMetatable(L, -1, "Tile"); @@ -443,7 +446,7 @@ int CreatureFunctions::luaCreatureGetTile(lua_State* L) { int CreatureFunctions::luaCreatureGetDirection(lua_State* L) { // creature:getDirection() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getDirection()); } else { @@ -454,7 +457,7 @@ int CreatureFunctions::luaCreatureGetDirection(lua_State* L) { int CreatureFunctions::luaCreatureSetDirection(lua_State* L) { // creature:setDirection(direction) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, g_game().internalCreatureTurn(creature, getNumber<Direction>(L, 2))); } else { @@ -465,7 +468,7 @@ int CreatureFunctions::luaCreatureSetDirection(lua_State* L) { int CreatureFunctions::luaCreatureGetHealth(lua_State* L) { // creature:getHealth() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getHealth()); } else { @@ -476,7 +479,7 @@ int CreatureFunctions::luaCreatureGetHealth(lua_State* L) { int CreatureFunctions::luaCreatureSetHealth(lua_State* L) { // creature:setHealth(health) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -485,7 +488,7 @@ int CreatureFunctions::luaCreatureSetHealth(lua_State* L) { creature->health = std::min<int32_t>(getNumber<uint32_t>(L, 2), creature->healthMax); g_game().addCreatureHealth(creature); - std::shared_ptr<Player> player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendStats(); } @@ -495,7 +498,7 @@ int CreatureFunctions::luaCreatureSetHealth(lua_State* L) { int CreatureFunctions::luaCreatureAddHealth(lua_State* L) { // creature:addHealth(healthChange, combatType) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -516,7 +519,7 @@ int CreatureFunctions::luaCreatureAddHealth(lua_State* L) { int CreatureFunctions::luaCreatureGetMaxHealth(lua_State* L) { // creature:getMaxHealth() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getMaxHealth()); } else { @@ -527,7 +530,7 @@ int CreatureFunctions::luaCreatureGetMaxHealth(lua_State* L) { int CreatureFunctions::luaCreatureSetMaxHealth(lua_State* L) { // creature:setMaxHealth(maxHealth) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -537,7 +540,7 @@ int CreatureFunctions::luaCreatureSetMaxHealth(lua_State* L) { creature->health = std::min<int32_t>(creature->health, creature->healthMax); g_game().addCreatureHealth(creature); - std::shared_ptr<Player> player = creature->getPlayer(); + const auto &player = creature->getPlayer(); if (player) { player->sendStats(); } @@ -547,7 +550,7 @@ int CreatureFunctions::luaCreatureSetMaxHealth(lua_State* L) { int CreatureFunctions::luaCreatureSetHiddenHealth(lua_State* L) { // creature:setHiddenHealth(hide) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setHiddenHealth(getBoolean(L, 2)); g_game().addCreatureHealth(creature); @@ -560,7 +563,7 @@ int CreatureFunctions::luaCreatureSetHiddenHealth(lua_State* L) { int CreatureFunctions::luaCreatureIsMoveLocked(lua_State* L) { // creature:isMoveLocked() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->isMoveLocked()); } else { @@ -571,7 +574,7 @@ int CreatureFunctions::luaCreatureIsMoveLocked(lua_State* L) { int CreatureFunctions::luaCreatureSetMoveLocked(lua_State* L) { // creature:setMoveLocked(moveLocked) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setMoveLocked(getBoolean(L, 2)); pushBoolean(L, true); @@ -583,7 +586,7 @@ int CreatureFunctions::luaCreatureSetMoveLocked(lua_State* L) { int CreatureFunctions::luaCreatureIsDirectionLocked(lua_State* L) { // creature:isDirectionLocked() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->isDirectionLocked()); } else { @@ -594,7 +597,7 @@ int CreatureFunctions::luaCreatureIsDirectionLocked(lua_State* L) { int CreatureFunctions::luaCreatureSetDirectionLocked(lua_State* L) { // creature:setDirectionLocked(directionLocked) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setDirectionLocked(getBoolean(L, 2)); pushBoolean(L, true); @@ -606,7 +609,7 @@ int CreatureFunctions::luaCreatureSetDirectionLocked(lua_State* L) { int CreatureFunctions::luaCreatureGetSkull(lua_State* L) { // creature:getSkull() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getSkull()); } else { @@ -617,7 +620,7 @@ int CreatureFunctions::luaCreatureGetSkull(lua_State* L) { int CreatureFunctions::luaCreatureSetSkull(lua_State* L) { // creature:setSkull(skull) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { creature->setSkull(getNumber<Skulls_t>(L, 2)); pushBoolean(L, true); @@ -629,7 +632,7 @@ int CreatureFunctions::luaCreatureSetSkull(lua_State* L) { int CreatureFunctions::luaCreatureGetOutfit(lua_State* L) { // creature:getOutfit() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushOutfit(L, creature->getCurrentOutfit()); } else { @@ -640,10 +643,10 @@ int CreatureFunctions::luaCreatureGetOutfit(lua_State* L) { int CreatureFunctions::luaCreatureSetOutfit(lua_State* L) { // creature:setOutfit(outfit) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { Outfit_t outfit = getOutfit(L, 2); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { g_logger().warn("[CreatureFunctions::luaCreatureSetOutfit] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", outfit.lookType); return 1; } @@ -659,17 +662,17 @@ int CreatureFunctions::luaCreatureSetOutfit(lua_State* L) { int CreatureFunctions::luaCreatureGetCondition(lua_State* L) { // creature:getCondition(conditionType[, conditionId = CONDITIONID_COMBAT[, subId = 0]]) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); - ConditionId_t conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); - uint32_t subId = getNumber<uint32_t>(L, 4, 0); + const ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); + const auto conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); + const auto subId = getNumber<uint32_t>(L, 4, 0); - const std::shared_ptr<Condition> condition = creature->getCondition(conditionType, conditionId, subId); + const auto &condition = creature->getCondition(conditionType, conditionId, subId); if (condition) { pushUserdata<const Condition>(L, condition); setWeakMetatable(L, -1, "Condition"); @@ -681,8 +684,8 @@ int CreatureFunctions::luaCreatureGetCondition(lua_State* L) { int CreatureFunctions::luaCreatureAddCondition(lua_State* L) { // creature:addCondition(condition) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); - std::shared_ptr<Condition> condition = getUserdataShared<Condition>(L, 2); + const auto &creature = getUserdataShared<Creature>(L, 1); + const auto &condition = getUserdataShared<Condition>(L, 2); if (creature && condition) { pushBoolean(L, creature->addCondition(condition->clone())); } else { @@ -693,18 +696,18 @@ int CreatureFunctions::luaCreatureAddCondition(lua_State* L) { int CreatureFunctions::luaCreatureRemoveCondition(lua_State* L) { // creature:removeCondition(conditionType[, conditionId = CONDITIONID_COMBAT[, subId = 0[, force = false]]]) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); - ConditionId_t conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); - uint32_t subId = getNumber<uint32_t>(L, 4, 0); - const std::shared_ptr<Condition> condition = creature->getCondition(conditionType, conditionId, subId); + const ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); + const auto conditionId = getNumber<ConditionId_t>(L, 3, CONDITIONID_COMBAT); + const auto subId = getNumber<uint32_t>(L, 4, 0); + const auto &condition = creature->getCondition(conditionType, conditionId, subId); if (condition) { - bool force = getBoolean(L, 5, false); + const bool force = getBoolean(L, 5, false); if (subId == 0) { creature->removeCondition(conditionType, conditionId, force); } else { @@ -719,21 +722,21 @@ int CreatureFunctions::luaCreatureRemoveCondition(lua_State* L) { int CreatureFunctions::luaCreatureHasCondition(lua_State* L) { // creature:hasCondition(conditionType[, subId = 0]) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } - ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); - uint32_t subId = getNumber<uint32_t>(L, 3, 0); + const ConditionType_t conditionType = getNumber<ConditionType_t>(L, 2); + const auto subId = getNumber<uint32_t>(L, 3, 0); pushBoolean(L, creature->hasCondition(conditionType, subId)); return 1; } int CreatureFunctions::luaCreatureIsImmune(lua_State* L) { // creature:isImmune(condition or conditionType) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -741,7 +744,7 @@ int CreatureFunctions::luaCreatureIsImmune(lua_State* L) { if (isNumber(L, 2)) { pushBoolean(L, creature->isImmune(getNumber<ConditionType_t>(L, 2))); - } else if (auto condition = getUserdataShared<Condition>(L, 2)) { + } else if (const auto condition = getUserdataShared<Condition>(L, 2)) { pushBoolean(L, creature->isImmune(condition->getType())); } else { lua_pushnil(L); @@ -751,20 +754,20 @@ int CreatureFunctions::luaCreatureIsImmune(lua_State* L) { int CreatureFunctions::luaCreatureRemove(lua_State* L) { // creature:remove([forced = true]) - std::shared_ptr<Creature>* creaturePtr = getRawUserDataShared<Creature>(L, 1); + auto* creaturePtr = getRawUserDataShared<Creature>(L, 1); if (!creaturePtr) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = *creaturePtr; + const auto &creature = *creaturePtr; if (!creature) { lua_pushnil(L); return 1; } - bool forced = getBoolean(L, 2, true); - if (std::shared_ptr<Player> player = creature->getPlayer()) { + const bool forced = getBoolean(L, 2, true); + if (const auto &player = creature->getPlayer()) { if (forced) { player->removePlayer(true); } else { @@ -781,10 +784,10 @@ int CreatureFunctions::luaCreatureRemove(lua_State* L) { int CreatureFunctions::luaCreatureTeleportTo(lua_State* L) { // creature:teleportTo(position[, pushMovement = false]) - bool pushMovement = getBoolean(L, 3, false); + const bool pushMovement = getBoolean(L, 3, false); const Position &position = getPosition(L, 2); - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature == nullptr) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -792,7 +795,7 @@ int CreatureFunctions::luaCreatureTeleportTo(lua_State* L) { } const Position oldPosition = creature->getPosition(); - if (auto ret = g_game().internalTeleport(creature, position, pushMovement); + if (const auto ret = g_game().internalTeleport(creature, position, pushMovement); ret != RETURNVALUE_NOERROR) { g_logger().debug("[{}] Failed to teleport creature {}, on position {}, error code: {}", __FUNCTION__, creature->getName(), oldPosition.toString(), getReturnMessage(ret)); pushBoolean(L, false); @@ -818,7 +821,7 @@ int CreatureFunctions::luaCreatureTeleportTo(lua_State* L) { int CreatureFunctions::luaCreatureSay(lua_State* L) { // creature:say(text[, type = TALKTYPE_MONSTER_SAY[, ghost = false[, target = nullptr[, position]]]]) - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); Position position; if (parameters >= 6) { @@ -835,11 +838,11 @@ int CreatureFunctions::luaCreatureSay(lua_State* L) { target = getCreature(L, 5); } - bool ghost = getBoolean(L, 4, false); + const bool ghost = getBoolean(L, 4, false); - SpeakClasses type = getNumber<SpeakClasses>(L, 3, TALKTYPE_MONSTER_SAY); + const auto type = getNumber<SpeakClasses>(L, 3, TALKTYPE_MONSTER_SAY); const std::string &text = getString(L, 2); - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -860,14 +863,14 @@ int CreatureFunctions::luaCreatureSay(lua_State* L) { int CreatureFunctions::luaCreatureGetDamageMap(lua_State* L) { // creature:getDamageMap() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } lua_createtable(L, creature->damageMap.size(), 0); - for (auto damageEntry : creature->damageMap) { + for (const auto damageEntry : creature->damageMap) { lua_createtable(L, 0, 2); setField(L, "total", damageEntry.second.total); setField(L, "ticks", damageEntry.second.ticks); @@ -878,7 +881,7 @@ int CreatureFunctions::luaCreatureGetDamageMap(lua_State* L) { int CreatureFunctions::luaCreatureGetSummons(lua_State* L) { // creature:getSummons() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -899,7 +902,7 @@ int CreatureFunctions::luaCreatureGetSummons(lua_State* L) { int CreatureFunctions::luaCreatureHasBeenSummoned(lua_State* L) { // creature:hasBeenSummoned() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushBoolean(L, creature->hasBeenSummoned()); } else { @@ -911,8 +914,8 @@ int CreatureFunctions::luaCreatureHasBeenSummoned(lua_State* L) { int CreatureFunctions::luaCreatureGetDescription(lua_State* L) { // creature:getDescription(distance) - int32_t distance = getNumber<int32_t>(L, 2); - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const int32_t distance = getNumber<int32_t>(L, 2); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { pushString(L, creature->getDescription(distance)); } else { @@ -923,7 +926,7 @@ int CreatureFunctions::luaCreatureGetDescription(lua_State* L) { int CreatureFunctions::luaCreatureGetPathTo(lua_State* L) { // creature:getPathTo(pos[, minTargetDist = 0[, maxTargetDist = 1[, fullPathSearch = true[, clearSight = true[, maxSearchDist = 0]]]]]) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; @@ -943,7 +946,7 @@ int CreatureFunctions::luaCreatureGetPathTo(lua_State* L) { lua_newtable(L); int index = 0; - for (Direction dir : dirList) { + for (const Direction dir : dirList) { lua_pushnumber(L, dir); lua_rawseti(L, -2, ++index); } @@ -956,21 +959,21 @@ int CreatureFunctions::luaCreatureGetPathTo(lua_State* L) { int CreatureFunctions::luaCreatureMove(lua_State* L) { // creature:move(direction) // creature:move(tile[, flags = 0]) - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { lua_pushnil(L); return 1; } if (isNumber(L, 2)) { - Direction direction = getNumber<Direction>(L, 2); + const Direction direction = getNumber<Direction>(L, 2); if (direction > DIRECTION_LAST) { lua_pushnil(L); return 1; } lua_pushnumber(L, g_game().internalMoveCreature(creature, direction, FLAG_NOLIMIT)); } else { - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 2); + const auto &tile = getUserdataShared<Tile>(L, 2); if (!tile) { lua_pushnil(L); return 1; @@ -982,7 +985,7 @@ int CreatureFunctions::luaCreatureMove(lua_State* L) { int CreatureFunctions::luaCreatureGetZoneType(lua_State* L) { // creature:getZoneType() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature) { lua_pushnumber(L, creature->getZoneType()); } else { @@ -993,7 +996,7 @@ int CreatureFunctions::luaCreatureGetZoneType(lua_State* L) { int CreatureFunctions::luaCreatureGetZones(lua_State* L) { // creature:getZones() - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (creature == nullptr) { lua_pushnil(L); return 1; @@ -1002,7 +1005,7 @@ int CreatureFunctions::luaCreatureGetZones(lua_State* L) { const auto zones = creature->getZones(); lua_createtable(L, static_cast<int>(zones.size()), 0); int index = 0; - for (auto zone : zones) { + for (const auto &zone : zones) { index++; pushUserdata<Zone>(L, zone); setMetatable(L, -1, "Zone"); @@ -1013,21 +1016,21 @@ int CreatureFunctions::luaCreatureGetZones(lua_State* L) { int CreatureFunctions::luaCreatureSetIcon(lua_State* L) { // creature:setIcon(key, category, icon[, number]) - auto creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } const auto key = getString(L, 2); - auto category = getNumber<CreatureIconCategory_t>(L, 3); - auto count = getNumber<uint16_t>(L, 5, 0); + const auto category = getNumber<CreatureIconCategory_t>(L, 3); + const auto count = getNumber<uint16_t>(L, 5, 0); CreatureIcon creatureIcon; if (category == CreatureIconCategory_t::Modifications) { - auto icon = getNumber<CreatureIconModifications_t>(L, 5); + const auto icon = getNumber<CreatureIconModifications_t>(L, 4); creatureIcon = CreatureIcon(icon, count); } else { - auto icon = getNumber<CreatureIconQuests_t>(L, 4); + const auto icon = getNumber<CreatureIconQuests_t>(L, 4); creatureIcon = CreatureIcon(icon, count); } @@ -1038,7 +1041,7 @@ int CreatureFunctions::luaCreatureSetIcon(lua_State* L) { int CreatureFunctions::luaCreatureGetIcons(lua_State* L) { // creature:getIcons() - const auto creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1059,7 +1062,7 @@ int CreatureFunctions::luaCreatureGetIcons(lua_State* L) { int CreatureFunctions::luaCreatureGetIcon(lua_State* L) { // creature:getIcon(key) - const auto creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1080,7 +1083,7 @@ int CreatureFunctions::luaCreatureGetIcon(lua_State* L) { int CreatureFunctions::luaCreatureRemoveIcon(lua_State* L) { // creature:removeIcon(key) - auto creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1094,7 +1097,7 @@ int CreatureFunctions::luaCreatureRemoveIcon(lua_State* L) { int CreatureFunctions::luaCreatureClearIcons(lua_State* L) { // creature:clearIcons() - auto creature = getUserdataShared<Creature>(L, 1); + const auto &creature = getUserdataShared<Creature>(L, 1); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); diff --git a/src/lua/functions/creatures/creature_functions.hpp b/src/lua/functions/creatures/creature_functions.hpp index 0876bb729..f0f1d12bb 100644 --- a/src/lua/functions/creatures/creature_functions.hpp +++ b/src/lua/functions/creatures/creature_functions.hpp @@ -17,6 +17,12 @@ class CreatureFunctions final : LuaScriptInterface { public: + explicit CreatureFunctions(lua_State* L) : + LuaScriptInterface("CreatureFunctions") { + init(L); + } + ~CreatureFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Creature", "", CreatureFunctions::luaCreatureCreate); registerMetaMethod(L, "Creature", "__eq", CreatureFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/monster/charm_functions.cpp b/src/lua/functions/creatures/monster/charm_functions.cpp index d456f1c96..920f4891a 100644 --- a/src/lua/functions/creatures/monster/charm_functions.cpp +++ b/src/lua/functions/creatures/monster/charm_functions.cpp @@ -7,16 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/monster/charm_functions.hpp" #include "game/game.hpp" #include "io/iobestiary.hpp" -#include "lua/functions/creatures/monster/charm_functions.hpp" int CharmFunctions::luaCharmCreate(lua_State* L) { // charm(id) if (isNumber(L, 2)) { - charmRune_t charmid = getNumber<charmRune_t>(L, 2); + const charmRune_t charmid = getNumber<charmRune_t>(L, 2); const auto charmList = g_game().getCharmList(); for (const auto &charm : charmList) { if (charm->id == charmid) { @@ -33,7 +32,7 @@ int CharmFunctions::luaCharmCreate(lua_State* L) { int CharmFunctions::luaCharmName(lua_State* L) { // get: charm:name() set: charm:name(string) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { pushString(L, charm->name); } else { @@ -45,7 +44,7 @@ int CharmFunctions::luaCharmName(lua_State* L) { int CharmFunctions::luaCharmDescription(lua_State* L) { // get: charm:description() set: charm:description(string) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { pushString(L, charm->description); } else { @@ -57,7 +56,7 @@ int CharmFunctions::luaCharmDescription(lua_State* L) { int CharmFunctions::luaCharmType(lua_State* L) { // get: charm:type() set: charm:type(charm_t) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->type); } else { @@ -69,7 +68,7 @@ int CharmFunctions::luaCharmType(lua_State* L) { int CharmFunctions::luaCharmPoints(lua_State* L) { // get: charm:points() set: charm:points(value) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->points); } else { @@ -81,7 +80,7 @@ int CharmFunctions::luaCharmPoints(lua_State* L) { int CharmFunctions::luaCharmDamageType(lua_State* L) { // get: charm:damageType() set: charm:damageType(type) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->dmgtype); } else { @@ -93,7 +92,7 @@ int CharmFunctions::luaCharmDamageType(lua_State* L) { int CharmFunctions::luaCharmPercentage(lua_State* L) { // get: charm:percentage() set: charm:percentage(value) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->percent); } else { @@ -105,7 +104,7 @@ int CharmFunctions::luaCharmPercentage(lua_State* L) { int CharmFunctions::luaCharmChance(lua_State* L) { // get: charm:chance() set: charm:chance(value) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->chance); } else { @@ -117,7 +116,7 @@ int CharmFunctions::luaCharmChance(lua_State* L) { int CharmFunctions::luaCharmMessageCancel(lua_State* L) { // get: charm:messageCancel() set: charm:messageCancel(string) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { pushString(L, charm->cancelMsg); } else { @@ -129,7 +128,7 @@ int CharmFunctions::luaCharmMessageCancel(lua_State* L) { int CharmFunctions::luaCharmMessageServerLog(lua_State* L) { // get: charm:messageServerLog() set: charm:messageServerLog(string) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { pushString(L, charm->logMsg); } else { @@ -141,7 +140,7 @@ int CharmFunctions::luaCharmMessageServerLog(lua_State* L) { int CharmFunctions::luaCharmEffect(lua_State* L) { // get: charm:effect() set: charm:effect(value) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, charm->effect); } else { @@ -153,7 +152,7 @@ int CharmFunctions::luaCharmEffect(lua_State* L) { int CharmFunctions::luaCharmCastSound(lua_State* L) { // get: charm:castSound() set: charm:castSound(sound) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<lua_Number>(charm->soundCastEffect)); } else { @@ -165,7 +164,7 @@ int CharmFunctions::luaCharmCastSound(lua_State* L) { int CharmFunctions::luaCharmImpactSound(lua_State* L) { // get: charm:impactSound() set: charm:impactSound(sound) - const auto charm = getUserdataShared<Charm>(L, 1); + const auto &charm = getUserdataShared<Charm>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<lua_Number>(charm->soundImpactEffect)); } else { diff --git a/src/lua/functions/creatures/monster/charm_functions.hpp b/src/lua/functions/creatures/monster/charm_functions.hpp index 7be1c8de6..837c1c14f 100644 --- a/src/lua/functions/creatures/monster/charm_functions.hpp +++ b/src/lua/functions/creatures/monster/charm_functions.hpp @@ -13,6 +13,12 @@ class CharmFunctions final : LuaScriptInterface { public: + explicit CharmFunctions(lua_State* L) : + LuaScriptInterface("CharmFunctions") { + init(L); + } + ~CharmFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Charm", "", CharmFunctions::luaCharmCreate); registerMetaMethod(L, "Charm", "__eq", CharmFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/monster/loot_functions.cpp b/src/lua/functions/creatures/monster/loot_functions.cpp index 47e0d8778..79260ccc9 100644 --- a/src/lua/functions/creatures/monster/loot_functions.cpp +++ b/src/lua/functions/creatures/monster/loot_functions.cpp @@ -7,14 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/monster/loot_functions.hpp" #include "creatures/monsters/monsters.hpp" -#include "lua/functions/creatures/monster/loot_functions.hpp" +#include "items/item.hpp" +#include "utils/tools.hpp" int LootFunctions::luaCreateLoot(lua_State* L) { // Loot() will create a new loot item - const auto loot = std::make_shared<Loot>(); + auto loot = std::make_shared<Loot>(); pushUserdata<Loot>(L, loot); setMetatable(L, -1, "Loot"); return 1; @@ -22,7 +23,7 @@ int LootFunctions::luaCreateLoot(lua_State* L) { int LootFunctions::luaLootSetId(lua_State* L) { // loot:setId(id) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { if (isNumber(L, 2)) { loot->lootBlock.id = getNumber<uint16_t>(L, 2); @@ -40,10 +41,10 @@ int LootFunctions::luaLootSetId(lua_State* L) { int LootFunctions::luaLootSetIdFromName(lua_State* L) { // loot:setIdFromName(name) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot && isString(L, 2)) { auto name = getString(L, 2); - auto ids = Item::items.nameToItems.equal_range(asLowerCaseString(name)); + const auto ids = Item::items.nameToItems.equal_range(asLowerCaseString(name)); if (ids.first == Item::items.nameToItems.cend()) { g_logger().warn("[LootFunctions::luaLootSetIdFromName] - " @@ -73,7 +74,7 @@ int LootFunctions::luaLootSetIdFromName(lua_State* L) { int LootFunctions::luaLootSetSubType(lua_State* L) { // loot:setSubType(type) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.subType = getNumber<uint16_t>(L, 2); pushBoolean(L, true); @@ -85,7 +86,7 @@ int LootFunctions::luaLootSetSubType(lua_State* L) { int LootFunctions::luaLootSetChance(lua_State* L) { // loot:setChance(chance) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.chance = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -97,7 +98,7 @@ int LootFunctions::luaLootSetChance(lua_State* L) { int LootFunctions::luaLootSetMinCount(lua_State* L) { // loot:setMinCount(min) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.countmin = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -109,7 +110,7 @@ int LootFunctions::luaLootSetMinCount(lua_State* L) { int LootFunctions::luaLootSetMaxCount(lua_State* L) { // loot:setMaxCount(max) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.countmax = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -121,7 +122,7 @@ int LootFunctions::luaLootSetMaxCount(lua_State* L) { int LootFunctions::luaLootSetActionId(lua_State* L) { // loot:setActionId(actionid) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.actionId = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -133,7 +134,7 @@ int LootFunctions::luaLootSetActionId(lua_State* L) { int LootFunctions::luaLootSetText(lua_State* L) { // loot:setText(text) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.text = getString(L, 2); pushBoolean(L, true); @@ -145,7 +146,7 @@ int LootFunctions::luaLootSetText(lua_State* L) { int LootFunctions::luaLootSetNameItem(lua_State* L) { // loot:setNameItem(name) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.name = getString(L, 2); pushBoolean(L, true); @@ -157,7 +158,7 @@ int LootFunctions::luaLootSetNameItem(lua_State* L) { int LootFunctions::luaLootSetArticle(lua_State* L) { // loot:setArticle(article) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.article = getString(L, 2); pushBoolean(L, true); @@ -169,7 +170,7 @@ int LootFunctions::luaLootSetArticle(lua_State* L) { int LootFunctions::luaLootSetAttack(lua_State* L) { // loot:setAttack(attack) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.attack = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -181,7 +182,7 @@ int LootFunctions::luaLootSetAttack(lua_State* L) { int LootFunctions::luaLootSetDefense(lua_State* L) { // loot:setDefense(defense) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.defense = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -193,7 +194,7 @@ int LootFunctions::luaLootSetDefense(lua_State* L) { int LootFunctions::luaLootSetExtraDefense(lua_State* L) { // loot:setExtraDefense(defense) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.extraDefense = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -205,7 +206,7 @@ int LootFunctions::luaLootSetExtraDefense(lua_State* L) { int LootFunctions::luaLootSetArmor(lua_State* L) { // loot:setArmor(armor) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.armor = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -217,7 +218,7 @@ int LootFunctions::luaLootSetArmor(lua_State* L) { int LootFunctions::luaLootSetShootRange(lua_State* L) { // loot:setShootRange(range) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.shootRange = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -229,7 +230,7 @@ int LootFunctions::luaLootSetShootRange(lua_State* L) { int LootFunctions::luaLootSetHitChance(lua_State* L) { // loot:setHitChance(chance) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { loot->lootBlock.hitChance = getNumber<uint32_t>(L, 2); pushBoolean(L, true); @@ -241,7 +242,7 @@ int LootFunctions::luaLootSetHitChance(lua_State* L) { int LootFunctions::luaLootSetUnique(lua_State* L) { // loot:setUnique(bool) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { if (lua_gettop(L) == 1) { pushBoolean(L, loot->lootBlock.unique); @@ -257,7 +258,7 @@ int LootFunctions::luaLootSetUnique(lua_State* L) { int LootFunctions::luaLootAddChildLoot(lua_State* L) { // loot:addChildLoot(loot) - const auto loot = getUserdataShared<Loot>(L, 1); + const auto &loot = getUserdataShared<Loot>(L, 1); if (loot) { const auto childLoot = getUserdata<Loot>(L, 2); if (childLoot) { diff --git a/src/lua/functions/creatures/monster/loot_functions.hpp b/src/lua/functions/creatures/monster/loot_functions.hpp index 77059307a..321f6bd83 100644 --- a/src/lua/functions/creatures/monster/loot_functions.hpp +++ b/src/lua/functions/creatures/monster/loot_functions.hpp @@ -13,6 +13,12 @@ class LootFunctions final : LuaScriptInterface { public: + explicit LootFunctions(lua_State* L) : + LuaScriptInterface("LootFunctions") { + init(L); + } + ~LootFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Loot", "", LootFunctions::luaCreateLoot); diff --git a/src/lua/functions/creatures/monster/monster_functions.cpp b/src/lua/functions/creatures/monster/monster_functions.cpp index 5578477d6..4b85fc98c 100644 --- a/src/lua/functions/creatures/monster/monster_functions.cpp +++ b/src/lua/functions/creatures/monster/monster_functions.cpp @@ -7,15 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/monster/monster_functions.hpp" -#include "game/game.hpp" +#include "config/configmanager.hpp" #include "creatures/creature.hpp" #include "creatures/monsters/monster.hpp" #include "creatures/monsters/monsters.hpp" -#include "lua/functions/creatures/monster/monster_functions.hpp" -#include "map/spectators.hpp" +#include "creatures/players/player.hpp" +#include "game/game.hpp" #include "game/scheduling/events_scheduler.hpp" +#include "map/spectators.hpp" int MonsterFunctions::luaMonsterCreate(lua_State* L) { // Monster(id or userdata) @@ -49,7 +50,7 @@ int MonsterFunctions::luaMonsterIsMonster(lua_State* L) { int MonsterFunctions::luaMonsterGetType(lua_State* L) { // monster:getType() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { pushUserdata<MonsterType>(L, monster->mType); setMetatable(L, -1, "MonsterType"); @@ -60,10 +61,11 @@ int MonsterFunctions::luaMonsterGetType(lua_State* L) { } int MonsterFunctions::luaMonsterSetType(lua_State* L) { - // monster:setType(name or raceid) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + // monster:setType(name or raceid, restoreHealth = false) + bool restoreHealth = getBoolean(L, 3, false); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<MonsterType> mType = nullptr; + std::shared_ptr<MonsterType> mType; if (isNumber(L, 2)) { mType = g_monsters().getMonsterTypeByRaceId(getNumber<uint16_t>(L, 2)); } else { @@ -81,8 +83,14 @@ int MonsterFunctions::luaMonsterSetType(lua_State* L) { monster->defaultOutfit = mType->info.outfit; monster->currentOutfit = mType->info.outfit; monster->skull = mType->info.skull; - monster->health = mType->info.health * mType->getHealthMultiplier(); - monster->healthMax = mType->info.healthMax * mType->getHealthMultiplier(); + if (restoreHealth) { + auto multiplier = mType->getHealthMultiplier(); + monster->health = mType->info.health * multiplier; + monster->healthMax = mType->info.healthMax * multiplier; + } else { + monster->health = monster->getHealth(); + monster->healthMax = monster->getMaxHealth(); + } monster->baseSpeed = mType->getBaseSpeed(); monster->internalLight = mType->info.light; monster->hiddenHealth = mType->info.hiddenHealth; @@ -106,7 +114,7 @@ int MonsterFunctions::luaMonsterSetType(lua_State* L) { int MonsterFunctions::luaMonsterGetSpawnPosition(lua_State* L) { // monster:getSpawnPosition() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { pushPosition(L, monster->getMasterPos()); } else { @@ -117,7 +125,7 @@ int MonsterFunctions::luaMonsterGetSpawnPosition(lua_State* L) { int MonsterFunctions::luaMonsterIsInSpawnRange(lua_State* L) { // monster:isInSpawnRange([position]) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { pushBoolean(L, monster->isInSpawnRange(lua_gettop(L) >= 2 ? getPosition(L, 2) : monster->getPosition())); } else { @@ -128,7 +136,7 @@ int MonsterFunctions::luaMonsterIsInSpawnRange(lua_State* L) { int MonsterFunctions::luaMonsterIsIdle(lua_State* L) { // monster:isIdle() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { pushBoolean(L, monster->getIdleStatus()); } else { @@ -139,7 +147,7 @@ int MonsterFunctions::luaMonsterIsIdle(lua_State* L) { int MonsterFunctions::luaMonsterSetIdle(lua_State* L) { // monster:setIdle(idle) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; @@ -152,9 +160,9 @@ int MonsterFunctions::luaMonsterSetIdle(lua_State* L) { int MonsterFunctions::luaMonsterIsTarget(lua_State* L) { // monster:isTarget(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); pushBoolean(L, monster->isTarget(creature)); } else { lua_pushnil(L); @@ -164,9 +172,9 @@ int MonsterFunctions::luaMonsterIsTarget(lua_State* L) { int MonsterFunctions::luaMonsterIsOpponent(lua_State* L) { // monster:isOpponent(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); pushBoolean(L, monster->isOpponent(creature)); } else { lua_pushnil(L); @@ -176,9 +184,9 @@ int MonsterFunctions::luaMonsterIsOpponent(lua_State* L) { int MonsterFunctions::luaMonsterIsFriend(lua_State* L) { // monster:isFriend(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); pushBoolean(L, monster->isFriend(creature)); } else { lua_pushnil(L); @@ -188,9 +196,9 @@ int MonsterFunctions::luaMonsterIsFriend(lua_State* L) { int MonsterFunctions::luaMonsterAddFriend(lua_State* L) { // monster:addFriend(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); monster->addFriend(creature); pushBoolean(L, true); } else { @@ -201,9 +209,9 @@ int MonsterFunctions::luaMonsterAddFriend(lua_State* L) { int MonsterFunctions::luaMonsterRemoveFriend(lua_State* L) { // monster:removeFriend(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); monster->removeFriend(creature); pushBoolean(L, true); } else { @@ -214,7 +222,7 @@ int MonsterFunctions::luaMonsterRemoveFriend(lua_State* L) { int MonsterFunctions::luaMonsterGetFriendList(lua_State* L) { // monster:getFriendList() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; @@ -234,7 +242,7 @@ int MonsterFunctions::luaMonsterGetFriendList(lua_State* L) { int MonsterFunctions::luaMonsterGetFriendCount(lua_State* L) { // monster:getFriendCount() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { lua_pushnumber(L, monster->getFriendList().size()); } else { @@ -245,14 +253,14 @@ int MonsterFunctions::luaMonsterGetFriendCount(lua_State* L) { int MonsterFunctions::luaMonsterAddTarget(lua_State* L) { // monster:addTarget(creature[, pushFront = false]) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = getCreature(L, 2); - bool pushFront = getBoolean(L, 3, false); + const auto &creature = getCreature(L, 2); + const bool pushFront = getBoolean(L, 3, false); monster->addTarget(creature, pushFront); pushBoolean(L, true); return 1; @@ -260,7 +268,7 @@ int MonsterFunctions::luaMonsterAddTarget(lua_State* L) { int MonsterFunctions::luaMonsterRemoveTarget(lua_State* L) { // monster:removeTarget(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; @@ -273,17 +281,17 @@ int MonsterFunctions::luaMonsterRemoveTarget(lua_State* L) { int MonsterFunctions::luaMonsterGetTargetList(lua_State* L) { // monster:getTargetList() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; } - const auto targetList = monster->getTargetList(); + const auto &targetList = monster->getTargetList(); lua_createtable(L, targetList.size(), 0); int index = 0; - for (std::shared_ptr<Creature> creature : targetList) { + for (const auto &creature : targetList) { pushUserdata<Creature>(L, creature); setCreatureMetatable(L, -1, creature); lua_rawseti(L, -2, ++index); @@ -293,7 +301,7 @@ int MonsterFunctions::luaMonsterGetTargetList(lua_State* L) { int MonsterFunctions::luaMonsterGetTargetCount(lua_State* L) { // monster:getTargetCount() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { lua_pushnumber(L, monster->getTargetList().size()); } else { @@ -304,10 +312,10 @@ int MonsterFunctions::luaMonsterGetTargetCount(lua_State* L) { int MonsterFunctions::luaMonsterChangeTargetDistance(lua_State* L) { // monster:changeTargetDistance(distance[, duration = 12000]) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - int32_t distance = getNumber<int32_t>(L, 2, 1); - uint32_t duration = getNumber<uint32_t>(L, 3, 12000); + const auto distance = getNumber<int32_t>(L, 2, 1); + const auto duration = getNumber<uint32_t>(L, 3, 12000); pushBoolean(L, monster->changeTargetDistance(distance, duration)); } else { lua_pushnil(L); @@ -317,7 +325,7 @@ int MonsterFunctions::luaMonsterChangeTargetDistance(lua_State* L) { int MonsterFunctions::luaMonsterIsChallenged(lua_State* L) { // monster:isChallenged() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { pushBoolean(L, monster->isChallenged()); } else { @@ -328,9 +336,9 @@ int MonsterFunctions::luaMonsterIsChallenged(lua_State* L) { int MonsterFunctions::luaMonsterSelectTarget(lua_State* L) { // monster:selectTarget(creature) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); pushBoolean(L, monster->selectTarget(creature)); } else { lua_pushnil(L); @@ -340,9 +348,9 @@ int MonsterFunctions::luaMonsterSelectTarget(lua_State* L) { int MonsterFunctions::luaMonsterSearchTarget(lua_State* L) { // monster:searchTarget([searchType = TARGETSEARCH_DEFAULT]) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (monster) { - TargetSearchType_t searchType = getNumber<TargetSearchType_t>(L, 2, TARGETSEARCH_DEFAULT); + const auto &searchType = getNumber<TargetSearchType_t>(L, 2, TARGETSEARCH_DEFAULT); pushBoolean(L, monster->searchTarget(searchType)); } else { lua_pushnil(L); @@ -352,21 +360,21 @@ int MonsterFunctions::luaMonsterSearchTarget(lua_State* L) { int MonsterFunctions::luaMonsterSetSpawnPosition(lua_State* L) { // monster:setSpawnPosition(interval) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; } - uint32_t eventschedule = g_eventsScheduler().getSpawnMonsterSchedule(); + const uint32_t eventschedule = g_eventsScheduler().getSpawnMonsterSchedule(); const Position &pos = monster->getPosition(); monster->setMasterPos(pos); - SpawnMonster &spawnMonster = g_game().map.spawnsMonster.getspawnMonsterList().emplace_back(pos, 5); - uint32_t interval = getNumber<uint32_t>(L, 2, 90) * 1000 * 100 / std::max((uint32_t)1, (g_configManager().getNumber(RATE_SPAWN, __FUNCTION__) * eventschedule)); - spawnMonster.addMonster(monster->mType->typeName, pos, DIRECTION_NORTH, static_cast<uint32_t>(interval)); - spawnMonster.startSpawnMonsterCheck(); + const auto &spawnMonster = g_game().map.spawnsMonster.getspawnMonsterList().emplace_back(std::make_shared<SpawnMonster>(pos, 5)); + uint32_t interval = getNumber<uint32_t>(L, 2, 90) * 1000 * 100 / std::max((uint32_t)1, (g_configManager().getNumber(RATE_SPAWN) * eventschedule)); + spawnMonster->addMonster(monster->mType->typeName, pos, DIRECTION_NORTH, static_cast<uint32_t>(interval)); + spawnMonster->startSpawnMonsterCheck(); pushBoolean(L, true); return 1; @@ -374,14 +382,14 @@ int MonsterFunctions::luaMonsterSetSpawnPosition(lua_State* L) { int MonsterFunctions::luaMonsterGetRespawnType(lua_State* L) { // monster:getRespawnType() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { lua_pushnil(L); return 1; } - RespawnType respawnType = monster->getRespawnType(); + const RespawnType respawnType = monster->getRespawnType(); lua_pushnumber(L, respawnType.period); pushBoolean(L, respawnType.underground); @@ -390,7 +398,7 @@ int MonsterFunctions::luaMonsterGetRespawnType(lua_State* L) { int MonsterFunctions::luaMonsterGetTimeToChangeFiendish(lua_State* L) { // monster:getTimeToChangeFiendish() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -403,8 +411,8 @@ int MonsterFunctions::luaMonsterGetTimeToChangeFiendish(lua_State* L) { int MonsterFunctions::luaMonsterSetTimeToChangeFiendish(lua_State* L) { // monster:setTimeToChangeFiendish(endTime) - time_t endTime = getNumber<uint32_t>(L, 2, 1); - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const time_t endTime = getNumber<uint32_t>(L, 2, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -417,22 +425,22 @@ int MonsterFunctions::luaMonsterSetTimeToChangeFiendish(lua_State* L) { int MonsterFunctions::luaMonsterGetMonsterForgeClassification(lua_State* L) { // monster:getMonsterForgeClassification() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); return 0; } - auto classification = static_cast<lua_Number>(monster->getMonsterForgeClassification()); + const auto classification = static_cast<lua_Number>(monster->getMonsterForgeClassification()); lua_pushnumber(L, classification); return 1; } int MonsterFunctions::luaMonsterSetMonsterForgeClassification(lua_State* L) { // monster:setMonsterForgeClassification(classication) - ForgeClassifications_t classification = getNumber<ForgeClassifications_t>(L, 2); - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const ForgeClassifications_t classification = getNumber<ForgeClassifications_t>(L, 2); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -445,7 +453,7 @@ int MonsterFunctions::luaMonsterSetMonsterForgeClassification(lua_State* L) { int MonsterFunctions::luaMonsterGetForgeStack(lua_State* L) { // monster:getForgeStack() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -458,8 +466,8 @@ int MonsterFunctions::luaMonsterGetForgeStack(lua_State* L) { int MonsterFunctions::luaMonsterSetForgeStack(lua_State* L) { // monster:setForgeStack(stack) - uint16_t stack = getNumber<uint16_t>(L, 2, 0); - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto stack = getNumber<uint16_t>(L, 2, 0); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -467,7 +475,7 @@ int MonsterFunctions::luaMonsterSetForgeStack(lua_State* L) { } monster->setForgeStack(stack); - auto icon = stack < 15 + const auto icon = stack < 15 ? CreatureIconModifications_t::Influenced : CreatureIconModifications_t::Fiendish; monster->setIcon("forge", CreatureIcon(icon, icon == CreatureIconModifications_t::Influenced ? static_cast<uint8_t>(stack) : 0)); @@ -478,7 +486,7 @@ int MonsterFunctions::luaMonsterSetForgeStack(lua_State* L) { int MonsterFunctions::luaMonsterConfigureForgeSystem(lua_State* L) { // monster:configureForgeSystem() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -491,7 +499,7 @@ int MonsterFunctions::luaMonsterConfigureForgeSystem(lua_State* L) { int MonsterFunctions::luaMonsterClearFiendishStatus(lua_State* L) { // monster:clearFiendishStatus() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -504,7 +512,7 @@ int MonsterFunctions::luaMonsterClearFiendishStatus(lua_State* L) { int MonsterFunctions::luaMonsterIsForgeable(lua_State* L) { // monster:isForgeable() - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -530,7 +538,7 @@ int MonsterFunctions::luaMonsterGetName(lua_State* L) { int MonsterFunctions::luaMonsterSetName(lua_State* L) { // monster:setName(name[, nameDescription]) - auto monster = getUserdataShared<Monster>(L, 1); + const auto &monster = getUserdataShared<Monster>(L, 1); if (!monster) { reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); pushBoolean(L, false); @@ -548,8 +556,8 @@ int MonsterFunctions::luaMonsterSetName(lua_State* L) { int MonsterFunctions::luaMonsterHazard(lua_State* L) { // get: monster:hazard() ; set: monster:hazard(hazard) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); - bool hazard = getBoolean(L, 2, false); + const auto &monster = getUserdataShared<Monster>(L, 1); + const bool hazard = getBoolean(L, 2, false); if (monster) { if (lua_gettop(L) == 1) { pushBoolean(L, monster->getHazard()); @@ -565,8 +573,8 @@ int MonsterFunctions::luaMonsterHazard(lua_State* L) { int MonsterFunctions::luaMonsterHazardCrit(lua_State* L) { // get: monster:hazardCrit() ; set: monster:hazardCrit(hazardCrit) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); - bool hazardCrit = getBoolean(L, 2, false); + const auto &monster = getUserdataShared<Monster>(L, 1); + const bool hazardCrit = getBoolean(L, 2, false); if (monster) { if (lua_gettop(L) == 1) { pushBoolean(L, monster->getHazardSystemCrit()); @@ -582,8 +590,8 @@ int MonsterFunctions::luaMonsterHazardCrit(lua_State* L) { int MonsterFunctions::luaMonsterHazardDodge(lua_State* L) { // get: monster:hazardDodge() ; set: monster:hazardDodge(hazardDodge) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); - bool hazardDodge = getBoolean(L, 2, false); + const auto &monster = getUserdataShared<Monster>(L, 1); + const bool hazardDodge = getBoolean(L, 2, false); if (monster) { if (lua_gettop(L) == 1) { pushBoolean(L, monster->getHazardSystemDodge()); @@ -599,8 +607,8 @@ int MonsterFunctions::luaMonsterHazardDodge(lua_State* L) { int MonsterFunctions::luaMonsterHazardDamageBoost(lua_State* L) { // get: monster:hazardDamageBoost() ; set: monster:hazardDamageBoost(hazardDamageBoost) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); - bool hazardDamageBoost = getBoolean(L, 2, false); + const auto &monster = getUserdataShared<Monster>(L, 1); + const bool hazardDamageBoost = getBoolean(L, 2, false); if (monster) { if (lua_gettop(L) == 1) { pushBoolean(L, monster->getHazardSystemDamageBoost()); @@ -616,8 +624,8 @@ int MonsterFunctions::luaMonsterHazardDamageBoost(lua_State* L) { int MonsterFunctions::luaMonsterHazardDefenseBoost(lua_State* L) { // get: monster:hazardDefenseBoost() ; set: monster:hazardDefenseBoost(hazardDefenseBoost) - std::shared_ptr<Monster> monster = getUserdataShared<Monster>(L, 1); - bool hazardDefenseBoost = getBoolean(L, 2, false); + const auto &monster = getUserdataShared<Monster>(L, 1); + const bool hazardDefenseBoost = getBoolean(L, 2, false); if (monster) { if (lua_gettop(L) == 1) { pushBoolean(L, monster->getHazardSystemDefenseBoost()); @@ -630,3 +638,76 @@ int MonsterFunctions::luaMonsterHazardDefenseBoost(lua_State* L) { } return 1; } + +int MonsterFunctions::luaMonsterAddReflectElement(lua_State* L) { + // monster:addReflectElement(type, percent) + const auto &monster = getUserdataShared<Monster>(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + CombatType_t element = getNumber<CombatType_t>(L, 2); + monster->addReflectElement(element, getNumber<int32_t>(L, 3)); + pushBoolean(L, true); + return 1; +} + +int MonsterFunctions::luaMonsterAddDefense(lua_State* L) { + // monster:addDefense(defense) + const auto &monster = getUserdataShared<Monster>(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + monster->addDefense(getNumber<int32_t>(L, 2)); + pushBoolean(L, true); + return 1; +} + +int MonsterFunctions::luaMonsterGetDefense(lua_State* L) { + // monster:getDefense(defense) + const auto &monster = getUserdataShared<Monster>(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + lua_pushnumber(L, monster->getDefense()); + return 1; +} + +int MonsterFunctions::luaMonsterIsDead(lua_State* L) { + // monster:isDead() + const auto &monster = getUserdataShared<Monster>(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + pushBoolean(L, monster->isDead()); + return 1; +} + +int MonsterFunctions::luaMonsterImmune(lua_State* L) { + // to get: isImmune = monster:immune() + // to set and get: newImmuneBool = monster:immune(newImmuneBool) + const auto &monster = getUserdataShared<Monster>(L, 1); + if (!monster) { + reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_NOT_FOUND)); + pushBoolean(L, false); + return 0; + } + + if (lua_gettop(L) > 1) { + monster->setImmune(getBoolean(L, 2)); + } + + pushBoolean(L, monster->isImmune()); + return 1; +} diff --git a/src/lua/functions/creatures/monster/monster_functions.hpp b/src/lua/functions/creatures/monster/monster_functions.hpp index dd1c38273..0674bf644 100644 --- a/src/lua/functions/creatures/monster/monster_functions.hpp +++ b/src/lua/functions/creatures/monster/monster_functions.hpp @@ -17,6 +17,12 @@ class MonsterFunctions final : LuaScriptInterface { private: + explicit MonsterFunctions(lua_State* L) : + LuaScriptInterface("MonsterFunctions") { + init(L); + } + ~MonsterFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Monster", "Creature", MonsterFunctions::luaMonsterCreate); registerMetaMethod(L, "Monster", "__eq", MonsterFunctions::luaUserdataCompare); @@ -64,6 +70,13 @@ class MonsterFunctions final : LuaScriptInterface { registerMethod(L, "Monster", "hazardDamageBoost", MonsterFunctions::luaMonsterHazardDamageBoost); registerMethod(L, "Monster", "hazardDefenseBoost", MonsterFunctions::luaMonsterHazardDefenseBoost); + registerMethod(L, "Monster", "addReflectElement", MonsterFunctions::luaMonsterAddReflectElement); + registerMethod(L, "Monster", "addDefense", MonsterFunctions::luaMonsterAddDefense); + registerMethod(L, "Monster", "getDefense", MonsterFunctions::luaMonsterGetDefense); + + registerMethod(L, "Monster", "isDead", MonsterFunctions::luaMonsterIsDead); + registerMethod(L, "Monster", "immune", MonsterFunctions::luaMonsterImmune); + CharmFunctions::init(L); LootFunctions::init(L); MonsterSpellFunctions::init(L); @@ -124,6 +137,12 @@ class MonsterFunctions final : LuaScriptInterface { static int luaMonsterHazardDodge(lua_State* L); static int luaMonsterHazardDamageBoost(lua_State* L); static int luaMonsterHazardDefenseBoost(lua_State* L); + static int luaMonsterAddReflectElement(lua_State* L); + static int luaMonsterAddDefense(lua_State* L); + static int luaMonsterGetDefense(lua_State* L); + + static int luaMonsterIsDead(lua_State* L); + static int luaMonsterImmune(lua_State* L); friend class CreatureFunctions; }; diff --git a/src/lua/functions/creatures/monster/monster_spell_functions.cpp b/src/lua/functions/creatures/monster/monster_spell_functions.cpp index a20d57008..693da8e6b 100644 --- a/src/lua/functions/creatures/monster/monster_spell_functions.cpp +++ b/src/lua/functions/creatures/monster/monster_spell_functions.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/creatures/monster/monster_spell_functions.hpp" + #include "creatures/monsters/monsters.hpp" int MonsterSpellFunctions::luaCreateMonsterSpell(lua_State* L) { @@ -21,7 +20,7 @@ int MonsterSpellFunctions::luaCreateMonsterSpell(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetType(lua_State* L) { // monsterSpell:setType(type) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->name = getString(L, 2); pushBoolean(L, true); @@ -33,7 +32,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetType(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetScriptName(lua_State* L) { // monsterSpell:setScriptName(name) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->scriptName = getString(L, 2); pushBoolean(L, true); @@ -45,7 +44,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetScriptName(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetChance(lua_State* L) { // monsterSpell:setChance(chance) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->chance = getNumber<uint8_t>(L, 2); pushBoolean(L, true); @@ -57,7 +56,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetChance(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetInterval(lua_State* L) { // monsterSpell:setInterval(interval) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->interval = getNumber<uint16_t>(L, 2); pushBoolean(L, true); @@ -69,7 +68,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetInterval(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetRange(lua_State* L) { // monsterSpell:setRange(range) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->range = getNumber<uint8_t>(L, 2); pushBoolean(L, true); @@ -81,7 +80,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetRange(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatValue(lua_State* L) { // monsterSpell:setCombatValue(min, max) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->minCombatValue = getNumber<int32_t>(L, 2); spell->maxCombatValue = getNumber<int32_t>(L, 3); @@ -94,7 +93,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatValue(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatType(lua_State* L) { // monsterSpell:setCombatType(combatType_t) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->combatType = getNumber<CombatType_t>(L, 2); pushBoolean(L, true); @@ -106,7 +105,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatType(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetAttackValue(lua_State* L) { // monsterSpell:setAttackValue(attack, skill) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->attack = getNumber<int32_t>(L, 2); spell->skill = getNumber<int32_t>(L, 3); @@ -119,7 +118,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetAttackValue(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetNeedTarget(lua_State* L) { // monsterSpell:setNeedTarget(bool) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->needTarget = getBoolean(L, 2); pushBoolean(L, true); @@ -131,7 +130,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetNeedTarget(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatLength(lua_State* L) { // monsterSpell:setCombatLength(length) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->length = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -143,7 +142,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatLength(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatSpread(lua_State* L) { // monsterSpell:setCombatSpread(spread) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->spread = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -155,7 +154,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatSpread(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatRadius(lua_State* L) { // monsterSpell:setCombatRadius(radius) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->radius = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -167,7 +166,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatRadius(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetConditionType(lua_State* L) { // monsterSpell:setConditionType(type) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { auto conditionType = getNumber<uint8_t>(L, 2); if (conditionType == 254) { @@ -187,7 +186,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetConditionType(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetConditionDamage(lua_State* L) { // monsterSpell:setConditionDamage(min, max, start) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->conditionMinDamage = getNumber<int32_t>(L, 2); spell->conditionMaxDamage = getNumber<int32_t>(L, 3); @@ -201,7 +200,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetConditionDamage(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetConditionSpeedChange(lua_State* L) { // monsterSpell:setConditionSpeedChange(speed) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->speedChange = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -213,7 +212,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetConditionSpeedChange(lua_State* L) int MonsterSpellFunctions::luaMonsterSpellSetConditionDuration(lua_State* L) { // monsterSpell:setConditionDuration(duration) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->duration = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -225,7 +224,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetConditionDuration(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetConditionTickInterval(lua_State* L) { // monsterSpell:setConditionTickInterval(interval) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->tickInterval = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -237,7 +236,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetConditionTickInterval(lua_State* L) int MonsterSpellFunctions::luaMonsterSpellSetCombatShootEffect(lua_State* L) { // monsterSpell:setCombatShootEffect(effect) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->shoot = getNumber<ShootType_t>(L, 2); pushBoolean(L, true); @@ -249,7 +248,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatShootEffect(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetCombatEffect(lua_State* L) { // monsterSpell:setCombatEffect(effect) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->effect = getNumber<MagicEffectClasses>(L, 2); pushBoolean(L, true); @@ -261,7 +260,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetCombatEffect(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetOutfitMonster(lua_State* L) { // monsterSpell:setOutfitMonster(effect) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->outfitMonster = getString(L, 2); pushBoolean(L, true); @@ -273,7 +272,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetOutfitMonster(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellSetOutfitItem(lua_State* L) { // monsterSpell:setOutfitItem(effect) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (spell) { spell->outfitItem = getNumber<uint16_t>(L, 2); pushBoolean(L, true); @@ -285,7 +284,7 @@ int MonsterSpellFunctions::luaMonsterSpellSetOutfitItem(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellCastSound(lua_State* L) { // get: monsterSpell:castSound() set: monsterSpell:castSound(sound) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<lua_Number>(spell->soundCastEffect)); } else { @@ -297,7 +296,7 @@ int MonsterSpellFunctions::luaMonsterSpellCastSound(lua_State* L) { int MonsterSpellFunctions::luaMonsterSpellImpactSound(lua_State* L) { // get: monsterSpell:impactSound() set: monsterSpell:impactSound(sound) - const auto spell = getUserdataShared<MonsterSpell>(L, 1); + const auto &spell = getUserdataShared<MonsterSpell>(L, 1); if (lua_gettop(L) == 1) { lua_pushnumber(L, static_cast<lua_Number>(spell->soundImpactEffect)); } else { diff --git a/src/lua/functions/creatures/monster/monster_spell_functions.hpp b/src/lua/functions/creatures/monster/monster_spell_functions.hpp index ad737ea93..e44c5e534 100644 --- a/src/lua/functions/creatures/monster/monster_spell_functions.hpp +++ b/src/lua/functions/creatures/monster/monster_spell_functions.hpp @@ -13,8 +13,14 @@ class MonsterSpellFunctions final : LuaScriptInterface { public: + explicit MonsterSpellFunctions(lua_State* L) : + LuaScriptInterface("MonsterSpellFunctions") { + init(L); + } + ~MonsterSpellFunctions() override = default; + static void init(lua_State* L) { - registerClass(L, "MonsterSpell", "", MonsterSpellFunctions::luaCreateMonsterSpell); + registerSharedClass(L, "MonsterSpell", "", MonsterSpellFunctions::luaCreateMonsterSpell); registerMethod(L, "MonsterSpell", "setType", MonsterSpellFunctions::luaMonsterSpellSetType); registerMethod(L, "MonsterSpell", "setScriptName", MonsterSpellFunctions::luaMonsterSpellSetScriptName); diff --git a/src/lua/functions/creatures/monster/monster_type_functions.cpp b/src/lua/functions/creatures/monster/monster_type_functions.cpp index ded7c2054..3df28d127 100644 --- a/src/lua/functions/creatures/monster/monster_type_functions.cpp +++ b/src/lua/functions/creatures/monster/monster_type_functions.cpp @@ -7,15 +7,16 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/monster/monster_type_functions.hpp" -#include "game/game.hpp" -#include "io/io_bosstiary.hpp" +#include "config/configmanager.hpp" #include "creatures/combat/spells.hpp" -#include "creatures/monsters/monsters.hpp" #include "creatures/monsters/monster.hpp" -#include "lua/functions/creatures/monster/monster_type_functions.hpp" +#include "creatures/monsters/monsters.hpp" +#include "game/game.hpp" +#include "io/io_bosstiary.hpp" #include "lua/scripts/scripts.hpp" +#include "utils/tools.hpp" void MonsterTypeFunctions::createMonsterTypeLootLuaTable(lua_State* L, const std::vector<LootBlock> &lootList) { lua_createtable(L, lootList.size(), 0); @@ -43,7 +44,7 @@ void MonsterTypeFunctions::createMonsterTypeLootLuaTable(lua_State* L, const std int MonsterTypeFunctions::luaMonsterTypeCreate(lua_State* L) { // MonsterType(name or raceid) - std::shared_ptr<MonsterType> monsterType = nullptr; + std::shared_ptr<MonsterType> monsterType; if (isNumber(L, 2)) { monsterType = g_monsters().getMonsterTypeByRaceId(getNumber<uint16_t>(L, 2)); } else { @@ -61,7 +62,7 @@ int MonsterTypeFunctions::luaMonsterTypeCreate(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsAttackable(lua_State* L) { // get: monsterType:isAttackable() set: monsterType:isAttackable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isAttackable); @@ -77,7 +78,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsAttackable(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsConvinceable(lua_State* L) { // get: monsterType:isConvinceable() set: monsterType:isConvinceable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isConvinceable); @@ -93,7 +94,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsConvinceable(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsSummonable(lua_State* L) { // get: monsterType:isSummonable() set: monsterType:isSummonable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isSummonable); @@ -107,9 +108,41 @@ int MonsterTypeFunctions::luaMonsterTypeIsSummonable(lua_State* L) { return 1; } +int MonsterTypeFunctions::luaMonsterTypeIsPreyExclusive(lua_State* L) { + // get: monsterType:isPreyExclusive() set: monsterType:isPreyExclusive(bool) + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); + if (monsterType) { + if (lua_gettop(L) == 1) { + pushBoolean(L, monsterType->info.isPreyExclusive); + } else { + monsterType->info.isPreyExclusive = getBoolean(L, 2); + pushBoolean(L, true); + } + } else { + lua_pushnil(L); + } + return 1; +} + +int MonsterTypeFunctions::luaMonsterTypeIsPreyable(lua_State* L) { + // get: monsterType:isPreyable() set: monsterType:isPreyable(bool) + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); + if (monsterType) { + if (lua_gettop(L) == 1) { + pushBoolean(L, monsterType->info.isPreyable); + } else { + monsterType->info.isPreyable = getBoolean(L, 2); + pushBoolean(L, true); + } + } else { + lua_pushnil(L); + } + return 1; +} + int MonsterTypeFunctions::luaMonsterTypeIsIllusionable(lua_State* L) { // get: monsterType:isIllusionable() set: monsterType:isIllusionable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isIllusionable); @@ -125,7 +158,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsIllusionable(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsHostile(lua_State* L) { // get: monsterType:isHostile() set: monsterType:isHostile(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isHostile); @@ -141,7 +174,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsHostile(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeFamiliar(lua_State* L) { // get: monsterType:familiar() set: monsterType:familiar(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isFamiliar); @@ -157,7 +190,7 @@ int MonsterTypeFunctions::luaMonsterTypeFamiliar(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsRewardBoss(lua_State* L) { // get: monsterType:isRewardBoss() set: monsterType:isRewardBoss(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isRewardBoss); @@ -173,7 +206,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsRewardBoss(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsPushable(lua_State* L) { // get: monsterType:isPushable() set: monsterType:isPushable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.pushable); @@ -189,7 +222,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsPushable(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsHealthHidden(lua_State* L) { // get: monsterType:isHealthHidden() set: monsterType:isHealthHidden(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.hiddenHealth); @@ -205,7 +238,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsHealthHidden(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsBlockable(lua_State* L) { // get: monsterType:isBlockable() set: monsterType:isBlockable(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.isBlockable); @@ -221,7 +254,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsBlockable(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeIsForgeCreature(lua_State* L) { // get: monsterType:isForgeCreature() set: monsterType:isForgeCreature(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -239,7 +272,7 @@ int MonsterTypeFunctions::luaMonsterTypeIsForgeCreature(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanSpawn(lua_State* L) { // monsterType:canSpawn(pos) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); const Position &position = getPosition(L, 2); if (monsterType) { pushBoolean(L, monsterType->canSpawn(position)); @@ -251,7 +284,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanSpawn(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanPushItems(lua_State* L) { // get: monsterType:canPushItems() set: monsterType:canPushItems(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.canPushItems); @@ -267,7 +300,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanPushItems(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanPushCreatures(lua_State* L) { // get: monsterType:canPushCreatures() set: monsterType:canPushCreatures(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.canPushCreatures); @@ -283,7 +316,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanPushCreatures(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCritChance(lua_State* L) { // get: monsterType:critChance() set: monsterType:critChance(int) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 2) { monsterType->info.critChance = getNumber<uint16_t>(L, 2); @@ -297,7 +330,7 @@ int MonsterTypeFunctions::luaMonsterTypeCritChance(lua_State* L) { int32_t MonsterTypeFunctions::luaMonsterTypeName(lua_State* L) { // get: monsterType:name() set: monsterType:name(name) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushString(L, monsterType->name); @@ -313,7 +346,7 @@ int32_t MonsterTypeFunctions::luaMonsterTypeName(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeNameDescription(lua_State* L) { // get: monsterType:nameDescription() set: monsterType:nameDescription(desc) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushString(L, monsterType->nameDescription); @@ -329,7 +362,7 @@ int MonsterTypeFunctions::luaMonsterTypeNameDescription(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypegetCorpseId(lua_State* L) { // monsterType:getCorpseId() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { lua_pushnumber(L, monsterType->info.lookcorpse); } else { @@ -340,7 +373,7 @@ int MonsterTypeFunctions::luaMonsterTypegetCorpseId(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeHealth(lua_State* L) { // get: monsterType:health() set: monsterType:health(health) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.health); @@ -356,7 +389,7 @@ int MonsterTypeFunctions::luaMonsterTypeHealth(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeMaxHealth(lua_State* L) { // get: monsterType:maxHealth() set: monsterType:maxHealth(health) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.healthMax); @@ -372,7 +405,7 @@ int MonsterTypeFunctions::luaMonsterTypeMaxHealth(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRunHealth(lua_State* L) { // get: monsterType:runHealth() set: monsterType:runHealth(health) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.runAwayHealth); @@ -388,7 +421,7 @@ int MonsterTypeFunctions::luaMonsterTypeRunHealth(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeExperience(lua_State* L) { // get: monsterType:experience() set: monsterType:experience(exp) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.experience); @@ -404,7 +437,7 @@ int MonsterTypeFunctions::luaMonsterTypeExperience(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeFaction(lua_State* L) { // get: monsterType:faction() set: monsterType:faction(faction) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.faction); @@ -420,7 +453,7 @@ int MonsterTypeFunctions::luaMonsterTypeFaction(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeEnemyFactions(lua_State* L) { // get: monsterType:enemyFactions() set: monsterType:enemyFactions(enemyFaction) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_createtable(L, monsterType->info.enemyFactions.size(), 0); @@ -431,7 +464,7 @@ int MonsterTypeFunctions::luaMonsterTypeEnemyFactions(lua_State* L) { lua_rawseti(L, -2, ++index); } } else { - Faction_t faction = getNumber<Faction_t>(L, 2); + const Faction_t faction = getNumber<Faction_t>(L, 2); monsterType->info.enemyFactions.insert(faction); pushBoolean(L, true); } @@ -443,7 +476,7 @@ int MonsterTypeFunctions::luaMonsterTypeEnemyFactions(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeTargetPreferPlayer(lua_State* L) { // get: monsterType:targetPreferPlayer() set: monsterType:targetPreferPlayer(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushboolean(L, monsterType->info.targetPreferPlayer); @@ -459,7 +492,7 @@ int MonsterTypeFunctions::luaMonsterTypeTargetPreferPlayer(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeTargetPreferMaster(lua_State* L) { // get: monsterType:targetPreferMaster() set: monsterType:targetPreferMaster(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.faction); @@ -475,7 +508,7 @@ int MonsterTypeFunctions::luaMonsterTypeTargetPreferMaster(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRaceid(lua_State* L) { // get: monsterType:raceId() set: monsterType:raceId(id) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.raceid); @@ -492,7 +525,7 @@ int MonsterTypeFunctions::luaMonsterTypeRaceid(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiarytoKill(lua_State* L) { // get: monsterType:BestiarytoKill() set: monsterType:BestiarytoKill(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryToUnlock); @@ -508,7 +541,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiarytoKill(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryFirstUnlock(lua_State* L) { // get: monsterType:BestiaryFirstUnlock() set: monsterType:BestiaryFirstUnlock(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryFirstUnlock); @@ -524,7 +557,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryFirstUnlock(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiarySecondUnlock(lua_State* L) { // get: monsterType:BestiarySecondUnlock() set: monsterType:BestiarySecondUnlock(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiarySecondUnlock); @@ -540,7 +573,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiarySecondUnlock(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryCharmsPoints(lua_State* L) { // get: monsterType:BestiaryCharmsPoints() set: monsterType:BestiaryCharmsPoints(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryCharmsPoints); @@ -556,7 +589,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryCharmsPoints(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryStars(lua_State* L) { // get: monsterType:BestiaryStars() set: monsterType:BestiaryStars(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryStars); @@ -572,7 +605,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryStars(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryOccurrence(lua_State* L) { // get: monsterType:BestiaryOccurrence() set: monsterType:BestiaryOccurrence(value) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryOccurrence); @@ -588,7 +621,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryOccurrence(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryLocations(lua_State* L) { // get: monsterType:BestiaryLocations() set: monsterType:BestiaryLocations(string) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushString(L, monsterType->info.bestiaryLocations); @@ -604,7 +637,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryLocations(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryclass(lua_State* L) { // get: monsterType:Bestiaryclass() set: monsterType:Bestiaryclass(string) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushString(L, monsterType->info.bestiaryClass); @@ -620,12 +653,12 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryclass(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBestiaryrace(lua_State* L) { // get: monsterType:Bestiaryrace() set: monsterType:Bestiaryrace(raceid) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.bestiaryRace); } else { - BestiaryType_t race = getNumber<BestiaryType_t>(L, 2); + const BestiaryType_t race = getNumber<BestiaryType_t>(L, 2); monsterType->info.bestiaryRace = race; pushBoolean(L, true); } @@ -637,7 +670,7 @@ int MonsterTypeFunctions::luaMonsterTypeBestiaryrace(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCombatImmunities(lua_State* L) { // get: monsterType:combatImmunities() set: monsterType:combatImmunities(immunity) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -693,7 +726,7 @@ int MonsterTypeFunctions::luaMonsterTypeCombatImmunities(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeConditionImmunities(lua_State* L) { // get: monsterType:conditionImmunities() set: monsterType:conditionImmunities(immunity) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -751,7 +784,7 @@ int MonsterTypeFunctions::luaMonsterTypeConditionImmunities(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetAttackList(lua_State* L) { // monsterType:getAttackList() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -781,9 +814,9 @@ int MonsterTypeFunctions::luaMonsterTypeGetAttackList(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddAttack(lua_State* L) { // monsterType:addAttack(monsterspell) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - const auto spell = getUserdataShared<MonsterSpell>(L, 2); + const auto &spell = getUserdataShared<MonsterSpell>(L, 2); if (spell) { spellBlock_t sb; if (g_monsters().deserializeSpell(spell, sb, monsterType->name)) { @@ -802,7 +835,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddAttack(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetDefenseList(lua_State* L) { // monsterType:getDefenseList() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -832,7 +865,7 @@ int MonsterTypeFunctions::luaMonsterTypeGetDefenseList(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetTypeName(lua_State* L) { // monsterType:getTypeName() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { return 1; } @@ -843,9 +876,9 @@ int MonsterTypeFunctions::luaMonsterTypeGetTypeName(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddDefense(lua_State* L) { // monsterType:addDefense(monsterspell) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - const auto spell = getUserdataShared<MonsterSpell>(L, 2); + const auto &spell = getUserdataShared<MonsterSpell>(L, 2); if (spell) { spellBlock_t sb; if (g_monsters().deserializeSpell(spell, sb, monsterType->name)) { @@ -864,9 +897,9 @@ int MonsterTypeFunctions::luaMonsterTypeAddDefense(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddElement(lua_State* L) { // monsterType:addElement(type, percent) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - CombatType_t element = getNumber<CombatType_t>(L, 2); + const CombatType_t element = getNumber<CombatType_t>(L, 2); monsterType->info.elementMap[element] = getNumber<int32_t>(L, 3); pushBoolean(L, true); } else { @@ -877,9 +910,9 @@ int MonsterTypeFunctions::luaMonsterTypeAddElement(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddReflect(lua_State* L) { // monsterType:addReflect(type, percent) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - CombatType_t element = getNumber<CombatType_t>(L, 2); + const CombatType_t element = getNumber<CombatType_t>(L, 2); monsterType->info.reflectMap[element] = getNumber<int32_t>(L, 3); pushBoolean(L, true); } else { @@ -890,9 +923,9 @@ int MonsterTypeFunctions::luaMonsterTypeAddReflect(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddHealing(lua_State* L) { // monsterType:addHealing(type, percent) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - CombatType_t element = getNumber<CombatType_t>(L, 2); + const CombatType_t element = getNumber<CombatType_t>(L, 2); monsterType->info.healingMap[element] = getNumber<int32_t>(L, 3); pushBoolean(L, true); } else { @@ -903,7 +936,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddHealing(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetElementList(lua_State* L) { // monsterType:getElementList() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -919,7 +952,7 @@ int MonsterTypeFunctions::luaMonsterTypeGetElementList(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddVoice(lua_State* L) { // monsterType:addVoice(sentence, interval, chance, yell) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { voiceBlock_t voice; voice.text = getString(L, 2); @@ -936,7 +969,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddVoice(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetVoices(lua_State* L) { // monsterType:getVoices() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -955,7 +988,7 @@ int MonsterTypeFunctions::luaMonsterTypeGetVoices(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetLoot(lua_State* L) { // monsterType:getLoot() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -967,9 +1000,9 @@ int MonsterTypeFunctions::luaMonsterTypeGetLoot(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddLoot(lua_State* L) { // monsterType:addLoot(loot) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - const auto loot = getUserdataShared<Loot>(L, 2); + const auto &loot = getUserdataShared<Loot>(L, 2); if (loot) { monsterType->loadLoot(monsterType, loot->lootBlock); pushBoolean(L, true); @@ -984,7 +1017,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddLoot(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetCreatureEvents(lua_State* L) { // monsterType:getCreatureEvents() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -1001,9 +1034,9 @@ int MonsterTypeFunctions::luaMonsterTypeGetCreatureEvents(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRegisterEvent(lua_State* L) { // monsterType:registerEvent(name) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { - auto eventName = getString(L, 2); + const auto eventName = getString(L, 2); monsterType->info.scripts.insert(eventName); for (const auto &[_, monster] : g_game().getMonsters()) { if (monster->getMonsterType() == monsterType) { @@ -1023,7 +1056,9 @@ int MonsterTypeFunctions::luaMonsterTypeEventOnCallback(lua_State* L) { // monsterType:onDisappear(callback) // monsterType:onMove(callback) // monsterType:onSay(callback) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + // monsterType:onPlayerAttack(callback) + // monsterType:onSpawn(callback) + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (monsterType->loadCallback(&g_scripts().getScriptInterface())) { pushBoolean(L, true); @@ -1038,7 +1073,7 @@ int MonsterTypeFunctions::luaMonsterTypeEventOnCallback(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeEventType(lua_State* L) { // monstertype:eventType(event) - const auto mType = getUserdataShared<MonsterType>(L, 1); + const auto &mType = getUserdataShared<MonsterType>(L, 1); if (mType) { mType->info.eventType = getNumber<MonstersEvent_t>(L, 2); pushBoolean(L, true); @@ -1050,7 +1085,7 @@ int MonsterTypeFunctions::luaMonsterTypeEventType(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetSummonList(lua_State* L) { // monsterType:getSummonList() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -1070,7 +1105,7 @@ int MonsterTypeFunctions::luaMonsterTypeGetSummonList(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddSummon(lua_State* L) { // monsterType:addSummon(name, interval, chance[, count = 1]) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { summonBlock_t summon; summon.name = getString(L, 2); @@ -1087,7 +1122,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddSummon(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeMaxSummons(lua_State* L) { // get: monsterType:maxSummons() set: monsterType:maxSummons(ammount) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.maxSummons); @@ -1103,7 +1138,7 @@ int MonsterTypeFunctions::luaMonsterTypeMaxSummons(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeArmor(lua_State* L) { // get: monsterType:armor() set: monsterType:armor(armor) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.armor); @@ -1119,7 +1154,7 @@ int MonsterTypeFunctions::luaMonsterTypeArmor(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeMitigation(lua_State* L) { // get: monsterType:mitigation() set: monsterType:mitigation(mitigation) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -1137,7 +1172,7 @@ int MonsterTypeFunctions::luaMonsterTypeMitigation(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeDefense(lua_State* L) { // get: monsterType:defense() set: monsterType:defense(defense) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.defense); @@ -1153,13 +1188,13 @@ int MonsterTypeFunctions::luaMonsterTypeDefense(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeOutfit(lua_State* L) { // get: monsterType:outfit() set: monsterType:outfit(outfit) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushOutfit(L, monsterType->info.outfit); } else { Outfit_t outfit = getOutfit(L, 2); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { g_logger().warn("[MonsterTypeFunctions::luaMonsterTypeOutfit] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", outfit.lookType); lua_pushnil(L); } else { @@ -1175,7 +1210,7 @@ int MonsterTypeFunctions::luaMonsterTypeOutfit(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRace(lua_State* L) { // get: monsterType:race() set: monsterType:race(race) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); std::string race = getString(L, 2); if (monsterType) { if (lua_gettop(L) == 1) { @@ -1210,7 +1245,7 @@ int MonsterTypeFunctions::luaMonsterTypeRace(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCorpseId(lua_State* L) { // get: monsterType:corpseId() set: monsterType:corpseId(id) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.lookcorpse); @@ -1226,7 +1261,7 @@ int MonsterTypeFunctions::luaMonsterTypeCorpseId(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeManaCost(lua_State* L) { // get: monsterType:manaCost() set: monsterType:manaCost(mana) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.manaCost); @@ -1242,7 +1277,7 @@ int MonsterTypeFunctions::luaMonsterTypeManaCost(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBaseSpeed(lua_State* L) { // monsterType:baseSpeed() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->getBaseSpeed()); @@ -1257,7 +1292,7 @@ int MonsterTypeFunctions::luaMonsterTypeBaseSpeed(lua_State* L) { } int MonsterTypeFunctions::luaMonsterTypeLight(lua_State* L) { // get: monsterType:light() set: monsterType:light(color, level) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -1277,7 +1312,7 @@ int MonsterTypeFunctions::luaMonsterTypeLight(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeStaticAttackChance(lua_State* L) { // get: monsterType:staticAttackChance() set: monsterType:staticAttackChance(chance) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.staticAttackChance); @@ -1293,7 +1328,7 @@ int MonsterTypeFunctions::luaMonsterTypeStaticAttackChance(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeTargetDistance(lua_State* L) { // get: monsterType:targetDistance() set: monsterType:targetDistance(distance) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.targetDistance); @@ -1309,7 +1344,7 @@ int MonsterTypeFunctions::luaMonsterTypeTargetDistance(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeYellChance(lua_State* L) { // get: monsterType:yellChance() set: monsterType:yellChance(chance) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { if (lua_gettop(L) == 1) { @@ -1330,7 +1365,7 @@ int MonsterTypeFunctions::luaMonsterTypeYellChance(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeYellSpeedTicks(lua_State* L) { // get: monsterType:yellSpeedTicks() set: monsterType:yellSpeedTicks(rate) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.yellSpeedTicks); @@ -1346,7 +1381,7 @@ int MonsterTypeFunctions::luaMonsterTypeYellSpeedTicks(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeChangeTargetChance(lua_State* L) { // monsterType:getChangeTargetChance() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.changeTargetChance); @@ -1362,7 +1397,7 @@ int MonsterTypeFunctions::luaMonsterTypeChangeTargetChance(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeChangeTargetSpeed(lua_State* L) { // get: monsterType:changeTargetSpeed() set: monsterType:changeTargetSpeed(speed) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.changeTargetSpeed); @@ -1378,7 +1413,7 @@ int MonsterTypeFunctions::luaMonsterTypeChangeTargetSpeed(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanWalkOnEnergy(lua_State* L) { // get: monsterType:canWalkOnEnergy() set: monsterType:canWalkOnEnergy(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.canWalkOnEnergy); @@ -1394,7 +1429,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanWalkOnEnergy(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanWalkOnFire(lua_State* L) { // get: monsterType:canWalkOnFire() set: monsterType:canWalkOnFire(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.canWalkOnFire); @@ -1410,7 +1445,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanWalkOnFire(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeCanWalkOnPoison(lua_State* L) { // get: monsterType:canWalkOnPoison() set: monsterType:canWalkOnPoison(bool) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { pushBoolean(L, monsterType->info.canWalkOnPoison); @@ -1426,7 +1461,7 @@ int MonsterTypeFunctions::luaMonsterTypeCanWalkOnPoison(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetNearest(lua_State* L) { // monsterType:strategiesTargetNearest() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.strategiesTargetNearest); @@ -1442,7 +1477,7 @@ int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetNearest(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetHealth(lua_State* L) { // monsterType:strategiesTargetHealth() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.strategiesTargetHealth); @@ -1458,7 +1493,7 @@ int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetHealth(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetDamage(lua_State* L) { // monsterType:strategiesTargetDamage() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.strategiesTargetDamage); @@ -1474,7 +1509,7 @@ int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetDamage(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetRandom(lua_State* L) { // monsterType:strategiesTargetRandom() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.strategiesTargetRandom); @@ -1494,7 +1529,7 @@ int MonsterTypeFunctions::luaMonsterTypeStrategiesTargetRandom(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRespawnTypePeriod(lua_State* L) { // monsterType:respawnTypePeriod() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.respawnType.period); @@ -1510,7 +1545,7 @@ int MonsterTypeFunctions::luaMonsterTypeRespawnTypePeriod(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeRespawnTypeIsUnderground(lua_State* L) { // monsterType:respawnTypeIsUnderground() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (monsterType) { if (lua_gettop(L) == 1) { lua_pushnumber(L, monsterType->info.respawnType.underground); @@ -1527,7 +1562,7 @@ int MonsterTypeFunctions::luaMonsterTypeRespawnTypeIsUnderground(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBossRace(lua_State* L) { // set: monsterType:bosstiaryRace(raceId, class) // get: monsterType:bosstiaryRace() = this return only class name - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -1541,8 +1576,8 @@ int MonsterTypeFunctions::luaMonsterTypeBossRace(lua_State* L) { } pushString(L, monsterType->info.bosstiaryClass); } else { - auto bossRace = getNumber<uint8_t>(L, 2, 0); - auto bossClass = getString(L, 3); + const auto bossRace = getNumber<uint8_t>(L, 2, 0); + const auto bossClass = getString(L, 3); monsterType->info.bosstiaryRace = magic_enum::enum_value<BosstiaryRarity_t>(bossRace); monsterType->info.bosstiaryClass = bossClass; pushBoolean(L, true); @@ -1554,7 +1589,7 @@ int MonsterTypeFunctions::luaMonsterTypeBossRace(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeBossRaceId(lua_State* L) { // set: monsterType:bossRaceId(raceId) // get: monsterType:bossRaceId() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_MONSTER_TYPE_NOT_FOUND)); @@ -1568,9 +1603,9 @@ int MonsterTypeFunctions::luaMonsterTypeBossRaceId(lua_State* L) { lua_pushnumber(L, static_cast<lua_Number>(monsterType->info.bosstiaryRace)); } } else { - auto raceId = getNumber<uint16_t>(L, 2, 0); + const auto raceId = getNumber<uint16_t>(L, 2, 0); monsterType->info.raceid = raceId; - g_ioBosstiary().addBosstiaryMonster(raceId, monsterType->name); + g_ioBosstiary().addBosstiaryMonster(raceId, monsterType->typeName); pushBoolean(L, true); } @@ -1579,7 +1614,7 @@ int MonsterTypeFunctions::luaMonsterTypeBossRaceId(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeSoundChance(lua_State* L) { // get: monsterType:soundChance() set: monsterType:soundChance(chance) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1597,7 +1632,7 @@ int MonsterTypeFunctions::luaMonsterTypeSoundChance(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeSoundSpeedTicks(lua_State* L) { // get: monsterType:soundSpeedTicks() set: monsterType:soundSpeedTicks(ticks) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1615,7 +1650,7 @@ int MonsterTypeFunctions::luaMonsterTypeSoundSpeedTicks(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeAddSound(lua_State* L) { // monsterType:addSound(soundId) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1629,7 +1664,7 @@ int MonsterTypeFunctions::luaMonsterTypeAddSound(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeGetSounds(lua_State* L) { // monsterType:getSounds() - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { lua_pushnil(L); return 1; @@ -1648,7 +1683,7 @@ int MonsterTypeFunctions::luaMonsterTypeGetSounds(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypedeathSound(lua_State* L) { // get: monsterType:deathSound() set: monsterType:deathSound(sound) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -1667,7 +1702,7 @@ int MonsterTypeFunctions::luaMonsterTypedeathSound(lua_State* L) { int MonsterTypeFunctions::luaMonsterTypeVariant(lua_State* L) { // get: monsterType:variant() set: monsterType:variant(variantName) - const auto monsterType = getUserdataShared<MonsterType>(L, 1); + const auto &monsterType = getUserdataShared<MonsterType>(L, 1); if (!monsterType) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); diff --git a/src/lua/functions/creatures/monster/monster_type_functions.hpp b/src/lua/functions/creatures/monster/monster_type_functions.hpp index 9a72f53b1..a10f1619d 100644 --- a/src/lua/functions/creatures/monster/monster_type_functions.hpp +++ b/src/lua/functions/creatures/monster/monster_type_functions.hpp @@ -13,6 +13,12 @@ class MonsterTypeFunctions final : LuaScriptInterface { public: + explicit MonsterTypeFunctions(lua_State* L) : + LuaScriptInterface("MonsterTypeFunctions") { + init(L); + } + ~MonsterTypeFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "MonsterType", "", MonsterTypeFunctions::luaMonsterTypeCreate); registerMetaMethod(L, "MonsterType", "__eq", MonsterTypeFunctions::luaUserdataCompare); @@ -20,6 +26,8 @@ class MonsterTypeFunctions final : LuaScriptInterface { registerMethod(L, "MonsterType", "isAttackable", MonsterTypeFunctions::luaMonsterTypeIsAttackable); registerMethod(L, "MonsterType", "isConvinceable", MonsterTypeFunctions::luaMonsterTypeIsConvinceable); registerMethod(L, "MonsterType", "isSummonable", MonsterTypeFunctions::luaMonsterTypeIsSummonable); + registerMethod(L, "MonsterType", "isPreyable", MonsterTypeFunctions::luaMonsterTypeIsPreyable); + registerMethod(L, "MonsterType", "isPreyExclusive", MonsterTypeFunctions::luaMonsterTypeIsPreyExclusive); registerMethod(L, "MonsterType", "isIllusionable", MonsterTypeFunctions::luaMonsterTypeIsIllusionable); registerMethod(L, "MonsterType", "isHostile", MonsterTypeFunctions::luaMonsterTypeIsHostile); registerMethod(L, "MonsterType", "isPushable", MonsterTypeFunctions::luaMonsterTypeIsPushable); @@ -96,6 +104,8 @@ class MonsterTypeFunctions final : LuaScriptInterface { registerMethod(L, "MonsterType", "onDisappear", MonsterTypeFunctions::luaMonsterTypeEventOnCallback); registerMethod(L, "MonsterType", "onMove", MonsterTypeFunctions::luaMonsterTypeEventOnCallback); registerMethod(L, "MonsterType", "onSay", MonsterTypeFunctions::luaMonsterTypeEventOnCallback); + registerMethod(L, "MonsterType", "onPlayerAttack", MonsterTypeFunctions::luaMonsterTypeEventOnCallback); + registerMethod(L, "MonsterType", "onSpawn", MonsterTypeFunctions::luaMonsterTypeEventOnCallback); registerMethod(L, "MonsterType", "getSummonList", MonsterTypeFunctions::luaMonsterTypeGetSummonList); registerMethod(L, "MonsterType", "addSummon", MonsterTypeFunctions::luaMonsterTypeAddSummon); @@ -151,6 +161,8 @@ class MonsterTypeFunctions final : LuaScriptInterface { static int luaMonsterTypeIsAttackable(lua_State* L); static int luaMonsterTypeIsConvinceable(lua_State* L); static int luaMonsterTypeIsSummonable(lua_State* L); + static int luaMonsterTypeIsPreyable(lua_State* L); + static int luaMonsterTypeIsPreyExclusive(lua_State* L); static int luaMonsterTypeIsIllusionable(lua_State* L); static int luaMonsterTypeIsHostile(lua_State* L); static int luaMonsterTypeIsPushable(lua_State* L); diff --git a/src/lua/functions/creatures/npc/npc_functions.cpp b/src/lua/functions/creatures/npc/npc_functions.cpp index 13e9b499a..f3f5a204b 100644 --- a/src/lua/functions/creatures/npc/npc_functions.cpp +++ b/src/lua/functions/creatures/npc/npc_functions.cpp @@ -7,12 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/npc/npc_functions.hpp" -#include "game/game.hpp" #include "creatures/creature.hpp" #include "creatures/npcs/npc.hpp" -#include "lua/functions/creatures/npc/npc_functions.hpp" +#include "creatures/players/player.hpp" +#include "game/game.hpp" #include "map/spectators.hpp" int NpcFunctions::luaNpcCreate(lua_State* L) { @@ -53,7 +53,7 @@ int NpcFunctions::luaNpcIsNpc(lua_State* L) { int NpcFunctions::luaNpcSetMasterPos(lua_State* L) { // npc:setMasterPos(pos) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); @@ -68,7 +68,7 @@ int NpcFunctions::luaNpcSetMasterPos(lua_State* L) { int NpcFunctions::luaNpcGetCurrency(lua_State* L) { // npc:getCurrency() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -80,7 +80,7 @@ int NpcFunctions::luaNpcGetCurrency(lua_State* L) { int NpcFunctions::luaNpcSetCurrency(lua_State* L) { // npc:getCurrency() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); @@ -93,7 +93,7 @@ int NpcFunctions::luaNpcSetCurrency(lua_State* L) { int NpcFunctions::luaNpcGetSpeechBubble(lua_State* L) { // npc:getSpeechBubble() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -105,7 +105,7 @@ int NpcFunctions::luaNpcGetSpeechBubble(lua_State* L) { int NpcFunctions::luaNpcSetSpeechBubble(lua_State* L) { // npc:setSpeechBubble(speechBubble) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -117,7 +117,7 @@ int NpcFunctions::luaNpcSetSpeechBubble(lua_State* L) { int NpcFunctions::luaNpcGetName(lua_State* L) { // npc:getName() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -130,7 +130,7 @@ int NpcFunctions::luaNpcGetName(lua_State* L) { int NpcFunctions::luaNpcSetName(lua_State* L) { // npc:setName(name) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); const std::string &name = getString(L, 2); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -143,7 +143,7 @@ int NpcFunctions::luaNpcSetName(lua_State* L) { int NpcFunctions::luaNpcPlace(lua_State* L) { // npc:place(position[, extended = false[, force = true]]) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -151,8 +151,8 @@ int NpcFunctions::luaNpcPlace(lua_State* L) { } const Position &position = getPosition(L, 2); - bool extended = getBoolean(L, 3, false); - bool force = getBoolean(L, 4, true); + const bool extended = getBoolean(L, 3, false); + const bool force = getBoolean(L, 4, true); if (g_game().placeCreature(npc, position, extended, force)) { pushUserdata<Npc>(L, npc); setMetatable(L, -1, "Npc"); @@ -164,7 +164,7 @@ int NpcFunctions::luaNpcPlace(lua_State* L) { int NpcFunctions::luaNpcSay(lua_State* L) { // npc:say(text[, type = TALKTYPE_PRIVATE_NP[, ghost = false[, target = nullptr[, position]]]]) - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); Position position; if (parameters >= 6) { @@ -181,11 +181,11 @@ int NpcFunctions::luaNpcSay(lua_State* L) { target = getCreature(L, 5); } - bool ghost = getBoolean(L, 4, false); + const bool ghost = getBoolean(L, 4, false); - SpeakClasses type = getNumber<SpeakClasses>(L, 3, TALKTYPE_PRIVATE_NP); + const auto &type = getNumber<SpeakClasses>(L, 3, TALKTYPE_PRIVATE_NP); const std::string &text = getString(L, 2); - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { lua_pushnil(L); return 1; @@ -210,8 +210,8 @@ int NpcFunctions::luaNpcSay(lua_State* L) { */ int NpcFunctions::luaNpcTurnToCreature(lua_State* L) { // npc:turnToCreature(creature, true) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &npc = getUserdataShared<Npc>(L, 1); + const auto &creature = getCreature(L, 2); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -225,7 +225,7 @@ int NpcFunctions::luaNpcTurnToCreature(lua_State* L) { return 1; } - bool stopEventWalk = getBoolean(L, 3, true); + const bool stopEventWalk = getBoolean(L, 3, true); if (stopEventWalk) { npc->stopEventWalk(); } @@ -236,9 +236,9 @@ int NpcFunctions::luaNpcTurnToCreature(lua_State* L) { int NpcFunctions::luaNpcSetPlayerInteraction(lua_State* L) { // npc:setPlayerInteraction(creature, topic = 0) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); - std::shared_ptr<Creature> creature = getCreature(L, 2); - uint16_t topicId = getNumber<uint16_t>(L, 3, 0); + const auto &npc = getUserdataShared<Npc>(L, 1); + const auto &creature = getCreature(L, 2); + const auto topicId = getNumber<uint16_t>(L, 3, 0); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -259,8 +259,8 @@ int NpcFunctions::luaNpcSetPlayerInteraction(lua_State* L) { int NpcFunctions::luaNpcRemovePlayerInteraction(lua_State* L) { // npc:removePlayerInteraction() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &npc = getUserdataShared<Npc>(L, 1); + const auto &creature = getCreature(L, 2); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -281,8 +281,8 @@ int NpcFunctions::luaNpcRemovePlayerInteraction(lua_State* L) { int NpcFunctions::luaNpcIsInteractingWithPlayer(lua_State* L) { // npc:isInteractingWithPlayer(creature) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &npc = getUserdataShared<Npc>(L, 1); + const auto &creature = getCreature(L, 2); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -302,9 +302,9 @@ int NpcFunctions::luaNpcIsInteractingWithPlayer(lua_State* L) { int NpcFunctions::luaNpcIsPlayerInteractingOnTopic(lua_State* L) { // npc:isPlayerInteractingOnTopic(creature, topicId = 0) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); - std::shared_ptr<Creature> creature = getCreature(L, 2); - uint32_t topicId = getNumber<uint32_t>(L, 3, 0); + const auto &npc = getUserdataShared<Npc>(L, 1); + const auto &creature = getCreature(L, 2); + const auto topicId = getNumber<uint32_t>(L, 3, 0); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -324,9 +324,9 @@ int NpcFunctions::luaNpcIsPlayerInteractingOnTopic(lua_State* L) { int NpcFunctions::luaNpcIsInTalkRange(lua_State* L) { // npc:isInTalkRange(position[, range = 4]) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); const Position &position = getPosition(L, 2); - uint32_t range = getNumber<uint32_t>(L, 3, 4); + const auto range = getNumber<uint32_t>(L, 3, 4); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); @@ -340,7 +340,7 @@ int NpcFunctions::luaNpcIsInTalkRange(lua_State* L) { int NpcFunctions::luaNpcOpenShopWindow(lua_State* L) { // npc:openShopWindow(player) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); @@ -354,6 +354,7 @@ int NpcFunctions::luaNpcOpenShopWindow(lua_State* L) { return 1; } + player->closeShopWindow(); pushBoolean(L, player->openShopWindow(npc)); return 1; } @@ -404,6 +405,7 @@ int NpcFunctions::luaNpcOpenShopWindowTable(lua_State* L) { } lua_pop(L, 3); + player->closeShopWindow(); pushBoolean(L, player->openShopWindow(npc, items)); return 1; } @@ -417,7 +419,7 @@ int NpcFunctions::luaNpcCloseShopWindow(lua_State* L) { return 1; } - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); @@ -434,14 +436,14 @@ int NpcFunctions::luaNpcCloseShopWindow(lua_State* L) { int NpcFunctions::luaNpcIsMerchant(lua_State* L) { // npc:isMerchant() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto playerGUID = getNumber<uint32_t>(L, 2, 0); + const auto playerGUID = getNumber<uint32_t>(L, 2, 0); const auto &shopItems = npc->getShopItemVector(playerGUID); if (shopItems.empty()) { pushBoolean(L, false); @@ -454,16 +456,16 @@ int NpcFunctions::luaNpcIsMerchant(lua_State* L) { int NpcFunctions::luaNpcGetShopItem(lua_State* L) { // npc:getShopItem(itemId) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_CREATURE_NOT_FOUND)); pushBoolean(L, false); return 1; } - auto playerGUID = getNumber<uint32_t>(L, 2, 0); + const auto playerGUID = getNumber<uint32_t>(L, 2, 0); const auto &shopItems = npc->getShopItemVector(playerGUID); - for (ShopBlock shopBlock : shopItems) { + for (const ShopBlock &shopBlock : shopItems) { setField(L, "id", shopBlock.itemId); setField(L, "name", shopBlock.itemName); setField(L, "subType", shopBlock.itemSubType); @@ -479,7 +481,7 @@ int NpcFunctions::luaNpcGetShopItem(lua_State* L) { int NpcFunctions::luaNpcMove(lua_State* L) { // npc:move(direction) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (npc) { g_game().internalMoveCreature(npc, getNumber<Direction>(L, 2)); } @@ -488,7 +490,7 @@ int NpcFunctions::luaNpcMove(lua_State* L) { int NpcFunctions::luaNpcTurn(lua_State* L) { // npc:turn(direction) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (npc) { g_game().internalCreatureTurn(npc, getNumber<Direction>(L, 2)); } @@ -497,7 +499,7 @@ int NpcFunctions::luaNpcTurn(lua_State* L) { int NpcFunctions::luaNpcFollow(lua_State* L) { // npc:follow(player) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { pushBoolean(L, false); return 1; @@ -515,7 +517,7 @@ int NpcFunctions::luaNpcFollow(lua_State* L) { int NpcFunctions::luaNpcGetId(lua_State* L) { // npc:getId() - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); lua_pushnil(L); @@ -528,7 +530,7 @@ int NpcFunctions::luaNpcGetId(lua_State* L) { int NpcFunctions::luaNpcSellItem(lua_State* L) { // npc:sellItem(player, itemid, amount, <optional: default: 1> subtype, <optional: default: 0> actionid, <optional: default: false> ignoreCap, <optional: default: false> inBackpacks) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); @@ -542,12 +544,12 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { return 1; } - uint16_t itemId = getNumber<uint16_t>(L, 3); - double amount = getNumber<double>(L, 4); - uint16_t subType = getNumber<uint16_t>(L, 5, 1); - uint16_t actionId = getNumber<uint16_t>(L, 6, 0); - bool ignoreCap = getBoolean(L, 7, false); - bool inBackpacks = getBoolean(L, 8, false); + auto itemId = getNumber<uint16_t>(L, 3); + const double amount = getNumber<double>(L, 4); + const auto subType = getNumber<uint16_t>(L, 5, 1); + const auto actionId = getNumber<uint16_t>(L, 6, 0); + const bool ignoreCap = getBoolean(L, 7, false); + const bool inBackpacks = getBoolean(L, 8, false); const ItemType &it = Item::items[itemId]; if (it.id == 0) { @@ -555,9 +557,9 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { return 1; } - uint32_t shoppingBagPrice = 20; - double shoppingBagSlots = 20; - if (std::shared_ptr<Tile> tile = ignoreCap ? player->getTile() : nullptr; tile) { + constexpr uint32_t shoppingBagPrice = 20; + constexpr double shoppingBagSlots = 20; + if (const auto &tile = ignoreCap ? player->getTile() : nullptr; tile) { double slotsNedeed = 0; if (it.stackable) { slotsNedeed = inBackpacks ? std::ceil(std::ceil(amount / it.stackSize) / shoppingBagSlots) : std::ceil(amount / it.stackSize); @@ -574,7 +576,7 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { uint64_t pricePerUnit = 0; const auto &shopVector = npc->getShopItemVector(player->getGUID()); - for (ShopBlock shopBlock : shopVector) { + for (const ShopBlock &shopBlock : shopVector) { if (itemId == shopBlock.itemId && shopBlock.itemBuyPrice != 0) { pricePerUnit = shopBlock.itemBuyPrice; break; @@ -584,8 +586,8 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { const auto &[_, itemsPurchased, backpacksPurchased] = g_game().createItem(player, itemId, amount, subType, actionId, ignoreCap, inBackpacks ? ITEM_SHOPPING_BAG : 0); std::stringstream ss; - uint64_t itemCost = itemsPurchased * pricePerUnit; - uint64_t backpackCost = backpacksPurchased * shoppingBagPrice; + const uint64_t itemCost = itemsPurchased * pricePerUnit; + const uint64_t backpackCost = backpacksPurchased * shoppingBagPrice; if (npc->getCurrency() == ITEM_GOLD_COIN) { if (!g_game().removeMoney(player, itemCost + backpackCost, 0, true)) { g_logger().error("[NpcFunctions::luaNpcSellItem (removeMoney)] - Player {} have a problem for buy item {} on shop for npc {}", player->getName(), itemId, npc->getName()); @@ -646,14 +648,14 @@ int NpcFunctions::luaNpcSellItem(lua_State* L) { int NpcFunctions::luaNpcGetDistanceTo(lua_State* L) { // npc:getDistanceTo(uid) - std::shared_ptr<Npc> npc = getUserdataShared<Npc>(L, 1); + const auto &npc = getUserdataShared<Npc>(L, 1); if (!npc) { reportErrorFunc(getErrorDesc(LUA_ERROR_NPC_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Thing> thing = getScriptEnv()->getThingByUID(getNumber<uint32_t>(L, -1)); + const auto &thing = getScriptEnv()->getThingByUID(getNumber<uint32_t>(L, -1)); pushBoolean(L, thing && thing->isPushable()); if (!thing) { reportErrorFunc(getErrorDesc(LUA_ERROR_THING_NOT_FOUND)); @@ -666,7 +668,7 @@ int NpcFunctions::luaNpcGetDistanceTo(lua_State* L) { if (npcPos.z != thingPos.z) { lua_pushnumber(L, -1); } else { - int32_t dist = std::max<int32_t>(Position::getDistanceX(npcPos, thingPos), Position::getDistanceY(npcPos, thingPos)); + const int32_t dist = std::max<int32_t>(Position::getDistanceX(npcPos, thingPos), Position::getDistanceY(npcPos, thingPos)); lua_pushnumber(L, dist); } return 1; diff --git a/src/lua/functions/creatures/npc/npc_functions.hpp b/src/lua/functions/creatures/npc/npc_functions.hpp index 1622a15c0..e03e3f72b 100644 --- a/src/lua/functions/creatures/npc/npc_functions.hpp +++ b/src/lua/functions/creatures/npc/npc_functions.hpp @@ -15,6 +15,12 @@ class NpcFunctions final : LuaScriptInterface { private: + explicit NpcFunctions(lua_State* L) : + LuaScriptInterface("NpcFunctions") { + init(L); + } + ~NpcFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Npc", "Creature", NpcFunctions::luaNpcCreate); registerMetaMethod(L, "Npc", "__eq", NpcFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/npc/npc_type_functions.cpp b/src/lua/functions/creatures/npc/npc_type_functions.cpp index ef79b671a..936059131 100644 --- a/src/lua/functions/creatures/npc/npc_type_functions.cpp +++ b/src/lua/functions/creatures/npc/npc_type_functions.cpp @@ -7,12 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/npc/npc_type_functions.hpp" +#include "config/configmanager.hpp" #include "creatures/npcs/npcs.hpp" -#include "lua/functions/creatures/npc/npc_type_functions.hpp" -#include "lua/scripts/scripts.hpp" #include "game/game.hpp" +#include "lua/scripts/scripts.hpp" void NpcTypeFunctions::createNpcTypeShopLuaTable(lua_State* L, const std::vector<ShopBlock> &shopVector) { lua_createtable(L, shopVector.size(), 0); @@ -191,7 +191,7 @@ int NpcTypeFunctions::luaNpcTypeAddShopItem(lua_State* L) { return 1; } - auto shop = getUserdataShared<Shop>(L, 2); + const auto &shop = getUserdataShared<Shop>(L, 2); if (shop) { npcType->loadShop(npcType, shop->shopBlock); pushBoolean(L, true); @@ -308,7 +308,7 @@ int NpcTypeFunctions::luaNpcTypeOutfit(lua_State* L) { pushOutfit(L, npcType->info.outfit); } else { Outfit_t outfit = getOutfit(L, 2); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && outfit.lookType != 0 && !g_game().isLookTypeRegistered(outfit.lookType)) { g_logger().warn("[NpcTypeFunctions::luaNpcTypeOutfit] An unregistered creature looktype type with id '{}' was blocked to prevent client crash.", outfit.lookType); lua_pushnil(L); } else { diff --git a/src/lua/functions/creatures/npc/npc_type_functions.hpp b/src/lua/functions/creatures/npc/npc_type_functions.hpp index ce799c71f..ee54f1249 100644 --- a/src/lua/functions/creatures/npc/npc_type_functions.hpp +++ b/src/lua/functions/creatures/npc/npc_type_functions.hpp @@ -13,6 +13,12 @@ class NpcTypeFunctions final : LuaScriptInterface { public: + explicit NpcTypeFunctions(lua_State* L) : + LuaScriptInterface("NpcTypeFunctions") { + init(L); + } + ~NpcTypeFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "NpcType", "", NpcTypeFunctions::luaNpcTypeCreate); registerMetaMethod(L, "NpcType", "__eq", NpcTypeFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/npc/shop_functions.cpp b/src/lua/functions/creatures/npc/shop_functions.cpp index 122e249a8..7ba7f89d4 100644 --- a/src/lua/functions/creatures/npc/shop_functions.cpp +++ b/src/lua/functions/creatures/npc/shop_functions.cpp @@ -7,10 +7,12 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/npc/shop_functions.hpp" #include "creatures/npcs/npcs.hpp" -#include "lua/functions/creatures/npc/shop_functions.hpp" + +#include "items/item.hpp" +#include "utils/tools.hpp" int ShopFunctions::luaCreateShop(lua_State* L) { // Shop() will create a new shop item @@ -42,7 +44,7 @@ int ShopFunctions::luaShopSetIdFromName(lua_State* L) { const auto &shop = getUserdataShared<Shop>(L, 1); if (shop && isString(L, 2)) { auto name = getString(L, 2); - auto ids = Item::items.nameToItems.equal_range(asLowerCaseString(name)); + const auto ids = Item::items.nameToItems.equal_range(asLowerCaseString(name)); if (ids.first == Item::items.nameToItems.cend()) { g_logger().warn("[ShopFunctions::luaShopSetIdFromName] - " diff --git a/src/lua/functions/creatures/npc/shop_functions.hpp b/src/lua/functions/creatures/npc/shop_functions.hpp index e5a6c9943..2d326ff73 100644 --- a/src/lua/functions/creatures/npc/shop_functions.hpp +++ b/src/lua/functions/creatures/npc/shop_functions.hpp @@ -13,6 +13,12 @@ class ShopFunctions final : LuaScriptInterface { public: + explicit ShopFunctions(lua_State* L) : + LuaScriptInterface("ShopFunctions") { + init(L); + } + ~ShopFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Shop", "", ShopFunctions::luaCreateShop); registerMethod(L, "Shop", "setId", ShopFunctions::luaShopSetId); diff --git a/src/lua/functions/creatures/player/group_functions.cpp b/src/lua/functions/creatures/player/group_functions.cpp index f547eec15..66003a649 100644 --- a/src/lua/functions/creatures/player/group_functions.cpp +++ b/src/lua/functions/creatures/player/group_functions.cpp @@ -7,15 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/group_functions.hpp" #include "creatures/players/grouping/groups.hpp" #include "game/game.hpp" -#include "lua/functions/creatures/player/group_functions.hpp" int GroupFunctions::luaGroupCreate(lua_State* L) { // Group(id) - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); const auto &group = g_game().groups.getGroup(id); if (group) { @@ -103,7 +102,7 @@ int GroupFunctions::luaGroupHasFlag(lua_State* L) { // group:hasFlag(flag) const auto &group = getUserdataShared<Group>(L, 1); if (group) { - auto flag = static_cast<PlayerFlags_t>(getNumber<int>(L, 2)); + const auto flag = static_cast<PlayerFlags_t>(getNumber<int>(L, 2)); pushBoolean(L, group->flags[Groups::getFlagNumber(flag)]); } else { lua_pushnil(L); diff --git a/src/lua/functions/creatures/player/group_functions.hpp b/src/lua/functions/creatures/player/group_functions.hpp index 4a33d1b98..7729690b7 100644 --- a/src/lua/functions/creatures/player/group_functions.hpp +++ b/src/lua/functions/creatures/player/group_functions.hpp @@ -13,6 +13,12 @@ class GroupFunctions final : LuaScriptInterface { public: + explicit GroupFunctions(lua_State* L) : + LuaScriptInterface("GroupFunctions") { + init(L); + } + ~GroupFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Group", "", GroupFunctions::luaGroupCreate); registerMetaMethod(L, "Group", "__eq", GroupFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/player/guild_functions.cpp b/src/lua/functions/creatures/player/guild_functions.cpp index 196f0f9d3..808a5725e 100644 --- a/src/lua/functions/creatures/player/guild_functions.cpp +++ b/src/lua/functions/creatures/player/guild_functions.cpp @@ -7,15 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/guild_functions.hpp" #include "game/game.hpp" #include "creatures/players/grouping/guild.hpp" -#include "lua/functions/creatures/player/guild_functions.hpp" int GuildFunctions::luaGuildCreate(lua_State* L) { - uint32_t id = getNumber<uint32_t>(L, 2); - const auto guild = g_game().getGuild(id); + const uint32_t id = getNumber<uint32_t>(L, 2); + const auto &guild = g_game().getGuild(id); if (guild) { pushUserdata<Guild>(L, guild); setMetatable(L, -1, "Guild"); @@ -26,7 +25,7 @@ int GuildFunctions::luaGuildCreate(lua_State* L) { } int GuildFunctions::luaGuildGetId(lua_State* L) { - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (guild) { lua_pushnumber(L, guild->getId()); } else { @@ -37,7 +36,7 @@ int GuildFunctions::luaGuildGetId(lua_State* L) { int GuildFunctions::luaGuildGetName(lua_State* L) { // guild:getName() - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; @@ -48,7 +47,7 @@ int GuildFunctions::luaGuildGetName(lua_State* L) { int GuildFunctions::luaGuildGetMembersOnline(lua_State* L) { // guild:getMembersOnline() - const auto guild = getUserdataShared<const Guild>(L, 1); + const auto &guild = getUserdataShared<const Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; @@ -58,7 +57,7 @@ int GuildFunctions::luaGuildGetMembersOnline(lua_State* L) { lua_createtable(L, members.size(), 0); int index = 0; - for (std::shared_ptr<Player> player : members) { + for (const auto &player : members) { pushUserdata<Player>(L, player); setMetatable(L, -1, "Player"); lua_rawseti(L, -2, ++index); @@ -68,7 +67,7 @@ int GuildFunctions::luaGuildGetMembersOnline(lua_State* L) { int GuildFunctions::luaGuildGetBankBalance(lua_State* L) { // guild:getBankBalance() - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; @@ -79,7 +78,7 @@ int GuildFunctions::luaGuildGetBankBalance(lua_State* L) { int GuildFunctions::luaGuildSetBankBalance(lua_State* L) { // guild:setBankBalance(bankBalance) - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; @@ -92,14 +91,14 @@ int GuildFunctions::luaGuildSetBankBalance(lua_State* L) { int GuildFunctions::luaGuildAddRank(lua_State* L) { // guild:addRank(id, name, level) - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; } - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); const std::string &name = getString(L, 3); - uint8_t level = getNumber<uint8_t>(L, 4); + const uint8_t level = getNumber<uint8_t>(L, 4); guild->addRank(id, name, level); pushBoolean(L, true); return 1; @@ -107,14 +106,14 @@ int GuildFunctions::luaGuildAddRank(lua_State* L) { int GuildFunctions::luaGuildGetRankById(lua_State* L) { // guild:getRankById(id) - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; } - uint32_t id = getNumber<uint32_t>(L, 2); - GuildRank_ptr rank = guild->getRankById(id); + const uint32_t id = getNumber<uint32_t>(L, 2); + const GuildRank_ptr rank = guild->getRankById(id); if (rank) { lua_createtable(L, 0, 3); setField(L, "id", rank->id); @@ -128,14 +127,14 @@ int GuildFunctions::luaGuildGetRankById(lua_State* L) { int GuildFunctions::luaGuildGetRankByLevel(lua_State* L) { // guild:getRankByLevel(level) - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; } - uint8_t level = getNumber<uint8_t>(L, 2); - GuildRank_ptr rank = guild->getRankByLevel(level); + const uint8_t level = getNumber<uint8_t>(L, 2); + const GuildRank_ptr rank = guild->getRankByLevel(level); if (rank) { lua_createtable(L, 0, 3); setField(L, "id", rank->id); @@ -149,7 +148,7 @@ int GuildFunctions::luaGuildGetRankByLevel(lua_State* L) { int GuildFunctions::luaGuildGetMotd(lua_State* L) { // guild:getMotd() - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; @@ -160,7 +159,7 @@ int GuildFunctions::luaGuildGetMotd(lua_State* L) { int GuildFunctions::luaGuildSetMotd(lua_State* L) { // guild:setMotd(motd) - const auto guild = getUserdataShared<Guild>(L, 1); + const auto &guild = getUserdataShared<Guild>(L, 1); if (!guild) { lua_pushnil(L); return 1; diff --git a/src/lua/functions/creatures/player/guild_functions.hpp b/src/lua/functions/creatures/player/guild_functions.hpp index e5c482444..d8f844de7 100644 --- a/src/lua/functions/creatures/player/guild_functions.hpp +++ b/src/lua/functions/creatures/player/guild_functions.hpp @@ -13,6 +13,12 @@ class GuildFunctions final : LuaScriptInterface { public: + explicit GuildFunctions(lua_State* L) : + LuaScriptInterface("GuildFunctions") { + init(L); + } + ~GuildFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Guild", "", GuildFunctions::luaGuildCreate); registerMetaMethod(L, "Guild", "__eq", GuildFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/player/mount_functions.cpp b/src/lua/functions/creatures/player/mount_functions.cpp index 49b16db6c..7822e4f8e 100644 --- a/src/lua/functions/creatures/player/mount_functions.cpp +++ b/src/lua/functions/creatures/player/mount_functions.cpp @@ -7,20 +7,19 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/mount_functions.hpp" #include "creatures/appearance/mounts/mounts.hpp" #include "game/game.hpp" -#include "lua/functions/creatures/player/mount_functions.hpp" int MountFunctions::luaCreateMount(lua_State* L) { // Mount(id or name) std::shared_ptr<Mount> mount; if (isNumber(L, 2)) { - mount = g_game().mounts.getMountByID(getNumber<uint8_t>(L, 2)); + mount = g_game().mounts->getMountByID(getNumber<uint8_t>(L, 2)); } else if (isString(L, 2)) { std::string mountName = getString(L, 2); - mount = g_game().mounts.getMountByName(mountName); + mount = g_game().mounts->getMountByName(mountName); } else { mount = nullptr; } @@ -37,7 +36,7 @@ int MountFunctions::luaCreateMount(lua_State* L) { int MountFunctions::luaMountGetName(lua_State* L) { // mount:getName() - const std::shared_ptr<Mount> mount = getUserdataShared<Mount>(L, 1); + const auto &mount = getUserdataShared<Mount>(L, 1); if (mount) { pushString(L, mount->name); } else { @@ -49,7 +48,7 @@ int MountFunctions::luaMountGetName(lua_State* L) { int MountFunctions::luaMountGetId(lua_State* L) { // mount:getId() - const std::shared_ptr<Mount> mount = getUserdataShared<Mount>(L, 1); + const auto &mount = getUserdataShared<Mount>(L, 1); if (mount) { lua_pushnumber(L, mount->id); } else { @@ -61,7 +60,7 @@ int MountFunctions::luaMountGetId(lua_State* L) { int MountFunctions::luaMountGetClientId(lua_State* L) { // mount:getClientId() - const std::shared_ptr<Mount> mount = getUserdataShared<Mount>(L, 1); + const auto &mount = getUserdataShared<Mount>(L, 1); if (mount) { lua_pushnumber(L, mount->clientId); } else { @@ -73,7 +72,7 @@ int MountFunctions::luaMountGetClientId(lua_State* L) { int MountFunctions::luaMountGetSpeed(lua_State* L) { // mount:getSpeed() - const std::shared_ptr<Mount> mount = getUserdataShared<Mount>(L, 1); + const auto &mount = getUserdataShared<Mount>(L, 1); if (mount) { lua_pushnumber(L, mount->speed); } else { diff --git a/src/lua/functions/creatures/player/mount_functions.hpp b/src/lua/functions/creatures/player/mount_functions.hpp index 3a4db6d6f..a6ce7003e 100644 --- a/src/lua/functions/creatures/player/mount_functions.hpp +++ b/src/lua/functions/creatures/player/mount_functions.hpp @@ -13,6 +13,12 @@ class MountFunctions final : LuaScriptInterface { public: + explicit MountFunctions(lua_State* L) : + LuaScriptInterface("MountFunctions") { + init(L); + } + ~MountFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Mount", "", MountFunctions::luaCreateMount); registerMetaMethod(L, "Mount", "__eq", MountFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/player/party_functions.cpp b/src/lua/functions/creatures/player/party_functions.cpp index d739cde3c..2c420c3ec 100644 --- a/src/lua/functions/creatures/player/party_functions.cpp +++ b/src/lua/functions/creatures/player/party_functions.cpp @@ -7,22 +7,21 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/party_functions.hpp" #include "creatures/players/grouping/party.hpp" #include "creatures/players/player.hpp" #include "game/game.hpp" -#include "lua/functions/creatures/player/party_functions.hpp" int32_t PartyFunctions::luaPartyCreate(lua_State* L) { // Party(userdata) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 2); + const auto &player = getUserdataShared<Player>(L, 2); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Party> party = player->getParty(); + auto party = player->getParty(); if (!party) { party = Party::create(player); g_game().updatePlayerShield(player); @@ -37,7 +36,7 @@ int32_t PartyFunctions::luaPartyCreate(lua_State* L) { int PartyFunctions::luaPartyDisband(lua_State* L) { // party:disband() - std::shared_ptr<Party>* partyPtr = getRawUserDataShared<Party>(L, 1); + auto* partyPtr = getRawUserDataShared<Party>(L, 1); if (partyPtr && *partyPtr) { std::shared_ptr<Party> &party = *partyPtr; party->disband(); @@ -51,13 +50,13 @@ int PartyFunctions::luaPartyDisband(lua_State* L) { int PartyFunctions::luaPartyGetLeader(lua_State* L) { // party:getLeader() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (!party) { lua_pushnil(L); return 1; } - std::shared_ptr<Player> leader = party->getLeader(); + const auto &leader = party->getLeader(); if (leader) { pushUserdata<Player>(L, leader); setMetatable(L, -1, "Player"); @@ -75,7 +74,7 @@ int PartyFunctions::luaPartySetLeader(lua_State* L) { return 1; } - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { pushBoolean(L, party->passPartyLeadership(player)); } else { @@ -86,7 +85,7 @@ int PartyFunctions::luaPartySetLeader(lua_State* L) { int PartyFunctions::luaPartyGetMembers(lua_State* L) { // party:getMembers() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (!party) { lua_pushnil(L); return 1; @@ -94,7 +93,7 @@ int PartyFunctions::luaPartyGetMembers(lua_State* L) { int index = 0; lua_createtable(L, party->getMemberCount(), 0); - for (std::shared_ptr<Player> player : party->getMembers()) { + for (const auto &player : party->getMembers()) { pushUserdata<Player>(L, player); setMetatable(L, -1, "Player"); lua_rawseti(L, -2, ++index); @@ -104,7 +103,7 @@ int PartyFunctions::luaPartyGetMembers(lua_State* L) { int PartyFunctions::luaPartyGetMemberCount(lua_State* L) { // party:getMemberCount() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { lua_pushnumber(L, party->getMemberCount()); } else { @@ -115,12 +114,12 @@ int PartyFunctions::luaPartyGetMemberCount(lua_State* L) { int PartyFunctions::luaPartyGetInvitees(lua_State* L) { // party:getInvitees() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { lua_createtable(L, party->getInvitationCount(), 0); int index = 0; - for (std::shared_ptr<Player> player : party->getInvitees()) { + for (const auto &player : party->getInvitees()) { pushUserdata<Player>(L, player); setMetatable(L, -1, "Player"); lua_rawseti(L, -2, ++index); @@ -133,7 +132,7 @@ int PartyFunctions::luaPartyGetInvitees(lua_State* L) { int PartyFunctions::luaPartyGetInviteeCount(lua_State* L) { // party:getInviteeCount() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { lua_pushnumber(L, party->getInvitationCount()); } else { @@ -150,7 +149,7 @@ int PartyFunctions::luaPartyAddInvite(lua_State* L) { return 1; } - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party && player) { pushBoolean(L, party->invitePlayer(player)); } else { @@ -167,7 +166,7 @@ int PartyFunctions::luaPartyRemoveInvite(lua_State* L) { return 1; } - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party && player) { pushBoolean(L, party->removeInvite(player)); } else { @@ -184,7 +183,7 @@ int PartyFunctions::luaPartyAddMember(lua_State* L) { return 1; } - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party && player) { pushBoolean(L, party->joinParty(player)); } else { @@ -201,7 +200,7 @@ int PartyFunctions::luaPartyRemoveMember(lua_State* L) { return 1; } - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party && player) { pushBoolean(L, party->leaveParty(player)); } else { @@ -212,7 +211,7 @@ int PartyFunctions::luaPartyRemoveMember(lua_State* L) { int PartyFunctions::luaPartyIsSharedExperienceActive(lua_State* L) { // party:isSharedExperienceActive() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { pushBoolean(L, party->isSharedExperienceActive()); } else { @@ -223,7 +222,7 @@ int PartyFunctions::luaPartyIsSharedExperienceActive(lua_State* L) { int PartyFunctions::luaPartyIsSharedExperienceEnabled(lua_State* L) { // party:isSharedExperienceEnabled() - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { pushBoolean(L, party->isSharedExperienceEnabled()); } else { @@ -234,8 +233,8 @@ int PartyFunctions::luaPartyIsSharedExperienceEnabled(lua_State* L) { int PartyFunctions::luaPartyShareExperience(lua_State* L) { // party:shareExperience(experience) - uint64_t experience = getNumber<uint64_t>(L, 2); - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const uint64_t experience = getNumber<uint64_t>(L, 2); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { party->shareExperience(experience); pushBoolean(L, true); @@ -247,8 +246,8 @@ int PartyFunctions::luaPartyShareExperience(lua_State* L) { int PartyFunctions::luaPartySetSharedExperience(lua_State* L) { // party:setSharedExperience(active) - bool active = getBoolean(L, 2); - std::shared_ptr<Party> party = getUserdataShared<Party>(L, 1); + const bool active = getBoolean(L, 2); + const auto &party = getUserdataShared<Party>(L, 1); if (party) { pushBoolean(L, party->setSharedExperience(party->getLeader(), active)); } else { diff --git a/src/lua/functions/creatures/player/party_functions.hpp b/src/lua/functions/creatures/player/party_functions.hpp index 312a39952..79e6a07de 100644 --- a/src/lua/functions/creatures/player/party_functions.hpp +++ b/src/lua/functions/creatures/player/party_functions.hpp @@ -13,6 +13,12 @@ class PartyFunctions final : LuaScriptInterface { public: + explicit PartyFunctions(lua_State* L) : + LuaScriptInterface("PartyFunctions") { + init(L); + } + ~PartyFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Party", "", PartyFunctions::luaPartyCreate); registerMetaMethod(L, "Party", "__eq", PartyFunctions::luaUserdataCompare); diff --git a/src/lua/functions/creatures/player/player_functions.cpp b/src/lua/functions/creatures/player/player_functions.cpp index 609ecbe95..c4c2faa8c 100644 --- a/src/lua/functions/creatures/player/player_functions.cpp +++ b/src/lua/functions/creatures/player/player_functions.cpp @@ -7,33 +7,39 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/player_functions.hpp" +#include "creatures/appearance/mounts/mounts.hpp" #include "creatures/combat/spells.hpp" #include "creatures/creature.hpp" #include "creatures/interactions/chat.hpp" -#include "creatures/players/player.hpp" -#include "creatures/players/wheel/player_wheel.hpp" +#include "creatures/monsters/monsters.hpp" #include "creatures/players/achievement/player_achievement.hpp" -#include "creatures/players/cyclopedia/player_badge.hpp" #include "creatures/players/cyclopedia/player_cyclopedia.hpp" #include "creatures/players/cyclopedia/player_title.hpp" +#include "creatures/players/player.hpp" +#include "creatures/players/vip/player_vip.hpp" +#include "creatures/players/vocations/vocation.hpp" +#include "creatures/players/wheel/player_wheel.hpp" +#include "server/network/protocol/protocolgame.hpp" #include "game/game.hpp" +#include "game/scheduling/save_manager.hpp" +#include "io/iobestiary.hpp" #include "io/iologindata.hpp" #include "io/ioprey.hpp" +#include "items/containers/depot/depotchest.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "items/containers/rewards/reward.hpp" #include "items/item.hpp" -#include "lua/functions/creatures/player/player_functions.hpp" -#include "game/scheduling/save_manager.hpp" -#include "game/scheduling/dispatcher.hpp" #include "map/spectators.hpp" -#include "enums/account_errors.hpp" -#include "enums/account_type.hpp" #include "enums/account_coins.hpp" +#include "enums/account_errors.hpp" +#include "enums/player_icons.hpp" int PlayerFunctions::luaPlayerSendInventory(lua_State* L) { // player:sendInventory() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -47,19 +53,19 @@ int PlayerFunctions::luaPlayerSendInventory(lua_State* L) { int PlayerFunctions::luaPlayerSendLootStats(lua_State* L) { // player:sendLootStats(item, count) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { lua_pushnil(L); return 1; } - uint8_t count = getNumber<uint8_t>(L, 3, 0); + const auto count = getNumber<uint8_t>(L, 3, 0); if (count == 0) { lua_pushnil(L); return 1; @@ -73,13 +79,13 @@ int PlayerFunctions::luaPlayerSendLootStats(lua_State* L) { int PlayerFunctions::luaPlayerUpdateSupplyTracker(lua_State* L) { // player:updateSupplyTracker(item) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { lua_pushnil(L); return 1; @@ -93,19 +99,19 @@ int PlayerFunctions::luaPlayerUpdateSupplyTracker(lua_State* L) { int PlayerFunctions::luaPlayerUpdateKillTracker(lua_State* L) { // player:updateKillTracker(creature, corpse) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> monster = getUserdataShared<Creature>(L, 2); + const auto &monster = getUserdataShared<Creature>(L, 2); if (!monster) { lua_pushnil(L); return 1; } - std::shared_ptr<Container> corpse = getUserdataShared<Container>(L, 3); + const auto &corpse = getUserdataShared<Container>(L, 3); if (!corpse) { lua_pushnil(L); return 1; @@ -122,7 +128,7 @@ int PlayerFunctions::luaPlayerCreate(lua_State* L) { // Player(id or guid or name or userdata) std::shared_ptr<Player> player; if (isNumber(L, 2)) { - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); if (id >= Player::getFirstID() && id <= Player::getLastID()) { player = g_game().getPlayerByID(id); } else { @@ -156,7 +162,7 @@ int PlayerFunctions::luaPlayerCreate(lua_State* L) { int PlayerFunctions::luaPlayerResetCharmsMonsters(lua_State* L) { // player:resetCharmsBestiary() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setCharmPoints(0); player->setCharmExpansion(false); @@ -174,12 +180,12 @@ int PlayerFunctions::luaPlayerResetCharmsMonsters(lua_State* L) { int PlayerFunctions::luaPlayerUnlockAllCharmRunes(lua_State* L) { // player:unlockAllCharmRunes() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { for (int8_t i = CHARM_WOUND; i <= CHARM_LAST; i++) { const auto charm = g_iobestiary().getBestiaryCharm(static_cast<charmRune_t>(i)); if (charm) { - int32_t value = g_iobestiary().bitToggle(player->getUnlockedRunesBit(), charm, true); + const int32_t value = g_iobestiary().bitToggle(player->getUnlockedRunesBit(), charm, true); player->setUnlockedRunesBit(value); } } @@ -192,7 +198,7 @@ int PlayerFunctions::luaPlayerUnlockAllCharmRunes(lua_State* L) { int PlayerFunctions::luaPlayeraddCharmPoints(lua_State* L) { // player:addCharmPoints() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { int16_t charms = getNumber<int16_t>(L, 2); if (charms >= 0) { @@ -216,7 +222,7 @@ int PlayerFunctions::luaPlayerIsPlayer(lua_State* L) { int PlayerFunctions::luaPlayerGetGuid(lua_State* L) { // player:getGuid() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getGUID()); } else { @@ -227,7 +233,7 @@ int PlayerFunctions::luaPlayerGetGuid(lua_State* L) { int PlayerFunctions::luaPlayerGetIp(lua_State* L) { // player:getIp() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getIP()); } else { @@ -238,7 +244,7 @@ int PlayerFunctions::luaPlayerGetIp(lua_State* L) { int PlayerFunctions::luaPlayerGetAccountId(lua_State* L) { // player:getAccountId() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || player->getAccountId() == 0) { lua_pushnil(L); return 1; @@ -251,7 +257,7 @@ int PlayerFunctions::luaPlayerGetAccountId(lua_State* L) { int PlayerFunctions::luaPlayerGetLastLoginSaved(lua_State* L) { // player:getLastLoginSaved() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getLastLoginSaved()); } else { @@ -262,7 +268,7 @@ int PlayerFunctions::luaPlayerGetLastLoginSaved(lua_State* L) { int PlayerFunctions::luaPlayerGetLastLogout(lua_State* L) { // player:getLastLogout() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getLastLogout()); } else { @@ -273,7 +279,7 @@ int PlayerFunctions::luaPlayerGetLastLogout(lua_State* L) { int PlayerFunctions::luaPlayerGetAccountType(lua_State* L) { // player:getAccountType() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getAccountType()); } else { @@ -284,18 +290,18 @@ int PlayerFunctions::luaPlayerGetAccountType(lua_State* L) { int PlayerFunctions::luaPlayerSetAccountType(lua_State* L) { // player:setAccountType(accountType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { lua_pushnil(L); return 1; } - if (player->getAccount()->setAccountType(getNumber<uint8_t>(L, 2)) != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->setAccountType(getNumber<AccountType>(L, 2)) != AccountErrors_t::Ok) { lua_pushnil(L); return 1; } - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { lua_pushnil(L); return 1; } @@ -306,9 +312,9 @@ int PlayerFunctions::luaPlayerSetAccountType(lua_State* L) { int PlayerFunctions::luaPlayerAddBestiaryKill(lua_State* L) { // player:addBestiaryKill(name[, amount = 1]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - const auto mtype = g_monsters().getMonsterType(getString(L, 2)); + const auto &mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { g_iobestiary().addBestiaryKill(player, mtype, getNumber<uint32_t>(L, 3, 1)); pushBoolean(L, true); @@ -323,21 +329,21 @@ int PlayerFunctions::luaPlayerAddBestiaryKill(lua_State* L) { int PlayerFunctions::luaPlayerIsMonsterBestiaryUnlocked(lua_State* L) { // player:isMonsterBestiaryUnlocked(raceId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player == nullptr) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - auto raceId = getNumber<uint16_t>(L, 2, 0); + const auto raceId = getNumber<uint16_t>(L, 2, 0); if (!g_monsters().getMonsterTypeByRaceId(raceId)) { reportErrorFunc("Monster race id not exists"); pushBoolean(L, false); return 0; } - for (uint16_t finishedRaceId : g_iobestiary().getBestiaryFinished(player)) { + for (const uint16_t finishedRaceId : g_iobestiary().getBestiaryFinished(player)) { if (raceId == finishedRaceId) { pushBoolean(L, true); return 1; @@ -350,12 +356,12 @@ int PlayerFunctions::luaPlayerIsMonsterBestiaryUnlocked(lua_State* L) { int PlayerFunctions::luaPlayergetCharmMonsterType(lua_State* L) { // player:getCharmMonsterType(charmRune_t) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - charmRune_t charmid = getNumber<charmRune_t>(L, 2); - uint16_t raceid = player->parseRacebyCharm(charmid, false, 0); + const charmRune_t charmid = getNumber<charmRune_t>(L, 2); + const uint16_t raceid = player->parseRacebyCharm(charmid, false, 0); if (raceid > 0) { - const auto mtype = g_monsters().getMonsterTypeByRaceId(raceid); + const auto &mtype = g_monsters().getMonsterTypeByRaceId(raceid); if (mtype) { pushUserdata<MonsterType>(L, mtype); setMetatable(L, -1, "MonsterType"); @@ -373,7 +379,7 @@ int PlayerFunctions::luaPlayergetCharmMonsterType(lua_State* L) { int PlayerFunctions::luaPlayerRemovePreyStamina(lua_State* L) { // player:removePreyStamina(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { g_ioprey().checkPlayerPreys(player, getNumber<uint8_t>(L, 2, 1)); pushBoolean(L, true); @@ -385,7 +391,7 @@ int PlayerFunctions::luaPlayerRemovePreyStamina(lua_State* L) { int PlayerFunctions::luaPlayerAddPreyCards(lua_State* L) { // player:addPreyCards(amount) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { player->addPreyCards(getNumber<uint64_t>(L, 2, 0)); pushBoolean(L, true); } else { @@ -396,7 +402,7 @@ int PlayerFunctions::luaPlayerAddPreyCards(lua_State* L) { int PlayerFunctions::luaPlayerGetPreyCards(lua_State* L) { // player:getPreyCards() - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { lua_pushnumber(L, static_cast<lua_Number>(player->getPreyCards())); } else { lua_pushnil(L); @@ -406,7 +412,7 @@ int PlayerFunctions::luaPlayerGetPreyCards(lua_State* L) { int PlayerFunctions::luaPlayerGetPreyExperiencePercentage(lua_State* L) { // player:getPreyExperiencePercentage(raceId) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { if (const std::unique_ptr<PreySlot> &slot = player->getPreyWithMonster(getNumber<uint16_t>(L, 2, 0)); slot && slot->isOccupied() && slot->bonus == PreyBonus_Experience && slot->bonusTimeLeft > 0) { lua_pushnumber(L, static_cast<lua_Number>(100 + slot->bonusPercentage)); @@ -421,7 +427,7 @@ int PlayerFunctions::luaPlayerGetPreyExperiencePercentage(lua_State* L) { int PlayerFunctions::luaPlayerRemoveTaskHuntingPoints(lua_State* L) { // player:removeTaskHuntingPoints(amount) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { pushBoolean(L, player->useTaskHuntingPoints(getNumber<uint64_t>(L, 2, 0))); } else { lua_pushnil(L); @@ -431,7 +437,7 @@ int PlayerFunctions::luaPlayerRemoveTaskHuntingPoints(lua_State* L) { int PlayerFunctions::luaPlayerGetTaskHuntingPoints(lua_State* L) { // player:getTaskHuntingPoints() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player == nullptr) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -444,8 +450,8 @@ int PlayerFunctions::luaPlayerGetTaskHuntingPoints(lua_State* L) { int PlayerFunctions::luaPlayerAddTaskHuntingPoints(lua_State* L) { // player:addTaskHuntingPoints(amount) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { - auto points = getNumber<uint64_t>(L, 2); + if (const auto &player = getUserdataShared<Player>(L, 1)) { + const auto points = getNumber<uint64_t>(L, 2); player->addTaskHuntingPoints(getNumber<uint64_t>(L, 2)); lua_pushnumber(L, static_cast<lua_Number>(points)); } else { @@ -456,7 +462,7 @@ int PlayerFunctions::luaPlayerAddTaskHuntingPoints(lua_State* L) { int PlayerFunctions::luaPlayerGetPreyLootPercentage(lua_State* L) { // player:getPreyLootPercentage(raceid) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { if (const std::unique_ptr<PreySlot> &slot = player->getPreyWithMonster(getNumber<uint16_t>(L, 2, 0)); slot && slot->isOccupied() && slot->bonus == PreyBonus_Loot) { lua_pushnumber(L, slot->bonusPercentage); @@ -471,7 +477,7 @@ int PlayerFunctions::luaPlayerGetPreyLootPercentage(lua_State* L) { int PlayerFunctions::luaPlayerisMonsterPrey(lua_State* L) { // player:isMonsterPrey(raceid) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1)) { + if (const auto &player = getUserdataShared<Player>(L, 1)) { if (const std::unique_ptr<PreySlot> &slot = player->getPreyWithMonster(getNumber<uint16_t>(L, 2, 0)); slot && slot->isOccupied()) { pushBoolean(L, true); @@ -486,7 +492,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> player = getUserdataShared<Player>(L, 1); + if (const auto &player = getUserdataShared<Player>(L, 1); const auto &slot = player->getPreySlotById(PreySlot_Three)) { if (!slot) { lua_pushnil(L); @@ -513,7 +519,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> player = getUserdataShared<Player>(L, 1); + if (const auto &player = getUserdataShared<Player>(L, 1); const auto &slot = player->getTaskHuntingSlotById(PreySlot_Three)) { if (lua_gettop(L) == 1) { pushBoolean(L, slot->state != PreyTaskDataState_Locked); @@ -538,7 +544,7 @@ int PlayerFunctions::luaPlayerTaskThirdSlot(lua_State* L) { int PlayerFunctions::luaPlayercharmExpansion(lua_State* L) { // get: player:charmExpansion() set: player:charmExpansion(bool) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { if (lua_gettop(L) == 1) { pushBoolean(L, player->hasCharmExpansion()); @@ -554,7 +560,7 @@ int PlayerFunctions::luaPlayercharmExpansion(lua_State* L) { int PlayerFunctions::luaPlayerGetCapacity(lua_State* L) { // player:getCapacity() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getCapacity()); } else { @@ -565,7 +571,7 @@ int PlayerFunctions::luaPlayerGetCapacity(lua_State* L) { int PlayerFunctions::luaPlayerSetCapacity(lua_State* L) { // player:setCapacity(capacity) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->capacity = getNumber<uint32_t>(L, 2); player->sendStats(); @@ -578,9 +584,9 @@ int PlayerFunctions::luaPlayerSetCapacity(lua_State* L) { int PlayerFunctions::luaPlayerSetTraining(lua_State* L) { // player:setTraining(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - bool value = getBoolean(L, 2, false); + const bool value = getBoolean(L, 2, false); player->setTraining(value); pushBoolean(L, true); } else { @@ -591,7 +597,7 @@ int PlayerFunctions::luaPlayerSetTraining(lua_State* L) { int PlayerFunctions::luaPlayerGetIsTraining(lua_State* L) { // player:isTraining() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); @@ -604,7 +610,7 @@ int PlayerFunctions::luaPlayerGetIsTraining(lua_State* L) { int PlayerFunctions::luaPlayerGetFreeCapacity(lua_State* L) { // player:getFreeCapacity() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getFreeCapacity()); } else { @@ -615,7 +621,7 @@ int PlayerFunctions::luaPlayerGetFreeCapacity(lua_State* L) { int PlayerFunctions::luaPlayerGetKills(lua_State* L) { // player:getKills() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -639,7 +645,7 @@ int PlayerFunctions::luaPlayerGetKills(lua_State* L) { int PlayerFunctions::luaPlayerSetKills(lua_State* L) { // player:setKills(kills) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -667,15 +673,15 @@ int PlayerFunctions::luaPlayerSetKills(lua_State* L) { int PlayerFunctions::luaPlayerGetReward(lua_State* L) { // player:getReward(rewardId[, autoCreate = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint64_t rewardId = getNumber<uint64_t>(L, 2); - bool autoCreate = getBoolean(L, 3, false); - if (auto reward = player->getReward(rewardId, autoCreate)) { + const uint64_t rewardId = getNumber<uint64_t>(L, 2); + const bool autoCreate = getBoolean(L, 3, false); + if (const auto &reward = player->getReward(rewardId, autoCreate)) { pushUserdata<Item>(L, reward); setItemMetatable(L, -1, reward); } else { @@ -686,13 +692,13 @@ int PlayerFunctions::luaPlayerGetReward(lua_State* L) { int PlayerFunctions::luaPlayerRemoveReward(lua_State* L) { // player:removeReward(rewardId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint32_t rewardId = getNumber<uint32_t>(L, 2); + const uint32_t rewardId = getNumber<uint32_t>(L, 2); player->removeReward(rewardId); pushBoolean(L, true); return 1; @@ -700,7 +706,7 @@ int PlayerFunctions::luaPlayerRemoveReward(lua_State* L) { int PlayerFunctions::luaPlayerGetRewardList(lua_State* L) { // player:getRewardList() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -720,7 +726,7 @@ int PlayerFunctions::luaPlayerGetRewardList(lua_State* L) { int PlayerFunctions::luaPlayerSetDailyReward(lua_State* L) { // player:setDailyReward(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setDailyReward(getNumber<uint8_t>(L, 2)); pushBoolean(L, true); @@ -732,14 +738,14 @@ int PlayerFunctions::luaPlayerSetDailyReward(lua_State* L) { int PlayerFunctions::luaPlayerGetDepotLocker(lua_State* L) { // player:getDepotLocker(depotId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint32_t depotId = getNumber<uint32_t>(L, 2); - std::shared_ptr<DepotLocker> depotLocker = player->getDepotLocker(depotId); + const uint32_t depotId = getNumber<uint32_t>(L, 2); + const auto &depotLocker = player->getDepotLocker(depotId); if (depotLocker) { depotLocker->setParent(player); pushUserdata<Item>(L, depotLocker); @@ -752,9 +758,9 @@ int PlayerFunctions::luaPlayerGetDepotLocker(lua_State* L) { int PlayerFunctions::luaPlayerGetStashCounter(lua_State* L) { // player:getStashCount() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t sizeStash = getStashSize(player->getStashItems()); + const uint16_t sizeStash = getStashSize(player->getStashItems()); lua_pushnumber(L, sizeStash); } else { lua_pushnil(L); @@ -764,15 +770,15 @@ int PlayerFunctions::luaPlayerGetStashCounter(lua_State* L) { int PlayerFunctions::luaPlayerGetDepotChest(lua_State* L) { // player:getDepotChest(depotId[, autoCreate = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint32_t depotId = getNumber<uint32_t>(L, 2); - bool autoCreate = getBoolean(L, 3, false); - std::shared_ptr<DepotChest> depotChest = player->getDepotChest(depotId, autoCreate); + const uint32_t depotId = getNumber<uint32_t>(L, 2); + const bool autoCreate = getBoolean(L, 3, false); + const auto &depotChest = player->getDepotChest(depotId, autoCreate); if (depotChest) { player->setLastDepotId(depotId); pushUserdata<Item>(L, depotChest); @@ -785,13 +791,13 @@ int PlayerFunctions::luaPlayerGetDepotChest(lua_State* L) { int PlayerFunctions::luaPlayerGetInbox(lua_State* L) { // player:getInbox() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Inbox> inbox = player->getInbox(); + const auto &inbox = player->getInbox(); if (inbox) { pushUserdata<Item>(L, inbox); setItemMetatable(L, -1, inbox); @@ -803,7 +809,7 @@ int PlayerFunctions::luaPlayerGetInbox(lua_State* L) { int PlayerFunctions::luaPlayerGetSkullTime(lua_State* L) { // player:getSkullTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getSkullTicks()); } else { @@ -814,7 +820,7 @@ int PlayerFunctions::luaPlayerGetSkullTime(lua_State* L) { int PlayerFunctions::luaPlayerSetSkullTime(lua_State* L) { // player:setSkullTime(skullTime) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setSkullTicks(getNumber<int64_t>(L, 2)); pushBoolean(L, true); @@ -826,7 +832,7 @@ int PlayerFunctions::luaPlayerSetSkullTime(lua_State* L) { int PlayerFunctions::luaPlayerGetDeathPenalty(lua_State* L) { // player:getDeathPenalty() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, static_cast<uint32_t>(player->getLostPercent() * 100)); } else { @@ -837,7 +843,7 @@ int PlayerFunctions::luaPlayerGetDeathPenalty(lua_State* L) { int PlayerFunctions::luaPlayerGetExperience(lua_State* L) { // player:getExperience() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getExperience()); } else { @@ -848,10 +854,10 @@ int PlayerFunctions::luaPlayerGetExperience(lua_State* L) { int PlayerFunctions::luaPlayerAddExperience(lua_State* L) { // player:addExperience(experience[, sendText = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - int64_t experience = getNumber<int64_t>(L, 2); - bool sendText = getBoolean(L, 3, false); + const int64_t experience = getNumber<int64_t>(L, 2); + const bool sendText = getBoolean(L, 3, false); player->addExperience(nullptr, experience, sendText); pushBoolean(L, true); } else { @@ -862,10 +868,10 @@ int PlayerFunctions::luaPlayerAddExperience(lua_State* L) { int PlayerFunctions::luaPlayerRemoveExperience(lua_State* L) { // player:removeExperience(experience[, sendText = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - int64_t experience = getNumber<int64_t>(L, 2); - bool sendText = getBoolean(L, 3, false); + const int64_t experience = getNumber<int64_t>(L, 2); + const bool sendText = getBoolean(L, 3, false); player->removeExperience(experience, sendText); pushBoolean(L, true); } else { @@ -876,7 +882,7 @@ int PlayerFunctions::luaPlayerRemoveExperience(lua_State* L) { int PlayerFunctions::luaPlayerGetLevel(lua_State* L) { // player:getLevel() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getLevel()); } else { @@ -887,7 +893,7 @@ int PlayerFunctions::luaPlayerGetLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetMagicShieldCapacityFlat(lua_State* L) { // player:getMagicShieldCapacityFlat(useCharges) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMagicShieldCapacityFlat(getBoolean(L, 2, false))); } else { @@ -898,7 +904,7 @@ int PlayerFunctions::luaPlayerGetMagicShieldCapacityFlat(lua_State* L) { int PlayerFunctions::luaPlayerGetMagicShieldCapacityPercent(lua_State* L) { // player:getMagicShieldCapacityPercent(useCharges) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMagicShieldCapacityPercent(getBoolean(L, 2, false))); } else { @@ -909,13 +915,13 @@ int PlayerFunctions::luaPlayerGetMagicShieldCapacityPercent(lua_State* L) { int PlayerFunctions::luaPlayerSendSpellCooldown(lua_State* L) { // player:sendSpellCooldown(spellId, time) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint8_t spellId = getNumber<uint32_t>(L, 2, 1); - uint32_t time = getNumber<uint32_t>(L, 3, 0); + const uint8_t spellId = getNumber<uint32_t>(L, 2, 1); + const auto time = getNumber<uint32_t>(L, 3, 0); player->sendSpellCooldown(spellId, time); pushBoolean(L, true); @@ -925,13 +931,13 @@ int PlayerFunctions::luaPlayerSendSpellCooldown(lua_State* L) { int PlayerFunctions::luaPlayerSendSpellGroupCooldown(lua_State* L) { // player:sendSpellGroupCooldown(groupId, time) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - SpellGroup_t groupId = getNumber<SpellGroup_t>(L, 2, SPELLGROUP_ATTACK); - uint32_t time = getNumber<uint32_t>(L, 3, 0); + const auto groupId = getNumber<SpellGroup_t>(L, 2, SPELLGROUP_ATTACK); + const auto time = getNumber<uint32_t>(L, 3, 0); player->sendSpellGroupCooldown(groupId, time); pushBoolean(L, true); @@ -941,7 +947,7 @@ int PlayerFunctions::luaPlayerSendSpellGroupCooldown(lua_State* L) { int PlayerFunctions::luaPlayerGetMagicLevel(lua_State* L) { // player:getMagicLevel() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMagicLevel()); } else { @@ -952,7 +958,7 @@ int PlayerFunctions::luaPlayerGetMagicLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetBaseMagicLevel(lua_State* L) { // player:getBaseMagicLevel() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getBaseMagicLevel()); } else { @@ -963,7 +969,7 @@ int PlayerFunctions::luaPlayerGetBaseMagicLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetMana(lua_State* L) { // player:getMana() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMana()); } else { @@ -974,14 +980,14 @@ int PlayerFunctions::luaPlayerGetMana(lua_State* L) { int PlayerFunctions::luaPlayerAddMana(lua_State* L) { // player:addMana(manaChange[, animationOnLoss = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - int32_t manaChange = getNumber<int32_t>(L, 2); - bool animationOnLoss = getBoolean(L, 3, false); + const int32_t manaChange = getNumber<int32_t>(L, 2); + const bool animationOnLoss = getBoolean(L, 3, false); if (!animationOnLoss && manaChange < 0) { player->changeMana(manaChange); } else { @@ -996,7 +1002,7 @@ int PlayerFunctions::luaPlayerAddMana(lua_State* L) { int PlayerFunctions::luaPlayerGetMaxMana(lua_State* L) { // player:getMaxMana() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMaxMana()); } else { @@ -1023,7 +1029,7 @@ int PlayerFunctions::luaPlayerSetMaxMana(lua_State* L) { int PlayerFunctions::luaPlayerGetManaSpent(lua_State* L) { // player:getManaSpent() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getSpentMana()); } else { @@ -1034,7 +1040,7 @@ int PlayerFunctions::luaPlayerGetManaSpent(lua_State* L) { int PlayerFunctions::luaPlayerAddManaSpent(lua_State* L) { // player:addManaSpent(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->addManaSpent(getNumber<uint64_t>(L, 2)); pushBoolean(L, true); @@ -1046,7 +1052,7 @@ int PlayerFunctions::luaPlayerAddManaSpent(lua_State* L) { int PlayerFunctions::luaPlayerGetBaseMaxHealth(lua_State* L) { // player:getBaseMaxHealth() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->healthMax); } else { @@ -1057,7 +1063,7 @@ int PlayerFunctions::luaPlayerGetBaseMaxHealth(lua_State* L) { int PlayerFunctions::luaPlayerGetBaseMaxMana(lua_State* L) { // player:getBaseMaxMana() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->manaMax); } else { @@ -1068,8 +1074,8 @@ int PlayerFunctions::luaPlayerGetBaseMaxMana(lua_State* L) { int PlayerFunctions::luaPlayerGetSkillLevel(lua_State* L) { // player:getSkillLevel(skillType) - skills_t skillType = getNumber<skills_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const skills_t skillType = getNumber<skills_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player && skillType <= SKILL_LAST) { lua_pushnumber(L, player->skills[skillType].level); } else { @@ -1080,8 +1086,8 @@ int PlayerFunctions::luaPlayerGetSkillLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetEffectiveSkillLevel(lua_State* L) { // player:getEffectiveSkillLevel(skillType) - skills_t skillType = getNumber<skills_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const skills_t skillType = getNumber<skills_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player && skillType <= SKILL_LAST) { lua_pushnumber(L, player->getSkillLevel(skillType)); } else { @@ -1092,8 +1098,8 @@ int PlayerFunctions::luaPlayerGetEffectiveSkillLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetSkillPercent(lua_State* L) { // player:getSkillPercent(skillType) - skills_t skillType = getNumber<skills_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const skills_t skillType = getNumber<skills_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player && skillType <= SKILL_LAST) { lua_pushnumber(L, player->skills[skillType].percent); } else { @@ -1104,8 +1110,8 @@ int PlayerFunctions::luaPlayerGetSkillPercent(lua_State* L) { int PlayerFunctions::luaPlayerGetSkillTries(lua_State* L) { // player:getSkillTries(skillType) - skills_t skillType = getNumber<skills_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const skills_t skillType = getNumber<skills_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player && skillType <= SKILL_LAST) { lua_pushnumber(L, player->skills[skillType].tries); } else { @@ -1116,10 +1122,10 @@ int PlayerFunctions::luaPlayerGetSkillTries(lua_State* L) { int PlayerFunctions::luaPlayerAddSkillTries(lua_State* L) { // player:addSkillTries(skillType, tries) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - skills_t skillType = getNumber<skills_t>(L, 2); - uint64_t tries = getNumber<uint64_t>(L, 3); + const skills_t skillType = getNumber<skills_t>(L, 2); + const uint64_t tries = getNumber<uint64_t>(L, 3); player->addSkillAdvance(skillType, tries); pushBoolean(L, true); } else { @@ -1130,9 +1136,9 @@ int PlayerFunctions::luaPlayerAddSkillTries(lua_State* L) { int PlayerFunctions::luaPlayerSetLevel(lua_State* L) { // player:setLevel(level) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t level = getNumber<uint16_t>(L, 2); + const uint16_t level = getNumber<uint16_t>(L, 2); player->level = level; player->experience = Player::getExpForLevel(level); player->sendStats(); @@ -1146,13 +1152,13 @@ int PlayerFunctions::luaPlayerSetLevel(lua_State* L) { int PlayerFunctions::luaPlayerSetMagicLevel(lua_State* L) { // player:setMagicLevel(level[, manaSpent]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t level = getNumber<uint16_t>(L, 2); + const uint16_t level = getNumber<uint16_t>(L, 2); player->magLevel = level; if (getNumber<uint64_t>(L, 3, 0) > 0) { - uint64_t manaSpent = getNumber<uint64_t>(L, 3); - uint64_t nextReqMana = player->vocation->getReqMana(level + 1); + const uint64_t manaSpent = getNumber<uint64_t>(L, 3); + const uint64_t nextReqMana = player->vocation->getReqMana(level + 1); player->manaSpent = manaSpent; player->magLevelPercent = Player::getPercentLevel(manaSpent, nextReqMana); } else { @@ -1170,14 +1176,14 @@ int PlayerFunctions::luaPlayerSetMagicLevel(lua_State* L) { int PlayerFunctions::luaPlayerSetSkillLevel(lua_State* L) { // player:setSkillLevel(skillType, level[, tries]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - skills_t skillType = getNumber<skills_t>(L, 2); - uint16_t level = getNumber<uint16_t>(L, 3); + const skills_t skillType = getNumber<skills_t>(L, 2); + const uint16_t level = getNumber<uint16_t>(L, 3); player->skills[skillType].level = level; if (getNumber<uint64_t>(L, 4, 0) > 0) { - uint64_t tries = getNumber<uint64_t>(L, 4); - uint64_t nextReqTries = player->vocation->getReqSkillTries(skillType, level + 1); + const uint64_t tries = getNumber<uint64_t>(L, 4); + const uint64_t nextReqTries = player->vocation->getReqSkillTries(skillType, level + 1); player->skills[skillType].tries = tries; player->skills[skillType].percent = Player::getPercentLevel(tries, nextReqTries); } else { @@ -1195,9 +1201,9 @@ int PlayerFunctions::luaPlayerSetSkillLevel(lua_State* L) { int PlayerFunctions::luaPlayerAddOfflineTrainingTime(lua_State* L) { // player:addOfflineTrainingTime(time) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - int32_t time = getNumber<int32_t>(L, 2); + const int32_t time = getNumber<int32_t>(L, 2); player->addOfflineTrainingTime(time); player->sendStats(); pushBoolean(L, true); @@ -1209,7 +1215,7 @@ int PlayerFunctions::luaPlayerAddOfflineTrainingTime(lua_State* L) { int PlayerFunctions::luaPlayerGetOfflineTrainingTime(lua_State* L) { // player:getOfflineTrainingTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getOfflineTrainingTime()); } else { @@ -1220,9 +1226,9 @@ int PlayerFunctions::luaPlayerGetOfflineTrainingTime(lua_State* L) { int PlayerFunctions::luaPlayerRemoveOfflineTrainingTime(lua_State* L) { // player:removeOfflineTrainingTime(time) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - int32_t time = getNumber<int32_t>(L, 2); + const int32_t time = getNumber<int32_t>(L, 2); player->removeOfflineTrainingTime(time); player->sendStats(); pushBoolean(L, true); @@ -1234,10 +1240,10 @@ int PlayerFunctions::luaPlayerRemoveOfflineTrainingTime(lua_State* L) { int PlayerFunctions::luaPlayerAddOfflineTrainingTries(lua_State* L) { // player:addOfflineTrainingTries(skillType, tries) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - skills_t skillType = getNumber<skills_t>(L, 2); - uint64_t tries = getNumber<uint64_t>(L, 3); + const skills_t skillType = getNumber<skills_t>(L, 2); + const uint64_t tries = getNumber<uint64_t>(L, 3); pushBoolean(L, player->addOfflineTrainingTries(skillType, tries)); } else { lua_pushnil(L); @@ -1247,7 +1253,7 @@ int PlayerFunctions::luaPlayerAddOfflineTrainingTries(lua_State* L) { int PlayerFunctions::luaPlayerGetOfflineTrainingSkill(lua_State* L) { // player:getOfflineTrainingSkill() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getOfflineTrainingSkill()); } else { @@ -1258,9 +1264,9 @@ int PlayerFunctions::luaPlayerGetOfflineTrainingSkill(lua_State* L) { int PlayerFunctions::luaPlayerSetOfflineTrainingSkill(lua_State* L) { // player:setOfflineTrainingSkill(skillId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - int8_t skillId = getNumber<int8_t>(L, 2); + const int8_t skillId = getNumber<int8_t>(L, 2); player->setOfflineTrainingSkill(skillId); pushBoolean(L, true); } else { @@ -1271,8 +1277,8 @@ int PlayerFunctions::luaPlayerSetOfflineTrainingSkill(lua_State* L) { int PlayerFunctions::luaPlayerOpenStash(lua_State* L) { // player:openStash(isNpc) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); - bool isNpc = getBoolean(L, 2, false); + const auto &player = getUserdataShared<Player>(L, 1); + const bool isNpc = getBoolean(L, 2, false); if (player) { player->sendOpenStash(isNpc); pushBoolean(L, true); @@ -1285,7 +1291,7 @@ int PlayerFunctions::luaPlayerOpenStash(lua_State* L) { int PlayerFunctions::luaPlayerGetItemCount(lua_State* L) { // player:getItemCount(itemId[, subType = -1]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1302,14 +1308,14 @@ int PlayerFunctions::luaPlayerGetItemCount(lua_State* L) { } } - int32_t subType = getNumber<int32_t>(L, 3, -1); + const auto subType = getNumber<int32_t>(L, 3, -1); lua_pushnumber(L, player->getItemTypeCount(itemId, subType)); return 1; } int PlayerFunctions::luaPlayerGetStashItemCount(lua_State* L) { // player:getStashItemCount(itemId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1338,7 +1344,7 @@ int PlayerFunctions::luaPlayerGetStashItemCount(lua_State* L) { int PlayerFunctions::luaPlayerGetItemById(lua_State* L) { // player:getItemById(itemId, deepSearch[, subType = -1]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1354,10 +1360,10 @@ int PlayerFunctions::luaPlayerGetItemById(lua_State* L) { return 1; } } - bool deepSearch = getBoolean(L, 3); - int32_t subType = getNumber<int32_t>(L, 4, -1); + const bool deepSearch = getBoolean(L, 3); + const auto subType = getNumber<int32_t>(L, 4, -1); - std::shared_ptr<Item> item = g_game().findItemOfType(player, itemId, deepSearch, subType); + const auto &item = g_game().findItemOfType(player, itemId, deepSearch, subType); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -1369,7 +1375,7 @@ int PlayerFunctions::luaPlayerGetItemById(lua_State* L) { int PlayerFunctions::luaPlayerGetVocation(lua_State* L) { // player:getVocation() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushUserdata<Vocation>(L, player->getVocation()); setMetatable(L, -1, "Vocation"); @@ -1381,7 +1387,7 @@ int PlayerFunctions::luaPlayerGetVocation(lua_State* L) { int PlayerFunctions::luaPlayerSetVocation(lua_State* L) { // player:setVocation(id or name or userdata) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1415,7 +1421,7 @@ int PlayerFunctions::luaPlayerSetVocation(lua_State* L) { int PlayerFunctions::luaPlayerIsPromoted(lua_State* L) { // player:isPromoted() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->isPromoted()); } else { @@ -1426,7 +1432,7 @@ int PlayerFunctions::luaPlayerIsPromoted(lua_State* L) { int PlayerFunctions::luaPlayerGetSex(lua_State* L) { // player:getSex() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getSex()); } else { @@ -1437,9 +1443,9 @@ int PlayerFunctions::luaPlayerGetSex(lua_State* L) { int PlayerFunctions::luaPlayerSetSex(lua_State* L) { // player:setSex(newSex) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - PlayerSex_t newSex = getNumber<PlayerSex_t>(L, 2); + const PlayerSex_t newSex = getNumber<PlayerSex_t>(L, 2); player->setSex(newSex); pushBoolean(L, true); } else { @@ -1450,7 +1456,7 @@ int PlayerFunctions::luaPlayerSetSex(lua_State* L) { int PlayerFunctions::luaPlayerGetPronoun(lua_State* L) { // player:getPronoun() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getPronoun()); } else { @@ -1461,9 +1467,9 @@ int PlayerFunctions::luaPlayerGetPronoun(lua_State* L) { int PlayerFunctions::luaPlayerSetPronoun(lua_State* L) { // player:setPronoun(newPronoun) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - PlayerPronoun_t newPronoun = getNumber<PlayerPronoun_t>(L, 2); + const PlayerPronoun_t newPronoun = getNumber<PlayerPronoun_t>(L, 2); player->setPronoun(newPronoun); pushBoolean(L, true); } else { @@ -1474,7 +1480,7 @@ int PlayerFunctions::luaPlayerSetPronoun(lua_State* L) { int PlayerFunctions::luaPlayerGetTown(lua_State* L) { // player:getTown() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushUserdata<Town>(L, player->getTown()); setMetatable(L, -1, "Town"); @@ -1492,7 +1498,7 @@ int PlayerFunctions::luaPlayerSetTown(lua_State* L) { return 1; } - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setTown(town); pushBoolean(L, true); @@ -1504,13 +1510,13 @@ int PlayerFunctions::luaPlayerSetTown(lua_State* L) { int PlayerFunctions::luaPlayerGetGuild(lua_State* L) { // player:getGuild() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - const auto guild = player->getGuild(); + const auto &guild = player->getGuild(); if (!guild) { lua_pushnil(L); return 1; @@ -1523,13 +1529,13 @@ int PlayerFunctions::luaPlayerGetGuild(lua_State* L) { int PlayerFunctions::luaPlayerSetGuild(lua_State* L) { // player:setGuild(guild) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - const auto guild = getUserdataShared<Guild>(L, 2); + const auto &guild = getUserdataShared<Guild>(L, 2); player->setGuild(guild); pushBoolean(L, true); @@ -1538,7 +1544,7 @@ int PlayerFunctions::luaPlayerSetGuild(lua_State* L) { int PlayerFunctions::luaPlayerGetGuildLevel(lua_State* L) { // player:getGuildLevel() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player && player->getGuild()) { lua_pushnumber(L, player->getGuildRank()->level); } else { @@ -1549,14 +1555,14 @@ int PlayerFunctions::luaPlayerGetGuildLevel(lua_State* L) { int PlayerFunctions::luaPlayerSetGuildLevel(lua_State* L) { // player:setGuildLevel(level) - uint8_t level = getNumber<uint8_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const uint8_t level = getNumber<uint8_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getGuild()) { lua_pushnil(L); return 1; } - GuildRank_ptr rank = player->getGuild()->getRankByLevel(level); + const auto &rank = player->getGuild()->getRankByLevel(level); if (!rank) { pushBoolean(L, false); } else { @@ -1569,7 +1575,7 @@ int PlayerFunctions::luaPlayerSetGuildLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetGuildNick(lua_State* L) { // player:getGuildNick() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushString(L, player->getGuildNick()); } else { @@ -1581,7 +1587,7 @@ int PlayerFunctions::luaPlayerGetGuildNick(lua_State* L) { int PlayerFunctions::luaPlayerSetGuildNick(lua_State* L) { // player:setGuildNick(nick) const std::string &nick = getString(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setGuildNick(nick); pushBoolean(L, true); @@ -1593,7 +1599,7 @@ int PlayerFunctions::luaPlayerSetGuildNick(lua_State* L) { int PlayerFunctions::luaPlayerGetGroup(lua_State* L) { // player:getGroup() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushUserdata<Group>(L, player->getGroup()); setMetatable(L, -1, "Group"); @@ -1605,13 +1611,13 @@ int PlayerFunctions::luaPlayerGetGroup(lua_State* L) { int PlayerFunctions::luaPlayerSetGroup(lua_State* L) { // player:setGroup(group) - std::shared_ptr<Group> group = getUserdataShared<Group>(L, 2); + const auto &group = getUserdataShared<Group>(L, 2); if (!group) { pushBoolean(L, false); return 1; } - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setGroup(group); pushBoolean(L, true); @@ -1623,10 +1629,10 @@ int PlayerFunctions::luaPlayerSetGroup(lua_State* L) { int PlayerFunctions::luaPlayerSetSpecialContainersAvailable(lua_State* L) { // player:setSpecialContainersAvailable(stashMenu, marketMenu, depotSearchMenu) - bool supplyStashMenu = getBoolean(L, 2, false); - bool marketMenu = getBoolean(L, 3, false); - bool depotSearchMenu = getBoolean(L, 4, false); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const bool supplyStashMenu = getBoolean(L, 2, false); + const bool marketMenu = getBoolean(L, 3, false); + const bool depotSearchMenu = getBoolean(L, 4, false); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setSpecialMenuAvailable(supplyStashMenu, marketMenu, depotSearchMenu); pushBoolean(L, true); @@ -1638,7 +1644,7 @@ int PlayerFunctions::luaPlayerSetSpecialContainersAvailable(lua_State* L) { int PlayerFunctions::luaPlayerGetStamina(lua_State* L) { // player:getStamina() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getStaminaMinutes()); } else { @@ -1649,8 +1655,8 @@ int PlayerFunctions::luaPlayerGetStamina(lua_State* L) { int PlayerFunctions::luaPlayerSetStamina(lua_State* L) { // player:setStamina(stamina) - uint16_t stamina = getNumber<uint16_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const uint16_t stamina = getNumber<uint16_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->staminaMinutes = std::min<uint16_t>(2520, stamina); player->sendStats(); @@ -1662,7 +1668,7 @@ int PlayerFunctions::luaPlayerSetStamina(lua_State* L) { int PlayerFunctions::luaPlayerGetSoul(lua_State* L) { // player:getSoul() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getSoul()); } else { @@ -1673,8 +1679,8 @@ int PlayerFunctions::luaPlayerGetSoul(lua_State* L) { int PlayerFunctions::luaPlayerAddSoul(lua_State* L) { // player:addSoul(soulChange) - int32_t soulChange = getNumber<int32_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const int32_t soulChange = getNumber<int32_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->changeSoul(soulChange); pushBoolean(L, true); @@ -1686,7 +1692,7 @@ int PlayerFunctions::luaPlayerAddSoul(lua_State* L) { int PlayerFunctions::luaPlayerGetMaxSoul(lua_State* L) { // player:getMaxSoul() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player && player->vocation) { lua_pushnumber(L, player->vocation->getSoulMax()); } else { @@ -1697,7 +1703,7 @@ int PlayerFunctions::luaPlayerGetMaxSoul(lua_State* L) { int PlayerFunctions::luaPlayerGetBankBalance(lua_State* L) { // player:getBankBalance() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getBankBalance()); } else { @@ -1708,7 +1714,7 @@ int PlayerFunctions::luaPlayerGetBankBalance(lua_State* L) { int PlayerFunctions::luaPlayerSetBankBalance(lua_State* L) { // player:setBankBalance(bankBalance) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1721,22 +1727,22 @@ int PlayerFunctions::luaPlayerSetBankBalance(lua_State* L) { int PlayerFunctions::luaPlayerGetStorageValue(lua_State* L) { // player:getStorageValue(key) - const auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint32_t key = getNumber<uint32_t>(L, 2); + const uint32_t key = getNumber<uint32_t>(L, 2); lua_pushnumber(L, player->getStorageValue(key)); return 1; } int PlayerFunctions::luaPlayerSetStorageValue(lua_State* L) { // player:setStorageValue(key, value) - int32_t value = getNumber<int32_t>(L, 3); - uint32_t key = getNumber<uint32_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const int32_t value = getNumber<int32_t>(L, 3); + const uint32_t key = getNumber<uint32_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (IS_IN_KEYRANGE(key, RESERVED_RANGE)) { std::ostringstream ss; ss << "Accessing reserved range: " << key; @@ -1761,7 +1767,7 @@ int PlayerFunctions::luaPlayerSetStorageValue(lua_State* L) { int PlayerFunctions::luaPlayerGetStorageValueByName(lua_State* L) { // player:getStorageValueByName(name) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -1769,14 +1775,14 @@ int PlayerFunctions::luaPlayerGetStorageValueByName(lua_State* L) { } 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); + const auto name = getString(L, 2); lua_pushnumber(L, player->getStorageValueByName(name)); return 1; } int PlayerFunctions::luaPlayerSetStorageValueByName(lua_State* L) { // player:setStorageValueByName(storageName, value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -1784,8 +1790,8 @@ int PlayerFunctions::luaPlayerSetStorageValueByName(lua_State* L) { } 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<int32_t>(L, 3); + const auto storageName = getString(L, 2); + const int32_t value = getNumber<int32_t>(L, 3); player->addStorageValueByName(storageName, value); pushBoolean(L, true); @@ -1794,7 +1800,7 @@ int PlayerFunctions::luaPlayerSetStorageValueByName(lua_State* L) { int PlayerFunctions::luaPlayerAddItem(lua_State* L) { // player:addItem(itemId, count = 1, canDropOnMap = true, subType = 1, slot = CONST_SLOT_WHEREEVER, tier = 0) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { pushBoolean(L, false); return 1; @@ -1811,18 +1817,18 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { } } - int32_t count = getNumber<int32_t>(L, 3, 1); - int32_t subType = getNumber<int32_t>(L, 5, 1); + const auto count = getNumber<int32_t>(L, 3, 1); + auto subType = getNumber<int32_t>(L, 5, 1); const ItemType &it = Item::items[itemId]; int32_t itemCount = 1; - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); if (parameters >= 4) { itemCount = std::max<int32_t>(1, count); } else if (it.hasSubType()) { if (it.stackable) { - itemCount = std::ceil(count / (float_t)it.stackSize); + itemCount = std::ceil(count / static_cast<float_t>(it.stackSize)); } subType = count; @@ -1830,7 +1836,7 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { itemCount = std::max<int32_t>(1, count); } - bool hasTable = itemCount > 1; + const bool hasTable = itemCount > 1; if (hasTable) { lua_newtable(L); } else if (itemCount == 0) { @@ -1838,9 +1844,9 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { return 1; } - bool canDropOnMap = getBoolean(L, 4, true); - Slots_t slot = getNumber<Slots_t>(L, 6, CONST_SLOT_WHEREEVER); - auto tier = getNumber<uint8_t>(L, 7, 0); + const bool canDropOnMap = getBoolean(L, 4, true); + const auto slot = getNumber<Slots_t>(L, 6, CONST_SLOT_WHEREEVER); + const auto tier = getNumber<uint8_t>(L, 7, 0); for (int32_t i = 1; i <= itemCount; ++i) { int32_t stackCount = subType; if (it.stackable) { @@ -1848,7 +1854,7 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { subType -= stackCount; } - std::shared_ptr<Item> item = Item::CreateItem(itemId, stackCount); + const auto &item = Item::CreateItem(itemId, stackCount); if (!item) { if (!hasTable) { lua_pushnil(L); @@ -1865,6 +1871,8 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { if (!hasTable) { lua_pushnil(L); } + + player->sendCancelMessage(ret); return 1; } @@ -1884,14 +1892,14 @@ int PlayerFunctions::luaPlayerAddItem(lua_State* L) { int PlayerFunctions::luaPlayerAddItemEx(lua_State* L) { // player:addItemEx(item[, canDropOnMap = false[, index = INDEX_WHEREEVER[, flags = 0]]]) // player:addItemEx(item[, canDropOnMap = true[, slot = CONST_SLOT_WHEREEVER]]) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1903,14 +1911,14 @@ int PlayerFunctions::luaPlayerAddItemEx(lua_State* L) { return 1; } - bool canDropOnMap = getBoolean(L, 3, false); + const bool canDropOnMap = getBoolean(L, 3, false); ReturnValue returnValue; if (canDropOnMap) { - Slots_t slot = getNumber<Slots_t>(L, 4, CONST_SLOT_WHEREEVER); + const auto slot = getNumber<Slots_t>(L, 4, CONST_SLOT_WHEREEVER); returnValue = g_game().internalPlayerAddItem(player, item, true, slot); } else { - int32_t index = getNumber<int32_t>(L, 4, INDEX_WHEREEVER); - uint32_t flags = getNumber<uint32_t>(L, 5, 0); + const auto index = getNumber<int32_t>(L, 4, INDEX_WHEREEVER); + const auto flags = getNumber<uint32_t>(L, 5, 0); returnValue = g_game().internalAddItem(player, item, index, flags); } @@ -1923,14 +1931,14 @@ int PlayerFunctions::luaPlayerAddItemEx(lua_State* L) { int PlayerFunctions::luaPlayerAddItemStash(lua_State* L) { // player:addItemStash(itemId, count = 1) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - auto itemId = getNumber<uint16_t>(L, 2); - auto count = getNumber<uint32_t>(L, 3, 1); + const auto itemId = getNumber<uint16_t>(L, 2); + const auto count = getNumber<uint32_t>(L, 3, 1); player->addItemOnStash(itemId, count); pushBoolean(L, true); @@ -1939,7 +1947,7 @@ int PlayerFunctions::luaPlayerAddItemStash(lua_State* L) { int PlayerFunctions::luaPlayerRemoveStashItem(lua_State* L) { // player:removeStashItem(itemId, count) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1962,14 +1970,14 @@ int PlayerFunctions::luaPlayerRemoveStashItem(lua_State* L) { return 1; } - uint32_t count = getNumber<uint32_t>(L, 3); + const uint32_t count = getNumber<uint32_t>(L, 3); pushBoolean(L, player->withdrawItem(itemType.id, count)); return 1; } int PlayerFunctions::luaPlayerRemoveItem(lua_State* L) { // player:removeItem(itemId, count[, subType = -1[, ignoreEquipped = false]]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -1986,22 +1994,22 @@ int PlayerFunctions::luaPlayerRemoveItem(lua_State* L) { } } - uint32_t count = getNumber<uint32_t>(L, 3); - int32_t subType = getNumber<int32_t>(L, 4, -1); - bool ignoreEquipped = getBoolean(L, 5, false); + const uint32_t count = getNumber<uint32_t>(L, 3); + const auto subType = getNumber<int32_t>(L, 4, -1); + const bool ignoreEquipped = getBoolean(L, 5, false); pushBoolean(L, player->removeItemOfType(itemId, count, subType, ignoreEquipped)); return 1; } int PlayerFunctions::luaPlayerSendContainer(lua_State* L) { // player:sendContainer(container) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 2); + const auto &container = getUserdataShared<Container>(L, 2); if (!container) { lua_pushnil(L); return 1; @@ -2014,13 +2022,13 @@ int PlayerFunctions::luaPlayerSendContainer(lua_State* L) { int PlayerFunctions::luaPlayerSendUpdateContainer(lua_State* L) { // player:sendUpdateContainer(container) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - const auto container = getUserdataShared<Container>(L, 2); + const auto &container = getUserdataShared<Container>(L, 2); if (!container) { reportErrorFunc("Container is nullptr"); return 1; @@ -2033,7 +2041,7 @@ int PlayerFunctions::luaPlayerSendUpdateContainer(lua_State* L) { int PlayerFunctions::luaPlayerGetMoney(lua_State* L) { // player:getMoney() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getMoney()); } else { @@ -2044,8 +2052,8 @@ int PlayerFunctions::luaPlayerGetMoney(lua_State* L) { int PlayerFunctions::luaPlayerAddMoney(lua_State* L) { // player:addMoney(money) - uint64_t money = getNumber<uint64_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const uint64_t money = getNumber<uint64_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { g_game().addMoney(player, money); pushBoolean(L, true); @@ -2057,11 +2065,11 @@ int PlayerFunctions::luaPlayerAddMoney(lua_State* L) { int PlayerFunctions::luaPlayerRemoveMoney(lua_State* L) { // player:removeMoney(money[, flags = 0[, useBank = true]]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint64_t money = getNumber<uint64_t>(L, 2); - int32_t flags = getNumber<int32_t>(L, 3, 0); - bool useBank = getBoolean(L, 4, true); + const uint64_t money = getNumber<uint64_t>(L, 2); + const auto flags = getNumber<int32_t>(L, 3, 0); + const bool useBank = getBoolean(L, 4, true); pushBoolean(L, g_game().removeMoney(player, money, flags, useBank)); } else { lua_pushnil(L); @@ -2071,17 +2079,17 @@ int PlayerFunctions::luaPlayerRemoveMoney(lua_State* L) { int PlayerFunctions::luaPlayerShowTextDialog(lua_State* L) { // player:showTextDialog(id or name or userdata[, text[, canWrite[, length]]]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - int32_t length = getNumber<int32_t>(L, 5, -1); - bool canWrite = getBoolean(L, 4, false); + auto length = getNumber<int32_t>(L, 5, -1); + const bool canWrite = getBoolean(L, 4, false); std::string text; - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); if (parameters >= 3) { text = getString(L, 3); } @@ -2128,17 +2136,17 @@ int PlayerFunctions::luaPlayerSendTextMessage(lua_State* L) { // player:sendTextMessage(type, text[, position, primaryValue = 0, primaryColor = TEXTCOLOR_NONE[, secondaryValue = 0, secondaryColor = TEXTCOLOR_NONE]]) // player:sendTextMessage(type, text, channelId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - int parameters = lua_gettop(L); + const int parameters = lua_gettop(L); TextMessage message(getNumber<MessageClasses>(L, 2), getString(L, 3)); if (parameters == 4) { - uint16_t channelId = getNumber<uint16_t>(L, 4); + const uint16_t channelId = getNumber<uint16_t>(L, 4); const auto &channel = g_chat().getChannel(player, channelId); if (!channel || !channel->hasUser(player)) { pushBoolean(L, false); @@ -2166,14 +2174,14 @@ int PlayerFunctions::luaPlayerSendTextMessage(lua_State* L) { int PlayerFunctions::luaPlayerSendChannelMessage(lua_State* L) { // player:sendChannelMessage(author, text, type, channelId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint16_t channelId = getNumber<uint16_t>(L, 5); - SpeakClasses type = getNumber<SpeakClasses>(L, 4); + const uint16_t channelId = getNumber<uint16_t>(L, 5); + const SpeakClasses type = getNumber<SpeakClasses>(L, 4); const std::string &text = getString(L, 3); const std::string &author = getString(L, 2); player->sendChannelMessage(author, text, type, channelId); @@ -2183,15 +2191,15 @@ int PlayerFunctions::luaPlayerSendChannelMessage(lua_State* L) { int PlayerFunctions::luaPlayerSendPrivateMessage(lua_State* L) { // player:sendPrivateMessage(speaker, text[, type]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Player> speaker = getUserdataShared<Player>(L, 2); + const auto &speaker = getUserdataShared<Player>(L, 2); const std::string &text = getString(L, 3); - SpeakClasses type = getNumber<SpeakClasses>(L, 4, TALKTYPE_PRIVATE_FROM); + const auto type = getNumber<SpeakClasses>(L, 4, TALKTYPE_PRIVATE_FROM); player->sendPrivateMessage(speaker, type, text); pushBoolean(L, true); return 1; @@ -2199,16 +2207,16 @@ int PlayerFunctions::luaPlayerSendPrivateMessage(lua_State* L) { int PlayerFunctions::luaPlayerChannelSay(lua_State* L) { // player:channelSay(speaker, type, text, channelId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> speaker = getCreature(L, 2); - SpeakClasses type = getNumber<SpeakClasses>(L, 3); + const auto &speaker = getCreature(L, 2); + const SpeakClasses type = getNumber<SpeakClasses>(L, 3); const std::string &text = getString(L, 4); - uint16_t channelId = getNumber<uint16_t>(L, 5); + const uint16_t channelId = getNumber<uint16_t>(L, 5); player->sendToChannel(speaker, type, text, channelId); pushBoolean(L, true); return 1; @@ -2216,8 +2224,8 @@ int PlayerFunctions::luaPlayerChannelSay(lua_State* L) { int PlayerFunctions::luaPlayerOpenChannel(lua_State* L) { // player:openChannel(channelId) - uint16_t channelId = getNumber<uint16_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const uint16_t channelId = getNumber<uint16_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { g_game().playerOpenChannel(player->getID(), channelId); pushBoolean(L, true); @@ -2229,20 +2237,20 @@ int PlayerFunctions::luaPlayerOpenChannel(lua_State* L) { int PlayerFunctions::luaPlayerGetSlotItem(lua_State* L) { // player:getSlotItem(slot) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint32_t slot = getNumber<uint32_t>(L, 2); - std::shared_ptr<Thing> thing = player->getThing(slot); + const uint32_t slot = getNumber<uint32_t>(L, 2); + const auto &thing = player->getThing(slot); if (!thing) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -2254,13 +2262,13 @@ int PlayerFunctions::luaPlayerGetSlotItem(lua_State* L) { int PlayerFunctions::luaPlayerGetParty(lua_State* L) { // player:getParty() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Party> party = player->getParty(); + const auto &party = player->getParty(); if (party) { pushUserdata<Party>(L, party); setMetatable(L, -1, "Party"); @@ -2271,10 +2279,23 @@ int PlayerFunctions::luaPlayerGetParty(lua_State* L) { } int PlayerFunctions::luaPlayerAddOutfit(lua_State* L) { - // player:addOutfit(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + // player:addOutfit(lookType or name, addon = 0) + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - player->addOutfit(getNumber<uint16_t>(L, 2), 0); + auto addon = getNumber<uint8_t>(L, 3, 0); + if (lua_isnumber(L, 2)) { + player->addOutfit(getNumber<uint16_t>(L, 2), addon); + } else if (lua_isstring(L, 2)) { + const std::string &outfitName = getString(L, 2); + const auto &outfit = Outfits::getInstance().getOutfitByName(player->getSex(), outfitName); + if (!outfit) { + reportErrorFunc("Outfit not found"); + return 1; + } + + player->addOutfit(outfit->lookType, addon); + } + pushBoolean(L, true); } else { lua_pushnil(L); @@ -2284,10 +2305,10 @@ int PlayerFunctions::luaPlayerAddOutfit(lua_State* L) { int PlayerFunctions::luaPlayerAddOutfitAddon(lua_State* L) { // player:addOutfitAddon(lookType, addon) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); - uint8_t addon = getNumber<uint8_t>(L, 3); + const uint16_t lookType = getNumber<uint16_t>(L, 2); + const uint8_t addon = getNumber<uint8_t>(L, 3); player->addOutfit(lookType, addon); pushBoolean(L, true); } else { @@ -2298,9 +2319,9 @@ int PlayerFunctions::luaPlayerAddOutfitAddon(lua_State* L) { int PlayerFunctions::luaPlayerRemoveOutfit(lua_State* L) { // player:removeOutfit(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); + const uint16_t lookType = getNumber<uint16_t>(L, 2); pushBoolean(L, player->removeOutfit(lookType)); } else { lua_pushnil(L); @@ -2310,10 +2331,10 @@ int PlayerFunctions::luaPlayerRemoveOutfit(lua_State* L) { int PlayerFunctions::luaPlayerRemoveOutfitAddon(lua_State* L) { // player:removeOutfitAddon(lookType, addon) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); - uint8_t addon = getNumber<uint8_t>(L, 3); + const uint16_t lookType = getNumber<uint16_t>(L, 2); + const uint8_t addon = getNumber<uint8_t>(L, 3); pushBoolean(L, player->removeOutfitAddon(lookType, addon)); } else { lua_pushnil(L); @@ -2323,10 +2344,10 @@ int PlayerFunctions::luaPlayerRemoveOutfitAddon(lua_State* L) { int PlayerFunctions::luaPlayerHasOutfit(lua_State* L) { // player:hasOutfit(lookType[, addon = 0]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); - uint8_t addon = getNumber<uint8_t>(L, 3, 0); + const uint16_t lookType = getNumber<uint16_t>(L, 2); + const auto addon = getNumber<uint8_t>(L, 3, 0); pushBoolean(L, player->canWear(lookType, addon)); } else { lua_pushnil(L); @@ -2336,7 +2357,7 @@ int PlayerFunctions::luaPlayerHasOutfit(lua_State* L) { int PlayerFunctions::luaPlayerSendOutfitWindow(lua_State* L) { // player:sendOutfitWindow() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->sendOutfitWindow(); pushBoolean(L, true); @@ -2348,7 +2369,7 @@ int PlayerFunctions::luaPlayerSendOutfitWindow(lua_State* L) { int PlayerFunctions::luaPlayerAddMount(lua_State* L) { // player:addMount(mountId or mountName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2358,7 +2379,7 @@ int PlayerFunctions::luaPlayerAddMount(lua_State* L) { if (isNumber(L, 2)) { mountId = getNumber<uint8_t>(L, 2); } else { - const std::shared_ptr<Mount> mount = g_game().mounts.getMountByName(getString(L, 2)); + const auto &mount = g_game().mounts->getMountByName(getString(L, 2)); if (!mount) { lua_pushnil(L); return 1; @@ -2371,7 +2392,7 @@ int PlayerFunctions::luaPlayerAddMount(lua_State* L) { int PlayerFunctions::luaPlayerRemoveMount(lua_State* L) { // player:removeMount(mountId or mountName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2381,7 +2402,7 @@ int PlayerFunctions::luaPlayerRemoveMount(lua_State* L) { if (isNumber(L, 2)) { mountId = getNumber<uint8_t>(L, 2); } else { - const std::shared_ptr<Mount> mount = g_game().mounts.getMountByName(getString(L, 2)); + const auto &mount = g_game().mounts->getMountByName(getString(L, 2)); if (!mount) { lua_pushnil(L); return 1; @@ -2394,7 +2415,7 @@ int PlayerFunctions::luaPlayerRemoveMount(lua_State* L) { int PlayerFunctions::luaPlayerHasMount(lua_State* L) { // player:hasMount(mountId or mountName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2402,9 +2423,9 @@ int PlayerFunctions::luaPlayerHasMount(lua_State* L) { std::shared_ptr<Mount> mount = nullptr; if (isNumber(L, 2)) { - mount = g_game().mounts.getMountByID(getNumber<uint8_t>(L, 2)); + mount = g_game().mounts->getMountByID(getNumber<uint8_t>(L, 2)); } else { - mount = g_game().mounts.getMountByName(getString(L, 2)); + mount = g_game().mounts->getMountByName(getString(L, 2)); } if (mount) { @@ -2417,7 +2438,7 @@ int PlayerFunctions::luaPlayerHasMount(lua_State* L) { int PlayerFunctions::luaPlayerAddFamiliar(lua_State* L) { // player:addFamiliar(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->addFamiliar(getNumber<uint16_t>(L, 2)); pushBoolean(L, true); @@ -2429,9 +2450,9 @@ int PlayerFunctions::luaPlayerAddFamiliar(lua_State* L) { int PlayerFunctions::luaPlayerRemoveFamiliar(lua_State* L) { // player:removeFamiliar(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); + const uint16_t lookType = getNumber<uint16_t>(L, 2); pushBoolean(L, player->removeFamiliar(lookType)); } else { lua_pushnil(L); @@ -2441,9 +2462,9 @@ int PlayerFunctions::luaPlayerRemoveFamiliar(lua_State* L) { int PlayerFunctions::luaPlayerHasFamiliar(lua_State* L) { // player:hasFamiliar(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t lookType = getNumber<uint16_t>(L, 2); + const uint16_t lookType = getNumber<uint16_t>(L, 2); pushBoolean(L, player->canFamiliar(lookType)); } else { lua_pushnil(L); @@ -2453,7 +2474,7 @@ int PlayerFunctions::luaPlayerHasFamiliar(lua_State* L) { int PlayerFunctions::luaPlayerSetFamiliarLooktype(lua_State* L) { // player:setFamiliarLooktype(lookType) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setFamiliarLooktype(getNumber<uint16_t>(L, 2)); pushBoolean(L, true); @@ -2465,7 +2486,7 @@ int PlayerFunctions::luaPlayerSetFamiliarLooktype(lua_State* L) { int PlayerFunctions::luaPlayerGetFamiliarLooktype(lua_State* L) { // player:getFamiliarLooktype() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->defaultOutfit.lookFamiliarsType); } else { @@ -2476,7 +2497,7 @@ int PlayerFunctions::luaPlayerGetFamiliarLooktype(lua_State* L) { int PlayerFunctions::luaPlayerGetPremiumDays(lua_State* L) { // player:getPremiumDays() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player && player->getAccount()) { lua_pushnumber(L, player->getAccount()->getPremiumRemainingDays()); } else { @@ -2487,26 +2508,26 @@ int PlayerFunctions::luaPlayerGetPremiumDays(lua_State* L) { int PlayerFunctions::luaPlayerAddPremiumDays(lua_State* L) { // player:addPremiumDays(days) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { lua_pushnil(L); return 1; } - auto premiumDays = player->getAccount()->getPremiumRemainingDays(); + const auto premiumDays = player->getAccount()->getPremiumRemainingDays(); if (premiumDays == std::numeric_limits<uint16_t>::max()) { return 1; } - int32_t addDays = std::min<int32_t>(0xFFFE - premiumDays, getNumber<uint16_t>(L, 2)); + const int32_t addDays = std::min<int32_t>(0xFFFE - premiumDays, getNumber<uint16_t>(L, 2)); if (addDays <= 0) { return 1; } player->getAccount()->addPremiumDays(addDays); - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { return 1; } @@ -2516,26 +2537,26 @@ int PlayerFunctions::luaPlayerAddPremiumDays(lua_State* L) { int PlayerFunctions::luaPlayerRemovePremiumDays(lua_State* L) { // player:removePremiumDays(days) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { lua_pushnil(L); return 1; } - auto premiumDays = player->getAccount()->getPremiumRemainingDays(); + const auto premiumDays = player->getAccount()->getPremiumRemainingDays(); if (premiumDays == std::numeric_limits<uint16_t>::max()) { return 1; } - int32_t removeDays = std::min<int32_t>(0xFFFE - premiumDays, getNumber<uint16_t>(L, 2)); + const int32_t removeDays = std::min<int32_t>(0xFFFE - premiumDays, getNumber<uint16_t>(L, 2)); if (removeDays <= 0) { return 1; } player->getAccount()->addPremiumDays(-removeDays); - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { return 1; } @@ -2545,16 +2566,16 @@ int PlayerFunctions::luaPlayerRemovePremiumDays(lua_State* L) { int PlayerFunctions::luaPlayerGetTibiaCoins(lua_State* L) { // player:getTibiaCoins() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - auto [coins, result] = player->getAccount()->getCoins(enumToValue(CoinType::Normal)); + auto [coins, result] = player->getAccount()->getCoins(CoinType::Normal); - if (result == enumToValue(AccountErrors_t::Ok)) { + if (result == AccountErrors_t::Ok) { lua_pushnumber(L, coins); } @@ -2563,20 +2584,20 @@ int PlayerFunctions::luaPlayerGetTibiaCoins(lua_State* L) { int PlayerFunctions::luaPlayerAddTibiaCoins(lua_State* L) { // player:addTibiaCoins(coins) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - if (player->account->addCoins(enumToValue(CoinType::Normal), getNumber<uint32_t>(L, 2)) != enumToValue(AccountErrors_t::Ok)) { + if (player->account->addCoins(CoinType::Normal, getNumber<uint32_t>(L, 2)) != AccountErrors_t::Ok) { reportErrorFunc("Failed to add coins"); lua_pushnil(L); return 1; } - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { reportErrorFunc("Failed to save account"); lua_pushnil(L); return 1; @@ -2589,19 +2610,19 @@ int PlayerFunctions::luaPlayerAddTibiaCoins(lua_State* L) { int PlayerFunctions::luaPlayerRemoveTibiaCoins(lua_State* L) { // player:removeTibiaCoins(coins) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - if (player->account->removeCoins(enumToValue(CoinType::Normal), getNumber<uint32_t>(L, 2)) != enumToValue(AccountErrors_t::Ok)) { + if (player->account->removeCoins(CoinType::Normal, getNumber<uint32_t>(L, 2)) != AccountErrors_t::Ok) { reportErrorFunc("Failed to remove coins"); return 1; } - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { reportErrorFunc("Failed to save account"); lua_pushnil(L); return 1; @@ -2614,16 +2635,16 @@ int PlayerFunctions::luaPlayerRemoveTibiaCoins(lua_State* L) { int PlayerFunctions::luaPlayerGetTransferableCoins(lua_State* L) { // player:getTransferableCoins() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - auto [coins, result] = player->getAccount()->getCoins(enumToValue(CoinType::Transferable)); + auto [coins, result] = player->getAccount()->getCoins(CoinType::Transferable); - if (result == enumToValue(AccountErrors_t::Ok)) { + if (result == AccountErrors_t::Ok) { lua_pushnumber(L, coins); } @@ -2632,20 +2653,20 @@ int PlayerFunctions::luaPlayerGetTransferableCoins(lua_State* L) { int PlayerFunctions::luaPlayerAddTransferableCoins(lua_State* L) { // player:addTransferableCoins(coins) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - if (player->account->addCoins(enumToValue(CoinType::Transferable), getNumber<uint32_t>(L, 2)) != enumToValue(AccountErrors_t::Ok)) { + if (player->account->addCoins(CoinType::Transferable, getNumber<uint32_t>(L, 2)) != AccountErrors_t::Ok) { reportErrorFunc("failed to add transferable coins"); lua_pushnil(L); return 1; } - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { reportErrorFunc("failed to save account"); lua_pushnil(L); return 1; @@ -2658,20 +2679,20 @@ int PlayerFunctions::luaPlayerAddTransferableCoins(lua_State* L) { int PlayerFunctions::luaPlayerRemoveTransferableCoins(lua_State* L) { // player:removeTransferableCoins(coins) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player || !player->getAccount()) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); lua_pushnil(L); return 1; } - if (player->account->removeCoins(enumToValue(CoinType::Transferable), getNumber<uint32_t>(L, 2)) != enumToValue(AccountErrors_t::Ok)) { + if (player->account->removeCoins(CoinType::Transferable, getNumber<uint32_t>(L, 2)) != AccountErrors_t::Ok) { reportErrorFunc("failed to remove transferable coins"); lua_pushnil(L); return 1; } - if (player->getAccount()->save() != enumToValue(AccountErrors_t::Ok)) { + if (player->getAccount()->save() != AccountErrors_t::Ok) { reportErrorFunc("failed to save account"); lua_pushnil(L); return 1; @@ -2684,8 +2705,8 @@ int PlayerFunctions::luaPlayerRemoveTransferableCoins(lua_State* L) { int PlayerFunctions::luaPlayerHasBlessing(lua_State* L) { // player:hasBlessing(blessing) - uint8_t blessing = getNumber<uint8_t>(L, 2); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const uint8_t blessing = getNumber<uint8_t>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->hasBlessing(blessing)); } else { @@ -2696,14 +2717,14 @@ int PlayerFunctions::luaPlayerHasBlessing(lua_State* L) { int PlayerFunctions::luaPlayerAddBlessing(lua_State* L) { // player:addBlessing(blessing) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint8_t blessing = getNumber<uint8_t>(L, 2); - uint8_t count = getNumber<uint8_t>(L, 3); + const uint8_t blessing = getNumber<uint8_t>(L, 2); + const uint8_t count = getNumber<uint8_t>(L, 3); player->addBlessing(blessing, count); player->sendBlessStatus(); @@ -2713,14 +2734,14 @@ int PlayerFunctions::luaPlayerAddBlessing(lua_State* L) { int PlayerFunctions::luaPlayerRemoveBlessing(lua_State* L) { // player:removeBlessing(blessing) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - uint8_t blessing = getNumber<uint8_t>(L, 2); - uint8_t count = getNumber<uint8_t>(L, 3); + const uint8_t blessing = getNumber<uint8_t>(L, 2); + const uint8_t count = getNumber<uint8_t>(L, 3); if (!player->hasBlessing(blessing)) { pushBoolean(L, false); @@ -2734,7 +2755,7 @@ int PlayerFunctions::luaPlayerRemoveBlessing(lua_State* L) { int PlayerFunctions::luaPlayerGetBlessingCount(lua_State* L) { // player:getBlessingCount(index[, storeCount = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); uint8_t index = getNumber<uint8_t>(L, 2); if (index == 0) { index = 1; @@ -2750,14 +2771,14 @@ int PlayerFunctions::luaPlayerGetBlessingCount(lua_State* L) { int PlayerFunctions::luaPlayerCanLearnSpell(lua_State* L) { // player:canLearnSpell(spellName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } const std::string &spellName = getString(L, 2); - const auto spell = g_spells().getInstantSpellByName(spellName); + const auto &spell = g_spells().getInstantSpellByName(spellName); if (!spell) { reportErrorFunc("Spell \"" + spellName + "\" not found"); pushBoolean(L, false); @@ -2770,7 +2791,7 @@ int PlayerFunctions::luaPlayerCanLearnSpell(lua_State* L) { } const auto vocMap = spell->getVocMap(); - if (vocMap.count(player->getVocationId()) == 0) { + if (!vocMap.contains(player->getVocationId())) { pushBoolean(L, false); } else if (player->getLevel() < spell->getLevel()) { pushBoolean(L, false); @@ -2784,7 +2805,7 @@ int PlayerFunctions::luaPlayerCanLearnSpell(lua_State* L) { int PlayerFunctions::luaPlayerLearnSpell(lua_State* L) { // player:learnSpell(spellName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { const std::string &spellName = getString(L, 2); player->learnInstantSpell(spellName); @@ -2797,7 +2818,7 @@ int PlayerFunctions::luaPlayerLearnSpell(lua_State* L) { int PlayerFunctions::luaPlayerForgetSpell(lua_State* L) { // player:forgetSpell(spellName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { const std::string &spellName = getString(L, 2); player->forgetInstantSpell(spellName); @@ -2810,7 +2831,7 @@ int PlayerFunctions::luaPlayerForgetSpell(lua_State* L) { int PlayerFunctions::luaPlayerHasLearnedSpell(lua_State* L) { // player:hasLearnedSpell(spellName) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { const std::string &spellName = getString(L, 2); pushBoolean(L, player->hasLearnedInstantSpell(spellName)); @@ -2822,9 +2843,9 @@ int PlayerFunctions::luaPlayerHasLearnedSpell(lua_State* L) { int PlayerFunctions::luaPlayerSendTutorial(lua_State* L) { // player:sendTutorial(tutorialId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint8_t tutorialId = getNumber<uint8_t>(L, 2); + const uint8_t tutorialId = getNumber<uint8_t>(L, 2); player->sendTutorial(tutorialId); pushBoolean(L, true); } else { @@ -2835,14 +2856,14 @@ int PlayerFunctions::luaPlayerSendTutorial(lua_State* L) { int PlayerFunctions::luaPlayerOpenImbuementWindow(lua_State* L) { // player:openImbuementWindow(item) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 1; } - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -2855,7 +2876,7 @@ int PlayerFunctions::luaPlayerOpenImbuementWindow(lua_State* L) { int PlayerFunctions::luaPlayerCloseImbuementWindow(lua_State* L) { // player:closeImbuementWindow() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -2868,10 +2889,10 @@ int PlayerFunctions::luaPlayerCloseImbuementWindow(lua_State* L) { int PlayerFunctions::luaPlayerAddMapMark(lua_State* L) { // player:addMapMark(position, type, description) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { const Position &position = getPosition(L, 2); - uint8_t type = getNumber<uint8_t>(L, 3); + const uint8_t type = getNumber<uint8_t>(L, 3); const std::string &description = getString(L, 4); player->sendAddMarker(position, type, description); pushBoolean(L, true); @@ -2883,7 +2904,7 @@ int PlayerFunctions::luaPlayerAddMapMark(lua_State* L) { int PlayerFunctions::luaPlayerSave(lua_State* L) { // player:save() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { if (!player->isOffline()) { player->loginPosition = player->getPosition(); @@ -2897,7 +2918,7 @@ int PlayerFunctions::luaPlayerSave(lua_State* L) { int PlayerFunctions::luaPlayerPopupFYI(lua_State* L) { // player:popupFYI(message) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { const std::string &message = getString(L, 2); player->sendFYIBox(message); @@ -2910,7 +2931,7 @@ int PlayerFunctions::luaPlayerPopupFYI(lua_State* L) { int PlayerFunctions::luaPlayerIsPzLocked(lua_State* L) { // player:isPzLocked() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->isPzLocked()); } else { @@ -2921,7 +2942,7 @@ int PlayerFunctions::luaPlayerIsPzLocked(lua_State* L) { int PlayerFunctions::luaPlayerGetClient(lua_State* L) { // player:getClient() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_createtable(L, 0, 2); setField(L, "version", player->getProtocolVersion()); @@ -2934,7 +2955,7 @@ int PlayerFunctions::luaPlayerGetClient(lua_State* L) { int PlayerFunctions::luaPlayerGetHouse(lua_State* L) { // player:getHouse() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2952,7 +2973,7 @@ int PlayerFunctions::luaPlayerGetHouse(lua_State* L) { int PlayerFunctions::luaPlayerSendHouseWindow(lua_State* L) { // player:sendHouseWindow(house, listId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2964,7 +2985,7 @@ int PlayerFunctions::luaPlayerSendHouseWindow(lua_State* L) { return 1; } - uint32_t listId = getNumber<uint32_t>(L, 3); + const uint32_t listId = getNumber<uint32_t>(L, 3); player->sendHouseWindow(house, listId); pushBoolean(L, true); return 1; @@ -2972,7 +2993,7 @@ int PlayerFunctions::luaPlayerSendHouseWindow(lua_State* L) { int PlayerFunctions::luaPlayerSetEditHouse(lua_State* L) { // player:setEditHouse(house, listId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -2984,7 +3005,7 @@ int PlayerFunctions::luaPlayerSetEditHouse(lua_State* L) { return 1; } - uint32_t listId = getNumber<uint32_t>(L, 3); + const uint32_t listId = getNumber<uint32_t>(L, 3); player->setEditHouse(house, listId); pushBoolean(L, true); return 1; @@ -2992,13 +3013,13 @@ int PlayerFunctions::luaPlayerSetEditHouse(lua_State* L) { int PlayerFunctions::luaPlayerSetGhostMode(lua_State* L) { // player:setGhostMode(enabled) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - bool enabled = getBoolean(L, 2); + const bool enabled = getBoolean(L, 2); if (player->isInGhostMode() == enabled) { pushBoolean(L, true); return 1; @@ -3006,7 +3027,7 @@ int PlayerFunctions::luaPlayerSetGhostMode(lua_State* L) { player->switchGhostMode(); - std::shared_ptr<Tile> tile = player->getTile(); + const auto &tile = player->getTile(); const Position &position = player->getPosition(); for (const auto &spectator : Spectators().find<Player>(position, true)) { @@ -3028,14 +3049,12 @@ int PlayerFunctions::luaPlayerSetGhostMode(lua_State* L) { 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->vip()->notifyStatusChange(player, player->vip()->getStatus()); } } - IOLoginData::updateOnlineStatus(player->getGUID(), true); } pushBoolean(L, true); return 1; @@ -3043,13 +3062,13 @@ int PlayerFunctions::luaPlayerSetGhostMode(lua_State* L) { int PlayerFunctions::luaPlayerGetContainerId(lua_State* L) { // player:getContainerId(container) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 2); + const auto &container = getUserdataShared<Container>(L, 2); if (container) { lua_pushnumber(L, player->getContainerID(container)); } else { @@ -3060,13 +3079,13 @@ int PlayerFunctions::luaPlayerGetContainerId(lua_State* L) { int PlayerFunctions::luaPlayerGetContainerById(lua_State* L) { // player:getContainerById(id) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::shared_ptr<Container> container = player->getContainerByID(getNumber<uint8_t>(L, 2)); + const auto &container = player->getContainerByID(getNumber<uint8_t>(L, 2)); if (container) { pushUserdata<Container>(L, container); setMetatable(L, -1, "Container"); @@ -3078,7 +3097,7 @@ int PlayerFunctions::luaPlayerGetContainerById(lua_State* L) { int PlayerFunctions::luaPlayerGetContainerIndex(lua_State* L) { // player:getContainerIndex(id) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getContainerIndex(getNumber<uint8_t>(L, 2))); } else { @@ -3089,14 +3108,14 @@ int PlayerFunctions::luaPlayerGetContainerIndex(lua_State* L) { int PlayerFunctions::luaPlayerGetInstantSpells(lua_State* L) { // player:getInstantSpells() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } std::vector<std::shared_ptr<InstantSpell>> spells; - for (auto &[key, spell] : g_spells().getInstantSpells()) { + for (const auto &[key, spell] : g_spells().getInstantSpells()) { if (spell->canCast(player)) { spells.push_back(spell); } @@ -3105,7 +3124,7 @@ int PlayerFunctions::luaPlayerGetInstantSpells(lua_State* L) { lua_createtable(L, spells.size(), 0); int index = 0; - for (auto spell : spells) { + for (const auto &spell : spells) { pushInstantSpell(L, *spell); lua_rawseti(L, -2, ++index); } @@ -3114,8 +3133,8 @@ int PlayerFunctions::luaPlayerGetInstantSpells(lua_State* L) { int PlayerFunctions::luaPlayerCanCast(lua_State* L) { // player:canCast(spell) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); - const auto spell = getUserdataShared<InstantSpell>(L, 2); + const auto &player = getUserdataShared<Player>(L, 1); + const auto &spell = getUserdataShared<InstantSpell>(L, 2); if (player && spell) { pushBoolean(L, spell->canCast(player)); } else { @@ -3126,7 +3145,7 @@ int PlayerFunctions::luaPlayerCanCast(lua_State* L) { int PlayerFunctions::luaPlayerHasChaseMode(lua_State* L) { // player:hasChaseMode() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->chaseMode); } else { @@ -3137,7 +3156,7 @@ int PlayerFunctions::luaPlayerHasChaseMode(lua_State* L) { int PlayerFunctions::luaPlayerHasSecureMode(lua_State* L) { // player:hasSecureMode() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->secureMode); } else { @@ -3148,7 +3167,7 @@ int PlayerFunctions::luaPlayerHasSecureMode(lua_State* L) { int PlayerFunctions::luaPlayerGetFightMode(lua_State* L) { // player:getFightMode() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->fightMode); } else { @@ -3159,7 +3178,7 @@ int PlayerFunctions::luaPlayerGetFightMode(lua_State* L) { int PlayerFunctions::luaPlayerGetBaseXpGain(lua_State* L) { // player:getBaseXpGain() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getBaseXpGain()); } else { @@ -3170,7 +3189,7 @@ int PlayerFunctions::luaPlayerGetBaseXpGain(lua_State* L) { int PlayerFunctions::luaPlayerSetBaseXpGain(lua_State* L) { // player:setBaseXpGain(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setBaseXpGain(getNumber<uint16_t>(L, 2)); player->sendStats(); @@ -3183,7 +3202,7 @@ int PlayerFunctions::luaPlayerSetBaseXpGain(lua_State* L) { int PlayerFunctions::luaPlayerGetVoucherXpBoost(lua_State* L) { // player:getVoucherXpBoost() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getVoucherXpBoost()); } else { @@ -3194,7 +3213,7 @@ int PlayerFunctions::luaPlayerGetVoucherXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerSetVoucherXpBoost(lua_State* L) { // player:setVoucherXpBoost(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setVoucherXpBoost(getNumber<uint16_t>(L, 2)); player->sendStats(); @@ -3207,7 +3226,7 @@ int PlayerFunctions::luaPlayerSetVoucherXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerGetGrindingXpBoost(lua_State* L) { // player:getGrindingXpBoost() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getGrindingXpBoost()); } else { @@ -3218,7 +3237,7 @@ int PlayerFunctions::luaPlayerGetGrindingXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerSetGrindingXpBoost(lua_State* L) { // player:setGrindingXpBoost(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setGrindingXpBoost(getNumber<uint16_t>(L, 2)); player->sendStats(); @@ -3231,7 +3250,7 @@ int PlayerFunctions::luaPlayerSetGrindingXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerGetXpBoostPercent(lua_State* L) { // player:getXpBoostPercent() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getXpBoostPercent()); } else { @@ -3242,9 +3261,9 @@ int PlayerFunctions::luaPlayerGetXpBoostPercent(lua_State* L) { int PlayerFunctions::luaPlayerSetXpBoostPercent(lua_State* L) { // player:setXpBoostPercent(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t percent = getNumber<uint16_t>(L, 2); + const uint16_t percent = getNumber<uint16_t>(L, 2); player->setXpBoostPercent(percent); pushBoolean(L, true); } else { @@ -3255,7 +3274,7 @@ int PlayerFunctions::luaPlayerSetXpBoostPercent(lua_State* L) { int PlayerFunctions::luaPlayerGetStaminaXpBoost(lua_State* L) { // player:getStaminaXpBoost() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getStaminaXpBoost()); } else { @@ -3266,7 +3285,7 @@ int PlayerFunctions::luaPlayerGetStaminaXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerSetStaminaXpBoost(lua_State* L) { // player:setStaminaXpBoost(value) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { player->setStaminaXpBoost(getNumber<uint16_t>(L, 2)); player->sendStats(); @@ -3279,9 +3298,9 @@ int PlayerFunctions::luaPlayerSetStaminaXpBoost(lua_State* L) { int PlayerFunctions::luaPlayerSetXpBoostTime(lua_State* L) { // player:setXpBoostTime(timeLeft) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { - uint16_t timeLeft = getNumber<uint16_t>(L, 2); + const uint16_t timeLeft = getNumber<uint16_t>(L, 2); player->setXpBoostTime(timeLeft); player->sendStats(); pushBoolean(L, true); @@ -3293,7 +3312,7 @@ int PlayerFunctions::luaPlayerSetXpBoostTime(lua_State* L) { int PlayerFunctions::luaPlayerGetXpBoostTime(lua_State* L) { // player:getXpBoostTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getXpBoostTime()); } else { @@ -3304,7 +3323,7 @@ int PlayerFunctions::luaPlayerGetXpBoostTime(lua_State* L) { int PlayerFunctions::luaPlayerGetIdleTime(lua_State* L) { // player:getIdleTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { lua_pushnumber(L, player->getIdleTime()); } else { @@ -3315,7 +3334,7 @@ int PlayerFunctions::luaPlayerGetIdleTime(lua_State* L) { int PlayerFunctions::luaPlayerGetFreeBackpackSlots(lua_State* L) { // player:getFreeBackpackSlots() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); } @@ -3325,7 +3344,7 @@ int PlayerFunctions::luaPlayerGetFreeBackpackSlots(lua_State* L) { } int PlayerFunctions::luaPlayerIsOffline(lua_State* L) { - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player) { pushBoolean(L, player->isOffline()); } else { @@ -3337,7 +3356,7 @@ int PlayerFunctions::luaPlayerIsOffline(lua_State* L) { int PlayerFunctions::luaPlayerOpenMarket(lua_State* L) { // player:openMarket() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3351,7 +3370,7 @@ int PlayerFunctions::luaPlayerOpenMarket(lua_State* L) { // Forge int PlayerFunctions::luaPlayerOpenForge(lua_State* L) { // player:openForge() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3365,7 +3384,7 @@ int PlayerFunctions::luaPlayerOpenForge(lua_State* L) { int PlayerFunctions::luaPlayerCloseForge(lua_State* L) { // player:closeForge() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3379,7 +3398,7 @@ int PlayerFunctions::luaPlayerCloseForge(lua_State* L) { int PlayerFunctions::luaPlayerAddForgeDusts(lua_State* L) { // player:addForgeDusts(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3393,7 +3412,7 @@ int PlayerFunctions::luaPlayerAddForgeDusts(lua_State* L) { int PlayerFunctions::luaPlayerRemoveForgeDusts(lua_State* L) { // player:removeForgeDusts(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3407,7 +3426,7 @@ int PlayerFunctions::luaPlayerRemoveForgeDusts(lua_State* L) { int PlayerFunctions::luaPlayerGetForgeDusts(lua_State* L) { // player:getForgeDusts() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3420,7 +3439,7 @@ int PlayerFunctions::luaPlayerGetForgeDusts(lua_State* L) { int PlayerFunctions::luaPlayerSetForgeDusts(lua_State* L) { // player:setForgeDusts() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3434,7 +3453,7 @@ int PlayerFunctions::luaPlayerSetForgeDusts(lua_State* L) { int PlayerFunctions::luaPlayerAddForgeDustLevel(lua_State* L) { // player:addForgeDustLevel(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3448,7 +3467,7 @@ int PlayerFunctions::luaPlayerAddForgeDustLevel(lua_State* L) { int PlayerFunctions::luaPlayerRemoveForgeDustLevel(lua_State* L) { // player:removeForgeDustLevel(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3462,7 +3481,7 @@ int PlayerFunctions::luaPlayerRemoveForgeDustLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetForgeDustLevel(lua_State* L) { // player:getForgeDustLevel() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3475,7 +3494,7 @@ int PlayerFunctions::luaPlayerGetForgeDustLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetForgeSlivers(lua_State* L) { // player:getForgeSlivers() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3489,7 +3508,7 @@ int PlayerFunctions::luaPlayerGetForgeSlivers(lua_State* L) { int PlayerFunctions::luaPlayerGetForgeCores(lua_State* L) { // player:getForgeCores() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3503,14 +3522,14 @@ int PlayerFunctions::luaPlayerGetForgeCores(lua_State* L) { int PlayerFunctions::luaPlayerSetFaction(lua_State* L) { // player:setFaction(factionId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player == nullptr) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - Faction_t factionId = getNumber<Faction_t>(L, 2); + const Faction_t factionId = getNumber<Faction_t>(L, 2); player->setFaction(factionId); pushBoolean(L, true); return 1; @@ -3518,7 +3537,7 @@ int PlayerFunctions::luaPlayerSetFaction(lua_State* L) { int PlayerFunctions::luaPlayerGetFaction(lua_State* L) { // player:getFaction() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (player == nullptr) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3531,21 +3550,21 @@ int PlayerFunctions::luaPlayerGetFaction(lua_State* L) { int PlayerFunctions::luaPlayerIsUIExhausted(lua_State* L) { // player:isUIExhausted() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - uint16_t time = getNumber<uint16_t>(L, 2); + const uint16_t time = getNumber<uint16_t>(L, 2); pushBoolean(L, player->isUIExhausted(time)); return 1; } int PlayerFunctions::luaPlayerUpdateUIExhausted(lua_State* L) { // player:updateUIExhausted(exhaustionTime = 250) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3560,7 +3579,7 @@ int PlayerFunctions::luaPlayerUpdateUIExhausted(lua_State* L) { // Bosstiary Cooldown Timer int PlayerFunctions::luaPlayerBosstiaryCooldownTimer(lua_State* L) { // player:sendBosstiaryCooldownTimer() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3574,16 +3593,16 @@ int PlayerFunctions::luaPlayerBosstiaryCooldownTimer(lua_State* L) { int PlayerFunctions::luaPlayerGetBosstiaryLevel(lua_State* L) { // player:getBosstiaryLevel(name) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + if (const auto &player = getUserdataShared<Player>(L, 1); player) { - const auto mtype = g_monsters().getMonsterType(getString(L, 2)); + const auto &mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { - uint32_t bossId = mtype->info.raceid; + const uint32_t bossId = mtype->info.raceid; if (bossId == 0) { lua_pushnil(L); return 0; } - auto level = g_ioBosstiary().getBossCurrentLevel(player, bossId); + const auto level = g_ioBosstiary().getBossCurrentLevel(player, bossId); lua_pushnumber(L, level); } else { lua_pushnil(L); @@ -3596,16 +3615,16 @@ int PlayerFunctions::luaPlayerGetBosstiaryLevel(lua_State* L) { int PlayerFunctions::luaPlayerGetBosstiaryKills(lua_State* L) { // player:getBosstiaryKills(name) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + if (const auto &player = getUserdataShared<Player>(L, 1); player) { - const auto mtype = g_monsters().getMonsterType(getString(L, 2)); + const auto &mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { - uint32_t bossId = mtype->info.raceid; + const uint32_t bossId = mtype->info.raceid; if (bossId == 0) { lua_pushnil(L); return 0; } - uint32_t currentKills = player->getBestiaryKillCount(static_cast<uint16_t>(bossId)); + const uint32_t currentKills = player->getBestiaryKillCount(static_cast<uint16_t>(bossId)); lua_pushnumber(L, currentKills); } else { lua_pushnil(L); @@ -3618,9 +3637,9 @@ int PlayerFunctions::luaPlayerGetBosstiaryKills(lua_State* L) { int PlayerFunctions::luaPlayerAddBosstiaryKill(lua_State* L) { // player:addBosstiaryKill(name[, amount = 1]) - if (std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + if (const auto &player = getUserdataShared<Player>(L, 1); player) { - const auto mtype = g_monsters().getMonsterType(getString(L, 2)); + const auto &mtype = g_monsters().getMonsterType(getString(L, 2)); if (mtype) { g_ioBosstiary().addBosstiaryKill(player, mtype, getNumber<uint32_t>(L, 3, 1)); pushBoolean(L, true); @@ -3635,7 +3654,7 @@ int PlayerFunctions::luaPlayerAddBosstiaryKill(lua_State* L) { int PlayerFunctions::luaPlayerSetBossPoints(lua_State* L) { // player:setBossPoints() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3649,7 +3668,7 @@ int PlayerFunctions::luaPlayerSetBossPoints(lua_State* L) { int PlayerFunctions::luaPlayerSetRemoveBossTime(lua_State* L) { // player:setRemoveBossTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3663,36 +3682,36 @@ int PlayerFunctions::luaPlayerSetRemoveBossTime(lua_State* L) { int PlayerFunctions::luaPlayerGetSlotBossId(lua_State* L) { // player:getSlotBossId(slotId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - uint8_t slotId = getNumber<uint8_t>(L, 2); - auto bossId = player->getSlotBossId(slotId); + const uint8_t slotId = getNumber<uint8_t>(L, 2); + const auto bossId = player->getSlotBossId(slotId); lua_pushnumber(L, static_cast<lua_Number>(bossId)); return 1; } int PlayerFunctions::luaPlayerGetBossBonus(lua_State* L) { // player:getBossBonus(slotId) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - uint8_t slotId = getNumber<uint8_t>(L, 2); - auto bossId = player->getSlotBossId(slotId); + const uint8_t slotId = getNumber<uint8_t>(L, 2); + const auto bossId = player->getSlotBossId(slotId); - uint32_t playerBossPoints = player->getBossPoints(); - uint16_t currentBonus = g_ioBosstiary().calculateLootBonus(playerBossPoints); + const uint32_t playerBossPoints = player->getBossPoints(); + const uint16_t currentBonus = g_ioBosstiary().calculateLootBonus(playerBossPoints); - auto bossLevel = g_ioBosstiary().getBossCurrentLevel(player, bossId); - uint16_t bonusBoss = currentBonus + (bossLevel == 3 ? 25 : 0); + const auto bossLevel = g_ioBosstiary().getBossCurrentLevel(player, bossId); + const uint16_t bonusBoss = currentBonus + (bossLevel == 3 ? 25 : 0); lua_pushnumber(L, static_cast<lua_Number>(bonusBoss)); return 1; @@ -3700,15 +3719,15 @@ int PlayerFunctions::luaPlayerGetBossBonus(lua_State* L) { int PlayerFunctions::luaPlayerSendSingleSoundEffect(lua_State* L) { // player:sendSingleSoundEffect(soundId[, actor = true]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - SoundEffect_t soundEffect = getNumber<SoundEffect_t>(L, 2); - bool actor = getBoolean(L, 3, true); + const SoundEffect_t soundEffect = getNumber<SoundEffect_t>(L, 2); + const bool actor = getBoolean(L, 3, true); player->sendSingleSoundEffect(player->getPosition(), soundEffect, actor ? SourceEffect_t::OWN : SourceEffect_t::GLOBAL); pushBoolean(L, true); @@ -3717,16 +3736,16 @@ int PlayerFunctions::luaPlayerSendSingleSoundEffect(lua_State* L) { int PlayerFunctions::luaPlayerSendDoubleSoundEffect(lua_State* L) { // player:sendDoubleSoundEffect(mainSoundId, secondarySoundId[, actor = true]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - SoundEffect_t mainSoundEffect = getNumber<SoundEffect_t>(L, 2); - SoundEffect_t secondarySoundEffect = getNumber<SoundEffect_t>(L, 3); - bool actor = getBoolean(L, 4, true); + const SoundEffect_t mainSoundEffect = getNumber<SoundEffect_t>(L, 2); + const SoundEffect_t secondarySoundEffect = getNumber<SoundEffect_t>(L, 3); + const bool actor = getBoolean(L, 4, true); player->sendDoubleSoundEffect(player->getPosition(), mainSoundEffect, actor ? SourceEffect_t::OWN : SourceEffect_t::GLOBAL, secondarySoundEffect, actor ? SourceEffect_t::OWN : SourceEffect_t::GLOBAL); pushBoolean(L, true); @@ -3735,7 +3754,7 @@ int PlayerFunctions::luaPlayerSendDoubleSoundEffect(lua_State* L) { int PlayerFunctions::luaPlayerGetName(lua_State* L) { // player:getName() - const auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3748,7 +3767,7 @@ int PlayerFunctions::luaPlayerGetName(lua_State* L) { int PlayerFunctions::luaPlayerChangeName(lua_State* L) { // player:changeName(newName) - const auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3758,7 +3777,7 @@ int PlayerFunctions::luaPlayerChangeName(lua_State* L) { player->removePlayer(true, true); } player->kv()->remove("namelock"); - auto newName = getString(L, 2); + const auto newName = getString(L, 2); player->setName(newName); g_saveManager().savePlayer(player); return 1; @@ -3766,7 +3785,7 @@ int PlayerFunctions::luaPlayerChangeName(lua_State* L) { int PlayerFunctions::luaPlayerHasGroupFlag(lua_State* L) { // player:hasGroupFlag(flag) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3779,7 +3798,7 @@ int PlayerFunctions::luaPlayerHasGroupFlag(lua_State* L) { int PlayerFunctions::luaPlayerSetGroupFlag(lua_State* L) { // player:setGroupFlag(flag) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3792,7 +3811,7 @@ int PlayerFunctions::luaPlayerSetGroupFlag(lua_State* L) { int PlayerFunctions::luaPlayerRemoveGroupFlag(lua_State* L) { // player:removeGroupFlag(flag) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -3806,7 +3825,7 @@ int PlayerFunctions::luaPlayerRemoveGroupFlag(lua_State* L) { // Hazard system int PlayerFunctions::luaPlayerAddHazardSystemPoints(lua_State* L) { // player:setHazardSystemPoints(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); @@ -3820,7 +3839,7 @@ int PlayerFunctions::luaPlayerAddHazardSystemPoints(lua_State* L) { int PlayerFunctions::luaPlayerGetHazardSystemPoints(lua_State* L) { // player:getHazardSystemPoints() - const auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { pushBoolean(L, false); reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); @@ -3833,7 +3852,7 @@ int PlayerFunctions::luaPlayerGetHazardSystemPoints(lua_State* L) { int PlayerFunctions::luaPlayerSetLoyaltyBonus(lua_State* L) { // player:setLoyaltyBonus(amount) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3846,7 +3865,7 @@ int PlayerFunctions::luaPlayerSetLoyaltyBonus(lua_State* L) { int PlayerFunctions::luaPlayerGetLoyaltyBonus(lua_State* L) { // player:getLoyaltyBonus() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3858,7 +3877,7 @@ int PlayerFunctions::luaPlayerGetLoyaltyBonus(lua_State* L) { int PlayerFunctions::luaPlayerGetLoyaltyPoints(lua_State* L) { // player:getLoyaltyPoints() - const auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3870,7 +3889,7 @@ int PlayerFunctions::luaPlayerGetLoyaltyPoints(lua_State* L) { int PlayerFunctions::luaPlayerGetLoyaltyTitle(lua_State* L) { // player:getLoyaltyTitle() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3882,7 +3901,7 @@ int PlayerFunctions::luaPlayerGetLoyaltyTitle(lua_State* L) { int PlayerFunctions::luaPlayerSetLoyaltyTitle(lua_State* L) { // player:setLoyaltyTitle(name) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3896,13 +3915,13 @@ int PlayerFunctions::luaPlayerSetLoyaltyTitle(lua_State* L) { // Wheel of destiny system int PlayerFunctions::luaPlayerInstantSkillWOD(lua_State* L) { // player:instantSkillWOD(name[, value]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } - std::string name = getString(L, 2); + const std::string name = getString(L, 2); if (lua_gettop(L) == 2) { pushBoolean(L, player->wheel()->getInstant(name)); } else { @@ -3914,7 +3933,7 @@ int PlayerFunctions::luaPlayerInstantSkillWOD(lua_State* L) { int PlayerFunctions::luaPlayerUpgradeSpellWOD(lua_State* L) { // player:upgradeSpellsWOD([name[, add]]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3925,13 +3944,13 @@ int PlayerFunctions::luaPlayerUpgradeSpellWOD(lua_State* L) { return 1; } - std::string name = getString(L, 2); + const std::string name = getString(L, 2); if (lua_gettop(L) == 2) { lua_pushnumber(L, static_cast<lua_Number>(player->wheel()->getSpellUpgrade(name))); return 1; } - bool add = getBoolean(L, 3); + const bool add = getBoolean(L, 3); if (add) { player->wheel()->upgradeSpell(name); } else { @@ -3944,7 +3963,7 @@ int PlayerFunctions::luaPlayerUpgradeSpellWOD(lua_State* L) { int PlayerFunctions::luaPlayerRevelationStageWOD(lua_State* L) { // player:revelationStageWOD([name[, set]]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3955,13 +3974,13 @@ int PlayerFunctions::luaPlayerRevelationStageWOD(lua_State* L) { return 1; } - std::string name = getString(L, 2); + const std::string name = getString(L, 2); if (lua_gettop(L) == 2) { lua_pushnumber(L, static_cast<lua_Number>(player->wheel()->getStage(name))); return 1; } - bool value = getNumber<uint8_t>(L, 3); + const bool value = getNumber<uint8_t>(L, 3); player->wheel()->setSpellInstant(name, value); pushBoolean(L, true); @@ -3970,7 +3989,7 @@ int PlayerFunctions::luaPlayerRevelationStageWOD(lua_State* L) { int PlayerFunctions::luaPlayerReloadData(lua_State* L) { // player:reloadData() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -3987,7 +4006,7 @@ int PlayerFunctions::luaPlayerReloadData(lua_State* L) { int PlayerFunctions::luaPlayerOnThinkWheelOfDestiny(lua_State* L) { // player:onThinkWheelOfDestiny([force = false]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -4000,14 +4019,14 @@ int PlayerFunctions::luaPlayerOnThinkWheelOfDestiny(lua_State* L) { int PlayerFunctions::luaPlayerAvatarTimer(lua_State* L) { // player:avatarTimer([value]) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; } if (lua_gettop(L) == 1) { - lua_pushnumber(L, (lua_Number)player->wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR_SPELL)); + lua_pushnumber(L, static_cast<lua_Number>(player->wheel()->getOnThinkTimer(WheelOnThink_t::AVATAR_SPELL))); } else { player->wheel()->setOnThinkTimer(WheelOnThink_t::AVATAR_SPELL, getNumber<int64_t>(L, 2)); pushBoolean(L, true); @@ -4017,21 +4036,21 @@ int PlayerFunctions::luaPlayerAvatarTimer(lua_State* L) { int PlayerFunctions::luaPlayerGetWheelSpellAdditionalArea(lua_State* L) { // player:getWheelSpellAdditionalArea(spellname) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - auto spellName = getString(L, 2); + const auto spellName = getString(L, 2); if (spellName.empty()) { reportErrorFunc("Spell name is empty"); pushBoolean(L, false); return 0; } - auto spell = g_spells().getInstantSpellByName(spellName); + const auto &spell = g_spells().getInstantSpellByName(spellName); if (!spell) { reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); pushBoolean(L, false); @@ -4044,21 +4063,21 @@ int PlayerFunctions::luaPlayerGetWheelSpellAdditionalArea(lua_State* L) { int PlayerFunctions::luaPlayerGetWheelSpellAdditionalTarget(lua_State* L) { // player:getWheelSpellAdditionalTarget(spellname) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - auto spellName = getString(L, 2); + const auto spellName = getString(L, 2); if (spellName.empty()) { reportErrorFunc("Spell name is empty"); pushBoolean(L, false); return 0; } - auto spell = g_spells().getInstantSpellByName(spellName); + const auto &spell = g_spells().getInstantSpellByName(spellName); if (!spell) { reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); pushBoolean(L, false); @@ -4071,21 +4090,21 @@ int PlayerFunctions::luaPlayerGetWheelSpellAdditionalTarget(lua_State* L) { int PlayerFunctions::luaPlayerGetWheelSpellAdditionalDuration(lua_State* L) { // player:getWheelSpellAdditionalDuration(spellname) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); return 0; } - auto spellName = getString(L, 2); + const auto spellName = getString(L, 2); if (spellName.empty()) { reportErrorFunc("Spell name is empty"); pushBoolean(L, false); return 0; } - auto spell = g_spells().getInstantSpellByName(spellName); + const auto &spell = g_spells().getInstantSpellByName(spellName); if (!spell) { reportErrorFunc(getErrorDesc(LUA_ERROR_SPELL_NOT_FOUND)); pushBoolean(L, false); @@ -4098,7 +4117,7 @@ int PlayerFunctions::luaPlayerGetWheelSpellAdditionalDuration(lua_State* L) { int PlayerFunctions::luaPlayerUpdateConcoction(lua_State* L) { // player:updateConcoction(itemid, timeLeft) - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -4110,7 +4129,7 @@ int PlayerFunctions::luaPlayerUpdateConcoction(lua_State* L) { int PlayerFunctions::luaPlayerClearSpellCooldowns(lua_State* L) { // player:clearSpellCooldowns() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { lua_pushnil(L); return 1; @@ -4122,7 +4141,7 @@ int PlayerFunctions::luaPlayerClearSpellCooldowns(lua_State* L) { int PlayerFunctions::luaPlayerIsVip(lua_State* L) { // player:isVip() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -4134,7 +4153,7 @@ int PlayerFunctions::luaPlayerIsVip(lua_State* L) { int PlayerFunctions::luaPlayerGetVipDays(lua_State* L) { // player:getVipDays() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -4147,7 +4166,7 @@ int PlayerFunctions::luaPlayerGetVipDays(lua_State* L) { int PlayerFunctions::luaPlayerGetVipTime(lua_State* L) { // player:getVipTime() - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -4160,7 +4179,7 @@ int PlayerFunctions::luaPlayerGetVipTime(lua_State* L) { int PlayerFunctions::luaPlayerKV(lua_State* L) { // player:kv() - auto player = getUserdataShared<Player>(L, 1); + const auto &player = getUserdataShared<Player>(L, 1); if (!player) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); pushBoolean(L, false); @@ -4180,7 +4199,7 @@ int PlayerFunctions::luaPlayerGetStoreInbox(lua_State* L) { return 1; } - if (auto item = player->getStoreInbox()) { + if (const auto &item = player->getStoreInbox()) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); } else { @@ -4223,8 +4242,12 @@ int PlayerFunctions::luaPlayerAddAchievement(lua_State* L) { achievementId = g_game().getAchievementByName(getString(L, 2)).id; } - player->sendTakeScreenshot(SCREENSHOT_TYPE_ACHIEVEMENT); - pushBoolean(L, player->achiev()->add(achievementId, getBoolean(L, 3, true))); + const bool success = player->achiev()->add(achievementId, getBoolean(L, 3, true)); + if (success) { + player->sendTakeScreenshot(SCREENSHOT_TYPE_ACHIEVEMENT); + } + + pushBoolean(L, success); return 1; } @@ -4267,7 +4290,7 @@ int PlayerFunctions::luaPlayerAddAchievementPoints(lua_State* L) { return 1; } - auto points = getNumber<uint16_t>(L, 2); + const auto points = getNumber<uint16_t>(L, 2); if (points > 0) { player->achiev()->addPoints(points); } @@ -4283,7 +4306,7 @@ int PlayerFunctions::luaPlayerRemoveAchievementPoints(lua_State* L) { return 1; } - auto points = getNumber<uint16_t>(L, 2); + const auto points = getNumber<uint16_t>(L, 2); if (points > 0) { player->achiev()->removePoints(points); } @@ -4325,7 +4348,7 @@ int PlayerFunctions::luaPlayerGetTitles(lua_State* L) { return 1; } - auto playerTitles = player->title()->getUnlockedTitles(); + const auto playerTitles = player->title()->getUnlockedTitles(); lua_createtable(L, static_cast<int>(playerTitles.size()), 0); int index = 0; @@ -4366,14 +4389,14 @@ int PlayerFunctions::luaPlayerCreateTransactionSummary(lua_State* L) { return 1; } - auto type = getNumber<uint8_t>(L, 2, 0); + const auto type = getNumber<uint8_t>(L, 2, 0); if (type == 0) { reportErrorFunc(getErrorDesc(LUA_ERROR_VARIANT_NOT_FOUND)); return 1; } - auto amount = getNumber<uint16_t>(L, 3, 1); - auto id = getString(L, 4, ""); + const auto amount = getNumber<uint16_t>(L, 3, 1); + const auto id = getString(L, 4, ""); player->cyclopedia()->updateStoreSummary(type, amount, id); pushBoolean(L, true); @@ -4388,8 +4411,54 @@ int PlayerFunctions::luaPlayerTakeScreenshot(lua_State* L) { return 1; } - auto screenshotType = getNumber<Screenshot_t>(L, 2); + const auto screenshotType = getNumber<Screenshot_t>(L, 2); player->sendTakeScreenshot(screenshotType); pushBoolean(L, true); return 1; } + +int PlayerFunctions::luaPlayerSendIconBakragore(lua_State* L) { + // player:sendIconBakragore() + const auto &player = getUserdataShared<Player>(L, 1); + if (!player) { + lua_pushnil(L); + return 1; + } + + const auto iconType = getNumber<IconBakragore>(L, 2); + player->sendIconBakragore(iconType); + pushBoolean(L, true); + return 1; +} + +int PlayerFunctions::luaPlayerRemoveIconBakragore(lua_State* L) { + // player:removeIconBakragore(iconType or nil for remove all bakragore icons) + const auto &player = getUserdataShared<Player>(L, 1); + if (!player) { + lua_pushnil(L); + return 1; + } + + const auto iconType = getNumber<IconBakragore>(L, 2, IconBakragore::None); + if (iconType == IconBakragore::None) { + player->removeBakragoreIcons(); + } else { + player->removeBakragoreIcon(iconType); + } + + pushBoolean(L, true); + return 1; +} + +int PlayerFunctions::luaPlayerSendCreatureAppear(lua_State* L) { + auto player = getUserdataShared<Player>(L, 1); + if (!player) { + reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); + return 1; + } + + bool isLogin = getBoolean(L, 2, false); + player->sendCreatureAppear(player, player->getPosition(), isLogin); + pushBoolean(L, true); + return 1; +} diff --git a/src/lua/functions/creatures/player/player_functions.hpp b/src/lua/functions/creatures/player/player_functions.hpp index 3912753a1..090e4371a 100644 --- a/src/lua/functions/creatures/player/player_functions.hpp +++ b/src/lua/functions/creatures/player/player_functions.hpp @@ -16,8 +16,16 @@ #include "lua/functions/creatures/player/party_functions.hpp" #include "lua/functions/creatures/player/vocation_functions.hpp" +enum class PlayerIcon : uint8_t; +enum class IconBakragore : uint8_t; + class PlayerFunctions final : LuaScriptInterface { -private: + explicit PlayerFunctions(lua_State* L) : + LuaScriptInterface("PlayerFunctions") { + init(L); + } + ~PlayerFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Player", "Creature", PlayerFunctions::luaPlayerCreate); registerMetaMethod(L, "Player", "__eq", PlayerFunctions::luaUserdataCompare); @@ -376,6 +384,9 @@ class PlayerFunctions final : LuaScriptInterface { registerMethod(L, "Player", "createTransactionSummary", PlayerFunctions::luaPlayerCreateTransactionSummary); registerMethod(L, "Player", "takeScreenshot", PlayerFunctions::luaPlayerTakeScreenshot); + registerMethod(L, "Player", "sendIconBakragore", PlayerFunctions::luaPlayerSendIconBakragore); + registerMethod(L, "Player", "removeIconBakragore", PlayerFunctions::luaPlayerRemoveIconBakragore); + registerMethod(L, "Player", "sendCreatureAppear", PlayerFunctions::luaPlayerSendCreatureAppear); GroupFunctions::init(L); GuildFunctions::init(L); @@ -740,6 +751,10 @@ class PlayerFunctions final : LuaScriptInterface { static int luaPlayerCreateTransactionSummary(lua_State* L); static int luaPlayerTakeScreenshot(lua_State* L); + static int luaPlayerSendIconBakragore(lua_State* L); + static int luaPlayerRemoveIconBakragore(lua_State* L); + + static int luaPlayerSendCreatureAppear(lua_State* L); friend class CreatureFunctions; }; diff --git a/src/lua/functions/creatures/player/vocation_functions.cpp b/src/lua/functions/creatures/player/vocation_functions.cpp index 15cf888bf..59b2a0d87 100644 --- a/src/lua/functions/creatures/player/vocation_functions.cpp +++ b/src/lua/functions/creatures/player/vocation_functions.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/creatures/player/vocation_functions.hpp" #include "creatures/players/vocations/vocation.hpp" -#include "lua/functions/creatures/player/vocation_functions.hpp" int VocationFunctions::luaVocationCreate(lua_State* L) { // Vocation(id or name) @@ -21,7 +20,7 @@ int VocationFunctions::luaVocationCreate(lua_State* L) { vocationId = g_vocations().getVocationId(getString(L, 2)); } - std::shared_ptr<Vocation> vocation = g_vocations().getVocation(vocationId); + const auto &vocation = g_vocations().getVocation(vocationId); if (vocation) { pushUserdata<Vocation>(L, vocation); setMetatable(L, -1, "Vocation"); @@ -33,7 +32,7 @@ int VocationFunctions::luaVocationCreate(lua_State* L) { int VocationFunctions::luaVocationGetId(lua_State* L) { // vocation:getId() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getId()); } else { @@ -44,7 +43,7 @@ int VocationFunctions::luaVocationGetId(lua_State* L) { int VocationFunctions::luaVocationGetClientId(lua_State* L) { // vocation:getClientId() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getClientId()); } else { @@ -55,7 +54,7 @@ int VocationFunctions::luaVocationGetClientId(lua_State* L) { int VocationFunctions::luaVocationGetBaseId(lua_State* L) { // vocation:getBaseId() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getBaseId()); } else { @@ -66,7 +65,7 @@ int VocationFunctions::luaVocationGetBaseId(lua_State* L) { int VocationFunctions::luaVocationGetName(lua_State* L) { // vocation:getName() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { pushString(L, vocation->getVocName()); } else { @@ -77,7 +76,7 @@ int VocationFunctions::luaVocationGetName(lua_State* L) { int VocationFunctions::luaVocationGetDescription(lua_State* L) { // vocation:getDescription() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { pushString(L, vocation->getVocDescription()); } else { @@ -88,10 +87,10 @@ int VocationFunctions::luaVocationGetDescription(lua_State* L) { int VocationFunctions::luaVocationGetRequiredSkillTries(lua_State* L) { // vocation:getRequiredSkillTries(skillType, skillLevel) - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { - skills_t skillType = getNumber<skills_t>(L, 2); - uint16_t skillLevel = getNumber<uint16_t>(L, 3); + const skills_t skillType = getNumber<skills_t>(L, 2); + const uint16_t skillLevel = getNumber<uint16_t>(L, 3); lua_pushnumber(L, vocation->getReqSkillTries(skillType, skillLevel)); } else { lua_pushnil(L); @@ -101,9 +100,9 @@ int VocationFunctions::luaVocationGetRequiredSkillTries(lua_State* L) { int VocationFunctions::luaVocationGetRequiredManaSpent(lua_State* L) { // vocation:getRequiredManaSpent(magicLevel) - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { - uint32_t magicLevel = getNumber<uint32_t>(L, 2); + const uint32_t magicLevel = getNumber<uint32_t>(L, 2); lua_pushnumber(L, vocation->getReqMana(magicLevel)); } else { lua_pushnil(L); @@ -113,7 +112,7 @@ int VocationFunctions::luaVocationGetRequiredManaSpent(lua_State* L) { int VocationFunctions::luaVocationGetCapacityGain(lua_State* L) { // vocation:getCapacityGain() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getCapGain()); } else { @@ -124,7 +123,7 @@ int VocationFunctions::luaVocationGetCapacityGain(lua_State* L) { int VocationFunctions::luaVocationGetHealthGain(lua_State* L) { // vocation:getHealthGain() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getHPGain()); } else { @@ -135,7 +134,7 @@ int VocationFunctions::luaVocationGetHealthGain(lua_State* L) { int VocationFunctions::luaVocationGetHealthGainTicks(lua_State* L) { // vocation:getHealthGainTicks() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getHealthGainTicks()); } else { @@ -146,7 +145,7 @@ int VocationFunctions::luaVocationGetHealthGainTicks(lua_State* L) { int VocationFunctions::luaVocationGetHealthGainAmount(lua_State* L) { // vocation:getHealthGainAmount() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getHealthGainAmount()); } else { @@ -157,7 +156,7 @@ int VocationFunctions::luaVocationGetHealthGainAmount(lua_State* L) { int VocationFunctions::luaVocationGetManaGain(lua_State* L) { // vocation:getManaGain() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getManaGain()); } else { @@ -168,7 +167,7 @@ int VocationFunctions::luaVocationGetManaGain(lua_State* L) { int VocationFunctions::luaVocationGetManaGainTicks(lua_State* L) { // vocation:getManaGainTicks() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getManaGainTicks()); } else { @@ -179,7 +178,7 @@ int VocationFunctions::luaVocationGetManaGainTicks(lua_State* L) { int VocationFunctions::luaVocationGetManaGainAmount(lua_State* L) { // vocation:getManaGainAmount() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getManaGainAmount()); } else { @@ -190,7 +189,7 @@ int VocationFunctions::luaVocationGetManaGainAmount(lua_State* L) { int VocationFunctions::luaVocationGetMaxSoul(lua_State* L) { // vocation:getMaxSoul() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getSoulMax()); } else { @@ -201,7 +200,7 @@ int VocationFunctions::luaVocationGetMaxSoul(lua_State* L) { int VocationFunctions::luaVocationGetSoulGainTicks(lua_State* L) { // vocation:getSoulGainTicks() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getSoulGainTicks()); } else { @@ -212,7 +211,7 @@ int VocationFunctions::luaVocationGetSoulGainTicks(lua_State* L) { int VocationFunctions::luaVocationGetBaseAttackSpeed(lua_State* L) { // vocation:getBaseAttackSpeed() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getBaseAttackSpeed()); } else { @@ -223,7 +222,7 @@ int VocationFunctions::luaVocationGetBaseAttackSpeed(lua_State* L) { int VocationFunctions::luaVocationGetAttackSpeed(lua_State* L) { // vocation:getAttackSpeed() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getAttackSpeed()); } else { @@ -234,7 +233,7 @@ int VocationFunctions::luaVocationGetAttackSpeed(lua_State* L) { int VocationFunctions::luaVocationGetBaseSpeed(lua_State* L) { // vocation:getBaseSpeed() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (vocation) { lua_pushnumber(L, vocation->getBaseSpeed()); } else { @@ -245,19 +244,19 @@ int VocationFunctions::luaVocationGetBaseSpeed(lua_State* L) { int VocationFunctions::luaVocationGetDemotion(lua_State* L) { // vocation:getDemotion() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (!vocation) { lua_pushnil(L); return 1; } - uint16_t fromId = vocation->getFromVocation(); + const uint16_t fromId = vocation->getFromVocation(); if (fromId == VOCATION_NONE) { lua_pushnil(L); return 1; } - std::shared_ptr<Vocation> demotedVocation = g_vocations().getVocation(fromId); + const auto &demotedVocation = g_vocations().getVocation(fromId); if (demotedVocation && demotedVocation != vocation) { pushUserdata<Vocation>(L, demotedVocation); setMetatable(L, -1, "Vocation"); @@ -269,19 +268,19 @@ int VocationFunctions::luaVocationGetDemotion(lua_State* L) { int VocationFunctions::luaVocationGetPromotion(lua_State* L) { // vocation:getPromotion() - std::shared_ptr<Vocation> vocation = getUserdataShared<Vocation>(L, 1); + const auto &vocation = getUserdataShared<Vocation>(L, 1); if (!vocation) { lua_pushnil(L); return 1; } - uint16_t promotedId = g_vocations().getPromotedVocation(vocation->getId()); + const uint16_t promotedId = g_vocations().getPromotedVocation(vocation->getId()); if (promotedId == VOCATION_NONE) { lua_pushnil(L); return 1; } - std::shared_ptr<Vocation> promotedVocation = g_vocations().getVocation(promotedId); + const auto &promotedVocation = g_vocations().getVocation(promotedId); if (promotedVocation && promotedVocation != vocation) { pushUserdata<Vocation>(L, promotedVocation); setMetatable(L, -1, "Vocation"); diff --git a/src/lua/functions/creatures/player/vocation_functions.hpp b/src/lua/functions/creatures/player/vocation_functions.hpp index 0895f6ac8..7d98131ec 100644 --- a/src/lua/functions/creatures/player/vocation_functions.hpp +++ b/src/lua/functions/creatures/player/vocation_functions.hpp @@ -13,6 +13,12 @@ class VocationFunctions final : LuaScriptInterface { public: + explicit VocationFunctions(lua_State* L) : + LuaScriptInterface("VocationFunctions") { + init(L); + } + ~VocationFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Vocation", "", VocationFunctions::luaVocationCreate); registerMetaMethod(L, "Vocation", "__eq", VocationFunctions::luaUserdataCompare); diff --git a/src/lua/functions/events/action_functions.cpp b/src/lua/functions/events/action_functions.cpp index 31b202465..a21ab37eb 100644 --- a/src/lua/functions/events/action_functions.cpp +++ b/src/lua/functions/events/action_functions.cpp @@ -7,16 +7,15 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/events/action_functions.hpp" #include "lua/creature/actions.hpp" -#include "lua/functions/events/action_functions.hpp" #include "game/game.hpp" #include "items/item.hpp" int ActionFunctions::luaCreateAction(lua_State* L) { // Action() - auto action = std::make_shared<Action>(getScriptEnv()->getScriptInterface()); + const auto action = std::make_shared<Action>(getScriptEnv()->getScriptInterface()); pushUserdata<Action>(L, action); setMetatable(L, -1, "Action"); return 1; @@ -24,7 +23,7 @@ int ActionFunctions::luaCreateAction(lua_State* L) { int ActionFunctions::luaActionOnUse(lua_State* L) { // action:onUse(callback) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { if (!action->loadCallback()) { pushBoolean(L, false); @@ -41,7 +40,7 @@ int ActionFunctions::luaActionOnUse(lua_State* L) { int ActionFunctions::luaActionRegister(lua_State* L) { // action:register() - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { if (!action->isLoadedCallback()) { pushBoolean(L, false); @@ -58,9 +57,9 @@ int ActionFunctions::luaActionRegister(lua_State* L) { int ActionFunctions::luaActionItemId(lua_State* L) { // action:id(ids) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { action->setItemIdsVector(getNumber<uint16_t>(L, 2 + i)); @@ -78,9 +77,9 @@ int ActionFunctions::luaActionItemId(lua_State* L) { int ActionFunctions::luaActionActionId(lua_State* L) { // action:aid(aids) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { action->setActionIdsVector(getNumber<uint16_t>(L, 2 + i)); @@ -98,9 +97,9 @@ int ActionFunctions::luaActionActionId(lua_State* L) { int ActionFunctions::luaActionUniqueId(lua_State* L) { // action:uid(uids) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { action->setUniqueIdsVector(getNumber<uint16_t>(L, 2 + i)); @@ -122,17 +121,17 @@ int ActionFunctions::luaActionPosition(lua_State* L) { * @param itemId or @param itemName = if item id or string name is set, the item is created on position (if not exists), this variable is nil by default * action:position(positions, itemId or name) */ - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (!action) { reportErrorFunc(getErrorDesc(LUA_ERROR_ACTION_NOT_FOUND)); pushBoolean(L, false); return 1; } - Position position = getPosition(L, 2); + const Position position = getPosition(L, 2); // 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; + if (const int parameters = lua_gettop(L) - 1; parameters > 1 && isNumber(L, 2)) { for (int i = 0; i < parameters; ++i) { action->setPositionsVector(getPosition(L, 2 + i)); @@ -179,7 +178,7 @@ int ActionFunctions::luaActionPosition(lua_State* L) { int ActionFunctions::luaActionAllowFarUse(lua_State* L) { // action:allowFarUse(bool) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { action->setAllowFarUse(getBoolean(L, 2)); pushBoolean(L, true); @@ -192,7 +191,7 @@ int ActionFunctions::luaActionAllowFarUse(lua_State* L) { int ActionFunctions::luaActionBlockWalls(lua_State* L) { // action:blockWalls(bool) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { action->setCheckLineOfSight(getBoolean(L, 2)); pushBoolean(L, true); @@ -205,7 +204,7 @@ int ActionFunctions::luaActionBlockWalls(lua_State* L) { int ActionFunctions::luaActionCheckFloor(lua_State* L) { // action:checkFloor(bool) - const auto action = getUserdataShared<Action>(L, 1); + const auto &action = getUserdataShared<Action>(L, 1); if (action) { action->setCheckFloor(getBoolean(L, 2)); pushBoolean(L, true); diff --git a/src/lua/functions/events/action_functions.hpp b/src/lua/functions/events/action_functions.hpp index 952ee746a..0816ca9d3 100644 --- a/src/lua/functions/events/action_functions.hpp +++ b/src/lua/functions/events/action_functions.hpp @@ -13,6 +13,12 @@ class ActionFunctions final : LuaScriptInterface { public: + explicit ActionFunctions(lua_State* L) : + LuaScriptInterface("ActionFunctions") { + init(L); + } + ~ActionFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Action", "", ActionFunctions::luaCreateAction); registerMethod(L, "Action", "onUse", ActionFunctions::luaActionOnUse); diff --git a/src/lua/functions/events/creature_event_functions.cpp b/src/lua/functions/events/creature_event_functions.cpp index 7edbabad1..ea4c05758 100644 --- a/src/lua/functions/events/creature_event_functions.cpp +++ b/src/lua/functions/events/creature_event_functions.cpp @@ -7,15 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/events/creature_event_functions.hpp" #include "lua/creature/creatureevent.hpp" -#include "lua/functions/events/creature_event_functions.hpp" #include "utils/tools.hpp" int CreatureEventFunctions::luaCreateCreatureEvent(lua_State* L) { // CreatureEvent(eventName) - auto creatureEvent = std::make_shared<CreatureEvent>(getScriptEnv()->getScriptInterface()); + const auto creatureEvent = std::make_shared<CreatureEvent>(getScriptEnv()->getScriptInterface()); creatureEvent->setName(getString(L, 2)); pushUserdata<CreatureEvent>(L, creatureEvent); setMetatable(L, -1, "CreatureEvent"); @@ -24,10 +23,10 @@ int CreatureEventFunctions::luaCreateCreatureEvent(lua_State* L) { int CreatureEventFunctions::luaCreatureEventType(lua_State* L) { // creatureevent:type(callback) - const auto creatureEvent = getUserdataShared<CreatureEvent>(L, 1); + const auto &creatureEvent = getUserdataShared<CreatureEvent>(L, 1); if (creatureEvent) { std::string typeName = getString(L, 2); - std::string tmpStr = asLowerCaseString(typeName); + const std::string tmpStr = asLowerCaseString(typeName); if (tmpStr == "login") { creatureEvent->setEventType(CREATURE_EVENT_LOGIN); } else if (tmpStr == "logout") { @@ -68,7 +67,7 @@ int CreatureEventFunctions::luaCreatureEventType(lua_State* L) { int CreatureEventFunctions::luaCreatureEventRegister(lua_State* L) { // creatureevent:register() - const auto creatureEvent = getUserdataShared<CreatureEvent>(L, 1); + const auto &creatureEvent = getUserdataShared<CreatureEvent>(L, 1); if (creatureEvent) { if (!creatureEvent->isLoadedCallback()) { pushBoolean(L, false); @@ -83,7 +82,7 @@ int CreatureEventFunctions::luaCreatureEventRegister(lua_State* L) { int CreatureEventFunctions::luaCreatureEventOnCallback(lua_State* L) { // creatureevent:onLogin / logout / etc. (callback) - const auto creatureEvent = getUserdataShared<CreatureEvent>(L, 1); + const auto &creatureEvent = getUserdataShared<CreatureEvent>(L, 1); if (creatureEvent) { if (!creatureEvent->loadCallback()) { pushBoolean(L, false); diff --git a/src/lua/functions/events/creature_event_functions.hpp b/src/lua/functions/events/creature_event_functions.hpp index 64b9e6e4e..f605d517f 100644 --- a/src/lua/functions/events/creature_event_functions.hpp +++ b/src/lua/functions/events/creature_event_functions.hpp @@ -13,6 +13,12 @@ class CreatureEventFunctions final : LuaScriptInterface { public: + explicit CreatureEventFunctions(lua_State* L) : + LuaScriptInterface("CreatureEventFunctions") { + init(L); + } + ~CreatureEventFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "CreatureEvent", "", CreatureEventFunctions::luaCreateCreatureEvent); registerMethod(L, "CreatureEvent", "type", CreatureEventFunctions::luaCreatureEventType); diff --git a/src/lua/functions/events/event_callback_functions.cpp b/src/lua/functions/events/event_callback_functions.cpp index 54457f436..db59092f3 100644 --- a/src/lua/functions/events/event_callback_functions.cpp +++ b/src/lua/functions/events/event_callback_functions.cpp @@ -7,8 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/events/event_callback_functions.hpp" #include "lua/callbacks/event_callback.hpp" @@ -34,14 +32,21 @@ void EventCallbackFunctions::init(lua_State* luaState) { } int EventCallbackFunctions::luaEventCallbackCreate(lua_State* luaState) { - const auto eventCallback = std::make_shared<EventCallback>(getScriptEnv()->getScriptInterface()); + const auto &callbackName = getString(luaState, 2); + if (callbackName.empty()) { + reportErrorFunc("Invalid callback name"); + return 1; + } + + bool skipDuplicationCheck = getBoolean(luaState, 3, false); + const auto eventCallback = std::make_shared<EventCallback>(getScriptEnv()->getScriptInterface(), callbackName, skipDuplicationCheck); pushUserdata<EventCallback>(luaState, eventCallback); setMetatable(luaState, -1, "EventCallback"); return 1; } int EventCallbackFunctions::luaEventCallbackType(lua_State* luaState) { - auto callback = getUserdataShared<EventCallback>(luaState, 1); + const auto &callback = getUserdataShared<EventCallback>(luaState, 1); if (!callback) { reportErrorFunc("EventCallback is nil"); return 0; @@ -72,9 +77,8 @@ int EventCallbackFunctions::luaEventCallbackType(lua_State* luaState) { } int EventCallbackFunctions::luaEventCallbackRegister(lua_State* luaState) { - auto callback = getUserdataShared<EventCallback>(luaState, 1); + const auto &callback = getUserdataShared<EventCallback>(luaState, 1); if (!callback) { - reportErrorFunc("EventCallback is nil, failed to register script"); return 0; } @@ -82,6 +86,11 @@ int EventCallbackFunctions::luaEventCallbackRegister(lua_State* luaState) { return 0; } + if (g_callbacks().isCallbackRegistered(callback)) { + reportErrorFunc(fmt::format("EventCallback is duplicated for event with name: {}", callback->getName())); + return 0; + } + g_callbacks().addCallback(callback); pushBoolean(luaState, true); return 1; @@ -89,9 +98,8 @@ int EventCallbackFunctions::luaEventCallbackRegister(lua_State* luaState) { // Callback functions int EventCallbackFunctions::luaEventCallbackLoad(lua_State* luaState) { - auto callback = getUserdataShared<EventCallback>(luaState, 1); + const auto &callback = getUserdataShared<EventCallback>(luaState, 1); if (!callback) { - reportErrorFunc("EventCallback is nil"); return 1; } diff --git a/src/lua/functions/events/event_callback_functions.hpp b/src/lua/functions/events/event_callback_functions.hpp index a5fa9e890..9623a5216 100644 --- a/src/lua/functions/events/event_callback_functions.hpp +++ b/src/lua/functions/events/event_callback_functions.hpp @@ -18,8 +18,14 @@ * @details This class encapsulates the Lua binding functions related to event callbacks, * allowing for interaction between the C++ codebase and Lua scripts. */ -class EventCallbackFunctions : public LuaScriptInterface { +class EventCallbackFunctions final : public LuaScriptInterface { public: + explicit EventCallbackFunctions(lua_State* L) : + LuaScriptInterface("EventCallbackFunctions") { + init(L); + } + ~EventCallbackFunctions() override = default; + /** * @brief Initializes the Lua state with the event callback functions. * diff --git a/src/lua/functions/events/events_functions.hpp b/src/lua/functions/events/events_functions.hpp index 6830b7c1a..4a4e3570a 100644 --- a/src/lua/functions/events/events_functions.hpp +++ b/src/lua/functions/events/events_functions.hpp @@ -20,6 +20,12 @@ class EventFunctions final : LuaScriptInterface { public: + explicit EventFunctions(lua_State* L) : + LuaScriptInterface("EventFunctions") { + init(L); + } + ~EventFunctions() override = default; + static void init(lua_State* L) { ActionFunctions::init(L); CreatureEventFunctions::init(L); @@ -30,6 +36,4 @@ class EventFunctions final : LuaScriptInterface { EventCallbackFunctions::init(L); /* Move, Creature, Talk, Global events goes all here */ } - -private: }; diff --git a/src/lua/functions/events/events_scheduler_functions.cpp b/src/lua/functions/events/events_scheduler_functions.cpp index e26794e21..7b9e7709d 100644 --- a/src/lua/functions/events/events_scheduler_functions.cpp +++ b/src/lua/functions/events/events_scheduler_functions.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/events/events_scheduler_functions.hpp" #include "game/scheduling/events_scheduler.hpp" -#include "lua/functions/events/events_scheduler_functions.hpp" int EventsSchedulerFunctions::luaEventsSchedulergetEventSLoot(lua_State* L) { // EventsScheduler.getEventSLoot diff --git a/src/lua/functions/events/events_scheduler_functions.hpp b/src/lua/functions/events/events_scheduler_functions.hpp index bedbf16b4..9059bf1fd 100644 --- a/src/lua/functions/events/events_scheduler_functions.hpp +++ b/src/lua/functions/events/events_scheduler_functions.hpp @@ -13,6 +13,12 @@ class EventsSchedulerFunctions final : private LuaScriptInterface { public: + explicit EventsSchedulerFunctions(lua_State* L) : + LuaScriptInterface("EventsSchedulerFunctions") { + init(L); + } + ~EventsSchedulerFunctions() override = default; + static void init(lua_State* L) { registerTable(L, "EventsScheduler"); diff --git a/src/lua/functions/events/global_event_functions.cpp b/src/lua/functions/events/global_event_functions.cpp index 129a466e9..32c9eccf2 100644 --- a/src/lua/functions/events/global_event_functions.cpp +++ b/src/lua/functions/events/global_event_functions.cpp @@ -7,12 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/events/global_event_functions.hpp" + #include "game/game.hpp" #include "lua/global/globalevent.hpp" -#include "lua/scripts/scripts.hpp" #include "utils/tools.hpp" int GlobalEventFunctions::luaCreateGlobalEvent(lua_State* L) { @@ -26,10 +24,10 @@ int GlobalEventFunctions::luaCreateGlobalEvent(lua_State* L) { int GlobalEventFunctions::luaGlobalEventType(lua_State* L) { // globalevent:type(callback) - const auto global = getUserdataShared<GlobalEvent>(L, 1); + const auto &global = getUserdataShared<GlobalEvent>(L, 1); if (global) { - std::string typeName = getString(L, 2); - std::string tmpStr = asLowerCaseString(typeName); + const std::string typeName = getString(L, 2); + const std::string tmpStr = asLowerCaseString(typeName); if (tmpStr == "startup") { global->setEventType(GLOBALEVENT_STARTUP); } else if (tmpStr == "shutdown") { @@ -56,7 +54,7 @@ int GlobalEventFunctions::luaGlobalEventType(lua_State* L) { int GlobalEventFunctions::luaGlobalEventRegister(lua_State* L) { // globalevent:register() - const auto globalevent = getUserdataShared<GlobalEvent>(L, 1); + const auto &globalevent = getUserdataShared<GlobalEvent>(L, 1); if (globalevent) { if (!globalevent->isLoadedCallback()) { pushBoolean(L, false); @@ -76,7 +74,7 @@ int GlobalEventFunctions::luaGlobalEventRegister(lua_State* L) { int GlobalEventFunctions::luaGlobalEventOnCallback(lua_State* L) { // globalevent:onThink / record / etc. (callback) - const auto globalevent = getUserdataShared<GlobalEvent>(L, 1); + const auto &globalevent = getUserdataShared<GlobalEvent>(L, 1); if (globalevent) { if (!globalevent->loadCallback()) { pushBoolean(L, false); @@ -91,12 +89,12 @@ int GlobalEventFunctions::luaGlobalEventOnCallback(lua_State* L) { int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { // globalevent:time(time) - const auto globalevent = getUserdataShared<GlobalEvent>(L, 1); + const auto &globalevent = getUserdataShared<GlobalEvent>(L, 1); if (globalevent) { std::string timer = getString(L, 2); - std::vector<int32_t> params = vectorAtoi(explodeString(timer, ":")); + const std::vector<int32_t> params = vectorAtoi(explodeString(timer, ":")); - int32_t hour = params.front(); + const int32_t hour = params.front(); if (hour < 0 || hour > 23) { g_logger().error("[GlobalEventFunctions::luaGlobalEventTime] - " "Invalid hour {} for globalevent with name: {}", @@ -131,13 +129,13 @@ int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { } } - time_t current_time = time(nullptr); + const time_t current_time = time(nullptr); tm* timeinfo = localtime(¤t_time); timeinfo->tm_hour = hour; timeinfo->tm_min = min; timeinfo->tm_sec = sec; - time_t difference = static_cast<time_t>(difftime(mktime(timeinfo), current_time)); + auto difference = static_cast<time_t>(difftime(mktime(timeinfo), current_time)); // If the difference is negative, add 86400 seconds (1 day) to it if (difference < 0) { difference += 86400; @@ -154,7 +152,7 @@ int GlobalEventFunctions::luaGlobalEventTime(lua_State* L) { int GlobalEventFunctions::luaGlobalEventInterval(lua_State* L) { // globalevent:interval(interval) - const auto globalevent = getUserdataShared<GlobalEvent>(L, 1); + const auto &globalevent = getUserdataShared<GlobalEvent>(L, 1); if (globalevent) { globalevent->setInterval(getNumber<uint32_t>(L, 2)); globalevent->setNextExecution(OTSYS_TIME() + getNumber<uint32_t>(L, 2)); diff --git a/src/lua/functions/events/global_event_functions.hpp b/src/lua/functions/events/global_event_functions.hpp index e04072a24..41fc57fdf 100644 --- a/src/lua/functions/events/global_event_functions.hpp +++ b/src/lua/functions/events/global_event_functions.hpp @@ -13,6 +13,12 @@ class GlobalEventFunctions final : LuaScriptInterface { public: + explicit GlobalEventFunctions(lua_State* L) : + LuaScriptInterface("GlobalEventFunctions") { + init(L); + } + ~GlobalEventFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "GlobalEvent", "", GlobalEventFunctions::luaCreateGlobalEvent); registerMethod(L, "GlobalEvent", "type", GlobalEventFunctions::luaGlobalEventType); diff --git a/src/lua/functions/events/move_event_functions.cpp b/src/lua/functions/events/move_event_functions.cpp index 8340dded9..ac7727fb2 100644 --- a/src/lua/functions/events/move_event_functions.cpp +++ b/src/lua/functions/events/move_event_functions.cpp @@ -7,11 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/events/move_event_functions.hpp" #include "creatures/creature.hpp" #include "lua/creature/movement.hpp" -#include "lua/functions/events/move_event_functions.hpp" +#include "utils/tools.hpp" int MoveEventFunctions::luaCreateMoveEvent(lua_State* L) { // MoveEvent() @@ -23,10 +23,10 @@ int MoveEventFunctions::luaCreateMoveEvent(lua_State* L) { int MoveEventFunctions::luaMoveEventType(lua_State* L) { // moveevent:type(callback) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { std::string typeName = getString(L, 2); - std::string tmpStr = asLowerCaseString(typeName); + const std::string tmpStr = asLowerCaseString(typeName); if (tmpStr == "stepin") { moveevent->setEventType(MOVE_EVENT_STEP_IN); moveevent->stepFunction = moveevent->StepInField; @@ -60,7 +60,7 @@ int MoveEventFunctions::luaMoveEventType(lua_State* L) { int MoveEventFunctions::luaMoveEventRegister(lua_State* L) { // moveevent:register() - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { // If not scripted, register item event // Example: unscripted_equipments.lua @@ -78,7 +78,7 @@ int MoveEventFunctions::luaMoveEventRegister(lua_State* L) { int MoveEventFunctions::luaMoveEventOnCallback(lua_State* L) { // moveevent:onEquip / deEquip / etc. (callback) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { if (!moveevent->loadCallback()) { pushBoolean(L, false); @@ -94,7 +94,7 @@ int MoveEventFunctions::luaMoveEventOnCallback(lua_State* L) { int MoveEventFunctions::luaMoveEventSlot(lua_State* L) { // moveevent:slot(slot) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (!moveevent) { lua_pushnil(L); return 1; @@ -139,7 +139,7 @@ int MoveEventFunctions::luaMoveEventSlot(lua_State* L) { int MoveEventFunctions::luaMoveEventLevel(lua_State* L) { // moveevent:level(lvl) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { moveevent->setRequiredLevel(getNumber<uint32_t>(L, 2)); moveevent->setWieldInfo(WIELDINFO_LEVEL); @@ -152,7 +152,7 @@ int MoveEventFunctions::luaMoveEventLevel(lua_State* L) { int MoveEventFunctions::luaMoveEventMagLevel(lua_State* L) { // moveevent:magicLevel(lvl) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { moveevent->setRequiredMagLevel(getNumber<uint32_t>(L, 2)); moveevent->setWieldInfo(WIELDINFO_MAGLV); @@ -165,7 +165,7 @@ int MoveEventFunctions::luaMoveEventMagLevel(lua_State* L) { int MoveEventFunctions::luaMoveEventPremium(lua_State* L) { // moveevent:premium(bool) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { moveevent->setNeedPremium(getBoolean(L, 2)); moveevent->setWieldInfo(WIELDINFO_PREMIUM); @@ -178,7 +178,7 @@ int MoveEventFunctions::luaMoveEventPremium(lua_State* L) { int MoveEventFunctions::luaMoveEventVocation(lua_State* L) { // moveevent:vocation(vocName[, showInDescription = false, lastVoc = false]) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { moveevent->addVocEquipMap(getString(L, 2)); moveevent->setWieldInfo(WIELDINFO_VOCREQ); @@ -217,9 +217,9 @@ int MoveEventFunctions::luaMoveEventVocation(lua_State* L) { int MoveEventFunctions::luaMoveEventItemId(lua_State* L) { // moveevent:id(ids) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { moveevent->setItemId(getNumber<uint32_t>(L, 2 + i)); @@ -236,9 +236,9 @@ int MoveEventFunctions::luaMoveEventItemId(lua_State* L) { int MoveEventFunctions::luaMoveEventActionId(lua_State* L) { // moveevent:aid(ids) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { moveevent->setActionId(getNumber<uint32_t>(L, 2 + i)); @@ -255,9 +255,9 @@ int MoveEventFunctions::luaMoveEventActionId(lua_State* L) { int MoveEventFunctions::luaMoveEventUniqueId(lua_State* L) { // moveevent:uid(ids) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { moveevent->setUniqueId(getNumber<uint32_t>(L, 2 + i)); @@ -274,9 +274,9 @@ int MoveEventFunctions::luaMoveEventUniqueId(lua_State* L) { int MoveEventFunctions::luaMoveEventPosition(lua_State* L) { // moveevent:position(positions) - const auto moveevent = getUserdataShared<MoveEvent>(L, 1); + const auto &moveevent = getUserdataShared<MoveEvent>(L, 1); if (moveevent) { - int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc + const int parameters = lua_gettop(L) - 1; // - 1 because self is a parameter aswell, which we want to skip ofc if (parameters > 1) { for (int i = 0; i < parameters; ++i) { moveevent->setPosition(getPosition(L, 2 + i)); diff --git a/src/lua/functions/events/move_event_functions.hpp b/src/lua/functions/events/move_event_functions.hpp index 6e6412bec..202006257 100644 --- a/src/lua/functions/events/move_event_functions.hpp +++ b/src/lua/functions/events/move_event_functions.hpp @@ -13,6 +13,12 @@ class MoveEventFunctions final : LuaScriptInterface { public: + explicit MoveEventFunctions(lua_State* L) : + LuaScriptInterface("MoveEventFunctions") { + init(L); + } + ~MoveEventFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "MoveEvent", "", MoveEventFunctions::luaCreateMoveEvent); registerMethod(L, "MoveEvent", "type", MoveEventFunctions::luaMoveEventType); diff --git a/src/lua/functions/events/talk_action_functions.cpp b/src/lua/functions/events/talk_action_functions.cpp index 559e251eb..1b87fec4b 100644 --- a/src/lua/functions/events/talk_action_functions.cpp +++ b/src/lua/functions/events/talk_action_functions.cpp @@ -7,11 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/events/talk_action_functions.hpp" #include "account/account.hpp" #include "lua/creature/talkaction.hpp" -#include "lua/functions/events/talk_action_functions.hpp" #include "utils/tools.hpp" #include "enums/account_group_type.hpp" @@ -23,7 +22,7 @@ int TalkActionFunctions::luaCreateTalkAction(lua_State* L) { wordsVector.push_back(getString(L, i)); } - auto talkactionSharedPtr = std::make_shared<TalkAction>(getScriptEnv()->getScriptInterface()); + const auto talkactionSharedPtr = std::make_shared<TalkAction>(getScriptEnv()->getScriptInterface()); talkactionSharedPtr->setWords(wordsVector); pushUserdata<TalkAction>(L, talkactionSharedPtr); setMetatable(L, -1, "TalkAction"); @@ -32,7 +31,7 @@ int TalkActionFunctions::luaCreateTalkAction(lua_State* L) { int TalkActionFunctions::luaTalkActionOnSay(lua_State* L) { // talkAction:onSay(callback) - auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -49,7 +48,7 @@ int TalkActionFunctions::luaTalkActionOnSay(lua_State* L) { int TalkActionFunctions::luaTalkActionGroupType(lua_State* L) { // talkAction:groupType(GroupType = GROUP_TYPE_NORMAL) - auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -57,7 +56,7 @@ int TalkActionFunctions::luaTalkActionGroupType(lua_State* L) { } GroupType groupType; - int type = lua_type(L, 2); + const int type = lua_type(L, 2); if (type == LUA_TNUMBER) { groupType = enumFromValue<GroupType>(getNumber<uint8_t>(L, 2)); } else if (type == LUA_TSTRING) { @@ -75,13 +74,13 @@ int TalkActionFunctions::luaTalkActionGroupType(lua_State* L) { } else if (strValue == "god") { groupType = GROUP_TYPE_GOD; } else { - auto string = fmt::format("Invalid group type string value {} for group type for script: {}", strValue, getScriptEnv()->getScriptInterface()->getLoadingScriptName()); + const auto string = fmt::format("Invalid group type string value {} for group type for script: {}", strValue, getScriptEnv()->getScriptInterface()->getLoadingScriptName()); reportErrorFunc(string); pushBoolean(L, false); return 1; } } else { - auto string = fmt::format("Expected number or string value for group type for script: {}", getScriptEnv()->getScriptInterface()->getLoadingScriptName()); + const auto string = fmt::format("Expected number or string value for group type for script: {}", getScriptEnv()->getScriptInterface()->getLoadingScriptName()); reportErrorFunc(string); pushBoolean(L, false); return 1; @@ -94,7 +93,7 @@ int TalkActionFunctions::luaTalkActionGroupType(lua_State* L) { int TalkActionFunctions::luaTalkActionRegister(lua_State* L) { // talkAction:register() - auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -107,7 +106,7 @@ int TalkActionFunctions::luaTalkActionRegister(lua_State* L) { } if (talkactionSharedPtr->getGroupType() == GROUP_TYPE_NONE) { - auto string = fmt::format("TalkAction with name {} does't have groupType", talkactionSharedPtr->getWords()); + const auto string = fmt::format("TalkAction with name {} does't have groupType", talkactionSharedPtr->getWords()); reportErrorFunc(string); pushBoolean(L, false); return 1; @@ -119,7 +118,7 @@ int TalkActionFunctions::luaTalkActionRegister(lua_State* L) { int TalkActionFunctions::luaTalkActionSeparator(lua_State* L) { // talkAction:separator(sep) - auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -133,7 +132,7 @@ int TalkActionFunctions::luaTalkActionSeparator(lua_State* L) { int TalkActionFunctions::luaTalkActionGetName(lua_State* L) { // local name = talkAction:getName() - const auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -146,7 +145,7 @@ int TalkActionFunctions::luaTalkActionGetName(lua_State* L) { int TalkActionFunctions::luaTalkActionGetDescription(lua_State* L) { // local description = talkAction:getDescription() - const auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -159,7 +158,7 @@ int TalkActionFunctions::luaTalkActionGetDescription(lua_State* L) { int TalkActionFunctions::luaTalkActionSetDescription(lua_State* L) { // local description = talkAction:setDescription() - auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); @@ -173,7 +172,7 @@ int TalkActionFunctions::luaTalkActionSetDescription(lua_State* L) { int TalkActionFunctions::luaTalkActionGetGroupType(lua_State* L) { // local groupType = talkAction:getGroupType() - const auto talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); + const auto &talkactionSharedPtr = getUserdataShared<TalkAction>(L, 1); if (!talkactionSharedPtr) { reportErrorFunc(getErrorDesc(LUA_ERROR_TALK_ACTION_NOT_FOUND)); pushBoolean(L, false); diff --git a/src/lua/functions/events/talk_action_functions.hpp b/src/lua/functions/events/talk_action_functions.hpp index 384688b47..487f2046d 100644 --- a/src/lua/functions/events/talk_action_functions.hpp +++ b/src/lua/functions/events/talk_action_functions.hpp @@ -13,6 +13,12 @@ class TalkActionFunctions final : LuaScriptInterface { public: + explicit TalkActionFunctions(lua_State* L) : + LuaScriptInterface("TalkActionFunctions") { + init(L); + } + ~TalkActionFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "TalkAction", "", TalkActionFunctions::luaCreateTalkAction); registerMethod(L, "TalkAction", "onSay", TalkActionFunctions::luaTalkActionOnSay); diff --git a/src/lua/functions/items/container_functions.cpp b/src/lua/functions/items/container_functions.cpp index a2251de64..8a0a84e31 100644 --- a/src/lua/functions/items/container_functions.cpp +++ b/src/lua/functions/items/container_functions.cpp @@ -7,17 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/items/container_functions.hpp" #include "game/game.hpp" #include "items/item.hpp" -#include "lua/functions/items/container_functions.hpp" +#include "utils/tools.hpp" int ContainerFunctions::luaContainerCreate(lua_State* L) { // Container(uid) - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); - std::shared_ptr<Container> container = getScriptEnv()->getContainerByUID(id); + const auto &container = getScriptEnv()->getContainerByUID(id); if (container) { pushUserdata(L, container); setMetatable(L, -1, "Container"); @@ -29,7 +29,7 @@ int ContainerFunctions::luaContainerCreate(lua_State* L) { int ContainerFunctions::luaContainerGetSize(lua_State* L) { // container:getSize() - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { lua_pushnumber(L, container->size()); } else { @@ -51,7 +51,7 @@ int ContainerFunctions::luaContainerGetMaxCapacity(lua_State* L) { int ContainerFunctions::luaContainerGetCapacity(lua_State* L) { // container:getCapacity() - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { lua_pushnumber(L, container->capacity()); } else { @@ -62,17 +62,17 @@ int ContainerFunctions::luaContainerGetCapacity(lua_State* L) { int ContainerFunctions::luaContainerGetEmptySlots(lua_State* L) { // container:getEmptySlots([recursive = false]) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; } uint32_t slots = container->capacity() - container->size(); - bool recursive = getBoolean(L, 2, false); + const bool recursive = getBoolean(L, 2, false); if (recursive) { for (ContainerIterator it = container->iterator(); it.hasNext(); it.advance()) { - if (std::shared_ptr<Container> tmpContainer = (*it)->getContainer()) { + if (const auto &tmpContainer = (*it)->getContainer()) { slots += tmpContainer->capacity() - tmpContainer->size(); } } @@ -83,7 +83,7 @@ int ContainerFunctions::luaContainerGetEmptySlots(lua_State* L) { int ContainerFunctions::luaContainerGetItemHoldingCount(lua_State* L) { // container:getItemHoldingCount() - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { lua_pushnumber(L, container->getItemHoldingCount()); } else { @@ -94,14 +94,14 @@ int ContainerFunctions::luaContainerGetItemHoldingCount(lua_State* L) { int ContainerFunctions::luaContainerGetItem(lua_State* L) { // container:getItem(index) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; } - uint32_t index = getNumber<uint32_t>(L, 2); - std::shared_ptr<Item> item = container->getItemByIndex(index); + const uint32_t index = getNumber<uint32_t>(L, 2); + const auto &item = container->getItemByIndex(index); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -113,8 +113,8 @@ int ContainerFunctions::luaContainerGetItem(lua_State* L) { int ContainerFunctions::luaContainerHasItem(lua_State* L) { // container:hasItem(item) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &item = getUserdataShared<Item>(L, 2); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { pushBoolean(L, container->isHoldingItem(item)); } else { @@ -125,7 +125,7 @@ int ContainerFunctions::luaContainerHasItem(lua_State* L) { int ContainerFunctions::luaContainerAddItem(lua_State* L) { // container:addItem(itemId[, count/subType = 1[, index = INDEX_WHEREEVER[, flags = 0]]]) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); reportErrorFunc("Container is nullptr"); @@ -144,21 +144,21 @@ int ContainerFunctions::luaContainerAddItem(lua_State* L) { } } - uint32_t count = getNumber<uint32_t>(L, 3, 1); + auto count = getNumber<uint32_t>(L, 3, 1); const ItemType &it = Item::items[itemId]; if (it.stackable) { count = std::min<uint16_t>(count, it.stackSize); } - std::shared_ptr<Item> item = Item::CreateItem(itemId, count); + const auto &item = Item::CreateItem(itemId, count); if (!item) { lua_pushnil(L); reportErrorFunc("Item is nullptr"); return 1; } - int32_t index = getNumber<int32_t>(L, 4, INDEX_WHEREEVER); - uint32_t flags = getNumber<uint32_t>(L, 5, 0); + const auto index = getNumber<int32_t>(L, 4, INDEX_WHEREEVER); + const auto flags = getNumber<uint32_t>(L, 5, 0); ReturnValue ret = g_game().internalAddItem(container, item, index, flags); if (ret == RETURNVALUE_NOERROR) { @@ -166,19 +166,20 @@ int ContainerFunctions::luaContainerAddItem(lua_State* L) { setItemMetatable(L, -1, item); } else { reportErrorFunc(fmt::format("Cannot add item to container, error code: '{}'", getReturnMessage(ret))); + pushBoolean(L, false); } return 1; } int ContainerFunctions::luaContainerAddItemEx(lua_State* L) { // container:addItemEx(item[, index = INDEX_WHEREEVER[, flags = 0]]) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; @@ -190,8 +191,8 @@ int ContainerFunctions::luaContainerAddItemEx(lua_State* L) { return 1; } - int32_t index = getNumber<int32_t>(L, 3, INDEX_WHEREEVER); - uint32_t flags = getNumber<uint32_t>(L, 4, 0); + const auto index = getNumber<int32_t>(L, 3, INDEX_WHEREEVER); + const auto flags = getNumber<uint32_t>(L, 4, 0); ReturnValue ret = g_game().internalAddItem(container, item, index, flags); if (ret == RETURNVALUE_NOERROR) { ScriptEnvironment::removeTempItem(item); @@ -202,7 +203,7 @@ int ContainerFunctions::luaContainerAddItemEx(lua_State* L) { int ContainerFunctions::luaContainerGetCorpseOwner(lua_State* L) { // container:getCorpseOwner() - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { lua_pushnumber(L, container->getCorpseOwner()); } else { @@ -213,7 +214,7 @@ int ContainerFunctions::luaContainerGetCorpseOwner(lua_State* L) { int ContainerFunctions::luaContainerGetItemCountById(lua_State* L) { // container:getItemCountById(itemId[, subType = -1]) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; @@ -230,14 +231,14 @@ int ContainerFunctions::luaContainerGetItemCountById(lua_State* L) { } } - int32_t subType = getNumber<int32_t>(L, 3, -1); + const auto subType = getNumber<int32_t>(L, 3, -1); lua_pushnumber(L, container->getItemTypeCount(itemId, subType)); return 1; } int ContainerFunctions::luaContainerGetContentDescription(lua_State* L) { // container:getContentDescription([oldProtocol]) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (container) { pushString(L, container->getContentDescription(getBoolean(L, 2, false))); } else { @@ -248,19 +249,19 @@ int ContainerFunctions::luaContainerGetContentDescription(lua_State* L) { int ContainerFunctions::luaContainerGetItems(lua_State* L) { // container:getItems([recursive = false]) - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; } - bool recursive = getBoolean(L, 2, false); - std::vector<std::shared_ptr<Item>> items = container->getItems(recursive); + const bool recursive = getBoolean(L, 2, false); + const std::vector<std::shared_ptr<Item>> items = container->getItems(recursive); lua_createtable(L, static_cast<int>(items.size()), 0); int index = 0; - for (std::shared_ptr<Item> item : items) { + for (const auto &item : items) { index++; pushUserdata(L, item); setItemMetatable(L, -1, item); @@ -271,14 +272,14 @@ int ContainerFunctions::luaContainerGetItems(lua_State* L) { int ContainerFunctions::luaContainerRegisterReward(lua_State* L) { // container:registerReward() - std::shared_ptr<Container> container = getUserdataShared<Container>(L, 1); + const auto &container = getUserdataShared<Container>(L, 1); if (!container) { lua_pushnil(L); return 1; } - int64_t rewardId = getTimeMsNow(); - std::shared_ptr<Item> rewardContainer = Item::CreateItem(ITEM_REWARD_CONTAINER); + const int64_t rewardId = getTimeMsNow(); + const auto &rewardContainer = Item::CreateItem(ITEM_REWARD_CONTAINER); rewardContainer->setAttribute(ItemAttribute_t::DATE, rewardId); container->setAttribute(ItemAttribute_t::DATE, rewardId); container->internalAddThing(rewardContainer); diff --git a/src/lua/functions/items/container_functions.hpp b/src/lua/functions/items/container_functions.hpp index 568018b45..52bb33e6b 100644 --- a/src/lua/functions/items/container_functions.hpp +++ b/src/lua/functions/items/container_functions.hpp @@ -12,8 +12,13 @@ #include "lua/scripts/luascript.hpp" class ContainerFunctions final : LuaScriptInterface { -public: private: + explicit ContainerFunctions(lua_State* L) : + LuaScriptInterface("ContainerFunctions") { + init(L); + } + ~ContainerFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Container", "Item", ContainerFunctions::luaContainerCreate); registerMetaMethod(L, "Container", "__eq", ContainerFunctions::luaUserdataCompare); diff --git a/src/lua/functions/items/imbuement_functions.cpp b/src/lua/functions/items/imbuement_functions.cpp index f24a3f564..cf01295ed 100644 --- a/src/lua/functions/items/imbuement_functions.cpp +++ b/src/lua/functions/items/imbuement_functions.cpp @@ -7,15 +7,14 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/items/imbuement_functions.hpp" #include "items/weapons/weapons.hpp" #include "creatures/players/imbuements/imbuements.hpp" -#include "lua/functions/items/imbuement_functions.hpp" int ImbuementFunctions::luaCreateImbuement(lua_State* L) { // Imbuement(id) - uint16_t imbuementId = getNumber<uint16_t>(L, 2); + const uint16_t imbuementId = getNumber<uint16_t>(L, 2); Imbuement* imbuement = g_imbuements().getImbuement(imbuementId); if (imbuement) { @@ -29,7 +28,7 @@ int ImbuementFunctions::luaCreateImbuement(lua_State* L) { int ImbuementFunctions::luaImbuementGetName(lua_State* L) { // imbuement:getName() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (imbuement) { pushString(L, imbuement->getName()); } else { @@ -40,7 +39,7 @@ int ImbuementFunctions::luaImbuementGetName(lua_State* L) { int ImbuementFunctions::luaImbuementGetId(lua_State* L) { // imbuement:getId() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (imbuement) { lua_pushnumber(L, imbuement->getID()); } else { @@ -51,7 +50,7 @@ int ImbuementFunctions::luaImbuementGetId(lua_State* L) { int ImbuementFunctions::luaImbuementGetItems(lua_State* L) { // imbuement:getItems() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (!imbuement) { lua_pushnil(L); return 1; @@ -72,7 +71,7 @@ int ImbuementFunctions::luaImbuementGetItems(lua_State* L) { int ImbuementFunctions::luaImbuementGetBase(lua_State* L) { // imbuement:getBase() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (!imbuement) { lua_pushnil(L); return 1; @@ -97,12 +96,12 @@ int ImbuementFunctions::luaImbuementGetBase(lua_State* L) { int ImbuementFunctions::luaImbuementGetCategory(lua_State* L) { // imbuement:getCategory() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (!imbuement) { lua_pushnil(L); return 1; } - uint16_t categoryId = imbuement->getCategory(); + const uint16_t categoryId = imbuement->getCategory(); const CategoryImbuement* categoryImbuement = g_imbuements().getCategoryByID(categoryId); if (categoryImbuement) { @@ -118,7 +117,7 @@ int ImbuementFunctions::luaImbuementGetCategory(lua_State* L) { int ImbuementFunctions::luaImbuementIsPremium(lua_State* L) { // imbuement:isPremium() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (!imbuement) { lua_pushnil(L); return 1; @@ -130,7 +129,7 @@ int ImbuementFunctions::luaImbuementIsPremium(lua_State* L) { int ImbuementFunctions::luaImbuementGetElementDamage(lua_State* L) { // imbuement:getElementDamage() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (imbuement) { lua_pushnumber(L, imbuement->elementDamage); } else { @@ -141,7 +140,7 @@ int ImbuementFunctions::luaImbuementGetElementDamage(lua_State* L) { int ImbuementFunctions::luaImbuementGetCombatType(lua_State* L) { // imbuement:getCombatType() - Imbuement* imbuement = getUserdata<Imbuement>(L, 1); + const auto* imbuement = getUserdata<Imbuement>(L, 1); if (imbuement) { lua_pushnumber(L, imbuement->combatType); } else { diff --git a/src/lua/functions/items/imbuement_functions.hpp b/src/lua/functions/items/imbuement_functions.hpp index 516fe91a3..f86882b1c 100644 --- a/src/lua/functions/items/imbuement_functions.hpp +++ b/src/lua/functions/items/imbuement_functions.hpp @@ -13,6 +13,12 @@ class ImbuementFunctions final : LuaScriptInterface { public: + explicit ImbuementFunctions(lua_State* L) : + LuaScriptInterface("ImbuementFunctions") { + init(L); + } + ~ImbuementFunctions() override = default; + static void init(lua_State* L) { registerClass(L, "Imbuement", "", ImbuementFunctions::luaCreateImbuement); registerMetaMethod(L, "Imbuement", "__eq", ImbuementFunctions::luaUserdataCompare); diff --git a/src/lua/functions/items/item_classification_functions.cpp b/src/lua/functions/items/item_classification_functions.cpp index aa8cf19d5..0b68458f2 100644 --- a/src/lua/functions/items/item_classification_functions.cpp +++ b/src/lua/functions/items/item_classification_functions.cpp @@ -7,10 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/items/item_classification_functions.hpp" #include "game/game.hpp" -#include "lua/functions/items/item_classification_functions.hpp" +#include "items/items_classification.hpp" int ItemClassificationFunctions::luaItemClassificationCreate(lua_State* L) { // ItemClassification(id) @@ -29,7 +29,7 @@ int ItemClassificationFunctions::luaItemClassificationCreate(lua_State* L) { int ItemClassificationFunctions::luaItemClassificationAddTier(lua_State* L) { // itemClassification:addTier(id, core, regularPrice, convergenceFusionPrice, convergenceTransferPrice) - ItemClassification* itemClassification = getUserdata<ItemClassification>(L, 1); + auto* itemClassification = getUserdata<ItemClassification>(L, 1); if (itemClassification) { itemClassification->addTier( getNumber<uint8_t>(L, 2), diff --git a/src/lua/functions/items/item_classification_functions.hpp b/src/lua/functions/items/item_classification_functions.hpp index ebbd9fddd..29b042682 100644 --- a/src/lua/functions/items/item_classification_functions.hpp +++ b/src/lua/functions/items/item_classification_functions.hpp @@ -13,6 +13,12 @@ class ItemClassificationFunctions final : LuaScriptInterface { public: + explicit ItemClassificationFunctions(lua_State* L) : + LuaScriptInterface("ItemClassificationFunctions") { + init(L); + } + ~ItemClassificationFunctions() override = default; + static void init(lua_State* L) { registerClass(L, "ItemClassification", "", ItemClassificationFunctions::luaItemClassificationCreate); registerMetaMethod(L, "ItemClassification", "__eq", ItemClassificationFunctions::luaUserdataCompare); diff --git a/src/lua/functions/items/item_functions.cpp b/src/lua/functions/items/item_functions.cpp index 361a469da..c54d43bc9 100644 --- a/src/lua/functions/items/item_functions.cpp +++ b/src/lua/functions/items/item_functions.cpp @@ -7,23 +7,22 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/items/item_functions.hpp" +#include "creatures/players/imbuements/imbuements.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" -#include "items/item.hpp" -#include "items/decay/decay.hpp" #include "game/scheduling/save_manager.hpp" - -class Imbuement; +#include "items/decay/decay.hpp" +#include "items/item.hpp" +#include "utils/tools.hpp" // Item int ItemFunctions::luaItemCreate(lua_State* L) { // Item(uid) - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); - std::shared_ptr<Item> item = getScriptEnv()->getItemByUID(id); + const auto &item = getScriptEnv()->getItemByUID(id); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -39,15 +38,34 @@ int ItemFunctions::luaItemIsItem(lua_State* L) { return 1; } +int ItemFunctions::luaItemGetContainer(lua_State* L) { + // item:getContainer() + const auto &item = getUserdataShared<Item>(L, 1); + if (!item) { + lua_pushnil(L); + return 1; + } + + const auto &container = item->getContainer(); + if (!container) { + g_logger().trace("Item {} is not a container", item->getName()); + pushBoolean(L, false); + return 1; + } + + pushUserdata(L, container); + return 1; +} + int ItemFunctions::luaItemGetParent(lua_State* L) { // item:getParent() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Cylinder> parent = item->getParent(); + const auto &parent = item->getParent(); if (!parent) { lua_pushnil(L); return 1; @@ -59,13 +77,13 @@ int ItemFunctions::luaItemGetParent(lua_State* L) { int ItemFunctions::luaItemGetTopParent(lua_State* L) { // item:getTopParent() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Cylinder> topParent = item->getTopParent(); + const auto &topParent = item->getTopParent(); if (!topParent) { lua_pushnil(L); return 1; @@ -77,7 +95,7 @@ int ItemFunctions::luaItemGetTopParent(lua_State* L) { int ItemFunctions::luaItemGetId(lua_State* L) { // item:getId() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, item->getID()); } else { @@ -88,13 +106,13 @@ int ItemFunctions::luaItemGetId(lua_State* L) { int ItemFunctions::luaItemClone(lua_State* L) { // item:clone() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> clone = item->clone(); + const auto &clone = item->clone(); if (!clone) { lua_pushnil(L); return 1; @@ -110,22 +128,22 @@ int ItemFunctions::luaItemClone(lua_State* L) { int ItemFunctions::luaItemSplit(lua_State* L) { // item:split([count = 1]) - std::shared_ptr<Item>* itemPtr = getRawUserDataShared<Item>(L, 1); + const auto &itemPtr = getRawUserDataShared<Item>(L, 1); if (!itemPtr) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = *itemPtr; + const auto &item = *itemPtr; if (!item || !item->isStackable() || item->isRemoved()) { lua_pushnil(L); return 1; } - uint16_t count = std::min<uint16_t>(getNumber<uint16_t>(L, 2, 1), item->getItemCount()); - uint16_t diff = item->getItemCount() - count; + const uint16_t count = std::min<uint16_t>(getNumber<uint16_t>(L, 2, 1), item->getItemCount()); + const uint16_t diff = item->getItemCount() - count; - std::shared_ptr<Item> splitItem = item->clone(); + const auto &splitItem = item->clone(); if (!splitItem) { lua_pushnil(L); return 1; @@ -134,9 +152,9 @@ int ItemFunctions::luaItemSplit(lua_State* L) { splitItem->setItemCount(count); ScriptEnvironment* env = getScriptEnv(); - uint32_t uid = env->addThing(item); + const uint32_t uid = env->addThing(item); - std::shared_ptr<Item> newItem = g_game().transformItem(item, item->getID(), diff); + const auto &newItem = g_game().transformItem(item, item->getID(), diff); if (item->isRemoved()) { env->removeItemByUID(uid); } @@ -157,9 +175,9 @@ int ItemFunctions::luaItemSplit(lua_State* L) { int ItemFunctions::luaItemRemove(lua_State* L) { // item:remove([count = -1]) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { - int32_t count = getNumber<int32_t>(L, 2, -1); + const auto count = getNumber<int32_t>(L, 2, -1); pushBoolean(L, g_game().internalRemoveItem(item, count) == RETURNVALUE_NOERROR); } else { lua_pushnil(L); @@ -169,7 +187,7 @@ int ItemFunctions::luaItemRemove(lua_State* L) { int ItemFunctions::luaItemGetUniqueId(lua_State* L) { // item:getUniqueId() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { uint32_t uniqueId = item->getAttribute<uint16_t>(ItemAttribute_t::UNIQUEID); if (uniqueId == 0) { @@ -184,9 +202,9 @@ int ItemFunctions::luaItemGetUniqueId(lua_State* L) { int ItemFunctions::luaItemGetActionId(lua_State* L) { // item:getActionId() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { - auto actionId = item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID); + const auto actionId = item->getAttribute<uint16_t>(ItemAttribute_t::ACTIONID); lua_pushnumber(L, actionId); } else { lua_pushnil(L); @@ -196,8 +214,8 @@ int ItemFunctions::luaItemGetActionId(lua_State* L) { int ItemFunctions::luaItemSetActionId(lua_State* L) { // item:setActionId(actionId) - uint16_t actionId = getNumber<uint16_t>(L, 2); - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const uint16_t actionId = getNumber<uint16_t>(L, 2); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { item->setAttribute(ItemAttribute_t::ACTIONID, actionId); pushBoolean(L, true); @@ -209,7 +227,7 @@ int ItemFunctions::luaItemSetActionId(lua_State* L) { int ItemFunctions::luaItemGetCount(lua_State* L) { // item:getCount() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, item->getItemCount()); } else { @@ -220,7 +238,7 @@ int ItemFunctions::luaItemGetCount(lua_State* L) { int ItemFunctions::luaItemGetCharges(lua_State* L) { // item:getCharges() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, item->getCharges()); } else { @@ -231,7 +249,7 @@ int ItemFunctions::luaItemGetCharges(lua_State* L) { int ItemFunctions::luaItemGetFluidType(lua_State* L) { // item:getFluidType() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, static_cast<lua_Number>(item->getAttribute<uint16_t>(ItemAttribute_t::FLUIDTYPE))); } else { @@ -242,7 +260,7 @@ int ItemFunctions::luaItemGetFluidType(lua_State* L) { int ItemFunctions::luaItemGetWeight(lua_State* L) { // item:getWeight() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, item->getWeight()); } else { @@ -253,7 +271,7 @@ int ItemFunctions::luaItemGetWeight(lua_State* L) { int ItemFunctions::luaItemGetSubType(lua_State* L) { // item:getSubType() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { lua_pushnumber(L, item->getSubType()); } else { @@ -264,7 +282,7 @@ int ItemFunctions::luaItemGetSubType(lua_State* L) { int ItemFunctions::luaItemGetName(lua_State* L) { // item:getName() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { pushString(L, item->getName()); } else { @@ -275,7 +293,7 @@ int ItemFunctions::luaItemGetName(lua_State* L) { int ItemFunctions::luaItemGetPluralName(lua_State* L) { // item:getPluralName() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { pushString(L, item->getPluralName()); } else { @@ -286,7 +304,7 @@ int ItemFunctions::luaItemGetPluralName(lua_State* L) { int ItemFunctions::luaItemGetArticle(lua_State* L) { // item:getArticle() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { pushString(L, item->getArticle()); } else { @@ -297,7 +315,7 @@ int ItemFunctions::luaItemGetArticle(lua_State* L) { int ItemFunctions::luaItemGetPosition(lua_State* L) { // item:getPosition() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { pushPosition(L, item->getPosition()); } else { @@ -308,13 +326,13 @@ int ItemFunctions::luaItemGetPosition(lua_State* L) { int ItemFunctions::luaItemGetTile(lua_State* L) { // item:getTile() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Tile> tile = item->getTile(); + const auto &tile = item->getTile(); if (tile) { pushUserdata<Tile>(L, tile); setMetatable(L, -1, "Tile"); @@ -326,7 +344,7 @@ int ItemFunctions::luaItemGetTile(lua_State* L) { int ItemFunctions::luaItemHasAttribute(lua_State* L) { // item:hasAttribute(key) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -347,7 +365,7 @@ int ItemFunctions::luaItemHasAttribute(lua_State* L) { int ItemFunctions::luaItemGetAttribute(lua_State* L) { // item:getAttribute(key) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -379,7 +397,7 @@ int ItemFunctions::luaItemGetAttribute(lua_State* L) { int ItemFunctions::luaItemSetAttribute(lua_State* L) { // item:setAttribute(key, value) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -397,7 +415,7 @@ int ItemFunctions::luaItemSetAttribute(lua_State* L) { if (item->isAttributeInteger(attribute)) { switch (attribute) { case ItemAttribute_t::DECAYSTATE: { - if (ItemDecayState_t decayState = getNumber<ItemDecayState_t>(L, 3); + if (const auto decayState = getNumber<ItemDecayState_t>(L, 3); decayState == DECAYING_FALSE || decayState == DECAYING_STOPPING) { g_decay().stopDecay(item); } else { @@ -426,7 +444,7 @@ int ItemFunctions::luaItemSetAttribute(lua_State* L) { item->updateTileFlags(); pushBoolean(L, true); } else if (item->isAttributeString(attribute)) { - auto newAttributeString = getString(L, 3); + const auto newAttributeString = getString(L, 3); item->setAttribute(attribute, newAttributeString); item->updateTileFlags(); pushBoolean(L, true); @@ -438,7 +456,7 @@ int ItemFunctions::luaItemSetAttribute(lua_State* L) { int ItemFunctions::luaItemRemoveAttribute(lua_State* L) { // item:removeAttribute(key) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -470,7 +488,7 @@ int ItemFunctions::luaItemRemoveAttribute(lua_State* L) { int ItemFunctions::luaItemGetCustomAttribute(lua_State* L) { // item:getCustomAttribute(key) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -496,7 +514,7 @@ int ItemFunctions::luaItemGetCustomAttribute(lua_State* L) { int ItemFunctions::luaItemSetCustomAttribute(lua_State* L) { // item:setCustomAttribute(key, value) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -517,7 +535,7 @@ int ItemFunctions::luaItemSetCustomAttribute(lua_State* L) { if (std::floor(doubleValue) < doubleValue) { item->setCustomAttribute(key, doubleValue); } else { - int64_t int64 = getNumber<int64_t>(L, 3); + const int64_t int64 = getNumber<int64_t>(L, 3); item->setCustomAttribute(key, int64); } } else if (isString(L, 3)) { @@ -537,7 +555,7 @@ int ItemFunctions::luaItemSetCustomAttribute(lua_State* L) { int ItemFunctions::luaItemRemoveCustomAttribute(lua_State* L) { // item:removeCustomAttribute(key) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -555,7 +573,7 @@ int ItemFunctions::luaItemRemoveCustomAttribute(lua_State* L) { int ItemFunctions::luaItemCanBeMoved(lua_State* L) { // item:canBeMoved() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { pushBoolean(L, item->canBeMoved()); } else { @@ -566,7 +584,7 @@ int ItemFunctions::luaItemCanBeMoved(lua_State* L) { int ItemFunctions::luaItemSerializeAttributes(lua_State* L) { // item:serializeAttributes() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { lua_pushnil(L); return 1; @@ -583,13 +601,13 @@ int ItemFunctions::luaItemSerializeAttributes(lua_State* L) { int ItemFunctions::luaItemMoveTo(lua_State* L) { // item:moveTo(position or cylinder[, flags]) - std::shared_ptr<Item>* itemPtr = getRawUserDataShared<Item>(L, 1); + const auto &itemPtr = getRawUserDataShared<Item>(L, 1); if (!itemPtr) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = *itemPtr; + const auto &item = *itemPtr; if (!item || item->isRemoved()) { lua_pushnil(L); return 1; @@ -626,7 +644,7 @@ int ItemFunctions::luaItemMoveTo(lua_State* L) { return 1; } - uint32_t flags = getNumber<uint32_t>(L, 3, FLAG_NOLIMIT | FLAG_IGNOREBLOCKITEM | FLAG_IGNOREBLOCKCREATURE | FLAG_IGNORENOTMOVABLE); + const auto flags = getNumber<uint32_t>(L, 3, FLAG_NOLIMIT | FLAG_IGNOREBLOCKITEM | FLAG_IGNOREBLOCKCREATURE | FLAG_IGNORENOTMOVABLE); if (item->getParent() == VirtualCylinder::virtualCylinder) { pushBoolean(L, g_game().internalAddItem(toCylinder, item, INDEX_WHEREEVER, flags) == RETURNVALUE_NOERROR); @@ -643,13 +661,13 @@ int ItemFunctions::luaItemMoveTo(lua_State* L) { int ItemFunctions::luaItemTransform(lua_State* L) { // item:transform(itemId[, count/subType = -1]) - std::shared_ptr<Item>* itemPtr = getRawUserDataShared<Item>(L, 1); + const auto &itemPtr = getRawUserDataShared<Item>(L, 1); if (!itemPtr) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> &item = *itemPtr; + auto &item = *itemPtr; if (!item) { lua_pushnil(L); return 1; @@ -666,7 +684,7 @@ int ItemFunctions::luaItemTransform(lua_State* L) { } } - int32_t subType = getNumber<int32_t>(L, 3, -1); + auto subType = getNumber<int32_t>(L, 3, -1); if (item->getID() == itemId && (subType == -1 || subType == item->getSubType())) { pushBoolean(L, true); return 1; @@ -678,9 +696,9 @@ int ItemFunctions::luaItemTransform(lua_State* L) { } ScriptEnvironment* env = getScriptEnv(); - uint32_t uid = env->addThing(item); + const uint32_t uid = env->addThing(item); - std::shared_ptr<Item> newItem = g_game().transformItem(item, itemId, subType); + const auto &newItem = g_game().transformItem(item, itemId, subType); if (item->isRemoved()) { env->removeItemByUID(uid); } @@ -696,7 +714,7 @@ int ItemFunctions::luaItemTransform(lua_State* L) { int ItemFunctions::luaItemDecay(lua_State* L) { // item:decay(decayId) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { if (isNumber(L, 2)) { ItemType &it = Item::items.getItemType(item->getID()); @@ -713,25 +731,21 @@ int ItemFunctions::luaItemDecay(lua_State* L) { int ItemFunctions::luaItemMoveToSlot(lua_State* L) { // item:moveToSlot(player, slot) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item || item->isRemoved()) { lua_pushnil(L); return 1; } - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 2); + const auto &player = getUserdataShared<Player>(L, 2); if (!player) { lua_pushnil(L); return 1; } - Slots_t slot = getNumber<Slots_t>(L, 3, CONST_SLOT_WHEREEVER); + const auto slot = getNumber<Slots_t>(L, 3, CONST_SLOT_WHEREEVER); - std::shared_ptr<Item> moveItem = nullptr; ReturnValue ret = g_game().internalMoveItem(item->getParent(), player, slot, item, item->getItemCount(), nullptr); - if (moveItem) { - item = moveItem; - } pushBoolean(L, ret == RETURNVALUE_NOERROR); return 1; @@ -739,9 +753,9 @@ int ItemFunctions::luaItemMoveToSlot(lua_State* L) { int ItemFunctions::luaItemGetDescription(lua_State* L) { // item:getDescription(distance) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { - int32_t distance = getNumber<int32_t>(L, 2); + const int32_t distance = getNumber<int32_t>(L, 2); pushString(L, item->getDescription(distance)); } else { lua_pushnil(L); @@ -751,9 +765,9 @@ int ItemFunctions::luaItemGetDescription(lua_State* L) { int ItemFunctions::luaItemHasProperty(lua_State* L) { // item:hasProperty(property) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (item) { - ItemProperty property = getNumber<ItemProperty>(L, 2); + const ItemProperty property = getNumber<ItemProperty>(L, 2); pushBoolean(L, item->hasProperty(property)); } else { lua_pushnil(L); @@ -763,7 +777,7 @@ int ItemFunctions::luaItemHasProperty(lua_State* L) { int ItemFunctions::luaItemGetImbuement(lua_State* L) { // item:getImbuement() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -794,7 +808,7 @@ int ItemFunctions::luaItemGetImbuement(lua_State* L) { int ItemFunctions::luaItemGetImbuementSlot(lua_State* L) { // item:getImbuementSlot() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -808,14 +822,14 @@ int ItemFunctions::luaItemGetImbuementSlot(lua_State* L) { int ItemFunctions::luaItemSetDuration(lua_State* L) { // item:setDuration(minDuration, maxDuration = 0, decayTo = 0, showDuration = true) // Example: item:setDuration(10000, 20000, 2129, false) = random duration from range 10000/20000 - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); return 1; } - uint32_t minDuration = getNumber<uint32_t>(L, 2); + const uint32_t minDuration = getNumber<uint32_t>(L, 2); uint32_t maxDuration = 0; if (lua_gettop(L) > 2) { maxDuration = uniform_random(minDuration, getNumber<uint32_t>(L, 3)); @@ -845,7 +859,7 @@ int ItemFunctions::luaItemSetDuration(lua_State* L) { int ItemFunctions::luaItemIsInsideDepot(lua_State* L) { // item:isInsideDepot([includeInbox = false]) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -858,7 +872,7 @@ int ItemFunctions::luaItemIsInsideDepot(lua_State* L) { int ItemFunctions::luaItemIsContainer(lua_State* L) { // item:isContainer() - const auto item = getUserdataShared<const Item>(L, 1); + const auto &item = getUserdataShared<const Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -872,7 +886,7 @@ int ItemFunctions::luaItemIsContainer(lua_State* L) { int ItemFunctions::luaItemGetTier(lua_State* L) { // item:getTier() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -885,7 +899,7 @@ int ItemFunctions::luaItemGetTier(lua_State* L) { int ItemFunctions::luaItemSetTier(lua_State* L) { // item:setTier(tier) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -899,7 +913,7 @@ int ItemFunctions::luaItemSetTier(lua_State* L) { int ItemFunctions::luaItemGetClassification(lua_State* L) { // item:getClassification() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -912,7 +926,7 @@ int ItemFunctions::luaItemGetClassification(lua_State* L) { int ItemFunctions::luaItemCanReceiveAutoCarpet(lua_State* L) { // item:canReceiveAutoCarpet() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); pushBoolean(L, false); @@ -925,14 +939,14 @@ int ItemFunctions::luaItemCanReceiveAutoCarpet(lua_State* L) { int ItemFunctions::luaItemSetOwner(lua_State* L) { // item:setOwner(creature|creatureId) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); return 0; } if (isUserdata(L, 2)) { - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 2); + const auto &creature = getUserdataShared<Creature>(L, 2); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); return 0; @@ -942,7 +956,7 @@ int ItemFunctions::luaItemSetOwner(lua_State* L) { return 1; } - auto creatureId = getNumber<uint32_t>(L, 2); + const auto creatureId = getNumber<uint32_t>(L, 2); if (creatureId != 0) { item->setOwner(creatureId); pushBoolean(L, true); @@ -955,13 +969,13 @@ int ItemFunctions::luaItemSetOwner(lua_State* L) { int ItemFunctions::luaItemGetOwnerId(lua_State* L) { // item:getOwner() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); return 0; } - if (auto ownerId = item->getOwnerId()) { + if (const auto ownerId = item->getOwnerId()) { lua_pushnumber(L, ownerId); return 1; } @@ -972,14 +986,14 @@ int ItemFunctions::luaItemGetOwnerId(lua_State* L) { int ItemFunctions::luaItemIsOwner(lua_State* L) { // item:isOwner(creature|creatureId) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); return 0; } if (isUserdata(L, 2)) { - std::shared_ptr<Creature> creature = getUserdataShared<Creature>(L, 2); + const auto &creature = getUserdataShared<Creature>(L, 2); if (!creature) { reportErrorFunc(getErrorDesc(LUA_ERROR_PLAYER_NOT_FOUND)); return 0; @@ -988,7 +1002,7 @@ int ItemFunctions::luaItemIsOwner(lua_State* L) { return 1; } - auto creatureId = getNumber<uint32_t>(L, 2); + const auto creatureId = getNumber<uint32_t>(L, 2); if (creatureId != 0) { pushBoolean(L, item->isOwner(creatureId)); return 1; @@ -1000,13 +1014,13 @@ int ItemFunctions::luaItemIsOwner(lua_State* L) { int ItemFunctions::luaItemGetOwnerName(lua_State* L) { // item:getOwnerName() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); return 0; } - if (auto ownerName = item->getOwnerName(); !ownerName.empty()) { + if (const auto ownerName = item->getOwnerName(); !ownerName.empty()) { pushString(L, ownerName); return 1; } @@ -1017,7 +1031,7 @@ int ItemFunctions::luaItemGetOwnerName(lua_State* L) { int ItemFunctions::luaItemHasOwner(lua_State* L) { // item:hasOwner() - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 1); + const auto &item = getUserdataShared<Item>(L, 1); if (!item) { reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND)); return 1; diff --git a/src/lua/functions/items/item_functions.hpp b/src/lua/functions/items/item_functions.hpp index 44e111479..1cf3764ea 100644 --- a/src/lua/functions/items/item_functions.hpp +++ b/src/lua/functions/items/item_functions.hpp @@ -17,12 +17,19 @@ class ItemFunctions final : LuaScriptInterface { public: + explicit ItemFunctions(lua_State* L) : + LuaScriptInterface("ItemFunctions") { + init(L); + } + ~ItemFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Item", "", ItemFunctions::luaItemCreate); registerMetaMethod(L, "Item", "__eq", ItemFunctions::luaUserdataCompare); registerMethod(L, "Item", "isItem", ItemFunctions::luaItemIsItem); + registerMethod(L, "Item", "getContainer", ItemFunctions::luaItemGetContainer); registerMethod(L, "Item", "getParent", ItemFunctions::luaItemGetParent); registerMethod(L, "Item", "getTopParent", ItemFunctions::luaItemGetTopParent); @@ -101,6 +108,7 @@ class ItemFunctions final : LuaScriptInterface { static int luaItemIsItem(lua_State* L); + static int luaItemGetContainer(lua_State* L); static int luaItemGetParent(lua_State* L); static int luaItemGetTopParent(lua_State* L); diff --git a/src/lua/functions/items/item_type_functions.cpp b/src/lua/functions/items/item_type_functions.cpp index b528795a0..57c5cc5b9 100644 --- a/src/lua/functions/items/item_type_functions.cpp +++ b/src/lua/functions/items/item_type_functions.cpp @@ -7,11 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/items/item_type_functions.hpp" #include "items/item.hpp" #include "items/items.hpp" -#include "lua/functions/items/item_type_functions.hpp" int ItemTypeFunctions::luaItemTypeCreate(lua_State* L) { // ItemType(id or name) @@ -30,7 +29,7 @@ int ItemTypeFunctions::luaItemTypeCreate(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsCorpse(lua_State* L) { // itemType:isCorpse() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isCorpse); } else { @@ -41,7 +40,7 @@ int ItemTypeFunctions::luaItemTypeIsCorpse(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsDoor(lua_State* L) { // itemType:isDoor() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isDoor()); } else { @@ -52,7 +51,7 @@ int ItemTypeFunctions::luaItemTypeIsDoor(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsContainer(lua_State* L) { // itemType:isContainer() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isContainer()); } else { @@ -63,7 +62,7 @@ int ItemTypeFunctions::luaItemTypeIsContainer(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsFluidContainer(lua_State* L) { // itemType:isFluidContainer() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isFluidContainer()); } else { @@ -74,7 +73,7 @@ int ItemTypeFunctions::luaItemTypeIsFluidContainer(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsMovable(lua_State* L) { // itemType:isMovable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->movable); } else { @@ -85,7 +84,7 @@ int ItemTypeFunctions::luaItemTypeIsMovable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsRune(lua_State* L) { // itemType:isRune() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isRune()); } else { @@ -96,7 +95,7 @@ int ItemTypeFunctions::luaItemTypeIsRune(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsStackable(lua_State* L) { // itemType:isStackable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->stackable); } else { @@ -107,7 +106,7 @@ int ItemTypeFunctions::luaItemTypeIsStackable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsStowable(lua_State* L) { // itemType:isStowable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->stackable && itemType->wareId > 0); } else { @@ -118,7 +117,7 @@ int ItemTypeFunctions::luaItemTypeIsStowable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsReadable(lua_State* L) { // itemType:isReadable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->canReadText); } else { @@ -129,7 +128,7 @@ int ItemTypeFunctions::luaItemTypeIsReadable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsWritable(lua_State* L) { // itemType:isWritable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->canWriteText); } else { @@ -140,7 +139,7 @@ int ItemTypeFunctions::luaItemTypeIsWritable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsBlocking(lua_State* L) { // itemType:isBlocking() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->blockProjectile || itemType->blockSolid); } else { @@ -151,7 +150,7 @@ int ItemTypeFunctions::luaItemTypeIsBlocking(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsGroundTile(lua_State* L) { // itemType:isGroundTile() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isGroundTile()); } else { @@ -162,7 +161,7 @@ int ItemTypeFunctions::luaItemTypeIsGroundTile(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsMagicField(lua_State* L) { // itemType:isMagicField() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isMagicField()); } else { @@ -173,7 +172,7 @@ int ItemTypeFunctions::luaItemTypeIsMagicField(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsMultiUse(lua_State* L) { // itemType:isMultiUse() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isMultiUse()); } else { @@ -184,7 +183,7 @@ int ItemTypeFunctions::luaItemTypeIsMultiUse(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsPickupable(lua_State* L) { // itemType:isPickupable() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isPickupable()); } else { @@ -195,7 +194,7 @@ int ItemTypeFunctions::luaItemTypeIsPickupable(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsKey(lua_State* L) { // itemType:isKey() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isKey()); } else { @@ -206,7 +205,7 @@ int ItemTypeFunctions::luaItemTypeIsKey(lua_State* L) { int ItemTypeFunctions::luaItemTypeIsQuiver(lua_State* L) { // itemType:isQuiver() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->isQuiver()); } else { @@ -217,7 +216,7 @@ int ItemTypeFunctions::luaItemTypeIsQuiver(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetType(lua_State* L) { // itemType:getType() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->type); } else { @@ -228,7 +227,7 @@ int ItemTypeFunctions::luaItemTypeGetType(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetId(lua_State* L) { // itemType:getId() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->id); } else { @@ -239,7 +238,7 @@ int ItemTypeFunctions::luaItemTypeGetId(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetName(lua_State* L) { // itemType:getName() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushString(L, itemType->name); } else { @@ -250,7 +249,7 @@ int ItemTypeFunctions::luaItemTypeGetName(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetPluralName(lua_State* L) { // itemType:getPluralName() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushString(L, itemType->getPluralName()); } else { @@ -261,7 +260,7 @@ int ItemTypeFunctions::luaItemTypeGetPluralName(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetArticle(lua_State* L) { // itemType:getArticle() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushString(L, itemType->article); } else { @@ -272,10 +271,10 @@ int ItemTypeFunctions::luaItemTypeGetArticle(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetDescription(lua_State* L) { // itemType:getDescription([count]) - auto itemType = getUserdata<ItemType>(L, 1); + const auto &itemType = getUserdata<ItemType>(L, 1); if (itemType) { - auto count = getNumber<uint16_t>(L, 2, -1); - auto description = Item::getDescription(*itemType, 1, nullptr, count); + const auto count = getNumber<uint16_t>(L, 2, -1); + const auto description = Item::getDescription(*itemType, 1, nullptr, count); pushString(L, description); } else { lua_pushnil(L); @@ -285,7 +284,7 @@ int ItemTypeFunctions::luaItemTypeGetDescription(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetSlotPosition(lua_State* L) { // itemType:getSlotPosition() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->slotPosition); } else { @@ -296,7 +295,7 @@ int ItemTypeFunctions::luaItemTypeGetSlotPosition(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetCharges(lua_State* L) { // itemType:getCharges() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->charges); } else { @@ -307,7 +306,7 @@ int ItemTypeFunctions::luaItemTypeGetCharges(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetFluidSource(lua_State* L) { // itemType:getFluidSource() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->fluidSource); } else { @@ -318,7 +317,7 @@ int ItemTypeFunctions::luaItemTypeGetFluidSource(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetCapacity(lua_State* L) { // itemType:getCapacity() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->maxItems); } else { @@ -329,35 +328,35 @@ int ItemTypeFunctions::luaItemTypeGetCapacity(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetWeight(lua_State* L) { // itemType:getWeight([count = 1]) - uint16_t count = getNumber<uint16_t>(L, 2, 1); + const auto count = getNumber<uint16_t>(L, 2, 1); - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (!itemType) { lua_pushnil(L); return 1; } - uint64_t weight = static_cast<uint64_t>(itemType->weight) * std::max<int32_t>(1, count); + const uint64_t weight = static_cast<uint64_t>(itemType->weight) * std::max<int32_t>(1, count); lua_pushnumber(L, weight); return 1; } int ItemTypeFunctions::luaItemTypeGetStackSize(lua_State* L) { // itemType:getStackSize() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (!itemType) { lua_pushnil(L); return 1; } - uint64_t stackSize = static_cast<uint64_t>(itemType->stackSize); + const auto stackSize = static_cast<uint64_t>(itemType->stackSize); lua_pushnumber(L, stackSize); return 1; } int ItemTypeFunctions::luaItemTypeGetHitChance(lua_State* L) { // itemType:getHitChance() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->hitChance); } else { @@ -368,7 +367,7 @@ int ItemTypeFunctions::luaItemTypeGetHitChance(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetShootRange(lua_State* L) { // itemType:getShootRange() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->shootRange); } else { @@ -379,7 +378,7 @@ int ItemTypeFunctions::luaItemTypeGetShootRange(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetAttack(lua_State* L) { // itemType:getAttack() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->attack); } else { @@ -390,7 +389,7 @@ int ItemTypeFunctions::luaItemTypeGetAttack(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetDefense(lua_State* L) { // itemType:getDefense() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->defense); } else { @@ -401,7 +400,7 @@ int ItemTypeFunctions::luaItemTypeGetDefense(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetExtraDefense(lua_State* L) { // itemType:getExtraDefense() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->extraDefense); } else { @@ -412,7 +411,7 @@ int ItemTypeFunctions::luaItemTypeGetExtraDefense(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetImbuementSlot(lua_State* L) { // itemType:getImbuementSlot() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->imbuementSlot); } else { @@ -423,7 +422,7 @@ int ItemTypeFunctions::luaItemTypeGetImbuementSlot(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetArmor(lua_State* L) { // itemType:getArmor() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->armor); } else { @@ -434,7 +433,7 @@ int ItemTypeFunctions::luaItemTypeGetArmor(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetWeaponType(lua_State* L) { // itemType:getWeaponType() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->weaponType); } else { @@ -445,7 +444,7 @@ int ItemTypeFunctions::luaItemTypeGetWeaponType(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetAmmoType(lua_State* L) { // itemType:getAmmoType() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->ammoType); } else { @@ -456,7 +455,7 @@ int ItemTypeFunctions::luaItemTypeGetAmmoType(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetElementType(lua_State* L) { // itemType:getElementType() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (!itemType) { lua_pushnil(L); return 1; @@ -473,7 +472,7 @@ int ItemTypeFunctions::luaItemTypeGetElementType(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetElementDamage(lua_State* L) { // itemType:getElementDamage() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (!itemType) { lua_pushnil(L); return 1; @@ -490,7 +489,7 @@ int ItemTypeFunctions::luaItemTypeGetElementDamage(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetTransformEquipId(lua_State* L) { // itemType:getTransformEquipId() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->transformEquipTo); } else { @@ -501,7 +500,7 @@ int ItemTypeFunctions::luaItemTypeGetTransformEquipId(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetTransformDeEquipId(lua_State* L) { // itemType:getTransformDeEquipId() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->transformDeEquipTo); } else { @@ -512,7 +511,7 @@ int ItemTypeFunctions::luaItemTypeGetTransformDeEquipId(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetDestroyId(lua_State* L) { // itemType:getDestroyId() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->destroyTo); } else { @@ -523,7 +522,7 @@ int ItemTypeFunctions::luaItemTypeGetDestroyId(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetDecayId(lua_State* L) { // itemType:getDecayId() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->decayTo); } else { @@ -534,7 +533,7 @@ int ItemTypeFunctions::luaItemTypeGetDecayId(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetRequiredLevel(lua_State* L) { // itemType:getRequiredLevel() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->minReqLevel); } else { @@ -545,7 +544,7 @@ int ItemTypeFunctions::luaItemTypeGetRequiredLevel(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetSpeed(lua_State* L) { // itemType:getSpeed() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (!itemType) { lua_pushnil(L); return 1; @@ -562,7 +561,7 @@ int ItemTypeFunctions::luaItemTypeGetSpeed(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetBaseSpeed(lua_State* L) { // itemType:getBaseSpeed() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->speed); } else { @@ -573,7 +572,7 @@ int ItemTypeFunctions::luaItemTypeGetBaseSpeed(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetDecayTime(lua_State* L) { // itemType:getDecayTime() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->decayTime); } else { @@ -584,7 +583,7 @@ int ItemTypeFunctions::luaItemTypeGetDecayTime(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetShowDuration(lua_State* L) { // itemType:getShowDuration() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushboolean(L, itemType->showDuration); } else { @@ -594,7 +593,7 @@ int ItemTypeFunctions::luaItemTypeGetShowDuration(lua_State* L) { } int ItemTypeFunctions::luaItemTypeGetWrapableTo(lua_State* L) { // itemType:getWrapableTo() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { lua_pushnumber(L, itemType->wrapableTo); } else { @@ -605,7 +604,7 @@ int ItemTypeFunctions::luaItemTypeGetWrapableTo(lua_State* L) { int ItemTypeFunctions::luaItemTypeHasSubType(lua_State* L) { // itemType:hasSubType() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushBoolean(L, itemType->hasSubType()); } else { @@ -616,7 +615,7 @@ int ItemTypeFunctions::luaItemTypeHasSubType(lua_State* L) { int ItemTypeFunctions::luaItemTypeGetVocationString(lua_State* L) { // itemType:getVocationString() - const ItemType* itemType = getUserdata<const ItemType>(L, 1); + const auto* itemType = getUserdata<const ItemType>(L, 1); if (itemType) { pushString(L, itemType->vocationString); } else { diff --git a/src/lua/functions/items/item_type_functions.hpp b/src/lua/functions/items/item_type_functions.hpp index ce53d4298..254831fba 100644 --- a/src/lua/functions/items/item_type_functions.hpp +++ b/src/lua/functions/items/item_type_functions.hpp @@ -14,6 +14,12 @@ class ItemTypeFunctions final : LuaScriptInterface { public: + explicit ItemTypeFunctions(lua_State* L) : + LuaScriptInterface("ItemTypeFunctions") { + init(L); + } + ~ItemTypeFunctions() override = default; + static void init(lua_State* L) { registerClass(L, "ItemType", "", ItemTypeFunctions::luaItemTypeCreate); registerMetaMethod(L, "ItemType", "__eq", ItemTypeFunctions::luaUserdataCompare); diff --git a/src/lua/functions/items/weapon_functions.cpp b/src/lua/functions/items/weapon_functions.cpp index 61eff2dfb..4a02b1c4b 100644 --- a/src/lua/functions/items/weapon_functions.cpp +++ b/src/lua/functions/items/weapon_functions.cpp @@ -7,24 +7,21 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/functions/items/weapon_functions.hpp" #include "game/game.hpp" #include "items/item.hpp" #include "lua/scripts/lua_environment.hpp" -#include "lua/scripts/scripts.hpp" #include "utils/tools.hpp" int WeaponFunctions::luaCreateWeapon(lua_State* L) { // Weapon(type) - WeaponType_t type = getNumber<WeaponType_t>(L, 2); + const WeaponType_t type = getNumber<WeaponType_t>(L, 2); switch (type) { case WEAPON_SWORD: case WEAPON_AXE: case WEAPON_CLUB: { - if (auto weaponPtr = g_luaEnvironment().createWeaponObject<WeaponMelee>(getScriptEnv()->getScriptInterface())) { + if (const auto &weaponPtr = g_luaEnvironment().createWeaponObject<WeaponMelee>(getScriptEnv()->getScriptInterface())) { pushUserdata<WeaponMelee>(L, weaponPtr); setMetatable(L, -1, "Weapon"); weaponPtr->weaponType = type; @@ -36,7 +33,7 @@ int WeaponFunctions::luaCreateWeapon(lua_State* L) { case WEAPON_MISSILE: case WEAPON_DISTANCE: case WEAPON_AMMO: { - if (auto weaponPtr = g_luaEnvironment().createWeaponObject<WeaponDistance>(getScriptEnv()->getScriptInterface())) { + if (const auto &weaponPtr = g_luaEnvironment().createWeaponObject<WeaponDistance>(getScriptEnv()->getScriptInterface())) { pushUserdata<WeaponDistance>(L, weaponPtr); setMetatable(L, -1, "Weapon"); weaponPtr->weaponType = type; @@ -46,7 +43,7 @@ int WeaponFunctions::luaCreateWeapon(lua_State* L) { break; } case WEAPON_WAND: { - if (auto weaponPtr = g_luaEnvironment().createWeaponObject<WeaponWand>(getScriptEnv()->getScriptInterface())) { + if (const auto &weaponPtr = g_luaEnvironment().createWeaponObject<WeaponWand>(getScriptEnv()->getScriptInterface())) { pushUserdata<WeaponWand>(L, weaponPtr); setMetatable(L, -1, "Weapon"); weaponPtr->weaponType = type; @@ -68,7 +65,7 @@ int WeaponFunctions::luaWeaponAction(lua_State* L) { const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { std::string typeName = getString(L, 2); - std::string tmpStr = asLowerCaseString(typeName); + const std::string tmpStr = asLowerCaseString(typeName); if (tmpStr == "removecount") { weapon->action = WEAPONACTION_REMOVECOUNT; } else if (tmpStr == "removecharge") { @@ -90,7 +87,7 @@ int WeaponFunctions::luaWeaponAction(lua_State* L) { int WeaponFunctions::luaWeaponRegister(lua_State* L) { // weapon:register() - WeaponShared_ptr* weaponPtr = getRawUserDataShared<Weapon>(L, 1); + const WeaponShared_ptr* weaponPtr = getRawUserDataShared<Weapon>(L, 1); if (weaponPtr && *weaponPtr) { WeaponShared_ptr weapon = *weaponPtr; if (weapon->weaponType == WEAPON_DISTANCE || weapon->weaponType == WEAPON_AMMO || weapon->weaponType == WEAPON_MISSILE) { @@ -101,7 +98,7 @@ int WeaponFunctions::luaWeaponRegister(lua_State* L) { weapon = getUserdataShared<WeaponMelee>(L, 1); } - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.weaponType = weapon->weaponType; @@ -270,7 +267,7 @@ int WeaponFunctions::luaWeaponElement(lua_State* L) { if (weapon) { if (!getNumber<CombatType_t>(L, 2)) { std::string element = getString(L, 2); - std::string tmpStrValue = asLowerCaseString(element); + const std::string tmpStrValue = asLowerCaseString(element); if (tmpStrValue == "earth") { weapon->params.combatType = COMBAT_EARTHDAMAGE; } else if (tmpStrValue == "ice") { @@ -366,7 +363,7 @@ int WeaponFunctions::luaWeaponAttack(lua_State* L) { // weapon:attack(atk) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.attack = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -380,7 +377,7 @@ int WeaponFunctions::luaWeaponDefense(lua_State* L) { // weapon:defense(defense[, extraDefense]) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.defense = getNumber<int32_t>(L, 2); if (lua_gettop(L) > 2) { @@ -397,7 +394,7 @@ int WeaponFunctions::luaWeaponRange(lua_State* L) { // weapon:range(range) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.shootRange = getNumber<uint8_t>(L, 2); pushBoolean(L, true); @@ -415,7 +412,7 @@ int WeaponFunctions::luaWeaponCharges(lua_State* L) { if (lua_gettop(L) > 2) { showCharges = getBoolean(L, 3); } - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.charges = getNumber<uint8_t>(L, 2); it.showCharges = showCharges; @@ -434,7 +431,7 @@ int WeaponFunctions::luaWeaponDuration(lua_State* L) { if (lua_gettop(L) > 2) { showDuration = getBoolean(L, 3); } - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.decayTime = getNumber<uint8_t>(L, 2); it.showDuration = showDuration; @@ -453,7 +450,7 @@ int WeaponFunctions::luaWeaponDecayTo(lua_State* L) { if (lua_gettop(L) > 1) { itemid = getNumber<uint16_t>(L, 2); } - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.decayTo = itemid; pushBoolean(L, true); @@ -467,7 +464,7 @@ int WeaponFunctions::luaWeaponTransformEquipTo(lua_State* L) { // weapon:transformEquipTo(itemid) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.transformEquipTo = getNumber<uint16_t>(L, 2); pushBoolean(L, true); @@ -481,7 +478,7 @@ int WeaponFunctions::luaWeaponTransformDeEquipTo(lua_State* L) { // weapon:transformDeEquipTo(itemid) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.transformDeEquipTo = getNumber<uint16_t>(L, 2); pushBoolean(L, true); @@ -495,7 +492,7 @@ int WeaponFunctions::luaWeaponShootType(lua_State* L) { // weapon:shootType(type) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.shootType = getNumber<ShootType_t>(L, 2); pushBoolean(L, true); @@ -509,9 +506,9 @@ int WeaponFunctions::luaWeaponSlotType(lua_State* L) { // weapon:slotType(slot) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); - std::string slot = getString(L, 2); + const std::string slot = getString(L, 2); if (slot == "two-handed") { it.slotPosition = SLOTP_TWO_HAND; @@ -529,7 +526,7 @@ int WeaponFunctions::luaWeaponAmmoType(lua_State* L) { // weapon:ammoType(type) const auto &weapon = getUserdataShared<WeaponDistance>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); std::string type = getString(L, 2); @@ -555,7 +552,7 @@ int WeaponFunctions::luaWeaponHitChance(lua_State* L) { // weapon:hitChance(chance) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.hitChance = getNumber<int8_t>(L, 2); pushBoolean(L, true); @@ -569,7 +566,7 @@ int WeaponFunctions::luaWeaponMaxHitChance(lua_State* L) { // weapon:maxHitChance(max) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); + const uint16_t id = weapon->getID(); ItemType &it = Item::items.getItemType(id); it.maxHitChance = getNumber<int32_t>(L, 2); pushBoolean(L, true); @@ -583,13 +580,13 @@ int WeaponFunctions::luaWeaponExtraElement(lua_State* L) { // weapon:extraElement(atk, combatType) const WeaponShared_ptr &weapon = getUserdataShared<Weapon>(L, 1); if (weapon) { - uint16_t id = weapon->getID(); - ItemType &it = Item::items.getItemType(id); + const uint16_t id = weapon->getID(); + const ItemType &it = Item::items.getItemType(id); it.abilities->elementDamage = getNumber<uint16_t>(L, 2); if (!getNumber<CombatType_t>(L, 3)) { std::string element = getString(L, 3); - std::string tmpStrValue = asLowerCaseString(element); + const std::string tmpStrValue = asLowerCaseString(element); if (tmpStrValue == "earth") { it.abilities->elementType = COMBAT_EARTHDAMAGE; } else if (tmpStrValue == "ice") { diff --git a/src/lua/functions/items/weapon_functions.hpp b/src/lua/functions/items/weapon_functions.hpp index b7ac6fe6a..d68146f82 100644 --- a/src/lua/functions/items/weapon_functions.hpp +++ b/src/lua/functions/items/weapon_functions.hpp @@ -13,6 +13,12 @@ class WeaponFunctions final : LuaScriptInterface { public: + explicit WeaponFunctions(lua_State* L) : + LuaScriptInterface("WeaponFunctions") { + init(L); + } + ~WeaponFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Weapon", "", WeaponFunctions::luaCreateWeapon); registerMethod(L, "Weapon", "action", WeaponFunctions::luaWeaponAction); diff --git a/src/lua/functions/lua_functions_loader.cpp b/src/lua/functions/lua_functions_loader.cpp index c2dedfb57..894cf252c 100644 --- a/src/lua/functions/lua_functions_loader.cpp +++ b/src/lua/functions/lua_functions_loader.cpp @@ -7,7 +7,7 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/lua_functions_loader.hpp" #include "creatures/combat/spells.hpp" #include "creatures/monsters/monster.hpp" @@ -22,7 +22,6 @@ #include "lua/functions/creatures/creature_functions.hpp" #include "lua/functions/events/events_functions.hpp" #include "lua/functions/items/item_functions.hpp" -#include "lua/functions/lua_functions_loader.hpp" #include "lua/functions/map/map_functions.hpp" #include "lua/functions/core/game/zone_functions.hpp" #include "lua/global/lua_variant.hpp" @@ -98,11 +97,11 @@ int LuaFunctionsLoader::protectedCall(lua_State* L, int nargs, int nresults) { return ret; } - int error_index = lua_gettop(L) - nargs; + const int error_index = lua_gettop(L) - nargs; lua_pushcfunction(L, luaErrorHandler); lua_insert(L, error_index); - int ret = lua_pcall(L, nargs, nresults, error_index); + const int ret = lua_pcall(L, nargs, nresults, error_index); lua_remove(L, error_index); return ret; } @@ -134,7 +133,7 @@ void LuaFunctionsLoader::reportError(const char* function, const std::string &er } logMsg << "Error Description: " << error_desc << "\n"; if (stack_trace && scriptInterface) { - std::string stackTrace = scriptInterface->getStackTrace(error_desc); + const std::string stackTrace = scriptInterface->getStackTrace(error_desc); if (!stackTrace.empty() && stackTrace != "N/A") { logMsg << "Stack Trace:\n" << stackTrace << "\n"; @@ -147,7 +146,7 @@ void LuaFunctionsLoader::reportError(const char* function, const std::string &er int LuaFunctionsLoader::luaErrorHandler(lua_State* L) { const std::string &errorMessage = popString(L); - auto interface = getScriptEnv()->getScriptInterface(); + const auto interface = getScriptEnv()->getScriptInterface(); if (!interface) { g_logger().error("[{}]: LuaScriptInterface not found, error: {}", __FUNCTION__, errorMessage); return 0; @@ -186,7 +185,7 @@ void LuaFunctionsLoader::pushVariant(lua_State* L, const LuaVariant &var) { setMetatable(L, -1, "Variant"); } -void LuaFunctionsLoader::pushThing(lua_State* L, std::shared_ptr<Thing> thing) { +void LuaFunctionsLoader::pushThing(lua_State* L, const std::shared_ptr<Thing> &thing) { if (validateDispatcherContext(__FUNCTION__)) { return; } @@ -200,10 +199,10 @@ void LuaFunctionsLoader::pushThing(lua_State* L, std::shared_ptr<Thing> thing) { return; } - if (std::shared_ptr<Item> item = thing->getItem()) { + if (const auto &item = thing->getItem()) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); - } else if (std::shared_ptr<Creature> creature = thing->getCreature()) { + } else if (const auto &creature = thing->getCreature()) { pushUserdata<Creature>(L, creature); setCreatureMetatable(L, -1, creature); } else { @@ -211,18 +210,18 @@ void LuaFunctionsLoader::pushThing(lua_State* L, std::shared_ptr<Thing> thing) { } } -void LuaFunctionsLoader::pushCylinder(lua_State* L, std::shared_ptr<Cylinder> cylinder) { +void LuaFunctionsLoader::pushCylinder(lua_State* L, const std::shared_ptr<Cylinder> &cylinder) { if (validateDispatcherContext(__FUNCTION__)) { return; } - if (std::shared_ptr<Creature> creature = cylinder->getCreature()) { + if (const auto &creature = cylinder->getCreature()) { pushUserdata<Creature>(L, creature); setCreatureMetatable(L, -1, creature); - } else if (std::shared_ptr<Item> parentItem = cylinder->getItem()) { + } else if (const auto &parentItem = cylinder->getItem()) { pushUserdata<Item>(L, parentItem); setItemMetatable(L, -1, parentItem); - } else if (std::shared_ptr<Tile> tile = cylinder->getTile()) { + } else if (const auto &tile = cylinder->getTile()) { pushUserdata<Tile>(L, tile); setMetatable(L, -1, "Tile"); } else if (cylinder == VirtualCylinder::virtualCylinder) { @@ -250,7 +249,7 @@ void LuaFunctionsLoader::pushCallback(lua_State* L, int32_t callback) { std::string LuaFunctionsLoader::popString(lua_State* L) { if (lua_gettop(L) == 0) { - return std::string(); + return {}; } std::string str(getString(L, -1)); @@ -280,13 +279,13 @@ void LuaFunctionsLoader::setWeakMetatable(lua_State* L, int32_t index, const std const std::string &weakName = name + "_weak"; - auto result = weakObjectTypes.emplace(name); + const auto result = weakObjectTypes.emplace(name); if (result.second) { luaL_getmetatable(L, name.c_str()); - int childMetatable = lua_gettop(L); + const int childMetatable = lua_gettop(L); luaL_newmetatable(L, weakName.c_str()); - int metatable = lua_gettop(L); + const int metatable = lua_gettop(L); for (static const std::vector<std::string> methodKeys = { "__index", "__metatable", "__eq" }; const std::string &metaKey : methodKeys) { @@ -295,7 +294,7 @@ void LuaFunctionsLoader::setWeakMetatable(lua_State* L, int32_t index, const std } for (static const std::vector<int> methodIndexes = { 'h', 'p', 't' }; - int metaIndex : methodIndexes) { + const int metaIndex : methodIndexes) { lua_rawgeti(L, childMetatable, metaIndex); lua_rawseti(L, metatable, metaIndex); } @@ -310,7 +309,7 @@ void LuaFunctionsLoader::setWeakMetatable(lua_State* L, int32_t index, const std lua_setmetatable(L, index - 1); } -void LuaFunctionsLoader::setItemMetatable(lua_State* L, int32_t index, std::shared_ptr<Item> item) { +void LuaFunctionsLoader::setItemMetatable(lua_State* L, int32_t index, const std::shared_ptr<Item> &item) { if (validateDispatcherContext(__FUNCTION__)) { return; } @@ -325,7 +324,7 @@ void LuaFunctionsLoader::setItemMetatable(lua_State* L, int32_t index, std::shar lua_setmetatable(L, index - 1); } -void LuaFunctionsLoader::setCreatureMetatable(lua_State* L, int32_t index, std::shared_ptr<Creature> creature) { +void LuaFunctionsLoader::setCreatureMetatable(lua_State* L, int32_t index, const std::shared_ptr<Creature> &creature) { if (validateDispatcherContext(__FUNCTION__)) { return; } @@ -353,8 +352,8 @@ CombatDamage LuaFunctionsLoader::getCombatDamage(lua_State* L) { // Get std::string LuaFunctionsLoader::getFormatedLoggerMessage(lua_State* L) { - std::string format = getString(L, 1); - int n = lua_gettop(L); + const std::string format = getString(L, 1); + const int n = lua_gettop(L); fmt::dynamic_format_arg_store<fmt::format_context> args; for (int i = 2; i <= n; i++) { @@ -365,7 +364,7 @@ std::string LuaFunctionsLoader::getFormatedLoggerMessage(lua_State* L) { } else if (isBoolean(L, i)) { args.push_back(lua_toboolean(L, i) ? "true" : "false"); } else if (isUserdata(L, i)) { - LuaData_t userType = getUserdataType(L, i); + const LuaData_t userType = getUserdataType(L, i); args.push_back(getUserdataTypeName(userType)); } else if (isTable(L, i)) { args.push_back("table"); @@ -392,7 +391,7 @@ std::string LuaFunctionsLoader::getString(lua_State* L, int32_t arg) { size_t len; const char* c_str = lua_tolstring(L, arg, &len); if (!c_str || len == 0) { - return std::string(); + return {}; } return std::string(c_str, len); } @@ -556,7 +555,7 @@ LuaData_t LuaFunctionsLoader::getUserdataType(lua_State* L, int32_t arg) { } lua_rawgeti(L, -1, 't'); - LuaData_t type = getNumber<LuaData_t>(L, -1); + const LuaData_t type = getNumber<LuaData_t>(L, -1); lua_pop(L, 2); return type; @@ -645,11 +644,11 @@ void LuaFunctionsLoader::registerClass(lua_State* L, const std::string &classNam lua_newtable(L); lua_pushvalue(L, -1); lua_setglobal(L, className.c_str()); - int methods = lua_gettop(L); + const int methods = lua_gettop(L); // methodsTable = {} lua_newtable(L); - int methodsTable = lua_gettop(L); + const int methodsTable = lua_gettop(L); if (newFunction) { // className.__call = newFunction @@ -671,7 +670,7 @@ void LuaFunctionsLoader::registerClass(lua_State* L, const std::string &classNam // className.metatable = {} luaL_newmetatable(L, className.c_str()); - int metatable = lua_gettop(L); + const int metatable = lua_gettop(L); // className.metatable.__metatable = className lua_pushvalue(L, methods); @@ -781,7 +780,7 @@ void LuaFunctionsLoader::registerSharedClass(lua_State* L, const std::string &cl } int LuaFunctionsLoader::luaGarbageCollection(lua_State* L) { - auto objPtr = static_cast<std::shared_ptr<SharedObject>*>(lua_touserdata(L, 1)); + const auto objPtr = static_cast<std::shared_ptr<SharedObject>*>(lua_touserdata(L, 1)); if (objPtr) { objPtr->reset(); } @@ -789,7 +788,7 @@ int LuaFunctionsLoader::luaGarbageCollection(lua_State* L) { } int LuaFunctionsLoader::validateDispatcherContext(std::string_view fncName) { - if (g_dispatcher().context().isOn() && g_dispatcher().context().isAsync()) { + if (DispatcherContext::isOn() && g_dispatcher().context().isAsync()) { g_logger().warn("[{}] The call to lua was ignored because the '{}' task is trying to communicate while in async mode.", fncName, g_dispatcher().context().getName()); return LUA_ERRRUN; } diff --git a/src/lua/functions/lua_functions_loader.hpp b/src/lua/functions/lua_functions_loader.hpp index e5251e3a1..9c5b65c14 100644 --- a/src/lua/functions/lua_functions_loader.hpp +++ b/src/lua/functions/lua_functions_loader.hpp @@ -39,11 +39,11 @@ class LuaFunctionsLoader { static void reportError(const char* function, const std::string &error_desc, bool stack_trace = false); static int luaErrorHandler(lua_State* L); - static void pushThing(lua_State* L, std::shared_ptr<Thing> thing); + static void pushThing(lua_State* L, const std::shared_ptr<Thing> &thing); static void pushVariant(lua_State* L, const LuaVariant &var); static void pushString(lua_State* L, const std::string &value); static void pushCallback(lua_State* L, int32_t callback); - static void pushCylinder(lua_State* L, std::shared_ptr<Cylinder> cylinder); + static void pushCylinder(lua_State* L, const std::shared_ptr<Cylinder> &cylinder); static std::string popString(lua_State* L); static int32_t popCallback(lua_State* L); @@ -56,16 +56,16 @@ class LuaFunctionsLoader { static void setMetatable(lua_State* L, int32_t index, const std::string &name); static void setWeakMetatable(lua_State* L, int32_t index, const std::string &name); - static void setItemMetatable(lua_State* L, int32_t index, std::shared_ptr<Item> item); - static void setCreatureMetatable(lua_State* L, int32_t index, std::shared_ptr<Creature> creature); + static void setItemMetatable(lua_State* L, int32_t index, const std::shared_ptr<Item> &item); + static void setCreatureMetatable(lua_State* L, int32_t index, const std::shared_ptr<Creature> &creature); template <typename T> - static typename std::enable_if<std::is_enum<T>::value, T>::type + static std::enable_if_t<std::is_enum_v<T>, T> getNumber(lua_State* L, int32_t arg) { return static_cast<T>(static_cast<int64_t>(lua_tonumber(L, arg))); } template <typename T> - static typename std::enable_if<std::is_integral<T>::value || std::is_floating_point<T>::value, T>::type getNumber(lua_State* L, int32_t arg) { + static std::enable_if_t<std::is_integral_v<T> || std::is_floating_point_v<T>, T> getNumber(lua_State* L, int32_t arg) { auto number = lua_tonumber(L, arg); // If there is overflow, we return the value 0 if constexpr (std::is_integral_v<T> && std::is_unsigned_v<T>) { diff --git a/src/lua/functions/map/house_functions.cpp b/src/lua/functions/map/house_functions.cpp index ffba0d0b5..708b9233a 100644 --- a/src/lua/functions/map/house_functions.cpp +++ b/src/lua/functions/map/house_functions.cpp @@ -7,13 +7,13 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/map/house_functions.hpp" +#include "config/configmanager.hpp" #include "items/bed.hpp" #include "game/game.hpp" #include "game/movement/position.hpp" #include "io/iologindata.hpp" -#include "lua/functions/map/house_functions.hpp" #include "map/house/house.hpp" int HouseFunctions::luaHouseCreate(lua_State* L) { @@ -116,8 +116,8 @@ int HouseFunctions::luaHouseSetHouseOwner(lua_State* L) { return 1; } - uint32_t guid = getNumber<uint32_t>(L, 2); - bool updateDatabase = getBoolean(L, 3, true); + const uint32_t guid = getNumber<uint32_t>(L, 2); + const bool updateDatabase = getBoolean(L, 3, true); house->setOwner(guid, updateDatabase); pushBoolean(L, true); return 1; @@ -125,11 +125,11 @@ int HouseFunctions::luaHouseSetHouseOwner(lua_State* L) { int HouseFunctions::luaHouseSetNewOwnerGuid(lua_State* L) { // house:setNewOwnerGuid(guid[, updateDatabase = true]) - auto house = getUserdataShared<House>(L, 1); + const auto &house = getUserdataShared<House>(L, 1); if (house) { - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (isTransferOnRestart && house->hasNewOwnership()) { - const auto player = g_game().getPlayerByGUID(house->getOwner()); + const auto &player = g_game().getPlayerByGUID(house->getOwner()); if (player) { player->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You cannot leave this house. Ownership is already scheduled to be transferred upon the next server restart."); } @@ -137,7 +137,7 @@ int HouseFunctions::luaHouseSetNewOwnerGuid(lua_State* L) { return 1; } - uint32_t guid = getNumber<uint32_t>(L, 2, 0); + const auto guid = getNumber<uint32_t>(L, 2, 0); house->setNewOwnerGuid(guid, false); pushBoolean(L, true); } else { @@ -148,7 +148,7 @@ int HouseFunctions::luaHouseSetNewOwnerGuid(lua_State* L) { int HouseFunctions::luaHouseHasItemOnTile(lua_State* L) { // house:hasItemOnTile() - auto house = getUserdataShared<House>(L, 1); + const auto &house = getUserdataShared<House>(L, 1); if (!house) { reportErrorFunc("House not found"); lua_pushnil(L); @@ -161,14 +161,14 @@ int HouseFunctions::luaHouseHasItemOnTile(lua_State* L) { int HouseFunctions::luaHouseHasNewOwnership(lua_State* L) { // house:hasNewOwnership(guid) - auto house = getUserdataShared<House>(L, 1); + const auto &house = getUserdataShared<House>(L, 1); if (!house) { reportErrorFunc("House not found"); lua_pushnil(L); return 1; } - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); pushBoolean(L, isTransferOnRestart && house->hasNewOwnership()); return 1; } @@ -176,8 +176,8 @@ int HouseFunctions::luaHouseHasNewOwnership(lua_State* L) { int HouseFunctions::luaHouseStartTrade(lua_State* L) { // house:startTrade(player, tradePartner) const auto &house = getUserdataShared<House>(L, 1); - std::shared_ptr<Player> player = getUserdataShared<Player>(L, 2); - std::shared_ptr<Player> tradePartner = getUserdataShared<Player>(L, 3); + const auto &player = getUserdataShared<Player>(L, 2); + const auto &tradePartner = getUserdataShared<Player>(L, 3); if (!player || !tradePartner || !house) { lua_pushnil(L); @@ -204,13 +204,13 @@ int HouseFunctions::luaHouseStartTrade(lua_State* L) { return 1; } - std::shared_ptr<Item> transferItem = house->getTransferItem(); + const auto &transferItem = house->getTransferItem(); if (!transferItem) { lua_pushnumber(L, RETURNVALUE_YOUCANNOTTRADETHISHOUSE); return 1; } - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (isTransferOnRestart && house->hasNewOwnership()) { tradePartner->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You cannot buy this house. Ownership is already scheduled to be transferred upon the next server restart."); player->sendTextMessage(MESSAGE_EVENT_ADVANCE, "You cannot sell this house. Ownership is already scheduled to be transferred upon the next server restart."); @@ -235,11 +235,11 @@ int HouseFunctions::luaHouseGetBeds(lua_State* L) { return 1; } - const auto beds = house->getBeds(); + const auto &beds = house->getBeds(); lua_createtable(L, beds.size(), 0); int index = 0; - for (std::shared_ptr<BedItem> bedItem : beds) { + for (const auto &bedItem : beds) { pushUserdata<Item>(L, bedItem); setItemMetatable(L, -1, bedItem); lua_rawseti(L, -2, ++index); @@ -265,11 +265,11 @@ int HouseFunctions::luaHouseGetDoors(lua_State* L) { return 1; } - const auto doors = house->getDoors(); + const auto &doors = house->getDoors(); lua_createtable(L, doors.size(), 0); int index = 0; - for (std::shared_ptr<Door> door : doors) { + for (const auto &door : doors) { pushUserdata<Item>(L, door); setItemMetatable(L, -1, door); lua_rawseti(L, -2, ++index); @@ -295,7 +295,7 @@ int HouseFunctions::luaHouseGetDoorIdByPosition(lua_State* L) { return 1; } - std::shared_ptr<Door> door = house->getDoorByPosition(getPosition(L, 2)); + const auto &door = house->getDoorByPosition(getPosition(L, 2)); if (door) { lua_pushnumber(L, door->getDoorId()); } else { @@ -312,11 +312,11 @@ int HouseFunctions::luaHouseGetTiles(lua_State* L) { return 1; } - const auto tiles = house->getTiles(); + const auto &tiles = house->getTiles(); lua_newtable(L); int index = 0; - for (std::shared_ptr<Tile> tile : tiles) { + for (const auto &tile : tiles) { pushUserdata<Tile>(L, tile); setMetatable(L, -1, "Tile"); lua_rawseti(L, -2, ++index); @@ -332,14 +332,14 @@ int HouseFunctions::luaHouseGetItems(lua_State* L) { return 1; } - const auto tiles = house->getTiles(); + const auto &tiles = house->getTiles(); lua_newtable(L); int index = 0; - for (std::shared_ptr<Tile> tile : tiles) { - TileItemVector* itemVector = tile->getItemList(); + for (const auto &tile : tiles) { + const TileItemVector* itemVector = tile->getItemList(); if (itemVector) { - for (auto &item : *itemVector) { + for (const auto &item : *itemVector) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); lua_rawseti(L, -2, ++index); @@ -367,7 +367,7 @@ int HouseFunctions::luaHouseCanEditAccessList(lua_State* L) { return 1; } - uint32_t listId = getNumber<uint32_t>(L, 2); + const uint32_t listId = getNumber<uint32_t>(L, 2); const auto &player = getPlayer(L, 3); if (!player) { @@ -388,7 +388,7 @@ int HouseFunctions::luaHouseGetAccessList(lua_State* L) { } std::string list; - uint32_t listId = getNumber<uint32_t>(L, 2); + const uint32_t listId = getNumber<uint32_t>(L, 2); if (house->getAccessList(listId, list)) { pushString(L, list); } else { @@ -405,7 +405,7 @@ int HouseFunctions::luaHouseSetAccessList(lua_State* L) { return 1; } - uint32_t listId = getNumber<uint32_t>(L, 2); + const uint32_t listId = getNumber<uint32_t>(L, 2); const std::string &list = getString(L, 3); house->setAccessList(listId, list); pushBoolean(L, true); @@ -426,7 +426,7 @@ int HouseFunctions::luaHouseKickPlayer(lua_State* L) { return 1; } - auto targetPlayer = getPlayer(L, 3); + const auto &targetPlayer = getPlayer(L, 3); if (!targetPlayer) { reportErrorFunc("Target player is nullptr"); return 1; diff --git a/src/lua/functions/map/house_functions.hpp b/src/lua/functions/map/house_functions.hpp index ede7e1f09..8d527bf63 100644 --- a/src/lua/functions/map/house_functions.hpp +++ b/src/lua/functions/map/house_functions.hpp @@ -13,6 +13,12 @@ class HouseFunctions final : LuaScriptInterface { public: + explicit HouseFunctions(lua_State* L) : + LuaScriptInterface("HouseFunctions") { + init(L); + } + ~HouseFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "House", "", HouseFunctions::luaHouseCreate); registerMetaMethod(L, "House", "__eq", HouseFunctions::luaUserdataCompare); diff --git a/src/lua/functions/map/map_functions.hpp b/src/lua/functions/map/map_functions.hpp index 43b025c91..c89ee760d 100644 --- a/src/lua/functions/map/map_functions.hpp +++ b/src/lua/functions/map/map_functions.hpp @@ -18,6 +18,12 @@ class MapFunctions final : LuaScriptInterface { public: + explicit MapFunctions(lua_State* L) : + LuaScriptInterface("MapFunctions") { + init(L); + } + ~MapFunctions() override = default; + static void init(lua_State* L) { HouseFunctions::init(L); PositionFunctions::init(L); @@ -25,6 +31,4 @@ class MapFunctions final : LuaScriptInterface { TileFunctions::init(L); TownFunctions::init(L); } - -private: }; diff --git a/src/lua/functions/map/position_functions.cpp b/src/lua/functions/map/position_functions.cpp index 0e4397f3f..b182ee5e4 100644 --- a/src/lua/functions/map/position_functions.cpp +++ b/src/lua/functions/map/position_functions.cpp @@ -7,12 +7,13 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/map/position_functions.hpp" +#include "config/configmanager.hpp" +#include "creatures/creature.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" #include "game/movement/position.hpp" -#include "lua/functions/map/position_functions.hpp" -#include "map/spectators.hpp" int PositionFunctions::luaPositionCreate(lua_State* L) { // Position([x = 0[, y = 0[, z = 0[, stackpos = 0]]]]) @@ -27,9 +28,9 @@ int PositionFunctions::luaPositionCreate(lua_State* L) { const Position &position = getPosition(L, 2, stackpos); pushPosition(L, position, stackpos); } else { - uint16_t x = getNumber<uint16_t>(L, 2, 0); - uint16_t y = getNumber<uint16_t>(L, 3, 0); - uint8_t z = getNumber<uint8_t>(L, 4, 0); + const auto x = getNumber<uint16_t>(L, 2, 0); + const auto y = getNumber<uint16_t>(L, 3, 0); + const auto z = getNumber<uint8_t>(L, 4, 0); stackpos = getNumber<int32_t>(L, 5, 0); pushPosition(L, Position(x, y, z), stackpos); @@ -102,7 +103,7 @@ int PositionFunctions::luaPositionGetPathTo(lua_State* L) { lua_newtable(L); int index = 0; - for (Direction dir : dirList) { + for (const Direction dir : dirList) { lua_pushnumber(L, dir); lua_rawseti(L, -2, ++index); } @@ -114,7 +115,7 @@ int PositionFunctions::luaPositionGetPathTo(lua_State* L) { int PositionFunctions::luaPositionIsSightClear(lua_State* L) { // position:isSightClear(positionEx[, sameFloor = true]) - bool sameFloor = getBoolean(L, 3, true); + const bool sameFloor = getBoolean(L, 3, true); const Position &positionEx = getPosition(L, 2); const Position &position = getPosition(L, 1); pushBoolean(L, g_game().isSightClear(position, positionEx, sameFloor)); @@ -131,13 +132,13 @@ int PositionFunctions::luaPositionGetTile(lua_State* L) { int PositionFunctions::luaPositionGetZones(lua_State* L) { // position:getZones() const Position &position = getPosition(L, 1); - auto tile = g_game().map.getTile(position); + const auto &tile = g_game().map.getTile(position); if (tile == nullptr) { lua_pushnil(L); return 1; } int index = 0; - for (auto zone : tile->getZones()) { + for (const auto &zone : tile->getZones()) { index++; pushUserdata<Zone>(L, zone); setMetatable(L, -1, "Zone"); @@ -160,7 +161,7 @@ int PositionFunctions::luaPositionSendMagicEffect(lua_State* L) { } MagicEffectClasses magicEffect = getNumber<MagicEffectClasses>(L, 2); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && !g_game().isMagicEffectRegistered(magicEffect)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && !g_game().isMagicEffectRegistered(magicEffect)) { g_logger().warn("[PositionFunctions::luaPositionSendMagicEffect] An unregistered magic effect type with id '{}' was blocked to prevent client crash.", fmt::underlying(magicEffect)); pushBoolean(L, false); return 1; @@ -191,7 +192,7 @@ int PositionFunctions::luaPositionRemoveMagicEffect(lua_State* L) { } MagicEffectClasses magicEffect = getNumber<MagicEffectClasses>(L, 2); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && !g_game().isMagicEffectRegistered(magicEffect)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && !g_game().isMagicEffectRegistered(magicEffect)) { g_logger().warn("[PositionFunctions::luaPositionRemoveMagicEffect] An unregistered magic effect type with id '{}' was blocked to prevent client crash.", fmt::underlying(magicEffect)); pushBoolean(L, false); return 1; @@ -221,10 +222,10 @@ int PositionFunctions::luaPositionSendDistanceEffect(lua_State* L) { spectators.emplace_back(player); } - ShootType_t distanceEffect = getNumber<ShootType_t>(L, 3); + const ShootType_t distanceEffect = getNumber<ShootType_t>(L, 3); const Position &positionEx = getPosition(L, 2); const Position &position = getPosition(L, 1); - if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS, __FUNCTION__) && !g_game().isDistanceEffectRegistered(distanceEffect)) { + if (g_configManager().getBoolean(WARN_UNSAFE_SCRIPTS) && !g_game().isDistanceEffectRegistered(distanceEffect)) { g_logger().warn("[PositionFunctions::luaPositionSendDistanceEffect] An unregistered distance effect type with id '{}' was blocked to prevent client crash.", fmt::underlying(distanceEffect)); return 1; } @@ -242,8 +243,8 @@ int PositionFunctions::luaPositionSendDistanceEffect(lua_State* L) { int PositionFunctions::luaPositionSendSingleSoundEffect(lua_State* L) { // position:sendSingleSoundEffect(soundId[, actor = nullptr]) const Position &position = getPosition(L, 1); - SoundEffect_t soundEffect = getNumber<SoundEffect_t>(L, 2); - std::shared_ptr<Creature> actor = getCreature(L, 3); + const SoundEffect_t soundEffect = getNumber<SoundEffect_t>(L, 2); + const auto actor = getCreature(L, 3); g_game().sendSingleSoundEffect(position, soundEffect, actor); pushBoolean(L, true); @@ -253,9 +254,9 @@ int PositionFunctions::luaPositionSendSingleSoundEffect(lua_State* L) { int PositionFunctions::luaPositionSendDoubleSoundEffect(lua_State* L) { // position:sendDoubleSoundEffect(mainSoundId, secondarySoundId[, actor = nullptr]) const Position &position = getPosition(L, 1); - SoundEffect_t mainSoundEffect = getNumber<SoundEffect_t>(L, 2); - SoundEffect_t secondarySoundEffect = getNumber<SoundEffect_t>(L, 3); - std::shared_ptr<Creature> actor = getCreature(L, 4); + const SoundEffect_t mainSoundEffect = getNumber<SoundEffect_t>(L, 2); + const SoundEffect_t secondarySoundEffect = getNumber<SoundEffect_t>(L, 3); + const auto &actor = getCreature(L, 4); g_game().sendDoubleSoundEffect(position, mainSoundEffect, secondarySoundEffect, actor); pushBoolean(L, true); diff --git a/src/lua/functions/map/position_functions.hpp b/src/lua/functions/map/position_functions.hpp index 095ec0667..4bb6917ae 100644 --- a/src/lua/functions/map/position_functions.hpp +++ b/src/lua/functions/map/position_functions.hpp @@ -13,8 +13,14 @@ class PositionFunctions final : LuaScriptInterface { public: + explicit PositionFunctions(lua_State* L) : + LuaScriptInterface("PositionFunctions") { + init(L); + } + ~PositionFunctions() override = default; + static void init(lua_State* L) { - registerClass(L, "Position", "", PositionFunctions::luaPositionCreate); + registerSharedClass(L, "Position", "", PositionFunctions::luaPositionCreate); registerMetaMethod(L, "Position", "__add", PositionFunctions::luaPositionAdd); registerMetaMethod(L, "Position", "__sub", PositionFunctions::luaPositionSub); registerMetaMethod(L, "Position", "__eq", PositionFunctions::luaPositionCompare); diff --git a/src/lua/functions/map/teleport_functions.cpp b/src/lua/functions/map/teleport_functions.cpp index 32fce5830..84eafe21b 100644 --- a/src/lua/functions/map/teleport_functions.cpp +++ b/src/lua/functions/map/teleport_functions.cpp @@ -7,18 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/map/teleport_functions.hpp" #include "game/movement/teleport.hpp" #include "items/item.hpp" -#include "lua/functions/map/teleport_functions.hpp" // Teleport int TeleportFunctions::luaTeleportCreate(lua_State* L) { // Teleport(uid) - uint32_t id = getNumber<uint32_t>(L, 2); + const uint32_t id = getNumber<uint32_t>(L, 2); - std::shared_ptr<Item> item = getScriptEnv()->getItemByUID(id); + const auto &item = getScriptEnv()->getItemByUID(id); if (item && item->getTeleport()) { pushUserdata(L, item); setMetatable(L, -1, "Teleport"); @@ -30,7 +29,7 @@ int TeleportFunctions::luaTeleportCreate(lua_State* L) { int TeleportFunctions::luaTeleportGetDestination(lua_State* L) { // teleport:getDestination() - std::shared_ptr<Teleport> teleport = getUserdataShared<Teleport>(L, 1); + const auto &teleport = getUserdataShared<Teleport>(L, 1); if (teleport) { pushPosition(L, teleport->getDestPos()); } else { @@ -41,7 +40,7 @@ int TeleportFunctions::luaTeleportGetDestination(lua_State* L) { int TeleportFunctions::luaTeleportSetDestination(lua_State* L) { // teleport:setDestination(position) - std::shared_ptr<Teleport> teleport = getUserdataShared<Teleport>(L, 1); + const auto &teleport = getUserdataShared<Teleport>(L, 1); if (teleport) { teleport->setDestPos(getPosition(L, 2)); pushBoolean(L, true); diff --git a/src/lua/functions/map/teleport_functions.hpp b/src/lua/functions/map/teleport_functions.hpp index 152cf8f0d..57f59a703 100644 --- a/src/lua/functions/map/teleport_functions.hpp +++ b/src/lua/functions/map/teleport_functions.hpp @@ -13,6 +13,12 @@ class TeleportFunctions final : LuaScriptInterface { public: + explicit TeleportFunctions(lua_State* L) : + LuaScriptInterface("TeleportFunctions") { + init(L); + } + ~TeleportFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Teleport", "Item", TeleportFunctions::luaTeleportCreate); registerMetaMethod(L, "Teleport", "__eq", TeleportFunctions::luaUserdataCompare); diff --git a/src/lua/functions/map/tile_functions.cpp b/src/lua/functions/map/tile_functions.cpp index cdd82abda..d43ce68e6 100644 --- a/src/lua/functions/map/tile_functions.cpp +++ b/src/lua/functions/map/tile_functions.cpp @@ -7,10 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/map/tile_functions.hpp" +#include "creatures/combat/combat.hpp" #include "game/game.hpp" -#include "lua/functions/map/tile_functions.hpp" int TileFunctions::luaTileCreate(lua_State* L) { // Tile(x, y, z) @@ -19,9 +19,9 @@ int TileFunctions::luaTileCreate(lua_State* L) { if (isTable(L, 2)) { tile = g_game().map.getTile(getPosition(L, 2)); } else { - uint8_t z = getNumber<uint8_t>(L, 4); - uint16_t y = getNumber<uint16_t>(L, 3); - uint16_t x = getNumber<uint16_t>(L, 2); + const uint8_t z = getNumber<uint8_t>(L, 4); + const uint16_t y = getNumber<uint16_t>(L, 3); + const uint16_t x = getNumber<uint16_t>(L, 2); tile = g_game().map.getTile(x, y, z); } @@ -36,7 +36,7 @@ int TileFunctions::luaTileCreate(lua_State* L) { int TileFunctions::luaTileGetPosition(lua_State* L) { // tile:getPosition() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (tile) { pushPosition(L, tile->getPosition()); } else { @@ -47,7 +47,7 @@ int TileFunctions::luaTileGetPosition(lua_State* L) { int TileFunctions::luaTileGetGround(lua_State* L) { // tile:getGround() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (tile && tile->getGround()) { pushUserdata<Item>(L, tile->getGround()); setItemMetatable(L, -1, tile->getGround()); @@ -59,23 +59,23 @@ int TileFunctions::luaTileGetGround(lua_State* L) { int TileFunctions::luaTileGetThing(lua_State* L) { // tile:getThing(index) - int32_t index = getNumber<int32_t>(L, 2); - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const int32_t index = getNumber<int32_t>(L, 2); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Thing> thing = tile->getThing(index); + const auto &thing = tile->getThing(index); if (!thing) { lua_pushnil(L); return 1; } - if (std::shared_ptr<Creature> creature = thing->getCreature()) { + if (const auto &creature = thing->getCreature()) { pushUserdata<Creature>(L, creature); setCreatureMetatable(L, -1, creature); - } else if (std::shared_ptr<Item> item = thing->getItem()) { + } else if (const auto &item = thing->getItem()) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); } else { @@ -86,7 +86,7 @@ int TileFunctions::luaTileGetThing(lua_State* L) { int TileFunctions::luaTileGetThingCount(lua_State* L) { // tile:getThingCount() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (tile) { lua_pushnumber(L, tile->getThingCount()); } else { @@ -97,23 +97,23 @@ int TileFunctions::luaTileGetThingCount(lua_State* L) { int TileFunctions::luaTileGetTopVisibleThing(lua_State* L) { // tile:getTopVisibleThing(creature) - std::shared_ptr<Creature> creature = getCreature(L, 2); - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &creature = getCreature(L, 2); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Thing> thing = tile->getTopVisibleThing(creature); + const auto &thing = tile->getTopVisibleThing(creature); if (!thing) { lua_pushnil(L); return 1; } - if (std::shared_ptr<Creature> visibleCreature = thing->getCreature()) { + if (const auto &visibleCreature = thing->getCreature()) { pushUserdata<Creature>(L, visibleCreature); setCreatureMetatable(L, -1, visibleCreature); - } else if (std::shared_ptr<Item> visibleItem = thing->getItem()) { + } else if (const auto &visibleItem = thing->getItem()) { pushUserdata<Item>(L, visibleItem); setItemMetatable(L, -1, visibleItem); } else { @@ -124,13 +124,13 @@ int TileFunctions::luaTileGetTopVisibleThing(lua_State* L) { int TileFunctions::luaTileGetTopTopItem(lua_State* L) { // tile:getTopTopItem() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = tile->getTopTopItem(); + const auto &item = tile->getTopTopItem(); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -142,13 +142,13 @@ int TileFunctions::luaTileGetTopTopItem(lua_State* L) { int TileFunctions::luaTileGetTopDownItem(lua_State* L) { // tile:getTopDownItem() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = tile->getTopDownItem(); + const auto &item = tile->getTopDownItem(); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -160,13 +160,13 @@ int TileFunctions::luaTileGetTopDownItem(lua_State* L) { int TileFunctions::luaTileGetFieldItem(lua_State* L) { // tile:getFieldItem() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Item> item = tile->getFieldItem(); + const auto &item = tile->getFieldItem(); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -178,7 +178,7 @@ int TileFunctions::luaTileGetFieldItem(lua_State* L) { int TileFunctions::luaTileGetItemById(lua_State* L) { // tile:getItemById(itemId[, subType = -1]) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -194,9 +194,9 @@ int TileFunctions::luaTileGetItemById(lua_State* L) { return 1; } } - int32_t subType = getNumber<int32_t>(L, 3, -1); + const auto subType = getNumber<int32_t>(L, 3, -1); - std::shared_ptr<Item> item = g_game().findItemOfType(tile, itemId, false, subType); + const auto &item = g_game().findItemOfType(tile, itemId, false, subType); if (item) { pushUserdata<Item>(L, item); setItemMetatable(L, -1, item); @@ -208,7 +208,7 @@ int TileFunctions::luaTileGetItemById(lua_State* L) { int TileFunctions::luaTileGetItemByType(lua_State* L) { // tile:getItemByType(itemType) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -216,7 +216,7 @@ int TileFunctions::luaTileGetItemByType(lua_State* L) { bool found; - ItemTypes_t itemType = getNumber<ItemTypes_t>(L, 2); + const ItemTypes_t itemType = getNumber<ItemTypes_t>(L, 2); switch (itemType) { case ITEM_TYPE_TELEPORT: found = tile->hasFlag(TILESTATE_TELEPORT); @@ -246,7 +246,7 @@ int TileFunctions::luaTileGetItemByType(lua_State* L) { return 1; } - if (std::shared_ptr<Item> item = tile->getGround()) { + if (const auto &item = tile->getGround()) { const ItemType &it = Item::items[item->getID()]; if (it.type == itemType) { pushUserdata<Item>(L, item); @@ -272,15 +272,15 @@ int TileFunctions::luaTileGetItemByType(lua_State* L) { int TileFunctions::luaTileGetItemByTopOrder(lua_State* L) { // tile:getItemByTopOrder(topOrder) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - int32_t topOrder = getNumber<int32_t>(L, 2); + const int32_t topOrder = getNumber<int32_t>(L, 2); - std::shared_ptr<Item> item = tile->getItemByTopOrder(topOrder); + const auto &item = tile->getItemByTopOrder(topOrder); if (!item) { lua_pushnil(L); return 1; @@ -293,13 +293,13 @@ int TileFunctions::luaTileGetItemByTopOrder(lua_State* L) { int TileFunctions::luaTileGetItemCountById(lua_State* L) { // tile:getItemCountById(itemId[, subType = -1]) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - int32_t subType = getNumber<int32_t>(L, 3, -1); + const auto subType = getNumber<int32_t>(L, 3, -1); uint16_t itemId; if (isNumber(L, 2)) { @@ -318,13 +318,13 @@ int TileFunctions::luaTileGetItemCountById(lua_State* L) { int TileFunctions::luaTileGetBottomCreature(lua_State* L) { // tile:getBottomCreature() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = tile->getBottomCreature(); + const auto &creature = tile->getBottomCreature(); if (!creature) { lua_pushnil(L); return 1; @@ -337,13 +337,13 @@ int TileFunctions::luaTileGetBottomCreature(lua_State* L) { int TileFunctions::luaTileGetTopCreature(lua_State* L) { // tile:getTopCreature() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = tile->getTopCreature(); + const auto &creature = tile->getTopCreature(); if (!creature) { lua_pushnil(L); return 1; @@ -356,19 +356,19 @@ int TileFunctions::luaTileGetTopCreature(lua_State* L) { int TileFunctions::luaTileGetBottomVisibleCreature(lua_State* L) { // tile:getBottomVisibleCreature(creature) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> visibleCreature = tile->getBottomVisibleCreature(creature); + const auto &visibleCreature = tile->getBottomVisibleCreature(creature); if (visibleCreature) { pushUserdata<const Creature>(L, visibleCreature); setCreatureMetatable(L, -1, visibleCreature); @@ -380,19 +380,19 @@ int TileFunctions::luaTileGetBottomVisibleCreature(lua_State* L) { int TileFunctions::luaTileGetTopVisibleCreature(lua_State* L) { // tile:getTopVisibleCreature(creature) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> creature = getCreature(L, 2); + const auto &creature = getCreature(L, 2); if (!creature) { lua_pushnil(L); return 1; } - std::shared_ptr<Creature> visibleCreature = tile->getTopVisibleCreature(creature); + const auto &visibleCreature = tile->getTopVisibleCreature(creature); if (visibleCreature) { pushUserdata<Creature>(L, visibleCreature); setCreatureMetatable(L, -1, visibleCreature); @@ -404,7 +404,7 @@ int TileFunctions::luaTileGetTopVisibleCreature(lua_State* L) { int TileFunctions::luaTileGetItems(lua_State* L) { // tile:getItems() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -429,7 +429,7 @@ int TileFunctions::luaTileGetItems(lua_State* L) { int TileFunctions::luaTileGetItemCount(lua_State* L) { // tile:getItemCount() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -441,7 +441,7 @@ int TileFunctions::luaTileGetItemCount(lua_State* L) { int TileFunctions::luaTileGetDownItemCount(lua_State* L) { // tile:getDownItemCount() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (tile) { lua_pushnumber(L, tile->getDownItemCount()); } else { @@ -452,7 +452,7 @@ int TileFunctions::luaTileGetDownItemCount(lua_State* L) { int TileFunctions::luaTileGetTopItemCount(lua_State* L) { // tile:getTopItemCount() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -464,7 +464,7 @@ int TileFunctions::luaTileGetTopItemCount(lua_State* L) { int TileFunctions::luaTileGetCreatures(lua_State* L) { // tile:getCreatures() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -489,7 +489,7 @@ int TileFunctions::luaTileGetCreatures(lua_State* L) { int TileFunctions::luaTileGetCreatureCount(lua_State* L) { // tile:getCreatureCount() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -501,7 +501,7 @@ int TileFunctions::luaTileGetCreatureCount(lua_State* L) { int TileFunctions::luaTileHasProperty(lua_State* L) { // tile:hasProperty(property[, item]) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -525,13 +525,13 @@ int TileFunctions::luaTileHasProperty(lua_State* L) { int TileFunctions::luaTileGetThingIndex(lua_State* L) { // tile:getThingIndex(thing) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Thing> thing = getThing(L, 2); + const auto &thing = getThing(L, 2); if (thing) { lua_pushnumber(L, tile->getThingIndex(thing)); } else { @@ -542,7 +542,7 @@ int TileFunctions::luaTileGetThingIndex(lua_State* L) { int TileFunctions::luaTileHasFlag(lua_State* L) { // tile:hasFlag(flag) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (tile) { TileFlags_t flag = getNumber<TileFlags_t>(L, 2); pushBoolean(L, tile->hasFlag(flag)); @@ -554,15 +554,15 @@ int TileFunctions::luaTileHasFlag(lua_State* L) { int TileFunctions::luaTileQueryAdd(lua_State* L) { // tile:queryAdd(thing[, flags]) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - std::shared_ptr<Thing> thing = getThing(L, 2); + const auto &thing = getThing(L, 2); if (thing) { - uint32_t flags = getNumber<uint32_t>(L, 3, 0); + const auto flags = getNumber<uint32_t>(L, 3, 0); lua_pushnumber(L, tile->queryAdd(0, thing, 1, flags)); } else { lua_pushnil(L); @@ -572,7 +572,7 @@ int TileFunctions::luaTileQueryAdd(lua_State* L) { int TileFunctions::luaTileAddItem(lua_State* L) { // tile:addItem(itemId[, count/subType = 1[, flags = 0]]) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -589,15 +589,15 @@ int TileFunctions::luaTileAddItem(lua_State* L) { } } - uint32_t subType = getNumber<uint32_t>(L, 3, 1); + const auto subType = getNumber<uint32_t>(L, 3, 1); - std::shared_ptr<Item> item = Item::CreateItem(itemId, std::min<uint32_t>(subType, Item::items[itemId].stackSize)); + const auto &item = Item::CreateItem(itemId, std::min<uint32_t>(subType, Item::items[itemId].stackSize)); if (!item) { lua_pushnil(L); return 1; } - uint32_t flags = getNumber<uint32_t>(L, 4, 0); + const auto flags = getNumber<uint32_t>(L, 4, 0); ReturnValue ret = g_game().internalAddItem(tile, item, INDEX_WHEREEVER, flags); if (ret == RETURNVALUE_NOERROR) { @@ -612,13 +612,13 @@ int TileFunctions::luaTileAddItem(lua_State* L) { int TileFunctions::luaTileAddItemEx(lua_State* L) { // tile:addItemEx(item[, flags = 0]) - std::shared_ptr<Item> item = getUserdataShared<Item>(L, 2); + const auto &item = getUserdataShared<Item>(L, 2); if (!item) { lua_pushnil(L); return 1; } - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; @@ -630,7 +630,7 @@ int TileFunctions::luaTileAddItemEx(lua_State* L) { return 1; } - uint32_t flags = getNumber<uint32_t>(L, 3, 0); + const auto flags = getNumber<uint32_t>(L, 3, 0); ReturnValue ret = g_game().internalAddItem(tile, item, INDEX_WHEREEVER, flags); if (ret == RETURNVALUE_NOERROR) { ScriptEnvironment::removeTempItem(item); @@ -641,13 +641,13 @@ int TileFunctions::luaTileAddItemEx(lua_State* L) { int TileFunctions::luaTileGetHouse(lua_State* L) { // tile:getHouse() - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - if (std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(tile)) { + if (const auto &houseTile = std::dynamic_pointer_cast<HouseTile>(tile)) { pushUserdata<House>(L, houseTile->getHouse()); setMetatable(L, -1, "House"); } else { @@ -658,18 +658,18 @@ int TileFunctions::luaTileGetHouse(lua_State* L) { int TileFunctions::luaTileSweep(lua_State* L) { // tile:sweep(actor) - std::shared_ptr<Tile> tile = getUserdataShared<Tile>(L, 1); + const auto &tile = getUserdataShared<Tile>(L, 1); if (!tile) { lua_pushnil(L); return 1; } - auto actor = getPlayer(L, 2); + const auto &actor = getPlayer(L, 2); if (!actor) { lua_pushnil(L); return 1; } - auto house = tile->getHouse(); + const auto &house = tile->getHouse(); if (!house) { g_logger().debug("TileFunctions::luaTileSweep: tile has no house"); lua_pushnil(L); @@ -682,7 +682,7 @@ int TileFunctions::luaTileSweep(lua_State* L) { return 1; } - auto houseTile = std::dynamic_pointer_cast<HouseTile>(tile); + const auto &houseTile = std::dynamic_pointer_cast<HouseTile>(tile); if (!houseTile) { g_logger().debug("TileFunctions::luaTileSweep: tile is not a house tile"); lua_pushnil(L); diff --git a/src/lua/functions/map/tile_functions.hpp b/src/lua/functions/map/tile_functions.hpp index 78e8c44b3..a1183508b 100644 --- a/src/lua/functions/map/tile_functions.hpp +++ b/src/lua/functions/map/tile_functions.hpp @@ -13,6 +13,12 @@ class TileFunctions final : LuaScriptInterface { public: + explicit TileFunctions(lua_State* L) : + LuaScriptInterface("TileFunctions") { + init(L); + } + ~TileFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Tile", "", TileFunctions::luaTileCreate); registerMetaMethod(L, "Tile", "__eq", TileFunctions::luaUserdataCompare); diff --git a/src/lua/functions/map/town_functions.cpp b/src/lua/functions/map/town_functions.cpp index 053aca36b..eba9213d0 100644 --- a/src/lua/functions/map/town_functions.cpp +++ b/src/lua/functions/map/town_functions.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/functions/map/town_functions.hpp" #include "game/game.hpp" -#include "lua/functions/map/town_functions.hpp" #include "map/town.hpp" int TownFunctions::luaTownCreate(lua_State* L) { diff --git a/src/lua/functions/map/town_functions.hpp b/src/lua/functions/map/town_functions.hpp index 65ff991c2..a3e41ec67 100644 --- a/src/lua/functions/map/town_functions.hpp +++ b/src/lua/functions/map/town_functions.hpp @@ -13,6 +13,12 @@ class TownFunctions final : LuaScriptInterface { public: + explicit TownFunctions(lua_State* L) : + LuaScriptInterface("TownFunctions") { + init(L); + } + ~TownFunctions() override = default; + static void init(lua_State* L) { registerSharedClass(L, "Town", "", TownFunctions::luaTownCreate); registerMetaMethod(L, "Town", "__eq", TownFunctions::luaUserdataCompare); @@ -24,7 +30,6 @@ class TownFunctions final : LuaScriptInterface { private: static int luaTownCreate(lua_State* L); - static int luaTownGetId(lua_State* L); static int luaTownGetName(lua_State* L); static int luaTownGetTemplePosition(lua_State* L); diff --git a/src/lua/global/baseevents.cpp b/src/lua/global/baseevents.cpp index 3b312100d..71832291d 100644 --- a/src/lua/global/baseevents.cpp +++ b/src/lua/global/baseevents.cpp @@ -7,10 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/global/baseevents.hpp" + +#include "config/configmanager.hpp" #include "lua/scripts/lua_environment.hpp" +#include "lua/scripts/luascript.hpp" #include "utils/tools.hpp" bool BaseEvents::loadFromXml() { @@ -20,7 +21,7 @@ bool BaseEvents::loadFromXml() { } std::string scriptsName = getScriptBaseName(); - std::string basePath = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/" + scriptsName + "/"; + std::string basePath = g_configManager().getString(CORE_DIRECTORY) + "/" + scriptsName + "/"; if (getScriptInterface().loadFile( basePath + "lib/" + scriptsName + ".lua", scriptsName + ".lua" @@ -29,10 +30,10 @@ bool BaseEvents::loadFromXml() { g_logger().warn(__FUNCTION__, scriptsName, scriptsName); } - std::string filename = basePath + scriptsName + ".xml"; + const std::string filename = basePath + scriptsName + ".xml"; pugi::xml_document doc; - pugi::xml_parse_result result = doc.load_file(filename.c_str()); + const pugi::xml_parse_result result = doc.load_file(filename.c_str()); if (!result) { printXMLError(__FUNCTION__, filename, result); return false; @@ -40,8 +41,8 @@ bool BaseEvents::loadFromXml() { loaded = true; - for (auto node : doc.child(scriptsName.c_str()).children()) { - Event_ptr event = getEvent(node.name()); + for (const auto &node : doc.child(scriptsName.c_str()).children()) { + const auto &event = getEvent(node.name()); if (!event) { continue; } @@ -66,7 +67,7 @@ bool BaseEvents::loadFromXml() { } if (success) { - registerEvent(std::move(event), node); + registerEvent(event, node); } } return true; @@ -74,7 +75,7 @@ bool BaseEvents::loadFromXml() { bool BaseEvents::reload() { loaded = false; - clear(false); + clear(); return loadFromXml(); } @@ -104,7 +105,7 @@ bool Event::checkScript(const std::string &basePath, const std::string &scriptsN return false; } - int32_t id = testInterface->getEvent(getScriptEventName()); + const int32_t id = testInterface->getEvent(getScriptEventName()); if (id == -1) { g_logger().warn("[Event::checkScript] - Event " "{} not found {}", @@ -129,7 +130,7 @@ bool Event::loadScript(const std::string &scriptFile, const std::string &scriptN return false; } - int32_t id = scriptInterface->getEvent(getScriptEventName()); + const int32_t id = scriptInterface->getEvent(getScriptEventName()); if (id == -1) { g_logger().warn( "[Event::loadScript] - Event {} not found {}", @@ -152,7 +153,7 @@ bool CallBack::loadCallBack(LuaScriptInterface* interface, const std::string &na scriptInterface = interface; - int32_t id = scriptInterface->getEvent(name.c_str()); + const int32_t id = scriptInterface->getEvent(name); if (id == -1) { g_logger().warn("[{}] - Event {} not found", __FUNCTION__, name); return false; diff --git a/src/lua/global/baseevents.hpp b/src/lua/global/baseevents.hpp index 48e2d104a..754f8a7b2 100644 --- a/src/lua/global/baseevents.hpp +++ b/src/lua/global/baseevents.hpp @@ -9,10 +9,9 @@ #pragma once -#include "lua/scripts/luascript.hpp" - +class LuaScriptInterface; class Event; -using Event_ptr = std::unique_ptr<Event>; +using Event_ptr = std::shared_ptr<Event>; /** * @brief Class that describes an event @@ -84,7 +83,7 @@ class Event { * * @return int32_t */ - int32_t getScriptId() { + int32_t getScriptId() const { return scriptId; } @@ -147,8 +146,8 @@ class BaseEvents { virtual LuaScriptInterface &getScriptInterface() = 0; virtual std::string getScriptBaseName() const = 0; virtual Event_ptr getEvent(const std::string &nodeName) = 0; - virtual bool registerEvent(Event_ptr event, const pugi::xml_node &node) = 0; - virtual void clear(bool) = 0; + virtual bool registerEvent(const Event_ptr &event, const pugi::xml_node &node) = 0; + virtual void clear() = 0; bool loaded = false; diff --git a/src/lua/global/globalevent.cpp b/src/lua/global/globalevent.cpp index 32fa1a01a..f7de024bd 100644 --- a/src/lua/global/globalevent.cpp +++ b/src/lua/global/globalevent.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/global/globalevent.hpp" + #include "utils/tools.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" @@ -30,9 +29,9 @@ void GlobalEvents::clear() { timerMap.clear(); } -bool GlobalEvents::registerLuaEvent(const std::shared_ptr<GlobalEvent> globalEvent) { +bool GlobalEvents::registerLuaEvent(const std::shared_ptr<GlobalEvent> &globalEvent) { if (globalEvent->getEventType() == GLOBALEVENT_TIMER) { - auto result = timerMap.emplace(globalEvent->getName(), globalEvent); + const auto result = timerMap.emplace(globalEvent->getName(), globalEvent); if (result.second) { if (timerEventId == 0) { timerEventId = g_dispatcher().scheduleEvent( @@ -42,12 +41,12 @@ bool GlobalEvents::registerLuaEvent(const std::shared_ptr<GlobalEvent> globalEve return true; } } else if (globalEvent->getEventType() != GLOBALEVENT_NONE) { - auto result = serverMap.emplace(globalEvent->getName(), globalEvent); + const auto result = serverMap.emplace(globalEvent->getName(), globalEvent); if (result.second) { return true; } } else { // think event - auto result = thinkMap.emplace(globalEvent->getName(), globalEvent); + const auto result = thinkMap.emplace(globalEvent->getName(), globalEvent); if (result.second) { if (thinkEventId == 0) { thinkEventId = g_dispatcher().scheduleEvent( @@ -75,13 +74,13 @@ void GlobalEvents::save() const { } void GlobalEvents::timer() { - time_t now = time(nullptr); + const time_t now = time(nullptr); int64_t nextScheduledTime = std::numeric_limits<int64_t>::max(); auto it = timerMap.begin(); while (it != timerMap.end()) { - const auto globalEvent = it->second; + const auto &globalEvent = it->second; int64_t nextExecutionTime = globalEvent->getNextExecution() - now; if (nextExecutionTime > 0) { @@ -116,12 +115,10 @@ void GlobalEvents::timer() { } void GlobalEvents::think() { - int64_t now = OTSYS_TIME(); + const int64_t now = OTSYS_TIME(); int64_t nextScheduledTime = std::numeric_limits<int64_t>::max(); - for (auto &it : thinkMap) { - const auto globalEvent = it.second; - + for (const auto &[globalEventName, globalEvent] : thinkMap) { int64_t nextExecutionTime = globalEvent->getNextExecution() - now; if (nextExecutionTime > 0) { if (nextExecutionTime < nextScheduledTime) { @@ -147,7 +144,7 @@ void GlobalEvents::think() { } if (nextScheduledTime != std::numeric_limits<int64_t>::max()) { - auto delay = static_cast<uint32_t>(nextScheduledTime); + const auto delay = static_cast<uint32_t>(nextScheduledTime); thinkEventId = g_dispatcher().scheduleEvent( delay, [this] { think(); }, "GlobalEvents::think" ); @@ -155,8 +152,7 @@ void GlobalEvents::think() { } void GlobalEvents::execute(GlobalEvent_t type) const { - for (const auto &it : serverMap) { - const auto globalEvent = it.second; + for (const auto &[globalEventName, globalEvent] : serverMap) { if (globalEvent->getEventType() == type) { globalEvent->executeEvent(); } @@ -209,20 +205,20 @@ std::string GlobalEvent::getScriptTypeName() const { return "onSave"; default: g_logger().error("[GlobalEvent::getScriptTypeName] - Invalid event type"); - return std::string(); + return {}; } } bool GlobalEvent::executePeriodChange(LightState_t lightState, LightInfo lightInfo) const { // onPeriodChange(lightState, lightTime) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[GlobalEvent::executePeriodChange - {}] " "Call stack overflow. Too many lua script calls being nested.", getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -233,16 +229,16 @@ bool GlobalEvent::executePeriodChange(LightState_t lightState, LightInfo lightIn return getScriptInterface()->callFunction(2); } -bool GlobalEvent::executeRecord(uint32_t current, uint32_t old) { +bool GlobalEvent::executeRecord(uint32_t current, uint32_t old) const { // onRecord(current, old) - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[GlobalEvent::executeRecord - {}] " "Call stack overflow. Too many lua script calls being nested.", getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); @@ -254,14 +250,14 @@ bool GlobalEvent::executeRecord(uint32_t current, uint32_t old) { } bool GlobalEvent::executeEvent() const { - if (!getScriptInterface()->reserveScriptEnv()) { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("[GlobalEvent::executeEvent - {}] " "Call stack overflow. Too many lua script calls being nested.", getName()); return false; } - ScriptEnvironment* env = getScriptInterface()->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(getScriptId(), getScriptInterface()); lua_State* L = getScriptInterface()->getLuaState(); getScriptInterface()->pushFunction(getScriptId()); diff --git a/src/lua/global/globalevent.hpp b/src/lua/global/globalevent.hpp index 128a743b3..cc08bb9c7 100644 --- a/src/lua/global/globalevent.hpp +++ b/src/lua/global/globalevent.hpp @@ -38,7 +38,7 @@ class GlobalEvents final : public Scripts { GlobalEventMap getEventMap(GlobalEvent_t type); - bool registerLuaEvent(const std::shared_ptr<GlobalEvent> globalEvent); + bool registerLuaEvent(const std::shared_ptr<GlobalEvent> &globalEvent); void clear(); private: @@ -53,7 +53,7 @@ class GlobalEvent final : public Script { explicit GlobalEvent(LuaScriptInterface* interface); bool executePeriodChange(LightState_t lightState, LightInfo lightInfo) const; - bool executeRecord(uint32_t current, uint32_t old); + bool executeRecord(uint32_t current, uint32_t old) const; bool executeEvent() const; GlobalEvent_t getEventType() const { @@ -67,7 +67,7 @@ class GlobalEvent final : public Script { return name; } void setName(std::string eventName) { - name = eventName; + name = std::move(eventName); } uint32_t getInterval() const { return interval; diff --git a/src/lua/lua_definitions.hpp b/src/lua/lua_definitions.hpp index 81add18e5..ace5ee321 100644 --- a/src/lua/lua_definitions.hpp +++ b/src/lua/lua_definitions.hpp @@ -57,7 +57,7 @@ enum class LuaData_t : uint8_t { ItemClassification, }; -enum CreatureEventType_t { +enum CreatureEventType_t : uint8_t { CREATURE_EVENT_NONE, CREATURE_EVENT_LOGIN, CREATURE_EVENT_LOGOUT, @@ -74,7 +74,7 @@ enum CreatureEventType_t { CREATURE_EVENT_EXTENDED_OPCODE, }; -enum MoveEvent_t { +enum MoveEvent_t : uint8_t { MOVE_EVENT_STEP_IN, MOVE_EVENT_STEP_OUT, MOVE_EVENT_EQUIP, diff --git a/src/lua/modules/modules.cpp b/src/lua/modules/modules.cpp index 8b79524ec..1e501b85c 100644 --- a/src/lua/modules/modules.cpp +++ b/src/lua/modules/modules.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/modules/modules.hpp" + #include "creatures/players/player.hpp" #include "game/game.hpp" @@ -18,10 +17,15 @@ Modules::Modules() : scriptInterface.initState(); } -void Modules::clear(bool) { +void Modules::clear() { // clear recvbyte list - for (auto &it : recvbyteList) { - it.second.clearEvent(); + for (const auto &[moduleId, modulePtr] : recvbyteList) { + if (moduleId == 0) { + g_logger().error("Invalid module id 0."); + continue; + } + + modulePtr->clearEvent(); } // clear lua state @@ -40,54 +44,56 @@ Event_ptr Modules::getEvent(const std::string &nodeName) { if (strcasecmp(nodeName.c_str(), "module") != 0) { return nullptr; } - return Event_ptr(new Module(&scriptInterface)); + return std::make_unique<Module>(&scriptInterface); } -bool Modules::registerEvent(Event_ptr event, const pugi::xml_node &) { - Module_ptr module { static_cast<Module*>(event.release()) }; - if (module->getEventType() == MODULE_TYPE_NONE) { +bool Modules::registerEvent(const Event_ptr &event, const pugi::xml_node &) { + const auto &modulePtr = std::dynamic_pointer_cast<Module>(event); + if (modulePtr->getEventType() == MODULE_TYPE_NONE) { g_logger().error("Trying to register event without type!"); return false; } - Module* oldModule = getEventByRecvbyte(module->getRecvbyte(), false); + const auto oldModule = getEventByRecvbyte(modulePtr->getRecvbyte(), false); if (oldModule) { - if (!oldModule->isLoaded() && oldModule->getEventType() == module->getEventType()) { - oldModule->copyEvent(module.get()); + if (!oldModule->isLoaded() && oldModule->getEventType() == modulePtr->getEventType()) { + oldModule->copyEvent(modulePtr); + return true; } return false; + } + + const auto it = recvbyteList.find(modulePtr->getRecvbyte()); + if (it != recvbyteList.end()) { + it->second = modulePtr; } else { - auto it = recvbyteList.find(module->getRecvbyte()); - if (it != recvbyteList.end()) { - it->second = *module; - } else { - recvbyteList.emplace(module->getRecvbyte(), std::move(*module)); - } - return true; + recvbyteList.try_emplace(modulePtr->getRecvbyte(), modulePtr); } + return true; } -Module* Modules::getEventByRecvbyte(uint8_t recvbyte, bool force) { - ModulesList::iterator it = recvbyteList.find(recvbyte); - if (it != recvbyteList.end()) { - if (!force || it->second.isLoaded()) { - return &it->second; - } +Module_ptr Modules::getEventByRecvbyte(uint8_t recvbyte, bool force) { + const auto it = recvbyteList.find(recvbyte); + if (it != recvbyteList.end() && (!force || it->second->isLoaded())) { + return it->second; } return nullptr; } void Modules::executeOnRecvbyte(uint32_t playerId, NetworkMessage &msg, uint8_t byte) const { - std::shared_ptr<Player> player = g_game().getPlayerByID(playerId); + const auto &player = g_game().getPlayerByID(playerId); if (!player) { return; } - for (auto &it : recvbyteList) { - Module module = it.second; - if (module.getEventType() == MODULE_TYPE_RECVBYTE && module.getRecvbyte() == byte && player->canRunModule(module.getRecvbyte())) { - player->setModuleDelay(module.getRecvbyte(), module.getDelay()); - module.executeOnRecvbyte(player, msg); + for (const auto &[moduleId, modulePtr] : recvbyteList) { + if (moduleId == 0) { + g_logger().error("Invalid module id 0."); + continue; + } + if (modulePtr->getEventType() == MODULE_TYPE_RECVBYTE && modulePtr->getRecvbyte() == byte && player->canRunModule(modulePtr->getRecvbyte())) { + player->setModuleDelay(modulePtr->getRecvbyte(), modulePtr->getDelay()); + modulePtr->executeOnRecvbyte(player, msg); return; } } @@ -99,15 +105,15 @@ Module::Module(LuaScriptInterface* interface) : bool Module::configureEvent(const pugi::xml_node &node) { delay = 0; - pugi::xml_attribute typeAttribute = node.attribute("type"); + const auto typeAttribute = node.attribute("type"); if (!typeAttribute) { g_logger().error("Missing type for module."); return false; } - std::string tmpStr = asLowerCaseString(typeAttribute.as_string()); + const auto tmpStr = asLowerCaseString(typeAttribute.as_string()); if (tmpStr == "recvbyte") { - pugi::xml_attribute byteAttribute = node.attribute("byte"); + const auto byteAttribute = node.attribute("byte"); if (!byteAttribute) { g_logger().error("Missing byte for module typed recvbyte."); return false; @@ -120,9 +126,9 @@ bool Module::configureEvent(const pugi::xml_node &node) { return false; } - pugi::xml_attribute delayAttribute = node.attribute("delay"); + const auto delayAttribute = node.attribute("delay"); if (delayAttribute) { - delay = static_cast<uint16_t>(delayAttribute.as_uint()); + delay = static_cast<int16_t>(delayAttribute.as_uint()); } loaded = true; @@ -134,15 +140,15 @@ std::string Module::getScriptEventName() const { case MODULE_TYPE_RECVBYTE: return "onRecvbyte"; default: - return std::string(); + return {}; } } -void Module::copyEvent(Module* module) { - scriptId = module->scriptId; - scriptInterface = module->scriptInterface; - scripted = module->scripted; - loaded = module->loaded; +void Module::copyEvent(const Module_ptr &modulePtr) { + scriptId = modulePtr->scriptId; + scriptInterface = modulePtr->scriptInterface; + scripted = modulePtr->scripted; + loaded = modulePtr->loaded; } void Module::clearEvent() { @@ -152,14 +158,13 @@ void Module::clearEvent() { loaded = false; } -void Module::executeOnRecvbyte(std::shared_ptr<Player> player, NetworkMessage &msg) { - // onRecvbyte(player, msg, recvbyte) - if (!scriptInterface->reserveScriptEnv()) { +void Module::executeOnRecvbyte(const std::shared_ptr<Player> &player, NetworkMessage &msg) const { + if (!LuaScriptInterface::reserveScriptEnv()) { g_logger().error("Call stack overflow. Too many lua script calls being nested {}", player->getName()); return; } - ScriptEnvironment* env = scriptInterface->getScriptEnv(); + ScriptEnvironment* env = LuaScriptInterface::getScriptEnv(); env->setScriptId(scriptId, scriptInterface); lua_State* L = scriptInterface->getLuaState(); diff --git a/src/lua/modules/modules.hpp b/src/lua/modules/modules.hpp index 6543138d5..400ced5e0 100644 --- a/src/lua/modules/modules.hpp +++ b/src/lua/modules/modules.hpp @@ -16,13 +16,13 @@ #include "server/network/message/networkmessage.hpp" class Module; -using Module_ptr = std::unique_ptr<Module>; +using Module_ptr = std::shared_ptr<Module>; class Module final : public Event { public: explicit Module(LuaScriptInterface* interface); - bool configureEvent(const pugi::xml_node &node) final; + bool configureEvent(const pugi::xml_node &node) override; ModuleType_t getEventType() const { return type; @@ -32,26 +32,26 @@ class Module final : public Event { } void clearEvent(); - void copyEvent(Module* creatureEvent); + void copyEvent(const Module_ptr &creatureEvent); // scripting - void executeOnRecvbyte(std::shared_ptr<Player> player, NetworkMessage &msg); + void executeOnRecvbyte(const std::shared_ptr<Player> &player, NetworkMessage &msg) const; // - uint8_t getRecvbyte() { + uint8_t getRecvbyte() const { return recvbyte; } - int16_t getDelay() { + int16_t getDelay() const { return delay; } protected: - std::string getScriptEventName() const final; + std::string getScriptEventName() const override; ModuleType_t type; - uint8_t recvbyte; - int16_t delay; + uint8_t recvbyte {}; + int16_t delay {}; bool loaded; }; @@ -68,16 +68,16 @@ class Modules final : public BaseEvents { } void executeOnRecvbyte(uint32_t playerId, NetworkMessage &msg, uint8_t byte) const; - Module* getEventByRecvbyte(uint8_t recvbyte, bool force); + Module_ptr getEventByRecvbyte(uint8_t recvbyte, bool force); protected: LuaScriptInterface &getScriptInterface() override; std::string getScriptBaseName() const override; Event_ptr getEvent(const std::string &nodeName) override; - bool registerEvent(Event_ptr event, const pugi::xml_node &node) override; - void clear(bool) override final; + bool registerEvent(const Event_ptr &event, const pugi::xml_node &node) override; + void clear() override; - typedef std::map<uint8_t, Module> ModulesList; + using ModulesList = std::map<uint8_t, Module_ptr>; ModulesList recvbyteList; LuaScriptInterface scriptInterface; diff --git a/src/lua/scripts/lua_environment.cpp b/src/lua/scripts/lua_environment.cpp index cd5023a8d..b4cc620b1 100644 --- a/src/lua/scripts/lua_environment.cpp +++ b/src/lua/scripts/lua_environment.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/scripts/lua_environment.hpp" #include "declarations.hpp" -#include "lua/scripts/lua_environment.hpp" #include "lua/functions/lua_functions_loader.hpp" #include "lua/scripts/script_environment.hpp" #include "lua/global/lua_timer_event_descr.hpp" @@ -71,7 +70,7 @@ bool LuaEnvironment::closeState() { for (auto &timerEntry : timerEvents) { LuaTimerEventDesc timerEventDesc = std::move(timerEntry.second); - for (int32_t parameter : timerEventDesc.parameters) { + for (const int32_t parameter : timerEventDesc.parameters) { luaL_unref(luaState, LUA_REGISTRYINDEX, parameter); } luaL_unref(luaState, LUA_REGISTRYINDEX, timerEventDesc.function); @@ -96,7 +95,7 @@ LuaScriptInterface* LuaEnvironment::getTestInterface() { } std::shared_ptr<Combat> LuaEnvironment::getCombatObject(uint32_t id) const { - auto it = combatMap.find(id); + const auto it = combatMap.find(id); if (it == combatMap.end()) { return nullptr; } @@ -111,7 +110,7 @@ std::shared_ptr<Combat> LuaEnvironment::createCombatObject(LuaScriptInterface* i } void LuaEnvironment::clearCombatObjects(LuaScriptInterface* interface) { - auto it = combatIdMap.find(interface); + const auto it = combatIdMap.find(interface); if (it == combatIdMap.end()) { return; } @@ -121,7 +120,7 @@ void LuaEnvironment::clearCombatObjects(LuaScriptInterface* interface) { } const std::unique_ptr<AreaCombat> &LuaEnvironment::getAreaObject(uint32_t id) const { - auto it = areaMap.find(id); + const auto it = areaMap.find(id); if (it == areaMap.end()) { return AreaCombatNull; } @@ -135,7 +134,7 @@ uint32_t LuaEnvironment::createAreaObject(LuaScriptInterface* interface) { } void LuaEnvironment::clearAreaObjects(LuaScriptInterface* interface) { - auto it = areaIdMap.find(interface); + const auto it = areaIdMap.find(interface); if (it == areaIdMap.end()) { return; } @@ -150,7 +149,7 @@ void LuaEnvironment::clearAreaObjects(LuaScriptInterface* interface) { } void LuaEnvironment::executeTimerEvent(uint32_t eventIndex) { - auto it = timerEvents.find(eventIndex); + const auto it = timerEvents.find(eventIndex); if (it == timerEvents.end()) { return; } @@ -162,7 +161,7 @@ void LuaEnvironment::executeTimerEvent(uint32_t eventIndex) { lua_rawgeti(luaState, LUA_REGISTRYINDEX, timerEventDesc.function); // push parameters - for (auto parameter : std::views::reverse(timerEventDesc.parameters)) { + for (const auto parameter : std::views::reverse(timerEventDesc.parameters)) { lua_rawgeti(luaState, LUA_REGISTRYINDEX, parameter); } @@ -180,7 +179,7 @@ void LuaEnvironment::executeTimerEvent(uint32_t eventIndex) { // free resources luaL_unref(luaState, LUA_REGISTRYINDEX, timerEventDesc.function); - for (auto parameter : timerEventDesc.parameters) { + for (const auto parameter : timerEventDesc.parameters) { luaL_unref(luaState, LUA_REGISTRYINDEX, parameter); } } diff --git a/src/lua/scripts/lua_environment.hpp b/src/lua/scripts/lua_environment.hpp index b467599ca..e7751bb49 100644 --- a/src/lua/scripts/lua_environment.hpp +++ b/src/lua/scripts/lua_environment.hpp @@ -22,7 +22,7 @@ class Cylinder; class Game; class GlobalFunctions; -class LuaEnvironment : public LuaScriptInterface { +class LuaEnvironment final : public LuaScriptInterface { public: static bool shuttingDown; @@ -52,7 +52,7 @@ class LuaEnvironment : public LuaScriptInterface { template <typename T> std::shared_ptr<T> createWeaponObject(LuaScriptInterface* interface) { auto weapon = std::make_shared<T>(interface); - auto weaponId = ++lastWeaponId; + const auto weaponId = ++lastWeaponId; weaponMap[weaponId] = weapon; weaponIdMap[interface].push_back(weaponId); return weapon; @@ -60,7 +60,7 @@ class LuaEnvironment : public LuaScriptInterface { template <typename T> std::shared_ptr<T> getWeaponObject(uint32_t id) const { - auto it = weaponMap.find(id); + const auto it = weaponMap.find(id); if (it == weaponMap.end()) { return nullptr; } @@ -68,7 +68,7 @@ class LuaEnvironment : public LuaScriptInterface { } void clearWeaponObjects(LuaScriptInterface* interface) { - auto it = weaponIdMap.find(interface); + const auto it = weaponIdMap.find(interface); if (it == weaponIdMap.end()) { return; } @@ -89,7 +89,7 @@ class LuaEnvironment : public LuaScriptInterface { private: void executeTimerEvent(uint32_t eventIndex); - phmap::flat_hash_map<uint32_t, LuaTimerEventDesc> timerEvents; + std::unordered_map<uint32_t, LuaTimerEventDesc> timerEvents; uint32_t lastEventTimerId = 1; phmap::flat_hash_map<uint32_t, std::unique_ptr<AreaCombat>> areaMap; @@ -100,8 +100,8 @@ class LuaEnvironment : public LuaScriptInterface { phmap::flat_hash_map<LuaScriptInterface*, std::vector<uint32_t>> combatIdMap; uint32_t lastCombatId = 0; - phmap::flat_hash_map<uint32_t, std::shared_ptr<Weapon>> weaponMap; - phmap::flat_hash_map<LuaScriptInterface*, std::vector<uint32_t>> weaponIdMap; + std::unordered_map<uint32_t, std::shared_ptr<Weapon>> weaponMap; + std::unordered_map<LuaScriptInterface*, std::vector<uint32_t>> weaponIdMap; uint32_t lastWeaponId = 0; LuaScriptInterface* testInterface = nullptr; diff --git a/src/lua/scripts/luascript.cpp b/src/lua/scripts/luascript.cpp index d67b90e9d..aa1b60118 100644 --- a/src/lua/scripts/luascript.cpp +++ b/src/lua/scripts/luascript.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "lua/scripts/luascript.hpp" + #include "lua/scripts/lua_environment.hpp" #include "lib/metrics/metrics.hpp" @@ -25,7 +24,7 @@ LuaScriptInterface::LuaScriptInterface(std::string initInterfaceName) : } LuaScriptInterface::~LuaScriptInterface() { - closeState(); + LuaScriptInterface::closeState(); } bool LuaScriptInterface::reInitState() { @@ -158,7 +157,7 @@ const std::string &LuaScriptInterface::getFileById(int32_t scriptId) { return loadingFile; } - auto it = cacheFiles.find(scriptId); + const auto it = cacheFiles.find(scriptId); if (it == cacheFiles.end()) { static const std::string &unk = "(Unknown scriptfile)"; return unk; @@ -166,7 +165,7 @@ const std::string &LuaScriptInterface::getFileById(int32_t scriptId) { return it->second; } -std::string LuaScriptInterface::getStackTrace(const std::string &error_desc) { +std::string LuaScriptInterface::getStackTrace(const std::string &error_desc) const { lua_getglobal(luaState, "debug"); if (!isTable(luaState, -1)) { lua_pop(luaState, 1); @@ -195,7 +194,7 @@ std::string LuaScriptInterface::getStackTrace(const std::string &error_desc) { return stackTrace; } -bool LuaScriptInterface::pushFunction(int32_t functionId) { +bool LuaScriptInterface::pushFunction(int32_t functionId) const { lua_rawgeti(luaState, LUA_REGISTRYINDEX, eventTableRef); if (!isTable(luaState, -1)) { return false; @@ -237,7 +236,7 @@ bool LuaScriptInterface::closeState() { return true; } -std::string LuaScriptInterface::getMetricsScope() { +std::string LuaScriptInterface::getMetricsScope() const { metrics::method_latency measure(__METHOD_NAME__); int32_t scriptId; int32_t callbackId; @@ -255,7 +254,7 @@ std::string LuaScriptInterface::getMetricsScope() { if (name.empty()) { return "unknown"; } - auto pos = name.find("data"); + const auto pos = name.find("data"); if (pos != std::string::npos) { name = name.substr(pos); } @@ -264,10 +263,10 @@ std::string LuaScriptInterface::getMetricsScope() { return fmt::format("{}:{}", name, timerEvent ? "timer" : "<direct>"); } -bool LuaScriptInterface::callFunction(int params) { +bool LuaScriptInterface::callFunction(int params) const { metrics::lua_latency measure(getMetricsScope()); bool result = false; - int size = lua_gettop(luaState); + const int size = lua_gettop(luaState); if (protectedCall(luaState, params, 1) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::getString(luaState, -1)); } else { @@ -283,9 +282,9 @@ bool LuaScriptInterface::callFunction(int params) { return result; } -void LuaScriptInterface::callVoidFunction(int params) { +void LuaScriptInterface::callVoidFunction(int params) const { metrics::lua_latency measure(getMetricsScope()); - int size = lua_gettop(luaState); + const int size = lua_gettop(luaState); if (protectedCall(luaState, params, 0) != 0) { LuaScriptInterface::reportError(nullptr, LuaScriptInterface::popString(luaState)); } diff --git a/src/lua/scripts/luascript.hpp b/src/lua/scripts/luascript.hpp index 06654c35a..82ed9fa69 100644 --- a/src/lua/scripts/luascript.hpp +++ b/src/lua/scripts/luascript.hpp @@ -9,7 +9,6 @@ #pragma once -#include "lib/logging/log_with_spd_log.hpp" #include "lua/functions/lua_functions_loader.hpp" #include "lua/scripts/script_environment.hpp" @@ -58,12 +57,12 @@ class LuaScriptInterface : public LuaFunctionsLoader { return luaState; } - bool pushFunction(int32_t functionId); + bool pushFunction(int32_t functionId) const; - bool callFunction(int params); - void callVoidFunction(int params); + bool callFunction(int params) const; + void callVoidFunction(int params) const; - std::string getStackTrace(const std::string &error_desc); + std::string getStackTrace(const std::string &error_desc) const; protected: virtual bool closeState(); @@ -73,7 +72,7 @@ class LuaScriptInterface : public LuaFunctionsLoader { std::map<int32_t, std::string> cacheFiles; private: - std::string getMetricsScope(); + std::string getMetricsScope() const; std::string lastLuaError; std::string interfaceName; diff --git a/src/lua/scripts/script_environment.cpp b/src/lua/scripts/script_environment.cpp index 4a7ad7acd..80eea882f 100644 --- a/src/lua/scripts/script_environment.cpp +++ b/src/lua/scripts/script_environment.cpp @@ -7,11 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "lua/scripts/script_environment.hpp" +#include "creatures/creature.hpp" #include "game/game.hpp" #include "lua/scripts/luascript.hpp" -#include "lua/scripts/script_environment.hpp" ScriptEnvironment::ScriptEnvironment() { resetEnv(); @@ -29,10 +29,10 @@ void ScriptEnvironment::resetEnv() { localMap.clear(); tempResults.clear(); - auto pair = tempItems.equal_range(this); - auto it = pair.first; - while (it != pair.second) { - std::shared_ptr<Item> item = it->second; + const auto [fst, snd] = tempItems.equal_range(this); + auto it = fst; + while (it != snd) { + const auto item = it->second; it = tempItems.erase(it); } } @@ -41,7 +41,7 @@ bool ScriptEnvironment::setCallbackId(int32_t newCallbackId, LuaScriptInterface* if (this->callbackId != 0) { // nested callbacks are not allowed if (interface) { - interface->reportErrorFunc("Nested callbacks!"); + LuaScriptInterface::reportErrorFunc("Nested callbacks!"); } return false; } @@ -58,24 +58,24 @@ void ScriptEnvironment::getEventInfo(int32_t &retScriptId, LuaScriptInterface*&r retTimerEvent = this->timerEvent; } -uint32_t ScriptEnvironment::addThing(std::shared_ptr<Thing> thing) { +uint32_t ScriptEnvironment::addThing(const std::shared_ptr<Thing> &thing) { if (!thing || thing->isRemoved()) { return 0; } - std::shared_ptr<Creature> creature = thing->getCreature(); + const auto &creature = thing->getCreature(); if (creature) { return creature->getID(); } - std::shared_ptr<Item> item = thing->getItem(); + const auto &item = thing->getItem(); if (item && item->hasAttribute(ItemAttribute_t::UNIQUEID)) { return item->getAttribute<uint32_t>(ItemAttribute_t::UNIQUEID); } - for (const auto &it : localMap) { - if (it.second == item) { - return it.first; + for (const auto &[itemId, itemPtr] : localMap) { + if (itemPtr == item) { + return itemId; } } @@ -84,8 +84,8 @@ uint32_t ScriptEnvironment::addThing(std::shared_ptr<Thing> thing) { } void ScriptEnvironment::insertItem(uint32_t uid, std::shared_ptr<Item> item) { - auto result = localMap.emplace(uid, item); - if (!result.second) { + const auto [fst, snd] = localMap.emplace(uid, item); + if (!snd) { g_logger().error("Thing uid already taken: {}", uid); } } @@ -96,16 +96,16 @@ std::shared_ptr<Thing> ScriptEnvironment::getThingByUID(uint32_t uid) { } if (uid <= std::numeric_limits<uint16_t>::max()) { - std::shared_ptr<Item> item = g_game().getUniqueItem(static_cast<uint16_t>(uid)); + const auto &item = g_game().getUniqueItem(static_cast<uint16_t>(uid)); if (item && !item->isRemoved()) { return item; } return nullptr; } - auto it = localMap.find(uid); + const auto it = localMap.find(uid); if (it != localMap.end()) { - std::shared_ptr<Item> item = it->second; + const auto &item = it->second; if (!item->isRemoved()) { return item; } @@ -114,7 +114,7 @@ std::shared_ptr<Thing> ScriptEnvironment::getThingByUID(uint32_t uid) { } std::shared_ptr<Item> ScriptEnvironment::getItemByUID(uint32_t uid) { - std::shared_ptr<Thing> thing = getThingByUID(uid); + const auto &thing = getThingByUID(uid); if (!thing) { return nullptr; } @@ -122,7 +122,7 @@ std::shared_ptr<Item> ScriptEnvironment::getItemByUID(uint32_t uid) { } std::shared_ptr<Container> ScriptEnvironment::getContainerByUID(uint32_t uid) { - std::shared_ptr<Item> item = getItemByUID(uid); + const auto &item = getItemByUID(uid); if (!item) { return nullptr; } @@ -135,17 +135,17 @@ void ScriptEnvironment::removeItemByUID(uint32_t uid) { return; } - auto it = localMap.find(uid); + const auto it = localMap.find(uid); if (it != localMap.end()) { localMap.erase(it); } } -void ScriptEnvironment::addTempItem(std::shared_ptr<Item> item) { +void ScriptEnvironment::addTempItem(const std::shared_ptr<Item> &item) { tempItems.emplace(this, item); } -void ScriptEnvironment::removeTempItem(std::shared_ptr<Item> item) { +void ScriptEnvironment::removeTempItem(const std::shared_ptr<Item> &item) { for (auto it = tempItems.begin(), end = tempItems.end(); it != end; ++it) { if (it->second == item) { tempItems.erase(it); @@ -155,12 +155,12 @@ void ScriptEnvironment::removeTempItem(std::shared_ptr<Item> item) { } uint32_t ScriptEnvironment::addResult(DBResult_ptr res) { - tempResults[++lastResultId] = res; + tempResults[++lastResultId] = std::move(res); return lastResultId; } bool ScriptEnvironment::removeResult(uint32_t id) { - auto it = tempResults.find(id); + const auto it = tempResults.find(id); if (it == tempResults.end()) { return false; } @@ -170,7 +170,7 @@ bool ScriptEnvironment::removeResult(uint32_t id) { } DBResult_ptr ScriptEnvironment::getResultByID(uint32_t id) { - auto it = tempResults.find(id); + const auto it = tempResults.find(id); if (it == tempResults.end()) { return nullptr; } diff --git a/src/lua/scripts/script_environment.hpp b/src/lua/scripts/script_environment.hpp index fe89d3f1e..54faf81b7 100644 --- a/src/lua/scripts/script_environment.hpp +++ b/src/lua/scripts/script_environment.hpp @@ -22,10 +22,10 @@ class LuaScriptInterface; class Cylinder; class Game; -class ScriptEnvironment { +class ScriptEnvironment final { public: ScriptEnvironment(); - virtual ~ScriptEnvironment(); + ~ScriptEnvironment(); // non-copyable ScriptEnvironment(const ScriptEnvironment &) = delete; @@ -42,7 +42,7 @@ class ScriptEnvironment { int32_t getScriptId() const { return scriptId; } - LuaScriptInterface* getScriptInterface() { + LuaScriptInterface* getScriptInterface() const { return interface; } @@ -52,9 +52,9 @@ class ScriptEnvironment { void getEventInfo(int32_t &scriptId, LuaScriptInterface*&scriptInterface, int32_t &callbackId, bool &timerEvent) const; - void addTempItem(std::shared_ptr<Item> item); - static void removeTempItem(std::shared_ptr<Item> item); - uint32_t addThing(std::shared_ptr<Thing> thing); + void addTempItem(const std::shared_ptr<Item> &item); + static void removeTempItem(const std::shared_ptr<Item> &item); + uint32_t addThing(const std::shared_ptr<Thing> &thing); void insertItem(uint32_t uid, std::shared_ptr<Item> item); static DBResult_ptr getResultByID(uint32_t id); @@ -62,7 +62,7 @@ class ScriptEnvironment { static bool removeResult(uint32_t id); void setNpc(std::shared_ptr<Npc> npc) { - curNpc = npc; + curNpc = std::move(npc); } std::shared_ptr<Npc> getNpc() const { return curNpc; @@ -77,7 +77,7 @@ class ScriptEnvironment { using StorageMap = std::map<uint32_t, int32_t>; using DBResultMap = std::map<uint32_t, DBResult_ptr>; - LuaScriptInterface* interface; + LuaScriptInterface* interface {}; // for npc scripts std::shared_ptr<Npc> curNpc = nullptr; @@ -90,9 +90,9 @@ class ScriptEnvironment { uint32_t lastUID = std::numeric_limits<uint16_t>::max(); // script file id - int32_t scriptId; - int32_t callbackId; - bool timerEvent; + int32_t scriptId {}; + int32_t callbackId {}; + bool timerEvent {}; // result map static uint32_t lastResultId; diff --git a/src/lua/scripts/scripts.cpp b/src/lua/scripts/scripts.cpp index cb92c1cc2..556ed1be5 100644 --- a/src/lua/scripts/scripts.cpp +++ b/src/lua/scripts/scripts.cpp @@ -7,15 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "creatures/players/imbuements/imbuements.hpp" -#include "lua/global/globalevent.hpp" -#include "items/weapons/weapons.hpp" -#include "lua/creature/movement.hpp" #include "lua/scripts/scripts.hpp" + +#include "config/configmanager.hpp" #include "creatures/combat/spells.hpp" +#include "creatures/monsters/monsters.hpp" +#include "items/weapons/weapons.hpp" #include "lua/callbacks/events_callbacks.hpp" +#include "lua/creature/creatureevent.hpp" +#include "lua/creature/movement.hpp" +#include "lua/creature/talkaction.hpp" +#include "lua/global/globalevent.hpp" Scripts::Scripts() : scriptInterface("Scripts Interface") { @@ -35,14 +37,14 @@ void Scripts::clearAllScripts() const { } bool Scripts::loadEventSchedulerScripts(const std::string &fileName) { - auto coreFolder = g_configManager().getString(CORE_DIRECTORY, __FUNCTION__); + auto coreFolder = g_configManager().getString(CORE_DIRECTORY); const auto dir = std::filesystem::current_path() / coreFolder / "events" / "scripts" / "scheduler"; if (!std::filesystem::exists(dir) || !std::filesystem::is_directory(dir)) { g_logger().warn("{} - Can not load folder 'scheduler' on {}/events/scripts'", __FUNCTION__, coreFolder); return false; } - std::filesystem::recursive_directory_iterator endit; + const std::filesystem::recursive_directory_iterator endit; for (std::filesystem::recursive_directory_iterator it(dir); it != endit; ++it) { if (std::filesystem::is_regular_file(*it) && it->path().extension() == ".lua") { if (it->path().filename().string() == fileName) { @@ -72,13 +74,13 @@ bool Scripts::loadScripts(std::string loadPath, bool isLib, bool reload) { // Recursive iterate through all entries in the directory for (const auto &entry : std::filesystem::recursive_directory_iterator(dir)) { // Get the filename of the entry as a string - const auto realPath = entry.path(); + const auto &realPath = entry.path(); std::string fileFolder = realPath.parent_path().filename().string(); // Script folder, example: "actions" std::string scriptFolder = realPath.parent_path().string(); // Create a string_view for the fileFolder and scriptFolder strings - std::string_view fileFolderView(fileFolder); - std::string_view scriptFolderView(scriptFolder); + const std::string_view fileFolderView(fileFolder); + const std::string_view scriptFolderView(scriptFolder); // Filename, example: "demon.lua" std::string file(realPath.filename().string()); if (!std::filesystem::is_regular_file(entry) || realPath.extension() != ".lua") { @@ -90,7 +92,7 @@ bool Scripts::loadScripts(std::string loadPath, bool isLib, bool reload) { if (std::string disable("#"); file.front() == disable.front()) { // Send log of disabled script - if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS, __FUNCTION__)) { + if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS)) { g_logger().info("[script]: {} [disabled]", realPath.filename().string()); } // Skip for next loop and ignore disabled file @@ -100,7 +102,7 @@ bool Scripts::loadScripts(std::string loadPath, bool isLib, bool reload) { // If the file is a library file or if the file's parent directory is not "lib" or "events" if (isLib || (fileFolderView != "lib" && fileFolderView != "events")) { // If console logs are enabled and the file is not a library file - if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS, __FUNCTION__)) { + if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS)) { // If the current directory is different from the last directory that was logged if (lastDirectory.empty() || lastDirectory != scriptFolderView) { // Update the last directory variable and log the directory name @@ -118,7 +120,7 @@ bool Scripts::loadScripts(std::string loadPath, bool isLib, bool reload) { } } - if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS, __FUNCTION__)) { + if (g_configManager().getBoolean(SCRIPTS_CONSOLE_LOGS)) { if (!reload) { g_logger().info("[script loaded]: {}", realPath.filename().string()); } else { diff --git a/src/lua/scripts/scripts.hpp b/src/lua/scripts/scripts.hpp index 7cefaaaf8..10ed18ed4 100644 --- a/src/lua/scripts/scripts.hpp +++ b/src/lua/scripts/scripts.hpp @@ -85,7 +85,7 @@ class Script { return false; } - int32_t id = scriptInterface->getEvent(); + const int32_t id = scriptInterface->getEvent(); if (id == -1) { g_logger().error("[Script::loadCallback] Event {} not found for script with name {}", getScriptTypeName(), scriptInterface->getLoadingScriptName()); return false; diff --git a/src/main.cpp b/src/main.cpp index be289d397..8534bbb69 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,7 +7,6 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" #include "canary_server.hpp" #include "lib/di/container.hpp" diff --git a/src/map/house/house.cpp b/src/map/house/house.cpp index 261147fff..334144cfb 100644 --- a/src/map/house/house.cpp +++ b/src/map/house/house.cpp @@ -7,27 +7,29 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "utils/pugicast.hpp" #include "map/house/house.hpp" -#include "io/iologindata.hpp" + +#include "config/configmanager.hpp" #include "game/game.hpp" -#include "items/bed.hpp" #include "game/scheduling/save_manager.hpp" +#include "io/ioguild.hpp" +#include "io/iologindata.hpp" +#include "items/bed.hpp" +#include "items/containers/inbox/inbox.hpp" #include "lib/metrics/metrics.hpp" +#include "utils/pugicast.hpp" House::House(uint32_t houseId) : id(houseId) { } -void House::addTile(std::shared_ptr<HouseTile> tile) { +void House::addTile(const std::shared_ptr<HouseTile> &tile) { tile->setFlag(TILESTATE_PROTECTIONZONE); houseTiles.push_back(tile); updateDoorDescription(); } void House::setNewOwnerGuid(int32_t newOwnerGuid, bool serverStartup) { - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (!isTransferOnRestart) { setOwner(newOwnerGuid, true); return; @@ -65,7 +67,7 @@ void House::clearHouseInfo(bool preventOwnerDeletion) { } } -bool House::tryTransferOwnership(std::shared_ptr<Player> player, bool serverStartup) { +bool House::tryTransferOwnership(const std::shared_ptr<Player> &player, bool serverStartup) { bool transferSuccess = false; if (player) { transferSuccess = transferToDepot(player); @@ -76,7 +78,7 @@ bool House::tryTransferOwnership(std::shared_ptr<Player> player, bool serverStar for (const auto &tile : houseTiles) { if (const CreatureVector* creatures = tile->getCreatures()) { for (int32_t i = creatures->size(); --i >= 0;) { - const auto creature = (*creatures)[i]; + const auto &creature = (*creatures)[i]; kickPlayer(nullptr, creature->getPlayer()); } } @@ -87,7 +89,7 @@ bool House::tryTransferOwnership(std::shared_ptr<Player> player, bool serverStar return transferSuccess; } -void House::setOwner(uint32_t guid, bool updateDatabase /* = true*/, std::shared_ptr<Player> player /* = nullptr*/) { +void House::setOwner(uint32_t guid, bool updateDatabase /* = true*/, const std::shared_ptr<Player> &player /* = nullptr*/) { if (updateDatabase && owner != guid) { Database &db = Database::getInstance(); @@ -103,9 +105,9 @@ void House::setOwner(uint32_t guid, bool updateDatabase /* = true*/, std::shared isLoaded = true; if (owner != 0) { - tryTransferOwnership(std::move(player), false); + tryTransferOwnership(player, false); } else { - std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD, __FUNCTION__)); + std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD)); time_t currentTime = time(nullptr); if (strRentPeriod == "yearly") { currentTime += 24 * 60 * 60 * 365; @@ -128,12 +130,12 @@ void House::setOwner(uint32_t guid, bool updateDatabase /* = true*/, std::shared Database &db = Database::getInstance(); std::ostringstream query; query << "SELECT `name`, `account_id` FROM `players` WHERE `id` = " << guid; - DBResult_ptr result = db.storeQuery(query.str()); + const DBResult_ptr result = db.storeQuery(query.str()); if (!result) { return; } - std::string name = result->getString("name"); + const std::string name = result->getString("name"); if (!name.empty()) { owner = guid; ownerName = name; @@ -155,10 +157,10 @@ void House::updateDoorDescription() const { ss << " It is " << getSize() << " square meters."; const int32_t housePrice = getPrice(); if (housePrice != -1) { - if (g_configManager().getBoolean(HOUSE_PURSHASED_SHOW_PRICE, __FUNCTION__) || owner == 0) { + if (g_configManager().getBoolean(HOUSE_PURSHASED_SHOW_PRICE) || owner == 0) { ss << " It costs " << formatNumber(getPrice()) << " gold coins."; } - std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD, __FUNCTION__)); + std::string strRentPeriod = asLowerCaseString(g_configManager().getString(HOUSE_RENT_PERIOD)); if (strRentPeriod != "never") { ss << " The rent cost is " << formatNumber(getRent()) << " gold coins and it is billed " << strRentPeriod << "."; } @@ -169,12 +171,12 @@ void House::updateDoorDescription() const { } } -AccessHouseLevel_t House::getHouseAccessLevel(std::shared_ptr<Player> player) const { +AccessHouseLevel_t House::getHouseAccessLevel(const std::shared_ptr<Player> &player) const { if (!player) { return HOUSE_OWNER; } - if (g_configManager().getBoolean(HOUSE_OWNED_BY_ACCOUNT, __FUNCTION__)) { + if (g_configManager().getBoolean(HOUSE_OWNED_BY_ACCOUNT)) { if (ownerAccountId == player->getAccountId()) { return HOUSE_OWNER; } @@ -199,12 +201,12 @@ AccessHouseLevel_t House::getHouseAccessLevel(std::shared_ptr<Player> player) co return HOUSE_NOT_INVITED; } -bool House::kickPlayer(std::shared_ptr<Player> player, std::shared_ptr<Player> target) { +bool House::kickPlayer(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target) { if (!target) { return false; } - std::shared_ptr<HouseTile> houseTile = std::dynamic_pointer_cast<HouseTile>(target->getTile()); + const auto &houseTile = std::dynamic_pointer_cast<HouseTile>(target->getTile()); if (!houseTile || houseTile->getHouse() != static_self_cast<House>()) { return false; } @@ -213,7 +215,7 @@ bool House::kickPlayer(std::shared_ptr<Player> player, std::shared_ptr<Player> t return false; } - Position oldPosition = target->getPosition(); + const Position oldPosition = target->getPosition(); if (g_game().internalTeleport(target, getEntryPosition()) == RETURNVALUE_NOERROR) { g_game().addMagicEffect(oldPosition, CONST_ME_POFF); g_game().addMagicEffect(getEntryPosition(), CONST_ME_TELEPORT); @@ -227,7 +229,7 @@ void House::setAccessList(uint32_t listId, const std::string &textlist) { } else if (listId == SUBOWNER_LIST) { subOwnerList.parseList(textlist); } else { - std::shared_ptr<Door> door = getDoorByNumber(listId); + const auto &door = getDoorByNumber(listId); if (door) { door->setAccessList(textlist); } @@ -238,9 +240,9 @@ void House::setAccessList(uint32_t listId, const std::string &textlist) { // kick uninvited players for (const std::shared_ptr<HouseTile> &tile : houseTiles) { - if (CreatureVector* creatures = tile->getCreatures()) { + if (const CreatureVector* creatures = tile->getCreatures()) { for (int32_t i = creatures->size(); --i >= 0;) { - std::shared_ptr<Player> player = (*creatures)[i]->getPlayer(); + const auto &player = (*creatures)[i]->getPlayer(); if (player && !isInvited(player)) { kickPlayer(nullptr, player); } @@ -254,11 +256,11 @@ bool House::transferToDepot() const { return false; } - std::shared_ptr<Player> player = g_game().getPlayerByGUID(owner); + const auto &player = g_game().getPlayerByGUID(owner); if (player) { transferToDepot(player); } else { - std::shared_ptr<Player> tmpPlayer = std::make_shared<Player>(nullptr); + const auto tmpPlayer = std::make_shared<Player>(nullptr); if (!IOLoginData::loadPlayerById(tmpPlayer, owner)) { return false; } @@ -268,11 +270,11 @@ bool House::transferToDepot() const { return true; } -bool House::transferToDepot(std::shared_ptr<Player> player) const { +bool House::transferToDepot(const std::shared_ptr<Player> &player) const { if (townId == 0 || !player) { return false; } - for (const std::shared_ptr<HouseTile> &tile : houseTiles) { + for (const auto &tile : houseTiles) { if (!transferToDepot(player, tile)) { return false; } @@ -280,7 +282,7 @@ bool House::transferToDepot(std::shared_ptr<Player> player) const { return true; } -bool House::transferToDepot(std::shared_ptr<Player> player, std::shared_ptr<HouseTile> tile) const { +bool House::transferToDepot(const std::shared_ptr<Player> &player, const std::shared_ptr<HouseTile> &tile) const { if (townId == 0 || !player) { return false; } @@ -291,7 +293,7 @@ bool House::transferToDepot(std::shared_ptr<Player> player, std::shared_ptr<Hous ItemList moveItemList; if (const TileItemVector* items = tile->getItemList()) { - for (const std::shared_ptr<Item> &item : *items) { + for (const auto &item : *items) { if (item->isWrapable()) { handleWrapableItem(moveItemList, item, player, tile); } else if (item->isPickupable()) { @@ -304,7 +306,7 @@ bool House::transferToDepot(std::shared_ptr<Player> player, std::shared_ptr<Hous std::unordered_set<std::shared_ptr<Player>> playersToSave = { player }; - for (const std::shared_ptr<Item> &item : moveItemList) { + for (const auto &item : moveItemList) { g_logger().debug("[{}] moving item '{}' to depot", __FUNCTION__, item->getName()); auto targetPlayer = player; if (item->hasOwner() && !item->isOwner(targetPlayer)) { @@ -325,9 +327,9 @@ bool House::transferToDepot(std::shared_ptr<Player> player, std::shared_ptr<Hous bool House::hasItemOnTile() const { bool foundItem = false; - for (const std::shared_ptr<HouseTile> &tile : houseTiles) { + for (const auto &tile : houseTiles) { if (const auto &items = tile->getItemList()) { - for (const std::shared_ptr<Item> &item : *items) { + for (const auto &item : *items) { if (!item) { continue; } @@ -362,13 +364,13 @@ void House::setNewOwnership() { hasNewOwnerOnStartup = true; } -void House::handleWrapableItem(ItemList &moveItemList, std::shared_ptr<Item> item, std::shared_ptr<Player> player, std::shared_ptr<HouseTile> houseTile) const { +void House::handleWrapableItem(ItemList &moveItemList, const std::shared_ptr<Item> &item, const std::shared_ptr<Player> &player, const std::shared_ptr<HouseTile> &houseTile) const { if (item->isWrapContainer()) { g_logger().debug("[{}] found wrapable item '{}'", __FUNCTION__, item->getName()); handleContainer(moveItemList, item); } - std::shared_ptr<Item> newItem = g_game().wrapItem(item, houseTile->getHouse()); + const auto &newItem = g_game().wrapItem(item, houseTile->getHouse()); if (newItem->isRemoved() && !newItem->getParent()) { g_logger().warn("[{}] item removed during wrapping - check ground type - player name: {} item id: {} position: {}", __FUNCTION__, player->getName(), item->getID(), houseTile->getPosition().toString()); return; @@ -377,9 +379,9 @@ void House::handleWrapableItem(ItemList &moveItemList, std::shared_ptr<Item> ite moveItemList.push_back(newItem); } -void House::handleContainer(ItemList &moveItemList, std::shared_ptr<Item> item) const { - if (const auto container = item->getContainer()) { - for (const std::shared_ptr<Item> &containerItem : container->getItemList()) { +void House::handleContainer(ItemList &moveItemList, const std::shared_ptr<Item> &item) const { + if (const auto &container = item->getContainer()) { + for (const auto &containerItem : container->getItemList()) { moveItemList.push_back(containerItem); } } @@ -394,7 +396,7 @@ bool House::getAccessList(uint32_t listId, std::string &list) const { return true; } - std::shared_ptr<Door> door = getDoorByNumber(listId); + const auto &door = getDoorByNumber(listId); if (!door) { return false; } @@ -402,25 +404,25 @@ bool House::getAccessList(uint32_t listId, std::string &list) const { return door->getAccessList(list); } -void House::addDoor(std::shared_ptr<Door> door) { +void House::addDoor(const std::shared_ptr<Door> &door) { doorList.push_back(door); door->setHouse(static_self_cast<House>()); updateDoorDescription(); } -void House::removeDoor(std::shared_ptr<Door> door) { - auto it = std::find(doorList.begin(), doorList.end(), door); +void House::removeDoor(const std::shared_ptr<Door> &door) { + auto it = std::ranges::find(doorList, door); if (it != doorList.end()) { doorList.erase(it); } } -void House::addBed(std::shared_ptr<BedItem> bed) { +void House::addBed(const std::shared_ptr<BedItem> &bed) { bedsList.push_back(bed); bed->setHouse(static_self_cast<House>()); } -void House::removeBed(std::shared_ptr<BedItem> bed) { +void House::removeBed(const std::shared_ptr<BedItem> &bed) { bed->setHouse(nullptr); bedsList.remove(bed); } @@ -434,8 +436,8 @@ std::shared_ptr<Door> House::getDoorByNumber(uint32_t doorId) const { return nullptr; } -std::shared_ptr<Door> House::getDoorByPosition(const Position &pos) { - for (std::shared_ptr<Door> door : doorList) { +std::shared_ptr<Door> House::getDoorByPosition(const Position &pos) const { + for (const auto &door : doorList) { if (door->getPosition() == pos) { return door; } @@ -469,15 +471,15 @@ std::shared_ptr<HouseTransferItem> House::getTransferItem() { void House::resetTransferItem() { if (transferItem) { - std::shared_ptr<Item> tmpItem = transferItem; + const auto &tmpItem = transferItem; transferItem = nullptr; transfer_container->resetParent(); transfer_container->removeThing(tmpItem, tmpItem->getItemCount()); } } -std::shared_ptr<HouseTransferItem> HouseTransferItem::createHouseTransferItem(std::shared_ptr<House> house) { - std::shared_ptr<HouseTransferItem> transferItem = std::make_shared<HouseTransferItem>(house); +std::shared_ptr<HouseTransferItem> HouseTransferItem::createHouseTransferItem(const std::shared_ptr<House> &house) { + auto transferItem = std::make_shared<HouseTransferItem>(house); transferItem->setID(ITEM_DOCUMENT_RO); transferItem->setSubType(1); std::ostringstream ss; @@ -486,17 +488,17 @@ std::shared_ptr<HouseTransferItem> HouseTransferItem::createHouseTransferItem(st return transferItem; } -void HouseTransferItem::onTradeEvent(TradeEvents_t event, std::shared_ptr<Player> owner) { +void HouseTransferItem::onTradeEvent(TradeEvents_t event, const std::shared_ptr<Player> &owner) { if (event == ON_TRADE_TRANSFER) { if (house) { - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); auto ownershipTransferMessage = " The ownership will be transferred upon server restart."; - auto boughtMessage = fmt::format("You have successfully bought the house.{}", isTransferOnRestart ? ownershipTransferMessage : ""); - auto soldMessage = fmt::format("You have successfully sold your house.{}", isTransferOnRestart ? ownershipTransferMessage : ""); + const auto boughtMessage = fmt::format("You have successfully bought the house.{}", isTransferOnRestart ? ownershipTransferMessage : ""); + const auto soldMessage = fmt::format("You have successfully sold your house.{}", isTransferOnRestart ? ownershipTransferMessage : ""); owner->sendTextMessage(MESSAGE_EVENT_ADVANCE, boughtMessage); - auto oldOwner = g_game().getPlayerByGUID(house->getOwner()); + const auto oldOwner = g_game().getPlayerByGUID(house->getOwner()); if (oldOwner) { oldOwner->sendTextMessage(MESSAGE_EVENT_ADVANCE, soldMessage); } @@ -511,12 +513,12 @@ void HouseTransferItem::onTradeEvent(TradeEvents_t event, std::shared_ptr<Player } } -bool House::executeTransfer(std::shared_ptr<HouseTransferItem> item, std::shared_ptr<Player> newOwner) { +bool House::executeTransfer(const std::shared_ptr<HouseTransferItem> &item, const std::shared_ptr<Player> &newOwner) { if (transferItem != item) { return false; } - auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART, __FUNCTION__); + auto isTransferOnRestart = g_configManager().getBoolean(TOGGLE_HOUSE_TRANSFER_ON_SERVER_RESTART); if (isTransferOnRestart) { if (hasNewOwnerOnStartup) { return false; @@ -531,7 +533,7 @@ bool House::executeTransfer(std::shared_ptr<HouseTransferItem> item, std::shared } void AccessList::parseList(const std::string &list) { - std::regex regexValidChars("[^a-zA-Z' \n*!@#]+"); + const std::regex regexValidChars("[^a-zA-Z' \n*!@#]+"); std::string validList = std::regex_replace(list, regexValidChars, ""); // Remove empty lines @@ -566,7 +568,7 @@ void AccessList::parseList(const std::string &list) { toLowerCaseString(m_line); - std::string::size_type at_pos = m_line.find('@'); + const std::string::size_type at_pos = m_line.find('@'); if (at_pos != std::string::npos) { if (at_pos == 0) { addGuild(m_line.substr(1)); @@ -585,11 +587,11 @@ void AccessList::parseList(const std::string &list) { } void AccessList::addPlayer(const std::string &name) { - std::shared_ptr<Player> player = g_game().getPlayerByName(name); + const auto &player = g_game().getPlayerByName(name); if (player) { playerList.insert(player->getGUID()); } else { - uint32_t guid = IOLoginData::getGuidByName(name); + const uint32_t guid = IOLoginData::getGuidByName(name); if (guid != 0) { playerList.insert(guid); } @@ -598,12 +600,12 @@ void AccessList::addPlayer(const std::string &name) { namespace { std::shared_ptr<Guild> getGuildByName(const std::string &name) { - uint32_t guildId = IOGuild::getGuildIdByName(name); + const uint32_t guildId = IOGuild::getGuildIdByName(name); if (guildId == 0) { return nullptr; } - auto guild = g_game().getGuild(guildId); + const auto &guild = g_game().getGuild(guildId); if (guild) { return guild; } @@ -613,7 +615,7 @@ namespace { } void AccessList::addGuild(const std::string &name) { - const auto guild = getGuildByName(name); + const auto &guild = getGuildByName(name); if (guild) { for (const auto &rank : guild->getRanks()) { guildRankList.insert(rank->id); @@ -622,16 +624,16 @@ void AccessList::addGuild(const std::string &name) { } void AccessList::addGuildRank(const std::string &name, const std::string &guildName) { - const auto guild = getGuildByName(guildName); + const auto &guild = getGuildByName(guildName); if (guild) { - const GuildRank_ptr rank = guild->getRankByName(name); + const GuildRank_ptr &rank = guild->getRankByName(name); if (rank) { guildRankList.insert(rank->id); } } } -bool AccessList::isInList(std::shared_ptr<Player> player) const { +bool AccessList::isInList(const std::shared_ptr<Player> &player) const { if (allowEveryone) { return true; } @@ -676,7 +678,7 @@ void Door::setHouse(std::shared_ptr<House> newHouse) { } } -bool Door::canUse(std::shared_ptr<Player> player) const { +bool Door::canUse(const std::shared_ptr<Player> &player) const { if (!house) { return true; } @@ -713,7 +715,7 @@ void Door::onRemoved() { } } -std::shared_ptr<House> Houses::getHouseByPlayerId(uint32_t playerId) { +std::shared_ptr<House> Houses::getHouseByPlayerId(uint32_t playerId) const { for (const auto &it : houseMap) { if (it.second->getOwner() == playerId) { return it.second; @@ -724,21 +726,21 @@ std::shared_ptr<House> Houses::getHouseByPlayerId(uint32_t playerId) { bool Houses::loadHousesXML(const std::string &filename) { pugi::xml_document doc; - pugi::xml_parse_result result = doc.load_file(filename.c_str()); + const pugi::xml_parse_result result = doc.load_file(filename.c_str()); if (!result) { printXMLError(__FUNCTION__, filename, result); return false; } - for (auto houseNode : doc.child("houses").children()) { + for (const auto &houseNode : doc.child("houses").children()) { pugi::xml_attribute houseIdAttribute = houseNode.attribute("houseid"); if (!houseIdAttribute) { return false; } - int32_t houseId = pugi::cast<int32_t>(houseIdAttribute.value()); + auto houseId = pugi::cast<int32_t>(houseIdAttribute.value()); - std::shared_ptr<House> house = getHouse(houseId); + const auto &house = getHouse(houseId); if (!house) { g_logger().error("[Houses::loadHousesXML] - Unknown house, id: {}", houseId); return false; @@ -746,7 +748,7 @@ bool Houses::loadHousesXML(const std::string &filename) { house->setName(houseNode.attribute("name").as_string()); - Position entryPos( + const Position entryPos( pugi::cast<uint16_t>(houseNode.attribute("entryx").value()), pugi::cast<uint16_t>(houseNode.attribute("entryy").value()), pugi::cast<uint16_t>(houseNode.attribute("entryz").value()) @@ -778,9 +780,9 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { return; } - time_t currentTime = time(nullptr); + const time_t currentTime = time(nullptr); for (const auto &it : houseMap) { - std::shared_ptr<House> house = it.second; + const auto &house = it.second; if (house->getOwner() == 0) { continue; } @@ -791,7 +793,7 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { continue; } - auto player = g_game().getPlayerByGUID(ownerId, true); + const auto &player = g_game().getPlayerByGUID(ownerId, true); if (!player) { // Player doesn't exist, reset house owner house->tryTransferOwnership(nullptr, true); @@ -799,10 +801,10 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { } // Player hasn't logged in for a while, reset house owner - auto daysToReset = g_configManager().getNumber(HOUSE_LOSE_AFTER_INACTIVITY, __FUNCTION__); + auto daysToReset = g_configManager().getNumber(HOUSE_LOSE_AFTER_INACTIVITY); if (daysToReset > 0) { auto daysSinceLastLogin = (currentTime - player->getLastLoginSaved()) / (60 * 60 * 24); - bool vipKeep = g_configManager().getBoolean(VIP_KEEP_HOUSE, __FUNCTION__) && player->isVip(); + bool vipKeep = g_configManager().getBoolean(VIP_KEEP_HOUSE) && player->isVip(); bool activityKeep = daysSinceLastLogin < daysToReset; if (vipKeep && !activityKeep) { g_logger().info("Player {} has not logged in for {} days, but is a VIP, so the house will not be reset.", player->getName(), daysToReset); @@ -844,7 +846,7 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { house->setPaidUntil(paidUntil); } else { if (house->getPayRentWarnings() < 7) { - int32_t daysLeft = 7 - house->getPayRentWarnings(); + const int32_t daysLeft = 7 - house->getPayRentWarnings(); std::shared_ptr<Item> letter = Item::CreateItem(ITEM_LETTER_STAMPED); std::string period; @@ -871,7 +873,7 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { } std::ostringstream ss; - ss << "Warning! \nThe " << period << " rent of " << house->getRent() << " gold for your house \"" << house->getName() << "\" is payable. Have it within " << daysLeft << " days or you will lose static_self_cast<HouseTransferItem>() house."; + ss << "Warning! \nThe " << period << " rent of " << house->getRent() << " gold for your house \"" << house->getName() << "\" is payable. Have it within " << daysLeft << " days or you will lose this house."; letter->setAttribute(ItemAttribute_t::TEXT, ss.str()); g_game().internalAddItem(player->getInbox(), letter, INDEX_WHEREEVER, FLAG_NOLIMIT); house->setPayRentWarnings(house->getPayRentWarnings() + 1); @@ -885,11 +887,11 @@ void Houses::payHouses(RentPeriod_t rentPeriod) const { } uint32_t House::getRent() const { - return static_cast<uint32_t>(g_configManager().getFloat(HOUSE_RENT_RATE, __FUNCTION__) * static_cast<float>(rent)); + return static_cast<uint32_t>(g_configManager().getFloat(HOUSE_RENT_RATE) * static_cast<float>(rent)); } uint32_t House::getPrice() const { - auto sqmPrice = static_cast<uint32_t>(g_configManager().getNumber(HOUSE_PRICE_PER_SQM, __FUNCTION__)) * getSize(); - auto rentPrice = static_cast<uint32_t>(static_cast<float>(getRent()) * g_configManager().getFloat(HOUSE_PRICE_RENT_MULTIPLIER, __FUNCTION__)); + auto sqmPrice = static_cast<uint32_t>(g_configManager().getNumber(HOUSE_PRICE_PER_SQM)) * getSize(); + auto rentPrice = static_cast<uint32_t>(static_cast<float>(getRent()) * g_configManager().getFloat(HOUSE_PRICE_RENT_MULTIPLIER)); return sqmPrice + rentPrice; } diff --git a/src/map/house/house.hpp b/src/map/house/house.hpp index aa4b746cc..a3dc76598 100644 --- a/src/map/house/house.hpp +++ b/src/map/house/house.hpp @@ -25,7 +25,7 @@ class AccessList { void addGuild(const std::string &name); void addGuildRank(const std::string &name, const std::string &rankName); - bool isInList(std::shared_ptr<Player> player) const; + bool isInList(const std::shared_ptr<Player> &player) const; void getList(std::string &list) const; @@ -63,7 +63,7 @@ class Door final : public Item { return getAttribute<uint32_t>(ItemAttribute_t::DOORID); } - bool canUse(std::shared_ptr<Player> player) const; + bool canUse(const std::shared_ptr<Player> &player) const; void setAccessList(const std::string &textlist); bool getAccessList(std::string &list) const; @@ -83,12 +83,12 @@ using HouseBedItemList = std::list<std::shared_ptr<BedItem>>; class HouseTransferItem final : public Item { public: - static std::shared_ptr<HouseTransferItem> createHouseTransferItem(std::shared_ptr<House> house); + static std::shared_ptr<HouseTransferItem> createHouseTransferItem(const std::shared_ptr<House> &house); explicit HouseTransferItem(std::shared_ptr<House> newHouse) : - Item(0), house(newHouse) { } + Item(0), house(std::move(newHouse)) { } - void onTradeEvent(TradeEvents_t event, std::shared_ptr<Player> owner) override; + void onTradeEvent(TradeEvents_t event, const std::shared_ptr<Player> &owner) override; bool canTransform() const override { return false; } @@ -97,11 +97,11 @@ class HouseTransferItem final : public Item { std::shared_ptr<House> house; }; -class House : public SharedObject { +class House final : public SharedObject { public: explicit House(uint32_t houseId); - void addTile(std::shared_ptr<HouseTile> tile); + void addTile(const std::shared_ptr<HouseTile> &tile); void updateDoorDescription() const; bool canEditAccessList(uint32_t listId, const std::shared_ptr<Player> &player) const; @@ -115,8 +115,8 @@ class House : public SharedObject { return getHouseAccessLevel(player) != HOUSE_NOT_INVITED; } - AccessHouseLevel_t getHouseAccessLevel(std::shared_ptr<Player> player) const; - bool kickPlayer(std::shared_ptr<Player> player, std::shared_ptr<Player> target); + AccessHouseLevel_t getHouseAccessLevel(const std::shared_ptr<Player> &player) const; + bool kickPlayer(const std::shared_ptr<Player> &player, const std::shared_ptr<Player> &target); void setEntryPos(Position pos) { posEntry = pos; @@ -126,7 +126,7 @@ class House : public SharedObject { } void setName(std::string newHouseName) { - this->houseName = newHouseName; + this->houseName = std::move(newHouseName); } const std::string &getName() const { return houseName; @@ -148,8 +148,8 @@ class House : public SharedObject { */ void setNewOwnerGuid(int32_t newOwnerGuid, bool serverStartup); void clearHouseInfo(bool preventOwnerDeletion); - bool tryTransferOwnership(std::shared_ptr<Player> player, bool serverStartup); - void setOwner(uint32_t guid, bool updateDatabase = true, std::shared_ptr<Player> player = nullptr); + bool tryTransferOwnership(const std::shared_ptr<Player> &player, bool serverStartup); + void setOwner(uint32_t guid, bool updateDatabase = true, const std::shared_ptr<Player> &player = nullptr); uint32_t getOwner() const { return owner; } @@ -192,14 +192,14 @@ class House : public SharedObject { return id; } - void addDoor(std::shared_ptr<Door> door); - void removeDoor(std::shared_ptr<Door> door); + void addDoor(const std::shared_ptr<Door> &door); + void removeDoor(const std::shared_ptr<Door> &door); std::shared_ptr<Door> getDoorByNumber(uint32_t doorId) const; - std::shared_ptr<Door> getDoorByPosition(const Position &pos); + std::shared_ptr<Door> getDoorByPosition(const Position &pos) const; std::shared_ptr<HouseTransferItem> getTransferItem(); void resetTransferItem(); - bool executeTransfer(std::shared_ptr<HouseTransferItem> item, std::shared_ptr<Player> player); + bool executeTransfer(const std::shared_ptr<HouseTransferItem> &item, const std::shared_ptr<Player> &player); const HouseTileList &getTiles() const { return houseTiles; @@ -209,8 +209,8 @@ class House : public SharedObject { return doorList; } - void addBed(std::shared_ptr<BedItem> bed); - void removeBed(std::shared_ptr<BedItem> bed); + void addBed(const std::shared_ptr<BedItem> &bed); + void removeBed(const std::shared_ptr<BedItem> &bed); const HouseBedItemList &getBeds() const { return bedsList; } @@ -226,8 +226,8 @@ class House : public SharedObject { return maxBeds; } - bool transferToDepot(std::shared_ptr<Player> player) const; - bool transferToDepot(std::shared_ptr<Player> player, std::shared_ptr<HouseTile> tile) const; + bool transferToDepot(const std::shared_ptr<Player> &player) const; + bool transferToDepot(const std::shared_ptr<Player> &player, const std::shared_ptr<HouseTile> &tile) const; bool hasItemOnTile() const; bool hasNewOwnership() const; @@ -268,8 +268,8 @@ class House : public SharedObject { bool isLoaded = false; - void handleContainer(ItemList &moveItemList, std::shared_ptr<Item> item) const; - void handleWrapableItem(ItemList &moveItemList, std::shared_ptr<Item> item, std::shared_ptr<Player> player, std::shared_ptr<HouseTile> houseTile) const; + void handleContainer(ItemList &moveItemList, const std::shared_ptr<Item> &item) const; + void handleWrapableItem(ItemList &moveItemList, const std::shared_ptr<Item> &item, const std::shared_ptr<Player> &player, const std::shared_ptr<HouseTile> &houseTile) const; }; using HouseMap = std::map<uint32_t, std::shared_ptr<House>>; @@ -284,7 +284,7 @@ class Houses { Houses &operator=(const Houses &) = delete; std::shared_ptr<House> addHouse(uint32_t id) { - if (auto it = houseMap.find(id); it != houseMap.end()) { + if (const auto it = houseMap.find(id); it != houseMap.end()) { return it->second; } @@ -292,14 +292,14 @@ class Houses { } std::shared_ptr<House> getHouse(uint32_t houseId) { - auto it = houseMap.find(houseId); + const auto it = houseMap.find(houseId); if (it == houseMap.end()) { return nullptr; } return it->second; } - std::shared_ptr<House> getHouseByPlayerId(uint32_t playerId); + std::shared_ptr<House> getHouseByPlayerId(uint32_t playerId) const; bool loadHousesXML(const std::string &filename); diff --git a/src/map/house/housetile.cpp b/src/map/house/housetile.cpp index 5e728a14e..ce9229ce4 100644 --- a/src/map/house/housetile.cpp +++ b/src/map/house/housetile.cpp @@ -7,66 +7,68 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "map/house/housetile.hpp" -#include "items/tile.hpp" +#include "config/configmanager.hpp" #include "creatures/monsters/monster.hpp" -#include "map/house/housetile.hpp" -#include "map/house/house.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" +#include "items/tile.hpp" +#include "map/house/house.hpp" +#include "utils/tools.hpp" HouseTile::HouseTile(int32_t initX, int32_t initY, int32_t initZ, std::shared_ptr<House> initHouse) : - DynamicTile(initX, initY, initZ), house(initHouse) { } + DynamicTile(initX, initY, initZ), house(std::move(initHouse)) { } -void HouseTile::addThing(int32_t index, std::shared_ptr<Thing> thing) { +void HouseTile::addThing(int32_t index, const std::shared_ptr<Thing> &thing) { Tile::addThing(index, thing); if (!thing || !thing->getParent()) { return; } - if (std::shared_ptr<Item> item = thing->getItem()) { + if (const auto &item = thing->getItem()) { updateHouse(item); } } -void HouseTile::internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) { +void HouseTile::internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) { Tile::internalAddThing(index, thing); if (!thing || !thing->getParent()) { return; } - if (std::shared_ptr<Item> item = thing->getItem()) { + if (const auto &item = thing->getItem()) { updateHouse(item); } } -void HouseTile::updateHouse(std::shared_ptr<Item> item) { +void HouseTile::updateHouse(const std::shared_ptr<Item> &item) const { if (item->getParent().get() != this) { return; } - std::shared_ptr<Door> door = item->getDoor(); + const auto &door = item->getDoor(); if (door) { if (door->getDoorId() != 0) { house->addDoor(door); } } else { - std::shared_ptr<BedItem> bed = item->getBed(); + const auto &bed = item->getBed(); if (bed) { house->addBed(bed); } } } -ReturnValue HouseTile::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, std::shared_ptr<Creature> actor /* = nullptr*/) { - if (std::shared_ptr<Creature> creature = thing->getCreature()) { - if (std::shared_ptr<Player> player = creature->getPlayer()) { +ReturnValue HouseTile::queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t tileFlags, const std::shared_ptr<Creature> &actor /* = nullptr*/) { + if (const auto &creature = thing->getCreature()) { + if (const auto &player = creature->getPlayer()) { if (!house->isInvited(player)) { return RETURNVALUE_PLAYERISNOTINVITED; } - } else if (std::shared_ptr<Monster> monster = creature->getMonster()) { + } else if (const auto &monster = creature->getMonster()) { if (monster->isSummon()) { if (!house->isInvited(monster->getMaster()->getPlayer())) { return RETURNVALUE_NOTPOSSIBLE; @@ -79,20 +81,20 @@ ReturnValue HouseTile::queryAdd(int32_t index, const std::shared_ptr<Thing> &thi } } } else if (thing->getItem() && actor) { - std::shared_ptr<Player> actorPlayer = actor->getPlayer(); - if (house && (!house->isInvited(actorPlayer) || house->getHouseAccessLevel(actorPlayer) == HOUSE_GUEST) && g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__)) { + const auto &actorPlayer = actor->getPlayer(); + if (house && (!house->isInvited(actorPlayer) || house->getHouseAccessLevel(actorPlayer) == HOUSE_GUEST) && g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS)) { return RETURNVALUE_CANNOTTHROW; } } return Tile::queryAdd(index, thing, count, tileFlags, actor); } -std::shared_ptr<Cylinder> HouseTile::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &tileFlags) { - if (std::shared_ptr<Creature> creature = thing->getCreature()) { - if (std::shared_ptr<Player> player = creature->getPlayer()) { +std::shared_ptr<Cylinder> HouseTile::queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &tileFlags) { + if (const auto &creature = thing->getCreature()) { + if (const auto &player = creature->getPlayer()) { if (!house->isInvited(player)) { const Position &entryPos = house->getEntryPosition(); - std::shared_ptr<Tile> destTile = g_game().map.getTile(entryPos); + auto destTile = g_game().map.getTile(entryPos); if (!destTile) { g_logger().error("[HouseTile::queryDestination] - " "Entry not correct for house name: {} " @@ -105,7 +107,7 @@ std::shared_ptr<Cylinder> HouseTile::queryDestination(int32_t &index, const std: } index = -1; - *destItem = nullptr; + destItem = nullptr; return destTile; } } @@ -114,14 +116,14 @@ std::shared_ptr<Cylinder> HouseTile::queryDestination(int32_t &index, const std: return Tile::queryDestination(index, thing, destItem, tileFlags); } -ReturnValue HouseTile::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor /*= nullptr*/) { - std::shared_ptr<Item> item = thing->getItem(); +ReturnValue HouseTile::queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor /*= nullptr */) { + const auto &item = thing->getItem(); if (!item) { return RETURNVALUE_NOTPOSSIBLE; } - if (actor && g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS, __FUNCTION__)) { - std::shared_ptr<Player> actorPlayer = actor->getPlayer(); + if (actor && g_configManager().getBoolean(ONLY_INVITED_CAN_MOVE_HOUSE_ITEMS)) { + const auto &actorPlayer = actor->getPlayer(); if (house && !house->isInvited(actorPlayer)) { return RETURNVALUE_NOTPOSSIBLE; } else if (house && house->getHouseAccessLevel(actorPlayer) == HOUSE_GUEST) { diff --git a/src/map/house/housetile.hpp b/src/map/house/housetile.hpp index b661251db..6a191d0f8 100644 --- a/src/map/house/housetile.hpp +++ b/src/map/house/housetile.hpp @@ -15,24 +15,26 @@ class House; class HouseTile final : public DynamicTile { public: + using Tile::addThing; + HouseTile(int32_t x, int32_t y, int32_t z, std::shared_ptr<House> house); // cylinder implementations - ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryAdd(int32_t index, const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item>* destItem, uint32_t &flags) override; + std::shared_ptr<Cylinder> queryDestination(int32_t &index, const std::shared_ptr<Thing> &thing, std::shared_ptr<Item> &destItem, uint32_t &flags) override; - ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, std::shared_ptr<Creature> actor = nullptr) override; + ReturnValue queryRemove(const std::shared_ptr<Thing> &thing, uint32_t count, uint32_t flags, const std::shared_ptr<Creature> &actor = nullptr) override; - void addThing(int32_t index, std::shared_ptr<Thing> thing) override; - void virtual internalAddThing(uint32_t index, std::shared_ptr<Thing> thing) override; + void addThing(int32_t index, const std::shared_ptr<Thing> &thing) override; + void internalAddThing(uint32_t index, const std::shared_ptr<Thing> &thing) override; std::shared_ptr<House> getHouse() override { return house; } private: - void updateHouse(std::shared_ptr<Item> item); + void updateHouse(const std::shared_ptr<Item> &item) const; std::shared_ptr<House> house; }; diff --git a/src/map/map.cpp b/src/map/map.cpp index 0d9a38b7c..768ba959d 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -7,42 +7,39 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "map.hpp" -#include "utils/astarnodes.hpp" +#include "map/map.hpp" #include "creatures/monsters/monster.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" +#include "game/scheduling/dispatcher.hpp" #include "game/zones/zone.hpp" #include "io/iomap.hpp" #include "io/iomapserialize.hpp" -#include "game/scheduling/dispatcher.hpp" +#include "lua/callbacks/event_callback.hpp" +#include "lua/callbacks/events_callbacks.hpp" #include "map/spectators.hpp" +#include "utils/astarnodes.hpp" void Map::load(const std::string &identifier, const Position &pos) { try { path = identifier; IOMap::loadMap(this, pos); } catch (const std::exception &e) { - throw IOMapException(fmt::format( - "\n[Map::load] - The map in folder {} is missing or corrupted" - "\n - {}", - identifier, e.what() - )); + g_logger().warn("[Map::load] - The map in folder {} is missing or corrupted", identifier); } } void Map::loadMap(const std::string &identifier, bool mainMap /*= false*/, bool loadHouses /*= false*/, bool loadMonsters /*= false*/, bool loadNpcs /*= false*/, bool loadZones /*= false*/, const Position &pos /*= Position()*/) { // Only download map if is loading the main map and it is not already downloaded - if (mainMap && g_configManager().getBoolean(TOGGLE_DOWNLOAD_MAP, __FUNCTION__) && !std::filesystem::exists(identifier)) { - const auto mapDownloadUrl = g_configManager().getString(MAP_DOWNLOAD_URL, __FUNCTION__); + if (mainMap && g_configManager().getBoolean(TOGGLE_DOWNLOAD_MAP) && !std::filesystem::exists(identifier)) { + const auto mapDownloadUrl = g_configManager().getString(MAP_DOWNLOAD_URL); if (mapDownloadUrl.empty()) { g_logger().warn("Map download URL in config.lua is empty, download disabled"); } if (CURL* curl = curl_easy_init(); curl && !mapDownloadUrl.empty()) { - g_logger().info("Downloading " + g_configManager().getString(MAP_NAME, __FUNCTION__) + ".otbm to world folder"); + g_logger().info("Downloading " + g_configManager().getString(MAP_NAME) + ".otbm to world folder"); FILE* otbm = fopen(identifier.c_str(), "wb"); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_URL, mapDownloadUrl.c_str()); @@ -77,7 +74,7 @@ void Map::loadMap(const std::string &identifier, bool mainMap /*= false*/, bool * If map custom is enabled, then it is load in loadMapCustom function * NOTE: This will ensure that the information is not duplicated */ - if (!g_configManager().getBoolean(TOGGLE_MAP_CUSTOM, __FUNCTION__)) { + if (!g_configManager().getBoolean(TOGGLE_MAP_CUSTOM)) { IOMapSerialize::loadHouseInfo(); IOMapSerialize::loadHouseItems(this); } @@ -92,16 +89,20 @@ void Map::loadMap(const std::string &identifier, bool mainMap /*= false*/, bool } // Files need to be cleaned up if custom map is enabled to open, or will try to load main map files - if (g_configManager().getBoolean(TOGGLE_MAP_CUSTOM, __FUNCTION__)) { + if (g_configManager().getBoolean(TOGGLE_MAP_CUSTOM)) { monsterfile.clear(); housefile.clear(); npcfile.clear(); } + + if (!mainMap) { + g_callbacks().executeCallback(EventCallback_t::mapOnLoad, &EventCallback::mapOnLoad, path.string()); + } } void Map::loadMapCustom(const std::string &mapName, bool loadHouses, bool loadMonsters, bool loadNpcs, bool loadZones, int customMapIndex) { // Load the map - load(g_configManager().getString(DATA_DIRECTORY, __FUNCTION__) + "/world/custom/" + mapName + ".otbm"); + load(g_configManager().getString(DATA_DIRECTORY) + "/world/custom/" + mapName + ".otbm"); if (loadMonsters && !IOMap::loadMonstersCustom(this, mapName, customMapIndex)) { g_logger().warn("Failed to load monster custom data"); @@ -163,7 +164,7 @@ std::shared_ptr<Tile> Map::getLoadedTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto leaf = getMapSector(x, y); + const auto &leaf = getMapSector(x, y); if (!leaf) { return nullptr; } @@ -173,7 +174,7 @@ std::shared_ptr<Tile> Map::getLoadedTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto tile = floor->getTile(x, y); + const auto &tile = floor->getTile(x, y); return tile; } @@ -182,7 +183,7 @@ std::shared_ptr<Tile> Map::getTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto sector = getMapSector(x, y); + const auto §or = getMapSector(x, y); if (!sector) { return nullptr; } @@ -192,12 +193,11 @@ std::shared_ptr<Tile> Map::getTile(uint16_t x, uint16_t y, uint8_t z) { return nullptr; } - const auto tile = floor->getTile(x, y); - return tile ? tile : getOrCreateTileFromCache(floor, x, y); + return getOrCreateTileFromCache(floor, x, y); } void Map::refreshZones(uint16_t x, uint16_t y, uint8_t z) { - const auto tile = getLoadedTile(x, y, z); + const auto &tile = getLoadedTile(x, y, z); if (!tile) { return; } @@ -209,21 +209,21 @@ void Map::refreshZones(uint16_t x, uint16_t y, uint8_t z) { } } -void Map::setTile(uint16_t x, uint16_t y, uint8_t z, std::shared_ptr<Tile> newTile) { +void Map::setTile(uint16_t x, uint16_t y, uint8_t z, const std::shared_ptr<Tile> &newTile) { if (z >= MAP_MAX_LAYERS) { g_logger().error("Attempt to set tile on invalid coordinate: {}", Position(x, y, z).toString()); return; } - if (const auto sector = getMapSector(x, y)) { + if (const auto §or = getMapSector(x, y)) { sector->createFloor(z)->setTile(x, y, newTile); } else { getBestMapSector(x, y)->createFloor(z)->setTile(x, y, newTile); } } -bool Map::placeCreature(const Position ¢erPos, std::shared_ptr<Creature> creature, bool extendedPos /* = false*/, bool forceLogin /* = false*/) { - auto monster = creature->getMonster(); +bool Map::placeCreature(const Position ¢erPos, const std::shared_ptr<Creature> &creature, bool extendedPos /* = false*/, bool forceLogin /* = false*/) { + const auto &monster = creature ? creature->getMonster() : nullptr; if (monster) { monster->ignoreFieldDamage = true; } @@ -231,7 +231,7 @@ bool Map::placeCreature(const Position ¢erPos, std::shared_ptr<Creature> cre bool foundTile; bool placeInPZ; - std::shared_ptr<Tile> tile = getTile(centerPos.x, centerPos.y, centerPos.z); + auto tile = getTile(centerPos.x, centerPos.y, centerPos.z); if (tile) { placeInPZ = tile->hasFlag(TILESTATE_PROTECTIONZONE); ReturnValue ret = tile->queryAdd(0, creature, 1, FLAG_IGNOREBLOCKITEM | FLAG_IGNOREFIELDDAMAGE); @@ -270,11 +270,11 @@ bool Map::placeCreature(const Position ¢erPos, std::shared_ptr<Creature> cre std::shuffle(relList.begin(), relList.begin() + 4, getRandomGenerator()); std::shuffle(relList.begin() + 4, relList.end(), getRandomGenerator()); } else { - std::shuffle(relList.begin(), relList.end(), getRandomGenerator()); + std::ranges::shuffle(relList, getRandomGenerator()); } - for (const auto &it : relList) { - Position tryPos(centerPos.x + it.first, centerPos.y + it.second, centerPos.z); + for (const auto &[xOffset, yOffset] : relList) { + Position tryPos(centerPos.x + xOffset, centerPos.y + yOffset, centerPos.z); tile = getTile(tryPos.x, tryPos.y, tryPos.z); if (!tile || (placeInPZ && !tile->hasFlag(TILESTATE_PROTECTIONZONE))) { @@ -311,16 +311,18 @@ bool Map::placeCreature(const Position ¢erPos, std::shared_ptr<Creature> cre uint32_t flags = 0; std::shared_ptr<Item> toItem = nullptr; - auto toCylinder = tile->queryDestination(index, creature, &toItem, flags); - toCylinder->internalAddThing(creature); + if (tile) { + const auto toCylinder = tile->queryDestination(index, creature, toItem, flags); + toCylinder->internalAddThing(creature); - const Position &dest = toCylinder->getPosition(); - getMapSector(dest.x, dest.y)->addCreature(creature); + const Position &dest = toCylinder->getPosition(); + getMapSector(dest.x, dest.y)->addCreature(creature); + } return true; } void Map::moveCreature(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &newTile, bool forceTeleport /* = false*/) { - if (!creature || !newTile) { + if (!creature || creature->isRemoved() || !newTile) { return; } @@ -333,14 +335,18 @@ void Map::moveCreature(const std::shared_ptr<Creature> &creature, const std::sha const auto &oldPos = oldTile->getPosition(); const auto &newPos = newTile->getPosition(); + if (oldPos == newPos) { + return; + } + const auto &fromZones = oldTile->getZones(); const auto &toZones = newTile->getZones(); - if (auto ret = g_game().beforeCreatureZoneChange(creature, fromZones, toZones); ret != RETURNVALUE_NOERROR) { + if (const auto &ret = g_game().beforeCreatureZoneChange(creature, fromZones, toZones); ret != RETURNVALUE_NOERROR) { return; } - bool teleport = forceTeleport || !newTile->getGround() || !Position::areInRange<1, 1, 0>(oldPos, newPos); + const bool teleport = forceTeleport || !newTile->getGround() || !Position::areInRange<1, 1, 0>(oldPos, newPos); Spectators spectators; if (!teleport && oldPos.z == newPos.z) { @@ -361,13 +367,13 @@ void Map::moveCreature(const std::shared_ptr<Creature> &creature, const std::sha ++minRangeX; } - spectators.find<Creature>(oldPos, true, minRangeX, maxRangeX, minRangeY, maxRangeY); + spectators.find<Creature>(oldPos, true, minRangeX, maxRangeX, minRangeY, maxRangeY, false); } else { - spectators.find<Creature>(oldPos, true); - spectators.find<Creature>(newPos, true); + spectators.find<Creature>(oldPos, true, 0, 0, 0, 0, false); + spectators.find<Creature>(newPos, true, 0, 0, 0, 0, false); } - auto playersSpectators = spectators.filter<Player>(); + const auto playersSpectators = spectators.filter<Player>(); std::vector<int32_t> oldStackPosVector; oldStackPosVector.reserve(playersSpectators.size()); @@ -412,7 +418,7 @@ void Map::moveCreature(const std::shared_ptr<Creature> &creature, const std::sha size_t i = 0; for (const auto &spectator : playersSpectators) { // Use the correct stackpos - int32_t stackpos = oldStackPosVector[i++]; + const int32_t stackpos = oldStackPosVector[i++]; if (stackpos != -1) { const auto &player = spectator->getPlayer(); player->sendCreatureMove(creature, newPos, newTile->getStackposOfCreature(player, creature), oldPos, stackpos, teleport); @@ -424,12 +430,21 @@ void Map::moveCreature(const std::shared_ptr<Creature> &creature, const std::sha spectator->onCreatureMove(creature, newTile, newPos, oldTile, oldPos, teleport); } - oldTile->postRemoveNotification(creature, newTile, 0); - newTile->postAddNotification(creature, oldTile, 0); - g_game().afterCreatureZoneChange(creature, fromZones, toZones); + auto events = [=] { + oldTile->postRemoveNotification(creature, newTile, 0); + newTile->postAddNotification(creature, oldTile, 0); + g_game().afterCreatureZoneChange(creature, fromZones, toZones); + }; + + if (g_dispatcher().context().getGroup() == TaskGroup::Walk) { + // onCreatureMove for monster is asynchronous, so we need to defer the actions. + g_dispatcher().addEvent(std::move(events), "Map::moveCreature"); + } else { + events(); + } } -bool Map::canThrowObjectTo(const Position &fromPos, const Position &toPos, bool checkLineOfSight /*= true*/, int32_t rangex /*= MAP_MAX_CLIENT_VIEW_PORT_X*/, int32_t rangey /*= MAP_MAX_CLIENT_VIEW_PORT_Y*/) { +bool Map::canThrowObjectTo(const Position &fromPos, const Position &toPos, const SightLines_t lineOfSight /*= SightLine_CheckSightLine*/, const int32_t rangex /*= Map::maxClientViewportX*/, const int32_t rangey /*= Map::maxClientViewportY*/) { // z checks // underground 8->15 // ground level and above 7->0 @@ -437,7 +452,7 @@ bool Map::canThrowObjectTo(const Position &fromPos, const Position &toPos, bool return false; } - int32_t deltaz = Position::getDistanceZ(fromPos, toPos); + const int32_t deltaz = Position::getDistanceZ(fromPos, toPos); if (deltaz > MAP_LAYER_VIEW_LIMIT) { return false; } @@ -451,10 +466,11 @@ bool Map::canThrowObjectTo(const Position &fromPos, const Position &toPos, bool return false; } - if (!checkLineOfSight) { + if (!(lineOfSight & SightLine_CheckSightLine)) { return true; } - return isSightClear(fromPos, toPos, false); + + return isSightClear(fromPos, toPos, lineOfSight & SightLine_FloorCheck); } bool Map::checkSightLine(Position start, Position destination) { @@ -472,7 +488,7 @@ bool Map::checkSightLine(Position start, Position destination) { start.x += delta; const auto &tile = getTile(start.x, start.y, start.z); - if (tile && tile->hasFlag(TILESTATE_BLOCKPROJECTILE)) { + if (tile && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { return false; } } @@ -483,7 +499,7 @@ bool Map::checkSightLine(Position start, Position destination) { start.y += delta; const auto &tile = getTile(start.x, start.y, start.z); - if (tile && tile->hasFlag(TILESTATE_BLOCKPROJECTILE)) { + if (tile && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { return false; } } @@ -516,7 +532,7 @@ bool Map::checkSightLine(Position start, Position destination) { } const auto &tile = getTile(start.x + xIncrease, start.y + deltaY, start.z); - if (tile && tile->hasFlag(TILESTATE_BLOCKPROJECTILE)) { + if (tile && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { if (Position::areInRange<1, 1>(start, destination)) { return true; } @@ -547,7 +563,7 @@ bool Map::checkSightLine(Position start, Position destination) { } const auto &tile = getTile(start.x + deltaX, start.y + yIncrease, start.z); - if (tile && tile->hasFlag(TILESTATE_BLOCKPROJECTILE)) { + if (tile && tile->hasProperty(CONST_PROP_BLOCKPROJECTILE)) { if (Position::areInRange<1, 1>(start, destination)) { return true; } @@ -590,7 +606,7 @@ bool Map::isSightClear(const Position &fromPos, const Position &toPos, bool floo } else { // Check if we can throw above obstacle const auto &tile = getTile(fromPos.x, fromPos.y, fromPos.z - 1); - if ((tile && (tile->getGround() || tile->hasFlag(TILESTATE_BLOCKPROJECTILE))) || !checkSightLine(Position(fromPos.x, fromPos.y, fromPos.z - 1), Position(toPos.x, toPos.y, toPos.z - 1))) { + if ((tile && (tile->getGround() || tile->hasProperty(CONST_PROP_BLOCKPROJECTILE))) || !checkSightLine(Position(fromPos.x, fromPos.y, fromPos.z - 1), Position(toPos.x, toPos.y, toPos.z - 1))) { return false; } @@ -605,7 +621,7 @@ bool Map::isSightClear(const Position &fromPos, const Position &toPos, bool floo // now we need to perform a jump between floors to see if everything is clear (literally) for (; startZ != toPos.z; ++startZ) { const auto &tile = getTile(toPos.x, toPos.y, startZ); - if (tile && (tile->getGround() || tile->hasFlag(TILESTATE_BLOCKPROJECTILE))) { + if (tile && (tile->getGround() || tile->hasProperty(CONST_PROP_BLOCKPROJECTILE))) { return false; } } @@ -638,7 +654,7 @@ std::shared_ptr<Tile> Map::canWalkTo(const std::shared_ptr<Creature> &creature, return tile; } -bool Map::getPathMatching(const std::shared_ptr<Creature> &creature, const Position &__targetPos, std::vector<Direction> &dirList, const FrozenPathingConditionCall &pathCondition, const FindPathParams &fpp) { +bool Map::getPathMatching(const std::shared_ptr<Creature> &creature, const Position &_targetPos, std::vector<Direction> &dirList, const FrozenPathingConditionCall &pathCondition, const FindPathParams &fpp) { static int_fast32_t allNeighbors[8][2] = { { -1, 0 }, { 0, 1 }, { 1, 0 }, { 0, -1 }, { -1, -1 }, { 1, -1 }, { 1, 1 }, { -1, 1 } }; @@ -656,7 +672,7 @@ bool Map::getPathMatching(const std::shared_ptr<Creature> &creature, const Posit const bool withoutCreature = creature == nullptr; - Position pos = withoutCreature ? __targetPos : creature->getPosition(); + Position pos = withoutCreature ? _targetPos : creature->getPosition(); Position endPos; AStarNodes nodes(pos.x, pos.y, AStarNodes::getTileWalkCost(creature, getTile(pos.x, pos.y, pos.z))); @@ -664,14 +680,14 @@ bool Map::getPathMatching(const std::shared_ptr<Creature> &creature, const Posit int32_t bestMatch = 0; const auto &startPos = pos; - const auto &targetPos = withoutCreature ? pathCondition.getTargetPos() : __targetPos; + const auto &targetPos = withoutCreature ? pathCondition.getTargetPos() : _targetPos; const int_fast32_t sX = std::abs(targetPos.getX() - pos.getX()); const int_fast32_t sY = std::abs(targetPos.getY() - pos.getY()); uint_fast16_t cntDirs = 0; - AStarNode* found = nullptr; + const AStarNode* found = nullptr; do { AStarNode* n = nodes.getBestNode(); if (!n) { @@ -785,8 +801,8 @@ bool Map::getPathMatching(const std::shared_ptr<Creature> &creature, const Posit pos.x = found->x; pos.y = found->y; - int_fast32_t dx = pos.getX() - prevx; - int_fast32_t dy = pos.getY() - prevy; + const int_fast32_t dx = pos.getX() - prevx; + const int_fast32_t dy = pos.getY() - prevy; prevx = pos.x; prevy = pos.y; @@ -851,7 +867,7 @@ bool Map::getPathMatchingCond(const std::shared_ptr<Creature> &creature, const P uint_fast16_t cntDirs = 0; - AStarNode* found = nullptr; + const AStarNode* found = nullptr; do { AStarNode* n = nodes.getBestNode(); if (!n) { @@ -973,8 +989,8 @@ bool Map::getPathMatchingCond(const std::shared_ptr<Creature> &creature, const P pos.x = found->x; pos.y = found->y; - int_fast32_t dx = pos.getX() - prevx; - int_fast32_t dy = pos.getY() - prevy; + const int_fast32_t dx = pos.getX() - prevx; + const int_fast32_t dy = pos.getY() - prevy; prevx = pos.x; prevy = pos.y; @@ -1005,8 +1021,8 @@ bool Map::getPathMatchingCond(const std::shared_ptr<Creature> &creature, const P return true; } -uint32_t Map::clean() { - uint64_t start = OTSYS_TIME(); +uint32_t Map::clean() const { + const uint64_t start = OTSYS_TIME(); size_t qntTiles = 0; if (g_game().getGameState() == GAME_STATE_NORMAL) { @@ -1021,7 +1037,7 @@ uint32_t Map::clean() { continue; } - if (const auto items = tile->getItemList()) { + if (const auto &items = tile->getItemList()) { ++qntTiles; for (const auto &item : *items) { if (item->isCleanable()) { @@ -1042,7 +1058,7 @@ uint32_t Map::clean() { g_game().setGameState(GAME_STATE_NORMAL); } - uint64_t end = OTSYS_TIME(); + const uint64_t end = OTSYS_TIME(); 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 a20007663..b4b78c7b5 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 : public MapCache { +class Map final : public MapCache { public: - uint32_t clean(); + uint32_t clean() const; std::filesystem::path getPath() const { return path; @@ -59,7 +59,7 @@ class Map : public MapCache { * \param loadNpcs if true, the map custom npcs is loaded * \returns true if the custom map was loaded successfully */ - void loadMapCustom(const std::string &mapName, bool loadHouses, bool loadMonsters, bool loadNpcs, bool loadZones, const int customMapIndex); + void loadMapCustom(const std::string &mapName, bool loadHouses, bool loadMonsters, bool loadNpcs, bool loadZones, int customMapIndex); void loadHouseInfo(); @@ -95,7 +95,7 @@ class Map : public MapCache { * \param extendedPos If true, the creature will in first-hand be placed 2 tiles away * \param forceLogin If true, placing the creature will not fail becase of obstacles (creatures/chests) */ - bool placeCreature(const Position ¢erPos, std::shared_ptr<Creature> creature, bool extendedPos = false, bool forceLogin = false); + bool placeCreature(const Position ¢erPos, const std::shared_ptr<Creature> &creature, bool extendedPos = false, bool forceLogin = false); void moveCreature(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &newTile, bool forceTeleport = false); @@ -108,8 +108,7 @@ class Map : public MapCache { * \param checkLineOfSight checks if there is any blocking objects in the way * \returns The result if you can throw there or not */ - bool canThrowObjectTo(const Position &fromPos, const Position &toPos, bool checkLineOfSight = true, int32_t rangex = MAP_MAX_CLIENT_VIEW_PORT_X, int32_t rangey = MAP_MAX_CLIENT_VIEW_PORT_Y); - + bool canThrowObjectTo(const Position &fromPos, const Position &toPos, SightLines_t lineOfSight = SightLine_CheckSightLine, int32_t rangex = MAP_MAX_CLIENT_VIEW_PORT_X, int32_t rangey = MAP_MAX_CLIENT_VIEW_PORT_Y); /** * Checks if path is clear from fromPos to toPos * Notice: This only checks a straight line if the path is clear, for path finding use getPathTo. @@ -148,8 +147,8 @@ class Map : public MapCache { /** * Set a single tile. */ - void setTile(uint16_t x, uint16_t y, uint8_t z, std::shared_ptr<Tile> newTile); - void setTile(const Position &pos, std::shared_ptr<Tile> newTile) { + void setTile(uint16_t x, uint16_t y, uint8_t z, const std::shared_ptr<Tile> &newTile); + void setTile(const Position &pos, const std::shared_ptr<Tile> &newTile) { setTile(pos.x, pos.y, pos.z, newTile); } std::shared_ptr<Tile> getLoadedTile(uint16_t x, uint16_t y, uint8_t z); diff --git a/src/map/map_definitions.hpp b/src/map/map_definitions.hpp index 67c9878b9..da3447efc 100644 --- a/src/map/map_definitions.hpp +++ b/src/map/map_definitions.hpp @@ -29,3 +29,10 @@ enum RentPeriod_t { RENTPERIOD_YEARLY, RENTPERIOD_NEVER, }; + +enum SightLines_t : uint8_t { + SightLine_NoCheck = 0, + SightLine_CheckSightLine = 1 << 0, + SightLine_FloorCheck = 1 << 1, + SightLine_CheckSightLineAndFloor = SightLine_CheckSightLine | SightLine_FloorCheck, +}; diff --git a/src/map/mapcache.cpp b/src/map/mapcache.cpp index cb3e95eb3..01fd9da63 100644 --- a/src/map/mapcache.cpp +++ b/src/map/mapcache.cpp @@ -7,21 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "mapcache.hpp" +#include "map/mapcache.hpp" #include "game/movement/teleport.hpp" -#include "items/bed.hpp" -#include "io/iologindata.hpp" -#include "items/item.hpp" -#include "game/game.hpp" +#include "game/scheduling/dispatcher.hpp" #include "game/zones/zone.hpp" -#include "map/map.hpp" -#include "utils/hash.hpp" #include "io/filestream.hpp" - #include "io/iomap.hpp" +#include "items/containers/depot/depotlocker.hpp" +#include "items/item.hpp" +#include "map/map.hpp" +#include "utils/hash.hpp" static phmap::flat_hash_map<size_t, std::shared_ptr<BasicItem>> items; static phmap::flat_hash_map<size_t, std::shared_ptr<BasicTile>> tiles; @@ -34,12 +30,12 @@ std::shared_ptr<BasicTile> static_tryGetTileFromCache(const std::shared_ptr<Basi return ref ? tiles.try_emplace(ref->hash(), ref).first->second : nullptr; } -void MapCache::flush() { +void MapCache::flush() const { items.clear(); tiles.clear(); } -void MapCache::parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, std::shared_ptr<Item> item) { +void MapCache::parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, const std::shared_ptr<Item> &item) const { if (BasicItem->charges > 0) { item->setSubType(BasicItem->charges); } @@ -53,7 +49,7 @@ void MapCache::parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, std::s } if (item->getTeleport() && (BasicItem->destX != 0 || BasicItem->destY != 0 || BasicItem->destZ != 0)) { - auto dest = Position(BasicItem->destX, BasicItem->destY, BasicItem->destZ); + const auto dest = Position(BasicItem->destX, BasicItem->destY, BasicItem->destZ); item->getTeleport()->setDestPos(dest); } @@ -74,7 +70,7 @@ void MapCache::parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, std::s } std::shared_ptr<Item> MapCache::createItem(const std::shared_ptr<BasicItem> &BasicItem, Position position) { - auto item = Item::CreateItem(BasicItem->id, position); + const auto &item = Item::CreateItem(BasicItem->id, position); if (!item) { return nullptr; } @@ -94,28 +90,38 @@ std::shared_ptr<Item> MapCache::createItem(const std::shared_ptr<BasicItem> &Bas item->setItemCount(1); } - item->startDecaying(); + if (item->canDecay()) { + item->startDecaying(); + } item->loadedFromMap = true; item->decayDisabled = Item::items[item->getID()].decayTo != -1; return item; } -std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::unique_ptr<Floor> &floor, uint16_t x, uint16_t y) { - const auto cachedTile = floor->getTileCache(x, y); +std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::shared_ptr<Floor> &floor, uint16_t x, uint16_t y) { + const auto &cachedTile = floor->getTileCache(x, y); + const auto oldTile = floor->getTile(x, y); if (!cachedTile) { - return floor->getTile(x, y); + return oldTile; } - std::unique_lock l(floor->getMutex()); - const uint8_t z = floor->getZ(); + const auto map = dynamic_cast<Map*>(this); - auto map = static_cast<Map*>(this); + std::vector<std::shared_ptr<Creature>> oldCreatureList; + if (oldTile) { + if (CreatureVector* creatures = oldTile->getCreatures()) { + for (const auto &creature : *creatures) { + oldCreatureList.emplace_back(creature); + } + } + } std::shared_ptr<Tile> tile = nullptr; + if (cachedTile->isHouse()) { - const auto house = map->houses.getHouse(cachedTile->houseId); + const auto &house = map->houses.getHouse(cachedTile->houseId); tile = std::make_shared<HouseTile>(x, y, z, house); house->addTile(std::static_pointer_cast<HouseTile>(tile)); } else if (cachedTile->isStatic) { @@ -126,6 +132,10 @@ std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::unique_ptr<F auto pos = Position(x, y, z); + for (const auto &creature : oldCreatureList) { + tile->internalAddThing(creature); + } + if (cachedTile->ground != nullptr) { tile->internalAddThing(createItem(cachedTile->ground, pos)); } @@ -135,9 +145,16 @@ std::shared_ptr<Tile> MapCache::getOrCreateTileFromCache(const std::unique_ptr<F } tile->setFlag(static_cast<TileFlags_t>(cachedTile->flags)); - for (const auto &zone : Zone::getZones(pos)) { - tile->addZone(zone); - } + + // add zone synchronously + g_dispatcher().context().tryAddEvent( + [tile, pos] { + for (const auto &zone : Zone::getZones(pos)) { + tile->addZone(zone); + } + }, + "Zone::getZones" + ); floor->setTile(x, y, tile); @@ -153,7 +170,7 @@ void MapCache::setBasicTile(uint16_t x, uint16_t y, uint8_t z, const std::shared return; } - const auto tile = static_tryGetTileFromCache(newTile); + const auto &tile = static_tryGetTileFromCache(newTile); if (const auto sector = getMapSector(x, y)) { sector->createFloor(z)->setTileCache(x, y, tile); } else { @@ -161,7 +178,7 @@ void MapCache::setBasicTile(uint16_t x, uint16_t y, uint8_t z, const std::shared } } -std::shared_ptr<BasicItem> MapCache::tryReplaceItemFromCache(const std::shared_ptr<BasicItem> &ref) { +std::shared_ptr<BasicItem> MapCache::tryReplaceItemFromCache(const std::shared_ptr<BasicItem> &ref) const { return static_tryGetItemFromCache(ref); } @@ -206,7 +223,7 @@ MapSector* MapCache::getBestMapSector(uint32_t x, uint32_t y) { } void BasicTile::hash(size_t &h) const { - std::array<uint32_t, 4> arr = { flags, houseId, type, isStatic }; + const std::array<uint32_t, 4> arr = { flags, houseId, type, isStatic }; for (const auto v : arr) { if (v > 0) { stdext::hash_combine(h, v); diff --git a/src/map/mapcache.hpp b/src/map/mapcache.hpp index 429d78697..eb7a313ff 100644 --- a/src/map/mapcache.hpp +++ b/src/map/mapcache.hpp @@ -15,7 +15,7 @@ class Map; class Tile; class Item; -class Position; +struct Position; class FileStream; #pragma pack(1) @@ -47,7 +47,7 @@ struct BasicItem { private: void hash(size_t &h) const; - friend class BasicTile; + friend struct BasicTile; }; struct BasicTile { @@ -85,9 +85,9 @@ class MapCache { void setBasicTile(uint16_t x, uint16_t y, uint8_t z, const std::shared_ptr<BasicTile> &BasicTile); - std::shared_ptr<BasicItem> tryReplaceItemFromCache(const std::shared_ptr<BasicItem> &ref); + std::shared_ptr<BasicItem> tryReplaceItemFromCache(const std::shared_ptr<BasicItem> &ref) const; - void flush(); + void flush() const; /** * Creates a map sector. @@ -111,11 +111,11 @@ class MapCache { } protected: - std::shared_ptr<Tile> getOrCreateTileFromCache(const std::unique_ptr<Floor> &floor, uint16_t x, uint16_t y); + std::shared_ptr<Tile> getOrCreateTileFromCache(const std::shared_ptr<Floor> &floor, uint16_t x, uint16_t y); std::unordered_map<uint32_t, MapSector> mapSectors; private: - void parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, std::shared_ptr<Item> item); + void parseItemAttr(const std::shared_ptr<BasicItem> &BasicItem, const std::shared_ptr<Item> &item) const; std::shared_ptr<Item> createItem(const std::shared_ptr<BasicItem> &BasicItem, Position position); }; diff --git a/src/map/spectators.cpp b/src/map/spectators.cpp index 405119b83..74c6aa19a 100644 --- a/src/map/spectators.cpp +++ b/src/map/spectators.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "map/spectators.hpp" -#include "spectators.hpp" +#include "creatures/creature.hpp" #include "game/game.hpp" phmap::flat_hash_map<Position, SpectatorsCache> Spectators::spectatorsCache; @@ -75,43 +75,7 @@ bool Spectators::checkCache(const SpectatorsCache::FloorData &specData, bool onl return true; } -Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onlyPlayers, int32_t minRangeX, int32_t maxRangeX, int32_t minRangeY, int32_t maxRangeY) { - minRangeX = (minRangeX == 0 ? -MAP_MAX_VIEW_PORT_X : -minRangeX); - maxRangeX = (maxRangeX == 0 ? MAP_MAX_VIEW_PORT_X : maxRangeX); - minRangeY = (minRangeY == 0 ? -MAP_MAX_VIEW_PORT_Y : -minRangeY); - maxRangeY = (maxRangeY == 0 ? MAP_MAX_VIEW_PORT_Y : maxRangeY); - - const auto &it = spectatorsCache.find(centerPos); - const bool cacheFound = it != spectatorsCache.end(); - if (cacheFound) { - auto &cache = it->second; - if (minRangeX < cache.minRangeX || maxRangeX > cache.maxRangeX || minRangeY < cache.minRangeY || maxRangeY > cache.maxRangeY) { - // recache with new range - cache.minRangeX = minRangeX = std::min<int32_t>(minRangeX, cache.minRangeX); - cache.minRangeY = minRangeY = std::min<int32_t>(minRangeY, cache.minRangeY); - cache.maxRangeX = maxRangeX = std::max<int32_t>(maxRangeX, cache.maxRangeX); - cache.maxRangeY = maxRangeY = std::max<int32_t>(maxRangeY, cache.maxRangeY); - } else { - const bool checkDistance = minRangeX != cache.minRangeX || maxRangeX != cache.maxRangeX || minRangeY != cache.minRangeY || maxRangeY != cache.maxRangeY; - - if (onlyPlayers) { - // check players cache - if (checkCache(cache.players, true, centerPos, checkDistance, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { - return *this; - } - - // if there is no player cache, look for players in the creatures cache. - if (checkCache(cache.creatures, true, centerPos, true, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { - return *this; - } - - // All Creatures - } else if (checkCache(cache.creatures, false, centerPos, checkDistance, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { - return *this; - } - } - } - +CreatureVector Spectators::getSpectators(const Position ¢erPos, bool multifloor, bool onlyPlayers, int32_t minRangeX, int32_t maxRangeX, int32_t minRangeY, int32_t maxRangeY) { uint8_t minRangeZ = centerPos.z; uint8_t maxRangeZ = centerPos.z; @@ -185,6 +149,53 @@ Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onl } } + return spectators; +} + +Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onlyPlayers, int32_t minRangeX, int32_t maxRangeX, int32_t minRangeY, int32_t maxRangeY, bool useCache) { + minRangeX = (minRangeX == 0 ? -MAP_MAX_VIEW_PORT_X : -minRangeX); + maxRangeX = (maxRangeX == 0 ? MAP_MAX_VIEW_PORT_X : maxRangeX); + minRangeY = (minRangeY == 0 ? -MAP_MAX_VIEW_PORT_Y : -minRangeY); + maxRangeY = (maxRangeY == 0 ? MAP_MAX_VIEW_PORT_Y : maxRangeY); + + if (!useCache) { + insertAll(getSpectators(centerPos, multifloor, onlyPlayers, minRangeX, maxRangeX, minRangeY, maxRangeY)); + return *this; + } + + const auto &it = spectatorsCache.find(centerPos); + const bool cacheFound = it != spectatorsCache.end(); + if (cacheFound) { + auto &cache = it->second; + if (minRangeX < cache.minRangeX || maxRangeX > cache.maxRangeX || minRangeY < cache.minRangeY || maxRangeY > cache.maxRangeY) { + // recache with new range + cache.minRangeX = minRangeX = std::min<int32_t>(minRangeX, cache.minRangeX); + cache.minRangeY = minRangeY = std::min<int32_t>(minRangeY, cache.minRangeY); + cache.maxRangeX = maxRangeX = std::max<int32_t>(maxRangeX, cache.maxRangeX); + cache.maxRangeY = maxRangeY = std::max<int32_t>(maxRangeY, cache.maxRangeY); + } else { + const bool checkDistance = minRangeX != cache.minRangeX || maxRangeX != cache.maxRangeX || minRangeY != cache.minRangeY || maxRangeY != cache.maxRangeY; + + if (onlyPlayers) { + // check players cache + if (checkCache(cache.players, true, centerPos, checkDistance, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { + return *this; + } + + // if there is no player cache, look for players in the creatures cache. + if (checkCache(cache.creatures, true, centerPos, true, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { + return *this; + } + + // All Creatures + } else if (checkCache(cache.creatures, false, centerPos, checkDistance, multifloor, minRangeX, maxRangeX, minRangeY, maxRangeY)) { + return *this; + } + } + } + + const auto &spectators = getSpectators(centerPos, multifloor, onlyPlayers, minRangeX, maxRangeX, minRangeY, maxRangeY); + // It is necessary to create the cache even if no spectators is found, so that there is no future query. auto &cache = cacheFound ? it->second : spectatorsCache.emplace(centerPos, SpectatorsCache { .minRangeX = minRangeX, .maxRangeX = maxRangeX, .minRangeY = minRangeY, .maxRangeY = maxRangeY, .creatures = {}, .players = {} }).first->second; auto &creaturesCache = onlyPlayers ? cache.players : cache.creatures; @@ -203,3 +214,20 @@ Spectators Spectators::find(const Position ¢erPos, bool multifloor, bool onl return *this; } + +Spectators Spectators::filter(bool onlyPlayers, bool onlyMonsters, bool onlyNpcs) const { + auto specs = Spectators(); + specs.creatures.reserve(creatures.size()); + + for (const auto &c : creatures) { + if (onlyPlayers && c->getPlayer() != nullptr) { + specs.insert(c); + } else if (onlyMonsters && c->getMonster() != nullptr) { + specs.insert(c); + } else if (onlyNpcs && c->getNpc() != nullptr) { + specs.insert(c); + } + } + + return specs; +} diff --git a/src/map/spectators.hpp b/src/map/spectators.hpp index 9e998da2b..68ad751b0 100644 --- a/src/map/spectators.hpp +++ b/src/map/spectators.hpp @@ -9,13 +9,15 @@ #pragma once -#include "creatures/creature.hpp" - +class Creature; class Player; class Monster; class Npc; struct Position; +// Forward declaration para CreatureVector +using CreatureVector = std::vector<std::shared_ptr<Creature>>; + struct SpectatorsCache { struct FloorData { std::optional<CreatureVector> floor; @@ -37,14 +39,19 @@ class Spectators { template <typename T> requires std::is_same_v<Creature, T> || std::is_same_v<Player, T> - Spectators find(const Position ¢erPos, bool multifloor = false, int32_t minRangeX = 0, int32_t maxRangeX = 0, int32_t minRangeY = 0, int32_t maxRangeY = 0) { + Spectators find(const Position ¢erPos, bool multifloor = false, int32_t minRangeX = 0, int32_t maxRangeX = 0, int32_t minRangeY = 0, int32_t maxRangeY = 0, bool useCache = true) { constexpr bool onlyPlayers = std::is_same_v<T, Player>; - return find(centerPos, multifloor, onlyPlayers, minRangeX, maxRangeX, minRangeY, maxRangeY); + return find(centerPos, multifloor, onlyPlayers, minRangeX, maxRangeX, minRangeY, maxRangeY, useCache); } template <typename T> requires std::is_base_of_v<Creature, T> - Spectators filter(); + Spectators filter() const { + bool onlyPlayers = std::is_same_v<T, Player>; + bool onlyMonsters = std::is_same_v<T, Monster>; + bool onlyNpcs = std::is_same_v<T, Npc>; + return filter(onlyPlayers, onlyMonsters, onlyNpcs); + } Spectators insert(const std::shared_ptr<Creature> &creature); Spectators insertAll(const CreatureVector &list); @@ -83,33 +90,12 @@ class Spectators { private: static phmap::flat_hash_map<Position, SpectatorsCache> spectatorsCache; - 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); + 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 useCache = true); + CreatureVector getSpectators(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); + + Spectators filter(bool onlyPlayers, bool onlyMonsters, bool onlyNpcs) const; + 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); CreatureVector creatures; }; - -template <typename T> - requires std::is_base_of_v<Creature, T> -Spectators Spectators::filter() { - auto specs = Spectators(); - specs.creatures.reserve(creatures.size()); - - for (const auto &c : creatures) { - if constexpr (std::is_same_v<T, Player>) { - if (c->getPlayer() != nullptr) { - specs.insert(c); - } - } else if constexpr (std::is_same_v<T, Monster>) { - if (c->getMonster() != nullptr) { - specs.insert(c); - } - } else if constexpr (std::is_same_v<T, Npc>) { - if (c->getNpc() != nullptr) { - specs.insert(c); - } - } - } - - return specs; -} diff --git a/src/map/town.hpp b/src/map/town.hpp index d6529fa30..6dd91d388 100644 --- a/src/map/town.hpp +++ b/src/map/town.hpp @@ -10,6 +10,7 @@ #pragma once #include "game/movement/position.hpp" +#include "utils/tools.hpp" class Town { public: @@ -55,16 +56,20 @@ class Towns { } std::shared_ptr<Town> getTown(const std::string &townName) const { - for (const auto &it : townMap) { - if (strcasecmp(townName.c_str(), it.second->getName().c_str()) == 0) { - return it.second; + for (const auto &[townId, town] : townMap) { + if (townId == 0) { + continue; + } + + if (caseInsensitiveCompare(townName, town->getName())) { + return town; } } return nullptr; } std::shared_ptr<Town> getTown(uint32_t townId) const { - auto it = townMap.find(townId); + const auto it = townMap.find(townId); if (it == townMap.end()) { return nullptr; } diff --git a/src/map/utils/astarnodes.cpp b/src/map/utils/astarnodes.cpp index 21ebe5f98..a7e95055b 100644 --- a/src/map/utils/astarnodes.cpp +++ b/src/map/utils/astarnodes.cpp @@ -7,14 +7,28 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "map/utils/astarnodes.hpp" -#include "astarnodes.hpp" -#include "creatures/monsters/monster.hpp" #include "creatures/combat/combat.hpp" +#include "creatures/monsters/monster.hpp" +#include "items/tile.hpp" AStarNodes::AStarNodes(uint32_t x, uint32_t y, int_fast32_t extraCost) : - openNodes(), nodes() { +#if defined(__AVX2__) || defined(__SSE2__) + nodesTable(), // 1. nodesTable + calculatedNodes(), // 2. calculatedNodes + nodes(), // 3. nodes + closedNodes(0), // 4. closedNodes + curNode(0), // 5. curNode + openNodes() // 6. openNodes +#else + nodes(), // 1. nodes + nodesTable(), // 2. nodesTable + closedNodes(0), // 3. closedNodes + curNode(0), // 4. curNode + openNodes() // 5. openNodes +#endif +{ #if defined(__AVX2__) __m256i defaultCost = _mm256_set1_epi32(std::numeric_limits<int32_t>::max()); for (int32_t i = 0; i < MAX_NODES; i += 32) { @@ -47,7 +61,7 @@ AStarNodes::AStarNodes(uint32_t x, uint32_t y, int_fast32_t extraCost) : startNode.g = 0; startNode.c = extraCost; nodesTable[0] = (x << 16) | y; -#if defined(__SSE2__) +#if defined(__SSE2__) || defined(__AVX2__) calculatedNodes[0] = 0; #endif } @@ -57,7 +71,7 @@ bool AStarNodes::createOpenNode(AStarNode* parent, uint32_t x, uint32_t y, int_f return false; } - int32_t retNode = curNode++; + const int32_t retNode = curNode++; openNodes[retNode] = true; AStarNode &node = nodes[retNode]; @@ -100,7 +114,7 @@ AStarNode* AStarNodes::getBestNode() { best_node = (total_cost < best_node_f ? indices_array[i] : best_node); best_node_f = (total_cost < best_node_f ? total_cost : best_node_f); } - return (openNodes[best_node] ? &nodes[best_node] : NULL); + return (openNodes[best_node] ? &nodes[best_node] : nullptr); #elif defined(__AVX2__) const __m256i increment = _mm256_set1_epi32(8); __m256i indices = _mm256_setr_epi32(0, 1, 2, 3, 4, 5, 6, 7); @@ -120,8 +134,8 @@ AStarNode* AStarNodes::getBestNode() { alignas(32) int32_t indices_array[8]; _mm256_store_si256(reinterpret_cast<__m256i*>(indices_array), minindices); - int32_t best_node = indices_array[(_mm_ctz(_mm256_movemask_epi8(_mm256_cmpeq_epi32(minvalues, res))) >> 2)]; - return (openNodes[best_node] ? &nodes[best_node] : NULL); + int32_t best_node = indices_array[(mm_ctz(_mm256_movemask_epi8(_mm256_cmpeq_epi32(minvalues, res))) >> 2)]; + return (openNodes[best_node] ? &nodes[best_node] : nullptr); #elif defined(__SSE4_1__) const __m128i increment = _mm_set1_epi32(4); __m128i indices = _mm_setr_epi32(0, 1, 2, 3); @@ -140,7 +154,7 @@ AStarNode* AStarNodes::getBestNode() { alignas(16) int32_t indices_array[4]; _mm_store_si128(reinterpret_cast<__m128i*>(indices_array), minindices); - int32_t best_node = indices_array[(_mm_ctz(_mm_movemask_epi8(_mm_cmpeq_epi32(minvalues, res))) >> 2)]; + int32_t best_node = indices_array[(mm_ctz(_mm_movemask_epi8(_mm_cmpeq_epi32(minvalues, res))) >> 2)]; return (openNodes[best_node] ? &nodes[best_node] : NULL); #elif defined(__SSE2__) auto _mm_sse2_min_epi32 = [](const __m128i a, const __m128i b) { @@ -170,8 +184,8 @@ AStarNode* AStarNodes::getBestNode() { alignas(16) int32_t indices_array[4]; _mm_store_si128(reinterpret_cast<__m128i*>(indices_array), minindices); - int32_t best_node = indices_array[(_mm_ctz(_mm_movemask_epi8(_mm_cmpeq_epi32(minvalues, res))) >> 2)]; - return (openNodes[best_node] ? &nodes[best_node] : NULL); + int32_t best_node = indices_array[(mm_ctz(_mm_movemask_epi8(_mm_cmpeq_epi32(minvalues, res))) >> 2)]; + return (openNodes[best_node] ? &nodes[best_node] : nullptr); #else int32_t best_node_f = std::numeric_limits<int32_t>::max(); int32_t best_node = -1; @@ -227,7 +241,7 @@ AStarNode* AStarNodes::getNodeByPosition(uint32_t x, uint32_t y) { v[3] = _mm_cmpeq_epi32(_mm_load_si128(reinterpret_cast<const __m128i*>(&nodesTable[pos + 12])), key); const uint32_t mask = _mm_movemask_epi8(_mm_packs_epi16(_mm_packs_epi32(v[0], v[1]), _mm_packs_epi32(v[2], v[3]))); if (mask != 0) { - return &nodes[pos + _mm_ctz(mask)]; + return &nodes[pos + mm_ctz(mask)]; } } curRound = curNode - 8; @@ -237,7 +251,7 @@ AStarNode* AStarNodes::getNodeByPosition(uint32_t x, uint32_t y) { v[1] = _mm_cmpeq_epi32(_mm_load_si128(reinterpret_cast<const __m128i*>(&nodesTable[pos + 4])), key); const uint32_t mask = _mm_movemask_epi8(_mm_packs_epi32(v[0], v[1])); if (mask != 0) { - return &nodes[pos + (_mm_ctz(mask) >> 1)]; + return &nodes[pos + (mm_ctz(mask) >> 1)]; } pos += 8; } @@ -257,7 +271,7 @@ AStarNode* AStarNodes::getNodeByPosition(uint32_t x, uint32_t y) { #endif } -int_fast32_t AStarNodes::getMapWalkCost(AStarNode* node, const Position &neighborPos) { +int_fast32_t AStarNodes::getMapWalkCost(const AStarNode* node, const Position &neighborPos) { // diagonal movement extra cost return (((std::abs(node->x - neighborPos.x) + std::abs(node->y - neighborPos.y)) - 1) * MAP_DIAGONALWALKCOST) + MAP_NORMALWALKCOST; } @@ -265,13 +279,13 @@ int_fast32_t AStarNodes::getMapWalkCost(AStarNode* node, const Position &neighbo int_fast32_t AStarNodes::getTileWalkCost(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile) { int_fast32_t cost = 0; - if (creature) { + if (creature && tile) { + // Destroy creature cost if (tile->getTopVisibleCreature(creature) != nullptr) { - // destroy creature cost cost += MAP_NORMALWALKCOST * 4; } if (const auto &field = tile->getFieldItem()) { - CombatType_t combatType = field->getCombatType(); + const CombatType_t combatType = field->getCombatType(); if (!creature->isImmune(combatType) && !creature->hasCondition(Combat::DamageToConditionType(combatType)) && (creature->getMonster() && !creature->getMonster()->canWalkOnFieldType(combatType))) { cost += MAP_NORMALWALKCOST * 18; } diff --git a/src/map/utils/astarnodes.hpp b/src/map/utils/astarnodes.hpp index d66171f0d..6e4411855 100644 --- a/src/map/utils/astarnodes.hpp +++ b/src/map/utils/astarnodes.hpp @@ -30,7 +30,7 @@ class AStarNodes { int32_t getClosedNodes() const; AStarNode* getNodeByPosition(uint32_t x, uint32_t y); - static int_fast32_t getMapWalkCost(AStarNode* node, const Position &neighborPos); + static int_fast32_t getMapWalkCost(const AStarNode* node, const Position &neighborPos); static int_fast32_t getTileWalkCost(const std::shared_ptr<Creature> &creature, const std::shared_ptr<Tile> &tile); private: @@ -40,8 +40,8 @@ class AStarNodes { static constexpr int32_t MAP_DIAGONALWALKCOST = 25; #if defined(__SSE2__) - alignas(16) uint32_t nodesTable[MAX_NODES]; - alignas(64) int32_t calculatedNodes[MAX_NODES]; + alignas(16) uint32_t nodesTable[MAX_NODES] {}; + alignas(64) int32_t calculatedNodes[MAX_NODES] {}; AStarNode nodes[MAX_NODES]; #else AStarNode nodes[MAX_NODES]; diff --git a/src/map/utils/mapsector.cpp b/src/map/utils/mapsector.cpp index de036728b..f07c2a3e1 100644 --- a/src/map/utils/mapsector.cpp +++ b/src/map/utils/mapsector.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "map/utils/mapsector.hpp" #include "creatures/creature.hpp" -#include "mapsector.hpp" bool MapSector::newSector = false; @@ -22,7 +21,7 @@ void MapSector::addCreature(const std::shared_ptr<Creature> &c) { } void MapSector::removeCreature(const std::shared_ptr<Creature> &c) { - auto iter = std::find(creature_list.begin(), creature_list.end(), c); + auto iter = std::ranges::find(creature_list, c); if (iter == creature_list.end()) { g_logger().error("[{}]: Creature not found in creature_list!", __FUNCTION__); return; @@ -33,7 +32,7 @@ void MapSector::removeCreature(const std::shared_ptr<Creature> &c) { creature_list.pop_back(); if (c->getPlayer()) { - iter = std::find(player_list.begin(), player_list.end(), c); + iter = std::ranges::find(player_list, c); if (iter == player_list.end()) { g_logger().error("[{}]: Player not found in player_list!", __FUNCTION__); return; diff --git a/src/map/utils/mapsector.hpp b/src/map/utils/mapsector.hpp index 7b95db7f7..58130007e 100644 --- a/src/map/utils/mapsector.hpp +++ b/src/map/utils/mapsector.hpp @@ -20,24 +20,27 @@ struct Floor { z(z) { } std::shared_ptr<Tile> getTile(uint16_t x, uint16_t y) const { - std::shared_lock sl(mutex); + std::shared_lock<std::shared_mutex> sl(mutex); return tiles[x & SECTOR_MASK][y & SECTOR_MASK].first; } void setTile(uint16_t x, uint16_t y, std::shared_ptr<Tile> tile) { - tiles[x & SECTOR_MASK][y & SECTOR_MASK].first = tile; + std::unique_lock<std::shared_mutex> ul(mutex); + tiles[x & SECTOR_MASK][y & SECTOR_MASK].first = std::move(tile); } std::shared_ptr<BasicTile> getTileCache(uint16_t x, uint16_t y) const { - std::shared_lock sl(mutex); + std::shared_lock<std::shared_mutex> sl(mutex); return tiles[x & SECTOR_MASK][y & SECTOR_MASK].second; } void setTileCache(uint16_t x, uint16_t y, const std::shared_ptr<BasicTile> &newTile) { + std::unique_lock<std::shared_mutex> ul(mutex); tiles[x & SECTOR_MASK][y & SECTOR_MASK].second = newTile; } const auto &getTiles() const { + std::shared_lock<std::shared_mutex> sl(mutex); return tiles; } @@ -45,13 +48,11 @@ struct Floor { return z; } - auto &getMutex() const { - return mutex; - } - private: std::pair<std::shared_ptr<Tile>, std::shared_ptr<BasicTile>> tiles[SECTOR_SIZE][SECTOR_SIZE] = {}; + mutable std::shared_mutex mutex; + uint8_t z { 0 }; }; @@ -59,32 +60,49 @@ 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<Floor> &createFloor(uint32_t z) { - return floors[z] ? floors[z] : (floors[z] = std::make_unique<Floor>(z)); + std::shared_ptr<Floor> createFloor(uint32_t z) { + if (z >= MAP_MAX_LAYERS) { + g_logger().error("Attempt to create floor on invalid coordinate: {}", z); + return nullptr; + } + std::scoped_lock lock(floors_mutex); + if (!floors[z]) { + floors[z] = std::make_shared<Floor>(static_cast<uint8_t>(z)); + } + return floors[z]; } - const std::unique_ptr<Floor> &getFloor(uint8_t z) const { + std::shared_ptr<Floor> getFloor(uint8_t z) { + if (z >= MAP_MAX_LAYERS) { + g_logger().error("Attempt to get floor on invalid coordinate: {}", z); + return nullptr; + } + std::scoped_lock lock(floors_mutex); return floors[z]; } void addCreature(const std::shared_ptr<Creature> &c); + void removeCreature(const std::shared_ptr<Creature> &c); private: static bool newSector; + MapSector* sectorS = nullptr; MapSector* sectorE = nullptr; + std::vector<std::shared_ptr<Creature>> creature_list; std::vector<std::shared_ptr<Creature>> player_list; - std::unique_ptr<Floor> floors[MAP_MAX_LAYERS] = {}; + + mutable std::mutex floors_mutex; + + std::shared_ptr<Floor> floors[MAP_MAX_LAYERS] = {}; + uint32_t floorBits = 0; friend class Spectators; diff --git a/src/pch.cpp b/src/pch.cpp new file mode 100644 index 000000000..c76b9e42c --- /dev/null +++ b/src/pch.cpp @@ -0,0 +1,11 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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/ + */ + +// The visual studio solution requires a pch.cpp including the pch.hpp +#include "pch.hpp" diff --git a/src/pch.hpp b/src/pch.hpp index e69c27016..79f14433f 100644 --- a/src/pch.hpp +++ b/src/pch.hpp @@ -46,6 +46,8 @@ #include <cmath> #include <mutex> #include <stack> +#include <source_location> +#include <span> // -------------------- // System Includes @@ -81,17 +83,14 @@ #include <fmt/core.h> #include <fmt/format.h> #include <fmt/args.h> +#include <fmt/ranges.h> // FMT Custom Formatter for Enums template <typename E> -struct fmt::formatter<E, std::enable_if_t<std::is_enum_v<E>, char>> : formatter<std::underlying_type_t<E>> { - template <typename FormatContext> - auto format(E e, FormatContext &ctx) { - return formatter<std::underlying_type_t<E>>::format( - static_cast<std::underlying_type_t<E>>(e), ctx - ); - } -}; +std::enable_if_t<std::is_enum_v<E>, std::underlying_type_t<E>> +format_as(E e) { + return static_cast<std::underlying_type_t<E>>(e); +} // GMP #include <gmp.h> @@ -172,9 +171,9 @@ struct fmt::formatter<E, std::enable_if_t<std::is_enum_v<E>, char>> : formatter< #include "lua/global/shared_object.hpp" constexpr std::string_view methodName(const char* s) { - std::string_view prettyFunction(s); - size_t bracket = prettyFunction.rfind('('); - size_t space = prettyFunction.rfind(' ', bracket) + 1; + const std::string_view prettyFunction(s); + const size_t bracket = prettyFunction.rfind('('); + const size_t space = prettyFunction.rfind(' ', bracket) + 1; return prettyFunction.substr(space, bracket - space); } @@ -185,3 +184,6 @@ constexpr std::string_view methodName(const char* s) { #else #error "Compiler not supported" #endif + +#include "account/account_info.hpp" +#include "config/config_enums.hpp" diff --git a/src/security/argon.cpp b/src/security/argon.cpp index 02079e70c..206c4ac0a 100644 --- a/src/security/argon.cpp +++ b/src/security/argon.cpp @@ -7,51 +7,61 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "security/argon.hpp" #include "config/configmanager.hpp" #include "database/database.hpp" -#include "security/argon.hpp" #include <argon2.h> -const std::regex Argon2::re("\\$([A-Za-z0-9+/]+)\\$([A-Za-z0-9+/]+)"); -const std::string Argon2::base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - Argon2::Argon2() { updateConstants(); } void Argon2::updateConstants() { - m_const_str = g_configManager().getString(M_CONST, __FUNCTION__); + m_const_str = g_configManager().getString(M_CONST); m_cost = parseBitShift(m_const_str); - t_cost = g_configManager().getNumber(T_CONST, __FUNCTION__); - parallelism = g_configManager().getNumber(PARALLELISM, __FUNCTION__); + t_cost = g_configManager().getNumber(T_CONST); + parallelism = g_configManager().getNumber(PARALLELISM); } uint32_t Argon2::parseBitShift(const std::string &bitShiftStr) const { - std::stringstream ss(bitShiftStr); - int base; - int shift; - char op1; - char op2; - - if (!(ss >> base >> op1 >> op2 >> shift) || op1 != '<' || op2 != '<') { - g_logger().warn("Invalid bit shift string"); + static const std::regex pattern(R"(^\s*(\d+)\s*<<\s*(\d+)\s*$)", std::regex_constants::ECMAScript | std::regex_constants::icase); + std::smatch match; + + if (!std::regex_match(bitShiftStr, match, pattern)) { + g_logger().warn("Invalid bit shift string format: '{}'", bitShiftStr); + return 0; + } + + int base = 0; + int shift = 0; + try { + base = std::stoi(match[1].str()); + shift = std::stoi(match[2].str()); + } catch (const std::exception &e) { + g_logger().warn("Error parsing bit shift string: '{}'", e.what()); + return 0; + } + + if (shift < 0 || shift >= 32) { + g_logger().warn("Shift value out of bounds: '{}'", shift); + return 0; } - return base << shift; + return static_cast<uint32_t>(base) << shift; } bool Argon2::verifyPassword(const std::string &password, const std::string &phash) const { + const std::regex re("\\$([A-Za-z0-9+/]+)\\$([A-Za-z0-9+/]+)"); std::smatch match; if (!std::regex_search(phash, match, re)) { g_logger().debug("No argon2 hash found in string"); return false; } - std::vector<uint8_t> salt = base64_decode(match[1]); - std::vector<uint8_t> hash = base64_decode(match[2]); + const std::vector<uint8_t> salt = base64_decode(match[1]); + const std::vector<uint8_t> hash = base64_decode(match[2]); // Hash the password std::vector<uint8_t> computed_hash(hash.size()); @@ -64,16 +74,17 @@ bool Argon2::verifyPassword(const std::string &password, const std::string &phas return computed_hash == hash; } -std::vector<uint8_t> Argon2::base64_decode(const std::string &input) const { +std::vector<uint8_t> Argon2::base64_decode(const std::string &input) { + const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; std::vector<uint8_t> ret; int i = 0; uint32_t val = 0; - for (char c : input) { + for (const char c : input) { if (isspace(c) || c == '=') { continue; } - size_t pos = base64_chars.find(c); + const size_t pos = base64_chars.find(c); if (pos == std::string::npos) { g_logger().warn("Invalid character in base64 string"); } else if (pos > std::numeric_limits<uint32_t>::max()) { @@ -83,9 +94,9 @@ std::vector<uint8_t> Argon2::base64_decode(const std::string &input) const { } if (++i % 4 == 0) { - ret.push_back((val >> 16) & 0xFF); - ret.push_back((val >> 8) & 0xFF); - ret.push_back(val & 0xFF); + ret.emplace_back((val >> 16) & 0xFF); + ret.emplace_back((val >> 8) & 0xFF); + ret.emplace_back(val & 0xFF); } } @@ -94,11 +105,11 @@ std::vector<uint8_t> Argon2::base64_decode(const std::string &input) const { g_logger().warn("Invalid length for base64 string"); break; case 2: - ret.push_back((val >> 4) & 0xFF); + ret.emplace_back((val >> 4) & 0xFF); break; case 3: - ret.push_back((val >> 10) & 0xFF); - ret.push_back((val >> 2) & 0xFF); + ret.emplace_back((val >> 10) & 0xFF); + ret.emplace_back((val >> 2) & 0xFF); break; default: g_logger().warn("Unexpected remainder when dividing string length by 4"); diff --git a/src/security/argon.hpp b/src/security/argon.hpp index ea09dcffc..839ce02a4 100644 --- a/src/security/argon.hpp +++ b/src/security/argon.hpp @@ -25,12 +25,12 @@ class Argon2 { private: uint32_t parseBitShift(const std::string &bitShiftStr) const; bool verifyPassword(const std::string &password, const std::string &phash) const; - std::vector<uint8_t> base64_decode(const std::string &input) const; + static std::vector<uint8_t> base64_decode(const std::string &input); static const std::regex re; static const std::string base64_chars; std::string m_const_str; - uint32_t m_cost; - uint32_t t_cost; - uint32_t parallelism; + uint32_t m_cost {}; + uint32_t t_cost {}; + uint32_t parallelism {}; }; diff --git a/src/security/rsa.cpp b/src/security/rsa.cpp index fc28d931f..18e1f6e83 100644 --- a/src/security/rsa.cpp +++ b/src/security/rsa.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "security/rsa.hpp" #include "lib/di/container.hpp" -#include "security/rsa.hpp" RSA::RSA(Logger &logger) : logger(logger) { @@ -28,8 +27,8 @@ RSA &RSA::getInstance() { } void RSA::start() { - const char* p("14299623962416399520070177382898895550795403345466153217470516082934737582776038882967213386204600674145392845853859217990626450972452084065728686565928113"); - const char* q("7630979195970404721891201847792002125535401292779123937207447574596692788513647179235335529307251350570728407373705564708871762033017096809910315212884101"); + const auto p("14299623962416399520070177382898895550795403345466153217470516082934737582776038882967213386204600674145392845853859217990626450972452084065728686565928113"); + const auto q("7630979195970404721891201847792002125535401292779123937207447574596692788513647179235335529307251350570728407373705564708871762033017096809910315212884101"); try { if (!loadPEM("key.pem")) { // file doesn't exist - switch to base10-hardcoded keys @@ -97,8 +96,9 @@ void RSA::decrypt(char* msg) const { // m = c^d mod n mpz_powm(m, c, d, n); - size_t count = (mpz_sizeinbase(m, 2) + 7) / 8; - memset(msg, 0, 128 - count); + const size_t count = (mpz_sizeinbase(m, 2) + 7) / 8; + std::fill(msg, msg + (128 - count), 0); + mpz_export(msg + (128 - count), nullptr, 1, 1, 0, 0, m); mpz_clear(c); @@ -109,13 +109,17 @@ std::string RSA::base64Decrypt(const std::string &input) const { auto posOfCharacter = [](const uint8_t chr) -> uint16_t { if (chr >= 'A' && chr <= 'Z') { return chr - 'A'; - } else if (chr >= 'a' && chr <= 'z') { + } + if (chr >= 'a' && chr <= 'z') { return chr - 'a' + ('Z' - 'A') + 1; - } else if (chr >= '0' && chr <= '9') { + } + if (chr >= '0' && chr <= '9') { return chr - '0' + ('Z' - 'A') + ('z' - 'a') + 2; - } else if (chr == '+' || chr == '-') { + } + if (chr == '+' || chr == '-') { return 62; - } else if (chr == '/' || chr == '_') { + } + if (chr == '/' || chr == '_') { return 63; } g_logger().error("[RSA::base64Decrypt] - Invalid base6409"); @@ -123,19 +127,19 @@ std::string RSA::base64Decrypt(const std::string &input) const { }; if (input.empty()) { - return std::string(); + return {}; } - size_t length = input.length(); + const size_t length = input.length(); size_t pos = 0; std::string output; output.reserve(length / 4 * 3); while (pos < length) { - uint16_t pos1 = posOfCharacter(input[pos + 1]); + const uint16_t pos1 = posOfCharacter(input[pos + 1]); output.push_back(static_cast<std::string::value_type>(((posOfCharacter(input[pos])) << 2) + ((pos1 & 0x30) >> 4))); if (input[pos + 2] != '=' && input[pos + 2] != '.') { - uint16_t pos2 = posOfCharacter(input[pos + 2]); + const uint16_t pos2 = posOfCharacter(input[pos + 2]); output.push_back(static_cast<std::string::value_type>(((pos1 & 0x0f) << 4) + ((pos2 & 0x3c) >> 2))); if (input[pos + 3] != '=' && input[pos + 3] != '.') { output.push_back(static_cast<std::string::value_type>(((pos2 & 0x03) << 6) + posOfCharacter(input[pos + 3]))); @@ -161,27 +165,27 @@ enum { }; uint16_t RSA::decodeLength(char*&pos) const { - uint8_t buffer[4] = { 0 }; - auto length = static_cast<uint16_t>(static_cast<uint8_t>(*pos++)); + std::array<uint8_t, 4> buffer = { 0 }; + uint16_t length = static_cast<uint8_t>(*pos++); if (length & 0x80) { - length &= 0x7F; - if (length > 4) { + uint8_t numLengthBytes = length & 0x7F; + if (numLengthBytes > 4) { g_logger().error("[RSA::loadPEM] - Invalid 'length'"); return 0; } - switch (length) { - case 4: - buffer[3] = static_cast<uint8_t>(*pos++); - case 3: - buffer[2] = static_cast<uint8_t>(*pos++); - case 2: - buffer[1] = static_cast<uint8_t>(*pos++); - case 1: - buffer[0] = static_cast<uint8_t>(*pos++); - default: - break; + // Copy 'numLengthBytes' bytes from 'pos' into 'buffer', starting at the correct position + std::ranges::copy_n(pos, numLengthBytes, buffer.begin() + (4 - numLengthBytes)); + pos += numLengthBytes; + // Reconstruct 'length' from 'buffer' (big-endian) + uint32_t tempLength = 0; + for (size_t i = 0; i < numLengthBytes; ++i) { + tempLength = (tempLength << 8) | buffer[4 - numLengthBytes + i]; + } + if (tempLength > UINT16_MAX) { + g_logger().error("[RSA::loadPEM] - Length too large"); + return 0; } - std::memcpy(&length, buffer, sizeof(length)); + length = static_cast<uint16_t>(tempLength); } return length; } @@ -189,7 +193,7 @@ uint16_t RSA::decodeLength(char*&pos) const { void RSA::readHexString(char*&pos, uint16_t length, std::string &output) const { output.reserve(static_cast<size_t>(length) * 2); for (uint16_t i = 0; i < length; ++i) { - auto hex = static_cast<uint8_t>(*pos++); + const auto hex = static_cast<uint8_t>(*pos++); output.push_back("0123456789ABCDEF"[(hex >> 4) & 15]); output.push_back("0123456789ABCDEF"[hex & 15]); } diff --git a/src/security/rsa.hpp b/src/security/rsa.hpp index a6de23b4e..a6575a551 100644 --- a/src/security/rsa.hpp +++ b/src/security/rsa.hpp @@ -13,7 +13,7 @@ class Logger; class RSA { public: - RSA(Logger &logger); + explicit RSA(Logger &logger); ~RSA(); // Singleton - ensures we don't accidentally copy it @@ -34,8 +34,8 @@ class RSA { private: Logger &logger; - mpz_t n; - mpz_t d; + mpz_t n {}; + mpz_t d {}; }; constexpr auto g_RSA = RSA::getInstance; diff --git a/src/server/network/connection/connection.cpp b/src/server/network/connection/connection.cpp index 307238442..76c954af4 100644 --- a/src/server/network/connection/connection.cpp +++ b/src/server/network/connection/connection.cpp @@ -7,15 +7,22 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "server/network/connection/connection.hpp" + +#include "config/configmanager.hpp" +#include "lib/di/container.hpp" #include "server/network/message/outputmessage.hpp" #include "server/network/protocol/protocol.hpp" #include "game/scheduling/dispatcher.hpp" +#include "server/network/message/networkmessage.hpp" #include "server/server.hpp" +#include "utils/tools.hpp" -Connection_ptr ConnectionManager::createConnection(asio::io_service &io_service, ConstServicePort_ptr servicePort) { +ConnectionManager &ConnectionManager::getInstance() { + return inject<ConnectionManager>(); +} + +Connection_ptr ConnectionManager::createConnection(asio::io_service &io_service, const ConstServicePort_ptr &servicePort) { auto connection = std::make_shared<Connection>(io_service, servicePort); connections.emplace(connection); return connection; @@ -47,7 +54,7 @@ Connection::Connection(asio::io_service &initIoService, ConstServicePort_ptr ini readTimer(initIoService), writeTimer(initIoService), service_port(std::move(initservicePort)), - socket(initIoService) { + socket(initIoService), m_msg() { } void Connection::close(bool force) { @@ -62,7 +69,7 @@ void Connection::close(bool force) { connectionState = CONNECTION_STATE_CLOSED; if (protocol) { - g_dispatcher().addEvent([protocol = protocol] { protocol->release(); }, "Protocol::release", std::chrono::milliseconds(CONNECTION_WRITE_TIMEOUT * 1000).count()); + g_dispatcher().addEvent([protocol = protocol] { protocol->release(); }, __FUNCTION__, std::chrono::milliseconds(CONNECTION_WRITE_TIMEOUT * 1000).count()); } if (messageQueue.empty() || force) { @@ -98,7 +105,7 @@ void Connection::closeSocket() { void Connection::accept(Protocol_ptr protocolPtr) { connectionState = CONNECTION_STATE_IDENTIFYING; protocol = std::move(protocolPtr); - g_dispatcher().addEvent([protocol = protocol] { protocol->onConnect(); }, "Protocol::onConnect", std::chrono::milliseconds(CONNECTION_WRITE_TIMEOUT * 1000).count()); + g_dispatcher().addEvent([protocol = protocol] { protocol->onConnect(); }, __FUNCTION__, std::chrono::milliseconds(CONNECTION_WRITE_TIMEOUT * 1000).count()); acceptInternal(false); } @@ -108,7 +115,7 @@ void Connection::acceptInternal(bool toggleParseHeader) { readTimer.async_wait([self = std::weak_ptr<Connection>(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) { + asio::async_read(socket, asio::buffer(m_msg.getBuffer(), HEADER_LENGTH), [self = shared_from_this(), toggleParseHeader](const std::error_code &error, std::size_t N) { if (toggleParseHeader) { self->parseHeader(error); } else { @@ -120,6 +127,7 @@ void Connection::acceptInternal(bool toggleParseHeader) { close(FORCE_CLOSE); } } + void Connection::parseProxyIdentification(const std::error_code &error) { std::scoped_lock lock(connectionLock); readTimer.cancel(); @@ -132,9 +140,9 @@ void Connection::parseProxyIdentification(const std::error_code &error) { return; } - uint8_t* msgBuffer = msg.getBuffer(); + uint8_t* msgBuffer = m_msg.getBuffer(); auto charData = static_cast<char*>(static_cast<void*>(msgBuffer)); - std::string serverName = g_configManager().getString(SERVER_NAME, __FUNCTION__) + "\n"; + std::string serverName = g_configManager().getString(SERVER_NAME) + "\n"; if (connectionState == CONNECTION_STATE_IDENTIFYING) { if (msgBuffer[1] == 0x00 || strncasecmp(charData, &serverName[0], 2) != 0) { // Probably not proxy identification so let's try standard parsing method @@ -150,7 +158,7 @@ void Connection::parseProxyIdentification(const std::error_code &error) { readTimer.async_wait([self = std::weak_ptr<Connection>(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); }); + asio::async_read(socket, asio::buffer(m_msg.getBuffer(), remainder), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parseProxyIdentification(error); }); } catch (const std::system_error &e) { g_logger().error("Connection::parseProxyIdentification] - error: {}", e.what()); close(FORCE_CLOSE); @@ -189,7 +197,7 @@ void Connection::parseHeader(const std::error_code &error) { } uint32_t timePassed = std::max<uint32_t>(1, (time(nullptr) - timeConnected) + 1); - if ((++packetsSent / timePassed) > static_cast<uint32_t>(g_configManager().getNumber(MAX_PACKETS_PER_SECOND, __FUNCTION__))) { + if ((++packetsSent / timePassed) > static_cast<uint32_t>(g_configManager().getNumber(MAX_PACKETS_PER_SECOND))) { g_logger().warn("[Connection::parseHeader] - {} disconnected for exceeding packet per second limit.", convertIPToString(getIP())); close(); return; @@ -200,7 +208,7 @@ void Connection::parseHeader(const std::error_code &error) { packetsSent = 0; } - uint16_t size = msg.getLengthHeader(); + uint16_t size = m_msg.getLengthHeader(); if (size == 0 || size > INPUTMESSAGE_MAXSIZE) { close(FORCE_CLOSE); return; @@ -211,9 +219,9 @@ void Connection::parseHeader(const std::error_code &error) { readTimer.async_wait([self = std::weak_ptr<Connection>(shared_from_this())](const std::error_code &error) { Connection::handleTimeout(self, error); }); // Read packet content - msg.setLength(size + HEADER_LENGTH); + m_msg.setLength(size + HEADER_LENGTH); // Read the remainder of proxy identification - asio::async_read(socket, asio::buffer(msg.getBodyBuffer(), size), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parsePacket(error); }); + asio::async_read(socket, asio::buffer(m_msg.getBodyBuffer(), size), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parsePacket(error); }); } catch (const std::system_error &e) { g_logger().error("[Connection::parseHeader] - error: {}", e.what()); close(FORCE_CLOSE); @@ -240,21 +248,21 @@ void Connection::parsePacket(const std::error_code &error) { if (!protocol) { // Check packet checksum uint32_t checksum; - if (int32_t len = msg.getLength() - msg.getBufferPosition() - CHECKSUM_LENGTH; + if (int32_t len = m_msg.getLength() - m_msg.getBufferPosition() - CHECKSUM_LENGTH; len > 0) { - checksum = adlerChecksum(msg.getBuffer() + msg.getBufferPosition() + CHECKSUM_LENGTH, len); + checksum = adlerChecksum(m_msg.getBuffer() + m_msg.getBufferPosition() + CHECKSUM_LENGTH, len); } else { checksum = 0; } - uint32_t recvChecksum = msg.get<uint32_t>(); + uint32_t recvChecksum = m_msg.get<uint32_t>(); if (recvChecksum != checksum) { // it might not have been the checksum, step back - msg.skipBytes(-CHECKSUM_LENGTH); + m_msg.skipBytes(-CHECKSUM_LENGTH); } // Game protocol has already been created at this point - protocol = service_port->make_protocol(recvChecksum == checksum, msg, shared_from_this()); + protocol = service_port->make_protocol(recvChecksum == checksum, m_msg, shared_from_this()); if (!protocol) { close(FORCE_CLOSE); return; @@ -262,15 +270,15 @@ void Connection::parsePacket(const std::error_code &error) { } else { // It is rather hard to detect if we have checksum or sequence method here so let's skip checksum check // it doesn't generate any problem because olders protocol don't use 'server sends first' feature - msg.get<uint32_t>(); + m_msg.get<uint32_t>(); // Skip protocol ID - msg.skipBytes(1); + m_msg.skipBytes(1); } - protocol->onRecvFirstMessage(msg); + protocol->onRecvFirstMessage(m_msg); } else { // Send the packet to the current protocol - skipReadingNextPacket = protocol->onRecvMessage(msg); + skipReadingNextPacket = protocol->onRecvMessage(m_msg); } try { @@ -279,7 +287,7 @@ void Connection::parsePacket(const std::error_code &error) { if (!skipReadingNextPacket) { // Wait to the next packet - 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); }); + asio::async_read(socket, asio::buffer(m_msg.getBuffer(), HEADER_LENGTH), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parseHeader(error); }); } } catch (const std::system_error &e) { g_logger().error("[Connection::parsePacket] - error: {}", e.what()); @@ -292,7 +300,7 @@ void Connection::resumeWork() { readTimer.async_wait([self = std::weak_ptr<Connection>(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); }); + asio::async_read(socket, asio::buffer(m_msg.getBuffer(), HEADER_LENGTH), [self = shared_from_this()](const std::error_code &error, std::size_t N) { self->parseHeader(error); }); } catch (const std::system_error &e) { g_logger().error("[Connection::resumeWork] - Exception in async_read: {}", e.what()); close(FORCE_CLOSE); diff --git a/src/server/network/connection/connection.hpp b/src/server/network/connection/connection.hpp index 76d9b1c18..139bfc730 100644 --- a/src/server/network/connection/connection.hpp +++ b/src/server/network/connection/connection.hpp @@ -10,7 +10,7 @@ #pragma once #include "declarations.hpp" -#include "lib/di/container.hpp" +// TODO: Remove circular includes (maybe shared_ptr?) #include "server/network/message/networkmessage.hpp" static constexpr int32_t CONNECTION_WRITE_TIMEOUT = 30; @@ -28,16 +28,15 @@ using Service_ptr = std::shared_ptr<ServiceBase>; class ServicePort; using ServicePort_ptr = std::shared_ptr<ServicePort>; using ConstServicePort_ptr = std::shared_ptr<const ServicePort>; +class NetworkMessage; class ConnectionManager { public: ConnectionManager() = default; - static ConnectionManager &getInstance() { - return inject<ConnectionManager>(); - } + static ConnectionManager &getInstance(); - Connection_ptr createConnection(asio::io_service &io_service, ConstServicePort_ptr servicePort); + Connection_ptr createConnection(asio::io_service &io_service, const ConstServicePort_ptr &servicePort); void releaseConnection(const Connection_ptr &connection); void closeAll(); @@ -86,8 +85,6 @@ class Connection : public std::enable_shared_from_this<Connection> { return socket; } - NetworkMessage msg; - asio::high_resolution_timer readTimer; asio::high_resolution_timer writeTimer; @@ -100,6 +97,8 @@ class Connection : public std::enable_shared_from_this<Connection> { asio::ip::tcp::socket socket; + NetworkMessage m_msg; + std::time_t timeConnected = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); uint32_t packetsSent = 0; uint32_t ip = 1; diff --git a/src/server/network/message/networkmessage.cpp b/src/server/network/message/networkmessage.cpp index 38acc0b48..0fb8b6332 100644 --- a/src/server/network/message/networkmessage.cpp +++ b/src/server/network/message/networkmessage.cpp @@ -7,29 +7,106 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "server/network/message/networkmessage.hpp" + #include "items/containers/container.hpp" int32_t NetworkMessage::decodeHeader() { - int32_t newSize = buffer[0] | buffer[1] << 8; - info.length = newSize; - return info.length; + // Ensure there are enough bytes to read the header (2 bytes) + if (!canRead(2)) { + g_logger().error("[{}] Not enough data to decode header. Current position: {}, Length: {}", __FUNCTION__, info.position, info.length); + return {}; + } + + // Log the current position and buffer content before decoding + g_logger().debug("[{}] Decoding header at position: {}", __FUNCTION__, info.position); + g_logger().debug("[{}] Buffer content: ", __FUNCTION__); + + // Log only up to 10 bytes of the buffer or until the end of the buffer + for (size_t i = 0; i < 10 && i < buffer.size(); ++i) { + g_logger().debug("[{}] Buffer[{}]: {}", __FUNCTION__, i, buffer[i]); + } + + // Check if there are enough bytes in the buffer for the header + if (info.position + 1 < buffer.size()) { + // Create a span view for safety + std::span<uint8_t> bufferSpan(buffer.data(), buffer.size()); + auto decodedHeader = bufferSpan[info.position] | (bufferSpan[info.position + 1] << 8); + // Update position after reading the header + info.position += sizeof(decodedHeader); + return decodedHeader; + } else { + g_logger().warn("Index out of bounds when trying to access buffer with position: {}", info.position); + } + + // Handle buffer overflow error here + g_logger().error("[{}] attempted to read beyond buffer limits at position: {}", __FUNCTION__, info.position); + return {}; } -std::string NetworkMessage::getString(uint16_t stringLen /* = 0*/) { +// Simply read functions for incoming message +uint8_t NetworkMessage::getByte(const std::source_location &location /*= std::source_location::current()*/) { + // Check if there is at least 1 byte to read + if (!canRead(1)) { + g_logger().error("[{}] Not enough data to read a byte. Current position: {}, Length: {}. Called line {}:{} in {}", __FUNCTION__, info.position, info.length, location.line(), location.column(), location.function_name()); + return {}; + } + + // Ensure that position is within bounds before decrementing + if (info.position == 0) { + g_logger().error("[{}] Position is at the beginning of the buffer. Cannot decrement. Called line {}:{} in {}", __FUNCTION__, location.line(), location.column(), location.function_name()); + return {}; + } + + try { + // Decrement position safely and return the byte + return buffer.at(info.position++); + } catch (const std::out_of_range &e) { + g_logger().error("[{}] Out of range error: {}. Position: {}, Buffer size: {}. Called line {}:{} in {}", __FUNCTION__, e.what(), info.position, buffer.size(), location.line(), location.column(), location.function_name()); + } + + return {}; +} + +uint8_t NetworkMessage::getPreviousByte() { + // Check if position is at the beginning of the buffer + if (info.position == 0) { + g_logger().error("[{}] Attempted to get previous byte at position 0", __FUNCTION__); + return {}; // Return default value (0) when at the start of the buffer + } + + try { + // Safely decrement position and access the previous byte using 'at()' + return buffer.at(--info.position); + } catch (const std::out_of_range &e) { + // Log the out-of-range exception if accessing outside buffer limits + g_logger().error("[{}] Out of range error: {}. Position: {}, Buffer size: {}", __FUNCTION__, e.what(), info.position, buffer.size()); + } + + return {}; +} + +std::string NetworkMessage::getString(uint16_t stringLen /* = 0*/, const std::source_location &location) { if (stringLen == 0) { stringLen = get<uint16_t>(); } if (!canRead(stringLen)) { - return std::string(); + g_logger().error("[{}] not enough data to read string of length: {}. Called line {}:{} in {}", __FUNCTION__, stringLen, location.line(), location.column(), location.function_name()); + return {}; } - char* v = reinterpret_cast<char*>(buffer) + info.position; // does not break strict aliasing + if (stringLen > NETWORKMESSAGE_MAXSIZE) { + g_logger().error("[{}] exceded NetworkMessage max size: {}, actually size: {}. Called line '{}:{}' in '{}'", __FUNCTION__, NETWORKMESSAGE_MAXSIZE, stringLen, location.line(), location.column(), location.function_name()); + return {}; + } + + g_logger().trace("[{}] called line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + + // Copy the string from the buffer + std::string result(buffer.begin() + info.position, buffer.begin() + info.position + stringLen); info.position += stringLen; - return std::string(v, stringLen); + return result; } Position NetworkMessage::getPosition() { @@ -40,29 +117,84 @@ Position NetworkMessage::getPosition() { return pos; } -void NetworkMessage::addString(const std::string &value, const std::string &function /* = ""*/) { +// Skips count unknown/unused bytes in an incoming message +void NetworkMessage::skipBytes(int16_t count) { + info.position += count; +} + +void NetworkMessage::addString(const std::string &value, const std::source_location &location /*= std::source_location::current()*/, const std::string &function /* = ""*/) { size_t stringLen = value.length(); - if (value.empty() && !function.empty()) { - g_logger().debug("[NetworkMessage::addString] - Value string is empty, function '{}'", function); + if (value.empty()) { + if (!function.empty()) { + g_logger().debug("[{}] attempted to add an empty string. Called line '{}'", __FUNCTION__, function); + } else { + g_logger().debug("[{}] attempted to add an empty string. Called line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + } + + // Add a 0 length string, the std::array will be filled with 0s + add<uint16_t>(uint16_t()); + return; } if (!canAdd(stringLen + 2)) { - g_logger().error("[NetworkMessage::addString] - NetworkMessage size is wrong: {}, function '{}'", stringLen, function); + if (!function.empty()) { + g_logger().error("[{}] NetworkMessage size is wrong: {}. Called line '{}'", __FUNCTION__, stringLen, function); + } else { + g_logger().error("[{}] NetworkMessage size is wrong: {}. Called line '{}:{}' in '{}'", __FUNCTION__, stringLen, location.line(), location.column(), location.function_name()); + } return; } if (stringLen > NETWORKMESSAGE_MAXSIZE) { - g_logger().error("[NetworkMessage::addString] - Exceded NetworkMessage max size: {}, actually size: {}, function '{}'", NETWORKMESSAGE_MAXSIZE, stringLen, function); + if (!function.empty()) { + g_logger().error("[{}] exceeded NetworkMessage max size: {}, actual size: {}. Called line '{}'", __FUNCTION__, NETWORKMESSAGE_MAXSIZE, stringLen, function); + } else { + g_logger().error("[{}] exceeded NetworkMessage max size: {}, actual size: {}. Called line '{}:{}' in '{}'", __FUNCTION__, NETWORKMESSAGE_MAXSIZE, stringLen, location.line(), location.column(), location.function_name()); + } return; } - add<uint16_t>(stringLen); - memcpy(buffer + info.position, value.c_str(), stringLen); + if (!function.empty()) { + g_logger().trace("[{}] called line '{}'", __FUNCTION__, function); + } else { + g_logger().trace("[{}] called line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + } + + auto len = static_cast<uint16_t>(stringLen); + add<uint16_t>(len); + // Using to copy the string into the buffer + std::ranges::copy(value, buffer.begin() + info.position); info.position += stringLen; info.length += stringLen; } -void NetworkMessage::addDouble(double value, uint8_t precision /* = 2*/) { +void NetworkMessage::addDouble(double value, uint8_t precision /*= 2*/) { addByte(precision); - add<uint32_t>((value * std::pow(static_cast<float>(10), precision)) + std::numeric_limits<int32_t>::max()); + add<uint32_t>((value * std::pow(static_cast<float>(SCALING_BASE), precision)) + std::numeric_limits<int32_t>::max()); +} + +double NetworkMessage::getDouble() { + // Retrieve the precision byte from the buffer + uint8_t precision = getByte(); + // Retrieve the scaled uint32_t value from the buffer + auto scaledValue = get<uint32_t>(); + // Convert the scaled value back to double using the precision factor + double adjustedValue = static_cast<double>(scaledValue) - static_cast<double>(std::numeric_limits<int32_t>::max()); + // Convert back to the original double value using the precision factor + return adjustedValue / std::pow(static_cast<double>(SCALING_BASE), precision); +} + +void NetworkMessage::addByte(uint8_t value, std::source_location location /*= std::source_location::current()*/) { + if (!canAdd(1)) { + g_logger().error("[{}] cannot add byte, buffer overflow. Called line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + return; + } + + g_logger().trace("[{}] called line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + try { + buffer.at(info.position++) = value; + info.length++; + } catch (const std::out_of_range &e) { + g_logger().error("[{}] buffer access out of range: {}. Called line '{}:{}' in '{}'", __FUNCTION__, e.what(), location.line(), location.column(), location.function_name()); + } } void NetworkMessage::addBytes(const char* bytes, size_t size) { @@ -79,19 +211,19 @@ void NetworkMessage::addBytes(const char* bytes, size_t size) { return; } - memcpy(buffer + info.position, bytes, size); + std::ranges::copy(std::span(bytes, size), buffer.begin() + info.position); info.position += size; info.length += size; } void NetworkMessage::addPaddingBytes(size_t n) { -#define canAdd(size) ((size + info.position) < NETWORKMESSAGE_MAXSIZE) if (!canAdd(n)) { + g_logger().error("[NetworkMessage::addPaddingBytes] - Cannot add padding bytes, buffer overflow"); return; } -#undef canAdd - memset(buffer + info.position, 0x33, n); + std::fill(buffer.begin() + info.position, buffer.begin() + info.position + n, 0x33); + info.position += n; info.length += n; } @@ -100,3 +232,74 @@ void NetworkMessage::addPosition(const Position &pos) { add<uint16_t>(pos.y); addByte(pos.z); } + +NetworkMessage::MsgSize_t NetworkMessage::getLength() const { + return info.length; +} + +void NetworkMessage::setLength(NetworkMessage::MsgSize_t newLength) { + info.length = newLength; +} + +NetworkMessage::MsgSize_t NetworkMessage::getBufferPosition() const { + return info.position; +} + +void NetworkMessage::setBufferPosition(NetworkMessage::MsgSize_t newPosition) { + info.position = newPosition; +} + +uint16_t NetworkMessage::getLengthHeader() const { + return static_cast<uint16_t>(buffer[0] | buffer[1] << 8); +} + +bool NetworkMessage::isOverrun() const { + return info.overrun; +} + +uint8_t* NetworkMessage::getBuffer() { + return buffer.data(); +} + +const uint8_t* NetworkMessage::getBuffer() const { + return buffer.data(); +} + +uint8_t* NetworkMessage::getBodyBuffer() { + info.position = 2; + // Return the pointer to the body of the buffer starting after the header + // Convert HEADER_LENGTH to uintptr_t to ensure safe pointer arithmetic with enum type + return buffer.data() + static_cast<std::uintptr_t>(HEADER_LENGTH); +} + +bool NetworkMessage::canAdd(size_t size) const { + return (size + info.position) < MAX_BODY_LENGTH; +} + +bool NetworkMessage::canRead(int32_t size) const { + return size <= (info.length - (info.position - INITIAL_BUFFER_POSITION)); +} + +void NetworkMessage::append(const NetworkMessage &other) { + size_t otherLength = other.getLength(); + size_t otherStartPos = NetworkMessage::INITIAL_BUFFER_POSITION; // Always start copying from the initial buffer position + + g_logger().debug("[{}] appending message, other Length = {}, current length = {}, current position = {}, other start position = {}", __FUNCTION__, otherLength, info.length, info.position, otherStartPos); + + // Ensure there is enough space in the buffer to append the new data + if (!canAdd(otherLength)) { + std::cerr << "Cannot append message: not enough space in buffer.\n"; + return; + } + + std::ranges::copy( + std::span<const unsigned char>(other.getBuffer() + otherStartPos, otherLength), + buffer.data() + info.position + ); + + // Update the buffer information + info.length += otherLength; + info.position += otherLength; + // Debugging output after appending + g_logger().debug("After append: New Length = {}, New Position = {}", info.length, info.position); +} diff --git a/src/server/network/message/networkmessage.hpp b/src/server/network/message/networkmessage.hpp index 02e192531..f738de850 100644 --- a/src/server/network/message/networkmessage.hpp +++ b/src/server/network/message/networkmessage.hpp @@ -27,62 +27,76 @@ class NetworkMessage { // 2 bytes for encrypted message size static constexpr MsgSize_t INITIAL_BUFFER_POSITION = 8; - NetworkMessage() = default; + int32_t decodeHeader(); void reset() { info = {}; } // simply read functions for incoming message - uint8_t getByte() { - if (!canRead(1)) { - return 0; - } + uint8_t getByte(const std::source_location &location = std::source_location::current()); - return buffer[info.position++]; - } - - uint8_t getPreviousByte() { - return buffer[--info.position]; - } + uint8_t getPreviousByte(); template <typename T> T get() { + static_assert(!std::is_same_v<T, double>, "Error: get<double>() is not allowed. Use getDouble() instead."); + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); if (!canRead(sizeof(T))) { - return 0; + return T(); } - T v; - memcpy(&v, buffer + info.position, sizeof(T)); + // Create a temporary byte array to store the value read from the buffer. + std::array<unsigned char, sizeof(T)> tempBuffer; + // Copy data from the buffer to the temporary array + std::span<const unsigned char> sourceSpan(buffer.data() + info.position, sizeof(T)); + std::ranges::copy(sourceSpan, tempBuffer.begin()); + // Update the read position in the buffer info.position += sizeof(T); - return v; + // Convert the byte array to type T using std::bit_cast and return the result + return std::bit_cast<T>(tempBuffer); } - std::string getString(uint16_t stringLen = 0); + std::string getString(uint16_t stringLen = 0, const std::source_location &location = std::source_location::current()); Position getPosition(); // skips count unknown/unused bytes in an incoming message - void skipBytes(int16_t count) { - info.position += count; - } + void skipBytes(int16_t count); // simply write functions for outgoing message - void addByte(uint8_t value) { - if (!canAdd(1)) { + void addByte(uint8_t value, std::source_location location = std::source_location::current()); + + template <typename T> + void add(T value, std::source_location location = std::source_location::current()) { + static_assert(!std::is_same_v<T, double>, "Error: get<double>() is not allowed. Use addDouble() instead."); + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); + + if (!canAdd(sizeof(T))) { + g_logger().error("Cannot add value of size '{}', buffer size: '{}' overflow. Called at line '{}:{}' in '{}'", sizeof(T), buffer.size(), location.line(), location.column(), location.function_name()); return; } - buffer[info.position++] = value; - info.length++; - } + if (info.position + sizeof(T) > buffer.size()) { + g_logger().error("Buffer overflow detected, current position: '{}', value size: '{}', buffer size: '{}'. Called at line '{}:{}' in '{}'", info.position, sizeof(T), buffer.size(), location.line(), location.column(), location.function_name()); + return; + } - template <typename T> - void add(T value) { - if (!canAdd(sizeof(T))) { + // Convert the value to an array of unsigned char using std::bit_cast + auto byteArray = std::bit_cast<std::array<unsigned char, sizeof(T)>>(value); + + // Create a span from the byte array + std::span<const unsigned char> byteSpan(byteArray); + + // Check if the size of byteSpan can fit into the buffer + if (byteSpan.size() > (buffer.size() - info.position)) { + g_logger().error("Buffer overflow during span copy. Source span size: {}, buffer available space: {}", byteSpan.size(), buffer.size() - info.position); return; } - memcpy(buffer + info.position, &value, sizeof(T)); + g_logger().trace("[{}] called at line '{}:{}' in '{}'", __FUNCTION__, location.line(), location.column(), location.function_name()); + + std::ranges::copy(byteSpan, buffer.begin() + info.position); + info.position += sizeof(T); info.length += sizeof(T); } @@ -94,74 +108,66 @@ class NetworkMessage { * 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. + * @param location An optional parameter that captures the location from which `addString` is invoked. + * This enhances logging by including the file name, line number, and function name + * in debug and error log messages. It 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. + * + * Using `std::source_location` automatically captures the caller context, 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. + * + * @param function An optional string parameter provided from Lua that specifies the name of the Lua + * function or context from which `addString` is called. When this parameter is not empty, + * it overrides the information captured by `std::source_location` in log messages. + * This allows for more precise and meaningful logging in scenarios where `addString` is invoked + * directly from Lua scripts, enabling developers to trace the origin of network messages + * back to specific Lua functions or contexts. + * + * This dual-parameter approach ensures flexibility: + * - When called from C++ without specifying `function`, `std::source_location` provides the necessary + * context for logging. + * - When called from Lua with a `function` name, the provided string offers clearer insight into + * the Lua-side invocation, enhancing the ability to debug and maintain Lua-C++ integrations. + * + * @note It is recommended to use the `function` parameter when invoking `addString` from Lua to ensure + * that log messages accurately reflect the Lua context. When invoking from C++, omitting the `function` + * parameter allows `std::source_location` to automatically capture the C++ context. */ - void addString(const std::string &value, const std::string &function = ""); + void addString(const std::string &value, const std::source_location &location = std::source_location::current(), const std::string &function = ""); void addDouble(double value, uint8_t precision = 2); + double getDouble(); // write functions for complex types void addPosition(const Position &pos); - MsgSize_t getLength() const { - return info.length; - } + MsgSize_t getLength() const; - void setLength(MsgSize_t newLength) { - info.length = newLength; - } + void setLength(MsgSize_t newLength); - MsgSize_t getBufferPosition() const { - return info.position; - } + MsgSize_t getBufferPosition() const; - void setBufferPosition(MsgSize_t newPosition) { - info.position = newPosition; - } + void setBufferPosition(MsgSize_t newPosition); - uint16_t getLengthHeader() const { - return static_cast<uint16_t>(buffer[0] | buffer[1] << 8); - } + uint16_t getLengthHeader() const; - int32_t decodeHeader(); + bool isOverrun() const; - bool isOverrun() const { - return info.overrun; - } + uint8_t* getBuffer(); - uint8_t* getBuffer() { - return buffer; - } + const uint8_t* getBuffer() const; - const uint8_t* getBuffer() const { - return buffer; - } + uint8_t* getBodyBuffer(); - uint8_t* getBodyBuffer() { - info.position = 2; - return buffer + HEADER_LENGTH; - } + bool canAdd(size_t size) const; -protected: - bool canAdd(size_t size) const { - return (size + info.position) < MAX_BODY_LENGTH; - } + bool canRead(int32_t size) const; - bool canRead(int32_t size) { - if ((info.position + size) > (info.length + 8) || size >= (NETWORKMESSAGE_MAXSIZE - info.position)) { - info.overrun = true; - return false; - } - return true; - } + void append(const NetworkMessage &other); +protected: struct NetworkMessageInfo { MsgSize_t length = 0; MsgSize_t position = INITIAL_BUFFER_POSITION; @@ -169,5 +175,5 @@ class NetworkMessage { }; NetworkMessageInfo info; - uint8_t buffer[NETWORKMESSAGE_MAXSIZE]; + std::array<uint8_t, NETWORKMESSAGE_MAXSIZE> buffer = {}; }; diff --git a/src/server/network/message/outputmessage.cpp b/src/server/network/message/outputmessage.cpp index efed7fe83..f0f2530fa 100644 --- a/src/server/network/message/outputmessage.cpp +++ b/src/server/network/message/outputmessage.cpp @@ -7,13 +7,19 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "server/network/message/outputmessage.hpp" -#include "outputmessage.hpp" +#include "lib/di/container.hpp" #include "server/network/protocol/protocol.hpp" #include "game/scheduling/dispatcher.hpp" +#include "utils/lockfree.hpp" -const std::chrono::milliseconds OUTPUTMESSAGE_AUTOSEND_DELAY { 10 }; +constexpr uint16_t OUTPUTMESSAGE_FREE_LIST_CAPACITY = 2048; +constexpr std::chrono::milliseconds OUTPUTMESSAGE_AUTOSEND_DELAY { 10 }; + +OutputMessagePool &OutputMessagePool::getInstance() { + return inject<OutputMessagePool>(); +} void OutputMessagePool::scheduleSendAll() { g_dispatcher().scheduleEvent( @@ -23,7 +29,7 @@ void OutputMessagePool::scheduleSendAll() { void OutputMessagePool::sendAll() { // dispatcher thread - for (auto &protocol : bufferedProtocols) { + for (const auto &protocol : bufferedProtocols) { auto &msg = protocol->getCurrentBuffer(); if (msg) { protocol->send(std::move(msg)); @@ -35,7 +41,7 @@ void OutputMessagePool::sendAll() { } } -void OutputMessagePool::addProtocolToAutosend(Protocol_ptr protocol) { +void OutputMessagePool::addProtocolToAutosend(const Protocol_ptr &protocol) { // dispatcher thread if (bufferedProtocols.empty()) { scheduleSendAll(); @@ -45,7 +51,7 @@ void OutputMessagePool::addProtocolToAutosend(Protocol_ptr protocol) { void OutputMessagePool::removeProtocolFromAutosend(const Protocol_ptr &protocol) { // dispatcher thread - auto it = std::ranges::find(bufferedProtocols.begin(), bufferedProtocols.end(), protocol); + const auto it = std::ranges::find(bufferedProtocols, protocol); if (it != bufferedProtocols.end()) { *it = bufferedProtocols.back(); bufferedProtocols.pop_back(); @@ -53,5 +59,5 @@ void OutputMessagePool::removeProtocolFromAutosend(const Protocol_ptr &protocol) } OutputMessage_ptr OutputMessagePool::getOutputMessage() { - return std::make_shared<OutputMessage>(); + return std::allocate_shared<OutputMessage>(LockfreePoolingAllocator<OutputMessage, OUTPUTMESSAGE_FREE_LIST_CAPACITY>()); } diff --git a/src/server/network/message/outputmessage.hpp b/src/server/network/message/outputmessage.hpp index 1f590fbd2..291ceb335 100644 --- a/src/server/network/message/outputmessage.hpp +++ b/src/server/network/message/outputmessage.hpp @@ -11,7 +11,6 @@ #include "server/network/message/networkmessage.hpp" #include "server/network/connection/connection.hpp" -#include "utils/tools.hpp" class Protocol; @@ -24,7 +23,7 @@ class OutputMessage : public NetworkMessage { OutputMessage &operator=(const OutputMessage &) = delete; uint8_t* getOutputBuffer() { - return buffer + outputBufferStart; + return buffer.data() + outputBufferStart; } void writeMessageLength() { @@ -41,14 +40,18 @@ class OutputMessage : public NetworkMessage { void append(const NetworkMessage &msg) { auto msgLen = msg.getLength(); - memcpy(buffer + info.position, msg.getBuffer() + INITIAL_BUFFER_POSITION, msgLen); + std::span<const unsigned char> sourceSpan(msg.getBuffer() + INITIAL_BUFFER_POSITION, msgLen); + std::span<unsigned char> destSpan(buffer.data() + info.position, msgLen); + std::ranges::copy(sourceSpan, destSpan.begin()); info.length += msgLen; info.position += msgLen; } void append(const OutputMessage_ptr &msg) { auto msgLen = msg->getLength(); - memcpy(buffer + info.position, msg->getBuffer() + INITIAL_BUFFER_POSITION, msgLen); + std::span<const unsigned char> sourceSpan(msg->getBuffer() + INITIAL_BUFFER_POSITION, msgLen); + std::span<unsigned char> destSpan(buffer.data() + info.position, msgLen); + std::ranges::copy(sourceSpan, destSpan.begin()); info.length += msgLen; info.position += msgLen; } @@ -61,10 +64,20 @@ class OutputMessage : public NetworkMessage { return; } + // Ensure at runtime that outputBufferStart >= sizeof(T) assert(outputBufferStart >= sizeof(T)); + // Move the buffer position back to make space for the header outputBufferStart -= sizeof(T); - memcpy(buffer + outputBufferStart, &addHeader, sizeof(T)); - // added header size to the message size + + static_assert(std::is_trivially_copyable_v<T>, "Type T must be trivially copyable"); + + // Convert the header to an array of unsigned char using std::bit_cast + auto byteArray = std::bit_cast<std::array<unsigned char, sizeof(T)>>(addHeader); + + std::span<const unsigned char> byteSpan(byteArray); + // Copy the bytes into the buffer + std::ranges::copy(byteSpan, buffer.begin() + outputBufferStart); + // Update the message size info.length += sizeof(T); } @@ -79,16 +92,14 @@ class OutputMessagePool { OutputMessagePool(const OutputMessagePool &) = delete; OutputMessagePool &operator=(const OutputMessagePool &) = delete; - static OutputMessagePool &getInstance() { - return inject<OutputMessagePool>(); - } + static OutputMessagePool &getInstance(); void sendAll(); void scheduleSendAll(); static OutputMessage_ptr getOutputMessage(); - void addProtocolToAutosend(Protocol_ptr protocol); + void addProtocolToAutosend(const Protocol_ptr &protocol); void removeProtocolFromAutosend(const Protocol_ptr &protocol); private: diff --git a/src/server/network/protocol/protocol.cpp b/src/server/network/protocol/protocol.cpp index 255899f2f..61eda4121 100644 --- a/src/server/network/protocol/protocol.cpp +++ b/src/server/network/protocol/protocol.cpp @@ -7,12 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "server/network/protocol/protocol.hpp" + +#include "config/configmanager.hpp" +#include "server/network/connection/connection.hpp" #include "server/network/message/outputmessage.hpp" #include "security/rsa.hpp" #include "game/scheduling/dispatcher.hpp" +#include "utils/tools.hpp" + +Protocol::Protocol(const Connection_ptr &initConnection) : + connectionPtr(initConnection) { } void Protocol::onSendMessage(const OutputMessage_ptr &msg) { if (!rawMessages) { @@ -44,20 +49,24 @@ bool Protocol::sendRecvMessageCallback(NetworkMessage &msg) { return false; } - g_dispatcher().addEvent([&msg, protocolWeak = std::weak_ptr<Protocol>(shared_from_this())]() { - if (auto protocol = protocolWeak.lock()) { - if (auto protocolConnection = protocol->getConnection()) { - protocol->parsePacket(msg); - protocolConnection->resumeWork(); + g_dispatcher().addEvent( + [&msg, protocolWeak = std::weak_ptr<Protocol>(shared_from_this())]() { + if (const auto &protocol = protocolWeak.lock()) { + if (const auto &protocolConnection = protocol->getConnection()) { + protocol->parsePacket(msg); + protocolConnection->resumeWork(); + } } - } }, "Protocol::sendRecvMessageCallback"); + }, + __FUNCTION__ + ); return true; } bool Protocol::onRecvMessage(NetworkMessage &msg) { if (checksumMethod != CHECKSUM_METHOD_NONE) { - uint32_t recvChecksum = msg.get<uint32_t>(); + const auto recvChecksum = msg.get<uint32_t>(); if (checksumMethod == CHECKSUM_METHOD_SEQUENCE) { if (recvChecksum == 0) { // checksum 0 indicate that the packet should be connection ping - 0x1C packet header @@ -65,8 +74,7 @@ bool Protocol::onRecvMessage(NetworkMessage &msg) { return false; } - uint32_t checksum; - checksum = ++clientSequenceNumber; + const uint32_t checksum = ++clientSequenceNumber; if (clientSequenceNumber >= 0x7FFFFFFF) { clientSequenceNumber = 0; } @@ -77,7 +85,7 @@ bool Protocol::onRecvMessage(NetworkMessage &msg) { } } else { uint32_t checksum; - if (int32_t len = msg.getLength() - msg.getBufferPosition(); + if (const int32_t len = msg.getLength() - msg.getBufferPosition(); len > 0) { checksum = adlerChecksum(msg.getBuffer() + msg.getBufferPosition(), len); } else { @@ -105,69 +113,101 @@ OutputMessage_ptr Protocol::getOutputBuffer(int32_t size) { return outputBuffer; } -void Protocol::XTEA_encrypt(OutputMessage &msg) const { - const uint32_t delta = 0x61C88647; +void Protocol::send(OutputMessage_ptr msg) const { + if (auto connection = getConnection()) { + connection->send(msg); + } +} - // The message must be a multiple of 8 - size_t paddingBytes = msg.getLength() & 7; - if (paddingBytes != 0) { - msg.addPaddingBytes(8 - paddingBytes); +void Protocol::disconnect() const { + if (const auto connection = getConnection()) { + connection->close(); } +} + +void Protocol::XTEA_transform(uint8_t* buffer, size_t messageLength, bool encrypt) const { + constexpr uint32_t delta = 0x61C88647; + size_t readPos = 0; + const std::array<uint32_t, 4> newKey = key; - uint8_t* buffer = msg.getOutputBuffer(); - auto messageLength = static_cast<int32_t>(msg.getLength()); - int32_t readPos = 0; - const std::array<uint32_t, 4> newKey = { key[0], key[1], key[2], key[3] }; - // TODO: refactor this for not use c-style - uint32_t precachedControlSum[32][2]; - uint32_t sum = 0; - for (int32_t i = 0; i < 32; ++i) { - precachedControlSum[i][0] = (sum + newKey[sum & 3]); - sum -= delta; - precachedControlSum[i][1] = (sum + newKey[(sum >> 11) & 3]); + std::array<std::array<uint32_t, 2>, 32> precachedControlSum; + uint32_t sum = encrypt ? 0 : 0xC6EF3720; + + // Precompute control sums + if (encrypt) { + for (size_t i = 0; i < 32; ++i) { + precachedControlSum[i][0] = sum + newKey[sum & 3]; + sum -= delta; + precachedControlSum[i][1] = sum + newKey[(sum >> 11) & 3]; + } + } else { + for (size_t i = 0; i < 32; ++i) { + precachedControlSum[i][0] = sum + newKey[(sum >> 11) & 3]; + sum += delta; + precachedControlSum[i][1] = sum + newKey[sum & 3]; + } } + while (readPos < messageLength) { - std::array<uint32_t, 2> vData = {}; - memcpy(vData.data(), buffer + readPos, 8); - for (int32_t i = 0; i < 32; ++i) { - vData[0] += ((vData[1] << 4 ^ vData[1] >> 5) + vData[1]) ^ precachedControlSum[i][0]; - vData[1] += ((vData[0] << 4 ^ vData[0] >> 5) + vData[0]) ^ precachedControlSum[i][1]; + std::array<uint8_t, 8> tempBuffer; + std::ranges::copy_n(buffer + readPos, 8, tempBuffer.begin()); + + // Convert bytes to uint32_t considering little-endian order + std::array<uint8_t, 4> bytes0; + std::array<uint8_t, 4> bytes1; + std::copy_n(tempBuffer.begin(), 4, bytes0.begin()); + std::copy_n(tempBuffer.begin() + 4, 4, bytes1.begin()); + + uint32_t vData0 = std::bit_cast<uint32_t>(bytes0); + uint32_t vData1 = std::bit_cast<uint32_t>(bytes1); + + if (encrypt) { + for (size_t i = 0; i < 32; ++i) { + vData0 += ((vData1 << 4 ^ vData1 >> 5) + vData1) ^ precachedControlSum[i][0]; + vData1 += ((vData0 << 4 ^ vData0 >> 5) + vData0) ^ precachedControlSum[i][1]; + } + } else { + for (size_t i = 0; i < 32; ++i) { + vData1 -= ((vData0 << 4 ^ vData0 >> 5) + vData0) ^ precachedControlSum[i][0]; + vData0 -= ((vData1 << 4 ^ vData1 >> 5) + vData1) ^ precachedControlSum[i][1]; + } } - memcpy(buffer + readPos, vData.data(), 8); + + // Convert vData back to bytes + bytes0 = std::bit_cast<std::array<uint8_t, 4>>(vData0); + bytes1 = std::bit_cast<std::array<uint8_t, 4>>(vData1); + + // Copy transformed bytes back to buffer + std::copy_n(bytes0.begin(), 4, buffer + readPos); + std::copy_n(bytes1.begin(), 4, buffer + readPos + 4); + readPos += 8; } } +void Protocol::XTEA_encrypt(OutputMessage &outputMessage) const { + // Ensure the message length is a multiple of 8 + size_t paddingBytes = outputMessage.getLength() % 8; + if (paddingBytes != 0) { + outputMessage.addPaddingBytes(8 - paddingBytes); + } + + uint8_t* buffer = outputMessage.getOutputBuffer(); + size_t messageLength = outputMessage.getLength(); + + XTEA_transform(buffer, messageLength, true); +} + bool Protocol::XTEA_decrypt(NetworkMessage &msg) const { uint16_t msgLength = msg.getLength() - (checksumMethod == CHECKSUM_METHOD_NONE ? 2 : 6); - if ((msgLength & 7) != 0) { + if ((msgLength % 8) != 0) { return false; } - const uint32_t delta = 0x61C88647; - uint8_t* buffer = msg.getBuffer() + msg.getBufferPosition(); - auto messageLength = static_cast<int32_t>(msgLength); - int32_t readPos = 0; - const std::array<uint32_t, 4> newKey = { key[0], key[1], key[2], key[3] }; - // TODO: refactor this for not use c-style - uint32_t precachedControlSum[32][2]; - uint32_t sum = 0xC6EF3720; - for (int32_t i = 0; i < 32; ++i) { - precachedControlSum[i][0] = (sum + newKey[(sum >> 11) & 3]); - sum += delta; - precachedControlSum[i][1] = (sum + newKey[sum & 3]); - } - while (readPos < messageLength) { - std::array<uint32_t, 2> vData = {}; - memcpy(vData.data(), buffer + readPos, 8); - for (int32_t i = 0; i < 32; ++i) { - vData[1] -= ((vData[0] << 4 ^ vData[0] >> 5) + vData[0]) ^ precachedControlSum[i][0]; - vData[0] -= ((vData[1] << 4 ^ vData[1] >> 5) + vData[1]) ^ precachedControlSum[i][1]; - } - memcpy(buffer + readPos, vData.data(), 8); - readPos += 8; - } + size_t messageLength = msgLength; + + XTEA_transform(buffer, messageLength, false); uint16_t innerLength = msg.get<uint16_t>(); if (std::cmp_greater(innerLength, msgLength - 2)) { @@ -183,37 +223,47 @@ bool Protocol::RSA_decrypt(NetworkMessage &msg) { return false; } - auto charData = static_cast<char*>(static_cast<void*>(msg.getBuffer())); + const auto charData = static_cast<char*>(static_cast<void*>(msg.getBuffer())); // Does not break strict aliasing g_RSA().decrypt(charData + msg.getBufferPosition()); return (msg.getByte() == 0); } +bool Protocol::isConnectionExpired() const { + return connectionPtr.expired(); +} + +Connection_ptr Protocol::getConnection() const { + return connectionPtr.lock(); +} + uint32_t Protocol::getIP() const { - if (auto protocolConnection = getConnection()) { + if (const auto protocolConnection = getConnection()) { return protocolConnection->getIP(); } return 0; } -bool Protocol::compression(OutputMessage &msg) const { +bool Protocol::compression(OutputMessage &outputMessage) const { if (checksumMethod != CHECKSUM_METHOD_SEQUENCE) { return false; } - static const thread_local auto &compress = std::make_unique<ZStream>(); + static thread_local auto compress_ptr = std::make_unique<ZStream>(); + static const auto &compress = compress_ptr; + if (!compress->stream) { return false; } - const auto outputMessageSize = msg.getLength(); + const auto outputMessageSize = outputMessage.getLength(); if (outputMessageSize > NETWORKMESSAGE_MAXSIZE) { g_logger().error("[NetworkMessage::compression] - Exceded NetworkMessage max size: {}, actually size: {}", NETWORKMESSAGE_MAXSIZE, outputMessageSize); return false; } - compress->stream->next_in = msg.getOutputBuffer(); + compress->stream->next_in = outputMessage.getOutputBuffer(); compress->stream->avail_in = outputMessageSize; compress->stream->next_out = reinterpret_cast<Bytef*>(compress->buffer.data()); compress->stream->avail_out = NETWORKMESSAGE_MAXSIZE; @@ -230,8 +280,25 @@ bool Protocol::compression(OutputMessage &msg) const { return false; } - msg.reset(); - msg.addBytes(compress->buffer.data(), totalSize); + outputMessage.reset(); + outputMessage.addBytes(compress->buffer.data(), totalSize); return true; } + +Protocol::ZStream::ZStream() noexcept { + const int32_t compressionLevel = g_configManager().getNumber(COMPRESSION_LEVEL); + if (compressionLevel <= 0) { + return; + } + + stream = std::make_unique<z_stream>(); + stream->zalloc = nullptr; + stream->zfree = nullptr; + stream->opaque = nullptr; + + if (deflateInit2(stream.get(), compressionLevel, Z_DEFLATED, -15, 9, Z_DEFAULT_STRATEGY) != Z_OK) { + stream.reset(); + g_logger().error("[Protocol::enableCompression()] - Zlib deflateInit2 error: {}", (stream->msg ? stream->msg : " unknown error")); + } +} diff --git a/src/server/network/protocol/protocol.hpp b/src/server/network/protocol/protocol.hpp index 54e3dcfd4..172c9afba 100644 --- a/src/server/network/protocol/protocol.hpp +++ b/src/server/network/protocol/protocol.hpp @@ -9,13 +9,19 @@ #pragma once -#include "server/network/connection/connection.hpp" -#include "config/configmanager.hpp" +#include "server/server_definitions.hpp" + +class OutputMessage; +using OutputMessage_ptr = std::shared_ptr<OutputMessage>; +class Connection; +using Connection_ptr = std::shared_ptr<Connection>; +using ConnectionWeak_ptr = std::weak_ptr<Connection>; + +class NetworkMessage; class Protocol : public std::enable_shared_from_this<Protocol> { public: - explicit Protocol(Connection_ptr initConnection) : - connectionPtr(initConnection) { } + explicit Protocol(const Connection_ptr &initConnection); virtual ~Protocol() = default; @@ -31,13 +37,9 @@ class Protocol : public std::enable_shared_from_this<Protocol> { virtual void onRecvFirstMessage(NetworkMessage &msg) = 0; virtual void onConnect() { } - bool isConnectionExpired() const { - return connectionPtr.expired(); - } + bool isConnectionExpired() const; - Connection_ptr getConnection() const { - return connectionPtr.lock(); - } + Connection_ptr getConnection() const; uint32_t getIP() const; @@ -48,26 +50,18 @@ class Protocol : public std::enable_shared_from_this<Protocol> { return outputBuffer; } - void send(OutputMessage_ptr msg) const { - if (auto connection = getConnection(); - connection != nullptr) { - connection->send(msg); - } - } + void send(OutputMessage_ptr msg) const; protected: - void disconnect() const { - if (auto connection = getConnection()) { - connection->close(); - } - } + void disconnect() const; void enableXTEAEncryption() { encryptionEnabled = true; } void setXTEAKey(const uint32_t* newKey) { - memcpy(this->key.data(), newKey, sizeof(*newKey) * 4); + std::ranges::copy(newKey, newKey + 4, this->key.begin()); } + void setChecksumMethod(ChecksumMethods_t method) { checksumMethod = method; } @@ -82,22 +76,7 @@ class Protocol : public std::enable_shared_from_this<Protocol> { private: struct ZStream { - ZStream() noexcept { - const int32_t compressionLevel = g_configManager().getNumber(COMPRESSION_LEVEL, __FUNCTION__); - if (compressionLevel <= 0) { - return; - } - - stream = std::make_unique<z_stream>(); - stream->zalloc = nullptr; - stream->zfree = nullptr; - stream->opaque = nullptr; - - if (deflateInit2(stream.get(), compressionLevel, Z_DEFLATED, -15, 9, Z_DEFAULT_STRATEGY) != Z_OK) { - stream.reset(); - g_logger().error("[Protocol::enableCompression()] - Zlib deflateInit2 error: {}", (stream->msg ? stream->msg : " unknown error")); - } - } + ZStream() noexcept; ~ZStream() { deflateEnd(stream.get()); @@ -107,6 +86,7 @@ class Protocol : public std::enable_shared_from_this<Protocol> { std::array<char, NETWORKMESSAGE_MAXSIZE> buffer {}; }; + void XTEA_transform(uint8_t* buffer, size_t messageLength, bool encrypt) const; void XTEA_encrypt(OutputMessage &msg) const; bool XTEA_decrypt(NetworkMessage &msg) const; bool compression(OutputMessage &msg) const; diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 133f0335f..99c8a9606 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -7,42 +7,52 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "server/network/protocol/protocolgame.hpp" -#include "creatures/players/management/ban.hpp" +#include "config/configmanager.hpp" #include "core.hpp" -#include "declarations.hpp" -#include "game/game.hpp" -#include "creatures/players/imbuements/imbuements.hpp" -#include "io/functions/iologindata_load_player.hpp" -#include "io/iobestiary.hpp" -#include "io/io_bosstiary.hpp" -#include "io/iologindata.hpp" -#include "io/iomarket.hpp" -#include "lua/modules/modules.hpp" +#include "creatures/appearance/mounts/mounts.hpp" +#include "creatures/combat/condition.hpp" +#include "creatures/combat/spells.hpp" +#include "creatures/interactions/chat.hpp" #include "creatures/monsters/monster.hpp" #include "creatures/monsters/monsters.hpp" -#include "game/modal_window/modal_window.hpp" -#include "server/network/message/outputmessage.hpp" -#include "creatures/players/player.hpp" -#include "creatures/players/wheel/player_wheel.hpp" +#include "creatures/npcs/npc.hpp" #include "creatures/players/achievement/player_achievement.hpp" #include "creatures/players/cyclopedia/player_badge.hpp" #include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_title.hpp" #include "creatures/players/grouping/familiars.hpp" -#include "server/network/protocol/protocolgame.hpp" -#include "game/scheduling/dispatcher.hpp" -#include "creatures/combat/spells.hpp" -#include "utils/tools.hpp" +#include "creatures/players/grouping/party.hpp" +#include "creatures/players/grouping/team_finder.hpp" +#include "creatures/players/highscore_category.hpp" +#include "creatures/players/imbuements/imbuements.hpp" +#include "creatures/players/management/ban.hpp" #include "creatures/players/management/waitlist.hpp" +#include "creatures/players/player.hpp" +#include "creatures/players/vip/player_vip.hpp" +#include "creatures/players/wheel/player_wheel.hpp" +#include "enums/player_icons.hpp" +#include "game/game.hpp" +#include "game/modal_window/modal_window.hpp" +#include "game/scheduling/dispatcher.hpp" +#include "io/functions/iologindata_load_player.hpp" +#include "io/io_bosstiary.hpp" +#include "io/iobestiary.hpp" +#include "io/iologindata.hpp" +#include "io/iomarket.hpp" +#include "io/ioprey.hpp" +#include "items/items_classification.hpp" #include "items/weapons/weapons.hpp" -#include "enums/object_category.hpp" -#include "enums/account_type.hpp" -#include "enums/account_group_type.hpp" -#include "enums/account_coins.hpp" +#include "lua/creature/creatureevent.hpp" +#include "lua/modules/modules.hpp" +#include "server/network/message/outputmessage.hpp" +#include "utils/tools.hpp" -#include "creatures/players/highscore_category.hpp" +#include "enums/account_coins.hpp" +#include "enums/account_group_type.hpp" +#include "enums/account_type.hpp" +#include "enums/object_category.hpp" +#include "enums/player_blessings.hpp" /* * NOTE: This namespace is used so that we can add functions without having to declare them in the ".hpp/.hpp" file @@ -72,7 +82,7 @@ namespace { return totalIterationCount; } - void addOutfitAndMountBytes(NetworkMessage &msg, std::shared_ptr<Item> item, const CustomAttribute* attribute, const std::string &head, const std::string &body, const std::string &legs, const std::string &feet, bool addAddon = false, bool addByte = false) { + void addOutfitAndMountBytes(NetworkMessage &msg, const std::shared_ptr<Item> &item, const CustomAttribute* attribute, const std::string &head, const std::string &body, const std::string &legs, const std::string &feet, bool addAddon = false, bool addByte = false) { auto look = attribute->getAttribute<uint16_t>(); msg.add<uint16_t>(look); if (look != 0) { @@ -117,7 +127,7 @@ namespace { * @param msg The network message to which the imbuement damage should be added. * @param player Pointer to the player for whom the imbuement damage should be handled. */ - void handleImbuementDamage(NetworkMessage &msg, std::shared_ptr<Player> player) { + void handleImbuementDamage(NetworkMessage &msg, const std::shared_ptr<Player> &player) { bool imbueDmg = false; std::shared_ptr<Item> weapon = player->getWeapon(); if (weapon) { @@ -155,7 +165,7 @@ namespace { * * @param[in] player The pointer to the player whose equipped items are considered. */ - void calculateAbsorbValues(std::shared_ptr<Player> player, NetworkMessage &msg, uint8_t &combats) { + void calculateAbsorbValues(const std::shared_ptr<Player> &player, NetworkMessage &msg, uint8_t &combats) { alignas(16) uint16_t damageModifiers[COMBAT_COUNT] = { 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000, 10000 }; for (int32_t slot = CONST_SLOT_FIRST; slot <= CONST_SLOT_LAST; ++slot) { @@ -163,7 +173,7 @@ namespace { continue; } - std::shared_ptr<Item> item = player->getInventoryItem(static_cast<Slots_t>(slot)); + const auto item = player->getInventoryItem(static_cast<Slots_t>(slot)); if (!item) { continue; } @@ -206,7 +216,7 @@ namespace { for (size_t i = 0; i < COMBAT_COUNT; ++i) { damageModifiers[i] -= 100 * player->getAbsorbPercent(indexToCombatType(i)); - if (g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { damageModifiers[i] -= player->wheel()->getResistance(indexToCombatType(i)); } @@ -241,17 +251,17 @@ namespace { g_logger().debug("Sendding category number '{}', category name '{}'", static_cast<uint8_t>(value), magic_enum::enum_name(value).data()); msg.addByte(static_cast<uint8_t>(value)); - msg.addString(toStartCaseWithSpace(magic_enum::enum_name(value).data()), "void sendContainerCategory - toStartCaseWithSpace(magic_enum::enum_name(value).data())"); + msg.addString(toStartCaseWithSpace(magic_enum::enum_name(value).data())); } } } // namespace -ProtocolGame::ProtocolGame(Connection_ptr initConnection) : +ProtocolGame::ProtocolGame(const Connection_ptr &initConnection) : Protocol(initConnection) { version = CLIENT_VERSION; } -void ProtocolGame::AddItem(NetworkMessage &msg, uint16_t id, uint8_t count, uint8_t tier) { +void ProtocolGame::AddItem(NetworkMessage &msg, uint16_t id, uint8_t count, uint8_t tier) const { const ItemType &it = Item::items[id]; msg.add<uint16_t>(it.id); @@ -310,7 +320,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, uint16_t id, uint8_t count, uint } } -void ProtocolGame::AddItem(NetworkMessage &msg, std::shared_ptr<Item> item) { +void ProtocolGame::AddItem(NetworkMessage &msg, const std::shared_ptr<Item> &item) { if (!item) { return; } @@ -348,7 +358,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, std::shared_ptr<Item> item) { if (container && containerType == 0 && container->getHoldingPlayer() == player) { uint32_t lootFlags = 0; uint32_t obtainFlags = 0; - for (auto [category, containerMap] : player->m_managedContainers) { + for (const auto &[category, containerMap] : player->m_managedContainers) { if (!isValidObjectCategory(category)) { continue; } @@ -371,7 +381,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, std::shared_ptr<Item> item) { // Quiver ammo count if (container && containerType == 0 && item->isQuiver() && player->getThing(CONST_SLOT_RIGHT) == item) { uint16_t ammoTotal = 0; - for (std::shared_ptr<Item> listItem : container->getItemList()) { + for (const std::shared_ptr<Item> &listItem : container->getItemList()) { if (player->getLevel() >= Item::items[listItem->getID()].minReqLevel) { ammoTotal += listItem->getItemCount(); } @@ -512,7 +522,7 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS if (g_game().getGameState() == GAME_STATE_CLOSED && !player->hasFlag(PlayerFlags_t::CanAlwaysLogin)) { g_game().removePlayerUniqueLogin(player); - auto maintainMessage = g_configManager().getString(MAINTAIN_MODE_MESSAGE, __FUNCTION__); + auto maintainMessage = g_configManager().getString(MAINTAIN_MODE_MESSAGE); if (!maintainMessage.empty()) { disconnectClient(maintainMessage); } else { @@ -521,14 +531,14 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS return; } - if (g_configManager().getBoolean(ONLY_PREMIUM_ACCOUNT, __FUNCTION__) && !player->isPremium() && (player->getGroup()->id < GROUP_TYPE_GAMEMASTER || player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER)) { + if (g_configManager().getBoolean(ONLY_PREMIUM_ACCOUNT) && !player->isPremium() && (player->getGroup()->id < GROUP_TYPE_GAMEMASTER || player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER)) { g_game().removePlayerUniqueLogin(player); disconnectClient("Your premium time for this account is out.\n\nTo play please buy additional premium time from our website"); return; } auto onlineCount = g_game().getPlayersByAccount(player->getAccount()).size(); - auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT, __FUNCTION__); + auto maxOnline = g_configManager().getNumber(MAX_PLAYERS_PER_ACCOUNT); if (player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER && onlineCount >= maxOnline) { g_game().removePlayerUniqueLogin(player); disconnectClient(fmt::format("You may only login with {} character{}\nof your account at the same time.", maxOnline, maxOnline > 1 ? "s" : "")); @@ -567,7 +577,7 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS auto output = OutputMessagePool::getOutputMessage(); output->addByte(0x16); - output->addString(ss.str(), "ProtocolGame::login - ss.str()"); + output->addString(ss.str()); output->addByte(retryTime); send(output); disconnect(); @@ -587,7 +597,7 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS const auto tile = g_game().map.getOrCreateTile(player->getLoginPosition()); // moving from a pz tile to a non-pz tile if (maxOnline > 1 && player->getAccountType() < ACCOUNT_TYPE_GAMEMASTER && !tile->hasFlag(TILESTATE_PROTECTIONZONE)) { - auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT, __FUNCTION__); + auto maxOutsizePZ = g_configManager().getNumber(MAX_PLAYERS_OUTSIDE_PZ_PER_ACCOUNT); auto accountPlayers = g_game().getPlayersByAccount(player->getAccount()); int countOutsizePZ = 0; for (const auto &accountPlayer : accountPlayers) { @@ -613,7 +623,7 @@ void ProtocolGame::login(const std::string &name, uint32_t accountId, OperatingS player->lastLoginSaved = std::max<time_t>(time(nullptr), player->lastLoginSaved + 1); acceptPackets = true; } else { - if (eventConnect != 0 || !g_configManager().getBoolean(REPLACE_KICK_ON_LOGIN, __FUNCTION__)) { + if (eventConnect != 0 || !g_configManager().getBoolean(REPLACE_KICK_ON_LOGIN)) { // Already trying to connect disconnectClient("You are already logged in."); return; @@ -706,11 +716,12 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { return; } - OperatingSystem_t operatingSystem = static_cast<OperatingSystem_t>(msg.get<uint16_t>()); + auto operatingSystem = static_cast<OperatingSystem_t>(msg.get<uint16_t>()); version = msg.get<uint16_t>(); // Protocol version + g_logger().trace("Protocol version: {}", version); // Old protocol support - oldProtocol = g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__) && version <= 1100; + oldProtocol = g_configManager().getBoolean(OLD_PROTOCOL) && version <= 1100; if (oldProtocol) { setChecksumMethod(CHECKSUM_METHOD_ADLER32); @@ -721,10 +732,21 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { clientVersion = static_cast<int32_t>(msg.get<uint32_t>()); if (!oldProtocol) { - msg.getString(); // Client version (String) + auto clientVersionString = msg.getString(); // Client version (String) + g_logger().trace("Client version: {}", clientVersionString); + if (version >= 1334) { + auto assetHashIdentifier = msg.getString(); // Assets hash identifier + g_logger().trace("Client asset hash identifier: {}", assetHashIdentifier); + } + } + + if (version < 1334) { + auto datRevision = msg.get<uint16_t>(); // Dat revision + g_logger().trace("Dat revision: {}", datRevision); } - msg.skipBytes(3); // U16 dat revision, U8 game preview state + auto gamePreviewState = msg.getByte(); // U8 game preview state + g_logger().trace("Game preview state: {}", gamePreviewState); if (!Protocol::RSA_decrypt(msg)) { g_logger().warn("[ProtocolGame::onRecvFirstMessage] - RSA Decrypt Failed"); @@ -736,13 +758,14 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { enableXTEAEncryption(); setXTEAKey(key.data()); - msg.skipBytes(1); // gamemaster flag + auto isGameMaster = static_cast<bool>(msg.getByte()); // gamemaster flag + g_logger().trace("Is Game Master: {}", isGameMaster); - std::string authType = g_configManager().getString(AUTH_TYPE, __FUNCTION__); + std::string authType = g_configManager().getString(AUTH_TYPE); std::ostringstream ss; std::string sessionKey = msg.getString(); std::string accountDescriptor = sessionKey; - std::string password = ""; + std::string password; if (authType != "session") { size_t pos = sessionKey.find('\n'); @@ -779,7 +802,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { foundPlayer->client->disconnectClient("You are already connected through another client. Please use only one client at a time!"); } - uint32_t timeStamp = msg.get<uint32_t>(); + auto timeStamp = msg.get<uint32_t>(); uint8_t randNumber = msg.getByte(); if (challengeTimestamp != timeStamp || challengeRandom != randNumber) { disconnect(); @@ -787,7 +810,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { } // OTCv8 version detection - uint16_t otcV8StringLength = msg.get<uint16_t>(); + auto otcV8StringLength = msg.get<uint16_t>(); if (otcV8StringLength == 5 && msg.getString(5) == "OTCv8") { otclientV8 = msg.get<uint16_t>(); // 253, 260, 261, ... } @@ -795,7 +818,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { if (!oldProtocol && clientVersion != CLIENT_VERSION) { ss.str(std::string()); ss << "Only clients with protocol " << CLIENT_VERSION_UPPER << "." << CLIENT_VERSION_LOWER; - if (g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__)) { + if (g_configManager().getBoolean(OLD_PROTOCOL)) { ss << " or 11.00"; } ss << " allowed!"; @@ -827,7 +850,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { } uint32_t accountId; - if (!IOLoginData::gameWorldAuthentication(accountDescriptor, password, characterName, accountId, oldProtocol)) { + if (!IOLoginData::gameWorldAuthentication(accountDescriptor, password, characterName, accountId, oldProtocol, getIP())) { ss.str(std::string()); if (authType == "session") { ss << "Your session has expired. Please log in again."; @@ -837,7 +860,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { auto output = OutputMessagePool::getOutputMessage(); output->addByte(0x14); - output->addString(ss.str(), "ProtocolGame::onRecvFirstMessage - ss.str()"); + output->addString(ss.str()); send(output); g_dispatcher().scheduleEvent( 1000, [self = getThis()] { self->disconnect(); }, "ProtocolGame::disconnect" @@ -845,7 +868,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage &msg) { return; } - g_dispatcher().addEvent([self = getThis(), characterName, accountId, operatingSystem] { self->login(characterName, accountId, operatingSystem); }, "ProtocolGame::login"); + g_dispatcher().addEvent([self = getThis(), characterName, accountId, operatingSystem] { self->login(characterName, accountId, operatingSystem); }, __FUNCTION__); } void ProtocolGame::onConnect() { @@ -873,13 +896,13 @@ void ProtocolGame::onConnect() { // To support 11.10-, not have problems with 11.11+ output->add<uint32_t>(adlerChecksum(output->getOutputBuffer() + sizeof(uint32_t), 8)); - send(std::move(output)); + send(output); } void ProtocolGame::disconnectClient(const std::string &message) const { auto output = OutputMessagePool::getOutputMessage(); output->addByte(0x14); - output->addString(message, "ProtocolGame::disconnectClient - message"); + output->addString(message); send(output); disconnect(); } @@ -929,7 +952,6 @@ void ProtocolGame::parsePacketDead(uint8_t recvbyte) { g_game().removePlayerUniqueLogin(player->getName()); } disconnect(); - IOLoginData::updateOnlineStatus(player->getGUID(), false); return; } @@ -970,7 +992,7 @@ void ProtocolGame::addBless() { player->checkAndShowBlessingMessage(); } -void ProtocolGame::parsePacketFromDispatcher(NetworkMessage msg, uint8_t recvbyte) { +void ProtocolGame::parsePacketFromDispatcher(NetworkMessage &msg, uint8_t recvbyte) { if (!acceptPackets || g_game().getGameState() == GAME_STATE_SHUTDOWN) { return; } @@ -1303,7 +1325,7 @@ void ProtocolGame::parsePacketFromDispatcher(NetworkMessage msg, uint8_t recvbyt parseWheelGemAction(msg); break; case 0xE8: - parseDebugAssert(msg); + parseOfferDescription(msg); break; case 0xEB: parsePreyAction(msg); @@ -1366,12 +1388,12 @@ void ProtocolGame::parseHotkeyEquip(NetworkMessage &msg) { return; } - uint16_t itemId = msg.get<uint16_t>(); - uint8_t tier = msg.get<uint8_t>(); + auto itemId = msg.get<uint16_t>(); + auto tier = msg.get<uint8_t>(); g_game().playerEquipItem(player->getID(), itemId, Item::items[itemId].upgradeClassification > 0, tier); } -void ProtocolGame::GetTileDescription(std::shared_ptr<Tile> tile, NetworkMessage &msg) { +void ProtocolGame::GetTileDescription(const std::shared_ptr<Tile> &tile, NetworkMessage &msg) { if (oldProtocol) { msg.add<uint16_t>(0x00); // Env effects } @@ -1402,8 +1424,7 @@ void ProtocolGame::GetTileDescription(std::shared_ptr<Tile> tile, NetworkMessage const CreatureVector* creatures = tile->getCreatures(); if (creatures) { bool playerAdded = false; - for (auto it = creatures->rbegin(); it != creatures->rend(); ++it) { - std::shared_ptr<Creature> creature = *it; + for (auto creature : std::ranges::reverse_view(*creatures)) { if (!player->canSeeCreature(creature)) { continue; } @@ -1527,7 +1548,7 @@ void ProtocolGame::checkCreatureAsKnown(uint32_t id, bool &known, uint32_t &remo } } -bool ProtocolGame::canSee(std::shared_ptr<Creature> c) const { +bool ProtocolGame::canSee(const std::shared_ptr<Creature> &c) const { if (!c || !player || c->isRemoved()) { return false; } @@ -1580,12 +1601,12 @@ void ProtocolGame::parseChannelExclude(NetworkMessage &msg) { } void ProtocolGame::parseOpenChannel(NetworkMessage &msg) { - uint16_t channelId = msg.get<uint16_t>(); + auto channelId = msg.get<uint16_t>(); g_game().playerOpenChannel(player->getID(), channelId); } void ProtocolGame::parseCloseChannel(NetworkMessage &msg) { - uint16_t channelId = msg.get<uint16_t>(); + auto channelId = msg.get<uint16_t>(); g_game().playerCloseChannel(player->getID(), channelId); } @@ -1647,7 +1668,7 @@ void ProtocolGame::parseSetOutfit(NetworkMessage &msg) { } uint16_t startBufferPosition = msg.getBufferPosition(); - Module* outfitModule = g_modules().getEventByRecvbyte(0xD3, false); + const auto &outfitModule = g_modules().getEventByRecvbyte(0xD3, false); if (outfitModule) { outfitModule->executeOnRecvbyte(player, msg); } @@ -1668,8 +1689,11 @@ void ProtocolGame::parseSetOutfit(NetworkMessage &msg) { newOutfit.lookMountBody = std::min<uint8_t>(132, msg.getByte()); newOutfit.lookMountLegs = std::min<uint8_t>(132, msg.getByte()); newOutfit.lookMountFeet = std::min<uint8_t>(132, msg.getByte()); + bool isMounted = msg.getByte(); newOutfit.lookFamiliarsType = msg.get<uint16_t>(); + g_logger().debug("Bool isMounted: {}", isMounted); } + uint8_t isMountRandomized = msg.getByte(); g_game().playerChangeOutfit(player->getID(), newOutfit, isMountRandomized); } else if (outfitType == 1) { @@ -1679,7 +1703,7 @@ void ProtocolGame::parseSetOutfit(NetworkMessage &msg) { msg.get<uint32_t>(); } else if (outfitType == 2) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); newOutfit.lookMount = msg.get<uint16_t>(); newOutfit.lookMountHead = std::min<uint8_t>(132, msg.getByte()); @@ -1700,7 +1724,7 @@ void ProtocolGame::parseToggleMount(NetworkMessage &msg) { void ProtocolGame::parseApplyImbuement(NetworkMessage &msg) { uint8_t slot = msg.getByte(); - uint32_t imbuementId = msg.get<uint32_t>(); + auto imbuementId = msg.get<uint32_t>(); bool protectionCharm = msg.getByte() != 0x00; g_game().playerApplyImbuement(player->getID(), imbuementId, slot, protectionCharm); } @@ -1716,7 +1740,7 @@ void ProtocolGame::parseCloseImbuementWindow(NetworkMessage &) { void ProtocolGame::parseUseItem(NetworkMessage &msg) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); uint8_t index = msg.getByte(); g_game().playerUseItem(player->getID(), pos, stackpos, index, itemId); @@ -1724,19 +1748,19 @@ void ProtocolGame::parseUseItem(NetworkMessage &msg) { void ProtocolGame::parseUseItemEx(NetworkMessage &msg) { Position fromPos = msg.getPosition(); - uint16_t fromItemId = msg.get<uint16_t>(); + auto fromItemId = msg.get<uint16_t>(); uint8_t fromStackPos = msg.getByte(); Position toPos = msg.getPosition(); - uint16_t toItemId = msg.get<uint16_t>(); + auto toItemId = msg.get<uint16_t>(); uint8_t toStackPos = msg.getByte(); g_game().playerUseItemEx(player->getID(), fromPos, fromStackPos, fromItemId, toPos, toStackPos, toItemId); } void ProtocolGame::parseUseWithCreature(NetworkMessage &msg) { Position fromPos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t fromStackPos = msg.getByte(); - uint32_t creatureId = msg.get<uint32_t>(); + auto creatureId = msg.get<uint32_t>(); g_game().playerUseWithCreature(player->getID(), fromPos, fromStackPos, creatureId, itemId); } @@ -1762,7 +1786,7 @@ void ProtocolGame::parseTeleport(NetworkMessage &msg) { void ProtocolGame::parseThrow(NetworkMessage &msg) { Position fromPos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t fromStackpos = msg.getByte(); Position toPos = msg.getPosition(); uint8_t count = msg.getByte(); @@ -1774,13 +1798,13 @@ void ProtocolGame::parseThrow(NetworkMessage &msg) { void ProtocolGame::parseLookAt(NetworkMessage &msg) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerLookAt(player->getID(), itemId, pos, stackpos); } void ProtocolGame::parseLookInBattleList(NetworkMessage &msg) { - uint32_t creatureId = msg.get<uint32_t>(); + auto creatureId = msg.get<uint32_t>(); g_game().playerLookInBattleList(player->getID(), creatureId); } @@ -1789,11 +1813,22 @@ void ProtocolGame::parseQuickLoot(NetworkMessage &msg) { return; } - Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); - uint8_t stackpos = msg.getByte(); - bool lootAllCorpses = msg.getByte(); - bool autoLoot = msg.getByte(); + uint8_t variant = msg.getByte(); + const Position pos = msg.getPosition(); + auto itemId = 0; + uint8_t stackpos = 0; + bool lootAllCorpses = true; + bool autoLoot = true; + + if (variant == 2) { + // Loot player nearby (13.40) + } else { + itemId = msg.get<uint16_t>(); + stackpos = msg.getByte(); + lootAllCorpses = variant == 1; + autoLoot = false; + } + g_logger().debug("[{}] variant {}, pos {}, itemId {}, stackPos {}", __FUNCTION__, variant, pos.toString(), itemId, stackpos); g_game().playerQuickLoot(player->getID(), pos, itemId, stackpos, nullptr, lootAllCorpses, autoLoot); } @@ -1804,32 +1839,32 @@ void ProtocolGame::parseLootContainer(NetworkMessage &msg) { uint8_t action = msg.getByte(); if (action == 0) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerSetManagedContainer(player->getID(), category, pos, itemId, stackpos, true); } else if (action == 1) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); g_game().playerClearManagedContainer(player->getID(), category, true); } else if (action == 2) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); g_game().playerOpenManagedContainer(player->getID(), category, true); } else if (action == 3) { bool useMainAsFallback = msg.getByte() == 1; g_game().playerSetQuickLootFallback(player->getID(), useMainAsFallback); } else if (action == 4) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_logger().debug("[{}] action {}, category {}, pos {}, itemId {}, stackPos {}", __FUNCTION__, action, static_cast<uint8_t>(category), pos.toString(), itemId, stackpos); g_game().playerSetManagedContainer(player->getID(), category, pos, itemId, stackpos, false); } else if (action == 5) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); g_game().playerClearManagedContainer(player->getID(), category, false); } else if (action == 6) { - ObjectCategory_t category = (ObjectCategory_t)msg.getByte(); + auto category = static_cast<ObjectCategory_t>(msg.getByte()); g_game().playerOpenManagedContainer(player->getID(), category, false); } @@ -1841,10 +1876,10 @@ void ProtocolGame::parseQuickLootBlackWhitelist(NetworkMessage &msg) { return; } - QuickLootFilter_t filter = (QuickLootFilter_t)msg.getByte(); + auto filter = (QuickLootFilter_t)msg.getByte(); std::vector<uint16_t> listedItems; - uint16_t size = msg.get<uint16_t>(); + auto size = msg.get<uint16_t>(); listedItems.reserve(size); for (int i = 0; i < size; i++) { @@ -1856,9 +1891,9 @@ void ProtocolGame::parseQuickLootBlackWhitelist(NetworkMessage &msg) { void ProtocolGame::parseSay(NetworkMessage &msg) { std::string receiver; - uint16_t channelId; + uint16_t channelId {}; - SpeakClasses type = static_cast<SpeakClasses>(msg.getByte()); + auto type = static_cast<SpeakClasses>(msg.getByte()); switch (type) { case TALKTYPE_PRIVATE_TO: case TALKTYPE_PRIVATE_RED_TO: @@ -1903,38 +1938,38 @@ void ProtocolGame::parseFightModes(NetworkMessage &msg) { } void ProtocolGame::parseAttack(NetworkMessage &msg) { - uint32_t creatureId = msg.get<uint32_t>(); + auto creatureId = msg.get<uint32_t>(); // msg.get<uint32_t>(); creatureId (same as above) g_game().playerSetAttackedCreature(player->getID(), creatureId); } void ProtocolGame::parseFollow(NetworkMessage &msg) { - uint32_t creatureId = msg.get<uint32_t>(); + auto creatureId = msg.get<uint32_t>(); // msg.get<uint32_t>(); creatureId (same as above) g_game().playerFollowCreature(player->getID(), creatureId); } void ProtocolGame::parseTextWindow(NetworkMessage &msg) { - uint32_t windowTextId = msg.get<uint32_t>(); + auto windowTextId = msg.get<uint32_t>(); const std::string newText = msg.getString(); g_game().playerWriteItem(player->getID(), windowTextId, newText); } void ProtocolGame::parseHouseWindow(NetworkMessage &msg) { uint8_t doorId = msg.getByte(); - uint32_t id = msg.get<uint32_t>(); + auto id = msg.get<uint32_t>(); const std::string text = msg.getString(); g_game().playerUpdateHouseWindow(player->getID(), doorId, id, text); } void ProtocolGame::parseLookInShop(NetworkMessage &msg) { - uint16_t id = msg.get<uint16_t>(); + auto id = msg.get<uint16_t>(); uint8_t count = msg.getByte(); g_game().playerLookInShop(player->getID(), id, count); } void ProtocolGame::parsePlayerBuyOnShop(NetworkMessage &msg) { - uint16_t id = msg.get<uint16_t>(); + auto id = msg.get<uint16_t>(); uint8_t count = msg.getByte(); uint16_t amount = oldProtocol ? static_cast<uint16_t>(msg.getByte()) : msg.get<uint16_t>(); bool ignoreCap = msg.getByte() != 0; @@ -1943,7 +1978,7 @@ void ProtocolGame::parsePlayerBuyOnShop(NetworkMessage &msg) { } void ProtocolGame::parsePlayerSellOnShop(NetworkMessage &msg) { - uint16_t id = msg.get<uint16_t>(); + auto id = msg.get<uint16_t>(); uint8_t count = std::max(msg.getByte(), (uint8_t)1); uint16_t amount = oldProtocol ? static_cast<uint16_t>(msg.getByte()) : msg.get<uint16_t>(); bool ignoreEquipped = msg.getByte() != 0; @@ -1953,9 +1988,9 @@ void ProtocolGame::parsePlayerSellOnShop(NetworkMessage &msg) { void ProtocolGame::parseRequestTrade(NetworkMessage &msg) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); - uint32_t playerId = msg.get<uint32_t>(); + auto playerId = msg.get<uint32_t>(); g_game().playerRequestTrade(player->getID(), pos, stackpos, playerId, itemId); } @@ -1971,13 +2006,13 @@ void ProtocolGame::parseAddVip(NetworkMessage &msg) { } void ProtocolGame::parseRemoveVip(NetworkMessage &msg) { - uint32_t guid = msg.get<uint32_t>(); + auto guid = msg.get<uint32_t>(); g_game().playerRequestRemoveVip(player->getID(), guid); } void ProtocolGame::parseEditVip(NetworkMessage &msg) { std::vector<uint8_t> vipGroupsId; - uint32_t guid = msg.get<uint32_t>(); + auto guid = msg.get<uint32_t>(); const std::string description = msg.getString(); uint32_t icon = std::min<uint32_t>(10, msg.get<uint32_t>()); // 10 is max icon in 9.63 bool notify = msg.getByte() != 0; @@ -2017,7 +2052,7 @@ void ProtocolGame::parseVipGroupActions(NetworkMessage &msg) { void ProtocolGame::parseRotateItem(NetworkMessage &msg) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); const auto &itemType = Item::items[itemId]; if (itemType.isPodium) { @@ -2029,7 +2064,7 @@ void ProtocolGame::parseRotateItem(NetworkMessage &msg) { void ProtocolGame::parseWrapableItem(NetworkMessage &msg) { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerWrapableItem(player->getID(), pos, stackpos, itemId); } @@ -2044,7 +2079,7 @@ void ProtocolGame::parseInspectionObject(NetworkMessage &msg) { Position pos = msg.getPosition(); g_game().playerInspectItem(player, pos); } else if (inspectionType == INSPECT_NPCTRADE || inspectionType == INSPECT_CYCLOPEDIA) { - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint16_t itemCount = msg.getByte(); g_game().playerInspectItem(player, itemId, static_cast<int8_t>(itemCount), (inspectionType == INSPECT_CYCLOPEDIA)); } @@ -2060,7 +2095,7 @@ void ProtocolGame::sendSessionEndInformation(SessionEndInformations information) disconnect(); } -void ProtocolGame::sendItemInspection(uint16_t itemId, uint8_t itemCount, std::shared_ptr<Item> item, bool cyclopedia) { +void ProtocolGame::sendItemInspection(uint16_t itemId, uint8_t itemCount, const std::shared_ptr<Item> &item, bool cyclopedia) { if (oldProtocol) { return; } @@ -2075,10 +2110,10 @@ void ProtocolGame::sendItemInspection(uint16_t itemId, uint8_t itemCount, std::s const ItemType &it = Item::items[itemId]; if (item) { - msg.addString(item->getName(), "ProtocolGame::sendItemInspection - item->getName()"); + msg.addString(item->getName()); AddItem(msg, item); } else { - msg.addString(it.name, "ProtocolGame::sendItemInspection - it.name"); + msg.addString(it.name); AddItem(msg, it.id, itemCount, 0); } msg.addByte(0); @@ -2086,8 +2121,8 @@ void ProtocolGame::sendItemInspection(uint16_t itemId, uint8_t itemCount, std::s auto descriptions = Item::getDescriptions(it, item); msg.addByte(descriptions.size()); for (const auto &description : descriptions) { - msg.addString(description.first, "ProtocolGame::sendItemInspection - description.first"); - msg.addString(description.second, "ProtocolGame::sendItemInspection - description.second"); + msg.addString(description.first); + msg.addString(description.second); } writeToOutputBuffer(msg); } @@ -2125,9 +2160,9 @@ void ProtocolGame::parseHighscores(NetworkMessage &msg) { return; } - HighscoreType_t type = static_cast<HighscoreType_t>(msg.getByte()); + auto type = static_cast<HighscoreType_t>(msg.getByte()); uint8_t category = msg.getByte(); - uint32_t vocation = msg.get<uint32_t>(); + auto vocation = msg.get<uint32_t>(); uint16_t page = 1; const std::string worldName = msg.getString(); msg.getByte(); // Game World Category @@ -2147,9 +2182,9 @@ void ProtocolGame::parseTaskHuntingAction(NetworkMessage &msg) { uint8_t slot = msg.getByte(); uint8_t action = msg.getByte(); bool upgrade = msg.getByte() != 0; - uint16_t raceId = msg.get<uint16_t>(); + auto raceId = msg.get<uint16_t>(); - if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(TASK_HUNTING_ENABLED)) { return; } @@ -2177,9 +2212,9 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact msg.addByte(0x00); // All data available msg.addByte(1); // Worlds - auto serverName = g_configManager().getString(SERVER_NAME, __FUNCTION__); - msg.addString(serverName, "ProtocolGame::sendHighscores - g_configManager().getString(SERVER_NAME)"); // First World - msg.addString(serverName, "ProtocolGame::sendHighscores - g_configManager().getString(SERVER_NAME)"); // Selected World + auto serverName = g_configManager().getString(SERVER_NAME); + msg.addString(serverName); // First World + msg.addString(serverName); // Selected World msg.addByte(0); // Game World Category: 0xFF(-1) - Selected World msg.addByte(0); // BattlEye World Type @@ -2189,7 +2224,7 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact msg.skipBytes(1); // Vocation Count msg.add<uint32_t>(0xFFFFFFFF); // All Vocations - hardcoded - msg.addString("(all)", "ProtocolGame::sendHighscores - (all)"); // All Vocations - hardcoded + msg.addString("(all)"); // All Vocations - hardcoded uint32_t selectedVocation = 0xFFFFFFFF; const auto vocationsMap = g_vocations().getVocations(); @@ -2197,7 +2232,7 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact const auto &vocation = it.second; if (vocation->getFromVocation() == static_cast<uint32_t>(vocation->getId())) { msg.add<uint32_t>(vocation->getFromVocation()); // Vocation Id - msg.addString(vocation->getVocName(), "ProtocolGame::sendHighscores - vocation.getVocName()"); // Vocation Name + msg.addString(vocation->getVocName()); // Vocation Name ++vocations; if (vocation->getFromVocation() == vocationId) { selectedVocation = vocationId; @@ -2213,7 +2248,7 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact for (const HighscoreCategory &category : highscoreCategories) { g_logger().debug("[ProtocolGame::sendHighscores] - Category: {} - Name: {}", category.m_id, category.m_name); msg.addByte(category.m_id); // Category Id - msg.addString(category.m_name, "ProtocolGame::sendHighscores - category.name"); // Category Name + msg.addString(category.m_name); // Category Name if (category.m_id == categoryId) { selectedCategory = categoryId; } @@ -2226,10 +2261,10 @@ void ProtocolGame::sendHighscores(const std::vector<HighscoreCharacter> &charact msg.addByte(characters.size()); // Character Count for (const HighscoreCharacter &character : characters) { msg.add<uint32_t>(character.rank); // Rank - msg.addString(character.name, "ProtocolGame::sendHighscores - character.name"); // Character Name - msg.addString(character.loyaltyTitle, "ProtocolGame::sendHighscores - character.loyaltyTitle"); // Character Loyalty Title + msg.addString(character.name); // Character Name + msg.addString(character.loyaltyTitle); // Character Loyalty Title msg.addByte(character.vocation); // Vocation Id - msg.addString(serverName, "ProtocolGame::sendHighscores - g_configManager().getString(SERVER_NAME)"); // World + msg.addString(serverName); // World msg.add<uint16_t>(character.level); // Level msg.addByte((player->getGUID() == character.id)); // Player Indicator Boolean msg.add<uint64_t>(character.points); // Points @@ -2250,7 +2285,7 @@ void ProtocolGame::parseConfigureShowOffSocket(NetworkMessage &msg) { } Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerConfigureShowOffSocket(player->getID(), pos, stackpos, itemId); } @@ -2281,7 +2316,7 @@ void ProtocolGame::parseBestiarysendRaces() { msg.add<uint16_t>(BESTY_RACE_LAST); std::map<uint16_t, std::string> mtype_list = g_game().getBestiaryList(); for (uint8_t i = BESTY_RACE_FIRST; i <= BESTY_RACE_LAST; i++) { - std::string BestClass = ""; + std::string BestClass; uint16_t count = 0; for (const auto &rit : mtype_list) { const auto mtype = g_monsters().getMonsterType(rit.second); @@ -2293,7 +2328,7 @@ void ProtocolGame::parseBestiarysendRaces() { BestClass = mtype->info.bestiaryClass; } } - msg.addString(BestClass, "ProtocolGame::parseBestiarysendRaces - BestClass"); + msg.addString(BestClass); msg.add<uint16_t>(count); uint16_t unlockedCount = g_iobestiary().getBestiaryRaceUnlocked(player, static_cast<BestiaryType_t>(i)); msg.add<uint16_t>(unlockedCount); @@ -2319,8 +2354,8 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { return; } - uint16_t raceId = msg.get<uint16_t>(); - std::string Class = ""; + auto raceId = msg.get<uint16_t>(); + std::string Class; std::shared_ptr<MonsterType> mtype = nullptr; std::map<uint16_t, std::string> mtype_list = g_game().getBestiaryList(); @@ -2345,9 +2380,13 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { NetworkMessage newmsg; newmsg.addByte(0xd7); newmsg.add<uint16_t>(raceId); - newmsg.addString(Class, "ProtocolGame::parseBestiarysendMonsterData - Class"); + newmsg.addString(Class); newmsg.addByte(currentLevel); + + newmsg.add<uint16_t>(0); // Animus Mastery Bonus + newmsg.add<uint16_t>(0); // Animus Mastery Points + newmsg.add<uint32_t>(killCounter); newmsg.add<uint16_t>(mtype->info.bestiaryFirstUnlock); @@ -2382,11 +2421,11 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { break; } - newmsg.add<uint16_t>(g_configManager().getBoolean(SHOW_LOOTS_IN_BESTIARY, __FUNCTION__) || shouldAddItem == true ? loot.id : 0); + newmsg.add<uint16_t>(g_configManager().getBoolean(SHOW_LOOTS_IN_BESTIARY) || shouldAddItem == true ? loot.id : 0); newmsg.addByte(difficult); newmsg.addByte(0); // 1 if special event - 0 if regular loot (?) - if (g_configManager().getBoolean(SHOW_LOOTS_IN_BESTIARY, __FUNCTION__) || shouldAddItem == true) { - newmsg.addString(loot.name, "ProtocolGame::parseBestiarysendMonsterData - loot.name"); + if (g_configManager().getBoolean(SHOW_LOOTS_IN_BESTIARY) || shouldAddItem == true) { + newmsg.addString(loot.name); newmsg.addByte(loot.countmax > 0 ? 0x1 : 0x0); } } @@ -2413,13 +2452,13 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { std::map<uint8_t, int16_t> elements = g_iobestiary().getMonsterElements(mtype); newmsg.addByte(elements.size()); - for (auto it = std::begin(elements), end = std::end(elements); it != end; it++) { - newmsg.addByte(it->first); - newmsg.add<uint16_t>(it->second); + for (auto &element : elements) { + newmsg.addByte(element.first); + newmsg.add<uint16_t>(element.second); } newmsg.add<uint16_t>(1); - newmsg.addString(mtype->info.bestiaryLocations, "ProtocolGame::parseBestiarysendMonsterData - mtype->info.bestiaryLocations"); + newmsg.addString(mtype->info.bestiaryLocations); } if (currentLevel > 3) { @@ -2438,7 +2477,7 @@ void ProtocolGame::parseBestiarysendMonsterData(NetworkMessage &msg) { } void ProtocolGame::parseCyclopediaMonsterTracker(NetworkMessage &msg) { - uint16_t monsterRaceId = msg.get<uint16_t>(); + auto monsterRaceId = msg.get<uint16_t>(); // Bosstiary tracker: 0 = disabled, 1 = enabled // Bestiary tracker: 1 = enabled auto trackerButtonType = msg.getByte(); @@ -2497,7 +2536,7 @@ void ProtocolGame::sendTeamFinderList() { uint8_t status = 0; uint16_t membersSize = 0; msg.add<uint32_t>(leader->getGUID()); - msg.addString(leader->getName(), "ProtocolGame::sendTeamFinderList - leader->getName()"); + msg.addString(leader->getName()); msg.add<uint16_t>(teamAssemble->minLevel); msg.add<uint16_t>(teamAssemble->maxLevel); msg.addByte(teamAssemble->vocationIDs); @@ -2603,7 +2642,7 @@ void ProtocolGame::sendLeaderTeamFinder(bool reset) { } msg.add<uint32_t>(leader->getGUID()); - msg.addString(leader->getName(), "ProtocolGame::sendLeaderTeamFinder - leader->getName()"); + msg.addString(leader->getName()); msg.add<uint16_t>(leader->getLevel()); msg.addByte(leader->getVocation()->getClientId()); msg.addByte(3); @@ -2614,7 +2653,7 @@ void ProtocolGame::sendLeaderTeamFinder(bool reset) { continue; } msg.add<uint32_t>(member->getGUID()); - msg.addString(member->getName(), "ProtocolGame::sendLeaderTeamFinder - member->getName()"); + msg.addString(member->getName()); msg.add<uint16_t>(member->getLevel()); msg.addByte(member->getVocation()->getClientId()); msg.addByte(memberPair.second); @@ -2693,16 +2732,16 @@ void ProtocolGame::parsePartyAnalyzerAction(NetworkMessage &msg) const { return; } - PartyAnalyzerAction_t action = static_cast<PartyAnalyzerAction_t>(msg.getByte()); + auto action = static_cast<PartyAnalyzerAction_t>(msg.getByte()); if (action == PARTYANALYZERACTION_RESET) { party->resetAnalyzer(); } else if (action == PARTYANALYZERACTION_PRICETYPE) { party->switchAnalyzerPriceType(); } else if (action == PARTYANALYZERACTION_PRICEVALUE) { - uint16_t size = msg.get<uint16_t>(); + auto size = msg.get<uint16_t>(); for (uint16_t i = 1; i <= size; i++) { - uint16_t itemId = msg.get<uint16_t>(); - uint64_t price = msg.get<uint64_t>(); + auto itemId = msg.get<uint16_t>(); + auto price = msg.get<uint64_t>(); player->setItemCustomPrice(itemId, price); } party->reloadPrices(); @@ -2726,7 +2765,7 @@ void ProtocolGame::parseLeaderFinderWindow(NetworkMessage &msg) { break; } case 2: { - uint32_t memberID = msg.get<uint32_t>(); + auto memberID = msg.get<uint32_t>(); std::shared_ptr<Player> member = g_game().getPlayerByGUID(memberID); if (!member) { return; @@ -2784,7 +2823,7 @@ void ProtocolGame::parseMemberFinderWindow(NetworkMessage &msg) { if (action == 0) { player->sendTeamFinderList(); } else { - uint32_t leaderID = msg.get<uint32_t>(); + auto leaderID = msg.get<uint32_t>(); std::shared_ptr<Player> leader = g_game().getPlayerByGUID(leaderID); if (!leader) { return; @@ -2815,9 +2854,9 @@ void ProtocolGame::parseSendBuyCharmRune(NetworkMessage &msg) { return; } - charmRune_t runeID = static_cast<charmRune_t>(msg.getByte()); + auto runeID = static_cast<charmRune_t>(msg.getByte()); uint8_t action = msg.getByte(); - uint16_t raceid = msg.get<uint16_t>(); + auto raceid = msg.get<uint16_t>(); g_iobestiary().sendBuyCharmRune(player, runeID, action, raceid); } @@ -2880,8 +2919,8 @@ void ProtocolGame::BestiarysendCharms() { msg.addByte(charmList.size()); for (const auto &c_type : charmList) { msg.addByte(c_type->id); - msg.addString(c_type->name, "ProtocolGame::BestiarysendCharms - c_type->name"); - msg.addString(c_type->description, "ProtocolGame::BestiarysendCharms - c_type->description"); + msg.addString(c_type->name); + msg.addString(c_type->description); msg.addByte(0); // Unknown msg.add<uint16_t>(c_type->points); if (g_iobestiary().hasCharmUnlockedRuneBit(c_type, player->getUnlockedRunesBit())) { @@ -2924,14 +2963,14 @@ void ProtocolGame::parseBestiarysendCreatures(NetworkMessage &msg) { std::ostringstream ss; std::map<uint16_t, std::string> race = {}; - std::string text = ""; + std::string text; uint8_t search = msg.getByte(); if (search == 1) { - uint16_t monsterAmount = msg.get<uint16_t>(); + auto monsterAmount = msg.get<uint16_t>(); std::map<uint16_t, std::string> mtype_list = g_game().getBestiaryList(); for (uint16_t monsterCount = 1; monsterCount <= monsterAmount; monsterCount++) { - uint16_t raceid = msg.get<uint16_t>(); + auto raceid = msg.get<uint16_t>(); if (player->getBestiaryKillCount(raceid) > 0) { auto it = mtype_list.find(raceid); if (it != mtype_list.end()) { @@ -2953,7 +2992,7 @@ void ProtocolGame::parseBestiarysendCreatures(NetworkMessage &msg) { } NetworkMessage newmsg; newmsg.addByte(0xd6); - newmsg.addString(text, "ProtocolGame::parseBestiarysendCreatures - text"); + newmsg.addString(text); newmsg.add<uint16_t>(race.size()); std::map<uint16_t, uint32_t> creaturesKilled = g_iobestiary().getBestiaryKillCountByMonsterIDs(player, race); @@ -2980,7 +3019,12 @@ void ProtocolGame::parseBestiarysendCreatures(NetworkMessage &msg) { } else { newmsg.addByte(0); } + + newmsg.add<uint16_t>(0); // Creature Animous Bonus } + + newmsg.add<uint16_t>(0); // Animus Mastery Points + writeToOutputBuffer(newmsg); } @@ -2997,22 +3041,13 @@ void ProtocolGame::parseBugReport(NetworkMessage &msg) { } void ProtocolGame::parseGreet(NetworkMessage &msg) { - uint32_t npcId = msg.get<uint32_t>(); + auto npcId = msg.get<uint32_t>(); g_game().playerNpcGreet(player->getID(), npcId); } -void ProtocolGame::parseDebugAssert(NetworkMessage &msg) { - if (debugAssertSent) { - return; - } - - debugAssertSent = true; - - std::string assertLine = msg.getString(); - std::string date = msg.getString(); - std::string description = msg.getString(); - std::string comment = msg.getString(); - g_game().playerDebugAssert(player->getID(), assertLine, date, description, comment); +void ProtocolGame::parseOfferDescription(NetworkMessage &msg) { + auto offerId = msg.get<uint32_t>(); + g_logger().debug("[{}] offer id: {}", __FUNCTION__, offerId); } void ProtocolGame::parsePreyAction(NetworkMessage &msg) { @@ -3029,7 +3064,7 @@ void ProtocolGame::parsePreyAction(NetworkMessage &msg) { raceId = msg.get<uint16_t>(); } - if (!g_configManager().getBoolean(PREY_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(PREY_ENABLED)) { return; } @@ -3051,22 +3086,22 @@ void ProtocolGame::parseSendResourceBalance() { } void ProtocolGame::parseInviteToParty(NetworkMessage &msg) { - uint32_t targetId = msg.get<uint32_t>(); + auto targetId = msg.get<uint32_t>(); g_game().playerInviteToParty(player->getID(), targetId); } void ProtocolGame::parseJoinParty(NetworkMessage &msg) { - uint32_t targetId = msg.get<uint32_t>(); + auto targetId = msg.get<uint32_t>(); g_game().playerJoinParty(player->getID(), targetId); } void ProtocolGame::parseRevokePartyInvite(NetworkMessage &msg) { - uint32_t targetId = msg.get<uint32_t>(); + auto targetId = msg.get<uint32_t>(); g_game().playerRevokePartyInvitation(player->getID(), targetId); } void ProtocolGame::parsePassPartyLeadership(NetworkMessage &msg) { - uint32_t targetId = msg.get<uint32_t>(); + auto targetId = msg.get<uint32_t>(); g_game().playerPassPartyLeadership(player->getID(), targetId); } @@ -3076,7 +3111,7 @@ void ProtocolGame::parseEnableSharedPartyExperience(NetworkMessage &msg) { } void ProtocolGame::parseQuestLine(NetworkMessage &msg) { - uint16_t questId = msg.get<uint16_t>(); + auto questId = msg.get<uint16_t>(); g_game().playerShowQuestLine(player->getID(), questId); } @@ -3092,8 +3127,8 @@ void ProtocolGame::parseMarketBrowse(NetworkMessage &msg) { } else if ((oldProtocol && browseId == MARKETREQUEST_OWN_HISTORY_OLD) || (!oldProtocol && browseId == MARKETREQUEST_OWN_HISTORY)) { g_game().playerBrowseMarketOwnHistory(player->getID()); } else if (!oldProtocol) { - uint16_t itemId = msg.get<uint16_t>(); - uint8_t tier = msg.get<uint8_t>(); + auto itemId = msg.get<uint16_t>(); + auto tier = msg.get<uint8_t>(); player->sendMarketEnter(player->getLastDepotId()); g_game().playerBrowseMarket(player->getID(), itemId, tier); } else { @@ -3103,13 +3138,13 @@ void ProtocolGame::parseMarketBrowse(NetworkMessage &msg) { void ProtocolGame::parseMarketCreateOffer(NetworkMessage &msg) { uint8_t type = msg.getByte(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t itemTier = 0; if (!oldProtocol && Item::items[itemId].upgradeClassification > 0) { itemTier = msg.getByte(); } - uint16_t amount = msg.get<uint16_t>(); + auto amount = msg.get<uint16_t>(); uint64_t price = oldProtocol ? static_cast<uint64_t>(msg.get<uint32_t>()) : msg.get<uint64_t>(); bool anonymous = (msg.getByte() != 0); if (amount > 0 && price > 0) { @@ -3118,8 +3153,8 @@ void ProtocolGame::parseMarketCreateOffer(NetworkMessage &msg) { } void ProtocolGame::parseMarketCancelOffer(NetworkMessage &msg) { - uint32_t timestamp = msg.get<uint32_t>(); - uint16_t counter = msg.get<uint16_t>(); + auto timestamp = msg.get<uint32_t>(); + auto counter = msg.get<uint16_t>(); if (counter > 0) { g_game().playerCancelMarketOffer(player->getID(), timestamp, counter); } @@ -3128,9 +3163,9 @@ void ProtocolGame::parseMarketCancelOffer(NetworkMessage &msg) { } void ProtocolGame::parseMarketAcceptOffer(NetworkMessage &msg) { - uint32_t timestamp = msg.get<uint32_t>(); - uint16_t counter = msg.get<uint16_t>(); - uint16_t amount = msg.get<uint16_t>(); + auto timestamp = msg.get<uint32_t>(); + auto counter = msg.get<uint16_t>(); + auto amount = msg.get<uint16_t>(); if (amount > 0 && counter > 0) { g_game().playerAcceptMarketOffer(player->getID(), timestamp, counter, amount); } @@ -3139,7 +3174,7 @@ void ProtocolGame::parseMarketAcceptOffer(NetworkMessage &msg) { } void ProtocolGame::parseModalWindowAnswer(NetworkMessage &msg) { - uint32_t id = msg.get<uint32_t>(); + auto id = msg.get<uint32_t>(); uint8_t button = msg.getByte(); uint8_t choice = msg.getByte(); g_game().playerAnswerModalWindow(player->getID(), id, button, choice); @@ -3151,12 +3186,12 @@ void ProtocolGame::parseRewardChestCollect(NetworkMessage &msg) { auto stackPosition = msg.getByte(); // Block collect reward - auto useCollect = g_configManager().getBoolean(REWARD_CHEST_COLLECT_ENABLED, __FUNCTION__); + auto useCollect = g_configManager().getBoolean(REWARD_CHEST_COLLECT_ENABLED); if (!useCollect) { return; } - auto maxCollectItems = g_configManager().getNumber(REWARD_CHEST_MAX_COLLECT_ITEMS, __FUNCTION__); + auto maxCollectItems = g_configManager().getNumber(REWARD_CHEST_MAX_COLLECT_ITEMS); g_game().playerRewardChestCollect(player->getID(), position, itemId, stackPosition, maxCollectItems); } @@ -3167,7 +3202,7 @@ void ProtocolGame::parseBrowseField(NetworkMessage &msg) { void ProtocolGame::parseSeekInContainer(NetworkMessage &msg) { uint8_t containerId = msg.getByte(); - uint16_t index = msg.get<uint16_t>(); + auto index = msg.get<uint16_t>(); auto primaryType = msg.getByte(); g_game().playerSeekInContainer(player->getID(), containerId, index, primaryType); } @@ -3176,7 +3211,7 @@ void ProtocolGame::parseSeekInContainer(NetworkMessage &msg) { void ProtocolGame::sendOpenPrivateChannel(const std::string &receiver) { NetworkMessage msg; msg.addByte(0xAD); - msg.addString(receiver, "ProtocolGame::sendOpenPrivateChannel - receiver"); + msg.addString(receiver); writeToOutputBuffer(msg); } @@ -3196,12 +3231,12 @@ void ProtocolGame::sendChannelEvent(uint16_t channelId, const std::string &playe NetworkMessage msg; msg.addByte(0xF3); msg.add<uint16_t>(channelId); - msg.addString(playerName, "ProtocolGame::sendChannelEvent - playerName"); + msg.addString(playerName); msg.addByte(channelEvent); writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit) { +void ProtocolGame::sendCreatureOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit) { if (!canSee(creature)) { return; } @@ -3226,7 +3261,7 @@ void ProtocolGame::sendCreatureOutfit(std::shared_ptr<Creature> creature, const writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureLight(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureLight(const std::shared_ptr<Creature> &creature) { if (!canSee(creature)) { return; } @@ -3236,7 +3271,7 @@ void ProtocolGame::sendCreatureLight(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::addCreatureIcon(NetworkMessage &msg, std::shared_ptr<Creature> creature) { +void ProtocolGame::addCreatureIcon(NetworkMessage &msg, const std::shared_ptr<Creature> &creature) { if (!creature || !player || oldProtocol) { return; } @@ -3253,7 +3288,7 @@ void ProtocolGame::addCreatureIcon(NetworkMessage &msg, std::shared_ptr<Creature } } -void ProtocolGame::sendCreatureIcon(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureIcon(const std::shared_ptr<Creature> &creature) { if (!creature || !player || oldProtocol) { return; } @@ -3285,7 +3320,7 @@ void ProtocolGame::sendTibiaTime(int32_t time) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureWalkthrough(std::shared_ptr<Creature> creature, bool walkthrough) { +void ProtocolGame::sendCreatureWalkthrough(const std::shared_ptr<Creature> &creature, bool walkthrough) { if (!canSee(creature)) { return; } @@ -3297,7 +3332,7 @@ void ProtocolGame::sendCreatureWalkthrough(std::shared_ptr<Creature> creature, b writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureShield(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureShield(const std::shared_ptr<Creature> &creature) { if (!canSee(creature)) { return; } @@ -3309,7 +3344,7 @@ void ProtocolGame::sendCreatureShield(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureEmblem(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureEmblem(const std::shared_ptr<Creature> &creature) { if (!creature || !canSee(creature) || oldProtocol) { return; } @@ -3331,7 +3366,7 @@ void ProtocolGame::sendCreatureEmblem(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureSkull(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureSkull(const std::shared_ptr<Creature> &creature) { if (g_game().getWorldType() != WORLD_TYPE_PVP) { return; } @@ -3347,7 +3382,7 @@ void ProtocolGame::sendCreatureSkull(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureType(std::shared_ptr<Creature> creature, uint8_t creatureType) { +void ProtocolGame::sendCreatureType(const std::shared_ptr<Creature> &creature, uint8_t creatureType) { NetworkMessage msg; msg.addByte(0x95); msg.add<uint32_t>(creature->getID()); @@ -3367,7 +3402,7 @@ void ProtocolGame::sendCreatureType(std::shared_ptr<Creature> creature, uint8_t writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureSquare(std::shared_ptr<Creature> creature, SquareColor_t color) { +void ProtocolGame::sendCreatureSquare(const std::shared_ptr<Creature> &creature, SquareColor_t color) { if (!canSee(creature)) { return; } @@ -3397,7 +3432,7 @@ void ProtocolGame::sendAddMarker(const Position &pos, uint8_t markType, const st msg.addPosition(pos); msg.addByte(markType); - msg.addString(desc, "ProtocolGame::sendAddMarker - desc"); + msg.addString(desc); writeToOutputBuffer(msg); } @@ -3422,13 +3457,13 @@ void ProtocolGame::sendCyclopediaCharacterBaseInformation() { msg.addByte(0xDA); msg.addByte(CYCLOPEDIA_CHARACTERINFO_BASEINFORMATION); msg.addByte(0x00); - msg.addString(player->getName(), "ProtocolGame::sendCyclopediaCharacterBaseInformation - player->getName()"); - msg.addString(player->getVocation()->getVocName(), "ProtocolGame::sendCyclopediaCharacterBaseInformation - player->getVocation()->getVocName()"); + msg.addString(player->getName()); + msg.addString(player->getVocation()->getVocName()); msg.add<uint16_t>(player->getLevel()); AddOutfit(msg, player->getDefaultOutfit(), false); msg.addByte(0x01); // Store summary & Character titles - msg.addString(player->title()->getCurrentTitleName(), "ProtocolGame::sendCyclopediaCharacterBaseInformation - player->title()->getCurrentTitleName()"); // character title + msg.addString(player->title()->getCurrentTitleName()); // character title writeToOutputBuffer(msg); } @@ -3479,10 +3514,7 @@ void ProtocolGame::sendCyclopediaCharacterGeneralStats() { for (uint8_t i = SKILL_FIRST; i < SKILL_CRITICAL_HIT_CHANCE; ++i) { static const uint8_t HardcodedSkillIds[] = { 11, 9, 8, 10, 7, 6, 13 }; - skills_t skill = static_cast<skills_t>(i); - if (!oldProtocol && (skill == SKILL_LIFE_LEECH_CHANCE || skill == SKILL_MANA_LEECH_CHANCE)) { - continue; - } + const auto skill = static_cast<skills_t>(i); msg.addByte(HardcodedSkillIds[i]); msg.add<uint16_t>(std::min<int32_t>(player->getSkillLevel(skill), std::numeric_limits<uint16_t>::max())); msg.add<uint16_t>(player->getBaseSkill(skill)); @@ -3516,10 +3548,10 @@ void ProtocolGame::sendCyclopediaCharacterCombatStats() { msg.addByte(CYCLOPEDIA_CHARACTERINFO_COMBATSTATS); msg.addByte(0x00); for (uint8_t i = SKILL_CRITICAL_HIT_CHANCE; i <= SKILL_LAST; ++i) { - if (!oldProtocol && (i == SKILL_LIFE_LEECH_CHANCE || i == SKILL_MANA_LEECH_CHANCE)) { + if (i == SKILL_LIFE_LEECH_CHANCE || i == SKILL_MANA_LEECH_CHANCE) { continue; } - skills_t skill = static_cast<skills_t>(i); + auto skill = static_cast<skills_t>(i); msg.add<uint16_t>(std::min<int32_t>(player->getSkillLevel(skill), std::numeric_limits<uint16_t>::max())); msg.add<uint16_t>(0); } @@ -3542,15 +3574,14 @@ void ProtocolGame::sendCyclopediaCharacterCombatStats() { msg.add<uint16_t>(static_cast<uint16_t>(player->getReflectFlat(COMBAT_PHYSICALDAMAGE))); uint8_t haveBlesses = 0; - uint8_t blessings = 8; - for (uint8_t i = 1; i < blessings; ++i) { - if (player->hasBlessing(i)) { + for (auto bless : magic_enum::enum_values<Blessings>()) { + if (player->hasBlessing(enumToValue(bless))) { ++haveBlesses; } } msg.addByte(haveBlesses); - msg.addByte(blessings); + msg.addByte(magic_enum::enum_count<Blessings>()); std::shared_ptr<Item> weapon = player->getWeapon(); if (weapon) { @@ -3623,7 +3654,7 @@ void ProtocolGame::sendCyclopediaCharacterCombatStats() { msg.add<uint16_t>(player->getArmor()); msg.add<uint16_t>(player->getDefense()); // Wheel of destiny mitigation - if (g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { msg.addDouble(player->getMitigation()); } else { msg.addDouble(0); @@ -3677,7 +3708,7 @@ void ProtocolGame::sendCyclopediaCharacterRecentDeaths(uint16_t page, uint16_t p msg.add<uint16_t>(entries.size()); for (const RecentDeathEntry &entry : entries) { msg.add<uint32_t>(entry.timestamp); - msg.addString(entry.cause, "ProtocolGame::sendCyclopediaCharacterRecentDeaths - entry.cause"); + msg.addString(entry.cause); } writeToOutputBuffer(msg); @@ -3697,14 +3728,14 @@ void ProtocolGame::sendCyclopediaCharacterRecentPvPKills(uint16_t page, uint16_t msg.add<uint16_t>(entries.size()); for (const RecentPvPKillEntry &entry : entries) { msg.add<uint32_t>(entry.timestamp); - msg.addString(entry.description, "ProtocolGame::sendCyclopediaCharacterRecentPvPKills - entry.description"); + msg.addString(entry.description); msg.addByte(entry.status); } writeToOutputBuffer(msg); } -void ProtocolGame::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, std::vector<std::pair<Achievement, uint32_t>> achievementsUnlocked) { +void ProtocolGame::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, const std::vector<std::pair<Achievement, uint32_t>> &achievementsUnlocked) { if (!player || oldProtocol) { return; } @@ -3716,15 +3747,13 @@ void ProtocolGame::sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, msg.add<uint16_t>(player->achiev()->getPoints()); msg.add<uint16_t>(secretsUnlocked); msg.add<uint16_t>(static_cast<uint16_t>(achievementsUnlocked.size())); - std::string messageAchievName = "ProtocolGame::sendCyclopediaCharacterAchievements - achievement.name"; - std::string messageAchievDesc = "ProtocolGame::sendCyclopediaCharacterAchievements - achievement.description"; for (const auto &[achievement, addedTimestamp] : achievementsUnlocked) { msg.add<uint16_t>(achievement.id); msg.add<uint32_t>(addedTimestamp); if (achievement.secret) { msg.addByte(0x01); - msg.addString(achievement.name, messageAchievName); - msg.addString(achievement.description, messageAchievDesc); + msg.addString(achievement.name); + msg.addString(achievement.description); msg.addByte(achievement.grade); } else { msg.addByte(0x00); @@ -3870,7 +3899,7 @@ void ProtocolGame::sendCyclopediaCharacterOutfitsMounts() { ++outfitSize; msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendCyclopediaCharacterOutfitsMounts - outfit->name"); + msg.addString(outfit->name); msg.addByte(addons); if (from == "store") { msg.addByte(CYCLOPEDIA_CHARACTERINFO_OUTFITTYPE_STORE); @@ -3895,13 +3924,13 @@ void ProtocolGame::sendCyclopediaCharacterOutfitsMounts() { uint16_t mountSize = 0; auto startMounts = msg.getBufferPosition(); msg.skipBytes(2); - for (const auto &mount : g_game().mounts.getMounts()) { + for (const auto &mount : g_game().mounts->getMounts()) { const std::string type = mount->type; if (player->hasMount(mount)) { ++mountSize; msg.add<uint16_t>(mount->clientId); - msg.addString(mount->name, "ProtocolGame::sendCyclopediaCharacterOutfitsMounts - mount->name"); + msg.addString(mount->name); if (type == "store") { msg.addByte(CYCLOPEDIA_CHARACTERINFO_OUTFITTYPE_STORE); } else if (type == "quest") { @@ -3930,7 +3959,7 @@ void ProtocolGame::sendCyclopediaCharacterOutfitsMounts() { } ++familiarsSize; msg.add<uint16_t>(familiar->lookType); - msg.addString(familiar->name, "ProtocolGame::sendCyclopediaCharacterOutfitsMounts - familiar.name"); + msg.addString(familiar->name); if (type == "quest") { msg.addByte(CYCLOPEDIA_CHARACTERINFO_OUTFITTYPE_QUEST); } else { @@ -3963,13 +3992,16 @@ void ProtocolGame::sendCyclopediaCharacterStoreSummary() { auto cyclopediaSummary = player->cyclopedia()->getSummary(); - // getBlessingsObtained - auto blessingNames = g_game().getBlessingNames(); - msg.addByte(static_cast<uint8_t>(blessingNames.size())); - for (const auto &bless : blessingNames) { - msg.addString(bless.second, "ProtocolGame::sendCyclopediaCharacterStoreSummary - blessing.name"); - uint8_t blessingIndex = bless.first - 1; - msg.addByte((blessingIndex < player->blessings.size()) ? static_cast<uint16_t>(player->blessings[blessingIndex]) : 0); + msg.addByte(static_cast<uint8_t>(magic_enum::enum_count<Blessings>())); + for (auto bless : magic_enum::enum_values<Blessings>()) { + std::string name = toStartCaseWithSpace(magic_enum::enum_name(bless).data()); + msg.addString(name); + auto blessValue = enumToValue(bless); + if (player->hasBlessing(blessValue)) { + msg.addByte(static_cast<uint16_t>(player->blessings[blessValue - 1])); + } else { + msg.addByte(0x00); + } } uint8_t preySlotsUnlocked = 0; @@ -4020,7 +4052,7 @@ void ProtocolGame::sendCyclopediaCharacterStoreSummary() { for (const auto &hItem_it : houseItems) { const ItemType &it = Item::items[hItem_it.first]; msg.add<uint16_t>(it.id); // Item ID - msg.addString(it.name, "ProtocolGame::sendCyclopediaCharacterStoreSummary - houseItem.name"); + msg.addString(it.name); msg.addByte(hItem_it.second); } @@ -4045,7 +4077,7 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { ++inventoryItems; msg.addByte(slot); - msg.addString(inventoryItem->getName(), "ProtocolGame::sendCyclopediaCharacterInspection - inventoryItem->getName()"); + msg.addString(inventoryItem->getName()); AddItem(msg, inventoryItem); uint8_t itemImbuements = 0; @@ -4069,12 +4101,12 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { auto descriptions = Item::getDescriptions(Item::items[inventoryItem->getID()], inventoryItem); msg.addByte(descriptions.size()); for (const auto &description : descriptions) { - msg.addString(description.first, "ProtocolGame::sendCyclopediaCharacterInspection - description.first"); - msg.addString(description.second, "ProtocolGame::sendCyclopediaCharacterInspection - description.second"); + msg.addString(description.first); + msg.addString(description.second); } } } - msg.addString(player->getName(), "ProtocolGame::sendCyclopediaCharacterInspection - player->getName()"); + msg.addString(player->getName()); AddOutfit(msg, player->getDefaultOutfit(), false); // Player overall summary @@ -4085,33 +4117,33 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { // Player title if (player->title()->getCurrentTitle() != 0) { playerDescriptionSize++; - msg.addString("Character Title", "ProtocolGame::sendCyclopediaCharacterInspection - Title"); - msg.addString(player->title()->getCurrentTitleName(), "ProtocolGame::sendCyclopediaCharacterInspection - player->title()->getCurrentTitleName()"); + msg.addString("Character Title"); + msg.addString(player->title()->getCurrentTitleName()); } // Level description playerDescriptionSize++; - msg.addString("Level", "ProtocolGame::sendCyclopediaCharacterInspection - Level"); - msg.addString(std::to_string(player->getLevel()), "ProtocolGame::sendCyclopediaCharacterInspection - std::to_string(player->getLevel())"); + msg.addString("Level"); + msg.addString(std::to_string(player->getLevel())); // Vocation description playerDescriptionSize++; - msg.addString("Vocation", "ProtocolGame::sendCyclopediaCharacterInspection - Vocation"); - msg.addString(player->getVocation()->getVocName(), "ProtocolGame::sendCyclopediaCharacterInspection - player->getVocation()->getVocName()"); + msg.addString("Vocation"); + msg.addString(player->getVocation()->getVocName()); // Loyalty title if (!player->getLoyaltyTitle().empty()) { playerDescriptionSize++; - msg.addString("Loyalty Title", "ProtocolGame::sendCyclopediaCharacterInspection - Loyalty Title"); - msg.addString(player->getLoyaltyTitle(), "ProtocolGame::sendCyclopediaCharacterInspection - player->getLoyaltyTitle()"); + msg.addString("Loyalty Title"); + msg.addString(player->getLoyaltyTitle()); } // Marriage description if (const auto spouseId = player->getMarriageSpouse(); spouseId > 0) { if (const auto &spouse = g_game().getPlayerByID(spouseId, true); spouse) { playerDescriptionSize++; - msg.addString("Married to", "ProtocolGame::sendCyclopediaCharacterInspection - Married to"); - msg.addString(spouse->getName(), "ProtocolGame::sendCyclopediaCharacterInspection - spouse->getName()"); + msg.addString("Married to"); + msg.addString(spouse->getName()); } } @@ -4121,7 +4153,7 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { slot && slot->isOccupied()) { playerDescriptionSize++; std::string activePrey = fmt::format("Active Prey {}", slotId + 1); - msg.addString(activePrey, "ProtocolGame::sendCyclopediaCharacterInspection - active prey"); + msg.addString(activePrey); std::string desc; if (auto mtype = g_monsters().getMonsterTypeByRaceId(slot->selectedRaceId)) { @@ -4143,17 +4175,17 @@ void ProtocolGame::sendCyclopediaCharacterInspection() { uint8_t hours = slot->bonusTimeLeft / 3600; uint8_t minutes = (slot->bonusTimeLeft - (hours * 3600)) / 60; desc.append(fmt::format("{}:{}{}h", hours, (minutes < 10 ? "0" : ""), minutes)); - msg.addString(desc, "ProtocolGame::sendCyclopediaCharacterInspection - prey description"); + msg.addString(desc); } } // Outfit description playerDescriptionSize++; - msg.addString("Outfit", "ProtocolGame::sendCyclopediaCharacterInspection - Outfit"); + msg.addString("Outfit"); if (const auto outfit = Outfits::getInstance().getOutfitByLookType(player, player->getDefaultOutfit().lookType)) { - msg.addString(outfit->name, "ProtocolGame::sendCyclopediaCharacterInspection - outfit->name"); + msg.addString(outfit->name); } else { - msg.addString("unknown", "ProtocolGame::sendCyclopediaCharacterInspection - unknown"); + msg.addString("unknown"); } msg.setBufferPosition(startInventory); @@ -4180,7 +4212,7 @@ void ProtocolGame::sendCyclopediaCharacterBadges() { msg.addByte(loggedPlayer ? 0x01 : 0x00); // IsOnline msg.addByte(player->isPremium() ? 0x01 : 0x00); // IsPremium (GOD has always 'Premium') // Character loyalty title - msg.addString(player->getLoyaltyTitle(), "ProtocolGame::sendCyclopediaCharacterBadges - player->getLoyaltyTitle()"); + msg.addString(player->getLoyaltyTitle()); uint8_t badgesSize = 0; auto badgesSizePosition = msg.getBufferPosition(); @@ -4188,7 +4220,7 @@ void ProtocolGame::sendCyclopediaCharacterBadges() { for (const auto &badge : g_game().getBadges()) { if (player->badge()->hasBadge(badge.m_id)) { msg.add<uint32_t>(badge.m_id); - msg.addString(badge.m_name, "ProtocolGame::sendCyclopediaCharacterBadges - name"); + msg.addString(badge.m_name); badgesSize++; } } @@ -4212,14 +4244,11 @@ void ProtocolGame::sendCyclopediaCharacterTitles() { msg.addByte(0x00); // 0x00 Here means 'no error' msg.addByte(player->title()->getCurrentTitle()); msg.addByte(static_cast<uint8_t>(titles.size())); - - std::string messageTitleName = "ProtocolGame::sendCyclopediaCharacterTitles - title.name"; - std::string messageTitleDesc = "ProtocolGame::sendCyclopediaCharacterTitles - title.description"; for (const auto &title : titles) { msg.addByte(title.m_id); auto titleName = player->title()->getNameBySex(player->getSex(), title.m_maleName, title.m_femaleName); - msg.addString(titleName, messageTitleName); - msg.addString(title.m_description, messageTitleDesc); + msg.addString(titleName); + msg.addString(title.m_description); msg.addByte(title.m_permanent ? 0x01 : 0x00); auto isUnlocked = player->title()->isTitleUnlocked(title.m_id); msg.addByte(isUnlocked ? 0x01 : 0x00); @@ -4274,7 +4303,7 @@ void ProtocolGame::sendBasicData() { for (uint16_t sid : spellsList) { auto spell = g_spells().getInstantSpellById(sid); if (spell && spell->getSpellId() > 0) { - validSpells.push_back(spell); + validSpells.emplace_back(spell); } } @@ -4339,7 +4368,7 @@ void ProtocolGame::sendBlessStatus() { if (oldProtocol) { msg.add<uint16_t>(blessCount >= 5 ? 0x01 : 0x00); } else { - bool glow = player->getVocationId() > VOCATION_NONE && ((g_configManager().getBoolean(INVENTORY_GLOW, __FUNCTION__) && blessCount >= 5) || player->getLevel() < g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL, __FUNCTION__)); + bool glow = player->getVocationId() > VOCATION_NONE && ((g_configManager().getBoolean(INVENTORY_GLOW) && blessCount >= 5) || player->getLevel() < g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL)); msg.add<uint16_t>(glow ? 1 : 0); // Show up the glowing effect in items if you have all blesses or adventurer's blessing msg.addByte((blessCount >= 7) ? 3 : ((blessCount >= 5) ? 2 : 1)); // 1 = Disabled | 2 = normal | 3 = green } @@ -4348,7 +4377,7 @@ void ProtocolGame::sendBlessStatus() { } void ProtocolGame::sendPremiumTrigger() { - if (!g_configManager().getBoolean(FREE_PREMIUM, __FUNCTION__) && !g_configManager().getBoolean(VIP_SYSTEM_ENABLED, __FUNCTION__)) { + if (!g_configManager().getBoolean(FREE_PREMIUM) && !g_configManager().getBoolean(VIP_SYSTEM_ENABLED)) { NetworkMessage msg; msg.addByte(0x9E); msg.addByte(16); @@ -4466,7 +4495,7 @@ void ProtocolGame::sendTextMessage(const TextMessage &message) { default: break; } - msg.addString(message.text, "ProtocolGame::sendTextMessage - message.text"); + msg.addString(message.text); writeToOutputBuffer(msg); } @@ -4481,9 +4510,9 @@ void ProtocolGame::sendCreatePrivateChannel(uint16_t channelId, const std::strin NetworkMessage msg; msg.addByte(0xB2); msg.add<uint16_t>(channelId); - msg.addString(channelName, "ProtocolGame::sendCreatePrivateChannel - channelName"); + msg.addString(channelName); msg.add<uint16_t>(0x01); - msg.addString(player->getName(), "ProtocolGame::sendCreatePrivateChannel - player->getName()"); + msg.addString(player->getName()); msg.add<uint16_t>(0x00); writeToOutputBuffer(msg); } @@ -4496,7 +4525,7 @@ void ProtocolGame::sendChannelsDialog() { msg.addByte(list.size()); for (const auto &channel : list) { msg.add<uint16_t>(channel->getId()); - msg.addString(channel->getName(), "ProtocolGame::sendChannelsDialog - channel->getName()"); + msg.addString(channel->getName()); } writeToOutputBuffer(msg); @@ -4507,12 +4536,12 @@ void ProtocolGame::sendChannel(uint16_t channelId, const std::string &channelNam msg.addByte(0xAC); msg.add<uint16_t>(channelId); - msg.addString(channelName, "ProtocolGame::sendChannel - channelName"); + msg.addString(channelName); if (channelUsers) { msg.add<uint16_t>(channelUsers->size()); for (const auto &it : *channelUsers) { - msg.addString(it.second->getName(), "ProtocolGame::sendChannel - it.second->getName()"); + msg.addString(it.second->getName()); } } else { msg.add<uint16_t>(0x00); @@ -4521,7 +4550,7 @@ void ProtocolGame::sendChannel(uint16_t channelId, const std::string &channelNam if (invitedUsers) { msg.add<uint16_t>(invitedUsers->size()); for (const auto &it : *invitedUsers) { - msg.addString(it.second->getName(), "ProtocolGame::sendChannel - it.second->getName()"); + msg.addString(it.second->getName()); } } else { msg.add<uint16_t>(0x00); @@ -4533,23 +4562,42 @@ void ProtocolGame::sendChannelMessage(const std::string &author, const std::stri NetworkMessage msg; msg.addByte(0xAA); msg.add<uint32_t>(0x00); - msg.addString(author, "ProtocolGame::sendChannelMessage - author"); + msg.addString(author); msg.add<uint16_t>(0x00); msg.addByte(type); msg.add<uint16_t>(channel); - msg.addString(text, "ProtocolGame::sendChannelMessage - text"); + msg.addString(text); writeToOutputBuffer(msg); } -void ProtocolGame::sendIcons(uint32_t icons) { +void ProtocolGame::sendIcons(const std::unordered_set<PlayerIcon> &iconSet, const IconBakragore iconBakragore) { NetworkMessage msg; msg.addByte(0xA2); + + std::bitset<static_cast<size_t>(PlayerIcon::Count)> iconsBitSet; + for (const auto &icon : iconSet) { + iconsBitSet.set(enumToValue(icon)); + } + + uint32_t icons = iconsBitSet.to_ulong(); + if (oldProtocol) { + // Send as uint16_t in old protocol msg.add<uint16_t>(static_cast<uint16_t>(icons)); } else { + // Send as uint32_t in new protocol msg.add<uint32_t>(icons); - msg.addByte(0x00); // 13.20 icon counter + msg.addByte(enumToValue(iconBakragore)); // Icons Bakragore } + + writeToOutputBuffer(msg); +} + +void ProtocolGame::sendIconBakragore(const IconBakragore icon) { + NetworkMessage msg; + msg.addByte(0xA2); + msg.add<uint32_t>(0); // Send empty normal icons + msg.addByte(enumToValue(icon)); writeToOutputBuffer(msg); } @@ -4566,8 +4614,8 @@ void ProtocolGame::sendUnjustifiedPoints(const uint8_t &dayProgress, const uint8 writeToOutputBuffer(msg); } -void ProtocolGame::sendContainer(uint8_t cid, std::shared_ptr<Container> container, bool hasParent, uint16_t firstIndex) { - if (!player) { +void ProtocolGame::sendContainer(uint8_t cid, const std::shared_ptr<Container> &container, bool hasParent, uint16_t firstIndex) { + if (!player || !container) { return; } @@ -4578,10 +4626,10 @@ void ProtocolGame::sendContainer(uint8_t cid, std::shared_ptr<Container> contain if (container->getID() == ITEM_BROWSEFIELD) { AddItem(msg, ITEM_BAG, 1, container->getTier()); - msg.addString("Browse Field", "ProtocolGame::sendContainer - Browse Field"); + msg.addString("Browse Field"); } else { AddItem(msg, container); - msg.addString(container->getName(), "ProtocolGame::sendContainer - container->getName()"); + msg.addString(container->getName()); } const auto itemsStoreInboxToSend = container->getStoreInboxFilteredItems(); @@ -4625,7 +4673,7 @@ void ProtocolGame::sendContainer(uint8_t cid, std::shared_ptr<Container> contain msg.addByte(std::min<uint32_t>(maxItemsToSend, containerSize)); uint32_t i = 0; - for (ItemDeque::const_iterator it = itemList.begin() + firstIndex, end = itemList.end(); i < maxItemsToSend && it != end; ++it, ++i) { + for (auto it = itemList.begin() + firstIndex, end = itemList.end(); i < maxItemsToSend && it != end; ++it, ++i) { AddItem(msg, *it); } } @@ -4665,6 +4713,19 @@ void ProtocolGame::sendContainer(uint8_t cid, std::shared_ptr<Container> contain msg.addByte(0x00); } + // New container menu options + if (container->isMovable()) { // Pickupable/Moveable (?) + msg.addByte(1); + } else { + msg.addByte(0); + } + + if (container->getHoldingPlayer()) { // Player holding the item (?) + msg.addByte(1); + } else { + msg.addByte(0); + } + writeToOutputBuffer(msg); } @@ -4678,7 +4739,7 @@ void ProtocolGame::sendLootContainers() { msg.addByte(player->quickLootFallbackToMainContainer ? 1 : 0); std::map<ObjectCategory_t, std::pair<std::shared_ptr<Container>, std::shared_ptr<Container>>> managedContainersMap; - for (auto [category, containersPair] : player->m_managedContainers) { + for (const auto &[category, containersPair] : player->m_managedContainers) { if (containersPair.first && !containersPair.first->isRemoved()) { managedContainersMap[category].first = containersPair.first; } @@ -4690,7 +4751,7 @@ void ProtocolGame::sendLootContainers() { auto msgPosition = msg.getBufferPosition(); msg.skipBytes(1); uint8_t containers = 0; - for (auto [category, containersPair] : managedContainersMap) { + for (const auto &[category, containersPair] : managedContainersMap) { if (!isValidObjectCategory(category)) { continue; } @@ -4707,7 +4768,7 @@ void ProtocolGame::sendLootContainers() { writeToOutputBuffer(msg); } -void ProtocolGame::sendLootStats(std::shared_ptr<Item> item, uint8_t count) { +void ProtocolGame::sendLootStats(const std::shared_ptr<Item> &item, uint8_t count) { if (!item) { return; } @@ -4724,18 +4785,18 @@ void ProtocolGame::sendLootStats(std::shared_ptr<Item> item, uint8_t count) { NetworkMessage msg; msg.addByte(0xCF); AddItem(msg, lootedItem); - msg.addString(lootedItem->getName(), "ProtocolGame::sendLootStats - lootedItem->getName()"); + msg.addString(lootedItem->getName()); item->setIsLootTrackeable(false); writeToOutputBuffer(msg); lootedItem = nullptr; } -void ProtocolGame::sendShop(std::shared_ptr<Npc> npc) { +void ProtocolGame::sendShop(const std::shared_ptr<Npc> &npc) { Benchmark brenchmark; NetworkMessage msg; msg.addByte(0x7A); - msg.addString(npc->getName(), "ProtocolGame::sendShop - npc->getName()"); + msg.addString(npc->getName()); if (!oldProtocol) { msg.add<uint16_t>(npc->getCurrency()); @@ -4861,9 +4922,10 @@ void ProtocolGame::sendSaleItemList(const std::vector<ShopBlock> &shopVector, co msg.add<uint64_t>(player->getMoney() + player->getBankBalance()); } - uint8_t itemsToSend = 0; + uint16_t itemsToSend = 0; + const uint16_t ItemsToSendLimit = oldProtocol ? 0xFF : 0xFFFF; auto msgPosition = msg.getBufferPosition(); - msg.skipBytes(1); + msg.skipBytes(oldProtocol ? 1 : 2); for (const ShopBlock &shopBlock : shopVector) { if (shopBlock.itemSellPrice == 0) { @@ -4878,14 +4940,18 @@ void ProtocolGame::sendSaleItemList(const std::vector<ShopBlock> &shopVector, co } else { msg.add<uint16_t>(std::min<uint16_t>(it->second, std::numeric_limits<uint16_t>::max())); } - if (++itemsToSend >= 0xFF) { + if (++itemsToSend >= ItemsToSendLimit) { break; } } } msg.setBufferPosition(msgPosition); - msg.addByte(itemsToSend); + if (oldProtocol) { + msg.addByte(static_cast<uint8_t>(itemsToSend)); + } else { + msg.add<uint16_t>(itemsToSend); + } writeToOutputBuffer(msg); } @@ -4966,18 +5032,20 @@ void ProtocolGame::updateCoinBalance() { return; } - g_dispatcher().addEvent([playerId = player->getID()] { - const auto &threadPlayer = g_game().getPlayerByID(playerId); - if (threadPlayer && threadPlayer->getAccount()) { - const auto [coins, errCoin] = threadPlayer->getAccount()->getCoins(enumToValue(CoinType::Normal)); - const auto [transferCoins, errTCoin] = threadPlayer->getAccount()->getCoins(enumToValue(CoinType::Transferable)); + g_dispatcher().addEvent( + [playerId = player->getID()] { + const auto &threadPlayer = g_game().getPlayerByID(playerId); + if (threadPlayer && threadPlayer->getAccount()) { + const auto [coins, errCoin] = threadPlayer->getAccount()->getCoins(CoinType::Normal); + const auto [transferCoins, errTCoin] = threadPlayer->getAccount()->getCoins(CoinType::Transferable); - threadPlayer->coinBalance = coins; - threadPlayer->coinTransferableBalance = transferCoins; - threadPlayer->sendCoinBalance(); - } - }, - "ProtocolGame::updateCoinBalance"); + threadPlayer->coinBalance = coins; + threadPlayer->coinTransferableBalance = transferCoins; + threadPlayer->sendCoinBalance(); + } + }, + __FUNCTION__ + ); } void ProtocolGame::sendMarketLeave() { @@ -5009,7 +5077,7 @@ void ProtocolGame::sendMarketBrowseItem(uint16_t itemId, const MarketOfferList & } else { msg.add<uint64_t>(static_cast<uint64_t>(offer.price)); } - msg.addString(offer.playerName, "ProtocolGame::sendMarketBrowseItem - offer.playerName"); + msg.addString(offer.playerName); } msg.add<uint32_t>(sellOffers.size()); @@ -5022,7 +5090,7 @@ void ProtocolGame::sendMarketBrowseItem(uint16_t itemId, const MarketOfferList & } else { msg.add<uint64_t>(static_cast<uint64_t>(offer.price)); } - msg.addString(offer.playerName, "ProtocolGame::sendMarketBrowseItem - offer.playerName"); + msg.addString(offer.playerName); } updateCoinBalance(); @@ -5051,7 +5119,7 @@ void ProtocolGame::sendMarketAcceptOffer(const MarketOfferEx &offer) { } else { msg.add<uint64_t>(static_cast<uint64_t>(offer.price)); } - msg.addString(offer.playerName, "ProtocolGame::sendMarketAcceptOffer - offer.playerName"); + msg.addString(offer.playerName); msg.add<uint32_t>(0x00); } else { msg.add<uint32_t>(0x00); @@ -5064,7 +5132,7 @@ void ProtocolGame::sendMarketAcceptOffer(const MarketOfferEx &offer) { } else { msg.add<uint64_t>(static_cast<uint64_t>(offer.price)); } - msg.addString(offer.playerName, "ProtocolGame::sendMarketAcceptOffer - offer.playerName"); + msg.addString(offer.playerName); } writeToOutputBuffer(msg); @@ -5259,31 +5327,31 @@ void ProtocolGame::sendForgingData() { } // (conversion) (left column top) Cost to make 1 bottom item - 20 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_COST_ONE_SLIVER, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_COST_ONE_SLIVER))); // (conversion) (left column bottom) How many items to make - 3 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_SLIVER_AMOUNT, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_SLIVER_AMOUNT))); // (conversion) (middle column top) Cost to make 1 - 50 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CORE_COST, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CORE_COST))); // (conversion) (right column top) Current stored dust limit minus this number = cost to increase stored dust limit - 75 msg.addByte(75); // (conversion) (right column bottom) Starting stored dust limit msg.add<uint16_t>(player->getForgeDustLevel()); // (conversion) (right column bottom) Max stored dust limit - 325 - msg.add<uint16_t>(g_configManager().getNumber(FORGE_MAX_DUST, __FUNCTION__)); + msg.add<uint16_t>(g_configManager().getNumber(FORGE_MAX_DUST)); // (normal fusion) dust cost - 100 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_FUSION_DUST_COST, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_FUSION_DUST_COST))); // (convergence fusion) dust cost - 130 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CONVERGENCE_FUSION_DUST_COST, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CONVERGENCE_FUSION_DUST_COST))); // (normal transfer) dust cost - 100 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_TRANSFER_DUST_COST, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_TRANSFER_DUST_COST))); // (convergence transfer) dust cost - 160 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CONVERGENCE_TRANSFER_DUST_COST, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_CONVERGENCE_TRANSFER_DUST_COST))); // (fusion) Base success rate - 50 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_BASE_SUCCESS_RATE, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_BASE_SUCCESS_RATE))); // (fusion) Bonus success rate - 15 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_BONUS_SUCCESS_RATE, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_BONUS_SUCCESS_RATE))); // (fusion) Tier loss chance after reduction - 50 - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_TIER_LOSS_REDUCTION, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(FORGE_TIER_LOSS_REDUCTION))); // Update player resources parseSendResourceBalance(); @@ -5294,11 +5362,12 @@ void ProtocolGame::sendForgingData() { void ProtocolGame::sendOpenForge() { // We will use it when sending the bytes to send the item information to the client std::map<uint16_t, std::map<uint8_t, uint16_t>> fusionItemsMap; - std::map<int32_t, std::map<uint16_t, std::map<uint8_t, uint16_t>>> convergenceItemsMap; + std::map<int32_t, std::map<uint16_t, std::map<uint8_t, uint16_t>>> convergenceFusionItemsMap; + std::map<int32_t, std::map<uint16_t, std::map<uint8_t, uint16_t>>> convergenceTransferItemsMap; std::map<uint16_t, std::map<uint8_t, uint16_t>> donorTierItemMap; std::map<uint16_t, std::map<uint8_t, uint16_t>> receiveTierItemMap; - auto maxConfigTier = g_configManager().getNumber(FORGE_MAX_ITEM_TIER, __FUNCTION__); + auto maxConfigTier = g_configManager().getNumber(FORGE_MAX_ITEM_TIER); /* *Start - Parsing items informations @@ -5329,7 +5398,12 @@ void ProtocolGame::sendOpenForge() { getForgeInfoMap(item, receiveTierItemMap); } if (itemClassification == 4) { - getForgeInfoMap(item, convergenceItemsMap[item->getClassification()]); + auto slotPosition = item->getSlotPosition(); + if ((slotPosition & SLOTP_TWO_HAND) != 0) { + slotPosition = SLOTP_HAND; + } + getForgeInfoMap(item, convergenceFusionItemsMap[slotPosition]); + getForgeInfoMap(item, convergenceTransferItemsMap[item->getClassification()]); } } } @@ -5337,7 +5411,7 @@ void ProtocolGame::sendOpenForge() { // Checking size of map to send in the addByte (total fusion items count) uint8_t fusionTotalItemsCount = 0; for (const auto &[itemId, tierAndCountMap] : fusionItemsMap) { - for (const auto [itemTier, itemCount] : tierAndCountMap) { + for (const auto &[itemTier, itemCount] : tierAndCountMap) { if (itemCount >= 2) { fusionTotalItemsCount++; } @@ -5354,7 +5428,7 @@ void ProtocolGame::sendOpenForge() { msg.add<uint16_t>(fusionTotalItemsCount); for (const auto &[itemId, tierAndCountMap] : fusionItemsMap) { - for (const auto [itemTier, itemCount] : tierAndCountMap) { + for (const auto &[itemTier, itemCount] : tierAndCountMap) { if (itemCount >= 2) { msg.addByte(0x01); // Number of friend items? msg.add<uint16_t>(itemId); @@ -5376,12 +5450,12 @@ void ProtocolGame::sendOpenForge() { 1 byte: tier 2 bytes: count */ - for (const auto &[slot, itemMap] : convergenceItemsMap) { + for (const auto &[slot, itemMap] : convergenceFusionItemsMap) { uint8_t totalItemsCount = 0; auto totalItemsCountPosition = msg.getBufferPosition(); msg.skipBytes(1); // Total items count for (const auto &[itemId, tierAndCountMap] : itemMap) { - for (const auto [tier, itemCount] : tierAndCountMap) { + for (const auto &[tier, itemCount] : tierAndCountMap) { if (tier >= maxConfigTier) { continue; } @@ -5412,11 +5486,15 @@ void ProtocolGame::sendOpenForge() { // Let's access the itemType to check the item's (donator of tier) classification level // Must be the same as the item that will receive the tier const ItemType &donorType = Item::items[itemId]; + auto donorSlotPosition = donorType.slotPosition; + if ((donorSlotPosition & SLOTP_TWO_HAND) != 0) { + donorSlotPosition = SLOTP_HAND; + } // Total count of item (donator of tier) auto donorTierTotalItemsCount = getIterationIncreaseCount(tierAndCountMap); msg.add<uint16_t>(donorTierTotalItemsCount); - for (const auto [donorItemTier, donorItemCount] : tierAndCountMap) { + for (const auto &[donorItemTier, donorItemCount] : tierAndCountMap) { msg.add<uint16_t>(itemId); msg.addByte(donorItemTier); msg.add<uint16_t>(donorItemCount); @@ -5426,7 +5504,11 @@ void ProtocolGame::sendOpenForge() { for (const auto &[iteratorItemId, unusedTierAndCountMap] : receiveTierItemMap) { // Let's access the itemType to check the item's (receiver of tier) classification level const ItemType &receiveType = Item::items[iteratorItemId]; - if (donorType.upgradeClassification == receiveType.upgradeClassification) { + auto receiveSlotPosition = receiveType.slotPosition; + if ((receiveSlotPosition & SLOTP_TWO_HAND) != 0) { + receiveSlotPosition = SLOTP_HAND; + } + if (donorType.upgradeClassification == receiveType.upgradeClassification && donorSlotPosition == receiveSlotPosition) { receiveTierTotalItemCount++; } } @@ -5437,8 +5519,12 @@ void ProtocolGame::sendOpenForge() { for (const auto &[receiveItemId, receiveTierAndCountMap] : receiveTierItemMap) { // Let's access the itemType to check the item's (receiver of tier) classification level const ItemType &receiveType = Item::items[receiveItemId]; - if (donorType.upgradeClassification == receiveType.upgradeClassification) { - for (const auto [receiveItemTier, receiveItemCount] : receiveTierAndCountMap) { + auto receiveSlotPosition = receiveType.slotPosition; + if ((receiveSlotPosition & SLOTP_TWO_HAND) != 0) { + receiveSlotPosition = SLOTP_HAND; + } + if (donorType.upgradeClassification == receiveType.upgradeClassification && donorSlotPosition == receiveSlotPosition) { + for (const auto &[receiveItemTier, receiveItemCount] : receiveTierAndCountMap) { msg.add<uint16_t>(receiveItemId); msg.add<uint16_t>(receiveItemCount); } @@ -5464,7 +5550,7 @@ void ProtocolGame::sendOpenForge() { 2 bytes: item id 2 bytes: count */ - for (const auto &[slot, itemMap] : convergenceItemsMap) { + for (const auto &[slot, itemMap] : convergenceTransferItemsMap) { uint16_t donorCount = 0; uint16_t receiverCount = 0; auto donorCountPosition = msg.getBufferPosition(); @@ -5517,14 +5603,23 @@ void ProtocolGame::parseForgeEnter(NetworkMessage &msg) { } // 0xBF -> 0 = fusion, 1 = transfer, 2 = dust to sliver, 3 = sliver to core, 4 = increase dust limit - auto actionType = static_cast<ForgeAction_t>(msg.getByte()); - bool convergence = msg.getByte(); - uint16_t firstItem = msg.get<uint16_t>(); - uint8_t tier = msg.getByte(); - uint16_t secondItem = msg.get<uint16_t>(); - bool usedCore = msg.getByte(); - bool reduceTierLoss = msg.getByte(); + const auto actionType = static_cast<ForgeAction_t>(msg.getByte()); + + bool convergence = false; + uint16_t firstItem = 0; + uint8_t tier = 0; + uint16_t secondItem = 0; + + if (actionType == ForgeAction_t::FUSION || actionType == ForgeAction_t::TRANSFER) { + convergence = msg.getByte(); + firstItem = msg.get<uint16_t>(); + tier = msg.getByte(); + secondItem = msg.get<uint16_t>(); + } + if (actionType == ForgeAction_t::FUSION) { + const bool usedCore = convergence ? false : msg.getByte(); + const bool reduceTierLoss = convergence ? false : msg.getByte(); g_game().playerForgeFuseItems(player->getID(), actionType, firstItem, tier, secondItem, usedCore, reduceTierLoss, convergence); } else if (actionType == ForgeAction_t::TRANSFER) { g_game().playerForgeTransferItemTier(player->getID(), actionType, firstItem, tier, secondItem, convergence); @@ -5591,7 +5686,7 @@ void ProtocolGame::sendForgeHistory(uint8_t page) { uint16_t pageFirstEntry = (0 < historyVectorLen - (currentPage - 1) * 9) ? historyVectorLen - (currentPage - 1) * 9 : 0; uint16_t pageLastEntry = (0 < historyVectorLen - currentPage * 9) ? historyVectorLen - currentPage * 9 : 0; for (uint16_t entry = pageFirstEntry; entry > pageLastEntry; --entry) { - historyPerPage.push_back(historyVector[entry - 1]); + historyPerPage.emplace_back(historyVector[entry - 1]); } auto historyPageToSend = getVectorIterationIncreaseCount(historyPerPage); @@ -5607,7 +5702,7 @@ void ProtocolGame::sendForgeHistory(uint8_t page) { auto action = magic_enum::enum_integer(history.actionType); msg.add<uint32_t>(static_cast<uint32_t>(history.createdAt)); msg.addByte(action); - msg.addString(history.description, "ProtocolGame::sendForgeHistory - history.description"); + msg.addString(history.description); msg.addByte((history.bonus >= 1 && history.bonus < 8) ? 0x01 : 0x00); } } @@ -5637,7 +5732,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { } if (it.armor != 0) { - msg.addString(std::to_string(it.armor), "ProtocolGame::sendMarketDetail - std::to_string(it.armor)"); + msg.addString(std::to_string(it.armor)); } else { msg.add<uint16_t>(0x00); } @@ -5665,21 +5760,24 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { } ss << static_cast<uint16_t>(it.shootRange) << " fields"; } - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); - } else if (!it.isRanged() && it.attack != 0) { + msg.addString(ss.str()); + } else { + std::string attackDescription; if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) { - std::ostringstream ss; - ss << it.attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType); - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); - } else { - msg.addString(std::to_string(it.attack), "ProtocolGame::sendMarketDetail - std::to_string(it.attack)"); + attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType)); } - } else { - msg.add<uint16_t>(0x00); + + if (it.attack != 0 && !attackDescription.empty()) { + attackDescription = fmt::format("{} physical + {}", it.attack, attackDescription); + } else if (it.attack != 0 && attackDescription.empty()) { + attackDescription = std::to_string(it.attack); + } + + msg.addString(attackDescription); } if (it.isContainer()) { - msg.addString(std::to_string(it.maxItems), "ProtocolGame::sendMarketDetail - std::to_string(it.maxItems)"); + msg.addString(std::to_string(it.maxItems)); } else { msg.add<uint16_t>(0x00); } @@ -5688,9 +5786,9 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.extraDefense != 0) { std::ostringstream ss; ss << it.defense << ' ' << std::showpos << it.extraDefense << std::noshowpos; - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else { - msg.addString(std::to_string(it.defense), "ProtocolGame::sendMarketDetail - std::to_string(it.defense)"); + msg.addString(std::to_string(it.defense)); } } else { msg.add<uint16_t>(0x00); @@ -5699,9 +5797,9 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (!it.description.empty()) { const std::string &descr = it.description; if (descr.back() == '.') { - msg.addString(std::string(descr, 0, descr.length() - 1), "ProtocolGame::sendMarketDetail - std::string(descr, 0, descr.length() - 1)"); + msg.addString(std::string(descr, 0, descr.length() - 1)); } else { - msg.addString(descr, "ProtocolGame::sendMarketDetail - descr"); + msg.addString(descr); } } else { msg.add<uint16_t>(0x00); @@ -5710,7 +5808,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.decayTime != 0) { std::ostringstream ss; ss << it.decayTime << " seconds"; - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else { msg.add<uint16_t>(0x00); } @@ -5733,25 +5831,25 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { ss << fmt::format("{} {:+}%", getCombatName(indexToCombatType(i)), it.abilities->absorbPercent[i]); } - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else { msg.add<uint16_t>(0x00); } if (it.minReqLevel != 0) { - msg.addString(std::to_string(it.minReqLevel), "ProtocolGame::sendMarketDetail - std::to_string(it.minReqLevel)"); + msg.addString(std::to_string(it.minReqLevel)); } else { msg.add<uint16_t>(0x00); } if (it.minReqMagicLevel != 0) { - msg.addString(std::to_string(it.minReqMagicLevel), "ProtocolGame::sendMarketDetail - std::to_string(it.minReqMagicLevel)"); + msg.addString(std::to_string(it.minReqMagicLevel)); } else { msg.add<uint16_t>(0x00); } - msg.addString(it.vocationString, "ProtocolGame::sendMarketDetail - it.vocationString"); - msg.addString(it.runeSpellName, "ProtocolGame::sendMarketDetail - it.runeSpellName"); + msg.addString(it.vocationString); + msg.addString(it.runeSpellName); if (it.abilities) { std::ostringstream ss; @@ -5783,7 +5881,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { separator = true; } - ss << fmt::format("{} {:+.2f}%", getSkillName(i), skills / 100.0); + ss << fmt::format("{} {:+}%", getSkillName(i), skills / 100.0); } if (it.abilities->stats[STAT_MAGICPOINTS] != 0) { @@ -5817,13 +5915,13 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { ss << fmt::format("speed {:+}", (it.abilities->speed >> 1)); } - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else { msg.add<uint16_t>(0x00); } if (it.charges != 0) { - msg.addString(std::to_string(it.charges), "ProtocolGame::sendMarketDetail - std::to_string(it.charges)"); + msg.addString(std::to_string(it.charges)); } else { msg.add<uint16_t>(0x00); } @@ -5838,7 +5936,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { } } - msg.addString(weaponName, "ProtocolGame::sendMarketDetail - weaponName"); + msg.addString(weaponName); if (it.weight != 0) { std::ostringstream ss; @@ -5852,7 +5950,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { ss << weightString; } ss << " oz"; - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else { msg.add<uint16_t>(0x00); } @@ -5860,14 +5958,14 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (!oldProtocol) { std::string augmentsDescription = it.parseAugmentDescription(true); if (!augmentsDescription.empty()) { - msg.addString(augmentsDescription, "ProtocolGame::sendMarketDetail - augmentsDescription"); + msg.addString(augmentsDescription); } else { msg.add<uint16_t>(0x00); // no augments } } if (it.imbuementSlot > 0) { - msg.addString(std::to_string(it.imbuementSlot), "ProtocolGame::sendMarketDetail - std::to_string(it.imbuementSlot)"); + msg.addString(std::to_string(it.imbuementSlot)); } else { msg.add<uint16_t>(0x00); } @@ -5879,7 +5977,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.abilities->magicShieldCapacityFlat > 0) { string.clear(); string << std::showpos << it.abilities->magicShieldCapacityFlat << std::noshowpos << " and " << it.abilities->magicShieldCapacityPercent << "%"; - msg.addString(string.str(), "ProtocolGame::sendMarketDetail - string.str()"); + msg.addString(string.str()); } else { msg.add<uint16_t>(0x00); } @@ -5887,7 +5985,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.abilities->cleavePercent > 0) { string.clear(); string << it.abilities->cleavePercent << "%"; - msg.addString(string.str(), "ProtocolGame::sendMarketDetail - string.str()"); + msg.addString(string.str()); } else { msg.add<uint16_t>(0x00); } @@ -5895,7 +5993,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.abilities->reflectFlat[COMBAT_PHYSICALDAMAGE] > 0) { string.clear(); string << it.abilities->reflectFlat[COMBAT_PHYSICALDAMAGE]; - msg.addString(string.str(), "ProtocolGame::sendMarketDetail - string.str()"); + msg.addString(string.str()); } else { msg.add<uint16_t>(0x00); } @@ -5903,7 +6001,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { if (it.abilities->perfectShotDamage > 0) { string.clear(); string << std::showpos << it.abilities->perfectShotDamage << std::noshowpos << " at range " << unsigned(it.abilities->perfectShotRange); - msg.addString(string.str(), "ProtocolGame::sendMarketDetail - string.str()"); + msg.addString(string.str()); } else { msg.add<uint16_t>(0x00); } @@ -5921,7 +6019,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { // Upgrade and tier detail modifier if (it.upgradeClassification > 0 && tier > 0) { - msg.addString(std::to_string(it.upgradeClassification), "ProtocolGame::sendMarketDetail - std::to_string(it.upgradeClassification)"); + msg.addString(std::to_string(it.upgradeClassification)); std::ostringstream ss; double chance; @@ -5935,10 +6033,10 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { chance = (0.0307576 * tier * tier) + (0.440697 * tier) + 0.026; ss << fmt::format("{} ({:.2f}% Ruse)", static_cast<uint16_t>(tier), chance); } - msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()"); + msg.addString(ss.str()); } else if (it.upgradeClassification > 0 && tier == 0) { - msg.addString(std::to_string(it.upgradeClassification), "ProtocolGame::sendMarketDetail - std::to_string(it.upgradeClassification)"); - msg.addString(std::to_string(tier), "ProtocolGame::sendMarketDetail - std::to_string(tier)"); + msg.addString(std::to_string(it.upgradeClassification)); + msg.addString(std::to_string(tier)); } else { msg.add<uint16_t>(0x00); msg.add<uint16_t>(0x00); @@ -5998,7 +6096,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) { writeToOutputBuffer(msg); } -void ProtocolGame::sendTradeItemRequest(const std::string &traderName, std::shared_ptr<Item> item, bool ack) { +void ProtocolGame::sendTradeItemRequest(const std::string &traderName, const std::shared_ptr<Item> &item, bool ack) { NetworkMessage msg; if (ack) { @@ -6007,22 +6105,23 @@ void ProtocolGame::sendTradeItemRequest(const std::string &traderName, std::shar msg.addByte(0x7E); } - msg.addString(traderName, "ProtocolGame::sendTradeItemRequest - traderName"); + msg.addString(traderName); if (std::shared_ptr<Container> tradeContainer = item->getContainer()) { std::list<std::shared_ptr<Container>> listContainer { tradeContainer }; std::list<std::shared_ptr<Item>> itemList { tradeContainer }; while (!listContainer.empty()) { - std::shared_ptr<Container> container = listContainer.front(); - listContainer.pop_front(); - - for (const std::shared_ptr<Item> &containerItem : container->getItemList()) { - std::shared_ptr<Container> tmpContainer = containerItem->getContainer(); + const auto &container = listContainer.front(); + for (const auto &containerItem : container->getItemList()) { + const auto &tmpContainer = containerItem->getContainer(); if (tmpContainer) { - listContainer.push_back(tmpContainer); + listContainer.emplace_back(tmpContainer); } - itemList.push_back(containerItem); + itemList.emplace_back(containerItem); } + + // Removes the object after processing everything, avoiding memory usage after freeing + listContainer.pop_front(); } msg.addByte(itemList.size()); @@ -6049,7 +6148,7 @@ void ProtocolGame::sendCloseContainer(uint8_t cid) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureTurn(std::shared_ptr<Creature> creature, uint32_t stackPos) { +void ProtocolGame::sendCreatureTurn(const std::shared_ptr<Creature> &creature, uint32_t stackPos) { if (!canSee(creature)) { return; } @@ -6065,14 +6164,14 @@ void ProtocolGame::sendCreatureTurn(std::shared_ptr<Creature> creature, uint32_t writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureSay(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, const Position* pos /* = nullptr*/) { +void ProtocolGame::sendCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, const Position* pos /* = nullptr*/) { NetworkMessage msg; msg.addByte(0xAA); static uint32_t statementId = 0; msg.add<uint32_t>(++statementId); - msg.addString(creature->getName(), "ProtocolGame::sendCreatureSay - creature->getName()"); + msg.addString(creature->getName()); if (!oldProtocol) { msg.addByte(0x00); // Show (Traded) @@ -6097,11 +6196,11 @@ void ProtocolGame::sendCreatureSay(std::shared_ptr<Creature> creature, SpeakClas msg.addPosition(creature->getPosition()); } - msg.addString(text, "ProtocolGame::sendCreatureSay - text"); + msg.addString(text); writeToOutputBuffer(msg); } -void ProtocolGame::sendToChannel(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, uint16_t channelId) { +void ProtocolGame::sendToChannel(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, uint16_t channelId) { NetworkMessage msg; msg.addByte(0xAA); @@ -6119,7 +6218,7 @@ void ProtocolGame::sendToChannel(std::shared_ptr<Creature> creature, SpeakClasse } type = TALKTYPE_CHANNEL_R1; } else { - msg.addString(creature->getName(), "ProtocolGame::sendToChannel - creature->getName()"); + msg.addString(creature->getName()); if (!oldProtocol && statementId != 0) { msg.addByte(0x00); // Show (Traded) } @@ -6139,17 +6238,17 @@ void ProtocolGame::sendToChannel(std::shared_ptr<Creature> creature, SpeakClasse } msg.add<uint16_t>(channelId); - msg.addString(text, "ProtocolGame::sendToChannel - text"); + msg.addString(text); writeToOutputBuffer(msg); } -void ProtocolGame::sendPrivateMessage(std::shared_ptr<Player> speaker, SpeakClasses type, const std::string &text) { +void ProtocolGame::sendPrivateMessage(const std::shared_ptr<Player> &speaker, SpeakClasses type, const std::string &text) { NetworkMessage msg; msg.addByte(0xAA); static uint32_t statementId = 0; msg.add<uint32_t>(++statementId); if (speaker) { - msg.addString(speaker->getName(), "ProtocolGame::sendPrivateMessage - speaker->getName()"); + msg.addString(speaker->getName()); if (!oldProtocol && statementId != 0) { msg.addByte(0x00); // Show (Traded) } @@ -6167,7 +6266,7 @@ void ProtocolGame::sendPrivateMessage(std::shared_ptr<Player> speaker, SpeakClas msg.addByte(type); } - msg.addString(text, "ProtocolGame::sendPrivateMessage - text"); + msg.addString(text); writeToOutputBuffer(msg); } @@ -6178,7 +6277,7 @@ void ProtocolGame::sendCancelTarget() { writeToOutputBuffer(msg); } -void ProtocolGame::sendChangeSpeed(std::shared_ptr<Creature> creature, uint16_t speed) { +void ProtocolGame::sendChangeSpeed(const std::shared_ptr<Creature> &creature, uint16_t speed) { NetworkMessage msg; msg.addByte(0x8F); msg.add<uint32_t>(creature->getID()); @@ -6255,7 +6354,7 @@ void ProtocolGame::sendRestingStatus(uint8_t protection) { msg.addByte(dailyStreak < 2 ? 0 : 1); if (dailyStreak < 2) { - msg.addString("Resting Area (no active bonus)", "ProtocolGame::sendRestingStatus - Resting Area (no active bonus)"); + msg.addString("Resting Area (no active bonus)"); } else { std::ostringstream ss; ss << "Active Resting Area Bonuses: "; @@ -6278,7 +6377,7 @@ void ProtocolGame::sendRestingStatus(uint8_t protection) { ss << ",\nSoul Points Regeneration"; } ss << "."; - msg.addString(ss.str(), "ProtocolGame::sendRestingStatus - ss.str()"); + msg.addString(ss.str()); } writeToOutputBuffer(msg); } @@ -6318,7 +6417,7 @@ void ProtocolGame::removeMagicEffect(const Position &pos, uint16_t type) { writeToOutputBuffer(msg); } -void ProtocolGame::sendCreatureHealth(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendCreatureHealth(const std::shared_ptr<Creature> &creature) { if (creature->isHealthHidden()) { return; } @@ -6335,7 +6434,7 @@ void ProtocolGame::sendCreatureHealth(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyCreatureUpdate(std::shared_ptr<Creature> target) { +void ProtocolGame::sendPartyCreatureUpdate(const std::shared_ptr<Creature> &target) { if (!player || oldProtocol) { return; } @@ -6353,7 +6452,7 @@ void ProtocolGame::sendPartyCreatureUpdate(std::shared_ptr<Creature> target) { writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyCreatureShield(std::shared_ptr<Creature> target) { +void ProtocolGame::sendPartyCreatureShield(const std::shared_ptr<Creature> &target) { uint32_t cid = target->getID(); if (!knownCreatureSet.contains(cid)) { sendPartyCreatureUpdate(target); @@ -6367,7 +6466,7 @@ void ProtocolGame::sendPartyCreatureShield(std::shared_ptr<Creature> target) { writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyCreatureSkull(std::shared_ptr<Creature> target) { +void ProtocolGame::sendPartyCreatureSkull(const std::shared_ptr<Creature> &target) { if (g_game().getWorldType() != WORLD_TYPE_PVP) { return; } @@ -6385,7 +6484,7 @@ void ProtocolGame::sendPartyCreatureSkull(std::shared_ptr<Creature> target) { writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyCreatureHealth(std::shared_ptr<Creature> target, uint8_t healthPercent) { +void ProtocolGame::sendPartyCreatureHealth(const std::shared_ptr<Creature> &target, uint8_t healthPercent) { uint32_t cid = target->getID(); if (!knownCreatureSet.contains(cid)) { sendPartyCreatureUpdate(target); @@ -6399,7 +6498,7 @@ void ProtocolGame::sendPartyCreatureHealth(std::shared_ptr<Creature> target, uin writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyPlayerMana(std::shared_ptr<Player> target, uint8_t manaPercent) { +void ProtocolGame::sendPartyPlayerMana(const std::shared_ptr<Player> &target, uint8_t manaPercent) { uint32_t cid = target->getID(); if (!knownCreatureSet.contains(cid)) { sendPartyCreatureUpdate(target); @@ -6417,7 +6516,7 @@ void ProtocolGame::sendPartyPlayerMana(std::shared_ptr<Player> target, uint8_t m writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyCreatureShowStatus(std::shared_ptr<Creature> target, bool showStatus) { +void ProtocolGame::sendPartyCreatureShowStatus(const std::shared_ptr<Creature> &target, bool showStatus) { uint32_t cid = target->getID(); if (!knownCreatureSet.contains(cid)) { sendPartyCreatureUpdate(target); @@ -6435,7 +6534,7 @@ void ProtocolGame::sendPartyCreatureShowStatus(std::shared_ptr<Creature> target, writeToOutputBuffer(msg); } -void ProtocolGame::sendPartyPlayerVocation(std::shared_ptr<Player> target) { +void ProtocolGame::sendPartyPlayerVocation(const std::shared_ptr<Player> &target) { if (!target) { return; } @@ -6458,7 +6557,7 @@ void ProtocolGame::sendPartyPlayerVocation(std::shared_ptr<Player> target) { writeToOutputBuffer(msg); } -void ProtocolGame::sendPlayerVocation(std::shared_ptr<Player> target) { +void ProtocolGame::sendPlayerVocation(const std::shared_ptr<Player> &target) { if (!player || !target || oldProtocol) { return; } @@ -6474,7 +6573,7 @@ void ProtocolGame::sendPlayerVocation(std::shared_ptr<Player> target) { void ProtocolGame::sendFYIBox(const std::string &message) { NetworkMessage msg; msg.addByte(0x15); - msg.addString(message, "ProtocolGame::sendFYIBox - message"); + msg.addString(message); writeToOutputBuffer(msg); } @@ -6487,7 +6586,7 @@ void ProtocolGame::sendMapDescription(const Position &pos) { writeToOutputBuffer(msg); } -void ProtocolGame::sendAddTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr<Item> item) { +void ProtocolGame::sendAddTileItem(const Position &pos, uint32_t stackpos, const std::shared_ptr<Item> &item) { if (!canSee(pos)) { return; } @@ -6500,7 +6599,7 @@ void ProtocolGame::sendAddTileItem(const Position &pos, uint32_t stackpos, std:: writeToOutputBuffer(msg); } -void ProtocolGame::sendUpdateTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr<Item> item) { +void ProtocolGame::sendUpdateTileItem(const Position &pos, uint32_t stackpos, const std::shared_ptr<Item> &item) { if (!canSee(pos)) { return; } @@ -6523,7 +6622,7 @@ 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> creature) { +void ProtocolGame::sendUpdateTileCreature(const Position &pos, uint32_t stackpos, const std::shared_ptr<Creature> &creature) { if (!canSee(pos)) { return; } @@ -6540,7 +6639,7 @@ void ProtocolGame::sendUpdateTileCreature(const Position &pos, uint32_t stackpos writeToOutputBuffer(msg); } -void ProtocolGame::sendUpdateTile(std::shared_ptr<Tile> tile, const Position &pos) { +void ProtocolGame::sendUpdateTile(const std::shared_ptr<Tile> &tile, const Position &pos) { if (!canSee(pos)) { return; } @@ -6598,7 +6697,7 @@ void ProtocolGame::sendAllowBugReport() { writeToOutputBuffer(msg); } -void ProtocolGame::sendAddCreature(std::shared_ptr<Creature> creature, const Position &pos, int32_t stackpos, bool isLogin) { +void ProtocolGame::sendAddCreature(const std::shared_ptr<Creature> &creature, const Position &pos, int32_t stackpos, bool isLogin) { if (!canSee(pos)) { return; } @@ -6654,8 +6753,8 @@ void ProtocolGame::sendAddCreature(std::shared_ptr<Creature> creature, const Pos msg.addByte(0x00); // can change pvp framing option msg.addByte(0x00); // expert mode button enabled - msg.addString(g_configManager().getString(STORE_IMAGES_URL, __FUNCTION__), "ProtocolGame::sendAddCreature - g_configManager().getString(STORE_IMAGES_URL)"); - msg.add<uint16_t>(static_cast<uint16_t>(g_configManager().getNumber(STORE_COIN_PACKET, __FUNCTION__))); + msg.addString(g_configManager().getString(STORE_IMAGES_URL)); + msg.add<uint16_t>(static_cast<uint16_t>(g_configManager().getNumber(STORE_COIN_PACKET))); if (!oldProtocol) { msg.addByte(shouldAddExivaRestrictions ? 0x01 : 0x00); // exiva button enabled @@ -6739,7 +6838,7 @@ void ProtocolGame::sendAddCreature(std::shared_ptr<Creature> creature, const Pos sendLootContainers(); sendBasicData(); // Wheel of destiny cooldown - if (!oldProtocol && g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (!oldProtocol && g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { player->wheel()->sendGiftOfLifeCooldown(); } @@ -6753,7 +6852,7 @@ void ProtocolGame::sendAddCreature(std::shared_ptr<Creature> creature, const Pos } } -void ProtocolGame::sendMoveCreature(std::shared_ptr<Creature> creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport) { +void ProtocolGame::sendMoveCreature(const std::shared_ptr<Creature> &creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport) { if (creature == player) { if (oldStackPos >= 10) { sendMapDescription(newPos); @@ -6815,7 +6914,7 @@ void ProtocolGame::sendMoveCreature(std::shared_ptr<Creature> creature, const Po } } -void ProtocolGame::sendInventoryItem(Slots_t slot, std::shared_ptr<Item> item) { +void ProtocolGame::sendInventoryItem(Slots_t slot, const std::shared_ptr<Item> &item) { NetworkMessage msg; if (item) { msg.addByte(0x78); @@ -6857,7 +6956,7 @@ void ProtocolGame::sendInventoryIds() { writeToOutputBuffer(msg); } -void ProtocolGame::sendAddContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> item) { +void ProtocolGame::sendAddContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &item) { NetworkMessage msg; msg.addByte(0x70); msg.addByte(cid); @@ -6866,7 +6965,7 @@ void ProtocolGame::sendAddContainerItem(uint8_t cid, uint16_t slot, std::shared_ writeToOutputBuffer(msg); } -void ProtocolGame::sendUpdateContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> item) { +void ProtocolGame::sendUpdateContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &item) { NetworkMessage msg; msg.addByte(0x71); msg.addByte(cid); @@ -6875,7 +6974,7 @@ void ProtocolGame::sendUpdateContainerItem(uint8_t cid, uint16_t slot, std::shar writeToOutputBuffer(msg); } -void ProtocolGame::sendRemoveContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> lastItem) { +void ProtocolGame::sendRemoveContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &lastItem) { NetworkMessage msg; msg.addByte(0x72); msg.addByte(cid); @@ -6888,7 +6987,7 @@ void ProtocolGame::sendRemoveContainerItem(uint8_t cid, uint16_t slot, std::shar writeToOutputBuffer(msg); } -void ProtocolGame::sendTextWindow(uint32_t windowTextId, std::shared_ptr<Item> item, uint16_t maxlen, bool canWrite) { +void ProtocolGame::sendTextWindow(uint32_t windowTextId, const std::shared_ptr<Item> &item, uint16_t maxlen, bool canWrite) { NetworkMessage msg; msg.addByte(0x96); msg.add<uint32_t>(windowTextId); @@ -6896,16 +6995,16 @@ void ProtocolGame::sendTextWindow(uint32_t windowTextId, std::shared_ptr<Item> i if (canWrite) { msg.add<uint16_t>(maxlen); - msg.addString(item->getAttribute<std::string>(ItemAttribute_t::TEXT), "ProtocolGame::sendTextWindow - item->getAttribute<std::string>(ItemAttribute_t::TEXT)"); + msg.addString(item->getAttribute<std::string>(ItemAttribute_t::TEXT)); } else { const std::string &text = item->getAttribute<std::string>(ItemAttribute_t::TEXT); msg.add<uint16_t>(text.size()); - msg.addString(text, "ProtocolGame::sendTextWindow - text"); + msg.addString(text); } const std::string &writer = item->getAttribute<std::string>(ItemAttribute_t::WRITER); if (!writer.empty()) { - msg.addString(writer, "ProtocolGame::sendTextWindow - writer"); + msg.addString(writer); } else { msg.add<uint16_t>(0x00); } @@ -6916,7 +7015,7 @@ void ProtocolGame::sendTextWindow(uint32_t windowTextId, std::shared_ptr<Item> i auto writtenDate = item->getAttribute<time_t>(ItemAttribute_t::DATE); if (writtenDate != 0) { - msg.addString(formatDateShort(writtenDate), "ProtocolGame::sendTextWindow - formatDateShort(writtenDate)"); + msg.addString(formatDateShort(writtenDate)); } else { msg.add<uint16_t>(0x00); } @@ -6930,7 +7029,7 @@ void ProtocolGame::sendTextWindow(uint32_t windowTextId, uint32_t itemId, const msg.add<uint32_t>(windowTextId); AddItem(msg, itemId, 1, 0); msg.add<uint16_t>(text.size()); - msg.addString(text, "ProtocolGame::sendTextWindow - text"); + msg.addString(text); msg.add<uint16_t>(0x00); if (!oldProtocol) { @@ -6946,7 +7045,7 @@ void ProtocolGame::sendHouseWindow(uint32_t windowTextId, const std::string &tex msg.addByte(0x97); msg.addByte(0x00); msg.add<uint32_t>(windowTextId); - msg.addString(text, "ProtocolGame::sendHouseWindow - text"); + msg.addString(text); writeToOutputBuffer(msg); } @@ -6959,7 +7058,7 @@ void ProtocolGame::sendOutfitWindow() { bool mounted = false; if (!isSupportOutfit) { - const auto currentMount = g_game().mounts.getMountByID(player->getLastMount()); + const auto currentMount = g_game().mounts->getMountByID(player->getLastMount()); if (currentMount) { mounted = (currentOutfit.lookMount == currentMount->clientId); currentOutfit.lookMount = currentMount->clientId; @@ -6990,21 +7089,21 @@ void ProtocolGame::sendOutfitWindow() { msg.addByte(protocolOutfits.size()); for (const ProtocolOutfit &outfit : protocolOutfits) { msg.add<uint16_t>(outfit.lookType); - msg.addString(outfit.name, "ProtocolGame::sendOutfitWindow - outfit.name"); + msg.addString(outfit.name); msg.addByte(outfit.addons); } std::vector<std::shared_ptr<Mount>> mounts; - for (const auto &mount : g_game().mounts.getMounts()) { + for (const auto &mount : g_game().mounts->getMounts()) { if (player->hasMount(mount)) { - mounts.push_back(mount); + mounts.emplace_back(mount); } } msg.addByte(mounts.size()); for (const auto &mount : mounts) { msg.add<uint16_t>(mount->clientId); - msg.addString(mount->name, "ProtocolGame::sendOutfitWindow - mount->name"); + msg.addString(mount->name); } writeToOutputBuffer(msg); @@ -7023,21 +7122,21 @@ void ProtocolGame::sendOutfitWindow() { uint16_t outfitSize = 0; msg.skipBytes(2); - if (player->isAccessPlayer() && g_configManager().getBoolean(ENABLE_SUPPORT_OUTFIT, __FUNCTION__)) { + if (player->isAccessPlayer() && g_configManager().getBoolean(ENABLE_SUPPORT_OUTFIT)) { msg.add<uint16_t>(75); - msg.addString("Gamemaster", "ProtocolGame::sendOutfitWindow - Gamemaster"); + msg.addString("Gamemaster"); msg.addByte(0); msg.addByte(0x00); ++outfitSize; msg.add<uint16_t>(266); - msg.addString("Customer Support", "ProtocolGame::sendOutfitWindow - Customer Support"); + msg.addString("Customer Support"); msg.addByte(0); msg.addByte(0x00); ++outfitSize; msg.add<uint16_t>(302); - msg.addString("Community Manager", "ProtocolGame::sendOutfitWindow - Community Manager"); + msg.addString("Community Manager"); msg.addByte(0); msg.addByte(0x00); ++outfitSize; @@ -7049,14 +7148,14 @@ void ProtocolGame::sendOutfitWindow() { uint8_t addons; if (player->getOutfitAddons(outfit, addons)) { msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendOutfitWindow - outfit->name"); + msg.addString(outfit->name); msg.addByte(addons); msg.addByte(0x00); ++outfitSize; } else if (outfit->lookType == 1210 || outfit->lookType == 1211) { if (player->canWear(1210, 0) || player->canWear(1211, 0)) { msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendOutfitWindow - outfit->name"); + msg.addString(outfit->name); msg.addByte(3); msg.addByte(0x02); ++outfitSize; @@ -7064,14 +7163,14 @@ void ProtocolGame::sendOutfitWindow() { } else if (outfit->lookType == 1456 || outfit->lookType == 1457) { if (player->canWear(1456, 0) || player->canWear(1457, 0)) { msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendOutfitWindow - outfit->name"); + msg.addString(outfit->name); msg.addByte(3); msg.addByte(0x03); ++outfitSize; } } else if (outfit->from == "store") { msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendOutfitWindow - outfit->name"); + msg.addString(outfit->name); msg.addByte(outfit->lookType >= 962 && outfit->lookType <= 975 ? 0 : 3); msg.addByte(0x01); msg.add<uint32_t>(0x00); @@ -7093,16 +7192,16 @@ void ProtocolGame::sendOutfitWindow() { uint16_t mountSize = 0; msg.skipBytes(2); - const auto mounts = g_game().mounts.getMounts(); + const auto mounts = g_game().mounts->getMounts(); for (const auto &mount : mounts) { if (player->hasMount(mount)) { msg.add<uint16_t>(mount->clientId); - msg.addString(mount->name, "ProtocolGame::sendOutfitWindow - mount->name"); + msg.addString(mount->name); msg.addByte(0x00); ++mountSize; } else if (mount->type == "store") { msg.add<uint16_t>(mount->clientId); - msg.addString(mount->name, "ProtocolGame::sendOutfitWindow - mount->name"); + msg.addString(mount->name); msg.addByte(0x01); msg.add<uint32_t>(0x00); ++mountSize; @@ -7131,7 +7230,7 @@ void ProtocolGame::sendOutfitWindow() { } msg.add<uint16_t>(familiar->lookType); - msg.addString(familiar->name, "ProtocolGame::sendOutfitWindow - familiar.name"); + msg.addString(familiar->name); msg.addByte(0x00); if (++familiarSize == limitFamiliars) { break; @@ -7152,7 +7251,7 @@ void ProtocolGame::sendOutfitWindow() { writeToOutputBuffer(msg); } -void ProtocolGame::sendPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackpos) { +void ProtocolGame::sendPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos) { if (!podium || oldProtocol) { g_logger().error("[{}] item is nullptr", __FUNCTION__); return; @@ -7195,7 +7294,7 @@ void ProtocolGame::sendPodiumWindow(std::shared_ptr<Item> podium, const Position } msg.add<uint16_t>(outfit->lookType); - msg.addString(outfit->name, "ProtocolGame::sendPodiumWindow - outfit->name"); + msg.addString(outfit->name); msg.addByte(addons); msg.addByte(0x00); if (++outfitSize == limitOutfits) { @@ -7213,11 +7312,11 @@ void ProtocolGame::sendPodiumWindow(std::shared_ptr<Item> podium, const Position uint16_t mountSize = 0; msg.skipBytes(2); - const auto mounts = g_game().mounts.getMounts(); + const auto mounts = g_game().mounts->getMounts(); for (const auto &mount : mounts) { if (player->hasMount(mount)) { msg.add<uint16_t>(mount->clientId); - msg.addString(mount->name, "ProtocolGame::sendPodiumWindow - mount->name"); + msg.addString(mount->name); msg.addByte(0x00); if (++mountSize == limitMounts) { break; @@ -7267,8 +7366,8 @@ void ProtocolGame::sendVIP(uint32_t guid, const std::string &name, const std::st NetworkMessage msg; msg.addByte(0xD2); msg.add<uint32_t>(guid); - msg.addString(name, "ProtocolGame::sendVIP - name"); - msg.addString(description, "ProtocolGame::sendVIP - description"); + msg.addString(name); + msg.addString(description); msg.add<uint32_t>(std::min<uint32_t>(10, icon)); msg.addByte(notify ? 0x01 : 0x00); msg.addByte(enumToValue(status)); @@ -7297,7 +7396,7 @@ void ProtocolGame::sendVIPGroups() { msg.addByte(vipGroups.size()); // vipGroups.size() for (const auto &vipGroup : vipGroups) { msg.addByte(vipGroup->id); - msg.addString(vipGroup->name, "ProtocolGame::sendVIP - vipGroup.name"); + msg.addString(vipGroup->name); msg.addByte(vipGroup->customizable ? 0x01 : 0x00); // 0x00 = not Customizable, 0x01 = Customizable } msg.addByte(player->vip()->getMaxGroupEntries() - vipGroups.size()); // max vip groups @@ -7368,7 +7467,7 @@ void ProtocolGame::sendPreyData(const std::unique_ptr<PreySlot> &slot) { std::vector<uint16_t> validRaceIds; for (auto raceId : slot->raceIdList) { if (g_monsters().getMonsterTypeByRaceId(raceId)) { - validRaceIds.push_back(raceId); + validRaceIds.emplace_back(raceId); } else { g_logger().error("[ProtocolGame::sendPreyData] - Unknown monster type raceid: {}, removing prey slot from player {}", raceId, player->getName()); // Remove wrong raceid from slot @@ -7392,7 +7491,7 @@ void ProtocolGame::sendPreyData(const std::unique_ptr<PreySlot> &slot) { // Empty } else if (slot->state == PreyDataState_Active) { if (const auto mtype = g_monsters().getMonsterTypeByRaceId(slot->selectedRaceId)) { - msg.addString(mtype->name, "ProtocolGame::sendPreyData - mtype->name"); + msg.addString(mtype->name); const Outfit_t outfit = mtype->info.outfit; msg.add<uint16_t>(outfit.lookType); if (outfit.lookType == 0) { @@ -7418,7 +7517,7 @@ void ProtocolGame::sendPreyData(const std::unique_ptr<PreySlot> &slot) { continue; } - msg.addString(mtype->name, "ProtocolGame::sendPreyData - mtype->name"); + msg.addString(mtype->name); const Outfit_t outfit = mtype->info.outfit; msg.add<uint16_t>(outfit.lookType); if (outfit.lookType == 0) { @@ -7443,7 +7542,7 @@ void ProtocolGame::sendPreyData(const std::unique_ptr<PreySlot> &slot) { continue; } - msg.addString(mtype->name, "ProtocolGame::sendPreyData - mtype->name"); + msg.addString(mtype->name); const Outfit_t outfit = mtype->info.outfit; msg.add<uint16_t>(outfit.lookType); if (outfit.lookType == 0) { @@ -7491,12 +7590,12 @@ void ProtocolGame::sendPreyPrices() { msg.addByte(0xE9); msg.add<uint32_t>(player->getPreyRerollPrice()); if (!oldProtocol) { - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE, __FUNCTION__))); - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(PREY_BONUS_REROLL_PRICE))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(PREY_SELECTION_LIST_PRICE))); msg.add<uint32_t>(player->getTaskHuntingRerollPrice()); msg.add<uint32_t>(player->getTaskHuntingRerollPrice()); - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(TASK_HUNTING_SELECTION_LIST_PRICE, __FUNCTION__))); - msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(TASK_HUNTING_BONUS_REROLL_PRICE, __FUNCTION__))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(TASK_HUNTING_SELECTION_LIST_PRICE))); + msg.addByte(static_cast<uint8_t>(g_configManager().getNumber(TASK_HUNTING_BONUS_REROLL_PRICE))); } writeToOutputBuffer(msg); @@ -7511,18 +7610,18 @@ void ProtocolGame::sendModalWindow(const ModalWindow &modalWindow) { msg.addByte(0xFA); msg.add<uint32_t>(modalWindow.id); - msg.addString(modalWindow.title, "ProtocolGame::sendModalWindow - modalWindow.title"); - msg.addString(modalWindow.message, "ProtocolGame::sendModalWindow - modalWindow.message"); + msg.addString(modalWindow.title); + msg.addString(modalWindow.message); msg.addByte(modalWindow.buttons.size()); for (const auto &it : modalWindow.buttons) { - msg.addString(it.first, "ProtocolGame::sendModalWindow - it.first"); + msg.addString(it.first); msg.addByte(it.second); } msg.addByte(modalWindow.choices.size()); for (const auto &it : modalWindow.choices) { - msg.addString(it.first, "ProtocolGame::sendModalWindow - it.first"); + msg.addString(it.first); msg.addByte(it.second); } @@ -7534,7 +7633,7 @@ void ProtocolGame::sendModalWindow(const ModalWindow &modalWindow) { } ////////////// Add common messages -void ProtocolGame::AddCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, bool known, uint32_t remove) { +void ProtocolGame::AddCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, bool known, uint32_t remove) { CreatureType_t creatureType = creature->getType(); std::shared_ptr<Player> otherPlayer = creature->getPlayer(); @@ -7562,7 +7661,7 @@ void ProtocolGame::AddCreature(NetworkMessage &msg, std::shared_ptr<Creature> cr if (!oldProtocol && creature->isHealthHidden()) { msg.addString(std::string()); } else { - msg.addString(creature->getName(), "ProtocolGame::AddCreature - creature->getName()"); + msg.addString(creature->getName()); } } @@ -7717,7 +7816,7 @@ void ProtocolGame::AddPlayerSkills(NetworkMessage &msg) { if (oldProtocol) { for (uint8_t i = SKILL_FIRST; i <= SKILL_FISHING; ++i) { - skills_t skill = static_cast<skills_t>(i); + auto skill = static_cast<skills_t>(i); msg.add<uint16_t>(std::min<int32_t>(player->getSkillLevel(skill), std::numeric_limits<uint16_t>::max())); msg.add<uint16_t>(player->getBaseSkill(skill)); msg.addByte(std::min<uint8_t>(100, static_cast<uint8_t>(player->getSkillPercent(skill)))); @@ -7729,7 +7828,7 @@ void ProtocolGame::AddPlayerSkills(NetworkMessage &msg) { msg.add<uint16_t>(player->getMagicLevelPercent() * 100); for (uint8_t i = SKILL_FIRST; i <= SKILL_FISHING; ++i) { - skills_t skill = static_cast<skills_t>(i); + auto skill = static_cast<skills_t>(i); msg.add<uint16_t>(std::min<int32_t>(player->getSkillLevel(skill), std::numeric_limits<uint16_t>::max())); msg.add<uint16_t>(player->getBaseSkill(skill)); msg.add<uint16_t>(player->getLoyaltySkill(skill)); @@ -7741,7 +7840,7 @@ void ProtocolGame::AddPlayerSkills(NetworkMessage &msg) { if (!oldProtocol && (i == SKILL_LIFE_LEECH_CHANCE || i == SKILL_MANA_LEECH_CHANCE)) { continue; } - skills_t skill = static_cast<skills_t>(i); + auto skill = static_cast<skills_t>(i); msg.add<uint16_t>(std::min<int32_t>(player->getSkillLevel(skill), std::numeric_limits<uint16_t>::max())); msg.add<uint16_t>(player->getBaseSkill(skill)); } @@ -7781,10 +7880,9 @@ void ProtocolGame::addImbuementInfo(NetworkMessage &msg, uint16_t imbuementId) c const CategoryImbuement* categoryImbuement = g_imbuements().getCategoryByID(imbuement->getCategory()); msg.add<uint32_t>(imbuementId); - msg.addString(baseImbuement->name + " " + imbuement->getName(), "ProtocolGame::addImbuementInfo - baseImbuement->name + " - " + imbuement->getName()"); - msg.addString(imbuement->getDescription(), "ProtocolGame::addImbuementInfo - imbuement->getDescription()"); - msg.addString(categoryImbuement->name + imbuement->getSubGroup(), "ProtocolGame::addImbuementInfo - categoryImbuement->name + imbuement->getSubGroup()"); + msg.addString(baseImbuement->name + " " + imbuement->getName()); + msg.addString(imbuement->getDescription()); + msg.addString(categoryImbuement->name + imbuement->getSubGroup()); msg.add<uint16_t>(imbuement->getIconID()); msg.add<uint32_t>(baseImbuement->duration); @@ -7797,7 +7895,7 @@ void ProtocolGame::addImbuementInfo(NetworkMessage &msg, uint16_t imbuementId) c for (const auto &itm : items) { const ItemType &it = Item::items[itm.first]; msg.add<uint16_t>(itm.first); - msg.addString(it.name, "ProtocolGame::addImbuementInfo - it.name"); + msg.addString(it.name); msg.add<uint16_t>(itm.second); } @@ -7806,7 +7904,7 @@ void ProtocolGame::addImbuementInfo(NetworkMessage &msg, uint16_t imbuementId) c msg.add<uint32_t>(baseImbuement->protectionPrice); } -void ProtocolGame::openImbuementWindow(std::shared_ptr<Item> item) { +void ProtocolGame::openImbuementWindow(const std::shared_ptr<Item> &item) { if (!item || item->isRemoved()) { return; } @@ -7869,15 +7967,15 @@ void ProtocolGame::sendMessageDialog(const std::string &message) { NetworkMessage msg; msg.addByte(0xED); msg.addByte(0x14); // Unknown type - msg.addString(message, "ProtocolGame::sendMessageDialog - message"); + msg.addString(message); writeToOutputBuffer(msg); } -void ProtocolGame::sendImbuementResult(const std::string message) { +void ProtocolGame::sendImbuementResult(const std::string &message) { NetworkMessage msg; msg.addByte(0xED); msg.addByte(0x01); - msg.addString(message, "ProtocolGame::sendImbuementResult - message"); + msg.addString(message); writeToOutputBuffer(msg); } @@ -7905,7 +8003,7 @@ void ProtocolGame::sendSpecialContainersAvailable() { writeToOutputBuffer(msg); } -void ProtocolGame::updatePartyTrackerAnalyzer(const std::shared_ptr<Party> party) { +void ProtocolGame::updatePartyTrackerAnalyzer(const std::shared_ptr<Party> &party) { if (oldProtocol || !player || !party || !party->getLeader()) { return; } @@ -7938,14 +8036,14 @@ void ProtocolGame::updatePartyTrackerAnalyzer(const std::shared_ptr<Party> party msg.addByte(static_cast<uint8_t>(party->membersData.size())); for (const std::shared_ptr<PartyAnalyzer> &analyzer : party->membersData) { msg.add<uint32_t>(analyzer->id); - msg.addString(analyzer->name, "ProtocolGame::updatePartyTrackerAnalyzer - analyzer->name"); + msg.addString(analyzer->name); } } writeToOutputBuffer(msg); } -void ProtocolGame::AddCreatureLight(NetworkMessage &msg, std::shared_ptr<Creature> creature) { +void ProtocolGame::AddCreatureLight(NetworkMessage &msg, const std::shared_ptr<Creature> &creature) { LightInfo lightInfo = creature->getCreatureLight(); msg.addByte(0x8D); @@ -7965,7 +8063,7 @@ void ProtocolGame::RemoveTileThing(NetworkMessage &msg, const Position &pos, uin msg.addByte(static_cast<uint8_t>(stackpos)); } -void ProtocolGame::sendKillTrackerUpdate(std::shared_ptr<Container> corpse, const std::string &name, const Outfit_t creatureOutfit) { +void ProtocolGame::sendKillTrackerUpdate(const std::shared_ptr<Container> &corpse, const std::string &name, const Outfit_t creatureOutfit) { if (oldProtocol) { return; } @@ -7974,7 +8072,7 @@ void ProtocolGame::sendKillTrackerUpdate(std::shared_ptr<Container> corpse, cons NetworkMessage msg; msg.addByte(0xD1); - msg.addString(name, "ProtocolGame::sendKillTrackerUpdate - name"); + msg.addString(name); msg.add<uint16_t>(creatureOutfit.lookType ? creatureOutfit.lookType : 21); msg.addByte(creatureOutfit.lookType ? creatureOutfit.lookHead : 0x00); msg.addByte(creatureOutfit.lookType ? creatureOutfit.lookBody : 0x00); @@ -7992,7 +8090,7 @@ void ProtocolGame::sendKillTrackerUpdate(std::shared_ptr<Container> corpse, cons writeToOutputBuffer(msg); } -void ProtocolGame::sendUpdateSupplyTracker(std::shared_ptr<Item> item) { +void ProtocolGame::sendUpdateSupplyTracker(const std::shared_ptr<Item> &item) { if (oldProtocol || !player || !item) { return; } @@ -8027,7 +8125,7 @@ void ProtocolGame::sendUpdateImpactTracker(CombatType_t type, int32_t amount) { writeToOutputBuffer(msg); } -void ProtocolGame::sendUpdateInputAnalyzer(CombatType_t type, int32_t amount, std::string target) { +void ProtocolGame::sendUpdateInputAnalyzer(CombatType_t type, int32_t amount, const std::string &target) { if (!player || oldProtocol) { return; } @@ -8042,7 +8140,7 @@ void ProtocolGame::sendUpdateInputAnalyzer(CombatType_t type, int32_t amount, st msg.addByte(ANALYZER_DAMAGE_RECEIVED); msg.add<uint32_t>(amount); msg.addByte(clientElement); - msg.addString(target, "ProtocolGame::sendUpdateInputAnalyzer - target"); + msg.addString(target); writeToOutputBuffer(msg); } @@ -8116,7 +8214,7 @@ void ProtocolGame::sendTaskHuntingData(const std::unique_ptr<TaskHuntingSlot> &s writeToOutputBuffer(msg); } -void ProtocolGame::MoveUpCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, const Position &newPos, const Position &oldPos) { +void ProtocolGame::MoveUpCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, const Position &newPos, const Position &oldPos) { if (creature != player) { return; } @@ -8160,7 +8258,7 @@ void ProtocolGame::MoveUpCreature(NetworkMessage &msg, std::shared_ptr<Creature> GetMapDescription(oldPos.x - MAP_MAX_CLIENT_VIEW_PORT_X, oldPos.y - MAP_MAX_CLIENT_VIEW_PORT_Y, newPos.z, (MAP_MAX_CLIENT_VIEW_PORT_X + 1) * 2, 1, msg); } -void ProtocolGame::MoveDownCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, const Position &newPos, const Position &oldPos) { +void ProtocolGame::MoveDownCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, const Position &newPos, const Position &oldPos) { if (creature != player) { return; } @@ -8229,9 +8327,9 @@ void ProtocolGame::AddShopItem(NetworkMessage &msg, const ShopBlock &shopBlock) // If not send "itemName" variable from the npc shop, will registered the name that is in items.xml if (shopBlock.itemName.empty()) { - msg.addString(it.name, "ProtocolGame::AddShopItem - it.name"); + msg.addString(it.name); } else { - msg.addString(shopBlock.itemName, "ProtocolGame::AddShopItem - shopBlock.itemName"); + msg.addString(shopBlock.itemName); } msg.add<uint32_t>(it.weight); msg.add<uint32_t>(shopBlock.itemBuyPrice == 4294967295 ? 0 : shopBlock.itemBuyPrice); @@ -8279,7 +8377,7 @@ void ProtocolGame::parseInventoryImbuements(NetworkMessage &msg) { g_game().playerRequestInventoryImbuements(player->getID(), isTrackerOpen); } -void ProtocolGame::sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> items) { +void ProtocolGame::sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> &items) { if (oldProtocol) { return; } @@ -8313,8 +8411,7 @@ void ProtocolGame::sendInventoryImbuements(const std::map<Slots_t, std::shared_p const BaseImbuement* baseImbuement = g_imbuements().getBaseByID(imbuement->getBaseID()); msg.addByte(0x01); - msg.addString(baseImbuement->name + " " + imbuement->getName(), "ProtocolGame::sendInventoryImbuements - baseImbuement->name + " - " + imbuement->getName()"); + msg.addString(baseImbuement->name + " " + imbuement->getName()); msg.add<uint16_t>(imbuement->getIconID()); msg.add<uint32_t>(imbuementInfo.duration); @@ -8372,7 +8469,7 @@ void ProtocolGame::sendItemsPrice() { writeToOutputBuffer(msg); } -void ProtocolGame::reloadCreature(std::shared_ptr<Creature> creature) { +void ProtocolGame::reloadCreature(const std::shared_ptr<Creature> &creature) { if (!creature || !canSee(creature)) { return; } @@ -8415,7 +8512,7 @@ void ProtocolGame::sendOpenStash() { msg.add<uint16_t>(item.first); msg.add<uint32_t>(item.second); } - msg.add<uint16_t>(static_cast<uint16_t>(g_configManager().getNumber(STASH_ITEMS, __FUNCTION__) - getStashSize(list))); + msg.add<uint16_t>(static_cast<uint16_t>(g_configManager().getNumber(STASH_ITEMS) - getStashSize(list))); writeToOutputBuffer(msg); } @@ -8434,11 +8531,11 @@ void ProtocolGame::parseStashWithdraw(NetworkMessage &msg) { return; } - Supply_Stash_Actions_t action = static_cast<Supply_Stash_Actions_t>(msg.getByte()); + auto action = static_cast<Supply_Stash_Actions_t>(msg.getByte()); switch (action) { case SUPPLY_STASH_ACTION_STOW_ITEM: { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); uint32_t count = msg.getByte(); g_game().playerStowItem(player->getID(), pos, itemId, stackpos, count, false); @@ -8446,21 +8543,21 @@ void ProtocolGame::parseStashWithdraw(NetworkMessage &msg) { } case SUPPLY_STASH_ACTION_STOW_CONTAINER: { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerStowItem(player->getID(), pos, itemId, stackpos, 0, false); break; } case SUPPLY_STASH_ACTION_STOW_STACK: { Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); g_game().playerStowItem(player->getID(), pos, itemId, stackpos, 0, true); break; } case SUPPLY_STASH_ACTION_WITHDRAW: { - uint16_t itemId = msg.get<uint16_t>(); - uint32_t count = msg.get<uint32_t>(); + auto itemId = msg.get<uint16_t>(); + auto count = msg.get<uint32_t>(); uint8_t stackpos = msg.getByte(); g_game().playerStashWithdraw(player->getID(), itemId, count, stackpos); break; @@ -8571,7 +8668,7 @@ void ProtocolGame::parseDepotSearchItemRequest(NetworkMessage &msg) { return; } - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t itemTier = 0; if (Item::items[itemId].upgradeClassification > 0) { itemTier = msg.getByte(); @@ -8585,7 +8682,7 @@ void ProtocolGame::parseRetrieveDepotSearch(NetworkMessage &msg) { return; } - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t itemTier = 0; if (Item::items[itemId].upgradeClassification > 0) { itemTier = msg.getByte(); @@ -8604,7 +8701,7 @@ void ProtocolGame::parseOpenParentContainer(NetworkMessage &msg) { g_game().playerRequestOpenContainerFromDepotSearch(player->getID(), pos); } -void ProtocolGame::sendUpdateCreature(std::shared_ptr<Creature> creature) { +void ProtocolGame::sendUpdateCreature(const std::shared_ptr<Creature> &creature) { if (oldProtocol || !creature || !player) { return; } @@ -8631,7 +8728,7 @@ void ProtocolGame::sendUpdateCreature(std::shared_ptr<Creature> creature) { writeToOutputBuffer(msg); } -void ProtocolGame::getForgeInfoMap(std::shared_ptr<Item> item, std::map<uint16_t, std::map<uint8_t, uint16_t>> &itemsMap) const { +void ProtocolGame::getForgeInfoMap(const std::shared_ptr<Item> &item, std::map<uint16_t, std::map<uint8_t, uint16_t>> &itemsMap) const { std::map<uint8_t, uint16_t> itemInfo; itemInfo.insert({ item->getTier(), item->getItemCount() }); auto [first, inserted] = itemsMap.try_emplace(item->getID(), itemInfo); @@ -8651,7 +8748,7 @@ void ProtocolGame::sendForgeSkillStats(NetworkMessage &msg) const { std::vector<Slots_t> slots { CONST_SLOT_LEFT, CONST_SLOT_ARMOR, CONST_SLOT_HEAD, CONST_SLOT_LEGS }; for (const auto &slot : slots) { double_t skill = 0; - if (std::shared_ptr<Item> item = player->getInventoryItem(slot); item) { + if (const auto &item = player->getInventoryItem(slot); item) { const ItemType &it = Item::items[item->getID()]; if (it.isWeapon()) { skill = item->getFatalChance() * 100; @@ -8836,14 +8933,14 @@ void ProtocolGame::parseSendBosstiarySlots() { bossesUnlockedSize--; } - bool isTodaySlotUnlocked = g_configManager().getBoolean(BOOSTED_BOSS_SLOT, __FUNCTION__); + bool isTodaySlotUnlocked = g_configManager().getBoolean(BOOSTED_BOSS_SLOT); msg.addByte(isTodaySlotUnlocked ? 1 : 0); msg.add<uint32_t>(boostedBossId); if (isTodaySlotUnlocked && boostedBossId != 0) { auto boostedBossKillCount = player->getBestiaryKillCount(static_cast<uint16_t>(boostedBossId)); - auto boostedLootBonus = static_cast<uint16_t>(g_configManager().getNumber(BOOSTED_BOSS_LOOT_BONUS, __FUNCTION__)); - auto bosstiaryMultiplier = static_cast<uint8_t>(g_configManager().getNumber(BOSSTIARY_KILL_MULTIPLIER, __FUNCTION__)); - auto boostedKillBonus = static_cast<uint8_t>(g_configManager().getNumber(BOOSTED_BOSS_KILL_BONUS, __FUNCTION__)); + auto boostedLootBonus = static_cast<uint16_t>(g_configManager().getNumber(BOOSTED_BOSS_LOOT_BONUS)); + auto bosstiaryMultiplier = static_cast<uint8_t>(g_configManager().getNumber(BOSSTIARY_KILL_MULTIPLIER)); + auto boostedKillBonus = static_cast<uint8_t>(g_configManager().getNumber(BOOSTED_BOSS_KILL_BONUS)); sendBosstiarySlotsBytes(msg, static_cast<uint8_t>(boostedBossRace), boostedBossKillCount, boostedLootBonus, bosstiaryMultiplier + boostedKillBonus, 0, 0); } @@ -8887,7 +8984,7 @@ void ProtocolGame::parseBosstiarySlot(NetworkMessage &msg) { } uint8_t slotBossId = msg.getByte(); - uint32_t selectedBossId = msg.get<uint32_t>(); + auto selectedBossId = msg.get<uint32_t>(); g_game().playerBosstiarySlot(player->getID(), slotBossId, selectedBossId); } @@ -8913,9 +9010,9 @@ void ProtocolGame::sendPodiumDetails(NetworkMessage &msg, const std::vector<uint // "Tantugly's Head" boss have to send other looktype to the podium if (monsterOutfit.lookTypeEx == 35105) { monsterOutfit.lookTypeEx = 39003; - msg.addString("Tentugly", "ProtocolGame::sendPodiumDetails - Tentugly"); + msg.addString("Tentugly"); } else { - msg.addString(mType->name, "ProtocolGame::sendPodiumDetails - mType->name"); + msg.addString(mType->name); } msg.add<uint16_t>(monsterOutfit.lookType); if (isLookType) { @@ -8930,7 +9027,7 @@ void ProtocolGame::sendPodiumDetails(NetworkMessage &msg, const std::vector<uint } } -void ProtocolGame::sendMonsterPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackPos) { +void ProtocolGame::sendMonsterPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackPos) { if (!podium || oldProtocol) { g_logger().error("[{}] item is nullptr", __FUNCTION__); return; @@ -8995,9 +9092,9 @@ void ProtocolGame::parseSetMonsterPodium(NetworkMessage &msg) const { } // For some reason the cip sends uint32_t, but we use uint16_t, so let's just ignore that - uint16_t monsterRaceId = (uint16_t)msg.get<uint32_t>(); + auto monsterRaceId = static_cast<uint16_t>(msg.get<uint32_t>()); Position pos = msg.getPosition(); - uint16_t itemId = msg.get<uint16_t>(); + auto itemId = msg.get<uint16_t>(); uint8_t stackpos = msg.getByte(); uint8_t direction = msg.getByte(); uint8_t podiumVisible = msg.getByte(); @@ -9099,7 +9196,7 @@ void ProtocolGame::sendDoubleSoundEffect( } void ProtocolGame::parseOpenWheel(NetworkMessage &msg) { - if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { return; } @@ -9108,7 +9205,7 @@ void ProtocolGame::parseOpenWheel(NetworkMessage &msg) { } void ProtocolGame::parseWheelGemAction(NetworkMessage &msg) { - if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { return; } @@ -9116,7 +9213,7 @@ void ProtocolGame::parseWheelGemAction(NetworkMessage &msg) { } void ProtocolGame::sendOpenWheelWindow(uint32_t ownerId) { - if (!player || oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (!player || oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { return; } @@ -9126,7 +9223,7 @@ void ProtocolGame::sendOpenWheelWindow(uint32_t ownerId) { } void ProtocolGame::parseSaveWheel(NetworkMessage &msg) { - if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM, __FUNCTION__)) { + if (oldProtocol || !g_configManager().getBoolean(TOGGLE_WHEELSYSTEM)) { return; } diff --git a/src/server/network/protocol/protocolgame.hpp b/src/server/network/protocol/protocolgame.hpp index f6b7be93c..27fa6c871 100644 --- a/src/server/network/protocol/protocolgame.hpp +++ b/src/server/network/protocol/protocolgame.hpp @@ -10,12 +10,25 @@ #pragma once #include "server/network/protocol/protocol.hpp" -#include "creatures/interactions/chat.hpp" -#include "creatures/creature.hpp" -#include "enums/forge_conversion.hpp" -#include "creatures/players/cyclopedia/player_badge.hpp" -#include "creatures/players/cyclopedia/player_cyclopedia.hpp" -#include "creatures/players/cyclopedia/player_title.hpp" +#include "game/movement/position.hpp" +#include "utils/utils_definitions.hpp" + +enum class PlayerIcon : uint8_t; +enum class IconBakragore : uint8_t; +enum class ForgeAction_t : uint8_t; +enum MessageClasses : uint8_t; +enum ReturnValue : uint16_t; +enum TextColor_t : uint8_t; +enum OperatingSystem_t : uint8_t; +enum ChannelEvent_t : uint8_t; +enum CyclopediaCharacterInfoType_t : uint8_t; +enum Resource_t : uint8_t; +enum class VipStatus_t : uint8_t; +enum SpellGroup_t : uint8_t; +enum Slots_t : uint8_t; +enum CombatType_t : uint8_t; +enum SoundEffect_t : uint16_t; +enum class SourceEffect_t : uint8_t; class NetworkMessage; class Player; @@ -25,18 +38,36 @@ class House; class Container; class Tile; class Connection; -class Quest; class ProtocolGame; class PreySlot; class TaskHuntingSlot; class TaskHuntingOption; +class Item; +class Party; +class Creature; +class MonsterType; +class Npc; struct ModalWindow; +struct Position; +struct Outfit_t; +struct RecentDeathEntry; +struct RecentPvPKillEntry; struct Achievement; -struct Badge; -struct Title; +struct MarketOffer; +struct ShopBlock; +struct MarketOfferEx; +struct HistoryMarketOffer; +struct LightInfo; using ProtocolGame_ptr = std::shared_ptr<ProtocolGame>; +using ItemVector = std::vector<std::shared_ptr<Item>>; +using InvitedMap = std::map<uint32_t, std::shared_ptr<Player>>; +using UsersMap = std::map<uint32_t, std::shared_ptr<Player>>; +using MarketOfferList = std::list<MarketOffer>; +using HistoryMarketOfferList = std::list<HistoryMarketOffer>; +using ItemsTierCountList = std::map<uint16_t, std::map<uint8_t, uint32_t>>; +using StashItemList = std::map<uint16_t, uint32_t>; struct TextMessage { TextMessage() = default; @@ -46,10 +77,10 @@ struct TextMessage { MessageClasses type = MESSAGE_STATUS; std::string text; Position position; - uint16_t channelId; + uint16_t channelId {}; struct { - int32_t value = 0; + int32_t value {}; TextColor_t color = TEXTCOLOR_NONE; } primary, secondary; }; @@ -66,13 +97,13 @@ class ProtocolGame final : public Protocol { return "gameworld protocol"; } - explicit ProtocolGame(Connection_ptr initConnection); + explicit ProtocolGame(const Connection_ptr &initConnection); void login(const std::string &name, uint32_t accnumber, OperatingSystem_t operatingSystem); void logout(bool displayEffect, bool forced); - void AddItem(NetworkMessage &msg, std::shared_ptr<Item> item); - void AddItem(NetworkMessage &msg, uint16_t id, uint8_t count, uint8_t tier); + void AddItem(NetworkMessage &msg, const std::shared_ptr<Item> &item); + void AddItem(NetworkMessage &msg, uint16_t id, uint8_t count, uint8_t tier) const; uint16_t getVersion() const { return version; @@ -91,12 +122,12 @@ class ProtocolGame final : public Protocol { void checkCreatureAsKnown(uint32_t id, bool &known, uint32_t &removedKnown); bool canSee(int32_t x, int32_t y, int32_t z) const; - bool canSee(std::shared_ptr<Creature>) const; + bool canSee(const std::shared_ptr<Creature> &) const; bool canSee(const Position &pos) const; // we have all the parse methods void parsePacket(NetworkMessage &msg) override; - void parsePacketFromDispatcher(NetworkMessage msg, uint8_t recvbyte); + void parsePacketFromDispatcher(NetworkMessage &msg, uint8_t recvbyte); void onRecvFirstMessage(NetworkMessage &msg) override; void onConnect() override; @@ -129,7 +160,7 @@ class ProtocolGame final : public Protocol { void sendSessionEndInformation(SessionEndInformations information); - void sendItemInspection(uint16_t itemId, uint8_t itemCount, std::shared_ptr<Item> item, bool cyclopedia); + void sendItemInspection(uint16_t itemId, uint8_t itemCount, const std::shared_ptr<Item> &item, bool cyclopedia); void parseInspectionObject(NetworkMessage &msg); void parseFriendSystemAction(NetworkMessage &msg); @@ -143,7 +174,7 @@ class ProtocolGame final : public Protocol { void parseGreet(NetworkMessage &msg); void parseBugReport(NetworkMessage &msg); - void parseDebugAssert(NetworkMessage &msg); + void parseOfferDescription(NetworkMessage &msg); void parsePreyAction(NetworkMessage &msg); void parseSendResourceBalance(); void parseRuleViolationReport(NetworkMessage &msg); @@ -162,7 +193,6 @@ class ProtocolGame final : public Protocol { void parseSendBuyCharmRune(NetworkMessage &msg); void parseBestiarysendMonsterData(NetworkMessage &msg); void parseCyclopediaMonsterTracker(NetworkMessage &msg); - void parseObjectInfo(NetworkMessage &msg); void parseTeleport(NetworkMessage &msg); void parseThrow(NetworkMessage &msg); @@ -240,13 +270,14 @@ class ProtocolGame final : public Protocol { void sendChannel(uint16_t channelId, const std::string &channelName, const UsersMap* channelUsers, const InvitedMap* invitedUsers); void sendOpenPrivateChannel(const std::string &receiver); void sendExperienceTracker(int64_t rawExp, int64_t finalExp); - void sendToChannel(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, uint16_t channelId); - void sendPrivateMessage(std::shared_ptr<Player> speaker, SpeakClasses type, const std::string &text); - void sendIcons(uint32_t icons); + void sendToChannel(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, uint16_t channelId); + void sendPrivateMessage(const std::shared_ptr<Player> &speaker, SpeakClasses type, const std::string &text); + void sendIcons(const std::unordered_set<PlayerIcon> &iconSet, const IconBakragore iconBakragore); + void sendIconBakragore(const IconBakragore icon); void sendFYIBox(const std::string &message); - void openImbuementWindow(std::shared_ptr<Item> item); - void sendImbuementResult(const std::string message); + void openImbuementWindow(const std::shared_ptr<Item> &item); + void sendImbuementResult(const std::string &message); void closeImbuementWindow(); void sendItemsPrice(); @@ -254,18 +285,11 @@ class ProtocolGame final : public Protocol { // Forge System void sendForgingData(); void sendOpenForge(); - void sendForgeError(const ReturnValue returnValue); + void sendForgeError(ReturnValue returnValue); void closeForgeWindow(); void parseForgeEnter(NetworkMessage &msg); void parseForgeBrowseHistory(NetworkMessage &msg); - void sendForgeFusionItem( - uint16_t itemId, - uint8_t tier, - bool success, - uint8_t bonus, - uint8_t coreCount, - bool convergence - ); + void sendForgeResult(ForgeAction_t actionType, uint16_t leftItemId, uint8_t leftTier, uint16_t rightItemId, uint8_t rightTier, bool success, uint8_t bonus, uint8_t coreCount, bool convergence); void sendForgeHistory(uint8_t page); void sendForgeSkillStats(NetworkMessage &msg) const; @@ -275,7 +299,7 @@ class ProtocolGame final : public Protocol { void parseSendBosstiarySlots(); void parseBosstiarySlot(NetworkMessage &msg); void sendPodiumDetails(NetworkMessage &msg, const std::vector<uint16_t> &toSendMonsters, bool isBoss) const; - void sendMonsterPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackPos); + void sendMonsterPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackPos); void parseSetMonsterPodium(NetworkMessage &msg) const; void sendBosstiaryCooldownTimer(); void sendBosstiaryEntryChanged(uint32_t bossid); @@ -285,28 +309,28 @@ class ProtocolGame final : public Protocol { void sendMagicEffect(const Position &pos, uint16_t type); void removeMagicEffect(const Position &pos, uint16_t type); void sendRestingStatus(uint8_t protection); - void sendCreatureHealth(std::shared_ptr<Creature> creature); - void sendPartyCreatureUpdate(std::shared_ptr<Creature> target); - void sendPartyCreatureShield(std::shared_ptr<Creature> target); - void sendPartyCreatureSkull(std::shared_ptr<Creature> target); - void sendPartyCreatureHealth(std::shared_ptr<Creature> target, uint8_t healthPercent); - void sendPartyPlayerMana(std::shared_ptr<Player> target, uint8_t manaPercent); - void sendPartyCreatureShowStatus(std::shared_ptr<Creature> target, bool showStatus); - void sendPartyPlayerVocation(std::shared_ptr<Player> target); - void sendPlayerVocation(std::shared_ptr<Player> target); + void sendCreatureHealth(const std::shared_ptr<Creature> &creature); + void sendPartyCreatureUpdate(const std::shared_ptr<Creature> &target); + void sendPartyCreatureShield(const std::shared_ptr<Creature> &target); + void sendPartyCreatureSkull(const std::shared_ptr<Creature> &target); + void sendPartyCreatureHealth(const std::shared_ptr<Creature> &target, uint8_t healthPercent); + void sendPartyPlayerMana(const std::shared_ptr<Player> &target, uint8_t manaPercent); + void sendPartyCreatureShowStatus(const std::shared_ptr<Creature> &target, bool showStatus); + void sendPartyPlayerVocation(const std::shared_ptr<Player> &target); + void sendPlayerVocation(const std::shared_ptr<Player> &target); void sendSkills(); void sendPing(); void sendPingBack(); - void sendCreatureTurn(std::shared_ptr<Creature> creature, uint32_t stackpos); - void sendCreatureSay(std::shared_ptr<Creature> creature, SpeakClasses type, const std::string &text, const Position* pos = nullptr); + void sendCreatureTurn(const std::shared_ptr<Creature> &creature, uint32_t stackpos); + void sendCreatureSay(const std::shared_ptr<Creature> &creature, SpeakClasses type, const std::string &text, const Position* pos = nullptr); // Unjust Panel void sendUnjustifiedPoints(const uint8_t &dayProgress, const uint8_t &dayLeft, const uint8_t &weekProgress, const uint8_t &weekLeft, const uint8_t &monthProgress, const uint8_t &monthLeft, const uint8_t &skullDuration); void sendCancelWalk(); - void sendChangeSpeed(std::shared_ptr<Creature> creature, uint16_t speed); + void sendChangeSpeed(const std::shared_ptr<Creature> &creature, uint16_t speed); void sendCancelTarget(); - void sendCreatureOutfit(std::shared_ptr<Creature> creature, const Outfit_t &outfit); + void sendCreatureOutfit(const std::shared_ptr<Creature> &creature, const Outfit_t &outfit); void sendStats(); void sendBasicData(); void sendTextMessage(const TextMessage &message); @@ -321,7 +345,7 @@ class ProtocolGame final : public Protocol { void sendCyclopediaCharacterCombatStats(); void sendCyclopediaCharacterRecentDeaths(uint16_t page, uint16_t pages, const std::vector<RecentDeathEntry> &entries); void sendCyclopediaCharacterRecentPvPKills(uint16_t page, uint16_t pages, const std::vector<RecentPvPKillEntry> &entries); - void sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, std::vector<std::pair<Achievement, uint32_t>> achievementsUnlocked); + void sendCyclopediaCharacterAchievements(uint16_t secretsUnlocked, const std::vector<std::pair<Achievement, uint32_t>> &achievementsUnlocked); void sendCyclopediaCharacterItemSummary(const ItemsTierCountList &inventoryItems, const ItemsTierCountList &storeInboxItems, const StashItemList &supplyStashItems, const ItemsTierCountList &depotBoxItems, const ItemsTierCountList &inboxItems); void sendCyclopediaCharacterOutfitsMounts(); void sendCyclopediaCharacterStoreSummary(); @@ -329,13 +353,13 @@ class ProtocolGame final : public Protocol { void sendCyclopediaCharacterBadges(); void sendCyclopediaCharacterTitles(); - void sendCreatureWalkthrough(std::shared_ptr<Creature> creature, bool walkthrough); - void sendCreatureShield(std::shared_ptr<Creature> creature); - void sendCreatureEmblem(std::shared_ptr<Creature> creature); - void sendCreatureSkull(std::shared_ptr<Creature> creature); - void sendCreatureType(std::shared_ptr<Creature> creature, uint8_t creatureType); + void sendCreatureWalkthrough(const std::shared_ptr<Creature> &creature, bool walkthrough); + void sendCreatureShield(const std::shared_ptr<Creature> &creature); + void sendCreatureEmblem(const std::shared_ptr<Creature> &creature); + void sendCreatureSkull(const std::shared_ptr<Creature> &creature); + void sendCreatureType(const std::shared_ptr<Creature> &creature, uint8_t creatureType); - void sendShop(std::shared_ptr<Npc> npc); + void sendShop(const std::shared_ptr<Npc> &npc); void sendCloseShop(); void sendClientCheck(); void sendGameNews(); @@ -351,15 +375,15 @@ class ProtocolGame final : public Protocol { void sendMarketCancelOffer(const MarketOfferEx &offer); void sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyOffers, const HistoryMarketOfferList &sellOffers); void sendMarketDetail(uint16_t itemId, uint8_t tier); - void sendTradeItemRequest(const std::string &traderName, std::shared_ptr<Item> item, bool ack); + void sendTradeItemRequest(const std::string &traderName, const std::shared_ptr<Item> &item, bool ack); void sendCloseTrade(); - void updatePartyTrackerAnalyzer(const std::shared_ptr<Party> party); + void updatePartyTrackerAnalyzer(const std::shared_ptr<Party> &party); void sendTextWindow(uint32_t windowTextId, uint32_t itemId, const std::string &text); - void sendTextWindow(uint32_t windowTextId, std::shared_ptr<Item> item, uint16_t maxlen, bool canWrite); + void sendTextWindow(uint32_t windowTextId, const std::shared_ptr<Item> &item, uint16_t maxlen, bool canWrite); void sendHouseWindow(uint32_t windowTextId, const std::string &text); void sendOutfitWindow(); - void sendPodiumWindow(std::shared_ptr<Item> podium, const Position &position, uint16_t itemId, uint8_t stackpos); + void sendPodiumWindow(const std::shared_ptr<Item> &podium, const Position &position, uint16_t itemId, uint8_t stackpos); 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); @@ -370,13 +394,13 @@ class ProtocolGame final : public Protocol { void sendFightModes(); - void sendCreatureLight(std::shared_ptr<Creature> creature); - void sendCreatureIcon(std::shared_ptr<Creature> creature); - void sendUpdateCreature(std::shared_ptr<Creature> creature); + void sendCreatureLight(const std::shared_ptr<Creature> &creature); + void sendCreatureIcon(const std::shared_ptr<Creature> &creature); + void sendUpdateCreature(const std::shared_ptr<Creature> &creature); void sendWorldLight(const LightInfo &lightInfo); void sendTibiaTime(int32_t time); - void sendCreatureSquare(std::shared_ptr<Creature> creature, SquareColor_t color); + void sendCreatureSquare(const std::shared_ptr<Creature> &creature, SquareColor_t color); void sendSpellCooldown(uint16_t spellId, uint32_t time); void sendSpellGroupCooldown(SpellGroup_t groupId, uint32_t time); @@ -391,46 +415,46 @@ class ProtocolGame final : public Protocol { // tiles void sendMapDescription(const Position &pos); - void sendAddTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr<Item> item); - void sendUpdateTileItem(const Position &pos, uint32_t stackpos, std::shared_ptr<Item> item); + void sendAddTileItem(const Position &pos, uint32_t stackpos, const std::shared_ptr<Item> &item); + void sendUpdateTileItem(const Position &pos, uint32_t stackpos, const std::shared_ptr<Item> &item); void sendRemoveTileThing(const Position &pos, uint32_t stackpos); - void sendUpdateTileCreature(const Position &pos, uint32_t stackpos, const std::shared_ptr<Creature> creature); - void sendUpdateTile(std::shared_ptr<Tile> tile, const Position &pos); + void sendUpdateTileCreature(const Position &pos, uint32_t stackpos, const std::shared_ptr<Creature> &creature); + void sendUpdateTile(const std::shared_ptr<Tile> &tile, const Position &pos); - void sendAddCreature(std::shared_ptr<Creature> creature, const Position &pos, int32_t stackpos, bool isLogin); - void sendMoveCreature(std::shared_ptr<Creature> creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport); + void sendAddCreature(const std::shared_ptr<Creature> &creature, const Position &pos, int32_t stackpos, bool isLogin); + void sendMoveCreature(const std::shared_ptr<Creature> &creature, const Position &newPos, int32_t newStackPos, const Position &oldPos, int32_t oldStackPos, bool teleport); // containers - void sendAddContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> item); - void sendUpdateContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> item); - void sendRemoveContainerItem(uint8_t cid, uint16_t slot, std::shared_ptr<Item> lastItem); + void sendAddContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &item); + void sendUpdateContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &item); + void sendRemoveContainerItem(uint8_t cid, uint16_t slot, const std::shared_ptr<Item> &lastItem); - void sendContainer(uint8_t cid, std::shared_ptr<Container> container, bool hasParent, uint16_t firstIndex); + void sendContainer(uint8_t cid, const std::shared_ptr<Container> &container, bool hasParent, uint16_t firstIndex); void sendCloseContainer(uint8_t cid); // quickloot void sendLootContainers(); - void sendLootStats(std::shared_ptr<Item> item, uint8_t count); + void sendLootStats(const std::shared_ptr<Item> &item, uint8_t count); // inventory - void sendInventoryItem(Slots_t slot, std::shared_ptr<Item> item); + void sendInventoryItem(Slots_t slot, const std::shared_ptr<Item> &item); void sendInventoryIds(); // messages void sendModalWindow(const ModalWindow &modalWindow); // analyzers - void sendKillTrackerUpdate(std::shared_ptr<Container> corpse, const std::string &name, const Outfit_t creatureOutfit); - void sendUpdateSupplyTracker(std::shared_ptr<Item> item); + void sendKillTrackerUpdate(const std::shared_ptr<Container> &corpse, const std::string &name, Outfit_t creatureOutfit); + void sendUpdateSupplyTracker(const std::shared_ptr<Item> &item); void sendUpdateImpactTracker(CombatType_t type, int32_t amount); - void sendUpdateInputAnalyzer(CombatType_t type, int32_t amount, std::string target); + void sendUpdateInputAnalyzer(CombatType_t type, int32_t amount, const std::string &target); // Hotkey equip/dequip item void parseHotkeyEquip(NetworkMessage &msg); // Help functions // translate a tile to clientreadable format - void GetTileDescription(std::shared_ptr<Tile> tile, NetworkMessage &msg); + void GetTileDescription(const std::shared_ptr<Tile> &tile, NetworkMessage &msg); // translate a floor to clientreadable format void GetFloorDescription(NetworkMessage &msg, int32_t x, int32_t y, int32_t z, int32_t width, int32_t height, int32_t offset, int32_t &skip); @@ -438,7 +462,7 @@ class ProtocolGame final : public Protocol { // translate a map area to clientreadable format void GetMapDescription(int32_t x, int32_t y, int32_t z, int32_t width, int32_t height, NetworkMessage &msg); - void AddCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, bool known, uint32_t remove); + void AddCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, bool known, uint32_t remove); void AddPlayerStats(NetworkMessage &msg); void AddOutfit(NetworkMessage &msg, const Outfit_t &outfit, bool addMount = true); void AddPlayerSkills(NetworkMessage &msg); @@ -446,15 +470,15 @@ class ProtocolGame final : public Protocol { void sendPremiumTrigger(); void sendMessageDialog(const std::string &message); void AddWorldLight(NetworkMessage &msg, LightInfo lightInfo); - void AddCreatureLight(NetworkMessage &msg, std::shared_ptr<Creature> creature); + void AddCreatureLight(NetworkMessage &msg, const std::shared_ptr<Creature> &creature); // tiles static void RemoveTileThing(NetworkMessage &msg, const Position &pos, uint32_t stackpos); void sendTaskHuntingData(const std::unique_ptr<TaskHuntingSlot> &slot); - void MoveUpCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, const Position &newPos, const Position &oldPos); - void MoveDownCreature(NetworkMessage &msg, std::shared_ptr<Creature> creature, const Position &newPos, const Position &oldPos); + void MoveUpCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, const Position &newPos, const Position &oldPos); + void MoveDownCreature(NetworkMessage &msg, const std::shared_ptr<Creature> &creature, const Position &newPos, const Position &oldPos); // shop void AddHiddenShopItem(NetworkMessage &msg); @@ -467,12 +491,12 @@ class ProtocolGame final : public Protocol { void sendFeatures(); void parseInventoryImbuements(NetworkMessage &msg); - void sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> items); + void sendInventoryImbuements(const std::map<Slots_t, std::shared_ptr<Item>> &items); // reloadCreature - void reloadCreature(std::shared_ptr<Creature> creature); + void reloadCreature(const std::shared_ptr<Creature> &creature); - void getForgeInfoMap(std::shared_ptr<Item> item, std::map<uint16_t, std::map<uint8_t, uint16_t>> &itemsMap) const; + void getForgeInfoMap(const std::shared_ptr<Item> &item, std::map<uint16_t, std::map<uint8_t, uint16_t>> &itemsMap) const; // Wheel void parseOpenWheel(NetworkMessage &msg); @@ -505,13 +529,12 @@ class ProtocolGame final : public Protocol { uint16_t otclientV8 = 0; bool isOTC = false; - void sendInventory(); void sendOpenStash(); void parseStashWithdraw(NetworkMessage &msg); void sendSpecialContainersAvailable(); void addBless(); void parsePacketDead(uint8_t recvbyte); - void addCreatureIcon(NetworkMessage &msg, std::shared_ptr<Creature> creature); + void addCreatureIcon(NetworkMessage &msg, const std::shared_ptr<Creature> &creature); 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); diff --git a/src/server/network/protocol/protocollogin.cpp b/src/server/network/protocol/protocollogin.cpp index d6e9e3cb9..9e28982e9 100644 --- a/src/server/network/protocol/protocollogin.cpp +++ b/src/server/network/protocol/protocollogin.cpp @@ -7,9 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "server/network/protocol/protocollogin.hpp" + +#include "config/configmanager.hpp" #include "server/network/message/outputmessage.hpp" #include "game/scheduling/dispatcher.hpp" #include "account/account.hpp" @@ -19,21 +19,21 @@ #include "core.hpp" #include "enums/account_errors.hpp" -void ProtocolLogin::disconnectClient(const std::string &message) { - auto output = OutputMessagePool::getOutputMessage(); +void ProtocolLogin::disconnectClient(const std::string &message) const { + const auto output = OutputMessagePool::getOutputMessage(); output->addByte(0x0B); - output->addString(message, "ProtocolLogin::disconnectClient - message"); + output->addString(message); send(output); disconnect(); } -void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const std::string &password) { +void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const std::string &password) const { Account account(accountDescriptor); account.setProtocolCompat(oldProtocol); - if (oldProtocol && !g_configManager().getBoolean(OLD_PROTOCOL, __FUNCTION__)) { + if (oldProtocol && !g_configManager().getBoolean(OLD_PROTOCOL)) { disconnectClient(fmt::format("Only protocol version {}.{} is allowed.", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER)); return; } else if (!oldProtocol) { @@ -41,7 +41,7 @@ void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const return; } - if (account.load() != enumToValue(AccountErrors_t::Ok) || !account.authenticate(password)) { + if (account.load() != AccountErrors_t::Ok || !account.authenticate(password)) { std::ostringstream ss; ss << (oldProtocol ? "Username" : "Email") << " or password is not correct."; disconnectClient(ss.str()); @@ -49,7 +49,7 @@ void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const } auto output = OutputMessagePool::getOutputMessage(); - const std::string &motd = g_configManager().getString(SERVER_MOTD, __FUNCTION__); + const std::string &motd = g_configManager().getString(SERVER_MOTD); if (!motd.empty()) { // Add MOTD output->addByte(0x14); @@ -57,16 +57,16 @@ void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const std::ostringstream ss; ss << g_game().getMotdNum() << "\n" << motd; - output->addString(ss.str(), "ProtocolLogin::getCharacterList - ss.str()"); + output->addString(ss.str()); } // Add session key output->addByte(0x28); - output->addString(accountDescriptor + "\n" + password, "ProtocolLogin::getCharacterList - accountDescriptor + password"); + output->addString(accountDescriptor + "\n" + password); // Add char list auto [players, result] = account.getAccountPlayers(); - if (enumToValue(AccountErrors_t::Ok) != result) { + if (AccountErrors_t::Ok != result) { g_logger().warn("Account[{}] failed to load players!", account.getID()); } @@ -75,10 +75,10 @@ void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const output->addByte(1); // number of worlds output->addByte(0); // world id - output->addString(g_configManager().getString(SERVER_NAME, __FUNCTION__), "ProtocolLogin::getCharacterList - _configManager().getString(SERVER_NAME)"); - output->addString(g_configManager().getString(IP, __FUNCTION__), "ProtocolLogin::getCharacterList - g_configManager().getString(IP)"); + output->addString(g_configManager().getString(SERVER_NAME)); + output->addString(g_configManager().getString(IP)); - output->add<uint16_t>(g_configManager().getNumber(GAME_PORT, __FUNCTION__)); + output->add<uint16_t>(g_configManager().getNumber(GAME_PORT)); output->addByte(0); @@ -86,7 +86,7 @@ void ProtocolLogin::getCharacterList(const std::string &accountDescriptor, const output->addByte(size); for (const auto &[name, deletion] : players) { output->addByte(0); - output->addString(name, "ProtocolLogin::getCharacterList - name"); + output->addString(name); } // Get premium days, check is premium and get lastday @@ -107,7 +107,7 @@ void ProtocolLogin::onRecvFirstMessage(NetworkMessage &msg) { msg.skipBytes(2); // client OS - uint16_t version = msg.get<uint16_t>(); + auto version = msg.get<uint16_t>(); // Old protocol support oldProtocol = version == 1100; @@ -174,8 +174,10 @@ void ProtocolLogin::onRecvFirstMessage(NetworkMessage &msg) { return; } - g_dispatcher().addEvent([self = std::static_pointer_cast<ProtocolLogin>(shared_from_this()), accountDescriptor, password] { - self->getCharacterList(accountDescriptor, password); - }, - "ProtocolLogin::getCharacterList"); + g_dispatcher().addEvent( + [self = std::static_pointer_cast<ProtocolLogin>(shared_from_this()), accountDescriptor, password] { + self->getCharacterList(accountDescriptor, password); + }, + __FUNCTION__ + ); } diff --git a/src/server/network/protocol/protocollogin.hpp b/src/server/network/protocol/protocollogin.hpp index 6652a8562..d3051119b 100644 --- a/src/server/network/protocol/protocollogin.hpp +++ b/src/server/network/protocol/protocollogin.hpp @@ -14,7 +14,7 @@ class NetworkMessage; class OutputMessage; -class ProtocolLogin : public Protocol { +class ProtocolLogin final : public Protocol { public: // static protocol information enum { SERVER_SENDS_FIRST = false }; @@ -24,15 +24,15 @@ class ProtocolLogin : public Protocol { return "login protocol"; } - explicit ProtocolLogin(Connection_ptr loginConnection) : + explicit ProtocolLogin(const Connection_ptr &loginConnection) : Protocol(loginConnection) { } - void onRecvFirstMessage(NetworkMessage &msg); + void onRecvFirstMessage(NetworkMessage &msg) override; private: - void disconnectClient(const std::string &message); + void disconnectClient(const std::string &message) const; - void getCharacterList(const std::string &accountDescriptor, const std::string &password); + void getCharacterList(const std::string &accountDescriptor, const std::string &password) const; bool oldProtocol = false; }; diff --git a/src/server/network/protocol/protocolstatus.cpp b/src/server/network/protocol/protocolstatus.cpp index be630886c..612c5f7e2 100644 --- a/src/server/network/protocol/protocolstatus.cpp +++ b/src/server/network/protocol/protocolstatus.cpp @@ -7,13 +7,11 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - -#include "core.hpp" - #include "server/network/protocol/protocolstatus.hpp" #include "config/configmanager.hpp" +#include "core.hpp" +#include "creatures/players/player.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "server/network/message/outputmessage.hpp" @@ -26,12 +24,12 @@ std::map<uint32_t, int64_t> ProtocolStatus::ipConnectMap; const uint64_t ProtocolStatus::start = OTSYS_TIME(true); void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { - uint32_t ip = getIP(); + const uint32_t ip = getIP(); if (ip != 0x0100007F) { - std::string ipStr = convertIPToString(ip); - if (ipStr != g_configManager().getString(IP, __FUNCTION__)) { - std::map<uint32_t, int64_t>::const_iterator it = ipConnectMap.find(ip); - if (it != ipConnectMap.end() && (OTSYS_TIME() < (it->second + g_configManager().getNumber(STATUSQUERY_TIMEOUT, __FUNCTION__)))) { + const std::string ipStr = convertIPToString(ip); + if (ipStr != g_configManager().getString(IP)) { + const auto it = ipConnectMap.find(ip); + if (it != ipConnectMap.end() && (OTSYS_TIME() < (it->second + g_configManager().getNumber(STATUSQUERY_TIMEOUT)))) { disconnect(); return; } @@ -44,10 +42,12 @@ void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { // XML info protocol case 0xFF: { if (msg.getString(4) == "info") { - g_dispatcher().addEvent([self = std::static_pointer_cast<ProtocolStatus>(shared_from_this())] { - self->sendStatusString(); - }, - "ProtocolStatus::sendStatusString"); + g_dispatcher().addEvent( + [self = std::static_pointer_cast<ProtocolStatus>(shared_from_this())] { + self->sendStatusString(); + }, + __FUNCTION__ + ); return; } break; @@ -55,15 +55,17 @@ void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { // Another ServerInfo protocol case 0x01: { - uint16_t requestedInfo = msg.get<uint16_t>(); // only a Byte is necessary, though we could add new info here + auto requestedInfo = msg.get<uint16_t>(); // only a Byte is necessary, though we could add new info here std::string characterName; if (requestedInfo & REQUEST_PLAYER_STATUS_INFO) { characterName = msg.getString(); } - g_dispatcher().addEvent([self = std::static_pointer_cast<ProtocolStatus>(shared_from_this()), requestedInfo, characterName] { - self->sendInfo(requestedInfo, characterName); - }, - "ProtocolStatus::sendInfo"); + g_dispatcher().addEvent( + [self = std::static_pointer_cast<ProtocolStatus>(shared_from_this()), requestedInfo, characterName] { + self->sendInfo(requestedInfo, characterName); + }, + __FUNCTION__ + ); return; } @@ -75,7 +77,7 @@ void ProtocolStatus::onRecvFirstMessage(NetworkMessage &msg) { } void ProtocolStatus::sendStatusString() { - auto output = OutputMessagePool::getOutputMessage(); + const auto output = OutputMessagePool::getOutputMessage(); setRawMessages(true); @@ -88,20 +90,20 @@ void ProtocolStatus::sendStatusString() { tsqp.append_attribute("version") = "1.0"; pugi::xml_node serverinfo = tsqp.append_child("serverinfo"); - uint64_t uptime = (OTSYS_TIME() - ProtocolStatus::start) / 1000; + const uint64_t uptime = (OTSYS_TIME() - ProtocolStatus::start) / 1000; serverinfo.append_attribute("uptime") = std::to_string(uptime).c_str(); - serverinfo.append_attribute("ip") = g_configManager().getString(IP, __FUNCTION__).c_str(); - serverinfo.append_attribute("servername") = g_configManager().getString(ConfigKey_t::SERVER_NAME, __FUNCTION__).c_str(); - serverinfo.append_attribute("port") = std::to_string(g_configManager().getNumber(LOGIN_PORT, __FUNCTION__)).c_str(); - serverinfo.append_attribute("location") = g_configManager().getString(LOCATION, __FUNCTION__).c_str(); - serverinfo.append_attribute("url") = g_configManager().getString(URL, __FUNCTION__).c_str(); + serverinfo.append_attribute("ip") = g_configManager().getString(IP).c_str(); + serverinfo.append_attribute("servername") = g_configManager().getString(ConfigKey_t::SERVER_NAME).c_str(); + serverinfo.append_attribute("port") = std::to_string(g_configManager().getNumber(LOGIN_PORT)).c_str(); + serverinfo.append_attribute("location") = g_configManager().getString(LOCATION).c_str(); + serverinfo.append_attribute("url") = g_configManager().getString(URL).c_str(); serverinfo.append_attribute("server") = ProtocolStatus::SERVER_NAME.c_str(); serverinfo.append_attribute("version") = ProtocolStatus::SERVER_VERSION.c_str(); serverinfo.append_attribute("client") = fmt::format("{}.{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER).c_str(); pugi::xml_node owner = tsqp.append_child("owner"); - owner.append_attribute("name") = g_configManager().getString(OWNER_NAME, __FUNCTION__).c_str(); - owner.append_attribute("email") = g_configManager().getString(OWNER_EMAIL, __FUNCTION__).c_str(); + owner.append_attribute("name") = g_configManager().getString(OWNER_NAME).c_str(); + owner.append_attribute("email") = g_configManager().getString(OWNER_EMAIL).c_str(); pugi::xml_node players = tsqp.append_child("players"); uint32_t real = 0; @@ -121,7 +123,7 @@ void ProtocolStatus::sendStatusString() { } } players.append_attribute("online") = std::to_string(real).c_str(); - players.append_attribute("max") = std::to_string(g_configManager().getNumber(MAX_PLAYERS, __FUNCTION__)).c_str(); + players.append_attribute("max") = std::to_string(g_configManager().getNumber(MAX_PLAYERS)).c_str(); players.append_attribute("peak") = std::to_string(g_game().getPlayersRecord()).c_str(); pugi::xml_node monsters = tsqp.append_child("monsters"); @@ -131,15 +133,15 @@ void ProtocolStatus::sendStatusString() { npcs.append_attribute("total") = std::to_string(g_game().getNpcsOnline()).c_str(); pugi::xml_node rates = tsqp.append_child("rates"); - rates.append_attribute("experience") = std::to_string(g_configManager().getNumber(RATE_EXPERIENCE, __FUNCTION__)).c_str(); - rates.append_attribute("skill") = std::to_string(g_configManager().getNumber(RATE_SKILL, __FUNCTION__)).c_str(); - rates.append_attribute("loot") = std::to_string(g_configManager().getNumber(RATE_LOOT, __FUNCTION__)).c_str(); - rates.append_attribute("magic") = std::to_string(g_configManager().getNumber(RATE_MAGIC, __FUNCTION__)).c_str(); - rates.append_attribute("spawn") = std::to_string(g_configManager().getNumber(RATE_SPAWN, __FUNCTION__)).c_str(); + rates.append_attribute("experience") = std::to_string(g_configManager().getNumber(RATE_EXPERIENCE)).c_str(); + rates.append_attribute("skill") = std::to_string(g_configManager().getNumber(RATE_SKILL)).c_str(); + rates.append_attribute("loot") = std::to_string(g_configManager().getNumber(RATE_LOOT)).c_str(); + rates.append_attribute("magic") = std::to_string(g_configManager().getNumber(RATE_MAGIC)).c_str(); + rates.append_attribute("spawn") = std::to_string(g_configManager().getNumber(RATE_SPAWN)).c_str(); pugi::xml_node map = tsqp.append_child("map"); - map.append_attribute("name") = g_configManager().getString(MAP_NAME, __FUNCTION__).c_str(); - map.append_attribute("author") = g_configManager().getString(MAP_AUTHOR, __FUNCTION__).c_str(); + map.append_attribute("name") = g_configManager().getString(MAP_NAME).c_str(); + map.append_attribute("author") = g_configManager().getString(MAP_AUTHOR).c_str(); uint32_t mapWidth, mapHeight; g_game().getMapDimensions(mapWidth, mapHeight); @@ -147,52 +149,52 @@ void ProtocolStatus::sendStatusString() { map.append_attribute("height") = std::to_string(mapHeight).c_str(); pugi::xml_node motd = tsqp.append_child("motd"); - motd.text() = g_configManager().getString(SERVER_MOTD, __FUNCTION__).c_str(); + motd.text() = g_configManager().getString(SERVER_MOTD).c_str(); std::ostringstream ss; doc.save(ss, "", pugi::format_raw); - std::string data = ss.str(); + const std::string data = ss.str(); output->addBytes(data.c_str(), data.size()); send(output); disconnect(); } -void ProtocolStatus::sendInfo(uint16_t requestedInfo, const std::string &characterName) { - auto output = OutputMessagePool::getOutputMessage(); +void ProtocolStatus::sendInfo(uint16_t requestedInfo, const std::string &characterName) const { + const auto output = OutputMessagePool::getOutputMessage(); if (requestedInfo & REQUEST_BASIC_SERVER_INFO) { output->addByte(0x10); - output->addString(g_configManager().getString(ConfigKey_t::SERVER_NAME, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(stringConfig_t::SERVER_NAME)"); - output->addString(g_configManager().getString(IP, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(IP)"); - output->addString(std::to_string(g_configManager().getNumber(LOGIN_PORT, __FUNCTION__)), "ProtocolStatus::sendInfo - std::to_string(g_configManager().getNumber(LOGIN_PORT))"); + output->addString(g_configManager().getString(ConfigKey_t::SERVER_NAME)); + output->addString(g_configManager().getString(IP)); + output->addString(std::to_string(g_configManager().getNumber(LOGIN_PORT))); } if (requestedInfo & REQUEST_OWNER_SERVER_INFO) { output->addByte(0x11); - output->addString(g_configManager().getString(OWNER_NAME, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(OWNER_NAME)"); - output->addString(g_configManager().getString(OWNER_EMAIL, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(OWNER_EMAIL)"); + output->addString(g_configManager().getString(OWNER_NAME)); + output->addString(g_configManager().getString(OWNER_EMAIL)); } if (requestedInfo & REQUEST_MISC_SERVER_INFO) { output->addByte(0x12); - output->addString(g_configManager().getString(SERVER_MOTD, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(SERVER_MOTD)"); - output->addString(g_configManager().getString(LOCATION, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(LOCATION)"); - output->addString(g_configManager().getString(URL, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(URL)"); + output->addString(g_configManager().getString(SERVER_MOTD)); + output->addString(g_configManager().getString(LOCATION)); + output->addString(g_configManager().getString(URL)); output->add<uint64_t>((OTSYS_TIME() - ProtocolStatus::start) / 1000); } if (requestedInfo & REQUEST_PLAYERS_INFO) { output->addByte(0x20); output->add<uint32_t>(static_cast<uint32_t>(g_game().getPlayersOnline())); - output->add<uint32_t>(g_configManager().getNumber(MAX_PLAYERS, __FUNCTION__)); + output->add<uint32_t>(g_configManager().getNumber(MAX_PLAYERS)); output->add<uint32_t>(g_game().getPlayersRecord()); } if (requestedInfo & REQUEST_MAP_INFO) { output->addByte(0x30); - output->addString(g_configManager().getString(MAP_NAME, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(MAP_NAME)"); - output->addString(g_configManager().getString(MAP_AUTHOR, __FUNCTION__), "ProtocolStatus::sendInfo - g_configManager().getString(MAP_AUTHOR)"); + output->addString(g_configManager().getString(MAP_NAME)); + output->addString(g_configManager().getString(MAP_AUTHOR)); uint32_t mapWidth, mapHeight; g_game().getMapDimensions(mapWidth, mapHeight); output->add<uint16_t>(mapWidth); @@ -205,7 +207,7 @@ void ProtocolStatus::sendInfo(uint16_t requestedInfo, const std::string &charact const auto players = g_game().getPlayers(); output->add<uint32_t>(players.size()); for (const auto &it : players) { - output->addString(it.second->getName(), "ProtocolStatus::sendInfo - it.second->getName()"); + output->addString(it.second->getName()); output->add<uint32_t>(it.second->getLevel()); } } @@ -221,9 +223,9 @@ void ProtocolStatus::sendInfo(uint16_t requestedInfo, const std::string &charact if (requestedInfo & REQUEST_SERVER_SOFTWARE_INFO) { output->addByte(0x23); // server software info - output->addString(ProtocolStatus::SERVER_NAME, "ProtocolStatus::sendInfo - ProtocolStatus::SERVER_NAME"); - output->addString(ProtocolStatus::SERVER_VERSION, "ProtocolStatus::sendInfo - ProtocolStatus::SERVER_VERSION)"); - output->addString(fmt::format("{}.{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER), "ProtocolStatus::sendInfo - fmt::format(CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER)"); + output->addString(ProtocolStatus::SERVER_NAME); + output->addString(ProtocolStatus::SERVER_VERSION); + output->addString(fmt::format("{}.{}", CLIENT_VERSION_UPPER, CLIENT_VERSION_LOWER)); } send(output); disconnect(); diff --git a/src/server/network/protocol/protocolstatus.hpp b/src/server/network/protocol/protocolstatus.hpp index 78b03a743..d56004387 100644 --- a/src/server/network/protocol/protocolstatus.hpp +++ b/src/server/network/protocol/protocolstatus.hpp @@ -22,13 +22,13 @@ class ProtocolStatus final : public Protocol { return "status protocol"; } - explicit ProtocolStatus(Connection_ptr conn) : + explicit ProtocolStatus(const Connection_ptr &conn) : Protocol(conn) { } void onRecvFirstMessage(NetworkMessage &msg) override; void sendStatusString(); - void sendInfo(uint16_t requestedInfo, const std::string &characterName); + void sendInfo(uint16_t requestedInfo, const std::string &characterName) const; static const uint64_t start; diff --git a/src/server/network/webhook/webhook.cpp b/src/server/network/webhook/webhook.cpp index f80ff4e59..006be8bbf 100644 --- a/src/server/network/webhook/webhook.cpp +++ b/src/server/network/webhook/webhook.cpp @@ -7,9 +7,8 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "server/network/webhook/webhook.hpp" + #include "config/configmanager.hpp" #include "game/scheduling/dispatcher.hpp" #include "utils/tools.hpp" @@ -25,7 +24,7 @@ Webhook::Webhook(ThreadPool &threadPool) : headers = curl_slist_append(headers, "content-type: application/json"); headers = curl_slist_append(headers, "accept: application/json"); - if (headers == NULL) { + if (headers == nullptr) { g_logger().error("Failed to init curl, appending request headers failed"); return; } @@ -40,18 +39,18 @@ Webhook &Webhook::getInstance() { void Webhook::run() { threadPool.detach_task([this] { sendWebhook(); }); g_dispatcher().scheduleEvent( - g_configManager().getNumber(DISCORD_WEBHOOK_DELAY_MS, __FUNCTION__), [this] { run(); }, "Webhook::run" + g_configManager().getNumber(DISCORD_WEBHOOK_DELAY_MS), [this] { run(); }, "Webhook::run" ); } -void Webhook::sendPayload(const std::string &payload, std::string url) { +void Webhook::sendPayload(const std::string &payload, const std::string &url) { std::scoped_lock lock { taskLock }; - webhooks.push_back(std::make_shared<WebhookTask>(payload, url)); + webhooks.emplace_back(std::make_shared<WebhookTask>(payload, url)); } void Webhook::sendMessage(const std::string &title, const std::string &message, int color, std::string url, bool embed) { if (url.empty()) { - url = g_configManager().getString(DISCORD_WEBHOOK_URL, __FUNCTION__); + url = g_configManager().getString(DISCORD_WEBHOOK_URL); } if (url.empty() || title.empty() || message.empty()) { @@ -63,7 +62,7 @@ void Webhook::sendMessage(const std::string &title, const std::string &message, void Webhook::sendMessage(const std::string &message, std::string url) { if (url.empty()) { - url = g_configManager().getString(DISCORD_WEBHOOK_URL, __FUNCTION__); + url = g_configManager().getString(DISCORD_WEBHOOK_URL); } if (url.empty() || message.empty()) { @@ -89,7 +88,7 @@ int Webhook::sendRequest(const char* url, const char* payload, std::string* resp curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl, CURLOPT_USERAGENT, "canary (https://github.com/opentibiabr/canary)"); - CURLcode res = curl_easy_perform(curl); + const CURLcode res = curl_easy_perform(curl); if (res != CURLE_OK) { g_logger().error("Failed to send webhook message with the error: {}", curl_easy_strerror(res)); @@ -107,37 +106,37 @@ int Webhook::sendRequest(const char* url, const char* payload, std::string* resp } size_t Webhook::writeCallback(void* contents, size_t size, size_t nmemb, void* userp) { - size_t real_size = size * nmemb; - auto* str = reinterpret_cast<std::string*>(userp); - str->append(reinterpret_cast<char*>(contents), real_size); + const size_t real_size = size * nmemb; + auto* str = static_cast<std::string*>(userp); + str->append(static_cast<char*>(contents), real_size); return real_size; } std::string Webhook::getPayload(const std::string &title, const std::string &message, int color, bool embed) const { - std::time_t now = getTimeNow(); - std::string time_buf = formatDate(now); + const std::time_t now = getTimeNow(); + const std::string time_buf = formatDate(now); std::stringstream footer_text; footer_text - << g_configManager().getString(SERVER_NAME, __FUNCTION__) << " | " + << g_configManager().getString(SERVER_NAME) << " | " << time_buf; std::stringstream payload; if (embed) { payload << "{ \"embeds\": [{ "; - payload << "\"title\": \"" << title << "\", "; + payload << R"("title": ")" << title << "\", "; if (!message.empty()) { - payload << "\"description\": \"" << message << "\", "; + payload << R"("description": ")" << message << "\", "; } - if (g_configManager().getBoolean(DISCORD_SEND_FOOTER, __FUNCTION__)) { - payload << "\"footer\": { \"text\": \"" << footer_text.str() << "\" }, "; + if (g_configManager().getBoolean(DISCORD_SEND_FOOTER)) { + payload << R"("footer": { "text": ")" << footer_text.str() << "\" }, "; } if (color >= 0) { payload << "\"color\": " << color; } payload << " }] }"; } else { - payload << "{ \"content\": \"" << (!message.empty() ? message : title) << "\" }"; + payload << R"({ "content": ")" << (!message.empty() ? message : title) << "\" }"; } return payload.str(); @@ -149,7 +148,7 @@ void Webhook::sendWebhook() { return; } - auto task = webhooks.front(); + const auto &task = webhooks.front(); std::string response_body; auto response_code = sendRequest(task->url.c_str(), task->payload.c_str(), &response_body); @@ -164,8 +163,6 @@ void Webhook::sendWebhook() { return; } - webhooks.pop_front(); - if (response_code >= 300) { g_logger().error( "Failed to send webhook message, error code: {} response body: {} request body: {}", @@ -178,4 +175,7 @@ void Webhook::sendWebhook() { } g_logger().debug("Webhook successfully sent to {}", task->url); + + // Removes the object after processing everything, avoiding memory usage after freeing + webhooks.pop_front(); } diff --git a/src/server/network/webhook/webhook.hpp b/src/server/network/webhook/webhook.hpp index bae62a64c..4ce989099 100644 --- a/src/server/network/webhook/webhook.hpp +++ b/src/server/network/webhook/webhook.hpp @@ -30,7 +30,7 @@ class Webhook { void run(); - void sendPayload(const std::string &payload, std::string url); + void sendPayload(const std::string &payload, const std::string &url); void sendMessage(const std::string &title, const std::string &message, int color, std::string url = "", bool embed = true); void sendMessage(const std::string &message, std::string url = ""); diff --git a/src/server/server.cpp b/src/server/server.cpp index fc8690468..2ba8f36df 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -7,10 +7,9 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "server/server.hpp" #include "server/network/message/outputmessage.hpp" -#include "server/server.hpp" #include "config/configmanager.hpp" #include "game/scheduling/dispatcher.hpp" #include "creatures/players/management/ban.hpp" @@ -71,7 +70,7 @@ bool ServicePort::is_single_socket() const { std::string ServicePort::get_protocol_names() const { if (services.empty()) { - return std::string(); + return {}; } std::string str = services.front()->get_protocol_name(); @@ -92,15 +91,15 @@ void ServicePort::accept() { acceptor->async_accept(connection->getSocket(), [self = shared_from_this(), connection](const std::error_code &error) { self->onAccept(connection, error); }); } -void ServicePort::onAccept(Connection_ptr connection, const std::error_code &error) { +void ServicePort::onAccept(const Connection_ptr &connection, const std::error_code &error) { if (!error) { if (services.empty()) { return; } - auto remote_ip = connection->getIP(); + const auto remote_ip = connection->getIP(); if (remote_ip != 0 && inject<Ban>().acceptConnection(remote_ip)) { - Service_ptr service = services.front(); + const Service_ptr service = services.front(); if (service->is_single_socket()) { connection->accept(service->make_protocol(connection)); } else { @@ -123,7 +122,7 @@ void ServicePort::onAccept(Connection_ptr connection, const std::error_code &err } Protocol_ptr ServicePort::make_protocol(bool checksummed, NetworkMessage &msg, const Connection_ptr &connection) const { - uint8_t protocolID = msg.getByte(); + const uint8_t protocolID = msg.getByte(); for (auto &service : services) { if (protocolID != service->get_protocol_identifier()) { continue; @@ -136,12 +135,12 @@ Protocol_ptr ServicePort::make_protocol(bool checksummed, NetworkMessage &msg, c return nullptr; } -void ServicePort::onStopServer() { +void ServicePort::onStopServer() const { close(); } -void ServicePort::openAcceptor(std::weak_ptr<ServicePort> weak_service, uint16_t port) { - if (auto service = weak_service.lock()) { +void ServicePort::openAcceptor(const std::weak_ptr<ServicePort> &weak_service, uint16_t port) { + if (const auto service = weak_service.lock()) { service->open(port); } } @@ -153,10 +152,10 @@ void ServicePort::open(uint16_t port) { pendingStart = false; try { - if (g_configManager().getBoolean(BIND_ONLY_GLOBAL_ADDRESS, __FUNCTION__)) { - acceptor.reset(new asio::ip::tcp::acceptor(io_service, asio::ip::tcp::endpoint(asio::ip::address(asio::ip::address_v4::from_string(g_configManager().getString(IP, __FUNCTION__))), serverPort))); + if (g_configManager().getBoolean(BIND_ONLY_GLOBAL_ADDRESS)) { + acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::address(asio::ip::address_v4::from_string(g_configManager().getString(IP))), serverPort)); } else { - acceptor.reset(new asio::ip::tcp::acceptor(io_service, asio::ip::tcp::endpoint(asio::ip::address(asio::ip::address_v4(INADDR_ANY)), serverPort))); + acceptor = std::make_unique<asio::ip::tcp::acceptor>(io_service, asio::ip::tcp::endpoint(asio::ip::address(asio::ip::address_v4(INADDR_ANY)), serverPort)); } acceptor->set_option(asio::ip::tcp::no_delay(true)); @@ -173,7 +172,7 @@ void ServicePort::open(uint16_t port) { } } -void ServicePort::close() { +void ServicePort::close() const { if (acceptor && acceptor->is_open()) { std::error_code error; acceptor->close(error); @@ -185,6 +184,6 @@ bool ServicePort::add_service(const Service_ptr &new_svc) { return false; } - services.push_back(new_svc); + services.emplace_back(new_svc); return true; } diff --git a/src/server/server.hpp b/src/server/server.hpp index 42134f765..0a658f4d2 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -9,7 +9,6 @@ #pragma once -#include "lib/logging/logger.hpp" #include "lib/metrics/metrics.hpp" #include "server/network/connection/connection.hpp" #include "server/signals.hpp" @@ -18,6 +17,7 @@ class Protocol; class ServiceBase { public: + virtual ~ServiceBase() = default; virtual bool is_single_socket() const = 0; virtual bool is_checksummed() const = 0; virtual uint8_t get_protocol_identifier() const = 0; @@ -57,17 +57,17 @@ class ServicePort : public std::enable_shared_from_this<ServicePort> { ServicePort(const ServicePort &) = delete; ServicePort &operator=(const ServicePort &) = delete; - static void openAcceptor(std::weak_ptr<ServicePort> weak_service, uint16_t port); + static void openAcceptor(const std::weak_ptr<ServicePort> &weak_service, uint16_t port); void open(uint16_t port); - void close(); + void close() const; bool is_single_socket() const; std::string get_protocol_names() const; bool add_service(const Service_ptr &new_svc); Protocol_ptr make_protocol(bool checksummed, NetworkMessage &msg, const Connection_ptr &connection) const; - void onStopServer(); - void onAccept(Connection_ptr connection, const std::error_code &error); + void onStopServer() const; + void onAccept(const Connection_ptr &connection, const std::error_code &error); private: void accept(); @@ -121,7 +121,7 @@ bool ServiceManager::add(uint16_t port) { ServicePort_ptr service_port; - auto foundServicePort = acceptors.find(port); + const auto foundServicePort = acceptors.find(port); if (foundServicePort == acceptors.end()) { service_port = std::make_shared<ServicePort>(io_service); diff --git a/src/server/server_definitions.hpp b/src/server/server_definitions.hpp index b957292b5..2a8d55e2c 100644 --- a/src/server/server_definitions.hpp +++ b/src/server/server_definitions.hpp @@ -9,6 +9,8 @@ #pragma once +#include "utils/const.hpp" + // Enums // Connection and networkmessage. enum { FORCE_CLOSE = true }; @@ -65,6 +67,8 @@ enum Resource_t : uint8_t { RESOURCE_LESSER_GEMS = 0x51, RESOURCE_REGULAR_GEMS = 0x52, RESOURCE_GREATER_GEMS = 0x53, + RESOURCE_LESSER_FRAGMENT = 0x54, + RESOURCE_GREATER_FRAGMENT = 0x55, RESOURCE_WHEEL_OF_DESTINY = 0x56 }; diff --git a/src/server/signals.cpp b/src/server/signals.cpp index 626a918f6..29382c558 100644 --- a/src/server/signals.cpp +++ b/src/server/signals.cpp @@ -7,16 +7,18 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "server/signals.hpp" +#include "config/configmanager.hpp" +#include "creatures/appearance/mounts/mounts.hpp" +#include "creatures/interactions/chat.hpp" #include "game/game.hpp" #include "game/scheduling/dispatcher.hpp" #include "game/scheduling/save_manager.hpp" #include "lib/thread/thread_pool.hpp" #include "lua/creature/events.hpp" -#include "lua/scripts/lua_environment.hpp" #include "lua/global/globalevent.hpp" -#include "server/signals.hpp" +#include "lua/scripts/lua_environment.hpp" Signals::Signals(asio::io_service &service) : set(service) { @@ -54,21 +56,21 @@ void Signals::asyncWait() { void Signals::dispatchSignalHandler(int signal) { switch (signal) { case SIGINT: // Shuts the server down - g_dispatcher().addEvent(sigintHandler, "sigintHandler"); + g_dispatcher().addEvent(sigintHandler, __FUNCTION__); break; case SIGTERM: // Shuts the server down - g_dispatcher().addEvent(sigtermHandler, "sigtermHandler"); + g_dispatcher().addEvent(sigtermHandler, __FUNCTION__); break; #ifndef _WIN32 case SIGHUP: // Reload config/data - g_dispatcher().addEvent(sighupHandler, "sighupHandler"); + g_dispatcher().addEvent(sighupHandler, __FUNCTION__); break; case SIGUSR1: // Saves game state - g_dispatcher().addEvent(sigusr1Handler, "sigusr1Handler"); + g_dispatcher().addEvent(sigusr1Handler, __FUNCTION__); break; #else case SIGBREAK: // Shuts the server down - g_dispatcher().addEvent(sigbreakHandler, "sigbreakHandler"); + g_dispatcher().addEvent(sigbreakHandler, __FUNCTION__); // hold the thread until other threads end inject<ThreadPool>().shutdown(); break; @@ -111,7 +113,7 @@ void Signals::sighupHandler() { Item::items.reload(); g_logger().info("Reloaded items"); - g_game().mounts.reload(); + g_game().mounts->reload(); g_logger().info("Reloaded mounts"); g_events().loadFromXml(); @@ -120,7 +122,7 @@ void Signals::sighupHandler() { g_chat().load(); g_logger().info("Reloaded chatchannels"); - g_luaEnvironment().loadFile(g_configManager().getString(CORE_DIRECTORY, __FUNCTION__) + "/core.lua", "core.lua"); + g_luaEnvironment().loadFile(g_configManager().getString(CORE_DIRECTORY) + "/core.lua", "core.lua"); g_logger().info("Reloaded core.lua"); lua_gc(g_luaEnvironment().getLuaState(), LUA_GCCOLLECT, 0); diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 1b2ba9da7..d3ce8329d 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -1,4 +1,5 @@ target_sources(${PROJECT_NAME}_lib PRIVATE + counter_pointer.cpp pugicast.cpp tools.cpp wildcardtree.cpp diff --git a/src/utils/arraylist.hpp b/src/utils/arraylist.hpp index da507e684..52850929e 100644 --- a/src/utils/arraylist.hpp +++ b/src/utils/arraylist.hpp @@ -48,7 +48,7 @@ namespace stdext { bool erase(const T &v) { update(); - const auto &it = std::ranges::find(backContainer, v); + auto it = std::ranges::find(backContainer, v); if (it == backContainer.end()) { return false; } diff --git a/src/utils/benchmark.hpp b/src/utils/benchmark.hpp index 961547efc..2524866a6 100644 --- a/src/utils/benchmark.hpp +++ b/src/utils/benchmark.hpp @@ -9,7 +9,6 @@ #pragma once -#include <ctime> #include <cstdint> #include <chrono> @@ -74,7 +73,7 @@ class Benchmark { } private: - int64_t time() const noexcept { + static int64_t time() noexcept { return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count(); } diff --git a/src/utils/const.hpp b/src/utils/const.hpp index c3f82df7f..4cc296e4a 100644 --- a/src/utils/const.hpp +++ b/src/utils/const.hpp @@ -35,6 +35,8 @@ static constexpr int32_t STORAGEVALUE_HAZARDCOUNT = 112550; // Wheel of destiny static constexpr int32_t STORAGEVALUE_GIFT_OF_LIFE_COOLDOWN_WOD = 43200; +constexpr double SCALING_BASE = 10.0; + // Reserved player storage key ranges; // [10000000 - 20000000]; static constexpr int32_t PSTRG_RESERVED_RANGE_START = 10000000; diff --git a/src/utils/counter_pointer.cpp b/src/utils/counter_pointer.cpp new file mode 100644 index 000000000..cdd0b56e8 --- /dev/null +++ b/src/utils/counter_pointer.cpp @@ -0,0 +1,31 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 "utils/counter_pointer.hpp" + +#include "lib/di/container.hpp" +#include "lib/logging/logger.hpp" + +SharedPtrManager &SharedPtrManager::getInstance() { + static SharedPtrManager instance; + return instance; +} + +void SharedPtrManager::countAllReferencesAndClean() { + for (auto it = m_sharedPtrMap.begin(); it != m_sharedPtrMap.end();) { + const auto &sptr = it->second.lock(); + if (sptr) { + g_logger().debug("Counting references of shared_ptr ({}): {}", it->first, sptr.use_count()); + ++it; + } else { + g_logger().debug("Object {} was destroyed and will be removed from the map.", it->first); + it = m_sharedPtrMap.erase(it); + } + } +} diff --git a/src/utils/counter_pointer.hpp b/src/utils/counter_pointer.hpp new file mode 100644 index 000000000..15e2b56ef --- /dev/null +++ b/src/utils/counter_pointer.hpp @@ -0,0 +1,34 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +class SharedPtrManager { +public: + SharedPtrManager() = default; + ~SharedPtrManager() = default; + + // Singleton - ensures we don't accidentally copy it. + SharedPtrManager(const SharedPtrManager &) = delete; + SharedPtrManager &operator=(const SharedPtrManager &) = delete; + + static SharedPtrManager &getInstance(); + + template <typename T> + void store(const std::string &name, const std::shared_ptr<T> &ptr) { + m_sharedPtrMap[name] = ptr; + } + + void countAllReferencesAndClean(); + +private: + std::unordered_map<std::string, std::weak_ptr<void>> m_sharedPtrMap; +}; + +constexpr auto g_counterPointer = SharedPtrManager::getInstance; diff --git a/src/utils/hash.hpp b/src/utils/hash.hpp index 6b819c9bb..7acee5551 100644 --- a/src/utils/hash.hpp +++ b/src/utils/hash.hpp @@ -1,8 +1,8 @@ #pragma once namespace stdext { - template <class _Kty> - using hash = phmap::Hash<_Kty>; + template <class Kty> + using hash = phmap::Hash<Kty>; // Robin Hood lib inline size_t hash_int(uint64_t x) noexcept { @@ -17,19 +17,19 @@ namespace stdext { seed ^= h + 0x9e3779b9 + (seed << 6) + (seed >> 2); } - void hash_combine(size_t &seed, uint64_t v) { + inline void hash_combine(size_t &seed, uint64_t v) { hash_union(seed, hash_int(v)); } - void hash_combine(size_t &seed, uint32_t v) { + inline void hash_combine(size_t &seed, uint32_t v) { hash_union(seed, hash_int(v)); } - void hash_combine(size_t &seed, uint16_t v) { + inline void hash_combine(size_t &seed, uint16_t v) { hash_union(seed, hash_int(v)); } - void hash_combine(size_t &seed, uint8_t v) { + inline void hash_combine(size_t &seed, uint8_t v) { hash_union(seed, hash_int(v)); } diff --git a/src/utils/lockfree.hpp b/src/utils/lockfree.hpp new file mode 100644 index 000000000..be245c051 --- /dev/null +++ b/src/utils/lockfree.hpp @@ -0,0 +1,68 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 <atomic_queue/atomic_queue.h> + +template <typename T, size_t CAPACITY> +struct LockfreeFreeList { + using FreeList = atomic_queue::AtomicQueue2<T*, CAPACITY>; + + static FreeList &get() { + static FreeList freeList; + return freeList; + } + + static void preallocate(size_t count) { + auto &freeList = get(); + for (size_t i = 0; i < count; ++i) { + auto p = static_cast<T*>(::operator new(sizeof(T), static_cast<std::align_val_t>(alignof(T)))); + if (!freeList.try_push(p)) { + ::operator delete(p, static_cast<std::align_val_t>(alignof(T))); + break; + } + } + } +}; + +template <typename T, size_t CAPACITY> +class LockfreePoolingAllocator { +public: + using value_type = T; + + template <typename U> + struct rebind { + using other = LockfreePoolingAllocator<U, CAPACITY>; + }; + + LockfreePoolingAllocator() noexcept = default; + + template <typename U> + explicit LockfreePoolingAllocator(const LockfreePoolingAllocator<U, CAPACITY> &) noexcept { } + + ~LockfreePoolingAllocator() = default; + + T* allocate(std::size_t n) { + if (n == 1) { + T* p; + if (LockfreeFreeList<T, CAPACITY>::get().try_pop(p)) { + return p; + } + } + return static_cast<T*>(::operator new(n * sizeof(T))); + } + + void deallocate(T* p, std::size_t n) const noexcept { + if (n == 1 && LockfreeFreeList<T, CAPACITY>::get().try_push(p)) { + return; + } + ::operator delete(p); + } +}; diff --git a/src/utils/pugicast.cpp b/src/utils/pugicast.cpp index 62717c336..5791a8383 100644 --- a/src/utils/pugicast.cpp +++ b/src/utils/pugicast.cpp @@ -6,8 +6,6 @@ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" -#include "lib/logging/log_with_spd_log.hpp" namespace pugi { void logError(const std::string &str) { diff --git a/src/utils/pugicast.hpp b/src/utils/pugicast.hpp index d09532a2d..b59e95d37 100644 --- a/src/utils/pugicast.hpp +++ b/src/utils/pugicast.hpp @@ -19,7 +19,7 @@ namespace pugi { T value; // Set the last character to parse - std::string_view string(str); + const std::string_view string(str); const auto last = str + string.size(); // Convert the string to the specified type diff --git a/src/utils/simd.hpp b/src/utils/simd.hpp index 7e57e75bf..f1116f1ce 100644 --- a/src/utils/simd.hpp +++ b/src/utils/simd.hpp @@ -56,11 +56,11 @@ #ifdef _MSC_VER #include <intrin.h> -__forceinline unsigned int _mm_ctz(unsigned int value) { +__forceinline unsigned int mm_ctz(unsigned int value) { unsigned long i = 0; _BitScanForward(&i, value); return static_cast<unsigned int>(i); } #else - #define _mm_ctz __builtin_ctz + #define mm_ctz __builtin_ctz #endif diff --git a/src/utils/tools.cpp b/src/utils/tools.cpp index f89b2c2f2..f393f5332 100644 --- a/src/utils/tools.cpp +++ b/src/utils/tools.cpp @@ -7,11 +7,17 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" +#include "utils/tools.hpp" #include "core.hpp" +#include "enums/object_category.hpp" #include "items/item.hpp" -#include "utils/tools.hpp" +#include "lua/lua_definitions.hpp" +#include "utils/const.hpp" +#include "config/configmanager.hpp" + +#include "absl/debugging/stacktrace.h" +#include "absl/debugging/symbolize.h" void printXMLError(const std::string &where, const std::string &fileName, const pugi::xml_parse_result &result) { g_logger().error("[{}] Failed to load {}: {}", where, fileName, result.description()); @@ -25,14 +31,14 @@ void printXMLError(const std::string &where, const std::string &fileName, const uint32_t currentLine = 1; std::string line; - size_t offset = static_cast<size_t>(result.offset); + const auto offset = static_cast<size_t>(result.offset); size_t lineOffsetPosition = 0; size_t index = 0; size_t bytes; do { bytes = fread(buffer, 1, 32768, file); for (size_t i = 0; i < bytes; ++i) { - char ch = buffer[i]; + const char ch = buffer[i]; if (ch == '\n') { if ((index + i) >= offset) { lineOffsetPosition = line.length() - ((index + i) - offset); @@ -135,7 +141,7 @@ std::string transformToSHA1(const std::string &input) { uint32_t length_low = 0; uint32_t length_high = 0; - for (char ch : input) { + for (const char ch : input) { messageBlock[index++] = ch; length_low += 8; @@ -177,7 +183,7 @@ std::string transformToSHA1(const std::string &input) { processSHA1MessageBlock(messageBlock, H); char hexstring[41]; - static const char hexDigits[] = { "0123456789abcdef" }; + static constexpr char hexDigits[] = { "0123456789abcdef" }; for (int hashByte = 20; --hashByte >= 0;) { const uint8_t byte = H[hashByte >> 2] >> (((3 - hashByte) & 3) << 3); index = hashByte << 1; @@ -187,10 +193,10 @@ std::string transformToSHA1(const std::string &input) { return std::string(hexstring, 40); } -uint16_t getStashSize(StashItemList itemList) { +uint16_t getStashSize(const std::map<uint16_t, uint32_t> &itemList) { uint16_t size = 0; - for (auto item : itemList) { - size += ceil(item.second / (float_t)Item::items[item.first].stackSize); + for (const auto &[itemId, itemCount] : itemList) { + size += ceil(itemCount / static_cast<float_t>(Item::items[itemId].stackSize)); } return size; } @@ -226,14 +232,14 @@ std::string generateToken(const std::string &key, uint32_t ticks) { message.assign(transformToSHA1(oKeyPad)); // calculate hmac offset - uint32_t offset = static_cast<uint32_t>(std::stol(message.substr(39, 1), nullptr, 16) & 0xF); + const auto offset = static_cast<uint32_t>(std::stol(message.substr(39, 1), nullptr, 16) & 0xF); // get truncated hash - uint32_t truncHash = std::stol(message.substr(2 * offset, 8), nullptr, 16) & 0x7FFFFFFF; + const uint32_t truncHash = std::stol(message.substr(2 * offset, 8), nullptr, 16) & 0x7FFFFFFF; message.assign(std::to_string(truncHash)); // return only last AUTHENTICATOR_DIGITS (default 6) digits, also asserts exactly 6 digits - uint32_t hashLen = message.length(); + const uint32_t hashLen = message.length(); message.assign(message.substr(hashLen - std::min(hashLen, AUTHENTICATOR_DIGITS))); message.insert(0, AUTHENTICATOR_DIGITS - std::min(hashLen, AUTHENTICATOR_DIGITS), '0'); return message; @@ -258,7 +264,7 @@ void trim_left(std::string &source, char t) { } std::string keepFirstWordOnly(std::string &str) { - size_t spacePos = str.find(' '); + const size_t spacePos = str.find(' '); if (spacePos != std::string::npos) { str.erase(spacePos); } @@ -267,7 +273,7 @@ std::string keepFirstWordOnly(std::string &str) { } void toLowerCaseString(std::string &source) { - std::transform(source.begin(), source.end(), source.begin(), tolower); + std::ranges::transform(source, source.begin(), tolower); } std::string asLowerCaseString(std::string source) { @@ -276,7 +282,7 @@ std::string asLowerCaseString(std::string source) { } std::string asUpperCaseString(std::string source) { - std::transform(source.begin(), source.end(), source.begin(), toupper); + std::ranges::transform(source, source.begin(), toupper); return source; } @@ -284,7 +290,7 @@ std::string toCamelCase(const std::string &str) { std::string result; bool capitalizeNext = false; - for (char ch : str) { + for (const char ch : str) { if (ch == '_' || std::isspace(ch) || ch == '-') { capitalizeNext = true; } else { @@ -304,7 +310,7 @@ std::string toPascalCase(const std::string &str) { std::string result; bool capitalizeNext = true; - for (char ch : str) { + for (const char ch : str) { if (ch == '_' || std::isspace(ch) || ch == '-') { capitalizeNext = true; } else { @@ -322,7 +328,7 @@ std::string toPascalCase(const std::string &str) { std::string toSnakeCase(const std::string &str) { std::string result; - for (char ch : str) { + for (const char ch : str) { if (std::isupper(ch)) { result += '_'; result += std::tolower(ch); @@ -338,7 +344,7 @@ std::string toSnakeCase(const std::string &str) { std::string toKebabCase(const std::string &str) { std::string result; - for (char ch : str) { + for (const char ch : str) { if (std::isupper(ch)) { result += '-'; result += std::tolower(ch); @@ -355,7 +361,7 @@ std::string toKebabCase(const std::string &str) { std::string toStartCaseWithSpace(const std::string &str) { std::string result; for (size_t i = 0; i < str.length(); ++i) { - char ch = str[i]; + const char ch = str[i]; if (i == 0 || std::isupper(ch)) { if (i > 0) { result += ' '; @@ -399,7 +405,8 @@ int32_t uniform_random(int32_t minNumber, int32_t maxNumber) { static std::uniform_int_distribution<int32_t> uniformRand; if (minNumber == maxNumber) { return minNumber; - } else if (minNumber > maxNumber) { + } + if (minNumber > maxNumber) { std::swap(minNumber, maxNumber); } return uniformRand(getRandomGenerator(), std::uniform_int_distribution<int32_t>::param_type(minNumber, maxNumber)); @@ -427,9 +434,12 @@ void trimString(std::string &str) { } std::string convertIPToString(uint32_t ip) { - char buffer[17]; - fmt::format_to_n(buffer, sizeof(buffer), "{}.{}.{}.{}", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, (ip >> 24)); - return buffer; + std::array<char, 16> buffer; + auto result = fmt::format_to_n(buffer.data(), buffer.size() - 1, "{}.{}.{}.{}", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, (ip >> 24)); + + buffer[std::min(result.size, buffer.size() - 1)] = '\0'; + + return std::string(buffer.data()); } std::string formatDate(time_t time) { @@ -461,8 +471,8 @@ std::string formatTime(time_t time) { std::string formatEnumName(std::string_view name) { std::string result { name.begin(), name.end() }; - std::replace(result.begin(), result.end(), '_', ' '); - std::transform(result.begin(), result.end(), result.begin(), [](unsigned char c) { return std::tolower(c); }); + std::ranges::replace(result, '_', ' '); + std::ranges::transform(result, result.begin(), [](unsigned char c) { return std::tolower(c); }); return result; } @@ -471,19 +481,20 @@ std::time_t getTimeNow() { } int64_t getTimeMsNow() { - auto duration = std::chrono::system_clock::now().time_since_epoch(); + const auto duration = std::chrono::system_clock::now().time_since_epoch(); return std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(); } int64_t getTimeUsNow() { - auto duration = std::chrono::system_clock::now().time_since_epoch(); + const auto duration = std::chrono::system_clock::now().time_since_epoch(); return std::chrono::duration_cast<std::chrono::microseconds>(duration).count(); } BedItemPart_t getBedPart(const std::string_view string) { if (string == "pillow" || string == "1") { return BED_PILLOW_PART; - } else if (string == "blanket" || string == "2") { + } + if (string == "blanket" || string == "2") { return BED_BLANKET_PART; } return BED_NONE_PART; @@ -559,12 +570,12 @@ Position getNextPosition(Direction direction, Position pos) { } Direction getDirectionTo(const Position &from, const Position &to, bool exactDiagonalOnly /* =true*/) { - int_fast32_t dx = Position::getOffsetX(from, to); - int_fast32_t dy = Position::getOffsetY(from, to); + const int_fast32_t dx = Position::getOffsetX(from, to); + const int_fast32_t dy = Position::getOffsetY(from, to); if (exactDiagonalOnly) { - int_fast32_t absDx = std::abs(dx); - int_fast32_t absDy = std::abs(dy); + const int_fast32_t absDx = std::abs(dx); + const int_fast32_t absDy = std::abs(dy); /* * Only consider diagonal if dx and dy are equal (exact diagonal). @@ -885,7 +896,7 @@ SpawnTypeNames spawnTypeNames = { }; MagicEffectClasses getMagicEffect(const std::string &strValue) { - auto magicEffect = magicEffectNames.find(strValue); + const auto magicEffect = magicEffectNames.find(strValue); if (magicEffect != magicEffectNames.end()) { return magicEffect->second; } @@ -893,7 +904,7 @@ MagicEffectClasses getMagicEffect(const std::string &strValue) { } ShootType_t getShootType(const std::string &strValue) { - auto shootType = shootTypeNames.find(strValue); + const auto shootType = shootTypeNames.find(strValue); if (shootType != shootTypeNames.end()) { return shootType->second; } @@ -901,7 +912,7 @@ ShootType_t getShootType(const std::string &strValue) { } Ammo_t getAmmoType(const std::string &strValue) { - auto ammoType = ammoTypeNames.find(strValue); + const auto ammoType = ammoTypeNames.find(strValue); if (ammoType != ammoTypeNames.end()) { return ammoType->second; } @@ -909,7 +920,7 @@ Ammo_t getAmmoType(const std::string &strValue) { } WeaponAction_t getWeaponAction(const std::string &strValue) { - auto weaponAction = weaponActionNames.find(strValue); + const auto weaponAction = weaponActionNames.find(strValue); if (weaponAction != weaponActionNames.end()) { return weaponAction->second; } @@ -917,7 +928,7 @@ WeaponAction_t getWeaponAction(const std::string &strValue) { } Skulls_t getSkullType(const std::string &strValue) { - auto skullType = skullNames.find(strValue); + const auto skullType = skullNames.find(strValue); if (skullType != skullNames.end()) { return skullType->second; } @@ -925,7 +936,7 @@ Skulls_t getSkullType(const std::string &strValue) { } ImbuementTypes_t getImbuementType(const std::string &strValue) { - auto imbuementType = imbuementTypeNames.find(strValue); + const auto imbuementType = imbuementTypeNames.find(strValue); if (imbuementType != imbuementTypeNames.end()) { return imbuementType->second; } @@ -937,7 +948,7 @@ ImbuementTypes_t getImbuementType(const std::string &strValue) { * It will be dropped with monsters. Use RespawnPeriod_t instead. */ SpawnType_t getSpawnType(const std::string &strValue) { - auto spawnType = spawnTypeNames.find(strValue); + const auto spawnType = spawnTypeNames.find(strValue); if (spawnType != spawnTypeNames.end()) { return spawnType->second; } @@ -1001,7 +1012,7 @@ uint32_t adlerChecksum(const uint8_t* data, size_t length) { return 0; } - const uint16_t adler = 65521; + constexpr uint16_t adler = 65521; uint32_t a = 1, b = 0; @@ -1032,7 +1043,7 @@ std::string ucfirst(std::string str) { } std::string ucwords(std::string str) { - size_t strLength = str.length(); + const size_t strLength = str.length(); if (strLength == 0) { return str; } @@ -1052,7 +1063,7 @@ bool booleanString(const std::string &str) { return false; } - char ch = tolower(str.front()); + const char ch = tolower(str.front()); return ch != 'f' && ch != 'n' && ch != '0'; } @@ -1073,7 +1084,7 @@ std::string getWeaponName(WeaponType_t weaponType) { case WEAPON_MISSILE: return "missile"; default: - return std::string(); + return {}; } } @@ -1090,7 +1101,7 @@ WeaponType_t getWeaponType(const std::string &name) { { "missile", WeaponType_t::WEAPON_MISSILE } }; - auto it = type_mapping.find(name); + const auto it = type_mapping.find(name); if (it != type_mapping.end()) { return it->second; } @@ -1110,7 +1121,7 @@ MoveEvent_t getMoveEventType(const std::string &name) { { "removeitemitemtile", MOVE_EVENT_REMOVE_ITEM_ITEMTILE } }; - auto it = move_event_type_mapping.find(name); + const auto it = move_event_type_mapping.find(name); if (it != move_event_type_mapping.end()) { return it->second; } @@ -1119,7 +1130,7 @@ MoveEvent_t getMoveEventType(const std::string &name) { } std::string getCombatName(CombatType_t combatType) { - auto combatName = combatTypeNames.find(combatType); + const auto combatName = combatTypeNames.find(combatType); if (combatName != combatTypeNames.end()) { return combatName->second; } @@ -1127,7 +1138,7 @@ std::string getCombatName(CombatType_t combatType) { } CombatType_t getCombatTypeByName(const std::string &combatname) { - auto it = std::find_if(combatTypeNames.begin(), combatTypeNames.end(), [combatname](const std::pair<CombatType_t, std::string> &pair) { + const auto it = std::ranges::find_if(combatTypeNames, [&combatname](const std::pair<CombatType_t, std::string> &pair) { return pair.second == combatname; }); @@ -1135,7 +1146,7 @@ CombatType_t getCombatTypeByName(const std::string &combatname) { } size_t combatTypeToIndex(CombatType_t combatType) { - auto enum_index_opt = magic_enum::enum_index(combatType); + const auto enum_index_opt = magic_enum::enum_index(combatType); if (enum_index_opt.has_value() && enum_index_opt.value() < COMBAT_COUNT) { return enum_index_opt.value(); } else { @@ -1148,7 +1159,7 @@ size_t combatTypeToIndex(CombatType_t combatType) { } std::string combatTypeToName(CombatType_t combatType) { - std::string_view name = magic_enum::enum_name(combatType); + const std::string_view name = magic_enum::enum_name(combatType); if (!name.empty() && combatType < COMBAT_COUNT) { return formatEnumName(name); } else { @@ -1167,59 +1178,86 @@ CombatType_t indexToCombatType(size_t v) { ItemAttribute_t stringToItemAttribute(const std::string &str) { if (str == "store") { return ItemAttribute_t::STORE; - } else if (str == "aid") { + } + if (str == "aid") { return ItemAttribute_t::ACTIONID; - } else if (str == "uid") { + } + if (str == "uid") { return ItemAttribute_t::UNIQUEID; - } else if (str == "description") { + } + if (str == "description") { return ItemAttribute_t::DESCRIPTION; - } else if (str == "text") { + } + if (str == "text") { return ItemAttribute_t::TEXT; - } else if (str == "date") { + } + if (str == "date") { return ItemAttribute_t::DATE; - } else if (str == "writer") { + } + if (str == "writer") { return ItemAttribute_t::WRITER; - } else if (str == "name") { + } + if (str == "name") { return ItemAttribute_t::NAME; - } else if (str == "article") { + } + if (str == "article") { return ItemAttribute_t::ARTICLE; - } else if (str == "pluralname") { + } + if (str == "pluralname") { return ItemAttribute_t::PLURALNAME; - } else if (str == "weight") { + } + if (str == "weight") { return ItemAttribute_t::WEIGHT; - } else if (str == "attack") { + } + if (str == "attack") { return ItemAttribute_t::ATTACK; - } else if (str == "defense") { + } + if (str == "defense") { return ItemAttribute_t::DEFENSE; - } else if (str == "extradefense") { + } + if (str == "extradefense") { return ItemAttribute_t::EXTRADEFENSE; - } else if (str == "armor") { + } + if (str == "armor") { return ItemAttribute_t::ARMOR; - } else if (str == "hitchance") { + } + if (str == "hitchance") { return ItemAttribute_t::HITCHANCE; - } else if (str == "shootrange") { + } + if (str == "shootrange") { return ItemAttribute_t::SHOOTRANGE; - } else if (str == "owner") { + } + if (str == "owner") { return ItemAttribute_t::OWNER; - } else if (str == "duration") { + } + if (str == "duration") { return ItemAttribute_t::DURATION; - } else if (str == "decaystate") { + } + if (str == "decaystate") { return ItemAttribute_t::DECAYSTATE; - } else if (str == "corpseowner") { + } + if (str == "corpseowner") { return ItemAttribute_t::CORPSEOWNER; - } else if (str == "charges") { + } + if (str == "charges") { return ItemAttribute_t::CHARGES; - } else if (str == "fluidtype") { + } + if (str == "fluidtype") { return ItemAttribute_t::FLUIDTYPE; - } else if (str == "doorid") { + } + if (str == "doorid") { return ItemAttribute_t::DOORID; - } else if (str == "timestamp") { + } + if (str == "timestamp") { return ItemAttribute_t::DURATION_TIMESTAMP; - } else if (str == "amount") { + } + if (str == "amount") { return ItemAttribute_t::AMOUNT; - } else if (str == "tier") { + } + if (str == "tier") { return ItemAttribute_t::TIER; - } else if (str == "lootmessagesuffix") { + } + if (str == "lootmessagesuffix") { return ItemAttribute_t::LOOTMESSAGE_SUFFIX; } @@ -1523,20 +1561,26 @@ int64_t OTSYS_TIME(bool useTime) { } SpellGroup_t stringToSpellGroup(const std::string &value) { - std::string tmpStr = asLowerCaseString(value); + const std::string tmpStr = asLowerCaseString(value); if (tmpStr == "attack" || tmpStr == "1") { return SPELLGROUP_ATTACK; - } else if (tmpStr == "healing" || tmpStr == "2") { + } + if (tmpStr == "healing" || tmpStr == "2") { return SPELLGROUP_HEALING; - } else if (tmpStr == "support" || tmpStr == "3") { + } + if (tmpStr == "support" || tmpStr == "3") { return SPELLGROUP_SUPPORT; - } else if (tmpStr == "special" || tmpStr == "4") { + } + if (tmpStr == "special" || tmpStr == "4") { return SPELLGROUP_SPECIAL; - } else if (tmpStr == "crippling" || tmpStr == "6") { + } + if (tmpStr == "crippling" || tmpStr == "6") { return SPELLGROUP_CRIPPLING; - } else if (tmpStr == "focus" || tmpStr == "7") { + } + if (tmpStr == "focus" || tmpStr == "7") { return SPELLGROUP_FOCUS; - } else if (tmpStr == "ultimatestrikes" || tmpStr == "8") { + } + if (tmpStr == "ultimatestrikes" || tmpStr == "8") { return SPELLGROUP_ULTIMATESTRIKES; } @@ -1551,20 +1595,20 @@ SpellGroup_t stringToSpellGroup(const std::string &value) { */ void capitalizeWords(std::string &source) { toLowerCaseString(source); - uint8_t size = (uint8_t)source.size(); + const auto size = static_cast<uint8_t>(source.size()); for (uint8_t i = 0; i < size; i++) { if (i == 0) { - source[i] = (char)toupper(source[i]); + source[i] = static_cast<char>(toupper(source[i])); } else if (source[i - 1] == ' ' || source[i - 1] == '\'') { source[i] = (char)toupper(source[i]); } } } -void capitalizeWordsIgnoringString(std::string &source, const std::string stringToIgnore) { +void capitalizeWordsIgnoringString(std::string &source, const std::string &stringToIgnore) { toLowerCaseString(source); - auto size = static_cast<uint8_t>(source.size()); - auto indexFound = source.find(stringToIgnore); + const auto size = static_cast<uint8_t>(source.size()); + const auto indexFound = source.find(stringToIgnore); for (uint8_t i = 0; i < size; i++) { if (indexFound != std::string::npos && indexFound > 0 && std::cmp_greater(i, static_cast<uint8_t>(indexFound - 1)) && i < (indexFound + stringToIgnore.size())) { @@ -1586,31 +1630,32 @@ void consoleHandlerExit() { if (isatty(STDIN_FILENO)) { getchar(); } - return; } NameEval_t validateName(const std::string &name) { StringVector prohibitedWords = { "owner", "gamemaster", "hoster", "admin", "staff", "tibia", "account", "god", "anal", "ass", "fuck", "sex", "hitler", "pussy", "dick", "rape", "cm", "gm", "tutor", "counsellor", "god" }; StringVector toks; - std::regex regexValidChars("^[a-zA-Z' ]+$"); + const std::regex regexValidChars("^[a-zA-Z' ]+$"); std::stringstream ss(name); - std::istream_iterator<std::string> begin(ss); - std::istream_iterator<std::string> end; + const std::istream_iterator<std::string> begin(ss); + const std::istream_iterator<std::string> end; std::copy(begin, end, std::back_inserter(toks)); if (name.length() < 3 || name.length() > 18) { return INVALID_LENGTH; } - if (!std::regex_match(name, regexValidChars)) { // invalid chars in name + if (!std::regex_match(name, regexValidChars)) { return INVALID_CHARACTER; } - for (std::string str : toks) { + for (const std::string &str : toks) { if (str.length() < 2) { return INVALID_TOKEN_LENGTH; - } else if (std::find(prohibitedWords.begin(), prohibitedWords.end(), str) != prohibitedWords.end()) { // searching for prohibited words + } + + if (std::ranges::find(prohibitedWords, str) != prohibitedWords.end()) { return INVALID_FORBIDDEN; } } @@ -1677,7 +1722,7 @@ std::string getObjectCategoryName(ObjectCategory_t category) { case OBJECTCATEGORY_DEFAULT: return "Unassigned Loot"; default: - return std::string(); + return {}; } } @@ -1720,31 +1765,31 @@ uint8_t forgeBonus(int32_t number) { return 0; } // Dust not consumed - else if (number >= 7400 && number < 9000) { + if (number >= 7400 && number < 9000) { return 1; } // Cores not consumed - else if (number >= 9000 && number < 9500) { + if (number >= 9000 && number < 9500) { return 2; } // Gold not consumed - else if (number >= 9500 && number < 9525) { + if (number >= 9500 && number < 9525) { return 3; } // Second item retained with decreased tier - else if (number >= 9525 && number < 9550) { + if (number >= 9525 && number < 9550) { return 4; } // Second item retained with unchanged tier - else if (number >= 9550 && number < 9950) { + if (number >= 9550 && number < 9950) { return 5; } // Second item retained with increased tier - else if (number >= 9950 && number < 9975) { + if (number >= 9950 && number < 9975) { return 6; } // Gain two tiers - else if (number >= 9975) { + if (number >= 9975) { return 7; } @@ -1752,9 +1797,9 @@ uint8_t forgeBonus(int32_t number) { } std::string formatPrice(std::string price, bool space /* = false*/) { - std::ranges::reverse(price.begin(), price.end()); + std::ranges::reverse(price); price = std::regex_replace(price, std::regex("000"), "k"); - std::ranges::reverse(price.begin(), price.end()); + std::ranges::reverse(price); if (space) { price = std::regex_replace(price, std::regex("k"), " k", std::regex_constants::format_first_only); } @@ -1875,9 +1920,9 @@ std::vector<std::string> split(const std::string &str, char delimiter /* = ','*/ } std::string getFormattedTimeRemaining(uint32_t time) { - time_t timeRemaining = time - getTimeNow(); + const time_t timeRemaining = time - getTimeNow(); - int days = static_cast<int>(std::floor(timeRemaining / 86400)); + const int days = static_cast<int>(std::floor(timeRemaining / 86400)); std::stringstream output; if (days > 1) { @@ -1885,9 +1930,9 @@ std::string getFormattedTimeRemaining(uint32_t time) { return output.str(); } - int hours = static_cast<int>(std::floor((timeRemaining % 86400) / 3600)); - int minutes = static_cast<int>(std::floor((timeRemaining % 3600) / 60)); - int seconds = static_cast<int>(timeRemaining % 60); + const auto hours = static_cast<int>(std::floor((timeRemaining % 86400) / 3600)); + const auto minutes = static_cast<int>(std::floor((timeRemaining % 3600) / 60)); + const auto seconds = static_cast<int>(timeRemaining % 60); if (hours == 0 && minutes == 0 && seconds > 0) { output << " less than 1 minute"; @@ -1908,6 +1953,39 @@ unsigned int getNumberOfCores() { return cores; } +Cipbia_Elementals_t getCipbiaElement(CombatType_t combatType) { + switch (combatType) { + case COMBAT_PHYSICALDAMAGE: + return CIPBIA_ELEMENTAL_PHYSICAL; + case COMBAT_ENERGYDAMAGE: + return CIPBIA_ELEMENTAL_ENERGY; + case COMBAT_EARTHDAMAGE: + return CIPBIA_ELEMENTAL_EARTH; + case COMBAT_FIREDAMAGE: + return CIPBIA_ELEMENTAL_FIRE; + case COMBAT_LIFEDRAIN: + return CIPBIA_ELEMENTAL_LIFEDRAIN; + case COMBAT_HEALING: + return CIPBIA_ELEMENTAL_HEALING; + case COMBAT_DROWNDAMAGE: + return CIPBIA_ELEMENTAL_DROWN; + case COMBAT_ICEDAMAGE: + return CIPBIA_ELEMENTAL_ICE; + case COMBAT_HOLYDAMAGE: + return CIPBIA_ELEMENTAL_HOLY; + case COMBAT_DEATHDAMAGE: + return CIPBIA_ELEMENTAL_DEATH; + case COMBAT_MANADRAIN: + return CIPBIA_ELEMENTAL_MANADRAIN; + case COMBAT_AGONYDAMAGE: + return CIPBIA_ELEMENTAL_AGONY; + case COMBAT_NEUTRALDAMAGE: + return CIPBIA_ELEMENTAL_AGONY; + default: + return CIPBIA_ELEMENTAL_UNDEFINED; + } +} + /** * @brief Formats a number to a string with commas * @param number The number to format @@ -1934,8 +2012,10 @@ void sleep_for(uint64_t ms) { */ std::string toKey(const std::string &str) { std::string key = asLowerCaseString(str); - std::replace(key.begin(), key.end(), ' ', '-'); - key.erase(std::remove_if(key.begin(), key.end(), [](char c) { return std::isspace(c); }), key.end()); + std::ranges::replace(key, ' ', '-'); + std::erase_if(key, [](char c) { + return std::isspace(c); + }); return key; } @@ -1954,3 +2034,48 @@ uint8_t convertWheelGemAffinityToDomain(uint8_t affinity) { return 0; } } + +bool caseInsensitiveCompare(std::string_view str1, std::string_view str2, size_t length /*= std::string_view::npos*/) { + if (length == std::string_view::npos) { + if (str1.size() != str2.size()) { + return false; + } + length = str1.size(); + } else { + length = std::min({ length, str1.size(), str2.size() }); + } + + return std::equal(str1.begin(), str1.begin() + length, str2.begin(), [](char c1, char c2) { + return std::tolower(static_cast<unsigned char>(c1)) == std::tolower(static_cast<unsigned char>(c2)); + }); +} + +void printStackTrace() { + if (g_logger().getLevel() == "info") { + return; + } + + constexpr int kMaxFrames = 64; + std::array<void*, kMaxFrames> stack; + int numFrames = absl::GetStackTrace(stack.data(), kMaxFrames, 0); + absl::InitializeSymbolizer(""); + g_logger().info("Stack trace captured:"); + for (int i = 0; i < numFrames; ++i) { + char symbolBuffer[1024]; + if (absl::Symbolize(stack[i], symbolBuffer, sizeof(symbolBuffer))) { + g_logger().info("{}: {}", i, symbolBuffer); + } else { + g_logger().info("{}: [Unknown function]", i); + } + } +} + +const std::map<uint8_t, uint16_t> &getMaxValuePerSkill() { + static std::map<uint8_t, uint16_t> maxValuePerSkill = { + { SKILL_LIFE_LEECH_CHANCE, 100 }, + { SKILL_MANA_LEECH_CHANCE, 100 }, + { SKILL_CRITICAL_HIT_CHANCE, 100 * g_configManager().getNumber(CRITICALCHANCE) } + }; + + return maxValuePerSkill; +} diff --git a/src/utils/tools.hpp b/src/utils/tools.hpp index a4426a066..7a7d4a22b 100644 --- a/src/utils/tools.hpp +++ b/src/utils/tools.hpp @@ -9,16 +9,33 @@ #pragma once -#include "utils/utils_definitions.hpp" -#include "declarations.hpp" -#include "enums/item_attribute.hpp" -#include "game/movement/position.hpp" -#include "enums/object_category.hpp" - namespace pugi { - class xml_parse_result; + struct xml_parse_result; } +struct Position; + +enum CombatType_t : uint8_t; +enum Direction : uint8_t; +enum MagicEffectClasses : uint16_t; +enum ShootType_t : uint8_t; +enum Ammo_t : uint8_t; +enum WeaponAction_t : uint8_t; +enum Skulls_t : uint8_t; +enum ImbuementTypes_t : int64_t; +enum SpawnType_t : uint8_t; +enum WeaponType_t : uint8_t; +enum MoveEvent_t : uint8_t; +enum NameEval_t : uint8_t; +enum BedItemPart_t : uint8_t; +enum ObjectCategory_t : uint8_t; +enum class ItemAttribute_t : uint64_t; +enum ReturnValue : uint16_t; +enum SpellGroup_t : uint8_t; +enum Cipbia_Elementals_t : uint8_t; +enum PlayerPronoun_t : uint8_t; +enum PlayerSex_t : uint8_t; + #ifndef USE_PRECOMPILED_HEADERS #include <random> #endif @@ -27,7 +44,7 @@ void printXMLError(const std::string &where, const std::string &fileName, const std::string transformToSHA1(const std::string &input); -uint16_t getStashSize(StashItemList itemList); +uint16_t getStashSize(const std::map<uint16_t, uint32_t> &itemList); std::string generateToken(const std::string &secret, uint32_t ticks); @@ -60,7 +77,7 @@ int32_t uniform_random(int32_t minNumber, int32_t maxNumber); int32_t normal_random(int32_t minNumber, int32_t maxNumber); bool boolean_random(double probability = 0.5); -BedItemPart_t getBedPart(const std::string_view string); +BedItemPart_t getBedPart(std::string_view string); Direction getDirection(const std::string &string); Position getNextPosition(Direction direction, Position pos); @@ -138,7 +155,7 @@ const char* getReturnMessage(ReturnValue value); void sleep_for(uint64_t ms); void capitalizeWords(std::string &source); -void capitalizeWordsIgnoringString(std::string &source, const std::string stringToIgnore); +void capitalizeWordsIgnoringString(std::string &source, const std::string &stringToIgnore); void consoleHandlerExit(); NameEval_t validateName(const std::string &name); @@ -160,38 +177,7 @@ std::string getFormattedTimeRemaining(uint32_t time); unsigned int getNumberOfCores(); -static inline Cipbia_Elementals_t getCipbiaElement(CombatType_t combatType) { - switch (combatType) { - case COMBAT_PHYSICALDAMAGE: - return CIPBIA_ELEMENTAL_PHYSICAL; - case COMBAT_ENERGYDAMAGE: - return CIPBIA_ELEMENTAL_ENERGY; - case COMBAT_EARTHDAMAGE: - return CIPBIA_ELEMENTAL_EARTH; - case COMBAT_FIREDAMAGE: - return CIPBIA_ELEMENTAL_FIRE; - case COMBAT_LIFEDRAIN: - return CIPBIA_ELEMENTAL_LIFEDRAIN; - case COMBAT_HEALING: - return CIPBIA_ELEMENTAL_HEALING; - case COMBAT_DROWNDAMAGE: - return CIPBIA_ELEMENTAL_DROWN; - case COMBAT_ICEDAMAGE: - return CIPBIA_ELEMENTAL_ICE; - case COMBAT_HOLYDAMAGE: - return CIPBIA_ELEMENTAL_HOLY; - case COMBAT_DEATHDAMAGE: - return CIPBIA_ELEMENTAL_DEATH; - case COMBAT_MANADRAIN: - return CIPBIA_ELEMENTAL_MANADRAIN; - case COMBAT_AGONYDAMAGE: - return CIPBIA_ELEMENTAL_AGONY; - case COMBAT_NEUTRALDAMAGE: - return CIPBIA_ELEMENTAL_AGONY; - default: - return CIPBIA_ELEMENTAL_UNDEFINED; - } -} +Cipbia_Elementals_t getCipbiaElement(CombatType_t combatType); std::string formatNumber(uint64_t number); @@ -220,3 +206,9 @@ template <typename EnumType, typename UnderlyingType = std::underlying_type_t<En EnumType enumFromValue(UnderlyingType value) { return static_cast<EnumType>(value); } + +bool caseInsensitiveCompare(std::string_view str1, std::string_view str2, size_t length = std::string_view::npos); + +void printStackTrace(); + +const std::map<uint8_t, uint16_t> &getMaxValuePerSkill(); diff --git a/src/utils/transparent_string_hash.hpp b/src/utils/transparent_string_hash.hpp new file mode 100644 index 000000000..2092aa2cb --- /dev/null +++ b/src/utils/transparent_string_hash.hpp @@ -0,0 +1,24 @@ +/** + * Canary - A free and open-source MMORPG server emulator + * Copyright (ÂĐ) 2019-2024 OpenTibiaBR <opentibiabr@outlook.com> + * 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 + +class TransparentStringHasher { +public: + using is_transparent = void; + size_t operator()(const std::string &key) const noexcept { + return std::hash<std::string> {}(key); + } + size_t operator()(std::string_view key) const noexcept { + return std::hash<std::string_view> {}(key); + } + size_t operator()(const char* key) const noexcept { + return std::hash<std::string_view> {}(key); + } +}; diff --git a/src/utils/utils_definitions.hpp b/src/utils/utils_definitions.hpp index be50fd35b..6eae663da 100644 --- a/src/utils/utils_definitions.hpp +++ b/src/utils/utils_definitions.hpp @@ -9,37 +9,6 @@ #pragma once -// Enums -enum Icons_t { - ICON_POISON = 1 << 0, - ICON_BURN = 1 << 1, - ICON_ENERGY = 1 << 2, - ICON_DRUNK = 1 << 3, - ICON_MANASHIELD = 1 << 4, - ICON_PARALYZE = 1 << 5, - ICON_HASTE = 1 << 6, - ICON_SWORDS = 1 << 7, - ICON_DROWNING = 1 << 8, - ICON_FREEZING = 1 << 9, - ICON_DAZZLED = 1 << 10, - ICON_CURSED = 1 << 11, - ICON_PARTY_BUFF = 1 << 12, - ICON_REDSWORDS = 1 << 13, - ICON_PIGEON = 1 << 14, - ICON_BLEEDING = 1 << 15, - ICON_LESSERHEX = 1 << 16, - ICON_INTENSEHEX = 1 << 17, - ICON_GREATERHEX = 1 << 18, - ICON_ROOTED = 1 << 19, - ICON_FEARED = 1 << 20, - ICON_GOSHNAR1 = 1 << 21, - ICON_GOSHNAR2 = 1 << 22, - ICON_GOSHNAR3 = 1 << 23, - ICON_GOSHNAR4 = 1 << 24, - ICON_GOSHNAR5 = 1 << 25, - ICON_NEWMANASHIELD = 1 << 26, -}; - enum WieldInfo_t { WIELDINFO_NONE = 0, WIELDINFO_LEVEL = 1 << 0, @@ -48,7 +17,7 @@ enum WieldInfo_t { WIELDINFO_PREMIUM = 1 << 3, }; -enum SpawnType_t { +enum SpawnType_t : uint8_t { RESPAWN_IN_ALL = 0, RESPAWN_IN_DAY = 1, RESPAWN_IN_NIGHT = 2, @@ -379,23 +348,25 @@ enum Fluids_t : uint8_t { FLUID_NONE = 0, /* Blue */ FLUID_WATER = 1, /* Blue */ FLUID_WINE = 2, /* Purple */ - FLUID_BEER = 3, /* Brown */ - FLUID_MUD = 4, /* Brown */ + FLUID_BEER = 3, /* Orange */ + FLUID_MUD = 4, /* Orange */ FLUID_BLOOD = 5, /* Red */ FLUID_SLIME = 6, /* Green */ - FLUID_OIL = 7, /* Brown */ + FLUID_OIL = 7, /* Orange */ FLUID_URINE = 8, /* Yellow */ FLUID_MILK = 9, /* White */ FLUID_MANA = 10, /* Purple */ FLUID_LIFE = 11, /* Red */ FLUID_LEMONADE = 12, /* Yellow */ - FLUID_RUM = 13, /* Brown */ + FLUID_RUM = 13, /* Orange */ FLUID_FRUITJUICE = 14, /* Yellow */ FLUID_COCONUTMILK = 15, /* White */ - FLUID_MEAD = 16, /* Brown */ - FLUID_TEA = 17, /* Brown */ - FLUID_INK = 18 /* Black */ - // 12.85 last fluid is 18, 19+ is a loop from 0 to 18 over and over again + FLUID_MEAD = 16, /* Orange */ + FLUID_TEA = 17, /* Orange */ + FLUID_INK = 18, /* Black */ + FLUID_CANDY = 19, /* Red with white pieces */ + FLUID_CHOCOLATE = 20, /* Brown */ + // 13.40 last fluid is 20, 21+ is a loop from 0 to 20 over and over again }; enum SquareColor_t : uint8_t { @@ -660,6 +631,9 @@ enum ItemID_t : uint16_t { ITEM_BATHTUB_FILLED = 26077, ITEM_BATHTUB_FILLED_NOTMOVABLE = 26100, + ITEM_LESSER_FRAGMENT = 46625, + ITEM_GREATER_FRAGMENT = 46626, + ITEM_NONE = 0 }; @@ -765,5 +739,6 @@ enum Screenshot_t : uint8_t { SCREENSHOT_TYPE_PLAYERKILL = 9, SCREENSHOT_TYPE_PLAYERATTACKING = 10, SCREENSHOT_TYPE_TREASUREFOUND = 11, - SCREENSHOT_TYPE_SKILLUP = 12 + SCREENSHOT_TYPE_SKILLUP = 12, + SCREENSHOT_TYPE_GIFTOFLIFE = 13, }; diff --git a/src/utils/vectorsort.hpp b/src/utils/vectorsort.hpp index 0a3618b96..c9dc35e0d 100644 --- a/src/utils/vectorsort.hpp +++ b/src/utils/vectorsort.hpp @@ -27,7 +27,7 @@ namespace stdext { bool erase(const T &v) { update(); - const auto &it = std::ranges::lower_bound(container, v); + auto it = std::ranges::lower_bound(container, v); if (it == container.end()) { return false; } diff --git a/src/utils/wildcardtree.cpp b/src/utils/wildcardtree.cpp index 4fd830b64..37f29caa2 100644 --- a/src/utils/wildcardtree.cpp +++ b/src/utils/wildcardtree.cpp @@ -7,12 +7,10 @@ * Website: https://docs.opentibiabr.com/ */ -#include "pch.hpp" - #include "utils/wildcardtree.hpp" std::shared_ptr<WildcardTreeNode> WildcardTreeNode::getChild(char ch) { - auto it = children.find(ch); + const auto it = children.find(ch); if (it == children.end()) { return nullptr; } @@ -20,7 +18,7 @@ std::shared_ptr<WildcardTreeNode> WildcardTreeNode::getChild(char ch) { } std::shared_ptr<WildcardTreeNode> WildcardTreeNode::getChild(char ch) const { - auto it = children.find(ch); + const auto it = children.find(ch); if (it == children.end()) { return nullptr; } @@ -28,22 +26,22 @@ std::shared_ptr<WildcardTreeNode> WildcardTreeNode::getChild(char ch) const { } std::shared_ptr<WildcardTreeNode> WildcardTreeNode::addChild(char ch, bool breakp) { - std::shared_ptr<WildcardTreeNode> child = getChild(ch); + auto child = getChild(ch); if (child) { if (breakp && !child->breakpoint) { child->breakpoint = true; } } else { - auto pair = children.emplace(std::piecewise_construct, std::forward_as_tuple(ch), std::forward_as_tuple(std::make_shared<WildcardTreeNode>(breakp))); - child = pair.first->second; + const auto [fst, snd] = children.emplace(std::piecewise_construct, std::forward_as_tuple(ch), std::forward_as_tuple(std::make_shared<WildcardTreeNode>(breakp))); + child = fst->second; } return child; } void WildcardTreeNode::insert(const std::string &str) { - std::shared_ptr<WildcardTreeNode> cur = static_self_cast<WildcardTreeNode>(); + auto cur = static_self_cast<WildcardTreeNode>(); - size_t length = str.length() - 1; + const size_t length = str.length() - 1; for (size_t pos = 0; pos < length; ++pos) { cur = cur->addChild(str[pos], false); } @@ -52,7 +50,7 @@ void WildcardTreeNode::insert(const std::string &str) { } void WildcardTreeNode::remove(const std::string &str) { - std::shared_ptr<WildcardTreeNode> cur = static_self_cast<WildcardTreeNode>(); + auto cur = static_self_cast<WildcardTreeNode>(); std::stack<std::shared_ptr<WildcardTreeNode>> path; path.push(cur); @@ -86,7 +84,7 @@ void WildcardTreeNode::remove(const std::string &str) { ReturnValue WildcardTreeNode::findOne(const std::string &query, std::string &result) const { auto cur = static_self_cast<const WildcardTreeNode>(); - for (char pos : query) { + for (const char &pos : query) { cur = cur->getChild(pos); if (!cur) { return RETURNVALUE_PLAYERWITHTHISNAMEISNOTONLINE; @@ -96,14 +94,14 @@ ReturnValue WildcardTreeNode::findOne(const std::string &query, std::string &res result = query; do { - size_t size = cur->children.size(); + const size_t size = cur->children.size(); if (size == 0) { return RETURNVALUE_NOERROR; } else if (size > 1 || cur->breakpoint) { return RETURNVALUE_NAMEISTOOAMBIGUOUS; } - auto it = cur->children.begin(); + const auto it = cur->children.begin(); result += it->first; cur = it->second; } while (true); diff --git a/src/utils/wildcardtree.hpp b/src/utils/wildcardtree.hpp index 9f3d2cf8e..ccbad316e 100644 --- a/src/utils/wildcardtree.hpp +++ b/src/utils/wildcardtree.hpp @@ -11,7 +11,7 @@ #include "declarations.hpp" -class WildcardTreeNode : public SharedObject { +class WildcardTreeNode final : public SharedObject { public: explicit WildcardTreeNode(bool initBreakpoint) : breakpoint(initBreakpoint) { } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5cf5c5d80..d35631ff2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,6 +9,15 @@ function(setup_test TARGET_NAME DIR) target_link_libraries(${TARGET_NAME} PRIVATE Boost::ut ${PROJECT_NAME}_lib) target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/tests/fixture PRIVATE ${CMAKE_SOURCE_DIR}/tests/${DIR}) + if(SPEED_UP_BUILD_UNITY AND (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "Release")) + set_target_properties(${TARGET_NAME} PROPERTIES UNITY_BUILD ON) + log_option_enabled("Build unity for speed up compilation for target ${TARGET_NAME}") + else() + log_option_disabled("Build unity") + endif() + + configure_linking(${TARGET_NAME}) + add_test(NAME ${DIR} COMMAND ${TARGET_NAME}) if(RUN_TESTS_AFTER_BUILD) add_custom_command( diff --git a/tests/build_and_run.sh b/tests/build_and_run.sh index 3d5531ebf..f88552535 100644 --- a/tests/build_and_run.sh +++ b/tests/build_and_run.sh @@ -1,12 +1,22 @@ #!/usr/bin/env bash +# Clean up existing containers, images and volumes and start over docker-compose down --rmi all -v --remove-orphans docker-compose up --build -d + +# Check if the build directory exists, if it doesn't exist it creates it cd .. -mkdir build -cd build -cmake -DPACKAGE_TESTS=On .. ; make -j`nproc` -./tests/canary_unittest --reporter compact --success -d yes -cd .. -cd tests +if [ ! -d "build" ]; then + mkdir build +fi +cd build || exit + +# Configure the build using vcpkg and compile the project with 6 threads +cmake -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Debug -DPACKAGE_TESTS=On .. ; make -j"$(nproc)" + +# Run tests after compilation +./tests/unit/canary_ut --reporter compact --success + +# Go back to the tests folder and clean the Docker environment again +cd ../tests || exit docker-compose down --rmi all -v --remove-orphans diff --git a/tests/fixture/account/in_memory_account_repository.hpp b/tests/fixture/account/in_memory_account_repository.hpp index 40dbda38e..d86d6a483 100644 --- a/tests/fixture/account/in_memory_account_repository.hpp +++ b/tests/fixture/account/in_memory_account_repository.hpp @@ -33,10 +33,10 @@ namespace tests { accounts[descriptor] = acc; } - bool loadByID(const uint32_t &id, AccountInfo &acc) final { + bool loadByID(const uint32_t &id, std::unique_ptr<AccountInfo> &acc) final { for (const auto &account : accounts) { if (account.second.id == id) { - acc = account.second; + acc = std::make_unique<AccountInfo>(account.second); return true; } } @@ -44,29 +44,29 @@ namespace tests { return false; } - bool loadByEmailOrName(bool oldProtocol, const std::string &email, AccountInfo &acc) final { + bool loadByEmailOrName(bool oldProtocol, const std::string &email, std::unique_ptr<AccountInfo> &acc) final { auto account = accounts.find(email); if (account == accounts.end()) { return false; } - acc = account->second; + acc = std::make_unique<AccountInfo>(account->second); return true; } - bool loadBySession(const std::string &sessionKey, AccountInfo &acc) final { + bool loadBySession(const std::string &sessionKey, std::unique_ptr<AccountInfo> &acc) final { auto account = accounts.find(sessionKey); if (account == accounts.end()) { return false; } - acc = account->second; + acc = std::make_unique<AccountInfo>(account->second); return true; } - bool save(const AccountInfo &accInfo) final { + bool save(const std::unique_ptr<AccountInfo> &accInfo) final { return !failSave; } @@ -75,7 +75,7 @@ namespace tests { return !failGetPassword; } - bool getCoins(const uint32_t &id, const uint8_t &type, uint32_t &coins) final { + bool getCoins(const uint32_t &id, CoinType type, uint32_t &coins) final { auto accountCoins = coins_.find(id); if (accountCoins == coins_.end()) { @@ -92,11 +92,11 @@ namespace tests { return true; } - bool setCoins(const uint32_t &id, const uint8_t &type, const uint32_t &amount) final { + bool setCoins(const uint32_t &id, CoinType type, const uint32_t &amount) final { auto accountCoins = coins_.find(id); if (accountCoins == coins_.end()) { - coins_[id] = phmap::flat_hash_map<uint8_t, uint32_t>(); + coins_[id] = phmap::flat_hash_map<CoinType, uint32_t>(); } coins_[id][type] = amount; @@ -105,21 +105,32 @@ namespace tests { bool registerCoinsTransaction( const uint32_t &id, - uint8_t type, + CoinTransactionType type, uint32_t coins, - const uint8_t &coinType, + CoinType coinType, const std::string &description ) final { auto accountCoins = coinsTransactions_.find(id); if (accountCoins == coinsTransactions_.end()) { - coinsTransactions_[id] = std::vector<std::tuple<uint8_t, uint32_t, uint8_t, std::string>>(); + coinsTransactions_[id] = std::vector<std::tuple<CoinTransactionType, uint32_t, CoinType, std::string>>(); } coinsTransactions_[id].emplace_back(type, coins, coinType, description); return true; } + bool getCharacterByAccountIdAndName(const uint32_t &id, const std::string &name) final { + for (auto it = accounts.begin(); it != accounts.end(); ++it) { + if (it->second.id == id) { + if (it->second.players.find(name) != it->second.players.end()) { + return true; + } + } + } + return false; + } + InMemoryAccountRepository &reset() { accounts.clear(); coins_.clear(); @@ -139,8 +150,8 @@ namespace tests { bool failAuthenticateFromSession = false; std::string password_ = "123456"; phmap::flat_hash_map<std::string, AccountInfo> accounts; - phmap::flat_hash_map<uint32_t, phmap::flat_hash_map<uint8_t, uint32_t>> coins_; - phmap::flat_hash_map<uint32_t, std::vector<std::tuple<uint8_t, uint32_t, uint8_t, std::string>>> coinsTransactions_; + phmap::flat_hash_map<uint32_t, phmap::flat_hash_map<CoinType, uint32_t>> coins_; + phmap::flat_hash_map<uint32_t, std::vector<std::tuple<CoinTransactionType, uint32_t, CoinType, std::string>>> coinsTransactions_; }; } diff --git a/tests/fixture/lib/logging/in_memory_logger.hpp b/tests/fixture/lib/logging/in_memory_logger.hpp index 76f0e7307..b45af9171 100644 --- a/tests/fixture/lib/logging/in_memory_logger.hpp +++ b/tests/fixture/lib/logging/in_memory_logger.hpp @@ -51,7 +51,7 @@ class InMemoryLogger : public Logger { return false; } - void setLevel(const std::string &name) override { + void setLevel(const std::string &name) const override { // For the stub, setting a level might not have any behavior. // But you can implement level filtering if you like. } @@ -61,10 +61,34 @@ class InMemoryLogger : public Logger { return "DEBUG"; } - virtual void log(const std::string &lvl, const fmt::basic_string_view<char> msg) const override { - logs.push_back({ lvl, { msg.data(), msg.size() } }); + virtual void info(const std::string &msg) const override { + logs.push_back({ "info", msg }); } + virtual void warn(const std::string &msg) const override { + logs.push_back({ "warning", msg }); + } + + virtual void error(const std::string &msg) const override { + logs.push_back({ "error", msg }); + } + + virtual void critical(const std::string &msg) const override { + logs.push_back({ "critical", msg }); + } + +#if defined(DEBUG_LOG) + virtual void debug(const std::string &msg) const override { + logs.push_back({ "debug", msg }); + } + + virtual void trace(const std::string &msg) const override { + logs.push_back({ "trace", msg }); + } +#else + virtual void debug(const std::string &) const override { } + virtual void trace(const std::string &) const override { } +#endif // Helper methods for testing size_t logCount() const { return logs.size(); diff --git a/tests/integration/main.cpp b/tests/integration/main.cpp index 3a34285f1..019c38524 100644 --- a/tests/integration/main.cpp +++ b/tests/integration/main.cpp @@ -1,6 +1,7 @@ #include <boost/ut.hpp> #include "account/account_repository_db.hpp" +#include "database/database.hpp" #include "lib/logging/in_memory_logger.hpp" #include "utils/tools.hpp" #include "enums/account_type.hpp" @@ -35,15 +36,15 @@ void createAccount(Database &db) { )); } -void assertAccountLoad(AccountInfo acc) { - expect(eq(acc.id, 111)); - expect(eq(acc.accountType, AccountType::ACCOUNT_TYPE_SENIORTUTOR)); - expect(eq(acc.premiumRemainingDays, 11)); - expect(eq(acc.premiumLastDay, 1293912)); - expect(eq(acc.players.size(), 0)); - expect(eq(acc.oldProtocol, false)); - expect(eq(acc.premiumDaysPurchased, 11)); - expect(approx(acc.creationTime, 42183281, 60 * 60 * 1000)); +void assertAccountLoad(const std::unique_ptr<AccountInfo> &acc) { + expect(eq(acc->id, 111)); + expect(eq(acc->accountType, AccountType::ACCOUNT_TYPE_SENIORTUTOR)); + expect(eq(acc->premiumRemainingDays, 11)); + expect(eq(acc->premiumLastDay, 1293912)); + expect(eq(acc->players.size(), 0)); + expect(eq(acc->oldProtocol, false)); + expect(eq(acc->premiumDaysPurchased, 11)); + expect(approx(acc->creationTime, 42183281, 60 * 60 * 1000)); } int main() { @@ -73,10 +74,10 @@ int main() { AccountRepositoryDB accRepo{}; createAccount(db); - AccountInfo acc{}; + auto acc = std::make_unique<AccountInfo>(); accRepo.loadByID(111, acc); assertAccountLoad(acc); - expect(eq(acc.sessionExpires, 0)); + expect(eq(acc->sessionExpires, 0)); }); test("AccountRepositoryDB::loadByEmailOrName") = databaseTest(db, [&db] { @@ -84,10 +85,10 @@ int main() { AccountRepositoryDB accRepo {}; createAccount(db); - AccountInfo acc {}; + auto acc = std::make_unique<AccountInfo>(); accRepo.loadByEmailOrName(false, "@test", acc); assertAccountLoad(acc); - expect(eq(acc.sessionExpires, 0)); + expect(eq(acc->sessionExpires, 0)); }); test("AccountRepositoryDB::loadBySession") = databaseTest(db, [&db] { @@ -95,25 +96,25 @@ int main() { AccountRepositoryDB accRepo {}; createAccount(db); - AccountInfo acc {}; + auto acc = std::make_unique<AccountInfo>(); accRepo.loadBySession("test", acc); assertAccountLoad(acc); - expect(eq(acc.sessionExpires, 1337)); + expect(eq(acc->sessionExpires, 1337)); }); test("AccountRepositoryDB load sets premium day purchased = remaining days, if needed") = databaseTest(db, [&db] { InMemoryLogger logger{}; AccountRepositoryDB accRepo{}; - AccountInfo acc{}; + auto acc = std::make_unique<AccountInfo>(); accRepo.loadByID(1, acc); - acc.premiumRemainingDays = 10; + acc->premiumRemainingDays = 10; accRepo.save(acc); accRepo.loadByID(1, acc); - expect(eq(acc.premiumDaysPurchased, 10)); + expect(eq(acc->premiumDaysPurchased, 10)); }); test("AccountRepositoryDB::getPassword") = databaseTest(db, [&db] { @@ -142,21 +143,21 @@ int main() { InMemoryLogger logger {}; AccountRepositoryDB accRepo {}; - AccountInfo acc {}; - acc.id = 1; - acc.accountType = AccountType::ACCOUNT_TYPE_SENIORTUTOR; - acc.premiumRemainingDays = 10; - acc.premiumLastDay = 10; - acc.sessionExpires = 99999999; + auto acc = std::make_unique<AccountInfo>(); + acc->id = 1; + acc->accountType = AccountType::ACCOUNT_TYPE_SENIORTUTOR; + acc->premiumRemainingDays = 10; + acc->premiumLastDay = 10; + acc->sessionExpires = 99999999; expect(accRepo.save(acc)); - AccountInfo acc2 {}; + auto acc2 = std::make_unique<AccountInfo>(); accRepo.loadByID(1, acc2); - expect(eq(acc2.id, 1)); - expect(eq(acc2.accountType, AccountType::ACCOUNT_TYPE_SENIORTUTOR)); - expect(eq(acc2.premiumRemainingDays, 10)); - expect(eq(acc2.premiumLastDay, 10)); + expect(eq(acc2->id, 1)); + expect(eq(acc2->accountType, AccountType::ACCOUNT_TYPE_SENIORTUTOR)); + expect(eq(acc2->premiumRemainingDays, 10)); + expect(eq(acc2->premiumLastDay, 10)); // sessionExpires is not saved - expect(eq(acc2.sessionExpires, 0)); + expect(eq(acc2->sessionExpires, 0)); }); } diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 8d234a676..991a01025 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -1,7 +1,9 @@ setup_test(canary_ut unit) add_subdirectory(account) +add_subdirectory(items) add_subdirectory(kv) add_subdirectory(lib) add_subdirectory(security) +add_subdirectory(server) add_subdirectory(utils) diff --git a/tests/unit/account/account_test.cpp b/tests/unit/account/account_test.cpp index 9259703c7..5ff632276 100644 --- a/tests/unit/account/account_test.cpp +++ b/tests/unit/account/account_test.cpp @@ -19,49 +19,65 @@ #include "enums/account_group_type.hpp" #include "utils/tools.hpp" +using namespace boost::ut; +using namespace std; + +template <typename T, typename U> +bool eqEnum(const T& lhs, const U& rhs) { + if constexpr (std::is_enum_v<T> && std::is_enum_v<U>) { + return enumToValue(lhs) == enumToValue(rhs); + } else if constexpr (std::is_enum_v<T>) { + return enumToValue(lhs) == rhs; + } else if constexpr (std::is_enum_v<U>) { + return lhs == enumToValue(rhs); + } else { + return lhs == rhs; + } +} + suite<"account"> accountTest = [] { - InjectionFixture injectionFixture {}; + InjectionFixture injectionFixture{}; + test("Account::Account default constructors") = [] { - Account byId { 1 }, byDescriptor { "canary@test.com" }; + shared_ptr<Account> byId = make_shared<Account>(1); + shared_ptr<Account> byDescriptor = make_shared<Account>("canary@test.com"); - expect(eq(byId.getID(), 1)); - expect(eq(byDescriptor.getID(), 0)); + expect(eq(byId->getID(), 1)); + expect(eq(byDescriptor->getID(), 0)); - expect(byId.getDescriptor().empty()); - expect(eq(byDescriptor.getDescriptor(), std::string { "canary@test.com" })); + expect(byId->getDescriptor().empty()); + expect(eq(byDescriptor->getDescriptor(), string{"canary@test.com"})); - for (auto &account : { byId, byDescriptor }) { - expect( - eq(account.getPremiumRemainingDays(), 0) and - eq(account.getPremiumLastDay(), 0) and - eq(account.getAccountType(), AccountType::ACCOUNT_TYPE_NORMAL) - ); + for (auto& account : { byId, byDescriptor }) { + expect(eq(account->getPremiumRemainingDays(), 0)); + expect(eq(account->getPremiumLastDay(), 0)); + expect(eqEnum(account->getAccountType(), AccountType::ACCOUNT_TYPE_NORMAL)); } }; struct AccountLoadTestCase { - std::string description; - Account account; + string description; + shared_ptr<Account> account; AccountErrors_t expectedError; }; - std::vector<AccountLoadTestCase> accountLoadTestCases { - { "returns by id if exists", Account { 1 }, AccountErrors_t::Ok }, - { "returns by descriptor if exists", Account { "canary@test.com" }, AccountErrors_t::Ok }, - { "returns error if id is not valid", Account { 2 }, AccountErrors_t::LoadingAccount }, - { "returns error if descriptor is not valid", Account { "not@valid.com" }, AccountErrors_t::LoadingAccount } + vector<AccountLoadTestCase> accountLoadTestCases{ + {"returns by id if exists", make_shared<Account>(1), AccountErrors_t::Ok}, + {"returns by descriptor if exists", make_shared<Account>("canary@test.com"), AccountErrors_t::Ok}, + {"returns error if id is not valid", make_shared<Account>(2), AccountErrors_t::LoadingAccount}, + {"returns error if descriptor is not valid", make_shared<Account>("not@valid.com"), AccountErrors_t::LoadingAccount} }; - for (auto accountLoadTestCase : accountLoadTestCases) { - test(accountLoadTestCase.description) = [&injectionFixture, &accountLoadTestCase] { + for (auto& testCase : accountLoadTestCases) { + test(testCase.description) = [&injectionFixture, &testCase] { auto [accountRepository] = injectionFixture.get<AccountRepository>(); - accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect(eq(accountLoadTestCase.account.load(), enumToValue(accountLoadTestCase.expectedError))) << accountLoadTestCase.description; + accountRepository.addAccount("canary@test.com", AccountInfo{1, 1, 1, AccountType::ACCOUNT_TYPE_GOD}); + expect(eqEnum(testCase.account->load(), testCase.expectedError)) << testCase.description; }; } test("Account::reload returns error if not yet loaded") = [] { - expect(eq(Account { 1 }.reload(), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(Account { 1 }.reload(), AccountErrors_t::NotInitialized)); }; test("Account::reload reloads account info") = [&injectionFixture] { @@ -70,21 +86,17 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GOD) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GOD)); accountRepository.addAccount("canary2@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GAMEMASTER }); - expect( - eq(acc.reload(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GAMEMASTER) - ); + expect(eqEnum(acc.reload(), AccountErrors_t::Ok)); + expect(eqEnum(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GAMEMASTER)); }; test("Account::save returns error if not yet loaded") = [] { - expect(eq(Account { 1 }.save(), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(Account { 1 }.save(), AccountErrors_t::NotInitialized)); }; test("Account::save returns error if it fails") = [&injectionFixture] { @@ -94,7 +106,8 @@ suite<"account"> accountTest = [] { accountRepository.failSave = true; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect(eq(acc.load(), enumToValue(AccountErrors_t::Ok) and eq(acc.save(), enumToValue(AccountErrors_t::Storage)))); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.save(), AccountErrors_t::Storage)); }; test("Account::save saves account info") = [&injectionFixture] { @@ -104,11 +117,12 @@ suite<"account"> accountTest = [] { accountRepository.failSave = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect(eq(acc.load(), enumToValue(AccountErrors_t::Ok) and eq(acc.save(), enumToValue(AccountErrors_t::Ok)))); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.save(), AccountErrors_t::Ok)); }; test("Account::getCoins returns error if not yet loaded") = [&injectionFixture] { - expect(eq(std::get<1>(Account { 1 }.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(std::get<1>(Account { 1 }.getCoins(CoinType::Normal)), AccountErrors_t::NotInitialized)); }; test("Account::getCoins returns error if it fails") = [&injectionFixture] { @@ -117,10 +131,8 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Storage)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Storage)); }; test("Account::getCoins returns coins") = [&injectionFixture] { @@ -128,13 +140,11 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 100) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 100)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::getCoins returns coins for specified account only") = [&injectionFixture] { @@ -142,16 +152,14 @@ suite<"account"> accountTest = [] { Account acc { 2 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); accountRepository.addAccount("canary2@test.com", AccountInfo { 2, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(2, enumToValue(CoinType::Normal), 33); + accountRepository.setCoins(2, CoinType::Normal, 33); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 33) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 33)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::getCoins returns coins for specified coin type only") = [&injectionFixture] { @@ -159,20 +167,18 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); - accountRepository.setCoins(1, enumToValue(CoinType::Tournament), 100); - - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 100) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Tournament))), 100) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Tournament))), enumToValue(AccountErrors_t::Ok)) - ); + accountRepository.setCoins(1, CoinType::Normal, 100); + accountRepository.setCoins(1, CoinType::Tournament, 100); + + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 100)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Tournament)), 100)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Tournament)), AccountErrors_t::Ok)); }; test("Account::addCoins returns error if not yet loaded") = [] { - expect(eq(Account { 1 }.addCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(Account { 1 }.addCoins(CoinType::Normal, 100), AccountErrors_t::NotInitialized)); }; test("Account::addCoins returns error if it fails") = [&injectionFixture] { @@ -181,12 +187,10 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = true; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.addCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Storage)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.addCoins(CoinType::Normal, 100), AccountErrors_t::Storage)); }; test("Account::addCoins returns error if get coins fail") = [&injectionFixture] { @@ -194,12 +198,10 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.addCoins(enumToValue(CoinType::Tournament), 100), enumToValue(AccountErrors_t::Storage)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.addCoins(CoinType::Tournament, 100), AccountErrors_t::Storage)); }; test("Account::addCoins adds coins") = [&injectionFixture] { @@ -208,14 +210,12 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.addCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) - and eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 200) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.addCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 200)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::addCoins adds coins for specified account only") = [&injectionFixture] { @@ -224,17 +224,15 @@ suite<"account"> accountTest = [] { Account acc { 2 }; accountRepository.failAddCoins = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); accountRepository.addAccount("canary2@test.com", AccountInfo { 2, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(2, enumToValue(CoinType::Normal), 33); + accountRepository.setCoins(2, CoinType::Normal, 33); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.addCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 133) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.addCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 133)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::addCoins adds coins for specified coin type only") = [&injectionFixture] { @@ -242,33 +240,29 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); - accountRepository.setCoins(1, enumToValue(CoinType::Tournament), 57); - accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.addCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 200) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Tournament))), 57) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Tournament))), enumToValue(AccountErrors_t::Ok)) - ); + accountRepository.setCoins(1, CoinType::Normal, 100); + accountRepository.setCoins(1, CoinType::Tournament, 57); + accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); + + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.addCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 200)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Tournament)), 57)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Tournament)), AccountErrors_t::Ok)); expect(eq(accountRepository.coinsTransactions_.size(), 1) >> fatal); expect(eq(accountRepository.coinsTransactions_[1].size(), 1) >> fatal); auto [type, coins, coinType, description] = accountRepository.coinsTransactions_[1][0]; - expect( - eq(coins, 100) and - eq(coinType, enumToValue(CoinType::Normal)) and - eq(type, enumToValue(CoinTransactionType::Add)) and - eq(description, std::string { "ADD Coins" }) - ); + expect(eq(coins, 100)); + expect(eqEnum(coinType, CoinType::Normal)); + expect(eqEnum(type, CoinTransactionType::Add)); + expect(eq(description, std::string { "ADD Coins" })); }; test("Account::removeCoins returns error if not yet loaded") = [] { - expect(eq(Account { 1 }.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(Account { 1 }.removeCoins(CoinType::Normal, 100), AccountErrors_t::NotInitialized)); }; test("Account::removeCoins returns error if it fails") = [&injectionFixture] { @@ -277,12 +271,10 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = true; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Storage)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::Storage)); }; test("Account::removeCoins returns error if get coins fail") = [&injectionFixture] { @@ -290,12 +282,10 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Tournament), 100), enumToValue(AccountErrors_t::Storage)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Tournament, 100), AccountErrors_t::Storage)); }; test("Account::removeCoins removes coins") = [&injectionFixture] { @@ -304,14 +294,12 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 0) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 0)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::removeCoins removes coins for specified account only") = [&injectionFixture] { @@ -320,17 +308,15 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); + accountRepository.setCoins(1, CoinType::Normal, 100); accountRepository.addAccount("canary2@test.com", AccountInfo { 2, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(2, enumToValue(CoinType::Normal), 33); + accountRepository.setCoins(2, CoinType::Normal, 33); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 0) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 0)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); }; test("Account::removeCoins removes coins for specified coin type only") = [&injectionFixture] { @@ -339,28 +325,24 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); - accountRepository.setCoins(1, enumToValue(CoinType::Tournament), 57); - - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 0) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok)) and - eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Tournament))), 57) and - eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Tournament))), enumToValue(AccountErrors_t::Ok)) - ); + accountRepository.setCoins(1, CoinType::Normal, 100); + accountRepository.setCoins(1, CoinType::Tournament, 57); + + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 0)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Tournament)), 57)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Tournament)), AccountErrors_t::Ok)); expect(eq(accountRepository.coinsTransactions_.size(), 1) >> fatal); expect(eq(accountRepository.coinsTransactions_[1].size(), 1) >> fatal); auto [type, coins, coinType, description] = accountRepository.coinsTransactions_[1][0]; - expect( - eq(coins, 100) and - eq(coinType, enumToValue(CoinType::Normal)) and - eq(type, enumToValue(CoinTransactionType::Remove)) and - eq(description, std::string { "REMOVE Coins" }) - ); + expect(eq(coins, 100)); + expect(eqEnum(coinType, CoinType::Normal)); + expect(eqEnum(type, CoinTransactionType::Remove)); + expect(eq(description, std::string { "REMOVE Coins" })); }; test("Account::removeCoins returns error if account doesn't have enough coins") = [&injectionFixture] { @@ -368,38 +350,30 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.failAddCoins = false; - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 1); + accountRepository.setCoins(1, CoinType::Normal, 1); accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::RemoveCoins)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::RemoveCoins)); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 50); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::RemoveCoins)) - ); + accountRepository.setCoins(1, CoinType::Normal, 50); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::RemoveCoins)); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 100); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::Ok)) - ); + accountRepository.setCoins(1, CoinType::Normal, 100); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::Ok)); expect(eq(accountRepository.coinsTransactions_.size(), 1) >> fatal); expect(eq(accountRepository.coinsTransactions_[1].size(), 1) >> fatal); auto [type, coins, coinType, description] = accountRepository.coinsTransactions_[1][0]; - expect( - eq(coins, 100) and - eq(coinType,enumToValue(CoinType::Normal)) and - eq(type, enumToValue(CoinTransactionType::Remove)) and - eq(description, std::string { "REMOVE Coins" }) - ); + expect(eq(coins, 100)); + expect(eqEnum(coinType,CoinType::Normal)); + expect(eqEnum(type, CoinTransactionType::Remove)); + expect(eq(description, std::string { "REMOVE Coins" })); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and eq(acc.removeCoins(enumToValue(CoinType::Normal), 100), enumToValue(AccountErrors_t::RemoveCoins)) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 100), AccountErrors_t::RemoveCoins)); expect(eq(accountRepository.coinsTransactions_.size(), 1) >> fatal); expect(eq(accountRepository.coinsTransactions_[1].size(), 1) >> fatal); @@ -410,23 +384,23 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect(eq(acc.load(), enumToValue(AccountErrors_t::Ok))); - accountRepository.setCoins(1, enumToValue(CoinType::Normal), 1); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + accountRepository.setCoins(1, CoinType::Normal, 1); - expect(eq(acc.addCoins(enumToValue(CoinType::Normal), 100, ""), enumToValue(AccountErrors_t::Ok))); - expect(eq(acc.removeCoins(enumToValue(CoinType::Normal), 80, ""), enumToValue(AccountErrors_t::Ok))); + expect(eqEnum(acc.addCoins(CoinType::Normal, 100, ""), AccountErrors_t::Ok)); + expect(eqEnum(acc.removeCoins(CoinType::Normal, 80, ""), AccountErrors_t::Ok)); - expect(eq(std::get<0>(acc.getCoins(enumToValue(CoinType::Normal))), 21)); - expect(eq(std::get<1>(acc.getCoins(enumToValue(CoinType::Normal))), enumToValue(AccountErrors_t::Ok))); + expect(eqEnum(std::get<0>(acc.getCoins(CoinType::Normal)), 21)); + expect(eqEnum(std::get<1>(acc.getCoins(CoinType::Normal)), AccountErrors_t::Ok)); - acc.registerCoinTransaction(enumToValue(CoinTransactionType::Add), enumToValue(CoinType::Normal), 100, ""); - acc.registerCoinTransaction(enumToValue(CoinTransactionType::Remove), enumToValue(CoinType::Normal), 100, ""); + acc.registerCoinTransaction(CoinTransactionType::Add, CoinType::Normal, 100, ""); + acc.registerCoinTransaction(CoinTransactionType::Remove, CoinType::Normal, 100, ""); expect(eq(accountRepository.coinsTransactions_.size(), 0)); }; test("Account::getPassword returns empty string if not yet loaded") = [] { - expect(eq(Account { 1 }.getPassword(), std::string { "" })); + expect(eqEnum(Account { 1 }.getPassword(), std::string { "" })); }; test("Account::getPassword returns password") = [&injectionFixture] { @@ -435,10 +409,8 @@ suite<"account"> accountTest = [] { Account acc { 1 }; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(acc.getPassword(), std::string { "123456" }) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eq(acc.getPassword(), std::string { "123456" })); }; test("Account::getPassword returns logs error if it fails") = [&injectionFixture] { @@ -448,12 +420,10 @@ suite<"account"> accountTest = [] { accountRepository.failGetPassword = true; accountRepository.addAccount("canary@test.com", AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD }); - expect( - eq(acc.load(), enumToValue(AccountErrors_t::Ok)) and - eq(std::string{}, acc.getPassword()) and - eq(std::string{"error"}, logger.logs[0].level) and - eq(std::string{"Failed to get password for account[1]!"}, logger.logs[0].message) - ); + expect(eqEnum(acc.load(), AccountErrors_t::Ok)); + expect(eq(std::string{}, acc.getPassword())); + expect(eq(std::string{"error"}, logger.logs[0].level)); + expect(eq(std::string{"Failed to get password for account[1]!"}, logger.logs[0].message)); }; test("Account::addPremiumDays sets premium remaining days") = [] { @@ -469,10 +439,8 @@ suite<"account"> accountTest = [] { acc.setPremiumDays(50); acc.addPremiumDays(50); - expect( - approx(acc.getPremiumLastDay(), getTimeNow() + (100 * 86400), 60 * 60 * 1000) and - eq(acc.getPremiumRemainingDays(), 100) - ); + expect(approx(acc.getPremiumLastDay(), getTimeNow() + (100 * 86400), 60 * 60 * 1000)); + expect(eq(acc.getPremiumRemainingDays(), 100)); }; test("Account::addPremiumDays can reduce premium") = [] { @@ -481,10 +449,8 @@ suite<"account"> accountTest = [] { acc.setPremiumDays(50); acc.addPremiumDays(-30); - expect( - approx(acc.getPremiumLastDay(), getTimeNow() - (20 * 86400), 60 * 60 * 1000) and - eq(acc.getPremiumRemainingDays(), 20) - ); + expect(approx(acc.getPremiumLastDay(), getTimeNow() - (20 * 86400), 60 * 60 * 1000)); + expect(eq(acc.getPremiumRemainingDays(), 20)); }; test("Account::setPremiumDays sets to 0 if day is negative") = [] { @@ -492,18 +458,14 @@ suite<"account"> accountTest = [] { acc.setPremiumDays(10); acc.setPremiumDays(-20); - expect( - eq(acc.getPremiumLastDay(), 0) and - eq(acc.getPremiumLastDay(), 0) - ); + expect(eq(acc.getPremiumLastDay(), 0)); + expect(eq(acc.getPremiumLastDay(), 0)); }; test("Account::setAccountType sets account type") = [] { Account acc { 1 }; - expect( - eq(acc.setAccountType(AccountType::ACCOUNT_TYPE_GAMEMASTER), enumToValue(AccountErrors_t::Ok)) and - eq(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GAMEMASTER) - ); + expect(eqEnum(acc.setAccountType(AccountType::ACCOUNT_TYPE_GAMEMASTER), AccountErrors_t::Ok)); + expect(eqEnum(acc.getAccountType(), AccountType::ACCOUNT_TYPE_GAMEMASTER)); }; test("Account::updatePremiumTime sets premium remaining days to 0 if last day is in the past") = [] { @@ -543,7 +505,7 @@ suite<"account"> accountTest = [] { }; test("Account::getAccountPlayer returns error if not yet loaded") = [] { - expect(eq(std::get<1>(Account { 1 }.getAccountPlayers()), enumToValue(AccountErrors_t::NotInitialized))); + expect(eqEnum(std::get<1>(Account { 1 }.getAccountPlayers()), AccountErrors_t::NotInitialized)); }; test("Account::getAccountPlayer returns players") = [&injectionFixture] { @@ -555,15 +517,13 @@ suite<"account"> accountTest = [] { AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, {{ "Canary", 1 }, { "Canary2", 2 }} } ); - expect(acc.load() == enumToValue(AccountErrors_t::Ok)); + expect(acc.load() == AccountErrors_t::Ok); auto [players, error] = acc.getAccountPlayers(); - expect( - eq(error, enumToValue(AccountErrors_t::Ok)) and - eq(players.size(), 2) and - eq(players["Canary"], 1) and - eq(players["Canary2"], 2) - ); + expect(eqEnum(error, AccountErrors_t::Ok)); + expect(eq(players.size(), 2)); + expect(eq(players["Canary"], 1)); + expect(eq(players["Canary2"], 2)); }; test("Account::authenticate password using sha1") = [&injectionFixture] { @@ -575,7 +535,7 @@ suite<"account"> accountTest = [] { AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } } } ); - expect(acc.load() == enumToValue(AccountErrors_t::Ok)); + expect(acc.load() == AccountErrors_t::Ok); accountRepository.password_ = "7c4a8d09ca3762af61e59520943dc26494f8941b"; expect(acc.authenticate("123456")); }; @@ -589,7 +549,35 @@ suite<"account"> accountTest = [] { AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } }, false, getTimeNow() + 24 * 60 * 60 * 1000 } ); - expect(acc.load() == enumToValue(AccountErrors_t::Ok)); + expect(acc.load() == AccountErrors_t::Ok); expect(acc.authenticate()); }; + + test("Account::getCharacterByAccountIdAndName using an account with the given character.") = [&injectionFixture] { + auto [accountRepository] = injectionFixture.get<AccountRepository>(); + + Account acc { 1 }; + accountRepository.addAccount( + "session-key", + AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } }, false, getTimeNow() + 24 * 60 * 60 * 1000 } + ); + + const auto hasCharacter = accountRepository.getCharacterByAccountIdAndName(1, "Canary"); + + expect(hasCharacter); + }; + + test("Account::getCharacterByAccountIdAndName using an account without the given character.") = [&injectionFixture] { + auto [accountRepository] = injectionFixture.get<AccountRepository>(); + + Account acc { 1 }; + accountRepository.addAccount( + "session-key", + AccountInfo { 1, 1, 1, AccountType::ACCOUNT_TYPE_GOD, { { "Canary", 1 }, { "Canary2", 2 } }, false, getTimeNow() + 24 * 60 * 60 * 1000 } + ); + + const auto hasCharacter = accountRepository.getCharacterByAccountIdAndName(1, "Invalid"); + + expect(!hasCharacter); + }; }; diff --git a/tests/unit/items/CMakeLists.txt b/tests/unit/items/CMakeLists.txt new file mode 100644 index 000000000..13acdb476 --- /dev/null +++ b/tests/unit/items/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(canary_ut PRIVATE + containers/container_test.cpp +) diff --git a/tests/unit/items/containers/container_test.cpp b/tests/unit/items/containers/container_test.cpp new file mode 100644 index 000000000..c6d36faeb --- /dev/null +++ b/tests/unit/items/containers/container_test.cpp @@ -0,0 +1,9 @@ +#include "pch.hpp" + +#include <boost/ut.hpp> + +#include "lib/logging/in_memory_logger.hpp" + +#include "items/containers/container.hpp" + +using namespace boost::ut; diff --git a/tests/unit/server/CMakeLists.txt b/tests/unit/server/CMakeLists.txt new file mode 100644 index 000000000..ec98d50a3 --- /dev/null +++ b/tests/unit/server/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(canary_ut PRIVATE + network/message/networkmessage_test.cpp +) diff --git a/tests/unit/server/network/message/networkmessage_test.cpp b/tests/unit/server/network/message/networkmessage_test.cpp new file mode 100644 index 000000000..f1ec904a3 --- /dev/null +++ b/tests/unit/server/network/message/networkmessage_test.cpp @@ -0,0 +1,144 @@ +#include "pch.hpp" + +#include <boost/ut.hpp> + +#include "lib/logging/in_memory_logger.hpp" + +#include "server/network/message/networkmessage.hpp" +#include "utils/tools.hpp" + +using namespace boost::ut; + +// Define a test suite for NetworkMessage +suite<"networkmessage"> networkMessageTest = [] { + di::extension::injector<> injector {}; + DI::setTestContainer(&InMemoryLogger::install(injector)); + auto& logger = dynamic_cast<InMemoryLogger&>(injector.create<Logger&>()); + + test("NetworkMessage::addByte and getByte") = [&]() { + NetworkMessage msg; + uint8_t byteToAdd = 100; + msg.addByte(byteToAdd); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + auto byte = msg.getByte(); + expect(eq(byte, byteToAdd)) << "Expected: " << byteToAdd << ", Got: " << byte; + }; + + test("NetworkMessage::addString and getString") = [&]() { + NetworkMessage msg; + std::string testStr = "TestString"; + msg.addString(testStr); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + std::string retrievedStr = msg.getString(); + expect(eq(retrievedStr, testStr)) << "Expected: \"" << testStr << "\", Got: \"" << retrievedStr << "\""; + }; + + test("NetworkMessage::addString should handle empty string") = [&]() { + NetworkMessage msg; + msg.addString(""); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + expect(eq(msg.getString(), std::string {})) << "Expected to retrieve an empty string"; + }; + + test("NetworkMessage::addString should fail with oversized string") = [&]() { + NetworkMessage msg; + std::string oversizedString(NETWORKMESSAGE_MAXSIZE + 1, 'a'); + msg.addString(oversizedString); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + expect(eq(msg.getString(), std::string {})) << "Expected to retrieve an empty string due to oversized input"; + }; + + test("NetworkMessage::canAdd should return false when exceeding max size") = [&]() { + NetworkMessage msg; + expect(not msg.canAdd(NETWORKMESSAGE_MAXSIZE)) << "Should have enough space in buffer"; + expect(not msg.canAdd(NETWORKMESSAGE_MAXSIZE + 1)) << "Should not be able to add data exceeding the max buffer size"; + }; + + test("NetworkMessage::addDouble and getDouble") = [&]() { + NetworkMessage msg; + double testValue = 123.123; + uint8_t precision = 3; + msg.addDouble(testValue, precision); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + double retrievedValue = msg.getDouble(); + expect(abs(retrievedValue - testValue) < 1e-6) << "Expected: " << testValue << ", Got: " << retrievedValue; + }; + + test("NetworkMessage::addPosition and getPosition") = [&]() { + NetworkMessage msg; + Position pos { 100, 200, 7 }; + msg.addPosition(pos); + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + Position retrievedPos = msg.getPosition(); + expect(eq(retrievedPos, pos)) << "Expected to retrieve the same position values"; + }; + + test("NetworkMessage::reset should clear buffer") = [&]() { + NetworkMessage msg; + msg.addByte(0x64); + msg.reset(); + expect(eq(msg.getLength(), 0)) << "Expected the message length to be zero after reset"; + }; + + test("NetworkMessage::append should merge messages correctly") = [&]() { + NetworkMessage msg1, msg2; + + // Adding initial byte and string to msg1 + msg1.addByte(1); // Byte value 1 + msg1.addString("Hello"); // String value "Hello" + // Adding initial byte and string to msg2 + msg2.addByte(2); // Byte value 2 + msg2.addString("World"); // String value "World" + // Append msg2 to msg1 + msg1.append(msg2); + msg1.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); // Reset read position to start + // Verify the first byte (msg1) + uint8_t byte1 = msg1.getByte(); + expect(eq(byte1, 1)) << "Expected the first byte of the first message (1)"; + // Verify the first string (msg1) + std::string str1 = msg1.getString(); + expect(eq(str1, std::string("Hello"))) << "Expected the first string of the first message"; + // Verify the second byte (msg2) + uint8_t byte2 = msg1.getByte(); + expect(eq(byte2, 2)) << "Expected the first byte of the second message (2)"; + // Verify the second string (msg2) + std::string str2 = msg1.getString(); + expect(eq(str2, std::string("World"))) << "Expected the first string of the second message"; + }; + + test("NetworkMessage::getString should handle out-of-bounds access safely") = [&]() { + NetworkMessage msg; + std::string testStr = "Short"; + msg.addString(testStr); + + // Move the position to simulate incomplete data read + msg.setBufferPosition(msg.getBufferPosition() + 10); + expect(eq(msg.getString(), std::string {})) << "Expected empty string due to out-of-bounds access"; + }; + + test("NetworkMessage::decodeHeader should correctly decode the header") = [&]() { + NetworkMessage msg; + msg.addByte(0x12); + msg.addByte(0x34); + + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + int32_t header = msg.decodeHeader(); + expect(eq(header, 0x3412)) << "Expected header to be decoded correctly"; + }; + + test("NetworkMessage::addBytes and validate content") = [&]() { + NetworkMessage msg; + std::string testData = "testBytes"; + + // Add bytes to the buffer + msg.addBytes(testData.data(), testData.size()); + // Set buffer position to the initial position for reading the added data + msg.setBufferPosition(NetworkMessage::INITIAL_BUFFER_POSITION); + // Verify the content of the buffer before extracting the data + auto buffer = msg.getBuffer(); + std::string extractedData(buffer + NetworkMessage::INITIAL_BUFFER_POSITION, + buffer + NetworkMessage::INITIAL_BUFFER_POSITION + testData.size()); + // Check if the extracted data matches the added data + expect(eq(extractedData, testData)) << "Expected the same bytes added"; + }; +}; diff --git a/tests/unit/utils/position_functions_test.cpp b/tests/unit/utils/position_functions_test.cpp index 82e269632..de7c04b0d 100644 --- a/tests/unit/utils/position_functions_test.cpp +++ b/tests/unit/utils/position_functions_test.cpp @@ -2,6 +2,7 @@ #include <boost/ut.hpp> +#include "game/movement/position.hpp" #include "utils/tools.hpp" using namespace boost::ut; diff --git a/vcpkg.json b/vcpkg.json index eed7e776e..e5a83b212 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,6 +9,7 @@ "bext-ut", "curl", "eventpp", + "libmariadb", "luajit", "magic-enum", "mio", @@ -18,17 +19,12 @@ "spdlog", "zlib", "bshoshany-thread-pool", + "atomic-queue", { "name": "opentelemetry-cpp", "default-features": true, "features": ["otlp-http", "prometheus"] }, - { - "name": "libmariadb", - "features": [ - "mariadbclient" - ] - }, { "name": "gmp", "platform": "linux" @@ -38,5 +34,5 @@ "platform": "windows" } ], - "builtin-baseline": "095ee06e7f60dceef7d713e3f8b1c2eb10d650d7" + "builtin-baseline": "9558037875497b9db8cf38fcd7db68ec661bffe7" } diff --git a/vcproj/otxserver.vcxproj b/vcproj/otxserver.vcxproj index eba7e9510..035cc6826 100644 --- a/vcproj/otxserver.vcxproj +++ b/vcproj/otxserver.vcxproj @@ -316,6 +316,7 @@ <ClCompile Include="..\src\kv\kv_sql.cpp" /> <ClCompile Include="..\src\kv\kv.cpp" /> <ClCompile Include="..\src\lib\di\soft_singleton.cpp" /> + <ClCompile Include="..\src\lib\logging\logger.cpp" /> <ClCompile Include="..\src\lib\logging\log_with_spd_log.cpp" /> <ClCompile Include="..\src\lib\metrics\metrics.cpp" /> <ClCompile Include="..\src\lib\thread\thread_pool.cpp" /> @@ -414,9 +415,10 @@ <ClCompile Include="..\src\utils\wildcardtree.cpp" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\src\pch.hpp"> + <ClCompile Include="..\src\pch.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> + <PrecompiledHeader>Create</PrecompiledHeader> </ClCompile> </ItemGroup> <ItemGroup> @@ -508,15 +510,16 @@ <WarningLevel>Level1</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> <LanguageStandard>stdcpp20</LanguageStandard> - <PrecompiledHeaderFile /> + <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile> <SupportJustMyCode>true</SupportJustMyCode> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <WholeProgramOptimization>true</WholeProgramOptimization> <IncludeInUnityFile>true</IncludeInUnityFile> <OpenMPSupport>true</OpenMPSupport> <LanguageStandard_C>Default</LanguageStandard_C> - <AdditionalOptions>/Zc:__cplusplus /fsanitize=address %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:__cplusplus /fsanitize=address /utf-8 %(AdditionalOptions)</AdditionalOptions> <PreprocessorDefinitions>_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -544,14 +547,15 @@ <WarningLevel>Level1</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> <LanguageStandard>stdcpp20</LanguageStandard> - <PrecompiledHeaderFile /> + <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile> <SupportJustMyCode>true</SupportJustMyCode> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <WholeProgramOptimization>true</WholeProgramOptimization> <IncludeInUnityFile>true</IncludeInUnityFile> <OpenMPSupport>true</OpenMPSupport> - <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions> <PreprocessorDefinitions>_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -594,14 +598,15 @@ <ItemGroup> <ClCompile Include="generated\%(ProtoFiles.Filename).pb.cc"> <IncludeInUnityFile>false</IncludeInUnityFile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClCompile> <ClInclude Include="generated\%(ProtoFiles.Filename).pb.h"> <IncludeInUnityFile>false</IncludeInUnityFile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> </ClInclude> </ItemGroup> </Target> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> - +</Project> \ No newline at end of file diff --git a/vcproj/settings.props b/vcproj/settings.props index 6f9896961..8c6bc887f 100644 --- a/vcproj/settings.props +++ b/vcproj/settings.props @@ -8,59 +8,37 @@ _WIN32_WINNT=0x0501; BUILD_TYPE="RelWithDebInfo"; </PREPROCESSOR_DEFS> - <CANARY_LIBDEPS> + <CANARY_COMMON_LIBDEPS> comctl32.lib; User32.lib; WS2_32.lib; pugixml.lib; - libprotobuf.lib; lua51.lib; mpir.lib; libmariadb.lib; + abseil_dll.lib; + argon2.lib; + </CANARY_COMMON_LIBDEPS> + <CANARY_LIBDEPS> + $(CANARY_COMMON_LIBDEPS); + libprotobuf.lib; zlib.lib; libcurl.lib; fmt.lib; spdlog.lib; - abseil_dll.lib; - argon2.lib; - opentelemetry_common.lib; - opentelemetry_exporter_in_memory.lib; - opentelemetry_exporter_ostream_logs.lib; - opentelemetry_exporter_ostream_metrics.lib; - opentelemetry_exporter_ostream_span.lib; - opentelemetry_exporter_otlp_http.lib; - opentelemetry_exporter_otlp_http_client.lib; - opentelemetry_exporter_otlp_http_log.lib; - opentelemetry_exporter_otlp_http_metric.lib; - opentelemetry_exporter_prometheus.lib; - opentelemetry_http_client_curl.lib; - opentelemetry_logs.lib; - opentelemetry_metrics.lib; - opentelemetry_otlp_recordable.lib; - opentelemetry_proto.lib; - opentelemetry_resources.lib; - opentelemetry_trace.lib; - opentelemetry_version.lib; - prometheus-cpp-core.lib; - prometheus-cpp-pull.lib; - civetweb.lib; - civetweb-cpp.lib </CANARY_LIBDEPS> <CANARY_LIBDEPS_D> - comctl32.lib; - User32.lib; - WS2_32.lib; - pugixml.lib; + $(CANARY_COMMON_LIBDEPS); libprotobufd.lib; - lua51.lib; - mpir.lib; - libmariadb.lib; zlibd.lib; libcurl-d.lib; fmtd.lib; spdlogd.lib; - abseil_dll.lib; - argon2.lib; + </CANARY_LIBDEPS_D> + </PropertyGroup> + + <PropertyGroup Condition="'$(FEATURE_METRICS)' == 'true'"> + <OPENTELEMETRY_LIBS> opentelemetry_common.lib; opentelemetry_exporter_in_memory.lib; opentelemetry_exporter_ostream_logs.lib; @@ -79,13 +57,19 @@ opentelemetry_resources.lib; opentelemetry_trace.lib; opentelemetry_version.lib; + prometheus-cpp-core.lib; + prometheus-cpp-pull; civetweb.lib; - civetweb-cpp.lib - </CANARY_LIBDEPS_D> + civetweb-cpp.lib; + </OPENTELEMETRY_LIBS> + <CANARY_LIBDEPS>$(CANARY_LIBDEPS);$(OPENTELEMETRY_LIBS)</CANARY_LIBDEPS> + <CANARY_LIBDEPS_D>$(CANARY_LIBDEPS_D);$(OPENTELEMETRY_LIBS)</CANARY_LIBDEPS_D> </PropertyGroup> + <PropertyGroup> <LinkIncremental>true</LinkIncremental> </PropertyGroup> + <ItemDefinitionGroup> <ClCompile> <WarningLevel>Level3</WarningLevel> @@ -101,6 +85,7 @@ <EntryPointSymbol>mainCRTStartup</EntryPointSymbol> </Link> </ItemDefinitionGroup> + <ItemGroup> <BuildMacro Include="PREPROCESSOR_DEFS"> <Value>$(PREPROCESSOR_DEFS)</Value>