summaryrefslogtreecommitdiff
path: root/src/map/skill.cpp
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2022-10-22 10:19:07 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2022-10-22 10:19:07 +0000
commit2a13b6510835b4bf6077ddb3e5391e42641b16cc (patch)
tree3b46b1b2c25f64df4e8e77004dcb660468fd82f4 /src/map/skill.cpp
parent040de94612025f2c3bf57c8e2c25dc6b2e8df126 (diff)
parente59a3f68e99943c6685fe37473d29e20529efa2b (diff)
downloadtmwa-2a13b6510835b4bf6077ddb3e5391e42641b16cc.tar.gz
tmwa-2a13b6510835b4bf6077ddb3e5391e42641b16cc.tar.bz2
tmwa-2a13b6510835b4bf6077ddb3e5391e42641b16cc.tar.xz
tmwa-2a13b6510835b4bf6077ddb3e5391e42641b16cc.zip
Merge branch 'sc_cooldown' into 'master'
I unfortunately do not care for TMWA. See merge request legacy/tmwa!234
Diffstat (limited to 'src/map/skill.cpp')
-rw-r--r--src/map/skill.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index cf99af8..4207b93 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -738,6 +738,9 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa
case StatusChange::SC_MATKPOT: /* magic attack potion [Valaris] */
case StatusChange::SC_PHYS_SHIELD:
case StatusChange::SC_HASTE:
+ case StatusChange::SC_COOLDOWN:
+ case StatusChange::SC_COOLDOWN_MG:
+ case StatusChange::SC_COOLDOWN_MT:
calc_flag = 1;
break;
@@ -1003,6 +1006,9 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type,
case StatusChange::SC_HASTE:
case StatusChange::SC_PHYS_SHIELD:
case StatusChange::SC_MBARRIER:
+ case StatusChange::SC_COOLDOWN:
+ case StatusChange::SC_COOLDOWN_MG:
+ case StatusChange::SC_COOLDOWN_MT:
calc_flag = 1;
break;
case StatusChange::SC_HALT_REGENERATE: