diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2022-09-28 12:52:39 +0200 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2022-09-28 12:52:39 +0200 |
| commit | 1f952de3ce09fe55e532f91170af88bdba7b9b1b (patch) | |
| tree | dbee3f304b19a1ac9652ec7f3928fa9193d7e9d4 | |
| parent | 20bcf8affe9fdfe824ad347cc5e74d145b5214cf (diff) | |
| parent | 9aa7e49ca2d67fa51a3258f00ab0f2cd9eaa5b4d (diff) | |
| download | tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.gz tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.bz2 tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.tar.xz tmwa-1f952de3ce09fe55e532f91170af88bdba7b9b1b.zip | |
Merge branch 'sc_cooldown' into full
| -rw-r--r-- | src/map/skill.cpp | 2 | ||||
| -rw-r--r-- | src/mmo/skill.t.hpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/map/skill.cpp b/src/map/skill.cpp index cf99af8..cf7ab6b 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -738,6 +738,7 @@ 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: calc_flag = 1; break; @@ -1003,6 +1004,7 @@ 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: 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..8238e11 100644 --- a/src/mmo/skill.t.hpp +++ b/src/mmo/skill.t.hpp @@ -52,6 +52,8 @@ enum class StatusChange : uint16_t SC_HEALING = 70, // item script + SC_COOLDOWN = 71, // Spell cooldown + SC_POISON = 132, // bad; actually used SC_ATKPOT = 185, // item script |