Changeset 25090

Timestamp:

Mar 20, 2021, 5:14:35 PM (3 years ago)

Author:

Freagarach

Message:

Store components to be miraged in cmpFogging.

Allows modders (and us) to just add an IID to the array and ensure the Mirage()-function to exist in the respective component.

Differential revision: D3713
Comment by: @wraitii

Location:

ps/trunk/binaries/data/mods/public/simulation/components

Files:

• Fogging.js (modified) (2 diffs)
• Mirage.js (modified) (1 diff)

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

@@ -8 +8 @@
     "<a:help>Allows this entity to be replaced by mirage entities in the fog-of-war.</a:help>" +
     "<empty/>";
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 Fogging.prototype.Init = function()
@@ -107 +121 @@
 
     // Store valuable information into the mirage component (especially for the GUI).
-    let cmpIdentity = Engine.QueryInterface(this.entity, IID_Identity);
-    if (cmpIdentity)
-        cmpMirage.CopyIdentity(cmpIdentity);
-
-    let cmpFoundation = Engine.QueryInterface(this.entity, IID_Foundation);
-    if (cmpFoundation)
-        cmpMirage.CopyFoundation(cmpFoundation);
-
-    let cmpRepairable = Engine.QueryInterface(this.entity, IID_Repairable);
-    if (cmpRepairable && !cmpFoundation)
-        cmpMirage.CopyRepairable(cmpRepairable);
-
-    let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
-    if (cmpHealth)
-        cmpMirage.CopyHealth(cmpHealth);
-
-    let cmpCapturable = Engine.QueryInterface(this.entity, IID_Capturable);
-    if (cmpCapturable)
-        cmpMirage.CopyCapturable(cmpCapturable);
-
-    let cmpResourceSupply = Engine.QueryInterface(this.entity, IID_ResourceSupply);
-    if (cmpResourceSupply)
-        cmpMirage.CopyResourceSupply(cmpResourceSupply);
-
-    let cmpMarket = Engine.QueryInterface(this.entity, IID_Market);
-    if (cmpMarket)
-        cmpMirage.CopyMarket(cmpMarket);
+    for (let component of this.componentsToMirage)
+        cmpMirage.CopyComponent(component);
 
     // Notify the GUI the entity has been replaced by a mirage, in case it is selected at this moment.

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

@@ -50 +50 @@
 // Parent entity data
 
-Mirage.prototype.CopyCapturable = function(cmpCapturable)
+/**
+ * @param {number} iid - The component to mirage.
+ */
+Mirage.prototype.CopyComponent = function(iid)
 {
-    this.miragedIids.set(IID_Capturable, cmpCapturable.Mirage());
-};
-
-Mirage.prototype.CopyFoundation = function(cmpFoundation)
-{
-    this.miragedIids.set(IID_Foundation, cmpFoundation.Mirage());
-};
-
-Mirage.prototype.CopyHealth = function(cmpHealth)
-{
-    this.miragedIids.set(IID_Health, cmpHealth.Mirage());
-};
-
-Mirage.prototype.CopyIdentity = function(cmpIdentity)
-{
-    this.miragedIids.set(IID_Identity, cmpIdentity.Mirage());
-};
-
-Mirage.prototype.CopyMarket = function(cmpMarket)
-{
-    this.miragedIids.set(IID_Market, cmpMarket.Mirage(this.entity, this.player));
-};
-
-Mirage.prototype.CopyRepairable = function(cmpRepairable)
-{
-    this.miragedIids.set(IID_Repairable, cmpRepairable.Mirage());
-};
-
-Mirage.prototype.CopyResourceSupply = function(cmpResourceSupply)
-{
-    this.miragedIids.set(IID_ResourceSupply, cmpResourceSupply.Mirage());
+    let cmp = Engine.QueryInterface(this.parent, iid);
+    if (cmp)
+        this.miragedIids.set(iid, cmp.Mirage(this.entity, this.player));
 };