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/item_price_calculation.ron b/assets/common/item_price_calculation.ron index 875321c988..8b4416054e 100644 --- a/assets/common/item_price_calculation.ron +++ b/assets/common/item_price_calculation.ron @@ -2,16 +2,16 @@ loot_tables: [ // balance the loot tables against each other (higher= more common= smaller price) // Weapons - (16.0, true, "common.loot_tables.weapons.starter"), - (12.0, true, "common.loot_tables.weapons.tier-0"), - (6.0, true, "common.loot_tables.weapons.tier-1"), + (32.0, true, "common.loot_tables.weapons.starter"), + (16.0, true, "common.loot_tables.weapons.tier-0"), + (8.0, true, "common.loot_tables.weapons.tier-1"), (4.0, true, "common.loot_tables.weapons.tier-2"), (2.0, true, "common.loot_tables.weapons.tier-3"), (1.0, false, "common.loot_tables.weapons.tier-4"), (0.5, false, "common.loot_tables.weapons.tier-5"), - (0.05, false, "common.loot_tables.weapons.cultist"), - (0.05, false, "common.loot_tables.weapons.cave"), - (0.04, false, "common.loot_tables.weapons.legendary"), + (0.025, false, "common.loot_tables.weapons.cultist"), + (0.025, false, "common.loot_tables.weapons.cave"), + (0.02, false, "common.loot_tables.weapons.legendary"), // Armor (20.0, true, "common.loot_tables.armor.cloth"), (1.0, true, "common.loot_tables.armor.twigs"), @@ -25,7 +25,14 @@ loot_tables: [ (0.4, true, "common.loot_tables.food.wild_ingredients"), (0.2, true, "common.loot_tables.food.prepared"), // Potions - (0.2, true, "common.loot_tables.consumable.potion"), + // + // crafted from food, no need to duplicate it here. + // Big potions aren't crafted, but our potions + // from merchants are already abused + // + // Place them back we will have better situation with potions + // and economy. + // // Misc (0.1, true, "common.loot_tables.consumable.throwable"), (0.7, true, "common.loot_tables.consumable.misc"), @@ -37,7 +44,7 @@ good_scaling: [ (Potions, 0.0075), // common.items.consumable.potion_minor (Food, 0.1), // common.items.food.mushroom (Coin, 1.0), // common.items.utility.coins - (Armor, 0.05), // common.items.armor.misc.pants.worker_blue - (Tools, 0.10), // common.items.weapons.staff.starter_staff - (Ingredients, 0.15), // common.items.crafting_ing.leather_scraps + (Armor, 0.5), // common.items.armor.misc.pants.worker_blue + (Tools, 0.25), // common.items.weapons.staff.starter_staff + (Ingredients, 0.25), // common.items.crafting_ing.leather_scraps ]) diff --git a/assets/common/loot_tables/materials/gems.ron b/assets/common/loot_tables/materials/gems.ron index 226beed85a..572025896a 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 +] 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..559a023911 100644 --- a/assets/common/loot_tables/trading.ron +++ b/assets/common/loot_tables/trading.ron @@ -1,38 +1,37 @@ // 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")), - (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")), + // Ores + // Uncomment when bug with crafting doesn't propagating can_sell will be fixed + // (0.03, Item("common.items.mineral.ore.gold")), + // (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.7, Item("common.items.crafting_ing.hide.tough_hide")), + (1.0, Item("common.items.crafting_ing.hide.animal_hide")), + (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")), ]