From e886d580bbfecb281f97c867b8fe0532985449f7 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 9 Nov 2022 09:50:02 -0300 Subject: Revert previous commit, but upmarmu is strange and TMWA is not honoring its own limits. No wonder upmarmu is so powerful, it is easy to be if you ignore max_aspeed parameter. Also, smooth the aspd nerf. --- src/map/pc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/map/pc.cpp b/src/map/pc.cpp index c7b8e3b..32d6769 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 { - pc_calcstatus(sd, 1); + sd->aspd = speed; //pc_calcstatus(sd, 1); clif_updatestatus(sd, SP::ASPD); clif_updatestatus(sd, SP::ATTACKRANGE); } @@ -1527,7 +1527,7 @@ int pc_calcstatus(dumb_ptr sd, int first) /* Red Threshold Calculation */ if (sd->aspd < 300_ms) { - sd->aspd = 300_ms + ((sd->aspd - 300_ms) / 2); + sd->aspd = 300_ms + ((sd->aspd - 300_ms) * 11 / 20); } sd->aspd = std::max(sd->aspd, battle_config.max_aspd); @@ -2871,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->aspd * 2); //sd->attack_spell_delay; + sd->attackabletime = tick + sd->attack_spell_delay; sd->attack_spell_charges--; if (!sd->attack_spell_charges) { -- cgit v1.2.3-60-g2f50