Should now work correctly when removing the home-area

emipa606 · emipa606 · commit 21b343aa84cc · 2023-07-01T22:18:45.000+02:00
diff --git a/1.0/Patches/WorkGiverPatch.xml b/1.0/Patches/WorkGiverPatch.xml
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Patch>
   <Operation Class="PatchOperationReplace">
-    <xpath>*/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
+    <xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
     <value>
       <giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
     </value>
diff --git a/1.1/Patches/WorkGiverPatch.xml b/1.1/Patches/WorkGiverPatch.xml
@@ -0,0 +1,9 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  <Operation Class="PatchOperationReplace">
+    <xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
+    <value>
+      <giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
+    </value>
+  </Operation>
+</Patch>
diff --git a/1.2/Patches/WorkGiverPatch.xml b/1.2/Patches/WorkGiverPatch.xml
@@ -0,0 +1,9 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  <Operation Class="PatchOperationReplace">
+    <xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
+    <value>
+      <giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
+    </value>
+  </Operation>
+</Patch>
diff --git a/1.3/Patches/WorkGiverPatch.xml b/1.3/Patches/WorkGiverPatch.xml
@@ -0,0 +1,9 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  <Operation Class="PatchOperationReplace">
+    <xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
+    <value>
+      <giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
+    </value>
+  </Operation>
+</Patch>
diff --git a/1.4/Assemblies/CleaningPriority.dll b/1.4/Assemblies/CleaningPriority.dll
diff --git a/1.4/Patches/WorkGiverPatch.xml b/1.4/Patches/WorkGiverPatch.xml
@@ -0,0 +1,9 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  <Operation Class="PatchOperationReplace">
+    <xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
+    <value>
+      <giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
+    </value>
+  </Operation>
+</Patch>
diff --git a/About/About.xml b/About/About.xml
@@ -84,7 +84,5 @@ As this is the first version, expect bugs. However, don't be too scared, they pr
 [*] Do not report errors by making a discussion-thread, I get no notification of that.
 [*] If you have the solution for a problem, please post it to the GitHub repository.
 [/list]
-
-
-[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2018316486]Last updated 2023-05-18[/url]</description>
+[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2018316486]Last updated 2023-07-01[/url]</description>
 </ModMetaData>
diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for CleaningPriority
 
+1.4.4 - Should now work correctly when removing the home-area
+
+
 1.4.3 - Fixed changing priority of areas.
 Used DeepL to update translations for ChineseSimplified, French, German
 
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>CleaningPriority</identifier>
-  <version>1.4.3</version>
+  <version>1.4.4</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />
diff --git a/About/ModIcon.png b/About/ModIcon.png
diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>f4f05f6a-8ae3-4d42-b2f5-734cae07b45f</ID>
   <ModName>Cleaning Priority (Continued)</ModName>
-  <Version>1.4.3</Version>
+  <Version>1.4.4</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>
diff --git a/About/Preview.png b/About/Preview.png
diff --git a/README.md b/README.md
@@ -59,6 +59,4 @@ As this is the first version, expect bugs. However, don't be too scared, they pr
 -  If you have the solution for a problem, please post it to the GitHub repository.
 
 
-
-
-https://steamcommunity.com/sharedfiles/filedetails/changelog/2018316486]Last updated 2023-05-18
+https://steamcommunity.com/sharedfiles/filedetails/changelog/2018316486]Last updated 2023-07-01
diff --git a/Source/CleaningPriority/CleaningPriority.csproj b/Source/CleaningPriority/CleaningPriority.csproj
@@ -6,7 +6,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>
     <LangVersion>latest</LangVersion>
-    <FileVersion>1.4.3</FileVersion>
+    <FileVersion>1.4.4</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Krafs.Rimworld.Ref">
diff --git a/Source/CleaningPriority/UserInterface/Dialog_CleaningPriority.cs b/Source/CleaningPriority/UserInterface/Dialog_CleaningPriority.cs
@@ -128,7 +128,6 @@ private int DoAreaRow(Area areaToList, Listing_Standard listing, int count, int
             GUI.color = Color.white;
         }
 
-        Log.Message($"{areaToList}: {count}, {priority}");
         DoAreaTooltip(rowRect, count, priority, isPriority);
 
         var widgetRow = new WidgetRow(rowRect.x, rowRect.y, UIDirection.RightThenUp, rowRect.width);
diff --git a/Source/CleaningPriority/WorkGiver_CleanFilthPrioritized.cs b/Source/CleaningPriority/WorkGiver_CleanFilthPrioritized.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.Linq;
 using RimWorld;
 using Verse;
 using Verse.AI;
@@ -22,7 +23,7 @@ public override IEnumerable<Thing> PotentialWorkThingsGlobal(Pawn pawn)
 
     public override bool ShouldSkip(Pawn pawn, bool forced = false)
     {
-        return pawn.Map.GetCleaningManager().FilthInCleaningAreas().EnumerableCount() == 0;
+        return !pawn.Map.GetCleaningManager().FilthInCleaningAreas().Any();
     }
 
     public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false)
@@ -37,9 +38,13 @@ public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false)
             return false;
         }
 
+        if (!pawn.Map.GetCleaningManager().FilthInCleaningAreas().Contains(filth))
+        {
+            return false;
+        }
+
         Area effectiveAreaRestriction = null;
-        if (pawn.playerSettings?.EffectiveAreaRestriction != null &&
-            pawn.playerSettings.EffectiveAreaRestriction.TrueCount > 0 &&
+        if (pawn.playerSettings?.EffectiveAreaRestriction is { TrueCount: > 0 } &&
             pawn.playerSettings.EffectiveAreaRestriction.Map == filth.Map)
         {
             effectiveAreaRestriction = pawn.playerSettings.EffectiveAreaRestriction;
@@ -65,12 +70,18 @@ public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false)
 
     public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false)
     {
+        if (!HasJobOnThing(pawn, t, forced))
+        {
+            return null;
+        }
+
         var job = new Job(DefDatabase<JobDef>.GetNamed("Clean_Prioritized"));
         job.AddQueuedTarget(TargetIndex.A, t);
 
         var map = t.Map;
         var maxQueued = 15;
         var room = t.GetRoom();
+
         for (var i = 0; i < 100; i++)
         {
             var intVec = t.Position + GenRadial.RadialPattern[i];
diff --git a/Source/MigrationBackup/ea3d0909/CleaningPriority/CleaningPriority.csproj b/Source/MigrationBackup/ea3d0909/CleaningPriority/CleaningPriority.csproj
@@ -6,7 +6,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>
     <LangVersion>latest</LangVersion>
-    <FileVersion>1.4.3</FileVersion>
+    <FileVersion>1.4.4</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Krafs.Rimworld.Ref">
diff --git a/Source/metadata.json b/Source/metadata.json
@@ -1,5 +1,6 @@
 {
   "Continued": true,
   "CanAdd": "0",
-  "CanRemove": "0"
+  "CanRemove": "0",
+  "PreviewVersion": "1.4"
 }
