Expert FIRE_SHIELD should not be massive

config/spells/timed.json

@@ -1,17 +1,17 @@
 {
 	"shield" : {
 		"index" : 27,
-		"targetType" : "CREATURE",			
-		
+		"targetType" : "CREATURE",
+
 		"animation":{
 			"affect":["C13SPE0"]
-		},		
+		},
 		"sounds": {
 			"cast": "SHIELD"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"generalDamageReduction" : {
@@ -32,16 +32,16 @@
 	"airShield" : {
 		"index" : 28,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C01SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "AIRSHELD"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"generalDamageReduction" : {
@@ -62,19 +62,19 @@
 	"fireShield" : {
 		"index" : 29,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C05SPF0"]
-		},		
+		},
 		"sounds": {
 			"cast": "FIRESHIE"
 		},
 		// It looks that fireshield has two separate sounds
 		//			"soundfile":"FIRESHLD.wav"
-		//		
+		//
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"fireShield" : {
@@ -82,9 +82,6 @@
 						"duration" : "N_TURNS"
 					}
 				}
-			},
-			"expert":{
-				"range" : "X"
 			}
 		},
 		"flags" : {
@@ -94,10 +91,10 @@
 	"protectAir" : {
 		"index" : 30,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C11SPE0"]
-		},		
+		},
 		"sounds": {
 			"cast": "PROTECTA"
 		},
@@ -124,10 +121,10 @@
 	"protectFire" : {
 		"index" : 31,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C11SPW0"]
-		},		
+		},
 		"sounds": {
 			"cast": "PROTECTF"
 		},
@@ -154,16 +151,16 @@
 	"protectWater" : {
 		"index" : 32,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C11SPF0"]
-		},		
+		},
 		"sounds": {
 			"cast": "PROTECTW"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"spellDamageReduction" : {
@@ -184,10 +181,10 @@
 	"protectEarth" : {
 		"index" : 33,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C13SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "PROTECTE"
 		},
@@ -214,10 +211,10 @@
 	"antiMagic" : {
 		"index" : 34,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C02SPE0"]
-		},		
+		},
 		"sounds": {
 			"cast": "ANTIMAGK"
 		},
@@ -227,7 +224,7 @@
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"levelSpellImmunity" : {
-						"val" : 3,					
+						"val" : 3,
 						"type" : "LEVEL_SPELL_IMMUNITY",
 						"valueType" : "INDEPENDENT_MAX",
 						"duration" : "N_TURNS"
@@ -257,10 +254,10 @@
 	"magicMirror" : {
 		"index" : 36,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C02SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "BACKLASH"
 		},
@@ -284,16 +281,16 @@
 	"bless" : {
 		"index" : 41,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C01SPW"] //C01SPW0
-		},		
+		},
 		"sounds": {
 			"cast": "BLESS"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"alwaysMaximumDamage" : {
@@ -322,16 +319,16 @@
 	"curse" : {
 		"index" : 42,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C04SPW"]//C04SPW0
-		},		
+		},
 		"sounds": {
 			"cast": "CURSE"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"alwaysMinimumDamage" : {
@@ -362,20 +359,20 @@
 	"bloodlust" : {
 		"index" : 43,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["SP12_"] //???
-		},		
+		},
 		"sounds": {
 			"cast": "BLOODLUS"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"primarySkill" : {
-						"val" : 3,					
+						"val" : 3,
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.attack",
 						"effectRange" : "ONLY_MELEE_FIGHT",
@@ -412,10 +409,10 @@
 	"precision" : {
 		"index" : 44,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C12SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "PRECISON"
 		},
@@ -459,22 +456,22 @@
 	"weakness" : {
 		"index" : 45,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C0ACID"]
-		},		
+		},
 		"sounds": {
 			"cast": "WEAKNESS"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"primarySkill" : {
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.attack",
-						"val" : -3,						
+						"val" : -3,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -506,22 +503,22 @@
 	"stoneSkin" : {
 		"index" : 46,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C16SPE"] //C16SPE0
-		},		
+		},
 		"sounds": {
 			"cast": "TUFFSKIN"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"primarySkill" : {
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.defence",
-						"val" : 3,						
+						"val" : 3,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -549,11 +546,11 @@
 	"disruptingRay" : {
 		"index" : 47,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C07SPA1"],
 			"projectile":[{"defName":"C07SPA0"}]//???
-		},		
+		},
 		"sounds": {
 			"cast": "DISRUPTR"
 		},
@@ -565,7 +562,7 @@
 					"primarySkill" : {
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.defence",
-						"val" : -3,						
+						"val" : -3,
 						"valueType" : "ADDITIVE_VALUE",
 						"duration" : "N_TURNS"
 					}
@@ -593,34 +590,34 @@
 	"prayer" : {
 		"index" : 48,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":[{"defName":"C10SPW", "verticalPosition":"bottom"}]
-		},		
+		},
 		"sounds": {
 			"cast": "PRAYER"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"attack" : {
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.attack",
-						"val" : 2,						
+						"val" : 2,
 						"duration" : "N_TURNS"
 					},
 					"defence" : {
 						"type" : "PRIMARY_SKILL",
 						"subtype" : "primSkill.defence",
-						"val" : 2,						
+						"val" : 2,
 						"duration" : "N_TURNS"
 					},
 					"stacksSpeed" : {
 						"addInfo" : 0,
 						"type" : "STACKS_SPEED",
-						"val" : 2,						
+						"val" : 2,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -660,21 +657,21 @@
 	"mirth" : {
 		"index" : 49,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C09SPW0"]
-		},		
+		},
 		"sounds": {
 			"cast": "MIRTH"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"morale" : {
 						"type" : "MORALE",
-						"val" : 1,						
+						"val" : 1,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -700,7 +697,7 @@
 		},
 		"absoluteImmunity":{
 			"SIEGE_WEAPON": true,
-			"UNDEAD": true,		
+			"UNDEAD": true,
 		},
 		"immunity" : {
 			"MIND_IMMUNITY": true,
@@ -713,21 +710,21 @@
 	"sorrow" : {
 		"index" : 50,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C14SPE0"]
-		},		
+		},
 		"sounds": {
 			"cast": "SORROW"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"morale" : {
 						"type" : "MORALE",
-						"val" : -1,						
+						"val" : -1,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -753,7 +750,7 @@
 		},
 		"absoluteImmunity":{
 			"SIEGE_WEAPON": true,
-			"UNDEAD": true,		
+			"UNDEAD": true,
 		},
 		"immunity" : {
 			"MIND_IMMUNITY": true,
@@ -766,21 +763,21 @@
 	"fortune" : {
 		"index" : 51,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C09SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "FORTUNE"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"luck" : {
 						"type" : "LUCK",
-						"val" : 1,						
+						"val" : 1,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -811,21 +808,21 @@
 	"misfortune" : {
 		"index" : 52,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C10SPF0"]
-		},		
+		},
 		"sounds": {
 			"cast": "MISFORT"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"luck" : {
 						"type" : "LUCK",
-						"val" : -1,						
+						"val" : -1,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -856,22 +853,22 @@
 	"haste" : {
 		"index" : 53,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C15SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "HASTE"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"stacksSpeed" : {
 						"addInfo" : 0,
 						"type" : "STACKS_SPEED",
-						"val" : 3,						
+						"val" : 3,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -905,22 +902,22 @@
 	"slow" : {
 		"index" : 54,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":[{"defName":"C09SPE0", "verticalPosition":"bottom"}]
-		},		
+		},
 		"sounds": {
 			"cast": "MUCKMIRE"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"stacksSpeed" : {
 						"addInfo" : 0,
 						"type" : "STACKS_SPEED",
-						"val" : -25,						
+						"val" : -25,
 						"valueType" : "PERCENT_TO_ALL",
 						"duration" : "N_TURNS"
 					}
@@ -956,10 +953,10 @@
 	"slayer" : {
 		"index" : 55,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C13SPW0"]
-		},		
+		},
 		"sounds": {
 			"cast": "SLAYER"
 		},
@@ -1010,10 +1007,10 @@
 	"frenzy" : {
 		"index" : 56,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C08SPF0"]
-		},		
+		},
 		"sounds": {
 			"cast": "FRENZY"
 		},
@@ -1024,7 +1021,7 @@
 				"effects" : {
 					"inFrenzy" : {
 						"type" : "IN_FRENZY",
-						"val" : 100,						
+						"val" : 100,
 						"duration" : "STACK_GETS_TURN"
 					}
 				}
@@ -1055,21 +1052,21 @@
 	"counterstrike" : {
 		"index" : 58,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C04SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "CNTRSTRK"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"additionalRetaliation" : {
 						"type" : "ADDITIONAL_RETALIATION",
-						"val" : 1,						
+						"val" : 1,
 						"duration" : "N_TURNS"
 					}
 				}
@@ -1100,10 +1097,10 @@
 	"berserk" : {
 		"index" : 59,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C01SPF"] //C01SPF0
-		},		
+		},
 		"sounds": {
 			"cast": "BERSERK"
 		},
@@ -1164,10 +1161,10 @@
 	"hypnotize" : {
 		"index" : 60,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C10SPA0"]
-		},		
+		},
 		"sounds": {
 			"cast": "HYPNOTIZ"
 		},
@@ -1225,17 +1222,17 @@
 	},
 	"forgetfulness" : {
 		"index" : 61,
-		"targetType" : "CREATURE", 
-		
+		"targetType" : "CREATURE",
+
 		"animation":{
 			"affect":["C06SPW"]//C06SPW0
-		},		
+		},
 		"sounds": {
 			"cast": "FORGET"
 		},
 		"levels" : {
 			"base":{
-				"range" : "0",			
+				"range" : "0",
 				"targetModifier":{"smart":true},
 				"effects" : {
 					"forgetful" : {
@@ -1292,10 +1289,10 @@
 	"blind" : {
 		"index" : 62,
 		"targetType" : "CREATURE",
-		
+
 		"animation":{
 			"affect":["C02SPF0"]
-		},		
+		},
 		"sounds": {
 			"cast": "BLIND"
 		},