diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron
index 92efc6bba2..5882174c4d 100644
--- a/assets/common/item_price_calculation.ron
+++ b/assets/common/item_price_calculation.ron
@@ -3,14 +3,14 @@ loot_tables: [
     // balance the loot tables against each other (higher= more common= smaller price)
     // Weapons
     (16.0, "common.loot_tables.weapons.starter"),
-    (8.0, "common.loot_tables.weapons.tier-0"),
-    (4.0, "common.loot_tables.weapons.tier-1"),
-    (2.0, "common.loot_tables.weapons.tier-2"),
-    (1.0, "common.loot_tables.weapons.tier-3"),
-    (0.25, "common.loot_tables.weapons.tier-4"),
+    (12.0, "common.loot_tables.weapons.tier-0"),
+    (6.0, "common.loot_tables.weapons.tier-1"),
+    (4.0, "common.loot_tables.weapons.tier-2"),
+    (2.0, "common.loot_tables.weapons.tier-3"),
+    //(0.25, "common.loot_tables.weapons.tier-4"),
     //(0.125, "common.loot_tables.weapons.tier-5"),
     //(0.05, "common.loot_tables.weapons.cultist"),
-    (0.125, "common.loot_tables.weapons.cave"),
+    //(0.125, "common.loot_tables.weapons.cave"),
     //(0.0625, "common.loot_tables.weapons.legendary"),
     // Armor
     (20.0, "common.loot_tables.armor.cloth"),
diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs
index 987e3d58b0..0499af2d6b 100644
--- a/common/src/comp/inventory/loadout_builder.rs
+++ b/common/src/comp/inventory/loadout_builder.rs
@@ -615,7 +615,7 @@ impl LoadoutBuilder {
                             let mut item = Item::new_from_asset_expect(&item_id);
                             // NOTE: Conversion to and from f32 works fine because we make sure the
                             // number we're converting is ≤ 100.
-                            let max = amount.min(100.min(item.max_amount()) as f32) as u32;
+                            let max = amount.min(16.min(item.max_amount()) as f32) as u32;
                             let n = rng.gen_range(1..max.max(2));
                             *amount -= if item.set_amount(n).is_ok() {
                                 n as f32