From c7151a7f563ce0eb546ca43698ddef4ae1f6725b Mon Sep 17 00:00:00 2001
From: gogenych <nechenku@gmail.com>
Date: Sun, 8 Jun 2025 19:16:25 +0300
Subject: [PATCH] Copper time! (#1403)

* blyad ya na mastere sdelal

* returned readability

* new presets for copper weapons

* fix
---
 .../Prototypes/_CP14/Catalog/Fills/crates.yml |  6 ++++-
 .../Weapons/ModularPresets/pickaxe.yml        | 14 +++++++++++
 .../Objects/Weapons/ModularPresets/rapier.yml | 15 ++++++++++++
 .../Weapons/ModularPresets/skimitar.yml       |  2 +-
 .../Objects/Weapons/ModularPresets/sword.yml  | 15 ++++++++++++
 .../_CP14/Loadouts/Jobs/adventure.yml         | 24 +++++++++----------
 .../_CP14/Loadouts/Jobs/general.yml           |  6 ++---
 7 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
index 8022aaa22e..59feb47008 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
@@ -55,8 +55,12 @@
       - id: CP14KeyFile
       - id: CP14BaseMop
       - id: CP14LockCopper
-      - id: CP14ModularIronPickaxe
+      - id: CP14ModularCopperPickaxe
       - id: CP14ModularIronSickle
+      - id: CP14ModularIronPickaxe
+        weight: 0.3
+
+
       - !type:GroupSelector
         children:
         - id: CP14FluteInstrument
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
index b0958d38a9..d5a7f2d21c 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml
@@ -13,3 +13,17 @@
     details:
     - BladeIronPickaxe
 
+- type: entity
+  id: CP14ModularCopperPickaxe
+  parent: CP14ModularGripWoodenLong
+  name: copper pickaxe
+  description: It's better than by hand
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperPickaxe
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml
index a9199b03cc..97f633ed52 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml
@@ -13,6 +13,21 @@
     details:
     - BladeIronRapier
 
+- type: entity
+  id: CP14ModularCopperRapier
+  parent: CP14ModularGripWooden
+  name: iron rapier
+  description: You'll be lucky if it even pierces the paper.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperRapier
+
 - type: entity
   id: CP14ModularGuildmasterRapier
   parent: CP14ModularGripGuildmaster
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
index 0ea44b359e..20899afe8f 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml
@@ -17,7 +17,7 @@
   id: CP14ModularCopperSkimitar
   parent: CP14ModularGripWooden
   name: copper skimitar
-  description: the gold standard of edged weapons. Medium length, comfortable grip. No frills.
+  description: You'll be lucky if it even pierces the paper.
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
index 86b641e0e3..bdd72cdd7f 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml
@@ -13,6 +13,21 @@
     details:
     - BladeIronSword
 
+- type: entity
+  id: CP14ModularCopperSword
+  parent: CP14ModularGripWooden
+  name: iron sword
+  description: You'll be lucky if it even pierces the paper.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperSword
+
 - type: entity
   id: CP14ModularGuardHalberd
   parent: CP14ModularGripIronLongGuard
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
index 7932d08b5b..f14060465b 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml
@@ -4,32 +4,32 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
-  - CP14ModularIronSkimitar
-  - CP14ModularIronSword
-  - CP14ModularIronRapier
+  - CP14ModularCopperSkimitar
+  - CP14ModularCopperSword
+  - CP14ModularCopperRapier
   - CP14BowCombat
 
 - type: loadout
-  id: CP14ModularIronSkimitar
-  dummyEntity: CP14ModularIronSkimitar
+  id: CP14ModularCopperSkimitar
+  dummyEntity: CP14ModularCopperSkimitar
   equipment:
-    belt2: CP14ModularIronSkimitar
+    belt2: CP14ModularCopperSkimitar
   skills:
   - SkimitarMastery
 
 - type: loadout
-  id: CP14ModularIronSword
-  dummyEntity: CP14ModularIronSword
+  id: CP14ModularCopperSword
+  dummyEntity: CP14ModularCopperSword
   equipment:
-    belt2: CP14ModularIronSword
+    belt2: CP14ModularCopperSword
   skills:
   - SwordMastery
 
 - type: loadout
-  id: CP14ModularIronRapier
-  dummyEntity: CP14ModularIronRapier
+  id: CP14ModularCopperRapier
+  dummyEntity: CP14ModularCopperRapier
   equipment:
-    belt2: CP14ModularIronRapier
+    belt2: CP14ModularCopperRapier
   skills:
   - RapierMastery
 
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
index 401e80e211..833264d4c5 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -666,7 +666,7 @@
   - CP14SilverCoin
   - CP14ModularIronDagger
   - CP14ModularIronSickle
-  - CP14ModularIronPickaxe
+  - CP14ModularCopperPickaxe
   - CP14Lighter
   - CP14Torch
   - CP14SmokingPipeFilledTobacco
@@ -723,10 +723,10 @@
     - CP14ModularIronSickle
 
 - type: loadout
-  id: CP14ModularIronPickaxe
+  id: CP14ModularCopperPickaxe
   storage:
     back:
-    - CP14ModularIronPickaxe
+    - CP14ModularCopperPickaxe
 
 - type: loadout
   id: CP14Lighter