Fix cleanbots (#16922)

Resources/Prototypes/NPCs/cleanbot.yml

@@ -12,18 +12,30 @@
   branches:
     - tasks:
         - id: PickPuddlePrimitive
-        - id: MoveToAccessiblePrimitive
-        - id: InteractWithPrimitive
+        - id: MoveToCombatTargetPrimitive
+        - id: MopPrimitive
 
 - type: htnPrimitive
   id: PickPuddlePrimitive
-  operator: !type:PickPuddleOperator
-    rangeKey: BufferRange
-    targetKey: MovementTarget
-    component: Puddle
+  operator: !type:UtilityOperator
+    proto: NearbyPuddles
 
 - type: htnPrimitive
   id: SetIdleTimePrimitive
   operator: !type:SetFloatOperator
     targetKey: IdleTime
     amount: 3
+
+- type: htnPrimitive
+  id: MopPrimitive
+  preconditions:
+    - !type:TargetInRangePrecondition
+      targetKey: CombatTarget
+      rangeKey: InteractRange
+  operator: !type:InteractWithOperator
+    targetKey: CombatTarget
+  services:
+    - !type:UtilityService
+      id: PuddleService
+      proto: NearbyPuddles
+      key: CombatTarget

Resources/Prototypes/NPCs/utility_queries.yml

@@ -35,6 +35,22 @@
     - !type:TargetInLOSOrCurrentCon
       curve: !type:BoolCurve
 
+- type: utilityQuery
+  id: NearbyPuddles
+  query:
+    - !type:ComponentQuery
+      components:
+        - type: Puddle
+    - !type:PuddleFilter
+  considerations:
+    - !type:TargetDistanceCon
+      curve: !type:PresetCurve
+        preset: TargetDistance
+    - !type:TargetAccessibleCon
+      curve: !type:BoolCurve
+    - !type:TargetInLOSOrCurrentCon
+      curve: !type:BoolCurve
+
 - type: utilityQuery
   id: NearbyRangedTargets
   query: