diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-04-17 23:18:24 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-17 23:18:24 +0000 |
| commit | 9a90161cf701f85760144d7084bf93816724376f (patch) | |
| tree | fbaf0ca1e0663a3ceb7e3da63b46395db967045d | |
| parent | 4887981f15cdae7f19d06471c54e6754e74e6567 (diff) | |
| parent | b261d1a65d264dadd3b0e25ac1a99fa5cbe29eeb (diff) | |
| download | tmwa-9a90161cf701f85760144d7084bf93816724376f.tar.gz tmwa-9a90161cf701f85760144d7084bf93816724376f.tar.bz2 tmwa-9a90161cf701f85760144d7084bf93816724376f.tar.xz tmwa-9a90161cf701f85760144d7084bf93816724376f.zip | |
Merge branch 'sc_cooldown_upmarmu' into 'master'
SC_COOLDOWN_UPMARMU
See merge request legacy/tmwa!247
| -rw-r--r-- | src/map/script-fun.cpp | 1 | ||||
| -rw-r--r-- | src/map/skill.cpp | 2 | ||||
| -rw-r--r-- | src/mmo/skill.t.hpp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 1788570..fd3f798 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -3888,6 +3888,7 @@ void builtin_sc_start(ScriptState *st) case StatusChange::SC_COOLDOWN_AR: case StatusChange::SC_COOLDOWN_ENCH: case StatusChange::SC_COOLDOWN_KOY: + case StatusChange::SC_COOLDOWN_UPMARMU: break; default: diff --git a/src/map/skill.cpp b/src/map/skill.cpp index cdaa0ba..0fcf505 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -764,6 +764,7 @@ void skill_status_change_end(dumb_ptr<block_list> bl, StatusChange type, TimerDa case StatusChange::SC_COOLDOWN_AR: case StatusChange::SC_COOLDOWN_ENCH: case StatusChange::SC_COOLDOWN_KOY: + case StatusChange::SC_COOLDOWN_UPMARMU: break; /* option2 */ @@ -1041,6 +1042,7 @@ int skill_status_effect(dumb_ptr<block_list> bl, StatusChange type, case StatusChange::SC_COOLDOWN_AR: case StatusChange::SC_COOLDOWN_ENCH: case StatusChange::SC_COOLDOWN_KOY: + case StatusChange::SC_COOLDOWN_UPMARMU: break; case StatusChange::SC_FLYING_BACKPACK: updateflag = SP::WEIGHT; diff --git a/src/mmo/skill.t.hpp b/src/mmo/skill.t.hpp index 1509852..782980c 100644 --- a/src/mmo/skill.t.hpp +++ b/src/mmo/skill.t.hpp @@ -59,6 +59,7 @@ enum class StatusChange : uint16_t SC_COOLDOWN_AR = 75, // Frillyar cooldown SC_COOLDOWN_ENCH = 76, // Enchanter cooldown SC_COOLDOWN_KOY = 77, // Koyntety cooldown + SC_COOLDOWN_UPMARMU = 78, // Upmarmu cooldown SC_POISON = 132, // bad; actually used |