diff options
33 files changed, 3862 insertions, 623 deletions
diff --git a/.travis.yml b/.travis.yml index a02f65eeb..43c8e4997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: - compiler: false include: - compiler: gcc - env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" HPM="1" + env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" HPM="1" addons: apt: sources: @@ -52,7 +52,7 @@ matrix: - libxml-sax-perl - libxml-parser-perl - compiler: clang - env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: @@ -72,7 +72,7 @@ matrix: - gdb - clang-5.0 - compiler: clang - env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: @@ -106,11 +106,11 @@ matrix: - compiler: clang env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot" - compiler: gcc - env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" - compiler: gcc env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot" - compiler: gcc - env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: @@ -128,7 +128,7 @@ matrix: - gdb - gcc-5 - compiler: gcc - env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: @@ -146,7 +146,7 @@ matrix: - gdb - gcc-6 - compiler: gcc - env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-7 --disable-manager --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-7 --disable-manager --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: @@ -164,7 +164,7 @@ matrix: - gdb - gcc-7 - compiler: gcc - env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-8 --disable-manager --enable-Werror --enable-packetver=20190821 --enable-packetver-re --enable-buildbot" + env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-8 --disable-manager --enable-Werror --enable-packetver=20190918 --enable-packetver-re --enable-buildbot" addons: apt: sources: diff --git a/conf/messages.conf b/conf/messages.conf index bff4829c8..f616335fa 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -442,8 +442,9 @@ 432: change the sex of 433: This character has been banned until 434: Char-server has been asked to %s the character '%.*s'. -//435-449 FREE +//435-448 FREE // Homunculus messages +449: Homunculus Experience Gained Base:%u (%.2f%%) 450: You already have a homunculus // Return pet to egg message @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac cdc66ce0e. +# From configure.ac 20c3ecff9. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # diff --git a/db/sc_config.conf b/db/sc_config.conf new file mode 100644 index 000000000..12b0e2293 --- /dev/null +++ b/db/sc_config.conf @@ -0,0 +1,2811 @@ +//================= Hercules Database ===================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2019 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//================= Description =========================================== +// Configurations file for status effects +//========================================================================= + +/************************************************************************** + ************* Entry structure ******************************************** + ************************************************************************** +SC_TYPE: { + // ================ Optional fields =============================== + Visible: (bool) SC can be visible for all players + Flags: { + NoDeathReset: (bool) SC cannot be removed by death. + NoSave: (bool) SC cannot be saved. + NoDispelReset: (bool) SC cannot be reset by dispell. + NoClearanceReset: (bool) SC cannot be reset by clearance. + Buff: (bool) SC considered as buff and be removed by Hermode and etc. + Debuff: (bool) SC considered as debuff and be removed by Gospel and etc. + NoMadoReset: (bool) SC cannot be reset when MADO Gear is taken off. + NoAllReset: (bool) SC cannot be reset by 'sc_end SC_ALL' and status change clear. + } +} +**************************************************************************/ +SC_PROVOKE: { + Flags: { + Debuff: true + } +} +SC_ENDURE: { + Flags: { + NoDeathReset: true + NoDispelReset: true + Buff: true + } +} +SC_HIDING: { + Flags: { + NoDispelReset: true + } +} +SC_CLOAKING: { + Flags: { + NoSave: true + NoDispelReset: true + } +} +SC_TWOHANDQUICKEN: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_CONCENTRATION: { + Flags: { + Buff: true + } +} +SC_ENCHANTPOISON: { + Flags: { + Buff: true + } +} +SC_POISONREACT: { + Flags: { + Buff: true + } +} +SC_QUAGMIRE: { + Flags: { + NoSave: true + NoClearanceReset: true + Debuff: true + } +} +SC_ANGELUS: { + Flags: { + Buff: true + } +} +SC_BLESSING: { + Flags: { + Buff: true + NoMadoReset: true + } +} +SC_INC_AGI: { + Flags: { + Buff: true + NoMadoReset: true + } +} +SC_DEC_AGI: { + Flags: { + NoSave: true + Debuff: true + } +} +SC_SLOWPOISON: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_IMPOSITIO: { + Flags: { + Buff: true + } +} +SC_SUFFRAGIUM: { + Flags: { + Buff: true + } +} +SC_ASPERSIO: { + Flags: { + Buff: true + NoMadoReset: true + } +} +SC_BENEDICTIO: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_KYRIE: { + Flags: { + Buff: true + } +} +SC_MAGNIFICAT: { + Flags: { + NoSave: true + Buff: true + } +} +SC_GLORIA: { + Flags: { + Buff: true + } +} +SC_LEXAETERNA: { + Flags: { + NoSave: true + Buff: true + } +} +SC_ADRENALINE: { + Flags: { + Buff: true + } +} +SC_WEAPONPERFECT: { + Flags: { + Buff: true + } +} +SC_OVERTHRUST: { + Flags: { + Buff: true + } +} +SC_MAXIMIZEPOWER: { + Flags: { + Buff: true + } +} +SC_TRICKDEAD: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_SHOUT: { + Flags: { + Buff: true + } +} +SC_ENERGYCOAT: { + Flags: { + Buff: true + } +} +SC_ATTHASTE_POTION1: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_ATTHASTE_POTION2: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_ATTHASTE_POTION3: { + Flags: { + Buff: true + } +} +SC_MOVHASTE_POTION: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_BARRIER: { + Flags: { + Buff: true + } +} +SC_NOEQUIPWEAPON: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NOEQUIPSHIELD: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NOEQUIPARMOR: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NOEQUIPHELM: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECTWEAPON: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECTSHIELD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECTARMOR: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECTHELM: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_AUTOGUARD: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_REFLECTSHIELD: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_DEVOTION: { + Flags: { + NoSave: true + Buff: true + } +} +SC_PROVIDENCE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_DEFENDER: { + Flags: { + Buff: true + } +} +SC_MAGICROD: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_AUTOSPELL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + Buff: true + } +} +SC_SPEARQUICKEN: { + Flags: { + Buff: true + } +} +SC_BLADESTOP: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_EXPLOSIONSPIRITS: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_STEELBODY: { + Flags: { + NoSave: true + Buff: true + } +} +SC_PROPERTYFIRE: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYWATER: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYWIND: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYGROUND: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_STOP: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYUNDEAD: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_AURABLADE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_PARRYING: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_LKCONCENTRATION: { + Flags: { + NoSave: true + Buff: true + } +} +SC_TENSIONRELAX: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_BERSERK: { + Flags: { + NoSave: true + Buff: true + } +} +SC_SACRIFICE: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_GOSPEL: { + Flags: { + NoSave: true + Debuff: true + } +} +SC_SAFETYWALL: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PNEUMA: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ASSUMPTIO: { + Flags: { + Buff: true + } +} +SC_BASILICA: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_VOLCANO: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_DELUGE: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_VIOLENTGALE: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_MAGICPOWER: { + Flags: { + NoSave: true + Buff: true + } +} +SC_EDP: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_TRUESIGHT: { + Flags: { + NoSave: true + Buff: true + } +} +SC_WINDWALK: { + Flags: { + NoSave: true + Buff: true + } +} +SC_MELTDOWN: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_CARTBOOST: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_BLOODING: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_JOINTBEAT: { + Flags: { + NoSave: true + NoClearanceReset: true + Debuff: true + } +} +SC_MINDBREAKER: { + Flags: { + NoSave: true + Buff: true + } +} +SC_MEMORIZE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_FOGWALL: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_SPIDERWEB: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Debuff: true + } +} +SC_SUB_WEAPONPROPERTY: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_RUN: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_STRUP: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYDARK: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_ADRENALINE2: { + Flags: { + NoSave: true + Buff: true + } +} +SC_PROPERTYTELEKINESIS: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_SOULLINK: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_PLUSATTACKPOWER: { + Flags: { + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_PLUSMAGICPOWER: { + Flags: { + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_KAITE: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_KAAHI: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_KAUPE: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_ONEHANDQUICKEN: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_PRESERVE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_CHASEWALK: { + Flags: { + NoDispelReset: true + } +} +SC_CHASEWALK2: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_MOVESLOW_POTION: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_DOUBLECASTING: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_GRAVITATION: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_OVERTHRUSTMAX: { + Flags: { + NoSave: true + Buff: true + } +} +SC_TAROTCARD: { + Flags: { + NoSave: true + NoClearanceReset: true + Debuff: true + } +} +SC_CR_SHRINK: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_WZ_SIGHTBLASTER: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_RG_CCONFINE_M: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_RG_CCONFINE_S: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NJ_UTSUSEMI: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_NJ_BUNSINJYUTSU: { + Flags: { + NoSave: true + NoClearanceReset: true + Buff: true + } +} +SC_NJ_SUITON: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Debuff: true + } +} +SC_FOOD_STR: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_AGI: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_VIT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_DEX: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_INT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_LUK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_BASICAVOIDANCE: { + Flags: { + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_BASICHIT: { + Flags: { + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_CRITICALSUCCESSVALUE: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_CASH_PLUSEXP: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_CASH_DEATHPENALTY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_CASH_RECEIVEITEM: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_CASH_BOSS_ALARM: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_STR_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_AGI_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_VIT_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_DEX_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_INT_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_FOOD_LUK_CASH: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_SAVAGE_STEAK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_COCKTAIL_WARG_BLOOD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_MINOR_BBQ: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_SIROMA_ICE_TEA: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_DROCERA_HERB_STEAMED: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_PUTTI_TAILS_NOODLES: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_MELON_BOMB: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_BANANA_BOMB_SITDOWN_POSTDELAY: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_BANANA_BOMB: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_PROMOTE_HEALTH_RESERCH: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_ENERGY_DRINK_RESERCH: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_EXTRACT_WHITE_POTION_Z: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_VITATA_500: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_EXTRACT_SALAMINE_JUICE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_BOOST500: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_FULL_SWING_K: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MANA_PLUS: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MUSTLE_M: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_LIFE_FORCE_F: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MER_FLEE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MER_ATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MER_HP: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MER_SP: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MER_HIT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SLOWCAST: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_CRITICALWOUND: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_MOVHASTE_HORSE: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECT_DEF: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROTECT_MDEF: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HEALPLUS: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_S_LIFEPOTION: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_L_LIFEPOTION: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_CRITICALPERCENT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_PLUSAVOIDVALUE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_ATKER_ASPD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_TARGET_ASPD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_ATKER_MOVESPEED: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ATKER_BLOOD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_TARGET_BLOOD: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ARMOR_PROPERTY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HELLPOWER: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_STEAMPACK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Debuff: true + NoMadoReset: true + } +} +SC_CASH_PLUSONLYJOBEXP: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_PARTYFLEE: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_ANGEL_PROTECT: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_ENCHANTBLADE: { + Flags: { + Buff: true + } +} +SC_DEATHBOUND: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_REFRESH: { + Flags: { + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_GIANTGROWTH: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_STONEHARDSKIN: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + Buff: true + } +} +SC_VITALITYACTIVATION: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_FIGHTINGSPIRIT: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_ABUNDANCE: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_EPICLESIS: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ORATIO: { + Visible: true + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_LAUDAAGNUS: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_LAUDARAMUS: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_CLOAKINGEXCEED: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HALLUCINATIONWALK: { + Visible: true + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HALLUCINATIONWALK_POSTDELAY: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_RENOVATIO: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_WEAPONBLOCKING: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ROLLINGCUTTER: { + Visible: true + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_EXPIATIO: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_POISONINGWEAPON: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_TOXIN: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_PARALYSE: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_VENOMBLEED: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_MAGICMUSHROOM: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_DEATHHURT: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_PYREXIA: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_OBLIVIONCURSE: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_LEECHESEND: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_DUPLELIGHT: { + Visible: true + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_FEARBREEZE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ELECTRICSHOCKER: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MARSHOFABYSS: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_RECOGNIZEDSPELL: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_WUGDASH: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_WUGBITE: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_CAMOUFLAGE: { + Visible: true + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ACCELERATION: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HOVERING: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SUMMON1: { + Visible: true + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_SUMMON2: { + Visible: true + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_SUMMON3: { + Visible: true + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_SUMMON4: { + Visible: true + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_SUMMON5: { + Visible: true + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC_MVPCARD_TAOGUNKA: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_MVPCARD_MISTRESS: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_MVPCARD_ORCHERO: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_MVPCARD_ORCLORD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_OVERHEAT_LIMITPOINT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_OVERHEAT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SHAPESHIFT: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_INFRAREDSCAN: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MAGNETICFIELD: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NEUTRALBARRIER: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_NEUTRALBARRIER_MASTER: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_STEALTHFIELD_MASTER: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MANU_ATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MANU_DEF: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SPL_ATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SPL_DEF: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__REPRODUCE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MANU_MATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SPL_MATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_STR_SCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_INT_SCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC_FORCEOFVANGUARD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_BUCHEDENOEL: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + Debuff: true + } +} +SC__AUTOSHADOWSPELL: { + Flags: { + Buff: true + } +} +SC__SHADOWFORM: { + Visible: true + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_RAID: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SHIELDSPELL_DEF: { + Flags: { + Buff: true + } +} +SC_SHIELDSPELL_MDEF: { + Flags: { + Buff: true + } +} +SC_SHIELDSPELL_REF: { + Flags: { + Buff: true + } +} +SC__BODYPAINT: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_EXEEDBREAK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ADORAMUS: { + Flags: { + Buff: true + } +} +SC_PRESTIGE: { + Flags: { + Buff: true + } +} +SC__INVISIBILITY: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__DEADLYINFECT: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_BANDING: { + Visible: true + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_BANDING_DEFENCE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_EARTHDRIVE: { + Flags: { + NoDispelReset: true + Buff: true + } +} +SC_INSPIRATION: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__ENERVATION: { + Flags: { + Buff: true + } +} +SC__GROOMY: { + Flags: { + Buff: true + } +} +SC_RAISINGDRAGON: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__IGNORANCE: { + Flags: { + Buff: true + } +} +SC__LAZINESS: { + Flags: { + Buff: true + } +} +SC_LIGHTNINGWALK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ACARAJE: { + Flags: { + NoClearanceReset: true + Buff: true + } +} +SC__UNLUCKY: { + Flags: { + Buff: true + } +} +SC_CURSEDCIRCLE_ATKER: { + Visible: true + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_CURSEDCIRCLE_TARGET: { + Visible: true + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__WEAKNESS: { + Flags: { + Buff: true + } +} +SC_CRESCENTELBOW: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__STRIPACCESSARY: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC__MANHOLE: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC__BLOODYLUST: { + Flags: { + Debuff: true + } +} +SC_SWING: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SYMPHONY_LOVE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_PROPERTYWALK: { + Flags: { + NoSave: true + Buff: true + } +} +SC_SPELLFIST: { + Flags: { + Buff: true + } +} +SC_NETHERWORLD: { + Flags: { + Buff: true + } +} +SC_SIREN: { + Flags: { + Buff: true + } +} +SC_DEEP_SLEEP: { + Visible: true + Flags: { + NoSave: true + Debuff: true + } +} +SC_SIRCLEOFNATURE: { + Flags: { + Buff: true + } +} +SC_GLOOMYDAY: { + Flags: { + Buff: true + } +} +SC_GLOOMYDAY_SK: { + Flags: { + Buff: true + } +} +SC_SONG_OF_MANA: { + Flags: { + Buff: true + } +} +SC_DANCE_WITH_WUG: { + Flags: { + Buff: true + } +} +SC_RUSH_WINDMILL: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ECHOSONG: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_HARMONIZE: { + Flags: { + Buff: true + } +} +SC_MOONLIT_SERENADE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_SATURDAY_NIGHT_FEVER: { + Flags: { + Buff: true + } +} +SC_SITDOWN_FORCE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_ANALYZE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_LERADS_DEW: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_MELODYOFSINK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_BEYOND_OF_WARCRY: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_UNLIMITED_HUMMING_VOICE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + } +} +SC_WARMER: { + Flags: { + NoSave: true + } +} +SC_VENOMIMPRESS: { + Visible: true + Flags: { + NoDispelReset: true + } +} +SC_FROSTMISTY: { + Visible: true + Flags: { + Debuff: true + } +} +SC_STOMACHACHE: { + Flags: { + Debuff: true + } +} +SC_MYSTERIOUS_POWDER: { + Flags: { + Debuff: true + } +} +SC_WATER_BARRIER: { + Flags: { + NoSave: true + } +} +SC_ZEPHYR: { + Flags: { + NoSave: true + } +} +SC_POWER_OF_GAIA: { + Flags: { + NoSave: true + } +} +SC_FIRE_INSIGNIA: { + Flags: { + NoSave: true + } +} +SC_WATER_INSIGNIA: { + Flags: { + NoSave: true + } +} +SC_WIND_INSIGNIA: { + Flags: { + NoSave: true + } +} +SC_EARTH_INSIGNIA: { + Flags: { + NoSave: true + } +} +SC_MORA_BUFF: { + Flags: { + NoSave: true + } +} +SC_NEEDLE_OF_PARALYZE: { + Flags: { + NoDeathReset: true + } +} +SC_PAIN_KILLER: { + Flags: { + NoDeathReset: true + } +} +SC_G_LIFEPOTION: { + Flags: { + NoDispelReset: true + NoMadoReset: true + } +} +SC_LIGHT_OF_REGENE: { + Flags: { + NoDeathReset: true + } +} +SC_MAGIC_CANDY: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + Buff: true + NoMadoReset: true + } +} +SC_MONSTER_TRANSFORM: { + Visible: true + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MTF_ASPD: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MTF_RANGEATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MTF_MATK: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MTF_MLEATKED: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_MTF_CRIDAMAGE: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_FULL_THROTTLE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_REBOUND: { + Flags: { + NoSave: true + Buff: true + } +} +SC_TELEKINESIS_INTENSE: { + Flags: { + NoSave: true + Buff: true + } +} +SC_SKELSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_DISTRUCTIONSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_ROYALSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_IMMUNITYSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_MYSTICSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_BATTLESCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_ARMORSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_FREYJASCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_SOULSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoMadoReset: true + } +} +SC_QUEST_BUFF1: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_QUEST_BUFF2: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_QUEST_BUFF3: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_GEFFEN_MAGIC1: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_GEFFEN_MAGIC2: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_GEFFEN_MAGIC3: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + } +} +SC_OVERLAPEXPUP: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_M_LIFEPOTION: { + Flags: { + NoDispelReset: true + NoMadoReset: true + } +} +SC_LEADERSHIP: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_GLORYWOUNDS: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_SOULCOLD: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_HAWKEYES: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_GDSKILL_REGENERATION: { + Flags: { + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_ORCISH: { + Flags: { + NoSave: true + } +} +SC_WEIGHTOVER50: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_WEIGHTOVER90: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_WEDDING: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_XMAS: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_SUMMER: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_NOCHAT: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_FUSION: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_EARTHSCROLL: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_STORMKICK_READY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_DOWNKICK_READY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_COUNTERKICK_READY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_TURNKICK_READY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_DODGE_READY: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_JAILED: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_AUTOTRADE: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_DANCING: { + Flags: { + NoDispelReset: true + NoClearanceReset: true + } +} +SC_WHISTLE: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_ASSNCROS: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_POEMBRAGI: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_APPLEIDUN: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_HUMMING: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_DONTFORGETME: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_FORTUNE: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_SERVICEFORYOU: { + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_INCHIT: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + } +} +SC_PUSH_CART: { + Visible: true + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_COLD: { + Visible: true + Flags: { + } +} +SC_BLOOD_SUCKER: { + Visible: true + Flags: { + } +} +SC_MOONSTAR: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_SUPER_STAR: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_STRANGELIGHTS: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_DECORATION_OF_MUSIC: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_LJOSALFAR: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_MERMAID_LONGING: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_HAT_EFFECT: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_FLOWERSMOKE: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_FSTONE: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_HAPPINESS_STAR: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_MAPLE_FALLS: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_TIME_ACCESSORY: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_MAGICAL_FEATHER: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_BLOSSOM_FLUTTERING: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_SPRITEMABLE: { + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_BITESCAR: { + Flags: { + NoDispelReset: true + } +} +SC_CLAN_INFO: { + Visible: true + Flags: { + NoDeathReset: true + NoSave: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} +SC_ALL_RIDING: { + Visible: true + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoAllReset: true + } +} +SC_DAILYSENDMAILCNT: { + Visible: true + Flags: { + NoDeathReset: true + NoDispelReset: true + NoClearanceReset: true + NoMadoReset: true + NoAllReset: true + } +} diff --git a/db/sc_config.txt b/db/sc_config.txt deleted file mode 100644 index 2648f7bae..000000000 --- a/db/sc_config.txt +++ /dev/null @@ -1,505 +0,0 @@ -// Status Change configuration database -// -// Structure of Database: -// SC_NAME, flag -// -// flag 1 - SC cannot be removed by death. -// 2 - SC cannot be saved. -// 4 - SC cannot be reset by dispell. -// 8 - SC cannot be reset by clearance. -// 16 - SC considered as buff and be removed by Hermode and etc. -// 32 - SC considered as debuff and be removed by Gospel and etc. -// 64 - SC cannot be reset when MADO Gear is taken off. -// 128 - SC cannot be reset by 'sc_end SC_ALL' and status change clear. -// 256 - SC can be visible for all players -// Example: -// SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21) - -SC_PROVOKE, 32 -SC_ENDURE, 21 -SC_HIDING, 4 -SC_CLOAKING, 6 -SC_TWOHANDQUICKEN, 24 -SC_CONCENTRATION, 16 -SC_ENCHANTPOISON, 16 -SC_POISONREACT, 16 -SC_QUAGMIRE, 42 -SC_ANGELUS, 16 -SC_BLESSING, 80 -SC_INC_AGI, 80 -SC_DEC_AGI, 34 -SC_SLOWPOISON, 24 -SC_IMPOSITIO, 16 -SC_SUFFRAGIUM, 16 -SC_ASPERSIO, 80 -SC_BENEDICTIO, 26 -SC_KYRIE, 16 -SC_MAGNIFICAT, 18 -SC_GLORIA, 16 -SC_LEXAETERNA, 18 -SC_ADRENALINE, 16 -SC_WEAPONPERFECT, 16 -SC_OVERTHRUST, 16 -SC_MAXIMIZEPOWER, 16 -SC_TRICKDEAD, 26 -SC_SHOUT, 16 -SC_ENERGYCOAT, 16 -SC_ATTHASTE_POTION1, 24 -SC_ATTHASTE_POTION2, 24 -SC_ATTHASTE_POTION3, 16 -SC_MOVHASTE_POTION, 26 -//SC_POSTDELAY, 29 -SC_BARRIER, 16 -SC_NOEQUIPWEAPON, 30 -SC_NOEQUIPSHIELD, 30 -SC_NOEQUIPARMOR, 30 -SC_NOEQUIPHELM, 30 -SC_PROTECTWEAPON, 28 -SC_PROTECTSHIELD, 28 -SC_PROTECTARMOR, 28 -SC_PROTECTHELM, 28 -SC_AUTOGUARD, 24 -SC_REFLECTSHIELD, 24 -SC_DEVOTION, 18 -SC_PROVIDENCE, 18 -SC_DEFENDER, 16 -SC_MAGICROD, 26 -//SC_WEAPONPROPERTY, 24 -SC_AUTOSPELL, 21 -//SC_SPECIALZONE, 26 -//SC_MASK, 26 -SC_SPEARQUICKEN, 16 -SC_BLADESTOP, 26 -SC_EXPLOSIONSPIRITS, 26 -SC_STEELBODY, 18 -SC_PROPERTYFIRE, 29 -SC_PROPERTYWATER, 29 -SC_PROPERTYWIND, 29 -SC_PROPERTYGROUND, 29 -SC_STOP, 26 -SC_PROPERTYUNDEAD, 26 -//SC_STATUSONE, 26 -SC_AURABLADE, 18 -SC_PARRYING, 26 -SC_LKCONCENTRATION, 18 -SC_TENSIONRELAX, 26 -SC_BERSERK, 18 -SC_SACRIFICE, 26 -SC_GOSPEL, 34 -SC_SAFETYWALL, 28 -SC_PNEUMA, 28 -SC_ASSUMPTIO, 16 -SC_BASILICA, 26 -//SC_GROUNDMAGIC, 26 // is divided to SC_VOLCANO, 0xSC_DELUGE, 0xSC_VIOLENTGALE -SC_VOLCANO, 26 -SC_DELUGE, 26 -SC_VIOLENTGALE, 26 -SC_MAGICPOWER, 18 -SC_EDP, 23 -SC_TRUESIGHT, 18 -SC_WINDWALK, 18 -SC_MELTDOWN, 23 -SC_CARTBOOST, 23 -SC_BLOODING, 26 -SC_JOINTBEAT, 42 -SC_MINDBREAKER, 18 -SC_MEMORIZE, 18 -SC_FOGWALL, 26 -SC_SPIDERWEB, 47 -SC_SUB_WEAPONPROPERTY, 23 -SC_RUN, 26 -SC_STRUP, 26 -SC_PROPERTYDARK, 26 -SC_ADRENALINE2, 18 -SC_PROPERTYTELEKINESIS, 26 -SC_SOULLINK, 26 -SC_PLUSATTACKPOWER, 88 -SC_PLUSMAGICPOWER, 88 -SC_KAITE, 26 -SC_KAAHI, 26 -SC_KAUPE, 26 -SC_ONEHANDQUICKEN, 26 -//SC_GDSKILL_POSTDELAY, 29 -SC_PRESERVE, 18 -SC_CHASEWALK, 4 -SC_CHASEWALK2, 26 -SC_MOVESLOW_POTION, 26 -SC_DOUBLECASTING, 26 -SC_GRAVITATION, 26 -SC_OVERTHRUSTMAX, 18 -SC_TAROTCARD, 42 -SC_CR_SHRINK, 23 -SC_WZ_SIGHTBLASTER, 23 -SC_RG_CCONFINE_M, 31 -SC_RG_CCONFINE_S, 31 -SC_NJ_UTSUSEMI, 26 -SC_NJ_BUNSINJYUTSU, 26 -SC_NJ_SUITON, 47 -//SC_MENTAL, 26 -//SC_EXPMEMORY, 26 -//SC_PERFORMANCE, 26 -//SC_GAIN, 26 -//SC_DRIFT, 26 -//SC_WALLSHIFT, 26 -//SC_REINCARNATION, 26 -//SC_DENERGY, 26 -//SC_DAURA, 26 -//SC_DFREEZER, 26 -//SC_DPUNISH, 26 -//SC_DBARRIER, 26 -//SC_DWARNING, 26 -//SC_MOUSEWHEEL, 30 -//SC_DACCEL, 26 -//SC_DBLOCK, 26 -SC_FOOD_STR, 92 -SC_FOOD_AGI, 92 -SC_FOOD_VIT, 92 -SC_FOOD_DEX, 92 -SC_FOOD_INT, 92 -SC_FOOD_LUK, 92 -SC_FOOD_BASICAVOIDANCE, 88 -SC_FOOD_BASICHIT, 88 -SC_FOOD_CRITICALSUCCESSVALUE, 24 -SC_CASH_PLUSEXP, 93 -SC_CASH_DEATHPENALTY, 93 -SC_CASH_RECEIVEITEM, 93 -SC_CASH_BOSS_ALARM, 94 -//SC_DA_ENERGY, 26 -//SC_DA_FIRSTSLOT, 26 -//SC_DA_HEADDEF, 26 -//SC_DA_SPACE, 30 -//SC_DA_ITEMREBUILD, 30 -//SC_DA_ILLUSION, 26 -//SC_DA_EARPLUG, 30 -//SC_DA_CONTRACT, 29 -//SC_DA_BLACK, 30 -//SC_DA_MAGICCART, 26 -//SC_CRYSTAL, 30 -//SC_DA_REBUILD, 29 -//SC_DA_EDARKNESS, 26 -//SC_DA_EGUARDIAN, 26 -//SC_DA_TIMEOUT, 26 -SC_FOOD_STR_CASH, 93 -SC_FOOD_AGI_CASH, 93 -SC_FOOD_VIT_CASH, 93 -SC_FOOD_DEX_CASH, 93 -SC_FOOD_INT_CASH, 93 -SC_FOOD_LUK_CASH, 93 -SC_SAVAGE_STEAK, 76 -SC_COCKTAIL_WARG_BLOOD, 76 -SC_MINOR_BBQ, 76 -SC_SIROMA_ICE_TEA, 76 -SC_DROCERA_HERB_STEAMED, 76 -SC_PUTTI_TAILS_NOODLES, 76 -SC_MELON_BOMB, 12 -SC_BANANA_BOMB_SITDOWN_POSTDELAY, 12 -SC_BANANA_BOMB, 12 -SC_PROMOTE_HEALTH_RESERCH, 12 -SC_ENERGY_DRINK_RESERCH, 12 -SC_EXTRACT_WHITE_POTION_Z, 12 -SC_VITATA_500, 12 -SC_EXTRACT_SALAMINE_JUICE, 12 -SC_BOOST500, 12 -SC_FULL_SWING_K, 12 -SC_MANA_PLUS, 12 -SC_MUSTLE_M, 12 -SC_LIFE_FORCE_F, 12 -SC_MER_FLEE, 28 -SC_MER_ATK, 28 -SC_MER_HP, 28 -SC_MER_SP, 28 -SC_MER_HIT, 28 -SC_SLOWCAST, 31 -SC_CRITICALWOUND, 23 -SC_MOVHASTE_HORSE, 31 -SC_PROTECT_DEF, 28 -SC_PROTECT_MDEF, 28 -SC_HEALPLUS, 92 -SC_S_LIFEPOTION, 92 -SC_L_LIFEPOTION, 92 -SC_CRITICALPERCENT, 92 -SC_PLUSAVOIDVALUE, 92 -SC_ATKER_ASPD, 28 -SC_TARGET_ASPD, 92 -SC_ATKER_MOVESPEED, 28 -SC_ATKER_BLOOD, 28 -SC_TARGET_BLOOD, 30 -SC_ARMOR_PROPERTY, 29 -//SC_REUSE_LIMIT_A, 29 -SC_HELLPOWER, 29 -SC_STEAMPACK, 108 -//SC_REUSE_LIMIT_B, 29 -//SC_REUSE_LIMIT_C, 29 -//SC_REUSE_LIMIT_D, 29 -//SC_REUSE_LIMIT_E, 29 -//SC_REUSE_LIMIT_F, 29 -SC_CASH_PLUSONLYJOBEXP, 93 -SC_PARTYFLEE, 24 -SC_ANGEL_PROTECT, 24 -//SC_ENDURE_MDEF, 21 -SC_ENCHANTBLADE, 16 -SC_DEATHBOUND, 30 -SC_REFRESH, 22 -SC_GIANTGROWTH, 20 -SC_STONEHARDSKIN, 23 -SC_VITALITYACTIVATION, 20 -SC_FIGHTINGSPIRIT, 20 -SC_ABUNDANCE, 20 -//SC_REUSE_MILLENNIUMSHIELD, 29 -//SC_REUSE_CRUSHSTRIKE, 29 -//SC_REUSE_REFRESH, 29 -//SC_REUSE_STORMBLAST, 29 -SC_EPICLESIS, 29 -SC_ORATIO, 276 -SC_LAUDAAGNUS, 20 -SC_LAUDARAMUS, 20 -SC_CLOAKINGEXCEED, 30 -SC_HALLUCINATIONWALK, 284 -SC_HALLUCINATIONWALK_POSTDELAY, 31 -SC_RENOVATIO, 20 -SC_WEAPONBLOCKING, 28 -//SC_WEAPONBLOCKING_POSTDELAY, 31 -SC_ROLLINGCUTTER, 286 -SC_EXPIATIO, 20 -SC_POISONINGWEAPON, 28 -SC_TOXIN, 20 -SC_PARALYSE, 20 -SC_VENOMBLEED, 20 -SC_MAGICMUSHROOM, 20 -SC_DEATHHURT, 20 -SC_PYREXIA, 20 -SC_OBLIVIONCURSE, 20 -SC_LEECHESEND, 20 -SC_DUPLELIGHT, 276 -SC_FEARBREEZE, 28 -SC_ELECTRICSHOCKER, 30 -SC_MARSHOFABYSS, 20 -SC_RECOGNIZEDSPELL, 20 -//SC_WUGRIDER, 29 -SC_WUGDASH, 30 -SC_WUGBITE, 30 -SC_CAMOUFLAGE, 286 -SC_ACCELERATION, 28 -SC_HOVERING, 28 -SC_SUMMON1, 280 -SC_SUMMON2, 280 -SC_SUMMON3, 280 -SC_SUMMON4, 280 -SC_SUMMON5, 280 -SC_MVPCARD_TAOGUNKA, 60 -SC_MVPCARD_MISTRESS, 60 -SC_MVPCARD_ORCHERO, 60 -SC_MVPCARD_ORCLORD, 60 -SC_OVERHEAT_LIMITPOINT, 28 -SC_OVERHEAT, 28 -SC_SHAPESHIFT, 28 -SC_INFRAREDSCAN, 28 -SC_MAGNETICFIELD, 30 -SC_NEUTRALBARRIER, 30 -SC_NEUTRALBARRIER_MASTER, 30 -SC_STEALTHFIELD_MASTER, 30 -SC_MANU_ATK, 28 -SC_MANU_DEF, 28 -SC_SPL_ATK, 28 -SC_SPL_DEF, 28 -SC__REPRODUCE, 28 -SC_MANU_MATK, 28 -SC_SPL_MATK, 28 -SC_STR_SCROLL, 61 -SC_INT_SCROLL, 61 -SC_FORCEOFVANGUARD, 28 -SC_BUCHEDENOEL, 60 -SC__AUTOSHADOWSPELL, 16 -SC__SHADOWFORM, 286 -SC_RAID, 28 -SC_SHIELDSPELL_DEF, 16 -SC_SHIELDSPELL_MDEF, 16 -SC_SHIELDSPELL_REF, 16 -SC__BODYPAINT, 20 -SC_EXEEDBREAK, 28 -SC_ADORAMUS, 16 -SC_PRESTIGE, 16 -SC__INVISIBILITY, 30 -SC__DEADLYINFECT, 20 -SC_BANDING, 284 -SC_BANDING_DEFENCE, 28 -SC_EARTHDRIVE, 20 -SC_INSPIRATION, 28 -SC__ENERVATION, 16 -SC__GROOMY, 16 -SC_RAISINGDRAGON, 30 -SC__IGNORANCE, 16 -SC__LAZINESS, 16 -SC_LIGHTNINGWALK, 28 -SC_ACARAJE, 24 -SC__UNLUCKY, 16 -SC_CURSEDCIRCLE_ATKER, 284 -SC_CURSEDCIRCLE_TARGET, 284 -SC__WEAKNESS, 16 -SC_CRESCENTELBOW, 28 -//SC_NOEQUIPACCESSARY, 30 -SC__STRIPACCESSARY, 28 -SC__MANHOLE, 94 -//SC_POPECOOKIE, 28 -SC__BLOODYLUST, 32 -SC_SWING, 28 -SC_SYMPHONY_LOVE, 28 -SC_PROPERTYWALK, 18 -SC_SPELLFIST, 16 -SC_NETHERWORLD, 16 -SC_SIREN, 16 -SC_DEEP_SLEEP, 290 -SC_SIRCLEOFNATURE, 16 -SC_GLOOMYDAY, 16 -SC_GLOOMYDAY_SK, 16 -SC_SONG_OF_MANA, 16 -SC_DANCE_WITH_WUG, 16 -SC_RUSH_WINDMILL, 28 -SC_ECHOSONG, 28 -SC_HARMONIZE, 16 -SC_MOONLIT_SERENADE, 28 -SC_SATURDAY_NIGHT_FEVER, 16 -SC_SITDOWN_FORCE, 28 -SC_ANALYZE, 28 -SC_LERADS_DEW, 28 -SC_MELODYOFSINK, 28 -SC_BEYOND_OF_WARCRY, 28 -SC_UNLIMITED_HUMMING_VOICE, 28 -SC_WARMER, 2 -SC_VENOMIMPRESS, 260 -SC_FROSTMISTY, 288 -//SC_ASSUMPTIO2, 16 -//SC_GN_TRAINING_SWORD, 31 -//SC_GN_REMODELING_CART, 31 -SC_STOMACHACHE, 32 -SC_MYSTERIOUS_POWDER, 32 -//SC_ELEMENTAL_AGGRESSIVE, 2 -//SC_ELEMENTAL_WAIT, 2 -//SC_ELEMENTAL_PASSIVE, 2 -//SC_ELEMENTAL_DEFENSIVE, 2 -SC_WATER_BARRIER, 2 -SC_ZEPHYR, 2 -SC_POWER_OF_GAIA, 2 -SC_FIRE_INSIGNIA, 2 -SC_WATER_INSIGNIA, 2 -SC_WIND_INSIGNIA, 2 -SC_EARTH_INSIGNIA, 2 -SC_MORA_BUFF, 2 -//SC_REUSE_LIMIT_G, 29 -//SC_REUSE_LIMIT_H, 29 -SC_NEEDLE_OF_PARALYZE, 1 -SC_PAIN_KILLER, 1 -SC_G_LIFEPOTION, 68 -//SC_VITALIZE_POTION, 4 -SC_LIGHT_OF_REGENE, 1 -//SC_SONIC_CLAW_POSTDELAY, 2 -//SC_SILVERVEIN_RUSH_POSTDELAY, 2 -//SC_MIDNIGHT_FRENZY_POSTDELAY, 2 -//SC_TINDER_BREAKER, 2 -//SC_TINDER_BREAKER_POSTDELAY, 2 -//SC_CBC, 2 -//SC_CBC_POSTDELAY, 2 -//SC_EQC, 2 -SC_MAGIC_CANDY, 92 -//SC_ALL_RIDING_REUSE_LIMIT, 1 -//SC_HANDICAPSTATE_DEEP_SLEEP, 80 -SC_MONSTER_TRANSFORM, 268 -SC_MTF_ASPD, 12 -SC_MTF_RANGEATK, 12 -SC_MTF_MATK, 12 -SC_MTF_MLEATKED,12 -SC_MTF_CRIDAMAGE, 12 -SC_FULL_THROTTLE, 18 -SC_REBOUND, 18 -SC_TELEKINESIS_INTENSE, 18 - -// Geffen Scrolls -SC_SKELSCROLL, 69 -SC_DISTRUCTIONSCROLL, 69 -SC_ROYALSCROLL, 69 -SC_IMMUNITYSCROLL, 69 -SC_MYSTICSCROLL, 69 -SC_BATTLESCROLL, 69 -SC_ARMORSCROLL, 69 -SC_FREYJASCROLL, 69 -SC_SOULSCROLL, 69 - -// Eden Crystal Synthesis -SC_QUEST_BUFF1, 13 -SC_QUEST_BUFF2, 13 -SC_QUEST_BUFF3, 13 - -// Geffen Magic Tournament -SC_GEFFEN_MAGIC1, 14 -SC_GEFFEN_MAGIC2, 14 -SC_GEFFEN_MAGIC3, 14 - -SC_OVERLAPEXPUP, 12 -SC_M_LIFEPOTION, 68 - -// Guild Auras should not be saved -SC_LEADERSHIP,78 -SC_GLORYWOUNDS,78 -SC_SOULCOLD,78 -SC_HAWKEYES,78 -SC_GDSKILL_REGENERATION,78 - -SC_ORCISH, 2 - -// Unremovable -SC_WEIGHTOVER50, 207 -SC_WEIGHTOVER90, 207 -SC_WEDDING, 77 -SC_XMAS, 77 -SC_SUMMER, 77 -SC_NOCHAT, 205 -SC_FUSION, 77 -SC_EARTHSCROLL, 77 -SC_STORMKICK_READY, 77 -SC_DOWNKICK_READY, 77 -SC_COUNTERKICK_READY, 77 -SC_TURNKICK_READY, 77 -SC_DODGE_READY, 77 -SC_JAILED, 205 -SC_AUTOTRADE, 77 -SC_DANCING, 12 -SC_WHISTLE, 79 -SC_ASSNCROS, 79 -SC_POEMBRAGI, 79 -SC_APPLEIDUN, 79 -SC_HUMMING, 79 -SC_DONTFORGETME, 79 -SC_FORTUNE, 79 -SC_SERVICEFORYOU, 79 -SC_INCHIT, 77 -SC_PUSH_CART, 461 -SC_COLD, 256 -SC_BLOOD_SUCKER, 256 - -// Costumes -SC_MOONSTAR, 463 -SC_SUPER_STAR, 463 -SC_STRANGELIGHTS, 463 -SC_DECORATION_OF_MUSIC, 463 -SC_LJOSALFAR, 463 -SC_MERMAID_LONGING, 463 -SC_HAT_EFFECT, 463 -SC_FLOWERSMOKE, 463 -SC_FSTONE, 463 -SC_HAPPINESS_STAR, 463 -SC_MAPLE_FALLS, 463 -SC_TIME_ACCESSORY, 463 -SC_MAGICAL_FEATHER, 463 -SC_BLOSSOM_FLUTTERING, 463 - -// Summoner -SC_SPRITEMABLE, 205 -SC_BITESCAR, 4 - -// Clan System -SC_CLAN_INFO, 463 - -// Cant Clear -SC_ALL_RIDING, 397 - -SC_DAILYSENDMAILCNT, 461 diff --git a/doc/atcommands.txt b/doc/atcommands.txt index 139295973..0b4dce579 100644 --- a/doc/atcommands.txt +++ b/doc/atcommands.txt @@ -1059,6 +1059,12 @@ Changes the gender attached to the player's account. --------------------------------------- +@changecharsex + +Changes the gender attached to the player's character. + +--------------------------------------- + @marry <player 1> <player 2> @divorce <player> diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h index 96fea8fe0..fd34a1d82 100644 --- a/src/common/HPMDataCheck.h +++ b/src/common/HPMDataCheck.h @@ -665,6 +665,8 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { { "PACKET_ZC_ACK_LEAVE_GUILD1", sizeof(struct PACKET_ZC_ACK_LEAVE_GUILD1), SERVER_TYPE_MAP }, { "PACKET_ZC_ACK_LEAVE_GUILD2", sizeof(struct PACKET_ZC_ACK_LEAVE_GUILD2), SERVER_TYPE_MAP }, { "PACKET_ZC_ACK_OPEN_WRITE_MAIL", sizeof(struct PACKET_ZC_ACK_OPEN_WRITE_MAIL), SERVER_TYPE_MAP }, + { "PACKET_ZC_ACK_RANKING_name", sizeof(struct PACKET_ZC_ACK_RANKING_name), SERVER_TYPE_MAP }, + { "PACKET_ZC_ACK_RANKING_points", sizeof(struct PACKET_ZC_ACK_RANKING_points), SERVER_TYPE_MAP }, { "PACKET_ZC_ACK_RANKING_sub", sizeof(struct PACKET_ZC_ACK_RANKING_sub), SERVER_TYPE_MAP }, { "PACKET_ZC_ACK_REMOVE_ITEM_MAIL", sizeof(struct PACKET_ZC_ACK_REMOVE_ITEM_MAIL), SERVER_TYPE_MAP }, { "PACKET_ZC_ACK_REQMAKINGITEM", sizeof(struct PACKET_ZC_ACK_REQMAKINGITEM), SERVER_TYPE_MAP }, @@ -741,6 +743,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = { { "PACKET_ZC_SPRITE_CHANGE", sizeof(struct PACKET_ZC_SPRITE_CHANGE), SERVER_TYPE_MAP }, { "PACKET_ZC_STATUS_CHANGE_ACK", sizeof(struct PACKET_ZC_STATUS_CHANGE_ACK), SERVER_TYPE_MAP }, { "PACKET_ZC_STYLE_CHANGE_RES", sizeof(struct PACKET_ZC_STYLE_CHANGE_RES), SERVER_TYPE_MAP }, + { "PACKET_ZC_TALKBOX_CHATCONTENTS", sizeof(struct PACKET_ZC_TALKBOX_CHATCONTENTS), SERVER_TYPE_MAP }, { "PACKET_ZC_UI_ACTION", sizeof(struct PACKET_ZC_UI_ACTION), SERVER_TYPE_MAP }, { "PACKET_ZC_UPDATE_ITEM_FROM_BUYING_STORE", sizeof(struct PACKET_ZC_UPDATE_ITEM_FROM_BUYING_STORE), SERVER_TYPE_MAP }, { "PACKET_ZC_USE_ITEM_ACK", sizeof(struct PACKET_ZC_USE_ITEM_ACK), SERVER_TYPE_MAP }, diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h index 949aae804..424abe14f 100644 --- a/src/common/packets/packets2019_len_main.h +++ b/src/common/packets/packets2019_len_main.h @@ -103,7 +103,11 @@ packetLen(0x007c, 44) // ZC_NOTIFY_STANDENTRY_NPC packetLen(0x007d, 2) // CZ_NOTIFY_ACTORINIT // Packet: 0x007e +#if PACKETVER >= 20190904 +packetLen(0x007e, 46) // CZ_REQUEST_TIME +#elif PACKETVER >= 20190109 packetLen(0x007e, 105) // CZ_REQUEST_TIME +#endif // Packet: 0x007f packetLen(0x007f, 6) // ZC_NOTIFY_TIME @@ -916,7 +920,11 @@ packetLen(0x018f, 8) // ZC_ACK_REQMAKINGITEM packetLen(0x0190, 23) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // Packet: 0x0191 +#if PACKETVER >= 20190904 +packetLen(0x0191, 27) // ZC_TALKBOX_CHATCONTENTS +#elif PACKETVER >= 20190109 packetLen(0x0191, 86) // ZC_TALKBOX_CHATCONTENTS +#endif // Packet: 0x0192 packetLen(0x0192, 24) // ZC_UPDATE_MAPINFO @@ -1966,7 +1974,11 @@ packetLen(0x0365, 8) // CZ_MOVE_ITEM_FROM_STORE_TO_BODY2 packetLen(0x0366, 10) // CZ_USE_SKILL_TOGROUND2 // Packet: 0x0367 +#if PACKETVER >= 20190904 +packetLen(0x0367, 31) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#elif PACKETVER >= 20190109 packetLen(0x0367, 90) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#endif // Packet: 0x0368 packetLen(0x0368, 6) // CZ_REQNAME2 @@ -4710,5 +4722,45 @@ packetLen(0x0b54, 8) packetLen(0x0b55, -1) #endif +// Packet: 0x0b56 +#if PACKETVER >= 20190904 +packetLen(0x0b56, -1) +#endif + +// Packet: 0x0b57 +#if PACKETVER >= 20190904 +packetLen(0x0b57, -1) +#endif + +// Packet: 0x0b58 +#if PACKETVER >= 20190904 +packetLen(0x0b58, 2) +#endif + +// Packet: 0x0b59 +#if PACKETVER >= 20190918 +packetLen(0x0b59, 2) +#endif + +// Packet: 0x0b5a +#if PACKETVER >= 20190918 +packetLen(0x0b5a, 4) +#endif + +// Packet: 0x0b5b +#if PACKETVER >= 20190918 +packetLen(0x0b5b, -1) +#endif + +// Packet: 0x0b5c +#if PACKETVER >= 20190918 +packetLen(0x0b5c, 10) +#endif + +// Packet: 0x0b5d +#if PACKETVER >= 20190918 +packetLen(0x0b5d, 2) +#endif + #endif /* COMMON_PACKETS2019_LEN_MAIN_H */ diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h index c31a10191..32c14775d 100644 --- a/src/common/packets/packets2019_len_re.h +++ b/src/common/packets/packets2019_len_re.h @@ -103,7 +103,11 @@ packetLen(0x007c, 44) // ZC_NOTIFY_STANDENTRY_NPC packetLen(0x007d, 2) // CZ_NOTIFY_ACTORINIT // Packet: 0x007e +#if PACKETVER >= 20190904 +packetLen(0x007e, 46) // CZ_REQUEST_TIME +#elif PACKETVER >= 20190109 packetLen(0x007e, 105) // CZ_REQUEST_TIME +#endif // Packet: 0x007f packetLen(0x007f, 6) // ZC_NOTIFY_TIME @@ -916,7 +920,11 @@ packetLen(0x018f, 8) // ZC_ACK_REQMAKINGITEM packetLen(0x0190, 23) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // Packet: 0x0191 +#if PACKETVER >= 20190904 +packetLen(0x0191, 27) // ZC_TALKBOX_CHATCONTENTS +#elif PACKETVER >= 20190109 packetLen(0x0191, 86) // ZC_TALKBOX_CHATCONTENTS +#endif // Packet: 0x0192 packetLen(0x0192, 24) // ZC_UPDATE_MAPINFO @@ -1972,7 +1980,11 @@ packetLen(0x0365, 8) // CZ_MOVE_ITEM_FROM_STORE_TO_BODY2 packetLen(0x0366, 10) // CZ_USE_SKILL_TOGROUND2 // Packet: 0x0367 +#if PACKETVER >= 20190904 +packetLen(0x0367, 31) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#elif PACKETVER >= 20190109 packetLen(0x0367, 90) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#endif // Packet: 0x0368 packetLen(0x0368, 6) // CZ_REQNAME2 @@ -4722,5 +4734,45 @@ packetLen(0x0b54, 8) packetLen(0x0b55, -1) #endif +// Packet: 0x0b56 +#if PACKETVER >= 20190904 +packetLen(0x0b56, -1) +#endif + +// Packet: 0x0b57 +#if PACKETVER >= 20190904 +packetLen(0x0b57, -1) +#endif + +// Packet: 0x0b58 +#if PACKETVER >= 20190904 +packetLen(0x0b58, 2) +#endif + +// Packet: 0x0b59 +#if PACKETVER >= 20190918 +packetLen(0x0b59, 2) +#endif + +// Packet: 0x0b5a +#if PACKETVER >= 20190918 +packetLen(0x0b5a, 4) +#endif + +// Packet: 0x0b5b +#if PACKETVER >= 20190918 +packetLen(0x0b5b, -1) +#endif + +// Packet: 0x0b5c +#if PACKETVER >= 20190918 +packetLen(0x0b5c, 10) +#endif + +// Packet: 0x0b5d +#if PACKETVER >= 20190918 +packetLen(0x0b5d, 2) +#endif + #endif /* COMMON_PACKETS2019_LEN_RE_H */ diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h index abe81796c..9cdc9db05 100644 --- a/src/common/packets/packets2019_len_zero.h +++ b/src/common/packets/packets2019_len_zero.h @@ -103,7 +103,11 @@ packetLen(0x007c, 44) // ZC_NOTIFY_STANDENTRY_NPC packetLen(0x007d, 2) // CZ_NOTIFY_ACTORINIT // Packet: 0x007e +#if PACKETVER >= 20190828 +packetLen(0x007e, 46) // CZ_REQUEST_TIME +#elif PACKETVER >= 20190116 packetLen(0x007e, 105) // CZ_REQUEST_TIME +#endif // Packet: 0x007f packetLen(0x007f, 6) // ZC_NOTIFY_TIME @@ -916,7 +920,11 @@ packetLen(0x018f, 8) // ZC_ACK_REQMAKINGITEM packetLen(0x0190, 23) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // Packet: 0x0191 +#if PACKETVER >= 20190828 +packetLen(0x0191, 27) // ZC_TALKBOX_CHATCONTENTS +#elif PACKETVER >= 20190116 packetLen(0x0191, 86) // ZC_TALKBOX_CHATCONTENTS +#endif // Packet: 0x0192 packetLen(0x0192, 24) // ZC_UPDATE_MAPINFO @@ -1966,7 +1974,11 @@ packetLen(0x0365, 8) // CZ_MOVE_ITEM_FROM_STORE_TO_BODY2 packetLen(0x0366, 10) // CZ_USE_SKILL_TOGROUND2 // Packet: 0x0367 +#if PACKETVER >= 20190828 +packetLen(0x0367, 31) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#elif PACKETVER >= 20190116 packetLen(0x0367, 90) // CZ_USE_SKILL_TOGROUND_WITHTALKBOX2 +#endif // Packet: 0x0368 packetLen(0x0368, 6) // CZ_REQNAME2 @@ -4697,5 +4709,50 @@ packetLen(0x0b53, 52) packetLen(0x0b54, 8) #endif +// Packet: 0x0b55 +#if PACKETVER >= 20190828 +packetLen(0x0b55, -1) +#endif + +// Packet: 0x0b56 +#if PACKETVER >= 20190828 +packetLen(0x0b56, -1) +#endif + +// Packet: 0x0b57 +#if PACKETVER >= 20190828 +packetLen(0x0b57, -1) +#endif + +// Packet: 0x0b58 +#if PACKETVER >= 20190828 +packetLen(0x0b58, 2) +#endif + +// Packet: 0x0b59 +#if PACKETVER >= 20190918 +packetLen(0x0b59, 2) +#endif + +// Packet: 0x0b5a +#if PACKETVER >= 20190918 +packetLen(0x0b5a, 4) +#endif + +// Packet: 0x0b5b +#if PACKETVER >= 20190918 +packetLen(0x0b5b, -1) +#endif + +// Packet: 0x0b5c +#if PACKETVER >= 20190918 +packetLen(0x0b5c, 10) +#endif + +// Packet: 0x0b5d +#if PACKETVER >= 20190918 +packetLen(0x0b5d, 2) +#endif + #endif /* COMMON_PACKETS2019_LEN_ZERO_H */ diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 22969606d..b472694c4 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6750,6 +6750,18 @@ ACMD(changesex) return true; } +ACMD(changecharsex) +{ + int i; + + pc->resetskill(sd, PCRESETSKILL_CHSEX); + // to avoid any problem with equipment and invalid sex, equipment is unequipped. + for (i=0; i<EQI_MAX; i++) + if (sd->equip_index[i] >= 0) pc->unequipitem(sd, sd->equip_index[i], PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); + chrif->changesex(sd, false); + return true; +} + /*================================================ * @mute - Mutes a player for a set amount of time *------------------------------------------------*/ @@ -10115,6 +10127,7 @@ static void atcommand_basecommands(void) ACMD_DEF(clearweather), ACMD_DEF(uptime), ACMD_DEF(changesex), + ACMD_DEF(changecharsex), ACMD_DEF(mute), ACMD_DEF(refresh), ACMD_DEF(refreshall), diff --git a/src/map/battle.h b/src/map/battle.h index 779e360bf..4400d37d1 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -103,8 +103,8 @@ enum e_battle_check_target { //New definitions [Skotlex] enum battle_dmg_type { BDT_NORMAL = 0, // Normal attack //BDT_PICKUP = 1, // Pick up item - //BDT_SITDOWN = 2, // Sit down - //BDT_STANDUP = 3, // Stand up + BDT_SITDOWN = 2, // Sit down + BDT_STANDUP = 3, // Stand up BDT_ENDURE = 4, // Damage (endure) BDT_SPLASH = 5, // Splash BDT_SKILL = 6, // Skill diff --git a/src/map/clif.c b/src/map/clif.c index 2be9619c8..c7f81a471 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4789,9 +4789,9 @@ static void clif_getareachar_unit(struct map_session_data *sd, struct block_list //Modifies the type of damage according to status changes [Skotlex] //Aegis data specifies that: 4 endure against single hit sources, 9 against multi-hit. -static inline int clif_calc_delay(int type, int div, int damage, int delay) +static inline enum battle_dmg_type clif_calc_delay(enum battle_dmg_type type, int div, int damage, int delay) { - return ( delay == 0 && damage > 0 ) ? ( div > 1 ? 9 : 4 ) : type; + return ( delay == 0 && damage > 0 ) ? ( div > 1 ? BDT_MULTIENDURE : BDT_ENDURE ) : type; } /*========================================== @@ -4822,7 +4822,7 @@ static int clif_calc_walkdelay(struct block_list *bl, int delay, int type, int d /// 08c8 <src ID>.L <dst ID>.L <server tick>.L <src speed>.L <dst speed>.L <damage>.L <IsSPDamage>.B <div>.W <type>.B <damage2>.L (ZC_NOTIFY_ACT2) /// type: @see enum battle_dmg_type /// for BDT_NORMAL: [ damage: total damage, div: amount of hits, damage2: assassin dual-wield damage ] -static int clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type, int64 in_damage2) +static int clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type, int64 in_damage2) { struct packet_damage p; struct status_change *sc; @@ -5268,7 +5268,7 @@ static void clif_playerSkillToPacket(struct map_session_data *sd, struct SKILLDA skillData->sp = 0; skillData->range2 = 0; } -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 if (newSkill) skillData->level2 = 0; else @@ -5419,7 +5419,7 @@ static void clif_skillinfo(struct map_session_data *sd, int skill_id, int inf) p->sp = 0; p->range2 = 0; } -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 p->level2 = skill_lv; #endif if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT) @@ -5573,7 +5573,7 @@ static void clif_skill_cooldown(struct map_session_data *sd, uint16 skill_id, un /// Skill attack effect and damage. /// 0114 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.W <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL) /// 01de <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <damage>.L <level>.W <div>.W <type>.B (ZC_NOTIFY_SKILL2) -static int clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 in_damage, int div, uint16 skill_id, uint16 skill_lv, int type) +static int clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 in_damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type) { unsigned char buf[64]; struct status_change *sc; @@ -5675,7 +5675,7 @@ static int clif_skill_damage(struct block_list *src, struct block_list *dst, int /// Ground skill attack effect and damage (ZC_NOTIFY_SKILL_POSITION). /// 0115 <skill id>.W <src id>.L <dst id>.L <tick>.L <src delay>.L <dst delay>.L <x>.W <y>.W <damage>.W <level>.W <div>.W <type>.B #if 0 -static int clif_skill_damage2(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int damage, int div, uint16 skill_id, uint16 skill_lv, int type) +static int clif_skill_damage2(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type) { unsigned char buf[64]; struct status_change *sc; @@ -8689,14 +8689,14 @@ static void clif_emotion(struct block_list *bl, int type) /// 0191 <id>.L <contents>.80B static void clif_talkiebox(struct block_list *bl, const char *talkie) { - unsigned char buf[MESSAGE_SIZE+6]; nullpo_retv(bl); nullpo_retv(talkie); + struct PACKET_ZC_TALKBOX_CHATCONTENTS p; - WBUFW(buf,0) = 0x191; - WBUFL(buf,2) = bl->id; - safestrncpy(WBUFP(buf,6),talkie,MESSAGE_SIZE); - clif->send(buf,packet_len(0x191),bl,AREA); + p.PacketType = HEADER_ZC_TALKBOX_CHATCONTENTS; + p.aid = bl->id; + safestrncpy(&p.message[0], talkie, TALKBOX_MESSAGE_SIZE); + clif->send(&p, sizeof(struct PACKET_ZC_TALKBOX_CHATCONTENTS), bl, AREA); } /// Displays wedding effect centered on an object (ZC_CONGRATULATION). @@ -9298,9 +9298,6 @@ static void clif_pcname_ack(int fd, struct block_list *bl) packet.gid = bl->id; const struct map_session_data *ssd = BL_UCCAST(BL_PC, bl); - const struct party_data *p = NULL; - const struct guild *g = NULL; - int ps = -1; if (ssd->fakename[0] != '\0' && ssd->disguise != -1) { packet.packet_id = reqName; @@ -9326,9 +9323,12 @@ static void clif_pcname_ack(int fd, struct block_list *bl) #endif memcpy(packet.name, ssd->status.name, NAME_LENGTH); + const struct party_data *p = NULL; + int ps = -1; if (ssd->status.party_id != 0) { p = party->search(ssd->status.party_id); } + const struct guild *g = NULL; if (ssd->status.guild_id != 0) { if ((g = ssd->guild) != NULL) { int i; @@ -9351,6 +9351,12 @@ static void clif_pcname_ack(int fd, struct block_list *bl) memcpy(packet.guild_name, g->name,NAME_LENGTH); memcpy(packet.position_name, g->position[ps].name, NAME_LENGTH); } + else if (ssd->status.clan_id != 0) { + struct clan *c = clan->search(ssd->status.clan_id); + if (c != 0) { + memcpy(packet.position_name, c->name, NAME_LENGTH); + } + } } clif->send_selforarea(fd, bl, &packet, len); @@ -12687,7 +12693,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin return; } //You can't use Graffiti/TalkieBox AND have a vending open, so this is safe. - safestrncpy(sd->message, RFIFOP(fd,skillmoreinfo), MESSAGE_SIZE); + safestrncpy(sd->message, RFIFOP(fd, skillmoreinfo), TALKBOX_MESSAGE_SIZE); } if( sd->ud.skilltimer != INVALID_TIMER ) @@ -15978,18 +15984,18 @@ static void clif_ranklist_sub(struct PACKET_ZC_ACK_RANKING_sub *ranks, enum fame if (list[i].id > 0) { const char* name; if (strcmp(list[i].name, "-") == 0 && (name = map->charid2nick(list[i].id)) != NULL) { - strncpy(ranks[i].name, name, NAME_LENGTH); + strncpy(ranks->names[i].name, name, NAME_LENGTH); } else { - strncpy(ranks[i].name, list[i].name, NAME_LENGTH); + strncpy(ranks->names[i].name, list[i].name, NAME_LENGTH); } } else { - strncpy(ranks[i].name, "None", 5); + strncpy(ranks->names[i].name, "None", 5); } - ranks[i].points = list[i].fame; //points + ranks->points[i].points = list[i].fame; //points } for (;i < 10; i++) { // In case the MAX is less than 10. - strncpy(ranks[i].name, "Unavailable", 12); - ranks[i].points = 0; + strncpy(ranks->names[i].name, "Unavailable", 12); + ranks->points[i].points = 0; } #endif } @@ -16038,7 +16044,7 @@ static void clif_ranklist(struct map_session_data *sd, enum fame_list_type type) #if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724 clif->ranklist_sub2(p->chars, p->points, type); #else - clif->ranklist_sub(p->ranks, type); + clif->ranklist_sub(&p->ranks, type); #endif if (pc->famelist_type(sd->job) == type) { @@ -20609,7 +20615,7 @@ static int clif_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) * * @return clif->calc_walkdelay used in further processing **/ -static int clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type) +static int clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type) { struct cdelayed_damage *dd; struct status_change *sc; diff --git a/src/map/clif.h b/src/map/clif.h index 07d2ef4a8..f3d7c78eb 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -59,6 +59,7 @@ struct s_refine_requirement; struct PACKET_ZC_ACK_RANKING_sub; struct SKILLDATA; +enum battle_dmg_type; enum clif_messages; enum rodex_add_item; enum rodex_get_zeny; @@ -861,7 +862,7 @@ struct clif_interface { void (*scriptclear) (struct map_session_data *sd, int npcid); /* client-user-interface-related */ void (*viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color); - int (*damage) (struct block_list* src, struct block_list* dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); + int (*damage) (struct block_list* src, struct block_list* dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2); void (*sitting) (struct block_list* bl); void (*standing) (struct block_list* bl); void (*arrow_create_list) (struct map_session_data *sd); @@ -987,7 +988,7 @@ struct clif_interface { void (*wedding_effect) (struct block_list *bl); void (*divorced) (struct map_session_data* sd, const char* name); void (*callpartner) (struct map_session_data *sd); - int (*skill_damage) (struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type); + int (*skill_damage) (struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type); int (*skill_nodamage) (struct block_list *src,struct block_list *dst,uint16 skill_id,int heal,int fail); void (*skill_poseffect) (struct block_list *src, uint16 skill_id, int val, int x, int y, int64 tick); void (*skill_estimation) (struct map_session_data *sd,struct block_list *dst); @@ -1282,7 +1283,7 @@ struct clif_interface { /* */ void (*notify_bounditem) (struct map_session_data *sd, unsigned short index); /* */ - int (*delay_damage) (int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type); + int (*delay_damage) (int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type); int (*delay_damage_sub) (int tid, int64 tick, int id, intptr_t data); /* NPC Market */ void (*npc_market_open) (struct map_session_data *sd, struct npc_data *nd); diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 31744f479..bb940fd44 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -525,6 +525,21 @@ static bool homunculus_mutate(struct homun_data *hd, int homun_id) return true; } +static int homunculus_gainexp_real(struct homun_data *hd, unsigned int exp) +{ + nullpo_ret(hd); + nullpo_ret(hd->master); + + hd->homunculus.exp += exp; + + if (hd->master->state.showexp && hd->exp_next > 0) { + char output[256]; + sprintf(output, msg_fd(hd->master->fd, 449), exp, ((float)exp / (float)hd->exp_next * (float)100)); + clif_disp_onlyself(hd->master, output); + } + return 1; +} + static int homunculus_gainexp(struct homun_data *hd, unsigned int exp) { enum homun_type htype; @@ -550,16 +565,10 @@ static int homunculus_gainexp(struct homun_data *hd, unsigned int exp) break; } - hd->homunculus.exp += exp; - - if (hd->master->state.showexp && hd->exp_next > 0) { - char output[256]; - sprintf(output, "Homunculus Experience Gained Base:%u (%.2f%%)", exp, ((float)exp / (float)hd->exp_next * (float)100)); - clif_disp_onlyself(hd->master, output); - } + homun->gainexp_real(hd, exp); - if(hd->homunculus.exp < hd->exp_next) { - clif->hominfo(hd->master,hd,0); + if (hd->homunculus.exp < hd->exp_next) { + clif->hominfo(hd->master, hd, 0); return 0; } @@ -1439,6 +1448,7 @@ void homunculus_defaults(void) homun->evolve = homunculus_evolve; homun->mutate = homunculus_mutate; homun->gainexp = homunculus_gainexp; + homun->gainexp_real = homunculus_gainexp_real; homun->add_intimacy = homunculus_add_intimacy; homun->consume_intimacy = homunculus_consume_intimacy; homun->healed = homunculus_healed; diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 745c7cd84..502fb0b7f 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -178,6 +178,7 @@ struct homunculus_interface { bool (*evolve) (struct homun_data *hd); bool (*mutate) (struct homun_data *hd, int homun_id); int (*gainexp) (struct homun_data *hd, unsigned int exp); + int (*gainexp_real) (struct homun_data *hd, unsigned int exp); unsigned int (*add_intimacy) (struct homun_data * hd, unsigned int value); unsigned int (*consume_intimacy) (struct homun_data *hd, unsigned int value); void (*healed) (struct homun_data *hd); diff --git a/src/map/mapdefines.h b/src/map/mapdefines.h index df9e9bccb..348ca98fd 100644 --- a/src/map/mapdefines.h +++ b/src/map/mapdefines.h @@ -21,6 +21,8 @@ #ifndef MAP_MAPDEFINES_H #define MAP_MAPDEFINES_H +#include "common/mmo.h" // packet versions + #define MAX_NPC_PER_MAP 512 #define AREA_SIZE (battle->bc->area_size) #define CHAT_AREA_SIZE (battle->bc->chat_area_size) @@ -57,8 +59,14 @@ #define MAPID_UPPERMASK 0x0fff #define MAPID_THIRDMASK (JOBL_THIRD|MAPID_UPPERMASK) -// Max size for inputs to Graffiti, Talkie Box and Vending text prompts +// Max size for inputs to Vending text prompts #define MESSAGE_SIZE (79 + 1) +// Max size for inputs to Graffiti, Talkie Box text prompts +#if PACKETVER_MAIN_NUM >= 20190904 || PACKETVER_RE_NUM >= 20190904 || PACKETVER_ZERO_NUM >= 20190828 +#define TALKBOX_MESSAGE_SIZE 21 +#else +#define TALKBOX_MESSAGE_SIZE (79 + 1) +#endif // String length you can write in the 'talking box' #define CHATBOX_SIZE (70 + 1) // Chatroom-related string sizes diff --git a/src/map/messages_main.h b/src/map/messages_main.h index bc5bcf55d..1ef24d6ab 100644 --- a/src/map/messages_main.h +++ b/src/map/messages_main.h @@ -24,7 +24,7 @@ /* This file is autogenerated, please do not commit manual changes -Latest version: 20190821 +Latest version: 20190918 */ enum clif_messages { @@ -21875,6 +21875,92 @@ Sold Out */ MSG_ID_E50 = 0xe50, #endif +#if PACKETVER >= 20190828 +/*20190828 to latest +장착 중인 아이템은 교환할 수 없습니다. 장착을 해제한 뒤 시도해 주시길 바랍니다. +*/ + MSG_ID_E51 = 0xe51, +#endif +#if PACKETVER >= 20190904 +/*20190904 to latest +길드 창고 이용 중엔 캐릭터 선택창으로 이동 할 수 없습니다. +*/ + MSG_ID_E52 = 0xe52, +/*20190904 to latest +아이템 태그가 포함되어 있어 사용할 수 없습니다. +*/ + MSG_ID_E53 = 0xe53, +/*20190904 to latest +Monster +*/ + MSG_ID_E54 = 0xe54, +/*20190904 to latest +Unknown +*/ + MSG_ID_E55 = 0xe55, +/*20190904 to latest +Undead +*/ + MSG_ID_E56 = 0xe56, +/*20190904 to latest +Animal +*/ + MSG_ID_E57 = 0xe57, +/*20190904 to latest +Plant +*/ + MSG_ID_E58 = 0xe58, +/*20190904 to latest +Insect +*/ + MSG_ID_E59 = 0xe59, +/*20190904 to latest +Marine +*/ + MSG_ID_E5A = 0xe5a, +/*20190904 to latest +Devil +*/ + MSG_ID_E5B = 0xe5b, +/*20190904 to latest +Human +*/ + MSG_ID_E5C = 0xe5c, +/*20190904 to latest +Angel +*/ + MSG_ID_E5D = 0xe5d, +/*20190904 to latest +Dragon +*/ + MSG_ID_E5E = 0xe5e, +#endif +#if PACKETVER >= 20190918 +/*20190918 to latest +Balance: %s %c +*/ + MSG_ID_E5F = 0xe5f, +/*20190918 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 %s캐시가 차감됩니다. +*/ + MSG_ID_E60 = 0xe60, +/*20190918 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 일반 %s캐시, 무료 %s캐시가 차감됩니다. +*/ + MSG_ID_E61 = 0xe61, +/*20190918 to latest +[%s]의 호출이 거부되었습니다. +*/ + MSG_ID_E62 = 0xe62, +/*20190918 to latest +구매 한도액은 소지액을 초과할 수 없습니다. +*/ + MSG_ID_E63 = 0xe63, +/*20190918 to latest +노점을 여는데 실패하였습니다. 구매노점 개설을 닫아주시기 바랍니다. +*/ + MSG_ID_E64 = 0xe64, +#endif }; #endif /* MAP_MESSAGES_MAIN_H */ diff --git a/src/map/messages_re.h b/src/map/messages_re.h index efebecdb2..4ae3dee1d 100644 --- a/src/map/messages_re.h +++ b/src/map/messages_re.h @@ -24,7 +24,7 @@ /* This file is autogenerated, please do not commit manual changes -Latest version: 20190821 +Latest version: 20190918 */ enum clif_messages { @@ -21354,6 +21354,92 @@ Sold Out */ MSG_ID_E50 = 0xe50, #endif +#if PACKETVER >= 20190828 +/*20190828 to latest +장착 중인 아이템은 교환할 수 없습니다. 장착을 해제한 뒤 시도해 주시길 바랍니다. +*/ + MSG_ID_E51 = 0xe51, +#endif +#if PACKETVER >= 20190904 +/*20190904 to latest +길드 창고 이용 중엔 캐릭터 선택창으로 이동 할 수 없습니다. +*/ + MSG_ID_E52 = 0xe52, +/*20190904 to latest +아이템 태그가 포함되어 있어 사용할 수 없습니다. +*/ + MSG_ID_E53 = 0xe53, +/*20190904 to latest +Monster +*/ + MSG_ID_E54 = 0xe54, +/*20190904 to latest +Unknown +*/ + MSG_ID_E55 = 0xe55, +/*20190904 to latest +Undead +*/ + MSG_ID_E56 = 0xe56, +/*20190904 to latest +Animal +*/ + MSG_ID_E57 = 0xe57, +/*20190904 to latest +Plant +*/ + MSG_ID_E58 = 0xe58, +/*20190904 to latest +Insect +*/ + MSG_ID_E59 = 0xe59, +/*20190904 to latest +Marine +*/ + MSG_ID_E5A = 0xe5a, +/*20190904 to latest +Devil +*/ + MSG_ID_E5B = 0xe5b, +/*20190904 to latest +Human +*/ + MSG_ID_E5C = 0xe5c, +/*20190904 to latest +Angel +*/ + MSG_ID_E5D = 0xe5d, +/*20190904 to latest +Dragon +*/ + MSG_ID_E5E = 0xe5e, +#endif +#if PACKETVER >= 20190918 +/*20190918 to latest +Balance: %s %c +*/ + MSG_ID_E5F = 0xe5f, +/*20190918 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 %s캐시가 차감됩니다. +*/ + MSG_ID_E60 = 0xe60, +/*20190918 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 일반 %s캐시, 무료 %s캐시가 차감됩니다. +*/ + MSG_ID_E61 = 0xe61, +/*20190918 to latest +호출이 거부되었습니다. +*/ + MSG_ID_E62 = 0xe62, +/*20190918 to latest +구매 한도액은 소지액을 초과할 수 없습니다. +*/ + MSG_ID_E63 = 0xe63, +/*20190918 to latest +노점을 여는데 실패하였습니다. 구매노점 개설을 닫아주시기 바랍니다. +*/ + MSG_ID_E64 = 0xe64, +#endif }; #endif /* MAP_MESSAGES_RE_H */ diff --git a/src/map/messages_zero.h b/src/map/messages_zero.h index 344dbb29e..039d215ac 100644 --- a/src/map/messages_zero.h +++ b/src/map/messages_zero.h @@ -24,7 +24,7 @@ /* This file is autogenerated, please do not commit manual changes -Latest version: 20190814 +Latest version: 20190918 */ enum clif_messages { @@ -17922,8 +17922,10 @@ Sale Start Time 계정 한정 */ MSG_ID_E48 = 0xe48, -/*20190814 to latest +/*20190814 to 20190814 판매기간 : %d월 %d일 ~ %d월 %d일 +20190828 to latest +판매기간 : %d월 %d일 %d시 %d분 */ MSG_ID_E49 = 0xe49, /*20190814 to latest @@ -17947,6 +17949,102 @@ Sold Out */ MSG_ID_E4E = 0xe4e, #endif +#if PACKETVER >= 20190828 +/*20190828 to latest +~ %d월 %d일 %d시 %d분 +*/ + MSG_ID_E4F = 0xe4f, +/*20190828 to latest +상품을 더이상 추가할 수 없습니다 +*/ + MSG_ID_E50 = 0xe50, +/*20190828 to latest +장착 중인 아이템은 교환할 수 없습니다. 장착을 해제한 뒤 시도해 주시길 바랍니다. +*/ + MSG_ID_E51 = 0xe51, +#endif +#if PACKETVER >= 20190911 +/*20190911 to latest +길드 창고 이용 중엔 캐릭터 선택창으로 이동 할 수 없습니다. +*/ + MSG_ID_E52 = 0xe52, +/*20190911 to latest +아이템 태그가 포함되어 있어 사용할 수 없습니다. +*/ + MSG_ID_E53 = 0xe53, +/*20190911 to latest +Monster +*/ + MSG_ID_E54 = 0xe54, +/*20190911 to latest +Unknown +*/ + MSG_ID_E55 = 0xe55, +/*20190911 to latest +Undead +*/ + MSG_ID_E56 = 0xe56, +/*20190911 to latest +Animal +*/ + MSG_ID_E57 = 0xe57, +/*20190911 to latest +Plant +*/ + MSG_ID_E58 = 0xe58, +/*20190911 to latest +Insect +*/ + MSG_ID_E59 = 0xe59, +/*20190911 to latest +Marine +*/ + MSG_ID_E5A = 0xe5a, +/*20190911 to latest +Devil +*/ + MSG_ID_E5B = 0xe5b, +/*20190911 to latest +Human +*/ + MSG_ID_E5C = 0xe5c, +/*20190911 to latest +Angel +*/ + MSG_ID_E5D = 0xe5d, +/*20190911 to latest +Dragon +*/ + MSG_ID_E5E = 0xe5e, +/*20190911 to latest +Balance: %s %c +*/ + MSG_ID_E5F = 0xe5f, +/*20190911 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 %s캐시가 차감됩니다. +*/ + MSG_ID_E60 = 0xe60, +/*20190911 to latest + ^ff0000본 아이템을 구매 후 7일 이내에는 청약 철회가 가능합니다. 다만, 7일이 지났거나 아이템을 개봉하시면 청약 철회 대상에서 제외 됩니다.또한 구매시 사용된 무료캐시는 청약철회시 반환되지 않습니다.^000000 정말로 아이템을 구매하시겠습니까? 구매하실 경우 일반 %s캐시, 무료 %s캐시가 차감됩니다. +*/ + MSG_ID_E61 = 0xe61, +/*20190911 to 20190911 +호출이 거부되었습니다. +20190918 to latest +[%s]의 호출이 거부되었습니다. +*/ + MSG_ID_E62 = 0xe62, +#endif +#if PACKETVER >= 20190918 +/*20190918 to latest +구매 한도액은 소지액을 초과할 수 없습니다. +*/ + MSG_ID_E63 = 0xe63, +/*20190918 to latest +노점을 여는데 실패하였습니다. 구매노점 개설을 닫아주시기 바랍니다. +*/ + MSG_ID_E64 = 0xe64, +#endif }; #endif /* MAP_MESSAGES_ZERO_H */ diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h index 565835cd7..b7f25a83d 100644 --- a/src/map/packets_keys_main.h +++ b/src/map/packets_keys_main.h @@ -37,7 +37,7 @@ packetKeys(0x49357d72,0x22c370a1,0x5f836591); #endif -// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE, 2019-07-31bRagexe, 2019-07-31bRagexeRE, 2019-08-02aRagexe, 2019-08-02aRagexeRE, 2019-08-07aRagexe, 2019-08-07dRagexeRE, 2019-08-21aRagexe, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE +// 2010-11-23aRagexeRE, 2010-11-24aRagexeRE, 2010-11-24bRagexeRE, 2010-11-25aRagexeRE, 2010-11-26aRagexeRE, 2010-11-30aRagexeRE, 2010-12-07aRagexeRE, 2010-12-14aRagexeRE, 2010-12-21aRagexeRE, 2010-12-23aRagexeRE, 2010-12-28aRagexeRE, 2011-01-04aRagexeRE, 2011-01-05aRagexeRE, 2011-01-11aRagexeRE, 2011-01-18aRagexeRE, 2011-01-25aRagexeRE, 2011-01-26aRagexeRE, 2011-01-26bRagexeRE, 2011-01-31aRagexeRE, 2011-01-31bRagexeRE, 2011-01-31cRagexeRE, 2011-02-08aRagexeRE, 2011-02-15aRagexeRE, 2011-02-22aRagexeRE, 2011-02-23aRagexeRE, 2011-02-23bRagexeRE, 2011-02-24aRagexeRE, 2011-02-25aRagexeRE, 2011-02-28aRagexeRE, 2011-03-08aRagexeRE, 2011-03-09aRagexeRE, 2011-03-09bRagexeRE, 2011-03-09cRagexeRE, 2011-03-09dRagexeRE, 2011-03-15aRagexeRE, 2011-03-22aRagexeRE, 2011-03-29aRagexeRE, 2011-03-30aRagexeRE, 2011-03-30cRagexeRE, 2011-04-05aRagexeRE, 2011-04-12aRagexeRE, 2011-04-19aRagexeRE, 2011-04-20aRagexeRE, 2011-04-26aRagexeRE, 2011-04-27aRagexeRE, 2011-05-03aRagexeRE, 2011-05-11aRagexeRE, 2011-05-17bRagexeRE, 2011-05-24aRagexeRE, 2011-05-26aRagexeRE, 2011-05-31aRagexeRE, 2011-06-07aRagexeRE, 2011-06-08aRagexeRE, 2011-06-08bRagexeRE, 2011-06-08cRagexeRE, 2011-06-09aRagexeRE, 2011-06-14bRagexeRE, 2011-06-22aRagexeRE, 2011-06-28aRagexeRE, 2011-07-06aRagexeRE, 2011-07-13aRagexeRE, 2011-07-13bRagexeRE, 2011-07-13cRagexeRE, 2011-07-19aRagexeRE, 2011-07-26aRagexeRE, 2011-08-03aRagexeRE, 2011-08-03bRagexeRE, 2011-08-10aRagexeRE, 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE, 2018-05-30aRagexe, 2018-05-30bRagexeRE, 2018-05-30cRagexeRE, 2018-06-05bRagexe, 2018-06-05bRagexeRE, 2018-06-12aRagexeRE, 2018-06-12bRagexeRE, 2018-06-20cRagexe, 2018-06-20dRagexeRE, 2018-06-20eRagexe, 2018-06-20eRagexeRE, 2018-06-21aRagexe, 2018-06-21aRagexeRE, 2018-07-04aRagexe, 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexe, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexe, 2018-07-18cRagexeRE, 2018-08-01cRagexe, 2018-08-01cRagexeRE, 2018-08-08bRagexe, 2018-08-08bRagexeRE, 2018-08-22cRagexe, 2018-08-22cRagexeRE, 2018-08-29aRagexe, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-08-31aRagexe, 2018-09-12dRagexe, 2018-09-12dRagexeRE, 2018-09-19aRagexe, 2018-09-19aRagexeRE, 2018-10-02aRagexe, 2018-10-02aRagexeRE, 2018-10-02bRagexe, 2018-10-02bRagexeRE, 2018-10-17_02aRagexe, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexe, 2018-10-17_03aRagexeRE, 2018-10-17bRagexe, 2018-10-17bRagexeRE, 2018-10-24bRagexe, 2018-10-31aRagexe, 2018-10-31bRagexe, 2018-10-31cRagexeRE, 2018-11-07aRagexe, 2018-11-07aRagexeRE, 2018-11-14cRagexe, 2018-11-14cRagexeRE, 2018-11-14dRagexe, 2018-11-14dRagexeRE, 2018-11-21bRagexe, 2018-11-21cRagexeRE, 2018-11-28aRagexe, 2018-11-28aRagexeRE, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-05bRagexeRE, 2018-12-12aRagexe, 2018-12-12aRagexeRE, 2018-12-12bRagexe, 2018-12-12bRagexeRE, 2018-12-19bRagexe, 2018-12-19bRagexeRE, 2018-12-26aRagexe, 2018-12-26aRagexeRE, 2019-01-09aRagexe, 2019-01-09bRagexeRE, 2019-01-16bRagexe, 2019-01-16bRagexeRE, 2019-01-16cRagexe, 2019-01-16cRagexeRE, 2019-01-23dRagexe, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-20aRagexeRE, 2019-02-27aRagexe, 2019-02-27bRagexeRE, 2019-02-28aRagexe, 2019-02-28aRagexeRE, 2019-03-06bRagexe, 2019-03-06bRagexeRE, 2019-03-06cRagexe, 2019-03-06cRagexeRE, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-20aRagexeRE, 2019-03-22aRagexe, 2019-03-22aRagexeRE, 2019-03-27bRagexe, 2019-03-27bRagexeRE, 2019-04-03aRagexe, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17aRagexe, 2019-04-17cRagexeRE, 2019-04-18aRagexe, 2019-04-18aRagexeRE, 2019-05-08cRagexe, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexe, 2019-05-22bRagexeRE, 2019-05-22cRagexe, 2019-05-22cRagexeRE, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29bRagexeRE, 2019-05-29cRagexe, 2019-05-29cRagexeRE, 2019-05-30aRagexe, 2019-05-30aRagexeRE, 2019-06-05JRagexeRE, 2019-06-05KRagexe, 2019-06-05LRagexeRE, 2019-06-05fRagexe, 2019-06-05hRagexeRE, 2019-06-19bRagexe, 2019-06-19cRagexeRE, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-06-26bRagexeRE, 2019-07-03aRagexe, 2019-07-03bRagexeRE, 2019-07-17aRagexe, 2019-07-17cRagexeRE, 2019-07-17dRagexe, 2019-07-17dRagexeRE, 2019-07-24aRagexe, 2019-07-24bRagexeRE, 2019-07-31bRagexe, 2019-07-31bRagexeRE, 2019-08-02aRagexe, 2019-08-02aRagexeRE, 2019-08-07aRagexe, 2019-08-07dRagexeRE, 2019-08-21aRagexe, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexe, 2019-08-28aRagexeRE, 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-04bRagexeRE, 2019-09-18bRagexe, 2019-09-18cRagexeRE #if PACKETVER == 20101123 || \ PACKETVER == 20101124 || \ PACKETVER == 20101125 || \ @@ -162,7 +162,10 @@ PACKETVER == 20190731 || \ PACKETVER == 20190802 || \ PACKETVER == 20190807 || \ - PACKETVER >= 20190821 + PACKETVER == 20190821 || \ + PACKETVER == 20190828 || \ + PACKETVER == 20190904 || \ + PACKETVER >= 20190918 packetKeys(0x00000000,0x00000000,0x00000000); #endif diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h index 0e70ef641..2708d11e1 100644 --- a/src/map/packets_keys_zero.h +++ b/src/map/packets_keys_zero.h @@ -30,7 +30,7 @@ /* This file is autogenerated, please do not commit manual changes */ -// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero +// 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero, 2018-06-05bRagexe_zero, 2018-06-05cRagexe_zero, 2018-06-27aRagexe_zero, 2018-07-03aRagexe_zero, 2018-07-11_2aRagexe_zero, 2018-07-25_2aRagexe_zero, 2018-08-01aRagexe_zero, 2018-08-08_2aRagexe_zero, 2018-08-22aRagexe_zero, 2018-08-29aRagexe_zero, 2018-09-05aRagexe_zero, 2018-09-12aRagexe_zero, 2018-09-19aRagexe_zero, 2018-09-28aRagexe_zero, 2018-10-10_2aRagexe_zero, 2018-10-24_2aRagexe_zero, 2018-11-14aRagexe_zero, 2018-11-20aRagexe_zero, 2018-11-28aRagexe_zero, 2018-12-12aRagexe_zero, 2018-12-19aRagexe_zero, 2018-12-26_2aRagexe_zero, 2019-01-16_2aRagexe_zero, 2019-01-17_1aRagexe_zero, 2019-01-30_2aRagexe_zero, 2019-02-13aRagexe_zero, 2019-02-20aRagexe_zero, 2019-02-27aRagexe_zero, 2019-03-13aRagexe_zero, 2019-03-27_2aRagexe_zero, 2019-03-27_3aRagexe_zero, 2019-04-03aRagexe_zero, 2019-04-10bRagexe_zero, 2019-04-24aRagexe_zero, 2019-05-02aRagexe_zero, 2019-05-08_2aRagexe_zero, 2019-05-08aRagexe_zero, 2019-05-15aRagexe_zero, 2019-05-29aRagexe_zero, 2019-05-30aRagexe_zero, 2019-06-05_2aRagexe_zero, 2019-06-26_2aRagexe_zero, 2019-06-26_3aRagexe_zero, 2019-07-09aRagexe_zero, 2019-07-10_3aRagexe_zero, 2019-07-17aRagexe_zero, 2019-07-24aRagexe_zero, 2019-08-14_3aRagexe_zero, 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero #if PACKETVER == 20171018 || \ PACKETVER == 20171019 || \ PACKETVER == 20171023 || \ @@ -91,7 +91,10 @@ PACKETVER == 20190710 || \ PACKETVER == 20190717 || \ PACKETVER == 20190724 || \ - PACKETVER >= 20190814 + PACKETVER == 20190814 || \ + PACKETVER == 20190828 || \ + PACKETVER == 20190911 || \ + PACKETVER >= 20190918 packetKeys(0x00000000,0x00000000,0x00000000); #endif diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h index 082c940c9..e3e798dd1 100644 --- a/src/map/packets_shuffle_main.h +++ b/src/map/packets_shuffle_main.h @@ -9727,7 +9727,7 @@ packet(0x0967,clif->pSolveCharName,2); // CZ_REQNAME_BYGID // 6 #endif -// 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe, 2019-07-31bRagexe, 2019-08-02aRagexe, 2019-08-07aRagexe, 2019-08-21aRagexe +// 2018-11-21bRagexe, 2018-11-28aRagexe, 2018-11-28bRagexe, 2018-11-28cRagexe, 2018-12-05aRagexe, 2018-12-12aRagexe, 2018-12-12bRagexe, 2018-12-19bRagexe, 2018-12-26aRagexe, 2019-01-09aRagexe, 2019-01-16bRagexe, 2019-01-16cRagexe, 2019-01-23dRagexe, 2019-02-13bRagexe, 2019-02-13eRagexe, 2019-02-27aRagexe, 2019-02-28aRagexe, 2019-03-06bRagexe, 2019-03-06cRagexe, 2019-03-13aRagexe, 2019-03-20aRagexe, 2019-03-22aRagexe, 2019-03-27bRagexe, 2019-04-03aRagexe, 2019-04-17aRagexe, 2019-04-18aRagexe, 2019-05-08cRagexe, 2019-05-22bRagexe, 2019-05-22cRagexe, 2019-05-23aRagexe, 2019-05-29aRagexe, 2019-05-29cRagexe, 2019-05-30aRagexe, 2019-06-05fRagexe, 2019-06-05KRagexe, 2019-06-19bRagexe, 2019-06-19eRagexe, 2019-06-19hRagexe, 2019-07-03aRagexe, 2019-07-17aRagexe, 2019-07-17dRagexe, 2019-07-24aRagexe, 2019-07-31bRagexe, 2019-08-02aRagexe, 2019-08-07aRagexe, 2019-08-21aRagexe, 2019-08-28aRagexe #if PACKETVER == 20181121 || \ PACKETVER == 20181128 || \ PACKETVER == 20181205 || \ @@ -9761,7 +9761,8 @@ PACKETVER == 20190731 || \ PACKETVER == 20190802 || \ PACKETVER == 20190807 || \ - PACKETVER >= 20190821 + PACKETVER == 20190821 || \ + PACKETVER >= 20190828 packet(0x0202,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS // 26 packet(0x022d,clif->pHomMenu,2,4); // CZ_COMMAND_MER // 5 packet(0x023b,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD // 36 @@ -9793,5 +9794,39 @@ packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 #endif +// 2019-09-04aRagexe, 2019-09-04bRagexe, 2019-09-18bRagexe +#if PACKETVER == 20190904 || \ + PACKETVER == 20190918 + packet(0x0202,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS // 26 + packet(0x022d,clif->pHomMenu,2,4); // CZ_COMMAND_MER // 5 + packet(0x023b,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD // 36 + packet(0x0281,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK // 4 + packet(0x02c4,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ // 26 + packet(0x035f,clif->pWalkToXY,2); // CZ_REQUEST_MOVE // 5 + packet(0x0360,clif->pTickSend,2); // CZ_REQUEST_TIME // 6 + packet(0x0361,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION // 5 + packet(0x0362,clif->pTakeItem,2); // CZ_ITEM_PICKUP // 6 + packet(0x0363,clif->pDropItem,2,4); // CZ_ITEM_THROW // 6 + packet(0x0364,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8 + packet(0x0365,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8 + packet(0x0366,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND // 10 + packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31 + packet(0x0368,clif->pGetCharNameRequest,2); // CZ_REQNAME // 6 + packet(0x0369,clif->pSolveCharName,2); // CZ_REQNAME_BYGID // 6 + packet(0x0436,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER // 19 + packet(0x0437,clif->pActionRequest,2,6); // CZ_REQUEST_ACT // 7 + packet(0x0438,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL // 10 + packet(0x07e4,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES // -1 + packet(0x07ec,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD // 8 + packet(0x0802,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER // 18 + packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE // -1 + packet(0x0815,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE // 2 + packet(0x0817,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE // 6 + packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE // -1 + packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO // -1 + packet(0x0838,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2 + packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 +#endif + #endif /* MAP_PACKETS_SHUFFLE_MAIN_H */ diff --git a/src/map/packets_shuffle_re.h b/src/map/packets_shuffle_re.h index 044788301..f2a1b96ad 100644 --- a/src/map/packets_shuffle_re.h +++ b/src/map/packets_shuffle_re.h @@ -9663,7 +9663,7 @@ packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 12 #endif -// 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE, 2019-07-31bRagexeRE, 2019-08-02aRagexeRE, 2019-08-07dRagexeRE, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE +// 2018-07-04aRagexeRE, 2018-07-11aRagexeRE, 2018-07-18bRagexeRE, 2018-07-18bRagexeRE1, 2018-07-18cRagexeRE, 2018-08-01cRagexeRE, 2018-08-08bRagexeRE, 2018-08-22cRagexeRE, 2018-08-29aRagexeRE, 2018-08-29bRagexeRE, 2018-09-12dRagexeRE, 2018-09-19aRagexeRE, 2018-10-02aRagexeRE, 2018-10-02bRagexeRE, 2018-10-17_02aRagexeRE, 2018-10-17_03aRagexeRE, 2018-10-17bRagexeRE, 2018-10-31cRagexeRE, 2018-11-07aRagexeRE, 2018-11-14cRagexeRE, 2018-11-14dRagexeRE, 2018-11-21cRagexeRE, 2018-11-28aRagexeRE, 2018-12-05bRagexeRE, 2018-12-12aRagexeRE, 2018-12-12bRagexeRE, 2018-12-19bRagexeRE, 2018-12-26aRagexeRE, 2019-01-09bRagexeRE, 2019-01-16bRagexeRE, 2019-01-16cRagexeRE, 2019-01-23dRagexeRE, 2019-02-13IRagexeRE, 2019-02-20aRagexeRE, 2019-02-27bRagexeRE, 2019-02-28aRagexeRE, 2019-03-06bRagexeRE, 2019-03-06cRagexeRE, 2019-03-20aRagexeRE, 2019-03-22aRagexeRE, 2019-03-27bRagexeRE, 2019-04-03bRagexeRE, 2019-04-03cRagexeRE, 2019-04-17cRagexeRE, 2019-04-18aRagexeRE, 2019-05-08dRagexeRE, 2019-05-08eRagexeRE, 2019-05-22bRagexeRE, 2019-05-22cRagexeRE, 2019-05-29bRagexeRE, 2019-05-29cRagexeRE, 2019-05-30aRagexeRE, 2019-06-05hRagexeRE, 2019-06-05JRagexeRE, 2019-06-05LRagexeRE, 2019-06-19cRagexeRE, 2019-06-26bRagexeRE, 2019-07-03bRagexeRE, 2019-07-17cRagexeRE, 2019-07-17dRagexeRE, 2019-07-24bRagexeRE, 2019-07-31bRagexeRE, 2019-08-02aRagexeRE, 2019-08-07dRagexeRE, 2019-08-21cRagexeRE, 2019-08-21dRagexeRE, 2019-08-28aRagexeRE #if PACKETVER == 20180704 || \ PACKETVER == 20180711 || \ PACKETVER == 20180718 || \ @@ -9711,7 +9711,8 @@ PACKETVER == 20190731 || \ PACKETVER == 20190802 || \ PACKETVER == 20190807 || \ - PACKETVER >= 20190821 + PACKETVER == 20190821 || \ + PACKETVER >= 20190828 packet(0x0202,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS // 26 packet(0x022d,clif->pHomMenu,2,4); // CZ_COMMAND_MER // 5 packet(0x023b,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD // 36 @@ -9743,5 +9744,39 @@ packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 #endif +// 2019-09-04bRagexeRE, 2019-09-18cRagexeRE +#if PACKETVER == 20190904 || \ + PACKETVER == 20190918 + packet(0x0202,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS // 26 + packet(0x022d,clif->pHomMenu,2,4); // CZ_COMMAND_MER // 5 + packet(0x023b,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD // 36 + packet(0x0281,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK // 4 + packet(0x02c4,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ // 26 + packet(0x035f,clif->pWalkToXY,2); // CZ_REQUEST_MOVE // 5 + packet(0x0360,clif->pTickSend,2); // CZ_REQUEST_TIME // 6 + packet(0x0361,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION // 5 + packet(0x0362,clif->pTakeItem,2); // CZ_ITEM_PICKUP // 6 + packet(0x0363,clif->pDropItem,2,4); // CZ_ITEM_THROW // 6 + packet(0x0364,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8 + packet(0x0365,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8 + packet(0x0366,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND // 10 + packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31 + packet(0x0368,clif->pGetCharNameRequest,2); // CZ_REQNAME // 6 + packet(0x0369,clif->pSolveCharName,2); // CZ_REQNAME_BYGID // 6 + packet(0x0436,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER // 19 + packet(0x0437,clif->pActionRequest,2,6); // CZ_REQUEST_ACT // 7 + packet(0x0438,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL // 10 + packet(0x07e4,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES // -1 + packet(0x07ec,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD // 8 + packet(0x0802,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER // 18 + packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE // -1 + packet(0x0815,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE // 2 + packet(0x0817,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE // 6 + packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE // -1 + packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO // -1 + packet(0x0838,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2 + packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 +#endif + #endif /* MAP_PACKETS_SHUFFLE_RE_H */ diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h index 109dadaba..4d6da7a8a 100644 --- a/src/map/packets_shuffle_zero.h +++ b/src/map/packets_shuffle_zero.h @@ -803,5 +803,40 @@ packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 #endif +// 2019-08-28_2aRagexe_zero, 2019-08-28_3aRagexe_zero, 2019-09-11aRagexe_zero, 2019-09-18_2aRagexe_zero, 2019-09-18aRagexe_zero +#if PACKETVER == 20190828 || \ + PACKETVER == 20190911 || \ + PACKETVER == 20190918 + packet(0x0202,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS // 26 + packet(0x022d,clif->pHomMenu,2,4); // CZ_COMMAND_MER // 5 + packet(0x023b,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD // 36 + packet(0x0281,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK // 4 + packet(0x02c4,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ // 26 + packet(0x035f,clif->pWalkToXY,2); // CZ_REQUEST_MOVE // 5 + packet(0x0360,clif->pTickSend,2); // CZ_REQUEST_TIME // 6 + packet(0x0361,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION // 5 + packet(0x0362,clif->pTakeItem,2); // CZ_ITEM_PICKUP // 6 + packet(0x0363,clif->pDropItem,2,4); // CZ_ITEM_THROW // 6 + packet(0x0364,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE // 8 + packet(0x0365,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY // 8 + packet(0x0366,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND // 10 + packet(0x0367,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX // 31 + packet(0x0368,clif->pGetCharNameRequest,2); // CZ_REQNAME // 6 + packet(0x0369,clif->pSolveCharName,2); // CZ_REQNAME_BYGID // 6 + packet(0x0436,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER // 19 + packet(0x0437,clif->pActionRequest,2,6); // CZ_REQUEST_ACT // 7 + packet(0x0438,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL // 10 + packet(0x07e4,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES // -1 + packet(0x07ec,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD // 8 + packet(0x0802,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER // 18 + packet(0x0811,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE // -1 + packet(0x0815,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE // 2 + packet(0x0817,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE // 6 + packet(0x0819,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE // -1 + packet(0x0835,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO // -1 + packet(0x0838,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE // 2 + packet(0x083c,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK // 14 +#endif + #endif /* MAP_PACKETS_SHUFFLE_ZERO_H */ diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index d12dc14d4..93b4abcca 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3460,6 +3460,14 @@ struct PACKET_ZC_REFINE_STATUS { DEFINE_PACKET_HEADER(ZC_REFINE_STATUS, 0x0ada); #endif +struct PACKET_ZC_ACK_RANKING_name { + char name[NAME_LENGTH]; +} __attribute__((packed)); + +struct PACKET_ZC_ACK_RANKING_points { + uint32 points; +} __attribute__((packed)); + #if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724 struct PACKET_ZC_ACK_RANKING_sub { char name[NAME_LENGTH]; @@ -3476,21 +3484,22 @@ struct PACKET_ZC_ACK_RANKING { DEFINE_PACKET_HEADER(ZC_ACK_RANKING, 0x0af6); #elif PACKETVER_MAIN_NUM >= 20130605 || PACKETVER_RE_NUM >= 20130529 || defined(PACKETVER_ZERO) struct PACKET_ZC_ACK_RANKING_sub { - char name[NAME_LENGTH]; - uint32 points; + struct PACKET_ZC_ACK_RANKING_name names[10]; + struct PACKET_ZC_ACK_RANKING_points points[10]; } __attribute__((packed)); struct PACKET_ZC_ACK_RANKING { int16 packetType; int16 rankType; - struct PACKET_ZC_ACK_RANKING_sub ranks[10]; + struct PACKET_ZC_ACK_RANKING_sub ranks; uint32 myPoints; } __attribute__((packed)); + DEFINE_PACKET_HEADER(ZC_ACK_RANKING, 0x097d); #else struct PACKET_ZC_ACK_RANKING_sub { - char name[NAME_LENGTH]; - uint32 points; + struct PACKET_ZC_ACK_RANKING_name names[10]; + struct PACKET_ZC_ACK_RANKING_points points[10]; } __attribute__((packed)); #endif @@ -3514,7 +3523,7 @@ DEFINE_PACKET_HEADER(ZC_HAT_EFFECT, 0x0a3b); #endif // [4144] this struct updated not in all packets in client -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 struct SKILLDATA { uint16 id; int inf; @@ -3540,7 +3549,7 @@ struct PACKET_ZC_ADD_SKILL { int16 packetType; struct SKILLDATA skill; } __attribute__((packed)); -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0b31); #else DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0111); @@ -3551,13 +3560,13 @@ struct PACKET_ZC_SKILLINFO_LIST { int16 packetLength; struct SKILLDATA skills[]; } __attribute__((packed)); -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x0b32); #else DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x010f); #endif -#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190814 +#if PACKETVER_RE_NUM >= 20190807 struct PACKET_ZC_SKILLINFO_UPDATE2 { int16 packetType; uint16 id; @@ -3610,6 +3619,13 @@ struct PACKET_ZC_NPC_MARKET_PURCHASE_RESULT { DEFINE_PACKET_HEADER(ZC_NPC_MARKET_PURCHASE_RESULT, 0x09d7); #endif +struct PACKET_ZC_TALKBOX_CHATCONTENTS { + int16 PacketType; + uint32 aid; + char message[TALKBOX_MESSAGE_SIZE]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_TALKBOX_CHATCONTENTS, 0x0191); + #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) #endif // not NetBSD < 6 / Solaris diff --git a/src/map/status.c b/src/map/status.c index 83434996e..90dfe2bfd 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -13397,25 +13397,104 @@ static bool status_readdb_sizefix(char *fields[], int columns, int current) return true; } -static bool status_readdb_scconfig(char *fields[], int columns, int current) +static bool status_read_scdb_libconfig(void) { - int val = 0; - char* type = fields[0]; + struct config_t status_conf; + char filepath[256]; + safesnprintf(filepath, sizeof(filepath), "%s/%s", map->db_path, "sc_config.conf"); - nullpo_retr(false, fields); - if( !script->get_constant(type, &val) ){ - ShowWarning("status_readdb_sc_conf: Invalid status type %s specified.\n", type); + if (libconfig->load_file(&status_conf, filepath) == CONFIG_FALSE) { + ShowError("status_read_scdb_libconfig: can't read %s\n", filepath); return false; } - status->dbs->sc_conf[val] = (int)strtol(fields[1], NULL, 0); - if (status->dbs->sc_conf[val] & SC_VISIBLE) - { - status->dbs->DisplayType[val] = true; + int i = 0; + int count = 0; + struct config_setting_t *it = NULL; + + while ((it = libconfig->setting_get_elem(status_conf.root, i++)) != NULL) { + if (status->read_scdb_libconfig_sub(it, i - 1, filepath)) + ++count; + } + + libconfig->destroy(&status_conf); + ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", count, filepath); + return true; +} + +static bool status_read_scdb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) +{ + nullpo_retr(false, it); + nullpo_retr(false, source); + + int i32; + const char *name = config_setting_name(it); + + if (!script->get_constant(name, &i32) || i32 <= SC_NONE || i32 >= SC_MAX) { + ShowWarning("status_read_scdb_libconfig_sub: Invalid status type (%s) in \"%s\" entry #%d, skipping.\n", name, source, idx); + return false; } + libconfig->setting_lookup_bool_real(it, "Visible", &status->dbs->DisplayType[i32]); + + struct config_setting_t *fg = libconfig->setting_get_member(it, "Flags"); + if (fg != NULL) + status->read_scdb_libconfig_sub_flag(fg, i32, source); + return true; } + +static bool status_read_scdb_libconfig_sub_flag(struct config_setting_t *it, int type, const char *source) +{ + nullpo_retr(false, it); + nullpo_retr(false, source); + Assert_retr(false, type > SC_NONE && type < SC_MAX); + + int i = 0; + struct config_setting_t *t = NULL; + while ((t = libconfig->setting_get_elem(it, i++)) != NULL) { + const char *flag = config_setting_name(t); + bool on = libconfig->setting_get_bool_real(t); + int j; + + struct { + const char *name; + enum sc_conf_type value; + } flags[] = { + { "NoDeathReset", SC_NO_REM_DEATH }, + { "NoSave", SC_NO_SAVE }, + { "NoDispelReset", SC_NO_DISPELL }, + { "NoClearanceReset", SC_NO_CLEARANCE }, + { "Buff", SC_BUFF }, + { "Debuff", SC_DEBUFF }, + { "NoMadoReset", SC_MADO_NO_RESET }, + { "NoAllReset", SC_NO_CLEAR } + }; + + ARR_FIND(0, ARRAYLENGTH(flags), j, strcmpi(flag, flags[j].name) == 0); + if (j != ARRAYLENGTH(flags)) { + if (strcmp(flag, flags[j].name) != 0) { + ShowWarning("status_read_scdb_libconfig_sub_flag: flag (%s) for status effect (%d) is casesensitive, correct it to (%s).", flag, type, flags[i].name); + } + if (on) { + status->dbs->sc_conf[type] |= flags[j].value; + } else { + status->dbs->sc_conf[type] &= ~flags[j].value; + } + } else { + if (!status->read_scdb_libconfig_sub_flag_additional(it, type, source)) + ShowWarning("status_read_scdb_libconfig_sub_flag: invalid flag (%s) for status effect (%d).", flag, type); + } + } + return true; +} + +static bool status_read_scdb_libconfig_sub_flag_additional(struct config_setting_t *it, int type, const char *source) +{ + // to be used by plugins + return false; +} + /** * Read status db * job1.txt @@ -13454,7 +13533,7 @@ static int status_readdb(void) // sv->readdb(map->db_path, "job_db2.txt", ',', 1, 1+MAX_LEVEL, -1, status->readdb_job2); sv->readdb(map->db_path, DBPATH"size_fix.txt", ',', MAX_SINGLE_WEAPON_TYPE, MAX_SINGLE_WEAPON_TYPE, ARRAYLENGTH(status->dbs->atkmods), status->readdb_sizefix); - sv->readdb(map->db_path, "sc_config.txt", ',', 2, 2, SC_MAX, status->readdb_scconfig); + status->read_scdb_libconfig(); status->read_job_db(); pc->validate_levels(); @@ -13644,7 +13723,10 @@ void status_defaults(void) status->natural_heal_timer = status_natural_heal_timer; status->readdb_job2 = status_readdb_job2; status->readdb_sizefix = status_readdb_sizefix; - status->readdb_scconfig = status_readdb_scconfig; + status->read_scdb_libconfig = status_read_scdb_libconfig; + status->read_scdb_libconfig_sub = status_read_scdb_libconfig_sub; + status->read_scdb_libconfig_sub_flag = status_read_scdb_libconfig_sub_flag; + status->read_scdb_libconfig_sub_flag_additional = status_read_scdb_libconfig_sub_flag_additional; status->read_job_db = status_read_job_db; status->read_job_db_sub = status_read_job_db_sub; status->set_sc = status_set_sc; diff --git a/src/map/status.h b/src/map/status.h index dc7629dea..536003d04 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -50,7 +50,7 @@ struct pet_data; /** * SC configuration type - * @see db/sc_config.txt for more information + * @see db/sc_config.conf for more information **/ typedef enum sc_conf_type { SC_NO_REM_DEATH = 0x001, @@ -2387,7 +2387,10 @@ struct status_interface { int (*natural_heal_timer) (int tid, int64 tick, int id, intptr_t data); bool (*readdb_job2) (char *fields[], int columns, int current); bool (*readdb_sizefix) (char *fields[], int columns, int current); - bool (*readdb_scconfig) (char *fields[], int columns, int current); + bool (*read_scdb_libconfig) (void); + bool (*read_scdb_libconfig_sub) (struct config_setting_t *it, int idx, const char *source); + bool (*read_scdb_libconfig_sub_flag) (struct config_setting_t *it, int type, const char *source); + bool (*read_scdb_libconfig_sub_flag_additional) (struct config_setting_t *it, int type, const char *source); void (*read_job_db) (void); void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb); void (*set_sc) (uint16 skill_id, sc_type sc, int icon, unsigned int flag); diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index b218988b6..63826753d 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -1276,8 +1276,8 @@ typedef void (*HPMHOOK_pre_clif_scriptclear) (struct map_session_data **sd, int typedef void (*HPMHOOK_post_clif_scriptclear) (struct map_session_data *sd, int npcid); typedef void (*HPMHOOK_pre_clif_viewpoint) (struct map_session_data **sd, int *npc_id, int *type, int *x, int *y, int *id, int *color); typedef void (*HPMHOOK_post_clif_viewpoint) (struct map_session_data *sd, int npc_id, int type, int x, int y, int id, int color); -typedef int (*HPMHOOK_pre_clif_damage) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); -typedef int (*HPMHOOK_post_clif_damage) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); +typedef int (*HPMHOOK_pre_clif_damage) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, enum battle_dmg_type *type, int64 *damage2); +typedef int (*HPMHOOK_post_clif_damage) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2); typedef void (*HPMHOOK_pre_clif_sitting) (struct block_list **bl); typedef void (*HPMHOOK_post_clif_sitting) (struct block_list *bl); typedef void (*HPMHOOK_pre_clif_standing) (struct block_list **bl); @@ -1524,8 +1524,8 @@ typedef void (*HPMHOOK_pre_clif_divorced) (struct map_session_data **sd, const c typedef void (*HPMHOOK_post_clif_divorced) (struct map_session_data *sd, const char *name); typedef void (*HPMHOOK_pre_clif_callpartner) (struct map_session_data **sd); typedef void (*HPMHOOK_post_clif_callpartner) (struct map_session_data *sd); -typedef int (*HPMHOOK_pre_clif_skill_damage) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); -typedef int (*HPMHOOK_post_clif_skill_damage) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type); +typedef int (*HPMHOOK_pre_clif_skill_damage) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, enum battle_dmg_type *type); +typedef int (*HPMHOOK_post_clif_skill_damage) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type); typedef int (*HPMHOOK_pre_clif_skill_nodamage) (struct block_list **src, struct block_list **dst, uint16 *skill_id, int *heal, int *fail); typedef int (*HPMHOOK_post_clif_skill_nodamage) (int retVal___, struct block_list *src, struct block_list *dst, uint16 skill_id, int heal, int fail); typedef void (*HPMHOOK_pre_clif_skill_poseffect) (struct block_list **src, uint16 *skill_id, int *val, int *x, int *y, int64 *tick); @@ -2046,8 +2046,8 @@ typedef void (*HPMHOOK_pre_clif_show_modifiers) (struct map_session_data **sd); typedef void (*HPMHOOK_post_clif_show_modifiers) (struct map_session_data *sd); typedef void (*HPMHOOK_pre_clif_notify_bounditem) (struct map_session_data **sd, unsigned short *index); typedef void (*HPMHOOK_post_clif_notify_bounditem) (struct map_session_data *sd, unsigned short index); -typedef int (*HPMHOOK_pre_clif_delay_damage) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); -typedef int (*HPMHOOK_post_clif_delay_damage) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type); +typedef int (*HPMHOOK_pre_clif_delay_damage) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, enum battle_dmg_type *type); +typedef int (*HPMHOOK_post_clif_delay_damage) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type); typedef int (*HPMHOOK_pre_clif_delay_damage_sub) (int *tid, int64 *tick, int *id, intptr_t *data); typedef int (*HPMHOOK_post_clif_delay_damage_sub) (int retVal___, int tid, int64 tick, int id, intptr_t data); typedef void (*HPMHOOK_pre_clif_npc_market_open) (struct map_session_data **sd, struct npc_data **nd); @@ -3158,6 +3158,8 @@ typedef bool (*HPMHOOK_pre_homun_mutate) (struct homun_data **hd, int *homun_id) typedef bool (*HPMHOOK_post_homun_mutate) (bool retVal___, struct homun_data *hd, int homun_id); typedef int (*HPMHOOK_pre_homun_gainexp) (struct homun_data **hd, unsigned int *exp); typedef int (*HPMHOOK_post_homun_gainexp) (int retVal___, struct homun_data *hd, unsigned int exp); +typedef int (*HPMHOOK_pre_homun_gainexp_real) (struct homun_data **hd, unsigned int *exp); +typedef int (*HPMHOOK_post_homun_gainexp_real) (int retVal___, struct homun_data *hd, unsigned int exp); typedef unsigned int (*HPMHOOK_pre_homun_add_intimacy) (struct homun_data **hd, unsigned int *value); typedef unsigned int (*HPMHOOK_post_homun_add_intimacy) (unsigned int retVal___, struct homun_data *hd, unsigned int value); typedef unsigned int (*HPMHOOK_pre_homun_consume_intimacy) (struct homun_data **hd, unsigned int *value); @@ -7934,8 +7936,14 @@ typedef bool (*HPMHOOK_pre_status_readdb_job2) (char **fields[], int *columns, i typedef bool (*HPMHOOK_post_status_readdb_job2) (bool retVal___, char *fields[], int columns, int current); typedef bool (*HPMHOOK_pre_status_readdb_sizefix) (char **fields[], int *columns, int *current); typedef bool (*HPMHOOK_post_status_readdb_sizefix) (bool retVal___, char *fields[], int columns, int current); -typedef bool (*HPMHOOK_pre_status_readdb_scconfig) (char **fields[], int *columns, int *current); -typedef bool (*HPMHOOK_post_status_readdb_scconfig) (bool retVal___, char *fields[], int columns, int current); +typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig) (void); +typedef bool (*HPMHOOK_post_status_read_scdb_libconfig) (bool retVal___); +typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source); +typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source); +typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag) (struct config_setting_t **it, int *type, const char **source); +typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag) (bool retVal___, struct config_setting_t *it, int type, const char *source); +typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag_additional) (struct config_setting_t **it, int *type, const char **source); +typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag_additional) (bool retVal___, struct config_setting_t *it, int type, const char *source); typedef void (*HPMHOOK_pre_status_read_job_db) (void); typedef void (*HPMHOOK_post_status_read_job_db) (void); typedef void (*HPMHOOK_pre_status_read_job_db_sub) (int *idx, const char **name, struct config_setting_t **jdb); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 2faafacc5..adfac1a93 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -2718,6 +2718,8 @@ struct { struct HPMHookPoint *HP_homun_mutate_post; struct HPMHookPoint *HP_homun_gainexp_pre; struct HPMHookPoint *HP_homun_gainexp_post; + struct HPMHookPoint *HP_homun_gainexp_real_pre; + struct HPMHookPoint *HP_homun_gainexp_real_post; struct HPMHookPoint *HP_homun_add_intimacy_pre; struct HPMHookPoint *HP_homun_add_intimacy_post; struct HPMHookPoint *HP_homun_consume_intimacy_pre; @@ -6456,8 +6458,14 @@ struct { struct HPMHookPoint *HP_status_readdb_job2_post; struct HPMHookPoint *HP_status_readdb_sizefix_pre; struct HPMHookPoint *HP_status_readdb_sizefix_post; - struct HPMHookPoint *HP_status_readdb_scconfig_pre; - struct HPMHookPoint *HP_status_readdb_scconfig_post; + struct HPMHookPoint *HP_status_read_scdb_libconfig_pre; + struct HPMHookPoint *HP_status_read_scdb_libconfig_post; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_pre; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_post; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_pre; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_post; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_pre; + struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_post; struct HPMHookPoint *HP_status_read_job_db_pre; struct HPMHookPoint *HP_status_read_job_db_post; struct HPMHookPoint *HP_status_read_job_db_sub_pre; @@ -9489,6 +9497,8 @@ struct { int HP_homun_mutate_post; int HP_homun_gainexp_pre; int HP_homun_gainexp_post; + int HP_homun_gainexp_real_pre; + int HP_homun_gainexp_real_post; int HP_homun_add_intimacy_pre; int HP_homun_add_intimacy_post; int HP_homun_consume_intimacy_pre; @@ -13227,8 +13237,14 @@ struct { int HP_status_readdb_job2_post; int HP_status_readdb_sizefix_pre; int HP_status_readdb_sizefix_post; - int HP_status_readdb_scconfig_pre; - int HP_status_readdb_scconfig_post; + int HP_status_read_scdb_libconfig_pre; + int HP_status_read_scdb_libconfig_post; + int HP_status_read_scdb_libconfig_sub_pre; + int HP_status_read_scdb_libconfig_sub_post; + int HP_status_read_scdb_libconfig_sub_flag_pre; + int HP_status_read_scdb_libconfig_sub_flag_post; + int HP_status_read_scdb_libconfig_sub_flag_additional_pre; + int HP_status_read_scdb_libconfig_sub_flag_additional_post; int HP_status_read_job_db_pre; int HP_status_read_job_db_post; int HP_status_read_job_db_sub_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index cfc6984dc..2c7eabeff 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -1394,6 +1394,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(homun->evolve, HP_homun_evolve) }, { HP_POP(homun->mutate, HP_homun_mutate) }, { HP_POP(homun->gainexp, HP_homun_gainexp) }, + { HP_POP(homun->gainexp_real, HP_homun_gainexp_real) }, { HP_POP(homun->add_intimacy, HP_homun_add_intimacy) }, { HP_POP(homun->consume_intimacy, HP_homun_consume_intimacy) }, { HP_POP(homun->healed, HP_homun_healed) }, @@ -3300,7 +3301,10 @@ struct HookingPointData HookingPoints[] = { { HP_POP(status->natural_heal_timer, HP_status_natural_heal_timer) }, { HP_POP(status->readdb_job2, HP_status_readdb_job2) }, { HP_POP(status->readdb_sizefix, HP_status_readdb_sizefix) }, - { HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) }, + { HP_POP(status->read_scdb_libconfig, HP_status_read_scdb_libconfig) }, + { HP_POP(status->read_scdb_libconfig_sub, HP_status_read_scdb_libconfig_sub) }, + { HP_POP(status->read_scdb_libconfig_sub_flag, HP_status_read_scdb_libconfig_sub_flag) }, + { HP_POP(status->read_scdb_libconfig_sub_flag_additional, HP_status_read_scdb_libconfig_sub_flag_additional) }, { HP_POP(status->read_job_db, HP_status_read_job_db) }, { HP_POP(status->read_job_db_sub, HP_status_read_job_db_sub) }, { HP_POP(status->set_sc, HP_status_set_sc) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index f74e08187..003219b47 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -11278,11 +11278,11 @@ void HP_clif_viewpoint(struct map_session_data *sd, int npc_id, int type, int x, } return; } -int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2) { +int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_clif_damage_pre > 0) { - int (*preHookFunc) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, unsigned char *type, int64 *damage2); + int (*preHookFunc) (struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *damage, short *div, enum battle_dmg_type *type, int64 *damage2); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_damage_pre[hIndex].func; @@ -11297,7 +11297,7 @@ int HP_clif_damage(struct block_list *src, struct block_list *dst, int sdelay, i retVal___ = HPMHooks.source.clif.damage(src, dst, sdelay, ddelay, damage, div, type, damage2); } if (HPMHooks.count.HP_clif_damage_post > 0) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, unsigned char type, int64 damage2); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 damage, short div, enum battle_dmg_type type, int64 damage2); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_damage_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_damage_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, dst, sdelay, ddelay, damage, div, type, damage2); @@ -14532,11 +14532,11 @@ void HP_clif_callpartner(struct map_session_data *sd) { } return; } -int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type) { +int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_clif_skill_damage_pre > 0) { - int (*preHookFunc) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, int *type); + int (*preHookFunc) (struct block_list **src, struct block_list **dst, int64 *tick, int *sdelay, int *ddelay, int64 *damage, int *div, uint16 *skill_id, uint16 *skill_lv, enum battle_dmg_type *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_skill_damage_pre[hIndex].func; @@ -14551,7 +14551,7 @@ int HP_clif_skill_damage(struct block_list *src, struct block_list *dst, int64 t retVal___ = HPMHooks.source.clif.skill_damage(src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type); } if (HPMHooks.count.HP_clif_skill_damage_post > 0) { - int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, int type); + int (*postHookFunc) (int retVal___, struct block_list *src, struct block_list *dst, int64 tick, int sdelay, int ddelay, int64 damage, int div, uint16 skill_id, uint16 skill_lv, enum battle_dmg_type type); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_skill_damage_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_skill_damage_post[hIndex].func; retVal___ = postHookFunc(retVal___, src, dst, tick, sdelay, ddelay, damage, div, skill_id, skill_lv, type); @@ -21332,11 +21332,11 @@ void HP_clif_notify_bounditem(struct map_session_data *sd, unsigned short index) } return; } -int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type) { +int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type) { int hIndex = 0; int retVal___ = 0; if (HPMHooks.count.HP_clif_delay_damage_pre > 0) { - int (*preHookFunc) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, unsigned char *type); + int (*preHookFunc) (int64 *tick, struct block_list **src, struct block_list **dst, int *sdelay, int *ddelay, int64 *in_damage, short *div, enum battle_dmg_type *type); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_clif_delay_damage_pre[hIndex].func; @@ -21351,7 +21351,7 @@ int HP_clif_delay_damage(int64 tick, struct block_list *src, struct block_list * retVal___ = HPMHooks.source.clif.delay_damage(tick, src, dst, sdelay, ddelay, in_damage, div, type); } if (HPMHooks.count.HP_clif_delay_damage_post > 0) { - int (*postHookFunc) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, unsigned char type); + int (*postHookFunc) (int retVal___, int64 tick, struct block_list *src, struct block_list *dst, int sdelay, int ddelay, int64 in_damage, short div, enum battle_dmg_type type); for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_delay_damage_post; hIndex++) { postHookFunc = HPMHooks.list.HP_clif_delay_damage_post[hIndex].func; retVal___ = postHookFunc(retVal___, tick, src, dst, sdelay, ddelay, in_damage, div, type); @@ -35652,6 +35652,33 @@ int HP_homun_gainexp(struct homun_data *hd, unsigned int exp) { } return retVal___; } +int HP_homun_gainexp_real(struct homun_data *hd, unsigned int exp) { + int hIndex = 0; + int retVal___ = 0; + if (HPMHooks.count.HP_homun_gainexp_real_pre > 0) { + int (*preHookFunc) (struct homun_data **hd, unsigned int *exp); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_real_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_homun_gainexp_real_pre[hIndex].func; + retVal___ = preHookFunc(&hd, &exp); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.homun.gainexp_real(hd, exp); + } + if (HPMHooks.count.HP_homun_gainexp_real_post > 0) { + int (*postHookFunc) (int retVal___, struct homun_data *hd, unsigned int exp); + for (hIndex = 0; hIndex < HPMHooks.count.HP_homun_gainexp_real_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_homun_gainexp_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, hd, exp); + } + } + return retVal___; +} unsigned int HP_homun_add_intimacy(struct homun_data *hd, unsigned int value) { int hIndex = 0; unsigned int retVal___ = 0; @@ -86386,15 +86413,15 @@ bool HP_status_readdb_sizefix(char *fields[], int columns, int current) { } return retVal___; } -bool HP_status_readdb_scconfig(char *fields[], int columns, int current) { +bool HP_status_read_scdb_libconfig(void) { int hIndex = 0; bool retVal___ = false; - if (HPMHooks.count.HP_status_readdb_scconfig_pre > 0) { - bool (*preHookFunc) (char **fields[], int *columns, int *current); + if (HPMHooks.count.HP_status_read_scdb_libconfig_pre > 0) { + bool (*preHookFunc) (void); *HPMforce_return = false; - for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_pre; hIndex++) { - preHookFunc = HPMHooks.list.HP_status_readdb_scconfig_pre[hIndex].func; - retVal___ = preHookFunc(&fields, &columns, ¤t); + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_pre[hIndex].func; + retVal___ = preHookFunc(); } if (*HPMforce_return) { *HPMforce_return = false; @@ -86402,13 +86429,94 @@ bool HP_status_readdb_scconfig(char *fields[], int columns, int current) { } } { - retVal___ = HPMHooks.source.status.readdb_scconfig(fields, columns, current); + retVal___ = HPMHooks.source.status.read_scdb_libconfig(); } - if (HPMHooks.count.HP_status_readdb_scconfig_post > 0) { - bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current); - for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_post; hIndex++) { - postHookFunc = HPMHooks.list.HP_status_readdb_scconfig_post[hIndex].func; - retVal___ = postHookFunc(retVal___, fields, columns, current); + if (HPMHooks.count.HP_status_read_scdb_libconfig_post > 0) { + bool (*postHookFunc) (bool retVal___); + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} +bool HP_status_read_scdb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) { + int hIndex = 0; + bool retVal___ = false; + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre > 0) { + bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_pre[hIndex].func; + retVal___ = preHookFunc(&it, &idx, &source); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub(it, idx, source); + } + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_post > 0) { + bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source); + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_post[hIndex].func; + retVal___ = postHookFunc(retVal___, it, idx, source); + } + } + return retVal___; +} +bool HP_status_read_scdb_libconfig_sub_flag(struct config_setting_t *it, int type, const char *source) { + int hIndex = 0; + bool retVal___ = false; + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre > 0) { + bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_pre[hIndex].func; + retVal___ = preHookFunc(&it, &type, &source); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag(it, type, source); + } + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post > 0) { + bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source); + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_post[hIndex].func; + retVal___ = postHookFunc(retVal___, it, type, source); + } + } + return retVal___; +} +bool HP_status_read_scdb_libconfig_sub_flag_additional(struct config_setting_t *it, int type, const char *source) { + int hIndex = 0; + bool retVal___ = false; + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre > 0) { + bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source); + *HPMforce_return = false; + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre; hIndex++) { + preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_pre[hIndex].func; + retVal___ = preHookFunc(&it, &type, &source); + } + if (*HPMforce_return) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag_additional(it, type, source); + } + if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post > 0) { + bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source); + for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post; hIndex++) { + postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_post[hIndex].func; + retVal___ = postHookFunc(retVal___, it, type, source); } } return retVal___; diff --git a/tools/scconfigconverter.py b/tools/scconfigconverter.py new file mode 100644 index 000000000..9216fa3b5 --- /dev/null +++ b/tools/scconfigconverter.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python +# -*- coding: utf8 -*- +# +# This file is part of Hercules. +# http://herc.ws - http://github.com/HerculesWS/Hercules +# +# Copyright (C) 2019 Hercules Dev Team +# Copyright (C) 2019 Asheraf +# +# Hercules is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +import csv + +with open('../db/sc_config.txt') as dbfile: + sc_config = csv.reader(dbfile, delimiter=',') + + print(r'''//================= Hercules Database ===================================== +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2019 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//================= Description =========================================== +// Configurations file for status effects +//========================================================================= +''') + print('''/************************************************************************** + ************* Entry structure ******************************************** + ************************************************************************** +SC_TYPE: { + // ================ Optional fields =============================== + Visible: (bool) SC can be visible for all players + Flags: { + NoDeathReset: (bool) SC cannot be removed by death. + NoSave: (bool) SC cannot be saved. + NoDispelReset: (bool) SC cannot be reset by dispell. + NoClearanceReset: (bool) SC cannot be reset by clearance. + Buff: (bool) SC considered as buff and be removed by Hermode and etc. + Debuff: (bool) SC considered as debuff and be removed by Gospel and etc. + NoMadoReset: (bool) SC cannot be reset when MADO Gear is taken off. + NoAllReset: (bool) SC cannot be reset by 'sc_end SC_ALL' and status change clear. + } +} +**************************************************************************/''') + flags = [ + ('NoDeathReset', 1), + ('NoSave', 2), + ('NoDispelReset', 4), + ('NoClearanceReset', 8), + ('Buff', 16), + ('Debuff', 32), + ('NoMadoReset', 64), + ('NoAllReset', 128) + ] + + for sc in sc_config: + if len(sc) != 2 or sc[0].startswith('//'): + continue + value = int(sc[1]) + print('{}: {{'.format(sc[0])) + if value & 256: + print('\tVisible: true') + value &= ~256; + + print('\tFlags: {') + for flag in flags: + if value & flag[1]: + print('\t\t{}: true'.format(flag[0])) + value &= ~flag[1]; + if value != 0: + print('Error: invalid value ({}) for status ({}), aborting.'.format(int(sc[1]), sc[0])) + exit() + print('\t}') + print('}') |