Blacksmith role (#534)

* disable crowbar door prying

* blacksmith role

* finish role

* map update

* more recipes to anvil

* Update arenas.yml

* glass!

* ores rebalance

Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml

@@ -100,6 +100,20 @@
       - state: green
       - state: alchemist
 
+- type: entity
+  id: CP14SpawnPointBlacksmith
+  parent: CP14SpawnPointJobBase
+  name: blacksmith
+  categories:
+  - Spawner
+  components:
+  - type: SpawnPoint
+    job_id: CP14Blacksmith
+  - type: Sprite
+    layers:
+      - state: green
+      - state: blacksmith
+
 - type: entity
   id: CP14SpawnPointInnkeeper
   parent: CP14SpawnPointJobBase

Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml

@@ -23,9 +23,6 @@
     - bar_2
     - bar_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Copper: 100
 
 - type: entity
   id: CP14CopperBar5
@@ -70,9 +67,6 @@
     - bar_2
     - bar_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Iron: 100
 
 - type: entity
   id: CP14IronBar5
@@ -116,9 +110,6 @@
     - bar_2
     - bar_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Gold: 100
 
 - type: entity
   id: CP14GoldBar5
@@ -133,5 +124,47 @@
   parent: CP14GoldBar1
   suffix: 10
   components:
+  - type: Stack
+    count: 10
+
+
+- type: entity
+  id: CP14GlassSheet1
+  parent: BaseItem
+  name: glass sheet
+  description: Treated quartz glass, transmits light well, and is nice to look at!
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/glass.rsi
+    layers:
+      - state: glass
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14GlassSheet
+    count: 1
+    baseLayer: base
+    layerStates:
+    - glass
+    - glass_2
+    - glass_3
+  - type: Material
+
+- type: entity
+  id: CP14GlassSheet5
+  parent: CP14GlassSheet1
+  suffix: 5
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  id: CP14GlassSheet10
+  parent: CP14GlassSheet1
+  suffix: 10
+  components:
   - type: Stack
     count: 10

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

@@ -43,6 +43,25 @@
   #  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

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

@@ -63,4 +63,21 @@
   - CP14IronDoorWindowedBankEntrance
   - CP14IronDoorWindowedMirrored
   id: CP14IronDoorWindowedMirroredBankEntrance
-  suffix: Bank Entrance, Mirrored
+  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/Walls/natural.yml

@@ -110,7 +110,7 @@
         spawn:
           CP14OreCopper:
             min: 1
-            max: 5
+            max: 3
 
 - type: entity
   id: CP14WallStoneIronOre
@@ -139,7 +139,7 @@
         spawn:
           CP14OreIron:
             min: 1
-            max: 5
+            max: 3
 
 - type: entity
   id: CP14WallStoneGoldOre
@@ -168,9 +168,6 @@
         spawn:
           CP14OreGold:
             min: 1
-            max: 5
-          CP14StoneBlock1:
-            min: 2
             max: 3
   - type: IconSmooth
     base: wall

Resources/Prototypes/_CP14/Entities/keyrings.yml

@@ -52,6 +52,15 @@
     - id: CP14KeyTavernDorms4
     - id: CP14KeyTavernDorms5
 
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingBlacksmith
+  suffix: Blacksmith
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyBlacksmith
+
 - type: entity
   parent: CP14BaseKeyRing
   id: CP14KeyRingAlchemist

Resources/Prototypes/_CP14/Entities/keys.yml

@@ -117,6 +117,16 @@
   - 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

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

@@ -0,0 +1,12 @@
+# Cloak
+
+- type: loadoutGroup
+  id: CP14BlacksmithCloak
+  name: cp14-loadout-blacksmith-cloak
+  loadouts:
+  - CP14ClothingCloakBlacksmithArpon
+
+- type: loadout
+  id: CP14ClothingCloakBlacksmithArpon
+  equipment:
+    cloak: CP14ClothingCloakBlacksmithArpon

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

@@ -7,7 +7,6 @@
   loadouts:
   - CP14ClothingCloakSimpleWhite
   - CP14ClothingCloakSimpleDarkBlue
-  - CP14ClothingCloakBlacksmithArpon
   - CP14ClothingCloakFurcapeBlack
   - CP14ClothingCloakFurcapeBlue
   - CP14ClothingCloakMaidArpon
@@ -23,11 +22,6 @@
   equipment:
     cloak: CP14ClothingCloakSimpleDarkBlue
 
-- type: loadout
-  id: CP14ClothingCloakBlacksmithArpon
-  equipment:
-    cloak: CP14ClothingCloakBlacksmithArpon
-
 - type: loadout
   id: CP14ClothingCloakFurcapeBlack
   equipment:

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -40,6 +40,20 @@
   - CP14GeneralBack
   - CP14GeneralTrinkets
 
+- type: roleLoadout
+  id: JobCP14Blacksmith
+  groups:
+  - CP14GeneralHead
+  - CP14GeneralEyes
+  - CP14GeneralMask
+  - CP14BlacksmithCloak
+  - CP14GeneralGloves
+  - CP14GeneralShirt
+  - CP14GeneralPants
+  - CP14GeneralShoes
+  - CP14GeneralBack
+  - CP14GeneralTrinkets
+
 - type: roleLoadout
   id: JobCP14Captain
   groups:

Resources/Prototypes/_CP14/LockCategories/LockCategory.yml

@@ -76,8 +76,12 @@
   id: TavernDorms5
   complexity: 3
 
-# Alchemy 
+# Mercenary 
 
 - type: CP14LockCategory
   id: Alchemy
+  complexity: 5
+
+- type: CP14LockCategory
+  id: Blacksmith
   complexity: 5

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -29,7 +29,8 @@
         - type: StationJobs
           availableJobs:
             CP14Adventurer: [ -1, -1 ]
-            CP14Alchemist: [ 2, 3 ]
+            CP14Alchemist: [ 2, 4 ]
+            CP14Blacksmith: [ 1, 1 ]
             CP14Innkeeper: [ 3, 4 ]
             #CP14Captain: [1, 1]
             CP14Commandant: [1, 1]

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml

@@ -8,10 +8,10 @@
     - !type:OreDunGen
       entityMask: 
       - CP14WallStone
-      entity: CP14WallStoneGoldOre
-      count: 10
-      minGroupSize: 10
-      maxGroupSize: 15
+      entity: CP14WallStoneGoldOre # Hellish gold 666
+      count: 6
+      minGroupSize: 6
+      maxGroupSize: 6
 
 - type: cp14DemiplaneModifier
   id: IronOre
@@ -24,10 +24,25 @@
       entityMask: 
       - CP14WallStone
       entity: CP14WallStoneIronOre
-      count: 10
+      count: 5
       minGroupSize: 10
       maxGroupSize: 15
 
+- type: cp14DemiplaneModifier
+  id: CopperOre
+  unique: false
+  reward: 0.3
+  requiredTags:
+  - CP14DemiplaneCave
+  layers:
+    - !type:OreDunGen
+      entityMask: 
+      - CP14WallStone
+      entity: CP14WallStoneCopperOre
+      count: 10
+      minGroupSize: 5
+      maxGroupSize: 7
+
 - type: cp14DemiplaneModifier
   id: QuartzCrystal
   reward: 0.1
@@ -226,21 +241,6 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
-  id: CopperOre
-  unique: false
-  reward: 0.3
-  requiredTags:
-  - CP14DemiplaneCave
-  layers:
-    - !type:OreDunGen
-      entityMask: 
-      - CP14WallStone
-      entity: CP14WallStoneCopperOre
-      count: 10
-      minGroupSize: 10
-      maxGroupSize: 15
-
 - type: cp14DemiplaneModifier
   id: Explosive
   difficulty: 0.4

Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml

@@ -153,4 +153,57 @@
   craftTime: 4
   stacks:
     CP14IronBar: 7
-  result: CP14ClothingCloakCuirassLeg
+  result: CP14ClothingCloakCuirassLeg
+
+- type: CP14Recipe
+  id: CP14Nail10
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14IronBar: 2
+  result: CP14Nail10
+
+- type: CP14Recipe
+  id: CP14CrystalLampBlueEmpty
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 2
+    CP14IronBar: 1
+  result: CP14CrystalLampBlueEmpty
+
+- type: CP14Recipe
+  id: CP14CrystalLampOrangeEmpty
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 2
+    CP14IronBar: 1
+  result: CP14CrystalLampOrangeEmpty
+
+- type: CP14Recipe
+  id: CP14Scissors
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14IronBar: 1
+  result: CP14Scissors
+
+- type: CP14Recipe
+  id: CP14ClothingCloakArmoredRed
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  entities:
+    CP14DyeRed: 1
+  stacks:
+    CP14Cloth: 3
+    CP14IronBar: 5
+  result: CP14ClothingCloakArmoredRed
+
+- type: CP14Recipe
+  id: CP14ClothingCloakBrassArmor
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14CopperBar: 6
+  result: CP14ClothingCloakBrassArmor

Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml

@@ -3,7 +3,7 @@
   tag: CP14RecipeMeltingFurnace
   craftTime: 4
   entities:
-    CP14OreCopper: 2
+    CP14OreCopper: 4
   result: CP14CopperBar1
 
 - type: CP14Recipe
@@ -11,7 +11,7 @@
   tag: CP14RecipeMeltingFurnace
   craftTime: 4
   entities:
-    CP14OreIron: 2
+    CP14OreIron: 4
   result: CP14IronBar1
 
 - type: CP14Recipe
@@ -19,5 +19,13 @@
   tag: CP14RecipeMeltingFurnace
   craftTime: 4
   entities:
-    CP14OreGold: 2
-  result: CP14GoldBar1
+    CP14OreGold: 4
+  result: CP14GoldBar1
+
+- type: CP14Recipe
+  id: CP14GlassSheet1
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 4
+  entities:
+    CP14QuartzShard: 1
+  result: CP14GlassSheet1

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

@@ -0,0 +1,18 @@
+- type: job
+  id: CP14Blacksmith
+  name: cp14-job-name-blacksmith
+  description: cp14-job-desc-blacksmith
+  playTimeTracker: CP14JobBlacksmith
+  startingGear: CP14BlacksmithGear
+  icon: "CP14JobIconBlacksmith"
+  supervisors: cp14-job-supervisors-command
+  special:
+  - !type:CP14AddSkillSpecial
+    skills:
+    - Blacksmith
+
+- type: startingGear
+  id: CP14BlacksmithGear
+  equipment:
+    belt1: CP14WalletFilledTest
+    keys: CP14KeyRingBlacksmith

Resources/Prototypes/_CP14/Roles/Jobs/departments.yml

@@ -29,4 +29,5 @@
   roles:
   - CP14Adventurer
   - CP14Alchemist
-  - CP14Innkeeper
+  - CP14Innkeeper
+  - CP14Blacksmith

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -6,6 +6,9 @@
 - type: playTimeTracker
   id: CP14JobAlchemist
 
+- type: playTimeTracker
+  id: CP14JobBlacksmith
+
 - type: playTimeTracker
   id: CP14JobInnkeeper
 

Resources/Prototypes/_CP14/Stacks/materials.yml

@@ -52,4 +52,11 @@
   name: cp14-stack-gold-bars
   spawn: CP14GoldBar1
   icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 }
+  maxCount: 10
+
+- type: stack
+  id: CP14GlassSheet
+  name: cp14-stack-glass-sheet
+  spawn: CP14GlassSheet1
+  icon: { sprite: _CP14/Objects/Materials/glass.rsi, state: glass_2 }
   maxCount: 10

Resources/Prototypes/_CP14/StatusIcon/job.yml

@@ -60,3 +60,11 @@
     sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
     state: Banker
   jobName: cp14-job-name-banker
+
+- type: jobIcon
+  parent: CP14JobIcon
+  id: CP14JobIconBlacksmith
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
+    state: Blacksmith
+  jobName: cp14-job-name-blacksmith