Bank rename (#855)

* job renamings * Job proto rename to merchant * loadout renaming * clothing rename * Update migration.yml * catalog * more folders rename * fix wood abuse * add selling ores * refolder * fix icons * herbals selling
2025-02-07 15:28:31 +03:00
parent 558c199a29
commit 3fd780bc8e
69 changed files with 472 additions and 285 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml
@@ -0,0 +1,111 @@
+- type: storePositionSell
+  id: CopperBars
+  name: cp14-store-sell-copperbar-name
+  desc: cp14-store-sell-copperbar-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    state: bar_3
+  price: 
+    min: 100
+    max: 150
+  service: !type:CP14SellStackService
+    stackId: CP14CopperBar
+    count: 10
+
+- type: storePositionSell
+  id: CopperOre
+  name: cp14-store-sell-copperore-name
+  desc: cp14-store-sell-copperore-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/copper_ore.rsi
+    state: ore3
+  price: 
+    min: 10
+    max: 20
+  service: !type:CP14SellStackService
+    stackId: CP14OreCopper
+    count: 10
+
+- type: storePositionSell
+  id: IronBars
+  name: cp14-store-sell-ironbar-name
+  desc: cp14-store-sell-ironbar-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/iron_bar.rsi
+    state: bar_3
+  price: 
+    min: 200
+    max: 300
+  service: !type:CP14SellStackService
+    stackId: CP14IronBar
+    count: 10
+
+- type: storePositionSell
+  id: IronOre
+  name: cp14-store-sell-ironore-name
+  desc: cp14-store-sell-ironore-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/iron_ore.rsi
+    state: ore3
+  price: 
+    min: 20
+    max: 30
+  service: !type:CP14SellStackService
+    stackId: CP14OreIron
+    count: 10
+
+- type: storePositionSell
+  id: GoldBars
+  name: cp14-store-sell-goldbar-name
+  desc: cp14-store-sell-goldbar-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/gold_bar.rsi
+    state: bar_3
+  price: 
+    min: 1000
+    max: 1500
+  service: !type:CP14SellStackService
+    stackId: CP14GoldBar
+    count: 10
+
+- type: storePositionSell
+  id: GoldOre
+  name: cp14-store-sell-goldore-name
+  desc: cp14-store-sell-goldore-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
+    state: ore3
+  price: 
+    min: 100
+    max: 150
+  service: !type:CP14SellStackService
+    stackId: CP14OreGold
+    count: 10
+
+- type: storePositionSell
+  id: MithrilBars
+  name: cp14-store-sell-mithrilbar-name
+  desc: cp14-store-sell-mithrilbar-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/mithril_bar.rsi
+    state: bar_3
+  price: 
+    min: 2000
+    max: 3000
+  service: !type:CP14SellStackService
+    stackId: CP14MithrilBar
+    count: 10
+
+- type: storePositionSell
+  id: MithrilOre
+  name: cp14-store-sell-mithrilore-name
+  desc: cp14-store-sell-mithrilore-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/mithril_ore.rsi
+    state: ore3
+  price: 
+    min: 200
+    max: 300
+  service: !type:CP14SellStackService
+    stackId: CP14OreMithril
+    count: 10
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml
@@ -0,0 +1,43 @@
+- type: storePositionSell
+  id: Wood
+  name: cp14-store-sell-wood-name
+  desc: cp14-store-sell-wood-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/wood.rsi
+    state: planks_3
+  price: 
+    min: 10
+    max: 30
+  service: !type:CP14SellStackService
+    stackId: CP14WoodenPlanks
+    count: 30
+
+- type: storePositionSell
+  id: Glass
+  name: cp14-store-sell-glass-name
+  desc: cp14-store-sell-glass-desc
+  icon: 
+    sprite: _CP14/Objects/Materials/glass.rsi
+    state: glass_3
+  price: 
+    min: 50
+    max: 250
+  service: !type:CP14SellStackService
+    stackId: CP14GlassSheet
+    count: 10
+
+- type: storePositionSell
+  id: AlchemicalHerbals
+  name: cp14-store-sell-alchemical-herbals-name
+  desc: cp14-store-sell-alchemical-herbals-desc
+  icon: 
+    sprite: _CP14/Objects/Flora/Wild/store_position.rsi
+    state: sell
+  price: 
+    min: 30
+    max: 60
+  service: !type:CP14SellWhitelistService
+    whitelist:
+      tags: 
+      - CP14AlchemicalHerbals
+    count: 10
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml
@@ -1,69 +0,0 @@
- type: storePositionSell
-  id: CopperBars
-  name: cp14-store-sell-copperbar-name
-  desc: cp14-store-sell-copperbar-desc
-  icon: 
-    sprite: _CP14/Objects/Materials/copper_bar.rsi
-    state: bar_3
-  price: 
-    min: 100
-    max: 150
-  service: !type:CP14SellStackService
-    stackId: CP14CopperBar
-    count: 10
-
- type: storePositionSell
-  id: IronBars
-  name: cp14-store-sell-ironbar-name
-  desc: cp14-store-sell-ironbar-desc
-  icon: 
-    sprite: _CP14/Objects/Materials/iron_bar.rsi
-    state: bar_3
-  price: 
-    min: 200
-    max: 300
-  service: !type:CP14SellStackService
-    stackId: CP14IronBar
-    count: 10
-
- type: storePositionSell
-  id: GoldBars
-  name: cp14-store-sell-goldbar-name
-  desc: cp14-store-sell-goldbar-desc
-  icon: 
-    sprite: _CP14/Objects/Materials/gold_bar.rsi
-    state: bar_3
-  price: 
-    min: 1000
-    max: 1500
-  service: !type:CP14SellStackService
-    stackId: CP14GoldBar
-    count: 10
-
- type: storePositionSell
-  id: Wood
-  name: cp14-store-sell-wood-name
-  desc: cp14-store-sell-wood-desc
-  icon: 
-    sprite: _CP14/Objects/Materials/wood.rsi
-    state: planks_3
-  price: 
-    min: 10
-    max: 55
-  service: !type:CP14SellStackService
-    stackId: CP14WoodenPlanks
-    count: 30
-
- type: storePositionSell
-  id: Glass
-  name: cp14-store-sell-glass-name
-  desc: cp14-store-sell-glass-desc
-  icon: 
-    sprite: _CP14/Objects/Materials/glass.rsi
-    state: glass_3
-  price: 
-    min: 50
-    max: 250
-  service: !type:CP14SellStackService
-    stackId: CP14GlassSheet
-    count: 10
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
@@ -72,7 +72,9 @@
  - type: StorageFill
    contents:
      - id: CP14DemiplaneKeyT1
-        amount: 5
+        amount: 4
+      - id: CP14DemiplaneKeyT2
+        amount: 1

 - type: entity
  parent: CP14BrassChest
@@ -83,16 +85,6 @@
    contents:
      - id: CP14WoodenPlanks10
        amount: 5
-        # Gift
-      - id: CP14WoodLog
-        amount: 2
-        prob: 0.5
-      - id: CP14WoodLog
-        amount: 2
-        prob: 0.4
-      - id: CP14WoodLog
-        amount: 2
-        prob: 0.3

 - type: entity
  parent: CP14BrassChest
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -42,8 +42,8 @@

 - type: entity
  parent: CP14WoodenCloset
-  id: CP14WoodenClosetBankerFilled
-  suffix: Banker, Filled
+  id: CP14WoodenClosetMerchantFilled
+  suffix: Merchant, Filled
  components:
  - type: StorageFill
    contents:
--- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml
@@ -18,8 +18,8 @@

 - type: entity
  parent: CP14WoodenCabinet
-  id: CP14WoodenCabinetBanker
-  suffix: Banker, Filled
+  id: CP14WoodenCabinetMerchant
+  suffix: Merchant, Filled
  components:
  - type: StorageFill
    contents:
@@ -27,7 +27,7 @@
        prob: 0.5
      - id: CP14ClothingPantsAristocratic
        prob: 0.5
-      - id: CP14ClothingShirtBanker
+      - id: CP14ClothingShirtMerchant
        prob: 0.5
      - id: CP14ClothingEyesMonocle
        prob: 0.2
@@ -47,7 +47,7 @@
        prob: 0.5
      - id: CP14ClothingPantsAristocratic
        prob: 0.5
-      - id: CP14ClothingShirtBanker
+      - id: CP14ClothingShirtMerchant
        prob: 0.5
      - id: CP14ClothingEyesMonocle
        prob: 0.2
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml
@@ -6,6 +6,6 @@
  description: The colors white and gold tell you that you're looking at a higher power.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi
+    sprite: _CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/merchant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/merchant.yml
@@ -2,12 +2,12 @@
  parent: CP14ClothingHeadBase
  id: CP14ClothingHeadBowler
  name: bowler hat
-  description: It has an aristocratic air about it...
+  description: It has an aristocratic vibe about it...
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi
+    sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi
+    sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi

 - type: entity
  parent: CP14ClothingHeadBase
@@ -16,6 +16,6 @@
  description: What an exquisite hat. It's clearly a hat that only sophisticated people prefer to wear.
  components:
  - type: Sprite
-    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi
+    sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi
  - type: Clothing
-    sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi
+    sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml
@@ -1,22 +0,0 @@
- type: entity
-  parent:
-  - ClothingSlotBase
-  - CP14ClothingOuterClothingBase
-  id: CP14ClothingOuterClothingBankerWaistCoat
-  name: "banker's waistcoat"
-  description: Stylish waistcoat made of expensive leather. A special uniform for bank employees that makes customers feel like beggars.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi
-
- type: entity
-  parent: CP14ClothingOuterClothingBankerWaistCoat
-  id: CP14ClothingOuterClothingBankerWaistCoatOpen
-  name: "open banker's waistcoat"
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml
@@ -0,0 +1,22 @@
+- type: entity
+  parent:
+  - ClothingSlotBase
+  - CP14ClothingOuterClothingBase
+  id: CP14ClothingOuterClothingMerchantWaistCoat
+  name: "merchant's waistcoat"
+  description: Stylish waistcoat made of expensive leather. A special uniform for merchants that makes customers feel like beggars.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi
+
+- type: entity
+  parent: CP14ClothingOuterClothingMerchantWaistCoat
+  id: CP14ClothingOuterClothingMerchantWaistCoatOpen
+  name: "open merchant's waistcoat"
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml
@@ -1,10 +0,0 @@
- type: entity
-  parent: CP14ClothingShirtBase
-  id: CP14ClothingShirtBanker
-  name: banker's shirt
-  description: A white shirt with bronze inserts. Standard bank employee costume.
-  components:
-  - type: Sprite
-    sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi
-  - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothingShirtMerchant
+  name: merchant's shirt
+  description: A white shirt with bronze inserts.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
@@ -56,9 +56,6 @@
        - id: CP14VialTinyLumiMushroom
      - id: CP14BaseLockpick
      - id: CP14EnergyCrystalMediumEmpty
-      - id: CP14DemiplaneKeyT1
-        weight: 2
-      - id: CP14DemiplaneKeyT2
      # Rare standard village crates loot
      - !type:NestedSelector
        tableId: CP14StationCrateLoot
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
@@ -38,7 +38,7 @@
      - state: green
      - state: guard

-# Bank
+# Traders

 - type: entity
  id: CP14SpawnPointCommandant
@@ -55,18 +55,18 @@
      - state: commandant

 - type: entity
-  id: CP14SpawnPointBanker
+  id: CP14SpawnPointMerchant
  parent: CP14SpawnPointJobBase
  name: merchant
  categories:
  - Spawner
  components:
  - type: SpawnPoint
-    job_id: CP14Banker
+    job_id: CP14Merchant
  - type: Sprite
    layers:
      - state: green
-      - state: banker
+      - state: merchant

 # Mercenary

--- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
@@ -42,6 +42,10 @@
        reagents:
        - ReagentId: CP14BloodFlowerSap
          Quantity: 12
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals

 - type: entity
  id: CP14AgaricMushroom
@@ -74,6 +78,10 @@
        reagents:
        - ReagentId: CP14AgaricMushroom
          Quantity: 3
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals

 - type: entity
  id: CP14ChromiumSlime
@@ -138,6 +146,10 @@
        reagents:
        - ReagentId: CP14WildSageSap
          Quantity: 15
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals

 - type: entity
  id: CP14LumiMushroom
@@ -173,6 +185,10 @@
        reagents:
        - ReagentId: CP14LumiMushroom
          Quantity: 4
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals

 - type: entity
  id: CP14BlueAmanita
@@ -202,6 +218,10 @@
        reagents:
        - ReagentId: CP14BlueAmanita
          Quantity: 5
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals
  
 - type: entity
  id: CP14Dayflin
@@ -231,6 +251,10 @@
        reagents:
        - ReagentId: CP14YellowDayflinPulp
          Quantity: 4
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals

 - type: entity
  id: CP14AirLily
@@ -258,4 +282,8 @@
        maxVol: 5
        reagents:
        - ReagentId: CP14AirLily
-          Quantity: 4
+          Quantity: 4
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+    - CP14AlchemicalHerbals
--- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml
@@ -81,7 +81,7 @@

 - type: entity
  parent: CP14BaseKeyRing
-  id: CP14KeyRingBanker
+  id: CP14KeyRingMerchant
  suffix: Banker
  components:
  - type: StorageFill
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml
@@ -1,63 +0,0 @@
-
-# Head
-
- type: loadoutGroup
-  id: CP14BankHead
-  name: cp14-loadout-bank-head
-  minLimit: 0
-  loadouts:
-  - CP14ClothingHeadBowler
-
- type: loadout
-  id: CP14ClothingHeadBowler
-  equipment:
-    head: CP14ClothingHeadBowler
-
-# OuterClothing
-
- type: loadoutGroup
-  id: CP14BankOuterClothing
-  name: cp14-loadout-banker-outer
-  minLimit: 0
-  loadouts:
-  - CP14ClothingOuterClothingBankerWaistCoat
-  - CP14ClothingOuterClothingBankerWaistCoatOpen
-
- type: loadout
-  id: CP14ClothingOuterClothingBankerWaistCoat
-  equipment:
-    outerClothing: CP14ClothingOuterClothingBankerWaistCoat
-
- type: loadout
-  id: CP14ClothingOuterClothingBankerWaistCoatOpen
-  equipment:
-    outerClothing: CP14ClothingOuterClothingBankerWaistCoatOpen
-
-# Shirt
-
- type: loadoutGroup
-  id: CP14BankShirt
-  name: cp14-loadout-bank-shirt
-  loadouts:
-  - CP14ClothingShirtBanker
-
- type: loadout
-  id: CP14ClothingShirtBanker
-  equipment:
-    shirt: CP14ClothingShirtBanker
-
-# Pants
-
- type: loadoutGroup
-  id: CP14BankPants
-  name: cp14-loadout-bank-pants
-  loadouts:
-  - CP14ClothingPantsAristocratic
-
-# Shoes
-
- type: loadoutGroup
-  id: CP14BankShoes
-  name: cp14-loadout-bank-shoes
-  loadouts:
-  - CP14ShoesAristocraticBlack
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml
@@ -0,0 +1,63 @@
+
+# Head
+
+- type: loadoutGroup
+  id: CP14MerchantHead
+  name: cp14-loadout-merchant-head
+  minLimit: 0
+  loadouts:
+  - CP14ClothingHeadBowler
+
+- type: loadout
+  id: CP14ClothingHeadBowler
+  equipment:
+    head: CP14ClothingHeadBowler
+
+# OuterClothing
+
+- type: loadoutGroup
+  id: CP14MerchantOuterClothing
+  name: cp14-loadout-merchant-outer
+  minLimit: 0
+  loadouts:
+  - CP14ClothingOuterClothingMerchantWaistCoat
+  - CP14ClothingOuterClothingMerchantWaistCoatOpen
+
+- type: loadout
+  id: CP14ClothingOuterClothingMerchantWaistCoat
+  equipment:
+    outerClothing: CP14ClothingOuterClothingMerchantWaistCoat
+
+- type: loadout
+  id: CP14ClothingOuterClothingMerchantWaistCoatOpen
+  equipment:
+    outerClothing: CP14ClothingOuterClothingMerchantWaistCoatOpen
+
+# Shirt
+
+- type: loadoutGroup
+  id: CP14MerchantShirt
+  name: cp14-loadout-merchant-shirt
+  loadouts:
+  - CP14ClothingShirtMerchant
+
+- type: loadout
+  id: CP14ClothingShirtMerchant
+  equipment:
+    shirt: CP14ClothingShirtMerchant
+
+# Pants
+
+- type: loadoutGroup
+  id: CP14MerchantPants
+  name: cp14-loadout-merchant-pants
+  loadouts:
+  - CP14ClothingPantsAristocratic
+
+# Shoes
+
+- type: loadoutGroup
+  id: CP14MerchantShoes
+  name: cp14-loadout-merchant-shoes
+  loadouts:
+  - CP14ShoesAristocraticBlack
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -108,10 +108,10 @@
  - CP14CommandantHead
  - CP14GeneralEyes
  - CP14CommandantCloak
-  - CP14BankOuterClothing
-  - CP14BankShirt
-  - CP14BankPants
-  - CP14BankShoes
+  - CP14MerchantOuterClothing
+  - CP14MerchantShirt
+  - CP14MerchantPants
+  - CP14MerchantShoes
  - CP14GeneralBack
  - CP14GeneralTrinkets

@@ -129,14 +129,14 @@
  - CP14GuildmasterSpells

 - type: roleLoadout
-  id: JobCP14Banker
+  id: JobCP14Merchant
  groups:
  - CP14GeneralSpells
-  - CP14BankHead
-  - CP14BankOuterClothing
+  - CP14MerchantHead
+  - CP14MerchantOuterClothing
  - CP14GeneralEyes
-  - CP14BankShirt
-  - CP14BankPants
-  - CP14BankShoes
+  - CP14MerchantShirt
+  - CP14MerchantPants
+  - CP14MerchantShoes
  - CP14GeneralBack
  - CP14GeneralTrinkets
--- a/Resources/Prototypes/_CP14/Maps/arenas.yml
+++ b/Resources/Prototypes/_CP14/Maps/arenas.yml
@@ -36,9 +36,9 @@
            CP14Alchemist: [ 2, 2 ]
            CP14Blacksmith: [ 2, 2 ]
            CP14Innkeeper: [ 3, 4 ]
-            #Bank
+            #Traders
            CP14Commandant: [1, 1]
-            CP14Banker: [3, 4]
+            CP14Merchant: [3, 4]
            #Guard
            CP14Guard: [8, 8]
            CP14GuardCommander: [1, 1]
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
@@ -5,7 +5,7 @@
  playTimeTracker: CP14JobAdventurer
  startingGear: CP14AdventurerGear
  icon: "CP14JobIconAdventurer"
-  supervisors: cp14-job-supervisors-command
+  supervisors: cp14-job-supervisors-guildmaster
  special:
  - !type:CP14AddKnowledgeSpecial
    knowledge:
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
@@ -1,10 +1,10 @@
 - type: job
-  id: CP14Banker
-  name: cp14-job-name-banker
-  description: cp14-job-desc-banker
-  playTimeTracker: CP14JobBanker
-  startingGear: CP14BankerGear
-  icon: "CP14JobIconBanker"
+  id: CP14Merchant
+  name: cp14-job-name-merchant
+  description: cp14-job-desc-merchant
+  playTimeTracker: CP14JobMerchant
+  startingGear: CP14MerchantGear
+  icon: "CP14JobIconMerchant"
  supervisors: cp14-job-supervisors-commandant
  special:
  - !type:CP14AddKnowledgeSpecial
@@ -15,11 +15,11 @@
      time: 3600 # 1 hours

 - type: startingGear
-  id: CP14BankerGear
+  id: CP14MerchantGear
  storage:
    back:
    - CP14EnergyCrystalSmall
    - CP14EnergyCrystalSmall
  equipment:
    belt1: CP14WalletFilledTest
-    keys: CP14KeyRingBanker
+    keys: CP14KeyRingMerchant
--- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
@@ -28,7 +28,7 @@
  color: "#fadb3e"
  roles:
  - CP14Commandant
-  - CP14Banker
+  - CP14Merchant

 - type: department
  id: CP14Artisan
--- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml
+++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml
@@ -1,11 +1,9 @@

-# Jobs
+# Artisans
+
 - type: playTimeTracker
  id: CP14JobApprentice

- type: playTimeTracker
-  id: CP14JobAdventurer
-
 - type: playTimeTracker
  id: CP14JobAlchemist

@@ -15,17 +13,26 @@
 - type: playTimeTracker
  id: CP14JobInnkeeper

+# Mercenary
+
+- type: playTimeTracker
+  id: CP14JobGuildmaster
+
+- type: playTimeTracker
+  id: CP14JobAdventurer
+
+# Guard
+
 - type: playTimeTracker
  id: CP14JobGuardCommander

 - type: playTimeTracker
  id: CP14JobGuard

+# Trade guild
+
 - type: playTimeTracker
  id: CP14JobCommandant

 - type: playTimeTracker
-  id: CP14JobBanker
-
- type: playTimeTracker
-  id: CP14JobGuildmaster
+  id: CP14JobMerchant
--- a/Resources/Prototypes/_CP14/StatusIcon/job.yml
+++ b/Resources/Prototypes/_CP14/StatusIcon/job.yml
@@ -63,11 +63,11 @@

 - type: jobIcon
  parent: CP14JobIcon
-  id: CP14JobIconBanker
+  id: CP14JobIconMerchant
  icon:
    sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
-    state: Banker
-  jobName: cp14-job-name-banker
+    state: Merchant
+  jobName: cp14-job-name-merchant

 - type: jobIcon
  parent: CP14JobIcon
--- a/Resources/Prototypes/_CP14/tags.yml
+++ b/Resources/Prototypes/_CP14/tags.yml
@@ -84,3 +84,6 @@

 - type: Tag
  id: CP14PlatePie
+
+- type: Tag
+  id: CP14AlchemicalHerbals