Merge branch 'horblegorble/recipe-pricing' into 'master'

recipe pricing adjustments; changed sea cleric drop

See merge request veloren/veloren!4515

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rocksnapper received new abilities and AI
 - Rebalanced cultist dungeon loot tables; among other things, the drop Ankh of Life from Mindflayer is now 25x more frequent.
 - Improved Mindflayer anticheese measures.
+- Recipe pricing with NPCs.
 
 ### Removed
 

assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron

@@ -4,7 +4,7 @@
             // Ingredients
             (2.0, Item("common.items.crafting_ing.coral_branch")),
             (0.5, Item("common.items.crafting_ing.pearl")),
-            (0.25, Item("common.items.recipes.unique.seashell_necklace")),
+            (0.5, Item("common.items.recipes.armor.brinestone")),
             (0.25, Item("common.items.recipes.unique.winged_coronet")),
             (0.25, Item("common.items.recipes.unique.abyssal_ring")),
         ]),

assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron

@@ -1,3 +1,5 @@
 [
-    (1.0, Item("common.items.recipes.armor.brinestone")),
+    (1.0, Nothing),
+    (1.0, LootTable("common.loot_tables.food.prepared")),
+    (0.5, Item("common.items.recipes.unique.seashell_necklace")),
 ]

assets/common/trading/item_price_calculation.ron

@@ -24,8 +24,8 @@ loot_tables: [
     (20.375, true, "common.trading.food"),
 
     // Recipes
-    (1.0, true, "common.trading.sellable_recipe"),
+    (1.8, true, "common.trading.sellable_recipe"),
-    (1.0, false, "common.trading.unsellable_recipe"),
+    (1.5, false, "common.trading.unsellable_recipe"),
 
     // Potions
     //

assets/common/trading/unsellable_recipe.ron

@@ -6,40 +6,40 @@
 [
     // Recipes
     // Misc Groups
-    (1.0, Item("common.items.recipes.charms")),
+    (1.25, Item("common.items.recipes.charms")),
-    (1.0, Item("common.items.recipes.explosives")),
+    (1.25, Item("common.items.recipes.explosives")),
-    (1.0, Item("common.items.recipes.gliders")),
+    (1.25, Item("common.items.recipes.gliders")),
-    (1.0, Item("common.items.recipes.instruments")),
+    (1.25, Item("common.items.recipes.instruments")),
     // Equipment
     (1.0, Item("common.items.recipes.equipment.moderate")),
-    (0.2, Item("common.items.recipes.equipment.advanced")),
+    (0.3, Item("common.items.recipes.equipment.advanced")),
     // Armors
-    (0.7, Item("common.items.recipes.armor.steel")),
+    (1.25, Item("common.items.recipes.armor.steel")),
-    (0.7, Item("common.items.recipes.armor.silken")),
+    (1.25, Item("common.items.recipes.armor.silken")),
-    (0.7, Item("common.items.recipes.armor.scale")),
+    (1.25, Item("common.items.recipes.armor.scale")),
-    (0.7, Item("common.items.recipes.weapons.steel")),
+    (1.25, Item("common.items.recipes.weapons.steel")),
-    (0.7, Item("common.items.recipes.weapons.hardwood")),
+    (1.25, Item("common.items.recipes.weapons.hardwood")),
-    (0.4, Item("common.items.recipes.armor.cobalt")),
+    (0.65, Item("common.items.recipes.armor.cobalt")),
-    (0.4, Item("common.items.recipes.armor.druid")),
+    (0.65, Item("common.items.recipes.armor.druid")),
-    (0.4, Item("common.items.recipes.armor.carapace")),
+    (0.65, Item("common.items.recipes.armor.carapace")),
-    (0.4, Item("common.items.recipes.weapons.cobalt")),
+    (0.65, Item("common.items.recipes.weapons.cobalt")),
-    (0.4, Item("common.items.recipes.weapons.ironwood")),
+    (0.65, Item("common.items.recipes.weapons.ironwood")),
-    (0.2, Item("common.items.recipes.armor.bloodsteel")),
+    (0.38, Item("common.items.recipes.armor.bloodsteel")),
-    (0.2, Item("common.items.recipes.armor.moonweave")),
+    (0.38, Item("common.items.recipes.armor.moonweave")),
-    (0.2, Item("common.items.recipes.armor.primal")),
+    (0.38, Item("common.items.recipes.armor.primal")),
-    (0.2, Item("common.items.recipes.weapons.bloodsteel")),
+    (0.38, Item("common.items.recipes.weapons.bloodsteel")),
-    (0.2, Item("common.items.recipes.weapons.frostwood")),
+    (0.38, Item("common.items.recipes.weapons.frostwood")),
-    (0.1, Item("common.items.recipes.armor.orichalcum")),
+    (0.25, Item("common.items.recipes.armor.sunsilk")),
-    (0.1, Item("common.items.recipes.armor.sunsilk")),
+    (0.25, Item("common.items.recipes.armor.orichalcum")),
-    (0.1, Item("common.items.recipes.armor.dragonscale")),
+    (0.25, Item("common.items.recipes.armor.dragonscale")),
-    (0.1, Item("common.items.recipes.armor.brinestone")),
+    (0.25, Item("common.items.recipes.weapons.orichalcum")),
-    (0.1, Item("common.items.recipes.weapons.orichalcum")),
+    (0.25, Item("common.items.recipes.weapons.eldwood")),
-    (0.1, Item("common.items.recipes.weapons.eldwood")),
+    (0.25, Item("common.items.recipes.armor.brinestone")),
     // Unique items
-    (1.0, Item("common.items.recipes.unique.seashell_necklace")),
+    (1.25, Item("common.items.recipes.unique.seashell_necklace")),
-    (0.8, Item("common.items.recipes.unique.winged_coronet")),
+    (0.6, Item("common.items.recipes.unique.winged_coronet")),
     (0.5, Item("common.items.recipes.unique.troll_hide_pack")),
-    (0.3, Item("common.items.recipes.unique.abyssal_gorget")),
+    (0.2, Item("common.items.recipes.unique.abyssal_gorget")),
-    (0.1, Item("common.items.recipes.unique.mindflayer_spellbag")),
+    (0.15, Item("common.items.recipes.unique.mindflayer_spellbag")),
     (0.1, Item("common.items.recipes.unique.polaris")),
 ]