diff --git a/changelog.txt b/changelog.txt index 08c11c6..34fab02 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.6 +Date: 2022-12-28 + Fixes: + - Fix load error with AAI Loaders +--------------------------------------------------------------------------------------------------- Version: 0.0.5 Date: 2022-12-27 Localization: diff --git a/data-updates.lua b/data-updates.lua index bc71429..0a93edc 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -6,41 +6,10 @@ require("map-gen-preset-updates") -- require("compatibility/248k") require("compatibility/bob") -local futil = require("util") +require("prototypes/assembler-updates") + local util = require("data-util") -if util.me.early_assemblers() then - util.add_crafting_category("assembling-machine", "assembling-machine-1", "crafting-with-fluid") - data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = futil.table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes) - for i, fb in pairs(data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes) do - if i ~= "off_when_no_fluid_recipe" and fb.pipe_picture then - fb.pipe_picture.north.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" - fb.pipe_picture.north.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" - fb.pipe_picture.south.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" - fb.pipe_picture.south.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" - fb.pipe_picture.east.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" - fb.pipe_picture.east.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" - fb.pipe_picture.west.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" - fb.pipe_picture.west.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" - end - end - if data.raw["assembling-machine"]["burner-assembling-machine"] then - util.add_crafting_category("assembling-machine", "burner-assembling-machine", "crafting-with-fluid") - data.raw["assembling-machine"]["burner-assembling-machine"].fluid_boxes = futil.table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes) - for i, fb in pairs(data.raw["assembling-machine"]["burner-assembling-machine"].fluid_boxes) do - if i ~= "off_when_no_fluid_recipe" and fb.pipe_picture then - fb.pipe_picture.north.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" - fb.pipe_picture.north.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" - fb.pipe_picture.south.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" - fb.pipe_picture.south.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" - fb.pipe_picture.east.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" - fb.pipe_picture.east.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" - fb.pipe_picture.west.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" - fb.pipe_picture.west.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" - end - end - end -end require("modules") diff --git a/info.json b/info.json index b39fad4..c85c85a 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzchlorine", - "version": "0.0.5", + "version": "0.0.6", "factorio_version": "1.1", "title": "Salt & Chlorine", "author": "Brevven", @@ -17,6 +17,7 @@ "? bzgas", "? space-exploration >= 0.5.100", "? aai-industry", + "(?) aai-loaders", "? Krastorio2", "? bobelectronics", "? MDbobelectronics", diff --git a/prototypes/assembler-updates.lua b/prototypes/assembler-updates.lua new file mode 100644 index 0000000..77288bf --- /dev/null +++ b/prototypes/assembler-updates.lua @@ -0,0 +1,74 @@ +local futil = require("util") +local util = require("data-util") + +if util.me.early_assemblers() then + util.add_crafting_category("assembling-machine", "assembling-machine-1", "crafting-with-fluid") + data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes = futil.table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes) + for i, fb in pairs(data.raw["assembling-machine"]["assembling-machine-1"].fluid_boxes) do + if i ~= "off_when_no_fluid_recipe" and fb.pipe_picture then + fb.pipe_picture.north.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" + + if fb.pipe_picture.north.hr_version then + fb.pipe_picture.north.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" + end + if fb.pipe_picture.north.layers and fb.pipe_picture.north.layers[1] then + fb.pipe_picture.north.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" + fb.pipe_picture.north.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" + fb.pipe_picture.north.layers[2] = nil + fb.pipe_picture.south.layers[2] = nil + fb.pipe_picture.east.layers[2] = nil + fb.pipe_picture.west.layers[2] = nil + end + + log("recipe") + log(serpent.dump(recipe)) + log("fb") + log(serpent.dump(fb)) + + end + end + if data.raw["assembling-machine"]["burner-assembling-machine"] then + util.add_crafting_category("assembling-machine", "burner-assembling-machine", "crafting-with-fluid") + data.raw["assembling-machine"]["burner-assembling-machine"].fluid_boxes = futil.table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"].fluid_boxes) + for i, fb in pairs(data.raw["assembling-machine"]["burner-assembling-machine"].fluid_boxes) do + if i ~= "off_when_no_fluid_recipe" and fb.pipe_picture then + fb.pipe_picture.north.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" + if fb.pipe_picture.north.hr_version then + fb.pipe_picture.north.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" + end + if fb.pipe_picture.north.layers and fb.pipe_picture.north.layers[1] then + fb.pipe_picture.north.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.layers[1].filename = "__bzchlorine__/graphics/entity/assembler/assembling-machine-2-pipe-W.png" + fb.pipe_picture.north.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-N.png" + fb.pipe_picture.south.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-S.png" + fb.pipe_picture.east.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-E.png" + fb.pipe_picture.west.layers[1].hr_version.filename = "__bzchlorine__/graphics/entity/assembler/hr-assembling-machine-2-pipe-W.png" + fb.pipe_picture.north.layers[2] = nil + fb.pipe_picture.south.layers[2] = nil + fb.pipe_picture.east.layers[2] = nil + fb.pipe_picture.west.layers[2] = nil + end + end + end + end +end