Ticket #1165: entity.js.patch

entity.js

@@ -177 +177 @@
         
         return this._template.GarrisonHolder.Max;
     },
+    
+    //"Population Bonus" is how much a building raises your population cap.
+    getPopulationBonus: function() 
+    {
+        if(!this._template.Cost)
+            return undefined;
+        return this._template.Cost.PopulationBonus;
+    },
 
     /**
      * Returns whether this is an animal that is too difficult to hunt.
@@ -286 +294 @@
     },
 
     hitpoints: function() { return this._entity.hitpoints; },
-    isHurt: function() { return this.hitpoints < this.maxHitpoints; },
-    needsHeal: function() { return this.isHurt && this.isHealable; },
-    needsRepair: function() { return this.isHurt && this.isRepairable; },
+    isHurt: function() { return this.hitpoints() < this.maxHitpoints(); },
+    needsHeal: function() { return this.isHurt() && this.isHealable(); },
+    needsRepair: function() { return this.isHurt() && this.isRepairable(); },
 
     /**
      * Returns the current training queue state, of the form
@@ -340 +348 @@
     {
         return (this.garrisonMax() - this.garrisoned().length);
     },
+    
+    canGarrisonInto: function(target) 
+    {
+        var allowedClasses = target.garrisonableClasses();
+        // return false if the target is full or doesn't have any allowed classes
+        if( target.garrisonSpaceAvaliable() <=0 || allowedClasses == undefined )
+        return false;
 
+        var hasClasses = this.classes();
+        for( var i=0; i<hasClasses.length; i++)
+            {
+                var hasClass = hasClasses[i];
+                if( allowedClasses.indexOf(hasClass) >= 0 )
+                return true;
+            }//end for units classes
+        return false;
+    },
+
     // TODO: visibility
-
+    attack: function(target)
+    { 
+        Engine.PostCommand({"type": "attack", "entities": [this.id()], "target": target.id(), "queued": false}); 
+        return this; 
+    },
+    
     move: function(x, z, queued) {
         queued = queued || false;
         Engine.PostCommand({"type": "walk", "entities": [this.id()], "x": x, "z": z, "queued": queued});
@@ -389 +419 @@
         });
         return this;
     },
+    
+    //ungarrison a specific unit in this building
+    unload: function(unit) 
+    {
+        if (!this._template.GarrisonHolder)
+            return undefined;
+            Engine.PostCommand({"type": "unload", "garrisonHolder": this.id(), "entity": unit});
+        var utug = this._entity.garrisoned.indexOf(unit);
+        this._entity.splice(utug, 1);       // remove the ungarrisoned unit
+            return this;
+    },
 
+    unloadAll: function() 
+    {
+            if (!this._template.GarrisonHolder)
+            return undefined;
+        Engine.PostCommand({"type": "unload-all", "garrisonHolder": this.id()});
+        this._entity.garrisoned = [];   // empty the garrisoned list 
+        return this;
+    },
+    
     construct: function(template, x, z, angle) {
         // TODO: verify this unit can construct this, just for internal
         // sanity-checking and error reporting