X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d0aaa2ab1ce3a67e4c2a407f0eebc2d3862af6c9..72b206b172f32b65161b0377ea01fb4e7afa4df3:/sc-units.inc.pl

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index 76223d5..47658d1 100644
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -24,7 +24,6 @@ attack => {
 	ground => {
 		name => "Particle Beam",
 		damage => 5,
-		dps => 7,
 		cooldown => 22,
 	},
 	range => 1,
@@ -52,7 +51,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 20,
-		dps => 27,
 		cooldown => 22,
 	},
 	air => 'ground',
@@ -85,7 +83,6 @@ attack => {
 	ground => {
 		name => "Psi Blades",
 		damage => [16, 18, 20, 22],
-		dps => [22, undef, undef, 30],
 		cooldown => 22,
 	},
 	range => 1,
@@ -125,7 +122,6 @@ attack => {
 	ground => {
 		name => "Phase Disruptor",
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
 		type => 'explosive',
 		cooldown => 30,
 	},
@@ -224,14 +220,20 @@ attack => {
 	ground => {
 		name => "Warp Blades",
 		damage => [40, 43, 46, 49],
-		dps => [40, 43, 46, 49],
 		cooldown => 30,
 	},
 	range => 1,
 },
 sight => 7,
 speed => 15,
-cloak => 1,
+special => [
+	{
+		name => 'Cloaked',
+		abbr => 'cl',
+		desc => 'cloaked at all times',
+		duration => -1,
+	},
+],
 },
 
 {
@@ -256,7 +258,6 @@ attack => {
 	ground => {
 		name => "Psionic Shockwave",
 		damage => [30, 33, 36, 39],
-		dps => [45, undef, undef, 59],
 		cooldown => 20,
 		splash => 1,
 	},
@@ -317,7 +318,7 @@ special => [
 		desc => 'permanently gives you control over any unit',
 		range => 8,
 		cost => 150,
-		duration => -1,
+		duration => 0,
 	},
 	{
 		name => 'Maelstrom',
@@ -354,12 +355,10 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		dps => [8, 9, 10, 11],
 		cooldown => 30,
 	},
 	air => {
 		damage => [28, 30, 32, 34],
-		dps => [38, undef, undef, 46],
 		type => 'explosive',
 		cooldown => 22,
 	},
@@ -405,7 +404,6 @@ armor => 1,
 attack => {
 	air => {
 		damage => [5, 6, 7, 8],
-		dps => [19, undef, undef, 30],
 		cooldown => 8,
 		splash => 1,
 		type => 'explosive',
@@ -482,7 +480,6 @@ special => [
 		attack => {
 			ground => {
 				damage => [6, 7, 8, 9],
-				dps => [4, 5, 5, 6],
 				cooldown => 43, # approximately 37 according to liquipedia
 				build => 20,
 			},
@@ -524,7 +521,6 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [7, undef, undef, 9],
 		cooldown => 45,
 		type => 'explosive',
 	},
@@ -590,7 +586,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 100,
-		dps => 50,
 		cooldown => 60,
 		splash => 1,
 		cost => 15,
@@ -610,7 +605,6 @@ upgrade => [
 		attack => {
 			ground => {
 				damage => 125 - 100,
-				dps => 63 - 50,
 			},
 		},
 	},
@@ -671,7 +665,14 @@ upgrade => [
 		speed => 13 - 9,
 	},
 ],
-cloak => 1,
+special => [
+	{
+		name => 'Cloaked',
+		abbr => 'cl',
+		desc => 'cloaked at all times',
+		duration => -1,
+	},
+],
 },
 
 {
@@ -724,7 +725,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		dps => 10,
 		cooldown => 15,
 	},
 	range => 1,
@@ -749,7 +749,6 @@ armor => 0,
 attack => {
 	air => {
 		damage => 20,
-		dps => 40,
 		cooldown => 15,
 		type => 'explosive',
 	},
@@ -778,7 +777,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [6, 7, 8, 9],
-		dps => [12, undef, undef, 18],
 		cooldown => 15,
 	},
 	air => 'ground',
@@ -809,7 +807,6 @@ special => [
 		attack => {
 			ground => {
 				cooldown => 7.5,
-				dps => [24, undef, undef, 36],
 			},
 			air => 'ground',
 		},
@@ -833,7 +830,6 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [16, 18, 20, 22],
-		dps => [22, undef, undef, 30],
 		cooldown => 22,
 		splash => 1,
 		type => 'implosive',
@@ -854,8 +850,9 @@ special => [
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
 		speed => 17,
 		attack => {
-			cooldown => 11,
-			dps => [44, undef, undef, 60],
+			ground => {
+				cooldown => 11,
+			},
 		},
 		duration => 220 / $FPS,
 	},
@@ -880,7 +877,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [14, undef, undef, 18],
 		cooldown => 22,
 		type => 'implosive',
 	},
@@ -1002,7 +998,7 @@ special => [
 		desc => 'reduces the sight of target unit to 1',
 		range => 9,
 		cost => 75,
-		duration => -1,
+		duration => 0,
 	},
 ],
 },
@@ -1025,7 +1021,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
 		cooldown => 30,
 		type => 'implosive',
 	},
@@ -1050,7 +1045,7 @@ special => [
 		gas => 100,
 		build => 80,
 		alt => 'Spider Mine',
-		desc => 'burrows a mine (capable of doing 125+ damage to enemy units coming within range 3)',
+		desc => 'burrows a mine which will automaticaly target non-hovering enemy units',
 		amount => 3,
 		organic => 0,
 		hp => 20,
@@ -1059,7 +1054,6 @@ special => [
 		attack => {
 			ground => {
 				damage => 125,
-				cooldown => 0,
 				splash => 1,
 				type => 'explosive',
 			},
@@ -1089,7 +1083,6 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [30, 33, 36, 39],
-		dps => [24, undef, undef, 32],
 		cooldown => 37,
 		type => 'explosive',
 	},
@@ -1108,7 +1101,6 @@ special => [
 		attack => {
 			ground => {
 				damage => [70, 75, 80, 85],
-				dps => [28, 30, 32, 34],
 				cooldown => 75,
 				splash => 1,
 				type => 'explosive',
@@ -1116,7 +1108,6 @@ special => [
 			range => 12,
 		},
 		speed => 0,
-		duration => -1,
 	},
 ],
 },
@@ -1139,12 +1130,10 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [12, 13, 14, 15],
-		dps => [16, undef, undef, 20],
 		cooldown => 22,
 	},
 	air => {
 		damage => [20, 24, 28, 32],
-		dps => [27, undef, undef, 44],
 		type => 'explosive',
 		cooldown => 22,
 	},
@@ -1183,12 +1172,10 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [8, 9, 10, 11],
-		dps => [8, 9, 10, 11],
 		cooldown => 30,
 	},
 	air => {
 		damage => [20, 22, 24, 26],
-		dps => [27, undef, undef, 35],
 		cooldown => 22,
 		type => 'explosive',
 	},
@@ -1239,7 +1226,6 @@ armor => 3,
 attack => {
 	ground => {
 		damage => [25, 28, 31, 34],
-		dps => [25, 28, 31, 34],
 		cooldown => 30,
 	},
 	air => 'ground',
@@ -1362,7 +1348,6 @@ armor => 2,
 attack => {
 	air => {
 		damage => [6, 7, 8, 9],
-		dps => [23, undef, undef, 25],
 		cooldown => 64,
 		splash => 1,
 		type => 'explosive',
@@ -1410,7 +1395,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => 5,
-		dps => 7,
 		cooldown => 22,
 	},
 	range => 1,
@@ -1508,7 +1492,6 @@ armor => 2,
 attack => {
 	ground => {
 		damage => 40,
-		dps => 38,
 		cooldown => 32,
 		type => 'explosive',
 	},
@@ -1531,7 +1514,6 @@ armor => 0,
 attack => {
 	air => {
 		damage => 15,
-		dps => 30,
 		cooldown => 15,
 	},
 	range => 7,
@@ -1556,7 +1538,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [5, 6, 7, 8],
-		dps => [18, undef, undef, 29], # 29 is an estimate
 		cooldown => 8,
 	},
 	range => 1,
@@ -1579,7 +1560,6 @@ upgrade => [
 		attack => {
 			ground => {
 				cooldown => 6,
-				dps => [undef, undef, undef, 42 - 29],
 			},
 		},
 	},
@@ -1602,7 +1582,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [10, 11, 12, 13],
-		dps => [20, 22, 24, 26],
 		cooldown => 15,
 		type => 'explosive',
 	},
@@ -1653,7 +1632,6 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [16, undef, undef, 21],
 		cooldown => 37,
 		splash => 'line',
 	},
@@ -1724,7 +1702,6 @@ special => [
 		attack => {
 			ground => {
 				damage => [4, 5, 6, 7],
-				dps => [8, 10, 12, 14],
 				cooldown => 15,
 			},
 			range => 1,
@@ -1799,7 +1776,6 @@ armor => 0,
 attack => {
 	ground => {
 		damage => [9 .. 12],
-		dps => [9, 10, 11, 12],
 		cooldown => 30,
 		splash => 'bounce',
 	},
@@ -1840,7 +1816,6 @@ armor => 2,
 attack => {
 	ground => {
 		damage => [20, 22, 24, 26],
-		dps => [20, 22, 24, 26],
 		cooldown => 30,
 	},
 	range => 8,
@@ -1866,7 +1841,6 @@ armor => 2,
 attack => {
 	air => {
 		damage => [25, 27, 29, 31],
-		dps => [8, undef, undef, 9],
 		cooldown => 100,
 		type => 'explosive',
 	},
@@ -1941,7 +1915,6 @@ armor => 1,
 attack => {
 	ground => {
 		damage => [20, 23, 26, 29],
-		dps => [40, 46, 52, 58],
 		cooldown => 15,
 	},
 	range => 1,