Sfoglia il codice sorgente

* Fixed the incorrect DEF reduction of Joint Beat (bugreport:3051)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13751 54d463be-8e91-2dee-dedb-b68131a5f0ec
Inkfish 16 anni fa
parent
commit
bba5e225cc
2 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. 2 1
      Changelog-Trunk.txt
  2. 3 5
      src/map/status.c

+ 2 - 1
Changelog-Trunk.txt

@@ -3,7 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 09/05/10
-	* Magnetic Earth will never stack(bugreport:2568) [Inkfish]
+	* Magnetic Earth will never stack (bugreport:2568) [Inkfish]
+	* Fixed Joint Beat incorrect DEF reduction (bugreport:3051) [Inkfish]
 09/05/09
 	* Fixed GX's skill level modifier is missing [Inkfish]
 	* Fixed some known and unknown player attached NPC timer problems [Inkfish]

+ 3 - 5
src/map/status.c

@@ -3758,11 +3758,9 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
 		def2 -= def2 * 50/100;
 	if(sc->data[SC_PROVOKE])
 		def2 -= def2 * sc->data[SC_PROVOKE]->val4/100;
-	if(sc->data[SC_JOINTBEAT]){
-		def2 -= def2 *
-			( ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 )
-			+ ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST    ? 25 : 0 ) );
-	}
+	if(sc->data[SC_JOINTBEAT])
+		def2 -= def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_SHOULDER ? 50 : 0 ) / 100
+			  + def2 * ( sc->data[SC_JOINTBEAT]->val2&BREAK_WAIST ? 25 : 0 ) / 100;
 	if(sc->data[SC_FLING])
 		def2 -= def2 * (sc->data[SC_FLING]->val3)/100;