diff options
| author | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-10-22 10:19:07 +0000 |
|---|---|---|
| committer | Jesusalva Jesusalva <jesusalva@themanaworld.org> | 2022-10-22 10:19:07 +0000 |
| commit | 2a13b6510835b4bf6077ddb3e5391e42641b16cc (patch) | |
| tree | 3b46b1b2c25f64df4e8e77004dcb660468fd82f4 | |
| parent | 040de94612025f2c3bf57c8e2c25dc6b2e8df126 (diff) | |
| parent | e59a3f68e99943c6685fe37473d29e20529efa2b (diff) | |
| download | tmwa-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
| -rw-r--r-- | src/map/skill.cpp | 6 | ||||
| -rw-r--r-- | src/mmo/skill.t.hpp | 4 |
2 files changed, 10 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: diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp index df9c40c..4d9a766 100644 --- a/src/mmo/skill.t.hpp +++ b/src/mmo/skill.t.hpp @@ -52,6 +52,10 @@ enum class StatusChange : uint16_t SC_HEALING = 70, // item script + SC_COOLDOWN = 71, // Spell cooldown + SC_COOLDOWN_MG = 72, // Mana Guardian cooldown + SC_COOLDOWN_MT = 73, // Mana Tyrant cooldown + SC_POISON = 132, // bad; actually used SC_ATKPOT = 185, // item script |