Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sprint, Fusion, and Increase AGI now stack independently. The other speed buffs still don't take affect if you have any of these three. (bugreport:1155)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12508 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Kevin 2008-04-06 22:01:49 +00:00
parent eda5b50aa1
commit 1e54725b26
2 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/06 2008/04/06
* Sprint, Fusion, and Increase AGI now stack independently.
- The others still don't take affect if you have any of these three. (r12508) [Kevin]
* Mind Sensing no longer gives an xp bonus on bosses. (r12507) [Kevin] * Mind Sensing no longer gives an xp bonus on bosses. (r12507) [Kevin]
* Changed Union/Increase AGI stack fix (it should work now). (r12506) [Kevin] * Changed Union/Increase AGI stack fix (it should work now). (r12506) [Kevin]
* Fixed seven wind not allowing ghost/shadow. (r12505) [Kevin] * Fixed seven wind not allowing ghost/shadow. (r12505) [Kevin]

55
src/map/status.c
View File

@ -3701,41 +3701,54 @@ static signed short status_calc_mdef2(struct block_list *bl, struct status_chang
static unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc, int speed) static unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc, int speed)
{ {
int new_speed = speed;
if(!sc || !sc->count) if(!sc || !sc->count)
return cap_value(speed,10,USHRT_MAX); return cap_value(speed,10,USHRT_MAX);
// Fixed reductions // Fixed reductions
if(sc->data[SC_CURSE]) if(sc->data[SC_CURSE])
speed += 450; new_speed += 450;
if(sc->data[SC_SWOO]) if(sc->data[SC_SWOO])
speed += 450; //Let's use Curse's slow down momentarily (exact value unknown) new_speed += 450; //Let's use Curse's slow down momentarily (exact value unknown)
if(sc->data[SC_WEDDING]) if(sc->data[SC_WEDDING])
speed += 300; new_speed += 300;
if(!sc->data[SC_GATLINGFEVER]) if(!sc->data[SC_GATLINGFEVER])
{ //% increases (they don't stack, with a few exceptions) { //These two stack with everything (but only one of them)
if(sc->data[SC_SPEEDUP1]) if(sc->data[SC_SPEEDUP1])
speed -= speed * 50/100; new_speed -= new_speed * 50/100;
else if(sc->data[SC_AVOID]) else if(sc->data[SC_AVOID])
speed -= speed * sc->data[SC_AVOID]->val2/100; new_speed -= new_speed * sc->data[SC_AVOID]->val2/100;
speed = new_speed;
//These stack independently
if(sc->data[SC_RUN]) if(sc->data[SC_RUN])
speed -= speed * 50/100; new_speed -= new_speed * 50/100;
else if(sc->data[SC_INCREASEAGI] && sc->data[SC_FUSION]) if(sc->data[SC_INCREASEAGI])
speed -= speed * 50/100; new_speed -= new_speed * 25/100;
else if(sc->data[SC_SPEEDUP0]) if(sc->data[SC_FUSION])
speed -= speed * 25/100; new_speed -= new_speed * 25/100;
else if(sc->data[SC_INCREASEAGI])
speed -= speed * 25/100;
else if(sc->data[SC_FUSION]) //These only apply if you don't have increase agi and/or fusion and/or sprint
speed -= speed * 25/100; if(speed == new_speed)
else if(sc->data[SC_CARTBOOST]) {
speed -= speed * 20/100; if(sc->data[SC_SPEEDUP0])
else if(sc->data[SC_BERSERK]) new_speed -= new_speed * 25/100;
speed -= speed * 20/100; else if(sc->data[SC_CARTBOOST])
else if(sc->data[SC_WINDWALK]) new_speed -= new_speed * 20/100;
speed -= speed * sc->data[SC_WINDWALK]->val3/100; else if(sc->data[SC_BERSERK])
new_speed -= new_speed * 20/100;
else if(sc->data[SC_WINDWALK])
new_speed -= new_speed * sc->data[SC_WINDWALK]->val3/100;
}
} }
speed = new_speed;
//% reductions (they stack) //% reductions (they stack)
if(sc->data[SC_DANCING] && sc->data[SC_DANCING]->val3&0xFFFF) if(sc->data[SC_DANCING] && sc->data[SC_DANCING]->val3&0xFFFF)
speed += speed*(sc->data[SC_DANCING]->val3&0xFFFF)/100; speed += speed*(sc->data[SC_DANCING]->val3&0xFFFF)/100;