games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
DjWarmonger 2013-07-17 10:54:07 +00:00
parent 43db5587a1
commit b925a75ecc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/battle/CBattleAnimations.cpp
View File

@ -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;
}

4
config/spell_info.json
View File

@ -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]
}
]