diff options
author | Jesusaves <cpntb1@ymail.com> | 2022-11-09 08:44:19 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2022-11-09 08:44:19 -0300 |
commit | 84bc4cd7fbfbacf74915de7d5541c82b65d64ee3 (patch) | |
tree | 19aef41a559ae227a07d83ea7f2118dc72ee5c96 /src/map/pc.cpp | |
parent | 2fd2caa7c54e3dd6898bb60d33e0e47153b10eb5 (diff) | |
download | tmwa-84bc4cd7fbfbacf74915de7d5541c82b65d64ee3.tar.gz tmwa-84bc4cd7fbfbacf74915de7d5541c82b65d64ee3.tar.bz2 tmwa-84bc4cd7fbfbacf74915de7d5541c82b65d64ee3.tar.xz tmwa-84bc4cd7fbfbacf74915de7d5541c82b65d64ee3.zip |
Fix the promised machine gun
Diffstat (limited to 'src/map/pc.cpp')
-rw-r--r-- | src/map/pc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 49ef5a4..c7b8e3b 100644 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -792,7 +792,7 @@ void pc_set_attack_info(dumb_ptr<map_session_data> sd, interval_t speed, int ran } else { - sd->aspd = speed; + pc_calcstatus(sd, 1); clif_updatestatus(sd, SP::ASPD); clif_updatestatus(sd, SP::ATTACKRANGE); } @@ -1518,6 +1518,7 @@ int pc_calcstatus(dumb_ptr<map_session_data> sd, int first) sd->speed = sd->speed * sd->speed_rate / 100; sd->speed = std::max(sd->speed, 1_ms); + /* Magic speed */ if (sd->attack_spell_override) sd->aspd = sd->attack_spell_delay; @@ -2870,7 +2871,7 @@ void pc_attack_timer(TimerData *, tick_t tick, BlockId id) {"@target_id"_s, static_cast<int32_t>(unwrap<BlockId>(bl->bl_id))}, }; npc_event_do_l(sd->magic_attack, sd->bl_id, arg); - sd->attackabletime = tick + sd->attack_spell_delay; + sd->attackabletime = tick + (sd->aspd * 2); //sd->attack_spell_delay; sd->attack_spell_charges--; if (!sd->attack_spell_charges) { |