summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/status.c8
2 files changed, 3 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index f722e6fd7..6ffb6d069 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.
2008/04/06
+ * Changed Union/Increase AGI stack fix (it should work now). (r12506) [Kevin]
* Fixed seven wind not allowing ghost/shadow. (r12505) [Kevin]
* Added Moscovia to the list of @go destinations [Toms]
2008/04/05
diff --git a/src/map/status.c b/src/map/status.c
index 1013a711f..bd2884569 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3721,18 +3721,14 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
if(sc->data[SC_RUN])
speed -= speed * 50/100;
+ else if(sc->data[SC_INCREASEAGI] && sc->data[SC_FUSION])
+ speed -= speed * 50/100;
else if(sc->data[SC_SPEEDUP0])
speed -= speed * 25/100;
else if(sc->data[SC_INCREASEAGI])
speed -= speed * 25/100;
else if(sc->data[SC_FUSION])
- {
speed -= speed * 25/100;
-
- //Union and Increase AGI should stack [Kevin]
- if(sc->data[SC_INCREASEAGI])
- speed -= speed * 25/100;
- }
else if(sc->data[SC_CARTBOOST])
speed -= speed * 20/100;
else if(sc->data[SC_BERSERK])