- Readjusted the Chasewalk icon to be as it should be.

- GS_DESPERADO is now a short-range attack skill.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8114 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/08/03
+	* Readjusted the Chasewalk icon to be as it should be. [Skotlex]
+	* GS_DESPERADO is now a short-range attack skill. [Skotlex]
 	* Changed the Battle-Orders icon to be the Strength Up icon (for
 	  Chasewalk's str bonus). [Skotlex]
 	* Fixed using the right-hand weapon's size modifiers regardless of which

src/map/battle.c

@@ -859,6 +859,10 @@ static struct Damage battle_calc_weapon_attack(
 				flag.arrow = 1;
 				wd.flag=(wd.flag&~BF_RANGEMASK)|BF_LONG;
 				break;
+			case GS_DESPERADO:
+				//This one is the opposite, it consumes ammo, but should count as short range.
+				wd.flag=(wd.flag&~BF_RANGEMASK)|BF_SHORT;
+				break;
 			case CR_SHIELDBOOMERANG:
 			case PA_SHIELDCHAIN:
 				flag.weapon = 0;

src/map/status.c

@@ -405,7 +405,6 @@ void initChangeTables(void) {
 	StatusIconChangeTable[SC_ASPDPOTION3] = SI_ASPDPOTION;
 	StatusIconChangeTable[SC_SPEEDUP0] = SI_SPEEDPOTION1;
 	StatusIconChangeTable[SC_SPEEDUP1] = SI_SPEEDPOTION2;
-	StatusIconChangeTable[SC_INCSTR] = SI_INCSTR;
 	StatusIconChangeTable[SC_MIRACLE] = SI_SPIRIT;
 		
 	//Other SC which are not necessarily associated to skills.

src/map/status.h

@@ -344,7 +344,7 @@ enum {
 	SI_WINDWALK		= 116,
 	SI_MELTDOWN		= 117,
 	SI_CARTBOOST		= 118,
-	SI_CHASEWALK		= 119,
+	//119, blank
 	SI_REJECTSWORD		= 120,
 	SI_MARIONETTE		= 121,
 	SI_MARIONETTE2		= 122,
@@ -381,7 +381,7 @@ enum {
 	SI_MOON_COMFORT		= 170,	
 	SI_STAR_COMFORT		= 171,	
 	SI_PRESERVE		= 181,
-	SI_INCSTR = 182,
+	SI_CHASEWALK	= 182,
 	SI_INTRAVISION	= 184, //WTF?? creates the black shape of 4_m_02 NPC, with NPC talk cursor. Supposedly intravision shows this.
 	SI_DOUBLECAST		= 186,
 	SI_MAXOVERTHRUST	= 188,