From cfadd6da04af1ce66a2904253acc5f3fb4bc9ba6 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 19 Feb 2021 19:33:26 -0500 Subject: [PATCH] Added 1h swords. --- .../items/weapons/axe_1h/orichalcum-0.ron | 16 +++ .../items/weapons/hammer_1h/orichalcum-0.ron | 16 +++ .../items/weapons/sword_1h/bloodsteel-0.ron | 16 +++ .../items/weapons/sword_1h/bloodsteel-1.ron | 16 +++ .../items/weapons/sword_1h/bloodsteel-2.ron | 16 +++ .../items/weapons/sword_1h/bronze-0.ron | 16 +++ .../items/weapons/sword_1h/bronze-1.ron | 16 +++ .../items/weapons/sword_1h/bronze-2.ron | 16 +++ .../items/weapons/sword_1h/cobalt-0.ron | 16 +++ .../items/weapons/sword_1h/cobalt-1.ron | 16 +++ .../items/weapons/sword_1h/cobalt-2.ron | 16 +++ .../items/weapons/sword_1h/cobalt-3.ron | 16 +++ .../common/items/weapons/sword_1h/iron-0.ron | 16 +++ .../common/items/weapons/sword_1h/iron-1.ron | 16 +++ .../common/items/weapons/sword_1h/iron-2.ron | 16 +++ .../common/items/weapons/sword_1h/iron-3.ron | 16 +++ .../common/items/weapons/sword_1h/iron-4.ron | 16 +++ .../items/weapons/sword_1h/obsidian-0.ron | 16 +++ .../items/weapons/sword_1h/orichalcum-0.ron | 16 +++ .../items/weapons/sword_1h/orichalcum-1.ron | 16 +++ .../common/items/weapons/sword_1h/steel-0.ron | 16 +++ .../common/items/weapons/sword_1h/steel-1.ron | 16 +++ .../common/items/weapons/sword_1h/steel-2.ron | 16 +++ .../common/items/weapons/sword_1h/steel-3.ron | 16 +++ assets/voxygen/item_image_manifest.ron | 97 +++++++++++++++++++ .../voxel/humanoid_main_weapon_manifest.ron | 97 +++++++++++++++++++ .../voxel/weapon/axe_1h/orichalcum-0.vox | 3 + .../voxel/weapon/hammer_1h/orichalcum-0.vox | 3 + .../voxel/weapon/sword_1h/bloodsteel-0.vox | 3 + .../voxel/weapon/sword_1h/bloodsteel-1.vox | 3 + .../voxel/weapon/sword_1h/bloodsteel-2.vox | 3 + .../voxel/weapon/sword_1h/bronze-0.vox | 3 + .../voxel/weapon/sword_1h/bronze-1.vox | 3 + .../voxel/weapon/sword_1h/bronze-2.vox | 3 + .../voxel/weapon/sword_1h/cobalt-0.vox | 3 + .../voxel/weapon/sword_1h/cobalt-1.vox | 3 + .../voxel/weapon/sword_1h/cobalt-2.vox | 3 + .../voxel/weapon/sword_1h/cobalt-3.vox | 3 + .../voxygen/voxel/weapon/sword_1h/iron-0.vox | 3 + .../voxygen/voxel/weapon/sword_1h/iron-1.vox | 3 + .../voxygen/voxel/weapon/sword_1h/iron-2.vox | 3 + .../voxygen/voxel/weapon/sword_1h/iron-3.vox | 3 + .../voxygen/voxel/weapon/sword_1h/iron-4.vox | 3 + .../voxel/weapon/sword_1h/obsidian-0.vox | 3 + .../voxel/weapon/sword_1h/orichalcum-0.vox | 3 + .../voxel/weapon/sword_1h/orichalcum-1.vox | 3 + .../voxygen/voxel/weapon/sword_1h/steel-0.vox | 3 + .../voxygen/voxel/weapon/sword_1h/steel-1.vox | 3 + .../voxygen/voxel/weapon/sword_1h/steel-2.vox | 3 + .../voxygen/voxel/weapon/sword_1h/steel-3.vox | 3 + 50 files changed, 650 insertions(+) create mode 100644 assets/common/items/weapons/axe_1h/orichalcum-0.ron create mode 100644 assets/common/items/weapons/hammer_1h/orichalcum-0.ron create mode 100644 assets/common/items/weapons/sword_1h/bloodsteel-0.ron create mode 100644 assets/common/items/weapons/sword_1h/bloodsteel-1.ron create mode 100644 assets/common/items/weapons/sword_1h/bloodsteel-2.ron create mode 100644 assets/common/items/weapons/sword_1h/bronze-0.ron create mode 100644 assets/common/items/weapons/sword_1h/bronze-1.ron create mode 100644 assets/common/items/weapons/sword_1h/bronze-2.ron create mode 100644 assets/common/items/weapons/sword_1h/cobalt-0.ron create mode 100644 assets/common/items/weapons/sword_1h/cobalt-1.ron create mode 100644 assets/common/items/weapons/sword_1h/cobalt-2.ron create mode 100644 assets/common/items/weapons/sword_1h/cobalt-3.ron create mode 100644 assets/common/items/weapons/sword_1h/iron-0.ron create mode 100644 assets/common/items/weapons/sword_1h/iron-1.ron create mode 100644 assets/common/items/weapons/sword_1h/iron-2.ron create mode 100644 assets/common/items/weapons/sword_1h/iron-3.ron create mode 100644 assets/common/items/weapons/sword_1h/iron-4.ron create mode 100644 assets/common/items/weapons/sword_1h/obsidian-0.ron create mode 100644 assets/common/items/weapons/sword_1h/orichalcum-0.ron create mode 100644 assets/common/items/weapons/sword_1h/orichalcum-1.ron create mode 100644 assets/common/items/weapons/sword_1h/steel-0.ron create mode 100644 assets/common/items/weapons/sword_1h/steel-1.ron create mode 100644 assets/common/items/weapons/sword_1h/steel-2.ron create mode 100644 assets/common/items/weapons/sword_1h/steel-3.ron create mode 100644 assets/voxygen/voxel/weapon/axe_1h/orichalcum-0.vox create mode 100644 assets/voxygen/voxel/weapon/hammer_1h/orichalcum-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bloodsteel-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bloodsteel-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/bronze-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/cobalt-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/cobalt-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/cobalt-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/cobalt-3.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/iron-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/iron-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/iron-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/iron-3.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/iron-4.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/obsidian-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/orichalcum-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/orichalcum-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/steel-0.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/steel-1.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/steel-2.vox create mode 100644 assets/voxygen/voxel/weapon/sword_1h/steel-3.vox 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..78dee61d1f --- /dev/null +++ b/assets/voxygen/voxel/weapon/axe_1h/orichalcum-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:452f22921d68cdba66ec55f95a6a2f59d5b00e93e5f6939fbefba5fde9b93a64 +size 1592 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..41d8076101 --- /dev/null +++ b/assets/voxygen/voxel/weapon/hammer_1h/orichalcum-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:708c5a7ac8eff4236b1b5b57a26c443084bd7796d938e1502bad269d1d973782 +size 1480 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..7a23fb8293 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75f016516a34e6aeaf58281da8905a0069e1478b0864b5c83ca41e49797860c3 +size 1348 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..f02b5cd40b --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c32bb80787b8c749c67164a6cee2d2348bea769454f9d6525bcc25310bc85bf +size 1408 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..740ddf624e --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bloodsteel-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d10a17ae0cbc1c13281e067f614a0eefb6989415c69d723f7dd55dceb0287c7 +size 1356 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..1bd430ba3c --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bronze-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1409c845b4d88ed3abe574e3c50e6e0b263c688aad021f183f35c4cb851093c +size 1284 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..6d5eb7f172 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bronze-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4977291be4cf152d55e3b21405309e2ed5fea8d6dd49c6e3550f6b40a6e6e5b +size 1308 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..7cf9ef1f54 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/bronze-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86ace29478b8f9dc3579c9b3452b650c0b2d3ecd13a420d0cb6e57836ebf384e +size 1336 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..d9562a3895 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/cobalt-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dc6835cf238241523d2ab669ee5f73069370696c8252d8578975b790f8069ed +size 1332 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..e1192d2534 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/cobalt-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c81695737cc86f5c7bc9eba266c9a93e8ba3039b48fda90a6be14a9fb8ff21c +size 1480 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..80c595d832 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/cobalt-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a11949adaf64f798c0f73aa41a5d10d4c065350c66f451d95ff40ef6c29df2d9 +size 1380 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..5f91fc093d --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/cobalt-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae865f7793bc2e9c0bff91bd057fd4526884fcd0774131411701edb0e69c5a34 +size 1372 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..7862e18254 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/iron-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be62bfe84b673663c9b8c039f2c4ae7c96668498d9f318e7c2951be82552b87f +size 1300 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..5c93fe60dd --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/iron-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84efc07a12daa8ca896c1529688dc5c5db3d34ef76b0c12508a046b00e74ded8 +size 1300 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..00265ae2c4 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/iron-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8758b41d966612e6be90461260ee483f1735483ee1bc47f986aae697fefdfd87 +size 1364 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..65fb36add4 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/iron-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e60534ddbdb1a1e5165ef947c9e6c9cdd971b2cf9ba9ec4e46aab76b497fc97 +size 1272 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..7de3148dbd --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/iron-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91b9c63a8869eb82cb9ee35517321a6cd20ad4c360ed404cda87b87fad649eca +size 1324 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..2728f7b312 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/obsidian-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0fe4b5ae2e2441a6c856fcd9ae13a61d75d51638caf9fe06467b99f51f8cdc5 +size 1664 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..421dbcf217 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:415b372c0d5b69c39ee92fc604238196c128bd2b952ce2e63e890b0265ae3858 +size 1488 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..ee16e53a7c --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/orichalcum-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aef691095a2e623d64de698cd860c7283271d5435353ed7c981098ab0133a43 +size 1396 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..cf8dd9e717 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/steel-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b444aa74c9c483eddb57632b5ca8e0a162091f1c836ce740c4f268c546452b15 +size 1372 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..1c0c61c3d9 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/steel-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afeb72d78425246d027cee8bbd75d6cd023f791dba0cfe6c8b24df2796f4d8e6 +size 1432 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..c6177048dd --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/steel-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60f82c89cd1538e7d9e3742005f9dcd386d8e20f4322d2e751675dd72949b6c4 +size 1332 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..2bb0146546 --- /dev/null +++ b/assets/voxygen/voxel/weapon/sword_1h/steel-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5c9487b2edcba1689336e42478419dbaa72263bf2b9f2908341fd02e1e8bba0 +size 1304