summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-26 18:32:23 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-26 18:32:23 +0000
commit4af7fbd2970fbb7546c50ee6b6451d9985c102aa (patch)
tree6a79ea3857e9e01caaf571ceffaf72397965e33c
parent3396bad1320df4d59a0806a41fafaf99d7b4c9d6 (diff)
downloadhercules-4af7fbd2970fbb7546c50ee6b6451d9985c102aa.tar.gz
hercules-4af7fbd2970fbb7546c50ee6b6451d9985c102aa.tar.bz2
hercules-4af7fbd2970fbb7546c50ee6b6451d9985c102aa.tar.xz
hercules-4af7fbd2970fbb7546c50ee6b6451d9985c102aa.zip
- 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
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/status.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 6a5b233e6..f97a99e5b 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -884,7 +884,7 @@
//-- NJ_ZENYNAGE
526,0,5000,0,0,0
//-- NJ_TATAMIGAESHI
-527,0,0,0,0,0
+527,0,0,0,3000,0
//-- NJ_KASUMIKIRI
528,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0
//-- NJ_SHADOWJUMP
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);