Prototypes for Guard (#616)

* Prototypes for Guard

* imperial laws

* merge

* yml clean up

* flags + change in imperial laws

* map update

* guard clothing resprite

* cool guard helmet

* guards grip and halberd

* fill cabinets, add guard commander stamp

* key and keyring fix

* Update arenas.yml

* Update migration.yml

* tapestry fix

* guidebook spacing

* Update meta.json

* add bold tags

* Update flags_wallmount.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>

Resources/Locale/en-US/_CP14/loadouts/loadout.ftl

@@ -31,6 +31,7 @@ cp14-loadout-guard-cloak  = Guard's cloak
 cp14-loadout-guard-head = Guard's head
 cp14-loadout-guard-pants = Guard's pants
 cp14-loadout-guard-shirt = Guard's shirt
+cp14-loadout-guard-spells = Guard's spells
 
 # Bank
 
@@ -39,4 +40,4 @@ cp14-loadout-commandant-head = Commandant's hat
 cp14-loadout-commandant-cloak = Commandant's cloak
 cp14-loadout-bank-shirt = Bank Employee shirt
 cp14-loadout-bank-pants = Bank Employee pants
-cp14-loadout-bank-shoes = Bank Employee shoes
+cp14-loadout-bank-shoes = Bank Employee shoes

Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl

@@ -27,4 +27,9 @@ cp14-lock-shape-personalhouse6 = house  №6
 cp14-lock-shape-personalhouse7 = house  №7
 cp14-lock-shape-personalhouse8 = house  №8
 cp14-lock-shape-personalhouse9 = house  №9
-cp14-lock-shape-personalhouse10 = house  №10
+cp14-lock-shape-personalhouse10 = house  №10
+
+cp14-lock-shaper-guard-entrance = barracks, entrance
+cp14-lock-shaper-guard-staff = barracks
+cp14-lock-shaper-guard-commander = guardhouse
+cp14-lock-shaper-guard-weapon-storage = weapons storage

Resources/Locale/en-US/_CP14/stamp/stamp.ftl

@@ -1,3 +1,4 @@
 cp14-stamp-denied = Denied
 cp14-stamp-approved = Approved
-cp14-stamp-bank = Commandant
+cp14-stamp-bank = Commandant
+cp14-stamp-guard-commander = Guard commander

Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl

@@ -32,6 +32,7 @@ cp14-loadout-guard-cloak  = Накидка стражи
 cp14-loadout-guard-head = Шляпа стражи
 cp14-loadout-guard-pants = Штаны стражи
 cp14-loadout-guard-shirt = Рубашка стражи
+cp14-loadout-guard-spells = Заклинания стражи
 
 # Bank
 
@@ -40,4 +41,4 @@ cp14-loadout-commandant-head = Шляпа коменданта
 cp14-loadout-commandant-cloak = Накидка коменданта
 cp14-loadout-bank-shirt = Рубашка работника банка
 cp14-loadout-bank-pants = Штаны работника банка
-cp14-loadout-bank-shoes = Ботинки работника банка
+cp14-loadout-bank-shoes = Ботинки работника банка

Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl

@@ -27,4 +27,9 @@ cp14-lock-shape-personalhouse6 = дом №6
 cp14-lock-shape-personalhouse7 = дом №7
 cp14-lock-shape-personalhouse8 = дом №8
 cp14-lock-shape-personalhouse9 = дом №9
-cp14-lock-shape-personalhouse10 = дом №10
+cp14-lock-shape-personalhouse10 = дом №10
+
+cp14-lock-shaper-guard-entrance = казармы, вход
+cp14-lock-shaper-guard-staff = казармы
+cp14-lock-shaper-guard-commander = дом главы стражи
+cp14-lock-shaper-guard-weapon-storage = хранилище оружия

Resources/Locale/ru-RU/_CP14/stamp/stamp.ftl

@@ -1,3 +1,4 @@
 cp14-stamp-denied = Отказано
 cp14-stamp-approved = Утверждено
-cp14-stamp-bank = Комендант
+cp14-stamp-bank = Комендант
+cp14-stamp-guard-commander = Командир стражи

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

@@ -106,11 +106,52 @@
   parent: CP14WoodenCloset
   id: CP14WoodenClosetBlacksmithFilled
   suffix: Blacksmith, Filled
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #    - id: CP14KeyRingCommandant
-  #    - id: HandLabeler #TODO custom cp14 labeler
-  #    - id: CP14StampDenied
-  #    - id: CP14StampApproved
-  #    - id: CP14StampCommandant
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandLabeler #TODO custom cp14 labeler
+      - id: CP14WoodenPlanks10
+      - id: CP14Nail10
+      - id: CP14CopperBar10
+      - id: CP14IronBar5
+
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetGuardFilled
+  suffix: Guard, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Rope
+      - id: CP14Rope
+      - id: CP14ModularGuardHalberd
+      - id: CP14BaseShield
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14BaseLightCrossbow
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14Crossbolt
+      - id: CP14EnergyCrystalSmall
+      - id: CP14CrystalLampBlueEmpty
+      - id: CP14BookImperialLawsHandBook
+
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetGuardCommanderFilled
+  suffix: Guard Commander, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Rope
+      - id: CP14Rope
+      - id: CP14ModularGuardHalberd
+      - id: CP14BaseShield
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14ModularGripIronLongGuard
+      - id: CP14EnergyCrystalSmall
+      - id: CP14CrystalLampBlueEmpty
+      - id: CP14StampGuardCommander
+      - id: CP14BookImperialLawsHandBook

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

@@ -58,18 +58,40 @@
   parent: CP14WoodenCabinet
   id: CP14WoodenCabinetBlacksmith
   suffix: Blacksmith, Filled
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #    - id: CP14ClothingCloakCommandantJacket
-  #      prob: 1
-  #    - id: CP14ClothingHeadBowlerGolden
-  #      prob: 0.5
-  #    - id: CP14ClothingPantsAristocratic
-  #      prob: 0.5
-  #    - id: CP14ClothingShirtBanker
-  #      prob: 0.5
-  #    - id: CP14ClothingEyesMonocle
-  #      prob: 0.2
-  #    - id: CP14ClothingEyesGlasses
-  #      prob: 0.3
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingCloakBlacksmithArpon
+        prob: 1
+
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetGuard
+  suffix: Guard, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingHeadGuardHelmet
+        prob: 0.7
+      - id: CP14ClothingPantsGuardsChainmailSkirt
+        prob: 0.7
+      - id: CP14ClothingShirtGuardsChainmailShirtB
+        prob: 0.7
+      - id: CP14ClothingCloakGuardBlue
+        prob: 0.5
+
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetGuardCommander
+  suffix: Guard Commander, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingHeadGuardHelmet
+        prob: 0.7
+      - id: CP14ClothingPantsGuardsChainmailSkirt
+        prob: 0.7
+      - id: CP14ClothingShirtGuardsChainmailShirtB
+        prob: 0.7
+      - id: CP14ClothingCloakGuardCommander
+        prob: 1

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/guard.yml

@@ -5,15 +5,6 @@
   name: "guard's cloak"
   description: Shoulder cape in the standard Imperial Guard colors
 
-- type: entity
-  parent: CP14ClothingCloakGuardBase
-  id: CP14ClothingCloakGuardWhite
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Roles/Guard/white.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/Guard/white.rsi
-
 - type: entity
   parent: CP14ClothingCloakGuardBase
   id: CP14ClothingCloakGuardBlue

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/mercenary.yml

@@ -29,4 +29,13 @@
   - type: Sprite
     sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/General/cheetah_skin.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakWhite
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/white.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guard.yml

@@ -0,0 +1,28 @@
+- type: entity
+  parent: CP14ClothingHeadBase
+  id: CP14ClothingHeadGuardBase
+  abstract: true
+  components:
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.90
+        Heat: 0.95
+
+- type: entity
+  parent: CP14ClothingHeadGuardBase
+  id: CP14ClothingHeadGuardHelmet
+  name: "guard's helmet"
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Head/Roles/Guard/helmet.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Head/Roles/Guard/helmet.rsi
+  - type: HideLayerClothing
+    slots:
+    - Hair
+    - Snout
+    - HeadTop
+    - HeadSide

Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/guard.yml

@@ -5,6 +5,6 @@
   description: Skirt with stitched clutch padding, in standard Imperial Guard uniform colors.
   components:
   - type: Sprite
-    sprite: _CP14/Clothing/Pants/Roles/Guard/wb_chainmail.rsi
+    sprite: _CP14/Clothing/Pants/Roles/Guard/b_chainmail.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Pants/Roles/Guard/wb_chainmail.rsi
+    sprite: _CP14/Clothing/Pants/Roles/Guard/b_chainmail.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guard.yml

@@ -13,15 +13,6 @@
         Piercing: 0.85
         Heat: 0.90
   
-- type: entity
-  parent: CP14ClothingShirtGuardBase
-  id: CP14ClothingShirtGuardsChainmailShirtWB
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Roles/Guard/wb_chainmail.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Roles/Guard/wb_chainmail.rsi
-  
 - type: entity
   parent: CP14ClothingShirtGuardBase
   id: CP14ClothingShirtGuardsChainmailShirtB

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml

@@ -56,4 +56,17 @@
     stampedColor: "#e8c348"
     stampState: "bank_on_paper"
   - type: Sprite
-    state: bank
+    state: bank
+
+- type: entity
+  id: CP14StampGuardCommander
+  parent: CP14StampBase
+  name: guard commander stamp
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: cp14-stamp-guard-commander
+    stampedColor: "#436a92"
+    stampState: "guard_on_paper"
+  - type: Sprite
+    state: guard

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

@@ -9,7 +9,7 @@
 - type: entity
   parent: CP14BaseKey
   id: CP14KeyAlchemy1
-  suffix: Alchemy1
+  suffix: Alchemy 1
   components:
   - type: CP14Key
     autoGenerateShape: Alchemy1
@@ -17,7 +17,7 @@
 - type: entity
   parent: CP14BaseKey
   id: CP14KeyAlchemy2
-  suffix: Alchemy2
+  suffix: Alchemy 2
   components:
   - type: CP14Key
     autoGenerateShape: Alchemy2

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

@@ -9,7 +9,7 @@
 - type: entity
   parent: CP14BaseKey
   id: CP14KeyBlacksmith
-  suffix: Blacksmith1
+  suffix: Blacksmith 1
   components:
   - type: CP14Key
     autoGenerateShape: Blacksmith1

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

@@ -0,0 +1,31 @@
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardEntrance
+  suffix: Guard Entrance
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardEntrance
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuard
+  suffix: Guard
+  components:
+  - type: CP14Key
+    autoGenerateShape: Guard
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardCommander
+  suffix: Guard Commander
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardCommander
+
+- type: entity
+  parent: CP14BaseKey
+  id: CP14KeyGuardWeaponStorage
+  suffix: Guard Weapon Storage
+  components:
+  - type: CP14Key
+    autoGenerateShape: GuardWeaponStorage

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

@@ -101,4 +101,26 @@
     - id: CP14KeyBankVault
     - id: CP14KeyBankEntrance
     - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe
+    - id: CP14KeyBankSafe
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingGuard
+  suffix: Guardian
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyGuardEntrance
+    - id: CP14KeyGuard
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingGuardCommander
+  suffix: Guard Commander
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyGuardEntrance
+    - id: CP14KeyGuard
+    - id: CP14KeyGuardCommander
+    #- id: CP14KeyGuardWeaponStorage

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml

@@ -221,6 +221,16 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
+- type: entity
+  parent: CP14ModularGripIronLong
+  id: CP14ModularGripIronLongGuard
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripIronLongGuard
+
 - type: entity
   parent: CP14ModularGripLong
   id: CP14ModularGripGoldLong

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml

@@ -11,4 +11,22 @@
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:
-    - BladeIronSword
+    - BladeIronSword
+
+- type: entity
+  id: CP14ModularGuardHalberd
+  parent: CP14ModularGripIronLongGuard
+  name: "guard's halberd"
+  description: The standard issue armament of the imperial guard. A long iron halberd adorned with blue feathers and brass
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/iron_sword.rsi
+      state: icon
+    - sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeIronSword
+    - GardeSharpIron

Resources/Prototypes/_CP14/Entities/Objects/guidebooks.yml

@@ -0,0 +1,19 @@
+- type: entity
+  id: CP14BookImperialLawsHandBook
+  parent: BaseGuidebook
+  name: imperial laws
+  description: A book about Imperial Laws.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: paper
+    - state: cover_base
+      color: "#871619"
+    - state: decor_wingette
+      color: "#a3181d"
+    - state: icon_law
+  - type: GuideHelp
+    guides:
+    - CP14_RU_Imperial_Laws
+    - CP14_EN_Imperial_Laws

Resources/Prototypes/_CP14/Entities/Structures/Decorations/flags_wallmount.yml

@@ -1,12 +1,12 @@
 - type: entity
   id: CP14WallmountFlagBase
   abstract: true
-  parent: 
+  parent:
   - CP14BaseWallmount
   - CP14BaseFlammableSpreadingStrong
   categories: [ ForkFiltered ]
   name: tapestry
-  description: A piece of cloth pinned to the wall. 
+  description: A piece of cloth pinned to the wall.
   components:
   - type: Sprite
     sprite: _CP14/Structures/Decoration/flags_wallmount.rsi
@@ -55,11 +55,12 @@
   parent: CP14WallmountFlagBase
   id: CP14WallmountFlagTavern
   name: tavern tapestry
-  description: A tapestry with a ?? symbol, indicating that blacksmiths dwell here.
+  description: A tapestry with a beer symbol, indicating that tavern is here.
   components:
   - type: Sprite
     layers:
-    - state: fill_mercenary #TODO: Icon
+    - state: fill_mercenary
+    - state: icon_tavern
 
 # Bank
 
@@ -72,7 +73,8 @@
   - type: Sprite
     layers:
     - state: fill_bank
-    - state: icon_coins
+    - state: icon_coin
+      color: "#ad633b"
 
 - type: entity
   parent: CP14WallmountFlagBase
@@ -83,7 +85,20 @@
   - type: Sprite
     layers:
     - state: fill_bank
-    - state: icon_vault
+    - state: icon_safe
+      color: "#ad633b"
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagBankCrates
+  name: bank crates tapestry
+  description: A tapestry with a crates symbol indicating that this is where the bank vaults reside.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_bank
+    - state: icon_crates
+      color: "#ad633b"
 
 - type: entity
   parent: CP14WallmountFlagBase
@@ -95,13 +110,51 @@
     layers:
     - state: fill_bank
     - state: icon_ship
+      color: "#ad633b"
 
 - type: entity
   parent: CP14WallmountFlagBase
   id: CP14WallmountFlagBankCommandant
   name: commandant tapestry
-  description: A tapestry with a ?? symbol indicating that the Commandant lives here.
+  description: A tapestry with a star symbol indicating that the commandant lives here.
   components:
   - type: Sprite
     layers:
-    - state: fill_bank #TODO: Icon
+    - state: fill_bank
+    - state: icon_star
+      color: "#ad633b"
+
+# Guard
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardSwords
+  name: guard tapestry
+  description: A tapestry with a swords symbol denoting that the guards are here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_swords
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardShield
+  name: guard tapestry
+  description: A tapestry with a shield symbol denoting that the guards are here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_shield
+
+- type: entity
+  parent: CP14WallmountFlagBase
+  id: CP14WallmountFlagGuardCommander
+  name: guard commander tapestry
+  description: A tapestry with a star symbol indicating that the Guard Commandant lives here.
+  components:
+  - type: Sprite
+    layers:
+    - state: fill_guard
+    - state: icon_star

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

@@ -0,0 +1,63 @@
+
+# Iron
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuard
+  suffix: Guard
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guard
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuardCommandantRoom
+  suffix: Guard Commander
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardCommander
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuardWeaponStorage
+  suffix: Guard, Weapon Storage
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardWeaponStorage
+  - type: Lock
+    locked: true
+
+# Iron windowed
+
+- type: entity
+  parent: CP14IronDoorWindowed
+  id: CP14IronDoorWindowedGuardEntrance
+  suffix: Guard, Entrance
+  components:
+  - type: CP14Lock
+    autoGenerateShape: GuardEntrance
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent:
+  - CP14IronDoorWindowedGuardEntrance
+  - CP14IronDoorWindowedMirrored
+  id: CP14IronDoorWindowedMirroredGuardEntrance
+  suffix: Guard, Entrance, Mirrored
+
+# Grill Gate
+
+- type: entity
+  parent: CP14FenceIronGrilleGate
+  id: CP14FenceIronGrilleGateGuard
+  suffix: Guard
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guard
+  - type: Lock
+    locked: true

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

@@ -95,6 +95,56 @@
   id: CP14WoodenDoorPersonalHouse10
   suffix: PersonalHouse10
   components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse11
+  suffix: PersonalHouse11
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse12
+  suffix: PersonalHouse12
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse13
+  suffix: PersonalHouse13
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse14
+  suffix: PersonalHouse14
+  components:
+  - type: CP14Lock
+    autoGenerateShape: PersonalHouse10
+  - type: Lock
+    locked: true
+
+- type: entity
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorPersonalHouse15
+  suffix: PersonalHouse15
+  components:
   - type: CP14Lock
     autoGenerateShape: PersonalHouse10
   - type: Lock

Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml

@@ -27,4 +27,11 @@
   id: CP14_EN_Demiplanes
   name: Demiplanes exploration
   text: "/ServerInfo/_CP14/Guidebook_EN/Demiplanes.xml"
-  filterEnabled: True
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Imperial_Laws
+  name: Imperial laws
+  text: "/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml"
+  filterEnabled: True

Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml

@@ -27,4 +27,11 @@
   id: CP14_RU_Demiplanes
   name: Исследование демипланов
   text: "/ServerInfo/_CP14/Guidebook_RU/Demiplanes.xml"
-  filterEnabled: True
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Imperial_Laws
+  name: Имперские законы
+  text: "/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml"
+  filterEnabled: True

Resources/Prototypes/_CP14/Guidebook/entry.yml

@@ -7,6 +7,7 @@
   children:
   - CP14_EN_Alchemy
   - CP14_EN_Demiplanes
+  - CP14_EN_Imperial_Laws
 
 - type: guideEntry
   crystallPunkAllowed: true
@@ -17,3 +18,4 @@
   children:
   - CP14_RU_Alchemy
   - CP14_RU_Demiplanes
+  - CP14_RU_Imperial_Laws

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -9,6 +9,7 @@
   - CP14ClothingCloakFurcapeBlue
   - CP14ClothingCloakMaidArpon
   - CP14ClothingCloakRitualAttireLeather
+  - CP14ClothingCloakWhite
 
 - type: loadout
   id: CP14ClothingCloakFurcapeBlack
@@ -30,6 +31,11 @@
   equipment:
     cloak: CP14ClothingCloakRitualAttireLeather
 
+- type: loadout
+  id: CP14ClothingCloakWhite
+  equipment:
+    cloak: CP14ClothingCloakWhite
+
 # Eyes
 
 - type: loadoutGroup

Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml

@@ -7,12 +7,6 @@
   minLimit: 0
   loadouts:
   - CP14ClothingCloakGuardBlue
-  - CP14ClothingCloakGuardWhite
-
-- type: loadout
-  id: CP14ClothingCloakGuardWhite
-  equipment:
-    cloak: CP14ClothingCloakGuardWhite
 
 - type: loadout
   id: CP14ClothingCloakGuardBlue
@@ -24,9 +18,14 @@
 - type: loadoutGroup
   id: CP14GuardHead
   name: cp14-loadout-guard-head
-  minLimit: 0
+  minLimit: 1
   loadouts:
-  - CP14ClothingHeadMetalHeadband
+  - CP14ClothingHeadGuardHelmet
+
+- type: loadout
+  id: CP14ClothingHeadGuardHelmet
+  equipment:
+    head: CP14ClothingHeadGuardHelmet
 
 # Pants
 
@@ -47,15 +46,23 @@
   id: CP14GuardShirt
   name: cp14-loadout-guard-shirt
   loadouts:
-  - CP14ClothingShirtGuardsChainmailShirtWB
   - CP14ClothingShirtGuardsChainmailShirtB
 
-- type: loadout
-  id: CP14ClothingShirtGuardsChainmailShirtWB
-  equipment:
-    shirt: CP14ClothingShirtGuardsChainmailShirtWB
-
 - type: loadout
   id: CP14ClothingShirtGuardsChainmailShirtB
   equipment:
-    shirt: CP14ClothingShirtGuardsChainmailShirtB
+    shirt: CP14ClothingShirtGuardsChainmailShirtB
+
+# Spells
+
+- type: loadoutGroup
+  id: CP14GuardSpells
+  name: cp14-loadout-guard-spells
+  loadouts:
+  - CP14ActionSpellFlashLight
+
+- type: loadout
+  id: CP14ActionSpellFlashLight
+  dummyEntity: CP14ActionSpellFlashLight
+  actions:
+  - CP14ActionSpellFlashLight

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -68,6 +68,7 @@
   - CP14GeneralShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
+  - CP14GuardSpells
 
 - type: roleLoadout
   id: JobCP14Guard
@@ -82,6 +83,7 @@
   - CP14GeneralShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
+  - CP14GuardSpells
 
 - type: roleLoadout
   id: JobCP14Commandant
@@ -106,4 +108,4 @@
   - CP14BankPants
   - CP14BankShoes
   - CP14GeneralBack
-  - CP14GeneralTrinkets
+  - CP14GeneralTrinkets

Resources/Prototypes/_CP14/LockCategories/lockTypes.yml

@@ -153,4 +153,26 @@
   id: PersonalHouse10
   group: PersonalHouse
   complexity: 3
-  name: cp14-lock-shape-personalhouse10
+  name: cp14-lock-shape-personalhouse10
+
+# Guard
+
+- type: CP14LockType
+  id: GuardEntrance
+  complexity: 3
+  name: cp14-lock-shaper-guard-entrance
+
+- type: CP14LockType
+  id: Guard
+  complexity: 5
+  name: cp14-lock-shaper-guard-staff
+
+- type: CP14LockType
+  id: GuardCommander
+  complexity: 7
+  name: cp14-lock-shaper-guard-commander
+
+- type: CP14LockType
+  id: GuardWeaponStorage
+  complexity: 7
+  name: cp14-lock-shaper-guard-weapon-storage

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -62,7 +62,8 @@
             CP14Innkeeper: [ 3, 4 ]
             CP14Commandant: [1, 1]
             CP14Banker: [3, 4]
-            #CP14GuardCommander: [1, 1]
+            CP14Guard: [8, 8]
+            CP14GuardCommander: [1, 1]
         - type: CP14StationKeyDistribution
           keys:
           - TavernDorms1
@@ -80,4 +81,8 @@
           - PersonalHouse7
           - PersonalHouse8
           - PersonalHouse9
-          - PersonalHouse10
+          - PersonalHouse10
+          - PersonalHouse11
+          - PersonalHouse12
+          - PersonalHouse13
+          - PersonalHouse14

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml

@@ -14,4 +14,5 @@
 - type: startingGear
   id: CP14GuardGear
   equipment:
+    keys: CP14KeyRingGuard
     belt1: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml

@@ -19,4 +19,5 @@
 - type: startingGear
   id: CP14GuardCommanderGear
   equipment:
+    keys: CP14KeyRingGuardCommander
     belt1: CP14WalletFilledTest

Resources/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml

@@ -0,0 +1,177 @@
+<Document>
+
+# Imperial Laws
+Publication of the official jurisdictional body of the Zellasian Empire .
+
+## Preamble
+This set of laws of the Empire is designed to ensure order, justice and security throughout the territory of the Empire. The laws are mandatory for all citizens, temporary residents and guests of the Empire. Ignoring or violating the provisions set out in this book is punishable in accordance with the established norms.
+
+Every crime recorded on the territory of the Empire is assessed according to the following parameters:
+
+Severity category - determines the basic level of punishment.
+Modifiers - increase or decrease responsibility.
+Sentence - the final measure of punishment is determined by the authorized body (or designated persons).
+
+## Section I. Categories of Crimes
+
+### Minor violations
+Crimes that do not cause significant harm to person or property.
+
+[bold]Examples:[/bold]
+
+1)	Insult to the Empire.
+
+2)	Damage to property or cruelty to animals.
+
+3)	Petty theft (up to 1 silver coin).
+
+4)	Disturbance of public order
+
+[bold]Punishments:[/bold]
+
+1)	Fines, not only material, but also limiting rights and services for a certain period of time
+
+2)	Community service for the benefit of the injured party or the city as a whole
+
+3)	Apology to the injured party.
+
+[bold]One type of punishment is selected without taking into account modifiers.[/bold]
+
+
+### Mild violations
+Actions that affect authorities or cause moderate harm to others.
+
+[bold]Examples:[/bold]
+
+1)	Resistance to government officials.
+
+2)	Negligence in the performance of duties.
+
+3) Failure to pay protection fee and/or licence trade tax.
+
+4)	Steal from 1 silver coin to 1 gold coin.
+
+5)	Causing minor bodily harm.
+
+[bold]Punishments:[/bold]
+
+1)	Fines, not only material, but also limiting rights and services for a certain period of time
+
+2)	Double compensation for damages to the injured party.
+
+3)	Public works for the benefit of the Empire.
+
+[bold]Are selected without taking into account modifiers[/bold]
+
+
+### Moderate violations
+Actions that cause significant harm or threaten the stability of the Empire.
+
+[bold]Examples:[/bold]
+
+1)	Arbitrariness or abuse of authority.
+
+2)	Sabotage.
+
+3)	Robbery (from 1 gold coin).
+
+4)	Causing moderate harm to health.
+
+[bold]Punishments:[/bold]
+
+1)	Double compensation for damages to the injured party.
+
+2)	Expulsion from a faction, camp (both temporary and permanent)
+
+3)	Atonement for punishment through the demiplane to complete the task.
+
+4)	The victim has the right to challenge the accused to a duel. The accused's victory in the duel removes the charges.
+
+[bold]One type of punishment is selected without taking into account modifiers[/bold]
+
+
+### Serious violations
+Crimes with a high level of danger to society and the structures of the Empire.
+
+[bold]Examples:[/bold]
+
+1)	Forced religious conversion.
+
+2)	Membership in criminal groups.
+
+3)	Racketeering is an illegal extortion of money from entrepreneurs by criminal elements, racketeers, carried out through threats and blackmail.
+
+4)	Murder
+
+[bold]Punishments:[/bold]
+
+1)	Double compensation for damages to the injured party.
+
+2)	Expulsion from a faction, camp (both temporary and permanent)
+
+3)	Atonement for punishment through the demiplane to complete the task.
+
+4)	The victim has the right to challenge the accused to a duel. The murderer's victory in the duel removes the charges.
+
+[bold]Two types of punishment are selected without taking into account modifiers[/bold]
+
+
+### Extremely severe violations
+Particularly dangerous acts that threaten the foundations of the Empire.
+
+[bold]Examples:[/bold]
+
+1)	Betrayal of the Crown.
+
+2)	Terrorist act or robbery raid
+
+3)	especially large-scale theft.
+
+4)	Destruction of the body
+
+[bold]Punishments:[/bold]
+
+1)	Public execution.
+
+2)	Payment of a fine by the head of the defendant's faction
+
+3)	Sent to the Imperial City Court
+
+[bold]One type of punishment is selected without taking into account modifiers[/bold]
+
+## Section II. Crime Modifiers
+1. Mitigating circumstances
+Self-defense: if the crime is committed in defense of life.
+Necessity: The action is taken to prevent a greater threat.
+Repentance: admission of guilt and cooperation with authorities.
+Inexperience (ignorance): If the offender has no previous offenses or does not understand the rules (e.g. new player), the punishment may be replaced by training or a warning. Applies only to minor and minor-moderate offenses
+Effect:
+The punishment is reduced by one level (for example, an average violation is considered light-average).
+
+2. Aggravating circumstances
+Recidivism: repeat commission of a crime.
+Cultural aspect: if the crime violates the canons of religion, traditions or laws of a specific race/faction, this is taken into account (for example, desecration of a shrine).
+Presence of victims: If the crime resulted in serious injury, death, or destruction of important objects.
+Complicity in collusion: group participation in a violation.
+
+Effect:
+The punishment in the current category is increased.
+3. Extremely aggravating circumstances
+Direct assault: If the offender acted openly and threatened others
+Wartime: If the crime is committed during a crisis or war, the punishment is more severe.
+Cruelty: If the crime is committed with particular cruelty or sophistication
+The organizer of the conspiracy: the leader of a criminal group
+Effect:
+Transferring the crime to the next level of complexity.
+
+## Section III. The Judicial System
+The case is being considered:
+
+Representatives of the guards - for minor and moderate crimes.
+By the Imperial Court or the commander of the guard - for medium and serious crimes. The commander of the guard also has the right to delegate authority to a trusted person.
+
+When considering a case, government officials have the right to independently choose a punishment consistent with the category of crimes after taking into account all modifiers, and also if the victim of the crime did not use the right to a duel.
+Note for players:
+This document is designed to provide a fully immersive gaming experience. The laws of the Empire maintain a fair balance between role-playing and mechanics. Violations and penalties are assessed individually, taking into account modifiers and circumstances.
+
+</Document>

Resources/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml

@@ -0,0 +1,178 @@
+<Document>
+
+# Имперские Законы
+Издание официального юрисдикционного органа Империи Зелласиан.
+
+## Преамбула
+Настоящий свод законов Империи разработан с целью обеспечения порядка, справедливости и безопасности на всей территории Империи. Законы обязательны для соблюдения всеми гражданами, временными жителями и гостями Империи. Игнорирование или нарушение положений, изложенных в данной книге, карается в соответствии с установленными нормами.
+
+Каждое преступление, зафиксированное на территории Империи, оценивается по следующим параметрам:
+
+Категория тяжести — определяет базовую степень наказания.
+Модификаторы — усиливают или смягчают ответственность.
+Приговор — итоговая мера наказания определяется уполномоченным органом (или назначенными лицами).
+
+## Раздел I. Категории преступлений
+
+### Легкие нарушения
+Преступления, не наносящие значительного вреда личности или имуществу.
+
+[bold]Примеры:[/bold]
+
+1)	Оскорбление Империи.
+
+2)	Порча имущества или жестокое обращение с животными.
+
+3)	Мелкая кража (до 1 серебряной монеты).
+
+4)	Нарушение общественного порядка
+
+[bold]Наказания:[/bold]
+
+1)	Штрафы, не только материальные, но и ограничивающие права и услуги на определенное время
+
+2)	Общественные работы на благо пострадавшей стороне или городу в целом
+
+3)	Извинение перед пострадавшей стороной.
+
+[bold]Выбирается один тип наказания без учета модификаторов.[/bold]
+
+
+### Легко-средние нарушения
+Действия, затрагивающие органы власти или наносящие умеренный ущерб другим.
+
+[bold]Примеры:[/bold]
+
+1)	Сопротивление представителям власти.
+
+2)	Халатность в выполнении обязанностей.
+
+3) Неуплата защитного сбора и/или налога на лицензионную торговлю
+
+4)	Кража от 1 серебряной монеты до 1 золотой монеты.
+
+5)	Нанесение легких телесных повреждений.
+
+[bold]Наказания:[/bold]
+
+1)	Штрафы, не только материальные, но и ограничивающие права и услуги на определенное время
+
+2)	Возмещение ущерба пострадавшей стороне в двойном размере.
+
+3)	Общественные работы на благо Империи.
+
+[bold]Выбираются два типа наказания без учета модификаторов[/bold]
+
+
+### Средние нарушения
+Действия, наносящие значительный вред, либо угрожающие стабильности Империи.
+
+[bold]Примеры:[/bold]
+
+1)	Самоуправство или превышение полномочий.
+
+2)	Саботаж.
+
+3)	Грабеж (от 1 золотой монеты).
+
+4)	Причинение среднего вреда здоровью.
+
+[bold]Наказания:[/bold]
+
+1)	Возмещение ущерба пострадавшей стороне в двойном размере.
+
+2)	Изгнание из фракции, лагеря (как временное, так и постоянное)
+
+3)	Искупления наказания через демиплан для выполнения задания.
+
+4)	Жертва имеет право вызвать обвиняемого на дуэль. Победа обвиняемого в дуэли снимает обвинения.
+
+[bold]Выбирается один тип наказания без учета модификаторов[/bold]
+
+
+### Средне-тяжелые нарушения
+Преступления с высоким уровнем опасности для общества и структур Империи.
+
+[bold]Примеры:[/bold]
+
+1)	Насильственное обращение в религию.
+
+2)	Членство в преступных группировках.
+
+3)	Рекет - незаконное, производимое путем угроз, шантажа вымогательство денег от предпринимателей со стороны преступных элементов, рэкетиров
+
+4)	Убийство
+
+[bold]Наказания:[/bold]
+
+1)	Возмещение ущерба пострадавшей стороне в двойном размере.
+
+2)	Изгнание из фракции, лагеря (как временное, так и постоянное)
+
+3)	Искупления наказания через демиплан для выполнения задания.
+
+4)	Жертва имеет право вызвать обвиняемого на дуэль. Победа убийцы в дуэли снимает обвинения.
+
+[bold]Выбираются два типа наказания без учета модификаторов[/bold]
+
+
+### Тяжелые нарушения
+Особо опасные деяния, угрожающие основам Империи.
+
+[bold]Примеры:[/bold]
+
+1)	Предательство короны.
+
+2)	Террористический акт или разбойничий налёт
+
+3)	Крупное хищение.
+
+4)	Уничтожение тела
+
+[bold]Наказания:[/bold]
+
+1)	Публичная казнь.
+
+2)	Уплата виры главой фракции подсудимого
+
+3)	Отправка в суд имперского города
+
+[bold]Выбирается один тип наказания без учета модификаторов[/bold]
+
+## Раздел II. Модификаторы преступлений
+1. Смягчающие обстоятельства
+Самооборона: если преступление совершено для защиты жизни.
+Необходимость: действие совершено для предотвращения большей угрозы.
+Покаяние: признание вины и сотрудничество с властями.
+Неопытность (незнание): Если преступник ранее не совершал правонарушений или не понимает правил (например, новый игрок), наказание может быть заменено на обучение или предупреждение. Применяется только к легким и легко-средним нарушениям
+Эффект:
+Наказание смягчается на одну ступень (например, среднее нарушение рассматривается как легко-среднее).
+
+2. Отягчающие обстоятельства
+Рецидив: повторное совершение преступления.
+Культурный аспект: если преступление нарушает каноны религии, традиции или законы конкретной расы/фракции, это учитывается (например, осквернение святыни).
+Наличие жертв: Если преступление привело к серьёзным ранениям, смерти или разрушению важных объектов.
+Соучастие в сговоре: групповое участие в нарушении.
+
+Эффект:
+Усиливается наказание в текущей категории.
+3. Крайне отягчающие обстоятельства
+Прямое нападение: Если преступник действовал открыто и угрожал другим
+Военное время: Если преступление совершено во время кризиса или войны, наказание ужесточается.
+Жестокость: Если преступление совершено с особой жестокостью или изощрённостью
+Организатор сговора: лидер преступной группировки
+Эффект:
+Перевод преступления на следующую категорию сложности.
+
+## Раздел III. Судебная система
+Рассмотрение дела осуществляется:
+
+Представителями стражи — для преступлений легкой и средней тяжести.
+Имперским судом или командиром стражи — для среднетяжелых и тяжких преступлений. Так же командир стражи имеет право на делегирование полномочий доверенному лицу.
+
+При рассмотрении дела представители власти имеют право на самостоятельный выбор наказания согласованному к категории преступлений после учета всех модификаторов, а также если жертва преступления не использовало право дуэли.
+Примечание для игроков:
+Настоящий документ разработан с целью обеспечить полное погружение в игровой процесс. Законы Империи поддерживают справедливый баланс между ролевой игрой и механикой. Нарушения и наказания оцениваются индивидуально с учетом модификаторов и обстоятельств.
+
+
+</Document>

Resources/Textures/_CP14/Clothing/Head/Roles/Guard/helmet.rsi/meta.json

@@ -3,15 +3,15 @@
     "license": "CLA",
     "copyright": "Created by TheShuEd",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {
             "name": "icon"
         },
         {
-            "name": "equipped-SHIRT",
+            "name": "equipped-HELMET",
             "directions": 4
         }
     ]

Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json

@@ -33,6 +33,9 @@
     {
       "name": "bank_on_paper"
     },
+    {
+      "name": "guard_on_paper"
+    },
     {
       "name": "denied_on_paper"
     },

Resources/Textures/_CP14/Objects/Bureaucracy/stamp.rsi/meta.json

@@ -15,6 +15,9 @@
     },
     {
       "name": "denied"
+    },
+    {
+      "name": "guard"
     }
   ]
 }

Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Decoration/flags_wallmount.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CLA",
-  "copyright": "By TheShuEd",
+  "copyright": "By Max Gab",
   "size": {
     "x": 32,
     "y": 96
@@ -11,6 +11,10 @@
       "name": "fill_bank",
       "directions": 4
     },
+    {
+      "name": "fill_guard",
+      "directions": 4
+    },
     {
       "name": "fill_mercenary",
       "directions": 4
@@ -20,20 +24,40 @@
       "directions": 4
     },
     {
-      "name": "icon_coins",
+      "name": "icon_coin",
+      "directions": 4
+    },
+    {
+      "name": "icon_crates",
       "directions": 4
     },
     {
       "name": "icon_potion",
       "directions": 4
     },
+    {
+      "name": "icon_safe",
+      "directions": 4
+    },
+    {
+      "name": "icon_shield",
+      "directions": 4
+    },
     {
       "name": "icon_ship",
       "directions": 4
     },
     {
-      "name": "icon_vault",
+      "name": "icon_star",
+      "directions": 4
+    },
+    {
+      "name": "icon_swords",
+      "directions": 4
+    },
+    {
+      "name": "icon_tavern",
       "directions": 4
     }
   ]
-}
+}

Resources/migration.yml

@@ -70,7 +70,7 @@ CP14WallpaperPink30: CP14WallpaperPurple
 
 #2024-09-25
 CP14IronGrilleStraight: CP14FenceIronGrilleStraight
-CP14IronGrilleCorner: CP14FenceIronGrilleCorner
+CP14IronGrilleCorner: null
 CP14IronGrilleGate: CP14FenceIronGrilleGate
 CP14IronGrilleTJunction: null
 CP14FenceWoodSmallTJunction: null
@@ -178,6 +178,10 @@ CP14IronDoorWindowedBlacksmith: CP14IronDoorBlacksmith1
 CP14IronDoorWindowedMirroredBlacksmith: CP14IronDoorMirroredBlacksmith1
 CP14FenceIronGrilleCorner: null
 
+#2024-04-12
+CP14ClothingShirtGuardsChainmailShirtWB: CP14ClothingShirtGuardsChainmailShirtB
+CP14KeyRingGuardCommandant: CP14KeyRingGuardCommander
+
 # <---> CrystallEdge migration zone end