Merge branch 'jcoxeye/price-entries' into 'master'

Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231

assets/common/loot_tables/armor/cloth.ron

@@ -31,4 +31,5 @@
     (1.0, Item("common.items.armor.misc.chest.worker_yellow_1")),
     (1.0, Item("common.items.armor.misc.pants.worker_blue")),
     (1.0, Item("common.items.armor.misc.pants.worker_brown")),
+    (1.0, Item("common.items.armor.misc.foot.sandals")),
 ]

assets/common/trading/collection.ron

@@ -8,15 +8,21 @@
 // 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")),
     // Butterfly gliders
-    (5, Item("common.items.glider.morpho")),
-    (5, Item("common.items.glider.monarch")),
-    (5, Item("common.items.glider.moth")),
-    // Skullgrin
-    (2, Item("common.items.glider.skullgrin")),
+    (5.0, Item("common.items.glider.morpho")),
+    (5.0, Item("common.items.glider.monarch")),
+    (5.0, Item("common.items.glider.moth")),
 
-    /// Lanterns
-    (5, Item("common.items.lantern.geode_purp")),
-    (2, Item("common.items.lantern.blue_0")),
-    (2, Item("common.items.boss_drops.lantern")),
+    // 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")),
+
+    // Keys
+    (5.0, Item("common.items.keys.bone_key")),
+    (5.0, Item("common.items.keys.glass_key")),
 ]

assets/common/trading/item_price_calculation.ron

@@ -12,11 +12,13 @@ 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"),
-    (0.02, false, "common.trading.jewellery"),
+    (4.0, false, "common.trading.misc_armor"),
+    (0.09, false, "common.loot_tables.armor.cultist"),
+    (0.0016, false, "common.loot_tables.armor.boreal"),
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
-    (2.774, false, "common.trading.unsellable_materials"),
+    (3.16184, false, "common.trading.unsellable_materials"),
 
     // Food Ingredients
     (20.375, true, "common.trading.food"),

assets/common/trading/jewellery.ron

@@ -1,11 +0,0 @@
-// Loot table that exists purely for price rationalisation
-//
-// This loot table should be marked as un-sellable.
-// If you want to add something that merchants can buy and sell,
-// add another loot table
-//
-// Please keep it sorted by rarity so it's easier to reason about things
-[
-    (1, Item("common.items.armor.misc.back.dungeon_purple")),
-    (1, Item("common.items.armor.cultist.ring")),
-]

assets/common/trading/misc_armor.ron

@@ -0,0 +1,60 @@
+// Loot table that exists purely for price rationalisation
+//
+// For miscellaneous un-craftable armor pieces
+//
+// This loot table should be marked as un-sellable.
+// If you want to add something that merchants can buy and sell,
+// add another loot table
+//
+// 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.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")),
+
+    // General humanoid
+    (0.75, Item("common.items.armor.misc.ring.gold")),
+    (0.75, 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")),
+
+    // Pirate
+    (0.05, Item("common.items.armor.misc.head.crown")),
+    (0.05, Item("common.items.armor.pirate.hat")),
+
+    // Witch
+    (0.05, 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")),
+
+    // Adlet
+    (0.1, Item("common.items.armor.misc.head.bear_bonnet")),
+    (0.1, 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")),
+
+    // Sahagin
+    (0.25, Item("common.items.armor.misc.neck.gem_of_resilience")),
+
+    // Haniwa
+    (0.2, 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")),
+
+    // Cultist
+    (0.0005, Item("common.items.armor.misc.neck.ankh_of_life")),
+]

assets/common/trading/unsellable_materials.ron

@@ -37,6 +37,12 @@
     (0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")),
     (0.225, Item("common.items.crafting_ing.sticky_thread")),
 
+    // Sea Materials
+    (0.05, Item("common.items.crafting_ing.abyssal_heart")),
+    (0.075, Item("common.items.crafting_ing.pearl")),
+    (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")),
@@ -44,4 +50,5 @@
 
     // Ultra Rare drops
     (0.0005, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
+    (0.00075, Item("common.items.crafting_ing.glacial_crystal")),
 ]

common/src/comp/inventory/trade_pricing.rs

@@ -644,6 +644,9 @@ impl TradePricing {
             ItemDefinitionIdOwned::Simple(name) if name.starts_with("common.items.lantern.") => {
                 Good::default()
             },
+            ItemDefinitionIdOwned::Simple(name) if name.starts_with("common.items.keys.") => {
+                Good::default()
+            },
             ItemDefinitionIdOwned::Modular {
                 pseudo_base: _,
                 components: _,