Merge branch 'FixFakeFailuresInVPG' into TEST

KSP-RO · Dec 4, 2023 · d675cd9 · d675cd9
2 parents 37e3d08 + 051cd15
commit d675cd9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/source/ContractConfigurator/Parameter/VesselParameter.cs b/source/ContractConfigurator/Parameter/VesselParameter.cs
@@ -193,7 +193,12 @@ protected virtual bool SetState(Vessel vessel, Contracts.ParameterState state)
             // Force to failure if failWhenUnmet is set
             if (failWhenUnmet && state == ParameterState.Incomplete)
             {
-                SetState(ParameterState.Failed);
+                // but when using VPG logic only do it when the vessel is the one being tracked
+                VesselParameterGroup vpg = GetParameterGroupHost();
+                if (vpg == null || vpg.TrackedVessel == vessel)
+                {
+                    SetState(ParameterState.Failed);
+                }
             }
 
             // Set the state
@@ -642,8 +647,9 @@ protected virtual void CheckVessel(Vessel vessel, bool forceStateChange = false)
                 if (vpg != null)
                 {
                     // Set the craft specific state
-                    bool stateChanged = SetState(vessel, VesselMeetsCondition(vessel) ?
-                        Contracts.ParameterState.Complete : Contracts.ParameterState.Incomplete) || forceStateChange;
+                    ParameterState newState = VesselMeetsCondition(vessel) ?
+                        Contracts.ParameterState.Complete : Contracts.ParameterState.Incomplete;
+                    bool stateChanged = SetState(vessel, newState) || forceStateChange;
 
                     // Update the group
                     if (stateChanged)