Browse Source

- Forgot to add Tatami Gaeshi's 3 sec block of ranged attacks.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7345 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
1478bfbae3
3 changed files with 6 additions and 2 deletions
  1. 1 1
      db/skill_cast_db.txt
  2. 4 0
      src/map/battle.c
  3. 1 1
      src/map/status.c

+ 1 - 1
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

+ 4 - 0
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))

+ 1 - 1
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);