From fbf1c2c86b6f774b45e26a906153b9630110af15 Mon Sep 17 00:00:00 2001 From: Brevven Date: Sun, 28 Feb 2021 00:16:50 -0800 Subject: [PATCH] add optional solar cell --- changelog.txt | 2 +- control.lua | 11 +++++++++++ graphics/icons/solar-cell.png | Bin 0 -> 17865 bytes locale/en/silicon.cfg | 10 +++++++--- prototypes/silicon-recipe.lua | 29 ++++++++++++++++++++++++++++- recipe-updates.lua | 31 ++++++++++++++++++++++++------- 6 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 graphics/icons/solar-cell.png diff --git a/changelog.txt b/changelog.txt index 7f172cf..e53375e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,7 @@ Version: 0.4.0 Date: 2021-02-27 Features: - - New optional intermediates: Silicon wafer + - New optional intermediates: Silicon wafer & Solar cell. --------------------------------------------------------------------------------------------------- Version: 0.3.7 Date: 2021-02-15 diff --git a/control.lua b/control.lua index 8b13789..0a1ac5f 100644 --- a/control.lua +++ b/control.lua @@ -1 +1,12 @@ +script.on_event( defines.events.on_console_chat, function(event) + -- refresh recipes, in case of settings change + if event.message and event.message == "SiliconRecipes" and (not event.player_index or not game.players[event.player_index] or game.players[event.player_index].admin) then + if game.players[event.player_index].force.recipes["silicon-wafer"] then + game.players[event.player_index].force.recipes["silicon-wafer"].enabled=true + end + if game.players[event.player_index].force.recipes["solar-cell"] then + game.players[event.player_index].force.recipes["solar-cell"].enabled=true + end + end +end) diff --git a/graphics/icons/solar-cell.png b/graphics/icons/solar-cell.png new file mode 100644 index 0000000000000000000000000000000000000000..29cc8ffa973d20cabb7bdcc516c2ffd49e9bc3f6 GIT binary patch literal 17865 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 literal 0 HcmV?d00001 diff --git a/locale/en/silicon.cfg b/locale/en/silicon.cfg index c681e48..0090387 100644 --- a/locale/en/silicon.cfg +++ b/locale/en/silicon.cfg @@ -2,18 +2,21 @@ silica=Silica silicon=Silicon silicon-wafer=Silicon wafer +solar-cell=Solar cell optical-fiber=Optical Fiber [item-name] silica=Silica silicon=Silicon silicon-wafer=Silicon wafer +solar-cell=Solar cell optical-fiber=Optical Fiber [item-description] silica=Can be used directly or processed further. silicon=Needed for various electrical and electronic applications -silicon-wafer=Use silicon in circuits +silicon-wafer=Use silicon in circuits. +solar-cell=Use the photovoltaic effect to harness solar energy. optical-fiber=Cable used for fiber optics, including circuit network. [technology-name] @@ -35,7 +38,8 @@ optical-fiber=__ITEM__optical-fiber__ # Settings [mod-setting-name] -bzsilicon-more-intermediates=Enable more intermediate recipes such as silicon wafers. More complex production chains. +bzsilicon-more-intermediates=Enable more intermediate recipes such as silicon wafers. [mod-setting-description] -bzsilicon-more-intermediates=Optional in vanilla, Krastorio 2, etc. Requried for Bio Industries. +bzsilicon-more-intermediates= More complex production chains. Optional in vanilla, Krastorio 2, etc. [color=red]Required for Bio Industries.[/color] + diff --git a/prototypes/silicon-recipe.lua b/prototypes/silicon-recipe.lua index 6afba17..60287a0 100644 --- a/prototypes/silicon-recipe.lua +++ b/prototypes/silicon-recipe.lua @@ -67,7 +67,6 @@ data:extend( type = "unlock-recipe", recipe = "silicon-wafer", } or nil, - }, unit = { @@ -93,6 +92,7 @@ data:extend({ icon_size = "64", subgroup = "intermediate-product", stack_size = util.get_stack_size(100), + order = "s[silicon]-silicon-wafer", }, { type = "recipe", @@ -111,5 +111,32 @@ data:extend({ result = "silicon-wafer", result_count = 10, }, + { + type = "item", + name = "solar-cell", + icon = "__bzsilicon__/graphics/icons/solar-cell.png", + icon_size = "128", + subgroup = "intermediate-product", + stack_size = util.get_stack_size(100), + order = "s[silicon]-solar-cell", + }, + { + type = "recipe", + name = "solar-cell", + category = "crafting-with-fluid", + subgroup = "intermediate-product", + enabled = false, + energy_required = 2, + ingredients = (mods["bzlead"] and { + {type= "item", name="silicon", amount=2}, + {type= "item", name="electronic-circuit", amount=1}, + {type= "item", name="lead-plate", amount=1}, + } or { + {type= "item", name="silicon", amount=2}, + {type= "item", name="electronic-circuit", amount=1}, + }), + result = "solar-cell", + result_count = 2, + }, }) end diff --git a/recipe-updates.lua b/recipe-updates.lua index 4039671..6b17564 100644 --- a/recipe-updates.lua +++ b/recipe-updates.lua @@ -5,15 +5,26 @@ if not mods["Krastorio2"] then util.add_ingredient("concrete", "silica", 25); util.add_prerequisite("concrete", "silica-processing") - util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon-wafer", 5) - util.add_prerequisite("advanced-electronics-2", util.silicon_processing) + if util.more_intermediates() then + util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon-wafer", 5) + util.replace_ingredient("effectivity-module", "electronic-circuit", "silicon-wafer") + util.replace_ingredient("productivity-module", "electronic-circuit", "silicon-wafer") + util.replace_ingredient("speed-module", "electronic-circuit", "silicon-wafer") + + util.replace_ingredient("solar-panel", "electronic-circuit", "solar-cell") + util.replace_ingredient("solar-panel-equipment", "solar-panel", "solar-cell") + util.add_effect("solar-energy", {type = "unlock-recipe", recipe="solar-cell"}) + else + util.replace_some_ingredient("solar-panel", "electronic-circuit", 10, "silicon", 10) + + util.replace_some_ingredient("processing-unit", "electronic-circuit", 10, "silicon", 10) + util.replace_ingredient("effectivity-module", "electronic-circuit", "silicon") + util.replace_ingredient("productivity-module", "electronic-circuit", "silicon") + util.replace_ingredient("speed-module", "electronic-circuit", "silicon") + end - util.replace_some_ingredient("solar-panel", "electronic-circuit", 10, "silicon", 10) util.add_prerequisite("solar-energy", "silicon-processing") - - util.replace_ingredient("effectivity-module", "electronic-circuit", "silicon-wafer") - util.replace_ingredient("productivity-module", "electronic-circuit", "silicon-wafer") - util.replace_ingredient("speed-module", "electronic-circuit", "silicon-wafer") + util.add_prerequisite("advanced-electronics-2", util.silicon_processing) util.add_prerequisite("modules", util.silicon_processing) else util.add_ingredient("concrete", "silica", 15); @@ -52,10 +63,16 @@ if mods["Krastorio2"] then util.add_ingredient("ai-core", "optical-fiber", 2) util.add_prerequisite(util.silicon_processing, "silica-processing") + if util.more_intermediates() then util.add_effect(util.silicon_processing, {type = "unlock-recipe", recipe="silicon-wafer"}) util.remove_ingredient("electronic-components", "silicon") util.add_ingredient("electronic-components", "silicon-wafer", 1) + + util.replace_ingredient("solar-panel", "electronic-circuit", "solar-cell") + util.remove_ingredient("solar-panel", "silicon") + util.replace_ingredient("solar-panel-equipment", "solar-panel", "solar-cell") + util.add_effect("solar-energy", {type = "unlock-recipe", recipe="solar-cell"}) end end