summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/status.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 3569346d1..52d0d41aa 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1706,13 +1706,11 @@ int status_base_amotion_pc(struct map_session_data* sd, struct status_data* stat
amotion+= sd->aspd_add;
#ifdef RENEWAL
- if( sd->status.shield )
- {// bearing a shield decreases your ASPD by a fixed value depending on your class
+ if( sd->status.shield ) {// bearing a shield decreases your ASPD by a fixed value depending on your class
amotion += re_job_db[pc_class2idx(sd->status.class_)][SHIELD_ASPD];
}
- if( sd->sc.count )
- {// renewal absolute ASPD modifiers
+ if( sd->sc.count ) {// renewal absolute ASPD modifiers
int i;
if ( sd->sc.data[i=SC_ASPDPOTION3] ||
sd->sc.data[i=SC_ASPDPOTION2] ||
@@ -1723,6 +1721,8 @@ int status_base_amotion_pc(struct map_session_data* sd, struct status_data* stat
amotion -= 150;
else if( sd->sc.data[SC_SPEARQUICKEN] || sd->sc.data[SC_TWOHANDQUICKEN] )
amotion -= 70;
+ if( sd->sc.data[SC_ADRENALINE] )/* +7 for self, +6 for others */
+ amotion -= sd->sc.data[SC_ADRENALINE]->val2 ? 70 : 60;
}
#endif
@@ -4896,8 +4896,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
if(!sc || !sc->count)
return cap_value(aspd_rate,0,SHRT_MAX);
- if(!sc->data[SC_QUAGMIRE])
- {
+ if( !sc->data[SC_QUAGMIRE] ){
int max = 0;
if(sc->data[SC_STAR_COMFORT])
max = sc->data[SC_STAR_COMFORT]->val2;
@@ -4917,12 +4916,11 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
if(sc->data[SC_ADRENALINE2] &&
max < sc->data[SC_ADRENALINE2]->val3)
max = sc->data[SC_ADRENALINE2]->val3;
-
+#ifndef RENEWAL
if(sc->data[SC_ADRENALINE] &&
max < sc->data[SC_ADRENALINE]->val3)
max = sc->data[SC_ADRENALINE]->val3;
-#ifndef RENEWAL
if(sc->data[SC_SPEARQUICKEN] &&
max < sc->data[SC_SPEARQUICKEN]->val2)
max = sc->data[SC_SPEARQUICKEN]->val2;