From 84bc4cd7fbfbacf74915de7d5541c82b65d64ee3 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 9 Nov 2022 08:44:19 -0300 Subject: Fix the promised machine gun --- src/map/pc.cpp | 5 +++-- 1 file 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 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 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(unwrap(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) { -- cgit v1.2.3-70-g09d2