[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

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index a26852684f149e5cb7eb197710dbf7a4dc6a99b2..9a4c09a6840a0f20f63174ec9edfbdef5a3c893d 100644 (file)
--- 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 (file)
index 0000000..3c05550
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_bucket.png differ

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 b0413325bd56b192ebe89c8dc1b2697b1a79394b..846a3157a544f0e8c1451d582f7820eb2f72c069 100644 (file)
--- 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
+}