Fixed broken completeInSequence.

jrossignol · Mar 20, 2015 · edec0e9 · edec0e9
1 parent 40358c7
commit edec0e9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -8,6 +8,7 @@ Contract Configurator 0.7.1
 - Support for notes in most contract parameters.
 - Weight in contract types now only applies within a contract group, and all contract groups are given equal preference.  This means that one contract group (or contract pack) can't cause contract starvation in another group.
 - Fix NullReferenceException when using TextGen without an agent specified (thanks AppoloFunghi).
+- Fix broken completeInSequence attribute.
 - Minor bug fixes.
 
 Contract Configurator 0.7.0

diff --git a/GameData/ContractConfigurator/CC_RemoteTech.dll b/GameData/ContractConfigurator/CC_RemoteTech.dll
diff --git a/GameData/ContractConfigurator/CC_SCANsat.dll b/GameData/ContractConfigurator/CC_SCANsat.dll
diff --git a/GameData/ContractConfigurator/ContractConfigurator.dll b/GameData/ContractConfigurator/ContractConfigurator.dll
diff --git a/source/ContractConfigurator/ContractParameter/ContractConfiguratorParameter.cs b/source/ContractConfigurator/ContractParameter/ContractConfiguratorParameter.cs
@@ -47,6 +47,7 @@ protected sealed override void OnSave(ConfigNode node)
                 }
                 node.AddValue("title", title ?? "");
                 node.AddValue("notes", notes ?? "");
+                node.AddValue("completeInSequence", completeInSequence);
                 OnParameterSave(node);
             }
             catch (Exception e)
@@ -68,6 +69,7 @@ protected sealed override void OnLoad(ConfigNode node)
             {
                 title = ConfigNodeUtil.ParseValue<string>(node, "title", "");
                 notes = ConfigNodeUtil.ParseValue<string>(node, "notes", "");
+                completeInSequence = ConfigNodeUtil.ParseValue<bool?>(node, "completeInSequence", (bool?)false).Value;
                 OnParameterLoad(node);
             }
             catch (Exception e)
@@ -94,7 +96,7 @@ protected sealed override void OnLoad(ConfigNode node)
         /// it will check if all previous parameters in the sequence have been completed.
         /// </summary>
         /// <returns>True if the parameter is ready to complete.</returns>
-        private bool ReadyToComplete()
+        protected bool ReadyToComplete()
         {
             if (!completeInSequence)
             {

diff --git a/source/ContractConfigurator/ContractParameter/SequenceNode.cs b/source/ContractConfigurator/ContractParameter/SequenceNode.cs
@@ -71,7 +71,7 @@ protected override void OnParameterLoad(ConfigNode node)
         /// in the sequence have been completed.
         /// </summary>
         /// <returns>True if the parameter is ready to complete.</returns>
-        private bool ReadyToComplete()
+        private new bool ReadyToComplete()
         {
             // Go through the parent's parameters
             for (int i = 0; i < Parent.ParameterCount; i++)

diff --git a/source/ContractConfigurator/ContractParameter/VesselParameter.cs b/source/ContractConfigurator/ContractParameter/VesselParameter.cs
@@ -151,6 +151,13 @@ protected virtual bool SetState(Vessel vessel, Contracts.ParameterState state)
                 return false;
             }
 
+            // Check if the transition is allowed
+            if (state == ParameterState.Complete && !ReadyToComplete())
+            {
+                LoggingUtil.LogVerbose(this, "Not setting state for vessel " + vessel.id + ", not ready to complete!");
+                return false;
+            }
+
             LoggingUtil.LogVerbose(this, "SetState to " + state + " for vessel " + vessel.id);
 
             // Before we wreck anything, don't allow the default disable on state change logic