diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 20:35:48 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 20:35:48 +0000 |
commit | 3f8358d9b0ed162a734d6e5d297beac73d759258 (patch) | |
tree | 5b81b6025170538f10a895efbb56155ff3420ec4 /src | |
parent | 0ceb473a68fa6ca5e154d6f337d35b0cf8570370 (diff) | |
download | hercules-3f8358d9b0ed162a734d6e5d297beac73d759258.tar.gz hercules-3f8358d9b0ed162a734d6e5d297beac73d759258.tar.bz2 hercules-3f8358d9b0ed162a734d6e5d297beac73d759258.tar.xz hercules-3f8358d9b0ed162a734d6e5d297beac73d759258.zip |
- Readjusted the Chasewalk icon to be as it should be.
- GS_DESPERADO is now a short-range attack skill.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/battle.c | 4 | ||||
-rw-r--r-- | src/map/status.c | 1 | ||||
-rw-r--r-- | src/map/status.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 7fd41c09b..cbc017819 100644 --- a/src/map/battle.c +++ b/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; diff --git a/src/map/status.c b/src/map/status.c index a280f6f30..e29e24de4 100644 --- a/src/map/status.c +++ b/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. diff --git a/src/map/status.h b/src/map/status.h index 794d14d9c..cf55f6a38 100644 --- a/src/map/status.h +++ b/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,
|