sc: rename energy property to capacity

Free 'energy' for starting energy.

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index a8ec4deae9e39a43a5f7786e7596fe41f682f98b..19c9237e19125e8032565f7e27e5a5a2be29aa16 100644 (file)
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -195,7 +195,7 @@ upgrade => [
                name => "Khaydarin Amulet",
                min => 150,
                gas => 150,
                name => "Khaydarin Amulet",
                min => 150,
                gas => 150,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 special => [
        },
 ],
 special => [


@@ -333,7 +333,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 special => [
        },
 ],
 special => [


@@ -468,7 +468,7 @@ upgrade => [
                min => 100,
                gas => 100,
                build => 166,
                min => 100,
                gas => 100,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 special => [
        },
 ],
 special => [


@@ -599,7 +599,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 special => [
        },
 ],
 special => [


@@ -1000,7 +1000,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 energy => 200,
        },
 ],
 energy => 200,


@@ -1063,7 +1063,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 special => [
        },
 ],
 special => [


@@ -1331,7 +1331,7 @@ upgrade => [
                min => 200,
                gas => 200,
                build => 166,
                min => 200,
                gas => 200,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 },
        },
 ],
 },


@@ -1391,7 +1391,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 },
        },
 ],
 },


@@ -1460,7 +1460,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
                min => 150,
                gas => 150,
                build => 166,

-               energy => 250-200,
+               capacity => 250-200,

        },
 ],
 },
        },
 ],
 },

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 2efb4b4db55afd32257c64ff26f35d345bf62217..1befd315819402f32194eb80ae04b92d47789881 100644 (file)
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -99,7 +99,7 @@ use strict;
        ],
        speed => 1.875,
        sight => 9,
        ],
        speed => 1.875,
        sight => 9,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Photon Overcharge',
        special => [
                {
                        name => 'Photon Overcharge',


@@ -160,7 +160,7 @@ use strict;
        ],
        speed => 1.4062,
        sight => 14,
        ],
        speed => 1.4062,
        sight => 14,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Cloaking Field',
        special => [
                {
                        name => 'Cloaking Field',


@@ -217,7 +217,7 @@ use strict;
        ],
        speed => 0,
        sight => 11,
        ],
        speed => 0,
        sight => 11,

-       energy => 100,
+       capacity => 100,

        special => [
                {
                        name => 'Chrono Boost',
        special => [
                {
                        name => 'Chrono Boost',


@@ -307,7 +307,7 @@ use strict;
        ],
        speed => 2.25,
        sight => 10,
        ],
        speed => 2.25,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Force Field',
        special => [
                {
                        name => 'Force Field',


@@ -406,7 +406,7 @@ use strict;
        },
        speed => 1.875,
        sight => 10,
        },
        speed => 1.875,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Feedback',
        special => [
                {
                        name => 'Feedback',


@@ -714,7 +714,7 @@ use strict;
        ],
        speed => 4.25,
        sight => 10,
        ],
        speed => 4.25,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Graviton Beam',
        special => [
                {
                        name => 'Graviton Beam',


@@ -828,7 +828,7 @@ use strict;
        ],
        speed => 4,
        sight => 10,
        ],
        speed => 4,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Revelation',
        special => [
                {
                        name => 'Revelation',


@@ -1342,7 +1342,7 @@ use strict;
        ],
        speed => 2.25,
        sight => 11,
        ],
        speed => 2.25,
        sight => 11,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Sniper Round',
        special => [
                {
                        name => 'Sniper Round',


@@ -1728,7 +1728,7 @@ use strict;
                flying => 1,
        },
        speed => 2.5,
                flying => 1,
        },
        speed => 2.5,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Heal',
        special => [
                {
                        name => 'Heal',


@@ -1753,7 +1753,7 @@ use strict;
                        min => 100,
                        gas => 100,
                        build => 80,
                        min => 100,
                        gas => 100,
                        build => 80,

-                       starting_energy => 25,
+                       energy => 25,

                },
        ],
 },
                },
        ],
 },


@@ -1789,7 +1789,7 @@ use strict;
        ],
        speed => 2.75,
        sight => 10,
        ],
        speed => 2.75,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Cloak',
        special => [
                {
                        name => 'Cloak',


@@ -1824,7 +1824,7 @@ use strict;
        speed => 2.25,
        sight => 11,
        detect => 1,
        speed => 2.25,
        sight => 11,
        detect => 1,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        alt => 'Auto-Turret',
        special => [
                {
                        alt => 'Auto-Turret',


@@ -1950,7 +1950,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 110,
                        min => 150,
                        gas => 150,
                        build => 110,

-                       starting_energy => 25,
+                       energy => 25,

                },
        ],
 },
                },
        ],
 },


@@ -1995,7 +1995,7 @@ use strict;
        ],
        speed => 1.875,
        sight => 12,
        ],
        speed => 1.875,
        sight => 12,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Yamato Cannon',
        special => [
                {
                        name => 'Yamato Cannon',


@@ -2020,7 +2020,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 80,
                        min => 150,
                        gas => 150,
                        build => 80,

-                       starting_energy => 25,
+                       energy => 25,

                },
        ],
 },
                },
        ],
 },


@@ -2097,7 +2097,7 @@ use strict;
        speed => 0.9375,
        creep => 2.7,
        sight => 9,
        speed => 0.9375,
        creep => 2.7,
        sight => 9,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Spawn Larva',
        special => [
                {
                        name => 'Spawn Larva',


@@ -2198,7 +2198,7 @@ use strict;
        creep => 0,
        sight => 11,
        detect => 1,
        creep => 0,
        sight => 11,
        detect => 1,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Spawn Changeling',
        special => [
                {
                        name => 'Spawn Changeling',


@@ -2570,7 +2570,7 @@ use strict;
        speed => 2.25,
        creep => 1.3,
        sight => 10,
        speed => 2.25,
        creep => 1.3,
        sight => 10,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Neural Parasite',
        special => [
                {
                        name => 'Neural Parasite',


@@ -2625,7 +2625,7 @@ use strict;
                        min => 150,
                        gas => 150,
                        build => 80,
                        min => 150,
                        gas => 150,
                        build => 80,

-                       starting_energy => 25,
+                       energy => 25,

                },
        ],
 },
                },
        ],
 },


@@ -2900,7 +2900,7 @@ use strict;
        },
        speed => 2.9531,
        sight => 11,
        },
        speed => 2.9531,
        sight => 11,

-       energy => 200,
+       capacity => 200,

        special => [
                {
                        name => 'Blinding Cloud',
        special => [
                {
                        name => 'Blinding Cloud',

diff --git a/sc.plp b/sc.plp
index 28d22d71c56290b57b38df0ed8c7d43002bb975b..c367da074bccbf4c19e2ecfebc1fae8cafa0e082 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -121,9 +121,9 @@ sub showrange {
 
        sub showcost {
                my ($row, $unit) = @_;
 
        sub showcost {
                my ($row, $unit) = @_;

-               my $minmult = 100 / $unit->{energy};  # cost multiplier
-               my $maxmult =       $unit->{upgraded}->{energy} &&
-                             100 / $unit->{upgraded}->{energy};
+               my $minmult = 100 / $unit->{capacity};  # cost multiplier
+               my $maxmult =       $unit->{upgraded}->{capacity} &&
+                             100 / $unit->{upgraded}->{capacity};

 
                return join(' ',
                        sprintf('cost %s%%',
 
                return join(' ',
                        sprintf('cost %s%%',