diff options
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/map/status.c b/src/map/status.c index 95b63ba92..ebab67eb1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3635,26 +3635,27 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha if(sc->data[SC_WEDDING].timer!=-1)
speed += 300;
- //% increases (they don't stack, with the exception of Speedup1? @.@)
- if(sc->data[SC_SPEEDUP1].timer!=-1)
- speed -= speed * 50/100;
- if(sc->data[SC_RUN].timer!=-1)
- speed -= speed * 50/100;
- else if(sc->data[SC_SPEEDUP0].timer!=-1)
- speed -= speed * 25/100;
- else if(sc->data[SC_INCREASEAGI].timer!=-1)
- speed -= speed * 25/100;
- else if(sc->data[SC_FUSION].timer != -1)
- speed -= speed * 25/100;
- else if(sc->data[SC_CARTBOOST].timer!=-1)
- speed -= speed * 20/100;
- else if(sc->data[SC_BERSERK].timer!=-1)
- speed -= speed * 20/100;
- else if(sc->data[SC_AVOID].timer!=-1)
- speed -= speed * sc->data[SC_AVOID].val2/100;
- else if(sc->data[SC_WINDWALK].timer!=-1)
- speed -= speed * sc->data[SC_WINDWALK].val3/100;
-
+ if(sc->data[SC_GATLINGFEVER].timer==-1)
+ { //% increases (they don't stack, with the exception of Speedup1? @.@)
+ if(sc->data[SC_SPEEDUP1].timer!=-1)
+ speed -= speed * 50/100;
+ if(sc->data[SC_RUN].timer!=-1)
+ speed -= speed * 50/100;
+ else if(sc->data[SC_SPEEDUP0].timer!=-1)
+ speed -= speed * 25/100;
+ else if(sc->data[SC_INCREASEAGI].timer!=-1)
+ speed -= speed * 25/100;
+ else if(sc->data[SC_FUSION].timer != -1)
+ speed -= speed * 25/100;
+ else if(sc->data[SC_CARTBOOST].timer!=-1)
+ speed -= speed * 20/100;
+ else if(sc->data[SC_BERSERK].timer!=-1)
+ speed -= speed * 20/100;
+ else if(sc->data[SC_AVOID].timer!=-1)
+ speed -= speed * sc->data[SC_AVOID].val2/100;
+ else if(sc->data[SC_WINDWALK].timer!=-1)
+ speed -= speed * sc->data[SC_WINDWALK].val3/100;
+ }
//% reductions (they stack)
if(sc->data[SC_DANCING].timer!=-1 && sc->data[SC_DANCING].val3&0xFFFF)
speed += speed*(sc->data[SC_DANCING].val3&0xFFFF)/100;
|