diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 5aa5341..aef4853 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -16,6 +16,8 @@ Date: ??.??.?? - Changed recipes for making metal catalysts (removed red and added purple) - Spread catalyst recipes more evenly out in the tech tree - Changed catalyst recipes to use the appropriate catalyst for their tech tier + - Remove underused items/fluids #334 + - Hid crushed stone. Use stone instead. Ratios will all stay the same Bugfixes: - Fixed tech steam-power missing a locale in some mod configurations #332 --------------------------------------------------------------------------------------------------- diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index fa76125..a083498 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -3,3 +3,62 @@ bobmods.lib.recipe.set_energy_required("insulated-cable", 2) seablock.lib.substingredient("insulated-cable", "tinned-copper-cable", nil, 8) seablock.lib.substingredient("insulated-cable", "rubber", nil, 8) bobmods.lib.recipe.set_result("insulated-cable", { "insulated-cable", 8 }) + +-- Combine Stone and Crushed Stone +local function replace_stone(recipe) + if recipe.ingredients then + for _, ingredient in pairs(recipe.ingredients) do + if ingredient.name == "stone" then + ingredient.amount = ingredient.amount * 2 + elseif ingredient.name == "stone-crushed" then + ingredient.name = "stone" + elseif ingredient[1] == "stone" then + ingredient[2] = ingredient[2] * 2 + elseif ingredient[1] == "stone-crushed" then + ingredient[1] = "stone" + end + end + end + if recipe.results then + for _, result in pairs(recipe.results) do + if result.name == "stone" then + result.amount = result.amount * 2 + elseif result.name == "stone-crushed" then + result.name = "stone" + elseif result[1] == "stone" then + result[2] = result[2] * 2 + elseif result[1] == "stone-crushed" then + result[1] = "stone" + end + end + end + if recipe.result == "stone" then + recipe.result_count = recipe.result_count or 1 * 2 + elseif recipe.result == "stone-crushed" then + recipe.result = "stone" + end + if recipe.main_product == "stone-crushed" then + recipe.main_product = "stone" + end +end +for _, recipe in pairs(data.raw.recipe) do + if recipe.normal then + replace_stone(recipe.normal) + end + if recipe.expensive then + replace_stone(recipe.expensive) + end + if not recipe.normal and not recipe.expensive then + replace_stone(recipe) + end +end +bobmods.lib.recipe.hide("stone-crushed") +seablock.lib.hide("item", "stone-crushed") + +if data.raw.recipe["stone-crushed-dissolution"] then + data.raw.recipe["stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon( + nil, + { { 142, 079, 028 }, { 107, 062, 021 }, { 075, 040, 015 } }, + { "stone" } + ) +end diff --git a/SeaBlock/starting-items.lua b/SeaBlock/starting-items.lua index 863097f..9e75c7c 100644 --- a/SeaBlock/starting-items.lua +++ b/SeaBlock/starting-items.lua @@ -2,7 +2,7 @@ seablock = seablock or {} function seablock.populate_starting_items(items) local starting_items = { - ["stone"] = 65, + ["stone"] = 130, ["small-electric-pole"] = 50, ["small-lamp"] = 12, ["iron-plate"] = 1200,