- Adjusted UTSUSEMI/BUNSINJYUTSU so that they block range/melee weapon attacks and only melee misc attacks. This isn't 100% correct, but it's a better approximation to the way these skills behave.

- Corrected issen's range to 5, as per the login packet information.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9001 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 10 insertions, 4 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 35f39cafa..cda0418a0 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/10/16

+	* Adjusted UTSUSEMI/BUNSINJYUTSU so that they block range/melee weapon

+	  attacks and only melee misc attacks. This isn't 100% correct, but it's a

+	  better approximation to the way these skills behave. [Skotlex]

 	* Emergency call &16 (disable skill from nowarpto maps) will now NOT block

 	  Emergency Call if that map is also a gvg-castle map. Makes it safe to turn

 	  on this option to prevent usage from special maps (like Lhz3) without

diff --git a/db/Changelog.txt b/db/Changelog.txt
index a4640b0ca..c3ca83110 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
 

 ========================

 10/16

+	* Corrected issen's range to 5, as per the login packet information.

+	  [Skotlex]

 	* Applied most of Mpeg's work on Ninja Skills. For information see:

 	  http://gpegon.free.fr/ea/ninja_10-15-06_mpeg.txt [Skotlex]

 	* Small Kiel MVP drop rate increase [Playtester]

diff --git a/db/skill_db.txt b/db/skill_db.txt
index 03e93eb96..2c9267f88 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -568,7 +568,7 @@
 541,9,6,4,4,2,2:2:3:3:4,5,1,yes,0,0,0,magic,0	//NJ_RAIGEKISAI#NJ_RAIGEKISAI#

 542,5:6:7:8:9,8,1,4,0,1,5,1,yes,0,0,0,magic,0	//NJ_KAMAITACHI#NJ_KAMAITACHI#

 543,0,6,4,0,1,0,5,1,yes,0,0,0,none,0	//NJ_NEN#NJ_NEN#

-544,-4,6,1,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ISSEN#NJ_ISSEN#

+544,-5,6,1,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_ISSEN#NJ_ISSEN#

 

 1001,9,6,1,-1,0,0,1,1,no,0,1,0,weapon,0	//KN_CHARGEATK#Charge Attack#

 1002,0,6,4,0,1,0,1,0,no,0,1,0,weapon,2	//CR_SHRINK#Shrink#

diff --git a/src/map/battle.c b/src/map/battle.c
index 878f9e322..d0eab1861 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -323,10 +323,12 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
 		}
 
 		if ((sc->data[SC_UTSUSEMI].timer != -1 || sc->data[SC_BUNSINJYUTSU].timer != -1)
-		&& (flag&(BF_WEAPON|BF_MISC))
+		&& 
+// This check used instead, is 'aproximate' to what it can block.
+			(flag&BF_WEAPON || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT))
 /* FIXME: This check is awful, there has to be some kind of logic behind this!
-		&& (
 		// there is no rule for that, only some exceptions.. which I listed according to many tests and says
+		&& (
 			skill_num != ASC_BREAKER &&
 			skill_num != NJ_KUNAI &&
 			skill_num != SN_FALCONASSAULT &&
diff --git a/src/map/clif.c b/src/map/clif.c
index bb985a20e..516b909e4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4404,7 +4404,6 @@ int clif_skillinfoblock(struct map_session_data *sd)
 			if(((!(inf2&INF2_QUEST_SKILL) || battle_config.quest_skill_learn) &&

 				!(inf2&(INF2_WEDDING_SKILL|INF2_SPIRIT_SKILL))) ||

 				(battle_config.gm_allskill > 0 && pc_isGM(sd) >= battle_config.gm_allskill) )

-				//WFIFOB(fd,len+36)= (sd->status.skill[i].lv < skill_get_max(id) && sd->status.skill[i].flag ==0 )? 1:0;

 				WFIFOB(fd,len+36)= (sd->status.skill[i].lv < skill_tree_get_max(id, sd->status.class_) && sd->status.skill[i].flag ==0 )? 1:0;

 			else

 				WFIFOB(fd,len+36) = 0;