From f4d25ff5c04c824e93310ae6f4088d7383e31df9 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 24 Feb 2021 20:37:43 -0500 Subject: [PATCH] Bows --- assets/common/items/weapons/bow/bone-0.ron | 16 +++ assets/common/items/weapons/bow/bone-1.ron | 16 +++ .../bow/{horn_longbow-0.ron => bone-2.ron} | 6 +- assets/common/items/weapons/bow/bone-3.ron | 16 +++ assets/common/items/weapons/bow/eldwood-0.ron | 16 +++ assets/common/items/weapons/bow/eldwood-1.ron | 16 +++ assets/common/items/weapons/bow/eldwood-2.ron | 16 +++ .../common/items/weapons/bow/frostwood-0.ron | 16 +++ .../{wood_shortbow-1.ron => frostwood-1.ron} | 10 +- .../common/items/weapons/bow/frostwood-2.ron | 16 +++ .../common/items/weapons/bow/hardwood-0.ron | 16 +++ .../common/items/weapons/bow/hardwood-1.ron | 16 +++ .../{leafy_longbow-0.ron => hardwood-2.ron} | 8 +- .../common/items/weapons/bow/hardwood-3.ron | 16 +++ .../{wood_longbow-1.ron => hardwood-4.ron} | 8 +- .../common/items/weapons/bow/hardwood-5.ron | 16 +++ .../bow/{iron_longbow-0.ron => metal-0.ron} | 8 +- .../bow/{rare_longbow.ron => metal-1.ron} | 10 +- assets/common/items/weapons/bow/metal-2.ron | 16 +++ assets/common/items/weapons/bow/metal-3.ron | 16 +++ assets/common/items/weapons/bow/metal-4.ron | 16 +++ assets/common/items/weapons/bow/rawwood-0.ron | 16 +++ assets/common/items/weapons/bow/rawwood-1.ron | 16 +++ assets/common/items/weapons/bow/sagitta.ron | 16 +++ .../bow/{starter_bow.ron => starter.ron} | 0 ...{nature_ore_longbow-0.ron => velorite.ron} | 0 .../bow/{leafy_shortbow-0.ron => wood-0.ron} | 10 +- assets/common/items/weapons/bow/wood-1.ron | 16 +++ .../bow/{wood_shortbow-0.ron => wood-2.ron} | 6 +- .../bow/{wood_longbow-0.ron => wood-3.ron} | 8 +- assets/common/items/weapons/bow/wood-4.ron | 16 +++ .../loot_tables/loot_table_cave_large.ron | 16 ++- .../loot_tables/loot_table_cultists.ron | 46 +++++-- .../loot_tables/loot_table_humanoids.ron | 3 +- .../loot_tables/loot_table_villager.ron | 3 +- .../loot_tables/loot_table_weapon_common.ron | 12 +- .../loot_tables/loot_table_weapon_rare.ron | 10 +- .../loot_table_weapon_uncommon.ron | 19 ++- assets/common/recipe_book.ron | 2 +- assets/voxygen/item_image_manifest.ron | 124 ++++++++++++++---- .../voxel/humanoid_main_weapon_manifest.ron | 124 ++++++++++++++---- assets/voxygen/voxel/weapon/bow/bone-0.vox | Bin 0 -> 1424 bytes assets/voxygen/voxel/weapon/bow/bone-1.vox | Bin 0 -> 1752 bytes assets/voxygen/voxel/weapon/bow/bone-2.vox | Bin 0 -> 1460 bytes assets/voxygen/voxel/weapon/bow/bone-3.vox | Bin 0 -> 1496 bytes assets/voxygen/voxel/weapon/bow/eldwood-0.vox | Bin 0 -> 1552 bytes assets/voxygen/voxel/weapon/bow/eldwood-1.vox | Bin 0 -> 1592 bytes assets/voxygen/voxel/weapon/bow/eldwood-2.vox | Bin 0 -> 1456 bytes .../voxygen/voxel/weapon/bow/frostwood-0.vox | Bin 0 -> 1592 bytes .../voxygen/voxel/weapon/bow/frostwood-1.vox | Bin 0 -> 1512 bytes .../voxygen/voxel/weapon/bow/frostwood-2.vox | Bin 0 -> 1384 bytes .../voxygen/voxel/weapon/bow/hardwood-0.vox | Bin 0 -> 1360 bytes .../voxygen/voxel/weapon/bow/hardwood-1.vox | Bin 0 -> 1424 bytes .../voxygen/voxel/weapon/bow/hardwood-2.vox | Bin 0 -> 1392 bytes .../{shortbow_wood-0.vox => hardwood-3.vox} | Bin 1280 -> 1296 bytes .../{longbow_wood-1.vox => hardwood-4.vox} | Bin 1304 -> 1328 bytes .../voxygen/voxel/weapon/bow/hardwood-5.vox | Bin 0 -> 1480 bytes .../voxel/weapon/bow/longbow_horn-0.vox | Bin 28027 -> 0 bytes .../voxel/weapon/bow/longbow_iron-0.vox | Bin 27787 -> 0 bytes .../voxel/weapon/bow/longbow_leafy-0.vox | Bin 23910 -> 0 bytes .../voxygen/voxel/weapon/bow/longbow_rare.vox | Bin 1444 -> 0 bytes assets/voxygen/voxel/weapon/bow/metal-0.vox | Bin 0 -> 1464 bytes assets/voxygen/voxel/weapon/bow/metal-1.vox | Bin 0 -> 1420 bytes assets/voxygen/voxel/weapon/bow/metal-2.vox | Bin 0 -> 1408 bytes assets/voxygen/voxel/weapon/bow/metal-3.vox | Bin 0 -> 1544 bytes assets/voxygen/voxel/weapon/bow/metal-4.vox | Bin 0 -> 1584 bytes assets/voxygen/voxel/weapon/bow/rawwood-0.vox | Bin 0 -> 1376 bytes assets/voxygen/voxel/weapon/bow/rawwood-1.vox | Bin 0 -> 1408 bytes assets/voxygen/voxel/weapon/bow/sagitta.vox | Bin 0 -> 1856 bytes .../voxel/weapon/bow/shortbow_leafy-0.vox | Bin 27426 -> 0 bytes .../bow/{shortbow_starter.vox => starter.vox} | Bin ...{longbow_ore_nature-0.vox => velorite.vox} | Bin assets/voxygen/voxel/weapon/bow/wood-0.vox | Bin 0 -> 1336 bytes assets/voxygen/voxel/weapon/bow/wood-1.vox | Bin 0 -> 1392 bytes .../bow/{longbow_wood-0.vox => wood-2.vox} | Bin 1344 -> 1312 bytes .../bow/{shortbow_wood-1.vox => wood-3.vox} | Bin 1280 -> 1336 bytes assets/voxygen/voxel/weapon/bow/wood-4.vox | Bin 0 -> 1344 bytes .../up.sql | 22 ++++ server/src/rtsim/entity.rs | 4 +- .../audio/sfx/event_mapper/combat/tests.rs | 2 +- voxygen/src/menu/char_selection/ui/mod.rs | 2 +- world/src/site/dungeon/mod.rs | 22 ++-- world/src/site/settlement/mod.rs | 2 +- 83 files changed, 680 insertions(+), 127 deletions(-) create mode 100644 assets/common/items/weapons/bow/bone-0.ron create mode 100644 assets/common/items/weapons/bow/bone-1.ron rename assets/common/items/weapons/bow/{horn_longbow-0.ron => bone-2.ron} (65%) create mode 100644 assets/common/items/weapons/bow/bone-3.ron create mode 100644 assets/common/items/weapons/bow/eldwood-0.ron create mode 100644 assets/common/items/weapons/bow/eldwood-1.ron create mode 100644 assets/common/items/weapons/bow/eldwood-2.ron create mode 100644 assets/common/items/weapons/bow/frostwood-0.ron rename assets/common/items/weapons/bow/{wood_shortbow-1.ron => frostwood-1.ron} (55%) create mode 100644 assets/common/items/weapons/bow/frostwood-2.ron create mode 100644 assets/common/items/weapons/bow/hardwood-0.ron create mode 100644 assets/common/items/weapons/bow/hardwood-1.ron rename assets/common/items/weapons/bow/{leafy_longbow-0.ron => hardwood-2.ron} (59%) create mode 100644 assets/common/items/weapons/bow/hardwood-3.ron rename assets/common/items/weapons/bow/{wood_longbow-1.ron => hardwood-4.ron} (60%) create mode 100644 assets/common/items/weapons/bow/hardwood-5.ron rename assets/common/items/weapons/bow/{iron_longbow-0.ron => metal-0.ron} (58%) rename assets/common/items/weapons/bow/{rare_longbow.ron => metal-1.ron} (51%) create mode 100644 assets/common/items/weapons/bow/metal-2.ron create mode 100644 assets/common/items/weapons/bow/metal-3.ron create mode 100644 assets/common/items/weapons/bow/metal-4.ron create mode 100644 assets/common/items/weapons/bow/rawwood-0.ron create mode 100644 assets/common/items/weapons/bow/rawwood-1.ron create mode 100644 assets/common/items/weapons/bow/sagitta.ron rename assets/common/items/weapons/bow/{starter_bow.ron => starter.ron} (100%) rename assets/common/items/weapons/bow/{nature_ore_longbow-0.ron => velorite.ron} (100%) rename assets/common/items/weapons/bow/{leafy_shortbow-0.ron => wood-0.ron} (54%) create mode 100644 assets/common/items/weapons/bow/wood-1.ron rename assets/common/items/weapons/bow/{wood_shortbow-0.ron => wood-2.ron} (64%) rename assets/common/items/weapons/bow/{wood_longbow-0.ron => wood-3.ron} (62%) create mode 100644 assets/common/items/weapons/bow/wood-4.ron create mode 100644 assets/voxygen/voxel/weapon/bow/bone-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/bone-3.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/eldwood-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/frostwood-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-2.vox rename assets/voxygen/voxel/weapon/bow/{shortbow_wood-0.vox => hardwood-3.vox} (58%) rename assets/voxygen/voxel/weapon/bow/{longbow_wood-1.vox => hardwood-4.vox} (57%) create mode 100644 assets/voxygen/voxel/weapon/bow/hardwood-5.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_horn-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_leafy-0.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/longbow_rare.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-2.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-3.vox create mode 100644 assets/voxygen/voxel/weapon/bow/metal-4.vox create mode 100644 assets/voxygen/voxel/weapon/bow/rawwood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/rawwood-1.vox create mode 100644 assets/voxygen/voxel/weapon/bow/sagitta.vox delete mode 100644 assets/voxygen/voxel/weapon/bow/shortbow_leafy-0.vox rename assets/voxygen/voxel/weapon/bow/{shortbow_starter.vox => starter.vox} (100%) rename assets/voxygen/voxel/weapon/bow/{longbow_ore_nature-0.vox => velorite.vox} (100%) create mode 100644 assets/voxygen/voxel/weapon/bow/wood-0.vox create mode 100644 assets/voxygen/voxel/weapon/bow/wood-1.vox rename assets/voxygen/voxel/weapon/bow/{longbow_wood-0.vox => wood-2.vox} (60%) rename assets/voxygen/voxel/weapon/bow/{shortbow_wood-1.vox => wood-3.vox} (67%) create mode 100644 assets/voxygen/voxel/weapon/bow/wood-4.vox diff --git a/assets/common/items/weapons/bow/bone-0.ron b/assets/common/items/weapons/bow/bone-0.ron new file mode 100644 index 0000000000..4e8f9ba91e --- /dev/null +++ b/assets/common/items/weapons/bow/bone-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Fanged Bow", + description: "There are over a dozen small fangs attached to the bow limbs", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.9, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/bone-1.ron b/assets/common/items/weapons/bow/bone-1.ron new file mode 100644 index 0000000000..74d1066e7a --- /dev/null +++ b/assets/common/items/weapons/bow/bone-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Horn Bow", + description: "The horns aren't from any creature you know", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.2, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/horn_longbow-0.ron b/assets/common/items/weapons/bow/bone-2.ron similarity index 65% rename from assets/common/items/weapons/bow/horn_longbow-0.ron rename to assets/common/items/weapons/bow/bone-2.ron index ee6f75c2f3..e648d6477a 100644 --- a/assets/common/items/weapons/bow/horn_longbow-0.ron +++ b/assets/common/items/weapons/bow/bone-2.ron @@ -1,12 +1,12 @@ ItemDef( - name: "Horn Bow", - description: "You don\'t recognize the creature these horns belong to.", + name: "Ritual Bow", + description: "A ceremonial weapon", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.5, + power: 1.0, poise_strength: 0.8, speed: 1.0, )), diff --git a/assets/common/items/weapons/bow/bone-3.ron b/assets/common/items/weapons/bow/bone-3.ron new file mode 100644 index 0000000000..27ac25aa26 --- /dev/null +++ b/assets/common/items/weapons/bow/bone-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Spinal Bow", + description: "Made with bones", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.1, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-0.ron b/assets/common/items/weapons/bow/eldwood-0.ron new file mode 100644 index 0000000000..9aaf8790f7 --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Eldwood Bow", + description: "The wood feels old, yet still alive", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.8, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-1.ron b/assets/common/items/weapons/bow/eldwood-1.ron new file mode 100644 index 0000000000..863d37da3d --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Topaz Warbow", + description: "Inset with topaz", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.6, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/eldwood-2.ron b/assets/common/items/weapons/bow/eldwood-2.ron new file mode 100644 index 0000000000..faffd799b2 --- /dev/null +++ b/assets/common/items/weapons/bow/eldwood-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Treant Branch", + description: "You occasionally see it twitch from your periphery", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.0, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/frostwood-0.ron b/assets/common/items/weapons/bow/frostwood-0.ron new file mode 100644 index 0000000000..fc2eeda6af --- /dev/null +++ b/assets/common/items/weapons/bow/frostwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Eagle Bow", + description: "The design is reminiscent of a spread eagle's wings", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.4, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-1.ron b/assets/common/items/weapons/bow/frostwood-1.ron similarity index 55% rename from assets/common/items/weapons/bow/wood_shortbow-1.ron rename to assets/common/items/weapons/bow/frostwood-1.ron index e5f1c33e58..46f8045f1c 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-1.ron +++ b/assets/common/items/weapons/bow/frostwood-1.ron @@ -1,16 +1,16 @@ ItemDef( - name: "Horse Bow", - description: "Works on the ground too.", + name: "Frostwood Bow", + description: "Chill to the touch...", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 0.75, - poise_strength: 0.4, + power: 1.6, + poise_strength: 0.8, speed: 1.0, )), )), - quality: Common, + quality: High, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/frostwood-2.ron b/assets/common/items/weapons/bow/frostwood-2.ron new file mode 100644 index 0000000000..e45c34fcd3 --- /dev/null +++ b/assets/common/items/weapons/bow/frostwood-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Lunar Bow", + description: "Glows under the light of the moon", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.7, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-0.ron b/assets/common/items/weapons/bow/hardwood-0.ron new file mode 100644 index 0000000000..7614564428 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Bramblewood Bow", + description: "Some loose brambles are still attached", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.2, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-1.ron b/assets/common/items/weapons/bow/hardwood-1.ron new file mode 100644 index 0000000000..6cb1c52721 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Composite Bow", + description: "It has a heavy draw weight", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.4, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/leafy_longbow-0.ron b/assets/common/items/weapons/bow/hardwood-2.ron similarity index 59% rename from assets/common/items/weapons/bow/leafy_longbow-0.ron rename to assets/common/items/weapons/bow/hardwood-2.ron index 72ee1b9ed2..0453c0d035 100644 --- a/assets/common/items/weapons/bow/leafy_longbow-0.ron +++ b/assets/common/items/weapons/bow/hardwood-2.ron @@ -1,14 +1,14 @@ ItemDef( name: "Elven Longbow", - description: "There\'s a new leaf starting to grow.", + description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.25, - poise_strength: 1.0, - speed: 1.0, + power: 1.1, + poise_strength: 0.8, + speed: 1.1, )), )), quality: Moderate, diff --git a/assets/common/items/weapons/bow/hardwood-3.ron b/assets/common/items/weapons/bow/hardwood-3.ron new file mode 100644 index 0000000000..b915905350 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Horse Bow", + description: "Perfect for mounted archery", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.9, + poise_strength: 0.8, + speed: 1.3, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-1.ron b/assets/common/items/weapons/bow/hardwood-4.ron similarity index 60% rename from assets/common/items/weapons/bow/wood_longbow-1.ron rename to assets/common/items/weapons/bow/hardwood-4.ron index d70d956963..573acf778a 100644 --- a/assets/common/items/weapons/bow/wood_longbow-1.ron +++ b/assets/common/items/weapons/bow/hardwood-4.ron @@ -1,16 +1,16 @@ ItemDef( name: "Recurve Bow", - description: "It\'s hard to pull all the way back.", + description: "It's hard to pull back all the way", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.0, - poise_strength: 1.2, - speed: 1.0, + poise_strength: 0.8, + speed: 1.2, )), )), - quality: Common, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/hardwood-5.ron b/assets/common/items/weapons/bow/hardwood-5.ron new file mode 100644 index 0000000000..9a60c8a114 --- /dev/null +++ b/assets/common/items/weapons/bow/hardwood-5.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Stag Bow", + description: "Made from the antlers of a stag", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.3, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/iron_longbow-0.ron b/assets/common/items/weapons/bow/metal-0.ron similarity index 58% rename from assets/common/items/weapons/bow/iron_longbow-0.ron rename to assets/common/items/weapons/bow/metal-0.ron index 0930934b58..69e5c5a6d9 100644 --- a/assets/common/items/weapons/bow/iron_longbow-0.ron +++ b/assets/common/items/weapons/bow/metal-0.ron @@ -1,13 +1,13 @@ ItemDef( - name: "Soldier\'s Bow", - description: "Has an insignia on it.", + name: "Beetlehorn Bow", + description: "Made from the horns of a small beetle", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.75, - poise_strength: 1.3, + power: 1.4, + poise_strength: 0.8, speed: 1.0, )), )), diff --git a/assets/common/items/weapons/bow/rare_longbow.ron b/assets/common/items/weapons/bow/metal-1.ron similarity index 51% rename from assets/common/items/weapons/bow/rare_longbow.ron rename to assets/common/items/weapons/bow/metal-1.ron index 3e6f048e74..bb917d2f90 100644 --- a/assets/common/items/weapons/bow/rare_longbow.ron +++ b/assets/common/items/weapons/bow/metal-1.ron @@ -1,16 +1,16 @@ ItemDef( name: "Enchanted Longbow", - description: "You can sense power resting in the bow.", + description: "You feel a faint magical aura emanating from the bow", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 2.0, - poise_strength: 1.0, - speed: 1.0, + power: 1.2, + poise_strength: 0.8, + speed: 1.2, )), )), - quality: Epic, + quality: Moderate, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-2.ron b/assets/common/items/weapons/bow/metal-2.ron new file mode 100644 index 0000000000..da08553c8a --- /dev/null +++ b/assets/common/items/weapons/bow/metal-2.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Iron Longbow", + description: "Forged from iron", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.3, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-3.ron b/assets/common/items/weapons/bow/metal-3.ron new file mode 100644 index 0000000000..8ef8934379 --- /dev/null +++ b/assets/common/items/weapons/bow/metal-3.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Metal Warbow", + description: "Its appearance is intimidating", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.5, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/metal-4.ron b/assets/common/items/weapons/bow/metal-4.ron new file mode 100644 index 0000000000..858bd7b5cf --- /dev/null +++ b/assets/common/items/weapons/bow/metal-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Soldier's Bow", + description: "Reinforced with iron", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 1.6, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/rawwood-0.ron b/assets/common/items/weapons/bow/rawwood-0.ron new file mode 100644 index 0000000000..bd7f5162f8 --- /dev/null +++ b/assets/common/items/weapons/bow/rawwood-0.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Oakroot Bow", + description: "The wood is blackened with dirt", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.7, + poise_strength: 0.8, + speed: 0.9, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/rawwood-1.ron b/assets/common/items/weapons/bow/rawwood-1.ron new file mode 100644 index 0000000000..2ccb1a8cba --- /dev/null +++ b/assets/common/items/weapons/bow/rawwood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sprig Bow", + description: "It was only recently collected", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.6, + poise_strength: 0.8, + speed: 1.0, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/sagitta.ron b/assets/common/items/weapons/bow/sagitta.ron new file mode 100644 index 0000000000..88a9e6ad6e --- /dev/null +++ b/assets/common/items/weapons/bow/sagitta.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Sagitta", + description: "Said to have slain a dragon with a single arrow", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 2.5, + poise_strength: 0.8, + speed: 0.8, + )), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/starter_bow.ron b/assets/common/items/weapons/bow/starter.ron similarity index 100% rename from assets/common/items/weapons/bow/starter_bow.ron rename to assets/common/items/weapons/bow/starter.ron diff --git a/assets/common/items/weapons/bow/nature_ore_longbow-0.ron b/assets/common/items/weapons/bow/velorite.ron similarity index 100% rename from assets/common/items/weapons/bow/nature_ore_longbow-0.ron rename to assets/common/items/weapons/bow/velorite.ron diff --git a/assets/common/items/weapons/bow/leafy_shortbow-0.ron b/assets/common/items/weapons/bow/wood-0.ron similarity index 54% rename from assets/common/items/weapons/bow/leafy_shortbow-0.ron rename to assets/common/items/weapons/bow/wood-0.ron index 36fb4c21e8..5bb641a6b8 100644 --- a/assets/common/items/weapons/bow/leafy_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood-0.ron @@ -1,16 +1,16 @@ ItemDef( name: "Elven Shortbow", - description: "The wood still seems alive.", + description: "Made with exquisite craftsmanship", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, - power: 1.0, - poise_strength: 0.4, - speed: 1.0, + power: 0.9, + poise_strength: 0.8, + speed: 0.9, )), )), - quality: Common, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood-1.ron b/assets/common/items/weapons/bow/wood-1.ron new file mode 100644 index 0000000000..0654451dc9 --- /dev/null +++ b/assets/common/items/weapons/bow/wood-1.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Flatbow", + description: "The bow looks stangely flat...", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.7, + poise_strength: 0.8, + speed: 1.1, + )), + )), + quality: Low, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood-2.ron similarity index 64% rename from assets/common/items/weapons/bow/wood_shortbow-0.ron rename to assets/common/items/weapons/bow/wood-2.ron index 9711d3f714..812d4d062c 100644 --- a/assets/common/items/weapons/bow/wood_shortbow-0.ron +++ b/assets/common/items/weapons/bow/wood-2.ron @@ -1,16 +1,16 @@ ItemDef( name: "Hunting Bow", - description: "Strips of leather are wrapped around the handle.", + description: "You could hunt a deer with this bow", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 0.8, - poise_strength: 0.7, + poise_strength: 0.8, speed: 1.0, )), )), - quality: Moderate, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood_longbow-0.ron b/assets/common/items/weapons/bow/wood-3.ron similarity index 62% rename from assets/common/items/weapons/bow/wood_longbow-0.ron rename to assets/common/items/weapons/bow/wood-3.ron index a548fa71c7..e041a1a2aa 100644 --- a/assets/common/items/weapons/bow/wood_longbow-0.ron +++ b/assets/common/items/weapons/bow/wood-3.ron @@ -1,16 +1,16 @@ ItemDef( name: "Longbow", - description: "It\'s been well used.", + description: "Made of wood", kind: Tool(( kind: Bow, hands: Two, stats: Direct(( equip_time_millis: 400, power: 1.0, - poise_strength: 0.9, - speed: 1.0, + poise_strength: 0.8, + speed: 0.8, )), )), - quality: Common, + quality: Low, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/weapons/bow/wood-4.ron b/assets/common/items/weapons/bow/wood-4.ron new file mode 100644 index 0000000000..d18abce394 --- /dev/null +++ b/assets/common/items/weapons/bow/wood-4.ron @@ -0,0 +1,16 @@ +ItemDef( + name: "Swift Shortbow", + description: "Swiftly fires arrows", + kind: Tool(( + kind: Bow, + hands: Two, + stats: Direct(( + equip_time_millis: 400, + power: 0.6, + poise_strength: 0.8, + speed: 1.2, + )), + )), + quality: Low, + 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 ea8f9d5fe5..11077acb9c 100644 --- a/assets/common/loot_tables/loot_table_cave_large.ron +++ b/assets/common/loot_tables/loot_table_cave_large.ron @@ -25,7 +25,6 @@ (0.01, "common.items.weapons.sword.bloodsteel-0"), (0.01, "common.items.weapons.sword.bloodsteel-1"), (0.01, "common.items.weapons.sword.bloodsteel-2"), - (0.001, "common.items.weapons.sword.caladbolg"), // axes (0.02, "common.items.weapons.axe.bloodsteel_axe-0"), (0.02, "common.items.weapons.axe.bloodsteel_axe-1"), @@ -62,8 +61,19 @@ (0.05, "common.items.weapons.hammer.steel_hammer-3"), (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), - // bows - (0.001, "common.items.weapons.bow.nature_ore_longbow-0"), + // bows + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), + (0.02, "common.items.weapons.bow.frostwood-0"), + (0.02, "common.items.weapons.bow.frostwood-1"), + (0.02, "common.items.weapons.bow.frostwood-2"), + (0.01, "common.items.weapons.bow.eldwood-0"), + (0.01, "common.items.weapons.bow.eldwood-1"), + (0.01, "common.items.weapons.bow.eldwood-2"), + (0.001, "common.items.weapons.bow.velorite"), ] diff --git a/assets/common/loot_tables/loot_table_cultists.ron b/assets/common/loot_tables/loot_table_cultists.ron index c8c40292ca..20dba99274 100644 --- a/assets/common/loot_tables/loot_table_cultists.ron +++ b/assets/common/loot_tables/loot_table_cultists.ron @@ -76,9 +76,9 @@ (0.10, "common.items.weapons.sword.stone-0"), (0.10, "common.items.weapons.sword.stone-1"), (0.10, "common.items.weapons.sword.stone-2"), - (0.15, "common.items.weapons.sword.bronze-0"), - (0.15, "common.items.weapons.sword.bronze-1"), - (0.15, "common.items.weapons.sword.bronze-2"), + (0.05, "common.items.weapons.sword.bronze-0"), + (0.05, "common.items.weapons.sword.bronze-1"), + (0.05, "common.items.weapons.sword.bronze-2"), // axes (0.20, "common.items.weapons.axe.orc_axe-0"), (0.10, "common.items.weapons.axe.worn_iron_axe-0"), @@ -99,9 +99,18 @@ (0.05, "common.items.weapons.hammer.worn_iron_hammer-1"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-2"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-3"), - // bows - (0.25, "common.items.weapons.bow.wood_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-1"), + // bows + (0.20, "common.items.weapons.bow.rawwood-0"), + (0.20, "common.items.weapons.bow.rawwood-1"), + (0.10, "common.items.weapons.bow.wood-0"), + (0.10, "common.items.weapons.bow.wood-1"), + (0.10, "common.items.weapons.bow.wood-2"), + (0.10, "common.items.weapons.bow.wood-3"), + (0.10, "common.items.weapons.bow.wood-4"), + (0.05, "common.items.weapons.bow.bone-0"), + (0.05, "common.items.weapons.bow.bone-1"), + (0.05, "common.items.weapons.bow.bone-2"), + (0.05, "common.items.weapons.bow.bone-3"), // Uncommon Weapons // swords (0.04, "common.items.weapons.sword.iron-0"), @@ -168,10 +177,17 @@ (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), // bows - (0.30, "common.items.weapons.bow.leafy_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-1"), - (0.20, "common.items.weapons.bow.leafy_longbow-0"), + (0.04, "common.items.weapons.bow.hardwood-0"), + (0.04, "common.items.weapons.bow.hardwood-1"), + (0.04, "common.items.weapons.bow.hardwood-2"), + (0.04, "common.items.weapons.bow.hardwood-3"), + (0.04, "common.items.weapons.bow.hardwood-4"), + (0.04, "common.items.weapons.bow.hardwood-5"), + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), // Rare Weapons // swords (0.20, "common.items.weapons.sword.cobalt-0"), @@ -198,7 +214,11 @@ (0.1, "common.items.weapons.hammer.ramshead_hammer"), (0.001, "common.items.weapons.hammer.mjolnir"), // bows - (0.6, "common.items.weapons.bow.horn_longbow-0"), - (0.2, "common.items.weapons.bow.iron_longbow-0"), - (0.10, "common.items.weapons.bow.rare_longbow"), + (0.20, "common.items.weapons.bow.frostwood-0"), + (0.20, "common.items.weapons.bow.frostwood-1"), + (0.20, "common.items.weapons.bow.frostwood-2"), + (0.10, "common.items.weapons.bow.eldwood-0"), + (0.10, "common.items.weapons.bow.eldwood-1"), + (0.10, "common.items.weapons.bow.eldwood-2"), + (0.001, "common.items.weapons.bow.sagitta"), ] diff --git a/assets/common/loot_tables/loot_table_humanoids.ron b/assets/common/loot_tables/loot_table_humanoids.ron index bf98129ae0..67c6b966e1 100644 --- a/assets/common/loot_tables/loot_table_humanoids.ron +++ b/assets/common/loot_tables/loot_table_humanoids.ron @@ -26,5 +26,6 @@ (0.25, "common.items.weapons.sceptre.staff_nature"), (0.15, "common.items.weapons.hammer.flimsy_hammer"), (0.10, "common.items.weapons.hammer.wood_hammer-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), + (0.15, "common.items.weapons.bow.rawwood-0"), + (0.15, "common.items.weapons.bow.rawwood-1"), ] diff --git a/assets/common/loot_tables/loot_table_villager.ron b/assets/common/loot_tables/loot_table_villager.ron index 158b8eed81..03189946ab 100644 --- a/assets/common/loot_tables/loot_table_villager.ron +++ b/assets/common/loot_tables/loot_table_villager.ron @@ -40,5 +40,6 @@ (0.25, "common.items.weapons.sceptre.staff_nature"), (0.15, "common.items.weapons.hammer.flimsy_hammer"), (0.10, "common.items.weapons.hammer.wood_hammer-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), + (0.15, "common.items.weapons.bow.rawwood-0"), + (0.15, "common.items.weapons.bow.rawwood-1"), ] diff --git a/assets/common/loot_tables/loot_table_weapon_common.ron b/assets/common/loot_tables/loot_table_weapon_common.ron index 84e2fdc0d3..3362614c5b 100644 --- a/assets/common/loot_tables/loot_table_weapon_common.ron +++ b/assets/common/loot_tables/loot_table_weapon_common.ron @@ -33,7 +33,11 @@ (0.05, "common.items.weapons.hammer.worn_iron_hammer-2"), (0.05, "common.items.weapons.hammer.worn_iron_hammer-3"), // bows - (0.50, "common.items.weapons.bow.starter_bow"), - (0.25, "common.items.weapons.bow.wood_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_shortbow-1"), -] \ No newline at end of file + (0.15, "common.items.weapons.bow.starter"), + (0.10, "common.items.weapons.bow.rawwood-0"), + (0.10, "common.items.weapons.bow.rawwood-1"), + (0.05, "common.items.weapons.bow.wood-0"), + (0.05, "common.items.weapons.bow.wood-1"), + (0.05, "common.items.weapons.bow.wood-2"), + (0.05, "common.items.weapons.bow.wood-3"), + (0.05, "common.items.weapons.bow.wood-4"), \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_weapon_rare.ron b/assets/common/loot_tables/loot_table_weapon_rare.ron index d75e12fa71..ee6d4db03e 100644 --- a/assets/common/loot_tables/loot_table_weapon_rare.ron +++ b/assets/common/loot_tables/loot_table_weapon_rare.ron @@ -28,7 +28,11 @@ (0.15, "common.items.weapons.hammer.ramshead_hammer"), (0.01, "common.items.weapons.hammer.mjolnir"), // bows - (0.60, "common.items.weapons.bow.horn_longbow-0"), - (0.30, "common.items.weapons.bow.iron_longbow-0"), - (0.05, "common.items.weapons.bow.rare_longbow"), + (0.20, "common.items.weapons.bow.frostwood-0"), + (0.20, "common.items.weapons.bow.frostwood-1"), + (0.20, "common.items.weapons.bow.frostwood-2"), + (0.10, "common.items.weapons.bow.eldwood-0"), + (0.10, "common.items.weapons.bow.eldwood-1"), + (0.10, "common.items.weapons.bow.eldwood-2"), + (0.01, "common.items.weapons.bow.sagitta"), ] \ No newline at end of file diff --git a/assets/common/loot_tables/loot_table_weapon_uncommon.ron b/assets/common/loot_tables/loot_table_weapon_uncommon.ron index cf8ede00b8..4ede12e596 100644 --- a/assets/common/loot_tables/loot_table_weapon_uncommon.ron +++ b/assets/common/loot_tables/loot_table_weapon_uncommon.ron @@ -69,8 +69,19 @@ (0.05, "common.items.weapons.hammer.steel_hammer-4"), (0.05, "common.items.weapons.hammer.steel_hammer-5"), // bows - (0.30, "common.items.weapons.bow.leafy_shortbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-0"), - (0.25, "common.items.weapons.bow.wood_longbow-1"), - (0.20, "common.items.weapons.bow.leafy_longbow-0"), + (0.15, "common.items.weapons.bow.bone-0"), + (0.15, "common.items.weapons.bow.bone-1"), + (0.15, "common.items.weapons.bow.bone-2"), + (0.15, "common.items.weapons.bow.bone-3"), + (0.04, "common.items.weapons.bow.hardwood-0"), + (0.04, "common.items.weapons.bow.hardwood-1"), + (0.04, "common.items.weapons.bow.hardwood-2"), + (0.04, "common.items.weapons.bow.hardwood-3"), + (0.04, "common.items.weapons.bow.hardwood-4"), + (0.04, "common.items.weapons.bow.hardwood-5"), + (0.03, "common.items.weapons.bow.metal-0"), + (0.03, "common.items.weapons.bow.metal-1"), + (0.03, "common.items.weapons.bow.metal-2"), + (0.03, "common.items.weapons.bow.metal-3"), + (0.03, "common.items.weapons.bow.metal-4"), ] \ No newline at end of file diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 918c2cc83a..5d518f77b3 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -235,7 +235,7 @@ ], ), "Hunting Bow": ( - ("common.items.weapons.bow.wood_shortbow-0", 1), + ("common.items.weapons.bow.wood-2", 1), [ (Item("common.items.crafting_ing.leather_scraps"), 8), (Item("common.items.crafting_ing.twigs"), 6), diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index c3180f8354..f780a72a2c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -45,48 +45,128 @@ (0.0, 0.0, 0.0), (125.0, 90.0, 80.0), 1.0, ), // Bows - Tool("common.items.weapons.bow.starter_bow"): VoxTrans( - "voxel.weapon.bow.shortbow_starter", + Tool("common.items.weapons.bow.bone-0"): VoxTrans( + "voxel.weapons.bow.bone-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_shortbow-0"): VoxTrans( - "voxel.weapon.bow.shortbow_wood-0", + Tool("common.items.weapons.bow.bone-1"): VoxTrans( + "voxel.weapons.bow.bone-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_shortbow-1"): VoxTrans( - "voxel.weapon.bow.shortbow_wood-1", + Tool("common.items.weapons.bow.bone-2"): VoxTrans( + "voxel.weapons.bow.bone-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.leafy_shortbow-0"): VoxTrans( - "voxel.weapon.bow.shortbow_leafy-0", + Tool("common.items.weapons.bow.bone-3"): VoxTrans( + "voxel.weapons.bow.bone-3", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_wood-0", + Tool("common.items.weapons.bow.eldwood-0"): VoxTrans( + "voxel.weapons.bow.eldwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.wood_longbow-1"): VoxTrans( - "voxel.weapon.bow.longbow_wood-1", + Tool("common.items.weapons.bow.eldwood-1"): VoxTrans( + "voxel.weapons.bow.eldwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.leafy_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_leafy-0", + Tool("common.items.weapons.bow.eldwood-2"): VoxTrans( + "voxel.weapons.bow.eldwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.horn_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_horn-0", + Tool("common.items.weapons.bow.frostwood-0"): VoxTrans( + "voxel.weapons.bow.frostwood-0", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.iron_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_iron-0", + Tool("common.items.weapons.bow.frostwood-1"): VoxTrans( + "voxel.weapons.bow.frostwood-1", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.rare_longbow"): VoxTrans( - "voxel.weapon.bow.longbow_rare", + Tool("common.items.weapons.bow.frostwood-2"): VoxTrans( + "voxel.weapons.bow.frostwood-2", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), - Tool("common.items.weapons.bow.nature_ore_longbow-0"): VoxTrans( - "voxel.weapon.bow.longbow_ore_nature-0", + Tool("common.items.weapons.bow.hardwood-0"): VoxTrans( + "voxel.weapons.bow.hardwood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-1"): VoxTrans( + "voxel.weapons.bow.hardwood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-2"): VoxTrans( + "voxel.weapons.bow.hardwood-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-3"): VoxTrans( + "voxel.weapons.bow.hardwood-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-4"): VoxTrans( + "voxel.weapons.bow.hardwood-4", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.hardwood-5"): VoxTrans( + "voxel.weapons.bow.hardwood-5", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-0"): VoxTrans( + "voxel.weapons.bow.metal-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-1"): VoxTrans( + "voxel.weapons.bow.metal-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-2"): VoxTrans( + "voxel.weapons.bow.metal-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-3"): VoxTrans( + "voxel.weapons.bow.metal-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.metal-4"): VoxTrans( + "voxel.weapons.bow.metal-4", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.rawwood-0"): VoxTrans( + "voxel.weapons.bow.rawwood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.rawwood-1"): VoxTrans( + "voxel.weapons.bow.rawwood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.sagitta"): VoxTrans( + "voxel.weapons.bow.sagitta", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.starter"): VoxTrans( + "voxel.weapons.bow.starter", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.velorite"): VoxTrans( + "voxel.weapons.bow.velorite", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-0"): VoxTrans( + "voxel.weapons.bow.wood-0", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-1"): VoxTrans( + "voxel.weapons.bow.wood-1", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-2"): VoxTrans( + "voxel.weapons.bow.wood-2", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-3"): VoxTrans( + "voxel.weapons.bow.wood-3", + (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, + ), + Tool("common.items.weapons.bow.wood-4"): VoxTrans( + "voxel.weapons.bow.wood-4", (0.0, 0.0, 0.0), (90.0, 90.0, 0.0), 1.0, ), // Daggers diff --git a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron index 2dd1d86377..7acbd56fd9 100644 --- a/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron +++ b/assets/voxygen/voxel/humanoid_main_weapon_manifest.ron @@ -695,48 +695,128 @@ color: None ), // Bows - "common.items.weapons.bow.starter_bow": ( - vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)), + "common.items.weapons.bow.bone-0": ( + vox_spec: ("weapons.bow.bone-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_shortbow-0": ( - vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)), + "common.items.weapons.bow.bone-1": ( + vox_spec: ("weapons.bow.bone-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_shortbow-1": ( - vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)), + "common.items.weapons.bow.bone-2": ( + vox_spec: ("weapons.bow.bone-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.leafy_shortbow-0": ( - vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)), + "common.items.weapons.bow.bone-3": ( + vox_spec: ("weapons.bow.bone-3", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_longbow-0": ( - vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)), + "common.items.weapons.bow.eldwood-0": ( + vox_spec: ("weapons.bow.eldwood-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.wood_longbow-1": ( - vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)), + "common.items.weapons.bow.eldwood-1": ( + vox_spec: ("weapons.bow.eldwood-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.leafy_longbow-0": ( - vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)), + "common.items.weapons.bow.eldwood-2": ( + vox_spec: ("weapons.bow.eldwood-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.horn_longbow-0": ( - vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)), + "common.items.weapons.bow.frostwood-0": ( + vox_spec: ("weapons.bow.frostwood-0", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.iron_longbow-0": ( - vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)), + "common.items.weapons.bow.frostwood-1": ( + vox_spec: ("weapons.bow.frostwood-1", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.rare_longbow": ( - vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)), + "common.items.weapons.bow.frostwood-2": ( + vox_spec: ("weapons.bow.frostwood-2", (-0.5, -3.0, -8.5)), color: None ), - "common.items.weapons.bow.nature_ore_longbow-0": ( - vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.0)), + "common.items.weapons.bow.hardwood-0": ( + vox_spec: ("weapons.bow.hardwood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-1": ( + vox_spec: ("weapons.bow.hardwood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-2": ( + vox_spec: ("weapons.bow.hardwood-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-3": ( + vox_spec: ("weapons.bow.hardwood-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-4": ( + vox_spec: ("weapons.bow.hardwood-4", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.hardwood-5": ( + vox_spec: ("weapons.bow.hardwood-5", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-0": ( + vox_spec: ("weapons.bow.metal-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-1": ( + vox_spec: ("weapons.bow.metal-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-2": ( + vox_spec: ("weapons.bow.metal-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-3": ( + vox_spec: ("weapons.bow.metal-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.metal-4": ( + vox_spec: ("weapons.bow.metal-4", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.rawwood-0": ( + vox_spec: ("weapons.bow.rawwood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.rawwood-1": ( + vox_spec: ("weapons.bow.rawwood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.sagitta": ( + vox_spec: ("weapons.bow.sagitta", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.starter": ( + vox_spec: ("weapons.bow.starter", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.velorite": ( + vox_spec: ("weapons.bow.velorite", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-0": ( + vox_spec: ("weapons.bow.wood-0", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-1": ( + vox_spec: ("weapons.bow.wood-1", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-2": ( + vox_spec: ("weapons.bow.wood-2", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-3": ( + vox_spec: ("weapons.bow.wood-3", (-0.5, -3.0, -8.5)), + color: None + ), + "common.items.weapons.bow.wood-4": ( + vox_spec: ("weapons.bow.wood-4", (-0.5, -3.0, -8.5)), color: None ), // Farming Equipment diff --git a/assets/voxygen/voxel/weapon/bow/bone-0.vox b/assets/voxygen/voxel/weapon/bow/bone-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..be146248e8e3f2478a3efff5bae1ef64ed37df94 GIT binary patch literal 1424 zcmdT@-Ahw(7=F&q*EV&ZZqov(3kfT+l2J&5ESJd2#F;EFgrIXy#JUL)#K6L&8_Bv@ z`bIfaP0@F`PJ z74kk8X2gb;a9~6os6O&h7n+ZpN~=21RU5w46co*c(q+SlThKMex(i)rtXoi1tT)If ziB1=W!PulV9hfHlF!O%acTzXWoS(S>wF8_lKtD)7N*kjMQZqq6!8>h?+o;t}+n$Hg zLEFJN#NII*dYrq3ICI=ZAZ)=OB|ySv<@OOTtKEB!7l z<#Ksny*JBvKjcUV(%T6c=!RVBg-o1oov(TRX8%MIk~#iowaxbq>nA6=W$0X=WG|lG ex65IB{*U)crIJ)Cl>^_P(P$jV|Lxx1|Nk5C-7Z4_ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-1.vox b/assets/voxygen/voxel/weapon/bow/bone-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..bf6a73bb5a3a824d12d9c64aa3a00472d66ad8bd GIT binary patch literal 1752 zcmXAnyRI8I6h$|wdFXY0J(8~O!**im7x)D>6d1Qi3^MVuurAh zomv+zSh`i=AJ8w17a2)=4z+oBxaN@W-+p-cucY5!J^n$^*Gl^H@#Amv^oP#~P0+9C z!(SgC|FI1C{D+Kv(HVpEqBW!Ey|GBoTT?vi%n0dOYs!b-6c4?S86iF3-FK$A?}Uu* zTT|Wjro8KgOo4RQTE>=no7U-<-c+}pEpI!6lwxsL9Oj90y>SLCe7S&>65@w8%Y+1Yy886;$@C3`G;rKn}AdevKG#tY(t zoGG;yteN&ov06|QKgDvvngu*fZ>t6$X-*I3)SL5vPX3%4jFC-oJZH@nIaiEl)FC39 zVtvKj6MFXKi_taln)sCXl-RJQp+;Jh_7Sh@rgAW(`(IIRWtUT;m_##jJa9&?#=60D)RNzkUx=U zKpr`Sovg?s;z#_5AMsOKzz+-pe!vg-X{pEe_?|x=-{Yrp4&UKBe23xi`3=GszVL-F z{l6{G$VQQ(kphwAjKU+r6XA*QM0heDJQ1D5I#gr8aukB7&@^<-*x>Q-czFK)v>QIZf0K{W!{g!c@OXGUJo$L@DW%RN zn)Jm_M-GpJ$HC*^aq#480FQ&m!QF7c1P>(F7E*c#zeP%IXS7tAv{p(8q=J=&oy+MovMg3joKj_82)Xot3FgBqj@I-?Uhq66Ba t9onJ|YKF_@GMvxn;dD9;$K!E091g>NzaMtH-LTzmhs|a)G)+UU^b;!h%8md4 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-2.vox b/assets/voxygen/voxel/weapon/bow/bone-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..fc14c8d845d3f46965cc15e4829c4ece942f5212 GIT binary patch literal 1460 zcmdT^-%C?*6hG&C@9uu6bLw{I3?v1KyBbz93TdF_5*e8!jb$MObq8V4gCydEg+(vY z>S2Y#Xsnk##a?|JL=TZjkG&3xOaFtMK6im^2oeTC7e1WN`Sm&Hd>?N1dhX;KBDyv? zGYdmy57GS0Lb}s+@M%B?FaYFkEzCS(5PY`*RzZgikIhD(&Hez;ZL_aC&;B4{#vN86 zhrPZ$t3HR7a@ZHL*%PtZ+mmNqS*&^x>x#3|9QJ57t1kFK#C3-Q&@y_V(TQGTdy|4k~J25YU zo(_jKGtZjBzEObl%r3ySsLdLqryn4j1JLoiw}j*D(c^4{EjDzEaK8cwa}+?hR{?|_ zlnc!qR@^_NRCHKrQCOFoLyEz5Gp;C>Pz+Fig7ql&kHiUa_L$a<>C2O(H=mv|nT-4^ zSbLSWS^GaK(wHD=ti+n}!M$>O{`-~`h-3w*zTA-$I|ca(zF!4C1C5P?`q`^}2fSQ; zEnC&Kre9imE9<#6$xcP2E@|2On3deplq@})m(}8;BnL@WH_P(iIcA?GS-eP6ydRe@ zo8wa7xNxA^`bKWe<0)#(CC5f3l}brEotEY0WvSI_&HRU_Ir&t)C*R&blrj6ROc!3r zU}0S{XG79>m1xs&XMEk=m0G1Dg^l00J((c6iM^8VlCr(MeW>2uWi~-F5F{B1lZ?hl zu8fe(ooU~%b^lg=$|Ok*{aI~m-*LG)7nAYxmZUG8J9Nu&HUG!HVzDTtQt8MysMqU9 L=KuC?_Yd$3G5;+P literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/bone-3.vox b/assets/voxygen/voxel/weapon/bow/bone-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..e12fa7da70701d0791eac8e2b14f4601350a961d GIT binary patch literal 1496 zcmdT^-Ahw(7=GX1&ex`Hb023~Aax;OCDmdS(jdzvGBQz;<%JMf7l3_RsVAH_a zblEiXY?%&I7kXPRnU@u^q7k zu>&y(eGvK}^g-wm{eTLA520oVHN)r^M!zung)wg@?sOK|>VyXg@Da=#!MqX78v!51 zK2huw1=of7V%Rr^ePh@+hI1T##0zZ1;jg!k4exAtXTv)i9@y{>QMdEN33v|g(Pw=4 z)*xw(&qLX4R{j6MIcew6Ixuiz+_`0*1_kLbNwM*B%l z1xb2iB$v8LZugRmU2L7NdH&}7oK2EG`)Atbdne89v2Gbi_DSZ(l_R^HwC4YKuUsxm TrBXT8gL=JwEdRHAdw+lf!ah3I literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/eldwood-0.vox b/assets/voxygen/voxel/weapon/bow/eldwood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..aefffd6a58ee66baa926839a7775625b6f951d42 GIT binary patch literal 1552 zcmdT^%}Z2q6utNNzGg<9?+-1IT1Z$)HN$gqMyD(%ks%c&nOq1#xd_{c2;!o`qK#xB zQ)-M2g)pmhJDXr2T14Qwtx)twB)9WsAu|XP20;%F=l6DzR#saV;p5Nm*rn6(5^ zEX7Jo6UTa(Vm519f;on|*2{*5K0T=%jjpGaqcQYeHg)tG-DDV7*f0{xVbg%tOp<9L zHq**s%Y@GACeuRBN+^dd3pp2bF63O$fh`w$-SBh6&kaAY>4wgeWW%#bre~8)PewUx z0o>HhW)tRYPO{mYW^Tc`1!phxUg*8hd!Ywg0Q=zWgSQXfVAF^D{FuRy*pC^&mLK;8 zFlzw00A>YS0qBCz1(6Fv2eyL9h2R&0UkH9+Glbr7lDXApJ&ZlIrq~E$PhsRE2~y6E zBWVRDr=~^HtQ>6wJC0k?9^Om0!wwd9ijb&b*d~ z`9+x+h)7kkvioU5@-qW6^JH8W3R7aYlPoNkAR@B%963+}xb(?CjL)A0FrBbK$Ohd;dTZ(|2TW<(Z6ay^-8SzwEu} zYVdIG__)0-TWf1lT3xNx9$h85g}Lmvwrp%{9MU_p40n;7@RD?dNiMXJT<;(mJ>NKA z{rvUunJ7u$=|9uf_Z>HmjH?n%Gyp9?_WH!oFG7ItK0wkwNu+qBOP7coB0EV&po@&KM~dQ* z3TRQ})Fe?TNoL3;Jpu$>G9_x89g+cubQQH)l4KCI!EQ1l*wb7xH0BxM(oiFsr z^cH{uPejcZ6Zf;bNQPaKx=WVKkrm95X*y)uj*zGYghVYM3>!Ucun9Kda{%61@C7~^ zxRY)Jrb`<3HSB84?B@KS|di{(gDa^$lC z6ElSX19OD|Jx4MEXt~kB3;jZ?J-^6gGW@U5UU^%0*5;4;bz5b*KL7nCmxSOuD1y7z9T*!6s`dlBEXOmm~w|i98Ob>{k zbegB8rg&{_t(ISXl;y95oBZwFZSHYy@ZiEz9)16cGu<|CJnO9MQ9Wb4r;YO$kMQdJ zByW7Y%MZ^BzJ|FHuM@nqw6sG%b@dnzcM9I`7koG(xFae!-YR(HME!i*=ieS5jR{U2 w{4?$Ly1mA+krwWYw{!Z;sU3IOYtR3&u23j&u~^*IgL1jNYyNNVUHt?62JDtHi~s-t literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/eldwood-2.vox b/assets/voxygen/voxel/weapon/bow/eldwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..762bb669cdd146f900359136af6e70416094433a GIT binary patch literal 1456 zcmdUvO=uHQ5Xax_$J;b*(|m1eEfhV7wp!3g5@`~!(pW;UmPSj=p&+OSiHEq!Lh+zd z#Y?e5iPmbcD21GCt^p|o#DfUA3B4Be>Rl+~KRJ|yLXirB3qNM&&3|Uzyu;33&K!9z zgt#=GoPrUrbs^HpY@(+b;8Q^t7yy}T*<_C3;L8Fs+(jZKiX)4N;JYIv`)rcFA}NYZ zD$o?1s}Uk^gcLPTx<5wZkVUE*CF)0BjghX}L|TLl4{AM8lKvv;T8yNIT0Kl!ph#-K zCIv_xS{WhTM6DSk3Pj0}&>3M;P4x6*R$rJ517{A*H1j0gI5*MXf!eMxkq7vo@uFWB zbj}dzPD@CqMbc?2O=|$^4w39G5cR*xL&vF!H4NfImu_2J}3sexM;o7U})yr2^9;hZ{JonaK;|LTf#{NTpKzuNZE; z?U=Rmqca|AtaawUzvP+_e792L%F`MT)|Pn37Q9mdpTYLRu72vGujPOHwaH(9R`^3> zr4^TRFZh1u9;f3@u5*GLA7?p}o8a7|G|!jjI5Z@9esPU&KgR5ng6GZ&F5MjAFNH>(y&Rsyp$&UOa9Plgx{SMvkQ6kZHin zc1V$Fk}^l8bjXs(F{enHSu#y%6WW5dpe<+%+CNQ(e^yBUEJ=S>@z?~EmT8hLMN(S9 zt#hQbf!m-1$PXYtfcyaR!6u*t;Twc+5WYe9hM+^xA?Ofv7=4A&R~R}B9YOCA^d3R) zkvthT?xL74ius}r>E3)X%pb%2G0Y#!6Zr~6?FABG0rnBlQ6L4Zfc+AC4!dNkfbEj1 z0LQR%um(2uJekovN$gjmo`KyPsAC{*Ag;qhhnFUR&H`DwOIFk+iSHxv4NVP*;m!ae zsO3k^Kw*6N+MrPDpI@X>DgIaJ-F??oYyU^H?%v&Oj(=b0su29JQsv6?DtA>^d4Epu zeg*gf>@6MSkKTwJoHr{kdA+hw*X5bl{3x@)lS47CagujGO>$;th-aQo@O-Jj{oR7+ zS2p?nGt@pKxNuo;>E3Dnx-!7ErAr5%jXUyk=7vO5EFO<@B9Y)^GRehak#}}>>hTXx zGW@x8m%qJ#z!#_P@bKy~k8i!<)cGLqz36N5@M?VA-sY{fHC|p^tj8W-6?_|g^}p@s zjg5^%`Cc!heS$mN1ouP*pX(5Oy+`oa+2;Nl`)@p-vIQqj{8?_}dq+LnV;wvY@8#r` g3x{Sos^|asUa3^#a=HB59n@;I-^TxTZtoB93%Kewi2wiq literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/frostwood-1.vox b/assets/voxygen/voxel/weapon/bow/frostwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..04c689eabeae9e45ceee49f0724f53528a966c94 GIT binary patch literal 1512 zcmdT^-Ahwp9DaZ2`%K;UIckB_g@lz<3n`>Qek>Uy6D8R>n@Ug-v2H>H@uI?_8_7ae zYK%rD>?(J=n_v)KMBq&~-Gxx>pO9bA*~QopBn*NMJiNc>eV^agGuZUC^s$#hh^s@% zaU9~CD#TRMO|*LipA7hbZXoTr$@hc+-yHy9mI#o%lU$O>A(^tIcn~v0QjKKEB}H;b zm9nHuvqW-@6gfkx?2;zqPKHjYk*YYPDH+lg)KY7tsV?bimP{2n8o1_=u4Ty3aHkz)DC_7 zFi{712e==4KlFa+{m|ny017}CK-~c922eK$9z@?D`Ub&6;33Qv!dxNnFzSRcdl)%k z%pS(<5!^+vUj#gY{i4`Eiv6S5KZ+a+9$E0nf=3oSvXEoLOB-I=@Y2Sejl52H-U-h; z;kSpb84_K{2c)j->0;mg>Bad&LjZOFTVlag`Ii^J$vXxlztNp5n#) zED!VuUR){i-6!aMO7QGO!TDP!`RmFcSC=m|YBqc1X%D<0u4qNko%**HVTqqO{^q^X;9{B#Zdwc%?zX3p&Hwpj% literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/frostwood-2.vox b/assets/voxygen/voxel/weapon/bow/frostwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..c860a884def6ce225cf09c86776a805b73a53896 GIT binary patch literal 1384 zcmdUvOKTHR6vxk*XOgCAnwLfgQAiQ3MU4cd7_dpk8iKL5HN<8TD5$GIK|(>huu`EL zu}T?jBf+8+W@WR@Mu>IC)y&9^1KCy%XgU6VNhB(X!8j6B}=wmy; z48{;e4JEORIHaKx;4{c^NkdtvpfZ?7Da- zvF%Br%sG`$)!u{q71ojijAEb^WMtM3F=0kzBm-S?1zo`kD4vwSOi!jJKd@-^`snbNTb9G`{M@7#06n%^WW8$9$<`Wm7J)hz^Ml!6>DA|N27C6F^@cXB zrLNzozN2TwB`RdX)Fz$wz7?og%~18l3_UR`lsE;n@N|`C=NBk93RJlUWIjAkyD!J7 zy>hiTv;U3kn#Bw_a`AYalF20Lx=yuPjhfA7H~;y0k-nP`XtZ#bt~{Ej$+cCQ-hNNH zOMcpaJ?5BUYkb++q3w+g+FD=l=9X^&-Q&Fy9}-lr*ALX&yX41!PWXUELO>UzKn zsSD2i`uFd*&qjcfXa20VzwfAaWGYJI@pGhKzkJ{>N1gdU_L-(hjYi|pH)yxphvxtG I-u55hHwSGM&j0`b literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-0.vox b/assets/voxygen/voxel/weapon/bow/hardwood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..29f5b4ef8cfb571485716a7e3d8ec366f34909d7 GIT binary patch literal 1360 zcmbu8e@xVM7{{N_{oqax@ZiovK#vP4`B5f9hzs-(m>dRrkfet>4syyE({6>xZf-i&0oq6V((}jqTp3v0I~}^I8<5einsjKg$xFy4RT<>hG{c zo40MP7TeNik&226;_*0l&j|JB=2+wXm7l#{5{X6@*QLd`EWN1nLWa)Vd2Tkg0ovl9TYqo`z{J)jV>B`+(ZUEynS^wwQ(UlB6Lg% zM{j9uI2+&2Eb`+;l+OgoiFwHz%BE-{my+vi$=oaC52*L3P&q5e^V+}PiHxKn(_T)j zO=oib3T{{BK*M8~Gyj zck^ma_xKrqMVLJ;Jf+{dD&VKJsEFgc!pc6n%5oUm_Bb>9o+h%hn(p={;)mNfdF%lF zhawEW(ap@{o6KK3hs)(+r6-+0AV5iB9_8zvpfyy*q4pgdKN4m5^;JxLkjGayidguf znD?~j%!F|BGvT{0h5oJr&JLC`cd3S-zHT9Q(#_CEUas8AVu9R;?q5?V|L^_{!r+VY z*Zs@=*@TMn*;~GjSnZ~V?jH;Wxho(}#hvR|=Y?-S6>hgF>-&|Kmh!R;B93v*?&tG7bNB?CUmIup`?IuMp674#ssDrX{a0T9!lnQ0QJhF5{xP?hSgd(e-JiLo N;y=#auiaN8zX8>jNgn_J literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-1.vox b/assets/voxygen/voxel/weapon/bow/hardwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..f0b36f3236622debcf2b2ea35405c79983798770 GIT binary patch literal 1424 zcmdT^&ubH56#U+9vb#ysG{4&@6g?EFTGU8TiUHduSwb|H6hrKxAgBk47YT(@LAO=B z6swfgHWCa){4DJc0T!gDrxPT~7ytSCQMj&|d0H{F(NLHmZNq|h?Qimi-Cs_iQ!DVn6 z+|eP~p_9V_?(C4msgu)bkOGj>A*Z5~qNGVxpw$j3s!pn!CQXIbI;3jg8n_GGwMOKI z$88AJZIJ3-ldP%%H1vbip*bQCe4bgNVd!CKFZ^Ekz3_YCN7Votfo}xo`A~hB;ln#W zynf90L;Ilv$QMAq0P+Q(gUBC5{vh%L6vA#H>=ptKW9Kk-4ueO)Bj6G6QQQ$Aj~XP# zpaE&j$m_E+!qK}{kmtm{J6Nvg=CmpoZ|N90vAh3E95x#k|Ac zKRn=z_inSk`JD5+Z#jG3$NMj*Y-d|`(f literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-2.vox b/assets/voxygen/voxel/weapon/bow/hardwood-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..56c5e49d35061cff1d03bb33a1acef75492f3411 GIT binary patch literal 1392 zcmeHHO-ox*5WVwWK8+eb677q~t6(5#AjOcjghGVML=*#N%-! zlSycrhIBfOOeTX|E{A+Rk5Z|Ga=DD1ogM7$?V(bs;OOWG)oK;BS`GDj9cO1}XfzsV zHk)X*TJSjpqE3P2xWMWyft*j^nO|TxC{PIt97hG}34umZ;G-rGoEXQ{Z4Y98FXjVx zusnGWtC1i!Vw2dKi=em|!**&GyQ@j;XP0r9dxBT_HM}lu;7xf8r@KYG-QUL7V}Yx4 zf#075@SX9)4qT1{S3!(Ujl#X)hIh>if5DH?ix47*5hQ8}EWTSrwwXooq6qcD44ktX z-04kBJbjM4+Xo07oFH61$INL9+WRlq{O}ER{+26#KejCYa2Q0&YQ^W_Vf;#^;PA}C myK;(r^(TfBL-5soC|nj$UtnK>eJ|N}9oHN9PaA0e0sa6zVN@~z literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox b/assets/voxygen/voxel/weapon/bow/hardwood-3.vox similarity index 58% rename from assets/voxygen/voxel/weapon/bow/shortbow_wood-0.vox rename to assets/voxygen/voxel/weapon/bow/hardwood-3.vox index 56d7d1cac4309ea6ba416a1f0a62657049d67e5c..364a29ca84296ba82a964d18aae01262e461cd07 100644 GIT binary patch delta 303 zcmWlTy-EW?6ot?H?QS;N?9Q%X_2i31UOeUgmjS7 z@qnx#nsX?{1BxEcp|yk2Gl<3l#yA9K3K1<41biHFX-EcS#HEIxX^@(X`w$%m2!}9X yBDelM65;ik_IHEM+o7E7Zl}KN?fZxGWB)zA^uu1)-=FUIm#YKsKOVn6rIY{T?l~y{ delta 249 zcmXAj%?ZLl5QX3V#hAn-YZ|Zs5nJ%+LB)%xCqoL+5){EY1g{p9gGKm>3&Z!`?Ax8W zW|u7PHv7p#(rU3>1AT6>IVXsQ+8>U~_pi&D{n5&(lMFPytm$Mdw5^;)yI#(<@(%5L zdEY8{bm$cVZxWcm0UXdzJB1WKBuAMHpKTF2ft)}A3;YO8uW|&P< zJr3w$iYaE8VITWkIG}ETLmC>=P)>t6jyBQ(O^-OZTPkRj3VS3a83{>5;&O32oyf0W rywAU$1h%JGs;Gz+IjcZZ$n~+vU~%+rHR;sh>QJ delta 261 zcmXBOO%4G;5QgEedS)8qcg!$$EF8ho#?k^iv5_z?;0Deh5^)TPi&!{BAHyp;={)^a zb$9BSKGJNv*-h?}R*U5t6koIPb h0Rs(i$bdtJE_qurbjf){eN?@sHn-a$I=|lT;J&UKEUN$j diff --git a/assets/voxygen/voxel/weapon/bow/hardwood-5.vox b/assets/voxygen/voxel/weapon/bow/hardwood-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..b63c1de74b2685a38ededb94927cc6b5e6814413 GIT binary patch literal 1480 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 diff --git a/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox b/assets/voxygen/voxel/weapon/bow/longbow_iron-0.vox deleted file mode 100644 index c1b8797950ee39710f289806ac7ced273af09a3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27787 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 diff --git a/assets/voxygen/voxel/weapon/bow/longbow_rare.vox b/assets/voxygen/voxel/weapon/bow/longbow_rare.vox deleted file mode 100644 index 538df2d21dfd0f11b0bdcb1cbd8d6a433b980cab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1444 zcmc&zZD^ZS7=7-WylL9BP12-qnsm0YtFBFDt{---wp(f&*K{^rR_(TQjv|h&gyAgG zY$Xh8RGgzO%+gM9);UU%v9gso6o1q($`}k8bqqm^3{msbA0qxco>YaYQ-6BlaL#j| z&wDR-Xkf2@Mnw9%!V!|Bb&O%So8B;_q z%8A965Z%UoBG1Z}Q>vI;GOko9+0Ix8V;#(QGR{fuWbHE6CM;#FU6xZ87h_$Fb<^)A zmvgRi>T=F&a9)Gj$SIR2p)?P*hkYt|t_t??@|<4Aa~49&gR^MsGub1WZl|`hmpvhQ z&=xaoLd&yW98r47fYM7@*T?#K@cv9DGVe}fA4>t@CM=2FJD%(k^ZHdwTU#5F$t3Qc z5%iv0!AAEl_{r@?HrtQn}1@a90Pgo(-rH~~zPHu8yVM{q~cUA&@4`Nyb zSBX2scf|BD!Q$J3?1JFN71}|;`H%LxS`R+#eTo*9#7`3C4Q_XSpA3 z@nJMngNbMzW)3zX`RrEA9PUQ;jXn5beiRKG4RkbBW9Rld930w;c%LBkoM7%{!SZQA zYn2b-KrQySZpK(oJB9)VMq4T|wc{aV4m^t3t}et!B1j$`#;FsBF!5px>DS`OEWD1@ zYv*9I*-+tf!teK^vAzban;*vGP4x(MG-BYXcBEh3fW`M~@a2sF);@2*yX={n7u@_* z@a-3ZiP1WoO*LcXQa675Y7k?m9GLphjVrgjSVQ&ye*R!Eh`R!amAG>qrd7c=p9pRb zllgwl&CPg8QV?wla`6Lb7x=!jzrA6a{;H}fd_N3CqQE46MmM$tUvB|sdx6f*zuo_~ zC(hvM-X-iCyos^H!137yq%LIe*3vb+^VupMJ9-k^UYWzr_m(kuc@=+}kM;jL-+%e} h3)lbI{WzP={-ZDN$miTI?+@R4^6zo??%k6kzXH|F13woTAP_w>z39r#Ie;-my|JP z34>Y{=ZJ<`+6m4&XDKpPwi1UT*cB;bFhuGY7A-PF{VO6O{&_r^3e!#f=L_dP&-p&* zeYpcWb_J&Z^mWAI0(e&e`eVsxNl}rb6De}P$gbVV*rB39&QS5ALk1>8Mo0!ay`Vl0 zy&(>rL4(nlfx#%;s6kOOFe<_o;U+Kz5(3J|Vmsq>R+9ls1`3~WZG*qYLIHk5zbf*TBOLAS( z+bz0VuuSGE6J93sN_~SzxJQFQ`suyGy&81ovR8Q=Cb6L+1B=X{mt76Aw`$43EU2u{ zL3KzUxAe0Mn#C?Yz2sVox=CV6Mxe;NO6dr6KG9uqC~`+unb#^ino-%>TH-zg$VtlZiaF`hG(l-cX<=NLtyo|)Sd!c7ePEG z{l`>dvXoeG^VlW_=eCsbTAQEjxto&!FN$0j`Br4|2sr;bxHJb|xgdH3JRJo;*a@!f z2a}>7836N7i~TUzSp)V)+j+PPJSp}>qmRSU5XTZ4r}ot|`}kH)9q8oJ%TMt8*|m1l7gH?Ey~LGEr&#Itv)tuiFc@TAO^8jK@8JXWHH@~_amT|g z%)d~{`L{#-;!2onpVsnC=~`%eG< zhI#P^0s($ENX8T7IDcj*w~=3MA*Z{^wzk{uzx}}ze58AUyZf(l^Z@zX^c*M76!_}G zCw$}53hz%JWBcgwu0`ihQX&Ykl9^xaJU LBkoq)EjjoNQvp#) literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-1.vox b/assets/voxygen/voxel/weapon/bow/metal-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..93efd233bb5e8c120bf399cc10922bfcace8ebed GIT binary patch literal 1420 zcmcgrZ%kWN6hG&+uRJJ&mOff2v(%2cM=^8!k%0m$LLCL^>`>gwTo&W9u?AO(AxN4f zST)Y&&1Mpqi4*5Sh*?H9QWwnEqki>+F~%=HPf?S(P5tIge);{* zJ?GqW&b_()J9haeiKw?d5*4CRm8dTg4;SVPSr$QophB=~cRbR?B4ot`%w#fikcovA zlSvt2#S&$<7;LqgY_W>A8my`&TUF7jXq&K2I8QjwU`;bQPhiu6%$mXZ`J(g1m!D*{ zK)AqQ#cPskmwiEw*`8!Be1Uo0A?70CVu^J~tV8mh66X}{OtMxYXA5j4a(0QqHkahO zq_!@8UAR>GDivKS{ko-Jw`jM)7LUn_N3_RaE|a;+MwrWG&T@&D`ijhIv6xD(7e($s zEsiQ`vDDE8InI-Qg%!!Q=4_k96b`W}{i;Pn%wDlwQC79+&h3x2lXdM%si~<6sZEH3sUx6VaA`d2tYZj|ry!+)d()zi(OunI~PfKHcymfUdk5=5B}nDFsV!s-D+TJzP7lYvd#$pC0_tzoy^j1tB?7-q1&)~372p~;x z{W2`egl|3}TpJLU_p7h3$BUE(DJJOb2T;z)`%eAwh8gkud_Mdz07PTJIDSC~wgF#n z0j9cu*4Df3zwOZzc%o|_yZf$U_#p7|)GX3xvN%5fIo|nf84o9qqV1Jw^t`u#zVplY rTYqx?o&EinUw+}*Kf4#NtgQT_FXzbR+$--d-&*pYakuZ?mP5Y-<+@C9 literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-2.vox b/assets/voxygen/voxel/weapon/bow/metal-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..fc9c82eb155fd568e72cc3dc89240446f7867ed8 GIT binary patch literal 1408 zcmdT^O>0w85S@8nN!ldMw^X6%qDa-EMuJisu$ovxFqS6oC3aB|)P=;2ghJ^;rHY$k zl@e_usX-}ZWwXsj2#5<2vUVp0{TE?8FN=^+C{jW2!Qsr@IWza%Sv>1z;rMGJx-pZ= zfT*YwWm5}Dx1Hcq0Vi+-DBM~|O)~;~wiuzw3@Bt0bC#L&ip>g}tO6S6m=%i^Km|0# zWL?3TnrBV5SXWIpRODKobrJV@Xv(qXx^$LEI(6VHu(#UNXRZf(ajpJJ zw(2Y0yjpxCj|wYdCBo8@q_jU*_%tia9r8K4Ub5kTw_)GB%+xwn;J7A+!mp4e8WO#WMM*4t~Sj znVL+dmQmWM4-zv)(NaQ)p-@U*)b>GY34ze3AVMBQ(H9Y)3W6ZZHGT6Z2wqs6bM{($ z?{)UM<0BKTOCoZ7Fm-~9Jg`MhrqV;f+JT>!s3RUFCQheQ-zhizUL!ORE@~iJRDYa^ zl+_~s_rMB9HHjuBcsMgP`+4r96zIoM0Scfo8u1X7Q5DtBqz2w8}wU?S$Nv$~Z zqg?6Bj&dI_sZF1n;2L3{FnuK0hkmUX&(X4)NP$os*wLua4px0k=Dn6(}FGW0;4AZ za?wm4mEXAi3CMl{^gOwO1N+axGI@v@#sJHltx3NDj-3VCo?6EPsT7k*@M*5)9ARc z9|8-qC6E;lq|yR;u@TZ^w+t5?E8b@0S*Fp&jUY?0^jmNe@p_O9|7L&#yc-v#O3Ec!q-pS!8Q3E z)hdW>qDoAm+C7bXhnIo3Z{yMt#_OxdXREj}Lw;xhxm*skh1xU7UqG1tuuYt*1uV3; zx8s*rfO@?OnY)O?S9`HmA-9#~z-LgYR50-V2HyN^0|N^SI5s_wR4RpJGKoYYfw8d+ z`uc{@)pZb^oq5C)d>3y9J3Bkr+}yDa_y+&uzcK^)2dLNz5dZ)H literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/metal-4.vox b/assets/voxygen/voxel/weapon/bow/metal-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..72375c934626ca4a185f4b015201c1b1b5299ab3 GIT binary patch literal 1584 zcmeH_-)mG?5XWck&y5>3ZnC@CjcG&3Mni={RuhcTL@}mIut}?ixHhp=Hb2xw+A8c_ zHEytSE1K2^Nwd}(Sw=SDYD%WIhM)xR0ak=lZ41iWawlz^GvzmS0t+SDHURDPpJ~K zuBb*G*L5YelAfBxNETI-CAAZtVI@2z5~xWuQBtSYGwfPVi3Dm9tu3kA%wf}KGiGxS z)gkK8?-a#$ib{+?9ilG%Zc1!7rNju-AsV`-b|@uIh;}Gt1nLs4U`-YDSI}QUKh-6= z>6$v5sA0y#o;YFN8}^JqU80qYSAM9vnY!6m-9p_$dnR9FRF`Os?~L)CF}^d#cTydqar)!z zOPqa)voBPKh%gqQoD)%_q=vy+8SI(KwOLftWZ#KeB{eP1$D(afU)>U0sik? z{tVAM)(C77H{;M_n2w}xvmHr$5H%ziXq*#UtCSry2< z0rBf0Z&yRwY`m2hcx$6L{+RjK1t+-EUlv?hY(e`^eZbde@bF+YJ0BSo>1& z;DO-wBJX`Fc#b{5zFVTo>>`E3UqC9k*V)gKu8_4)^65%4Lu>QYND) zw~pb-fmz_vBi!hszp9Kvu8iB`jQ30-pU;D3AsB=F1w>gN*2sy#VWFw13BR5Ps`MUY z@;VOOYsaF`*lLaqABXSz=)Sp(_di=k_tX@Qj13}_$snChBbiL1xAzTnbo8LBtALi4 z0uo8i#T>!<`Z`utR z6swfgHWCa)|VECpr%i7-xb2w4h6DhNLK_`Z4H%$s@d@KST>6K??E z=5##C1UF=W#rTruZU?+XhKmtmq;D_9k0T3SGYpn7M93ndjRGzee6=t=GvZ|w^vUXXhxU#6aIKR(EwU77uEmZp-Ar3TA9bk6zzMFZF zxyNuGaiodTNFHSd`fQYZ%zmEHZ=l4$fQ4d!Imq(| z4HOx8B!>b6M{@|HIpA7Q{01moD|_<-*9mfv5#T*R2U*fV5p{v@D#!u@^@Z7M(;#)8 z2@;6}{VPl~J~(={emUc@M%n5A+@=};>6IE)Ue@SXZG&0`pjL(Pjj^}Z%}>twy1HC> zP1}{#PF%{orN`-2O2qqoipX8HPdCYPI8kdYY!M=3V;n@gZHje}`r_UeLnM zJ4&4Q(%!2{#~JM&pLcg@XKRbfo0}c)$yK0RJXhp>go?%DzWnwq$w{E29-whQ(76!M z^>Lv2v(EW?=kL|0fq57AV3g0w3a_TA;MXa0|MrfE{CR66ht>h=18 L{@>oa{R8|4U*9XM literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/rawwood-1.vox b/assets/voxygen/voxel/weapon/bow/rawwood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..e2f3fe1ae2e0427776349b72d05546032164ef06 GIT binary patch literal 1408 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 diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_starter.vox b/assets/voxygen/voxel/weapon/bow/starter.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/shortbow_starter.vox rename to assets/voxygen/voxel/weapon/bow/starter.vox diff --git a/assets/voxygen/voxel/weapon/bow/longbow_ore_nature-0.vox b/assets/voxygen/voxel/weapon/bow/velorite.vox similarity index 100% rename from assets/voxygen/voxel/weapon/bow/longbow_ore_nature-0.vox rename to assets/voxygen/voxel/weapon/bow/velorite.vox diff --git a/assets/voxygen/voxel/weapon/bow/wood-0.vox b/assets/voxygen/voxel/weapon/bow/wood-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..9b3fd6f8d47fe08804c6da4795df34687720753c GIT binary patch literal 1336 zcmeH`O>0^~6o!xYdexgR%~v6Y#9WA4l7J;*TP^{$jj0-}n#3l#mKxF|5GyEXp>a{O z2nnQtENTN4%7tJ`>qZJTE#0)MZn{V}`32o|-Tm7m{SDpaz%yrtne)DL2IfJ0W$c8A zV!_CLPBbnNEk?9ZS9`%>U^cadNlBEib^Fx^ZS(>Y3(9)*NH zp7#!s#p)un%}rvTLPkdFbCKNnnB*>n%vOcu9yiI|E;9D>8P=3~6*AeFUN;E_#>hGn zV`9vVg^@=|=-@0cB6~>eVRVrwum>Xv>>;y$SIP=pMF^W1!tEN0&8R)_{-3-|5>$=Gh3$Zog8;c&p|bYfy+0v?YCKA#V& zs>1L0BNPfD8jT_zk0X^zLDMv3G8t@aY#^J>BA?HrR4SodE~8SZU~g{^hlhtaK0ZdZ zT1Bl^gRbkS*Xw9B8fZ3~Xti1hj1i(vLijpi?FJ$1BRo|Jy8*&>h)`J|=m|n2Mfj)@ z0@IV2yXiqp^QZ}%kP%4 z+1y0&QxT54^Kd3LOl7t){p1;L?;OB?aDq_v4D+WgXz#yZ`@=Wr+{-23AGywd90icJ yTJd>g1i#X0*gZ*jAD$v#{fXhkFnqcXg^L38C9W%Q-3zX}imMm+PcP8^|9=4tl1}~r literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/weapon/bow/wood-1.vox b/assets/voxygen/voxel/weapon/bow/wood-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..d97ebdf1832fa60ba50fa8f0379f5e71d847cd1c GIT binary patch literal 1392 zcmdT^OKTHR82#p*v}u~>BvB~3C{k@vBS9$!jLu{x25V_C#3BVjT}a$WD3mT#s<{ z@ss=t=Zr8n*yQHd9OnxL7oN}ava`sEG2-R53O{^--e-sxFA+QUPxFtpX>P1u?A7dl zqfX9}K?AXPJkH5vl1(=(%PT}Y0gBjO^GC|RhGMTjnhrb%`pxHXV7h~PR`kX*n! zxb*P277vfp-!|boZ8u#8sM5o@ z0PQ@K46p?=<)Kx8DX5x#%{*sqJglJ~EMYCRPdfA&N$7hk*zOXlqEADIV&rA$%k5!``OLa s2)g|t&@@e4uXoqtO_akVUY^zQX?77`$LDc=l7IZjq5RtJ{^Ugd1LV6n>;M1& delta 317 zcmXAkJx&8b427R(W+%xKHrZrh`krms^ZZes%KG7cclj>q_GWtrboEyE`!!kz`788YFv`S(dXT zZ-dNbd6yI%+GhoyRCsjADne2W=pri??1(VJ5gbt;!!i3Na01IcqC}hxiiAyBFeN`H zC#<4hkp81}GdJd|33M&Q) Yw;GO(z1rc^UmQ+u?Y>@)-)`f60g59v@Bjb+ diff --git a/assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox b/assets/voxygen/voxel/weapon/bow/wood-3.vox similarity index 67% rename from assets/voxygen/voxel/weapon/bow/shortbow_wood-1.vox rename to assets/voxygen/voxel/weapon/bow/wood-3.vox index 9dff83e1714497efbcfc62dcc3e7e5dde8d2c36f..318952e697c9fc69a756b7a39d0ce84a953d959e 100644 GIT binary patch delta 310 zcmWlTJ#xY@6oglnC4(`)#@Ojnq|FUzC@5S21v3oL***w4MedOj_%Sq?@X zd5@kkbcSypWNNSoN*eM@;s)P}dYoGZ*&1G>*BtR(&{Q$J;<`EUhC<#+4NxavVyal; JVEgx+rf_;0Zu?kA0&iQ01`+D=%O4XoPvwcP;j6W9DGI`7r8bHOLrfCIx1Ywb1r*79C7- zK`$Sm-6ZdNg%0f}g`S>pM1+V4Mik;fKE@|BCHNGd;xpeLiHapEmaDl}<7;$-Zie%I+lr4$?~SqU4>QIl=l}o! diff --git a/assets/voxygen/voxel/weapon/bow/wood-4.vox b/assets/voxygen/voxel/weapon/bow/wood-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..72a2473350c78f926688fe7ec6ae9443f8b5ae17 GIT binary patch literal 1344 zcmdT@O=}ZT6g~5uv}wK@i3?G%NHIl?1VxM(otF=Sv9uUsg@Pb1ByJ=`N*7wHxDh`n zscj?}l)|iRw%G^)5p>hF+k!Gb!f?HlMaWPnQbF*+nRnhj=iYbUg(+XJ99;)+EmJ7* zhJ*&p7Z!xiIq;GgUdACt<>o@+7w^uxOtYbDc^H}rBgFnt4pN9~1qJjVdxADR0RbbxJiy$~+|M3AdnOW) zCb-5p^D*vWjCU``yzKL^&%-$$<_2?vxxu>5b#>0yZKzQJg&{Mfs0l41phmd22_Pxhol{&H#X7u}J?4(>w27clCd|&!LC6-1?7A>H_q@ z>XP-MOL1$3`gKs>Vtixlt`7aBY-GsW)@$0dmIvon^$k6$EK}K>q#g;{`CO(-)uif^ zd0J{LQtAk3>3N&(J#AC*BxvzGs9n#}*YyhZR?iJ "common.items.weapons.sword.starter", 3 => "common.items.weapons.hammer.starter_hammer", 4 => "common.items.weapons.staff.starter_staff", - _ => "common.items.weapons.bow.starter_bow", + _ => "common.items.weapons.bow.starter", }, )), 1 => entity @@ -634,7 +634,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-8", 3 => "common.items.weapons.hammer.worn_iron_hammer-0", 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_shortbow-1", + _ => "common.items.weapons.bow.hardwood-3", }, )), 2 => entity @@ -651,7 +651,7 @@ impl Floor { 2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.bronze_hammer-0", 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_longbow-0", + _ => "common.items.weapons.bow.wood-3", }, )), 3 => entity @@ -667,7 +667,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), 4 => entity @@ -683,7 +683,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), 5 => match dynamic_rng.gen_range(0..6) { @@ -715,13 +715,13 @@ impl Floor { 0 => "common.items.weapons.axe.malachite_axe-0", 1..=2 => "common.items.weapons.sword.cultist", 3 => "common.items.weapons.hammer.cultist_purp_2h-0", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), }, _ => entity.with_name("Humanoid").with_main_tool( comp::Item::new_from_asset_expect( - "common.items.weapons.bow.horn_longbow-0", + "common.items.weapons.bow.bone-1", ), ), }; @@ -789,7 +789,7 @@ impl Floor { "common.items.weapons.hammer.worn_iron_hammer-0" }, 4 => "common.items.weapons.staff.bone_staff", - _ => "common.items.weapons.bow.wood_shortbow-1", + _ => "common.items.weapons.bow.hardwood-3", }, )), EntityInfo::at(tile_wcenter.map(|e| e as f32)) @@ -831,7 +831,7 @@ impl Floor { 1..=2 => "common.items.weapons.sword.steel-2", 3 => "common.items.weapons.hammer.cobalt_hammer-0", 4 => "common.items.weapons.staff.amethyst_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, ),); 2 @@ -855,7 +855,7 @@ impl Floor { 3 => "common.items.weapons.hammer.cultist_purp_2h-0", 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, ),); 2 @@ -1010,7 +1010,7 @@ impl Floor { "common.items.weapons.hammer.cultist_purp_2h-0" }, 4 => "common.items.weapons.staff.cultist_staff", - _ => "common.items.weapons.bow.horn_longbow-0", + _ => "common.items.weapons.bow.bone-1", }, )), EntityInfo::at(tile_wcenter.map(|e| e as f32)) diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index ee2c443324..42c314028b 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -948,7 +948,7 @@ impl Settlement { 4 => "common.items.weapons.tool.rake", 5 => "common.items.weapons.tool.shovel-0", _ => "common.items.weapons.tool.shovel-1", - //_ => "common.items.weapons.bow.starter_bow", TODO: Re-Add this when we have a better way of distributing npc_weapons here + //_ => "common.items.weapons.bow.starter", TODO: Re-Add this when we have a better way of distributing npc_weapons here }, )) .with_loadout_config(loadout_builder::LoadoutConfig::Villager)