From a97cfa6364e4d3f51a39d61f5961c65233a8cbfd Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Thu, 17 Jun 2021 21:50:31 +0300
Subject: [PATCH] trading.ron rebalance

- Name all section in trading.ron
- Balance post-meat materials
- Make gems more rarer and expensive
---
 assets/common/cave_scatter/shallow_floor.ron  |  4 +-
 assets/common/loot_tables/materials/gems.ron  |  8 +--
 .../loot_tables/materials/underground.ron     |  4 +-
 assets/common/loot_tables/trading.ron         | 66 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/assets/common/cave_scatter/shallow_floor.ron b/assets/common/cave_scatter/shallow_floor.ron
index f80601194a..894aa3d97b 100644
--- a/assets/common/cave_scatter/shallow_floor.ron
+++ b/assets/common/cave_scatter/shallow_floor.ron
@@ -3,8 +3,8 @@
     (250, ShortGrass),
     (50, CaveMushroom),
     (50, Mushroom),
-    (30, AmethystSmall),
-    (15, TopazSmall),
+    (5, AmethystSmall),
+    (5, TopazSmall),
     (15, Tin),
     (12, Copper),
     (15, Iron),
diff --git a/assets/common/loot_tables/materials/gems.ron b/assets/common/loot_tables/materials/gems.ron
index 226beed85a..1df71497b1 100644
--- a/assets/common/loot_tables/materials/gems.ron
+++ b/assets/common/loot_tables/materials/gems.ron
@@ -1,8 +1,8 @@
 [
-    (3.0, Item("common.items.mineral.gem.topaz")),
-    (3.0, Item("common.items.mineral.gem.amethyst")),
+    (6.0, Item("common.items.mineral.gem.topaz")),
+    (8.0, Item("common.items.mineral.gem.amethyst")),
     (1.6, Item("common.items.mineral.gem.sapphire")),
     (1.2, Item("common.items.mineral.gem.emerald")),
     (0.8, Item("common.items.mineral.gem.ruby")),
-    (0.4, Item("common.items.mineral.gem.diamond")),
-]
\ No newline at end of file
+    (0.3, Item("common.items.mineral.gem.diamond")),
+]
diff --git a/assets/common/loot_tables/materials/underground.ron b/assets/common/loot_tables/materials/underground.ron
index 9147aa87c2..88a247006c 100644
--- a/assets/common/loot_tables/materials/underground.ron
+++ b/assets/common/loot_tables/materials/underground.ron
@@ -2,5 +2,5 @@
     (2.0, Item("common.items.crafting_ing.stones")),
     (0.5, Item("common.items.mineral.ore.veloritefrag")),
     (0.25, Item("common.items.mineral.ore.velorite")),
-    (0.25, LootTable("common.loot_tables.materials.gems")),
-]
\ No newline at end of file
+    (0.15, LootTable("common.loot_tables.materials.gems")),
+]
diff --git a/assets/common/loot_tables/trading.ron b/assets/common/loot_tables/trading.ron
index 9db4df6cdb..84d002278c 100644
--- a/assets/common/loot_tables/trading.ron
+++ b/assets/common/loot_tables/trading.ron
@@ -1,38 +1,38 @@
 // Loot table that exists purely for price rationalisation
+// Please keep it sorting by rarity so it's easier to reason about things
 [
-    (1.0, Item("common.items.crafting_ing.honey")),
-    (1.5, Item("common.items.crafting_ing.leather.leather_strips")),
-    (0.08, Item("common.items.crafting_ing.leather.rigid_leather")),
-    (1.0, Item("common.items.crafting_ing.leather.simple_leather")),
-    (0.4, Item("common.items.crafting_ing.leather.thick_leather")),
-    (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
-    (0.5, Item("common.items.crafting_ing.hide.tough_hide")),
-    (0.2, Item("common.items.crafting_ing.hide.scales")),
-    (0.8, Item("common.items.crafting_ing.animal_misc.fur")),
-    (0.15, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
-    (0.1, Item("common.items.crafting_ing.animal_misc.icy_fang")),
-    (0.08, Item("common.items.crafting_ing.animal_misc.large_horn")),
-    (0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")),
-    (0.08, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),
-    (1.0, Item("common.items.food.meat.beast_small_raw")),
-    (0.6, Item("common.items.food.meat.beast_large_raw")),
-    (1.3, Item("common.items.food.meat.bird_raw")),
-    (1.2, Item("common.items.food.meat.fish_raw")),
-    (0.8, Item("common.items.food.meat.tough_raw")),
-    (0.2, Item("common.items.mineral.ore.bloodstone")),
-    (1.0, Item("common.items.mineral.ore.coal")),
-    (0.4, Item("common.items.mineral.ore.cobalt")),
-    (1.5, Item("common.items.mineral.ore.tin")),
-    (1.5, Item("common.items.mineral.ore.copper")),
+    // Ores
     (0.03, Item("common.items.mineral.ore.gold")),
-    (0.8, Item("common.items.mineral.ore.iron")),
-    (0.05, Item("common.items.mineral.ore.silver")),
-    (1.2, Item("common.items.mineral.ore.velorite")),
+    (0.045, Item("common.items.mineral.ore.silver")),
+    (0.1, Item("common.items.mineral.ore.bloodstone")),
+    (0.2, Item("common.items.mineral.ore.cobalt")),
+    (0.25, Item("common.items.mineral.ore.coal")),
+    (0.3, Item("common.items.mineral.ore.iron")),
+    (0.5, Item("common.items.mineral.ore.velorite")),
     (0.6, Item("common.items.mineral.ore.veloritefrag")),
-    (0.8, Item("common.items.mineral.gem.amethyst")),
-    (0.2, Item("common.items.mineral.gem.diamond")),
-    (0.6, Item("common.items.mineral.gem.emerald")),
-    (0.4, Item("common.items.mineral.gem.ruby")),
-    (0.4, Item("common.items.mineral.gem.sapphire")),
-    (0.9, Item("common.items.mineral.gem.topaz")),
+    (1.5, Item("common.items.mineral.ore.copper")),
+    (1.5, Item("common.items.mineral.ore.tin")),
+    // Animal Hide
+    (0.1, Item("common.items.crafting_ing.leather.rigid_leather")),
+    (0.2, Item("common.items.crafting_ing.hide.scales")),
+    (0.4, Item("common.items.crafting_ing.leather.thick_leather")),
+    (0.7, Item("common.items.crafting_ing.hide.tough_hide")),
+    (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
+    (1.2, Item("common.items.crafting_ing.leather.simple_leather")),
+    (1.5, Item("common.items.crafting_ing.leather.leather_strips")),
+    // Mob Drops
+    (0.01, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),
+    (0.08, Item("common.items.crafting_ing.animal_misc.large_horn")),
+    (0.1, Item("common.items.crafting_ing.animal_misc.icy_fang")),
+    (0.15, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
+    (0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")),
+    (1.2, Item("common.items.crafting_ing.animal_misc.fur")),
+    // Meats
+    (0.6, Item("common.items.food.meat.beast_large_raw")),
+    (0.8, Item("common.items.food.meat.tough_raw")),
+    (1.0, Item("common.items.food.meat.beast_small_raw")),
+    (1.2, Item("common.items.food.meat.fish_raw")),
+    (1.3, Item("common.items.food.meat.bird_raw")),
+    // Others
+    (1.0, Item("common.items.crafting_ing.honey")),
 ]