Merge pull request #237 from edbmods/develop

Merge beta 19 changes into master
edbmods · Aug 28, 2018 · 661cbf2 · 661cbf2
2 parents 76fc4a1 + 7d430bf
commit 661cbf2
Show file tree

Hide file tree

Showing 124 changed files with 6,148 additions and 1,669 deletions.
diff --git a/EdBPrepareCarefully.csproj b/EdBPrepareCarefully.csproj
@@ -46,19 +46,25 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Source\AlienRace.cs" />
+    <Compile Include="Source\AlienRaceBodyAddon.cs" />
     <Compile Include="Source\AnimalDatabase.cs" />
     <Compile Include="Source\AnimalRecord.cs" />
     <Compile Include="Source\AnimalRecordKey.cs" />
     <Compile Include="Source\ColonistFiles.cs" />
     <Compile Include="Source\ColonistSaver.cs" />
+    <Compile Include="Source\ColorSelectorType.cs" />
     <Compile Include="Source\ColorValidator.cs" />
     <Compile Include="Source\Configuration.cs" />
     <Compile Include="Source\Controller.cs" />
     <Compile Include="Source\ControllerRelationships.cs" />
     <Compile Include="Source\CostCalculator.cs" />
-    <Compile Include="Source\CustomParentChildGroup.cs" />
-    <Compile Include="Source\CustomParentChildPawn.cs" />
+    <Compile Include="Source\CustomFaction.cs" />
+    <Compile Include="Source\ParentChildGroup.cs" />
+    <Compile Include="Source\CustomPawnType.cs" />
+    <Compile Include="Source\DialogFactions.cs" />
+    <Compile Include="Source\DialogInitializationError.cs" />
     <Compile Include="Source\DialogManageImplants.cs" />
+    <Compile Include="Source\DialogPawnKinds.cs" />
     <Compile Include="Source\DialogSelectPawn.cs" />
     <Compile Include="Source\DialogSelectParentChildPawn.cs" />
     <Compile Include="Source\Dialog_Colonist.cs" />
@@ -74,17 +80,34 @@
     <Compile Include="Source\ExtensionsHediffDef.cs" />
     <Compile Include="Source\ExtensionsPawn.cs" />
     <Compile Include="Source\ExtensionsThing.cs" />
+    <Compile Include="Source\Filter.cs" />
+    <Compile Include="Source\FilterBackstoryNoDisabledWorkTypes.cs" />
+    <Compile Include="Source\FilterBackstoryNoPenalties.cs" />
+    <Compile Include="Source\FilterBackstorySkillAdjustment.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\LabelTrimmer.cs" />
     <Compile Include="Source\OptionsApparel.cs" />
     <Compile Include="Source\OptionsHealth.cs" />
+    <Compile Include="Source\PanelColonyPawnList.cs" />
+    <Compile Include="Source\PanelFaction.cs" />
     <Compile Include="Source\PanelRelationshipsOther.cs" />
     <Compile Include="Source\PanelRelationshipsParentChild.cs" />
     <Compile Include="Source\HarmonyPatches.cs" />
+    <Compile Include="Source\PanelWorldPawnList.cs" />
     <Compile Include="Source\PawnGenerationRequestWrapper.cs" />
-    <Compile Include="Source\PawnLayers.cs" />
+    <Compile Include="Source\PawnLayer.cs" />
+    <Compile Include="Source\PawnLayerAlienAddon.cs" />
+    <Compile Include="Source\PawnLayerBody.cs" />
+    <Compile Include="Source\PawnLayerHair.cs" />
+    <Compile Include="Source\PawnLayerHead.cs" />
+    <Compile Include="Source\PawnLayerOption.cs" />
+    <Compile Include="Source\PawnLayerOptionAlienAddon.cs" />
+    <Compile Include="Source\PawnLayerOptionBody.cs" />
+    <Compile Include="Source\PawnLayerOptionHair.cs" />
+    <Compile Include="Source\PawnLayerOptionHead.cs" />
+    <Compile Include="Source\PawnListMode.cs" />
     <Compile Include="Source\PrepareCarefully.cs" />
     <Compile Include="Source\PresetFiles.cs" />
     <Compile Include="Source\PresetLoader.cs" />
@@ -100,6 +123,7 @@
     <Compile Include="Source\OptionsHair.cs" />
     <Compile Include="Source\OptionsHeadType.cs" />
     <Compile Include="Source\Randomizer.cs" />
+    <Compile Include="Source\ReflectionUtil.cs" />
     <Compile Include="Source\RelatedPawn.cs" />
     <Compile Include="Source\RelationshipBuilder.cs" />
     <Compile Include="Source\RelationshipGroup.cs" />
@@ -111,7 +135,7 @@
     <Compile Include="Source\SelectedPet.cs" />
     <Compile Include="Source\StandardEquipment.cs" />
     <Compile Include="Source\TabRecordExtensions.cs" />
-    <Compile Include="Source\EquipmentSaveRecord.cs" />
+    <Compile Include="Source\Version3\SaveRecordEquipmentV3.cs" />
     <Compile Include="Source\IEquipment.cs" />
     <Compile Include="Source\AgeInjuryUtility.cs" />
     <Compile Include="Source\EquipmentKey.cs" />
@@ -128,9 +152,15 @@
     <Compile Include="Source\CarefullyPawnRelationDef.cs" />
     <Compile Include="Source\UtilityCopy.cs" />
     <Compile Include="Source\ExtensionsObject.cs" />
+    <Compile Include="Source\Version4\ColonistLoaderVersion4.cs" />
+    <Compile Include="Source\Version4\PresetLoaderVersion4.cs" />
+    <Compile Include="Source\Version4\SaveRecordFactionV4.cs" />
     <Compile Include="Source\Version3\PresetLoaderVersion3.cs" />
     <Compile Include="Source\Version3\SaveRecordParentChildGroupV3.cs" />
     <Compile Include="Source\Version3\SaveRecordPawnV3.cs" />
+    <Compile Include="Source\Version4\SaveRecordApparelV4.cs" />
+    <Compile Include="Source\Version4\SaveRecordPawnV4.cs" />
+    <Compile Include="Source\Version4\SaveRecordPresetV4.cs" />
     <Compile Include="Source\Version3\SaveRecordRelationshipV3.cs" />
     <Compile Include="Source\Version3\SaveRecordImplantV3.cs" />
     <Compile Include="Source\Version3\SaveRecordInjuryV3.cs" />
@@ -172,6 +202,7 @@
     <Compile Include="Source\PanelEquipmentSelected.cs" />
     <Compile Include="Source\ProviderEquipment.cs" />
     <Compile Include="Source\EquipmentType.cs" />
+    <Compile Include="Source\Version4\SaveRecordSkillV4.cs" />
     <Compile Include="Source\WidgetEquipmentIcon.cs" />
     <Compile Include="Source\WidgetNumberField.cs" />
     <Compile Include="Source\WidgetTable.cs" />
@@ -206,5 +237,10 @@
     <None Include="Resources\Defs\Scenarios\ScenParts_Fixed.xml" />
     <None Include="Resources\Defs\ThingDefs\EdBPrepareCarefully.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ResourcesUnstable\About\About.xml">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <ItemGroup />
 </Project>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -9,15 +9,15 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("EdB Prepare Carefully Mod")]
-[assembly: AssemblyCopyright("Copyright © 2014-2017")]
+[assembly: AssemblyCopyright("Copyright © 2014-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.18.2")]
+[assembly: AssemblyVersion("0.19.8")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 The more translations, the better--they are a great contribution to the mod community.  However, while it is appreciated that people take the time to translate the mod to other languages, it's difficult to keep up with those contributions.  Every addition or change to a translation requires a new release of the mod, and taking on that additional effort is not possible.
 
-Therefore, translation pull requests will not be merged into the project.  Please consider creating a standalone translation mod for your language like [this one](http://steamcommunity.com/sharedfiles/filedetails/?id=737171991).  These mods don't include any code--they simply include the translation resources for a given language.  With this approach, you can make changes and additions at your own pace, and you can take on the responsibility of releases for the translation.
+Therefore, translation pull requests will not be merged into the project.  Please consider creating a standalone translation mod for your language like [this one](https://steamcommunity.com/sharedfiles/filedetails/?id=1205095547).  These mods don't include any code--they simply include the translation resources for a given language.  With this approach, you can make changes and additions at your own pace, and you can take on the responsibility of releases for the translation.
 
 ## Building Prepare Carefully
 
@@ -33,17 +33,11 @@ To automatically build the mod directory for your Release DLL, run the `dist.bat
 
 Prepare Carefully uses a versioning scheme inspired by [semantic versioning](http://semver.org/) that combines the major/minor version of RimWorld with the major/minor version of the mod to end up with the following format:
 
-`{RimWorld major version}.{RimWorld minor version}.{mod major version}.{mod minor version}`
+`{RimWorld major version}.{RimWorld minor version}.{mod version for this RimWorld version}`
 
 Other conventions used to determine the mod version numbers:
-- The mod only uses `0` for major versions that are considered unstable/beta releases (i.e. 0.15.0.1)
-- Minor version numbers always start at `1` and never start at `0`
-- The mod considers a major release to be a release that adds or removes features
-- The mod considers a minor release to be an incremental release that makes bug fixes or otherwise changes existing features.
+- Mod version numbers always start at `1` and never start at `0`
 
 Some examples:
-+ **0.14.0.5**: The fifth "beta"/unstable release of the mod for RimWorld Alpha 14
-+ **0.14.1.1**: The first stable release of the mod for RimWorld Alpha 14
-+ **0.14.2.1**: The second stable release of the mod for RimWorld Alpha 14.  The point system was re-enabled for this version.  Since this was a new feature that was not in the previous version, it needed a new major-version number.
-+ **0.14.2.2**: If we need one, this will be the version number for the first bug-fix release after the second stable release of the mod for RimwWorld Alpha 14
-+ **0.15.0.1**: The first "beta"/unstable version of the mod for RimWorld Alpha 15
++ **0.18.2**: The second release of the mod for the Beta 18 version of RimWorld
++ **1.0.1**: The first release of the mod for RimWorld 1.0
diff --git a/Resources/About/About.xml b/Resources/About/About.xml
@@ -3,11 +3,11 @@
 	<name>EdB Prepare Carefully</name>
 	<author>EdB</author>
 	<url></url>
-	<targetVersion>0.18.1722</targetVersion>
+	<targetVersion>0.19.2009</targetVersion>
 	<description>Customize your colonists, choose your gear and prepare carefully for your crash landing!
 
 If you get a set of starting colonists that you like, save them as a preset so that you can start your game the same way next time.
 
-[Version 0.18.2]
+[Version 0.19.8]
 	</description>
 </ModMetaData>
diff --git a/Resources/CHANGELOG.txt b/Resources/CHANGELOG.txt
@@ -1,3 +1,75 @@
+ _____________________________________________________________________________
+
+   Version 0.19.8
+ _____________________________________________________________________________
+
+ - Backstory options are limited to those for the selected pawn kind.
+ - Fixed the info card for animals in the equipment tab view.
+
+ _____________________________________________________________________________
+
+   Version 0.19.7
+ _____________________________________________________________________________
+
+ - Fixed a problem where added faction pawns could not be used to create a
+   custom relationship.
+ - Compatibility with unstable build version 0.19.1987
+
+ _____________________________________________________________________________
+
+   Version 0.19.6
+ _____________________________________________________________________________
+
+ - Rearranged the backstory filters.
+ - Fixed a problem with custom relationships not being initialized.
+ - Added an initialization error dialog.
+
+ _____________________________________________________________________________
+
+   Version 0.19.5
+ _____________________________________________________________________________
+
+ - Added world characters to Prepare Carefully.  The character list is now
+   divided into separate colony and world character lists.
+ - Added a faction selector for world characters.
+ - Added the concept of "temporary" pawns to the relationship tab to allow
+   you to connect two pawns in a relationship without adding the intermediate
+   pawn to the world.
+ - Added filters to the backstory dialogs.
+ - Changes to the preset file format.
+
+ _____________________________________________________________________________
+
+   Version 0.19.4
+ _____________________________________________________________________________
+
+ - Compatibility with development build version 1.0.1969 
+
+ _____________________________________________________________________________
+
+   Version 0.19.3
+ _____________________________________________________________________________
+
+ - Fix to match changes in the HediffComp_GetsPermanent class.
+ - Updated version of Harmony to 1.1
+ - Fixes for Alien Races mod compatibility
+ - UI performance optimizations
+
+ _____________________________________________________________________________
+
+   Version 0.19.2
+ _____________________________________________________________________________
+
+ - Fixes to how related pawns are spawned into the world.
+ - Fix for how XP progress to the next skill level is updated.
+
+ _____________________________________________________________________________
+
+   Version 0.19.1
+ _____________________________________________________________________________
+
+ - Added minimum support for beta 19
+
  _____________________________________________________________________________
 
    Version 0.18.2

diff --git a/Resources/Defs/MapGeneratorDefs/MapGenerators.xml b/Resources/Defs/MapGeneratorDefs/MapGenerators.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <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.
+  -->
+</Defs>
 
-  <GenStepDef>
-    <defName>RemovePrepareCarefullyScenParts</defName>
-    <linkWithMapGenerator>BasicMap</linkWithMapGenerator>
-    <order>2147483647</order>
-    <genStep Class="EdB.PrepareCarefully.GenStep_RemovePrepareCarefullyScenario"/>
-  </GenStepDef>
-
-</Defs>
diff --git a/Resources/Defs/Scenarios/ScenParts_Fixed.xml b/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>
diff --git a/Resources/Defs/ThingDefs/EdBPrepareCarefully.xml b/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>