assets/common/abilities/ability_set_manifest.ron

@@ -1031,7 +1031,12 @@
         primary: Simple(None, "common.abilities.music.kora"),
         secondary: Simple(None, "common.abilities.music.kora"),
         abilities: [],
-    ),    
+    ),
+    Custom("Banjo"): (
+        primary: Simple(None, "common.abilities.music.banjo"),
+        secondary: Simple(None, "common.abilities.music.banjo"),
+        abilities: [],
+    ),
     Tool(Debug): (
         primary: Simple(None, "common.abilities.debug.forwardboost"),
         secondary: Simple(None, "common.abilities.debug.upboost"),

assets/common/abilities/music/banjo.ron

+Music(
+    play_duration: 0.4,
+    ori_modifier: 1.0,
+)
\ No newline at end of file

assets/common/item_i18n_manifest.ron

@@ -2530,7 +2530,10 @@
         ): "weapon-tool-shamisen",
         Simple(
             "common.items.tool.instruments.kora",
-        ): "weapon-tool-kora",        
+        ): "weapon-tool-kora",
+        Simple(
+            "common.items.tool.instruments.banjo",
+        ): "weapon-tool-banjo",
         Simple(
             "common.items.log.bamboo",
         ): "sprite-wood-item-bamboo",

assets/common/items/armor/misc/neck/fang.ron

@@ -9,6 +9,6 @@ ItemDef(
             energy_max: Some(-3.75),
         )),
     )),
-    quality: High,
+    quality: Moderate,
     tags: [],
 )
\ No newline at end of file

assets/common/items/recipes/instruments.ron

@@ -13,7 +13,8 @@ ItemDef(
             "washboard",
             "sitar",
             "icy_talharpa",
-            "kora",            
+            "kora",
+            "banjo",
         ],
     ),
     quality: Common,

assets/common/items/tool/instruments/banjo.ron

+ItemDef(
+    legacy_name: "Banjo",
+    legacy_description: "Banjo.",
+    kind: Tool((
+        kind: Instrument,
+        hands: Two,
+        stats: (
+            equip_time_secs: 0.4,
+            power: 0.0,
+            effect_power: 1.0,
+            speed: 1.0,
+            range: 0.0,
+            energy_efficiency: 1.0,
+            buff_strength: 1.0,
+        ),
+    )),
+    quality: Common,
+    tags: [Utility],
+    ability_spec: Some(Custom("Banjo")),
+)

assets/common/recipe_book_manifest.ron

@@ -2440,7 +2440,20 @@
         ],
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
-    ),    
+    ),
+    "banjo": (
+        output: ("common.items.tool.instruments.banjo", 1),
+        inputs: [
+            (Item("common.items.log.hardwood"), 3, false),
+            (Item("common.items.log.wood"), 3, false),            
+            (Item("common.items.crafting_ing.resin"), 2, false),
+            (Item("common.items.flowers.plant_fiber"), 5, false),            
+            (Item("common.items.mineral.ingot.iron"), 2, false),
+            (Item("common.items.mineral.ingot.tin"), 1, false),
+        ],
+        craft_sprite: Some(CraftingBench),
+        is_recycling: false,
+    ),
     "lockpick": (
         output: ("common.items.utility.lockpick_0", 2),
         inputs: [

assets/common/trading/collection.ron

@@ -8,21 +8,31 @@
 // Please keep it sorted by rarity so it's easier to reason about things
 [
     /// Non-craftable gliders
-    (5.0, Item("common.items.glider.blue")),
-    (5.0, Item("common.items.glider.moonrise")),
-    (2.0, Item("common.items.glider.skullgrin")),
+    (1.5, Item("common.items.glider.blue")),
+    (1.5, Item("common.items.glider.moonrise")),
+    (1.0, Item("common.items.glider.skullgrin")),
     // Butterfly gliders
-    (5.0, Item("common.items.glider.morpho")),
-    (5.0, Item("common.items.glider.monarch")),
-    (5.0, Item("common.items.glider.moth")),
+    (1.5, Item("common.items.glider.morpho")),
+    (1.5, Item("common.items.glider.monarch")),
+    (1.5, Item("common.items.glider.moth")),
 
     // Lanterns
-    (5.0, Item("common.items.lantern.geode_purp")),
-    (2.0, Item("common.items.lantern.pumpkin")),
-    (2.0, Item("common.items.boss_drops.lantern")),
-    (2.0, Item("common.items.lantern.blue_0")),
+    (1.5, Item("common.items.lantern.geode_purp")),
+    (1.5, Item("common.items.lantern.pumpkin")),
+    (1.0, Item("common.items.boss_drops.lantern")),
+    (1.5, Item("common.items.lantern.blue_0")),
 
     // Keys
-    (5.0, Item("common.items.keys.bone_key")),
-    (5.0, Item("common.items.keys.glass_key")),
+    (15.0, Item("common.items.keys.bone_key")),
+    (15.0, Item("common.items.keys.glass_key")),
+    (15.0, Item("common.items.keys.haniwa_key")),
+    (15.0, Item("common.items.keys.minotaur_key")),
+    (15.0, Item("common.items.keys.myrmidon_key")),
+    (15.0, Item("common.items.keys.rusty_tower_key")),
+    (15.0, Item("common.items.keys.sahagin_key")),
+    (15.0, Item("common.items.keys.terracotta_key_chest")),
+    (15.0, Item("common.items.keys.terracotta_key_door")),
+    (15.0, Item("common.items.keys.vampire_key")),
+    (15.0, Item("common.items.keys.quarry_keys.forge_key")),
+    (15.0, Item("common.items.keys.quarry_keys.miner_key")),
 ]

assets/common/trading/food.ron

@@ -8,15 +8,15 @@
 [
     // Meats
     (0.1, Item("common.items.food.meat.bird_large_raw")),
-    (0.35, Item("common.items.food.meat.beast_large_raw")),
-    (0.65, Item("common.items.food.meat.bird_raw")),
-    (0.65, Item("common.items.food.meat.fish_raw")),
-    (0.65, Item("common.items.food.meat.tough_raw")),
+    (0.5, Item("common.items.food.meat.beast_large_raw")),
+    (0.75, Item("common.items.food.meat.bird_raw")),
+    (0.75, Item("common.items.food.meat.fish_raw")),
+    (0.75, Item("common.items.food.meat.tough_raw")),
     (1.5, Item("common.items.food.meat.beast_small_raw")),
     // Gatherables
-    (0.25, Item("common.items.food.coconut")),
+    (0.5, Item("common.items.food.coconut")),
     (0.75, Item("common.items.food.cheese")),
-    (1.0, Item("common.items.food.apple")),
+    (1.5, Item("common.items.food.apple")),
     (2.0, Item("common.items.food.carrot")),
     (2.0, Item("common.items.food.lettuce")),
     (2.0, Item("common.items.food.tomato")),

assets/common/trading/item_price_calculation.ron

@@ -12,7 +12,7 @@ loot_tables: [
     (6.0, true, "common.loot_tables.armor.twigs"),
     (6.0, true, "common.loot_tables.armor.twigsflowers"),
     (6.0, true, "common.loot_tables.armor.twigsleaves"),
-    (4.0, false, "common.trading.misc_armor"),
+    (2.0, false, "common.trading.misc_armor"),
     (0.09, false, "common.loot_tables.armor.cultist"),
     (0.0016, false, "common.loot_tables.armor.boreal"),
 
@@ -37,7 +37,7 @@ loot_tables: [
     // and economy.
     //
     // Collections
-    (0.00026, false, "common.trading.collection"),
+    (1.0, false, "common.trading.collection"),
     // Manual balance
     (81.0, false, "common.trading.balance"),
 ],

assets/common/trading/misc_armor.ron

@@ -9,52 +9,54 @@
 // Please keep it sorted by rarity so it's easier to reason about things
 [
     // Bags
-    (0.1, Item("common.items.armor.misc.bag.heavy_seabag")),
+    (0.12, Item("common.items.armor.misc.bag.heavy_seabag")),
     (0.2, Item("common.items.armor.misc.bag.liana_kit")),
 
     // Basic
-    (2.0, Item("common.items.armor.misc.head.straw")),
-    (2.0, Item("common.items.armor.misc.head.bamboo_twig")),
+    (2.5, Item("common.items.armor.misc.head.straw")),
+    (2.5, Item("common.items.armor.misc.head.bamboo_twig")),
 
     // General humanoid
-    (0.75, Item("common.items.armor.misc.ring.gold")),
-    (0.75, Item("common.items.armor.misc.neck.gold")),
+    (0.12, Item("common.items.armor.misc.ring.gold")),
+    (0.12, Item("common.items.armor.misc.neck.gold")),
 
     // Grim Salvager
-    (2.0, Item("common.items.armor.misc.head.bandana.thief")),
-    (2.0, Item("common.items.armor.misc.head.bandana.red")),
-    (2.0, Item("common.items.armor.misc.head.hood")),
-    (2.0, Item("common.items.armor.misc.head.hood_dark")),
+    (1.5, Item("common.items.armor.misc.head.bandana.thief")),
+    (1.5, Item("common.items.armor.misc.head.bandana.red")),
+    (0.5, Item("common.items.armor.misc.head.hood")),
+    (0.5, Item("common.items.armor.misc.head.hood_dark")),
 
     // Pirate
-    (0.05, Item("common.items.armor.misc.head.crown")),
-    (0.05, Item("common.items.armor.pirate.hat")),
+    (0.03, Item("common.items.armor.misc.head.crown")),
+    (0.03, Item("common.items.armor.pirate.hat")),
 
     // Witch
-    (0.05, Item("common.items.armor.witch.hat")),
+    (0.03, Item("common.items.armor.witch.hat")),
 
     // Gnarling
-    (0.5, Item("common.items.armor.misc.head.gnarling_mask")),
-    (1.5, Item("common.items.armor.misc.head.wanderers_hat")),
-    (2.0, Item("common.items.armor.misc.neck.scratched")),
+    (0.3, Item("common.items.armor.misc.head.gnarling_mask")),
+    (0.5, Item("common.items.armor.misc.head.wanderers_hat")),
+    (1.5, Item("common.items.armor.misc.neck.scratched")),
 
     // Adlet
-    (0.1, Item("common.items.armor.misc.head.bear_bonnet")),
-    (0.1, Item("common.items.armor.misc.head.howl_cowl")),
+    (0.07, Item("common.items.armor.misc.head.bear_bonnet")),
+    (0.07, Item("common.items.armor.misc.head.howl_cowl")),
     (0.2, Item("common.items.armor.misc.head.hog_hood")),
-    (0.75, Item("common.items.armor.misc.neck.pendant_of_protection")),
+    (0.5, Item("common.items.armor.misc.neck.pendant_of_protection")),
 
     // Sahagin
-    (0.25, Item("common.items.armor.misc.neck.gem_of_resilience")),
+    (0.2, Item("common.items.armor.misc.neck.gem_of_resilience")),
 
     // Haniwa
-    (0.2, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (0.12, Item("common.items.armor.misc.neck.haniwa_talisman")),
 
     // Myrmidon
-    (0.05, Item("common.items.armor.misc.head.spikeguard")),
-    (0.05, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
-    (0.05, Item("common.items.armor.misc.head.mitre")),
+    (0.07, Item("common.items.armor.misc.head.spikeguard")),
+    (0.03, Item("common.items.armor.misc.neck.carcanet_of_wrath")),
+
+    // Vampire
+    (0.07, Item("common.items.armor.misc.head.mitre")),
 
     // Cultist
-    (0.0005, Item("common.items.armor.misc.neck.ankh_of_life")),
+    (0.03, Item("common.items.armor.misc.neck.ankh_of_life")),
 ]

assets/common/trading/sellable_materials.ron

@@ -7,38 +7,35 @@
 // Please keep it sorted by rarity so it's easier to reason about things
 [
     // Stones
-    (0.02, Item("common.items.mineral.gem.diamond")),
-    (0.08, Item("common.items.mineral.gem.ruby")),
-    (0.1, Item("common.items.mineral.gem.emerald")),
-    (0.2, Item("common.items.mineral.gem.sapphire")),
     (0.5, Item("common.items.mineral.ore.velorite")),
     (0.75, Item("common.items.mineral.gem.topaz")),
-    (1.0, Item("common.items.mineral.gem.amethyst")),
-    (2.0, Item("common.items.mineral.ore.veloritefrag")),
+    (0.75, Item("common.items.mineral.gem.amethyst")),
+    (1.5, Item("common.items.mineral.ore.veloritefrag")),
     (4.0, Item("common.items.crafting_ing.stones")),
 
     // Ores
-    (0.3, Item("common.items.mineral.ore.velorite")),
-    (0.4, Item("common.items.mineral.ore.veloritefrag")),
     (1.5, Item("common.items.mineral.ore.copper")),
     (1.5, Item("common.items.mineral.ore.tin")),
 
     // Logs
-    (5.0, Item("common.items.log.wood")),
+    (4.0, Item("common.items.log.wood")),
 
     // Animal Hide
     (4.0, Item("common.items.crafting_ing.hide.animal_hide")),
 
     // Mob Drops
-    (0.10, Item("common.items.crafting_ing.animal_misc.long_tusk")),
-    (0.15, Item("common.items.crafting_ing.animal_misc.elegant_crest")),
-    (0.15, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
-    (0.15, Item("common.items.crafting_ing.animal_misc.icy_fang")),
-    (0.2, Item("common.items.crafting_ing.animal_misc.strong_pincer")),
+    (0.3, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
+    (0.3, Item("common.items.crafting_ing.animal_misc.icy_fang")),
+    (0.3, Item("common.items.crafting_ing.animal_misc.long_tusk")),
+    (0.3, Item("common.items.crafting_ing.animal_misc.elegant_crest")),
+    (0.4, Item("common.items.crafting_ing.animal_misc.strong_pincer")),
+    (0.4, Item("common.items.crafting_ing.resin")),
+    (0.5, Item("common.items.crafting_ing.animal_misc.claw")),
+    (0.5, Item("common.items.crafting_ing.animal_misc.sharp_fang")),
     (0.5, Item("common.items.crafting_ing.animal_misc.raptor_feather")),
-    (1.2, Item("common.items.crafting_ing.animal_misc.claw")),
+    (0.5, Item("common.items.crafting_ing.sentient_seed")),
+    (0.75, Item("common.items.crafting_ing.living_embers")),
     (2.5, Item("common.items.crafting_ing.animal_misc.fur")),
-    (2.5, Item("common.items.crafting_ing.animal_misc.sharp_fang")),
     (2.5, Item("common.items.crafting_ing.animal_misc.venom_sac")),
     (2.5, Item("common.items.crafting_ing.animal_misc.viscous_ooze")),
     (4.0, Item("common.items.crafting_ing.cloth.wool")),
@@ -49,14 +46,12 @@
     (4.0, Item("common.items.crafting_ing.empty_vial")),
 
     // Gatherables
-    (0.1, Item("common.items.crafting_ing.seashells")),
+    (0.75, Item("common.items.crafting_ing.seashells")),
     (4.0, Item("common.items.crafting_ing.honey")),
-    (4.0, Item("common.items.flowers.moonbell")),
     (3.0, Item("common.items.crafting_ing.cotton_boll")),
-    (1.0, Item("common.items.flowers.pyrebloom")),
     (3.5, Item("common.items.crafting_ing.twigs")),
     (3.0, Item("common.items.crafting_ing.cactus")),
-    (2.0, Item("common.items.flowers.red")),
+    (3.0, Item("common.items.flowers.red")),
     (4.0, Item("common.items.flowers.wild_flax")),
     (8.0, Item("common.items.flowers.sunflower")),
 ]

assets/common/trading/unsellable_materials.ron

@@ -14,6 +14,12 @@
     (0.5, Item("common.items.mineral.ore.coal")),
     (1.0, Item("common.items.mineral.ore.iron")),
 
+    // High tier Gems
+    (0.1, Item("common.items.mineral.gem.diamond")),
+    (0.3, Item("common.items.mineral.gem.ruby")),
+    (0.35, Item("common.items.mineral.gem.emerald")),
+    (0.4, Item("common.items.mineral.gem.sapphire")),
+
     // High tier woods
     (0.05, Item("common.items.log.eldwood")),
     (0.1, Item("common.items.log.frostwood")),
@@ -32,9 +38,19 @@
 
     // High tier Mob drops
     (0.005, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),
-    (0.18, Item("common.items.crafting_ing.animal_misc.large_horn")),
-    (0.28, Item("common.items.crafting_ing.animal_misc.lively_vine")),
-    (0.35, Item("common.items.crafting_ing.sticky_thread")),
+    (0.025, Item("common.items.crafting_ing.golem_core")),
+    (0.025, Item("common.items.crafting_ing.cursed_bead")),
+    (0.025, Item("common.items.mineral.ore.ancient_gold")),
+    (0.05, Item("common.items.crafting_ing.alkahest")),
+    (0.05, Item("common.items.crafting_ing.dwarven_battery")),
+    (0.25, Item("common.items.crafting_ing.animal_misc.large_horn")),
+    (0.3, Item("common.items.crafting_ing.animal_misc.lively_vine")),
+    (0.5, Item("common.items.crafting_ing.sticky_thread")),
+    (1.0, Item("common.items.crafting_ing.earthern_shard")),
+
+    // High tier Flowers
+    (1.0, Item("common.items.flowers.pyrebloom")),
+    (2.0, Item("common.items.flowers.moonbell")),
 
     // Sea Materials
     (0.05, Item("common.items.crafting_ing.abyssal_heart")),
@@ -42,12 +58,7 @@
     (0.25, Item("common.items.crafting_ing.brinestone")),
     (1.0, Item("common.items.crafting_ing.coral_branch")),
 
-    // Miscellaneous Materials
-    (0.75, Item("common.items.crafting_ing.resin")),
-    (1.0, Item("common.items.crafting_ing.sentient_seed")),
-    (2.0, Item("common.items.crafting_ing.living_embers")),
-
     // Ultra Rare drops
-    (0.0005, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
-    (0.00075, Item("common.items.crafting_ing.glacial_crystal")),
+    (0.001, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
+    (0.001, Item("common.items.crafting_ing.glacial_crystal")),
 ]

assets/server/manifests/kits.ron

@@ -427,7 +427,8 @@
         (Item("common.items.tool.instruments.wildskin_drum"),1),
         (Item("common.items.tool.instruments.steeltonguedrum"),1),
         (Item("common.items.tool.instruments.shamisen"),1),
-        (Item("common.items.tool.instruments.kora"),1),        
+        (Item("common.items.tool.instruments.kora"),1),
+        (Item("common.items.tool.instruments.banjo"),1),
     ],
     "recipes": [
         // Armor

assets/voxygen/audio/sfx.ron

@@ -923,7 +923,40 @@
             ],
             threshold: 0.5,
             subtitle: "subtitle-instrument_kora",
-        ),        
+        ),
+        Music(Instrument, Custom("Banjo")): (
+            files: [
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1e1d1c1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_cecgce",
+            "voxygen.audio.sfx.instrument.banjo.banjo_ceeg",
+            "voxygen.audio.sfx.instrument.banjo.banjo_ceeg",
+            "voxygen.audio.sfx.instrument.banjo.banjo_ceeg",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_daece",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egc1a",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egc1a",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egc1a",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_egegc1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egegc1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egegc1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egegc1",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_egga",
+            "voxygen.audio.sfx.instrument.banjo.banjo_gd1gd1ac1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1e1c1e1d1g1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1e1c1e1d1g1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1e1c1e1d1g1",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1d1ae1e1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1d1ae1e1",
+            "voxygen.audio.sfx.instrument.banjo.banjo_c1d1ae1e1",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_e1a1e1g12c2",
+            "voxygen.audio.sfx.instrument.banjo.banjo_e1a1e1g12c2",
+            "voxygen.audio.sfx.instrument.banjo.banjo_e1a1e1g12c2",            
+            "voxygen.audio.sfx.instrument.banjo.banjo_ceceac1ce",
+            "voxygen.audio.sfx.instrument.banjo.banjo_egegac1eg",
+	    "voxygen.audio.sfx.instrument.banjo.banjo_cecegd1ce",            
+            ],
+            threshold: 0.5,
+            subtitle: "subtitle-instrument_banjo",
+        ),
         Inventory(CollectedTool(Instrument)): (
             files: [
             "voxygen.audio.sfx.inventory.add_item",