Adjust Belt Storage (#1870)

* belt rework

* Remove unnecessary tags

* Add whitelist to first aid kits

* Adjust medkit whitelist

* Add bottle-tagged items to medkit whitelist

* Grenade tag already exists pro

* tj is an idiot

* b&t debug wtaf are you yappin about

* Give belts another parent, ClothingSlotBase

* contain uncontained containers

* tj dumb fuck

Resources/Locale/en-US/deltav/clothing/belts.ftl

@@ -0,0 +1,7 @@
+# Add sidearm and medkit slots to security belts + webbing, medical webbing respectively
+clothing-belt-sidearm = Sidearm
+clothing-belt-medkit = Medkit
+
+# Add slots to the daishou
+clothing-belt-katana = Katana
+clothing-belt-wakizashi = Wakizashi

Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml

@@ -3,10 +3,12 @@
   parent: ClothingBeltKatanaSheath
   suffix: Filled
   components:
-  - type: StorageFill
-    contents:
-      - id: Wakizashi
-      - id: Katana
+  - type: ContainerFill
+    containers:
+      katanaslot:
+        - Katana
+      wakizashislot:
+        - Wakizashi
 
 - type: entity
   id: ClothingBeltCorpsmanWebbingFilled

Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml

@@ -39,7 +39,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltStorageBase, ClothingSlotBase]
   id: ClothingBeltCorpsmanWebbing
   name: corpsman webbing
   description: A set of security webbing with blue corpsman highlights.
@@ -48,7 +48,28 @@
     sprite: DeltaV/Clothing/Belt/corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/corpsman.rsi
+  - type: ItemSlots # add medkit slot
+    slots:
+      medkit:
+        name: clothing-belt-medkit
+        whitelist:
+          tags:
+          - Medkit
+        insertOnInteract: false # or you can't easily stow medkits in your rig.
   - type: Storage
     grid:
     - 0,0,2,1
     - 4,0,7,1
+  - type: ItemMapper # add stowed medkit sprite
+    mapLayers:
+      medkit:
+        whitelist:
+          tags:
+          - Medkit
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      medkit: !type:ContainerSlot {}
+  - type: Appearance

Resources/Prototypes/DeltaV/tags.yml

@@ -6,6 +6,33 @@
 - type: Tag
   id: BeltSlotNotBelt #not a 'belt'
 
+- type: Tag
+  id: BionicSyrinxImplant
+
+- type: Tag
+  id: BorgModuleSecurity
+
+- type: Tag
+  id: BorgSecurityArmour
+
+- type: Tag
+  id: BorgSecurityHead
+
+- type: Tag
+  id: BorgSecurityLArm
+
+- type: Tag
+  id: BorgSecurityLLeg
+
+- type: Tag
+  id: BorgSecurityRArm
+
+- type: Tag
+  id: BorgSecurityRLeg
+
+- type: Tag
+  id: BorgSecurityTorso
+
 - type: Tag
   id: BulletBB
 
@@ -35,6 +62,9 @@
 
 - type: Tag
   id: HidesHarpyWings
+  
+- type: Tag
+  id: HudMedicalSecurity #Craftable Corpsman Glasses
 
 - type: Tag
   id: MagazinePistolSpecial # For the .38 special ammo and pistol
@@ -46,46 +76,19 @@
   id: ModularTrigger #Craftable Musket
 
 - type: Tag
-  id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
-
-- type: Tag
-  id: SpeedLoaderSpecial
+  id: PaperSlip
 
 - type: Tag
   id: PreventLabel
 
 - type: Tag
-  id: BionicSyrinxImplant
-
-- type: Tag
-  id: PaperSlip
-  
-- type: Tag
-  id: HudMedicalSecurity #Craftable Corpsman Glasses
-
-- type: Tag
-  id: BorgModuleSecurity
-
-- type: Tag
-  id: BorgSecurityHead
-
-- type: Tag
-  id: BorgSecurityTorso
-
-- type: Tag
-  id: BorgSecurityRLeg
-
-- type: Tag
-  id: BorgSecurityLLeg
-
-- type: Tag
-  id: BorgSecurityRArm
-
-- type: Tag
-  id: BorgSecurityLArm
+  id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
 
 - type: Tag
   id: Skirt
 
 - type: Tag
-  id: BorgSecurityArmour
+  id: SpeedLoaderSpecial
+
+- type: Tag
+  id: Wakizashi

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -456,7 +456,7 @@
   - type: Appearance
 
 - type: entity
-  parent: [ClothingBeltStorageBase, BaseRestrictedContraband]
+  parent: [ClothingBeltStorageBase, BaseRestrictedContraband, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase
   id: ClothingBeltSecurity
   name: security belt
   description: Can hold security gear like handcuffs and flashes.
@@ -465,6 +465,14 @@
     sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite
+  - type: ItemSlots # DeltaV - add sidearm slot
+    slots:
+      holster:
+        name: clothing-belt-sidearm
+        whitelist:
+          tags:
+          - Sidearm
+        insertOnInteract: false
   - type: Storage
     whitelist:
       tags:
@@ -489,21 +497,26 @@
         - Whistle
         - HolosignProjector
         - BalloonPopper
-  - type: ItemMapper
+  - type: ItemMapper # DeltaV - adjust for DeltaV sprites.
     mapLayers:
-      flashbang:
-        whitelist:
-          components:
-          - FlashOnTrigger
-      stunbaton:
+      baton:
         whitelist:
           components:
           - Stunbaton
-      tear_gas_grenade:
+      gasgrenade:
         whitelist:
-          components:
-          - SmokeOnTrigger
-    sprite: Clothing/Belt/belt_overlay.rsi
+          tags:
+            - Grenade
+      slp:
+        whitelist:
+          tags:
+          - Sidearm
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      holster: !type:ContainerSlot {}
   - type: Appearance
 
 - type: entity
@@ -610,7 +623,7 @@
         - CartridgeAmmo
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase
   id: ClothingBeltSecurityWebbing
   name: security chest rig # DeltaV - rename from "security carrier" due to already existing plate carrier
   description: Unique and versatile chest rig, can hold security gear.
@@ -619,10 +632,31 @@
     sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
   - type: Clothing
     sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite
+  - type: ItemSlots # DeltaV - add sidearm slot
+    slots:
+      holster:
+        name: clothing-belt-sidearm
+        whitelist:
+          tags:
+          - Sidearm
+        insertOnInteract: false
   - type: Storage # Delta-V - Split Inventory
     grid:
     - 0,0,2,1
     - 4,0,7,1
+  - type: ItemMapper # DeltaV - add holstered sidearm sprite
+    mapLayers:
+      slp:
+        whitelist:
+          tags:
+          - Sidearm
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      holster: !type:ContainerSlot {}
+  - type: Appearance # DeltaV
 
 - type: entity
   parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ]

Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml

@@ -7,7 +7,20 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
-  - type: Storage
+  - type: Storage # DeltaV - add whitelist to first aid kits
+    whitelist:
+      tags:
+        - Bloodpack
+        - Bottle
+        - Brutepack
+        - Gauze
+        - GasTank
+        - Ointment
+        - PillCanister
+        - Syringe
+      components:
+        - BreathMask
+        - Hypospray
     maxItemSize: Small
     grid:
     - 0,0,3,1

Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

@@ -35,6 +35,9 @@
         enum.ConstructionVisuals.Layer:
           Primed: { state: primed }
           Unprimed: { state: icon }
+  - type: Tag # DeltaV - assign grenade tag to all grenades
+    tags:
+    - Grenade
 
 - type: entity
   name: explosive grenade

Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml

@@ -37,7 +37,7 @@
     sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: ClothingBeltBase # DeltaV - reparent from ClothingBeltStorageBase
   id: ClothingBeltKatanaSheath
   name: katana sheaths
   description: An ornate belt designed to hold a pair of samurai's blades, or daisho.
@@ -47,25 +47,52 @@
     state: sheath
   - type: Clothing
     sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi
-  - type: Storage
-    grid:
-      - 0,0,3,1
-    whitelist:
-      tags:
-        - Katana
-  - type: ItemMapper
-    mapLayers:
-      sheath-sabre:
+  - type: ItemSlots # DeltaV - adjust how objects are stored
+    slots:
+      katanaslot:
+        name: clothing-belt-katana
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/Items/sheath.ogg
+        ejectSound: /Audio/Items/unsheath.ogg
         whitelist:
           tags:
           - Katana
+        priority: 2
+      wakizashislot:
+        name: clothing-belt-wakizashi
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/Items/sheath.ogg
+        ejectSound: /Audio/Items/unsheath.ogg
+        whitelist:
+          tags:
+          - Wakizashi
+        priority: 1
+  - type: ItemMapper # DeltaV - adjust how stored objects are displayed
+    mapLayers:
+      katana:
+        whitelist:
+          tags:
+          - Katana
+      wakizashi:
+        whitelist:
+          tags:
+          - Wakizashi
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      katanaslot: !type:ContainerSlot {}
+      wakizashislot: !type:ContainerSlot {}
   - type: Appearance
   - type: Tag
     tags:
       - BeltSlotNotBelt
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase
   id: ClothingBeltMilitaryWebbingCMO
   name: chief medical officer's chest rig
   description: A medical chest rig with deep pockets, for use by paramedics and health professionals.
@@ -76,11 +103,32 @@
     sprite: DeltaV/Clothing/Belt/cmowebbing.rsi # DeltaV - resprite
   - type: Item
     size: Large
+  - type: ItemSlots # DeltaV - add medkit slot
+    slots:
+      medkit:
+        name: clothing-belt-medkit
+        whitelist:
+          tags:
+          - Medkit
+        insertOnInteract: false # or you can't easily stow medkits in your rig.
   - type: Storage
     maxItemSize: Normal
     grid: # DeltaV - Make the grid smaller
     - 0,0,2,1
     - 4,0,7,1
+  - type: ItemMapper # DeltaV - add stowed medkit sprite
+    mapLayers:
+      medkit:
+        whitelist:
+          tags:
+          - Medkit
+    sprite: DeltaV/Clothing/Belt/belt_overlay.rsi
   - type: Tag
     tags:
       - BeltSlotNotBelt
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      medkit: !type:ContainerSlot {}
+  - type: Appearance # DeltaV

Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml

@@ -6,7 +6,7 @@
   components:
   - type: Tag
     tags:
-    - Katana
+    - Wakizashi # DeltaV - differentiate between Katana and Wakizashi
   - type: Sharp
   - type: Utensil
     types:

Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Original work by TJohnson.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "katana"
+    },
+    {
+      "name": "wakizashi"
+    },
+    {
+      "name": "slp"
+    },
+    {
+      "name": "universal"
+    },
+    {
+      "name": "flashbang"
+    },
+    {
+      "name": "gasgrenade"
+    },
+    {
+      "name": "baton"
+    },
+    {
+      "name": "medkit"
+    }
+  ]
+}