Modular sprites auto coloring (#697)

* axe and dagger update

* more blade processing

* shovel and sickle

* sword

* gardes

* grips

* modular presets

* blade material modifiers

* modular spear blade

* balance sharp garde, add sturdy garde

* Update sturdy.yml

Content.Client/_CP14/ModularCraft/CP14ClientModularCraftSystem.cs

@@ -80,6 +80,9 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
                 start.Comp.RevealedLayers.Add(keyCode);
                 var index = sprite.AddLayer(defaultLayer);
                 sprite.LayerMapSet(keyCode, index);
+
+                if (indexedPart.Color is not null)
+                    sprite.LayerSetColor(keyCode, indexedPart.Color.Value);
             }
             else
             {
@@ -148,6 +151,7 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
                 {
                     RsiPath = indexedPart.RsiPath,
                     State = state,
+                    Color = indexedPart.Color,
                 };
 
                 var key = $"{defaultKey}-{counterPart}-default";
@@ -203,6 +207,7 @@ public sealed class CP14ClientModularCraftSystem : CP14SharedModularCraftSystem
                 {
                     RsiPath = indexedPart.RsiPath,
                     State = state,
+                    Color = indexedPart.Color,
                 };
 
                 var key = $"{defaultKey}-{counterPart}-default";

Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs

@@ -28,6 +28,12 @@ public sealed partial class CP14ModularCraftPartPrototype : IPrototype
     [DataField]
     public string? RsiPath;
 
+    /// <summary>
+    /// Automatic colored all states, QoL for YML size reducing
+    /// </summary>
+    [DataField]
+    public Color? Color;
+
     [DataField]
     public List<PrototypeLayerData>? IconSprite;
 

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml

@@ -17,8 +17,9 @@
   name: iron axe blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronAxe
@@ -29,8 +30,10 @@
   name: golden axe blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldAxe
@@ -41,8 +44,10 @@
   name: copper axe blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperAxe
@@ -53,8 +58,10 @@
   name: mithril axe blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilAxe

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml

@@ -17,8 +17,9 @@
   name: iron dagger blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronDagger
@@ -29,8 +30,10 @@
   name: golden dagger blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldDagger
@@ -41,8 +44,10 @@
   name: copper dagger blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperDagger
@@ -53,8 +58,10 @@
   name: mithril dagger blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilDagger

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml

@@ -17,8 +17,9 @@
   name: iron mace ball
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronMace
@@ -29,8 +30,10 @@
   name: golden mace ball
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldMace
@@ -41,8 +44,10 @@
   name: copper mace ball
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperMace
@@ -53,8 +58,10 @@
   name: mithril mace ball
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilMace

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml

@@ -17,8 +17,9 @@
   name: iron pickaxe head
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronPickaxe
@@ -29,8 +30,10 @@
   name: golden pickaxe head
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldPickaxe
@@ -41,8 +44,10 @@
   name: copper pickaxe head
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperPickaxe
@@ -53,8 +58,10 @@
   name: mithril pickaxe head
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilPickaxe

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml

@@ -17,8 +17,9 @@
   name: iron rapier blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronRapier
@@ -29,8 +30,10 @@
   name: golden rapier blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldRapier
@@ -41,8 +44,10 @@
   name: copper rapier blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperRapier
@@ -53,8 +58,10 @@
   name: mithril rapier blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilRapier

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml

@@ -17,8 +17,9 @@
   name: iron shovel blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronShovel
@@ -29,8 +30,10 @@
   name: golden shovel blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldShovel
@@ -41,8 +44,10 @@
   name: copper shovel blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperShovel
@@ -53,8 +58,10 @@
   name: mithril shovel blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilShovel

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml

@@ -17,8 +17,9 @@
   name: iron sickle blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronSickle
@@ -29,8 +30,10 @@
   name: copper sickle blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSickle
@@ -41,8 +44,10 @@
   name: golden sickle blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSickle
@@ -53,8 +58,10 @@
   name: mithril sickle blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSickle

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml

@@ -0,0 +1,71 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularBladeSpearBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: Hiltless spearhead. A blacksmith can use it as a spare part to create a weapon.
+  components:
+  - type: Item
+    storedRotation: 45
+    shape:
+    - 0,0,0,0
+    storedOffset: 0, 5
+
+- type: entity
+  parent: CP14ModularBladeSpearBase
+  id: CP14ModularBladeIronSpear
+  categories: [ ForkFiltered ]
+  name: iron spearhead
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+    layers:
+    - state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeIronSpear
+
+- type: entity
+  parent: CP14ModularBladeSpearBase
+  id: CP14ModularBladeGoldSpear
+  categories: [ ForkFiltered ]
+  name: gold spearhead
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeGoldSpear
+
+- type: entity
+  parent: CP14ModularBladeSpearBase
+  id: CP14ModularBladeCopperSpear
+  categories: [ ForkFiltered ]
+  name: copper spearhead
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeCopperSpear
+
+- type: entity
+  parent: CP14ModularBladeSpearBase
+  id: CP14ModularBladeMithrilSpear
+  categories: [ ForkFiltered ]
+  name: mithril spearhead
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeMithrilSpear

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml

@@ -17,7 +17,7 @@
   name: iron sword blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
     state: icon
   - type: CP14ModularCraftPart
     possibleParts:
@@ -29,8 +29,10 @@
   name: golden sword blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSword
@@ -41,8 +43,10 @@
   name: copper sword blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSword
@@ -53,8 +57,10 @@
   name: mithril sword blade
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSword

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml

@@ -11,19 +11,6 @@
     - 0,0,0,0
     storedOffset: 0, 5
 
-- type: entity
-  parent: CP14ModularGardeBase
-  id: CP14ModularGardeSharpGold
-  categories: [ ForkFiltered ]
-  name: sharp gold garde
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - GardeSharpGold
-
 - type: entity
   parent: CP14ModularGardeBase
   id: CP14ModularGardeSharpIron
@@ -31,12 +18,28 @@
   name: sharp iron garde
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpIron
 
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSharpGold
+  categories: [ ForkFiltered ]
+  name: sharp gold garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSharpGold
+
 - type: entity
   parent: CP14ModularGardeBase
   id: CP14ModularGardeSharpCopper
@@ -44,8 +47,10 @@
   name: sharp copper garde
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpCopper
@@ -57,8 +62,10 @@
   name: sharp mithril garde
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Garde/mithril_sharp.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpMithril

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml

@@ -0,0 +1,58 @@
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSturdyIron
+  categories: [ ForkFiltered ]
+  name: sturdy iron garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+    layers:
+    - state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSturdyIron
+
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSturdyGold
+  categories: [ ForkFiltered ]
+  name: sturdy gold garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSturdyGold
+
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSturdyCopper
+  categories: [ ForkFiltered ]
+  name: sturdy copper garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSturdyCopper
+
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSturdyMithril
+  categories: [ ForkFiltered ]
+  name: sturdy mithril garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSturdyMithril

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

@@ -1,33 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeIronSpear
-  categories: [ ForkFiltered ]
-  name: iron spearhead
-  description: Hiltless spearhead. A blacksmith can use it as a spare part to create a weapon.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/iron_spear.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronSpear
-
-#- type: entity
-#  parent: BaseItem
-#  id: CP14ModularBladeIronSwordTwoHanded
-#  categories: [ ForkFiltered ]
-#  name: iron two-handed sword blade
-#  description: A two-handed sword blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-#  components:
-#  - type: Sprite
-#    sprite: _CP14/Objects/ModularTools/blade48.rsi
-#    layers:
-#    - state: iron_sword_twohanded
-#  - type: CP14ModularCraftPart
-#    possibleParts:
-#    - BladeIronSwordTwoHanded

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

@@ -111,7 +111,10 @@
   name: lucens grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/lucens_grip.rsi
+    sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi
+    layers:
+    - state: icon
+      color: "#0398fc"
     state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripLucens
@@ -134,8 +137,9 @@
   name: iron grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/iron_grip.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+    layers:
+    - state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripIron
   - type: Destructible
@@ -151,37 +155,16 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
-- type: entity
-  parent: CP14ModularGripShort
-  id: CP14ModularGripMithril
-  name: mithril grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/mithril_grip.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripMithril
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 120 #x2.4 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
 - type: entity
   parent: CP14ModularGripShort
   id: CP14ModularGripGolden
   name: golden grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/gold_grip.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripGolden
   - type: Destructible
@@ -203,8 +186,10 @@
   name: copper grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/Grip/copper_grip.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripCopper
   - type: Destructible
@@ -220,6 +205,31 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
+- type: entity
+  parent: CP14ModularGripShort
+  id: CP14ModularGripMithril
+  name: mithril grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripMithril
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120 #x2.4 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
 # Long
 - type: entity
   parent: CP14ModularGripLong
@@ -250,8 +260,10 @@
   name: long lucens grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/lucens_grip_long.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi
+    layers:
+    - state: icon
+      color: "#0398fc"
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripLucensLong
   - type: Destructible
@@ -273,7 +285,7 @@
   name: long iron grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi
+    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
     state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripIronLong
@@ -290,29 +302,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
 
-- type: entity
-  parent: CP14ModularGripLong
-  id: CP14ModularGripMithrilLong
-  name: long mithril grip
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/mithril_grip_long.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripMithrilLong
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 120 #x2.4 durability
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-
 - type: entity
   parent: CP14ModularGripIronLong
   id: CP14ModularGripIronLongGuard
@@ -329,8 +318,10 @@
   name: long golden grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+    layers:
+    - state: icon
+      color: "#ffaf47"
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripGoldLong
   - type: Destructible
@@ -352,8 +343,10 @@
   name: long copper grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi
-    state: icon
+    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+    layers:
+    - state: icon
+      color: "#bd712f"
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripCopperLong
   - type: Destructible
@@ -368,3 +361,29 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+
+
+- type: entity
+  parent: CP14ModularGripLong
+  id: CP14ModularGripMithrilLong
+  name: long mithril grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi
+    layers:
+    - state: icon
+      color: "#45d2a4"
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripMithrilLong
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120 #x2.4 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/iron_spear.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:
@@ -22,7 +22,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/iron_spear.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:
@@ -22,9 +22,9 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
       state: icon
-    - sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+    - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml

@@ -31,42 +31,45 @@
   id: BladeIronAxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronAxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/iron_axe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeAxe
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldAxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldAxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/gold_axe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeAxe
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperAxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperAxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/copper_axe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeAxe
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilAxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilAxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/mithril_axe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeAxe
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml

@@ -0,0 +1,47 @@
+- type: modularPart
+  id: BaseBladeBone
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 2
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 3
+  - !type:EditMeleeWeapon
+    damageMultiplier: 0.75
+  - !type:EditIncreaseDamageOnWield
+    damageMultiplier: 0.75
+
+- type: modularPart
+  id: BaseBladeIron
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 1
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 1
+
+- type: modularPart
+  id: BaseBladeCopper
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 1.5
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 1.5
+
+- type: modularPart
+  id: BaseBladeGold
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 2
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 3
+
+- type: modularPart
+  id: BaseBladeMithril
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 1
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 1
+  - !type:EditMeleeWeapon
+    damageMultiplier: 1.25
+  - !type:EditIncreaseDamageOnWield
+    damageMultiplier: 1.25

Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml

@@ -36,42 +36,45 @@
   id: BladeIronDagger
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronDagger
-  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeDagger
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldDagger
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldDagger
-  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeDagger
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperDagger
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperDagger
-  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeDagger
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilDagger
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilDagger
-  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/mithril_dagger.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeDagger
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml

@@ -29,42 +29,45 @@
   id: BladeIronMace
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronMace
-  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/iron_mace.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeMace
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldMace
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldMace
-  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/gold_mace.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeMace
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperMace
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperMace
-  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/copper_mace.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeMace
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilMace
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilMace
-  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/mithril_mace.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeMace
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml

@@ -24,42 +24,45 @@
   id: BladeIronPickaxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronPickaxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladePickaxe
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldPickaxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldPickaxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladePickaxe
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperPickaxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperPickaxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladePickaxe
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilPickaxe
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilPickaxe
-  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/mithril_pickaxe.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladePickaxe
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml

@@ -39,42 +39,45 @@
   id: BladeIronRapier
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronRapier
-  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeRapier
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldRapier
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldRapier
-  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeRapier
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperRapier
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperRapier
-  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeRapier
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilRapier
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilRapier
-  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/mithril_rapier.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeRapier
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml

@@ -35,42 +35,45 @@
   id: BladeIronShovel
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronShovel
-  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeShovel
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldShovel
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldShovel
-  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/gold_shovel.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeShovel
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperShovel
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperShovel
-  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/copper_shovel.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeShovel
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilShovel
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilShovel
-  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/mithril_shovel.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeShovel
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml

@@ -27,42 +27,45 @@
   id: BladeIronSickle
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronSickle
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSickle
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldSickle
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronSickle
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSickle
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperSickle
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperSickle
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/copper_sickle.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSickle
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilSickle
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilSickle
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/mithril_sickle.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSickle
-    - BaseWeaponMithril
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml

@@ -0,0 +1,85 @@
+#Concept:
+# + High Throwable damage
+#   Piercing animation
+# - Low Melee Damage
+
+- type: modularPart
+  id: BaseBladeSpear
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseWeaponThrowable
+    - BaseWeaponChemical
+    - BaseWeaponSharp
+  - !type:AddComponents
+    override: true
+    components:
+    - type: DamageOtherOnHit
+      damage:
+        types:
+          Piercing: 15
+    - type: ThrowingAngle
+      angle: 135
+    - type: EmbeddableProjectile
+      offset: -0.15,-0.15
+      removalTime: 1.5
+  - !type:EditMeleeWeapon
+    newWideAnimation: CP14WeaponArcThrust
+    angleMultiplier: 0
+    bonusDamage:
+      types:
+        Piercing: 7
+  - !type:EditItem
+    newSize: Normal
+    adjustShape: 0, 1
+    storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
+
+- type: modularPart
+  id: BladeIronSpear
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronSpear
+  rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSpear
+    - BaseBladeIron
+
+- type: modularPart
+  id: BladeGoldSpear
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeGoldSpear
+  rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+  color: "#ffaf47"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSpear
+    - BaseBladeGold
+
+- type: modularPart
+  id: BladeCopperSpear
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeCopperSpear
+  rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+  color: "#bd712f"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSpear
+    - BaseBladeCopper
+
+- type: modularPart
+  id: BladeMithrilSpear
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeMithrilSpear
+  rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi
+  color: "#45d2a4"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSpear
+    - BaseBladeMithril

Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml

@@ -41,45 +41,48 @@
   id: BladeIronSword
   targetSlot: Blade
   sourcePart: CP14ModularBladeIronSword
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/iron_sword.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSword
-    - BaseWeaponIron
+    - BaseBladeIron
 
 - type: modularPart
   id: BladeGoldSword
   targetSlot: Blade
   sourcePart: CP14ModularBladeGoldSword
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/gold_sword.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSword
-    - BaseWeaponGold
+    - BaseBladeGold
 
 - type: modularPart
   id: BladeCopperSword
   targetSlot: Blade
   sourcePart: CP14ModularBladeCopperSword
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/copper_sword.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSword
-    - BaseWeaponCopper
+    - BaseBladeCopper
 
 - type: modularPart
   id: BladeMithrilSword
   targetSlot: Blade
   sourcePart: CP14ModularBladeMithrilSword
-  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/mithril_sword.rsi
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseBladeSword
-    - BaseWeaponMithril
+    - BaseBladeMithril
 
 - type: modularPart
   id: BladeBoneSword
@@ -90,18 +93,4 @@
   - !type:Inherit
     copyFrom:
     - BaseBladeSword
-  - !type:EditMeleeWeapon
-    bonusDamage:
-      types:
-        Slash: -4
-        Piercing: -3
-        Blunt: 2
-  - !type:EditIncreaseDamageOnWield
-    bonusDamage:
-      types:
-        Slash: -3
-        Piercing: -2
-  - !type:EditDamageableModifier
-    multiplier: 2.5
-  - !type:EditSharpened
-    sharpnessDamageMultiplier: 3
+    - BaseBladeBone

Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml

@@ -5,50 +5,49 @@
   id: BaseGardeSharp
   modifiers:
   - !type:EditMeleeWeapon
-    bonusDamage:
-      types:
-        Piercing: 3
-
-- type: modularPart
-  id: GardeSharpGold
-  targetSlot: Garde
-  sourcePart: CP14ModularGardeSharpGold
-  rsiPath: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi
-  modifiers:
-  - !type:Inherit
-    copyFrom:
-    - BaseGardeSharp
-    - BaseWeaponGold
+    damageMultiplier: 1.2
+  - !type:EditIncreaseDamageOnWield
+    damageMultiplier: 1.2
 
 - type: modularPart
   id: GardeSharpIron
   targetSlot: Garde
   sourcePart: CP14ModularGardeSharpIron
-  rsiPath: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSharp
+
+- type: modularPart
+  id: GardeSharpGold
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSharpGold
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+  color: "#ffaf47"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseGardeSharp
-    - BaseWeaponIron
 
 - type: modularPart
   id: GardeSharpCopper
   targetSlot: Garde
   sourcePart: CP14ModularGardeSharpCopper
-  rsiPath: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+  color: "#bd712f"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseGardeSharp
-    - BaseWeaponCopper
 
 - type: modularPart
   id: GardeSharpMithril
   targetSlot: Garde
   sourcePart: CP14ModularGardeSharpMithril
-  rsiPath: _CP14/Objects/ModularTools/Garde/mithril_sharp.rsi
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi
+  color: "#45d2a4"
   modifiers:
   - !type:Inherit
     copyFrom:
     - BaseGardeSharp
-    - BaseWeaponMithril

Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml

@@ -0,0 +1,53 @@
+# Concept
+# + Durability
+
+- type: modularPart
+  id: BaseGardeSturdy
+  modifiers:
+  - !type:EditDamageableModifier
+    multiplier: 0.8
+  - !type:EditSharpened
+    sharpnessDamageMultiplier: 0.8
+
+- type: modularPart
+  id: GardeSturdyIron
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSturdyIron
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSturdy
+
+- type: modularPart
+  id: GardeSturdyGold
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSturdyGold
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+  color: "#ffaf47"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSturdy
+
+- type: modularPart
+  id: GardeSturdyCopper
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSturdyCopper
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+  color: "#bd712f"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSturdy
+
+- type: modularPart
+  id: GardeSturdyMithril
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSturdyMithril
+  rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi
+  color: "#45d2a4"
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSturdy

Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml

@@ -65,36 +65,4 @@
     - type: Utensil
       types:
         - Knife
-    - type: CP14WallpaperRemover
-
-- type: modularPart
-  id: BaseWeaponIron
-  modifiers:
-  - !type:EditDamageableModifier
-    multiplier: 1
-  - !type:EditSharpened
-    sharpnessDamageMultiplier: 1
-
-- type: modularPart
-  id: BaseWeaponCopper
-  modifiers:
-  - !type:EditDamageableModifier
-    multiplier: 1.5
-  - !type:EditSharpened
-    sharpnessDamageMultiplier: 1.5
-
-- type: modularPart
-  id: BaseWeaponGold
-  modifiers:
-  - !type:EditDamageableModifier
-    multiplier: 2
-  - !type:EditSharpened
-    sharpnessDamageMultiplier: 3
-
-- type: modularPart
-  id: BaseWeaponMithril
-  modifiers:
-  - !type:EditDamageableModifier
-    multiplier: 1
-  - !type:EditSharpened
-    sharpnessDamageMultiplier: 1
+    - type: CP14WallpaperRemover

Resources/Prototypes/_CP14/ModularCraft/blade.yml

@@ -1,40 +0,0 @@
-#Concept:
-# + High Throwable damage
-#   Piercing animation
-# - Low Melee Damage
-- type: modularPart
-  id: BladeIronSpear
-  targetSlot: Blade
-  sourcePart: CP14ModularBladeIronSpear
-  rsiPath: _CP14/Objects/ModularTools/iron_spear.rsi
-  modifiers:
-  - !type:Inherit
-    copyFrom:
-    - BaseWeaponThrowable
-    - BaseWeaponChemical
-    - BaseWeaponSharp
-  - !type:AddComponents
-    override: true
-    components:
-    - type: DamageOtherOnHit
-      damage:
-        types:
-          Piercing: 15
-    - type: ThrowingAngle
-      angle: 135
-    - type: EmbeddableProjectile
-      offset: -0.15,-0.15
-      removalTime: 1.5
-  - !type:EditMeleeWeapon
-    newWideAnimation: CP14WeaponArcThrust
-    angleMultiplier: 0
-    bonusDamage:
-      types:
-        Piercing: 7
-  - !type:EditItem
-    newSize: Normal
-    adjustShape: 0, 1
-    storedOffsetBonus: 0, 5
-  - !type:EditModularSlots
-    addSlots:
-    - Garde

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

@@ -105,6 +105,16 @@
     CP14CopperBar: 1
   result: CP14Crossbolt
 
+- type: CP14Recipe
+  id: CP14BaseLockpick
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14IronBar: 1
+  result: CP14BaseLockpick
+
+# Dagger
+
 - type: CP14Recipe
   id: CP14ModularBladeIronDagger
   tag: CP14RecipeAnvil
@@ -113,6 +123,32 @@
     CP14IronBar: 1
   result: CP14ModularBladeIronDagger
 
+- type: CP14Recipe
+  id: CP14ModularBladeGoldDagger
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularBladeGoldDagger
+
+- type: CP14Recipe
+  id: CP14ModularBladeCopperDagger
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 1
+  result: CP14ModularBladeCopperDagger
+
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilDagger
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilDagger
+
+# Spear
+
 - type: CP14Recipe
   id: CP14ModularBladeIronSpear
   tag: CP14RecipeAnvil
@@ -121,6 +157,32 @@
     CP14IronBar: 1
   result: CP14ModularBladeIronSpear
 
+- type: CP14Recipe
+  id: CP14ModularBladeCopperSpear
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14CopperBar: 1
+  result: CP14ModularBladeCopperSpear
+
+- type: CP14Recipe
+  id: CP14ModularBladeGoldSpear
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularBladeGoldSpear
+
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilSpear
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilSpear
+
+# Mace
+
 - type: CP14Recipe
   id: CP14ModularBladeIronMace
   tag: CP14RecipeAnvil
@@ -145,6 +207,16 @@
     CP14CopperBar: 1
   result: CP14ModularBladeCopperMace
 
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilMace
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilMace
+
+# Sword
+
 - type: CP14Recipe
   id: CP14ModularBladeIronSword
   tag: CP14RecipeAnvil
@@ -169,6 +241,16 @@
     CP14CopperBar: 2
   result: CP14ModularBladeCopperSword
 
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilSword
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14MithrilBar: 2
+  result: CP14ModularBladeMithrilSword
+
+# Sickle
+
 - type: CP14Recipe
   id: CP14ModularBladeIronSickle
   tag: CP14RecipeAnvil
@@ -193,6 +275,16 @@
     CP14GoldBar: 1
   result: CP14ModularBladeGoldSickle
 
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilSickle
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilSickle
+
+# Shovel
+
 - type: CP14Recipe
   id: CP14ModularBladeIronShovel
   tag: CP14RecipeAnvil
@@ -218,6 +310,16 @@
     CP14CopperBar: 1
   result: CP14ModularBladeCopperShovel
 
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilShovel
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilShovel
+
+# Pickaxe
+
 - type: CP14Recipe
   id: CP14ModularBladeIronPickaxe
   tag: CP14RecipeAnvil
@@ -226,6 +328,32 @@
     CP14IronBar: 1
   result: CP14ModularBladeIronPickaxe
 
+- type: CP14Recipe
+  id: CP14ModularBladeGoldPickaxe
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 2
+  result: CP14ModularBladeGoldPickaxe
+
+- type: CP14Recipe
+  id: CP14ModularBladeCopperPickaxe
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 2
+  result: CP14ModularBladeCopperPickaxe
+
+- type: CP14Recipe
+  id: CP14ModularBladeMithrilPickaxe
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilPickaxe
+
+# Grip
+
 - type: CP14Recipe
   id: CP14ModularGripIron
   tag: CP14RecipeAnvil
@@ -234,6 +362,32 @@
     CP14IronBar: 1
   result: CP14ModularGripIron
 
+- type: CP14Recipe
+  id: CP14ModularGripCopper
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 1
+  result: CP14ModularGripCopper
+
+- type: CP14Recipe
+  id: CP14ModularGripGolden
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularGripGolden
+
+- type: CP14Recipe
+  id: CP14ModularGripMithril
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14MithrilBar: 1
+  result: CP14ModularGripMithril
+
+# Grip long
+
 - type: CP14Recipe
   id: CP14ModularGripIronLong
   tag: CP14RecipeAnvil
@@ -259,76 +413,14 @@
   result: CP14ModularGripGoldLong
 
 - type: CP14Recipe
-  id: CP14ModularGripCopper
+  id: CP14ModularGripMithrilLong
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
-    CP14CopperBar: 1
-  result: CP14ModularGripCopper
+    CP14MithrilBar: 2
+  result: CP14ModularGripMithrilLong
 
-- type: CP14Recipe
-  id: CP14ModularGripGolden
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 1
-  result: CP14ModularGripGolden
-
-- type: CP14Recipe
-  id: CP14ModularBladeGoldPickaxe
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 2
-  result: CP14ModularBladeGoldPickaxe
-
-- type: CP14Recipe
-  id: CP14ModularBladeCopperPickaxe
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 2
-  result: CP14ModularBladeCopperPickaxe
-
-- type: CP14Recipe
-  id: CP14ModularBladeGoldDagger
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 1
-  result: CP14ModularBladeGoldDagger
-
-- type: CP14Recipe
-  id: CP14ModularBladeCopperDagger
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 1
-  result: CP14ModularBladeCopperDagger
-
-- type: CP14Recipe
-  id: CP14ModularGardeSharpCopper
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14CopperBar: 1
-  result: CP14ModularGardeSharpCopper
-
-- type: CP14Recipe
-  id: CP14ModularGardeSharpIron
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14IronBar: 1
-  result: CP14ModularGardeSharpIron
-
-- type: CP14Recipe
-  id: CP14ModularGardeSharpGold
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14GoldBar: 1
-  result: CP14ModularGardeSharpGold
+# Rapier
 
 - type: CP14Recipe
   id: CP14ModularBladeIronRapier
@@ -355,12 +447,14 @@
   result: CP14ModularBladeCopperRapier
 
 - type: CP14Recipe
-  id: CP14BaseLockpick
+  id: CP14ModularBladeMithrilRapier
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
-    CP14IronBar: 1
-  result: CP14BaseLockpick
+    CP14MithrilBar: 1
+  result: CP14ModularBladeMithrilRapier
+
+# Axe
 
 - type: CP14Recipe
   id: CP14ModularBladeIronAxe
@@ -386,71 +480,39 @@
     CP14GoldBar: 2
   result: CP14ModularBladeGoldAxe
 
-## mithril
-
 - type: CP14Recipe
-  id: CP14ModularBladeMithrilDagger
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilDagger
-
-- type: CP14Recipe
-  id: CP14ModularBladeMithrilMace
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilMace
-
-- type: CP14Recipe
-  id: CP14ModularBladeMithrilSword
+  id: CP14ModularBladeMithrilAxe
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14MithrilBar: 2
-  result: CP14ModularBladeMithrilSword
+  result: CP14ModularBladeMithrilAxe
+
+# Sharp garde
 
 - type: CP14Recipe
-  id: CP14ModularBladeMithrilSickle
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilSickle
-
-- type: CP14Recipe
-  id: CP14ModularBladeMithrilShovel
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilShovel
-
-- type: CP14Recipe
-  id: CP14ModularBladeMithrilPickaxe
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilPickaxe
-
-- type: CP14Recipe
-  id: CP14ModularGripMithril
-  tag: CP14RecipeAnvil
-  craftTime: 2
-  stacks:
-    CP14MithrilBar: 1
-  result: CP14ModularGripMithril
-
-- type: CP14Recipe
-  id: CP14ModularGripMithrilLong
+  id: CP14ModularGardeSharpCopper
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
-    CP14MithrilBar: 2
-  result: CP14ModularGripMithrilLong
+    CP14CopperBar: 1
+  result: CP14ModularGardeSharpCopper
+
+- type: CP14Recipe
+  id: CP14ModularGardeSharpIron
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14IronBar: 1
+  result: CP14ModularGardeSharpIron
+
+- type: CP14Recipe
+  id: CP14ModularGardeSharpGold
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularGardeSharpGold
 
 - type: CP14Recipe
   id: CP14ModularGardeSharpMithril
@@ -460,18 +522,36 @@
     CP14MithrilBar: 1
   result: CP14ModularGardeSharpMithril
 
+# Sturdy garde
+
 - type: CP14Recipe
-  id: CP14ModularBladeMithrilRapier
+  id: CP14ModularGardeSturdyCopper
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 1
+  result: CP14ModularGardeSturdyCopper
+
+- type: CP14Recipe
+  id: CP14ModularGardeSturdyIron
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14IronBar: 1
+  result: CP14ModularGardeSturdyIron
+
+- type: CP14Recipe
+  id: CP14ModularGardeSturdyGold
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularGardeSturdyGold
+
+- type: CP14Recipe
+  id: CP14ModularGardeSturdyMithril
   tag: CP14RecipeAnvil
   craftTime: 4
   stacks:
     CP14MithrilBar: 1
-  result: CP14ModularBladeMithrilRapier
-
-- type: CP14Recipe
-  id: CP14ModularBladeMithrilAxe
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  stacks:
-    CP14MithrilBar: 2
-  result: CP14ModularBladeMithrilAxe
+  result: CP14ModularGardeSturdyMithril

Resources/Prototypes/_CP14/tools.yml

@@ -3,7 +3,7 @@
   name: cp14-tool-quality-digging-name
   toolName: cp14-tool-quality-digging-tool-name
   spawn: CP14ModularIronShovel
-  icon: { sprite: _CP14/Objects/ModularTools/Blade/Shovel/iron_shovel.rsi, state: tool}
+  icon: { sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi, state: tool}
 
 - type:  tool
   id: CP14Hammering