Swords

assets/common/items/weapons/sword/bloodsteel-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Bloodsteel Flamberge",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.8,
+            poise_strength: 0.4,
+            speed: 1.0,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/bloodsteel-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Fierce Katana",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.6,
+            poise_strength: 0.4,
+            speed: 1.2,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/bloodsteel-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Sharktooth",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 2.0,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/bronze-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Brass Beast",
+    description: "Forged with bronze.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.1,
+            poise_strength: 0.4,
+            speed: 0.9,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/bronze-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Bronze Longsword",
+    description: "Forged with bronze.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 0.9,
+            poise_strength: 0.4,
+            speed: 1.1,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/bronze-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Jagged Longblade",
+    description: "Forged with bronze.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.0,
+            poise_strength: 0.4,
+            speed: 1.0,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/caladbolg.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Caladborg",
+    description: "You sense an eldritch presence watching you.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 2.5,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: Legendary,
+    tags: [],
+)

assets/common/items/weapons/sword/cobalt-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Cobalt Claymore",
+    description: "Forged with cobalt.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.5,
+            poise_strength: 0.4,
+            speed: 1.1,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/cobalt-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Cobalt Greatsword",
+    description: "Forged with cobalt.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.8,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/cobalt-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Cobalt Longsword",
+    description: "Forged with cobalt.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.6,
+            poise_strength: 0.4,
+            speed: 1.0,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/cobalt-3.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Cobalt Towerblade",
+    description: "Forged with cobalt.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.7,
+            poise_strength: 0.4,
+            speed: 0.9,
+        )),
+    )),
+    quality: High,
+    tags: [],
+)

assets/common/items/weapons/sword/greatsword_2h_dam-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Greatsword",
-    description: "The blade has been chipped quite a few times.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.8,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_dam-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Greatsword",
-    description: "The blade has been chipped quite a few times.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.8,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_dam-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Greatsword",
-    description: "The blade has been chipped quite a few times.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.8,
-            poise_strength: 0.9,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_fine-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Greatsword",
-    description: "It\'s been polished and sharpened recently.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.4,
-            poise_strength: 1.6,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_fine-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Greatsword",
-    description: "It\'s been polished and sharpened recently.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.4,
-            poise_strength: 1.7,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_orn-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Greatsword",
-    description: "The sword\'s almost a work of art.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.7,
-            poise_strength: 1.4,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_orn-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Greatsword",
-    description: "The sword\'s almost a work of art.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.7,
-            poise_strength: 1.4,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_orn-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Greatsword",
-    description: "The sword\'s almost a work of art.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.7,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_simple-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Greatsword",
-    description: "It\'s been well used.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.1,
-            poise_strength: 1.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_simple-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Greatsword",
-    description: "It\'s been well used.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.1,
-            poise_strength: 1.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/greatsword_2h_simple-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Greatsword",
-    description: "It\'s been well used.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.1,
-            poise_strength: 1.4,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/iron-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Buccaneer's Blade",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.25,
+            poise_strength: 0.4,
+            speed: 0.95,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Embedded Greatsword",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.45,
+            poise_strength: 0.4,
+            speed: 0.75,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-10.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Warlord's Blade",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.35,
+            poise_strength: 0.4,
+            speed: 0.85,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Iron Claymore",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.1,
+            poise_strength: 0.4,
+            speed: 1.1,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-3.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Iron Flamberge",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.15,
+            poise_strength: 0.4,
+            speed: 1.05,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-4.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Iron Greatsword",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.3,
+            poise_strength: 0.4,
+            speed: 0.9,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-5.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Iron Longsword",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.05,
+            poise_strength: 0.4,
+            speed: 1.15,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-6.ron

@@ -1,13 +1,13 @@
 ItemDef(
-    name: "Fine Longsword",
+    name: "Iron Zweihander",
-    description: "It shines when you hold it up to the light.",
+    description: "Forged with iron.",
     kind: Tool((
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_millis: 300,
             power: 1.2,
-            poise_strength: 1.3,
+            poise_strength: 0.4,
             speed: 1.0,
         )),
     )),

assets/common/items/weapons/sword/iron-7.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Noble Greatsword",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.4,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-8.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Royal Longsword",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.0,
+            poise_strength: 0.4,
+            speed: 1.2,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/iron-9.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Swift Katana",
+    description: "Forged with iron.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 0.95,
+            poise_strength: 0.4,
+            speed: 1.25,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/long_2h_dam-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Longsword",
-    description: "It\'s slightly cracked.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.6,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_dam-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Longsword",
-    description: "It\'s slightly cracked.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.6,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_dam-3.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Longsword",
-    description: "It\'s slightly cracked.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.6,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_dam-4.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Longsword",
-    description: "It\'s slightly cracked.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.6,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_dam-5.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Damaged Longsword",
-    description: "It\'s slightly cracked.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.6,
-            poise_strength: 0.5,
-            speed: 1.0,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_fine-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Longsword",
-    description: "It shines when you hold it up to the light.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.2,
-            poise_strength: 1.3,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_fine-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Longsword",
-    description: "It shines when you hold it up to the light.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.2,
-            poise_strength: 1.3,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_fine-3.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Longsword",
-    description: "It shines when you hold it up to the light.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.2,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_fine-4.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Longsword",
-    description: "It shines when you hold it up to the light.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.2,
-            poise_strength: 1.3,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_fine-5.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Fine Longsword",
-    description: "It shines when you hold it up to the light.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.2,
-            poise_strength: 1.4,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.0,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.0,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-3.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.0,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-4.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_orn-5.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Ornamented Longsword",
-    description: "It\'s probably the weapon of some noble.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.1,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-1.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-2.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 1.0,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-3.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-4.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/long_2h_simple-5.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Simple Longsword",
-    description: "It was well maintained by it\'s previous owner.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 0.9,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/short_sword_0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Vicious Gladius",
-    description: "There\'s blood encrusted on the blade.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 400,
-            power: 0.75,
-            poise_strength: 0.8,
-            speed: 1.0,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/sword/starter.ron

@@ -1,6 +1,6 @@
 ItemDef(
-    name: "Battered Sword",
+    name: "Damaged Greatsword",
-    description: "Held together by Rust and hope.",
+    description: "The blade could snap at any moment...",
     kind: Tool((
         kind: Sword,
         hands: Two,

assets/common/items/weapons/sword/steel-0.ron

@@ -1,13 +1,13 @@
 ItemDef(
-    name: "Fine Greatsword",
+    name: "Butterfly Sword",
-    description: "It\'s been polished and sharpened recently.",
+    description: "Forged with steel.",
     kind: Tool((
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_millis: 300,
             power: 1.4,
-            poise_strength: 1.5,
+            poise_strength: 0.4,
             speed: 1.0,
         )),
     )),

assets/common/items/weapons/sword/steel-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Nomad's Longblade",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.45,
+            poise_strength: 0.4,
+            speed: 0.95,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Ornamental Longsword",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.25,
+            poise_strength: 0.4,
+            speed: 1.15,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-3.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Seven-Branched Sword",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.5,
+            poise_strength: 0.4,
+            speed: 0.9,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-4.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Greatsword",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.55,
+            poise_strength: 0.4,
+            speed: 0.85,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-5.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Katana",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.2,
+            poise_strength: 0.4,
+            speed: 1.2,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-6.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Longsword",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.3,
+            poise_strength: 0.4,
+            speed: 1.1,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-7.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Towerblade",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.6,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/steel-8.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Steel Zweihander",
+    description: "Forged with steel.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.35,
+            poise_strength: 0.4,
+            speed: 1.05,
+        )),
+    )),
+    quality: Moderate,
+    tags: [],
+)

assets/common/items/weapons/sword/stone-0.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Ancient Greatsword",
+    description: "Covered in stone.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 1.0,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/weapons/sword/stone-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Flint Sword",
+    description: "Chiseled from flint.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 0.8,
+            poise_strength: 0.4,
+            speed: 1.0,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/weapons/sword/stone-2.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Ritual Greatsword",
+    description: "Chiseled from stone.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 0.9,
+            poise_strength: 0.4,
+            speed: 0.9,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/weapons/sword/wood-0.ron

@@ -1,13 +1,13 @@
 ItemDef(
-    name: "Damaged Longsword",
+    name: "Bladed Branch",
-    description: "It\'s slightly cracked.",
+    description: "Grown in the shape of a sword.",
     kind: Tool((
         kind: Sword,
         hands: Two,
         stats: Direct((
-            equip_time_millis: 500,
+            equip_time_millis: 300,
             power: 0.6,
-            poise_strength: 0.5,
+            poise_strength: 0.4,
             speed: 1.0,
         )),
     )),

assets/common/items/weapons/sword/wood-1.ron

@@ -0,0 +1,16 @@
+ItemDef(
+    name: "Oaken Greatsword",
+    description: "Carved from an oak.",
+    kind: Tool((
+        kind: Sword,
+        hands: Two,
+        stats: Direct((
+            equip_time_millis: 300,
+            power: 0.8,
+            poise_strength: 0.4,
+            speed: 0.8,
+        )),
+    )),
+    quality: Low,
+    tags: [],
+)

assets/common/items/weapons/sword/wood-2.ron

@@ -6,11 +6,11 @@ ItemDef(
         hands: Two,
         stats: Direct((
             equip_time_millis: 400,
-            power: 0.8,
+            power: 0.5,
             poise_strength: 0.5,
-            speed: 1.0,
+            speed: 1.1,
         )),
     )),
-    quality: Moderate,
+    quality: Low,
     tags: [],
 )

assets/common/items/weapons/sword/zweihander_sword_0.ron

@@ -1,16 +0,0 @@
-ItemDef(
-    name: "Sturdy Zweihander",
-    description: "It\'s a big sword, and sharp too.",
-    kind: Tool((
-        kind: Sword,
-        hands: Two,
-        stats: Direct((
-            equip_time_millis: 500,
-            power: 1.5,
-            poise_strength: 1.9,
-            speed: 1.0,
-        )),
-    )),
-    quality: Moderate,
-    tags: [],
-)

assets/common/loot_tables/loot_table_cave_large.ron

@@ -9,18 +9,23 @@
     (0.05, "common.items.glider.glider_moth"),
     (0.05, "common.items.armor.ring.ring_gold_0"),   
     // swords
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
+    (0.03, "common.items.weapons.sword.steel-0"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),
+    (0.03, "common.items.weapons.sword.steel-1"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-0"),
+    (0.03, "common.items.weapons.sword.steel-2"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-1"),
+    (0.03, "common.items.weapons.sword.steel-3"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-2"),
+    (0.03, "common.items.weapons.sword.steel-4"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-3"),
+    (0.03, "common.items.weapons.sword.steel-5"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-4"),
+    (0.03, "common.items.weapons.sword.steel-6"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-5"),
+    (0.03, "common.items.weapons.sword.steel-7"),
-    (0.20, "common.items.weapons.sword.zweihander_sword_0"),
+    (0.03, "common.items.weapons.sword.steel-8"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"),
+    (0.02, "common.items.weapons.sword.cobalt-0"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"),
+    (0.02, "common.items.weapons.sword.cobalt-1"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"),
+    (0.02, "common.items.weapons.sword.cobalt-2"),
+    (0.02, "common.items.weapons.sword.cobalt-3"),
+    (0.01, "common.items.weapons.sword.bloodsteel-0"),
+    (0.01, "common.items.weapons.sword.bloodsteel-1"),
+    (0.01, "common.items.weapons.sword.bloodsteel-2"),
+    (0.001, "common.items.weapons.sword.caladbolg"),
     // axes
     (0.02, "common.items.weapons.axe.bloodsteel_axe-0"),
     (0.02, "common.items.weapons.axe.bloodsteel_axe-1"),

assets/common/loot_tables/loot_table_cultists.ron

@@ -69,18 +69,16 @@
     (0.001, "common.items.armor.back.backpack_0"),
     (0.1, "common.items.armor.bag.heavy_seabag"),
     // Common Weapons
-    // swords    
+    // swords
-    (0.4, "common.items.weapons.sword.wood_sword"),
+    (0.10, "common.items.weapons.sword.wood-0"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-0"),
+    (0.10, "common.items.weapons.sword.wood-1"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-1"),
+    (0.10, "common.items.weapons.sword.wood-2"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-2"),
+    (0.10, "common.items.weapons.sword.stone-0"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-3"),
+    (0.10, "common.items.weapons.sword.stone-1"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-4"),
+    (0.10, "common.items.weapons.sword.stone-2"),
-    (0.3, "common.items.weapons.sword.long_2h_dam-5"),
+    (0.15, "common.items.weapons.sword.bronze-0"),
-    (0.25, "common.items.weapons.sword.short_sword_0"),
+    (0.15, "common.items.weapons.sword.bronze-1"),
-    (0.1, "common.items.weapons.sword.greatsword_2h_dam-0"),
+    (0.15, "common.items.weapons.sword.bronze-2"),
-    (0.1, "common.items.weapons.sword.greatsword_2h_dam-1"),
-    (0.1, "common.items.weapons.sword.greatsword_2h_dam-2"),
     // axes    
     (0.20, "common.items.weapons.axe.orc_axe-0"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-0"),
@@ -106,24 +104,26 @@
     (0.25, "common.items.weapons.bow.wood_shortbow-1"),
     // Uncommon Weapons
     // swords
-    (0.05, "common.items.weapons.sword.long_2h_simple-0"),
+    (0.04, "common.items.weapons.sword.iron-0"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-1"),
+    (0.04, "common.items.weapons.sword.iron-1"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-2"),
+    (0.04, "common.items.weapons.sword.iron-2"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-3"),
+    (0.04, "common.items.weapons.sword.iron-3"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-4"),
+    (0.04, "common.items.weapons.sword.iron-4"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-5"),
+    (0.04, "common.items.weapons.sword.iron-5"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"),
+    (0.04, "common.items.weapons.sword.iron-6"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"),
+    (0.04, "common.items.weapons.sword.iron-7"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"),
+    (0.04, "common.items.weapons.sword.iron-8"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-0"),
+    (0.04, "common.items.weapons.sword.iron-9"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-1"),
+    (0.04, "common.items.weapons.sword.iron-10"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-2"),
+    (0.03, "common.items.weapons.sword.steel-0"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-3"),
+    (0.03, "common.items.weapons.sword.steel-1"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-4"),
+    (0.03, "common.items.weapons.sword.steel-2"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-5"),
+    (0.03, "common.items.weapons.sword.steel-3"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"),
+    (0.03, "common.items.weapons.sword.steel-4"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
+    (0.03, "common.items.weapons.sword.steel-5"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),
+    (0.03, "common.items.weapons.sword.steel-6"),
+    (0.03, "common.items.weapons.sword.steel-7"),
+    (0.03, "common.items.weapons.sword.steel-8"),
     // axes
     (0.15, "common.items.weapons.axe.bronze_axe-0"),
     (0.15, "common.items.weapons.axe.bronze_axe-1"),
@@ -173,21 +173,18 @@
     (0.20, "common.items.weapons.bow.leafy_longbow-0"),
     // Rare Weapons
     // swords
-    (0.08, "common.items.weapons.sword.long_2h_orn-0"),
+    (0.20, "common.items.weapons.sword.cobalt-0"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-1"),
+    (0.20, "common.items.weapons.sword.cobalt-1"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-2"),
+    (0.20, "common.items.weapons.sword.cobalt-2"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-3"),
+    (0.20, "common.items.weapons.sword.cobalt-3"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-4"),
+    (0.10, "common.items.weapons.sword.bloodsteel-0"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-5"),
+    (0.10, "common.items.weapons.sword.bloodsteel-1"),
-    (0.20, "common.items.weapons.sword.zweihander_sword_0"),
+    (0.10, "common.items.weapons.sword.bloodsteel-2"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"),
+    (0.001, "common.items.weapons.sword.caladbolg"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"),
     // axes
     (0.20, "common.items.weapons.axe.bloodsteel_axe-0"),
     (0.20, "common.items.weapons.axe.bloodsteel_axe-1"),
     (0.20, "common.items.weapons.axe.bloodsteel_axe-2"),
-    (0.30, "common.items.weapons.axe.cobalt_axe-0"),
     (0.10, "common.items.weapons.axe.malachite_axe-0"),
     // healing staff
     (0.25, "common.items.weapons.sceptre.staff_nature"),

assets/common/loot_tables/loot_table_humanoids.ron

@@ -15,7 +15,9 @@
     (0.10, "common.items.food.apple_stick"),
     (0.10, "common.items.food.mushroom_stick"),
     // Weapons
-    (0.15, "common.items.weapons.sword.wood_sword"),
+    (0.10, "common.items.weapons.sword.wood-0"),
+    (0.10, "common.items.weapons.sword.wood-1"),
+    (0.10, "common.items.weapons.sword.wood-2"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-0"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-1"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-2"),

assets/common/loot_tables/loot_table_mindflayer.ron

@@ -10,7 +10,7 @@
     // weapons
     (1, "common.items.weapons.staff.cultist_staff"),
     (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
-    (1, "common.items.weapons.sword.cultist_purp_2h-0"),
+    (1, "common.items.weapons.sword.cultist"),
     (0.25, "common.items.crafting_ing.mindflayer_bag_damaged"),
     (0.01, "common.items.weapons.sceptre.root_evil"),
     // misc    

assets/common/loot_tables/loot_table_miniboss.ron

@@ -11,7 +11,7 @@
     // weapons
     (1, "common.items.weapons.staff.cultist_staff"),
     (1, "common.items.weapons.hammer.cultist_purp_2h-0"),
-    (1, "common.items.weapons.sword.cultist_purp_2h-0"),
+    (1, "common.items.weapons.sword.cultist"),
     // misc    
     (0.25, "common.items.boss_drops.lantern"),
 ]

assets/common/loot_tables/loot_table_villager.ron

@@ -29,7 +29,9 @@
     (0.10, "common.items.food.apple_stick"),
     (0.10, "common.items.food.mushroom_stick"),
     // Weapons
-    (0.15, "common.items.weapons.sword.wood_sword"),
+    (0.15, "common.items.weapons.sword.wood-0"),
+    (0.15, "common.items.weapons.sword.wood-1"),
+    (0.15, "common.items.weapons.sword.wood-2"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-0"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-1"),
     (0.10, "common.items.weapons.axe.worn_iron_axe-2"),

assets/common/loot_tables/loot_table_weapon_common.ron

@@ -1,17 +1,12 @@
 [
     // swords
-    (0.15, "common.items.weapons.sword.starter_sword"),
+    (0.15, "common.items.weapons.sword.starter"),
-    (0.15, "common.items.weapons.sword.wood_sword"),
+    (0.10, "common.items.weapons.sword.wood-0"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-0"),
+    (0.10, "common.items.weapons.sword.wood-1"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-1"),
+    (0.10, "common.items.weapons.sword.wood-2"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-2"),
+    (0.05, "common.items.weapons.sword.stone-0"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-3"),
+    (0.05, "common.items.weapons.sword.stone-1"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-4"),
+    (0.05, "common.items.weapons.sword.stone-2"),
-    (0.07, "common.items.weapons.sword.long_2h_dam-5"),
-    (0.10, "common.items.weapons.sword.short_sword_0"),
-    (0.06, "common.items.weapons.sword.greatsword_2h_dam-0"),
-    (0.06, "common.items.weapons.sword.greatsword_2h_dam-1"),
-    (0.06, "common.items.weapons.sword.greatsword_2h_dam-2"),
     // axes
     (0.30, "common.items.weapons.axe.starter_axe"),
     (0.20, "common.items.weapons.axe.orc_axe-0"),

assets/common/loot_tables/loot_table_weapon_rare.ron

@@ -1,15 +1,13 @@
 [
     // swords
-    (0.08, "common.items.weapons.sword.long_2h_orn-0"),
+    (0.20, "common.items.weapons.sword.cobalt-0"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-1"),
+    (0.20, "common.items.weapons.sword.cobalt-1"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-2"),
+    (0.20, "common.items.weapons.sword.cobalt-2"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-3"),
+    (0.20, "common.items.weapons.sword.cobalt-3"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-4"),
+    (0.10, "common.items.weapons.sword.bloodsteel-0"),
-    (0.08, "common.items.weapons.sword.long_2h_orn-5"),
+    (0.10, "common.items.weapons.sword.bloodsteel-1"),
-    (0.20, "common.items.weapons.sword.zweihander_sword_0"),
+    (0.10, "common.items.weapons.sword.bloodsteel-2"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-0"),
+    (0.01, "common.items.weapons.sword.caladbolg"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-1"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_orn-2"),
     // axes
     (0.20, "common.items.weapons.axe.bloodsteel_axe-0"),
     (0.20, "common.items.weapons.axe.bloodsteel_axe-1"),

assets/common/loot_tables/loot_table_weapon_uncommon.ron

@@ -1,23 +1,28 @@
 [
     // swords
-    (0.05, "common.items.weapons.sword.long_2h_simple-0"),
+    (0.15, "common.items.weapons.sword.bronze-0"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-1"),
+    (0.15, "common.items.weapons.sword.bronze-1"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-2"),
+    (0.15, "common.items.weapons.sword.bronze-2"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-3"),
+    (0.04, "common.items.weapons.sword.iron-0"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-4"),
+    (0.04, "common.items.weapons.sword.iron-1"),
-    (0.05, "common.items.weapons.sword.long_2h_simple-5"),
+    (0.04, "common.items.weapons.sword.iron-2"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-0"),
+    (0.04, "common.items.weapons.sword.iron-3"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-1"),
+    (0.04, "common.items.weapons.sword.iron-4"),
-    (0.10, "common.items.weapons.sword.greatsword_2h_simple-2"),
+    (0.04, "common.items.weapons.sword.iron-5"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-0"),
+    (0.04, "common.items.weapons.sword.iron-6"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-1"),
+    (0.04, "common.items.weapons.sword.iron-7"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-2"),
+    (0.04, "common.items.weapons.sword.iron-8"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-3"),
+    (0.04, "common.items.weapons.sword.iron-9"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-4"),
+    (0.04, "common.items.weapons.sword.iron-10"),
-    (0.06, "common.items.weapons.sword.long_2h_fine-5"),
+    (0.03, "common.items.weapons.sword.steel-0"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-0"),
+    (0.03, "common.items.weapons.sword.steel-1"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-1"),
+    (0.03, "common.items.weapons.sword.steel-2"),
-    (0.07, "common.items.weapons.sword.greatsword_2h_fine-2"),
+    (0.03, "common.items.weapons.sword.steel-3"),
+    (0.03, "common.items.weapons.sword.steel-4"),
+    (0.03, "common.items.weapons.sword.steel-5"),
+    (0.03, "common.items.weapons.sword.steel-6"),
+    (0.03, "common.items.weapons.sword.steel-7"),
+    (0.03, "common.items.weapons.sword.steel-8"),
     // axes
     (0.15, "common.items.weapons.axe.bronze_axe-0"),
     (0.15, "common.items.weapons.axe.bronze_axe-1"),

assets/common/recipe_book.ron

@@ -243,7 +243,7 @@
         ],
     ),
     "Forest Spirit": (
-        ("common.items.weapons.sword.wood_sword", 1),
+        ("common.items.weapons.sword.wood-2", 1),
         [
             (Item("common.items.crafting_ing.leather_scraps"), 4),
             (Item("common.items.crafting_ing.twigs"), 10),

assets/voxygen/item_image_manifest.ron

@@ -103,177 +103,169 @@
         (0.0, 0.0, -4.0), (-120.0, 90.0, 0.0), 1.1,
     ),
     // Swords
-    Tool("common.items.weapons.sword.frost_cleaver_2h-0"): VoxTrans(
+    Tool("common.items.weapons.sword.bloodsteel-0"): VoxTrans(
-        "voxel.weapon.sword.frost_cleaver-0",
+        "voxel.weapons.sword.bloodsteel-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.frost_cleaver_2h-1"): VoxTrans(
+    Tool("common.items.weapons.sword.bloodsteel-1"): VoxTrans(
-        "voxel.weapon.sword.frost_cleaver-1",
+        "voxel.weapons.sword.bloodsteel-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.40,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.short_sword_0"): VoxTrans(
+    Tool("common.items.weapons.sword.bloodsteel-2"): VoxTrans(
-        "voxel.weapon.sword.short_2h-0",
+        "voxel.weapons.sword.bloodsteel-2",
-        (-3.0, 3.0, 0.0), (-135.0, 90.0, 0.0), 1.60,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.starter_sword"): VoxTrans(
+    Tool("common.items.weapons.sword.bronze-0"): VoxTrans(
-        "voxel.weapon.sword.rusty_2h",
+        "voxel.weapons.sword.bronze-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.3,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.zweihander_sword_0"): VoxTrans(
+    Tool("common.items.weapons.sword.bronze-1"): VoxTrans(
-        "voxel.weapon.sword.zweihander_2h-0",
+        "voxel.weapons.sword.bronze-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.wood_sword"): VoxTrans(
+    Tool("common.items.weapons.sword.bronze-2"): VoxTrans(
-        "voxel.weapon.sword.wood_ore_2h",
+        "voxel.weapons.sword.bronze-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_dam-0"): VoxTrans(
+    Tool("common.items.weapons.sword.caladbolg"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_dam-0",
+        "voxel.weapons.sword.caladbolg",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_dam-1"): VoxTrans(
+    Tool("common.items.weapons.sword.cobalt-0"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_dam-1",
+        "voxel.weapons.sword.cobalt-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_dam-2"): VoxTrans(
+    Tool("common.items.weapons.sword.cobalt-1"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_dam-2",
+        "voxel.weapons.sword.cobalt-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_simple-0"): VoxTrans(
+    Tool("common.items.weapons.sword.cobalt-2"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_simple-0",
+        "voxel.weapons.sword.cobalt-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_simple-1"): VoxTrans(
+    Tool("common.items.weapons.sword.cobalt-3"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_simple-1",
+        "voxel.weapons.sword.cobalt-3",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_simple-2"): VoxTrans(
+    Tool("common.items.weapons.sword.cultist"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_simple-2",
+        "voxel.weapons.sword.cultist",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_orn-0"): VoxTrans(
+    Tool("common.items.weapons.sword.frost-0"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_orn-0",
+        "voxel.weapons.sword.frost-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_orn-1"): VoxTrans(
+    Tool("common.items.weapons.sword.frost-1"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_orn-1",
+        "voxel.weapons.sword.frost-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_orn-2"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-0"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_orn-2",
+        "voxel.weapons.sword.iron-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_fine-0"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-1"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_fine-0",
+        "voxel.weapons.sword.iron-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_fine-1"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-10"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_fine-1",
+        "voxel.weapons.sword.iron-10",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.greatsword_2h_fine-2"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-2"): VoxTrans(
-        "voxel.weapon.sword.greatsword_2h_fine-2",
+        "voxel.weapons.sword.iron-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-0"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-3"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-0",
+        "voxel.weapons.sword.iron-3",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-1"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-4"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-1",
+        "voxel.weapons.sword.iron-4",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-2"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-5"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-2",
+        "voxel.weapons.sword.iron-5",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-3"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-6"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-3",
+        "voxel.weapons.sword.iron-6",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-4"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-7"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-4",
+        "voxel.weapons.sword.iron-7",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_dam-5"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-8"): VoxTrans(
-        "voxel.weapon.sword.long_2h_dam-5",
+        "voxel.weapons.sword.iron-8",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-0"): VoxTrans(
+    Tool("common.items.weapons.sword.iron-9"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-0",
+        "voxel.weapons.sword.iron-9",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-1"): VoxTrans(
+    Tool("common.items.weapons.sword.starter"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-1",
+        "voxel.weapons.sword.starter",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-2"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-0"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-2",
+        "voxel.weapons.sword.steel-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-3"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-1"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-3",
+        "voxel.weapons.sword.steel-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-4"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-2"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-4",
+        "voxel.weapons.sword.steel-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_simple-5"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-3"): VoxTrans(
-        "voxel.weapon.sword.long_2h_simple-5",
+        "voxel.weapons.sword.steel-3",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-0"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-4"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-0",
+        "voxel.weapons.sword.steel-4",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-1"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-5"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-1",
+        "voxel.weapons.sword.steel-5",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-2"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-6"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-2",
+        "voxel.weapons.sword.steel-6",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-3"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-7"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-3",
+        "voxel.weapons.sword.steel-7",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-4"): VoxTrans(
+    Tool("common.items.weapons.sword.steel-8"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-4",
+        "voxel.weapons.sword.steel-8",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_orn-5"): VoxTrans(
+    Tool("common.items.weapons.sword.stone-0"): VoxTrans(
-        "voxel.weapon.sword.long_2h_orn-5",
+        "voxel.weapons.sword.stone-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_fine-0"): VoxTrans(
+    Tool("common.items.weapons.sword.stone-1"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-0",
+        "voxel.weapons.sword.stone-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_fine-1"): VoxTrans(
+    Tool("common.items.weapons.sword.stone-2"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-1",
+        "voxel.weapons.sword.stone-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_fine-2"): VoxTrans(
+    Tool("common.items.weapons.sword.wood-0"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-2",
+        "voxel.weapons.sword.wood-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_fine-3"): VoxTrans(
+    Tool("common.items.weapons.sword.wood-1"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-3",
+        "voxel.weapons.sword.wood-1",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.sword.long_2h_fine-4"): VoxTrans(
+    Tool("common.items.weapons.sword.wood-2"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-4",
+        "voxel.weapons.sword.wood-2",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
+        (0.0, 0.0, -4.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.sword.long_2h_fine-5"): VoxTrans(
-        "voxel.weapon.sword.long_2h_fine-5",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
-    ),
-    Tool("common.items.weapons.sword.cultist_purp_2h-0"): VoxTrans(
-        "voxel.weapon.sword.cultist_purp_2h-0",
-        (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5,
     ),
     Tool("common.items.debug.admin_sword"): VoxTrans(
         "voxel.weapon.sword.frost_cleaver-1",

assets/voxygen/voxel/humanoid_main_weapon_manifest.ron

@@ -1,174 +1,166 @@
 ({  //Swords
-    "common.items.weapons.sword.starter_sword": (
+    "common.items.weapons.sword.bloodsteel-0": (
-        vox_spec: ("weapon.sword.rusty_2h", (-1.5, -6.5, -4.0)),
+        vox_spec: ("weapons.sword.bloodsteel-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.wood_sword": (
+    "common.items.weapons.sword.bloodsteel-1": (
-        vox_spec: ("weapon.sword.wood_ore_2h", (-1.5, -6.5, -4.0)),
+        vox_spec: ("weapons.sword.bloodsteel-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.zweihander_sword_0": (
+    "common.items.weapons.sword.bloodsteel-2": (
-        vox_spec: ("weapon.sword.zweihander_2h-0", (-1.5, -6.5, -4.0)),
+        vox_spec: ("weapons.sword.bloodsteel-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.short_sword_0": (
+    "common.items.weapons.sword.bronze-0": (
-        vox_spec: ("weapon.sword.short_2h-0", (-1.5, -6.5, -1.0)),
+        vox_spec: ("weapons.sword.bronze-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_dam-0": (
+    "common.items.weapons.sword.bronze-1": (
-        vox_spec: ("weapon.sword.greatsword_2h_dam-0", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.bronze-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_dam-1": (
+    "common.items.weapons.sword.bronze-2": (
-        vox_spec: ("weapon.sword.greatsword_2h_dam-1", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.bronze-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_dam-2": (
+    "common.items.weapons.sword.caladbolg": (
-        vox_spec: ("weapon.sword.greatsword_2h_dam-2", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.caladbolg", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_simple-0": (
+    "common.items.weapons.sword.cobalt-0": (
-        vox_spec: ("weapon.sword.greatsword_2h_simple-0", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.cobalt-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_simple-1": (
+    "common.items.weapons.sword.cobalt-1": (
-        vox_spec: ("weapon.sword.greatsword_2h_simple-1", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.cobalt-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_simple-2": (
+    "common.items.weapons.sword.cobalt-2": (
-        vox_spec: ("weapon.sword.greatsword_2h_simple-2", (-1.0, -4.5, -6.5)),
+        vox_spec: ("weapons.sword.cobalt-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_orn-0": (
+    "common.items.weapons.sword.cobalt-3": (
-        vox_spec: ("weapon.sword.greatsword_2h_orn-0", (-1.0, -4.5, -7.5)),
+        vox_spec: ("weapons.sword.cobalt-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_orn-1": (
+    "common.items.weapons.sword.cultist": (
-        vox_spec: ("weapon.sword.greatsword_2h_orn-1", (-1.0, -4.5, -7.5)),
+        vox_spec: ("weapons.sword.cultist", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_orn-2": (
+    "common.items.weapons.sword.frost-0": (
-        vox_spec: ("weapon.sword.greatsword_2h_orn-2", (-1.0, -4.5, -7.5)),
+        vox_spec: ("weapons.sword.frost-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_fine-0": (
+    "common.items.weapons.sword.frost-1": (
-        vox_spec: ("weapon.sword.greatsword_2h_fine-0", (-2.0, -6.5, -8.0)),
+        vox_spec: ("weapons.sword.frost-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_fine-1": (
+    "common.items.weapons.sword.iron-0": (
-        vox_spec: ("weapon.sword.greatsword_2h_fine-1", (-2.0, -6.5, -8.0)),
+        vox_spec: ("weapons.sword.iron-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.greatsword_2h_fine-2": (
+    "common.items.weapons.sword.iron-1": (
-        vox_spec: ("weapon.sword.greatsword_2h_fine-2", (-2.0, -6.5, -8.0)),
+        vox_spec: ("weapons.sword.iron-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-0": (
+    "common.items.weapons.sword.iron-10": (
-        vox_spec: ("weapon.sword.long_2h_dam-0", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-10", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-1": (
+    "common.items.weapons.sword.iron-2": (
-        vox_spec: ("weapon.sword.long_2h_dam-1", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-2": (
+    "common.items.weapons.sword.iron-3": (
-        vox_spec: ("weapon.sword.long_2h_dam-2", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-3": (
+    "common.items.weapons.sword.iron-4": (
-        vox_spec: ("weapon.sword.long_2h_dam-3", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-4", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-4": (
+    "common.items.weapons.sword.iron-5": (
-        vox_spec: ("weapon.sword.long_2h_dam-4", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-5", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_dam-5": (
+    "common.items.weapons.sword.iron-6": (
-        vox_spec: ("weapon.sword.long_2h_dam-5", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-6", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-0": (
+    "common.items.weapons.sword.iron-7": (
-        vox_spec: ("weapon.sword.long_2h_simple-0", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-7", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-1": (
+    "common.items.weapons.sword.iron-8": (
-        vox_spec: ("weapon.sword.long_2h_simple-1", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-8", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-2": (
+    "common.items.weapons.sword.iron-9": (
-        vox_spec: ("weapon.sword.long_2h_simple-2", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.iron-9", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-3": (
+    "common.items.weapons.sword.starter": (
-        vox_spec: ("weapon.sword.long_2h_simple-3", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.starter", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-4": (
+    "common.items.weapons.sword.steel-0": (
-        vox_spec: ("weapon.sword.long_2h_simple-4", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.steel-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_simple-5": (
+    "common.items.weapons.sword.steel-1": (
-        vox_spec: ("weapon.sword.long_2h_simple-5", (-1.0, -3.5, -5.0)),
+        vox_spec: ("weapons.sword.steel-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-0": (
+    "common.items.weapons.sword.steel-2": (
-        vox_spec: ("weapon.sword.long_2h_orn-0", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-1": (
+    "common.items.weapons.sword.steel-3": (
-        vox_spec: ("weapon.sword.long_2h_orn-1", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-3", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-2": (
+    "common.items.weapons.sword.steel-4": (
-        vox_spec: ("weapon.sword.long_2h_orn-2", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-4", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-3": (
+    "common.items.weapons.sword.steel-5": (
-        vox_spec: ("weapon.sword.long_2h_orn-3", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-5", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-4": (
+    "common.items.weapons.sword.steel-6": (
-        vox_spec: ("weapon.sword.long_2h_orn-4", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-6", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_orn-5": (
+    "common.items.weapons.sword.steel-7": (
-        vox_spec: ("weapon.sword.long_2h_orn-5", (-1.0, -3.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-7", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-0": (
+    "common.items.weapons.sword.steel-8": (
-        vox_spec: ("weapon.sword.long_2h_fine-0", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.steel-8", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-1": (
+    "common.items.weapons.sword.stone-0": (
-        vox_spec: ("weapon.sword.long_2h_fine-1", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.stone-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-2": (
+    "common.items.weapons.sword.stone-1": (
-        vox_spec: ("weapon.sword.long_2h_fine-2", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.stone-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-3": (
+    "common.items.weapons.sword.stone-2": (
-        vox_spec: ("weapon.sword.long_2h_fine-3", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.stone-2", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-4": (
+    "common.items.weapons.sword.wood-0": (
-        vox_spec: ("weapon.sword.long_2h_fine-4", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.wood-0", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.long_2h_fine-5": (
+    "common.items.weapons.sword.wood-1": (
-        vox_spec: ("weapon.sword.long_2h_fine-5", (-2.0, -4.5, -6.0)),
+        vox_spec: ("weapons.sword.wood-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
-    "common.items.weapons.sword.cultist_purp_2h-0": (
+    "common.items.weapons.sword.wood-2": (
-        vox_spec: ("weapon.sword.cultist_purp_2h-0", (-2.0, -4.5, -7.5)),
+        vox_spec: ("weapons.sword.wood-2", (-2.0, -4.5, -7.5)),
-        color: None
-    ),
-    "common.items.weapons.sword.frost_cleaver_2h-0": (
-        vox_spec: ("weapon.sword.frost_cleaver-0", (-2.0, -4.5, -7.5)),
-        color: None
-    ),
-    "common.items.weapons.sword.frost_cleaver_2h-1": (
-        vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)),
         color: None
     ),
     // 1h Swords