diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:41:31 -0400 |
| commit | 1ba24673e7064e39406e6faf11d790c2dcc2ac00 (patch) | |
| tree | 7e2645f6fdec1dcc63ae56366371246f62865dcd /src/mmo | |
| parent | c3e06ffe6437d27a2a7c6ddb2dc487ff2f007adf (diff) | |
| parent | c786a93e91adaf68780a5fd7585f51d0528f92ed (diff) | |
| download | tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.gz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.bz2 tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.tar.xz tmwa-1ba24673e7064e39406e6faf11d790c2dcc2ac00.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3
Diffstat (limited to 'src/mmo')
| -rw-r--r-- | src/mmo/clif.t.hpp | 21 | ||||
| -rw-r--r-- | src/mmo/cxxstdio_enums.hpp | 7 | ||||
| -rw-r--r-- | src/mmo/skill.t.hpp | 4 |
3 files changed, 13 insertions, 19 deletions
diff --git a/src/mmo/clif.t.hpp b/src/mmo/clif.t.hpp index 0a51523..c1b222f 100644 --- a/src/mmo/clif.t.hpp +++ b/src/mmo/clif.t.hpp @@ -234,7 +234,8 @@ enum class SP : uint16_t MAXSP = 8, // sent to client STATUSPOINT = 9, - + // sent to client + HEALXP = 10, // sent to client BASELEVEL = 11, // sent to client @@ -307,8 +308,9 @@ enum class SP : uint16_t // sent to client JOBLEVEL = 55, -#if 0 PARTNER = 57, + +#if 0 CART = 58, FAME = 59, UNBREAKABLE = 60, @@ -321,12 +323,8 @@ enum class SP : uint16_t // sent to client ATTACKRANGE = 1000, -#if 0 - ATKELE = 1001, -#endif -#if 0 - DEFELE = 1002, -#endif + ELTLVL = 1001, + ELTTYPE = 1002, #if 0 CASTRATE = 1003, #endif @@ -469,6 +467,13 @@ enum class SP : uint16_t #if 0 RANDOM_ATTACK_INCREASE = 1072, #endif + + POS_X = 1074, + POS_Y = 1075, + PVP_CHANNEL = 1076, + BL_ID = 1077, + BL_TYPE = 1078, + CHAR_ID = 1079, }; constexpr diff --git a/src/mmo/cxxstdio_enums.hpp b/src/mmo/cxxstdio_enums.hpp index 28a8a14..01e8842 100644 --- a/src/mmo/cxxstdio_enums.hpp +++ b/src/mmo/cxxstdio_enums.hpp @@ -64,13 +64,6 @@ auto decay_for_printf(BF v) -> typename remove_enum<decltype(v)>::type { return inline auto decay_for_printf(MapCell v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } } // namespace map::e -namespace magic -{ -enum class SPELLARG : uint8_t; - -inline -auto decay_for_printf(SPELLARG v) -> typename remove_enum<decltype(v)>::type { return typename remove_enum<decltype(v)>::type(v); } -} // namespace map::magic enum class BL : uint8_t; enum class ByteCode : uint8_t; diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp index 21e4059..df9c40c 100644 --- a/src/mmo/skill.t.hpp +++ b/src/mmo/skill.t.hpp @@ -41,11 +41,7 @@ enum class StatusChange : uint16_t // these ones are used by clif_status_change, // e.g. by the magic system ZERO = 0, - ATTACK_ICON_GENERIC = 2000, - ATTACK_ICON_SHEARING = 2001, - CART = 0x0c, CLIF_OPTION_SC_INVISIBILITY = 0x1000, - CLIF_OPTION_SC_SCRIBE = 0x1001, // the rest are the normal effects SC_SLOWPOISON = 14, // item script |