Fixed release when healthy alternatives

emipa606 · May 27, 2024 · cb5ccaa · cb5ccaa
1 parent fd2fd5e
commit cb5ccaa
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/1.5/Assemblies/CustomPrisonerInteractions.dll b/1.5/Assemblies/CustomPrisonerInteractions.dll
diff --git a/About/About.xml b/About/About.xml
@@ -106,5 +106,5 @@ Since modding is just a hobby for me I expect no donations to keep modding. If y
 [/list]
 
 [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2841231775][img]https://img.shields.io/github/v/release/emipa606/CustomPrisonerInteractions?label=latest%20version&amp;style=plastic&amp;labelColor=0070cd&amp;color=white[/img][/url]</description>
-  <modVersion IgnoreIfNoMatchingField="True">1.5.2</modVersion>
+  <modVersion IgnoreIfNoMatchingField="True">1.5.3</modVersion>
 </ModMetaData>
diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for CustomPrisonerInteractions
 
+1.5.3 - Fixed release when healthy alternatives
+
+
 1.5.2 - Fix for the latest rimworld-patch that renamed a fieldname
 
 

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>CustomPrisonerInteractions</identifier>
-  <version>1.5.2</version>
+  <version>1.5.3</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>74b7df5b-73c0-4825-884b-61df997d22b7</ID>
   <ModName>Custom Prisoner Interactions</ModName>
-  <Version>1.5.2</Version>
+  <Version>1.5.3</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>

diff --git a/Source/CustomPrisonerInteractions/CustomPrisonerInteractions.csproj b/Source/CustomPrisonerInteractions/CustomPrisonerInteractions.csproj
@@ -6,7 +6,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>
     <LangVersion>latest</LangVersion>
-    <FileVersion>1.5.2</FileVersion>
+    <FileVersion>1.5.3</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Krafs.Rimworld.Ref">

diff --git a/Source/CustomPrisonerInteractions/WorkGiver_Warden_ReleasePrisoner_JobOnThing.cs b/Source/CustomPrisonerInteractions/WorkGiver_Warden_ReleasePrisoner_JobOnThing.cs
@@ -39,16 +39,16 @@ and not CustomPrisonerInteractions.ExtraMode.ReleaseWhenAbleToWalk
             return true;
         }
 
-        if (extraInteractionsTracker[pawn2] is CustomPrisonerInteractions.ExtraMode.ReleaseWhenHealthy &&
-            !HealthAIUtility.ShouldSeekMedicalRest(pawn2))
+        if (extraInteractionsTracker[pawn2] is CustomPrisonerInteractions.ExtraMode.ReleaseWhenHealthy)
         {
-            return true;
+            return !HealthAIUtility.ShouldSeekMedicalRest(pawn2) &&
+                   !pawn2.health.hediffSet.HasNaturallyHealingInjury() &&
+                   !pawn2.health.hediffSet.HasTendedAndHealingInjury();
         }
 
-        if (extraInteractionsTracker[pawn2] is CustomPrisonerInteractions.ExtraMode.ReleaseWhenAbleToWalk &&
-            !pawn2.Downed)
+        if (extraInteractionsTracker[pawn2] is CustomPrisonerInteractions.ExtraMode.ReleaseWhenAbleToWalk)
         {
-            return true;
+            return !pawn2.Downed;
         }
 
         return pawn2.guilt is not { IsGuilty: true };