diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/status.c | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a101d6186..1c52e2582 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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.
2006/10/02
+ * Added the opt3 values to Eske [Skotlex]
* Fixed the txt->sql converter only saving the very first character
permanent variable. [Skotlex]
* Fixed the txt->sql converter saving account-wide variables as
diff --git a/src/map/status.c b/src/map/status.c index de520def0..bdb44c7a4 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3615,10 +3615,10 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha speed -= speed * 50/100;
else if(sc->data[SC_SPEEDUP0].timer!=-1)
speed -= speed * 25/100;
- else if(sc->data[SC_FUSION].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)
@@ -3631,14 +3631,14 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha //% 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;
+ if(sc->data[SC_DECREASEAGI].timer!=-1)
+ speed = speed * 100/75;
if(sc->data[SC_STEELBODY].timer!=-1)
speed = speed * 100/75;
if(sc->data[SC_QUAGMIRE].timer!=-1)
speed = speed * 100/50;
if(sc->data[SC_SUITON].timer!=-1 && 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)
speed = speed * 100/sc->data[SC_DONTFORGETME].val3;
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 -md->master_id;
}
-
}
break;
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;
break;
case SC_ENERGYCOAT:
+ case SC_SKE:
sc->opt3 |= 4;
opt_flag = 0;
break;
@@ -6250,6 +6250,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) opt_flag = 0;
break;
case SC_ENERGYCOAT:
+ case SC_SKE:
sc->opt3 &= ~4;
opt_flag = 0;
break;
|