diff --git a/bzgas2/changelog.txt b/bzgas2/changelog.txt index b303e3c..42c0650 100644 --- a/bzgas2/changelog.txt +++ b/bzgas2/changelog.txt @@ -1,9 +1,4 @@ --------------------------------------------------------------------------------------------------- -Version: 2.0.3 -Date: 05.11.2025 - Bug Fixes: - - Fix early game progression ---------------------------------------------------------------------------------------------------- Version: 2.0.2 Date: 22.10.2025 Bug Fixes: diff --git a/bzgas2/compatibility/electronic-circuit.lua b/bzgas2/compatibility/electronic-circuit.lua index 74a3440..65995f0 100644 --- a/bzgas2/compatibility/electronic-circuit.lua +++ b/bzgas2/compatibility/electronic-circuit.lua @@ -18,7 +18,7 @@ util.add_ingredient("electronic-circuit", "bakelite", amt) util.set_icons("electronic-circuit", nil) -if util.me.handcraft() and not mods["aai-industry"] then +if util.me.handcraft() then data:extend({{ type = "recipe-category", name = "handcraft-only" }}) for i, character in pairs(data.raw.character) do if character and character.crafting_categories then @@ -27,7 +27,6 @@ if util.me.handcraft() and not mods["aai-industry"] then end local hcec = futil.table.deepcopy(data.raw.recipe["electronic-circuit"]) hcec.name = "electronic-circuit-handcraft-only" - hcec.localized_name = { "item-name.electronic-circuit" } data:extend({hcec}) util.set_icons("electronic-circuit-handcraft-only", { diff --git a/bzgas2/data-final-fixes.lua b/bzgas2/data-final-fixes.lua index e39b171..ad08a6f 100644 --- a/bzgas2/data-final-fixes.lua +++ b/bzgas2/data-final-fixes.lua @@ -9,16 +9,12 @@ util.set_product_amount("se-core-fragment-omni", "gas", 24) -- Fix basic chemical plant fuels for K2 if mods.Krastorio2 and - data.raw["assembling-machine"]["basic-chemical-plant"] and - data.raw["assembling-machine"]["basic-chemical-plant"].energy_source and - data.raw["assembling-machine"]["basic-chemical-plant"].energy_source.fuel_categories then +data.raw["assembling-machine"]["basic-chemical-plant"] and +data.raw["assembling-machine"]["basic-chemical-plant"].energy_source and +data.raw["assembling-machine"]["basic-chemical-plant"].energy_source.fuel_categories then table.insert(data.raw["assembling-machine"]["basic-chemical-plant"].energy_source.fuel_categories , "kr-vehicle-fuel") end -if mods["aai-industry"] and not mods["Krastorio2"] then - util.remove_prerequisite("basic-chemistry", "basic-fluid-handling") -end - -- Vanilla burner phase tweaks -- green circuits after electronics -- Electronic circuit recipe set below in compatibility script if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and not mods["bzcarbon2"] then @@ -34,31 +30,13 @@ if not mods.Krastorio2 and not mods["aai-industry"] and not mods.bzaluminum2 and util.add_ingredient("repair-pack", "copper-cable", 6) util.set_ingredient("repair-pack", "iron-gear-wheel", 3) + util.add_unlock_force("electronics", "electronic-circuit") + util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" }) util.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" }) - util.remove_recipe_effect("electronics", "copper-cable") - util.remove_recipe_effect("electronics", "lab") - util.remove_recipe_effect("electronics", "small-electric-pole") util.remove_recipe_effect("automation", "long-handed-inserter") util.set_enabled("electronic-circuit", false) util.set_enabled("inserter", false) - util.set_enabled("copper-cable", true) - util.set_enabled("lab", true) - util.set_enabled("small-electric-pole", true) - util.remove_prerequisite("automation-science-pack", "electronics") - local electronics = data.raw.technology["electronics"] - electronics.research_trigger = nil - electronics.unit = { - count = 10, - time = 10, - ingredients = {{ "automation-science-pack", 1 }} - } - util.remove_prerequisite("fast-inserter", "automation-science-pack") - util.remove_prerequisite("lamp", "automation-science-pack") - util.remove_prerequisite("logistic-science-pack", "automation-science-pack") - util.add_prerequisite("fast-inserter", "electronics") - util.add_prerequisite("lamp", "electronics") util.add_prerequisite("logistic-science-pack", "electronics") - end if not mods.bzaluminum2 and not mods["bzcarbon2"] then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) diff --git a/bzgas2/info.json b/bzgas2/info.json index bdcec07..ebae08f 100644 --- a/bzgas2/info.json +++ b/bzgas2/info.json @@ -1,6 +1,6 @@ { "name": "bzgas2", - "version": "2.0.3", + "version": "2.0.2", "factorio_version": "2.0", "title": "Natural Gas", "description": "Adds a natural gas resource, along with early game plastic.", diff --git a/bzgas2/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua index e4815d1..83a7a9d 100644 --- a/bzgas2/prototypes/bakelite.lua +++ b/bzgas2/prototypes/bakelite.lua @@ -1,14 +1,5 @@ local util = require("data-util"); -local prereq = {"basic-chemistry"} -if mods["Krastorio2"] then - table.insert(prereq, "steel-processing") -elseif mods["bzfoundry2"] then - table.insert(prereq, "foundry") -elseif mods["aai-industry"] then - table.insert(prereq, "automation") -end - data:extend({ { type = "item", @@ -39,7 +30,7 @@ data:extend({ name = "bakelite", icon = "__bzgas2__/graphics/technology/bakelite.png", icon_size = 256, - prerequisites = prereq, + prerequisites = {"basic-chemistry"}, effects = { {type = "unlock-recipe", recipe = "bakelite"}, }, diff --git a/bzgas2/prototypes/formaldehyde.lua b/bzgas2/prototypes/formaldehyde.lua index 66724e3..36b0be4 100644 --- a/bzgas2/prototypes/formaldehyde.lua +++ b/bzgas2/prototypes/formaldehyde.lua @@ -7,11 +7,6 @@ local util = require("data-util"); -- } -- }) -local prereq = {"gas-extraction"} -if mods["Krastorio2"] then - table.insert(prereq, "automation-science-pack") -end - data:extend({ { type = "fluid", @@ -45,7 +40,7 @@ data:extend({ name = "basic-chemistry", icon = "__bzgas2__/graphics/technology/formaldehyde.png", icon_size = 256, - prerequisites = prereq, + prerequisites = {"gas-extraction"}, effects = { {type = "unlock-recipe", recipe = "basic-chemical-plant"}, {type = "unlock-recipe", recipe = "formaldehyde"}, diff --git a/bzgas2/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua index e7f3508..156b547 100644 --- a/bzgas2/prototypes/gas-extractor.lua +++ b/bzgas2/prototypes/gas-extractor.lua @@ -13,7 +13,7 @@ if mods.Krastorio2 then ge_prereq = {"kr-stone-processing"} elseif mods["aai-industry"] then table.insert(ge_ingredients, {type="item", name="sand", amount=10}) - ge_prereq = {"sand-processing", "basic-fluid-handling"} + ge_prereq = {"sand-processing"} elseif data.raw.item["silica"] and data.raw.technology["silica-processing"] then table.insert(ge_ingredients, {type="item", name="silica", amount=20}) ge_prereq = {"silica-processing"} @@ -54,7 +54,7 @@ data:extend({ name = "gas-extraction", icon = "__bzgas2__/graphics/technology/gas-processing.png", icon_size = 256, - prerequisites = ge_prereq, + --prerequisites = ge_prereq, effects = { {type = "unlock-recipe", recipe = "gas-extractor"}, },