summaryrefslogtreecommitdiff
path: root/src/mmo
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2022-10-24 23:33:34 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2022-10-24 23:33:34 +0000
commit886182e8757ae133df1b00f4650a9b48e0a3c3e0 (patch)
tree9e9c0cb3cca49cd5080f5ae2ed361c4e98165efb /src/mmo
parent9a3566484f2345db599552a6c18311978a0071ea (diff)
parentd3942a51238f34ae7807e5747f6569b55924e0d1 (diff)
downloadtmwa-886182e8757ae133df1b00f4650a9b48e0a3c3e0.tar.gz
tmwa-886182e8757ae133df1b00f4650a9b48e0a3c3e0.tar.bz2
tmwa-886182e8757ae133df1b00f4650a9b48e0a3c3e0.tar.xz
tmwa-886182e8757ae133df1b00f4650a9b48e0a3c3e0.zip
Merge branch 'sc_cooldown' into 'master'
Sc cooldown added frillyar and kaflosh status symbols and <1s fix See merge request legacy/tmwa!236
Diffstat (limited to 'src/mmo')
-rw-r--r--src/mmo/skill.t.hpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp
index 4d9a766..166543c 100644
--- a/src/mmo/skill.t.hpp
+++ b/src/mmo/skill.t.hpp
@@ -55,6 +55,8 @@ enum class StatusChange : uint16_t
SC_COOLDOWN = 71, // Spell cooldown
SC_COOLDOWN_MG = 72, // Mana Guardian cooldown
SC_COOLDOWN_MT = 73, // Mana Tyrant cooldown
+ SC_COOLDOWN_R = 74, // Kaflosh cooldown
+ SC_COOLDOWN_AR = 75, // Frillyar cooldown
SC_POISON = 132, // bad; actually used