Merge branch 'master' into MagicWands

Content.Server/_CP14/ModularCraft/CP14ModularCraftSystem.cs

@@ -126,7 +126,6 @@ public sealed class CP14ModularCraftSystem : CP14SharedModularCraftSystem
         start.Comp.InstalledParts.Add(partProto);
 
         var indexedPart = _proto.Index(partProto);
-        start.Comp.FreeSlots.AddRange(indexedPart.AddSlots);
 
         foreach (var modifier in indexedPart.Modifiers)
         {

Content.Server/_CP14/ModularCraft/Modifiers/EditDamageableModifier.cs

@@ -11,8 +11,7 @@ public sealed partial class EditDamageableModifier : CP14ModularCraftModifier
 
     public override void Effect(EntityManager entManager, Entity<CP14ModularCraftStartPointComponent> start, Entity<CP14ModularCraftPartComponent>? part)
     {
-        if (!entManager.TryGetComponent<CP14DamageableModifierComponent>(start, out var damageable))
-            return;
+        var damageable = entManager.EnsureComponent<CP14DamageableModifierComponent>(start);
 
         damageable.Modifier *= Multiplier;
         entManager.Dirty(start);

Content.Server/_CP14/ModularCraft/Modifiers/EditModularSlots.cs

@@ -0,0 +1,25 @@
+using Content.Shared._CP14.ModularCraft;
+using Content.Shared._CP14.ModularCraft.Components;
+using Content.Shared._CP14.ModularCraft.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._CP14.ModularCraft.Modifiers;
+
+public sealed partial class EditModularSlots : CP14ModularCraftModifier
+{
+    [DataField]
+    public HashSet<ProtoId<CP14ModularCraftSlotPrototype>> AddSlots = new();
+
+    [DataField]
+    public HashSet<ProtoId<CP14ModularCraftSlotPrototype>> RemoveSlots = new();
+
+    public override void Effect(EntityManager entManager, Entity<CP14ModularCraftStartPointComponent> start, Entity<CP14ModularCraftPartComponent>? part)
+    {
+        start.Comp.FreeSlots.AddRange(AddSlots);
+        foreach (var slot in RemoveSlots)
+        {
+            if (start.Comp.FreeSlots.Contains(slot))
+                start.Comp.FreeSlots.Remove(slot);
+        }
+    }
+}

Content.Server/_CP14/ModularCraft/Modifiers/EditSharpened.cs

@@ -0,0 +1,18 @@
+using Content.Shared._CP14.MeleeWeapon.Components;
+using Content.Shared._CP14.ModularCraft;
+using Content.Shared._CP14.ModularCraft.Components;
+
+namespace Content.Server._CP14.ModularCraft.Modifiers;
+
+public sealed partial class EditSharpened : CP14ModularCraftModifier
+{
+    [DataField]
+    public float SharpnessDamageMultiplier = 1f;
+    public override void Effect(EntityManager entManager, Entity<CP14ModularCraftStartPointComponent> start, Entity<CP14ModularCraftPartComponent>? part)
+    {
+        if (!entManager.TryGetComponent<CP14SharpenedComponent>(start, out var sharpened))
+            return;
+
+        sharpened.SharpnessDamageBy1Damage *= SharpnessDamageMultiplier;
+    }
+}

Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs

@@ -6,7 +6,7 @@ namespace Content.Shared._CP14.MeleeWeapon.Components;
 /// <summary>
 /// allows the object to become blunt with use
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(CP14SharpeningSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class CP14SharpenedComponent : Component
 {
     [DataField, AutoNetworkedField]

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

@@ -25,9 +25,6 @@ public sealed partial class CP14ModularCraftPartPrototype : IPrototype
     [DataField(serverOnly: true)]
     public List<CP14ModularCraftModifier> Modifiers = new();
 
-    [DataField]
-    public HashSet<ProtoId<CP14ModularCraftSlotPrototype>> AddSlots = new();
-
     [DataField]
     public string? RsiPath;
 

Resources/Locale/en-US/_CP14/modularCraft/modularCraft.ftl

@@ -0,0 +1,3 @@
+verb-categories-modular-craft = Forging
+
+cp14-modular-craft-add-part-verb-text = Attach as {$slot}

Resources/Locale/en-US/_CP14/modularCraft/slots.ftl

@@ -0,0 +1,2 @@
+cp14-modular-slot-blade = blade
+cp14-modular-slot-garde = garde

Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl

@@ -2,3 +2,4 @@ cp14-modular-slot-blade = лезвие
 cp14-modular-slot-jewerly1 = украшение (1)
 cp14-modular-slot-magic-crystal = магический кристалл
 cp14-modular-slot-magic-crystal-holder = держатель магических кристаллов
+cp14-modular-slot-garde = гарда

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

@@ -0,0 +1,48 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularBladeDaggerBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: A dagger blade without a hilt. 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: CP14ModularBladeDaggerBase
+  id: CP14ModularBladeIronDagger
+  name: iron dagger blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeIronDagger
+
+- type: entity
+  parent: CP14ModularBladeDaggerBase
+  id: CP14ModularBladeGoldDagger
+  name: golden dagger blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeGoldDagger
+
+- type: entity
+  parent: CP14ModularBladeDaggerBase
+  id: CP14ModularBladeCopperDagger
+  name: copper dagger blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeCopperDagger

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

@@ -0,0 +1,51 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularBladePickaxeBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: A pickaxe head without a hilt. A blacksmith can use it as a spare part to create a tool.
+  components:
+  - type: Item
+    storedRotation: 45
+    shape:
+    - 0,0,1,0
+    storedOffset: 0, 5
+
+- type: entity
+  parent: CP14ModularBladePickaxeBase
+  id: CP14ModularBladeIronPickaxe
+  categories: [ ForkFiltered ]
+  name: iron pickaxe head
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeIronPickaxe
+
+- type: entity
+  parent: CP14ModularBladePickaxeBase
+  id: CP14ModularBladeGoldPickaxe
+  categories: [ ForkFiltered ]
+  name: golden pickaxe head
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeGoldPickaxe
+
+- type: entity
+  parent: CP14ModularBladePickaxeBase
+  id: CP14ModularBladeCopperPickaxe
+  categories: [ ForkFiltered ]
+  name: copper pickaxe head
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeCopperPickaxe

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

@@ -0,0 +1,51 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularBladeRapierBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: A rapier blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
+  components:
+  - type: Item
+    storedRotation: 45
+    shape:
+    - 0,0,0,1
+    storedOffset: 0, 10
+
+- type: entity
+  parent: CP14ModularBladeRapierBase
+  id: CP14ModularBladeIronRapier
+  categories: [ ForkFiltered ]
+  name: iron rapier blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeIronRapier
+
+- type: entity
+  parent: CP14ModularBladeRapierBase
+  id: CP14ModularBladeGoldRapier
+  categories: [ ForkFiltered ]
+  name: golden rapier blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeGoldRapier
+
+- type: entity
+  parent: CP14ModularBladeRapierBase
+  id: CP14ModularBladeCopperRapier
+  categories: [ ForkFiltered ]
+  name: copper rapier blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeCopperRapier

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

@@ -0,0 +1,51 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularGardeBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: Garde? Garde!
+  components:
+  - type: Item
+    storedRotation: 45
+    shape:
+    - 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
+  categories: [ ForkFiltered ]
+  name: sharp iron garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSharpIron
+
+- type: entity
+  parent: CP14ModularGardeBase
+  id: CP14ModularGardeSharpCopper
+  categories: [ ForkFiltered ]
+  name: sharp copper garde
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - GardeSharpCopper

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

@@ -1,22 +1,3 @@
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeIronDagger
-  categories: [ ForkFiltered ]
-  name: iron dagger blade
-  description: A dagger blade without a hilt. 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_dagger.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronDagger
-
 - type: entity
   parent: BaseItem
   id: CP14ModularBladeIronSpear
@@ -112,25 +93,6 @@
     possibleParts:
     - BladeIronShovel
 
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeIronPickaxe
-  categories: [ ForkFiltered ]
-  name: iron pickaxe head
-  description: A pickaxe head without a hilt. A blacksmith can use it as a spare part to create a tool.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,1,0
-    storedOffset: 0, 5
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/iron_pickaxe.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronPickaxe
-
 #- type: entity
 #  parent: BaseItem
 #  id: CP14ModularBladeIronSwordTwoHanded

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

@@ -34,33 +34,17 @@
 
 - type: entity
   parent: CP14ModularGripBase
-  id: CP14ModularGripWooden
-  name: wooden grip
-  description: A short wooden handle for a weapon or tool. The cheapest and most unstable material.
+  id: CP14ModularGripShort
+  abstract: true
+  description: A short handle for a weapon or tool.
   components:
+  - type: CP14ModularCraftStartPoint
+    startSlots:
+    - Blade
   - type: Item
     shape:
     - 0,0,0,0
     storedOffset: 0, -5
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/wooden_grip.rsi
-    state: icon
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWooden
-    startSlots:
-    - Blade
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
   - type: MeleeWeapon
     resetOnHandSelected: false #Fast swap
     range: 1.0 # 1.5 standart
@@ -72,21 +56,42 @@
 
 - type: entity
   parent: CP14ModularGripBase
-  id: CP14ModularGripWoodenLong
-  name: long wooden grip
-  description: long, two-handed wooden handle for heavy weapons or large tools.
+  id: CP14ModularGripLong
+  abstract: true
+  description: long, two-handed handle for heavy weapons or large tools.
   components:
+  - type: CP14ModularCraftStartPoint
+    startSlots:
+    - Blade
   - type: Item
     shape:
     - 0,0,0,1
     storedOffset: 0, -15
+  - type: MeleeWeapon
+    resetOnHandSelected: true
+    range: 1.5 # 1.5 standart
+    attackRate: 0.7 # 1 standart
+    cPAnimationOffset: -1
+  - type: Clothing
+    slots:
+    - neck
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 0
+
+# Shorts
+- type: entity
+  parent: CP14ModularGripShort
+  id: CP14ModularGripWooden
+  name: wooden grip
+  components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/wooden_grip_long.rsi
+    sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi
     state: icon
   - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularGripWoodenLong
-    startSlots:
-    - Blade
+    startProtoPart: CP14ModularGripWooden
   - type: Destructible
     thresholds:
     - trigger:
@@ -99,28 +104,15 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: MeleeWeapon
-    resetOnHandSelected: true
-    range: 1.5 # 1.5 standart
-    attackRate: 0.7 # 1 standart
-    cPAnimationOffset: -1
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 0
-  - type: Clothing
-    slots:
-    - neck
-
+        
 - type: entity
-  parent: CP14ModularGripWooden
+  parent: CP14ModularGripShort
   id: CP14ModularGripIron
   name: iron grip
-  description: A short iron handle for a weapon or tool.
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/iron_grip.rsi
+    sprite: _CP14/Objects/ModularTools/Grip/iron_grip.rsi
+    state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripIron
   - type: Destructible
@@ -137,13 +129,83 @@
         acts: ["Destruction"]
 
 - type: entity
-  parent: CP14ModularGripWoodenLong
-  id: CP14ModularGripIronLong
-  name: long iron grip
-  description: long, two-handed iron handle for heavy weapons or large tools.
+  parent: CP14ModularGripShort
+  id: CP14ModularGripGolden
+  name: golden grip
   components:
   - type: Sprite
-    sprite: _CP14/Objects/ModularTools/iron_grip_long.rsi
+    sprite: _CP14/Objects/ModularTools/Grip/gold_grip.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripGolden
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 20 #~x0.3 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: CP14ModularGripShort
+  id: CP14ModularGripCopper
+  name: copper grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Grip/copper_grip.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripCopper
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70 #~x0.66 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+# Long
+- type: entity
+  parent: CP14ModularGripLong
+  id: CP14ModularGripWoodenLong
+  name: long wooden grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripWoodenLong
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: CP14ModularGripLong
+  id: CP14ModularGripIronLong
+  name: long iron grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi
+    state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripIronLong
   - type: Destructible
@@ -156,5 +218,51 @@
         sound:
           collection: MetalBreak
       - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: CP14ModularGripLong
+  id: CP14ModularGripGoldLong
+  name: long golden grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripGoldLong
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 40 #~x0.3 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  parent: CP14ModularGripLong
+  id: CP14ModularGripCopperLong
+  name: long copper grip
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi
+    state: icon
+  - type: CP14ModularCraftStartPoint
+    startProtoPart: CP14ModularGripCopperLong
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70 #~x0.66 durability
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]

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

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/iron_dagger.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.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/iron_pickaxe.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

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

@@ -0,0 +1,66 @@
+#Concept:
+# + Fast attackRate
+#   fast swing
+# - Low damage
+
+- type: modularPart
+  id: BaseBladeDagger
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseWeaponThrowable
+    - BaseWeaponChemical
+    - BaseWeaponSharp
+  - !type:AddComponents
+    components:
+    - type: ThrowingAngle
+      angle: 135
+    - type: EmbeddableProjectile
+      offset: -0.15,-0.15
+      removalTime: 0.5
+  - !type:EditMeleeWeapon
+    attackRateMultiplier: 1.4
+    bonusDamage:
+      types:
+        Slash: 3
+        Piercing: 3
+  - !type:EditItem
+    newSize: Normal
+    adjustShape: 0, 1
+    storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
+
+- type: modularPart
+  id: BladeIronDagger
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronDagger
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeDagger
+    - BaseWeaponIron
+
+- type: modularPart
+  id: BladeGoldDagger
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeGoldDagger
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeDagger
+    - BaseWeaponGold
+
+- type: modularPart
+  id: BladeCopperDagger
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeCopperDagger
+  rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeDagger
+    - BaseWeaponCopper

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

@@ -0,0 +1,54 @@
+- type: modularPart
+  id: BaseBladePickaxe
+  modifiers:
+  - !type:EditMeleeWeapon
+    attackRateMultiplier: 0.75
+    angleMultiplier: 1.2
+    bonusDamage:
+      types:
+        Piercing: 9
+  - !type:EditIncreaseDamageOnWield
+    bonusDamage:
+      types:
+        Piercing: 4
+        Structural: 10
+  - !type:EditItem
+    newSize: Normal
+    adjustShape: 1, 1
+    storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
+
+- type: modularPart
+  id: BladeIronPickaxe
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronPickaxe
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladePickaxe
+    - BaseWeaponIron
+
+- type: modularPart
+  id: BladeGoldPickaxe
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeGoldPickaxe
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladePickaxe
+    - BaseWeaponGold
+
+- type: modularPart
+  id: BladeCopperPickaxe
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeCopperPickaxe
+  rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladePickaxe
+    - BaseWeaponCopper

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

@@ -0,0 +1,69 @@
+#Concept:
+# + Additional range
+# + High Damage! And speed
+# - Required Warcraft skill
+
+- type: modularPart
+  id: BaseBladeRapier
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseWeaponChemical
+    - BaseWeaponSharp
+  - !type:AddComponents
+    components:
+    - type: CP14SkillRequirement
+      fuckupChance: 0.5
+      requiredSkills:
+      - Warcraft
+  - !type:EditMeleeWeapon
+    newWideAnimation: CP14WeaponArcThrust
+    resetOnHandSelected: true # Disable fast swap
+    bonusRange: 0.2
+    angleMultiplier: 0
+    attackRateMultiplier: 1.5
+    bonusDamage:
+      types:
+        Piercing: 14
+  - !type:EditItem
+    newSize: Large
+    adjustShape: 0, 2
+    storedOffsetBonus: 0, 10
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
+  - !type:EditDamageableModifier # Only 1 ingot t craft, so less health
+    multiplier: 2
+
+- type: modularPart
+  id: BladeIronRapier
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronRapier
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeRapier
+    - BaseWeaponIron
+
+- type: modularPart
+  id: BladeGoldRapier
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeGoldRapier
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeRapier
+    - BaseWeaponGold
+
+- type: modularPart
+  id: BladeCopperRapier
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeCopperRapier
+  rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeRapier
+    - BaseWeaponCopper

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

@@ -0,0 +1,43 @@
+# Concept
+# + Damage
+
+- type: modularPart
+  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
+
+- type: modularPart
+  id: GardeSharpIron
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSharpIron
+  rsiPath: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSharp
+    - BaseWeaponIron
+
+- type: modularPart
+  id: GardeSharpCopper
+  targetSlot: Garde
+  sourcePart: CP14ModularGardeSharpCopper
+  rsiPath: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseGardeSharp
+    - BaseWeaponCopper

Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml

@@ -65,4 +65,28 @@
     - type: Utensil
       types:
         - Knife
-    - type: CP14WallpaperRemover
+    - 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

Resources/Prototypes/_CP14/ModularCraft/blade.yml

@@ -1,36 +1,3 @@
-#Concept:
-# + Fast attackRate
-#   fast swing
-# - Low damage
-- type: modularPart
-  id: BladeIronDagger
-  targetSlot: Blade
-  sourcePart: CP14ModularBladeIronDagger
-  rsiPath: _CP14/Objects/ModularTools/iron_dagger.rsi
-  modifiers:
-  - !type:Inherit
-    copyFrom:
-    - BaseWeaponThrowable
-    - BaseWeaponChemical
-    - BaseWeaponSharp
-  - !type:AddComponents
-    components:
-    - type: ThrowingAngle
-      angle: 135
-    - type: EmbeddableProjectile
-      offset: -0.15,-0.15
-      removalTime: 0.5
-  - !type:EditMeleeWeapon
-    attackRateMultiplier: 1.4
-    bonusDamage:
-      types:
-        Slash: 3
-        Piercing: 3
-  - !type:EditItem
-    newSize: Normal
-    adjustShape: 0, 1
-    storedOffsetBonus: 0, 5
-
 #Concept:
 # Copy of dagger with lesser damage 
 # But can gather grass from world
@@ -55,6 +22,9 @@
     newSize: Normal
     adjustShape: 0, 1
     storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
 
 #Concept:
 # + High Throwable damage
@@ -93,6 +63,9 @@
     newSize: Normal
     adjustShape: 0, 1
     storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
 
 #Concept:
 # + High Wielded damage
@@ -160,6 +133,9 @@
     newSize: Large
     adjustShape: 0, 2
     storedOffsetBonus: 0, 10
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
 
 - type: modularPart
   id: BladeIronShovel
@@ -193,25 +169,6 @@
     newSize: Normal
     adjustShape: 0, 1
     storedOffsetBonus: 0, 5
-
-- type: modularPart
-  id: BladeIronPickaxe
-  targetSlot: Blade
-  sourcePart: CP14ModularBladeIronPickaxe
-  rsiPath: _CP14/Objects/ModularTools/iron_pickaxe.rsi
-  modifiers:
-  - !type:EditMeleeWeapon
-    attackRateMultiplier: 0.75
-    angleMultiplier: 1.2
-    bonusDamage:
-      types:
-        Piercing: 9
-  - !type:EditIncreaseDamageOnWield
-    bonusDamage:
-      types:
-        Piercing: 4
-        Structural: 10
-  - !type:EditItem
-    newSize: Normal
-    adjustShape: 1, 1
-    storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde

Resources/Prototypes/_CP14/ModularCraft/slots.yml

@@ -21,3 +21,7 @@
 - type: modularSlot
   id: MagicCrystalHolder
   name: cp14-modular-slot-magic-crystal-holder
+
+- type: modularSlot
+  id: Garde
+  name: cp14-modular-slot-garde

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

@@ -175,4 +175,116 @@
   craftTime: 4
   stacks:
     CP14IronBar: 2
-  result: CP14ModularGripIronLong
+  result: CP14ModularGripIronLong
+
+- type: CP14Recipe
+  id: CP14ModularGripCopperLong
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 2
+  result: CP14ModularGripCopperLong
+
+- type: CP14Recipe
+  id: CP14ModularGripGoldLong
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 2
+  result: CP14ModularGripGoldLong
+
+- 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: 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
+
+- type: CP14Recipe
+  id: CP14ModularBladeIronRapier
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14IronBar: 1
+  result: CP14ModularBladeIronRapier
+
+- type: CP14Recipe
+  id: CP14ModularBladeGoldRapier
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularBladeGoldRapier
+
+- type: CP14Recipe
+  id: CP14ModularBladeCopperRapier
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  stacks:
+    CP14CopperBar: 1
+  result: CP14ModularBladeCopperRapier

Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}