summaryrefslogtreecommitdiff
path: root/src/mmo
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-17 23:18:24 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-17 23:18:24 +0000
commit9a90161cf701f85760144d7084bf93816724376f (patch)
treefbaf0ca1e0663a3ceb7e3da63b46395db967045d /src/mmo
parent4887981f15cdae7f19d06471c54e6754e74e6567 (diff)
parentb261d1a65d264dadd3b0e25ac1a99fa5cbe29eeb (diff)
downloadtmwa-9a90161cf701f85760144d7084bf93816724376f.tar.gz
tmwa-9a90161cf701f85760144d7084bf93816724376f.tar.bz2
tmwa-9a90161cf701f85760144d7084bf93816724376f.tar.xz
tmwa-9a90161cf701f85760144d7084bf93816724376f.zip
Merge branch 'sc_cooldown_upmarmu' into 'master'
SC_COOLDOWN_UPMARMU See merge request legacy/tmwa!247
Diffstat (limited to 'src/mmo')
-rw-r--r--src/mmo/skill.t.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp
index 1509852..782980c 100644
--- a/src/mmo/skill.t.hpp
+++ b/src/mmo/skill.t.hpp
@@ -59,6 +59,7 @@ enum class StatusChange : uint16_t
SC_COOLDOWN_AR = 75, // Frillyar cooldown
SC_COOLDOWN_ENCH = 76, // Enchanter cooldown
SC_COOLDOWN_KOY = 77, // Koyntety cooldown
+ SC_COOLDOWN_UPMARMU = 78, // Upmarmu cooldown
SC_POISON = 132, // bad; actually used