Changeset 9659 for ps

Timestamp:

06/25/11 02:47:46 (14 years ago)

Author:

ben

Message:

Enforces max population limit, cleans up population variables in Player component. See #862
Max population defaults to 200

Location:

ps/trunk/binaries/data/mods/public

Files:

• gui/session/session.xml (modified) (1 diff)
• simulation/components/Player.js (modified) (5 diffs)
• simulation/helpers/Player.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/gui/session/session.xml

@@ -361 +361 @@
 
             <!-- Population -->
-            <object size="374 0 464 100%" type="image" style="resourceCounter" tooltip="Population (current / maximum)" tooltip_style="sessionToolTipBold">
+            <object size="374 0 464 100%" type="image" style="resourceCounter" tooltip="Population (current / limit)" tooltip_style="sessionToolTipBold">
                 <object size="-2 0 30 28" type="image" style="resourceIcon" cell_id="4"/>
                 <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourcePop"/>

ps/trunk/binaries/data/mods/public/simulation/components/Player.js

@@ -10 +10 @@
     this.civ = undefined;
     this.colour = { "r": 0.0, "g": 0.0, "b": 0.0, "a": 1.0 };
-    this.popUsed = 0; // population of units owned by this player
-    this.popReserved = 0; // population of units currently being trained
-    this.popLimit = 0; // maximum population
+    this.popUsed = 0; // population of units owned or trained by this player
+    this.popBonuses = 0; // sum of population bonuses of player's entities
+    this.maxPop = 200; // maximum population
     this.trainingQueueBlocked = false; // indicates whether any training queue is currently blocked
     this.resourceCount = {
@@ -71 +71 @@
 Player.prototype.TryReservePopulationSlots = function(num)
 {
-    if (num > this.GetPopulationLimit() - this.GetPopulationCount())
+    if (num > (this.GetPopulationLimit() - this.GetPopulationCount()))
         return false;
 
-    this.popReserved += num;
+    this.popUsed += num;
     return true;
 };
@@ -80 +80 @@
 Player.prototype.UnReservePopulationSlots = function(num)
 {
-    this.popReserved -= num;
+    this.popUsed -= num;
 };
 
 Player.prototype.GetPopulationCount = function()
 {
-    return this.popUsed + this.popReserved;
-};
-
-Player.prototype.SetPopulationLimit = function(limit)
-{
-    this.popLimit = limit;
+    return this.popUsed;
 };
 
 Player.prototype.GetPopulationLimit = function()
 {
-    return this.popLimit;
+    return Math.min(this.maxPop, this.popBonuses);
+};
+
+Player.prototype.SetMaxPopulation = function(max)
+{
+    this.maxPop = max;
+};
+
+Player.prototype.GetMaxPopulation = function()
+{
+    return this.maxPop;
 };
 
@@ -275 +280 @@
         {
             this.popUsed -= cost.GetPopCost();
-            this.popLimit -= cost.GetPopBonus();
+            this.popBonuses -= cost.GetPopBonus();
         }
     }
@@ -288 +293 @@
         {
             this.popUsed += cost.GetPopCost();
-            this.popLimit += cost.GetPopBonus();
+            this.popBonuses += cost.GetPopBonus();
         }
     }

ps/trunk/binaries/data/mods/public/simulation/helpers/Player.js

@@ -93 +93 @@
             if (getSetting(pData, pDefs, "PopulationLimit") !== undefined)
             {
-                player.SetPopulationLimit(getSetting(pData, pDefs, "PopulationLimit"));
+                player.SetMaxPopulation(getSetting(pData, pDefs, "PopulationLimit"));
             }