Key distribution system (#625)

* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -5,7 +5,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: CP14KeyRingAlchemist
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14Syringe
         amount: 2
@@ -43,7 +42,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: CP14KeyRingBanker
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved
@@ -73,7 +71,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: CP14KeyRingCommandant
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved

Resources/Prototypes/_CP14/Entities/Objects/Keys/alchemist.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernAlchemistAbstract
+  suffix: Abstract Alchemist
+  components:
+  - type: CP14AbstractKey
+    group: Alchemist
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyAlchemy1
+  suffix: Alchemy1
+  components:
+  - type: CP14Key
+    autoGenerateShape: Alchemy1
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyAlchemy2
+  suffix: Alchemy2
+  components:
+  - type: CP14Key
+    autoGenerateShape: Alchemy2

Resources/Prototypes/_CP14/Entities/Objects/Keys/bank.yml

@@ -0,0 +1,48 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBankEntrance
+  suffix: Bank Entrance
+  components:
+  - type: CP14Key
+    autoGenerateShape: BankEntrance
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBankStaff
+  suffix: Bank Staff
+  components:
+  - type: CP14Key
+    autoGenerateShape: BankStaff
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBankVault
+  name: golden key
+  suffix: Bank Vault
+  components:
+  - type: Sprite
+    layers:
+    - state: vault_key
+      map: [ "random" ]
+  - type: RandomSprite
+    available:
+    - random:
+        vault_key: ""
+  - type: CP14Key
+    autoGenerateShape: BankVault
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBankCommandantRoom
+  suffix: Commandant
+  components:
+  - type: CP14Key
+    autoGenerateShape: BankCommandantRoom
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBankSafe
+  suffix: Bank Safes
+  components:
+  - type: CP14Key
+    autoGenerateShape: BankSafe

Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml

@@ -0,0 +1,59 @@
+- type: entity
+  parent: BaseItem
+  id: CP14BaseKey
+  abstract: true
+  categories: [ ForkFiltered ]
+  name: key
+  description: A small, intricate piece of metal that opens some locks. Don't give it to anyone!
+  components: 
+  - type: Tag
+    tags:
+    - CP14Key
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _CP14/Objects/keys.rsi
+    layers:
+    - state: key1
+      map: [ "random" ]
+  - type: RandomSprite
+    available:
+    - random:
+        key1: ""
+        key2: ""
+        key3: ""
+        key4: ""
+        key5: ""
+        key6: ""
+        key7: ""
+        key8: ""
+        key9: ""
+        key10: ""
+        key11: ""
+        key12: ""
+        key13: ""
+        key14: ""
+        key15: ""
+        key16: ""
+        key17: ""
+        key18: ""
+  - type: CP14Key
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/_CP14/Items/key_drop.ogg
+      params:
+        variation: 0.05
+
+- type: entity
+  parent: BaseItem
+  id: CP14BaseLockpick
+  name: lockpick
+  description: A thief's tool that, with proper skill and skill, allows you to pick any lock.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Sprite
+    sprite: _CP14/Objects/keys.rsi
+    state: lockpick
+  - type: CP14Lockpick

Resources/Prototypes/_CP14/Entities/Objects/Keys/blacksmith.yml

@@ -0,0 +1,15 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernBlacksmithAbstract
+  suffix: Abstract Blacksmith
+  components:
+  - type: CP14AbstractKey
+    group: Blacksmith
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyBlacksmith
+  suffix: Blacksmith1
+  components:
+  - type: CP14Key
+    autoGenerateShape: Blacksmith1

Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml

@@ -46,11 +46,11 @@
     contents:
     - id: CP14KeyTavernHall
     - id: CP14KeyTavernStaff
-    - id: CP14KeyTavernDorms1
-    - id: CP14KeyTavernDorms2
-    - id: CP14KeyTavernDorms3
-    - id: CP14KeyTavernDorms4
-    - id: CP14KeyTavernDorms5
+    - id: CP14KeyTavernDormsAbstract # TODO: Move to main innkeeper
+    - id: CP14KeyTavernDormsAbstract
+    - id: CP14KeyTavernDormsAbstract
+    - id: CP14KeyTavernDormsAbstract
+    - id: CP14KeyTavernDormsAbstract
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -59,7 +59,16 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyBlacksmith
+    - id: CP14KeyTavernBlacksmithAbstract
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingPersonalHouse
+  suffix: Personal House
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyPersonalHouseAbstract
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -68,7 +77,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyAlchemy
+    - id: CP14KeyTavernAlchemistAbstract
 
 - type: entity
   parent: CP14BaseKeyRing

Resources/Prototypes/_CP14/Entities/Objects/Keys/personalHouse.yml

@@ -0,0 +1,87 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouseAbstract
+  suffix: Abstract Personal house
+  components:
+  - type: CP14AbstractKey
+    group: PersonalHouse
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse1
+  suffix: PersonalHouse1
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse1
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse2
+  suffix: PersonalHouse2
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse2
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse3
+  suffix: PersonalHouse3
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse3
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse4
+  suffix: PersonalHouse4
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse4
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse5
+  suffix: PersonalHouse5
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse5
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse6
+  suffix: PersonalHouse6
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse6
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse7
+  suffix: PersonalHouse7
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse7
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse8
+  suffix: PersonalHouse8
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse8
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse9
+  suffix: PersonalHouse9
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse9
+    
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyPersonalHouse10
+  suffix: PersonalHouse10
+  components:
+  - type: CP14Key
+    autoGenerateShape: PersonalHouse10

Resources/Prototypes/_CP14/Entities/Objects/Keys/tavern.yml

@@ -0,0 +1,63 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernHall
+  suffix: Tavern Hall
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernHall
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernStaff
+  suffix: Tavern Staff
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernStaff
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDormsAbstract
+  suffix: Abstract Tavern Dorms
+  components:
+  - type: CP14AbstractKey
+    group: TavernDorms
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDorms1
+  suffix: Tavern Dorms 1
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernDorms1
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDorms2
+  suffix: Tavern Dorms 2
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernDorms2
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDorms3
+  suffix: Tavern Dorms 3
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernDorms3
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDorms4
+  suffix: Tavern Dorms 4
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernDorms4
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyTavernDorms5
+  suffix: Tavern Dorms 5
+  components:
+  - type: CP14Key
+    autoGenerateShape: TavernDorms5

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/alchemist.yml

@@ -0,0 +1,35 @@
+# Wooden
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernAlchemy1
+  suffix: Alchemy 1
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Alchemy1
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14WoodenDoorTavernAlchemy1
+  - CP14WoodenDoorMirrored
+  id: CP14WoodenDoorTavernAlchemyMirrored1
+  suffix: Alchemy 1, Mirrored
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernAlchemy2
+  suffix: Alchemy 2
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Alchemy2
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14WoodenDoorTavernAlchemy2
+  - CP14WoodenDoorMirrored
+  id: CP14WoodenDoorTavernAlchemyMirrored2
+  suffix: Alchemy 2, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/bank.yml

@@ -0,0 +1,75 @@
+# Iron
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBankStaff
+  suffix: Bank Staff
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankStaff
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14IronDoorBankStaff
+  - CP14IronDoorMirrored
+  id: CP14IronDoorMirroredBankStaff
+  suffix: Bank Staff, Mirrored
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBankVault
+  suffix: Bank Vault
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankVault
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14IronDoorBankVault
+  - CP14IronDoorMirrored
+  id: CP14IronDoorMirroredBankVault
+  suffix: Bank Vault, Mirrored
+
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBankSafe
+  suffix: Bank Safe
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankSafe
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBankCommandantRoom
+  suffix: Bank Commandant room
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankCommandantRoom
+  - type: Lock
+    locked: true
+
+# Iron Windowed
+
+- type: entity
+  parent: CP14IronDoorWindowed
+  id: CP14IronDoorWindowedBankEntrance
+  suffix: Bank Entrance
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankEntrance
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14IronDoorWindowedBankEntrance
+  - CP14IronDoorWindowedMirrored
+  id: CP14IronDoorWindowedMirroredBankEntrance
+  suffix: Bank Entrance, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/blacksmith.yml

@@ -0,0 +1,33 @@
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBlacksmith1
+  suffix: Blacksmith
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Blacksmith1
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14IronDoorBlacksmith1
+  - CP14IronDoorMirrored
+  id: CP14IronDoorMirroredBlacksmith1
+  suffix: Blacksmith, Mirrored
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorBlacksmith2
+  suffix: Blacksmith
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Blacksmith2
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14IronDoorBlacksmith2
+  - CP14IronDoorMirrored
+  id: CP14IronDoorMirroredBlacksmith2
+  suffix: Blacksmith, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/personalHouse.yml

@@ -0,0 +1,101 @@
+# Wooden
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse1
+  suffix: PersonalHouse1
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse1
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse2
+  suffix: PersonalHouse2
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse2
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse3
+  suffix: PersonalHouse3
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse3
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse4
+  suffix: PersonalHouse4
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse4
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse5
+  suffix: PersonalHouse5
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse5
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse6
+  suffix: PersonalHouse6
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse6
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse7
+  suffix: PersonalHouse7
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse7
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse8
+  suffix: PersonalHouse8
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse8
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse9
+  suffix: PersonalHouse9
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse9
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse10
+  suffix: PersonalHouse10
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/tavern.yml

@@ -0,0 +1,87 @@
+# Wooden
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernStaff
+  suffix: Tavern Staff
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernStaff
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14WoodenDoorTavernStaff
+  - CP14WoodenDoorMirrored
+  id: CP14WoodenDoorTavernStaffMirrored
+  suffix: Tavern Staff, Mirrored
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernDorms1
+  suffix: Tavern Dorms 1
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernDorms1
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernDorms2
+  suffix: Tavern Dorms 2
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernDorms2
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernDorms3
+  suffix: Tavern Dorms 3
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernDorms3
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernDorms4
+  suffix: Tavern Dorms 4
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernDorms4
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorTavernDorms5
+  suffix: Tavern Dorms 5
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernDorms5
+  - type: Lock
+    locked: true
+
+# Wooden windowed
+
+- type: entity
+  parent: CP14WoodenDoorWindowed
+  id: CP14WoodenDoorWindowedTavernHall
+  suffix: Tavern Hall
+  components:
+  - type: CP14Lock
+    autoGenerateShape: TavernHall
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: 
+  - CP14WoodenDoorWindowedTavernHall
+  - CP14WoodenDoorWindowedMirrored
+  id: CP14WoodenDoorTavernHallMirrored
+  suffix: Tavern Hall, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml

@@ -42,80 +42,3 @@
   #- type: Construction
   #  graph: CP14WoodenDoor
   #  node: CP14WoodenDoorMirrored
-
-#Blacksmith
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBlacksmith
-  suffix: Blacksmith
-  components:
-  - type: CP14Lock
-    autoGenerateShape: Blacksmith
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14IronDoorBlacksmith
-  - CP14IronDoorMirrored
-  id: CP14IronDoorMirroredBlacksmith
-  suffix: Blacksmith, Mirrored
-
-# Bank
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankStaff
-  suffix: Bank Staff
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankStaff
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14IronDoorBankStaff
-  - CP14IronDoorMirrored
-  id: CP14IronDoorMirroredBankStaff
-  suffix: Bank Staff, Mirrored
-
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankVault
-  suffix: Bank Vault
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankVault
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14IronDoorBankVault
-  - CP14IronDoorMirrored
-  id: CP14IronDoorMirroredBankVault
-  suffix: Bank Vault, Mirrored
-
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe
-  suffix: Bank Safe
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankCommandantRoom
-  suffix: Bank Commandant room
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankCommandantRoom
-  - type: Lock
-    locked: true

Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors_windowed.yml

@@ -45,39 +45,3 @@
   #- type: Construction
   #  graph: CP14WoodenDoor
   #  node: CP14WoodenDoorMirrored
-
-# Bank
-
-- type: entity
-  parent: CP14IronDoorWindowed
-  id: CP14IronDoorWindowedBankEntrance
-  suffix: Bank Entrance
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankEntrance
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14IronDoorWindowedBankEntrance
-  - CP14IronDoorWindowedMirrored
-  id: CP14IronDoorWindowedMirroredBankEntrance
-  suffix: Bank Entrance, Mirrored
-
-- type: entity
-  parent: CP14IronDoorWindowed
-  id: CP14IronDoorWindowedBlacksmith
-  suffix: Blacksmith
-  components:
-  - type: CP14Lock
-    autoGenerateShape: Blacksmith
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14IronDoorWindowedBlacksmith
-  - CP14IronDoorWindowedMirrored
-  id: CP14IronDoorWindowedMirroredBlacksmith
-  suffix: Blacksmith, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors.yml

@@ -42,92 +42,4 @@
     closedSpriteState: closed_mirrored
   - type: Construction
     graph: CP14WoodenDoor
-    node: CP14WoodenDoorMirrored
-
-# Tavern
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernStaff
-  suffix: Tavern Staff
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernStaff
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14WoodenDoorTavernStaff
-  - CP14WoodenDoorMirrored
-  id: CP14WoodenDoorTavernStaffMirrored
-  suffix: Tavern Staff, Mirrored
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernDorms1
-  suffix: Tavern Dorms 1
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernDorms1
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernDorms2
-  suffix: Tavern Dorms 2
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernDorms2
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernDorms3
-  suffix: Tavern Dorms 3
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernDorms3
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernDorms4
-  suffix: Tavern Dorms 4
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernDorms4
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernDorms5
-  suffix: Tavern Dorms 5
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernDorms5
-  - type: Lock
-    locked: true
-
-# Alchemy 
-
-- type: entity
-  parent: CP14WoodenDoor
-  id: CP14WoodenDoorTavernAlchemy
-  suffix: Alchemy
-  components:
-  - type: CP14Lock
-    autoGenerateShape: Alchemy
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14WoodenDoorTavernAlchemy
-  - CP14WoodenDoorMirrored
-  id: CP14WoodenDoorTavernAlchemyMirrored
-  suffix: Alchemy, Mirrored
+    node: CP14WoodenDoorMirrored

Resources/Prototypes/_CP14/Entities/Structures/Doors/wooden_doors_windowed.yml

@@ -46,22 +46,3 @@
   - type: Construction
     graph: CP14WoodenDoor
     node: CP14WoodenDoorWindowedMirrored
-
-# Tavern
-
-- type: entity
-  parent: CP14WoodenDoorWindowed
-  id: CP14WoodenDoorWindowedTavernHall
-  suffix: Tavern Hall
-  components:
-  - type: CP14Lock
-    autoGenerateShape: TavernHall
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: 
-  - CP14WoodenDoorWindowedTavernHall
-  - CP14WoodenDoorWindowedMirrored
-  id: CP14WoodenDoorTavernHallMirrored
-  suffix: Tavern Hall, Mirrored

Resources/Prototypes/_CP14/Entities/keys.yml

@@ -1,178 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14BaseKey
-  abstract: true
-  categories: [ ForkFiltered ]
-  name: key
-  description: A small, intricate piece of iron that opens certain locks. Don't give it to just anyone!
-  components: 
-  - type: Tag
-    tags:
-    - CP14Key
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: _CP14/Objects/keys.rsi
-  - type: CP14Key
-    autoGenerateShape: Debug
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/_CP14/Items/key_drop.ogg
-      params:
-        variation: 0.05
-
-- type: entity
-  parent: BaseItem
-  id: CP14BaseLockpick
-  name: lockpick
-  description: A thief's tool that, with proper skill and skill, allows you to pick any lock.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    storedRotation: -90
-  - type: Sprite
-    sprite: _CP14/Objects/keys.rsi
-    state: lockpick
-  - type: CP14Lockpick
-
-# Tavern 
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernHall
-  name: tavern hall key
-  components:
-  - type: Sprite
-    state: key1
-  - type: CP14Key
-    autoGenerateShape: TavernHall
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernStaff
-  name: tavern staff key
-  components:
-  - type: Sprite
-    state: key2
-  - type: CP14Key
-    autoGenerateShape: TavernStaff
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernDorms1
-  name: tavern room 1 key
-  components:
-  - type: Sprite
-    state: key3
-  - type: CP14Key
-    autoGenerateShape: TavernDorms1
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernDorms2
-  name: tavern room 2 key
-  components:
-  - type: Sprite
-    state: key4
-  - type: CP14Key
-    autoGenerateShape: TavernDorms2
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernDorms3
-  name: tavern room 3 key
-  components:
-  - type: Sprite
-    state: key5
-  - type: CP14Key
-    autoGenerateShape: TavernDorms3
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernDorms4
-  name: tavern room 4 key
-  components:
-  - type: Sprite
-    state: key6
-  - type: CP14Key
-    autoGenerateShape: TavernDorms4
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyTavernDorms5
-  name: tavern room 5 key
-  components:
-  - type: Sprite
-    state: key7
-  - type: CP14Key
-    autoGenerateShape: TavernDorms5
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyAlchemy
-  name: alchemist key
-  components:
-  - type: Sprite
-    state: key8
-  - type: CP14Key
-    autoGenerateShape: Alchemy
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBlacksmith
-  name: blacksmith key
-  components:
-  - type: Sprite
-    state: key8
-  - type: CP14Key
-    autoGenerateShape: Blacksmith
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankEntrance
-  name: bank entrance key
-  components:
-  - type: Sprite
-    state: key9
-  - type: CP14Key
-    autoGenerateShape: BankEntrance
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankStaff
-  name: bank staff key
-  components:
-  - type: Sprite
-    state: key10
-  - type: CP14Key
-    autoGenerateShape: BankStaff
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankVault
-  name: bank vault key
-  components:
-  - type: Sprite
-    state: key11
-  - type: CP14Key
-    autoGenerateShape: BankVault
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankCommandantRoom
-  name: bank commandant room key
-  components:
-  - type: Sprite
-    state: key11
-  - type: CP14Key
-    autoGenerateShape: BankCommandantRoom
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe
-  name: bank safe key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe

Resources/Prototypes/_CP14/LockCategories/LockCategory.yml

@@ -1,66 +1,11 @@
-- type: CP14LockCategory
-  id: Debug
-  complexity: 10
+- type: CP14LockGroup
+  id: TavernDorms
 
-# Bank
-
-- type: CP14LockCategory
-  id: BankEntrance
-  complexity: 3
-
-- type: CP14LockCategory
-  id: BankStaff
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankVault
-  complexity: 7
-
-- type: CP14LockCategory
-  id: BankCommandantRoom
-  complexity: 7
-
-- type: CP14LockCategory
-  id: BankSafe
-  complexity: 5
-
-# Tavern 
-
-- type: CP14LockCategory
-  id: TavernHall
-  complexity: 3
-
-- type: CP14LockCategory
-  id: TavernStaff
-  complexity: 5
-
-
-- type: CP14LockCategory
-  id: TavernDorms1
-  complexity: 3
-
-- type: CP14LockCategory
-  id: TavernDorms2
-  complexity: 3
-
-- type: CP14LockCategory
-  id: TavernDorms3
-  complexity: 3
-
-- type: CP14LockCategory
-  id: TavernDorms4
-  complexity: 3
-
-- type: CP14LockCategory
-  id: TavernDorms5
-  complexity: 3
-
-# Mercenary 
-
-- type: CP14LockCategory
-  id: Alchemy
-  complexity: 5
-
-- type: CP14LockCategory
+- type: CP14LockGroup
   id: Blacksmith
-  complexity: 5
+
+- type: CP14LockGroup
+  id: Alchemist
+
+- type: CP14LockGroup
+  id: PersonalHouse

Resources/Prototypes/_CP14/LockCategories/lockTypes.yml

@@ -0,0 +1,156 @@
+# Bank
+
+- type: CP14LockType
+  id: BankEntrance
+  complexity: 3
+  name: cp14-lock-shape-bank-entrance
+
+- type: CP14LockType
+  id: BankStaff
+  complexity: 4
+  name: cp14-lock-shape-bank-staff
+
+- type: CP14LockType
+  id: BankCommandantRoom
+  complexity: 5
+  name: cp14-lock-shape-bank-commandant
+
+- type: CP14LockType
+  id: BankSafe
+  complexity: 6
+  name: cp14-lock-shape-bank-safe
+
+- type: CP14LockType
+  id: BankVault
+  complexity: 7
+  name: cp14-lock-shape-bank-vault
+
+# Tavern 
+
+- type: CP14LockType
+  id: TavernHall
+  complexity: 3
+  name: cp14-lock-shape-tavern-hall
+
+- type: CP14LockType
+  id: TavernStaff
+  complexity: 4
+  name: cp14-lock-shape-tavern-staff
+
+- type: CP14LockType
+  id: TavernDorms1
+  group: TavernDorms
+  complexity: 3
+  name: cp14-lock-shape-tavern-dorm1
+
+- type: CP14LockType
+  id: TavernDorms2
+  group: TavernDorms
+  complexity: 3
+  name: cp14-lock-shape-tavern-dorm2
+
+- type: CP14LockType
+  id: TavernDorms3
+  group: TavernDorms
+  complexity: 3
+  name: cp14-lock-shape-tavern-dorm3
+
+- type: CP14LockType
+  id: TavernDorms4
+  group: TavernDorms
+  complexity: 3
+  name: cp14-lock-shape-tavern-dorm4
+
+- type: CP14LockType
+  id: TavernDorms5
+  group: TavernDorms
+  complexity: 3
+  name: cp14-lock-shape-tavern-dorm5
+
+# Mercenary 
+
+- type: CP14LockType
+  id: Alchemy1
+  group: Alchemist
+  complexity: 4
+  name: cp14-lock-shape-alchemist1
+  
+- type: CP14LockType
+  id: Alchemy2
+  group: Alchemist
+  complexity: 4
+  name: cp14-lock-shape-alchemist2
+
+- type: CP14LockType
+  id: Blacksmith1
+  group: Blacksmith
+  complexity: 4
+  name: cp14-lock-shape-blacksmith1
+
+- type: CP14LockType
+  id: Blacksmith2
+  group: Blacksmith
+  complexity: 4
+  name: cp14-lock-shape-blacksmith2
+
+# Personal house
+
+- type: CP14LockType
+  id: PersonalHouse1
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse1
+
+- type: CP14LockType
+  id: PersonalHouse2
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse2
+
+- type: CP14LockType
+  id: PersonalHouse3
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse3
+
+- type: CP14LockType
+  id: PersonalHouse4
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse4
+
+- type: CP14LockType
+  id: PersonalHouse5
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse5
+
+- type: CP14LockType
+  id: PersonalHouse6
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse6
+
+- type: CP14LockType
+  id: PersonalHouse7
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse7
+
+- type: CP14LockType
+  id: PersonalHouse8
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse8
+
+- type: CP14LockType
+  id: PersonalHouse9
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse9
+
+- type: CP14LockType
+  id: PersonalHouse10
+  group: PersonalHouse
+  complexity: 3
+  name: cp14-lock-shape-personalhouse10

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -58,8 +58,26 @@
           availableJobs:
             CP14Adventurer: [ -1, -1 ]
             CP14Alchemist: [ 2, 4 ]
-            CP14Blacksmith: [ 1, 1 ]
+            CP14Blacksmith: [ 1, 2 ]
             CP14Innkeeper: [ 3, 4 ]
             CP14Commandant: [1, 1]
             CP14Banker: [3, 4]
-            #CP14GuardCommander: [1, 1]
+            #CP14GuardCommander: [1, 1]
+        - type: CP14StationKeyDistribution
+          keys:
+          - TavernDorms1
+          - TavernDorms2
+          - TavernDorms3
+          - Alchemy1
+          - Alchemy2
+          - Blacksmith1
+          - PersonalHouse1
+          - PersonalHouse2
+          - PersonalHouse3
+          - PersonalHouse4
+          - PersonalHouse5
+          - PersonalHouse6
+          - PersonalHouse7
+          - PersonalHouse8
+          - PersonalHouse9
+          - PersonalHouse10

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml

@@ -14,4 +14,5 @@
 - type: startingGear
   id: CP14AdventurerGear
   equipment:
+    keys: CP14KeyRingPersonalHouse
     belt1: CP14WalletFilledTest