diff --git a/config/creatures/castle.json b/config/creatures/castle.json
index 34f13b06b..d769f8679 100644
--- a/config/creatures/castle.json
+++ b/config/creatures/castle.json
@@ -57,6 +57,7 @@
 		"extraNames": [ "lightCrossbowman" ],
 		"faction": "castle",
 		"upgrades": ["marksman"],
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" : {
@@ -86,6 +87,7 @@
 		"index": 3,
 		"level": 2,
 		"faction": "castle",
+		"shots" : 24,
 		"abilities":
 		{
 			"shooter" : {
@@ -228,6 +230,7 @@
 		"level": 5,
 		"faction": "castle",
 		"upgrades": ["zealot"],
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" : {
@@ -257,6 +260,7 @@
 		"index": 9,
 		"level": 5,
 		"faction": "castle",
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" : {
diff --git a/config/creatures/conflux.json b/config/creatures/conflux.json
index dd0d9fc8a..78cb70ec1 100755
--- a/config/creatures/conflux.json
+++ b/config/creatures/conflux.json
@@ -127,6 +127,7 @@
 		"index": 127,
 		"level": 2,
 		"faction": "conflux",
+		"shots" : 24,
 		"abilities":
 		{
 			"nonLiving" : 
@@ -301,6 +302,7 @@
 		"level": 3,
 		"faction": "conflux",
 		"doubleWide" : true,
+		"shots" : 24,
 		"abilities":
 		{
 			"nonLiving" : 
@@ -472,11 +474,11 @@
 			{
 				"type" : "NON_LIVING"
 			},
-			"canFly" :
+			"energizes" :
 			{
 				"type" : "FLYING"
 			},
-			"spellcaster":
+			"spellcaster" :
 			{
 				"type" : "SPELLCASTER",
 				"subtype" : "spell.protectFire",
diff --git a/config/creatures/dungeon.json b/config/creatures/dungeon.json
index 39e6f8b67..4d7492983 100644
--- a/config/creatures/dungeon.json
+++ b/config/creatures/dungeon.json
@@ -138,6 +138,7 @@
 		"level": 3,
 		"faction": "dungeon",
 		"upgrades": ["evilEye"],
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" :
@@ -179,6 +180,7 @@
 		"index": 75,
 		"level": 3,
 		"faction": "dungeon",
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" :
@@ -221,6 +223,7 @@
 		"level": 4,
 		"faction": "dungeon",
 		"doubleWide" : true,
+		"shots" : 4,
 		"abilities":
 		{
 			"shooter" :
@@ -264,6 +267,7 @@
 		"level": 4,
 		"faction": "dungeon",
 		"doubleWide" : true,
+		"shots" : 8,
 		"abilities":
 		{
 			"shooter" :
diff --git a/config/creatures/fortress.json b/config/creatures/fortress.json
index ddcafe3a6..f834f993a 100644
--- a/config/creatures/fortress.json
+++ b/config/creatures/fortress.json
@@ -44,6 +44,7 @@
 		"faction": "fortress",
 		"upgrades": ["lizardWarrior"],
 		"hasDoubleWeek": true,
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" :
@@ -74,6 +75,7 @@
 		"index": 101,
 		"level": 2,
 		"faction": "fortress",
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" :
diff --git a/config/creatures/inferno.json b/config/creatures/inferno.json
index 491968747..cbea72a91 100755
--- a/config/creatures/inferno.json
+++ b/config/creatures/inferno.json
@@ -51,6 +51,7 @@
 		"faction": "inferno",
 		"upgrades": ["magog"],
 		"hasDoubleWeek": true,
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" :
@@ -81,6 +82,7 @@
 		"index": 45,
 		"level": 2,
 		"faction": "inferno",
+		"shots" : 24,
 		"abilities":
 		{
 			"shooter" :
@@ -353,7 +355,7 @@
 		"faction": "inferno",
 		"abilities":
 		{
-			"canFly" :
+			"teleports" :
 			{
 				"type" : "FLYING",
 				"subtype" : "movementTeleporting"
@@ -413,7 +415,7 @@
 		"faction": "inferno",
 		"abilities" :
 		{
-			"canFly" :
+			"teleports" :
 			{
 				"type" : "FLYING",
 				"subtype" : "movementTeleporting"
diff --git a/config/creatures/necropolis.json b/config/creatures/necropolis.json
index ebbb5dc0b..06a71382d 100644
--- a/config/creatures/necropolis.json
+++ b/config/creatures/necropolis.json
@@ -265,6 +265,7 @@
 		"index": 64,
 		"level": 5,
 		"faction": "necropolis",
+		"shots" : 12,
 		"abilities":
 		{
 			"undead" :
@@ -305,6 +306,7 @@
 		"index": 65,
 		"level": 5,
 		"faction": "necropolis",
+		"shots" : 24,
 		"abilities":
 		{
 			"undead" :
diff --git a/config/creatures/neutral.json b/config/creatures/neutral.json
index a8e7db89d..0e25c5231 100644
--- a/config/creatures/neutral.json
+++ b/config/creatures/neutral.json
@@ -323,6 +323,7 @@
 		"extraNames": [ "enchanters" ],
 		"faction": "neutral",
 		"excludeFromRandomization" : true,
+		"shots" : 32,
 		"abilities":
 		{
 			"shooter" :
@@ -410,6 +411,7 @@
 		"extraNames": [ "sharpshooters" ],
 		"faction": "neutral",
 		"excludeFromRandomization" : true,
+		"shots" : 32,
 		"abilities":
 		{
 			"shooter" :
@@ -448,6 +450,7 @@
 		"index": 138,
 		"level": 1,
 		"faction": "neutral",
+		"shots" : 24,
 		"abilities": 
 		{
 			"shooter" :
diff --git a/config/creatures/rampart.json b/config/creatures/rampart.json
index 7a64a1460..3b28901d7 100644
--- a/config/creatures/rampart.json
+++ b/config/creatures/rampart.json
@@ -101,6 +101,7 @@
 		"level": 3,
 		"faction": "rampart",
 		"upgrades": ["grandElf"],
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" :
@@ -131,7 +132,8 @@
 		"index": 19,
 		"level": 3,
 		"faction": "rampart",
-		"abilities": 
+		"shots" : 24,
+		"abilities" :
 		{
 			"shooter" :
 			{
diff --git a/config/creatures/special.json b/config/creatures/special.json
index f2457fcb4..4e528117a 100644
--- a/config/creatures/special.json
+++ b/config/creatures/special.json
@@ -37,6 +37,7 @@
 		"level": 0,
 		"faction": "neutral",
 		"doubleWide" : true,
+		"shots" : 24,
 		"abilities" :
 		{
 			"siegeWeapon" :
@@ -75,6 +76,7 @@
 		"level": 0,
 		"faction": "neutral",
 		"doubleWide" : true,
+		"shots" : 24,
 		"abilities" :
 		{
 			"siegeWeapon" :
@@ -163,8 +165,10 @@
 		"index": 149,
 		"level": 0,
 		"faction": "neutral",
+		"shots" : 99,
 		"abilities":
 		{
+			"siegeWeapon" : { "type" : "SIEGE_WEAPON" },
 			"shooter" : { "type" : "SHOOTER" },
 			"ignoreDefence" : { "type" : "ENEMY_DEFENCE_REDUCTION", "val" : 100 },
 			"noWallPenalty" : { "type" : "NO_WALL_PENALTY" },
diff --git a/config/creatures/stronghold.json b/config/creatures/stronghold.json
index b52a3cc82..7824a2b58 100644
--- a/config/creatures/stronghold.json
+++ b/config/creatures/stronghold.json
@@ -92,6 +92,7 @@
 		"level": 3,
 		"faction": "stronghold",
 		"upgrades": ["orcChieftain"],
+		"shots" : 12,
 		"abilities" :
 		{
 			"shooter" :
@@ -122,6 +123,7 @@
 		"index": 89,
 		"level": 3,
 		"faction": "stronghold",
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" :
@@ -274,6 +276,7 @@
 		"index": 94,
 		"level": 6,
 		"faction": "stronghold",
+		"shots" : 16,
 		"abilities" :
 		{
 			"shooter" :
@@ -310,6 +313,7 @@
 		"index": 95,
 		"level": 6,
 		"faction": "stronghold",
+		"shots" : 24,
 		"abilities":
 		{
 			"shooter" :
diff --git a/config/creatures/tower.json b/config/creatures/tower.json
index 259b6e056..99781a907 100644
--- a/config/creatures/tower.json
+++ b/config/creatures/tower.json
@@ -26,6 +26,7 @@
 		"index": 29,
 		"level": 1,
 		"faction": "tower",
+		"shots" : 8,
 		"abilities" :
 		{
 			"shooter" :
@@ -178,6 +179,7 @@
 		"index": 34,
 		"level": 4,
 		"faction": "tower",
+		"shots" : 24,
 		"abilities": 
 		{
 			"shooter" :
@@ -218,6 +220,7 @@
 		"index": 35,
 		"level": 4,
 		"faction": "tower",
+		"shots" : 24,
 		"abilities": 
 		{
 			"shooter" :
@@ -444,6 +447,7 @@
 		"index": 41,
 		"level": 7,
 		"faction": "tower",
+		"shots" : 24,
 		"abilities" :
 		{
 			"shooter" :