diff --git a/assets/common/item_price_calculation.ron b/assets/common/item_price_calculation.ron index ebba8d45df..b0c4a818c8 100644 --- a/assets/common/item_price_calculation.ron +++ b/assets/common/item_price_calculation.ron @@ -28,7 +28,7 @@ loot_tables: [ (0.2, true, "common.loot_tables.food.prepared"), // TODO: Change consumables and split them up (1.0, true, "common.loot_tables.consumable.default"), - (10.5, false, "common.loot_tables.trading"), + (1.0, false, "common.loot_tables.trading"), ], // this is the amount of that good the most common item represents // so basically this table balances the goods against each other (higher=less valuable) diff --git a/assets/common/items/armor/hide/scale/chest.ron b/assets/common/items/armor/hide/scale/chest.ron index a4af17b97c..4949f6b267 100644 --- a/assets/common/items/armor/hide/scale/chest.ron +++ b/assets/common/items/armor/hide/scale/chest.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Chest("Scale"), stats: ( - protection: Normal(72.0), + protection: Normal(21.0), poise_resilience: Normal(0.0), energy_max: 0, energy_reward: 0.0, diff --git a/assets/common/items/armor/misc/back/backpack.ron b/assets/common/items/armor/misc/back/backpack.ron index 9cf37a20f7..8fc7f39c39 100644 --- a/assets/common/items/armor/misc/back/backpack.ron +++ b/assets/common/items/armor/misc/back/backpack.ron @@ -13,7 +13,6 @@ ItemDef( ), )), quality: High, - tags: [ - Bag, - ], + tags: [Bag], + slots: 18, ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/hide/animal_hide.ron b/assets/common/items/crafting_ing/hide/animal_hide.ron index d6d68e6264..f8f5d865c5 100644 --- a/assets/common/items/crafting_ing/hide/animal_hide.ron +++ b/assets/common/items/crafting_ing/hide/animal_hide.ron @@ -4,7 +4,7 @@ ItemDef( kind: Ingredient( kind: "AnimalHide", ), - quality: Common, + quality: Low, tags: [ Material(Leather) ], diff --git a/assets/common/items/crafting_ing/hide/carapace.ron b/assets/common/items/crafting_ing/hide/carapace.ron index 1124c341f6..f49a147c22 100644 --- a/assets/common/items/crafting_ing/hide/carapace.ron +++ b/assets/common/items/crafting_ing/hide/carapace.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Carapace", ), - quality: Common, + quality: High, tags: [], ) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/leather/rigid_leather.ron b/assets/common/items/crafting_ing/leather/rigid_leather.ron index 87a6a96584..25c5cf9770 100644 --- a/assets/common/items/crafting_ing/leather/rigid_leather.ron +++ b/assets/common/items/crafting_ing/leather/rigid_leather.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "RigidLeather", ), - quality: Common, + quality: Epic, tags: [BaseMaterial, Leather], ) diff --git a/assets/common/items/crafting_ing/leather/simple_leather.ron b/assets/common/items/crafting_ing/leather/simple_leather.ron index 9e4de8d810..52e2db28bf 100644 --- a/assets/common/items/crafting_ing/leather/simple_leather.ron +++ b/assets/common/items/crafting_ing/leather/simple_leather.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "SimpleLeather", ), - quality: Common, + quality: Low, tags: [BaseMaterial, Leather], ) diff --git a/assets/common/items/mineral/gem/diamond.ron b/assets/common/items/mineral/gem/diamond.ron index 7096e8122c..63377e2540 100644 --- a/assets/common/items/mineral/gem/diamond.ron +++ b/assets/common/items/mineral/gem/diamond.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Diamond", ), - quality: Common, + quality: Epic, tags: [], ) diff --git a/assets/common/items/mineral/gem/emerald.ron b/assets/common/items/mineral/gem/emerald.ron index e2758fb742..c2ae944d7c 100644 --- a/assets/common/items/mineral/gem/emerald.ron +++ b/assets/common/items/mineral/gem/emerald.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Emerald", ), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/mineral/gem/ruby.ron b/assets/common/items/mineral/gem/ruby.ron index a62f073495..2b33f9c986 100644 --- a/assets/common/items/mineral/gem/ruby.ron +++ b/assets/common/items/mineral/gem/ruby.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Ruby", ), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/mineral/gem/sapphire.ron b/assets/common/items/mineral/gem/sapphire.ron index 1adf67ccff..6c97e6ec75 100644 --- a/assets/common/items/mineral/gem/sapphire.ron +++ b/assets/common/items/mineral/gem/sapphire.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "Sapphire", ), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/mineral/ingot/bloodsteel.ron b/assets/common/items/mineral/ingot/bloodsteel.ron index c1b9a1d785..f7c2dc4616 100644 --- a/assets/common/items/mineral/ingot/bloodsteel.ron +++ b/assets/common/items/mineral/ingot/bloodsteel.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "BloodsteelIngot", ), - quality: Common, + quality: Epic, tags: [MetalIngot], ) diff --git a/assets/common/items/mineral/ingot/bronze.ron b/assets/common/items/mineral/ingot/bronze.ron index b3296faf91..3d386989ca 100644 --- a/assets/common/items/mineral/ingot/bronze.ron +++ b/assets/common/items/mineral/ingot/bronze.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "BronzeIngot", ), - quality: Common, + quality: Low, tags: [MetalIngot], ) diff --git a/assets/common/items/mineral/ingot/cobalt.ron b/assets/common/items/mineral/ingot/cobalt.ron index 1ed63ae88a..3a869a34d0 100644 --- a/assets/common/items/mineral/ingot/cobalt.ron +++ b/assets/common/items/mineral/ingot/cobalt.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "CobaltIngot", ), - quality: Common, + quality: High, tags: [MetalIngot], ) diff --git a/assets/common/items/mineral/ingot/copper.ron b/assets/common/items/mineral/ingot/copper.ron index 4e76603982..b727ed2f63 100644 --- a/assets/common/items/mineral/ingot/copper.ron +++ b/assets/common/items/mineral/ingot/copper.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "CopperIngot", ), - quality: Common, + quality: Low, tags: [MetalIngot], ) diff --git a/assets/common/items/mineral/ingot/orichalcum.ron b/assets/common/items/mineral/ingot/orichalcum.ron index 34dc75db78..4241788018 100644 --- a/assets/common/items/mineral/ingot/orichalcum.ron +++ b/assets/common/items/mineral/ingot/orichalcum.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "OrichalcumIngot", ), - quality: Epic, + quality: Legendary, tags: [MetalIngot], ) \ No newline at end of file diff --git a/assets/common/items/mineral/ingot/steel.ron b/assets/common/items/mineral/ingot/steel.ron index a2f3b327aa..0c18b7b724 100644 --- a/assets/common/items/mineral/ingot/steel.ron +++ b/assets/common/items/mineral/ingot/steel.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "SteelIngot", ), - quality: Common, + quality: Moderate, tags: [MetalIngot], ) diff --git a/assets/common/items/mineral/ore/bloodstone.ron b/assets/common/items/mineral/ore/bloodstone.ron index 40b07d6fa3..6e7ef7443f 100644 --- a/assets/common/items/mineral/ore/bloodstone.ron +++ b/assets/common/items/mineral/ore/bloodstone.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "BloodstoneOre", ), - quality: Common, + quality: Epic, tags: [], ) diff --git a/assets/common/items/mineral/ore/cobalt.ron b/assets/common/items/mineral/ore/cobalt.ron index c282aa63c6..901b0cfe32 100644 --- a/assets/common/items/mineral/ore/cobalt.ron +++ b/assets/common/items/mineral/ore/cobalt.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "CobaltOre", ), - quality: Common, + quality: High, tags: [], ) diff --git a/assets/common/items/mineral/ore/copper.ron b/assets/common/items/mineral/ore/copper.ron index 913f4ae334..88ebac9ecc 100644 --- a/assets/common/items/mineral/ore/copper.ron +++ b/assets/common/items/mineral/ore/copper.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "CopperOre", ), - quality: Common, + quality: Low, tags: [], ) diff --git a/assets/common/items/mineral/ore/tin.ron b/assets/common/items/mineral/ore/tin.ron index 40959de977..0d2ab85b11 100644 --- a/assets/common/items/mineral/ore/tin.ron +++ b/assets/common/items/mineral/ore/tin.ron @@ -4,6 +4,6 @@ ItemDef( kind: Ingredient( kind: "TinOre", ), - quality: Common, + quality: Low, tags: [], ) diff --git a/assets/common/loot_tables/trading.ron b/assets/common/loot_tables/trading.ron index 6a487c808a..ed56835ca5 100644 --- a/assets/common/loot_tables/trading.ron +++ b/assets/common/loot_tables/trading.ron @@ -4,11 +4,9 @@ (0.2, Item("common.items.mineral.ore.bloodstone")), (1.0, Item("common.items.mineral.ore.coal")), (0.4, Item("common.items.mineral.ore.cobalt")), - (2.5, Item("common.items.mineral.ore.copper")), (0.05, Item("common.items.mineral.ore.gold")), (1.2, Item("common.items.mineral.ore.iron")), (0.07, Item("common.items.mineral.ore.silver")), - (2.5, Item("common.items.mineral.ore.tin")), (1.2, Item("common.items.mineral.ore.velorite")), (0.6, Item("common.items.mineral.ore.veloritefrag")), (0.8, Item("common.items.mineral.gem.amethyst")), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 541adbca42..3cf281b967 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -184,6 +184,13 @@ ], craft_sprite: Some(CookingPot), ), + "leather strips": ( + output: ("common.items.crafting_ing.leather.leather_strips", 4), + inputs: [ + (Item("common.items.crafting_ing.leather.simple_leather"), 1), + ], + craft_sprite: Some(TanningRack), + ), "simple leather": ( output: ("common.items.crafting_ing.leather.simple_leather", 1), inputs: [ @@ -1690,7 +1697,7 @@ "tin pickaxe": ( output: ("common.items.tool.pickaxe_stone", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen"), 1), + (Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.stones"), 5), (Item("common.items.tool.craftsman_hammer"), 0), ], @@ -1709,28 +1716,24 @@ output: ("common.items.crafting_ing.cloth.linen", 1), inputs: [ (Tag(Material(Linen)), 1), - (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "wool": ( output: ("common.items.crafting_ing.cloth.wool", 1), inputs: [ (Tag(Material(Wool)), 1), - (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "rawhide": ( output: ("common.items.crafting_ing.leather.simple_leather", 1), inputs: [ (Tag(Material(Rawhide)), 1), - (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "leather": ( output: ("common.items.crafting_ing.leather.thick_leather", 1), inputs: [ (Tag(Material(Leather)), 1), - (Item("common.items.crafting_tools.sewing_set"), 0), ], ), "bronze": ( diff --git a/common/src/comp/inventory/trade_pricing.rs b/common/src/comp/inventory/trade_pricing.rs index 25323dc516..12daa3b38b 100644 --- a/common/src/comp/inventory/trade_pricing.rs +++ b/common/src/comp/inventory/trade_pricing.rs @@ -163,7 +163,7 @@ impl TradePricing { _ if name.starts_with("common.items.food.") => &self.food, _ if name.starts_with("common.items.utility.") => &self.other, _ if name.starts_with("common.items.boss_drops.") => &self.other, - _ if name.starts_with("common.items.ore.") => &self.ingredients, + _ if name.starts_with("common.items.mineral.") => &self.ingredients, _ if name.starts_with("common.items.flowers.") => &self.ingredients, _ if name.starts_with("common.items.crafting_tools.") => &self.other, _ if name.starts_with("common.items.lantern.") => &self.other, @@ -186,7 +186,7 @@ impl TradePricing { _ if name.starts_with("common.items.food.") => &mut self.food, _ if name.starts_with("common.items.utility.") => &mut self.other, _ if name.starts_with("common.items.boss_drops.") => &mut self.other, - _ if name.starts_with("common.items.ore.") => &mut self.ingredients, + _ if name.starts_with("common.items.mineral.") => &mut self.ingredients, _ if name.starts_with("common.items.flowers.") => &mut self.ingredients, _ if name.starts_with("common.items.crafting_tools.") => &mut self.other, _ if name.starts_with("common.items.lantern.") => &mut self.other, @@ -337,7 +337,9 @@ impl TradePricing { // (start with cheap ones to avoid changing material prices after evaluation) while price_sort(&result, &eqset.read(), &mut ordered_recipes) { ordered_recipes.retain(|e| { - if e.material_cost < TradePricing::UNAVAILABLE_PRICE { + if e.material_cost < 1e-5 { + false + } else if e.material_cost < TradePricing::UNAVAILABLE_PRICE { let actual_cost = calculate_material_cost(&result, &eqset.read(), e); add( &mut result.get_list_by_path_mut(&e.output),