Explorar el Código

Fixed bugreport:6869 where some skills of Sura are affected by SA_DISPELL.
Fixed bugreport:6867 remove the heal effect animation of SR_GENTLETOUCH_CURE which is not official.
Follow up r16856 where AM_POTIONPITCHER should not affect targets under the SC_EXTREMITYFIST2(EF SP recovery block).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16874 54d463be-8e91-2dee-dedb-b68131a5f0ec

rud0lp20 hace 12 años
padre
commit
6311946402
Se han modificado 1 ficheros con 9 adiciones y 3 borrados
  1. 9 3
      src/map/skill.c

+ 9 - 3
src/map/skill.c

@@ -6181,6 +6181,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				clif_skill_nodamage(NULL,bl,AL_HEAL,hp,1);
 			if( sp > 0 )
 				clif_skill_nodamage(NULL,bl,MG_SRECOVERY,sp,1);
+#ifdef RENEWAL
+			if( tsc && tsc->data[SC_EXTREMITYFIST2] )
+				sp = 0;
+#endif
 			status_heal(bl,hp,sp,0);
 		}
 		break;
@@ -6292,7 +6296,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				case SC_REFRESH:		case SC_STONEHARDSKIN:	case SC_VITALITYACTIVATION:
 				case SC_FIGHTINGSPIRIT:	case SC_ABUNDANCE:		case SC__SHADOWFORM:
 				case SC_LEADERSHIP:		case SC_GLORYWOUNDS:	case SC_SOULCOLD:
-				case SC_HAWKEYES:		case SC_GUILDAURA:	case SC_PUSH_CART:
+				case SC_HAWKEYES:		case SC_GUILDAURA:		case SC_PUSH_CART:
+				case SC_RAISINGDRAGON:	case SC_GT_ENERGYGAIN:	case SC_GT_CHANGE:
+				case SC_GT_REVITALIZE:
 #ifdef RENEWAL
 				case SC_EXTREMITYFIST2:
 #endif
@@ -7665,7 +7671,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				case SC_STEALTHFIELD_MASTER: case SC_STEALTHFIELD:
 				case SC_LEADERSHIP:		case SC_GLORYWOUNDS:	case SC_SOULCOLD:
 				case SC_HAWKEYES:		case SC_GUILDAURA:	case SC_PUSH_CART:
-				case SC_PARTYFLEE:	
+				case SC_PARTYFLEE:		case SC_GT_REVITALIZE:
+				case SC_RAISINGDRAGON:	case SC_GT_ENERGYGAIN:	case SC_GT_CHANGE:
 #ifdef RENEWAL
 				case SC_EXTREMITYFIST2:
 #endif
@@ -8235,7 +8242,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 
 			heal = 120 * skilllv + status_get_max_hp(bl) * (2 + skilllv) / 100;
 			status_heal(bl, heal, 0, 0);
-			clif_skill_nodamage(src, bl, AL_HEAL, heal, 1);
 
 			if( (tsc && tsc->opt1) && (rnd()%100 < ((skilllv * 5) + (status_get_dex(src) + status_get_lv(src)) / 4) - (1 + (rnd() % 10))) )
 			{