diff --git a/prototypes/silica-recipe.lua b/prototypes/silica-recipe.lua index af205c4..8da893d 100644 --- a/prototypes/silica-recipe.lua +++ b/prototypes/silica-recipe.lua @@ -30,15 +30,6 @@ data:extend( allow_productivity = true, ingredients = {util.item("stone-crushed", 4)}, results = {util.item("silica", 5)}, - -- } or mods["aai-industry"] and { - -- type = "recipe", - -- name = "silica", - -- category = mods["space-age"] and "basic-crushing" or "crafting", - -- enabled = false, - -- energy_required = 0.5, - -- allow_productivity = true, - -- ingredients = {util.item("sand", 1)}, - -- results = {util.item("silica", 1)}, } or { type = "recipe", diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index 7b651d6..75e904a 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -6,7 +6,7 @@ if util.k2() then util.remove_raw("recipe", "kr-silicon") util.remove_recipe_effect("kr-silicon-processing", "kr-silicon") if mods["Sebs-Electrics"] then - util.add_unlock("kr-silicon-processing", "silicon") + util.add_unlock("kr-silicon-processing", "kr-silicon") end end local prerequisites = {} @@ -40,15 +40,6 @@ data:extend( allow_productivity = true, ingredients = {util.item("silica", 10)}, results = {util.item("silicon", 1)} - -- expensive = - -- { - -- enabled = false, - -- energy_required = 3.2, - -- ingredients = {{"silica", 10}}, - -- result = "silicon", - -- result_count = 1 - -- }, - }, (not util.k2()) and { @@ -209,7 +200,7 @@ if not mods["space-age"] then end end util.add_effect("kr-fluids-chemistry", {type="unlock-recipe", recipe="kr-hydrogen-chloride"}) -util.add_unlock("kr-silicon-processing", "silicon") +util.add_unlock("kr-silicon-processing", mods.Krastorio2 and "kr-silicon" or "silicon") if util.me.more_intermediates() and not mods["space-age"] then diff --git a/recipe-updates.lua b/recipe-updates.lua index 1bcc52c..0988805 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -140,7 +140,7 @@ if not util.k2() then else util.add_ingredient("concrete", "silica", 15); if not mods["aai-industry"] then - util.add_ingredient("concrete", "sand", 10); + util.add_ingredient("concrete", "kr-sand", 10); end end @@ -280,11 +280,12 @@ end -- Sand in crusher. If sand comes from stone, silica comes from sand if mods["space-age"] then - if data.raw.item["sand"] and data.raw.recipe["sand"] and #data.raw.recipe["sand"].ingredients == 1 then - data.raw.recipe["sand"].category = "basic-crushing" + local sand = mods["Krastorio2"] and "kr-sand" or "sand" + if data.raw.item[sand] and data.raw.recipe[sand] and #data.raw.recipe[sand].ingredients == 1 then + data.raw.recipe[sand].category = "basic-crushing" log(serpent.block(data.raw.recipe.sand)) if data.raw.recipe.sand.ingredients[1].name == "stone" then - util.replace_ingredient("silica", "stone", "sand", 1) + util.replace_ingredient("silica", "stone", sand, 1) util.set_product_amount("silica", "silica", 1) util.set_recipe_time("silica", 0.5) end diff --git a/recipes/silicon-vulcanite.lua b/recipes/silicon-vulcanite.lua index 19bf8f9..a5da764 100644 --- a/recipes/silicon-vulcanite.lua +++ b/recipes/silicon-vulcanite.lua @@ -22,7 +22,7 @@ if mods["space-exploration"] then if string.sub(mods["space-exploration"], 1, 3) == "0.6" then table.insert(recipe.ingredients, {"kr-coke", 1}) recipe.icons = { - { icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, + { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, } end