Added override to stock AnyChildParameterFailed method, fixes #559.

jrossignol · Aug 26, 2016 · 86e3d00 · 86e3d00
1 parent 6269d26
commit 86e3d00
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Contract Configurator 1.18.0
 - Fixed an issue that prevented expressions from working in resource loading (thanks hargn).
 - Cycle through new contracts to generate in a random order to prevent certain contracts from getting preference.
 - Fixed issue where contract expiries were never getting set (thanks DarkonZ).
+- Fixed issue with some parameters combined with the All parameter causing incorrect contract failure (thanks tomf).
 
 Contract Configurator 1.17.0
 - Mission Control remembers the last visited tab when you open it, and takes you there.

diff --git a/GameData/ContractConfigurator/CC_RemoteTech.dll b/GameData/ContractConfigurator/CC_RemoteTech.dll
diff --git a/GameData/ContractConfigurator/ContractConfigurator.dll b/GameData/ContractConfigurator/ContractConfigurator.dll
diff --git a/GameData/ContractConfigurator/KerKonConConExt.dll b/GameData/ContractConfigurator/KerKonConConExt.dll
diff --git a/source/ContractConfigurator/Parameter/ContractConfiguratorParameter.cs b/source/ContractConfigurator/Parameter/ContractConfiguratorParameter.cs
@@ -290,5 +290,20 @@ public virtual void SetState(ParameterState state)
         {
             base.SetIncomplete();
         }
+
+        public new bool AnyChildParametersFailed()
+        {
+            for (int i = ParameterCount; i-- > 0;)
+            {
+                ContractParameter param = GetParameter(i);
+                ContractConfiguratorParameter ccParam = param as ContractConfiguratorParameter;
+                if (param.State == ParameterState.Failed && (ccParam == null || !ccParam.fakeFailures))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }