X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/bd7288335390bc941dde7a1ad728bc0000d8386a..67ec2894e74854c57a71690314d268a9c1c179f0:/sc-units.inc.pl

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index 03fbc4b..d2c3b01 100644
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -14,14 +14,14 @@ suit => 1,
 unit => 1,
 race => 'protoss',
 organic => 0,
-hp => 40,
-shield => 50,
+hp => 20,
+shield => 20,
 armor => 0,
 attack => {
 	ground => {
 		name => "Particle Beam",
 		damage => 5,
-		cmp => 7,
+		dps => 7,
 	},
 	range => 1,
 },
@@ -42,20 +42,16 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
-unit => 0,
 race => 'protoss',
-hp => 200,
-shield => 50,
+hp => 100,
+shield => 100,
 armor => 0,
 attack => {
 	ground => {
 		damage => 20,
-		cmp => 27,
-	},
-	air => {
-		damage => 20,
-		cmp => 27,
+		dps => 27,
 	},
+	air => 'ground',
 	range => 7,
 },
 sight => 11,
@@ -79,14 +75,14 @@ suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 160,
-shield => 38,
+hp => 100,
+shield => 60,
 armor => 1,
 attack => {
 	ground => {
 		name => "Psi Blades",
 		damage => [16, 18, 20, 22],
-		cmp => [22, undef, undef, 30],
+		dps => [22, undef, undef, 30],
 	},
 	range => 1,
 },
@@ -116,21 +112,17 @@ suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 1,
 attack => {
 	ground => {
 		name => "Phase Disruptor",
 		damage => [20, 22, 24, 26],
-		cmp => [20, 22, 24, 26],
-		type => 'explosive',
-	},
-	air => {
-		damage => [20, 22, 24, 26],
-		cmp => [20, 22, 24, 26],
+		dps => [20, 22, 24, 26],
 		type => 'explosive',
 	},
+	air => 'ground',
 	range => 4,
 },
 sight => 8,
@@ -160,8 +152,8 @@ suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 80,
-shield => 50,
+hp => 40,
+shield => 40,
 armor => 0,
 attack => {
 },
@@ -221,14 +213,14 @@ suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
-hp => 120,
-shield => 33,
+hp => 80,
+shield => 40,
 armor => 1,
 attack => {
 	ground => {
 		name => "Warp Blades",
 		damage => [40, 43, 46, 49],
-		cmp => [40, 43, 46, 49],
+		dps => [40, 43, 46, 49],
 	},
 	range => 1,
 },
@@ -253,21 +245,17 @@ suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 360,
-shield => 97,
+hp => 10,
+shield => 350,
 armor => 0,
 attack => {
 	ground => {
 		name => "Psionic Shockwave",
 		damage => [30, 33, 36, 39],
-		cmp => [45, undef, undef, 59],
-		splash => 1,
-	},
-	air => {
-		damage => [30, 33, 36, 39],
-		cmp => [45, undef, undef, 59],
+		dps => [45, undef, undef, 59],
 		splash => 1,
 	},
+	air => 'ground',
 	range => 2,
 },
 sight => 8,
@@ -290,8 +278,8 @@ suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 225,
-shield => 89,
+hp => 25,
+shield => 200,
 armor => 1,
 attack => {
 },
@@ -359,17 +347,17 @@ unit => 3,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 250,
-shield => 40,
+hp => 150,
+shield => 100,
 armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		cmp => [8, 9, 10, 11],
+		dps => [8, 9, 10, 11],
 	},
 	air => {
 		damage => [28, 30, 32, 34],
-		cmp => [38, undef, undef, 46],
+		dps => [38, undef, undef, 46],
 		type => 'explosive',
 	},
 	range => 4,
@@ -401,13 +389,13 @@ unit => 2,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 1,
 attack => {
 	air => {
 		damage => [5, 6, 7, 8],
-		cmp => [19, undef, undef, 30],
+		dps => [19, undef, undef, 30],
 		splash => 1,
 		type => 'explosive',
 	},
@@ -441,24 +429,18 @@ suit => 3,
 unit => 6,
 race => 'protoss',
 organic => 0,
-hp => 450,
-shield => 33,
+hp => 300,
+shield => 150,
 armor => 4,
 attack => {
 	ground => {
 		damage => [6, 7, 8, 9],
-		cmp => [17, undef, undef, 49],
-		min => 25,
-		build => 12.7*$FM,
-		max => 4,
-	},
-	air => {
-		damage => [6, 7, 8, 9],
-		cmp => [17, undef, undef, 49],
+		dps => [17, undef, undef, 49],
 		min => 25,
 		build => 12.7*$FM,
 		max => 4,
 	},
+	air => 'ground',
 	range => 8,
 },
 sight => 11,
@@ -481,20 +463,16 @@ unit => 4,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 350,
-shield => 43,
+hp => 200,
+shield => 150,
 armor => 1,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		cmp => [7, undef, undef, 9],
-		type => 'explosive',
-	},
-	air => {
-		damage => [10, 11, 12, 13],
-		cmp => [7, undef, undef, 9],
+		dps => [7, undef, undef, 9],
 		type => 'explosive',
 	},
+	air => 'ground',
 	range => 5,
 },
 sight => 9,
@@ -540,13 +518,13 @@ suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
-hp => 180,
-shield => 44,
+hp => 100,
+shield => 80,
 armor => 0,
 attack => {
 	ground => {
 		damage => 100,
-		cmp => 50,
+		dps => 50,
 		splash => 1,
 		cost => 15,
 		build => 4.54*$FM,
@@ -561,7 +539,7 @@ upgrade => [
 		attack => {
 			ground => {
 				damage => 125 - 100,
-				cmp => 63 - 50,
+				dps => 63 - 50,
 			},
 		},
 	},
@@ -597,8 +575,8 @@ unit => 1,
 race => 'protoss',
 organic => 0,
 air => 1,
-hp => 60,
-shield => 33,
+hp => 40,
+shield => 20,
 armor => 0,
 attack => {
 },
@@ -636,8 +614,8 @@ suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
-hp => 140,
-shield => 43,
+hp => 80,
+shield => 60,
 armor => 1,
 attack => {
 },
@@ -664,12 +642,11 @@ unit => 1,
 race => 'terran',
 organic => 0,
 hp =>  60,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		cmp => 10,
+		dps => 10,
 	},
 	range => 1,
 },
@@ -688,15 +665,13 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
-unit => 0,
 race => 'terran',
 hp => 200,
-shield => 0,
 armor => 0,
 attack => {
 	air => {
 		damage => 20,
-		cmp => 40,
+		dps => 40,
 		type => 'explosive',
 	},
 	range => 7,
@@ -721,17 +696,13 @@ unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  40,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [6, 7, 8, 9],
-		cmp => [12, undef, undef, 18],
-	},
-	air => {
-		damage => [6, 7, 8, 9],
-		cmp => [12, undef, undef, 18],
+		dps => [12, undef, undef, 18],
 	},
+	air => 'ground',
 	range => 4,
 },
 sight => 7,
@@ -751,11 +722,9 @@ special => [
 		speed => 17,
 		attack => {
 			ground => {
-				cmp => [24, undef, undef, 36],
-			},
-			air => {
-				cmp => [24, undef, undef, 36],
+				dps => [24, undef, undef, 36],
 			},
+			air => 'ground',
 		},
 		duration => undef, #XXX
 	},
@@ -773,12 +742,11 @@ unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  50,
-shield => 0,
 armor => 1,
 attack => {
 	ground => {
 		damage => [16, 18, 20, 22],
-		cmp => [22, undef, undef, 30],
+		dps => [22, undef, undef, 30],
 		splash => 1,
 		type => 'implosive',
 	},
@@ -793,7 +761,7 @@ special => [
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
 		attack => {
-			cmp => [44, undef, undef, 60],
+			dps => [44, undef, undef, 60],
 		},
 		duration => undef, #XXX
 	},
@@ -814,19 +782,14 @@ unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  45,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		cmp => [14, undef, undef, 18],
-		type => 'implosive',
-	},
-	air => {
-		damage => [10, 11, 12, 13],
-		cmp => [14, undef, undef, 18],
+		dps => [14, undef, undef, 18],
 		type => 'implosive',
 	},
+	air => 'ground',
 	range => 7,
 },
 sight => 9,
@@ -872,7 +835,6 @@ unit => 1,
 race => 'terran',
 organic => 1,
 hp =>  60,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -920,12 +882,11 @@ unit => 2,
 race => 'terran',
 organic => 0,
 hp =>  80,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		cmp => [20, 22, 24, 26],
+		dps => [20, 22, 24, 26],
 		type => 'implosive',
 	},
 	range => 5,
@@ -966,12 +927,11 @@ unit => 2,
 race => 'terran',
 organic => 0,
 hp => 150,
-shield => 0,
 armor => 1,
 attack => {
 	ground => {
 		damage => [30, 33, 36, 39],
-		cmp => [24, undef, undef, 32],
+		dps => [24, undef, undef, 32],
 		type => 'explosive',
 	},
 	range => 7,
@@ -986,7 +946,7 @@ special => [
 		attack => {
 			ground => {
 				damage => [70, 75, 80, 85],
-				cmp => [28, 30, 32, 34],
+				dps => [28, 30, 32, 34],
 				splash => 1,
 				type => 'explosive',
 			},
@@ -1012,16 +972,15 @@ unit => 2,
 race => 'terran',
 organic => 0,
 hp => 125,
-shield => 0,
 armor => 1,
 attack => {
 	ground => {
 		damage => [12, 13, 14, 15],
-		cmp => [16, undef, undef, 20],
+		dps => [16, undef, undef, 20],
 	},
 	air => {
 		damage => [20, 24, 28, 32],
-		cmp => [27, undef, undef, 44],
+		dps => [27, undef, undef, 44],
 		type => 'explosive',
 	},
 	range => 5,
@@ -1052,16 +1011,15 @@ race => 'terran',
 organic => 0,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		cmp => [8, 9, 10, 11],
+		dps => [8, 9, 10, 11],
 	},
 	air => {
 		damage => [20, 22, 24, 26],
-		cmp => [27, undef, undef, 35],
+		dps => [27, undef, undef, 35],
 		type => 'explosive',
 	},
 	range => 5,
@@ -1094,17 +1052,13 @@ race => 'terran',
 organic => 0,
 air => 1,
 hp => 500,
-shield => 0,
 armor => 3,
 attack => {
 	ground => {
 		damage => [25, 28, 31, 34],
-		cmp => [25, 28, 31, 34],
-	},
-	air => {
-		damage => [25, 28, 31, 34],
-		cmp => [25, 28, 31, 34],
+		dps => [25, 28, 31, 34],
 	},
+	air => 'ground',
 	range => 6,
 },
 sight => 11,
@@ -1138,7 +1092,6 @@ race => 'terran',
 organic => 0,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1191,12 +1144,11 @@ race => 'terran',
 organic => 0,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 2,
 attack => {
 	air => {
 		damage => [6, 7, 8, 9],
-		cmp => [23, undef, undef, 25],
+		dps => [23, undef, undef, 25],
 		splash => 1,
 		type => 'explosive',
 	},
@@ -1219,7 +1171,6 @@ race => 'terran',
 organic => 0,
 air => 1,
 hp => 150,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1241,12 +1192,11 @@ unit => (1),
 race => 'zerg',
 organic => 1,
 hp => 40,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		cmp => 7,
+		dps => 7,
 	},
 	range => 1,
 },
@@ -1267,7 +1217,6 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 200,
-shield => 0,
 armor => 0,
 attack => {
 },
@@ -1292,44 +1241,36 @@ name => 'Larva',
 trans => {
 	nl => 'larve',
 },
-min => 0,
-gas => 0,
 build => 14.3*$FM, # = 21.5
 suit => 1,
 unit => 0,
 race => 'zerg',
 organic => 1,
 hp => 25,
-shield => 0,
 armor => 10,
 attack => {
 },
 sight => 4,
 speed => 0.1, #XXX
-special => [],
-},
-
-{
-cat => 'creep',
-name => 'Egg',
-trans => {
-	nl => 'ei',
-},
-min => 0,
-gas => 0,
-build => 0,
-suit => 3,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 200,
-shield => 0,
-armor => 10,
-attack => {
-},
-sight => 4,
-speed => 0,
-special => [],
+special => [
+	{
+		name => 'transform',
+		alt => 'Egg',
+		trans => {
+			nl => 'ei',
+		},
+		suit => 3,
+		race => 'zerg',
+		organic => undef, # unchanged from parent
+		hp => 200,
+		armor => 10,
+		attack => {
+		},
+		sight => 4,
+		speed => 0,
+		special => [],
+	},
+],
 },
 
 {
@@ -1339,15 +1280,13 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 300,
-shield => 0,
 armor => 2,
 attack => {
 	ground => {
 		damage => 40,
-		cmp => 38,
+		dps => 38,
 		type => 'explosive',
 	},
 	range => 7,
@@ -1364,15 +1303,13 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
-unit => 0,
 race => 'zerg',
 hp => 400,
-shield => 0,
 armor => 0,
 attack => {
 	air => {
 		damage => 15,
-		cmp => 30,
+		dps => 30,
 	},
 	range => 7,
 },
@@ -1393,12 +1330,11 @@ unit => 0.5,
 race => 'zerg',
 organic => 1,
 hp => 35,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [5, 6, 7, 8],
-		cmp => [18, undef, undef, 29], # 29 is an estimate
+		dps => [18, undef, undef, 29], # 29 is an estimate
 	},
 	range => 1,
 },
@@ -1411,7 +1347,7 @@ upgrade => [
 	{
 		attack => {
 			ground => {
-				cmp => [undef, undef, undef, 42 - 29],
+				dps => [undef, undef, undef, 42 - 29],
 			},
 		},
 	},
@@ -1431,19 +1367,14 @@ unit => 1,
 race => 'zerg',
 organic => 1,
 hp => 80,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		cmp => [20, 22, 24, 26],
-		type => 'explosive',
-	},
-	air => {
-		damage => [10, 11, 12, 13],
-		cmp => [20, 22, 24, 26],
+		dps => [20, 22, 24, 26],
 		type => 'explosive',
 	},
+	air => 'ground',
 	range => 4,
 },
 sight => 6,
@@ -1473,12 +1404,11 @@ unit => 2,
 race => 'zerg',
 organic => 1,
 hp => 125,
-shield => 0,
 armor => 1,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		cmp => [16, undef, undef, 21],
+		dps => [16, undef, undef, 21],
 		splash => 1,
 	},
 	range => 6,
@@ -1500,7 +1430,6 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
 },
@@ -1529,38 +1458,29 @@ special => [
 		duration => undef,
 	},
 	{
-		name => 'Broodling',
+		name => 'Spawn Broodling',
 		abbr => 'sb',
 		desc => 'spawn one inside an enemy unit killing it',
 		range => 9,
 		cost => 75-60,
-	},
-],
-},
 
-{
-cat => 'lair',
-name => 'Broodling',
-min => 0,
-gas => 0,
-build => 0,
-suit => 1,
-unit => 0,
-race => 'zerg',
-organic => 1,
-hp => 30,
-shield => 0,
-armor => 0,
-attack => {
-	ground => {
-		damage => [4, 5, 6, 7],
-		cmp => [8, 10, 12, 14],
+		alt => 'Broodling',
+		suit => 1,
+		unit => undef,
+		organic => undef,
+		hp => 30,
+		armor => 0,
+		attack => {
+			ground => {
+				damage => [4, 5, 6, 7],
+				dps => [8, 10, 12, 14],
+			},
+			range => 1,
+		},
+		sight => 5,
+		speed => 19,
 	},
-	range => 1,
-},
-sight => 5,
-speed => 19,
-special => [],
+],
 },
 
 {
@@ -1574,7 +1494,6 @@ unit => 1,
 race => 'zerg',
 organic => 1,
 hp => 60,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
@@ -1601,7 +1520,6 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 25,
-shield => 0,
 armor => 0,
 attack => {
 	air => {
@@ -1626,24 +1544,19 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 120,
-shield => 0,
 armor => 0,
 attack => {
 	ground => {
 		damage => [9, 10, 11, 12],
-		cmp => [9, 10, 11, 12],
-		splash => 1,
-	},
-	air => {
-		damage => [9, 10, 11, 12],
-		cmp => [9, 10, 11, 12],
+		dps => [9, 10, 11, 12],
 		splash => 1,
 	},
+	air => 'ground',
 	range => 3,
 },
 sight => 7,
 speed => 18,
-special => [],
+special => [], #TODO: glaive
 counter => ['templar', 'corsair', 'valkyrie'],
 },
 
@@ -1660,12 +1573,11 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 150,
-shield => 0,
 armor => 2,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		cmp => [20, 22, 24, 26],
+		dps => [20, 22, 24, 26],
 	},
 	range => 8,
 },
@@ -1687,12 +1599,11 @@ race => 'zerg',
 organic => 1,
 air => 1,
 hp => 250,
-shield => 0,
 armor => 2,
 attack => {
 	air => {
 		damage => [25, 27, 29, 31],
-		cmp => [8, undef, undef, 9],
+		dps => [8, undef, undef, 9],
 		type => 'explosive',
 	},
 	range => 6,
@@ -1713,7 +1624,6 @@ unit => 2,
 race => 'zerg',
 organic => 1,
 hp => 80,
-shield => 0,
 armor => 1,
 attack => {
 },
@@ -1758,12 +1668,11 @@ unit => 4,
 race => 'zerg',
 organic => 1,
 hp => 400,
-shield => 0,
 armor => 1,
 attack => {
 	ground => {
 		damage => [20, 23, 26, 29],
-		cmp => [40, 46, 52, 58],
+		dps => [40, 46, 52, 58],
 	},
 	range => 1,
 },