Changeset 27135

Timestamp:

Oct 8, 2022, 2:46:11 PM (22 months ago)

Author:

wraitii

Message:

Fix victory conditions loading (fixes Hero Garrison in regicide crashloop).

VictoryConditions.js gamesetting sends multiple updates to 'active' and 'disabled', instead of just one single update at the end. This is listened to by amongst others the regicide 'hero garrison' setting, thus HeroGarrison is deactivated, and then tries to be reactivated from the init attributes, and then disabled again later.

This implements a simple fix, VictoryConditions only sends a single update in FromInitAttributes with the end-state.

Differential Revision: ​https://code.wildfiregames.com/D4793

File:

• ps/trunk/binaries/data/mods/public/gamesettings/attributes/VictoryConditions.js (modified) (5 diffs)

ps/trunk/binaries/data/mods/public/gamesettings/attributes/VictoryConditions.js

@@ -18 +18 @@
             this.conditions[cond.Name] = cond;
 
+
         for (let cond in this.conditions)
             if (this.conditions[cond].Default)
-                this._add(this.conditions[cond].Name);
+                defaults.push(this.conditions[cond].Name);
+        this._add(this.active, this.disabled, defaults);
     }
 
@@ -51 +53 @@
             return;
 
-        this.disabled = new Set();
-        this.active = new Set();
-        // TODO: could be optimised.
-        for (const cond of conditionList)
-            this._add(cond);
+        this._add(new Set(), new Set(), conditionList);
     }
 
@@ -68 +66 @@
     }
 
-    _add(name)
+    _add()
     {
-        if (this.disabled.has(name))
-            return;
-        let active = clone(this.active);
-        active.add(name);
-        // Assume we want to remove incompatible ones.
-        if (this.conditions[name].DisabledWhenChecked)
-            this.conditions[name].DisabledWhenChecked.forEach(x => active.delete(x));
+        let active = clone(currentActive);
+        for (const name of names) {
+            if (currentDisabled.has(name))
+                continue;
+            active.add(name);
+            // Assume we want to remove incompatible ones.
+            if (this.conditions[name].DisabledWhenChecked)
+                this.conditions[name].DisabledWhenChecked.forEach(x => active.delete(x));
+        }
         // TODO: sanity check
         this.disabled = this._reconstructDisabled(active);
@@ -82 +82 @@
     }
 
-    _delete(name)
+    _delete(name)
     {
         let active = clone(this.active);
-        active.delete(name);
+        for (const name of names)
+            active.delete(name);
         // TODO: sanity check
         this.disabled = this._reconstructDisabled(active);
@@ -94 +95 @@
     {
         if (enabled)
-            this._add(name);
+            this._add();
         else
-            this._delete(name);
+            this._delete();
     }
 };