Removed old 2h variants of 1h weapons.

assets/common/items/weapons/axe/worn_iron_axe-0.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Dwarven Axe",
-    description: "Rough cut axe of dwarven origin, it's very old, but still usable.",
-    kind: Tool((
-        kind: Axe,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.4,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.0703125,
-            crit_mult: 2.015873,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/axe/worn_iron_axe-1.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Elven Axe",
-    description: "Light elven axe, scratched from eons of use. Still usable in some manner.",
-    kind: Tool((
-        kind: Axe,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.4,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.0703125,
-            crit_mult: 2.015873,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/axe/worn_iron_axe-2.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Human Axe",
-    description: "There's nothing too remarkable about this old axe.",
-    kind: Tool((
-        kind: Axe,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.4,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.0703125,
-            crit_mult: 2.015873,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/axe/worn_iron_axe-3.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Orcish Axe",
-    description: "Rough cut iron makes it hard to tell that this axe is even used, other than how old it feels.",
-    kind: Tool((
-        kind: Axe,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.4,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.0703125,
-            crit_mult: 2.015873,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/axe/worn_iron_axe-4.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Beetle Axe",
-    description: "An axe formed with the intent of making the blade seem like a beetle. With how brittle it has gotten over the years, one would be mistaken in thinking it was made from beetle shell.",
-    kind: Tool((
-        kind: Axe,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.4,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.0703125,
-            crit_mult: 2.015873,
-        )),
-    )),
-    quality: Low,
-    tags: [],
-)

assets/common/items/weapons/hammer/worn_iron_hammer-0.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Dwarven Hammer",
-    description: "While the dwarves excel at rough hewn weapons, this one has seen its fair share of battles, might still serve well enough for a few more.",
-    kind: Tool((
-        kind: Hammer,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.5,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.12242647,
-            crit_mult: 1.6864007,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/hammer/worn_iron_hammer-1.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Elven Hammer",
-    description: "Elven hammers are lighter than most. This one has seen its fair share of wear and tear.",
-    kind: Tool((
-        kind: Hammer,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.5,
-            power: 0.9,
-            poise_strength: 1.0,
-            speed: 0.9,
-            crit_chance: 0.12242647,
-            crit_mult: 1.6864007,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/hammer/worn_iron_hammer-2.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Human Mace",
-    description: "An unremarkable mace, that has seen a lot of use.",
-    kind: Tool((
-        kind: Hammer,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.5,
-            power: 0.7,
-            poise_strength: 1.0,
-            speed: 1.1,
-            crit_chance: 0.12242647,
-            crit_mult: 1.6864007,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/items/weapons/hammer/worn_iron_hammer-3.ron

@@ -1,18 +0,0 @@
-ItemDef(
-    name: "Worn Orcish Hammer",
-    description: "A heavy orc crafted hammer, missing chunks from heavy use.",
-    kind: Tool((
-        kind: Hammer,
-        hands: Two,
-        stats: Direct((
-            equip_time_secs: 0.5,
-            power: 0.8,
-            poise_strength: 1.0,
-            speed: 1.0,
-            crit_chance: 0.12242647,
-            crit_mult: 1.6864007,
-        )),
-    )),
-    quality: Common,
-    tags: [],
-)

assets/common/loot_tables/villager.ron

@@ -12,7 +12,8 @@
     (0.25, LootTable("common.loot_tables.food.prepared")),
     // Weapons
     (0.5, LootTable("common.loot_tables.weapons.sword.wood")),
-    (0.5, LootTable("common.loot_tables.weapons.hammer.stone")),
+    (0.5, LootTable("common.loot_tables.weapons.axe.wood")),
+    (0.5, LootTable("common.loot_tables.weapons.hammer.wood")),
     (0.5, LootTable("common.loot_tables.weapons.bow.rawwood")),
     (0.5, LootTable("common.loot_tables.weapons.starter")),
 ]

assets/common/loot_tables/weapons/axe/stone.ron

@@ -0,0 +1,5 @@
+[
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.stone-0")),
+    (1.0, Item("common.items.weapons.axe_1h.stone-1")),
+]

assets/common/loot_tables/weapons/axe/wood.ron

@@ -0,0 +1,5 @@
+[
+    //1h
+    (1.0, Item("common.items.weapons.axe_1h.wood-0")),
+    (1.0, Item("common.items.weapons.axe_1h.wood-1")),
+]

assets/common/loot_tables/weapons/axe/worn-iron.ron

@@ -1,7 +0,0 @@
-[
-    (1.0, Item("common.items.weapons.axe.worn_iron_axe-0")),
-    (1.0, Item("common.items.weapons.axe.worn_iron_axe-1")),
-    (1.0, Item("common.items.weapons.axe.worn_iron_axe-2")),
-    (1.0, Item("common.items.weapons.axe.worn_iron_axe-3")),
-    (1.0, Item("common.items.weapons.axe.worn_iron_axe-4")),
-]

assets/common/loot_tables/weapons/hammer/wood.ron

@@ -0,0 +1,8 @@
+[
+    //2h
+    (1.0, Item("common.items.weapons.hammer.wood_hammer-0")),
+    //1h
+    (1.0, Item("common.items.weapons.hammer_1h.wood-0")),
+    (1.0, Item("common.items.weapons.hammer_1h.wood-1")),
+]
+]

assets/common/loot_tables/weapons/hammer/worn-iron.ron

@@ -1,6 +0,0 @@
-[
-    (1.0, Item("common.items.weapons.hammer.worn_iron_hammer-0")),
-    (1.0, Item("common.items.weapons.hammer.worn_iron_hammer-1")),
-    (1.0, Item("common.items.weapons.hammer.worn_iron_hammer-2")),
-    (1.0, Item("common.items.weapons.hammer.worn_iron_hammer-3")),
-]

assets/common/loot_tables/weapons/tier-0.ron

@@ -1,7 +1,7 @@
 [
     (1.0, LootTable("common.loot_tables.weapons.sword.stone")),
-    (1.0, LootTable("common.loot_tables.weapons.axe.worn-iron")),
+    (1.0, LootTable("common.loot_tables.weapons.axe.stone")),
-    (1.0, LootTable("common.loot_tables.weapons.hammer.worn-iron")),
+    (1.0, LootTable("common.loot_tables.weapons.hammer.stone")),
     (1.0, LootTable("common.loot_tables.weapons.bow.wood")),
     (1.0, LootTable("common.loot_tables.weapons.staff.wood")),
 ]

assets/voxygen/item_image_manifest.ron

@@ -474,26 +474,6 @@
         "voxel.weapon.axe.2haxe_orc-0",
         (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.13,
     ),
-    Tool("common.items.weapons.axe.worn_iron_axe-0"): VoxTrans(
-        "voxel.weapon.axe.2haxe_worn_iron-0",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.worn_iron_axe-1"): VoxTrans(
-        "voxel.weapon.axe.2haxe_worn_iron-1",
-        (1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.worn_iron_axe-2"): VoxTrans(
-        "voxel.weapon.axe.2haxe_worn_iron-2",
-        (1.0, 0.8, 0.0), (-135.0, 90.0, 0.0), 1.15,
-    ),
-    Tool("common.items.weapons.axe.worn_iron_axe-3"): VoxTrans(
-        "voxel.weapon.axe.2haxe_worn_iron-3",
-        (1.0, 0.5, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.axe.worn_iron_axe-4"): VoxTrans(
-        "voxel.weapon.axe.2haxe_worn_iron-4",
-        (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
-    ),
     Tool("common.items.weapons.axe.bronze_axe-0"): VoxTrans(
         "voxel.weapon.axe.2haxe_bronze-0",
         (1.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
@@ -708,22 +688,6 @@
         "voxel.weapon.hammer.2hhammer_stone-3",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
     ),
-    Tool("common.items.weapons.hammer.worn_iron_hammer-0"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_worn_iron-0",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.worn_iron_hammer-1"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_worn_iron-1",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.worn_iron_hammer-2"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_worn_iron-2",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
-    Tool("common.items.weapons.hammer.worn_iron_hammer-3"): VoxTrans(
-        "voxel.weapon.hammer.2hhammer_worn_iron-3",
-        (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,
-    ),
     Tool("common.items.weapons.hammer.bronze_hammer-0"): VoxTrans(
         "voxel.weapon.hammer.2hhammer_bronze-0",
         (2.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.1,

assets/voxygen/voxel/biped_weapon_manifest.ron

@@ -261,26 +261,6 @@
         vox_spec: ("weapon.axe.2haxe_orc-0", (-1.5, -6.0, -4.5)),
         color: None
     ),
-    "common.items.weapons.axe.worn_iron_axe-0": (
-        vox_spec: ("weapon.axe.2haxe_worn_iron-0", (-1.5, -5.0, -4.0)),
-        color: None
-    ),
-    "common.items.weapons.axe.worn_iron_axe-1": (
-        vox_spec: ("weapon.axe.2haxe_worn_iron-1", (-1.5, -4.0, -4.0)),
-        color: None
-    ),
-    "common.items.weapons.axe.worn_iron_axe-2": (
-        vox_spec: ("weapon.axe.2haxe_worn_iron-2", (-1.5, -4.0, -4.0)),
-        color: None
-    ),
-    "common.items.weapons.axe.worn_iron_axe-3": (
-        vox_spec: ("weapon.axe.2haxe_worn_iron-3", (-1.5, -8.0, -4.0)),//offcenterY
-        color: None
-    ),
-    "common.items.weapons.axe.worn_iron_axe-4": (
-        vox_spec: ("weapon.axe.2haxe_worn_iron-4", (-1.5, -6.0, -5.5)),
-        color: None
-    ),
     "common.items.weapons.axe.bronze_axe-0": (
         vox_spec: ("weapon.axe.2haxe_bronze-0", (-1.5, -7.0, -4.5)),
         color: None
@@ -499,22 +479,6 @@
         vox_spec: ("weapon.hammer.2hhammer_stone-3", (-2.5, -6.5, -5.0)),
         color: None
     ),
-    "common.items.weapons.hammer.worn_iron_hammer-0": (
-        vox_spec: ("weapon.hammer.2hhammer_worn_iron-0", (-2.5, -4.5, -4.0)),
-        color: None
-    ),
-    "common.items.weapons.hammer.worn_iron_hammer-1": (
-        vox_spec: ("weapon.hammer.2hhammer_worn_iron-1", (-2.5, -4.5, -3.0)),
-        color: None
-    ),
-    "common.items.weapons.hammer.worn_iron_hammer-2": (
-        vox_spec: ("weapon.hammer.2hhammer_worn_iron-2", (-2.5, -3.5, -3.0)),
-        color: None
-    ),
-    "common.items.weapons.hammer.worn_iron_hammer-3": (
-        vox_spec: ("weapon.hammer.2hhammer_worn_iron-3", (-2.5, -4.5, -3.0)),
-        color: None
-    ),
     "common.items.weapons.hammer.bronze_hammer-0": (
         vox_spec: ("weapon.hammer.2hhammer_bronze-0", (-2.5, -6.5, -5.0)),
         color: None

server/src/migrations/V36__deduplicate_items.sql

@@ -0,0 +1,19 @@
+-- Replaces 2h weapons that were made into 1h versions
+UPDATE item
+SET item_definition_id = 'common.items.weapons.axe_1h.iron-3' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.axe_1h.iron-0' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-1';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.axe_1h.bronze-0' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-2';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.axe_1h.steel-1' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-3';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.axe_1h.iron-1' WHERE item_definition_id = 'common.items.weapons.axe.worn_iron_axe-4';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.hammer_1h.stone-1' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.hammer_1h.iron-0' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-1';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.hammer_1h.iron-1' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-2';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.hammer_1h.bronze-0' WHERE item_definition_id = 'common.items.weapons.hammer.worn_iron_hammer-3';