From 4af7fbd2970fbb7546c50ee6b6451d9985c102aa Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 26 Jun 2006 18:32:23 +0000 Subject: - Forgot to add Tatami Gaeshi's 3 sec block of ranged attacks. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7345 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 4 ++++ src/map/status.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index ba4150181..e74862b77 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -308,6 +308,10 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i && rand()%100 < 75 && !(skill_get_inf(skill_num)&INF_GROUND_SKILL)) return 0; + + if(sc->data[SC_TATAMIGAESHI].timer != -1 && !flag&BF_MAGIC && flag&BF_LONG) + return 0; + if(sc->data[SC_KAUPE].timer != -1 && rand()%100 < sc->data[SC_KAUPE].val2 && (src->type == BL_PC || !skill_num)) diff --git a/src/map/status.c b/src/map/status.c index fcd9e5a21..9fa7982d5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -363,9 +363,9 @@ void initChangeTables(void) { set_sc(GS_INCREASING, SC_INCREASING, SI_ACCURACY, SCB_AGI|SCB_DEX|SCB_HIT); set_sc(GS_GATLINGFEVER, SC_GATLINGFEVER, SI_GATLINGFEVER, SCB_FLEE|SCB_SPEED|SCB_ASPD); set_sc(GS_FLING, SC_FLING, SI_BLANK, SCB_DEF|SCB_DEF2); + set_sc(NJ_TATAMIGAESHI, SC_TATAMIGAESHI, SI_BLANK, SCB_NONE); //Uncomment and update when you plan on implementing. -// set_sc(NJ_TATAMIGAESHI, SC_TATAMIGAESHI, SI_BLANK); // set_sc(NJ_UTSUSEMI, SC_UTSUSEMI, SI_MAEMI); // set_sc(NJ_KAENSIN, SC_KAENSIN, SI_BLANK); set_sc(NJ_SUITON, SC_SUITON, SI_BLANK, SCB_AGI); -- cgit v1.2.3-70-g09d2