Ticket #52: DisablingTemplatesByTriggers.patch

binaries/data/mods/public/maps/random/survivalofthefittest_triggers.js

@@ -96 +96 @@
         {
             if (TriggerHelper.EntityHasClass(entity, "CivilCentre"))
             {
-                cmpTrigger.playerCivicCenter[i] = entity;
+                cmpTrigger.playerCivicCenter[i] = entity; // Don't put a "break;" here. For some reason each player has an 
+                                                          // extra entity with CivicCenter class with an ID smaller than 
+                                                          // that of the actual Civic Center
             }
         }
     }
@@ -118 +120 @@
     // Additional stuff
     var cmpPlayer = TriggerHelper.GetPlayerComponent(numberOfPlayers);
     cmpPlayer.SetName("Enemy Waves");
+    
+    // Disable farms and civic centers for all players
+    for (var i = 1; i < numberOfPlayers; ++i)
+    {
+        var cmpPlayer = TriggerHelper.GetPlayerComponent(i);
+        var civ = cmpPlayer.GetCiv();
+        var disabledTemplates = {}
+        disabledTemplates["structures/" + civ + "_field"] = true;
+        disabledTemplates["structures/" + civ + "_civil_centre"] = true;
+        cmpPlayer.SetDisabledTemplates(disabledTemplates);
+    }
 }
 
 Trigger.prototype.PlaceTreasures = function()
@@ -168 +181 @@
 cmpTrigger.DoAfterDelay(0, "InitGame", {}); 
 cmpTrigger.DoAfterDelay(1000, "InitializeEnemyWaves", {});
 
-cmpTrigger.RegisterTrigger("OnOwnershipChanged", "DefeatPlayerOnceCCIsDestroyed", {"enabled": true});
- No newline at end of file
+cmpTrigger.RegisterTrigger("OnOwnershipChanged", "DefeatPlayerOnceCCIsDestroyed", {"enabled": true});

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

@@ -35 +35 @@
         if (cmpIdentity)
             string = string.replace(/\{civ\}/g, cmpIdentity.GetCiv());
         entities = string.split(/\s+/);
+        
+        // Remove disabled entities
+        var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player)
+        var disabledEntities = cmpPlayer.GetDisabledTemplates();
+        
+        for (var i = 0; i < entities.length; ++i)
+            if (disabledEntities[entities[i]])
+                entities.splice(i, 1);
     }
     return entities;
 };

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

@@ -42 +42 @@
         "metal": markForTranslation("Metal"),
         "stone": markForTranslation("Stone"),
     }
+    this.disabledTemplates = {};
 };
 
 Player.prototype.SetPlayerID = function(id)
@@ -699 +700 @@
         cmpGUIInterface.PushNotification(notification);
 };
 
+Player.prototype.AddDisabledTemplate = function(template)
+{
+    this.disabledTemplates[template] = true;
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var ents = cmpRangeManager.GetEntitiesByPlayer(this.playerID);
+    Engine.BroadcastMessage(MT_DisabledTemplatesChanged, {});
+};
+
+Player.prototype.RemoveDisabledTemplate = function(template)
+{
+    this.disabledTemplates[template] = false;
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var ents = cmpRangeManager.GetEntitiesByPlayer(this.playerID);
+    Engine.BroadcastMessage(MT_DisabledTemplatesChanged, {});
+};
+
+Player.prototype.SetDisabledTemplates = function(templates)
+{
+    this.disabledTemplates = templates;
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var ents = cmpRangeManager.GetEntitiesByPlayer(this.playerID);
+    Engine.BroadcastMessage(MT_DisabledTemplatesChanged, {});
+};
+
+Player.prototype.GetDisabledTemplates = function(templates)
+{
+    return this.disabledTemplates;
+};
+
 Engine.RegisterComponentType(IID_Player, "Player", Player);

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

@@ -103 +103 @@
         string = string.replace(/\{civ\}/g, cmpIdentity.GetCiv());
     
     var entitiesList = string.split(/\s+/);
-
+    
+    // Remove disabled entities
+    var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player)
+    var disabledEntities = cmpPlayer.GetDisabledTemplates();
+    
+    for (var i = 0; i < entitiesList.length; ++i)
+        if (disabledEntities[entitiesList[i]])
+            entitiesList.splice(i, 1);
+    
     // check if some templates need to show their advanced or elite version
     var upgradeTemplate = function(templateName)
     {
@@ -120 +128 @@
     };
 
     var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
-    var playerID = QueryOwnerInterface(this.entity, IID_Player).GetPlayerID();
+    var playerID = cmpPlayer.GetPlayerID();
     for each (var templateName in entitiesList)
         this.entitiesList.push(upgradeTemplate(templateName));
     for each (var item in this.queue)
@@ -785 +793 @@
         this.CalculateEntitiesList();
 };
 
+ProductionQueue.prototype.OnDisabledTemplatesChanged = function(msg)
+{
+    // if the disabled templates of the player is changed,
+    // update the entities list so that this is reflected there
+    this.CalculateEntitiesList();
+};
+
 Engine.RegisterComponentType(IID_ProductionQueue, "ProductionQueue", ProductionQueue);

source/simulation2/MessageTypes.h

@@ -519 +519 @@
     }
 };
 
+/**
+ * Sent when a player's disabled templates list is changed
+ */
+class CMessageDisabledTemplatesChanged : public CMessage
+{
+public:
+    DEFAULT_MESSAGE_IMPL(DisabledTemplatesChanged)
+
+    CMessageDisabledTemplatesChanged()
+    {
+    }
+};
+
 #endif // INCLUDED_MESSAGETYPES

source/simulation2/scripting/MessageTypeConversions.cpp

@@ -451 +451 @@
     return new CMessageMinimapPing();
 }
 
+/////////////////////////////////
+
+jsval CMessageDisabledTemplatesChanged::ToJSVal(ScriptInterface& scriptInterface) const
+{
+    TOJSVAL_SETUP();
+    return OBJECT_TO_JSVAL(obj);
+}
+
+CMessage* CMessageDisabledTemplatesChanged::FromJSVal(ScriptInterface& UNUSED(scriptInterface), jsval UNUSED(val))
+{
+    return new CMessageDisabledTemplatesChanged();
+}
+
 ////////////////////////////////////////////////////////////////
 
 CMessage* CMessageFromJSVal(int mtid, ScriptInterface& scriptingInterface, jsval val)

source/simulation2/TypeList.h

@@ -56 +56 @@
 MESSAGE(TemplateModification)
 MESSAGE(VisionRangeChanged)
 MESSAGE(MinimapPing)
+MESSAGE(DisabledTemplatesChanged)
 
 // TemplateManager must come before all other (non-test) components,
 // so that it is the first to be (de)serialized