sc: rename 'size' attribute to 'suit'

Clarity ambiguous "size" (appearance? collision? cargo?) to mean damage class,
preparing for similar attributes.

diff --git a/sc-units.inc.pl b/sc-units.inc.pl
index 2bdc7154608c079a314d59e79e73f312ceeb0f59..03fbc4b166b2ab652b91d4597b1a51f6993ba69f 100644 (file)
--- a/sc-units.inc.pl
+++ b/sc-units.inc.pl
@@ -10,7 +10,7 @@ name => 'Probe',
 min => 50,
 gas => 0,
 build => 12.7*$FM, # 20
-size => 1,
+suit => 1,
 unit => 1,
 race => 'protoss',
 organic => 0,
@@ -41,7 +41,7 @@ trans => {
 min => 150,
 gas => 0,
 build => 50,
-size => 3,
+suit => 3,
 unit => 0,
 race => 'protoss',
 hp => 200,
@@ -75,7 +75,7 @@ trans => {
 min => 100,
 gas => 0,
 build => 25*$FM, # 40
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
@@ -112,7 +112,7 @@ trans => {
 min => 125,
 gas => 50,
 build => 32*$FM, # 40
-size => 3,
+suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
@@ -156,7 +156,7 @@ trans => {
 min => 50,
 gas => 150,
 build => 31.7*$FM, # 50
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
@@ -217,7 +217,7 @@ trans => {
 min => 125,
 gas => 100,
 build => 34*$FM, # 50
-size => 1,
+suit => 1,
 unit => 2,
 race => 'protoss',
 organic => 1,
@@ -249,7 +249,7 @@ min => 100,
 gas => 300,
 build => 13*$FM, # 20
 base => ['templar', 'templar'],
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
@@ -286,7 +286,7 @@ min => 250,
 gas => 200,
 build => 13*$FM, # 20
 base => ['dark templar', 'dark templar'],
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
@@ -354,7 +354,7 @@ trans => {
 min => 275,
 gas => 125,
 build => 50.5*$FM, # 80
-size => 3,
+suit => 3,
 unit => 3,
 race => 'protoss',
 organic => 0,
@@ -396,7 +396,7 @@ trans => {
 min => 150,
 gas => 100,
 build => 25.3*$FM, # 40
-size => 2,
+suit => 2,
 unit => 2,
 race => 'protoss',
 organic => 0,
@@ -437,7 +437,7 @@ trans => {
 min => 350,
 gas => 250,
 build => 88.5*$FM, # 140
-size => 3,
+suit => 3,
 unit => 6,
 race => 'protoss',
 organic => 0,
@@ -476,7 +476,7 @@ trans => {
 min => 100,
 gas => 350,
 build => 131, # 160
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
@@ -536,7 +536,7 @@ name => 'Reaver',
 min => 200,
 gas => 100,
 build => 44.5*$FM, # 70
-size => 3,
+suit => 3,
 unit => 4,
 race => 'protoss',
 organic => 0,
@@ -592,7 +592,7 @@ trans => {
 min => 25,
 gas => 75,
 build => 25.35*$FM, # 40
-size => 1,
+suit => 1,
 unit => 1,
 race => 'protoss',
 organic => 0,
@@ -632,7 +632,7 @@ trans => {
 min => 200,
 gas => 0,
 build => 38*$FM, # 60
-size => 3,
+suit => 3,
 unit => 2,
 race => 'protoss',
 organic => 0,
@@ -659,7 +659,7 @@ name => 'SCV', # T-280 Space Construction Vehicle
 min => 50,
 gas => 0,
 build => 20,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 0,
@@ -687,7 +687,7 @@ trans => {
 min => 75,
 gas => 0,
 build => 30,
-size => 3,
+suit => 3,
 unit => 0,
 race => 'terran',
 hp => 200,
@@ -716,7 +716,7 @@ trans => {
 min => 50,
 gas => 0,
 build => 24,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
@@ -768,7 +768,7 @@ name => 'Firebat',
 min => 50,
 gas => 25,
 build => 24,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
@@ -809,7 +809,7 @@ trans => {
 min => 25,
 gas => 75,
 build => 50,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
@@ -867,7 +867,7 @@ name => 'Medic',
 min => 50,
 gas => 25,
 build => 30,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'terran',
 organic => 1,
@@ -915,7 +915,7 @@ trans => {
 min => 75,
 gas => 0,
 build => 19*$FM, # 30
-size => 2,
+suit => 2,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -961,7 +961,7 @@ trans => {
 min => 150,
 gas => 100,
 build => 50,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -1007,7 +1007,7 @@ trans => {
 min => 100,
 gas => 50,
 build => 40,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -1046,7 +1046,7 @@ name => 'Wraith',
 min => 150,
 gas => 100,
 build => 60,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -1088,7 +1088,7 @@ trans => {
 min => 400,
 gas => 300,
 build => 160,
-size => 3,
+suit => 3,
 unit => 6,
 race => 'terran',
 organic => 0,
@@ -1132,7 +1132,7 @@ trans => {
 min => 100,
 gas => 225,
 build => 80,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -1185,7 +1185,7 @@ trans => {
 min => 250,
 gas => 125,
 build => 60,
-size => 3,
+suit => 3,
 unit => 3,
 race => 'terran',
 organic => 0,
@@ -1213,7 +1213,7 @@ name => 'Dropship',
 min => 100,
 gas => 100,
 build => 50,
-size => 3,
+suit => 3,
 unit => 2,
 race => 'terran',
 organic => 0,
@@ -1236,7 +1236,7 @@ name => 'Drone',
 min => 50,
 gas => 0,
 build => 13*$FM, # 20
-size => 1,
+suit => 1,
 unit => (1),
 race => 'zerg',
 organic => 1,
@@ -1261,7 +1261,7 @@ name => 'Overlord',
 min => 100,
 gas => 0,
 build => 26*$FM, # 40
-size => 3,
+suit => 3,
 unit => -9,
 race => 'zerg',
 organic => 1,
@@ -1295,7 +1295,7 @@ trans => {
 min => 0,
 gas => 0,
 build => 14.3*$FM, # = 21.5
-size => 1,
+suit => 1,
 unit => 0,
 race => 'zerg',
 organic => 1,
@@ -1318,7 +1318,7 @@ trans => {
 min => 0,
 gas => 0,
 build => 0,
-size => 3,
+suit => 3,
 unit => 0,
 race => 'zerg',
 organic => 1,
@@ -1338,7 +1338,7 @@ name => 'Sunken Colony',
 min => 175,
 gas => 0,
 build => 20,
-size => 3,
+suit => 3,
 unit => 0,
 race => 'zerg',
 hp => 300,
@@ -1363,7 +1363,7 @@ name => 'Spore Colony',
 min => 175,
 gas => 0,
 build => 20,
-size => 3,
+suit => 3,
 unit => 0,
 race => 'zerg',
 hp => 400,
@@ -1388,7 +1388,7 @@ name => 'Zergling',
 min => 25,
 gas => 0,
 build => 19*$FM, # 14
-size => 1,
+suit => 1,
 unit => 0.5,
 race => 'zerg',
 organic => 1,
@@ -1426,7 +1426,7 @@ name => 'Hydralisk',
 min => 75,
 gas => 25,
 build => 18.5*$FM, # 28
-size => 2,
+suit => 2,
 unit => 1,
 race => 'zerg',
 organic => 1,
@@ -1468,7 +1468,7 @@ min => 125,
 gas => 125,
 base => 'hydralisk',
 build => 25.5*$FM, # 40
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1494,7 +1494,7 @@ name => 'Queen',
 min => 100,
 gas => 100,
 build => 42.5*$FM, # 50
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1544,7 +1544,7 @@ name => 'Broodling',
 min => 0,
 gas => 0,
 build => 0,
-size => 1,
+suit => 1,
 unit => 0,
 race => 'zerg',
 organic => 1,
@@ -1569,7 +1569,7 @@ name => 'Infested Terran',
 min => 100,
 gas => 50,
 build => 40,
-size => 1,
+suit => 1,
 unit => 1,
 race => 'zerg',
 organic => 1,
@@ -1595,7 +1595,7 @@ name => 'Scourge',
 min => 12,
 gas => 38,
 build => 20*$FM, # 15
-size => 1,
+suit => 1,
 unit => 0.5,
 race => 'zerg',
 organic => 1,
@@ -1620,7 +1620,7 @@ name => 'Mutalisk',
 min => 100,
 gas => 100,
 build => 26*$FM, # 40
-size => 1,
+suit => 1,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1654,7 +1654,7 @@ min => 150,
 gas => 200,
 build => 25.6*$FM, # 40
 base => 'mutalisk',
-size => 3,
+suit => 3,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1681,7 +1681,7 @@ min => 250,
 gas => 150,
 build => 25.6*$FM, # 40
 base => 'mutalisk',
-size => 3,
+suit => 3,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1708,7 +1708,7 @@ name => 'Defiler',
 min => 50,
 gas => 150,
 build => 32.5*$FM, # 50
-size => 2,
+suit => 2,
 unit => 2,
 race => 'zerg',
 organic => 1,
@@ -1753,7 +1753,7 @@ name => 'Ultralisk',
 min => 200,
 gas => 200,
 build => 38.8*$FM, # 60
-size => 3,
+suit => 3,
 unit => 4,
 race => 'zerg',
 organic => 1,

diff --git a/sc.plp b/sc.plp
index 8ce0ba7a0816ea7839933b7a664d0756608c15f9..873c75b6964c71a95ec178e9c507ceacd92dcac2 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -252,7 +252,7 @@ sub showrange {
        if (exists $get{order}) {
                $get{order} ||= '';
                if ($get{order} eq 'size') {
-                       $_->{order} = $_->{unit}*8 + $_->{size} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+                       $_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
                }
                elsif ($get{order} eq 'cost') {
                        $_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
@@ -269,7 +269,7 @@ sub showrange {
                printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $race
                        if $grouped and $race ne $_->{race};
                $_->{cat} = $_->{race} if not $grouped;
-               my $sizechar = [qw/? s m l/]->[$_->{size}];
+               my $suitchar = [qw/? s m l/]->[$_->{suit}];
                print(
                        '<tr>',
                        sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
@@ -280,7 +280,7 @@ sub showrange {
                                !!$_->{base} && '<span class="unit-composed">+</span>',
                                $_->{build} || '0',
                        ),
-                       sprintf('<td class="unit unit-%s">%s', $sizechar, ucfirst $sizechar),
+                       sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
                        '<td class="val unit">' . join('',
                                $_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
                                defined $_->{organic} && sprintf(