diff --git a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron index 563e000679..ca005ed334 100644 --- a/assets/common/items/weapons/axe/bloodsteel_axe-2.ron +++ b/assets/common/items/weapons/axe/bloodsteel_axe-2.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Tribal Axe", - description: "Some tribes call for metal alloys to be formed in the blood of an animal carcass to ensure the resultant axe is honed for striking their enemy\'s veins.", + name: "Skull Axe", + description: "Infused with blood.", kind: Tool(( kind: Axe, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.6, - poise_strength: 1.4, + poise_strength: 1.8, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/axe/bronze_axe-2.ron b/assets/common/items/weapons/axe/bronze_axe-2.ron new file mode 100644 index 0000000000..bb2c6ef8c1 --- /dev/null +++ b/assets/common/items/weapons/axe/bronze_axe-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Tribal Axe", + description: "Stained with the blood of its wielder's enemies.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.0, + poise_strength: 1.4, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/cobalt_axe-1.ron b/assets/common/items/weapons/axe/cobalt_axe-1.ron new file mode 100644 index 0000000000..8607fcf969 --- /dev/null +++ b/assets/common/items/weapons/axe/cobalt_axe-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Cleaver", + description: "Forged with cobalt.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.8, + poise_strength: 1.0, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/axe/parashu.ron b/assets/common/items/weapons/axe/parashu.ron new file mode 100644 index 0000000000..932c189188 --- /dev/null +++ b/assets/common/items/weapons/axe/parashu.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Parashu", + description: "Said to be able to cleave the heavens.", + kind: Tool(( + kind: Axe, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.5, + poise_strength: 1.8, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_cave_large.ron b/assets/common/loot_tables/loot_table_cave_large.ron index fa0b8a83c0..ea8f9d5fe5 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -31,6 +31,7 @@ (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), (0.02, "common.items.weapons.axe.bloodsteel_axe-2"), (0.01, "common.items.weapons.axe.cobalt_axe-0"), + (0.01, "common.items.weapons.axe.cobalt_axe-1"), (0.001, "common.items.weapons.axe.malachite_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-7"), (0.04, "common.items.weapons.axe.iron_axe-8"), diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index 522067b488..c8c40292ca 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -127,6 +127,7 @@ // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), + (0.15, "common.items.weapons.axe.bronze_axe-2"), (0.04, "common.items.weapons.axe.iron_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-1"), (0.04, "common.items.weapons.axe.iron_axe-2"), @@ -185,7 +186,7 @@ (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.10, "common.items.weapons.axe.malachite_axe-0"), + (0.001, "common.items.weapons.axe.parashu"), // healing staff (0.25, "common.items.weapons.sceptre.staff_nature"), // staves diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index df0c9c4b9e..d75e12fa71 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -13,7 +13,9 @@ (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.30, "common.items.weapons.axe.cobalt_axe-1"), (0.10, "common.items.weapons.axe.malachite_axe-0"), + (0.01, "common.items.weapons.axe.parashu"), // healing staff (0.15, "common.items.weapons.sceptre.loops0"), (0.10, "common.items.weapons.sceptre.fork0"), diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index bf60c01102..cf8ede00b8 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -26,6 +26,7 @@ // axes (0.15, "common.items.weapons.axe.bronze_axe-0"), (0.15, "common.items.weapons.axe.bronze_axe-1"), + (0.15, "common.items.weapons.axe.bronze_axe-2"), (0.04, "common.items.weapons.axe.iron_axe-0"), (0.04, "common.items.weapons.axe.iron_axe-1"), (0.04, "common.items.weapons.axe.iron_axe-2"), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 59983a57a8..c3180f8354 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -397,6 +397,10 @@ "voxel.weapon.axe.2haxe_bronze-1", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.bronze_axe-2"): VoxTrans( + "voxel.weapon.axe.2haxe_bronze-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), Tool("common.items.weapons.axe.iron_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_iron-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, @@ -481,10 +485,18 @@ "voxel.weapon.axe.2haxe_cobalt-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.cobalt_axe-1"): VoxTrans( + "voxel.weapon.axe.2haxe_cobalt-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), Tool("common.items.weapons.axe.malachite_axe-0"): VoxTrans( "voxel.weapon.axe.2haxe_malachite-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.axe.parashu"): VoxTrans( + "voxel.weapon.axe.parashu", + (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", diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index a3fc00748b..2dd1d86377 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -289,6 +289,10 @@ vox_spec: ("weapon.axe.2haxe_bronze-1", (-1.5, -3.0, -5.5)), color: None ), + "common.items.weapons.axe.bronze_axe-2": ( + vox_spec: ("weapon.axe.2haxe_bronze-2", (-1.5, -3.0, -5.5)), + color: None + ), "common.items.weapons.axe.iron_axe-0": ( vox_spec: ("weapon.axe.2haxe_iron-0", (-1.5, -5.0, -5.5)), color: None @@ -373,10 +377,18 @@ vox_spec: ("weapon.axe.2haxe_cobalt-0", (-1.5, -5.0, -5.5)), color: None ), + "common.items.weapons.axe.cobalt_axe-1": ( + vox_spec: ("weapon.axe.2haxe_cobalt-1", (-1.5, -5.0, -5.5)), + color: None + ), "common.items.weapons.axe.malachite_axe-0": ( vox_spec: ("weapon.axe.2haxe_malachite-0", (-1.5, -5.0, -6.0)), color: None ), + "common.items.weapons.axe.parashu": ( + vox_spec: ("weapon.axe.parashu", (-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)), diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox index bdc33b04eb..edd95735ae 100644 Binary files a/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox and b/assets/voxygen/voxel/weapon/axe/2haxe_bloodsteel-2.vox differ diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox b/assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox new file mode 100644 index 0000000000..bdc33b04eb Binary files /dev/null and b/assets/voxygen/voxel/weapon/axe/2haxe_bronze-2.vox differ diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox b/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox new file mode 100644 index 0000000000..94b8456daa Binary files /dev/null and b/assets/voxygen/voxel/weapon/axe/2haxe_cobalt-1.vox differ diff --git a/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox b/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox index 492dbf22d1..aebd8da494 100644 Binary files a/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox and b/assets/voxygen/voxel/weapon/axe/2haxe_malachite-0.vox differ diff --git a/assets/voxygen/voxel/weapon/axe/parashu.vox b/assets/voxygen/voxel/weapon/axe/parashu.vox new file mode 100644 index 0000000000..231686cbce Binary files /dev/null and b/assets/voxygen/voxel/weapon/axe/parashu.vox differ