From 610430033b7529776cdbd59cb9327fab3252309f Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 3 Apr 2006 20:52:31 +0000 Subject: - 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5893 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 2 +- src/map/status.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map') diff --git a/src/map/battle.c b/src/map/battle.c index caa05e2ff..278ecc1db 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 312b6a6f1..7df40765c 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) ) -- cgit v1.2.3-70-g09d2