Merge pull request #99 from edbmods/develop

Merge to master v0.16.1.3

EdBPrepareCarefully.csproj

@@ -7,10 +7,9 @@
     <OutputType>Library</OutputType>
     <RootNamespace>EdB.PrepareCarefully</RootNamespace>
     <AssemblyName>EdBPrepareCarefully</AssemblyName>
-    <ReleaseVersion>0.16.1.2</ReleaseVersion>
+    <ReleaseVersion>0.16.1.3</ReleaseVersion>
     <UseMSBuildEngine>False</UseMSBuildEngine>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ApplicationManifest>Dialog_Confirm.cs.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

EdBPrepareCarefully.sln

@@ -22,9 +22,9 @@ Global
 		$0.TextStylePolicy = $2
 		$2.FileWidth = 120
 		$2.TabsToSpaces = False
-		$2.inheritsSet = VisualStudio
+		$2.inheritsSet = null
 		$2.inheritsScope = text/plain
-		$2.scope = text/plain
+		$2.scope = application/xml
 		$0.CSharpFormattingPolicy = $3
 		$3.IndentSwitchBody = True
 		$3.ElseNewLinePlacement = NewLine
@@ -194,6 +194,6 @@ Global
 		$29.IncludeStaticEntities = True
 		$0.VersionControlPolicy = $31
 		$31.inheritsSet = Mono
-		version = 0.16.1.2
+		version = 0.16.1.3
 	EndGlobalSection
 EndGlobal

Properties/AssemblyInfo.cs

@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.16.1.2")]
+[assembly: AssemblyVersion("0.16.1.3")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

Resources/About/About.xml

@@ -8,6 +8,6 @@
 
 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.16.1.2]
+[Version 0.16.1.3]
 	</description>
 </ModMetaData>

Resources/CHANGELOG.txt

@@ -1,3 +1,10 @@
+ _____________________________________________________________________________
+
+   Version 0.16.1.3
+ _____________________________________________________________________________
+
+ - Fixed the way that the option list for bionics/implants is built.
+
  _____________________________________________________________________________
 
    Version 0.16.1.2

Source/BodyPartDictionary.cs

@@ -64,8 +64,9 @@ public BodyPartDictionary(ThingDef pawnThingDef)
 			}
 
 			// Find all recipes that replace a body part.
-			recipes.AddRange(pawnThingDef.recipes.Where((RecipeDef def) => {
-				if (def.addsHediff != null && def.appliedOnFixedBodyParts != null && def.appliedOnFixedBodyParts.Count > 0) {
+			recipes.AddRange(DefDatabase<RecipeDef>.AllDefs.Where((RecipeDef def) => {
+				if (def.addsHediff != null && def.appliedOnFixedBodyParts != null && def.appliedOnFixedBodyParts.Count > 0
+						&& (def.recipeUsers.NullOrEmpty() || def.recipeUsers.Contains(pawnThingDef))) {
 					return true;
 				}
 				else {
@@ -101,6 +102,23 @@ public BodyPartDictionary(ThingDef pawnThingDef)
 				}
 			}
 
+			// Remove any recipe that has no relevant body parts.
+			List<RecipeDef> recipesToRemove = new List<RecipeDef>();
+			foreach (var r in recipes) {
+				List<BodyPartRecord> bodyPartRecords;
+				if (recipeBodyParts.TryGetValue(r, out bodyPartRecords)) {
+					if (bodyPartRecords.Count == 0) {
+						recipesToRemove.Add(r);
+					}
+				}
+				else {
+					recipesToRemove.Add(r);
+				}
+			}
+			foreach (var r in recipesToRemove) {
+				recipes.Remove(r);
+			}
+
 			// Sort the recipes.
 			recipes.Sort((RecipeDef a, RecipeDef b) => {
 				return a.LabelCap.CompareTo(b.LabelCap);