From 54369501190eaabebec864ddc1f9403b4f9cc9fa Mon Sep 17 00:00:00 2001
From: DjWarmonger <warmonger@vp.pl>
Date: Sat, 25 May 2013 07:21:02 +0000
Subject: [PATCH] Fixed abilities of Efreet.

---
 config/creatures/inferno.json | 10 ++++++----
 server/CGameHandler.cpp       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/creatures/inferno.json b/config/creatures/inferno.json
index e00fece33..bb2839ba5 100644
--- a/config/creatures/inferno.json
+++ b/config/creatures/inferno.json
@@ -266,7 +266,8 @@
 			},
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY"
+				"type" : "FIRE_IMMUNITY",
+				"subtype" : 0
 			}
 		},
 		"upgrades": ["efreetSultan"],
@@ -308,12 +309,13 @@
 			},
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY"
+				"type" : "FIRE_IMMUNITY",
+				"subtype" : 0
 			},
 			"fireShield" :
 			{
 				"type" : "FIRE_SHIELD",
-				"subtype" : 36 //FIXME: what is this magic number for?
+				"val" : 30
 			}
 		},
 		"graphics" :
@@ -398,7 +400,7 @@
 			"hateArchAngels" : 
 			{
 				"type" : "HATE",
-				"subtype" : "creature.archangel",
+				"subtype" : "creature.angel",
 				"val" : 50
 			},
 			"FLYING_ARMY" :
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index 57ca083c5..8a1c9368a 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -804,7 +804,7 @@ void CGameHandler::applyBattleEffects(BattleAttack &bat, const CStack *att, cons
 		bsa.flags |= BattleStackAttacked::EFFECT;
 		bsa.effect = 11;
 
-		bsa.damageAmount = (bsa.damageAmount * def->valOfBonuses(Bonus::FIRE_SHIELD)) / 100;
+		bsa.damageAmount = (bsa.damageAmount * def->valOfBonuses(Bonus::FIRE_SHIELD)) / 100; //TODO: scale with attack/defense
 		att->prepareAttacked(bsa);
 		bat.bsa.push_back(bsa);
 	}