From cbb91afccf1f0e84662b5ddfbe783c68407ecb8c Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 3 Apr 2006 20:52:31 +0000 Subject: [PATCH] - SC_AUTOCOUNTER now only blocks all attacks/skills when the flag is 0 (attempt to use skill) - Autocounter triggers are now checked against flag 1 (cast-end) rather than 0. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5893 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/battle.c | 2 +- src/map/status.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ad17dd2efa..56e9972bc2 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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/03 + * Fixed Auto-counter. [Skotlex] * Modified Rude-Attacked behaviour so that such skills only triggers when the rude-attacked count is greater than 3. [Skotlex] * Added config setting slaves_inherit_mode to determine whether slaves take diff --git a/src/map/battle.c b/src/map/battle.c index caa05e2ffe..278ecc1db4 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3014,7 +3014,7 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, { if(tsc->data[SC_AUTOCOUNTER].timer != -1 && (!sc || sc->data[SC_AUTOCOUNTER].timer == -1) && - status_check_skilluse(target, src, KN_AUTOCOUNTER, 0) + status_check_skilluse(target, src, KN_AUTOCOUNTER, 1) ) { int dir = map_calc_dir(target,src->x,src->y); int t_dir = unit_getdir(target); diff --git a/src/map/status.c b/src/map/status.c index 312b6a6f12..7df40765ca 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -405,7 +405,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int { if ( (sc->data[SC_TRICKDEAD].timer != -1 && skill_num != NV_TRICKDEAD) - || sc->data[SC_AUTOCOUNTER].timer != -1 + || (sc->data[SC_AUTOCOUNTER].timer != -1 && !flag) || (sc->data[SC_GOSPEL].timer != -1 && sc->data[SC_GOSPEL].val4 == BCT_SELF && skill_num != PA_GOSPEL) || (sc->data[SC_GRAVITATION].timer != -1 && sc->data[SC_GRAVITATION].val3 == BCT_SELF && skill_num != HW_GRAVITATION) )