From 50cbe42b07c90403e194746b333beeeb23bdf90a Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 13 Feb 2021 23:54:25 -0500 Subject: [PATCH] Added one-handed axes. --- .../common/items/weapons/axe/bronze_axe-1.ron | 2 +- .../items/weapons/axe_1h/bloodsteel-0.ron | 15 ++++ .../items/weapons/axe_1h/bloodsteel-1.ron | 15 ++++ .../common/items/weapons/axe_1h/bronze-0.ron | 15 ++++ .../common/items/weapons/axe_1h/bronze-1.ron | 15 ++++ .../common/items/weapons/axe_1h/cobalt-0.ron | 15 ++++ .../common/items/weapons/axe_1h/cobalt-1.ron | 15 ++++ assets/common/items/weapons/axe_1h/iron-0.ron | 15 ++++ assets/common/items/weapons/axe_1h/iron-1.ron | 15 ++++ assets/common/items/weapons/axe_1h/iron-2.ron | 15 ++++ assets/common/items/weapons/axe_1h/iron-3.ron | 15 ++++ .../common/items/weapons/axe_1h/steel-0.ron | 15 ++++ .../common/items/weapons/axe_1h/steel-1.ron | 15 ++++ .../common/items/weapons/axe_1h/steel-2.ron | 15 ++++ .../common/items/weapons/axe_1h/stone-0.ron | 15 ++++ .../common/items/weapons/axe_1h/stone-1.ron | 15 ++++ assets/common/items/weapons/axe_1h/wood-0.ron | 15 ++++ assets/common/items/weapons/axe_1h/wood-1.ron | 15 ++++ assets/voxygen/item_image_manifest.ron | 69 +++++++++++++++++++ .../voxel/humanoid_main_weapon_manifest.ron | 69 +++++++++++++++++++ .../voxel/weapon/axe_1h/bloodsteel-0.vox | 3 + .../voxel/weapon/axe_1h/bloodsteel-1.vox | 3 + .../voxygen/voxel/weapon/axe_1h/bronze-0.vox | 3 + .../voxygen/voxel/weapon/axe_1h/bronze-1.vox | 3 + .../voxygen/voxel/weapon/axe_1h/cobalt-0.vox | 3 + .../voxygen/voxel/weapon/axe_1h/cobalt-1.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/iron-0.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/iron-1.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/iron-2.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/iron-3.vox | 3 + .../voxygen/voxel/weapon/axe_1h/steel-0.vox | 3 + .../voxygen/voxel/weapon/axe_1h/steel-1.vox | 3 + .../voxygen/voxel/weapon/axe_1h/steel-2.vox | 3 + .../voxygen/voxel/weapon/axe_1h/stone-0.vox | 3 + .../voxygen/voxel/weapon/axe_1h/stone-1.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/wood-0.vox | 3 + assets/voxygen/voxel/weapon/axe_1h/wood-1.vox | 3 + common/src/bin/csv_export/main.rs | 2 +- 38 files changed, 446 insertions(+), 2 deletions(-) create mode 100644 assets/common/items/weapons/axe_1h/bloodsteel-0.ron create mode 100644 assets/common/items/weapons/axe_1h/bloodsteel-1.ron create mode 100644 assets/common/items/weapons/axe_1h/bronze-0.ron create mode 100644 assets/common/items/weapons/axe_1h/bronze-1.ron create mode 100644 assets/common/items/weapons/axe_1h/cobalt-0.ron create mode 100644 assets/common/items/weapons/axe_1h/cobalt-1.ron create mode 100644 assets/common/items/weapons/axe_1h/iron-0.ron create mode 100644 assets/common/items/weapons/axe_1h/iron-1.ron create mode 100644 assets/common/items/weapons/axe_1h/iron-2.ron create mode 100644 assets/common/items/weapons/axe_1h/iron-3.ron create mode 100644 assets/common/items/weapons/axe_1h/steel-0.ron create mode 100644 assets/common/items/weapons/axe_1h/steel-1.ron create mode 100644 assets/common/items/weapons/axe_1h/steel-2.ron create mode 100644 assets/common/items/weapons/axe_1h/stone-0.ron create mode 100644 assets/common/items/weapons/axe_1h/stone-1.ron create mode 100644 assets/common/items/weapons/axe_1h/wood-0.ron create mode 100644 assets/common/items/weapons/axe_1h/wood-1.ron create mode 100644 assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/steel-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/steel-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/steel-2.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/stone-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/stone-1.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/wood-0.vox create mode 100644 assets/voxygen/voxel/weapon/axe_1h/wood-1.vox diff --git a/assets/common/items/weapons/axe/bronze_axe-1.ron b/assets/common/items/weapons/axe/bronze_axe-1.ron index f29e1fa748..a367894890 100644 --- a/assets/common/items/weapons/axe/bronze_axe-1.ron +++ b/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, diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-0.ron b/assets/common/items/weapons/axe_1h/bloodsteel-0.ron new file mode 100644 index 0000000000..ff83344551 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bloodsteel-1.ron b/assets/common/items/weapons/axe_1h/bloodsteel-1.ron new file mode 100644 index 0000000000..c70238529d --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bronze-0.ron b/assets/common/items/weapons/axe_1h/bronze-0.ron new file mode 100644 index 0000000000..82f6f2ecd6 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/bronze-1.ron b/assets/common/items/weapons/axe_1h/bronze-1.ron new file mode 100644 index 0000000000..d3d8bb8867 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/cobalt-0.ron b/assets/common/items/weapons/axe_1h/cobalt-0.ron new file mode 100644 index 0000000000..52ff231f01 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/cobalt-1.ron b/assets/common/items/weapons/axe_1h/cobalt-1.ron new file mode 100644 index 0000000000..79a1ef2e47 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-0.ron b/assets/common/items/weapons/axe_1h/iron-0.ron new file mode 100644 index 0000000000..c6c42687dd --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-1.ron b/assets/common/items/weapons/axe_1h/iron-1.ron new file mode 100644 index 0000000000..56e6e46af9 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-2.ron b/assets/common/items/weapons/axe_1h/iron-2.ron new file mode 100644 index 0000000000..e0866cb192 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/iron-3.ron b/assets/common/items/weapons/axe_1h/iron-3.ron new file mode 100644 index 0000000000..0e73baf4b9 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-0.ron b/assets/common/items/weapons/axe_1h/steel-0.ron new file mode 100644 index 0000000000..f431a5037d --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-1.ron b/assets/common/items/weapons/axe_1h/steel-1.ron new file mode 100644 index 0000000000..e1125715e9 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/steel-2.ron b/assets/common/items/weapons/axe_1h/steel-2.ron new file mode 100644 index 0000000000..d6da77ad50 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/stone-0.ron b/assets/common/items/weapons/axe_1h/stone-0.ron new file mode 100644 index 0000000000..bf58d6e712 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/stone-1.ron b/assets/common/items/weapons/axe_1h/stone-1.ron new file mode 100644 index 0000000000..5617e4c08a --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/wood-0.ron b/assets/common/items/weapons/axe_1h/wood-0.ron new file mode 100644 index 0000000000..f24973cc0e --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe_1h/wood-1.ron b/assets/common/items/weapons/axe_1h/wood-1.ron new file mode 100644 index 0000000000..811983a753 --- /dev/null +++ b/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, +) \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 26f4edfb57..93114cfaba 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/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", diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 841c582eb6..0adfac564c 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/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)), diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox new file mode 100644 index 0000000000..3e79b3e4e9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b775d2bda4066cb06c47f176db3a079288d491125e6752cc66567d642bfbe1d7 +size 1372 diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox new file mode 100644 index 0000000000..7c1dc283dc --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b3ed736ed988fc830403affd8028fb936edbf334c38745e19c39f18bf53a26b +size 1420 diff --git a/assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox new file mode 100644 index 0000000000..d3782dc5fe --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/bronze-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cefe36bc327efed7df4a647d7afea5e1595143aa70abd305d195e5f79ba28606 +size 1380 diff --git a/assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox b/assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox new file mode 100644 index 0000000000..fa4a42f56c --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/bronze-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64bf3932ac8cd260e85cd1cf16fab9128e29254c54463f598f0bc2fdd1bc464b +size 1392 diff --git a/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox b/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox new file mode 100644 index 0000000000..f2f45f5d48 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b7696e2014076f71249ef5952b5abcd87ac820a9524faa1494b2088faaffe17 +size 1460 diff --git a/assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox b/assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox new file mode 100644 index 0000000000..8be945daa2 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/cobalt-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b810369a2524c3379ff3d92ba244a6bb567cfa7ee7b968bbeb619efbd5ccacbd +size 1544 diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-0.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-0.vox new file mode 100644 index 0000000000..ba856993bc --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/iron-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a62e8d72ef0c8a36e2eeceb56bd34621305f595b22e72ff0ea5e1215037030a +size 1380 diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-1.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-1.vox new file mode 100644 index 0000000000..091370d98d --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/iron-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d496f5878a9dc9897ad71143787f00a27352a8963a041bd6c84a28873dab0fa5 +size 1504 diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-2.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-2.vox new file mode 100644 index 0000000000..8499437079 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/iron-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fd5265f0c7d64fd6f01cc52c0dbea6bdaf19cda378f79214db6a5e88c40a9f5 +size 1356 diff --git a/assets/voxygen/voxel/weapon/axe_1h/iron-3.vox b/assets/voxygen/voxel/weapon/axe_1h/iron-3.vox new file mode 100644 index 0000000000..efddcef509 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/iron-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdeeec6612c74b930ac2becc3b80f156fa802d1455ac3ed435b5ae1cc1b17e0b +size 1480 diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox new file mode 100644 index 0000000000..a4741b2655 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7448f39faf1dd18a55cbe630f1a60a39b2f00c78f61c96c2358c5933138c48b +size 1456 diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-1.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-1.vox new file mode 100644 index 0000000000..799722ffda --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/steel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cafa32b99792535f62588048bcc55d976c3d9c01d63c7f69020cf680941daa31 +size 1424 diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-2.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-2.vox new file mode 100644 index 0000000000..b29980fbfd --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/steel-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e26ad5d492ac0f6da7da720d00235c16de81ed5a487bdad47a64a56838e419 +size 1444 diff --git a/assets/voxygen/voxel/weapon/axe_1h/stone-0.vox b/assets/voxygen/voxel/weapon/axe_1h/stone-0.vox new file mode 100644 index 0000000000..28643c0ff9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/stone-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84afad5f98fa515c7f9b1e3c2443ac2dd54040674cb265c8a46d703669baeeba +size 1508 diff --git a/assets/voxygen/voxel/weapon/axe_1h/stone-1.vox b/assets/voxygen/voxel/weapon/axe_1h/stone-1.vox new file mode 100644 index 0000000000..5c8651e203 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/stone-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:997b72661929669470870b20ce36b3f1c3803e06856b84ae9ffd067b438dcbbe +size 1396 diff --git a/assets/voxygen/voxel/weapon/axe_1h/wood-0.vox b/assets/voxygen/voxel/weapon/axe_1h/wood-0.vox new file mode 100644 index 0000000000..148e62aaf7 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/wood-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9363e47237cdb98a555a295aa5858c930f4e3b517288fe9b1ed268193254d9f3 +size 1488 diff --git a/assets/voxygen/voxel/weapon/axe_1h/wood-1.vox b/assets/voxygen/voxel/weapon/axe_1h/wood-1.vox new file mode 100644 index 0000000000..81487c12e2 --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/wood-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38605b2361ea20f7b928429eb1e59e8785f45b9d7f6eedd36be7dd4eb4b39ef9 +size 1404 diff --git a/common/src/bin/csv_export/main.rs b/common/src/bin/csv_export/main.rs index 6bcb4fd6b4..77ca87dc98 100644 --- a/common/src/bin/csv_export/main.rs +++ b/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;