diff options
author | HoraK-FDF <horak-fdf@web.de> | 2022-09-28 13:19:20 +0200 |
---|---|---|
committer | HoraK-FDF <horak-fdf@web.de> | 2022-09-28 13:19:20 +0200 |
commit | 7bad8b57bcc5e13f6342bdc74bd78dfb5711ef71 (patch) | |
tree | 9d23009742ffee7bb99368b22389d6c68cf27270 /src/map | |
parent | 1f952de3ce09fe55e532f91170af88bdba7b9b1b (diff) | |
parent | e59a3f68e99943c6685fe37473d29e20529efa2b (diff) | |
download | tmwa-7bad8b57bcc5e13f6342bdc74bd78dfb5711ef71.tar.gz tmwa-7bad8b57bcc5e13f6342bdc74bd78dfb5711ef71.tar.bz2 tmwa-7bad8b57bcc5e13f6342bdc74bd78dfb5711ef71.tar.xz tmwa-7bad8b57bcc5e13f6342bdc74bd78dfb5711ef71.zip |
Merge branch 'sc_cooldown' into fullfull
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/skill.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index cf7ab6b..4207b93 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -739,6 +739,8 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa 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; @@ -1005,6 +1007,8 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type, 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: |