diff --git a/assets/common/items/weapons/axe_1h/orichalcum-0.ron b/assets/common/items/weapons/axe_1h/orichalcum-0.ron new file mode 100644 index 0000000000..cfd64ef1a2 --- /dev/null +++ b/assets/common/items/weapons/axe_1h/orichalcum-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Orichalcum Axe", + description: "Forged with orichalcum.", + kind: Tool(( + kind: Axe, + hands: One, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_strength: 1.0, + speed: 1.0, + ), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/hammer_1h/orichalcum-0.ron b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron new file mode 100644 index 0000000000..a5c6c7009b --- /dev/null +++ b/assets/common/items/weapons/hammer_1h/orichalcum-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Orichalcum Mace", + description: "Forged with orichalcum.", + kind: Tool(( + kind: Axe, + hands: One, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_strength: 1.0, + speed: 1.0, + ), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-0.ron b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron new file mode 100644 index 0000000000..0186f5b007 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bloodsteel-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bloodrose", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.45, + poise_strength: 1.0, + speed: 1.3, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-1.ron b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron new file mode 100644 index 0000000000..acc31f3549 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bloodsteel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bloodsteel Sword", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 2.0, + poise_strength: 1.0, + speed: 0.75, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bloodsteel-2.ron b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron new file mode 100644 index 0000000000..b72acb86b8 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bloodsteel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Razorblade", + description: "Infused with blood.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.75, + poise_strength: 1.0, + speed: 1.0, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bronze-0.ron b/assets/common/items/weapons/sword_1h/bronze-0.ron new file mode 100644 index 0000000000..72650414ea --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bronze-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bronze Khopesh", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 0.65, + poise_strength: 1.0, + speed: 1.1, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bronze-1.ron b/assets/common/items/weapons/sword_1h/bronze-1.ron new file mode 100644 index 0000000000..b87e296ab9 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bronze-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bronze Shortsword", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 0.75, + poise_strength: 1.0, + speed: 1.0, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/bronze-2.ron b/assets/common/items/weapons/sword_1h/bronze-2.ron new file mode 100644 index 0000000000..13905573ca --- /dev/null +++ b/assets/common/items/weapons/sword_1h/bronze-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Fanged Blade", + description: "Forged with bronze.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 0.85, + poise_strength: 1.0, + speed: 0.9, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/cobalt-0.ron b/assets/common/items/weapons/sword_1h/cobalt-0.ron new file mode 100644 index 0000000000..22b53da46f --- /dev/null +++ b/assets/common/items/weapons/sword_1h/cobalt-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Shortsword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.3, + poise_strength: 1.0, + speed: 1.2, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/cobalt-1.ron b/assets/common/items/weapons/sword_1h/cobalt-1.ron new file mode 100644 index 0000000000..8a5e1f9fc7 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/cobalt-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Cobalt Warblade", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.7, + poise_strength: 1.0, + speed: 0.8, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/cobalt-2.ron b/assets/common/items/weapons/sword_1h/cobalt-2.ron new file mode 100644 index 0000000000..1e6251d382 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/cobalt-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Falchion", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.4, + poise_strength: 1.0, + speed: 1.1, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/cobalt-3.ron b/assets/common/items/weapons/sword_1h/cobalt-3.ron new file mode 100644 index 0000000000..3cdbe8ba81 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/cobalt-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Forked Sword", + description: "Forged with cobalt.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.6, + poise_strength: 1.0, + speed: 0.9, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/iron-0.ron b/assets/common/items/weapons/sword_1h/iron-0.ron new file mode 100644 index 0000000000..11b89e69fc --- /dev/null +++ b/assets/common/items/weapons/sword_1h/iron-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Gladius", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/iron-1.ron b/assets/common/items/weapons/sword_1h/iron-1.ron new file mode 100644 index 0000000000..f4335f3740 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/iron-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Khopesh", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 0.9, + poise_strength: 1.0, + speed: 1.1, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/iron-2.ron b/assets/common/items/weapons/sword_1h/iron-2.ron new file mode 100644 index 0000000000..479d5a0b80 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/iron-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Scimitar", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_strength: 1.0, + speed: 0.8, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/iron-3.ron b/assets/common/items/weapons/sword_1h/iron-3.ron new file mode 100644 index 0000000000..8ab9418dae --- /dev/null +++ b/assets/common/items/weapons/sword_1h/iron-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Swift Rapier", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 0.8, + poise_strength: 1.0, + speed: 1.2, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/iron-4.ron b/assets/common/items/weapons/sword_1h/iron-4.ron new file mode 100644 index 0000000000..6a1fc6ea43 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/iron-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sword of Man", + description: "Forged with iron.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.1, + poise_strength: 1.0, + speed: 0.9, + ), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/obsidian-0.ron b/assets/common/items/weapons/sword_1h/obsidian-0.ron new file mode 100644 index 0000000000..a7bbcfe291 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/obsidian-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Macuahuitl", + description: "Embedded with obsidian.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.95, + poise_strength: 1.0, + speed: 0.8, + ), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/orichalcum-0.ron b/assets/common/items/weapons/sword_1h/orichalcum-0.ron new file mode 100644 index 0000000000..d325243e10 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/orichalcum-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Diamond Blade", + description: "Forged with orichalcum.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 2.1, + poise_strength: 1.0, + speed: 0.9, + ), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/orichalcum-1.ron b/assets/common/items/weapons/sword_1h/orichalcum-1.ron new file mode 100644 index 0000000000..a6b5bb670c --- /dev/null +++ b/assets/common/items/weapons/sword_1h/orichalcum-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Orichalcum Sword", + description: "Forged with orichalcum.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.9, + poise_strength: 1.0, + speed: 1.1, + ), + )), + quality: Epic, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/steel-0.ron b/assets/common/items/weapons/sword_1h/steel-0.ron new file mode 100644 index 0000000000..d7cf2121e7 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/steel-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Butcher's Blade", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.5, + poise_strength: 1.0, + speed: 0.75, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/steel-1.ron b/assets/common/items/weapons/sword_1h/steel-1.ron new file mode 100644 index 0000000000..56016c62d1 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/steel-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Noble Scimitar", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.3, + poise_strength: 1.0, + speed: .95, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/steel-2.ron b/assets/common/items/weapons/sword_1h/steel-2.ron new file mode 100644 index 0000000000..eede6c0e38 --- /dev/null +++ b/assets/common/items/weapons/sword_1h/steel-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Royal Guard", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.05, + poise_strength: 1.0, + speed: 1.2, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/sword_1h/steel-3.ron b/assets/common/items/weapons/sword_1h/steel-3.ron new file mode 100644 index 0000000000..22bc629bef --- /dev/null +++ b/assets/common/items/weapons/sword_1h/steel-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Steel Sabre", + description: "Forged with steel.", + kind: Tool(( + kind: Sword, + hands: One, + stats: ( + equip_time_millis: 400, + power: 1.2, + poise_strength: 1.0, + speed: 1.05, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index cd14924f2c..203887d3c0 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -279,6 +279,95 @@ "voxel.weapon.sword.frost_cleaver-1", (0.0, 0.0, 0.0), (-135.0, 90.0, 0.0), 1.5, ), + // 1h Swords + Tool("common.items.weapons.sword_1h.bloodsteel-0"): VoxTrans( + "voxel.weapon.sword_1h.bloodsteel-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.bloodsteel-1"): VoxTrans( + "voxel.weapon.sword_1h.bloodsteel-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.bloodsteel-2"): VoxTrans( + "voxel.weapon.sword_1h.bloodsteel-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.bronze-0"): VoxTrans( + "voxel.weapon.sword_1h.bronze-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.bronze-1"): VoxTrans( + "voxel.weapon.sword_1h.bronze-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.bronze-2"): VoxTrans( + "voxel.weapon.sword_1h.bronze-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.cobalt-0"): VoxTrans( + "voxel.weapon.sword_1h.cobalt-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.cobalt-1"): VoxTrans( + "voxel.weapon.sword_1h.cobalt-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.cobalt-2"): VoxTrans( + "voxel.weapon.sword_1h.cobalt-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.cobalt-3"): VoxTrans( + "voxel.weapon.sword_1h.cobalt-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.iron-0"): VoxTrans( + "voxel.weapon.sword_1h.iron-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.iron-1"): VoxTrans( + "voxel.weapon.sword_1h.iron-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.iron-2"): VoxTrans( + "voxel.weapon.sword_1h.iron-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.iron-3"): VoxTrans( + "voxel.weapon.sword_1h.iron-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.iron-4"): VoxTrans( + "voxel.weapon.sword_1h.iron-4", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.obsidian-0"): VoxTrans( + "voxel.weapon.sword_1h.obsidian-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.orichalcum-0"): VoxTrans( + "voxel.weapon.sword_1h.orichalcum-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.orichalcum-1"): VoxTrans( + "voxel.weapon.sword_1h.orichalcum-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.steel-0"): VoxTrans( + "voxel.weapon.sword_1h.steel-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.steel-1"): VoxTrans( + "voxel.weapon.sword_1h.steel-1", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.steel-2"): VoxTrans( + "voxel.weapon.sword_1h.steel-2", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), + Tool("common.items.weapons.sword_1h.steel-3"): VoxTrans( + "voxel.weapon.sword_1h.steel-3", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), // Axes Tool("common.items.weapons.axe.starter_axe"): VoxTrans( "voxel.weapon.axe.2haxe_rusty", @@ -445,6 +534,10 @@ "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.orichalcum-0"): VoxTrans( + "voxel.weapon.axe_1h.orichalcum-0", + (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, @@ -651,6 +744,10 @@ "voxel.weapon.hammer_1h.iron-2", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, ), + Tool("common.items.weapons.hammer_1h.orichalcum-0"): VoxTrans( + "voxel.weapon.hammer_1h.orichalcum-0", + (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + ), Tool("common.items.weapons.hammer_1h.steel-0"): VoxTrans( "voxel.weapon.hammer_1h.steel-0", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index b430b3b0e0..0bf1551d20 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -171,6 +171,95 @@ vox_spec: ("weapon.sword.frost_cleaver-1", (-2.0, -4.5, -7.5)), color: None ), + // 1h Swords + "common.items.weapons.sword_1h.bloodsteel-0": ( + vox_spec: ("voxel.weapon.sword_1h.bloodsteel-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.bloodsteel-1": ( + vox_spec: ("voxel.weapon.sword_1h.bloodsteel-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.bloodsteel-2": ( + vox_spec: ("voxel.weapon.sword_1h.bloodsteel-2", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.bronze-0": ( + vox_spec: ("voxel.weapon.sword_1h.bronze-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.bronze-1": ( + vox_spec: ("voxel.weapon.sword_1h.bronze-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.bronze-2": ( + vox_spec: ("voxel.weapon.sword_1h.bronze-2", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.cobalt-0": ( + vox_spec: ("voxel.weapon.sword_1h.cobalt-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.cobalt-1": ( + vox_spec: ("voxel.weapon.sword_1h.cobalt-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.cobalt-2": ( + vox_spec: ("voxel.weapon.sword_1h.cobalt-2", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.cobalt-3": ( + vox_spec: ("voxel.weapon.sword_1h.cobalt-3", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.iron-0": ( + vox_spec: ("voxel.weapon.sword_1h.iron-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.iron-1": ( + vox_spec: ("voxel.weapon.sword_1h.iron-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.iron-2": ( + vox_spec: ("voxel.weapon.sword_1h.iron-2", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.iron-3": ( + vox_spec: ("voxel.weapon.sword_1h.iron-3", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.iron-4": ( + vox_spec: ("voxel.weapon.sword_1h.iron-4", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.obsidian-0": ( + vox_spec: ("voxel.weapon.sword_1h.obsidian-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.orichalcum-0": ( + vox_spec: ("voxel.weapon.sword_1h.orichalcum-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.orichalcum-1": ( + vox_spec: ("voxel.weapon.sword_1h.orichalcum-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.steel-0": ( + vox_spec: ("voxel.weapon.sword_1h.steel-0", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.steel-1": ( + vox_spec: ("voxel.weapon.sword_1h.steel-1", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.steel-2": ( + vox_spec: ("voxel.weapon.sword_1h.steel-2", (-2.0, -4.5, -7.5)), + color: None + ), + "common.items.weapons.sword_1h.steel-3": ( + vox_spec: ("voxel.weapon.sword_1h.steel-3", (-2.0, -4.5, -7.5)), + color: None + ), // Axes "common.items.weapons.axe.starter_axe": ( vox_spec: ("weapon.axe.2haxe_rusty", (-1.5, -5.0, -4.0)), @@ -337,6 +426,10 @@ vox_spec: ("weapon.axe_1h.iron-3", (-1.5, -5.0, -6.0)), color: None ), + "common.items.weapons.axe_1h.orichalcum-0": ( + vox_spec: ("weapon.axe_1h.orichalcum-0", (-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 @@ -547,6 +640,10 @@ vox_spec: ("weapon.hammer_1h.iron-2", (-1.5, -5.0, -6.0)), color: None ), + "common.items.weapons.hammer_1h.orichalcum-0": ( + vox_spec: ("weapon.hammer_1h.orichalcum-0", (-1.5, -5.0, -6.0)), + color: None + ), "common.items.weapons.hammer_1h.steel-0": ( vox_spec: ("weapon.hammer_1h.steel-0", (-1.5, -5.0, -6.0)), color: None diff --git a/assets/voxygen/voxel/weapon/axe_1h/orichalcum-0.vox b/assets/voxygen/voxel/weapon/axe_1h/orichalcum-0.vox new file mode 100644 index 0000000000..52e02b3371 Binary files /dev/null and b/assets/voxygen/voxel/weapon/axe_1h/orichalcum-0.vox differ diff --git a/assets/voxygen/voxel/weapon/hammer_1h/orichalcum-0.vox b/assets/voxygen/voxel/weapon/hammer_1h/orichalcum-0.vox new file mode 100644 index 0000000000..fbebda965b Binary files /dev/null and b/assets/voxygen/voxel/weapon/hammer_1h/orichalcum-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox new file mode 100644 index 0000000000..3178f49d12 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-1.vox b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-1.vox new file mode 100644 index 0000000000..732b9e62e6 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-2.vox b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-2.vox new file mode 100644 index 0000000000..0009a2bb38 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-2.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox b/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox new file mode 100644 index 0000000000..d1e22a0ace Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox b/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox new file mode 100644 index 0000000000..c87ce5f8f7 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/bronze-2.vox b/assets/voxygen/voxel/weapon/sword_1h/bronze-2.vox new file mode 100644 index 0000000000..f6128482f7 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/bronze-2.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/cobalt-0.vox b/assets/voxygen/voxel/weapon/sword_1h/cobalt-0.vox new file mode 100644 index 0000000000..812db3b4e6 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/cobalt-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/cobalt-1.vox b/assets/voxygen/voxel/weapon/sword_1h/cobalt-1.vox new file mode 100644 index 0000000000..445430d39a Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/cobalt-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/cobalt-2.vox b/assets/voxygen/voxel/weapon/sword_1h/cobalt-2.vox new file mode 100644 index 0000000000..81153bcc5e Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/cobalt-2.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/cobalt-3.vox b/assets/voxygen/voxel/weapon/sword_1h/cobalt-3.vox new file mode 100644 index 0000000000..76c22b6c84 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/cobalt-3.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox new file mode 100644 index 0000000000..1d0ebb98ea Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox new file mode 100644 index 0000000000..744a4236ad Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-2.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-2.vox new file mode 100644 index 0000000000..8b9cbbc50d Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/iron-2.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox new file mode 100644 index 0000000000..cef7f59d97 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/iron-4.vox b/assets/voxygen/voxel/weapon/sword_1h/iron-4.vox new file mode 100644 index 0000000000..1071f4c464 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/iron-4.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/obsidian-0.vox b/assets/voxygen/voxel/weapon/sword_1h/obsidian-0.vox new file mode 100644 index 0000000000..0b31047429 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/obsidian-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/orichalcum-0.vox b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-0.vox new file mode 100644 index 0000000000..b54ddbf4f6 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/orichalcum-1.vox b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-1.vox new file mode 100644 index 0000000000..aa3decbee8 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/steel-0.vox b/assets/voxygen/voxel/weapon/sword_1h/steel-0.vox new file mode 100644 index 0000000000..5e76cc7096 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/steel-0.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/steel-1.vox b/assets/voxygen/voxel/weapon/sword_1h/steel-1.vox new file mode 100644 index 0000000000..c9830ad2c2 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/steel-1.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox b/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox new file mode 100644 index 0000000000..e0af36a19d Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox differ diff --git a/assets/voxygen/voxel/weapon/sword_1h/steel-3.vox b/assets/voxygen/voxel/weapon/sword_1h/steel-3.vox new file mode 100644 index 0000000000..27121c1982 Binary files /dev/null and b/assets/voxygen/voxel/weapon/sword_1h/steel-3.vox differ