Bows

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: [],
+)

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: [],
+)

assets/common/items/weapons/bow/bone-2.ron

@@ -1,12 +1,12 @@
 ItemDef(
-    name: "Horn Bow",
+    name: "Ritual Bow",
-    description: "You don\'t recognize the creature these horns belong to.",
+    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,
         )),

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: [],
+)

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: [],
+)

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: [],
+)

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: [],
+)

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: [],
+)

assets/common/items/weapons/bow/frostwood-1.ron

@@ -1,16 +1,16 @@
 ItemDef(
-    name: "Horse Bow",
+    name: "Frostwood Bow",
-    description: "Works on the ground too.",
+    description: "Chill to the touch...",
     kind: Tool((
         kind: Bow,
         hands: Two,
         stats: Direct((
             equip_time_millis: 400,
-            power: 0.75,
+            power: 1.6,
-            poise_strength: 0.4,
+            poise_strength: 0.8,
             speed: 1.0,
         )),
     )),
-    quality: Common,
+    quality: High,
     tags: [],
 )

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: [],
+)

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: [],
+)

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: [],
+)

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,
+            power: 1.1,
-            poise_strength: 1.0,
+            poise_strength: 0.8,
-            speed: 1.0,
+            speed: 1.1,
         )),
     )),
     quality: Moderate,

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: [],
+)

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,
+            poise_strength: 0.8,
-            speed: 1.0,
+            speed: 1.2,
         )),
     )),
-    quality: Common,
+    quality: Moderate,
     tags: [],
 )

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: [],
+)

assets/common/items/weapons/bow/metal-0.ron

@@ -1,13 +1,13 @@
 ItemDef(
-    name: "Soldier\'s Bow",
+    name: "Beetlehorn Bow",
-    description: "Has an insignia on it.",
+    description: "Made from the horns of a small beetle",
     kind: Tool((
         kind: Bow,
         hands: Two,
         stats: Direct((
             equip_time_millis: 400,
-            power: 1.75,
+            power: 1.4,
-            poise_strength: 1.3,
+            poise_strength: 0.8,
             speed: 1.0,
         )),
     )),

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,
+            power: 1.2,
-            poise_strength: 1.0,
+            poise_strength: 0.8,
-            speed: 1.0,
+            speed: 1.2,
         )),
     )),
-    quality: Epic,
+    quality: Moderate,
     tags: [],
 )

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: [],
+)

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: [],
+)

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: [],
+)

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: [],
+)

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: [],
+)

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: [],
+)

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,
+            power: 0.9,
-            poise_strength: 0.4,
+            poise_strength: 0.8,
-            speed: 1.0,
+            speed: 0.9,
         )),
     )),
-    quality: Common,
+    quality: Low,
     tags: [],
 )

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: [],
+)

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: [],
 )

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,
+            poise_strength: 0.8,
-            speed: 1.0,
+            speed: 0.8,
         )),
     )),
-    quality: Common,
+    quality: Low,
     tags: [],
 )

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: [],
+)

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    
+    // bows
-    (0.001, "common.items.weapons.bow.nature_ore_longbow-0"),
+    (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"),
 
 
 ]

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.05, "common.items.weapons.sword.bronze-0"),
-    (0.15, "common.items.weapons.sword.bronze-1"),
+    (0.05, "common.items.weapons.sword.bronze-1"),
-    (0.15, "common.items.weapons.sword.bronze-2"),
+    (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    
+    // bows
-    (0.25, "common.items.weapons.bow.wood_shortbow-0"),
+    (0.20, "common.items.weapons.bow.rawwood-0"),
-    (0.25, "common.items.weapons.bow.wood_shortbow-1"),
+    (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.04, "common.items.weapons.bow.hardwood-0"),
-    (0.25, "common.items.weapons.bow.wood_longbow-0"),
+    (0.04, "common.items.weapons.bow.hardwood-1"),
-    (0.25, "common.items.weapons.bow.wood_longbow-1"),
+    (0.04, "common.items.weapons.bow.hardwood-2"),
-    (0.20, "common.items.weapons.bow.leafy_longbow-0"),
+    (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.20, "common.items.weapons.bow.frostwood-0"),
-    (0.2, "common.items.weapons.bow.iron_longbow-0"),
+    (0.20, "common.items.weapons.bow.frostwood-1"),
-    (0.10, "common.items.weapons.bow.rare_longbow"),
+    (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"),
 ]

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"),
 ]

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"),
 ]

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.15, "common.items.weapons.bow.starter"),
-    (0.25, "common.items.weapons.bow.wood_shortbow-0"),
+    (0.10, "common.items.weapons.bow.rawwood-0"),
-    (0.25, "common.items.weapons.bow.wood_shortbow-1"),
+    (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"),

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.20, "common.items.weapons.bow.frostwood-0"),
-    (0.30, "common.items.weapons.bow.iron_longbow-0"),
+    (0.20, "common.items.weapons.bow.frostwood-1"),
-    (0.05, "common.items.weapons.bow.rare_longbow"),
+    (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"),
 ]

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.15, "common.items.weapons.bow.bone-0"),
-    (0.25, "common.items.weapons.bow.wood_longbow-0"),
+    (0.15, "common.items.weapons.bow.bone-1"),
-    (0.25, "common.items.weapons.bow.wood_longbow-1"),
+    (0.15, "common.items.weapons.bow.bone-2"),
-    (0.20, "common.items.weapons.bow.leafy_longbow-0"),
+    (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"),
 ]

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),

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(
+    Tool("common.items.weapons.bow.bone-0"): VoxTrans(
-        "voxel.weapon.bow.shortbow_starter",
+        "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(
+    Tool("common.items.weapons.bow.bone-1"): VoxTrans(
-        "voxel.weapon.bow.shortbow_wood-0",
+        "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(
+    Tool("common.items.weapons.bow.bone-2"): VoxTrans(
-        "voxel.weapon.bow.shortbow_wood-1",
+        "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(
+    Tool("common.items.weapons.bow.bone-3"): VoxTrans(
-        "voxel.weapon.bow.shortbow_leafy-0",
+        "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(
+    Tool("common.items.weapons.bow.eldwood-0"): VoxTrans(
-        "voxel.weapon.bow.longbow_wood-0",
+        "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(
+    Tool("common.items.weapons.bow.eldwood-1"): VoxTrans(
-        "voxel.weapon.bow.longbow_wood-1",
+        "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(
+    Tool("common.items.weapons.bow.eldwood-2"): VoxTrans(
-        "voxel.weapon.bow.longbow_leafy-0",
+        "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(
+    Tool("common.items.weapons.bow.frostwood-0"): VoxTrans(
-        "voxel.weapon.bow.longbow_horn-0",
+        "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(
+    Tool("common.items.weapons.bow.frostwood-1"): VoxTrans(
-        "voxel.weapon.bow.longbow_iron-0",
+        "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(
+    Tool("common.items.weapons.bow.frostwood-2"): VoxTrans(
-        "voxel.weapon.bow.longbow_rare",
+        "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(
+    Tool("common.items.weapons.bow.hardwood-0"): VoxTrans(
-        "voxel.weapon.bow.longbow_ore_nature-0",
+        "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

assets/voxygen/voxel/humanoid_main_weapon_manifest.ron

@@ -695,48 +695,128 @@
         color: None
     ),
     // Bows
-    "common.items.weapons.bow.starter_bow": (
+    "common.items.weapons.bow.bone-0": (
-        vox_spec: ("weapon.bow.shortbow_starter", (-0.5, -3.0, -8.5)),
+        vox_spec: ("weapons.bow.bone-0", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.wood_shortbow-0": (
+    "common.items.weapons.bow.bone-1": (
-        vox_spec: ("weapon.bow.shortbow_wood-0", (-0.5, -3.0, -9.5)),
+        vox_spec: ("weapons.bow.bone-1", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.wood_shortbow-1": (
+    "common.items.weapons.bow.bone-2": (
-        vox_spec: ("weapon.bow.shortbow_wood-1", (-0.5, -3.5, -9.5)),
+        vox_spec: ("weapons.bow.bone-2", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.leafy_shortbow-0": (
+    "common.items.weapons.bow.bone-3": (
-        vox_spec: ("weapon.bow.shortbow_leafy-0", (-0.5, -4.5, -9.0)),
+        vox_spec: ("weapons.bow.bone-3", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.wood_longbow-0": (
+    "common.items.weapons.bow.eldwood-0": (
-        vox_spec: ("weapon.bow.longbow_wood-0", (-0.5, -3.5, -12.5)),
+        vox_spec: ("weapons.bow.eldwood-0", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.wood_longbow-1": (
+    "common.items.weapons.bow.eldwood-1": (
-        vox_spec: ("weapon.bow.longbow_wood-1", (-1.5, -3.5, -12.5)),
+        vox_spec: ("weapons.bow.eldwood-1", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.leafy_longbow-0": (
+    "common.items.weapons.bow.eldwood-2": (
-        vox_spec: ("weapon.bow.longbow_leafy-0", (-1.5, -4.5, -12.5)),
+        vox_spec: ("weapons.bow.eldwood-2", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.horn_longbow-0": (
+    "common.items.weapons.bow.frostwood-0": (
-        vox_spec: ("weapon.bow.longbow_horn-0", (-1.5, -4.5, -17.5)),
+        vox_spec: ("weapons.bow.frostwood-0", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.iron_longbow-0": (
+    "common.items.weapons.bow.frostwood-1": (
-        vox_spec: ("weapon.bow.longbow_iron-0", (-1.5, -4.0, -16.0)),
+        vox_spec: ("weapons.bow.frostwood-1", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.rare_longbow": (
+    "common.items.weapons.bow.frostwood-2": (
-        vox_spec: ("weapon.bow.longbow_rare", (-1.5, -5.0, -13.5)),
+        vox_spec: ("weapons.bow.frostwood-2", (-0.5, -3.0, -8.5)),
         color: None
     ),
-    "common.items.weapons.bow.nature_ore_longbow-0": (
+    "common.items.weapons.bow.hardwood-0": (
-        vox_spec: ("weapon.bow.longbow_ore_nature-0", (-1.5, -4.0, -15.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

server/src/migrations/2021-02-24-230149_weapon-replacements/up.sql

@@ -84,3 +84,25 @@ UPDATE item
 SET item_definition_id = 'common.items.weapons.sword.frost-0' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-0';
 UPDATE item
 SET item_definition_id = 'common.items.weapons.sword.frost-1' WHERE item_definition_id = 'common.items.weapons.sword.frost_cleaver_2h-1';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.bone-1' WHERE item_definition_id = 'common.items.weapons.bow.horn_longbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.metal-4' WHERE item_definition_id = 'common.items.weapons.bow.iron_longbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.hardwood-2' WHERE item_definition_id = 'common.items.weapons.bow.leafy_longbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.wood-0' WHERE item_definition_id = 'common.items.weapons.bow.leafy_shortbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.velorite' WHERE item_definition_id = 'common.items.weapons.bow.nature_ore_longbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.metal-1' WHERE item_definition_id = 'common.items.weapons.bow.rare_longbow';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.starter' WHERE item_definition_id = 'common.items.weapons.bow.starter_bow';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.wood-3' WHERE item_definition_id = 'common.items.weapons.bow.wood_longbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.hardwood-4' WHERE item_definition_id = 'common.items.weapons.bow.wood_longbow-1';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.wood-2' WHERE item_definition_id = 'common.items.weapons.bow.wood_shortbow-0';
+UPDATE item
+SET item_definition_id = 'common.items.weapons.bow.hardwood-3' WHERE item_definition_id = 'common.items.weapons.bow.wood_shortbow-1';

server/src/rtsim/entity.rs

@@ -69,8 +69,8 @@ impl Entity {
                 "common.items.weapons.sword.wood-2",
                 "common.items.weapons.sword.starter",
                 "common.items.weapons.sword.wood-0",
-                "common.items.weapons.bow.starter_bow",
+                "common.items.weapons.bow.starter",
-                "common.items.weapons.bow.leafy_longbow-0",
+                "common.items.weapons.bow.hardwood-2",
             ])
                 .choose(&mut rng)
                 .unwrap(),

voxygen/src/audio/sfx/event_mapper/combat/tests.rs

@@ -40,7 +40,7 @@ fn maps_wield_while_equipping() {
 fn maps_unwield() {
     let loadout = LoadoutBuilder::new()
         .active_item(Some(Item::new_from_asset_expect(
-            "common.items.weapons.bow.starter_bow",
+            "common.items.weapons.bow.starter",
         )))
         .build();
     let inventory = Inventory::new_with_loadout(loadout);

voxygen/src/menu/char_selection/ui/mod.rs

@@ -49,7 +49,7 @@ const BANNER_ALPHA: u8 = 210;
 const SMALL_BUTTON_HEIGHT: u16 = 31;
 
 const STARTER_HAMMER: &str = "common.items.weapons.hammer.starter_hammer";
-const STARTER_BOW: &str = "common.items.weapons.bow.starter_bow";
+const STARTER_BOW: &str = "common.items.weapons.bow.starter";
 const STARTER_AXE: &str = "common.items.weapons.axe.starter_axe";
 const STARTER_STAFF: &str = "common.items.weapons.staff.starter_staff";
 const STARTER_SWORD: &str = "common.items.weapons.sword.starter";

world/src/site/dungeon/mod.rs

@@ -618,7 +618,7 @@ impl Floor {
                                         1..=2 => "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))

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)