Ticket #3590: undeletable.diff

binaries/data/mods/public/gui/session/unit_actions.js

@@ -691 +691 @@
     "delete": {
         "getInfo": function(entState)
         {
+            if (!entState.canDelete)
+                return false;
+
             if (entState.mirage)
                 return {
                     "tooltip": translate("You cannot destroy this entity because it is in the fog-of-war"),

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -272 +272 @@
         ret.maxHitpoints = cmpHealth.GetMaxHitpoints();
         ret.needsRepair = cmpHealth.IsRepairable() && (cmpHealth.GetHitpoints() < cmpHealth.GetMaxHitpoints());
         ret.needsHeal = !cmpHealth.IsUnhealable();
+        ret.canDelete = !cmpHealth.IsUndeletable();
     }
 
     var cmpCapturable = QueryMiragedInterface(ent, IID_Capturable);

binaries/data/mods/public/simulation/components/Health.js

@@ -30 +30 @@
             "<value a:help='Remain in the world with 0 health'>remain</value>" +
         "</choice>" +
     "</element>" +
+    "<element name='Undeletable' a:help='Prevent players from deleting this entity.'>" +
+        "<data type='boolean'/>" +
+    "</element>" +
     "<element name='Unhealable' a:help='Indicates that the entity can not be healed by healer units'>" +
         "<data type='boolean'/>" +
     "</element>";
@@ -99 +102 @@
         || this.GetHitpoints() >= this.GetMaxHitpoints());
 };
 
+Health.prototype.IsUndeletable = function()
+{
+    return this.template.Undeletable == "true";
+};
+
 Health.prototype.GetRegenRate = function()
 {
     return this.regenRate;

binaries/data/mods/public/simulation/components/Mirage.js

@@ -22 +22 @@
     this.hitpoints = null;
     this.repairable = null;
     this.unhealable = null;
+    this.undeletable = null;
 
     this.capturePoints = [];
     this.maxCapturePoints = 0;
@@ -79 +80 @@
     this.hitpoints = cmpHealth.GetHitpoints();
     this.repairable = cmpHealth.IsRepairable();
     this.unhealable = cmpHealth.IsUnhealable();
+    this.undeletable = cmpHealth.IsUndeletable();
 };
 
 Mirage.prototype.GetMaxHitpoints = function() { return this.maxHitpoints; };
 Mirage.prototype.GetHitpoints = function() { return this.hitpoints; };
 Mirage.prototype.IsRepairable = function() { return this.repairable; };
 Mirage.prototype.IsUnhealable = function() { return this.unhealable; };
+Mirage.prototype.IsUndeletable = function() { return this.undeletable; };
 
 // Capture data
 

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -366 +366 @@
             var cmpHealth = Engine.QueryInterface(ent, IID_Health);
             if (cmpHealth)
             {
+                if (cmpHealth.IsUndeletable())
+                    continue;
                 var cmpResourceSupply = Engine.QueryInterface(ent, IID_ResourceSupply);
                 if (!cmpResourceSupply || !cmpResourceSupply.GetKillBeforeGather())
                     cmpHealth.Kill();

binaries/data/mods/public/simulation/templates/template_structure.xml

@@ -47 +47 @@
   <Health>
     <DeathType>corpse</DeathType>
     <RegenRate>0</RegenRate>
+    <Undeletable>false</Undeletable>
     <Unhealable>true</Unhealable>
   </Health>
   <Repairable>

binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml

@@ -65 +65 @@
     <Max>3000</Max>
     <SpawnEntityOnDeath>rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
-    <Identity>
+  <Identity>
     <GenericName>Civic Center</GenericName>
     <Tooltip>Build to acquire large tracts of territory. Train citizens. Garrison: 20.</Tooltip>
     <Classes datatype="tokens">

binaries/data/mods/public/simulation/templates/template_unit.xml

@@ -31 +31 @@
     <DeathType>corpse</DeathType>
     <Max>100</Max>
     <RegenRate>0</RegenRate>
+    <Undeletable>false</Undeletable>
     <Unhealable>false</Unhealable>
   </Health>
   <Identity>