summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-11-09 09:50:02 -0300
committerJesusaves <cpntb1@ymail.com>2022-11-09 09:50:02 -0300
commite886d580bbfecb281f97c867b8fe0532985449f7 (patch)
treea282dce2f56db8de60351bffdb6079701166c13a /src/map
parent84bc4cd7fbfbacf74915de7d5541c82b65d64ee3 (diff)
downloadtmwa-e886d580bbfecb281f97c867b8fe0532985449f7.tar.gz
tmwa-e886d580bbfecb281f97c867b8fe0532985449f7.tar.bz2
tmwa-e886d580bbfecb281f97c867b8fe0532985449f7.tar.xz
tmwa-e886d580bbfecb281f97c867b8fe0532985449f7.zip
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.
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.cpp6
1 files 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<map_session_data> 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<map_session_data> 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<int32_t>(unwrap<BlockId>(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)
{