From 853165e465d8bbab8357f98159ec04b7279dcdc8 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Thu, 21 Dec 2023 12:17:01 -0500
Subject: [PATCH 01/10] Added price entries for cultist and boreal armor loot
 tables. Removed redundant jewellery price table.

---
 assets/common/trading/item_price_calculation.ron |  3 ++-
 assets/common/trading/jewellery.ron              | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 assets/common/trading/jewellery.ron

diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index eac06b1278..a5d368f9e5 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -12,7 +12,8 @@ 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"),
+    (0.09, false, "common.loot_tables.armor.cultist"),
+    (0.08, false, "common.loot_tables.armor.boreal"),
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
diff --git a/assets/common/trading/jewellery.ron b/assets/common/trading/jewellery.ron
deleted file mode 100644
index 557269c06b..0000000000
--- a/assets/common/trading/jewellery.ron
+++ /dev/null
@@ -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")),
-]

From 5c90797ee148aba2ba154bc2eb245574bc4d05fc Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Thu, 21 Dec 2023 12:52:44 -0500
Subject: [PATCH 02/10] Moved grim salvager armor drops to their own loot
 table, and gave said loot table a price entry.

---
 assets/common/loot_tables/armor/salvager.ron          | 6 ++++++
 assets/common/loot_tables/humanoids/grim_salvager.ron | 5 +----
 assets/common/trading/item_price_calculation.ron      | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 assets/common/loot_tables/armor/salvager.ron

diff --git a/assets/common/loot_tables/armor/salvager.ron b/assets/common/loot_tables/armor/salvager.ron
new file mode 100644
index 0000000000..369491cad8
--- /dev/null
+++ b/assets/common/loot_tables/armor/salvager.ron
@@ -0,0 +1,6 @@
+[
+    (1.0, Item("common.items.armor.misc.head.bandana.thief")),
+    (1.0, Item("common.items.armor.misc.head.bandana.red")),
+    (1.0, Item("common.items.armor.misc.head.hood")),
+    (1.0, Item("common.items.armor.misc.head.hood_dark")),
+]
\ No newline at end of file
diff --git a/assets/common/loot_tables/humanoids/grim_salvager.ron b/assets/common/loot_tables/humanoids/grim_salvager.ron
index cd1d959272..ba25e09e28 100644
--- a/assets/common/loot_tables/humanoids/grim_salvager.ron
+++ b/assets/common/loot_tables/humanoids/grim_salvager.ron
@@ -10,8 +10,5 @@
     // Necklace
     (0.05, Item("common.items.armor.misc.neck.gold")),
     // Armor
-    (0.4, Item("common.items.armor.misc.head.bandana.thief")),
-    (0.4, Item("common.items.armor.misc.head.bandana.red")),
-    (0.4, Item("common.items.armor.misc.head.hood")),
-    (0.4, Item("common.items.armor.misc.head.hood_dark")),
+    (1.6, LootTable("common.loot_tables.armor.salvager")),
 ]
\ No newline at end of file
diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index a5d368f9e5..bfb99f76fe 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -12,6 +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"),
+    (2.0, false, "common.loot_tables.armor.salvager"),
     (0.09, false, "common.loot_tables.armor.cultist"),
     (0.08, false, "common.loot_tables.armor.boreal"),
 

From a7562b1baff5617c61167f20d32fd5eaa622a90b Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Thu, 21 Dec 2023 16:14:38 -0500
Subject: [PATCH 03/10] Added a loot table in assets/common/trading for
 misc_armor, containing a variety of assorted armor.

---
 .../common/trading/item_price_calculation.ron |  1 +
 assets/common/trading/misc_armor.ron          | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 assets/common/trading/misc_armor.ron

diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index bfb99f76fe..325cb8dc09 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -12,6 +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.loot_tables.armor.salvager"),
     (0.09, false, "common.loot_tables.armor.cultist"),
     (0.08, false, "common.loot_tables.armor.boreal"),
diff --git a/assets/common/trading/misc_armor.ron b/assets/common/trading/misc_armor.ron
new file mode 100644
index 0000000000..cc3580d030
--- /dev/null
+++ b/assets/common/trading/misc_armor.ron
@@ -0,0 +1,51 @@
+// 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
+[
+    // Basic
+    (5.0, Item("common.items.armor.misc.head.straw")),
+    (5.0, Item("common.items.armor.misc.head.bamboo_twig")),
+    (5.0, Item("common.items.armor.misc.foot.sandals")),
+
+    // General humanoid
+    (0.4, Item("common.items.armor.misc.ring.gold")),
+    (0.4, Item("common.items.armor.misc.neck.gold")),
+
+    // 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
+    (1.0, 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.4, Item("common.items.armor.misc.head.bear_bonnet")),
+    (0.4, Item("common.items.armor.misc.head.howl_cowl")),
+    (0.5, Item("common.items.armor.misc.head.hog_hood")),
+    (0.75, Item("common.items.armor.misc.neck.pendant_of_protection")),
+
+    // Sahagin
+    (0.2, Item("common.items.armor.misc.neck.gem_of_resilience")),
+
+    // Haniwa
+    (0.1, 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.005, Item("common.items.armor.misc.neck.ankh_of_life")),
+]

From 9334c7a2f99476a8d6b904beb7b41f6240bc332d Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Thu, 21 Dec 2023 16:48:34 -0500
Subject: [PATCH 04/10] Added price entries for coral, brinestone, abyssal
 hearts, and pearls in unsellable_materials.

---
 assets/common/trading/item_price_calculation.ron | 2 +-
 assets/common/trading/unsellable_materials.ron   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index 325cb8dc09..17609a3351 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -19,7 +19,7 @@ loot_tables: [
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
-    (2.774, false, "common.trading.unsellable_materials"),
+    (3.1548, false, "common.trading.unsellable_materials"),
 
     // Food Ingredients
     (20.375, true, "common.trading.food"),
diff --git a/assets/common/trading/unsellable_materials.ron b/assets/common/trading/unsellable_materials.ron
index 0e975388c2..af7762468c 100644
--- a/assets/common/trading/unsellable_materials.ron
+++ b/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.03, 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")),

From 3dc2c044915260a0a50a02bed9218cee1a700827 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Sun, 24 Dec 2023 07:17:29 -0500
Subject: [PATCH 05/10] Reduced price of abyssal heart.

---
 assets/common/trading/item_price_calculation.ron | 2 +-
 assets/common/trading/unsellable_materials.ron   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index 17609a3351..a60aae24f6 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -19,7 +19,7 @@ loot_tables: [
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
-    (3.1548, false, "common.trading.unsellable_materials"),
+    (3.16043, false, "common.trading.unsellable_materials"),
 
     // Food Ingredients
     (20.375, true, "common.trading.food"),
diff --git a/assets/common/trading/unsellable_materials.ron b/assets/common/trading/unsellable_materials.ron
index af7762468c..9a89076d81 100644
--- a/assets/common/trading/unsellable_materials.ron
+++ b/assets/common/trading/unsellable_materials.ron
@@ -38,7 +38,7 @@
     (0.225, Item("common.items.crafting_ing.sticky_thread")),
 
     // Sea Materials
-    (0.03, Item("common.items.crafting_ing.abyssal_heart")),
+    (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")),

From 3f747b5ab3af553b147d4d79120e45334163a67f Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Sun, 24 Dec 2023 16:29:49 -0500
Subject: [PATCH 06/10] Reverted grim salvager loot table changes, added
 bandanas and hoods to misc_armor, and roughly adjusted file weighting
 accordingly.

---
 assets/common/loot_tables/armor/salvager.ron          | 6 ------
 assets/common/loot_tables/humanoids/grim_salvager.ron | 5 ++++-
 assets/common/trading/item_price_calculation.ron      | 3 +--
 assets/common/trading/misc_armor.ron                  | 6 ++++++
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 assets/common/loot_tables/armor/salvager.ron

diff --git a/assets/common/loot_tables/armor/salvager.ron b/assets/common/loot_tables/armor/salvager.ron
deleted file mode 100644
index 369491cad8..0000000000
--- a/assets/common/loot_tables/armor/salvager.ron
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-    (1.0, Item("common.items.armor.misc.head.bandana.thief")),
-    (1.0, Item("common.items.armor.misc.head.bandana.red")),
-    (1.0, Item("common.items.armor.misc.head.hood")),
-    (1.0, Item("common.items.armor.misc.head.hood_dark")),
-]
\ No newline at end of file
diff --git a/assets/common/loot_tables/humanoids/grim_salvager.ron b/assets/common/loot_tables/humanoids/grim_salvager.ron
index ba25e09e28..cd1d959272 100644
--- a/assets/common/loot_tables/humanoids/grim_salvager.ron
+++ b/assets/common/loot_tables/humanoids/grim_salvager.ron
@@ -10,5 +10,8 @@
     // Necklace
     (0.05, Item("common.items.armor.misc.neck.gold")),
     // Armor
-    (1.6, LootTable("common.loot_tables.armor.salvager")),
+    (0.4, Item("common.items.armor.misc.head.bandana.thief")),
+    (0.4, Item("common.items.armor.misc.head.bandana.red")),
+    (0.4, Item("common.items.armor.misc.head.hood")),
+    (0.4, Item("common.items.armor.misc.head.hood_dark")),
 ]
\ No newline at end of file
diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index a60aae24f6..ec9dc5804b 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -12,8 +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.loot_tables.armor.salvager"),
+    (6.0, false, "common.trading.misc_armor"),
     (0.09, false, "common.loot_tables.armor.cultist"),
     (0.08, false, "common.loot_tables.armor.boreal"),
 
diff --git a/assets/common/trading/misc_armor.ron b/assets/common/trading/misc_armor.ron
index cc3580d030..6a8ef62a99 100644
--- a/assets/common/trading/misc_armor.ron
+++ b/assets/common/trading/misc_armor.ron
@@ -17,6 +17,12 @@
     (0.4, Item("common.items.armor.misc.ring.gold")),
     (0.4, 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")),

From 41bec15bc57262cb3cdad20927600600fd861f96 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Mon, 25 Dec 2023 13:00:38 -0500
Subject: [PATCH 07/10] Added price entries for blue falcon, moonrise glider,
 and eerie pumpkin lantern to collection.ron, and added price entries for
 liana kit and heavy seabag to misc_armor.

---
 assets/common/trading/collection.ron | 18 ++++++++++--------
 assets/common/trading/misc_armor.ron |  4 ++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/assets/common/trading/collection.ron b/assets/common/trading/collection.ron
index 4bc0b0a3b9..7037ba683f 100644
--- a/assets/common/trading/collection.ron
+++ b/assets/common/trading/collection.ron
@@ -8,15 +8,17 @@
 // 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")),
+    (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")),
 ]
diff --git a/assets/common/trading/misc_armor.ron b/assets/common/trading/misc_armor.ron
index 6a8ef62a99..c167a13eeb 100644
--- a/assets/common/trading/misc_armor.ron
+++ b/assets/common/trading/misc_armor.ron
@@ -8,6 +8,10 @@
 //
 // 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
     (5.0, Item("common.items.armor.misc.head.straw")),
     (5.0, Item("common.items.armor.misc.head.bamboo_twig")),

From 0f46eeaa78844c4bd03d0be3ec8ba263f65af459 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Mon, 25 Dec 2023 15:18:56 -0500
Subject: [PATCH 08/10] Added price entries for glass and bone dungeon keys to
 collection.ron, and listed their good type as default in trade_pricing.rs

---
 assets/common/trading/collection.ron       | 6 +++++-
 common/src/comp/inventory/trade_pricing.rs | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/assets/common/trading/collection.ron b/assets/common/trading/collection.ron
index 7037ba683f..2040300c63 100644
--- a/assets/common/trading/collection.ron
+++ b/assets/common/trading/collection.ron
@@ -16,9 +16,13 @@
     (5.0, Item("common.items.glider.monarch")),
     (5.0, Item("common.items.glider.moth")),
 
-    /// Lanterns
+    // 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")),
 ]
diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs
index cf6dc1f71e..6f45bba79d 100644
--- a/common/src/comp/inventory/trade_pricing.rs
+++ b/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: _,

From 49994af1360b2e9639bd6d0b76d9da781a111fc4 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Wed, 27 Dec 2023 08:34:27 -0500
Subject: [PATCH 09/10] Added glacial crystal to unsellable_materials.ron, and
 buffed price of boreal armor by 5x.

---
 assets/common/trading/item_price_calculation.ron | 4 ++--
 assets/common/trading/unsellable_materials.ron   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index ec9dc5804b..8200ffaa65 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -14,11 +14,11 @@ loot_tables: [
     (6.0, true, "common.loot_tables.armor.twigsleaves"),
     (6.0, false, "common.trading.misc_armor"),
     (0.09, false, "common.loot_tables.armor.cultist"),
-    (0.08, false, "common.loot_tables.armor.boreal"),
+    (0.016, false, "common.loot_tables.armor.boreal"),
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
-    (3.16043, false, "common.trading.unsellable_materials"),
+    (3.16184, false, "common.trading.unsellable_materials"),
 
     // Food Ingredients
     (20.375, true, "common.trading.food"),
diff --git a/assets/common/trading/unsellable_materials.ron b/assets/common/trading/unsellable_materials.ron
index 9a89076d81..5f3ee7e61b 100644
--- a/assets/common/trading/unsellable_materials.ron
+++ b/assets/common/trading/unsellable_materials.ron
@@ -50,4 +50,5 @@
 
     // Ultra Rare drops
     (0.0005, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
+    (0.005, Item("common.items.crafting_ing.glacial_crystal")),
 ]

From 3207df376261dc70a07452e1dfa7d5dbcfb2fb38 Mon Sep 17 00:00:00 2001
From: JCoxeye <oxeye1284@gmail.com>
Date: Tue, 23 Jan 2024 16:46:24 -0500
Subject: [PATCH 10/10] Rebalances, and moved sandals to cloth armor loot
 table, in line with other starter armor.

---
 assets/common/loot_tables/armor/cloth.ron     |  1 +
 .../common/trading/item_price_calculation.ron |  4 ++--
 assets/common/trading/misc_armor.ron          | 23 +++++++++----------
 .../common/trading/unsellable_materials.ron   |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/assets/common/loot_tables/armor/cloth.ron b/assets/common/loot_tables/armor/cloth.ron
index 76265a4eb1..066d86d2d2 100644
--- a/assets/common/loot_tables/armor/cloth.ron
+++ b/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")),
 ]
\ No newline at end of file
diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron
index 8200ffaa65..8397802523 100644
--- a/assets/common/trading/item_price_calculation.ron
+++ b/assets/common/trading/item_price_calculation.ron
@@ -12,9 +12,9 @@ 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"),
-    (6.0, false, "common.trading.misc_armor"),
+    (4.0, false, "common.trading.misc_armor"),
     (0.09, false, "common.loot_tables.armor.cultist"),
-    (0.016, false, "common.loot_tables.armor.boreal"),
+    (0.0016, false, "common.loot_tables.armor.boreal"),
 
     // Ingredients
     (72.5, true, "common.trading.sellable_materials"),
diff --git a/assets/common/trading/misc_armor.ron b/assets/common/trading/misc_armor.ron
index c167a13eeb..f044152dd9 100644
--- a/assets/common/trading/misc_armor.ron
+++ b/assets/common/trading/misc_armor.ron
@@ -13,13 +13,12 @@
     (0.2, Item("common.items.armor.misc.bag.liana_kit")),
 
     // Basic
-    (5.0, Item("common.items.armor.misc.head.straw")),
-    (5.0, Item("common.items.armor.misc.head.bamboo_twig")),
-    (5.0, Item("common.items.armor.misc.foot.sandals")),
+    (2.0, Item("common.items.armor.misc.head.straw")),
+    (2.0, Item("common.items.armor.misc.head.bamboo_twig")),
 
     // General humanoid
-    (0.4, Item("common.items.armor.misc.ring.gold")),
-    (0.4, Item("common.items.armor.misc.neck.gold")),
+    (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")),
@@ -35,21 +34,21 @@
     (0.05, Item("common.items.armor.witch.hat")),
 
     // Gnarling
-    (1.0, Item("common.items.armor.misc.head.gnarling_mask")),
+    (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.4, Item("common.items.armor.misc.head.bear_bonnet")),
-    (0.4, Item("common.items.armor.misc.head.howl_cowl")),
-    (0.5, Item("common.items.armor.misc.head.hog_hood")),
+    (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.2, Item("common.items.armor.misc.neck.gem_of_resilience")),
+    (0.25, Item("common.items.armor.misc.neck.gem_of_resilience")),
 
     // Haniwa
-    (0.1, Item("common.items.armor.misc.neck.haniwa_talisman")),
+    (0.2, Item("common.items.armor.misc.neck.haniwa_talisman")),
 
     // Myrmidon
     (0.05, Item("common.items.armor.misc.head.spikeguard")),
@@ -57,5 +56,5 @@
     (0.05, Item("common.items.armor.misc.head.mitre")),
 
     // Cultist
-    (0.005, Item("common.items.armor.misc.neck.ankh_of_life")),
+    (0.0005, Item("common.items.armor.misc.neck.ankh_of_life")),
 ]
diff --git a/assets/common/trading/unsellable_materials.ron b/assets/common/trading/unsellable_materials.ron
index 5f3ee7e61b..0e31c7706e 100644
--- a/assets/common/trading/unsellable_materials.ron
+++ b/assets/common/trading/unsellable_materials.ron
@@ -50,5 +50,5 @@
 
     // Ultra Rare drops
     (0.0005, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
-    (0.005, Item("common.items.crafting_ing.glacial_crystal")),
+    (0.00075, Item("common.items.crafting_ing.glacial_crystal")),
 ]