Browse Source

Union and Increase AGI now stack. (bugreport:1155)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12502 54d463be-8e91-2dee-dedb-b68131a5f0ec
Kevin 17 years ago
parent
commit
e74c3c0466
2 changed files with 7 additions and 0 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 6 0
      src/map/status.c

+ 1 - 0
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]

+ 6 - 0
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])