From 5898ce9d980fd41c7ac3d2cd824e1c97c2c8f7b3 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Sat, 31 Jul 2021 13:20:46 -0500
Subject: [PATCH] Added axe and hammer components.

---
 .../crafting_ing/modular/damage/axe/axe.ron   | 25 +++++++++++++++++++
 .../modular/damage/axe/battleaxe.ron          | 24 ++++++++++++++++++
 .../modular/damage/axe/greataxe.ron           | 23 +++++++++++++++++
 .../modular/damage/axe/jagged.ron             | 25 +++++++++++++++++++
 .../modular/damage/axe/labrys.ron             | 24 ++++++++++++++++++
 .../modular/damage/axe/ornate.ron             | 24 ++++++++++++++++++
 .../modular/damage/axe/poleaxe.ron            | 23 +++++++++++++++++
 .../modular/damage/hammer/greathammer.ron     | 23 +++++++++++++++++
 .../modular/damage/hammer/greatmace.ron       | 24 ++++++++++++++++++
 .../modular/damage/hammer/hammer.ron          | 25 +++++++++++++++++++
 .../modular/damage/hammer/maul.ron            | 23 +++++++++++++++++
 .../modular/damage/hammer/ornate.ron          | 24 ++++++++++++++++++
 .../modular/damage/hammer/spikedmace.ron      | 25 +++++++++++++++++++
 .../modular/damage/hammer/warhammer.ron       | 25 +++++++++++++++++++
 .../modular/damage/sword/greatsword.ron       |  2 +-
 .../modular/damage/sword/katana.ron           |  5 ++--
 .../modular/damage/sword/longsword.ron        |  4 +--
 .../modular/damage/sword/ornate.ron           |  4 +--
 .../modular/damage/sword/sabre.ron            |  4 +--
 .../modular/damage/sword/sawblade.ron         |  4 +--
 .../modular/damage/sword/zweihander.ron       |  2 +-
 .../crafting_ing/modular/held/axe/long.ron    | 24 ++++++++++++++++++
 .../crafting_ing/modular/held/axe/medium.ron  | 24 ++++++++++++++++++
 .../crafting_ing/modular/held/axe/short.ron   | 24 ++++++++++++++++++
 .../crafting_ing/modular/held/hammer/long.ron | 24 ++++++++++++++++++
 .../modular/held/hammer/medium.ron            | 24 ++++++++++++++++++
 .../modular/held/hammer/short.ron             | 24 ++++++++++++++++++
 27 files changed, 494 insertions(+), 12 deletions(-)
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/axe.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/jagged.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/labrys.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron
 create mode 100644 assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/axe/long.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/axe/medium.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/axe/short.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/hammer/long.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/hammer/medium.ron
 create mode 100644 assets/common/items/crafting_ing/modular/held/hammer/short.ron

diff --git a/assets/common/items/crafting_ing/modular/damage/axe/axe.ron b/assets/common/items/crafting_ing/modular/damage/axe/axe.ron
new file mode 100644
index 0000000000..fce6928c07
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/axe.ron
@@ -0,0 +1,25 @@
+ItemDef(
+    name: "Axe head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.2,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron
new file mode 100644
index 0000000000..d8d9a88060
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/battleaxe.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Battleaxe head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 1.5,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron
new file mode 100644
index 0000000000..bdc614b0d4
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/greataxe.ron
@@ -0,0 +1,23 @@
+ItemDef(
+    name: "Greataxe Head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 2.0,
+            speed: 0.8,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron b/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron
new file mode 100644
index 0000000000..59e2ded253
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/jagged.ron
@@ -0,0 +1,25 @@
+ItemDef(
+    name: "Jagged axe head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 2.0,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron b/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron
new file mode 100644
index 0000000000..9b6e3f3ba8
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/labrys.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Great mace head",
+    description: "A hamemr head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.5,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
new file mode 100644
index 0000000000..3371c79de8
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/ornate.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Ornate axe head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.5,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
new file mode 100644
index 0000000000..90b152c1c0
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/axe/poleaxe.ron
@@ -0,0 +1,23 @@
+ItemDef(
+    name: "Poleaxe head",
+    description: "An axe head made of metal.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.0,
+            effect_power: 0.9,
+            speed: 0.9,
+            crit_chance: 0.2,
+            range: 1.5,
+            energy_efficiency: 0.9,
+            buff_strength: 0.9,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron
new file mode 100644
index 0000000000..a5c49e9e89
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/greathammer.ron
@@ -0,0 +1,23 @@
+ItemDef(
+    name: "Greathammer Head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 2.0,
+            speed: 0.8,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron b/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron
new file mode 100644
index 0000000000..9b6e3f3ba8
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/greatmace.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Great mace head",
+    description: "A hamemr head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.5,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron
new file mode 100644
index 0000000000..3981687ec7
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/hammer.ron
@@ -0,0 +1,25 @@
+ItemDef(
+    name: "Hammer head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 0.2,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
new file mode 100644
index 0000000000..49fea6d316
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/maul.ron
@@ -0,0 +1,23 @@
+ItemDef(
+    name: "Maul head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 1.0,
+            effect_power: 0.9,
+            speed: 0.9,
+            crit_chance: 0.2,
+            range: 1.5,
+            energy_efficiency: 0.9,
+            buff_strength: 0.9,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
new file mode 100644
index 0000000000..c3236bafaf
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/ornate.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Ornate hammer head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.5,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron b/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron
new file mode 100644
index 0000000000..013510f01c
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/spikedmace.ron
@@ -0,0 +1,25 @@
+ItemDef(
+    name: "Spiked mace head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 0.9,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 2.0,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron b/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron
new file mode 100644
index 0000000000..4b02f05199
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/damage/hammer/warhammer.ron
@@ -0,0 +1,25 @@
+ItemDef(
+    name: "Warhammer head",
+    description: "A hammer head made of metal.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Damage,
+        stats: (
+            equip_time_secs: 0.25,
+            power: 0.9,
+            effect_power: 0.8,
+            speed: 1.5,
+            crit_chance: 0.15,
+            range: 1.0,
+            energy_efficiency: 0.8,
+            buff_strength: 0.8,
+        ),
+        hand_restriction: None,
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Hammer, modkind: Damage, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron b/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron
index 8f08ea97bd..9f9ac158ba 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/greatsword.ron
@@ -18,7 +18,7 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/katana.ron b/assets/common/items/crafting_ing/modular/damage/sword/katana.ron
index 72a3f301b6..678f415fb5 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/katana.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/katana.ron
@@ -14,11 +14,12 @@ ItemDef(
             energy_efficiency: 0.8,
             buff_strength: 0.8,
         ),
-        hand_restriction: Some(One),
+        hand_restriction: None,
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron b/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron
index c4a9836c8e..402773650b 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/longsword.ron
@@ -18,8 +18,8 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: One)),
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
index 05d5fda64b..1d535e1d2f 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/ornate.ron
@@ -18,8 +18,8 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: One)),
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron b/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron
index 1555dc2373..10faae32cf 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/sabre.ron
@@ -18,8 +18,8 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: One)),
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron b/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron
index 10354a9e11..207f37b151 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/sawblade.ron
@@ -18,8 +18,8 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: One)),
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: One)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
index f575b15944..d467c610da 100644
--- a/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
+++ b/assets/common/items/crafting_ing/modular/damage/sword/zweihander.ron
@@ -18,7 +18,7 @@ ItemDef(
     )),
     quality: Common,
     tags: [
-        ModularComponent((toolkind: Sword, modkind: Held, hands: Two)),
+        ModularComponent((toolkind: Sword, modkind: Damage, hands: Two)),
     ],
 )
 
diff --git a/assets/common/items/crafting_ing/modular/held/axe/long.ron b/assets/common/items/crafting_ing/modular/held/axe/long.ron
new file mode 100644
index 0000000000..f1617b30a6
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/axe/long.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Long axe haft",
+    description: "A axe haft.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 1.5,
+            effect_power: 1.3,
+            speed: 0.8,
+            crit_chance: 0.8,
+            range: 1.0,
+            energy_efficiency: 0.9,
+            buff_strength: 1.1,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Held, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/held/axe/medium.ron b/assets/common/items/crafting_ing/modular/held/axe/medium.ron
new file mode 100644
index 0000000000..42dce1b2f4
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/axe/medium.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Medium axe haft",
+    description: "A axe half.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Held, hands: One)),
+        ModularComponent((toolkind: Axe, modkind: Held, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/held/axe/short.ron b/assets/common/items/crafting_ing/modular/held/axe/short.ron
new file mode 100644
index 0000000000..40716f2fa5
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/axe/short.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Short axe haft",
+    description: "A axe haft.",
+    kind: ModularComponent((
+        toolkind: Axe,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 0.7,
+            effect_power: 0.8,
+            speed: 1.3,
+            crit_chance: 1.2,
+            range: 1.0,
+            energy_efficiency: 1.1,
+            buff_strength: 0.9,
+        ),
+        hand_restriction: Some(One),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Axe, modkind: Held, hands: One)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/held/hammer/long.ron b/assets/common/items/crafting_ing/modular/held/hammer/long.ron
new file mode 100644
index 0000000000..ba432bd9dc
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/hammer/long.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Long hammer haft",
+    description: "A hammer haft.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 1.5,
+            effect_power: 1.3,
+            speed: 0.8,
+            crit_chance: 0.8,
+            range: 1.0,
+            energy_efficiency: 0.9,
+            buff_strength: 1.1,
+        ),
+        hand_restriction: Some(Two),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Held, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/held/hammer/medium.ron b/assets/common/items/crafting_ing/modular/held/hammer/medium.ron
new file mode 100644
index 0000000000..78d0ddff5a
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/hammer/medium.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Medium hammer haft",
+    description: "A hammer half.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 1.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            crit_chance: 1.0,
+            range: 1.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Held, hands: One)),
+        ModularComponent((toolkind: Hammer, modkind: Held, hands: Two)),
+    ],
+)
+
diff --git a/assets/common/items/crafting_ing/modular/held/hammer/short.ron b/assets/common/items/crafting_ing/modular/held/hammer/short.ron
new file mode 100644
index 0000000000..9efae1a329
--- /dev/null
+++ b/assets/common/items/crafting_ing/modular/held/hammer/short.ron
@@ -0,0 +1,24 @@
+ItemDef(
+    name: "Short hammer haft",
+    description: "A hammer haft.",
+    kind: ModularComponent((
+        toolkind: Hammer,
+        modkind: Held,
+        stats: (
+            equip_time_secs: 1.0,
+            power: 0.7,
+            effect_power: 0.8,
+            speed: 1.3,
+            crit_chance: 1.2,
+            range: 1.0,
+            energy_efficiency: 1.1,
+            buff_strength: 0.9,
+        ),
+        hand_restriction: Some(One),
+    )),
+    quality: Common,
+    tags: [
+        ModularComponent((toolkind: Hammer, modkind: Held, hands: One)),
+    ],
+)
+