From 5ed99bf49734e926bfa0f782796fcfde035fe4a4 Mon Sep 17 00:00:00 2001
From: EnDecc <33369477+Endecc@users.noreply.github.com>
Date: Sat, 15 Apr 2023 18:46:00 -0400
Subject: [PATCH] [Tweak] Janibucket buffs (#15422)

* Improves Janitor trolley significantly by adding bucket slot with sprite overlay, and 300 extra water capacity. Improves Janitor bucket slightly by adding 100 extra water capacity.

* Reduces janitor trolley density by 100 to it's pull a bit faster
---
 .../Objects/Specific/Janitorial/janitor.yml   |  57 +++++++++++-------
 .../janitorial_cart.rsi/cart_bucket.png       | Bin 0 -> 6311 bytes
 .../Janitorial/janitorial_cart.rsi/meta.json  |   6 +-
 3 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_bucket.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index a26852684f..9a4c09a684 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -85,7 +85,7 @@
   - type: SolutionContainerManager
     solutions:
       bucket:
-        maxVol: 500
+        maxVol: 600
   - type: Spillable
     spillDelay: 3.0
   - type: DrainableSolution
@@ -134,10 +134,10 @@
     - type: SolutionContainerManager
       solutions:
         bucket:
-          maxVol: 500
+          maxVol: 600
           reagents:
             - ReagentId: Water
-              Quantity: 500
+              Quantity: 600
 
 - type: entity
   name: wet floor sign
@@ -179,6 +179,7 @@
         tags:
           - Mop
           - TrashBag
+          - Bucket
     - type: ItemSlots
       slots:
         mop_slot:
@@ -187,6 +188,13 @@
             tags:
               - Mop
           insertOnInteract: false # or it conflicts with bucket logic
+          priority: 5 # Higher than bucket slot
+        bucket_slot:
+          name: Bucket
+          whitelist:
+            tags:
+              - Bucket
+          insertOnInteract: false # or it also conflicts with bucket logic
           priority: 4 # Higher than trash bag slot
         trashbag_slot:
           name: Bag
@@ -199,7 +207,7 @@
       - shape:
           !type:PhysShapeCircle
           radius: 0.3
-        density: 350
+        density: 250
         layer:
         - MobLayer
         mask:
@@ -209,10 +217,10 @@
     - type: SolutionContainerManager
       solutions:
         bucket:
-          maxVol: 500
+          maxVol: 800
           reagents:
             - ReagentId: Water
-              Quantity: 250 # half-full at roundstart to leave room for puddles
+              Quantity: 600 # 3 quarters full at roundstart to make it more appealing
     - type: DrainableSolution
       solution: bucket
     - type: RefillableSolution
@@ -243,22 +251,6 @@
                 path: /Audio/Effects/metalbreak.ogg
     - type: ItemMapper
       mapLayers:
-        cart_mop:
-          whitelist:
-            tags:
-              - Mop
-        cart_garbage:
-          whitelist:
-            tags:
-              - TrashBag
-        cart_replacer:
-          whitelist:
-            components:
-              - LightReplacer
-        cart_spray:
-          whitelist:
-            tags:
-              - Spray
         cart_sign1: # this is like stack of floor signs
           minCount: 1
           whitelist:
@@ -279,6 +271,26 @@
           whitelist:
             tags:
               - WetFloorSign
+        cart_spray:
+          whitelist:
+            tags:
+              - Spray
+        cart_garbage:
+          whitelist:
+            tags:
+              - TrashBag
+        cart_replacer:
+          whitelist:
+            components:
+              - LightReplacer
+        cart_bucket:
+          whitelist:
+            tags:
+              - Bucket
+        cart_mop:
+          whitelist:
+            tags:
+              - Mop
       sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
     - type: Appearance
     - type: SolutionContainerVisuals
@@ -297,6 +309,7 @@
           ents: []
         mop_slot: !type:ContainerSlot {}
         trashbag_slot: !type:ContainerSlot {}
+        bucket_slot: !type:ContainerSlot {}
 
 - type: entity
   id: FloorDrain
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_bucket.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_bucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c0555094848693d1d326be4c6073c6cb0f5d391
GIT binary patch
literal 6311
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index b0413325bd..846a3157a5 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "cart_mop",
             "directions": 4
         },
+        {
+            "name": "cart_bucket",
+            "directions": 4
+        },
         {
             "name": "cart_replacer",
             "directions": 4
@@ -122,4 +126,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
-- 
2.51.2