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

Moved phoenix immunity to .json. This fixes #978

Browse Source
This commit is contained in:
DjWarmonger 2013-03-04 19:38:09 +00:00
parent 5252e2aefe
commit ae7f3560a3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/creatures/conflux.json
View File

@ -298,6 +298,7 @@
"level": 7,
"faction": "conflux",
"upgrades": ["phoenix"],
"abilities": [ ["FIRE_IMMUNITY", 0, 0, 0] ],
"graphics" :
{
"animation": "CFBIRD.DEF"
@ -317,7 +318,8 @@
"level": 7,
"faction": "conflux",
"abilities": [ [ "CASTS", 1, 0, 0 ], //Phoenix rebirths once
[ "REBIRTH", 20, 0, 0 ] ], //20% of stack is resurrected
["FIRE_IMMUNITY", 0, 0, 0],
[ "REBIRTH", 20, 0, 0 ] ], //20% of stack is resurrected
"graphics" :
{
"animation": "CPHX.DEF"

1
lib/CCreatureHandler.cpp
View File

@ -226,7 +226,6 @@ void CCreatureHandler::loadBonuses(CCreature & ncre, std::string bonuses)
("CATAPULT",Bonus::CATAPULT)
("MULTI_HEADED",Bonus::ATTACKS_ALL_ADJACENT)
("IMMUNE_TO_MIND_SPELLS",Bonus::MIND_IMMUNITY)
("IMMUNE_TO_FIRE_SPELLS",Bonus::FIRE_IMMUNITY)
("HAS_EXTENDED_ATTACK",Bonus::TWO_HEX_ATTACK_BREATH);
auto hasAbility = [&](const std::string name) -> bool