diff options
| author | Hello TMW <hello@themanaworld.org> | 2024-09-17 14:04:03 +0000 |
|---|---|---|
| committer | Hello TMW <hello@themanaworld.org> | 2024-09-17 14:04:03 +0000 |
| commit | 3a0bfe045e24a8d769c60b513ade85505926be70 (patch) | |
| tree | 9c8b265ac18c45bf6e51745af32b471646422b26 /src/mmo | |
| parent | 90754fd121ffaec886c415689031f9ef01ae4972 (diff) | |
| parent | 48ee77e4fdfc3741996df0ddaca49c090292fc10 (diff) | |
| download | tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.gz tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.bz2 tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.tar.xz tmwa-3a0bfe045e24a8d769c60b513ade85505926be70.zip | |
Merge branch tmwa:master into master
Diffstat (limited to 'src/mmo')
| -rw-r--r-- | src/mmo/clif.t.hpp | 2 | ||||
| -rw-r--r-- | src/mmo/enums.hpp | 2 | ||||
| -rw-r--r-- | src/mmo/skill.t.hpp | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/mmo/clif.t.hpp b/src/mmo/clif.t.hpp index f8350a7..c1f7ed3 100644 --- a/src/mmo/clif.t.hpp +++ b/src/mmo/clif.t.hpp @@ -265,6 +265,8 @@ enum class SP : uint16_t WEIGHT = 24, // sent to client MAXWEIGHT = 25, + MAXWEIGHT_ADD = 26, + MAXWEIGHT_OVERRIDE = 27, // sent to client USTR = 32, diff --git a/src/mmo/enums.hpp b/src/mmo/enums.hpp index c4a1b17..377f7d7 100644 --- a/src/mmo/enums.hpp +++ b/src/mmo/enums.hpp @@ -135,6 +135,8 @@ enum class ItemMode : uint8_t NO_TRADE = 2, NO_SELL_TO_NPC = 4, NO_STORAGE = 8, + KEEP_AFTER_USE = 16, + DONT_USE_AMMO = 32, }; ENUM_BITWISE_OPERATORS(ItemMode) } diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp index 782980c..b0b6b8d 100644 --- a/src/mmo/skill.t.hpp +++ b/src/mmo/skill.t.hpp @@ -60,11 +60,16 @@ enum class StatusChange : uint16_t SC_COOLDOWN_ENCH = 76, // Enchanter cooldown SC_COOLDOWN_KOY = 77, // Koyntety cooldown SC_COOLDOWN_UPMARMU = 78, // Upmarmu cooldown + SC_COOLDOWN_SG = 79, // Stone Golem cooldown SC_POISON = 132, // bad; actually used + SC_SLOWMOVE = 133, // slows down movement + SC_CANTMOVE = 134, // stops all movement SC_ATKPOT = 185, // item script - SC_MATKPOT = 186, // unused, but kept for parallel + SC_MATKPOT = 186, // `Matk' spell from items (val1 : power) + + SC_PHYS_SHIELD_ITEM = 193, // `Protect' spell from items, reduce damage (val1: power) can't be chancelled with detsanc // Added for Fate's spells SC_HIDE = 194, // Hide from `detect' magic (PCs only) |