immunities: polishing

config/bonuses.json

@@ -19,14 +19,6 @@
 		}
 	},
 
-	"AIR_IMMUNITY":
-	{
-		"graphics":
-		{
-			"icon":  "zvs/Lib1.res/E_SPAIR1"
-		}
-	},
-
 	"ATTACKS_ALL_ADJACENT":
 	{
 		"graphics":
@@ -137,14 +129,6 @@
 		"hidden": true
 	},
 
-	"EARTH_IMMUNITY":
-	{
-		"graphics":
-		{
-			"icon":  "zvs/Lib1.res/E_SPEATH1"
-		}
-	},
-
 	"ENCHANTER":
 	{
 		"graphics":
@@ -169,14 +153,6 @@
 		}
 	},
 
-	"FIRE_IMMUNITY":
-	{
-		"graphics":
-		{
-			"icon":  "zvs/Lib1.res/E_SPFIRE1"
-		}
-	},
-
 	"FIRE_SHIELD":
 	{
 		"graphics":
@@ -585,14 +561,6 @@
 		"hidden": true
 	},
 	
-	"WATER_IMMUNITY":
-	{
-		"graphics":
-		{
-			"icon":  "zvs/Lib1.res/E_SPWATER1"
-		}
-	},
-
 	"WIDE_BREATH":
 	{
 		"graphics":

config/creatures/conflux.json

@@ -154,8 +154,8 @@
 			},
 			"immuneToFire" : 
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			},
 			"frostRingVulnerablity" :
 			{
@@ -246,10 +246,15 @@
 				"subtype" : "spell.armageddon",
 				"val" : 100
 			},
-			"immuneToWater" :
+			"immuneToIceBolt" :
 			{
-				"type" : "WATER_IMMUNITY",
-				"subtype" : 2 //immune to damage spells only
+				"type" : "SPELL_IMMUNITY",
+				"subtype" : "spell.iceBolt"
+			},
+			"immuneToFrostRing" :
+			{
+				"type" : "SPELL_IMMUNITY",
+				"subtype" : "spell.frostRing"
 			},
 			"oppositeFire" :
 			{
@@ -440,10 +445,15 @@
 				"subtype" : "spell.armageddon",
 				"val" : 100
 			},
-			"immuneToWater" :
+			"immuneToIceBolt" :
 			{
-				"type" : "WATER_IMMUNITY",
-				"subtype" : 2 //immune to damage spells only
+				"type" : "SPELL_IMMUNITY",
+				"subtype" : "spell.iceBolt"
+			},
+			"immuneToFrostRing" :
+			{
+				"type" : "SPELL_IMMUNITY",
+				"subtype" : "spell.frostRing"
 			},
 			"oppositeFire" :
 			{
@@ -661,8 +671,8 @@
 			},
 			"immuneToFire" : 
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			},
 			"frostRingVulnerablity" :
 			{
@@ -732,8 +742,8 @@
 		{
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0 //this IS important
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			}
 		},
 		"graphics" :
@@ -763,8 +773,8 @@
 			},
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0 //this IS important
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			},
 			"rebirth" : 
 			{

config/creatures/inferno.json

@@ -272,8 +272,8 @@
 			},
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			}
 		},
 		"upgrades": ["efreetSultan"],
@@ -315,8 +315,8 @@
 			},
 			"immuneToFire" :
 			{
-				"type" : "FIRE_IMMUNITY",
-				"subtype" : 0
+				"type" : "SPELL_SCHOOL_IMMUNITY",
+				"subtype" : "spellSchool.fire"
 			},
 			"fireShield" :
 			{

lib/CBonusTypeHandler.cpp

@@ -118,9 +118,9 @@ std::string CBonusTypeHandler::bonusToGraphics(const std::shared_ptr<Bonus> & bo
 		}
 		break;
 	}
-		//	fileName = "E_FIRE.bmp"; //fire damage
-		//	fileName = "E_COLD.bmp"; //cold damage
-		//	fileName = "E_LIGHT.bmp"; //lightning damage
+	//	fileName = "E_FIRE.bmp"; //fire damage
+	//	fileName = "E_COLD.bmp"; //cold damage
+	//	fileName = "E_LIGHT.bmp"; //lightning damage
 	case BonusType::NEGATIVE_EFFECTS_IMMUNITY:
 	{
 		switch(bonus->subtype)