소스 검색

Tweaked Frenzy spell which now ends at the beginning of stacks turn, not at the end of turn (#1332).

DjWarmonger 12 년 전
부모
커밋
b925a75ecc
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      client/battle/CBattleAnimations.cpp
  2. 2 2
      config/spell_info.json

+ 1 - 1
client/battle/CBattleAnimations.cpp

@@ -229,7 +229,7 @@ CCreatureAnim::EAnimType CDefenceAnimation::getMyAnimType()
 	if(killed)
 		return CCreatureAnim::DEATH;
 
-	if (stack->valOfBonuses(Selector::durationType(Bonus::STACK_GETS_TURN)))
+	if (stack->valOfBonuses(Selector::durationType(Bonus::STACK_GETS_TURN).And(Selector::typeSubtype(Bonus::PRIMARY_SKILL, PrimarySkill::DEFENSE))))
 		return CCreatureAnim::DEFENCE;
 	return CCreatureAnim::HITTED;
 }

+ 2 - 2
config/spell_info.json

@@ -560,7 +560,7 @@
 					"type": 	"PRIMARY_SKILL",
 					"subtype": "primSkill.defence",
 					"valueType": "ADDITIVE_VALUE",
-					"duration": "ONE_BATTLE",
+					"duration": "N_TURNS",
 					"values":[-3,-3,-4,-5]
 				}
 			]
@@ -720,7 +720,7 @@
 			[
 				{
 					"type": 	"IN_FRENZY",
-					"duration": "N_TURNS",
+					"duration": "STACK_GETS_TURN",
 					"values":[100, 100, 150, 200]
 				}
 			]