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

- Added the opt3 values to Eske

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8920 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-10-02 16:42:04 +00:00
parent 94f10d7d39
commit e6ceed4220
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ 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.
2006/10/02 2006/10/02
* Added the opt3 values to Eske [Skotlex]
* Fixed the txt->sql converter only saving the very first character * Fixed the txt->sql converter only saving the very first character
permanent variable. [Skotlex] permanent variable. [Skotlex]
* Fixed the txt->sql converter saving account-wide variables as * Fixed the txt->sql converter saving account-wide variables as

11
src/map/status.c
View File

@ -3615,10 +3615,10 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
speed -= speed * 50/100; speed -= speed * 50/100;
else if(sc->data[SC_SPEEDUP0].timer!=-1) else if(sc->data[SC_SPEEDUP0].timer!=-1)
speed -= speed * 25/100; speed -= speed * 25/100;
else if(sc->data[SC_FUSION].timer != -1)
speed -= speed * 25/100;
else if(sc->data[SC_INCREASEAGI].timer!=-1) else if(sc->data[SC_INCREASEAGI].timer!=-1)
speed -= speed * 25/100; speed -= speed * 25/100;
else if(sc->data[SC_FUSION].timer != -1)
speed -= speed * 25/100;
else if(sc->data[SC_CARTBOOST].timer!=-1) else if(sc->data[SC_CARTBOOST].timer!=-1)
speed -= speed * 20/100; speed -= speed * 20/100;
else if(sc->data[SC_BERSERK].timer!=-1) else if(sc->data[SC_BERSERK].timer!=-1)
@ -3631,14 +3631,14 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
//% reductions (they stack) //% reductions (they stack)
if(sc->data[SC_DANCING].timer!=-1 && sc->data[SC_DANCING].val3&0xFFFF) if(sc->data[SC_DANCING].timer!=-1 && sc->data[SC_DANCING].val3&0xFFFF)
speed += speed*(sc->data[SC_DANCING].val3&0xFFFF)/100; speed += speed*(sc->data[SC_DANCING].val3&0xFFFF)/100;
if(sc->data[SC_DECREASEAGI].timer!=-1)
speed = speed * 100/75;
if(sc->data[SC_STEELBODY].timer!=-1) if(sc->data[SC_STEELBODY].timer!=-1)
speed = speed * 100/75; speed = speed * 100/75;
if(sc->data[SC_QUAGMIRE].timer!=-1) if(sc->data[SC_QUAGMIRE].timer!=-1)
speed = speed * 100/50; speed = speed * 100/50;
if(sc->data[SC_SUITON].timer!=-1 && sc->data[SC_SUITON].val3) if(sc->data[SC_SUITON].timer!=-1 && sc->data[SC_SUITON].val3)
speed = speed * 100/sc->data[SC_SUITON].val3; speed = speed * 100/sc->data[SC_SUITON].val3;
if(sc->data[SC_DECREASEAGI].timer!=-1)
speed = speed * 100/75;
if(sc->data[SC_DONTFORGETME].timer!=-1) if(sc->data[SC_DONTFORGETME].timer!=-1)
speed = speed * 100/sc->data[SC_DONTFORGETME].val3; speed = speed * 100/sc->data[SC_DONTFORGETME].val3;
if(sc->data[SC_DEFENDER].timer!=-1) if(sc->data[SC_DEFENDER].timer!=-1)
@ -4072,7 +4072,6 @@ int status_get_party_id(struct block_list *bl)
return msd->status.party_id; return msd->status.party_id;
return -md->master_id; return -md->master_id;
} }
} }
break; break;
case BL_HOM: case BL_HOM:
@ -5709,6 +5708,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
opt_flag = 0; opt_flag = 0;
break; break;
case SC_ENERGYCOAT: case SC_ENERGYCOAT:
case SC_SKE:
sc->opt3 |= 4; sc->opt3 |= 4;
opt_flag = 0; opt_flag = 0;
break; break;
@ -6250,6 +6250,7 @@ int status_change_end( struct block_list* bl , int type,int tid )
opt_flag = 0; opt_flag = 0;
break; break;
case SC_ENERGYCOAT: case SC_ENERGYCOAT:
case SC_SKE:
sc->opt3 &= ~4; sc->opt3 &= ~4;
opt_flag = 0; opt_flag = 0;
break; break;