Added one-handed axes.

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

@@ -3,7 +3,7 @@ ItemDef(
     description: "While the metal alloy is relatively simple, this unique circular axe has a unique appearance.",
     kind: Tool((
         kind: Axe,
-        hands: OneHand,
+        hands: TwoHand,
         stats: (
             equip_time_millis: 400,
             power: 1.0,

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Crimson Tomahawk",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 1.3,
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Nsapo Axe",
+    description: "Infused with blood.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 2.0,
+            poise_strength: 1.0,
+            speed: 0.8,
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Bronze Hatchet",
+    description: "Forged from bronze.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Bronze Kilonda",
+    description: "Forged from bronze.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.1,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Mooncleaver",
+    description: "Forged from cobalt.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.6,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Skullsplitter",
+    description: "Forged from cobalt.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.75,
+            poise_strength: 1.0,
+            speed: 0.85,
+        ),
+    )),
+    quality: High,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Bearded Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.1,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Beetle Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.3,
+            poise_strength: 1.0,
+            speed: 0.9,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Iron Tomahawk",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.0,
+            poise_strength: 1.0,
+            speed: 1.2,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Orcish Axe",
+    description: "Forged from iron.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.2,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Doloire",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.5,
+            poise_strength: 1.0,
+            speed: 0.9,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Steel Hatchet",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.4,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Steel Kilonda",
+    description: "Forged from steel.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 1.3,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Moderate,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Flint Axe",
+    description: "Chiseled from stone.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.8,
+            poise_strength: 1.0,
+            speed: 1.0,
+        ),
+    )),
+    quality: Common,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Stone Cleaver",
+    description: "Chiseled from stone.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.7,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Common,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Wooden Cleaver",
+    description: "Carved from wood.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.8,
+            poise_strength: 1.0,
+            speed: 0.8,
+        ),
+    )),
+    quality: Low,
+)

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

@@ -0,0 +1,15 @@
+ItemDef(
+    name: "Wooden Hatchet",
+    description: "Carved from wood.",
+    kind: Tool((
+        kind: Axe,
+        hands: OneHand,
+        stats: (
+            equip_time_millis: 400,
+            power: 0.5,
+            poise_strength: 1.0,
+            speed: 1.1,
+        ),
+    )),
+    quality: Low,
+)

assets/voxygen/item_image_manifest.ron

@@ -404,6 +404,75 @@
         "voxel.weapon.axe.2haxe_malachite-0",
         (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
     ),
+    // 1h Axes
+    Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans(
+        "voxel.weapon.axe_1h.bloodsteel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans(
+        "voxel.weapon.axe_1h.bloodsteel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans(
+        "voxel.weapon.axe_1h.bronze-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans(
+        "voxel.weapon.axe_1h.bronze-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans(
+        "voxel.weapon.axe_1h.cobalt-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans(
+        "voxel.weapon.axe_1h.cobalt-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans(
+        "voxel.weapon.axe_1h.iron-3",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans(
+        "voxel.weapon.axe_1h.steel-2",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans(
+        "voxel.weapon.axe_1h.stone-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans(
+        "voxel.weapon.axe_1h.stone-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans(
+        "voxel.weapon.axe_1h.wood-0",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
+    Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans(
+        "voxel.weapon.axe_1h.wood-1",
+        (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2,
+    ),
     // Hammers
     Tool("common.items.weapons.hammer.hammer_1"): VoxTrans(
         "voxel.weapon.hammer.2hhammer_rusty",

assets/voxygen/voxel/humanoid_main_weapon_manifest.ron

@@ -296,6 +296,75 @@
         vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)),
         color: None
     ),
+    // 1h Axes
+    "common.items.weapons.axe_1h.bloodsteel-0": (
+        vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.bloodsteel-1": (
+        vox_spec: ("weapon.axe_1h.bloodsteel-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.bronze-0": (
+        vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.bronze-1": (
+        vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.cobalt-0": (
+        vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.cobalt-1": (
+        vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.iron-0": (
+        vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.iron-1": (
+        vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.iron-2": (
+        vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.iron-3": (
+        vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.steel-0": (
+        vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.steel-1": (
+        vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.steel-2": (
+        vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.stone-0": (
+        vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.stone-1": (
+        vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.wood-0": (
+        vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
+    "common.items.weapons.axe_1h.wood-1": (
+        vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -6.0)),
+        color: None
+    ),
     // Hammers
     "common.items.weapons.hammer.hammer_1": (
         vox_spec: ("weapon.hammer.2hhammer_rusty", (-2.5, -5.5, -4.5)),

common/src/bin/csv_export/main.rs

@@ -5,7 +5,7 @@ use structopt::StructOpt;
 
 use comp::item::{
     armor::{ArmorKind, Protection},
-    tool::ToolKind,
+    tool::{Hands, Tool, ToolKind},
     ItemKind,
 };
 use veloren_common::comp;