浏览代码

Moved phoenix immunity to .json. This fixes #978

DjWarmonger 12 年之前
父节点
当前提交
ae7f3560a3
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 3 1
      config/creatures/conflux.json
  2. 0 1
      lib/CCreatureHandler.cpp

+ 3 - 1
config/creatures/conflux.json

@@ -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"

+ 0 - 1
lib/CCreatureHandler.cpp

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