Taislin 7 miesięcy temu
rodzic
commit
98861669a8
55 zmienionych plików z 1022 dodań i 1640 usunięć
  1. 0 45
      .github/CODEOWNERS
  2. 0 7
      .github/ISSUE_TEMPLATE/config.yml
  3. 6 7
      .github/ISSUE_TEMPLATE/issue_report.md
  4. 0 18
      .github/ISSUE_TEMPLATE/toolshed-feature-request.md
  5. 1 18
      .github/PULL_REQUEST_TEMPLATE.md
  6. 0 9
      .github/config.yml
  7. 3 1
      Content.Client/Power/EntitySystems/PowerReceiverSystem.cs
  8. 1 0
      Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs
  9. 1 0
      Resources/Locale/en-US/construction/construction-categories.ftl
  10. 1 0
      Resources/Locale/en-US/guidebook/guides.ftl
  11. 2 0
      Resources/Locale/en-US/lathe/lathe-categories.ftl
  12. 1 1
      Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
  13. 62 336
      Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_hats.yml
  14. 12 36
      Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_suit.yml
  15. 0 24
      Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_uniform.yml
  16. 10 9
      Resources/Prototypes/Civ14/Entities/Mining/bronze.yml
  17. 7 7
      Resources/Prototypes/Civ14/Entities/Mining/tin.yml
  18. 4 4
      Resources/Prototypes/Civ14/Entities/Objects/Materials/materials_metals.yml
  19. 222 0
      Resources/Prototypes/Civ14/Entities/Structures/Craft/anvil.yml
  20. 0 2
      Resources/Prototypes/Civ14/Entities/Structures/Craft/fletchers.yml
  21. 136 0
      Resources/Prototypes/Civ14/Entities/Structures/Craft/metallurgy.yml
  22. 1 1
      Resources/Prototypes/Civ14/Entities/Structures/Furniture/tables.yml
  23. 1 1
      Resources/Prototypes/Civ14/Entities/Structures/Walls/walls.yml
  24. 8 381
      Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_hats.yml
  25. 3 108
      Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_suit.yml
  26. 0 119
      Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_uniform.yml
  27. 63 0
      Resources/Prototypes/Civ14/Recipes/Construction/metallurgy.yml
  28. 1 1
      Resources/Prototypes/Civ14/Recipes/Construction/tools.yml
  29. 83 96
      Resources/Prototypes/Entities/Effects/mobspawn.yml
  30. 56 65
      Resources/Prototypes/Entities/Effects/wallspawn.yml
  31. 57 59
      Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
  32. 0 1
      Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
  33. 0 31
      Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
  34. 6 5
      Resources/Prototypes/Entities/Objects/Materials/ingots.yml
  35. 0 45
      Resources/Prototypes/Entities/Objects/Materials/materials.yml
  36. 0 33
      Resources/Prototypes/Entities/Objects/Materials/ore.yml
  37. 1 49
      Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
  38. 0 3
      Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml
  39. 8 17
      Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
  40. 49 50
      Resources/Prototypes/Entities/Structures/Walls/meteor.yml
  41. 8 0
      Resources/Prototypes/Guidebook/nomads.yml
  42. 2 2
      Resources/Prototypes/Reagents/Materials/metals.yml
  43. 1 1
      Resources/Prototypes/Reagents/Materials/ores.yml
  44. 36 28
      Resources/Prototypes/SoundCollections/destruction.yml
  45. 1 1
      Resources/Prototypes/Stacks/Materials/materials.yml
  46. 0 7
      Resources/Prototypes/Stacks/Materials/ore.yml
  47. 1 11
      Resources/Prototypes/ore.yml
  48. 83 0
      Resources/ServerInfo/Guidebook/Nomads/metallurgy.xml
  49. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze.png
  50. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze_2.png
  51. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze_3.png
  52. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron.png
  53. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron_2.png
  54. BIN
      Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron_3.png
  55. 84 1
      Wiki/src/guides/guide_to_metallurgy.md

+ 0 - 45
.github/CODEOWNERS

@@ -1,45 +0,0 @@
-# Last match in file takes precedence.
-
-# Sorting by path instead of by who added it one day :(
-# this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-
-/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr @crazybrain23
-/Content.*/Administration/ @DrSmugleaf @nikthechampiongr @crazybrain23
-/Resources/ServerInfo/ @nikthechampiongr @crazybrain23
-/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr @crazybrain23
-
-/Resources/Prototypes/Maps/** @Emisse
-
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr @crazybrain23
-/Content.*/Body/ @DrSmugleaf
-/Content.YAMLLinter @DrSmugleaf
-/Content.Shared/Damage/ @DrSmugleaf
-
-/Content.*/Anomaly/ @TheShuEd
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @TheShuEd
-
-/Content.*/Forensics/ @ficcialfaint
-
-# SKREEEE
-/Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr @crazybrain23
-/Pow3r/ @PJB3005
-/Content.Server/Power/Pow3r/ @PJB3005
-
-# notafet
-/Content.*/Atmos/ @Partmedia
-/Content.*/Botany/ @Partmedia
-
-# Jezi
-/Content.*/Medical @Jezithyr
-/Content.*/Body @Jezithyr
-
-# Sloth
-/Content.*/Audio @metalgearsloth
-/Content.*/Movement @metalgearsloth
-/Content.*/NPC @metalgearsloth
-/Content.*/Shuttles @metalgearsloth
-/Content.*/Weapons @metalgearsloth

+ 0 - 7
.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +0,0 @@
-contact_links:
-  - name: Report a Security Vulnerability
-    url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
-    about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
-  - name: Request a Feature
-    url: https://discord.gg/rGvu9hKffJ
-    about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).

+ 6 - 7
.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,20 +1,19 @@
 ---
 name: Report an Issue
 about: "..."
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
 ## Description
+
 <!-- Explain your issue in detail. Issues without proper explanation are liable to be closed by maintainers. -->
 
 **Reproduction**
+
 <!-- Include the steps to reproduce if applicable. -->
 
 **Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
 
-**Additional context**
-<!-- Add any other context about the problem here. Anything you think is related to the issue. -->
+<!-- If applicable, add screenshots to help explain your problem. -->

+ 0 - 18
.github/ISSUE_TEMPLATE/toolshed-feature-request.md

@@ -1,18 +0,0 @@
----
-name: Toolshed feature request
-about: Suggest a feature for Toolshed (for game admins/developers)
-title: "[TOOLSHED REQUEST]"
-labels: Toolshed
-assignees: moonheart08
-
----
-
-**Is your feature request related to a problem/bug? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the command you'd like**
-A clear and concise description of what you want and what it should do.
-If you're a technical user (i.e. programmer) including type signatures is helpful.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

+ 1 - 18
.github/PULL_REQUEST_TEMPLATE.md

@@ -1,25 +1,8 @@
-## About the PR
+## Changelog
 
 <!-- What did you change? -->
 
-## Technical details
-
-<!-- Summary of code changes for easier review. -->
-
 ## Media
 
 <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc).
 Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
-
-**Changelog**
-
-<!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
-Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
-Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
-<!--
-:cl:
-- add: Added fun!
-- remove: Removed fun!
-- tweak: Changed fun!
-- fix: Fixed fun!
--->

+ 0 - 9
.github/config.yml

@@ -1,9 +0,0 @@
-Project-Condor:
-  org: space-wizards
-  project: 2
-  inbox: Inbox
-  labels:
-    "W: In Progress": "In Progress"
-    "W: Discussion": "Design and Discussion"
-    "W: Backlog": "Backlog"
-    "W: Next": "Next"

+ 3 - 1
Content.Client/Power/EntitySystems/PowerReceiverSystem.cs

@@ -18,7 +18,9 @@ public override void Initialize()
 
     private void OnExamined(Entity<ApcPowerReceiverComponent> ent, ref ExaminedEvent args)
     {
-        args.PushMarkup(GetExamineText(ent.Comp.Powered));
+        if (ent.Comp.NeedsPower){
+            args.PushMarkup(GetExamineText(ent.Comp.Powered));
+        }
     }
 
     private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args)

+ 1 - 0
Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs

@@ -73,6 +73,7 @@ public bool IsPowered(Entity<SharedApcPowerReceiverComponent?> entity)
         return entity.Comp.Powered;
     }
 
+
     protected string GetExamineText(bool powered)
     {
         return Loc.GetString("power-receiver-component-on-examine-main",

+ 1 - 0
Resources/Locale/en-US/construction/construction-categories.ftl

@@ -5,6 +5,7 @@ construction-category-tools = Tools
 construction-category-materials = Materials
 construction-category-structures = Structures
 construction-category-machines = Machines
+construction-category-production = Production
 construction-category-weapons = Weapons
 construction-category-tiles = Tiles
 construction-category-utilities = Utilities

+ 1 - 0
Resources/Locale/en-US/guidebook/guides.ftl

@@ -94,6 +94,7 @@ guide-entry-charactercreation = Creating Characters
 guide-entry-nomads = Nomads Gamemode
 guide-entry-nomads-starterguide = Starter Guide
 guide-entry-nomads-farming = Farming
+guide-entry-nomads-metallurgy = Metallurgy
 guide-entry-species = Species
 guide-entry-yourfirstcharacter = Your First Character
 guide-entry-controls = Controls

+ 2 - 0
Resources/Locale/en-US/lathe/lathe-categories.ftl

@@ -24,3 +24,5 @@ lathe-category-neck = Neck
 
 # Crafting tables
 lathe-category-fletcher = Fletcher
+lathe-category-gold = Gold
+lathe-category-bronze = Bronze

+ 1 - 1
Resources/Locale/en-US/lathe/ui/lathe-menu.ftl

@@ -1,4 +1,4 @@
-lathe-menu-title = Lathe Menu
+lathe-menu-title = Production Menu
 lathe-menu-queue = Queue
 lathe-menu-server-list = Server list
 lathe-menu-sync = Sync

Plik diff jest za duży
+ 62 - 336
Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_hats.yml


+ 12 - 36
Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_suit.yml

@@ -2306,13 +2306,7 @@
           Piercing: 0.92
           Arrow: 0.65
           Heat: 0.85
-    - type: Construction
 
-      graph: civ13_suit_bronze_chinese_lamellar
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: american coat
   parent: ClothingOuterBase
@@ -4521,14 +4515,7 @@
           Piercing: 0.92
           Arrow: 0.65
           Heat: 0.85
-          Radiation: 0
-    - type: Construction
 
-      graph: civ13_suit_bronze_egyptian_lamellar
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: scaled armor
   parent: ClothingOuterBase
@@ -4544,16 +4531,10 @@
         coefficients:
           Blunt: 0.5
           Slash: 0.5
-          Piercing: 0.92
-          Arrow: 0.65
+          Piercing: 0.90
+          Arrow: 0.55
           Heat: 0.85
-    - type: Construction
 
-      graph: civ13_suit_scaled_armor
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: aztec harness
   parent: ClothingOuterBase
@@ -4880,17 +4861,12 @@
     - type: Armor
       modifiers:
         coefficients:
-          Blunt: 0.5
-          Slash: 0.5
-          Piercing: 0.92
-          Arrow: 0.65
-          Heat: 0.85
-    - type: Construction
+          Blunt: 0.85
+          Slash: 0.85
+          Piercing: 0.85
+          Arrow: 0.85
+          Heat: 0.9
 
-      graph: civ13_suit_bronze_chestplate
-      node: end
-      cost: 6
-      time: 17
 - type: entity
   name: iron chestplate
   parent: ClothingOuterBase
@@ -4904,11 +4880,11 @@
     - type: Armor
       modifiers:
         coefficients:
-          Blunt: 0.4
-          Slash: 0.4
-          Piercing: 0.92
-          Arrow: 0.6
-          Heat: 0.85
+          Blunt: 0.8
+          Slash: 0.8
+          Piercing: 0.8
+          Arrow: 0.8
+          Heat: 0.9
     - type: Construction
 
       graph: civ13_suit_iron_chestplate

+ 0 - 24
Resources/Prototypes/Civ14/Entities/Clothing/entities_clothing_uniform.yml

@@ -916,13 +916,7 @@
           Arrow: 1
           Heat: 1
           Radiation: 1
-    - type: Construction
 
-      graph: civ13_uniform_greek_uniform
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: greek uniform
   parent: ClothingUniformBase
@@ -944,13 +938,7 @@
           Arrow: 1
           Heat: 1
           Radiation: 1
-    - type: Construction
 
-      graph: civ13_uniform_greek_uniform_1
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: greek uniform
   parent: ClothingUniformBase
@@ -972,13 +960,7 @@
           Arrow: 1
           Heat: 1
           Radiation: 1
-    - type: Construction
 
-      graph: civ13_uniform_greek_uniform_1_2
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: greek commander uniform
   parent: ClothingUniformBase
@@ -1000,13 +982,7 @@
           Arrow: 1
           Heat: 1
           Radiation: 1
-    - type: Construction
 
-      graph: civ13_uniform_greek_commander_uniform
-      node: end
-      cost: 5
-      material: Cloth
-      time: 5
 - type: entity
   name: white tunic
   parent: ClothingUniformBase

+ 10 - 9
Resources/Prototypes/Civ14/Entities/Mining/bronze.yml

@@ -1,22 +1,23 @@
 - type: material
   id: Bronze
-  stackEntity: MaterialBronze1
+  stackEntity: IngotBronze1
   name: materials-bronze
   icon: { sprite: Objects/Materials/ingots.rsi, state: sheet-bronze }
   color: "#cd7f32"
   price: 0.05
 
 - type: entity
-  parent: MaterialBase
-  id: MaterialBronze
-  name: bronze
+  parent: IngotBase
+  id: IngotBronze
+  name: bronze ingot
   suffix: Full
   components:
     - type: Material
+    - type: Item
+      heldPrefix: gold
     - type: PhysicalComposition
       materialComposition:
-        Tin: 10
-        Copper: 90
+        Bronze: 100
     - type: Sprite
       sprite: "Objects/Materials/ingots.rsi"
       state: sheet-bronze
@@ -43,8 +44,8 @@
     - type: Appearance
 
 - type: entity
-  parent: MaterialBronze
-  id: MaterialBronze1
+  parent: IngotBronze
+  id: IngotBronze1
   suffix: Single
   components:
     - type: Sprite
@@ -57,5 +58,5 @@
   id: Bronze
   name: bronze
   icon: { sprite: /Textures/Objects/Materials/ingots.rsi, state: sheet-bronze }
-  spawn: MaterialBronze1
+  spawn: IngotBronze1
   maxCount: 10

+ 7 - 7
Resources/Prototypes/Civ14/Entities/Mining/tin.yml

@@ -40,16 +40,16 @@
 
 - type: material
   id: Tin
-  stackEntity: MaterialTin1
+  stackEntity: IngotTin1
   name: materials-tin
   icon: { sprite: Objects/Materials/ingots.rsi, state: iron }
   color: "#919191"
   price: 0.05
 
 - type: entity
-  parent: MaterialBase
-  id: MaterialTin
-  name: tin
+  parent: IngotBase
+  id: IngotTin
+  name: tin ingot
   suffix: Full
   components:
     - type: Material
@@ -82,8 +82,8 @@
       heldPrefix: iron
 
 - type: entity
-  parent: MaterialTin
-  id: MaterialTin1
+  parent: IngotTin
+  id: IngotTin1
   suffix: Single
   components:
     - type: Sprite
@@ -96,7 +96,7 @@
   id: Tin
   name: tin
   icon: { sprite: /Textures/Objects/Materials/ingots.rsi, state: iron }
-  spawn: MaterialTin1
+  spawn: IngotTin1
   maxCount: 10
 
 - type: stack

+ 4 - 4
Resources/Prototypes/Civ14/Entities/Objects/Materials/materials_metals.yml

@@ -1,7 +1,7 @@
 - type: entity
   parent: IngotBase
   id: IngotIron
-  name: iron bar
+  name: iron ingot
   suffix: Full
   components:
     - type: Material
@@ -35,7 +35,7 @@
 - type: entity
   parent: IngotIron
   id: IngotIron1
-  name: iron bar
+  name: iron ingot
   suffix: Single
   components:
     - type: Sprite
@@ -52,7 +52,7 @@
 - type: entity
   parent: IngotBase
   id: IngotCopper
-  name: copper bar
+  name: copper ingot
   suffix: Full
   components:
     - type: Material
@@ -86,7 +86,7 @@
 - type: entity
   parent: IngotCopper
   id: IngotCopper1
-  name: copper bar
+  name: copper ingot
   suffix: Single
   components:
     - type: Sprite

+ 222 - 0
Resources/Prototypes/Civ14/Entities/Structures/Craft/anvil.yml

@@ -0,0 +1,222 @@
+- type: entity
+  parent: BaseLathe
+  id: AnvilStone
+  name: stone anvil
+  description: A metalworking tool to produce weapons and armours.
+  components:
+    - type: Transform
+      noRot: false
+    - type: Sprite
+      sprite: Civ14/Objects/metallurgy.rsi
+      snapCardinals: true
+      state: stone_anvil
+    - type: ApcPowerReceiver
+      needsPower: false
+      powerLoad: 0
+    - type: Anchorable
+      delay: 2
+    - type: Lathe
+      producingSound: /Audio/Effects/metal_thud1.ogg
+      idleState: stone_anvil
+      runningState: stone_anvil_use
+      staticPacks:
+        - AnvilBronze
+        - AnvilGold
+    - type: MaterialStorage
+      whitelist:
+        tags:
+          - Sheet
+          - Ingot
+
+- type: latheCategory
+  id: AnvilBronze
+  name: lathe-category-bronze
+
+- type: latheRecipePack
+  id: AnvilBronze
+  recipes:
+    - civ13_suit_bronze_chinese_lamellar
+    - civ13_suit_bronze_egyptian_lamellar
+    - civ13_suit_scaled_armor
+    - civ13_suit_bronze_chestplate
+    - civ13_head_greek_anax_helmet
+    - civ13_head_aries_helmet
+    - civ13_head_athena_helmet
+    - civ13_head_lochagos_helmet
+    - civ13_head_dimoerites_helmet
+    - civ13_head_bronze_phrigian_helmet
+    - civ13_head_bronze_osirus_headdress
+    - civ13_head_bronze_anubis_headdress
+    - civ13_head_egyptian_war_headdress
+    - civ13_head_chinese_warrior_helmet
+
+- type: latheCategory
+  id: AnvilGold
+  name: lathe-category-gold
+
+- type: latheRecipePack
+  id: AnvilGold
+  recipes:
+    - civ13_head_khepresh_war_crown
+    - civ13_head_pharoah_headdress
+    - civ13_head_nemes_headdress
+    - civ13_head_sol_invictus_helmet
+
+- type: latheRecipe
+  id: civ13_head_khepresh_war_crown
+  categories:
+    - AnvilGold
+  completetime: 10
+  materials:
+    Gold: 300
+  result: civ13_head_khepresh_war_crown
+- type: latheRecipe
+  id: civ13_head_pharoah_headdress
+  categories:
+    - AnvilGold
+  completetime: 10
+  materials:
+    Gold: 300
+  result: civ13_head_pharoah_headdress
+- type: latheRecipe
+  id: civ13_head_sol_invictus_helmet
+  categories:
+    - AnvilGold
+  completetime: 10
+  materials:
+    Gold: 300
+  result: civ13_head_sol_invictus_helmet
+- type: latheRecipe
+  id: civ13_head_nemes_headdress
+  categories:
+    - AnvilGold
+  completetime: 10
+  materials:
+    Gold: 300
+  result: civ13_head_nemes_headdress
+
+- type: latheRecipe
+  id: civ13_suit_bronze_chinese_lamellar
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 800
+  result: civ13_suit_bronze_chinese_lamellar
+
+- type: latheRecipe
+  id: civ13_suit_bronze_egyptian_lamellar
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 800
+  result: civ13_suit_bronze_egyptian_lamellar
+
+- type: latheRecipe
+  id: civ13_suit_scaled_armor
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 1000
+  result: civ13_suit_scaled_armor
+
+- type: latheRecipe
+  id: civ13_suit_bronze_chestplate
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 700
+  result: civ13_suit_bronze_chestplate
+
+- type: latheRecipe
+  id: civ13_head_greek_anax_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_greek_anax_helmet
+
+- type: latheRecipe
+  id: civ13_head_aries_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_aries_helmet
+
+- type: latheRecipe
+  id: civ13_head_athena_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_athena_helmet
+
+- type: latheRecipe
+  id: civ13_head_lochagos_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 300
+  result: civ13_head_lochagos_helmet
+
+- type: latheRecipe
+  id: civ13_head_dimoerites_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 300
+  result: civ13_head_dimoerites_helmet
+
+- type: latheRecipe
+  id: civ13_head_bronze_phrigian_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 200
+  result: civ13_head_bronze_phrigian_helmet
+
+- type: latheRecipe
+  id: civ13_head_bronze_osirus_headdress
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_bronze_osirus_headdress
+
+- type: latheRecipe
+  id: civ13_head_bronze_anubis_headdress
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_bronze_anubis_headdress
+
+- type: latheRecipe
+  id: civ13_head_egyptian_war_headdress
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 300
+  result: civ13_head_egyptian_war_headdress
+
+- type: latheRecipe
+  id: civ13_head_chinese_warrior_helmet
+  categories:
+    - AnvilBronze
+  completetime: 10
+  materials:
+    Bronze: 500
+  result: civ13_head_chinese_warrior_helmet

+ 0 - 2
Resources/Prototypes/Civ14/Entities/Structures/Craft/fletchers.yml

@@ -10,8 +10,6 @@
       sprite: Civ14/Objects/structures.rsi
       snapCardinals: true
       state: fletchersbench
-    - type: Machine
-      board: UniformPrinterMachineCircuitboard
     - type: ApcPowerReceiver
       needsPower: false
       powerLoad: 0

+ 136 - 0
Resources/Prototypes/Civ14/Entities/Structures/Craft/metallurgy.yml

@@ -0,0 +1,136 @@
+- type: entity
+  id: StoneKiln
+  name: stone kiln
+  parent: OreProcessor
+  description: Used for smelting ore to produce metals.
+  components:
+    - type: Sprite
+      sprite: Civ14/Objects/metallurgy.rsi
+      layers:
+        - state: stone_kiln_on
+          shader: unshaded
+          map: ["enum.LatheVisualLayers.IsRunning"]
+        - state: stone_kiln
+          map: ["enum.PowerDeviceVisualLayers.Powered"]
+        - state: stone_kiln
+          map: ["enum.MaterialStorageVisualLayers.Inserting"]
+        - state: stone_kiln
+          map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - type: Destructible
+      thresholds:
+        - trigger: !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:PlaySoundBehavior
+              sound:
+                collection: StoneBreak
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+    - type: ApcPowerReceiver
+      needsPower: false
+    - type: Lathe
+      idleState: stone_kiln
+      runningState: stone_kiln_on
+      staticPacks:
+        - StoneKiln
+
+- type: latheRecipePack
+  id: StoneKiln
+  recipes:
+    - IngotCopper
+    - IngotTin
+    - IngotSilver
+    - IngotGold
+    - IngotBronze
+
+- type: latheRecipe
+  id: IngotGold
+  result: IngotGold1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: gold }
+  completetime: 2
+  materials:
+    RawGold: 100
+
+- type: latheRecipe
+  id: IngotSilver
+  result: IngotSilver1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: silver }
+  completetime: 2
+  materials:
+    RawSilver: 100
+
+- type: latheRecipe
+  id: IngotBronze
+  result: IngotBronze1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: sheet-bronze }
+  completetime: 2
+  materials:
+    RawCopper: 90
+    RawTin: 10
+
+- type: latheRecipe
+  id: IngotTin
+  result: IngotTin1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: iron }
+  completetime: 2
+  materials:
+    RawTin: 100
+
+- type: latheRecipe
+  id: IngotCopper
+  result: IngotCopper1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: copper }
+  completetime: 2
+  materials:
+    RawCopper: 100
+
+# bloomery
+- type: entity
+  id: Bloomery
+  name: bloomery
+  parent: OreProcessor
+  description: Used for smelting iron ore.
+  components:
+    - type: Sprite
+      sprite: Civ14/Objects/metallurgy.rsi
+      layers:
+        - state: bloomery_on
+          shader: unshaded
+          map: ["enum.LatheVisualLayers.IsRunning"]
+        - state: bloomery
+          map: ["enum.PowerDeviceVisualLayers.Powered"]
+        - state: bloomery
+          map: ["enum.MaterialStorageVisualLayers.Inserting"]
+        - state: bloomery
+          map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    - type: Destructible
+      thresholds:
+        - trigger: !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:PlaySoundBehavior
+              sound:
+                collection: StoneBreak
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+    - type: ApcPowerReceiver
+      needsPower: false
+    - type: Lathe
+      idleState: bloomery
+      runningState: bloomery_on
+      staticPacks:
+        - Bloomery
+
+- type: latheRecipePack
+  id: Bloomery
+  recipes:
+    - IngotIron
+
+- type: latheRecipe
+  id: IngotIron
+  result: IngotIron1
+  icon: { sprite: "/Textures/Objects/Materials/ingots.rsi", state: sheet-iron }
+  completetime: 2
+  materials:
+    RawIron: 100
+# forge

+ 1 - 1
Resources/Prototypes/Civ14/Entities/Structures/Furniture/tables.yml

@@ -19,7 +19,7 @@
               acts: ["Destruction"]
             - !type:PlaySoundBehavior
               sound:
-                collection: GlassBreak
+                collection: WoodDestroy
         - trigger: !type:DamageTrigger
             damage: 15
           behaviors:

+ 1 - 1
Resources/Prototypes/Civ14/Entities/Structures/Walls/walls.yml

@@ -122,7 +122,7 @@
           behaviors:
             - !type:PlaySoundBehavior
               sound:
-                collection: WoodDestroy
+                collection: StoneBreak
             - !type:DoActsBehavior
               acts: ["Destruction"]
     - type: Construction

+ 8 - 381
Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_hats.yml

@@ -754,114 +754,7 @@
               doAfter: 5
     - node: end
       entity: civ13_head_gladiator_helmet
-- type: construction
-  name: sol invictus helmet
-  id: civ13_head_sol_invictus_helmet
-  graph: civ13_head_sol_invictus_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A gold adorned helmet with masqued visage and gold solar streaks. Worn by roman emperors.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/sol_invictus.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_sol_invictus_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_sol_invictus_helmet
-- type: construction
-  name: greek anax helmet
-  id: civ13_head_greek_anax_helmet
-  graph: civ13_head_greek_anax_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A reinforced bronze greek helmet, covering most of the face, with black plummage on top. Worn by hellenic kings.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/leonidas.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_greek_anax_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_greek_anax_helmet
-- type: construction
-  name: aries helmet
-  id: civ13_head_aries_helmet
-  graph: civ13_head_aries_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A reinforced bronze greek helmet, covering most of the face, with red plummage on top. Worn by dieties and avatars of destruction such as aries.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/aries.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_aries_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_aries_helmet
-- type: construction
-  name: athena helmet
-  id: civ13_head_athena_helmet
-  graph: civ13_head_athena_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A reinforced bronze greek helmet, covering most of the face, with blue plummage on top and a gold laurel. Chosen helm of the god of tactical warfare and knowledge athena herself.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/athena.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_athena_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_athena_helmet
+
 - type: construction
   name: Greek M15 Adrian helmet
   id: civ13_head_Greek_M15_Adrian_helmet
@@ -889,168 +782,7 @@
               doAfter: 5
     - node: end
       entity: civ13_head_Greek_M15_Adrian_helmet
-- type: construction
-  name: lochagos helmet
-  id: civ13_head_lochagos_helmet
-  graph: civ13_head_lochagos_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze greek helmet, covering most of the face, with red plummage on top. Worn by hellenic lochagos.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/spartan.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_lochagos_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_lochagos_helmet
-- type: construction
-  name: dimoerites helmet
-  id: civ13_head_dimoerites_helmet
-  graph: civ13_head_dimoerites_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze greek helmet, covering most of the face, with blue plummage on top. Worn by hellenic dimoerites.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/athenian.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_dimoerites_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_dimoerites_helmet
-- type: construction
-  name: egyptian war headdress
-  id: civ13_head_egyptian_war_headdress
-  graph: civ13_head_egyptian_war_headdress
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze egyptian headpiece, with an exposed face to relieve the wearer of heat.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/egyptian_bronze_headdress.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_egyptian_war_headdress
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_egyptian_war_headdress
-- type: construction
-  name: bronze anubis headdress
-  id: civ13_head_bronze_anubis_headdress
-  graph: civ13_head_bronze_anubis_headdress
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze egyptian headpiece, with the visage of the god anubis; god of the dead.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/anubis.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_bronze_anubis_headdress
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_bronze_anubis_headdress
-- type: construction
-  name: bronze osirus headdress
-  id: civ13_head_bronze_osirus_headdress
-  graph: civ13_head_bronze_osirus_headdress
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze egyptian headpiece, with the visage of the god osiris; god of the underworld.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/osiris.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_bronze_osirus_headdress
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_bronze_osirus_headdress
-- type: construction
-  name: bronze phrigian helmet
-  id: civ13_head_bronze_phrigian_helmet
-  graph: civ13_head_bronze_phrigian_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A knob ended bronze phrigian helmet. With more emphasis on style than overall protection
-  icon:
-    sprite: Civ14/Clothing/exported/hats/phrigian_helmet.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_bronze_phrigian_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 4
-              doAfter: 10
-    - node: end
-      entity: civ13_head_bronze_phrigian_helmet
+
 - type: construction
   name: leather helmet
   id: civ13_head_leather_helmet
@@ -1105,33 +837,7 @@
               doAfter: 9
     - node: end
       entity: civ13_head_hatchigane_headband
-- type: construction
-  name: khepresh war crown
-  id: civ13_head_khepresh_war_crown
-  graph: civ13_head_khepresh_war_crown
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A ornate egyptian war crown made of leather and gold. It is not as protective as bronze or iron, but practical for protecting your majesty.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/khepresh.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_khepresh_war_crown
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Leather
-              amount: 3
-              doAfter: 9
-    - node: end
-      entity: civ13_head_khepresh_war_crown
+
 - type: construction
   name: horned helmet
   id: civ13_head_horned_helmet
@@ -1240,33 +946,7 @@
               doAfter: 5
     - node: end
       entity: civ13_head_conspicious_gaelic_helmet_1
-- type: construction
-  name: chinese warrior helmet
-  id: civ13_head_chinese_warrior_helmet
-  graph: civ13_head_chinese_warrior_helmet
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze helmet, used by early chinese dynasties.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/bronze_chinese.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 3
-- type: constructionGraph
-  id: civ13_head_chinese_warrior_helmet
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_head_chinese_warrior_helmet
+
 - type: construction
   name: yellow ninja headband
   id: civ13_head_yellow_ninja_headband
@@ -3881,7 +3561,7 @@
       edges:
         - to: end
           steps:
-            - material: Cloth
+            - material: Gold
               amount: 5
               doAfter: 5
     - node: end
@@ -3935,7 +3615,7 @@
       edges:
         - to: end
           steps:
-            - material: Cloth
+            - material: Gold
               amount: 5
               doAfter: 5
     - node: end
@@ -7126,60 +6806,7 @@
               doAfter: 6
     - node: end
       entity: civ13_head_red_egyptian_headdress
-- type: construction
-  name: pharoah headdress
-  id: civ13_head_pharoah_headdress
-  graph: civ13_head_pharoah_headdress
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A ornate, golden headdress.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/pharoah_headdress.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_pharoah_headdress
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 6
-              doAfter: 6
-    - node: end
-      entity: civ13_head_pharoah_headdress
-- type: construction
-  name: nemes headdress
-  id: civ13_head_nemes_headdress
-  graph: civ13_head_nemes_headdress
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A fancy, golden headdress.
-  icon:
-    sprite: Civ14/Clothing/exported/hats/nemes_headdress.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 2
-- type: constructionGraph
-  id: civ13_head_nemes_headdress
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 6
-              doAfter: 6
-    - node: end
-      entity: civ13_head_nemes_headdress
+
 - type: construction
   name: double crown
   id: civ13_head_double_crown
@@ -7337,7 +6964,7 @@
       edges:
         - to: end
           steps:
-            - material: Cloth
+            - material: Gold
               amount: 6
               doAfter: 15
     - node: end

+ 3 - 108
Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_suit.yml

@@ -2240,33 +2240,7 @@
               doAfter: 11
     - node: end
       entity: civ13_suit_red_jacket
-- type: construction
-  name: bronze chinese lamellar
-  id: civ13_suit_bronze_chinese_lamellar
-  graph: civ13_suit_bronze_chinese_lamellar
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze lamellar armor, used by warriors of early chinese dynasties.
-  icon:
-    sprite: Civ14/Clothing/exported/suits/chinese_lamellar.rsi
-    state: icon
-  objectType: Item
-  agemin: 8
-  agemax: 8
-- type: constructionGraph
-  id: civ13_suit_bronze_chinese_lamellar
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_suit_bronze_chinese_lamellar
+
 - type: construction
   name: american coat
   id: civ13_suit_american_coat
@@ -4616,60 +4590,7 @@
               doAfter: 10
     - node: end
       entity: civ13_suit_linothorax_armor
-- type: construction
-  name: bronze egyptian lamellar
-  id: civ13_suit_bronze_egyptian_lamellar
-  graph: civ13_suit_bronze_egyptian_lamellar
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze lamellar armor, used by soldiers of pharoahic dynasties.
-  icon:
-    sprite: Civ14/Clothing/exported/suits/egyptian_lamellar.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 8
-- type: constructionGraph
-  id: civ13_suit_bronze_egyptian_lamellar
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Bronze
-              amount: 6
-              doAfter: 10
-    - node: end
-      entity: civ13_suit_bronze_egyptian_lamellar
-- type: construction
-  name: scaled armor
-  id: civ13_suit_scaled_armor
-  graph: civ13_suit_scaled_armor
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: An armor made of serveral scales made of bronze.
-  icon:
-    sprite: Civ14/Clothing/exported/suits/scaled_armor.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 8
-- type: constructionGraph
-  id: civ13_suit_scaled_armor
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Bronze
-              amount: 6
-              doAfter: 10
-    - node: end
-      entity: civ13_suit_scaled_armor
+
 - type: construction
   name: aztec harness
   id: civ13_suit_aztec_harness
@@ -4994,33 +4915,7 @@
               doAfter: 5
     - node: end
       entity: civ13_suit_templar_plated_armor
-- type: construction
-  name: bronze chestplate
-  id: civ13_suit_bronze_chestplate
-  graph: civ13_suit_bronze_chestplate
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: A bronze chestplate.
-  icon:
-    sprite: Civ14/Clothing/exported/suits/bronze_chestplate.rsi
-    state: icon
-  objectType: Item
-  agemin: 1
-  agemax: 8
-- type: constructionGraph
-  id: civ13_suit_bronze_chestplate
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Bronze
-              amount: 6
-              doAfter: 17
-    - node: end
-      entity: civ13_suit_bronze_chestplate
+
 - type: construction
   name: iron chestplate
   id: civ13_suit_iron_chestplate

+ 0 - 119
Resources/Prototypes/Civ14/Recipes/Clothing/recipes_clothing_uniform.yml

@@ -963,126 +963,7 @@
               doAfter: 5
     - node: end
       entity: civ13_uniform_roman_centurion_uniform
-- type: construction
-  name: greek uniform
-  id: civ13_uniform_greek_uniform
-  graph: civ13_uniform_greek_uniform
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: >-
-    A light tunic, covered with bronze and leather armor. Used by the hellenic
-    armies.
-  icon:
-    sprite: Civ14/Clothing/exported/uniforms/athens.rsi
-    state: icon
-  objectType: Item
-  agemin: 8
-  agemax: 8
-
-- type: constructionGraph
-  id: civ13_uniform_greek_uniform
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_uniform_greek_uniform
-- type: construction
-  name: greek uniform
-  id: civ13_uniform_greek_uniform_1
-  graph: civ13_uniform_greek_uniform_1
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: >-
-    A light tunic, covered with bronze and leather armor. Used by the hellenic
-    armies.
-  icon:
-    sprite: Civ14/Clothing/exported/uniforms/thebes.rsi
-    state: icon
-  objectType: Item
-  agemin: 8
-  agemax: 8
 
-- type: constructionGraph
-  id: civ13_uniform_greek_uniform_1
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_uniform_greek_uniform_1
-- type: construction
-  name: greek uniform
-  id: civ13_uniform_greek_uniform_1_2
-  graph: civ13_uniform_greek_uniform_1_2
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: >-
-    A light tunic, covered with bronze and leather armor. Used by the hellenic
-    armies.
-  icon:
-    sprite: Civ14/Clothing/exported/uniforms/corinthia.rsi
-    state: icon
-  objectType: Item
-  agemin: 8
-  agemax: 8
-
-- type: constructionGraph
-  id: civ13_uniform_greek_uniform_1_2
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_uniform_greek_uniform_1_2
-- type: construction
-  name: greek commander uniform
-  id: civ13_uniform_greek_commander_uniform
-  graph: civ13_uniform_greek_commander_uniform
-  startNode: start
-  targetNode: end
-  category: construction-category-clothing
-  description: >-
-    A light blue tunic covered by a bronze plate armor. Used by hellenic
-    commanders.
-  icon:
-    sprite: Civ14/Clothing/exported/uniforms/greek_commander.rsi
-    state: icon
-  objectType: Item
-  agemin: 8
-  agemax: 8
-
-- type: constructionGraph
-  id: civ13_uniform_greek_commander_uniform
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: end
-          steps:
-            - material: Cloth
-              amount: 5
-              doAfter: 5
-    - node: end
-      entity: civ13_uniform_greek_commander_uniform
 - type: construction
   name: white tunic
   id: civ13_uniform_white_tunic

+ 63 - 0
Resources/Prototypes/Civ14/Recipes/Construction/metallurgy.yml

@@ -0,0 +1,63 @@
+- type: constructionGraph
+  id: StoneKiln
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: end
+          steps:
+            - material: Stone
+              amount: 25
+              doAfter: 15
+
+    - node: end
+      entity: StoneKiln
+
+- type: construction
+  name: stone kiln
+  id: StoneKiln
+  graph: StoneKiln
+  startNode: start
+  targetNode: end
+  category: construction-category-production
+  description: Used for smelting ore to produce metals.
+  icon: { sprite: Civ14/Objects/metallurgy.rsi, state: stone_kiln }
+  objectType: Structure
+  agemin: 0
+  agemax: 8
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: constructionGraph
+  id: Bloomery
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: end
+          steps:
+            - material: Stone
+              amount: 25
+              doAfter: 15
+
+    - node: end
+      entity: Bloomery
+
+- type: construction
+  name: bloomery
+  id: Bloomery
+  graph: Bloomery
+  startNode: start
+  targetNode: end
+  category: construction-category-production
+  description: Used for smelting iron.
+  icon: { sprite: Civ14/Objects/metallurgy.rsi, state: bloomery }
+  objectType: Structure
+  agemin: 1
+  agemax: 8
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked

+ 1 - 1
Resources/Prototypes/Civ14/Recipes/Construction/tools.yml

@@ -279,7 +279,7 @@
   graph: FletchersWorkstation
   startNode: start
   targetNode: end
-  category: construction-category-tools
+  category: construction-category-production
   description: Used to produce bows and arrows.
   icon: { sprite: Civ14/Objects/structures.rsi, state: fletchersbench }
   objectType: Structure

+ 83 - 96
Resources/Prototypes/Entities/Effects/mobspawn.yml

@@ -1,133 +1,120 @@
 - type: entity
   id: MobSpawnCrabQuartz
   name: mobspawner quartzcrab
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [HideSpawnMenu, Spawner]
   components:
-  - type: Transform
-    anchored: True
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_quartz
-  - type: Fixtures
-    fixtures:
-      portalFixture:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.48,0.25,0.48"
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-        hard: false
-  - type: TimedDespawn
-    lifetime: 2.1
-  - type: SpawnOnDespawn
-    prototype: MobQuartzCrab
-
-- type: entity
-  id: MobSpawnCrabIron
-  parent: MobSpawnCrabQuartz
-  name: mobspawner ironcrab
-  categories: [ HideSpawnMenu, Spawner ]
-  components:
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_iron
-  - type: SpawnOnDespawn
-    prototype: MobIronCrab
+    - type: Transform
+      anchored: True
+    - type: InteractionOutline
+    - type: Physics
+      bodyType: Static
+    - type: Sprite
+      sprite: /Textures/Effects/mobspawn.rsi
+      state: crab_quartz
+    - type: Fixtures
+      fixtures:
+        portalFixture:
+          shape: !type:PhysShapeAabb
+            bounds: "-0.25,-0.48,0.25,0.48"
+          mask:
+            - FullTileMask
+          layer:
+            - WallLayer
+          hard: false
+    - type: TimedDespawn
+      lifetime: 2.1
+    - type: SpawnOnDespawn
+      prototype: MobQuartzCrab
 
 - type: entity
   id: MobSpawnCrabCoal
   parent: MobSpawnCrabQuartz
   name: mobspawner coalcrab
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [HideSpawnMenu, Spawner]
   components:
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_coal
-  - type: SpawnOnDespawn
-    prototype: MobCoalCrab
+    - type: Sprite
+      sprite: /Textures/Effects/mobspawn.rsi
+      state: crab_coal
+    - type: SpawnOnDespawn
+      prototype: MobCoalCrab
 
 - type: entity
   id: MobSpawnCrabSilver
   parent: MobSpawnCrabQuartz
   name: mobspawner silvercrab
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [HideSpawnMenu, Spawner]
   components:
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_silver
-  - type: SpawnOnDespawn
-    prototype: MobSilverCrab
+    - type: Sprite
+      sprite: /Textures/Effects/mobspawn.rsi
+      state: crab_silver
+    - type: SpawnOnDespawn
+      prototype: MobSilverCrab
 
 - type: entity
   id: MobSpawnCrabGold
   parent: MobSpawnCrabQuartz
   name: mobspawner goldcrab
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [HideSpawnMenu, Spawner]
   components:
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_gold
-  - type: SpawnOnDespawn
-    prototype: MobGoldCrab
+    - type: Sprite
+      sprite: /Textures/Effects/mobspawn.rsi
+      state: crab_gold
+    - type: SpawnOnDespawn
+      prototype: MobGoldCrab
 
 - type: entity
   id: MobSpawnCrabUranium
   parent: MobSpawnCrabQuartz
   name: mobspawner uraniumcrab
-  categories: [ HideSpawnMenu, Spawner ]
+  categories: [HideSpawnMenu, Spawner]
   components:
-  - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
-    state: crab_uranium
-  - type: SpawnOnDespawn
-    prototype: MobUraniumCrab
+    - type: Sprite
+      sprite: /Textures/Effects/mobspawn.rsi
+      state: crab_uranium
+    - type: SpawnOnDespawn
+      prototype: MobUraniumCrab
 
 - type: entity
   id: EffectAnomalyFloraBulb
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: TimedDespawn
-    lifetime: 0.4
-  - type: Sprite
-    drawdepth: Effects
-    noRot: true
-    layers:
-      - shader: unshaded
-        map: ["enum.EffectLayers.Unshaded"]
-        sprite: Effects/emp.rsi
-        state: emp_disable
-  - type: EffectVisuals
-  - type: Tag
-    tags:
-      - HideContextMenu
-  - type: AnimationPlayer
-  - type: EntityTableSpawner
-    deleteSpawnerAfterSpawn: false
-    table: !type:NestedSelector
-      tableId: AnomalyFloraLootTable
+    - type: TimedDespawn
+      lifetime: 0.4
+    - type: Sprite
+      drawdepth: Effects
+      noRot: true
+      layers:
+        - shader: unshaded
+          map: ["enum.EffectLayers.Unshaded"]
+          sprite: Effects/emp.rsi
+          state: emp_disable
+    - type: EffectVisuals
+    - type: Tag
+      tags:
+        - HideContextMenu
+    - type: AnimationPlayer
+    - type: EntityTableSpawner
+      deleteSpawnerAfterSpawn: false
+      table: !type:NestedSelector
+        tableId: AnomalyFloraLootTable
 
 - type: entityTable
   id: AnomalyFloraLootTable
   table: !type:GroupSelector
     children:
-    - id: FoodAmbrosiaVulgaris
-    - id: FoodAloe
-    - id: FoodCabbage
-    - id: FoodGalaxythistle
-    - id: FoodLemon
-    - id: FoodLime
-    - id: FoodPeaPod
-    - id: FoodPineapple
-    - id: FoodOnionRed
-    - id: FoodWatermelon
-    - id: FoodCherry
-    - id: MobTomatoKiller
-    - id: MobLuminousEntity
-    - id: MobLuminousObject
-    - id: FoodGatfruit # 0.007% spawn chance. 1 / 141
-      weight: 0.10
+      - id: FoodAmbrosiaVulgaris
+      - id: FoodAloe
+      - id: FoodCabbage
+      - id: FoodGalaxythistle
+      - id: FoodLemon
+      - id: FoodLime
+      - id: FoodPeaPod
+      - id: FoodPineapple
+      - id: FoodOnionRed
+      - id: FoodWatermelon
+      - id: FoodCherry
+      - id: MobTomatoKiller
+      - id: MobLuminousEntity
+      - id: MobLuminousObject
+      - id: FoodGatfruit # 0.007% spawn chance. 1 / 141
+        weight: 0.10

+ 56 - 65
Resources/Prototypes/Entities/Effects/wallspawn.yml

@@ -1,123 +1,114 @@
 - type: entity
   id: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: Transform
-    anchored: True
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-  - type: Sprite
-    sprite: /Textures/Effects/rockspawn.rsi
-    state: asteroid
-  - type: Fixtures
-    fixtures:
-      portalFixture:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.48,0.25,0.48"
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-        hard: false
-  - type: TimedDespawn
-    lifetime: 2.4
-  - type: SpawnOnDespawn
-    prototype: AsteroidRock
+    - type: Transform
+      anchored: True
+    - type: InteractionOutline
+    - type: Physics
+      bodyType: Static
+    - type: Sprite
+      sprite: /Textures/Effects/rockspawn.rsi
+      state: asteroid
+    - type: Fixtures
+      fixtures:
+        portalFixture:
+          shape: !type:PhysShapeAabb
+            bounds: "-0.25,-0.48,0.25,0.48"
+          mask:
+            - FullTileMask
+          layer:
+            - WallLayer
+          hard: false
+    - type: TimedDespawn
+      lifetime: 2.4
+    - type: SpawnOnDespawn
+      prototype: AsteroidRock
 
 - type: entity
   id: WallSpawnAsteroidUraniumCrab
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockUraniumCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockUraniumCrab
 
 - type: entity
   id: WallSpawnAsteroidUranium
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockUranium
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockUranium
 
 - type: entity
   id: WallSpawnAsteroidQuartzCrab
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockQuartzCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockQuartzCrab
 
 - type: entity
   id: WallSpawnAsteroidQuartz
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockQuartz
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockQuartz
 
 - type: entity
   id: WallSpawnAsteroidSilverCrab
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockSilverCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockSilverCrab
 
 - type: entity
   id: WallSpawnAsteroidSilver
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockSilver
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockSilver
 
 - type: entity
   id: WallSpawnAsteroidGoldCrab
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockGoldCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockGoldCrab
 
 - type: entity
   id: WallSpawnAsteroidGold
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockGold
-
-- type: entity
-  id: WallSpawnAsteroidIronCrab
-  parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockTinCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockGold
 
 - type: entity
   id: WallSpawnAsteroidIron
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockTin
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockTin
 
 - type: entity
   id: WallSpawnAsteroidCoalCrab
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockCoalCrab
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockCoalCrab
 
 - type: entity
   id: WallSpawnAsteroidCoal
   parent: WallSpawnAsteroid
-  categories: [ HideSpawnMenu ]
+  categories: [HideSpawnMenu]
   components:
-  - type: SpawnOnDespawn
-    prototype: AsteroidRockCoal
+    - type: SpawnOnDespawn
+      prototype: AsteroidRockCoal

+ 57 - 59
Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml

@@ -3,72 +3,70 @@
   name: random anomaly spawner
   parent: MarkerBase
   components:
-  - type: Sprite
-    layers:
-    - state: red
-    - sprite: Structures/Specific/anomaly.rsi
-      state: anom1
-  - type: RandomSpawner
-    chance: 1
-    prototypes:
-    - AnomalyPyroclastic
-    - AnomalyGravity
-    - AnomalyElectricity
-    - AnomalyFlesh
-    - AnomalyBluespace
-    - AnomalyIce
-    - RandomRockAnomalySpawner
-    - AnomalyLiquid
-    - AnomalyFlora
-    - AnomalyShadow
-    - AnomalyTech
-    #- AnomalySanta
-    rareChance: 0.3
-    rarePrototypes:
-    - RandomAnomalyInjectorSpawner
-    offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile.
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Specific/anomaly.rsi
+          state: anom1
+    - type: RandomSpawner
+      chance: 1
+      prototypes:
+        - AnomalyPyroclastic
+        - AnomalyGravity
+        - AnomalyElectricity
+        - AnomalyFlesh
+        - AnomalyBluespace
+        - AnomalyIce
+        - RandomRockAnomalySpawner
+        - AnomalyLiquid
+        - AnomalyFlora
+        - AnomalyShadow
+        - AnomalyTech
+      #- AnomalySanta
+      rareChance: 0.3
+      rarePrototypes:
+        - RandomAnomalyInjectorSpawner
+      offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile.
 
 - type: entity
   id: RandomRockAnomalySpawner
   parent: MarkerBase
   components:
-  - type: Sprite
-    layers:
-    - state: red
-    - sprite: Structures/Specific/anomaly.rsi
-      state: anom6
-  - type: RandomSpawner
-    prototypes:
-    - AnomalyRockIron
-    - AnomalyRockCoal
-    - AnomalyRockSilver
-    - AnomalyRockGold
-    - AnomalyRockQuartz
-    - AnomalyRockUranium
-    chance: 1
-    offset: 0.15
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Specific/anomaly.rsi
+          state: anom6
+    - type: RandomSpawner
+      prototypes:
+        - AnomalyRockCoal
+        - AnomalyRockSilver
+        - AnomalyRockGold
+        - AnomalyRockQuartz
+        - AnomalyRockUranium
+      chance: 1
+      offset: 0.15
 
 - type: entity
   id: RandomAnomalyInjectorSpawner
   parent: MarkerBase
   components:
-  - type: Sprite
-    layers:
-    - state: red
-    - sprite: Structures/Specific/Anomalies/tech_anom.rsi
-      state: pulse
-  - type: RandomSpawner
-    prototypes:
-    - AnomalyTrapPyroclastic
-    - AnomalyTrapElectricity
-    - AnomalyTrapShadow
-    - AnomalyTrapIce
-    - AnomalyTrapFlora
-    - AnomalyTrapBluespace
-    - AnomalyTrapFlesh
-    - AnomalyTrapGravity
-    - AnomalyTrapTech
-    - AnomalyTrapRock
-    #- AnomalyTrapSanta
-    chance: 1
-
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Specific/Anomalies/tech_anom.rsi
+          state: pulse
+    - type: RandomSpawner
+      prototypes:
+        - AnomalyTrapPyroclastic
+        - AnomalyTrapElectricity
+        - AnomalyTrapShadow
+        - AnomalyTrapIce
+        - AnomalyTrapFlora
+        - AnomalyTrapBluespace
+        - AnomalyTrapFlesh
+        - AnomalyTrapGravity
+        - AnomalyTrapTech
+        - AnomalyTrapRock
+      #- AnomalyTrapSanta
+      chance: 1

+ 0 - 1
Resources/Prototypes/Entities/Markers/Spawners/mobs.yml

@@ -792,7 +792,6 @@
     - type: RandomSpawner
       prototypes:
         - MobSpawnCrabUranium
-        - MobSpawnCrabIron
         - MobSpawnCrabQuartz
         - MobSpawnCrabSilver
 

+ 0 - 31
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml

@@ -126,37 +126,6 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
-- type: entity
-  parent: MobOreCrab
-  id: MobIronCrab
-  description: An ore crab made from iron.
-  components:
-  - type: Sprite
-    state: iron_crab
-  - type: MeleeWeapon
-    damage:
-      types:
-        Blunt: 5
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 1.5
-    baseSprintSpeed : 2
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 80
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: GlassBreak
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SteelOre1:
-            min: 2
-            max: 4
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-
 - type: entity
   parent: MobOreCrab
   id: MobCoalCrab

+ 6 - 5
Resources/Prototypes/Entities/Objects/Materials/ingots.yml

@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: MaterialBase
   id: IngotBase
   description: A heavy metal ingot.
   components:
@@ -14,6 +14,7 @@
     - type: Tag
       tags:
         - Ingot
+        - RawMaterial
     - type: Damageable
       damageContainer: Inorganic
       damageModifierSet: Metallic
@@ -28,7 +29,7 @@
 - type: entity
   parent: IngotBase
   id: IngotGold
-  name: gold bar
+  name: gold ingot
   suffix: Full
   components:
     - type: Material
@@ -62,7 +63,7 @@
 - type: entity
   parent: IngotGold
   id: IngotGold1
-  name: gold bar
+  name: gold ingot
   suffix: Single
   components:
     - type: Sprite
@@ -73,7 +74,7 @@
 - type: entity
   parent: IngotBase
   id: IngotSilver
-  name: silver bar
+  name: silver ingot
   suffix: Full
   components:
     - type: Material
@@ -107,7 +108,7 @@
 - type: entity
   parent: IngotSilver
   id: IngotSilver1
-  name: silver bar
+  name: silver ingot
   suffix: Single
   components:
     - type: Sprite

+ 0 - 45
Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -558,51 +558,6 @@
     - type: Stack
       count: 1
 
-- type: entity
-  parent: MaterialBase
-  id: MaterialCopper
-  name: copper
-  suffix: Full
-  components:
-    - type: Material
-    - type: PhysicalComposition
-      materialComposition:
-        Copper: 100
-    - type: Sprite
-      state: copper
-      layers:
-        - state: copper
-          map: ["base"]
-    - type: Stack
-      stackType: Copper
-      count: 10
-      baseLayer: base
-      layerStates:
-        - copper
-        - copper_2
-        - copper_3
-    - type: SolutionContainerManager
-      solutions:
-        food:
-          maxVol: 10
-          reagents:
-            - ReagentId: Copper
-              Quantity: 10
-    - type: Appearance
-    - type: Item
-      heldPrefix: copper
-
-- type: entity
-  parent: MaterialCopper
-  id: MaterialCopper1
-  suffix: Single
-  components:
-    - type: Sprite
-      sprite: Objects/Materials/ingots.rsi
-      state: copper
-    - type: Stack
-      count: 1
-
 - type: entity
   parent: MaterialBase
   id: MaterialWebSilk

+ 0 - 33
Resources/Prototypes/Entities/Objects/Materials/ore.yml

@@ -89,39 +89,6 @@
     - type: Stack
       count: 1
 
-- type: entity
-  parent: OreBase
-  id: SteelOre
-  name: iron ore
-  suffix: Full
-  components:
-    - type: Stack
-      stackType: SteelOre
-    - type: Sprite
-      state: iron
-    - type: Material
-    - type: PhysicalComposition
-      materialComposition:
-        RawIron: 100
-    - type: Extractable
-      grindableSolutionName: ironore
-    - type: SolutionContainerManager
-      solutions:
-        ironore:
-          reagents:
-            - ReagentId: Iron
-              Quantity: 10
-    - type: Item
-      heldPrefix: iron
-
-- type: entity
-  id: SteelOre1
-  parent: SteelOre
-  suffix: Single
-  components:
-    - type: Stack
-      count: 1
-
 - type: entity
   parent: OreBase
   id: PlasmaOre

+ 1 - 49
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml

@@ -598,55 +598,7 @@
           spawns:
             - MobSpawnCrabGold
 
-- type: entity
-  id: AnomalyRockIron
-  parent: AnomalyRockBase
-  suffix: Rock, Iron
-  components:
-    - type: Sprite
-      color: "#ff8227"
-    - type: PointLight
-      radius: 2.0
-      energy: 7.5
-      color: "#ff8227"
-    - type: EntitySpawnAnomaly
-      entries:
-        - settings:
-            spawnOnPulse: true
-            minAmount: 8
-            maxAmount: 15
-            minRange: 4.5
-            maxRange: 7.5
-          spawns:
-            - WallSpawnAsteroid
-            - WallSpawnAsteroid
-            - WallSpawnAsteroidIron
-            - WallSpawnAsteroidIronCrab
-        - settings:
-            spawnOnPulse: true
-            maxAmount: 3
-            minRange: 2.5
-            maxRange: 4.5
-          spawns:
-            - CrystalOrange
-        - settings:
-            spawnOnSuperCritical: true
-            minAmount: 30
-            maxAmount: 40
-            minRange: 5
-            maxRange: 15
-          spawns:
-            - CrystalOrange
-            - WallSpawnAsteroid
-            - WallSpawnAsteroid
-            - WallSpawnAsteroidIronCrab
-        - settings:
-            spawnOnSuperCritical: true
-            minAmount: 6
-            maxAmount: 10
-            maxRange: 5
-          spawns:
-            - MobSpawnCrabIron
+
 
 - type: entity
   id: AnomalyRockCoal

+ 0 - 3
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml

@@ -312,7 +312,6 @@
             - WallSpawnAsteroidSilver
             - WallSpawnAsteroidSilverCrab
             - WallSpawnAsteroidIron
-            - WallSpawnAsteroidIronCrab
             - WallSpawnAsteroidQuartz
             - WallSpawnAsteroidQuartzCrab
         - settings:
@@ -339,7 +338,6 @@
             - WallSpawnAsteroidSilver
             - WallSpawnAsteroidSilverCrab
             - WallSpawnAsteroidIron
-            - WallSpawnAsteroidIronCrab
             - WallSpawnAsteroidQuartz
             - WallSpawnAsteroidQuartzCrab
         - settings:
@@ -349,7 +347,6 @@
             maxRange: 3
           spawns:
             - MobSpawnCrabSilver
-            - MobSpawnCrabIron
             - MobSpawnCrabQuartz
 
 - type: entity

+ 8 - 17
Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

@@ -274,7 +274,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_asteroid
@@ -289,15 +289,6 @@
         - state: rock_tin
           map: ["enum.MiningScannerVisualLayers.Overlay"]
 
-- type: entity
-  id: AsteroidRockTinCrab
-  parent: AsteroidRockTin
-  suffix: Iron Crab
-  components:
-    - type: OreVein
-      oreChance: 1.0
-      currentOre: OreIronCrab
-
 - type: entity
   id: AsteroidRockUranium
   parent: AsteroidRock
@@ -572,7 +563,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: ironrock
@@ -937,7 +928,7 @@
         WallRockSnow: WallRockSnowTin
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock
@@ -1240,7 +1231,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_wall
@@ -1515,7 +1506,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_snow
@@ -1790,7 +1781,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_sand
@@ -2065,7 +2056,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_chromite
@@ -2340,7 +2331,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_andesite

+ 49 - 50
Resources/Prototypes/Entities/Structures/Walls/meteor.yml

@@ -5,19 +5,18 @@
   name: meteorite rock
   description: What remains of a meteorite.
   components:
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 12 #This change makes meteorite walls easier to destroy for cleanup
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          path: /Audio/Effects/break_stone.ogg
-          params:
-            volume: -6
+    - type: Destructible
+      thresholds:
+        - trigger: !type:DamageTrigger
+            damage: 12 #This change makes meteorite walls easier to destroy for cleanup
+          behaviors:
+            - !type:DoActsBehavior
+              acts: ["Destruction"]
+            - !type:PlaySoundBehavior
+              sound:
+                path: /Audio/Effects/break_stone.ogg
+                params:
+                  volume: -6
 
 # Ore veins
 - type: entity
@@ -32,13 +31,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_coal
 
@@ -54,13 +53,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_gold
 
@@ -76,13 +75,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_diamond
 
@@ -98,13 +97,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_phoron
 
@@ -120,13 +119,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_quartz
 
@@ -142,13 +141,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_silver
 # Tin name is a holdover from the asteroid.yml prototype.
@@ -160,17 +159,17 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSteel
+      currentOre: OreIron
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_tin
 
@@ -186,13 +185,13 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_uranium
 
@@ -208,12 +207,12 @@
     - type: Sprite
       layers:
         - state: rock_asteroid
-        - map: [ "enum.EdgeLayer.South" ]
+        - map: ["enum.EdgeLayer.South"]
           state: rock_asteroid_south
-        - map: [ "enum.EdgeLayer.East" ]
+        - map: ["enum.EdgeLayer.East"]
           state: rock_asteroid_east
-        - map: [ "enum.EdgeLayer.North" ]
+        - map: ["enum.EdgeLayer.North"]
           state: rock_asteroid_north
-        - map: [ "enum.EdgeLayer.West" ]
+        - map: ["enum.EdgeLayer.West"]
           state: rock_asteroid_west
         - state: rock_bananium

+ 8 - 0
Resources/Prototypes/Guidebook/nomads.yml

@@ -5,6 +5,8 @@
   text: "/ServerInfo/Guidebook/Nomads/nomads.xml"
   children:
     - NomadsStarterGuide
+    - NomadsFarming
+    - NomadsMetallurgy
 
 - type: guideEntry
   id: NomadsStarterGuide
@@ -17,3 +19,9 @@
   name: guide-entry-nomads-farming
   priority: 2
   text: "/ServerInfo/Guidebook/Nomads/farming.xml"
+
+- type: guideEntry
+  id: NomadsMetallurgy
+  name: guide-entry-nomads-metallurgy
+  priority: 3
+  text: "/ServerInfo/Guidebook/Nomads/metallurgy.xml"

+ 2 - 2
Resources/Prototypes/Reagents/Materials/metals.yml

@@ -12,7 +12,7 @@
   unit: materials-unit-bar
   icon: { sprite: Objects/Materials/ingots.rsi, state: gold }
   color: "#FFD700"
-  price: 0.75 # $75 for 1 unit
+  price: 2 # $200 for 1 unit
 
 - type: material
   id: Silver
@@ -21,7 +21,7 @@
   unit: materials-unit-bar
   icon: { sprite: Objects/Materials/ingots.rsi, state: silver }
   color: "#C0C0C0"
-  price: 0.60 # $60 for 1 unit
+  price: 1 # $100 for 1 unit
 
 - type: material
   id: Brass

+ 1 - 1
Resources/Prototypes/Reagents/Materials/ores.yml

@@ -1,6 +1,6 @@
 - type: material
   id: RawIron
-  stackEntity: SteelOre1
+  stackEntity: IronOre1
   name: materials-raw-iron
   unit: materials-unit-chunk
   icon: { sprite: Objects/Materials/ore.rsi, state: iron }

+ 36 - 28
Resources/Prototypes/SoundCollections/destruction.yml

@@ -1,63 +1,71 @@
 - type: soundCollection
   id: GlassBreak
   files:
-  - /Audio/Effects/glass_break1.ogg
-  - /Audio/Effects/glass_break2.ogg
-  - /Audio/Effects/glass_break3.ogg
-  - /Audio/Effects/glass_break4.ogg
+    - /Audio/Effects/glass_break1.ogg
+    - /Audio/Effects/glass_break2.ogg
+    - /Audio/Effects/glass_break3.ogg
+    - /Audio/Effects/glass_break4.ogg
 
 - type: soundCollection
   id: GlassCrack
   files:
-  - /Audio/Effects/glass_crack1.ogg
-  - /Audio/Effects/glass_crack2.ogg
-  - /Audio/Effects/glass_crack3.ogg
-  - /Audio/Effects/glass_crack4.ogg
+    - /Audio/Effects/glass_crack1.ogg
+    - /Audio/Effects/glass_crack2.ogg
+    - /Audio/Effects/glass_crack3.ogg
+    - /Audio/Effects/glass_crack4.ogg
 
 - type: soundCollection
   id: WindowShatter
   files:
-  - /Audio/Effects/window_shatter1.ogg
-  - /Audio/Effects/window_shatter2.ogg
-  - /Audio/Effects/window_shatter3.ogg
+    - /Audio/Effects/window_shatter1.ogg
+    - /Audio/Effects/window_shatter2.ogg
+    - /Audio/Effects/window_shatter3.ogg
 
 - type: soundCollection
   id: WoodDestroy
   files:
-  - /Audio/Effects/wood_destroy1.ogg
-  - /Audio/Effects/wood_destroy2.ogg
-  - /Audio/Effects/wood_destroy3.ogg
+    - /Audio/Effects/wood_destroy1.ogg
+    - /Audio/Effects/wood_destroy2.ogg
+    - /Audio/Effects/wood_destroy3.ogg
 
 - type: soundCollection
   id: WoodDestroyHeavy
   files:
-  - /Audio/Effects/wood_destroy_heavy1.ogg
+    - /Audio/Effects/wood_destroy_heavy1.ogg
 
 - type: soundCollection
   id: MetalCrunch
   files:
-  - /Audio/Effects/metal_crunch.ogg
+    - /Audio/Effects/metal_crunch.ogg
 
 - type: soundCollection
   id: MetalBreak
   files:
-  - /Audio/Effects/metal_break1.ogg
-  - /Audio/Effects/metal_break2.ogg
-  - /Audio/Effects/metal_break3.ogg
-  - /Audio/Effects/metal_break4.ogg
-  - /Audio/Effects/metal_break5.ogg
+    - /Audio/Effects/metal_break1.ogg
+    - /Audio/Effects/metal_break2.ogg
+    - /Audio/Effects/metal_break3.ogg
+    - /Audio/Effects/metal_break4.ogg
+    - /Audio/Effects/metal_break5.ogg
 
 - type: soundCollection
   id: MetalGlassBreak
   files:
-  - /Audio/Effects/metal_glass_break1.ogg
-  - /Audio/Effects/metal_glass_break2.ogg
+    - /Audio/Effects/metal_glass_break1.ogg
+    - /Audio/Effects/metal_glass_break2.ogg
 
 - type: soundCollection
   id: MetalSlam
   files:
-  - /Audio/Effects/metal_slam1.ogg
-  - /Audio/Effects/metal_slam2.ogg
-  - /Audio/Effects/metal_slam3.ogg
-  - /Audio/Effects/metal_slam4.ogg
-  - /Audio/Effects/metal_slam5.ogg
+    - /Audio/Effects/metal_slam1.ogg
+    - /Audio/Effects/metal_slam2.ogg
+    - /Audio/Effects/metal_slam3.ogg
+    - /Audio/Effects/metal_slam4.ogg
+    - /Audio/Effects/metal_slam5.ogg
+
+# placeholder for now
+- type: soundCollection
+  id: StoneBreak
+  files:
+    - /Audio/Effects/metal_break1.ogg
+    - /Audio/Effects/metal_break2.ogg
+    - /Audio/Effects/metal_break3.ogg

+ 1 - 1
Resources/Prototypes/Stacks/Materials/materials.yml

@@ -65,7 +65,7 @@
   id: Copper
   name: copper
   icon: { sprite: /Textures/Objects/Materials/ingots.rsi, state: copper }
-  spawn: MaterialCopper1
+  spawn: IngotCopper1
   maxCount: 10
 
 - type: stack

+ 0 - 7
Resources/Prototypes/Stacks/Materials/ore.yml

@@ -12,13 +12,6 @@
   spawn: DiamondOre1
   maxCount: 30
 
-- type: stack
-  id: SteelOre
-  name: iron ore
-  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: iron }
-  spawn: SteelOre1
-  maxCount: 30
-
 - type: stack
   id: PlasmaOre
   name: plasma ore

+ 1 - 11
Resources/Prototypes/ore.yml

@@ -2,11 +2,6 @@
 # Split it into 2 components, 1 for "spawn XYZ on destruction" and 1 for "randomly select one of these for spawn on destruction"
 
 # High yields
-- type: ore
-  id: OreSteel
-  oreEntity: SteelOre1
-  minOreYield: 1
-  maxOreYield: 5
 
 - type: ore
   id: OreSpaceQuartz
@@ -80,10 +75,6 @@
   id: OreQuartzCrab
   oreEntity: MobSpawnCrabQuartz
 
-- type: ore
-  id: OreIronCrab
-  oreEntity: MobSpawnCrabIron
-
 - type: ore
   id: OreCoalCrab
   oreEntity: MobSpawnCrabCoal
@@ -109,7 +100,7 @@
 - type: weightedRandomOre
   id: RandomOreDistributionStandard
   weights:
-    OreSteel: 10
+    OreIron: 10
     OreCoal: 10
     OreSpaceQuartz: 8
     OreGold: 2
@@ -123,6 +114,5 @@
   id: OreCrab
   weights:
     OreQuartzCrab: 5
-    OreIronCrab: 5
     OreUraniumCrab: 2
     OreSilverCrab: 3

+ 83 - 0
Resources/ServerInfo/Guidebook/Nomads/metallurgy.xml

@@ -0,0 +1,83 @@
+<Document>
+# Guide to Metallurgy
+
+Sticks, stones and bones can only carry you so far, but Mother Nature is infinitely generous with her gifts, among which she includes a marvelous class of materials - metals. Grateful and astounded, we accept it and pledge that it will not be wasted on trifles. It shall serve us greatly in mastering ways of cutting, slashing, gutting, chopping and slicing. We shall use it to harness flames and tame explosions, to travel swiftly across vast distances and to bring the Torch of Civilization to the realms of dark ignorance! Bless you, Mother!
+
+## Obtaining Ores
+
+You will need to mine rocks in order to obtain ores. First, get a pickaxe:
+
+-   You'll need [bold]wood[/bold] and [bold]bone[/bold] for this. Go gather them (bones are obtained by butchering animals - click the carcass with something sharp, like a flint axe or a knife),
+-   Make a [bold]bone pickaxe[/bold].
+-   Find a [bold]rock[/bold] tile.
+-   Wield the axe (press [bold]Z[/bold]). Go on [bold]Combat Mode[/bold] and click on it while holding the [bold]pickaxe[bold] on your active hand.
+
+# Turning Ores into Metals
+
+## Kiln
+
+<GuideEntityEmbed Entity="StoneKiln" />
+
+The basic ore proccessor is the [bold]kiln[/bold]. This will enable you to produce basic ingots: [bold]Gold, Silver, Tin, Copper,[/bold] and [bold]Bronze[/bold].
+
+## Bloomery
+
+<GuideEntityEmbed Entity="Bloomery" />
+
+To produce [bold]Iron[/bold], you will need a [bold]bloomery[/bold].
+
+## Blast Furnace
+
+
+
+For advanced alloys like [bold]Steel[/bold], you will need a blast furnace.
+
+# Metals
+
+## Silver
+
+<GuideEntityEmbed Entity="IngotSilver" />
+
+Silver is a rare metal used for currency and jewelry. 1 ingot of silver can be used to produce 100 silver coins. The silver coin (sc) is the the basic measure of value in the game.
+
+## Gold
+
+<GuideEntityEmbed Entity="IngotGold" />
+
+Gold is the rarest metal, and is used in currency and fancy accessories. Gold has double the rarity and value of silver.
+
+## Tin
+
+<GuideEntityEmbed Entity="MaterialTin" />
+
+Tin is a somewhat rare metal, mostly used to make bronze together with cooper.
+
+## Copper
+
+<GuideEntityEmbed Entity="IngotCopper" />
+
+Copper is a basic metal that is important early on in the game. You can craft tools, kitchen accessories, and very basic armours from it.
+
+Later in the game, you will need copper to produce electric and electronic products.
+
+## Bronze
+
+<GuideEntityEmbed Entity="MaterialBronze" />
+
+Bronze is an alloy of tin and copper. You need to melt 9 parts of copper to 1 part of tin (9:1 ratio) in a [bold]kiln[bold]. For example, 1 unit of tin and 9 units of copper make 10 units of bronze.
+
+Bronze is an important early game alloy that will enable you to make decent weapons and armour.
+
+## Iron
+
+<GuideEntityEmbed Entity="IngotIron" />
+
+Smelt raw iron ore in the [bold]bloomery[bold] to obtain sponge iron.
+Work sponge iron at any anvil into usable iron ingots.
+
+## Steel
+
+<GuideEntityEmbed Entity="SheetSteel" />
+Smelt raw iron ore in the [bold]blast furnace[bold] to obtain pig iron.
+Work pig iron at the iron or steel anvil into usable steel sheets.
+</Document>

BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze.png


BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze_2.png


BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze_3.png


BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron.png


BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron_2.png


BIN
Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron_3.png


+ 84 - 1
Wiki/src/guides/guide_to_metallurgy.md

@@ -1,3 +1,86 @@
 # Guide to Metallurgy
 
-Coming soon!
+Sticks, stones and bones can only carry you so far, but Mother Nature is infinitely generous with her gifts, among which she includes a marvelous class of materials - metals. Grateful and astounded, we accept it and pledge that it will not be wasted on trifles. It shall serve us greatly in mastering ways of cutting, slashing, gutting, chopping and slicing. We shall use it to harness flames and tame explosions, to travel swiftly across vast distances and to bring the Torch of Civilization to the realms of dark ignorance! Bless you, Mother!
+
+```admonish note
+Before proceeding to metallurgy, it is recommended to check the [Guide to Crafting](guide_to_crafting.md) for the basics of crafting.
+```
+
+## Obtaining Ores
+
+You will need to mine rocks in order to obtain ores. First, get a pickaxe:
+
+-   You'll need **wood** and **bone** for this. Go gather them (bones are obtained by butchering animals - click the carcass with something sharp, like a flint axe or a knife),
+-   Make a **bone pickaxe**.
+-   Find a **rock** tile.
+-   Wield the axe (press **Z**). Go on **Combat Mode** and click on it while holding the **pickaxe** on your active hand.
+
+## Turning Ores into Metals
+
+### Kiln
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Civ14/Objects/metallurgy.rsi/stone_kiln.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+The basic ore proccessor is the **kiln**. This will enable you to produce basic ingots: **Gold, Silver, Tin, Copper,** and **Bronze**.
+
+### Bloomery
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Civ14/Objects/metallurgy.rsi/bloomery.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+To produce **Iron**, you will need a **bloomery**.
+
+### Blast Furnace
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Civ14/Objects/metallurgy.rsi/blast_furnace.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+For advanced alloys like **Steel**, you will need a blast furnace.
+
+## Metals
+
+### Silver
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/silver.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Silver is a rare metal used for currency and jewelry. 1 ingot of silver can be used to produce 100 silver coins. The silver coin (sc) is the the basic measure of value in the game.
+
+### Gold
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/gold.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Gold is the rarest metal, and is used in currency and fancy accessories. Gold has double the rarity and value of silver.
+
+### Tin
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/iron.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Tin is a somewhat rare metal, mostly used to make bronze together with cooper.
+
+### Copper
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/copper.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Copper is a basic metal that is important early on in the game. You can craft tools, kitchen accessories, and very basic armours from it.
+
+Later in the game, you will need copper to produce electric and electronic products.
+
+### Bronze
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/sheet-bronze.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Bronze is an alloy of tin and copper. You need to melt 9 parts of copper to 1 part of tin (9:1 ratio) in a **kiln**. For example, 1 unit of tin and 9 units of copper make 10 units of bronze.
+
+Bronze is an important early game alloy that will enable you to make decent weapons and armour.
+
+### Iron
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/ingots.rsi/sheet-iron.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Smelt raw iron ore in the **bloomery** to obtain sponge iron.
+Work sponge iron at any anvil into usable iron ingots.
+
+### Steel
+
+<img src="https://raw.githubusercontent.com/Civ13/Civ14/refs/heads/master/Resources/Textures/Objects/Materials/materials.rsi/sheet-metal.png" style="width:64px;height:64px;image-rendering: pixelated;">
+
+Smelt raw iron ore in the **blast furnace** to obtain pig iron.
+Work pig iron at the iron or steel anvil into usable steel sheets.

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików