Merge pull request #212 from edbmods/fix-scenario-replacement

Fix for scenario replacement workaround

EdBPrepareCarefully.csproj

@@ -76,7 +76,6 @@
     <Compile Include="Source\ExtensionsThing.cs" />
     <Compile Include="Source\GenStep_CustomScatterThings.cs" />
     <Compile Include="Source\CustomHeadType.cs" />
-    <Compile Include="Source\GenStep_RemovePrepareCarefullyScenario.cs" />
     <Compile Include="Source\IRelationshipWorker.cs" />
     <Compile Include="Source\OptionsApparel.cs" />
     <Compile Include="Source\OptionsHealth.cs" />

Resources/CHANGELOG.txt

@@ -1,3 +1,10 @@
+ _____________________________________________________________________________
+
+   Version 1.0.1
+ _____________________________________________________________________________
+
+ - Added minimum support for 1.0
+
  _____________________________________________________________________________
 
    Version 0.18.2

Resources/Defs/MapGeneratorDefs/MapGenerators.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-
-  <GenStepDef>
-    <defName>RemovePrepareCarefullyScenParts</defName>
-    <order>2147483647</order>
-    <genStep Class="EdB.PrepareCarefully.GenStep_RemovePrepareCarefullyScenario"/>
-  </GenStepDef>
-
+  <!-- This file is no longer used, but since the workshop doesn't seem to consistently
+       delete files on mod updates, we're leaving it here to avoid mod corruption errors.
+  -->
 </Defs>
 

Resources/Defs/Scenarios/ScenParts_Fixed.xml

@@ -2,9 +2,5 @@
 <Defs>
   <!-- This file is no longer used, but since the workshop doesn't seem to consistently
        delete files on mod updates, we're leaving it here to avoid mod corruption errors.
-       We leave a placeholder pawn relation def since that should leave no side-effects.
   -->
-  <EdB.PrepareCarefully.CarefullyPawnRelationDef>
-    <defName>ScenParts_FixedDummyDefinition</defName>
-  </EdB.PrepareCarefully.CarefullyPawnRelationDef>
 </Defs>

Resources/Defs/ThingDefs/EdBPrepareCarefully.xml

@@ -2,9 +2,5 @@
 <Defs>
   <!-- This file is no longer used, but since the workshop doesn't seem to consistently
        delete files on mod updates, we're leaving it here to avoid mod corruption errors.
-       We leave a placeholder pawn relation def since that should leave no side-effects.
   -->
-  <EdB.PrepareCarefully.CarefullyPawnRelationDef>
-    <defName>EdBPrepareCarefullyDummyDefinition</defName>
-  </EdB.PrepareCarefully.CarefullyPawnRelationDef>
 </Defs>

Source/HarmonyPatches.cs

@@ -21,6 +21,9 @@ static HarmonyPatches() {
             harmony.Patch(typeof(Page_ConfigureStartingPawns).GetMethod("DoWindowContents"),
                 new HarmonyMethod(null),
                 new HarmonyMethod(typeof(HarmonyPatches).GetMethod("DoWindowContentsPostfix")));
+            harmony.Patch(typeof(Game).GetMethod("InitNewGame"),
+                new HarmonyMethod(null),
+                new HarmonyMethod(typeof(HarmonyPatches).GetMethod("InitNewGamePostfix")));
         }
 
         // Clear the original scenario when opening the Configure Starting Pawns page.  This makes
@@ -30,6 +33,17 @@ public static void PreOpenPostfix() {
             PrepareCarefully.ClearOriginalScenario();
         }
 
+        // Removes the customized scenario (with PrepareCarefully-specific scenario parts) and replaces
+        // it with a vanilla-friendly version that was prepared earlier.  This is a workaround to avoid
+        // creating a dependency between a saved game and the mod.  See Controller.PrepareGame() for 
+        // more details.
+        public static void InitNewGamePostfix() {
+            if (PrepareCarefully.OriginalScenario != null) {
+                Current.Game.Scenario = PrepareCarefully.OriginalScenario;
+                PrepareCarefully.ClearOriginalScenario();
+            }
+        }
+
         // Draw the "Prepare Carefully" button at the bottom of the Configure Starting Pawns page.
         public static void DoWindowContentsPostfix(Rect rect, Page_ConfigureStartingPawns __instance) {
             Vector2 BottomButSize = new Vector2(150f, 38f);