From c447465521df3c9fac558d4e213fb0e8e9032bae Mon Sep 17 00:00:00 2001
From: severedsolo <severedsolo@users.noreply.github.com>
Date: Mon, 27 Jan 2020 17:35:14 +0000
Subject: [PATCH] Fix lastProgressUpdate not working

---
 .idea/.idea.Bureaucracy/.idea/workspace.xml | 77 +++++++++++----------
 Bureaucracy/Bureaucracy.cs                  |  2 +
 GameData/Bureaucracy/Bureaucracy.version    |  2 +-
 GameData/Bureaucracy/Changelog.cfg          |  6 ++
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/.idea/.idea.Bureaucracy/.idea/workspace.xml b/.idea/.idea.Bureaucracy/.idea/workspace.xml
index 53ff295..525072a 100644
--- a/.idea/.idea.Bureaucracy/.idea/workspace.xml
+++ b/.idea/.idea.Bureaucracy/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="9443f7e6-72af-4f0d-a9ef-cb7899d5c46e" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Bureaucracy/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Bureaucracy/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/GameData/Bureaucracy/Bureaucracy.version" beforeDir="false" afterPath="$PROJECT_DIR$/GameData/Bureaucracy/Bureaucracy.version" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Bureaucracy/Bureaucracy.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Bureaucracy/Bureaucracy.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,13 +26,11 @@
     <setting file="file://$PROJECT_DIR$/Bureaucracy/Bureaucracy.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/2C9E31D6-5A60-4D19-80FB-0CB89728FC1E/46/317f403c/GameEvents.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/UI/UIController.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/RandomEvents/QAEvent.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/RandomEvents/RandomEventLoader.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/RandomEvents/CurrencyEvent.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/RandomEvents/WageEvent.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/RandomEvents/TrainingEvent.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/ContractInterceptor.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/2C9E31D6-5A60-4D19-80FB-0CB89728FC1E/cf/f3a31ee7/UpgradeableObject.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/Report.cs" root0="FORCE_HIGHLIGHTING" />
@@ -41,6 +39,7 @@
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/2C9E31D6-5A60-4D19-80FB-0CB89728FC1E/bb/d699a6e5/SpaceCenterBuilding.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/Facilities/FacilityMenuOverride.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/Crew/CrewManager.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///Dummy.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/2C9E31D6-5A60-4D19-80FB-0CB89728FC1E/8e/ae6975ac/BuildingPickerItem.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/2C9E31D6-5A60-4D19-80FB-0CB89728FC1E/55/eaadaf84/UIStyle.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Bureaucracy/Crew/CrewMember.cs" root0="FORCE_HIGHLIGHTING" />
@@ -121,7 +120,6 @@
         <option value="$PROJECT_DIR$/Bureaucracy/Budget/BudgetEvent.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/SettingsClass.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/GameEvents/ExternalListeners.cs" />
-        <option value="$PROJECT_DIR$/Bureaucracy/Bureaucracy.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/ManagerProgressEvent.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/BureaucracyEvent.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/Utilities.cs" />
@@ -131,6 +129,7 @@
         <option value="$PROJECT_DIR$/Bureaucracy/UI/UIController.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/Facilities/FacilityManager.cs" />
         <option value="$PROJECT_DIR$/Bureaucracy/Science/ResearchManager.cs" />
+        <option value="$PROJECT_DIR$/Bureaucracy/Bureaucracy.cs" />
       </list>
     </option>
   </component>
@@ -251,7 +250,8 @@
       <workItem from="1579679198300" duration="27000" />
       <workItem from="1579702541253" duration="4601000" />
       <workItem from="1579962674923" duration="607000" />
-      <workItem from="1580052912766" duration="19899000" />
+      <workItem from="1580052912766" duration="19918000" />
+      <workItem from="1580144333566" duration="313000" />
     </task>
     <servers />
   </component>
@@ -295,86 +295,86 @@
     </state>
     <state x="743" y="277" width="424" height="479" key="FileChooserDialogImpl/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577561043328" />
     <state x="2446" y="517" width="316" height="354" key="FileChooserDialogImpl/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1579435952073" />
-    <state width="1318" height="157" key="GridCell.Tab.0.bottom" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.0.bottom" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.0.center" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.0.center" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.0.center/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.0.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.0.left" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.0.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.0.left" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.0.left/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.0.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.0.right" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.0.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.0.right" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.0.right/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.0.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.1.bottom" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.0.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.1.bottom" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.1.center" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.1.center" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.1.center/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.1.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.1.left" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.1.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.1.left" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.1.left/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.1.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.1.right" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.1.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.1.right" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.1.right/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.1.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.2.bottom" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.1.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.2.bottom" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.2.center" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.2.center" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.2.center/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.2.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.2.left" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.2.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.2.left" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.2.left/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.2.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.2.right" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.2.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.2.right" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.2.right/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.2.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.3.bottom" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.2.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.3.bottom" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.3.bottom/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.3.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.3.center" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.3.bottom/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.3.center" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.3.center/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.3.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.3.left" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.3.center/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.3.left" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.3.left/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.3.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
-    <state width="1318" height="157" key="GridCell.Tab.3.right" timestamp="1580073621572">
+    <state width="1318" height="157" key="GridCell.Tab.3.left/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
+    <state width="1318" height="157" key="GridCell.Tab.3.right" timestamp="1580144646661">
       <screen x="1920" y="312" width="1360" height="768" />
     </state>
     <state width="1878" height="209" key="GridCell.Tab.3.right/0.0.1920.1040/1920.312.1360.768@0.0.1920.1040" timestamp="1577477238040" />
-    <state width="1318" height="157" key="GridCell.Tab.3.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580073621572" />
+    <state width="1318" height="157" key="GridCell.Tab.3.right/0.0.1920.1040/1920.312.1360.768@1920.312.1360.768" timestamp="1580144646661" />
     <state x="704" y="92" width="351" height="585" key="RiderGenerateDialog" timestamp="1579607243840">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -1661,6 +1661,9 @@
       <configuration name="LinuxPlayer(10.82.10.6)">
         <watch expression="c.Name" language="C#" custom="RiderImportsList:" />
       </configuration>
+      <configuration name="LinuxPlayer(10.14.10.6)">
+        <watch expression="lastProgressUpdate" language="C#" custom="RiderImportsList:" />
+      </configuration>
       <configuration name="LinuxPlayer(10.30.1.18)">
         <watch expression="strikesToQuit" language="C#" custom="RiderImportsList:" />
         <watch expression="ActiveFlightTracker.instance" language="C#" custom="RiderImportsList:" />
diff --git a/Bureaucracy/Bureaucracy.cs b/Bureaucracy/Bureaucracy.cs
index 2849b34..1b1d703 100644
--- a/Bureaucracy/Bureaucracy.cs
+++ b/Bureaucracy/Bureaucracy.cs
@@ -101,6 +101,7 @@ public void OnLoad(ConfigNode node)
             RandomEventLoader.Instance.OnLoad(node);
             UiController.Instance.OnLoad(node);
             node.TryGetValue("existingSave", ref existingSave);
+            node.TryGetValue("lastProgressUpdate", ref lastProgressUpdate);
             if(progressEvent == null) progressEvent = new ManagerProgressEvent();
             Debug.Log("[Bureaucracy]: OnLoad Complete");
         }
@@ -117,6 +118,7 @@ public void OnSave(ConfigNode node)
             RandomEventLoader.Instance.OnSave(node);
             UiController.Instance.OnSave(node);
             node.SetValue("existingSave", existingSave, true);
+            node.SetValue("lastProgressUpdate", lastProgressUpdate, true);
             Debug.Log("[Bureaucracy]: OnSave Complete");
         }
 
diff --git a/GameData/Bureaucracy/Bureaucracy.version b/GameData/Bureaucracy/Bureaucracy.version
index 780f8d4..e4c78b7 100644
--- a/GameData/Bureaucracy/Bureaucracy.version
+++ b/GameData/Bureaucracy/Bureaucracy.version
@@ -11,7 +11,7 @@
     {
         "MAJOR" : 1,
         "MINOR" : 1,
-        "PATCH" : 0,
+        "PATCH" : 1,
         "BUILD" : 0
     },
     "KSP_VERSION" :
diff --git a/GameData/Bureaucracy/Changelog.cfg b/GameData/Bureaucracy/Changelog.cfg
index 8ac3326..20b4909 100644
--- a/GameData/Bureaucracy/Changelog.cfg
+++ b/GameData/Bureaucracy/Changelog.cfg
@@ -3,6 +3,12 @@ KERBALCHANGELOG
     showChangelog = True
     modName = Bureaucracy
 
+    VERSION
+    {
+        version = 1.1.1
+        change = Fixed issue where "incremental progress" would try and catch up from Y1 D1 the first time the mod is loaded. The fix is retroactive, so you may see this bug one more time when launching the save after upgrading.
+    }
+
     VERSION
     {
         version = 1.1