summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-17 18:14:15 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-17 18:14:15 +0000
commit0a2bd24600eb5596c42374391be07f9327cdb754 (patch)
tree3af5591b68e7f17af614e5c5e8af8e6d575a735f
parent5bfda2252623ad1b118dea23101ed72c1e77b780 (diff)
downloadhercules-0a2bd24600eb5596c42374391be07f9327cdb754.tar.gz
hercules-0a2bd24600eb5596c42374391be07f9327cdb754.tar.bz2
hercules-0a2bd24600eb5596c42374391be07f9327cdb754.tar.xz
hercules-0a2bd24600eb5596c42374391be07f9327cdb754.zip
Re-enabled SC_INCASPDRATE as per kenpachi's request.
- val1 is the % aspd boost. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15599 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/const.txt2
-rw-r--r--src/map/status.c5
-rw-r--r--src/map/status.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/db/const.txt b/db/const.txt
index 0529ca6e4..1fee30019 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -934,7 +934,7 @@ SC_BLOODLUST 243
SC_FLEET 244
SC_SPEED 245
SC_DEFENCE 246
-//SC_INCASPDRATE 247
+SC_INCASPDRATE 247
SC_INCFLEE2 248
SC_JAILED 249
SC_ENCHANTARMS 250
diff --git a/src/map/status.c b/src/map/status.c
index c0628ab24..39634ad09 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -777,6 +777,7 @@ void initChangeTables(void)
StatusChangeFlagTable[SC_INCFLEE] |= SCB_FLEE;
StatusChangeFlagTable[SC_INCFLEERATE] |= SCB_FLEE;
StatusChangeFlagTable[SC_INCCRI] |= SCB_CRI;
+ StatusChangeFlagTable[SC_INCASPDRATE] |= SCB_ASPD;
StatusChangeFlagTable[SC_INCFLEE2] |= SCB_FLEE2;
StatusChangeFlagTable[SC_INCMHPRATE] |= SCB_MAXHP;
StatusChangeFlagTable[SC_INCMSPRATE] |= SCB_MAXSP;
@@ -4656,8 +4657,10 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
aspd_rate += aspd_rate * sc->data[SC_MELON_BOMB]->val1 / 100;
if( sc->data[SC_BOOST500] )
aspd_rate -= aspd_rate * sc->data[SC_BOOST500]->val1/100;
- if(sc->data[SC_EXTRACT_SALAMINE_JUICE])
+ if( sc->data[SC_EXTRACT_SALAMINE_JUICE] )
aspd_rate -= aspd_rate * sc->data[SC_EXTRACT_SALAMINE_JUICE]->val1/100;
+ if( sc->data[SC_INCASPDRATE] )
+ aspd_rate -= aspd_rate * sc->data[SC_INCASPDRATE]->val1 / 100;
return (short)cap_value(aspd_rate,0,SHRT_MAX);
}
diff --git a/src/map/status.h b/src/map/status.h
index bd150977a..ad2bded4e 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -263,7 +263,7 @@ typedef enum sc_type {
SC_FLEET,
SC_SPEED,
SC_DEFENCE,
- //SC_INCASPDRATE,
+ SC_INCASPDRATE,
SC_INCFLEE2 = 248,
SC_JAILED,
SC_ENCHANTARMS, //250