summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-13 04:05:38 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-13 04:05:38 +0000
commit32368c7c1e350cec9a4fba86473c2cec46e14a72 (patch)
treef025690a58ab33ea00511a6eb436122521ee3698
parente100c1ebb316a9188e2fef9ea95a55837fa2f346 (diff)
downloadhercules-32368c7c1e350cec9a4fba86473c2cec46e14a72.tar.gz
hercules-32368c7c1e350cec9a4fba86473c2cec46e14a72.tar.bz2
hercules-32368c7c1e350cec9a4fba86473c2cec46e14a72.tar.xz
hercules-32368c7c1e350cec9a4fba86473c2cec46e14a72.zip
- Halved the aftercast delay of auto-casted spells.
- Allowed auto-spells to retrigger themselves. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6028 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/skill.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index dd4ea28c5..c9821a06c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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.
2006/04/12
+ * Halved the aftercast delay of auto-casted spells. [Skotlex]
+ * Allowed auto-spells to retrigger themselves. [Skotlex]
* Changed slave chasing from using unit_walktobl to map_search_freecell +
unit_walktoxy, since the previous behaviour makes all slaves always end up
on the same cell. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index f17d63952..ef702d03b 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1334,8 +1334,8 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
for (i = 0; i < MAX_PC_BONUS && sd->autospell[i].id; i++) {
skill = (sd->autospell[i].id > 0) ? sd->autospell[i].id : -sd->autospell[i].id;
- //Prevents skill from retriggering themselves. [Skotlex]
- if (skill == skillid || skillnotok(skill, sd))
+
+ if (skillnotok(skill, sd))
continue;
//skill2 reused to store skilllv.
@@ -1366,7 +1366,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
//Set canact delay. [Skotlex]
ud = unit_bl2ud(src);
if (ud) {
- rate = skill_delayfix(src, skill, skill2);
+ rate = skill_delayfix(src, skill, skill2)/2;
if (DIFF_TICK(ud->canact_tick, tick + rate) < 0)
ud->canact_tick = tick+rate;
}
@@ -1497,7 +1497,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list *
//Set canact delay. [Skotlex]
ud = unit_bl2ud(bl);
if (ud) {
- rate = skill_delayfix(bl, skillid, skilllv);
+ rate = skill_delayfix(bl, skillid, skilllv)/2;
if (DIFF_TICK(ud->canact_tick, tick + rate) < 0)
ud->canact_tick = tick+rate;
}