summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-13 11:25:34 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-13 11:25:34 +0000
commitd484be2d057716ac2e33d46e1cf867941a9b6091 (patch)
tree436cff17bc76796917251637bf2d1a3fd9ec44de /src/map
parentd932e32c00f8fecfff5558f34220095883102f6e (diff)
downloadhercules-d484be2d057716ac2e33d46e1cf867941a9b6091.tar.gz
hercules-d484be2d057716ac2e33d46e1cf867941a9b6091.tar.bz2
hercules-d484be2d057716ac2e33d46e1cf867941a9b6091.tar.xz
hercules-d484be2d057716ac2e33d46e1cf867941a9b6091.zip
* Some further changes to the delayfix function
- aftercast delay is at least amotion no matter what skill (this includes skills with cast time AND skills with skill delay!) - aftercast delay reductions can NEVER reduce the aftercast delay below amotion (this includes Bragi and Soul Links) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11448 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/skill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b068a275c..07b0bb6f8 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8867,8 +8867,6 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
if (time < 0)
time = -time + status_get_amotion(bl); // If set to <0, add to attack motion.
- else if (time == 0)
- time = status_get_amotion(bl); // Use amotion
// Delay reductions
switch (skill_id)
@@ -8927,6 +8925,9 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
if (battle_config.delay_rate != 100)
time = time * battle_config.delay_rate / 100;
+ if (time < status_get_amotion(bl))
+ time = status_get_amotion(bl); // Delay can never be below amotion [Playtester]
+
return max(time, battle_config.min_skill_delay_limit);
}