- Removed SP_DISGUISE from the bonus list.

- Moved Sharp Shooting display to the block with Auto-Counter (since that's the other skill that can show critical as well)
- Corrected some fields in the still packet (guild emblem being stored as a Long when it should be Short)
- Modified most fields of view_data to be unsigned shorts rather than signed ones.
- On-Touch NPCs will now make you stop walking when you trigger them.
- Reduced stun duration of most skills to 3 secs.
- ShadowJump/JumpKick will make you land on the target's cell now.
- Fixed Kaahi triggering only once per skill duration.
- Added the kaahi_heal_timer to the list of status change functions.


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

1 files changed, 13 insertions, 11 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 1160d2862..d606d54af 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -457,15 +457,16 @@ struct weapon_data {
 };

 

 struct view_data {

-	short class_;

-	short weapon;

-	short shield; //Or left-hand weapon.

-	short head_top;

-	short head_mid;

-	short head_bottom;

-	short hair_style;

-	short hair_color;

-	short cloth_color;

+	unsigned short

+	  	class_,

+		weapon,

+		shield, //Or left-hand weapon.

+		head_top,

+		head_mid,

+		head_bottom,

+		hair_style,

+		hair_color,

+		cloth_color;

 	char sex;

 	unsigned dead_sit : 2;

 };

@@ -1124,7 +1125,7 @@ enum {
 	SP_SHORT_WEAPON_DAMAGE_RETURN,SP_LONG_WEAPON_DAMAGE_RETURN,SP_WEAPON_COMA_ELE,SP_WEAPON_COMA_RACE, // 1063-1066

 	SP_ADDEFF2,SP_BREAK_WEAPON_RATE,SP_BREAK_ARMOR_RATE,SP_ADD_STEAL_RATE, // 1067-1070

 	SP_MAGIC_DAMAGE_RETURN,SP_RANDOM_ATTACK_INCREASE,SP_ALL_STATS,SP_AGI_VIT,SP_AGI_DEX_STR,SP_PERFECT_HIDE, // 1071-1076

-	SP_DISGUISE,SP_CLASSCHANGE, // 1077-1078

+	SP_FREE,SP_CLASSCHANGE, // 1077-1078

 	SP_HP_DRAIN_VALUE,SP_SP_DRAIN_VALUE, // 1079-1080

 	SP_WEAPON_ATK,SP_WEAPON_ATK_RATE, // 1081-1082

 	SP_DELAYRATE,SP_HP_DRAIN_RATE_RACE,SP_SP_DRAIN_RATE_RACE, // 1083-1085

@@ -1141,7 +1142,8 @@ enum {
 	SP_UNSTRIPABLE_WEAPON,SP_UNSTRIPABLE_ARMOR,SP_UNSTRIPABLE_HELM,SP_UNSTRIPABLE_SHIELD,  // 2034-2037

 	SP_INTRAVISION, SP_ADD_MONSTER_DROP_ITEMGROUP, SP_SP_LOSS_RATE, // 2038-2040

 	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE //2041

-	//Before adding another, note that 2007 (SP_FREE, previously Infinite Endure) is available!

+	//Before adding another, note that 1077 (SP_FREE, previously disguise) and

+	//2007 (SP_FREE, previously Infinite Endure) are available!

 };

 

 enum {