diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 11:25:34 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-13 11:25:34 +0000 |
| commit | d484be2d057716ac2e33d46e1cf867941a9b6091 (patch) | |
| tree | 436cff17bc76796917251637bf2d1a3fd9ec44de | |
| parent | d932e32c00f8fecfff5558f34220095883102f6e (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/skill.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b3748214b..3c9d33b79 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/10/13 + * Some further changes to the delayfix function [Playtester] + - 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) * Again modified the delayfix function to reflect the current skill delay knowledge. Skills with 0 delay use amotion always (regardless of cast times) [Skotlex] 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); } |