summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-06 19:05:34 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-06 19:05:34 +0000
commite0c532fc98f099e9ae82ffd2423673748117500c (patch)
treefb1cc44f9e3aac581abced5d7de74159767f0186
parentdb67fc53edf96f4fe837afc85733ed958b92f5b2 (diff)
downloadhercules-e0c532fc98f099e9ae82ffd2423673748117500c.tar.gz
hercules-e0c532fc98f099e9ae82ffd2423673748117500c.tar.bz2
hercules-e0c532fc98f099e9ae82ffd2423673748117500c.tar.xz
hercules-e0c532fc98f099e9ae82ffd2423673748117500c.zip
Changed Union/Increase AGI stack fix (it should work now). (bugreport:1155)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12506 54d463be-8e91-2dee-dedb-b68131a5f0ec
-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])