summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/status.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a8e379c64..7fc31fcb6 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/05
+ * Union and Increase AGI now stack. (r12502) [Kevin]
* Union now consumes sp when not soul linked. (r12499) [Kevin]
* Running into a wall/npc/pc/mob no longer enables spurt. (r12498) [Kevin]
* Fixed unable to move after using a skill to break out of sprint. (r12497) [Kevin]
diff --git a/src/map/status.c b/src/map/status.c
index 4db508cb2..d9c72c123 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3725,7 +3725,13 @@ static unsigned short status_calc_speed(struct block_list *bl, struct status_cha
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])