From c406eb2bb5f86a93a5d000d6ba9d3094bd4540be Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 14:58:07 +0200 Subject: [PATCH 001/117] Changed factorio version and added migration for stone-crushed --- SeaBlock/info.json | 4 ++-- SeaBlock/migrations/SeaBlock_0.6.0.json | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 SeaBlock/migrations/SeaBlock_0.6.0.json diff --git a/SeaBlock/info.json b/SeaBlock/info.json index 86926fbd..ba68cabe 100644 --- a/SeaBlock/info.json +++ b/SeaBlock/info.json @@ -1,7 +1,7 @@ { "name": "SeaBlock", - "version": "0.5.17", - "factorio_version": "1.1", + "version": "0.6.0", + "factorio_version": "2.0", "title": "Sea Block", "author": "Trainwreck", "contact": "", diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.json b/SeaBlock/migrations/SeaBlock_0.6.0.json new file mode 100644 index 00000000..9f9df572 --- /dev/null +++ b/SeaBlock/migrations/SeaBlock_0.6.0.json @@ -0,0 +1,8 @@ +{ + "entity": [], + "item": + [ + ["stone-crushed", "stone"] + ] + } + \ No newline at end of file From f5230d6cd535904b48d5efc663ab692513bb1d18 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 14:59:03 +0200 Subject: [PATCH 002/117] Replaced 'hidden' flag by property hidden and added some warning messages to help debugging --- SeaBlock/lib.lua | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 8342eb6e..aba6e3c1 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -95,12 +95,12 @@ function seablock.lib.add_recipe_unlock(technology, recipe, insertindex) end function seablock.lib.iteraterecipes(recipe, func) - if recipe.normal then - func(recipe.normal) - end - if recipe.expensive then - func(recipe.expensive) - end + -- if recipe.normal then --TODO: remove this + -- func(recipe.normal) + -- end + -- if recipe.expensive then + -- func(recipe.expensive) + -- end if recipe.ingredients then func(recipe) end @@ -154,6 +154,8 @@ function seablock.lib.removeingredient(name, ingredient) end end seablock.lib.iteraterecipes(t, doremove) + else + log("sb - removeingredient - can't find recipe : " .. name) end end @@ -231,6 +233,8 @@ function seablock.lib.hide_technology(technology_name) technology.hidden = true technology.enabled = false end + else + log("Hide non existing tech : " .. technology_name) end end @@ -246,12 +250,13 @@ end function seablock.lib.hide_item(item_name) local item = data.raw.item[item_name] if item then - if not item.flags then - item.flags = {} - end - if not seablock.lib.tablefind(item.flags, "hidden") then - table.insert(item.flags, "hidden") - end + item.hidden = true + -- if not item.flags then + -- item.flags = {} + -- end + -- if not seablock.lib.tablefind(item.flags, "hidden") then + -- table.insert(item.flags, "hidden") + -- end else item = data.raw.fluid[item_name] if item then @@ -262,7 +267,7 @@ end function seablock.lib.hide(type_name, name) if not data.raw[type_name] then - log("Unknown type: " .. type_name) + log("seablock.lib.hide: Unknown type: " .. type_name) else local item = data.raw[type_name][name] if not item then @@ -274,9 +279,10 @@ function seablock.lib.hide(type_name, name) if not item.flags then item.flags = {} end - if not seablock.lib.tablefind(item.flags, "hidden") then - table.insert(item.flags, "hidden") - end + -- if not seablock.lib.tablefind(item.flags, "hidden") then + -- table.insert(item.flags, "hidden") + -- end + item.hidden = true if type_name == "item" then table.insert(item.flags, "hide-from-bonus-gui") From 02dc91d0a607cdfc900a171654c254cdc47070c5 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:08:20 +0200 Subject: [PATCH 003/117] data - Fixed ScienceCostTweaker compatiblity --- SeaBlock/data/ScienceCostTweakerM.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SeaBlock/data/ScienceCostTweakerM.lua b/SeaBlock/data/ScienceCostTweakerM.lua index faa8ef4a..cca988d9 100644 --- a/SeaBlock/data/ScienceCostTweakerM.lua +++ b/SeaBlock/data/ScienceCostTweakerM.lua @@ -4,27 +4,27 @@ if mods["ScienceCostTweakerM"] then if mods["bobtech"] then -- Rename Lab 2 to Exoplanetary Studies Lab - if data.raw.item["lab-2"] then - data.raw.item["lab-2"].localised_name = { "item-name.sct-lab-lab2" } + if data.raw.item["bob-lab-2"] then + data.raw.item["bob-lab-2"].localised_name = { "item-name.sct-lab-lab2" } end - if data.raw.lab["lab-2"] then - data.raw.lab["lab-2"].localised_name = { "entity-name.sct-lab-lab2" } + if data.raw.lab["bob-lab-2"] then + data.raw.lab["bob-lab-2"].localised_name = { "entity-name.sct-lab-lab2" } end - bobmods.lib.recipe.set_ingredients("lab-2", { - { "sct-lab-t4", 1 }, - { "rocket-silo", 1 }, - { "nitinol-alloy", 100 }, - { "express-stack-filter-inserter", 2 }, - { "advanced-processing-unit", 20 }, + bobmods.lib.recipe.set_ingredients("bob-lab-2", { + { type = "item", name = "sct-lab-t4", amount = 1 }, + { type = "item", name = "rocket-silo", amount = 1 }, + { type = "item", name = "bob-nitinol-alloy", amount = 100 }, + { type = "item", name = "bob-express-bulk-inserter", amount = 2 }, + { type = "item", name = "advanced-processing-unit", amount = 20 }, }) bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "rocket-silo") bobmods.lib.tech.remove_prerequisite("sct-space-science-pack", "rocket-silo") bobmods.lib.tech.add_prerequisite("sct-space-science-pack", "sct-lab-lab2") - if data.raw.technology["stack-inserter-4"] then - bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "stack-inserter-4") + if data.raw.technology["bob-bulk-inserter-4"] then + bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "bob-bulk-inserter-4") else - bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "stack-inserter-2") + bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "bob-bulk-inserter-2") end end end From 71f12c4ca09b6606b60cb5406e93e3ecabb7f59b Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:09:00 +0200 Subject: [PATCH 004/117] data - Renamed base game techs and bob-stuff --- SeaBlock/data/recipe.lua | 2 +- SeaBlock/data/tables.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SeaBlock/data/recipe.lua b/SeaBlock/data/recipe.lua index 51bea663..1673a08b 100644 --- a/SeaBlock/data/recipe.lua +++ b/SeaBlock/data/recipe.lua @@ -1,5 +1,5 @@ -- Buff Lead 3 -seablock.lib.substresult("anode-lead-smelting", "slag", "quartz", 1) +seablock.lib.substresult("anode-lead-smelting", "slag", "bob-quartz", 1) seablock.lib.substingredient("anode-lead-smelting", "liquid-hexafluorosilicic-acid", nil, 20) -- Compost void recipe diff --git a/SeaBlock/data/tables.lua b/SeaBlock/data/tables.lua index 5e6e2c13..f3c64e22 100644 --- a/SeaBlock/data/tables.lua +++ b/SeaBlock/data/tables.lua @@ -29,9 +29,9 @@ seablock.startup_techs = { -- Don't reduce the science pack cost of green algae ["bio-processing-green"] = { false }, ["bio-wood-processing-2"] = { true }, - ["long-inserters-1"] = { true }, + ["bob-long-inserters-1"] = { true }, ["military"] = { true }, - ["optics"] = { true }, + ["lamp"] = { true }, ["slag-processing-1"] = { true }, ["steam-power"] = { true }, ["water-washing-1"] = { true }, From 84694182e70ed429d82bc48442a67c5042a27277 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:10:10 +0200 Subject: [PATCH 005/117] data - Renamed technologies and fixed some changes in the tech tree --- SeaBlock/data/tech-tree.lua | 53 ++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua index 780bbb15..da40ab88 100644 --- a/SeaBlock/data/tech-tree.lua +++ b/SeaBlock/data/tech-tree.lua @@ -22,14 +22,14 @@ bobmods.lib.tech.remove_prerequisite("angels-iron-smelting-2", "angels-coal-proc bobmods.lib.tech.replace_prerequisite("angels-coal-processing-2", "water-treatment-2", "basic-chemistry-3") -- Add other prerequisites -bobmods.lib.tech.add_prerequisite("gardens", "electronics") +bobmods.lib.tech.add_prerequisite("gardens", "bob-electronics") if mods["ScienceCostTweakerM"] then bobmods.lib.tech.add_prerequisite("sct-bio-science-pack", "bio-arboretum-1") bobmods.lib.tech.add_prerequisite("sb-bio-processing-advanced", "sct-bio-science-pack") bobmods.lib.tech.add_prerequisite("utility-science-pack", "rubber") end -bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "silicon-processing") -bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "silicon-processing") +bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "bob-silicon-processing") +bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "bob-silicon-processing") -- Add missing Science Pack Tech prerequisites @@ -61,12 +61,12 @@ bobmods.lib.tech.add_prerequisite("basic-chemistry-2", "logistic-science-pack") bobmods.lib.tech.add_prerequisite("logistic-system", "production-science-pack") -- Utility / Yellow -bobmods.lib.tech.add_prerequisite("radars-5", "utility-science-pack") +bobmods.lib.tech.add_prerequisite("bob-radar-5", "utility-science-pack") -- Space / White if mods["bobequipment"] then bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "space-science-pack") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-4", "space-science-pack") + bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "space-science-pack") end if mods["bobwarfare"] then bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "space-science-pack") @@ -91,16 +91,49 @@ bobmods.lib.tech.add_prerequisite("space-science-pack", "military") -- Steam power bobmods.lib.tech.add_prerequisite("automation", "steam-power") -bobmods.lib.tech.add_prerequisite("optics", "steam-power") +bobmods.lib.tech.add_prerequisite("lamp", "steam-power") if data.raw.technology["bob-greenhouse"] then bobmods.lib.tech.add_prerequisite("bob-greenhouse", "steam-power") end bobmods.lib.tech.add_prerequisite("angels-coal-processing", "steam-power") -- Gems are needed to make higher tier modules -if data.raw.technology["gem-processing-3"] then +if data.raw.technology["bob-gem-processing-3"] then --Module with 2 dots has the tech name of 3 - bobmods.lib.tech.add_prerequisite("speed-module-3", "gem-processing-3") - bobmods.lib.tech.add_prerequisite("productivity-module-3", "gem-processing-3") - bobmods.lib.tech.add_prerequisite("effectivity-module-3", "gem-processing-3") + bobmods.lib.tech.add_prerequisite("speed-module-3", "bob-gem-processing-3") + bobmods.lib.tech.add_prerequisite("productivity-module-3", "bob-gem-processing-3") + bobmods.lib.tech.add_prerequisite("efficiency-module-3", "bob-gem-processing-3") end + + +bobmods.lib.tech.remove_prerequisite("automation-science-pack", "electronics") +seablock.lib.hide_technology("automation-science-pack") + +seablock.lib.hide_technology("electronics") --new trigger tech in base game, we don't want it in seablock +-- I think i found a bug: trigger techs still research even if hidden and disabled +-- data.raw["technology"]["electronics"] = nil -- multiple different techs and shortcut will complain if we do that +data.raw["technology"]["electronics"].research_trigger = nil +data.raw["technology"]["electronics"].unit = {time = 1, count = 1, ingredients = {}} + +seablock.lib.hide_technology("electric-mining-drill") +seablock.lib.hide_technology("repair-pack") + +bobmods.lib.tech.add_prerequisite("radar", "military") +bobmods.lib.tech.remove_prerequisite("military", "automation-science-pack") +bobmods.lib.tech.remove_prerequisite("gun-turret", "automation-science-pack") +bobmods.lib.tech.remove_prerequisite("stone-wall", "automation-science-pack") +bobmods.lib.tech.remove_prerequisite("radar", "automation-science-pack") +bobmods.lib.tech.remove_prerequisite("automation", "automation-science-pack") + + +-- Change order for esthetics of the tech tree +data.raw["technology"]["military"].order = "z-[military]" + +if data.raw["technology"]["logistics-0"] then + data.raw["technology"]["logistics-0"].research_trigger = nil + data.raw["technology"]["logistics-0"].unit = { + ingredients = {{"automation-science-pack", 1}}, + time = 5, + count = 10 + } +end \ No newline at end of file From df2f5d3c0a0128a6e7683403a5c5b37c54ec4a17 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:13:15 +0200 Subject: [PATCH 006/117] Fixed new ingredient format and renamed bob-stuff --- SeaBlock/prototypes/recipe.lua | 14 +++++++------- SeaBlock/prototypes/rockchest.lua | 19 ++++++++----------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua index f171cd8f..a8a1861a 100644 --- a/SeaBlock/prototypes/recipe.lua +++ b/SeaBlock/prototypes/recipe.lua @@ -5,9 +5,8 @@ data:extend({ category = "smelting", enabled = false, energy_required = 3.5, - ingredients = { { "wood-bricks", 1 } }, - result = "wood-charcoal", - result_count = 5, + ingredients = { { type = "item", name = "wood-bricks", amount = 1 } }, + results = { { type = "item", name = "wood-charcoal", amount = 5 } }, subgroup = "bio-processing-wood", }, { @@ -19,7 +18,7 @@ data:extend({ energy_required = 10, enabled = false, ingredients = { - { type = "item", name = "lithium-chloride", amount = 1 }, + { type = "item", name = "bob-lithium-chloride", amount = 1 }, }, results = { { type = "fluid", name = "thermal-water", amount = 20 }, @@ -35,7 +34,7 @@ data:extend({ enabled = false, ingredients = { { type = "fluid", name = "steam", amount = 100 }, - { type = "item", name = "lithium-chloride", amount = 2 }, + { type = "item", name = "bob-lithium-chloride", amount = 2 }, }, results = { { type = "fluid", name = "thermal-water", amount = 100 }, @@ -81,8 +80,8 @@ data:extend({ enabled = false, ingredients = { { type = "item", name = "catalyst-metal-carrier", amount = 10 }, - { type = "item", name = "gold-ore", amount = 1 }, - { type = "item", name = "rutile-ore", amount = 1 }, + { type = "item", name = "bob-gold-ore", amount = 1 }, + { type = "item", name = "bob-rutile-ore", amount = 1 }, }, results = { { type = "item", name = "catalyst-metal-purple", amount = 10 }, @@ -150,6 +149,7 @@ for name, base_icons in pairs(slag_processing_list) do if recipe then local recipe_results if recipe.normal then + log("Warning - Recipe still using 'normal' subsection : " .. name) recipe_results = recipe.normal.results else recipe_results = recipe.results diff --git a/SeaBlock/prototypes/rockchest.lua b/SeaBlock/prototypes/rockchest.lua index 5bffd253..90434db8 100644 --- a/SeaBlock/prototypes/rockchest.lua +++ b/SeaBlock/prototypes/rockchest.lua @@ -22,17 +22,14 @@ data:extend({ close_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, vehicle_impact_sound = { filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0 }, picture = { - filename = "__base__/graphics/decorative/rock-big/rock-big-18.png", - width = 71, - height = 64, - shift = { 0.3125, 0.046875 }, - hr_version = { - filename = "__base__/graphics/decorative/rock-big/hr-rock-big-18.png", - width = 141, - height = 128, - scale = 0.5, - shift = { 0.304688, 0.0390625 }, - }, + filename = "__base__/graphics/decorative/big-rock/big-rock-18.png", + -- width = 71, --old non hr version + -- height = 64, + -- shift = { 0.3125, 0.046875 }, + width = 141, --taken from the old hr version + height = 128, + scale = 0.5, + shift = { 0.304688, 0.0390625 }, }, circuit_wire_connection_point = circuit_connector_definitions["chest"].points, From 56e63b31db9a874d9c8ac660b4ceb99a246f3d3a Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:14:47 +0200 Subject: [PATCH 007/117] prototypes - technology: fixed 2.0 tech and renamed bob-stuff --- SeaBlock/prototypes/technology.lua | 62 ++++++++++++------------------ 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index a760dccc..becff62f 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -1,11 +1,11 @@ data:extend({ - { + --[[{ type = "tool", name = "sb-angelsore3-tool", localised_name = { "item-name.angels-ore3-crushed" }, - icon = "__angelsrefining__/graphics/icons/angels-ore3-crushed.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore3-crushed.png", icon_size = 32, - flags = { "hidden" }, + hidden = true, stack_size = 100, durability = 1, }, @@ -14,8 +14,8 @@ data:extend({ name = "sb-basic-circuit-board-tool", localised_name = { "item-name.basic-circuit-board" }, icon = "__bobelectronics__/graphics/icons/basic-circuit-board.png", - icon_size = 128, - flags = { "hidden" }, + icon_size = 64, + hidden = true, stack_size = 100, durability = 1, }, @@ -26,10 +26,10 @@ data:extend({ icon = "__base__/graphics/icons/lab.png", icon_size = 64, icon_mipmaps = 4, - flags = { "hidden" }, + hidden = true, stack_size = 100, durability = 1, - }, + },]] { type = "technology", name = "sb-startup1", @@ -40,11 +40,7 @@ data:extend({ { type = "unlock-recipe", recipe = "angelsore3-crushed-smelting" }, { type = "unlock-recipe", recipe = "copper-cable" }, }, - unit = { - count = 1, - ingredients = { { "sb-angelsore3-tool", 1 } }, - time = 1, - }, + research_trigger = {type = "craft-item", item = "angels-ore3-crushed"} }, { type = "technology", @@ -55,19 +51,15 @@ data:extend({ { type = "unlock-recipe", recipe = "inserter" }, { type = "unlock-recipe", recipe = "pipe" }, { type = "unlock-recipe", recipe = "pipe-to-ground" }, - { type = "unlock-recipe", recipe = "copper-pipe" }, - { type = "unlock-recipe", recipe = "copper-pipe-to-ground" }, + { type = "unlock-recipe", recipe = "bob-copper-pipe" }, + { type = "unlock-recipe", recipe = "bob-copper-pipe-to-ground" }, { type = "unlock-recipe", recipe = "iron-stick" }, { type = "unlock-recipe", recipe = "iron-gear-wheel" }, { type = "unlock-recipe", recipe = "burner-inserter" }, { type = "unlock-recipe", recipe = "iron-chest" }, }, prerequisites = { "bio-wood-processing" }, - unit = { - count = 1, - ingredients = { { "sb-basic-circuit-board-tool", 1 } }, - time = 1, - }, + research_trigger = {type = "craft-item", item = "bob-basic-circuit-board"}, }, { type = "technology", @@ -78,25 +70,21 @@ data:extend({ { type = "unlock-recipe", recipe = "automation-science-pack" }, }, prerequisites = { "sb-startup3" }, - unit = { - count = 1, - ingredients = { { "sb-lab-tool", 1 } }, - time = 1, - }, + research_trigger = {type = "craft-item", item = "lab"}, }, { type = "technology", name = "sb-bio-processing-advanced", localised_name = { "technology-name.bio-processing-green" }, localised_description = { "technology-description.bio-processing-green" }, - icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png", + icon = "__angelsbioprocessinggraphics__/graphics/technology/algae-farm-tech.png", icon_size = 128, order = "c-a", prerequisites = { "bio-processing-red", - "advanced-electronics", + "advanced-circuit", "angels-stone-smelting-2", - "zinc-processing", + "bob-zinc-processing", "chemical-science-pack", }, effects = { @@ -108,10 +96,10 @@ data:extend({ unit = { count = 50, ingredients = { - { type = "item", name = "automation-science-pack", amount = 1 }, - { type = "item", name = "logistic-science-pack", amount = 1 }, - { type = "item", name = "token-bio", amount = 1 }, - { type = "item", name = "chemical-science-pack", amount = 1 }, + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + {"token-bio", 1 }, + { "chemical-science-pack", 1 }, }, time = 30, }, @@ -146,11 +134,11 @@ data:extend({ bobmods.lib.recipe.enabled("boiler", false) bobmods.lib.recipe.enabled("steam-engine", false) -bobmods.lib.recipe.enabled("copper-pipe-to-ground", false) -bobmods.lib.recipe.enabled("basic-circuit-board", false) +bobmods.lib.recipe.enabled("bob-copper-pipe-to-ground", false) +bobmods.lib.recipe.enabled("bob-basic-circuit-board", false) bobmods.lib.recipe.enabled("automation-science-pack", false) -if data.raw.recipe["basic-transport-belt"] then - bobmods.lib.tech.add_recipe_unlock("sb-startup3", "basic-transport-belt") +if data.raw.recipe["bob-basic-transport-belt"] then + bobmods.lib.tech.add_recipe_unlock("sb-startup3", "bob-basic-transport-belt") else bobmods.lib.tech.add_recipe_unlock("sb-startup3", "transport-belt") end @@ -160,14 +148,14 @@ if mods["bobwarfare"] then { type = "technology", name = "sb-sniper-rifle", - localised_name = { "item-name.sniper-rifle" }, + localised_name = { "item-name.bob-sniper-rifle" }, icon_size = 256, icon_mipmaps = 4, icon = "__base__/graphics/technology/military.png", effects = { { type = "unlock-recipe", - recipe = "sniper-rifle", + recipe = "bob-sniper-rifle", }, }, prerequisites = { "military-science-pack" }, From 5876ae1a61d3f8c38b520b72c0f68e3420ae646b Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:16:22 +0200 Subject: [PATCH 008/117] Renamed bob-stuff for starting items --- SeaBlock/starting-items.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SeaBlock/starting-items.lua b/SeaBlock/starting-items.lua index 9e75c7cd..fbb8b0c5 100644 --- a/SeaBlock/starting-items.lua +++ b/SeaBlock/starting-items.lua @@ -6,12 +6,12 @@ function seablock.populate_starting_items(items) ["small-electric-pole"] = 50, ["small-lamp"] = 12, ["iron-plate"] = 1200, - ["basic-circuit-board"] = 200, - ["stone-pipe"] = 100, - ["stone-pipe-to-ground"] = 50, + ["bob-basic-circuit-board"] = 200, + ["bob-stone-pipe"] = 100, + ["bob-stone-pipe-to-ground"] = 50, ["stone-brick"] = 500, ["pipe"] = 21, - ["copper-pipe"] = 5, + ["bob-copper-pipe"] = 5, ["iron-gear-wheel"] = 10, ["iron-stick"] = 88, ["pipe-to-ground"] = 2, From 688570eadbff4e0bde1fd1de758f5f6c4bb726c1 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:19:03 +0200 Subject: [PATCH 009/117] data-updates - fixed compatibility for mods: SpaceMod, clowns, Companion drones, etc.. --- SeaBlock/data-updates/Companion_Drones.lua | 6 +- SeaBlock/data-updates/SpaceMod.lua | 8 +- SeaBlock/data-updates/clowns.lua | 238 +++++---------------- SeaBlock/data-updates/other-mods.lua | 14 +- 4 files changed, 72 insertions(+), 194 deletions(-) diff --git a/SeaBlock/data-updates/Companion_Drones.lua b/SeaBlock/data-updates/Companion_Drones.lua index 5757b072..e302d2ee 100644 --- a/SeaBlock/data-updates/Companion_Drones.lua +++ b/SeaBlock/data-updates/Companion_Drones.lua @@ -1,7 +1,7 @@ if mods["Companion_Drones"] then - bobmods.lib.tech.add_recipe_unlock("electronics", "companion") - bobmods.lib.tech.add_recipe_unlock("electronics", "companion-roboport-equipment") - bobmods.lib.tech.add_recipe_unlock("electronics", "companion-reactor-equipment") + bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion") + bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion-roboport-equipment") + bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion-reactor-equipment") bobmods.lib.tech.add_recipe_unlock("energy-shield-mk2-equipment", "companion-shield-equipment") bobmods.lib.recipe.set_ingredient("companion-shield-equipment", { "energy-shield-mk2-equipment", 1 }) diff --git a/SeaBlock/data-updates/SpaceMod.lua b/SeaBlock/data-updates/SpaceMod.lua index 5170fc3a..77748b74 100644 --- a/SeaBlock/data-updates/SpaceMod.lua +++ b/SeaBlock/data-updates/SpaceMod.lua @@ -23,11 +23,11 @@ if mods["SpaceMod"] then if not mods["bobmodules"] then -- Do nothing elseif mods["CircuitProcessing"] then - bobmods.lib.tech.add_prerequisite("space-assembly", "effectivity-module-4") - bobmods.lib.tech.add_prerequisite("space-assembly", "productivity-module-4") - bobmods.lib.tech.add_prerequisite("space-assembly", "speed-module-4") + bobmods.lib.tech.add_prerequisite("space-assembly", "bob-efficiency-module-4") + bobmods.lib.tech.add_prerequisite("space-assembly", "bob-productivity-module-4") + bobmods.lib.tech.add_prerequisite("space-assembly", "bob-speed-module-4") else - bobmods.lib.tech.add_prerequisite("space-assembly", "productivity-module-8") + bobmods.lib.tech.add_prerequisite("space-assembly", "bob-productivity-module-5") end if mods["bobpower"] and settings.startup["bobmods-power-solar"].value == true then diff --git a/SeaBlock/data-updates/clowns.lua b/SeaBlock/data-updates/clowns.lua index 541c30ed..09dc3911 100644 --- a/SeaBlock/data-updates/clowns.lua +++ b/SeaBlock/data-updates/clowns.lua @@ -23,23 +23,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore1", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore1", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore1", amount = 1 }, }, icon_size = 32, order = "a", @@ -55,23 +44,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore2", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore2", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore2", amount = 1 }, }, icon_size = 32, order = "b", @@ -87,23 +65,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore3", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore3", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore3", amount = 1 }, }, icon_size = 32, order = "c", @@ -119,23 +86,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore4", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore4", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore4", amount = 1 }, }, icon_size = 32, order = "d", @@ -151,23 +107,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore5", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore5", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore5", amount = 1 }, }, icon_size = 32, order = "e", @@ -183,24 +128,14 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore6", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore6", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore6", amount = 1 }, }, + icon_size = 32, order = "f", }, @@ -215,23 +150,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore7", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore7", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore7", amount = 1 }, }, icon_size = 32, order = "g", @@ -247,23 +171,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore8", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore8", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore8", amount = 1 }, }, icon_size = 32, order = "h", @@ -279,23 +192,12 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, - }, - results = { - { type = "item", name = "clowns-ore9", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "fluid", name = "mineral-sludge", amount = 25 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 50 }, - }, - results = { - { type = "item", name = "clowns-ore9", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-ore9", amount = 1 }, }, icon_size = 32, order = "i", @@ -307,25 +209,13 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "resource-refining-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "item", name = "solid-sand", amount = 1 }, - { type = "item", name = "stone-crushed", amount = 6 }, - }, - results = { - { type = "item", name = "clowns-resource1", amount = 1 }, - }, + energy_required = 4, + ingredients = { + { type = "item", name = "solid-sand", amount = 1 }, + { type = "item", name = "stone", amount = 6 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "item", name = "solid-sand", amount = 1 }, - { type = "item", name = "stone-crushed", amount = 12 }, - }, - results = { - { type = "item", name = "clowns-resource1", amount = 1 }, - }, + results = { + { type = "item", name = "clowns-resource1", amount = 1 }, }, icon_size = 32, order = "j", @@ -337,25 +227,13 @@ if mods["Clowns-Extended-Minerals"] then subgroup = "resource-refining-2", enabled = false, allow_decomposition = false, - normal = { - energy_required = 4, - ingredients = { - { type = "item", name = "solid-sand", amount = 5 }, - { type = "item", name = "blue-cellulose-fiber", amount = 1 }, - }, - results = { - { type = "item", name = "clowns-resource2", amount = 5 }, - }, + energy_required = 4, + ingredients = { + { type = "item", name = "solid-sand", amount = 5 }, + { type = "item", name = "blue-cellulose-fiber", amount = 1 }, }, - expensive = { - energy_required = 8, - ingredients = { - { type = "item", name = "solid-sand", amount = 5 }, - { type = "item", name = "blue-cellulose-fiber", amount = 2 }, - }, - results = { - { type = "item", name = "clowns-resource2", amount = 5 }, - }, + results = { + { type = "item", name = "clowns-resource2", amount = 5 }, }, icon_size = 32, order = "k", diff --git a/SeaBlock/data-updates/other-mods.lua b/SeaBlock/data-updates/other-mods.lua index 6da50f87..9240ddd9 100644 --- a/SeaBlock/data-updates/other-mods.lua +++ b/SeaBlock/data-updates/other-mods.lua @@ -19,7 +19,7 @@ if mods["jetpack"] then bobmods.lib.tech.add_prerequisite("jetpack-1", "zinc-processing") bobmods.lib.recipe.replace_ingredient("jetpack-1", "electronic-circuit", "advanced-circuit") bobmods.lib.recipe.replace_ingredient("jetpack-1", "pipe", "brass-pipe") - bobmods.lib.recipe.replace_ingredient("jetpack-1", "steel-plate", "invar-alloy") + bobmods.lib.recipe.replace_ingredient("jetpack-1", "steel-plate", "bob-invar-alloy") bobmods.lib.tech.add_science_pack("jetpack-2", "military-science-pack", 1) bobmods.lib.tech.add_prerequisite("jetpack-2", "advanced-electronics-2") @@ -27,19 +27,19 @@ if mods["jetpack"] then bobmods.lib.tech.add_science_pack("jetpack-3", "military-science-pack", 1) bobmods.lib.tech.add_science_pack("jetpack-3", "production-science-pack", 1) - bobmods.lib.recipe.replace_ingredient("jetpack-3", "processing-unit", "advanced-processing-unit") + bobmods.lib.recipe.replace_ingredient("jetpack-3", "processing-unit", "bob-advanced-processing-unit") bobmods.lib.tech.add_science_pack("jetpack-4", "military-science-pack", 1) bobmods.lib.tech.add_science_pack("jetpack-4", "production-science-pack", 1) if mods["bobmodules"] then if mods["CircuitProcessing"] then bobmods.lib.recipe.remove_ingredient("jetpack-4", "speed-module-4") - bobmods.lib.recipe.remove_ingredient("jetpack-4", "effectivity-module-4") - bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "speed-module-8", amount = 2 }) - bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "effectivity-module-8", amount = 2 }) + bobmods.lib.recipe.remove_ingredient("jetpack-4", "efficiency-module-4") + bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "speed-module-5", amount = 2 }) + bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "efficiency-module-5", amount = 2 }) else - bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "speed-module-8") - bobmods.lib.recipe.replace_ingredient("jetpack-4", "effectivity-module-3", "effectivity-module-8") + bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "speed-module-5") + bobmods.lib.recipe.replace_ingredient("jetpack-4", "efficiency-module-3", "efficiency-module-5") end end end From 0d36b27d5c8599cb356078c5c327984006c1e056 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:20:09 +0200 Subject: [PATCH 010/117] data-updates - fixed compatibility for science cost tweaker --- .../data-updates/science-cost-tweaker.lua | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SeaBlock/data-updates/science-cost-tweaker.lua b/SeaBlock/data-updates/science-cost-tweaker.lua index 97224992..93cc4958 100644 --- a/SeaBlock/data-updates/science-cost-tweaker.lua +++ b/SeaBlock/data-updates/science-cost-tweaker.lua @@ -1,43 +1,43 @@ if mods["ScienceCostTweakerM"] then - if data.raw.item["lab-2"] then + if data.raw.item["bob-lab-2"] then -- Update lab energy usage - data.raw.lab["lab-2"].energy_usage = "10MW" + data.raw.lab["bob-lab-2"].energy_usage = "10MW" -- Only two module slots for lab-2 if s.c.t. is installed (other labs have no module slots) - data.raw.lab["lab-2"].module_specification.module_slots = 2 + data.raw.lab["bob-lab-2"].module_slots = 2 end -- Change tech to use lab icon from SCT - data.raw.tool["sb-lab-tool"].icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-64.png" - data.raw.tool["sb-lab-tool"].icon_mipmaps = 0 + data.raw["technology"]["sb-startup4"].icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-64.png" + data.raw["technology"]["sb-startup4"].icon_mipmaps = 0 -- Reduce processing unit cost of S.C.T. high-tech science seablock.lib.substingredient("sct-htech-injector", "processing-unit", nil, 3) -- Hide empty tech (Lab 2 will have been moved to it's own tech sct-lab-lab2 - seablock.lib.hide_technology("advanced-research") + seablock.lib.hide_technology("bob-advanced-research") -- Yellow science now requires Purple science -- Adjust any techs that needed Yellow but not Purple - bobmods.lib.tech.replace_science_pack("fusion-reactor-equipment", "utility-science-pack", "production-science-pack") - bobmods.lib.tech.replace_prerequisite("fusion-reactor-equipment", "utility-science-pack", "production-science-pack") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment", "low-density-structure") + bobmods.lib.tech.replace_science_pack("fission-reactor-equipment", "utility-science-pack", "production-science-pack") + bobmods.lib.tech.replace_prerequisite("fission-reactor-equipment", "utility-science-pack", "production-science-pack") + bobmods.lib.tech.add_prerequisite("fission-reactor-equipment", "low-density-structure") if mods["bobequipment"] then - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-3", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "utility-science-pack") end if mods["bobvehicleequipment"] then bobmods.lib.tech.replace_science_pack( - "vehicle-fusion-reactor-equipment-2", + "bob-vehicle-fission-reactor-equipment-2", "utility-science-pack", "production-science-pack" ) bobmods.lib.tech.replace_prerequisite( - "vehicle-fusion-reactor-equipment-2", + "bob-vehicle-fission-reactor-equipment-2", "utility-science-pack", "production-science-pack" ) - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-3", "utility-science-pack") end -- Move intermediates from Advanced Material Processing to Purple Science From 5cb7e0e6ea43ad7b086f1b5f9c5885eb4e22b657 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:24:05 +0200 Subject: [PATCH 011/117] data-updates - renamed bob stuff --- SeaBlock/data-updates/algae.lua | 37 +++------- .../data-updates/building-prerequisites.lua | 58 +++++++-------- SeaBlock/data-updates/catalyst-recipes.lua | 4 +- SeaBlock/data-updates/coal.lua | 14 ++-- SeaBlock/data-updates/concrete.lua | 72 +++++++++---------- SeaBlock/data-updates/fuel.lua | 17 ++--- SeaBlock/data-updates/furnaces.lua | 12 ++-- 7 files changed, 99 insertions(+), 115 deletions(-) diff --git a/SeaBlock/data-updates/algae.lua b/SeaBlock/data-updates/algae.lua index d4b843c8..6a8a0ada 100644 --- a/SeaBlock/data-updates/algae.lua +++ b/SeaBlock/data-updates/algae.lua @@ -12,7 +12,7 @@ data.raw.technology["bio-processing-green"].localised_name = { "technology-name. -- Move Lithia Salt to Thermal Water Extraction seablock.lib.moveeffect("algae-brown-burning", "bio-processing-green", "thermal-water-extraction", 2) -bobmods.lib.tech.add_prerequisite("lithium-processing", "thermal-water-extraction") +bobmods.lib.tech.add_prerequisite("bob-lithium-processing", "thermal-water-extraction") -- Change lithium crafting category bobmods.lib.recipe.set_category("lithium", "petrochem-electrolyser") @@ -58,36 +58,19 @@ data.raw.recipe["wood-pellets"].energy_required = 3 -- Reduce cost of Algae farm 2 -local buildingmulti = angelsmods.marathon.buildingmulti -local buildingtime = angelsmods.marathon.buildingtime - angelsmods.functions.RB.build({ { type = "recipe", name = "algae-farm-2", - normal = { - energy_required = 5, - enabled = false, - ingredients = { - { type = "item", name = "algaefarm-2", amount = 1 }, - { type = "item", name = "t0-plate", amount = 11 }, - { type = "item", name = "t0-circuit", amount = 4 }, - { type = "item", name = "t0-brick", amount = 11 }, - { type = "item", name = "t0-pipe", amount = 18 }, - }, - result = "algae-farm-2", - }, - expensive = { - energy_required = 5 * buildingtime, - enabled = false, - ingredients = { - { type = "item", name = "algaefarm-2", amount = 1 }, - { type = "item", name = "t0-plate", amount = 11 * buildingmulti }, - { type = "item", name = "t0-circuit", amount = 4 * buildingmulti }, - { type = "item", name = "t0-brick", amount = 11 * buildingmulti }, - { type = "item", name = "t0-pipe", amount = 18 * buildingmulti }, - }, - result = "algae-farm-2", + energy_required = 5, + enabled = false, + ingredients = { + { type = "item", name = "algaefarm-2", amount = 1 }, + { type = "item", name = "t0-plate", amount = 11 }, + { type = "item", name = "t0-circuit", amount = 4 }, + { type = "item", name = "t0-brick", amount = 11 }, + { type = "item", name = "t0-pipe", amount = 18 }, }, + results = {{type = "item", name = "algae-farm-2", amount = 1}} }, }) diff --git a/SeaBlock/data-updates/building-prerequisites.lua b/SeaBlock/data-updates/building-prerequisites.lua index 8f81650c..16e7fa7c 100644 --- a/SeaBlock/data-updates/building-prerequisites.lua +++ b/SeaBlock/data-updates/building-prerequisites.lua @@ -1,13 +1,13 @@ -- Bronze prerequisites -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "alloy-processing") -bobmods.lib.tech.add_prerequisite("angels-cooling", "alloy-processing") -bobmods.lib.tech.add_prerequisite("bio-nutrient-paste", "alloy-processing") -bobmods.lib.tech.add_prerequisite("ore-floatation", "alloy-processing") -bobmods.lib.tech.add_prerequisite("ore-processing-1", "alloy-processing") -bobmods.lib.tech.add_prerequisite("powder-metallurgy-2", "alloy-processing") -bobmods.lib.tech.add_prerequisite("strand-casting-1", "alloy-processing") -bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "alloy-processing") -bobmods.lib.tech.add_prerequisite("water-washing-2", "alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-cooling", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("bio-nutrient-paste", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("ore-floatation", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("ore-processing-1", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("powder-metallurgy-2", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("strand-casting-1", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("water-washing-2", "bob-alloy-processing") -- Clay Brick prerequisites bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "angels-stone-smelting-1") @@ -17,16 +17,16 @@ bobmods.lib.tech.add_prerequisite("fluid-handling", "angels-stone-smelting-1") bobmods.lib.tech.add_prerequisite("gardens", "angels-stone-smelting-1") -- Brass prerequisites -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "zinc-processing") -bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "zinc-processing") -bobmods.lib.tech.add_prerequisite("automation-3", "zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-desert-farm", "zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-refugium-puffer-1", "zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "zinc-processing") -bobmods.lib.tech.add_prerequisite("electronics-machine-2", "zinc-processing") -bobmods.lib.tech.add_prerequisite("slag-processing-2", "zinc-processing") -bobmods.lib.tech.add_prerequisite("water-treatment-3", "zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("automation-3", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("bio-desert-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("bio-refugium-puffer-1", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("slag-processing-2", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("water-treatment-3", "bob-zinc-processing") -- Concrete Brick prerequisites bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "angels-stone-smelting-2") @@ -39,12 +39,12 @@ bobmods.lib.tech.add_prerequisite("slag-processing-2", "angels-stone-smelting-2" bobmods.lib.tech.add_prerequisite("water-treatment-3", "angels-stone-smelting-2") -- Titanium prerequisites -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "titanium-processing") -bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "titanium-processing") -bobmods.lib.tech.add_prerequisite("automation-4", "titanium-processing") -bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "titanium-processing") -bobmods.lib.tech.add_prerequisite("slag-processing-3", "titanium-processing") -bobmods.lib.tech.add_prerequisite("water-treatment-4", "titanium-processing") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("automation-4", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("slag-processing-3", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("water-treatment-4", "bob-titanium-processing") -- Reinforced concrete brick bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "angels-stone-smelting-3") @@ -54,13 +54,13 @@ bobmods.lib.tech.add_prerequisite("slag-processing-3", "angels-stone-smelting-3" bobmods.lib.tech.add_prerequisite("water-treatment-4", "angels-stone-smelting-3") -- Copper tungsten / tungsten carbide prerequisites -bobmods.lib.tech.add_prerequisite("ore-processing-5", "tungsten-alloy-processing") +bobmods.lib.tech.add_prerequisite("ore-processing-5", "bob-tungsten-alloy-processing") -- Nitinol prerequisites -bobmods.lib.tech.add_prerequisite("ore-processing-5", "nitinol-processing") +bobmods.lib.tech.add_prerequisite("ore-processing-5", "bob-nitinol-processing") -- Advanced circuit -bobmods.lib.tech.add_prerequisite("tank", "advanced-electronics") +bobmods.lib.tech.add_prerequisite("tank", "advanced-circuit") -- Processing unit -bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "advanced-electronics-2") +bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "processing-unit") diff --git a/SeaBlock/data-updates/catalyst-recipes.lua b/SeaBlock/data-updates/catalyst-recipes.lua index 931ec396..97d039ed 100644 --- a/SeaBlock/data-updates/catalyst-recipes.lua +++ b/SeaBlock/data-updates/catalyst-recipes.lua @@ -10,8 +10,8 @@ bobmods.lib.recipe.set_ingredients("catalyst-metal-green", { }) bobmods.lib.recipe.set_ingredients("catalyst-metal-blue", { { type = "item", name = "catalyst-metal-carrier", amount = 10 }, - { type = "item", name = "bauxite-ore", amount = 1 }, - { type = "item", name = "silver-ore", amount = 1 }, + { type = "item", name = "bob-bauxite-ore", amount = 1 }, + { type = "item", name = "bob-silver-ore", amount = 1 }, }) bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "catalyst-metal-purple") diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua index 3b320823..ebddc46c 100644 --- a/SeaBlock/data-updates/coal.lua +++ b/SeaBlock/data-updates/coal.lua @@ -1,13 +1,13 @@ -- Coal removal seablock.lib.substingredient("grenade", "coal", "wood-charcoal") seablock.lib.substingredient("explosives", "coal", "wood-charcoal") -seablock.lib.substingredient("solid-fuel-from-hydrogen", "coal", "wood-charcoal") +seablock.lib.substingredient("bob-solid-fuel-from-hydrogen", "coal", "wood-charcoal") if mods["bobenemies"] then - seablock.lib.substingredient("alien-poison", "coal", "wood-charcoal") - seablock.lib.substingredient("alien-explosive", "coal", "wood-charcoal") + seablock.lib.substingredient("bob-alien-poison", "coal", "wood-charcoal") + seablock.lib.substingredient("bob-alien-explosive", "coal", "wood-charcoal") end seablock.lib.substingredient("filter-coal", "coal", "wood-charcoal") -seablock.lib.substingredient("carbon", "coal", "wood-charcoal") +seablock.lib.substingredient("bob-carbon", "coal", "wood-charcoal") if mods["Transport_Drones"] then seablock.lib.substingredient("road", "coal", "wood-charcoal") end @@ -23,9 +23,9 @@ angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-c angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-coke]", "recipe") -- Clear fuel value so these don't appear in Helmod's fuel picker -data.raw.item["carbon"].fuel_emissions_multiplier = nil -data.raw.item["carbon"].fuel_value = nil -data.raw.item["carbon"].fuel_category = nil +data.raw.item["bob-carbon"].fuel_emissions_multiplier = nil +data.raw.item["bob-carbon"].fuel_value = nil +data.raw.item["bob-carbon"].fuel_category = nil data.raw.item["coal"].fuel_emissions_multiplier = nil data.raw.item["coal"].fuel_value = nil data.raw.item["coal"].fuel_category = nil diff --git a/SeaBlock/data-updates/concrete.lua b/SeaBlock/data-updates/concrete.lua index 7a8ae6fa..e4436d8d 100644 --- a/SeaBlock/data-updates/concrete.lua +++ b/SeaBlock/data-updates/concrete.lua @@ -1,9 +1,9 @@ -- Swap out concrete for bricks -if data.raw.recipe["burner-reactor-2"] then - seablock.lib.substingredient("burner-reactor-2", "concrete", "concrete-brick", nil) - bobmods.lib.tech.remove_prerequisite("burner-reactor-2", "concrete") - bobmods.lib.tech.add_prerequisite("burner-reactor-2", "angels-stone-smelting-2") +if data.raw.recipe["bob-burner-reactor-2"] then + seablock.lib.substingredient("bob-burner-reactor-2", "concrete", "concrete-brick", nil) + bobmods.lib.tech.remove_prerequisite("bob-burner-reactor-2", "concrete") + bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "angels-stone-smelting-2") end seablock.lib.substingredient("centrifuge", "concrete", "concrete-brick", nil) if data.raw.recipe["fluid-reactor-2"] then @@ -33,43 +33,43 @@ if item and item.place_as_tile then item.place_as_tile["result"] = "tile-reinforced-concrete-brick" end -item = data.raw.tile["concrete"] -if item then - item.minable["result"] = "concrete-brick" - item.placeable_by = { item = "concrete-brick", count = 1 } - item.walking_speed_modifier = 1.4 +local tile = data.raw.tile["concrete"] +if tile then + tile.minable["result"] = "concrete-brick" + tile.placeable_by = { item = "concrete-brick", count = 1 } + tile.walking_speed_modifier = 1.4 end -item = data.raw.tile["refined-concrete"] -if item then - item.minable["result"] = "reinforced-concrete-brick" - item.placeable_by = { item = "reinforced-concrete-brick", count = 1 } - item.walking_speed_modifier = 1.55 +tile = data.raw.tile["refined-concrete"] +if tile then + tile.minable["result"] = "reinforced-concrete-brick" + tile.placeable_by = { item = "reinforced-concrete-brick", count = 1 } + tile.walking_speed_modifier = 1.55 end -item = data.raw.tile["tile-concrete-brick"] -if item then - item.minable["result"] = "concrete" - item.placeable_by = { item = "concrete", count = 1 } - item.walking_speed_modifier = 1.4 +tile = data.raw.tile["tile-concrete-brick"] +if tile then + tile.minable["result"] = "concrete" + tile.placeable_by = { item = "concrete", count = 1 } + tile.walking_speed_modifier = 1.4 end -item = data.raw.tile["tile-reinforced-concrete-brick"] -if item then - item.minable["result"] = "refined-concrete" - item.placeable_by = { item = "refined-concrete", count = 1 } - item.walking_speed_modifier = 1.55 +tile = data.raw.tile["tile-reinforced-concrete-brick"] +if tile then + tile.minable["result"] = "refined-concrete" + tile.placeable_by = { item = "refined-concrete", count = 1 } + tile.walking_speed_modifier = 1.55 end -item = data.raw.tile["hazard-concrete-left"] -if item then - item.walking_speed_modifier = 1.4 +tile = data.raw.tile["hazard-concrete-left"] +if tile then + tile.walking_speed_modifier = 1.4 end -item = data.raw.tile["hazard-concrete-right"] -if item then - item.walking_speed_modifier = 1.4 +tile = data.raw.tile["hazard-concrete-right"] +if tile then + tile.walking_speed_modifier = 1.4 end -item = data.raw.tile["refined-hazard-concrete-left"] -if item then - item.walking_speed_modifier = 1.55 +tile = data.raw.tile["refined-hazard-concrete-left"] +if tile then + tile.walking_speed_modifier = 1.55 end -item = data.raw.tile["refined-hazard-concrete-right"] -if item then - item.walking_speed_modifier = 1.55 +tile = data.raw.tile["refined-hazard-concrete-right"] +if tile then + tile.walking_speed_modifier = 1.55 end diff --git a/SeaBlock/data-updates/fuel.lua b/SeaBlock/data-updates/fuel.lua index 11f7ff9c..d363936c 100644 --- a/SeaBlock/data-updates/fuel.lua +++ b/SeaBlock/data-updates/fuel.lua @@ -4,8 +4,8 @@ data.raw.item["wood-charcoal"].fuel_value = "4MJ" data.raw.item["pellet-coke"].fuel_value = "24MJ" -- Make hydrazine solid fuel match fuel_value -if data.raw.fluid["hydrazine"] then - local hydrazinevalue = data.raw.fluid["hydrazine"].fuel_value +if data.raw.fluid["gas-hydrazine"] then + local hydrazinevalue = data.raw.fluid["gas-hydrazine"].fuel_value data.raw.fluid["gas-hydrazine"].fuel_value = hydrazinevalue if hydrazinevalue:sub(-2) == "kJ" then local hydrazinevaluekj = tonumber(hydrazinevalue:sub(1, -3)) @@ -18,8 +18,8 @@ data.raw.fluid["liquid-fuel-oil"].fuel_value = "1MJ" data.raw.fluid["liquid-naphtha"].fuel_value = "0.5MJ" data.raw.fluid["gas-methane"].fuel_value = "0.5MJ" data.raw.fluid["crude-oil"].fuel_value = "0.5MJ" -data.raw.item["enriched-fuel"].fuel_value = "50MJ" -data.raw.item["enriched-fuel"].stack_size = 50 +data.raw.item["bob-enriched-fuel"].fuel_value = "50MJ" +data.raw.item["bob-enriched-fuel"].stack_size = 50 data.raw.item["solid-carbon"].fuel_value = "2.5MJ" seablock.lib.substingredient("solid-fuel-methane", "gas-methane", nil, 40) @@ -27,7 +27,7 @@ seablock.lib.substingredient("solid-fuel-naphtha", "liquid-naphtha", nil, 40) seablock.lib.substingredient("solid-fuel-fuel-oil", "liquid-fuel-oil", nil, 20) for _, v in pairs({ - "hydrogen", + "bob-hydrogen", "gas-hydrogen", "gas-ethane", "gas-butane", @@ -39,9 +39,10 @@ for _, v in pairs({ "heavy-oil", "light-oil", "petroleum-gas", - "sour-gas", - "deuterium", - "hydrazine", + "bob-sour-gas", + "bob-deuterium", + "gas-deuterium", -- TODO: not sure which one it's supposed to be + "gas-hydrazine", "alien-fire", "glycerol", "diesel-fuel", diff --git a/SeaBlock/data-updates/furnaces.lua b/SeaBlock/data-updates/furnaces.lua index 1b31c986..e8a168e8 100644 --- a/SeaBlock/data-updates/furnaces.lua +++ b/SeaBlock/data-updates/furnaces.lua @@ -1,16 +1,16 @@ -- Fix up furnace tech icons if not mods["reskins-bobs"] then for _, v in pairs({ - "fluid-mixing-furnace", - "steel-mixing-furnace", + "bob-fluid-mixing-furnace", + "bob-steel-mixing-furnace", }) do seablock.lib.copy_icon(data.raw.technology[v], data.raw.technology["advanced-material-processing"]) end for _, v in pairs({ - "electric-mixing-furnace", - "multi-purpose-furnace-1", - "multi-purpose-furnace-2", + "bob-electric-mixing-furnace", + "bob-multi-purpose-furnace-1", + "bob-multi-purpose-furnace-2", "advanced-material-processing-3", "advanced-material-processing-4", }) do @@ -18,4 +18,4 @@ if not mods["reskins-bobs"] then end end -bobmods.lib.tech.remove_prerequisite("steel-mixing-furnace", "angels-steel-smelting-1") +bobmods.lib.tech.remove_prerequisite("bob-steel-mixing-furnace", "angels-steel-smelting-1") From 5a0e33afc831b78257d5c16b637b160f4efb1679 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:25:59 +0200 Subject: [PATCH 012/117] data-updates - military.lua - renamed bob-stuff --- SeaBlock/data-updates/military.lua | 667 +++++++++++++++-------------- 1 file changed, 346 insertions(+), 321 deletions(-) diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index d8da8a44..66231ff1 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -4,8 +4,8 @@ local mil_items = { { type = "ammo-turret", name = "bob-gun-turret-4" }, { type = "ammo-turret", name = "bob-gun-turret-5" }, { type = "ammo-turret", name = "bob-sniper-turret-3" }, - { type = "armor", name = "heavy-armor-2" }, - { type = "armor", name = "heavy-armor-3" }, + --{ type = "armor", name = "modular-armor" }, + --{ type = "armor", name = "heavy-armor-3" }, { type = "artillery-turret", name = "bob-artillery-turret-3" }, { type = "artillery-wagon", name = "bob-artillery-wagon-3" }, { type = "car", name = "bob-tank-2" }, @@ -26,16 +26,16 @@ local mil_items = { { type = "fluid-wagon", name = "bob-armoured-fluid-wagon-2" }, { type = "fluid-wagon", name = "bob-armoured-fluid-wagon" }, { type = "fluid", name = "alien-acid" }, - { type = "fluid", name = "alien-explosive" }, - { type = "fluid", name = "alien-fire" }, - { type = "fluid", name = "alien-poison" }, + { type = "fluid", name = "bob-alien-explosive" }, + { type = "fluid", name = "bob-alien-fire" }, + { type = "fluid", name = "bob-alien-poison" }, { type = "fluid", name = "liquid-glycerol" }, { type = "fluid", name = "liquid-toluene" }, - { type = "fluid", name = "nitroglycerin" }, + { type = "fluid", name = "bob-nitroglycerin" }, { type = "gun", name = "combat-shotgun" }, { type = "gun", name = "flamethrower" }, - { type = "gun", name = "laser-rifle" }, - { type = "gun", name = "rifle" }, + { type = "gun", name = "bob-laser-rifle" }, + { type = "gun", name = "bob-rifle" }, { type = "gun", name = "shotgun" }, { type = "item-with-entity-data", name = "bob-armoured-cargo-wagon-2" }, { type = "item-with-entity-data", name = "bob-armoured-cargo-wagon" }, @@ -46,17 +46,17 @@ local mil_items = { { type = "item-with-entity-data", name = "bob-artillery-wagon-3" }, { type = "item-with-entity-data", name = "bob-tank-2" }, { type = "item-with-entity-data", name = "bob-tank-3" }, - { type = "item", name = "acid-bullet-projectile" }, - { type = "item", name = "acid-bullet" }, - { type = "item", name = "acid-rocket-warhead" }, - { type = "item", name = "alien-acid-barrel" }, - { type = "item", name = "alien-blue-alloy" }, - { type = "item", name = "alien-explosive-barrel" }, - { type = "item", name = "alien-fire-barrel" }, - { type = "item", name = "alien-orange-alloy" }, - { type = "item", name = "alien-poison-barrel" }, - { type = "item", name = "ap-bullet-projectile" }, - { type = "item", name = "ap-bullet" }, + { type = "item", name = "bob-acid-bullet-projectile" }, + { type = "item", name = "bob-acid-bullet" }, + { type = "item", name = "bob-acid-rocket-warhead" }, + { type = "item", name = "bob-alien-acid-barrel" }, + { type = "item", name = "bob-alien-blue-alloy" }, + { type = "item", name = "bob-alien-explosive-barrel" }, + { type = "item", name = "bob-alien-fire-barrel" }, + { type = "item", name = "bob-alien-orange-alloy" }, + { type = "item", name = "bob-alien-poison-barrel" }, + { type = "item", name = "bob-ap-bullet-projectile" }, + { type = "item", name = "bob-ap-bullet" }, { type = "item", name = "bob-artillery-turret-3" }, { type = "item", name = "bob-gun-turret-3" }, { type = "item", name = "bob-gun-turret-4" }, @@ -73,65 +73,65 @@ local mil_items = { { type = "item", name = "bob-robot-laser-drone" }, { type = "item", name = "bob-robot-plasma-drone" }, { type = "item", name = "bob-sniper-turret-3" }, - { type = "item", name = "bullet-casing" }, - { type = "item", name = "bullet-projectile" }, - { type = "item", name = "bullet" }, + { type = "item", name = "bob-bullet-casing" }, + { type = "item", name = "bob-bullet-projectile" }, + { type = "item", name = "bob-bullet" }, { type = "item", name = "combat-robot-dispenser-equipment" }, - { type = "item", name = "cordite" }, + { type = "item", name = "bob-cordite" }, { type = "item", name = "discharge-defense-equipment" }, - { type = "item", name = "distractor-mine" }, - { type = "item", name = "electric-bullet-projectile" }, - { type = "item", name = "electric-bullet" }, - { type = "item", name = "electric-rocket-warhead" }, + { type = "item", name = "bob-distractor-mine" }, + { type = "item", name = "bob-electric-bullet-projectile" }, + { type = "item", name = "bob-electric-bullet" }, + { type = "item", name = "bob-electric-rocket-warhead" }, { type = "item", name = "explosive-rocket-warhead" }, - { type = "item", name = "flame-bullet-projectile" }, - { type = "item", name = "flame-bullet" }, + { type = "item", name = "bob-flame-bullet-projectile" }, + { type = "item", name = "bob-flame-bullet" }, { type = "item", name = "flame-rocket-warhead" }, { type = "item", name = "flamethrower-turret" }, - { type = "item", name = "gun-cotton" }, - { type = "item", name = "gunmetal-alloy" }, - { type = "item", name = "he-bullet-projectile" }, - { type = "item", name = "he-bullet" }, - { type = "item", name = "lab-alien" }, + { type = "item", name = "bob-gun-cotton" }, + { type = "item", name = "bob-gunmetal-alloy" }, + { type = "item", name = "bob-he-bullet-projectile" }, + { type = "item", name = "bob-he-bullet" }, + { type = "item", name = "bob-lab-alien" }, { type = "item", name = "land-mine" }, - { type = "item", name = "laser-rifle-battery-case" }, + { type = "item", name = "bob-laser-rifle-battery-case" }, { type = "item", name = "liquid-glycerol-barrel" }, { type = "item", name = "liquid-toluene-barrel" }, - { type = "item", name = "magazine" }, - { type = "item", name = "nitroglycerin-barrel" }, - { type = "item", name = "petroleum-jelly" }, - { type = "item", name = "piercing-rocket-warhead" }, - { type = "item", name = "plasma-bullet-projectile" }, - { type = "item", name = "plasma-bullet" }, - { type = "item", name = "plasma-rocket-warhead" }, - { type = "item", name = "poison-bullet-projectile" }, - { type = "item", name = "poison-bullet" }, - { type = "item", name = "poison-mine" }, - { type = "item", name = "poison-rocket-warhead" }, - { type = "item", name = "robot-drone-frame-large" }, - { type = "item", name = "robot-drone-frame" }, - { type = "item", name = "rocket-body" }, - { type = "item", name = "rocket-warhead" }, - { type = "item", name = "shot" }, - { type = "item", name = "shotgun-shell-casing" }, - { type = "item", name = "slowdown-mine" }, - { type = "item", name = "uranium-bullet-projectile" }, - { type = "item", name = "uranium-bullet" }, - { type = "lab", name = "lab-alien" }, - { type = "land-mine", name = "distractor-mine" }, - { type = "land-mine", name = "land-mine" }, - { type = "land-mine", name = "poison-mine" }, - { type = "land-mine", name = "slowdown-mine" }, + { type = "item", name = "bob-magazine" }, + { type = "item", name = "bob-nitroglycerin-barrel" }, + { type = "item", name = "bob-petroleum-jelly" }, + { type = "item", name = "bob-piercing-rocket-warhead" }, + { type = "item", name = "bob-plasma-bullet-projectile" }, + { type = "item", name = "bob-plasma-bullet" }, + { type = "item", name = "bob-plasma-rocket-warhead" }, + { type = "item", name = "bob-poison-bullet-projectile" }, + { type = "item", name = "bob-poison-bullet" }, + { type = "item", name = "bob-poison-mine" }, + { type = "item", name = "bob-poison-rocket-warhead" }, + { type = "item", name = "bob-robot-drone-frame-large" }, + { type = "item", name = "bob-robot-drone-frame" }, + { type = "item", name = "bob-rocket-body" }, + { type = "item", name = "bob-rocket-warhead" }, + { type = "item", name = "bob-shot" }, + { type = "item", name = "bob-shotgun-shell-casing" }, + { type = "item", name = "bob-slowdown-mine" }, + { type = "item", name = "bob-uranium-bullet-projectile" }, + { type = "item", name = "bob-uranium-bullet" }, + { type = "lab", name = "bob-lab-alien" }, + { type = "land-mine", name = "bob-distractor-mine" }, + { type = "land-mine", name = "bob-land-mine" }, + { type = "land-mine", name = "bob-poison-mine" }, + { type = "land-mine", name = "bob-slowdown-mine" }, { type = "locomotive", name = "bob-armoured-locomotive-2" }, { type = "locomotive", name = "bob-armoured-locomotive" }, - { type = "tool", name = "alien-science-pack-blue" }, - { type = "tool", name = "alien-science-pack-green" }, - { type = "tool", name = "alien-science-pack-orange" }, - { type = "tool", name = "alien-science-pack-purple" }, - { type = "tool", name = "alien-science-pack-red" }, - { type = "tool", name = "alien-science-pack-yellow" }, - { type = "tool", name = "alien-science-pack" }, - { type = "tool", name = "science-pack-gold" }, + { type = "tool", name = "bob-alien-science-pack-blue" }, + { type = "tool", name = "bob-alien-science-pack-green" }, + { type = "tool", name = "bob-alien-science-pack-orange" }, + { type = "tool", name = "bob-alien-science-pack-purple" }, + { type = "tool", name = "bob-alien-science-pack-red" }, + { type = "tool", name = "bob-alien-science-pack-yellow" }, + { type = "tool", name = "bob-alien-science-pack" }, + { type = "tool", name = "bob-science-pack-gold" }, { type = "unit", name = "bob-robot-flamethrower-drone" }, { type = "unit", name = "bob-robot-gun-drone" }, { type = "unit", name = "bob-robot-laser-drone" }, @@ -139,13 +139,13 @@ local mil_items = { } local mil_tech = { - "alien-blue-research", - "alien-green-research", - "alien-orange-research", - "alien-purple-research", - "alien-red-research", - "alien-research", - "alien-yellow-research", + "bob-alien-blue-research", + "bob-alien-green-research", + "bob-alien-orange-research", + "bob-alien-purple-research", + "bob-alien-red-research", + "bob-alien-research", + "bob-alien-yellow-research", "angels-explosives-1", "angels-explosives-2", "bob-acid-bullets", @@ -209,12 +209,12 @@ local mil_tech = { "bob-turrets-3", "bob-turrets-4", "bob-turrets-5", - "cordite-processing", + "bob-cordite-processing", "defender", "destroyer", "discharge-defense-equipment", "distractor", - "distractor-mine", + "bob-distractor-mine", "energy-weapons-damage-7", -- Infinite "explosive-rocketry", "flamethrower", @@ -227,9 +227,9 @@ local mil_tech = { "follower-robot-count-7", -- Infinite "land-mine", "laser-shooting-speed-7", - "nitroglycerin-processing", + "bob-nitroglycerin-processing", "physical-projectile-damage-7", -- Infinite - "poison-mine", + "bob-poison-mine", "refined-flammables-1", "refined-flammables-2", "refined-flammables-3", @@ -240,15 +240,15 @@ local mil_tech = { "sct-alien-science-pack", "sct-lab-alien", "sct-science-pack-gold", - "slowdown-mine", + "bob-slowdown-mine", "stronger-explosives-7", -- Infinite "uranium-ammo", } local mil_ammo = { - { type = "ammo", name = "acid-bullet-magazine" }, - { type = "ammo", name = "ap-bullet-magazine" }, - { type = "ammo", name = "better-shotgun-shell" }, + { type = "ammo", name = "bob-acid-bullet-magazine" }, + { type = "ammo", name = "bob-ap-bullet-magazine" }, + { type = "ammo", name = "bob-better-shotgun-shell" }, { type = "ammo", name = "bob-acid-rocket" }, { type = "ammo", name = "bob-electric-rocket" }, { type = "ammo", name = "bob-explosive-rocket" }, @@ -257,73 +257,73 @@ local mil_ammo = { { type = "ammo", name = "bob-plasma-rocket" }, { type = "ammo", name = "bob-poison-rocket" }, { type = "ammo", name = "bob-rocket" }, - { type = "ammo", name = "bullet-magazine" }, - { type = "ammo", name = "distractor-artillery-shell" }, - { type = "ammo", name = "electric-bullet-magazine" }, + { type = "ammo", name = "bob-bullet-magazine" }, + { type = "ammo", name = "bob-distractor-artillery-shell" }, + { type = "ammo", name = "bob-electric-bullet-magazine" }, { type = "ammo", name = "explosive-artillery-shell" }, { type = "ammo", name = "explosive-rocket" }, - { type = "ammo", name = "explosive-uranium-cannon-shell" }, - { type = "ammo", name = "fire-artillery-shell" }, - { type = "ammo", name = "flame-bullet-magazine" }, + { type = "ammo", name = "bob-explosive-uranium-cannon-shell" }, + { type = "ammo", name = "bob-fire-artillery-shell" }, + { type = "ammo", name = "bob-flame-bullet-magazine" }, { type = "ammo", name = "flamethrower-ammo" }, - { type = "ammo", name = "he-bullet-magazine" }, - { type = "ammo", name = "laser-rifle-battery-amethyst" }, - { type = "ammo", name = "laser-rifle-battery-diamond" }, - { type = "ammo", name = "laser-rifle-battery-emerald" }, - { type = "ammo", name = "laser-rifle-battery-ruby" }, - { type = "ammo", name = "laser-rifle-battery-sapphire" }, - { type = "ammo", name = "laser-rifle-battery-topaz" }, - { type = "ammo", name = "laser-rifle-battery" }, + { type = "ammo", name = "bob-he-bullet-magazine" }, + { type = "ammo", name = "bob-laser-rifle-battery-amethyst" }, + { type = "ammo", name = "bob-laser-rifle-battery-diamond" }, + { type = "ammo", name = "bob-laser-rifle-battery-emerald" }, + { type = "ammo", name = "bob-laser-rifle-battery-ruby" }, + { type = "ammo", name = "bob-laser-rifle-battery-sapphire" }, + { type = "ammo", name = "bob-laser-rifle-battery-topaz" }, + { type = "ammo", name = "bob-laser-rifle-battery" }, { type = "ammo", name = "piercing-shotgun-shell" }, - { type = "ammo", name = "plasma-bullet-magazine" }, - { type = "ammo", name = "poison-artillery-shell" }, - { type = "ammo", name = "poison-bullet-magazine" }, - { type = "ammo", name = "scatter-cannon-shell" }, - { type = "ammo", name = "shotgun-acid-shell" }, - { type = "ammo", name = "shotgun-ap-shell" }, - { type = "ammo", name = "shotgun-electric-shell" }, - { type = "ammo", name = "shotgun-explosive-shell" }, - { type = "ammo", name = "shotgun-flame-shell" }, - { type = "ammo", name = "shotgun-plasma-shell" }, - { type = "ammo", name = "shotgun-poison-shell" }, + { type = "ammo", name = "bob-plasma-bullet-magazine" }, + { type = "ammo", name = "bob-poison-artillery-shell" }, + { type = "ammo", name = "bob-poison-bullet-magazine" }, + { type = "ammo", name = "bob-scatter-cannon-shell" }, + { type = "ammo", name = "bob-shotgun-acid-shell" }, + { type = "ammo", name = "bob-shotgun-ap-shell" }, + { type = "ammo", name = "bob-shotgun-electric-shell" }, + { type = "ammo", name = "bob-shotgun-explosive-shell" }, + { type = "ammo", name = "bob-shotgun-flame-shell" }, + { type = "ammo", name = "bob-shotgun-plasma-shell" }, + { type = "ammo", name = "bob-shotgun-poison-shell" }, { type = "ammo", name = "shotgun-shell" }, - { type = "ammo", name = "shotgun-uranium-shell" }, - { type = "ammo", name = "uranium-cannon-shell" }, + { type = "ammo", name = "bob-shotgun-uranium-shell" }, + { type = "ammo", name = "bob-uranium-cannon-shell" }, { type = "ammo", name = "uranium-rounds-magazine" }, { type = "capsule", name = "cluster-grenade" }, { type = "capsule", name = "defender-capsule" }, { type = "capsule", name = "destroyer-capsule" }, { type = "capsule", name = "discharge-defense-remote" }, { type = "capsule", name = "distractor-capsule" }, - { type = "capsule", name = "fire-capsule" }, + { type = "capsule", name = "bob-fire-capsule" }, { type = "capsule", name = "poison-capsule" }, { type = "capsule", name = "slowdown-capsule" }, } local mil_recipes = { - "acid-bullet", - "acid-bullet-magazine", - "acid-bullet-projectile", - "acid-rocket-warhead", - "alien-acid", - "alien-blue-alloy", - "alien-explosive", - "alien-fire", - "alien-orange-alloy", - "alien-poison", - "alien-science-pack", - "alien-science-pack-blue", - "alien-science-pack-green", - "alien-science-pack-orange", - "alien-science-pack-purple", - "alien-science-pack-red", - "alien-science-pack-yellow", + "bob-acid-bullet", + "bob-acid-bullet-magazine", + "bob-acid-bullet-projectile", + "bob-acid-rocket-warhead", + "bob-alien-acid", + "bob-alien-blue-alloy", + "bob-alien-explosive", + "bob-alien-fire", + "bob-alien-orange-alloy", + "bob-alien-poison", + "bob-alien-science-pack", + "bob-alien-science-pack-blue", + "bob-alien-science-pack-green", + "bob-alien-science-pack-orange", + "bob-alien-science-pack-purple", + "bob-alien-science-pack-red", + "bob-alien-science-pack-yellow", "angels-chemical-void-liquid-glycerol", "angels-chemical-void-liquid-toluene", - "ap-bullet", - "ap-bullet-magazine", - "ap-bullet-projectile", - "better-shotgun-shell", + "bob-ap-bullet", + "bob-ap-bullet-magazine", + "bob-ap-bullet-projectile", + "bob-better-shotgun-shell", "bob-acid-rocket", "bob-armoured-cargo-wagon", "bob-armoured-cargo-wagon-2", @@ -347,7 +347,6 @@ local mil_recipes = { "bob-plasma-rocket", "bob-plasma-turret-3", "bob-plasma-turret-4", - "bob-plasma-turret-5", "bob-poison-rocket", "bob-robot-flamethrower-drone", "bob-robot-gun-drone", @@ -357,115 +356,114 @@ local mil_recipes = { "bob-sniper-turret-3", "bob-tank-2", "bob-tank-3", - "bullet", - "bullet-casing", - "bullet-magazine", - "bullet-projectile", + "bob-bullet", + "bob-bullet-casing", + "bob-bullet-magazine", + "bob-bullet-projectile", "cluster-grenade", "combat-shotgun", - "cordite", + "bob-cordite", "defender-capsule", "destroyer-capsule", "discharge-defense-equipment", - "discharge-defense-remote", - "distractor-artillery-shell", + "bob-distractor-artillery-shell", "distractor-capsule", - "distractor-mine", - "electric-bullet", - "electric-bullet-magazine", - "electric-bullet-projectile", + "bob-distractor-mine", + "bob-electric-bullet", + "bob-electric-bullet-magazine", + "bob-electric-bullet-projectile", "electric-energy-interface", - "electric-rocket-warhead", - "empty-alien-acid-barrel", - "empty-alien-explosive-barrel", - "empty-alien-fire-barrel", - "empty-alien-poison-barrel", + "bob-electric-rocket-warhead", + "empty-bob-alien-acid-barrel", + "empty-bob-alien-explosive-barrel", + "empty-bob-alien-fire-barrel", + "empty-bob-alien-poison-barrel", "empty-liquid-glycerol-barrel", "empty-liquid-toluene-barrel", - "empty-nitroglycerin-barrel", - "explosive-artillery-shell", + "empty-bob-nitroglycerin-barrel", + "bob-explosive-artillery-shell", "explosive-rocket", - "explosive-rocket-warhead", + "bob-explosive-rocket-warhead", "explosive-uranium-cannon-shell", - "fill-alien-acid-barrel", - "fill-alien-explosive-barrel", - "fill-alien-fire-barrel", - "fill-alien-poison-barrel", - "fill-liquid-glycerol-barrel", - "fill-liquid-toluene-barrel", - "fill-nitroglycerin-barrel", - "fire-artillery-shell", - "fire-capsule", - "flame-bullet", - "flame-bullet-magazine", - "flame-bullet-projectile", - "flame-rocket-warhead", + "bob-alien-acid-barrel", + "bob-alien-explosive-barrel", + "bob-alien-fire-barrel", + "bob-alien-poison-barrel", + "liquid-glycerol-barrel", + "liquid-toluene-barrel", + "bob-nitroglycerin-barrel", + "bob-fire-artillery-shell", + "bob-fire-capsule", + "bob-flame-bullet", + "bob-flame-bullet-magazine", + "bob-flame-bullet-projectile", + "bob-flame-rocket-warhead", "flamethrower", "flamethrower-ammo", "flamethrower-turret", "gas-fractioning-residual", - "gun-cotton", - "gunmetal-alloy", - "he-bullet", - "he-bullet-magazine", - "he-bullet-projectile", - "heavy-armor-2", - "heavy-armor-3", - "lab-alien", + "bob-gun-cotton", + "bob-gunmetal-alloy", + "bob-he-bullet", + "bob-he-bullet-magazine", + "bob-he-bullet-projectile", + --"modular-armor", + --"heavy-armor-3", + "bob-lab-alien", "land-mine", - "laser-rifle", - "laser-rifle-battery", - "laser-rifle-battery-amethyst", - "laser-rifle-battery-case", - "laser-rifle-battery-diamond", - "laser-rifle-battery-emerald", - "laser-rifle-battery-ruby", - "laser-rifle-battery-sapphire", - "laser-rifle-battery-topaz", + "bob-laser-rifle", + "bob-laser-rifle-battery", + "bob-laser-rifle-battery-amethyst", + "bob-laser-rifle-battery-case", + "bob-laser-rifle-battery-diamond", + "bob-laser-rifle-battery-emerald", + "bob-laser-rifle-battery-ruby", + "bob-laser-rifle-battery-sapphire", + "bob-laser-rifle-battery-topaz", "liquid-glycerol", "liquid-toluene-from-benzene", "liquid-toluene-from-naphtha", - "magazine", - "nitroglycerin", - "petroleum-jelly", - "piercing-rocket-warhead", + "bob-magazine", + "bob-nitroglycerin", + "bob-petroleum-jelly", + "bob-piercing-rocket-warhead", "piercing-shotgun-shell", - "plasma-bullet", - "plasma-bullet-magazine", - "plasma-bullet-projectile", - "plasma-rocket-warhead", - "poison-artillery-shell", - "poison-bullet", - "poison-bullet-magazine", - "poison-bullet-projectile", + "bob-plasma-bullet", + "bob-plasma-bullet-magazine", + "bob-plasma-bullet-projectile", + "bob-plasma-rocket-warhead", + "bob-poison-artillery-shell", + "bob-poison-bullet", + "bob-poison-bullet-magazine", + "bob-poison-bullet-projectile", "poison-capsule", - "poison-mine", - "poison-rocket-warhead", - "rifle", - "robot-drone-frame", - "robot-drone-frame-large", - "rocket-body", - "rocket-warhead", - "scatter-cannon-shell", - "science-pack-gold", - "shot", + "bob-poison-mine", + "bob-poison-rocket-warhead", + "bob-rifle", + "bob-robot-drone-frame", + "bob-robot-drone-frame-large", + "bob-rocket-body", + "bob-rocket-warhead", + "bob-scatter-cannon-shell", + "bob-science-pack-gold", + "bob-shot", "shotgun", - "shotgun-acid-shell", - "shotgun-ap-shell", - "shotgun-electric-shell", - "shotgun-explosive-shell", - "shotgun-flame-shell", - "shotgun-plasma-shell", - "shotgun-poison-shell", + "bob-shotgun-acid-shell", + "bob-shotgun-ap-shell", + "bob-shotgun-electric-shell", + "bob-shotgun-explosive-shell", + "bob-shotgun-flame-shell", + "bob-shotgun-plasma-shell", + "bob-shotgun-poison-shell", "shotgun-shell", - "shotgun-shell-casing", - "shotgun-uranium-shell", + "bob-shotgun-shell-casing", + "bob-shotgun-uranium-shell", "slowdown-capsule", - "slowdown-mine", + "bob-slowdown-mine", "solid-nitroglycerin", "solid-trinitrotoluene", - "uranium-bullet", - "uranium-bullet-projectile", + "bob-uranium-bullet", + "bob-uranium-bullet-projectile", "uranium-cannon-shell", "uranium-rounds-magazine", } @@ -483,9 +481,32 @@ for _, v in pairs(mil_ammo) do end end +-- except = { +-- ["follower-robot-count-1"] = true, +-- ["follower-robot-count-2"] = true, +-- ["follower-robot-count-3"] = true, +-- ["follower-robot-count-4"] = true, +-- ["follower-robot-count-5"] = true, +-- ["follower-robot-count-6"] = true, +-- ["follower-robot-count-7"] = true, +-- ["energy-weapons-damage-7"] = true, +-- ["physical-projectile-damage-7"] = true, +-- ["refined-flammables-1"] = true, +-- ["refined-flammables-2"] = true, +-- ["refined-flammables-3"] = true, +-- ["refined-flammables-4"] = true, +-- ["refined-flammables-5"] = true, +-- ["refined-flammables-6"] = true, +-- ["refined-flammables-7"] = true, +-- ["stronger-explosives-7"] = true, +-- ["laser-shooting-speed-7"] = true, +-- } for _, v in pairs(mil_tech) do if data.raw.technology[v] then seablock.lib.hide_technology(v) + -- if not except[v] then + -- data.raw.technology[v].unit.ingredients = {} --remove + -- end end end @@ -493,40 +514,49 @@ for _, v in pairs(mil_recipes) do bobmods.lib.recipe.hide(v) end +-- Remove hidden upgrade +data.raw["ammo-turret"]["bob-gun-turret-2"].next_upgrade = nil +data.raw["ammo-turret"]["bob-sniper-turret-2"].next_upgrade = nil +data.raw["electric-turret"]["laser-turret"].next_upgrade = nil +data.raw["electric-turret"]["bob-plasma-turret-2"].next_upgrade = nil +data.raw["artillery-turret"]["bob-artillery-turret-2"].next_upgrade = nil +data.raw["artillery-wagon"]["bob-artillery-wagon-2"].next_upgrade = nil + + bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-residual") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-glycerol-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-toluene-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-nitroglycerin-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-glycerol-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-toluene-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-nitroglycerin-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-acid-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-explosive-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-fire-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-poison-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-acid-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-explosive-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-fire-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-poison-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-glycerol-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-toluene-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-nitroglycerin-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-glycerol-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-toluene-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob--nitroglycerin-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-acid-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-explosive-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-fire-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-poison-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-acid-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-explosive-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-fire-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-poison-barrel") bobmods.lib.tech.remove_recipe_unlock("military", "shotgun") bobmods.lib.tech.remove_recipe_unlock("military", "shotgun-shell") bobmods.lib.tech.remove_recipe_unlock("military-3", "combat-shotgun") -bobmods.lib.tech.remove_recipe_unlock("military-3", "fire-capsule") +bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-fire-capsule") bobmods.lib.tech.remove_recipe_unlock("military-3", "poison-capsule") -bobmods.lib.tech.remove_recipe_unlock("military-3", "rifle") +bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-rifle") bobmods.lib.tech.remove_recipe_unlock("military-3", "slowdown-capsule") -bobmods.lib.tech.remove_recipe_unlock("military-3", "sniper-rifle") -- Unlocked by it's own earlier tech +bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-sniper-rifle") -- Unlocked by it's own earlier tech bobmods.lib.tech.remove_recipe_unlock("military-4", "cluster-grenade") bobmods.lib.tech.remove_recipe_unlock("military-4", "piercing-shotgun-shell") -bobmods.lib.tech.remove_recipe_unlock("robotics", "robot-drone-frame") -bobmods.lib.tech.remove_recipe_unlock("robotics", "robot-drone-frame-large") +bobmods.lib.tech.remove_recipe_unlock("robotics", "bob-robot-drone-frame") +bobmods.lib.tech.remove_recipe_unlock("robotics", "bob-robot-drone-frame-large") bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "explosive-uranium-cannon-shell") -bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "shotgun-uranium-shell") -bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-bullet") -bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-bullet-projectile") +bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-shotgun-uranium-shell") +bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-uranium-bullet") +bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-uranium-bullet-projectile") bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-cannon-shell") bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-rounds-magazine") -bobmods.lib.tech.remove_recipe_unlock("zinc-processing", "gunmetal-alloy") +bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-gunmetal-alloy") seablock.lib.substresult("nutrients-refining-2", "liquid-glycerol", "water", nil) if data.raw.recipe["nutrients-refining-2"] then @@ -542,10 +572,10 @@ for i = 1, 6 do seablock.lib.remove_effect("physical-projectile-damage-" .. i, "turret-attack", "turret_id", "bob-gun-turret-5") seablock.lib.remove_effect("physical-projectile-damage-" .. i, "turret-attack", "turret_id", "bob-sniper-turret-3") seablock.lib.remove_effect("physical-projectile-damage-" .. i, "ammo-damage", "ammo_category", "shotgun-shell") - seablock.lib.remove_effect("energy-weapons-damage-" .. i, "ammo-damage", "ammo_category", "laser-rifle") - seablock.lib.remove_effect("energy-weapons-damage-" .. i, "ammo-damage", "ammo_category", "beam") + seablock.lib.remove_effect("laser-weapons-damage-" .. i, "ammo-damage", "ammo_category", "bob-laser-rifle") + seablock.lib.remove_effect("laser-weapons-damage-" .. i, "ammo-damage", "ammo_category", "beam") seablock.lib.remove_effect("weapon-shooting-speed-" .. i, "gun-speed", "ammo_category", "shotgun-shell") - seablock.lib.remove_effect("laser-shooting-speed-" .. i, "gun-speed", "ammo_category", "laser-rifle") + seablock.lib.remove_effect("laser-shooting-speed-" .. i, "gun-speed", "ammo_category", "bob-laser-rifle") seablock.lib.remove_effect("stronger-explosives-" .. i, "ammo-damage", "ammo_category", "landmine") end @@ -569,7 +599,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 250 Red, Green, Blue, Purple, Pink, Yellow @@ -580,7 +610,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -593,7 +623,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow @@ -605,7 +635,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -618,7 +648,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, @@ -631,7 +661,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, - { mods["bobtech"] and "advanced-logistic-science-pack" or "production-science-pack", 1 }, + { mods["bobtech"] and "bob-advanced-logistic-science-pack" or "production-science-pack", 1 }, }, }, -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow @@ -643,7 +673,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -656,46 +686,46 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, }, -- 250 Red, Green, Military, Blue, Purple, Pink { - tech_name = "fusion-reactor-equipment-2", + tech_name = "bob-fission-reactor-equipment-2", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 300 Red, Green, Military, Blue, Purple, Pink, Yellow { - tech_name = "fusion-reactor-equipment-3", + tech_name = "bob-fission-reactor-equipment-3", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, -- 350 Red, Green, Military, Blue, Purple, Pink, Yellow, White { - tech_name = "fusion-reactor-equipment-4", + tech_name = "bob-fission-reactor-equipment-4", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, @@ -718,7 +748,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 250 Red, Green, Blue, Purple, Pink, Yellow @@ -729,7 +759,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -742,7 +772,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow @@ -754,7 +784,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -767,7 +797,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, @@ -791,7 +821,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, @@ -803,7 +833,7 @@ local mil_techswap = { { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, @@ -839,7 +869,7 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, }, }, -- 400 Red, Green, Military, Blue, Purple, Pink, Yellow @@ -851,13 +881,13 @@ local mil_techswap = { { "military-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, -- 350 Red, Green, Blue, Purple, Yellow { - tech_name = "vehicle-fusion-reactor-equipment-4", + tech_name = "bob-vehicle-fission-reactor-equipment-4", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, @@ -868,25 +898,25 @@ local mil_techswap = { }, -- 400 Red, Green, Blue, Purple, Pink, Yellow { - tech_name = "vehicle-fusion-reactor-equipment-5", + tech_name = "bob-vehicle-fission-reactor-equipment-5", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, }, }, -- 450 Red, Green, Blue, Purple, Pink, Yellow, White { - tech_name = "vehicle-fusion-reactor-equipment-6", + tech_name = "bob-vehicle-fission-reactor-equipment-6", science_packs = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 }, { "production-science-pack", 1 }, - { "advanced-logistic-science-pack", 1 }, + { "bob-advanced-logistic-science-pack", 1 }, { "utility-science-pack", 1 }, { "space-science-pack", 1 }, }, @@ -949,16 +979,16 @@ if mods["bobwarfare"] then bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "military-3") bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "angels-cobalt-steel-smelting-1") seablock.lib.substingredient("bob-plasma-turret-1", "electronic-circuit", "advanced-circuit", 40) - seablock.lib.substingredient("bob-plasma-turret-1", "steel-plate", "cobalt-steel-alloy", nil) + seablock.lib.substingredient("bob-plasma-turret-1", "steel-plate", "bob-cobalt-steel-alloy", nil) bobmods.lib.tech.add_new_science_pack("bob-plasma-turrets-2", "chemical-science-pack", 1) bobmods.lib.tech.add_new_science_pack("bob-plasma-turrets-2", "production-science-pack", 1) bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "military-4") - bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "battery-2") + bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-battery-2") bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "angels-titanium-smelting-1") - seablock.lib.substingredient("bob-plasma-turret-2", "battery", "lithium-ion-battery", nil) + seablock.lib.substingredient("bob-plasma-turret-2", "battery", "bob-lithium-ion-battery", nil) seablock.lib.substingredient("bob-plasma-turret-2", "advanced-circuit", "processing-unit", 40) - seablock.lib.substingredient("bob-plasma-turret-2", "steel-plate", "titanium-plate", nil) + seablock.lib.substingredient("bob-plasma-turret-2", "steel-plate", "bob-titanium-plate", nil) -- Make Military 4 take Purple science rather than Yellow science bobmods.lib.tech.remove_science_pack("military-4", "utility-science-pack") @@ -966,7 +996,7 @@ if mods["bobwarfare"] then bobmods.lib.tech.replace_prerequisite("military-4", "utility-science-pack", "production-science-pack") -- Walking Vehicle (Antron) can now depend on Military 4 - bobmods.lib.tech.replace_prerequisite("walking-vehicle", "military-3", "military-4") + bobmods.lib.tech.replace_prerequisite("bob-walking-vehicle", "military-3", "military-4") -- Move Artillery later bobmods.lib.tech.remove_science_pack("bob-artillery-turret-2", "utility-science-pack", 1) @@ -974,26 +1004,21 @@ if mods["bobwarfare"] then bobmods.lib.tech.add_new_science_pack("bob-artillery-turret-2", "production-science-pack", 1) bobmods.lib.tech.add_new_science_pack("bob-artillery-wagon-2", "production-science-pack", 1) bobmods.lib.tech.add_prerequisite("artillery", "military-3") - bobmods.lib.tech.add_prerequisite("artillery", "cobalt-processing") + bobmods.lib.tech.add_prerequisite("artillery", "bob-cobalt-processing") bobmods.lib.tech.add_prerequisite("artillery", "angels-stone-smelting-2") - seablock.lib.substingredient("artillery-turret", "iron-gear-wheel", "cobalt-steel-gear-wheel", nil) + seablock.lib.substingredient("artillery-turret", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil) seablock.lib.substingredient("artillery-turret", "concrete", "concrete-brick", nil) - seablock.lib.substingredient("artillery-turret", "steel-plate", "cobalt-steel-alloy", nil) - seablock.lib.substingredient("artillery-wagon", "iron-gear-wheel", "cobalt-steel-gear-wheel", nil) - seablock.lib.substingredient("artillery-wagon", "pipe", "brass-pipe", nil) - seablock.lib.substingredient("artillery-wagon", "steel-plate", "cobalt-steel-alloy", nil) - - bobmods.lib.tech.add_prerequisite("artillery", "radars-3") - seablock.lib.substingredient("artillery-targeting-remote", "radar", "radar-3") + seablock.lib.substingredient("artillery-turret", "steel-plate", "bob-cobalt-steel-alloy", nil) + seablock.lib.substingredient("artillery-wagon", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil) + seablock.lib.substingredient("artillery-wagon", "pipe", "bob-brass-pipe", nil) + seablock.lib.substingredient("artillery-wagon", "steel-plate", "bob-cobalt-steel-alloy", nil) - bobmods.lib.tech.add_prerequisite("spidertron", "radars-5") - seablock.lib.substingredient("spidertron-remote", "radar", "radar-5") + bobmods.lib.tech.add_prerequisite("artillery", "bob-radar-3") - -- Remove prerequisite as gunmetal smelting tech won't exist as we have disabled the trigger - bobmods.lib.tech.remove_prerequisite("bob-armor-making-3", "angels-gunmetal-smelting-1") + bobmods.lib.tech.add_prerequisite("spidertron", "bob-radar-5") -- Remove dependencies on Alien Research - bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "alien-research") + --bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "alien-research") -- Adjust Power Armor bobmods.lib.tech.remove_science_pack("power-armor", "chemical-science-pack") @@ -1001,18 +1026,18 @@ if mods["bobwarfare"] then bobmods.lib.tech.add_prerequisite("power-armor", "military-science-pack") bobmods.lib.tech.set_science_pack_count("power-armor", 150) bobmods.lib.recipe.replace_ingredient("power-armor", "processing-unit", "advanced-circuit") - bobmods.lib.tech.remove_prerequisite("power-armor", "advanced-electronics-2") + bobmods.lib.tech.remove_prerequisite("power-armor", "processing-unit") bobmods.lib.tech.remove_science_pack("power-armor-mk2", "utility-science-pack") bobmods.lib.tech.remove_prerequisite("power-armor-mk2", "utility-science-pack") bobmods.lib.tech.add_prerequisite("power-armor-mk2", "low-density-structure") - bobmods.lib.tech.add_prerequisite("power-armor-mk2", "advanced-electronics-2") + bobmods.lib.tech.add_prerequisite("power-armor-mk2", "processing-unit") bobmods.lib.tech.set_science_pack_count("power-armor-mk2", 200) bobmods.lib.tech.replace_prerequisite("power-armor-mk2", "military-4", "military-3") if mods["bobtech"] then bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "production-science-pack") - bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "bob-advanced-logistic-science-pack") else bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "military-4") end @@ -1022,51 +1047,51 @@ end if mods["bobequipment"] then -- Batteries bobmods.lib.tech.remove_prerequisite("battery-mk2-equipment", "power-armor") - bobmods.lib.tech.add_prerequisite("battery-mk2-equipment", "advanced-electronics-2") + bobmods.lib.tech.add_prerequisite("battery-mk2-equipment", "processing-unit") if mods["bobtech"] then - bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "bob-advanced-logistic-science-pack") end -- Personal Laser Defense - bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-5", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-6", "space-science-pack") + bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-5", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-6", "space-science-pack") -- Energy Shield - bobmods.lib.tech.add_prerequisite("energy-shield-mk2-equipment", "advanced-electronics-2") + bobmods.lib.tech.add_prerequisite("energy-shield-mk2-equipment", "processing-unit") -- Remove dependencies on Alien Research - bobmods.lib.tech.remove_prerequisite("bob-energy-shield-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("bob-battery-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("fusion-reactor-equipment-2", "alien-research") - bobmods.lib.tech.remove_prerequisite("personal-laser-defense-equipment-6", "alien-research") + bobmods.lib.tech.remove_prerequisite("bob-energy-shield-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-battery-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-2", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-research") end if mods["bobvehicleequipment"] then -- Remove dependencies on Alien Research - bobmods.lib.tech.remove_prerequisite("vehicle-battery-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("vehicle-big-turret-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("vehicle-energy-shield-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("vehicle-fusion-cell-equipment-4", "alien-research") - bobmods.lib.tech.remove_prerequisite("vehicle-fusion-reactor-equipment-4", "alien-research") + bobmods.lib.tech.remove_prerequisite("bob-vehicle-battery-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-vehicle-big-turret-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-vehicle-shield-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-alien-research") + bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-alien-research") - bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-4", "military-4") - bobmods.lib.tech.add_prerequisite("vehicle-laser-defense-equipment-5", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-4", "military-4") + bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-5", "utility-science-pack") if mods["bobtech"] then - bobmods.lib.tech.add_prerequisite("vehicle-battery-equipment-5", "advanced-logistic-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-5", "advanced-logistic-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "advanced-logistic-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-4", "advanced-logistic-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-4", "advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-5", "bob-advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-5", "bob-advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-4", "bob-advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-advanced-logistic-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-advanced-logistic-science-pack") end - bobmods.lib.tech.add_prerequisite("vehicle-battery-equipment-6", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-6", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-5", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-5", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-5", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-6", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-6", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-5", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-5", "utility-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-5", "utility-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-6", "space-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-6", "space-science-pack") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-6", "space-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-6", "space-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "space-science-pack") + bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "space-science-pack") end From ca7de07d5ada27503b9160576b86bd33a97a201a Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:28:29 +0200 Subject: [PATCH 013/117] data-updates - misc.lua - renamed bob-stuff --- SeaBlock/data-updates/misc.lua | 149 +++++++++++++++++---------------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index c9e77ab3..a6eb3931 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -10,7 +10,7 @@ bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gas-ext bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "angels-advanced-gas-processing") -- Remove steel's prerequiste on Chemical processing 1 -bobmods.lib.tech.remove_prerequisite("steel-processing", "chemical-processing-1") +bobmods.lib.tech.remove_prerequisite("steel-processing", "bob-chemical-processing-1") -- Move Water Treatment from Electronics to Slag Processing 1. Hydro Plant no longer requires Green Circuits -- Slag Processing 1 is first source of Sulfuric Waste Water @@ -22,10 +22,10 @@ bobmods.lib.tech.remove_prerequisite("water-washing-1", "water-treatment") bobmods.lib.tech.add_prerequisite("water-washing-1", "automation") seablock.lib.moveeffect("yellow-waste-water-purification", "water-treatment-2", "water-treatment") -bobmods.lib.tech.remove_prerequisite("electronics", "chemical-processing-1") +bobmods.lib.tech.remove_prerequisite("bob-electronics", "bob-chemical-processing-1") bobmods.lib.recipe.set_category("liquid-fish-atmosphere", "chemistry") -seablock.lib.hide_technology("pumpjack") +seablock.lib.hide_technology("oil-gathering") if not seablock.trigger.mining_productivity then for i = 1, 4, 1 do @@ -38,14 +38,16 @@ end -- Remove resources so mining recipes don't show in FNEI -- Have to leave at least one resource or game will not load -for k, v in pairs(data.raw["resource"]) do + +--TODO: handle this : ressource removal creates bugs +--[[for k, v in pairs(data.raw["resource"]) do -- Sea-pump-resource is a virtual resource. -- When the offshore pump is placed, it is supposed to be replaced by the resource and a mining-drill. -- Removing the resource causes placement of heavy pumps to crash new maps. if k ~= "sea-pump-resource" then data.raw["resource"][k] = nil end -end +end]] -- Add prerequisite for Tin and Lead if settings.startup["bobmods-logistics-beltoverhaul"].value then @@ -53,25 +55,25 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value then end -- Tidy prerequisite for Brass -bobmods.lib.tech.remove_prerequisite("zinc-processing", "electrolysis-1") -bobmods.lib.tech.replace_prerequisite("battery-3", "zinc-processing", "angels-zinc-smelting-1") +bobmods.lib.tech.remove_prerequisite("bob-zinc-processing", "bob-electrolysis-1") +bobmods.lib.tech.replace_prerequisite("bob-battery-3", "bob-zinc-processing", "angels-zinc-smelting-1") if mods["bobpower"] then - bobmods.lib.tech.replace_prerequisite("electric-pole-2", "zinc-processing", "angels-brass-smelting-1") - bobmods.lib.tech.replace_prerequisite("electric-substation-2", "zinc-processing", "angels-brass-smelting-1") + bobmods.lib.tech.replace_prerequisite("bob-electric-pole-2", "bob-zinc-processing", "angels-brass-smelting-1") + bobmods.lib.tech.replace_prerequisite("bob-electric-substation-2", "bob-zinc-processing", "angels-brass-smelting-1") end -- Move recipes that shouldn't be unlocked at startup if mods["bobenemies"] then - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-red-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-yellow-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-orange-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-blue-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-purple-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-green-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-red-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-yellow-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-orange-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-blue-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-purple-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-green-from-small") + seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact") end -bobmods.lib.tech.remove_prerequisite("tungsten-processing", "angels-nickel-smelting-1") +bobmods.lib.tech.remove_prerequisite("bob-tungsten-processing", "angels-nickel-smelting-1") bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-swamp-1", "solid-plastic") @@ -82,7 +84,7 @@ data.raw.recipe["angels-sulfur-scrubber"].energy_required = 6 -- Make Long Inserters a startup tech if data.raw.technology["logistics-0"] then - bobmods.lib.tech.replace_prerequisite("long-inserters-1", "logistics", "logistics-0") + bobmods.lib.tech.replace_prerequisite("bob-long-inserters-1", "logistics", "logistics-0") end -- Adjust for handcrafting boards @@ -105,7 +107,7 @@ if mods["angelsaddons-storage"] then end -- Logistic System prerequisite of Pink Science -if not data.raw.tool["advanced-logistic-science-pack"] then +if not data.raw.tool["bob-advanced-logistic-science-pack"] then bobmods.lib.tech.add_prerequisite("logistic-system", "utility-science-pack") end @@ -119,34 +121,34 @@ data.raw.recipe["solid-salt-dissolving"].energy_required = 5 for _, v in pairs({ "bio-processing-alien-3", - "gem-processing-1", - "gem-processing-2", - "gem-processing-3", + "bob-gem-processing-1", + "bob-gem-processing-2", + "bob-gem-processing-3", "geode-crystallization-1", - "polishing", + "bob-polishing", }) do if data.raw.technology[v] then bobmods.lib.tech.add_new_science_pack(v, "chemical-science-pack", 1) end end -bobmods.lib.tech.add_prerequisite("polishing", "chemical-science-pack") +bobmods.lib.tech.add_prerequisite("bob-polishing", "chemical-science-pack") bobmods.lib.tech.add_prerequisite("geode-crystallization-1", "chemical-science-pack") if mods["bobrevamp"] and not mods["bobclasses"] then - bobmods.lib.tech.add_new_science_pack("rtg", "production-science-pack", 1) - bobmods.lib.tech.add_new_science_pack("rtg", "utility-science-pack", 1) - bobmods.lib.tech.add_prerequisite("rtg", "utility-science-pack") - bobmods.lib.tech.remove_prerequisite("rtg", "angels-coal-processing-3") - bobmods.lib.tech.add_prerequisite("rtg", "sodium-processing-2") + bobmods.lib.tech.add_new_science_pack("bob-rtg", "production-science-pack", 1) + bobmods.lib.tech.add_new_science_pack("bob-rtg", "utility-science-pack", 1) + bobmods.lib.tech.add_prerequisite("bob-rtg", "utility-science-pack") + bobmods.lib.tech.remove_prerequisite("bob-rtg", "angels-coal-processing-3") + bobmods.lib.tech.add_prerequisite("bob-rtg", "sodium-processing-2") end -- Swap gold for platinum -seablock.lib.substingredient("processing-electronics", "angels-wire-platinum", nil, 20) +seablock.lib.substingredient("bob-processing-electronics", "angels-wire-platinum", nil, 20) if mods["bobmodules"] then - seablock.lib.substingredient("module-processor-board-3", "angels-wire-platinum", "angels-plate-platinum", nil) + seablock.lib.substingredient("bob-module-processor-board-3", "angels-wire-platinum", "angels-plate-platinum", nil) end -bobmods.lib.tech.add_prerequisite("advanced-electronics-3", "angels-platinum-smelting-1") +bobmods.lib.tech.add_prerequisite("bob-advanced-processing-unit", "angels-platinum-smelting-1") seablock.lib.substresult("angelsore-pure-mix2-processing", "platinum-ore", nil, 2) seablock.lib.substresult("angelsore9-crystal-processing", "platinum-ore", nil, 2) -- Swap stiratite for crotinnium so all pure ores are used @@ -154,7 +156,8 @@ seablock.lib.substingredient("angelsore-pure-mix2-processing", "angels-ore3-pure -- Unhide rocket part to make it easier to view recipes if data.raw.recipe["rocket-part"] then - angelsmods.functions.remove_flag("rocket-part", "hidden") + -- angelsmods.functions.remove_flag("rocket-part", "hidden") + -- angelsmods.functions.unhide("rocket-part") local r = data.raw.recipe["rocket-part"] if r.normal then @@ -172,33 +175,33 @@ if data.raw.recipe["rocket-part"] then end -- Buff bob's silicon and tungsten recipes -seablock.lib.substingredient("silicon-carbide", "silicon-powder", nil, 10) -seablock.lib.substingredient("silicon-carbide", "carbon", nil, 10) -data.raw.recipe["silicon-carbide"].result_count = 20 - -seablock.lib.substingredient("silicon-nitride", "silicon-powder", nil, 10) -seablock.lib.substingredient("silicon-nitride", "gas-nitrogen", nil, 130) -data.raw.recipe["silicon-nitride"].result_count = 10 - -seablock.lib.substingredient("tungsten-carbide", "tungsten-oxide", nil, 10) -seablock.lib.substingredient("tungsten-carbide", "carbon", nil, 10) -seablock.lib.substresult("tungsten-carbide", "tungsten-carbide", nil, 20) -bobmods.lib.recipe.set_energy_required("tungsten-carbide", 6) - -seablock.lib.substingredient("tungsten-carbide-2", "powdered-tungsten", nil, 10) -seablock.lib.substingredient("tungsten-carbide-2", "carbon", nil, 10) -seablock.lib.substresult("tungsten-carbide-2", "tungsten-carbide", nil, 20) -bobmods.lib.recipe.set_energy_required("tungsten-carbide-2", 6) - -seablock.lib.substingredient("copper-tungsten-alloy", "powdered-tungsten", nil, 15) -seablock.lib.substingredient("copper-tungsten-alloy", "copper-plate", "powder-copper", 10) -seablock.lib.substresult("copper-tungsten-alloy", "copper-tungsten-alloy", nil, 25) -bobmods.lib.recipe.set_energy_required("copper-tungsten-alloy", 8) -bobmods.lib.tech.add_prerequisite("tungsten-alloy-processing", "angels-copper-smelting-2") +seablock.lib.substingredient("bob-silicon-carbide", "bob-silicon-powder", nil, 10) +seablock.lib.substingredient("bob-silicon-carbide", "bob-carbon", nil, 10) +data.raw.recipe["bob-silicon-carbide"].results[1].amount = 20 + +seablock.lib.substingredient("bob-silicon-nitride", "bob-silicon-powder", nil, 10) +seablock.lib.substingredient("bob-silicon-nitride", "gas-nitrogen", nil, 130) +data.raw.recipe["bob-silicon-nitride"].results[1].amount = 10 + +seablock.lib.substingredient("bob-tungsten-carbide", "bob-tungsten-oxide", nil, 10) +seablock.lib.substingredient("bob-tungsten-carbide", "bob-carbon", nil, 10) +seablock.lib.substresult("bob-tungsten-carbide", "bob-tungsten-carbide", nil, 20) +bobmods.lib.recipe.set_energy_required("bob-tungsten-carbide", 6) + +seablock.lib.substingredient("bob-tungsten-carbide-2", "bob-powdered-tungsten", nil, 10) +seablock.lib.substingredient("bob-tungsten-carbide-2", "bob-carbon", nil, 10) +seablock.lib.substresult("bob-tungsten-carbide-2", "bob-tungsten-carbide", nil, 20) +bobmods.lib.recipe.set_energy_required("bob-tungsten-carbide-2", 6) + +seablock.lib.substingredient("bob-copper-tungsten-alloy", "bob-powdered-tungsten", nil, 15) +seablock.lib.substingredient("bob-copper-tungsten-alloy", "copper-plate", "powder-copper", 10) +seablock.lib.substresult("bob-copper-tungsten-alloy", "bob-copper-tungsten-alloy", nil, 25) +bobmods.lib.recipe.set_energy_required("bob-copper-tungsten-alloy", 8) +bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "angels-copper-smelting-2") -- Other prerequisites -if data.raw.technology["electronics-machine-1"] then - bobmods.lib.tech.add_prerequisite("electronics-machine-1", "electronics") +if data.raw.technology["bob-electronics-machine-1"] then + bobmods.lib.tech.add_prerequisite("bob-electronics-machine-1", "bob-electronics") end bobmods.lib.tech.add_prerequisite("bio-pressing-1", "bio-nutrient-paste") @@ -212,35 +215,35 @@ bobmods.lib.tech.add_prerequisite("water-treatment-2", "fluid-handling") bobmods.lib.tech.add_prerequisite("water-washing-2", "fluid-handling") -- Nerf early game glass. Just need a little bit for arboretums -seablock.lib.substingredient("quartz-glass", "quartz", nil, 10) -seablock.lib.substresult("quartz-glass", "glass", nil, 1) +seablock.lib.substingredient("bob-glass", "bob-quartz", nil, 10) +seablock.lib.substresult("bob-glass", "bob-glass", nil, 1) -- Biologically active tile has been hidden so no need for the prerequisites bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-glass-smelting-1") bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-stone-smelting-2") -- Rebalance glass mixture recipes -bobmods.lib.recipe.remove_ingredient("glass-mixture-1", "quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-1", { "silicon-powder", 1 }) +bobmods.lib.recipe.remove_ingredient("glass-mixture-1", "bob-quartz") +bobmods.lib.recipe.set_ingredient("glass-mixture-1", { type = "item", name = "bob-silicon-powder", amount = 1 }) -bobmods.lib.recipe.remove_ingredient("glass-mixture-2", "quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-2", { "silicon-powder", 2 }) -bobmods.lib.recipe.set_result("glass-mixture-2", { "solid-glass-mixture", 3 }) +bobmods.lib.recipe.remove_ingredient("glass-mixture-2", "bob-quartz") +bobmods.lib.recipe.set_ingredient("glass-mixture-2", { type = "item", name = "bob-silicon-powder", amount = 2 }) +bobmods.lib.recipe.set_result("glass-mixture-2", { type = "item", name = "solid-glass-mixture", amount = 3 }) bobmods.lib.recipe.set_energy_required("glass-mixture-2", 6) -bobmods.lib.recipe.remove_ingredient("glass-mixture-3", "quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-3", { "silicon-powder", 1 }) -bobmods.lib.recipe.set_ingredient("glass-mixture-3", { "solid-lime", 2 }) -bobmods.lib.recipe.set_result("glass-mixture-3", { "solid-glass-mixture", 4 }) +bobmods.lib.recipe.remove_ingredient("glass-mixture-3", "bob-quartz") +bobmods.lib.recipe.set_ingredient("glass-mixture-3", { type = "item", name = "bob-silicon-powder", amount = 1 }) +bobmods.lib.recipe.set_ingredient("glass-mixture-3", { type = "item", name = "solid-lime", amount = 2 }) +bobmods.lib.recipe.set_result("glass-mixture-3", { type = "item", name = "solid-glass-mixture", amount = 4 }) bobmods.lib.recipe.set_energy_required("glass-mixture-3", 8) bobmods.lib.recipe.set_energy_required("glass-mixture-4", 8) -- Rebalance cement recipes -bobmods.lib.recipe.replace_ingredient("cement-mixture-1", "quartz", "silicon-powder") +bobmods.lib.recipe.replace_ingredient("cement-mixture-1", "bob-quartz", "bob-silicon-powder") bobmods.lib.recipe.remove_ingredient("cement-mixture-2", "iron-ore") -bobmods.lib.recipe.replace_ingredient("cement-mixture-2", "quartz", "silicon-powder") -bobmods.lib.recipe.set_ingredient("cement-mixture-2", { "solid-lime", 4 }) -bobmods.lib.recipe.set_result("cement-mixture-2", { "solid-cement", 4 }) +bobmods.lib.recipe.replace_ingredient("cement-mixture-2", "bob-quartz", "bob-silicon-powder") +bobmods.lib.recipe.set_ingredient("cement-mixture-2", { type = "item", name = "solid-lime", amount = 4 }) +bobmods.lib.recipe.set_result("cement-mixture-2", { type = "item", name = "solid-cement", amount = 4 }) bobmods.lib.recipe.set_energy_required("cement-mixture-2", 16) From c3458ddaa8da297ba55c8337dbbb5b1e7a2d9c34 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:32:25 +0200 Subject: [PATCH 014/117] data-updates - fixed fluid boxes --- SeaBlock/data-updates/sulfur.lua | 7 +++-- SeaBlock/data-updates/thermal-extractor.lua | 32 ++++++++++++--------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua index 315ff94c..250b96a2 100644 --- a/SeaBlock/data-updates/sulfur.lua +++ b/SeaBlock/data-updates/sulfur.lua @@ -1,9 +1,10 @@ -- Washing plant sulfur byproduct -local washing_fluid_box = { +local washing_fluid_box = { --TODO: check correctness of washing plant fluid box production_type = "output", pipe_covers = pipecoverspictures(), - base_level = 1, - pipe_connections = { { position = { -3, 0 }, type = "output" } }, + --base_level = 1, + volume = 100, --TODO: decide the correct value + pipe_connections = { { position = { -2, 0 }, flow_direction = "output", direction = defines.direction.west } }, } for _, v in pairs({ "", "-2", "-3", "-4" }) do local washingplant = data.raw["assembling-machine"]["washing-plant" .. v] diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index 376629f9..51a7fa31 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -55,20 +55,22 @@ data.raw["assembling-machine"]["thermal-extractor"] = extractor extractor.type = "assembling-machine" extractor.crafting_speed = 1 extractor.ingredient_count = 2 -extractor.fluid_boxes = { +extractor.fluid_boxes = { --TODO: check validity of fluid boxes { production_type = "input", base_area = 10, - base_level = -1, + --base_level = -1, + volume = 1000, pipe_covers = pipecoverspictures(), - pipe_connections = { { type = "input", position = { 5, 3 } } }, + pipe_connections = { { flow_direction = "input", position = { 3, 4.4 }, direction = defines.direction.north } }, }, { production_type = "output", base_area = 10, - base_level = 1, + --base_level = 1, + volume = 1000, pipe_covers = pipecoverspictures(), - pipe_connections = { { type = "output", position = { -5, -3 } } }, + pipe_connections = { { flow_direction = "output", position = { -3, 4.4 }, direction = defines.direction.south } }, }, } extractor.animation = { @@ -81,7 +83,7 @@ extractor.crafting_categories = { "thermal-extractor" } extractor.fixed_recipe = "thermal-extractor-water" bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction-2", "thermal-extractor-water") move_item("thermal-extractor", "water-treatment-building", "f[thermal-extractor]-b[extractor]", "item") -bobmods.lib.recipe.add_ingredient("thermal-extractor", { "thermal-bore", 1 }) +bobmods.lib.recipe.add_ingredient("thermal-extractor", { type = "item", name = "thermal-bore", amount = 1 }) local bore = data.raw["mining-drill"]["thermal-bore"] data.raw["mining-drill"]["thermal-bore"] = nil @@ -89,16 +91,18 @@ data.raw["assembling-machine"]["thermal-bore"] = bore bore.type = "assembling-machine" bore.crafting_speed = 1 bore.ingredient_count = 1 -bore.fluid_boxes = { +bore.fluid_boxes = { --TODO: check this { production_type = "output", base_area = 1, - base_level = 1, + --base_level = 1, + volume = 500, pipe_covers = pipecoverspictures(), pipe_connections = { { - type = "output", - positions = { { 1, -2 }, { 2, -1 }, { -1, 2 }, { -2, 1 } }, + flow_direction = "output", + positions = { { 1, -1.4 }, { 1.4, -1 }, { -1, 1.4 }, { -1.4, 1 } }, + direction = defines.direction.north, }, }, }, @@ -118,10 +122,10 @@ end local function makeborelayers(d) return { layers = { - makesheet(bore.base_picture.sheets[1], bore.animations.north.layers[1].frame_count, d), - makesheet(bore.base_picture.sheets[2], bore.animations.north.layers[1].frame_count, d), - bore.animations.north.layers[1], - bore.animations.north.layers[2], + makesheet(bore.graphics_set.animation.layers[1], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), + makesheet(bore.graphics_set.animation.layers[2], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), + bore.wet_mining_graphics_set.animation.north.layers[1], + bore.wet_mining_graphics_set.animation.north.layers[2], }, } end From 120290840036e8aea13ac53994375edaa5c707ea Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:34:03 +0200 Subject: [PATCH 015/117] data-updates - renamed bob stuff --- SeaBlock/data-updates/groups.lua | 9 +-- SeaBlock/data-updates/landfill.lua | 5 +- SeaBlock/data-updates/rubber.lua | 10 +-- SeaBlock/data-updates/slag-processing.lua | 39 ++++------- SeaBlock/data-updates/startup.lua | 55 +++++++++------ SeaBlock/data-updates/unobtainable-items.lua | 74 ++++++++++---------- SeaBlock/data-updates/wood.lua | 23 +++--- 7 files changed, 109 insertions(+), 106 deletions(-) diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua index 59671736..dd42106c 100644 --- a/SeaBlock/data-updates/groups.lua +++ b/SeaBlock/data-updates/groups.lua @@ -6,15 +6,15 @@ if not mods["angelsindustries"] then if v.group == "bob-resource-products" or v.group == "bob-fluid-products" - or v.group == "bob-intermediate-products" + -- or v.group == "bob-intermediate-products" --should not exist anymore then v.group = "intermediate-products" end end - move_item("battery", "bob-intermediates", "f-cba[battery]") + --move_item("battery", "intermediate-products", "f-cba[battery]") -- already correctly set in bob2.0 move_item("iron-gear-wheel", "bob-gears", "aa[iron-gear-wheel]") - move_item("thorium-processing", "bob-nuclear", "l[thorium-processing]", "recipe") + move_item("bob-thorium-processing", "bob-nuclear", "l[thorium-processing]", "recipe") end if mods["SpaceMod"] then @@ -31,6 +31,7 @@ if mods["SpaceMod"] then "ftl-drive", "fuel-cell", "fusion-reactor", + "fission-reactor", "habitation", "hull-component", "life-support", @@ -46,4 +47,4 @@ if mods["Explosive Excavation"] then move_item("blasting-charge", "petrochem-solids-2", "a[explosives]-g", "recipe") end -move_item("solid-fuel-from-hydrogen", "petrochem-fuel", "e[bob]-d", "recipe") +move_item("bob-solid-fuel-from-hydrogen", "petrochem-fuel", "e[bob]-d", "recipe") diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 16bc0559..c6b11dfa 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -8,7 +8,7 @@ end -- Set prefered type for basic landfill crafting if settings.startup["sb-default-landfill"] and data.raw.item[settings.startup["sb-default-landfill"].value] then - data.raw.recipe["landfill"].result = settings.startup["sb-default-landfill"].value + data.raw.recipe["landfill"].results[1].name = settings.startup["sb-default-landfill"].value end local function BuffLandfill(recipe) @@ -34,8 +34,9 @@ end data.raw.technology["landfill"].prerequisites = { "water-washing-1" } data.raw.technology["landfill"].unit = { count = 10, - ingredients = { { type = "item", name = "automation-science-pack", amount = 1 } }, + ingredients = { { "automation-science-pack", 1 } }, time = 15, } + bobmods.lib.tech.remove_prerequisite("water-washing-2", "landfill") bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) diff --git a/SeaBlock/data-updates/rubber.lua b/SeaBlock/data-updates/rubber.lua index cf3d5ffe..79dc193c 100644 --- a/SeaBlock/data-updates/rubber.lua +++ b/SeaBlock/data-updates/rubber.lua @@ -1,13 +1,13 @@ bobmods.lib.recipe.hide("bob-rubber") -bobmods.lib.tech.remove_recipe_unlock("circuit-network", "insulated-cable") -bobmods.lib.tech.add_recipe_unlock("rubbers", "insulated-cable") +bobmods.lib.tech.remove_recipe_unlock("circuit-network", "bob-insulated-cable") +bobmods.lib.tech.add_recipe_unlock("rubbers", "bob-insulated-cable") -- Circuit network wires should not require rubber -bobmods.lib.recipe.set_ingredients("green-wire", { { "solid-paper", 2 }, { "tinned-copper-cable", 1 } }) -bobmods.lib.recipe.set_ingredients("red-wire", { { "solid-paper", 2 }, { "tinned-copper-cable", 1 } }) +--bobmods.lib.recipe.set_ingredients("green-wire", { { "solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) +--bobmods.lib.recipe.set_ingredients("red-wire", { { "solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) if mods["CircuitProcessing"] then - bobmods.lib.tech.add_prerequisite("effectivity-module", "rubbers") + bobmods.lib.tech.add_prerequisite("efficiency-module", "rubbers") bobmods.lib.tech.add_prerequisite("productivity-module", "rubbers") bobmods.lib.tech.add_prerequisite("speed-module", "rubbers") end diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index a0922be3..4f814197 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -9,24 +9,12 @@ for i = 1, 6 do recipe.localised_name = { "recipe-name.slag-processing", { "item-name.angels-ore" .. i } } recipe.order = "a-a [angels-ore-" .. i .. "]" - recipe.ingredients = nil - recipe.results = nil - recipe.energy_required = nil recipe.category = "crystallizing" - - recipe.normal = { - energy_required = 4, - ingredients = { { type = "fluid", name = "mineral-sludge", amount = 25 } }, - results = { { type = "item", name = "angels-ore" .. i, amount = 1 } }, - enabled = false, - } - - recipe.expensive = { - energy_required = 8, - ingredients = { { type = "fluid", name = "mineral-sludge", amount = 50 } }, - results = { { type = "item", name = "angels-ore" .. i, amount = 1 } }, - enabled = false, - } + recipe.energy_required = 4 + recipe.ingredients = { { type = "fluid", name = "mineral-sludge", amount = 25 } } + recipe.results = { { type = "item", name = "angels-ore" .. i, amount = 1 } } + recipe.enabled = false + end -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1, @@ -45,21 +33,22 @@ seablock.lib.moveeffect("slag-processing-4", "slag-processing-2", "ore-advanced- seablock.lib.moveeffect("angelsore2-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 3) seablock.lib.moveeffect("angelsore4-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 4) + seablock.lib.add_recipe_unlock("ore-crushing", "angelsore5-crushed", 3) seablock.lib.add_recipe_unlock("ore-crushing", "angelsore6-crushed", 4) seablock.lib.add_recipe_unlock("ore-crushing", "iron-plate") seablock.lib.add_recipe_unlock("ore-crushing", "copper-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "lead-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "tin-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "quartz-glass") +seablock.lib.add_recipe_unlock("ore-crushing", "bob-lead-plate") +seablock.lib.add_recipe_unlock("ore-crushing", "bob-tin-plate") +seablock.lib.add_recipe_unlock("ore-crushing", "bob-glass") seablock.lib.unhide_recipe("iron-plate") seablock.lib.unhide_recipe("copper-plate") -seablock.lib.unhide_recipe("lead-plate") -seablock.lib.unhide_recipe("tin-plate") +seablock.lib.unhide_recipe("bob-lead-plate") +seablock.lib.unhide_recipe("bob-tin-plate") -- Hide unwanted recipes -bobmods.lib.recipe.hide("silver-plate") +bobmods.lib.recipe.hide("bob-silver-plate") bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore2-crushed-processing") bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore4-crushed-processing") bobmods.lib.recipe.hide("angelsore2-crushed-processing") @@ -89,8 +78,8 @@ data.raw.technology["slag-processing-1"].unit = { } bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "ore-powderizer") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "advanced-electronics") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "advanced-electronics-3") +bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "advanced-circuit") +bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "bob-advanced-processing-unit") bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "angels-tungsten-smelting-1") -- Add an additional slag to the mixed sorting recipes diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index dfb8e71a..7ec15b9d 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -8,59 +8,59 @@ local knowningredients = { ["angels-electrolyser"] = { { "iron-plate", 10 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "iron-stick", 22 }, { "stone-brick", 10 }, }, ["liquifier"] = { { "iron-plate", 10 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "pipe-to-ground", 2 }, { "stone-brick", 10 }, }, ["offshore-pump"] = { - { "basic-circuit-board", 2 }, + { "bob-basic-circuit-board", 2 }, { "pipe", 1 }, { "iron-gear-wheel", 10 }, }, ["crystallizer"] = { { "iron-plate", 10 }, - { "basic-circuit-board", 5 }, - { "copper-pipe", 5 }, + { "bob-basic-circuit-board", 5 }, + { "bob-copper-pipe", 5 }, { "stone-brick", 10 }, }, ["algae-farm"] = { { "iron-plate", 10 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "iron-stick", 10 }, { "stone-brick", 25 }, }, ["angels-flare-stack"] = { { "iron-plate", 5 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "pipe", 10 }, { "stone-brick", 10 }, }, ["seafloor-pump"] = { { "iron-plate", 5 }, - { "basic-circuit-board", 2 }, + { "bob-basic-circuit-board", 2 }, { "pipe", 5 }, }, ["washing-plant"] = { { "iron-plate", 10 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "pipe", 10 }, { "stone-brick", 10 }, }, ["angels-chemical-plant"] = { { "iron-plate", 5 }, { "iron-gear-wheel", 5 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "pipe", 5 }, }, ["filtration-unit"] = { { "iron-plate", 5 }, - { "basic-circuit-board", 5 }, + { "bob-basic-circuit-board", 5 }, { "pipe", 10 }, { "stone-brick", 10 }, }, @@ -99,11 +99,13 @@ end if data.raw.technology["sct-automation-science-pack"] then bobmods.lib.tech.add_prerequisite("sct-automation-science-pack", "sct-lab-t1") - data.raw.technology["sct-automation-science-pack"].unit = { - count = 1, - ingredients = { { "sb-lab-tool", 1 } }, - time = 1, - } + -- data.raw.technology["sct-automation-science-pack"].unit = { + -- count = 1, + -- ingredients = { { "sb-lab-tool", 1 } }, + -- time = 1, + -- } + data.raw.technology["sct-automation-science-pack"].research_trigger = {type = "craft-item", item = "lab"} + data.raw.technology["sct-automation-science-pack"].unit = nil data.raw.technology["sct-lab-t1"].unit = { count = 1, ingredients = {}, @@ -133,7 +135,7 @@ local function ironrecipe(recipe) ["iron-stick"] = true, ["pipe"] = true, ["pipe-to-ground"] = true, - ["basic-circuit-board"] = true, + ["bob-basic-circuit-board"] = true, ["electronic-circuit"] = true, ["stone-brick"] = true, ["copper-plate"] = true, @@ -157,6 +159,7 @@ local function ironrecipe(recipe) return foundiron end + -- Disable recipes that shouldn't consume startup items for k, v in pairs(data.raw.recipe) do local r = v.normal or v @@ -205,12 +208,14 @@ end -- Limit research required for startup techs. for k, v in pairs(seablock.startup_techs) do if data.raw.technology[k] then - if v[1] and data.raw.technology[k].unit.count > 20 then - data.raw.technology[k].unit.count = 20 - data.raw.technology[k].unit.ingredients = { { "automation-science-pack", 1 } } + if data.raw.technology[k].unit then + if v[1] and data.raw.technology[k].unit.count > 20 then + data.raw.technology[k].unit.count = 20 + data.raw.technology[k].unit.ingredients = { { "automation-science-pack", 1 } } + end + bobmods.lib.tech.ignore_tech_cost_multiplier(k, true) + data.raw.technology[k].unit.time = 15 end - bobmods.lib.tech.ignore_tech_cost_multiplier(k, true) - data.raw.technology[k].unit.time = 15 end end @@ -221,3 +226,9 @@ data.raw.technology["bio-wood-processing"].unit = { ingredients = {}, time = 1, } + +-- Remove cycle introduced in the tech tree +-- Sectoid upgraded angelsbioprocessing by renaming the old prerequisite "basic-automation" into "electronics" +bobmods.lib.tech.remove_prerequisite("basic-chemistry", "electronics") +bobmods.lib.tech.remove_prerequisite("bio-processing-brown", "electronics") +bobmods.lib.tech.add_prerequisite("bio-processing-brown", "automation") \ No newline at end of file diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua index 62fd2a7f..9cc0985f 100644 --- a/SeaBlock/data-updates/unobtainable-items.lua +++ b/SeaBlock/data-updates/unobtainable-items.lua @@ -1,9 +1,9 @@ seablock.lib.hide("mining-drill", "burner-mining-drill") seablock.lib.hide("mining-drill", "electric-mining-drill") seablock.lib.hide("mining-drill", "pumpjack") -seablock.lib.hide("storage-tank", "bob-overflow-valve") -seablock.lib.hide("storage-tank", "bob-valve") -seablock.lib.hide("storage-tank", "bob-topup-valve") +seablock.lib.hide("storage-tank", "overflow-valve") +seablock.lib.hide("storage-tank", "valve") +seablock.lib.hide("storage-tank", "topup-valve") -- Hide Oil & Gas Separator -- Hide Advanced Gas Refinery @@ -46,8 +46,8 @@ bobmods.lib.recipe.hide("electro-whinning-cell") bobmods.lib.recipe.hide("electro-whinning-cell-2") bobmods.lib.recipe.hide("empty-gas-chlor-methane-barrel") bobmods.lib.recipe.hide("empty-liquid-multi-phase-oil-barrel") -bobmods.lib.recipe.hide("fill-gas-chlor-methane-barrel") -bobmods.lib.recipe.hide("fill-liquid-multi-phase-oil-barrel") +bobmods.lib.recipe.hide("gas-chlor-methane-barrel") +bobmods.lib.recipe.hide("liquid-multi-phase-oil-barrel") bobmods.lib.recipe.hide("gas-chlor-methane") bobmods.lib.recipe.hide("gas-fractioning-synthesis") bobmods.lib.recipe.hide("gas-refinery") @@ -70,10 +70,10 @@ bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fra bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-refinery") bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "gas-refinery-4") bobmods.lib.tech.remove_recipe_unlock("chlorine-processing-2", "gas-chlor-methane") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-multi-phase-oil-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-multi-phase-oil-barrel") -bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "empty-gas-chlor-methane-barrel") -bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "fill-gas-chlor-methane-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-multi-phase-oil-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-multi-phase-oil-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "empty-gas-chlor-methane-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "fill-gas-chlor-methane-barrel") bobmods.lib.tech.remove_recipe_unlock("ore-electro-whinning-cell", "electro-whinning-cell") bobmods.lib.recipe.replace_ingredient("paste-cellulose", "gas-chlor-methane", "gas-chlorine") @@ -90,41 +90,41 @@ bobmods.lib.tech.remove_recipe_unlock("angels-titanium-casting-3", "molten-titan bobmods.lib.tech.remove_prerequisite("angels-titanium-casting-3", "angels-chrome-smelting-1") -- Hide steam inserter -seablock.lib.hide("inserter", "steam-inserter") -bobmods.lib.recipe.hide("steam-inserter") -seablock.lib.hide_item("steam-inserter") -if data.raw.inserter["steam-inserter"] then - data.raw.inserter["steam-inserter"].next_upgrade = nil - bobmods.lib.recipe.replace_ingredient_in_all("steam-inserter", "burner-inserter") +seablock.lib.hide("inserter", "bob-steam-inserter") +bobmods.lib.recipe.hide("bob-steam-inserter") +seablock.lib.hide_item("bob-steam-inserter") +if data.raw.inserter["bob-steam-inserter"] then + data.raw.inserter["bob-steam-inserter"].next_upgrade = nil + bobmods.lib.recipe.replace_ingredient_in_all("bob-steam-inserter", "burner-inserter") end -bobmods.lib.tech.remove_recipe_unlock(seablock.final_scripted_tech, "steam-inserter") +bobmods.lib.tech.remove_recipe_unlock(seablock.final_scripted_tech, "bob-steam-inserter") -- Hide Liquid Fuel -if data.raw.recipe["enriched-fuel-from-liquid-fuel"] then - bobmods.lib.recipe.set_ingredients("enriched-fuel-from-liquid-fuel", { +if data.raw.recipe["bob-enriched-fuel"] then + bobmods.lib.recipe.set_ingredients("bob-enriched-fuel", { { type = "fluid", name = "liquid-fuel-oil", amount = 80 }, { type = "fluid", name = "gas-residual", amount = 20 }, }) - data.raw.recipe["enriched-fuel-from-liquid-fuel"].icons = - angelsmods.functions.create_solid_recipe_icon({ "liquid-fuel-oil", "gas-residual" }, "enriched-fuel") + data.raw.recipe["bob-enriched-fuel"].icons = + angelsmods.functions.create_solid_recipe_icon({ "liquid-fuel-oil", "gas-residual" }, "bob-enriched-fuel") end -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-liquid-fuel-barrel") -bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-liquid-fuel-barrel") -bobmods.lib.tech.remove_recipe_unlock("flammables", "liquid-fuel") -bobmods.lib.recipe.hide("empty-liquid-fuel-barrel") -bobmods.lib.recipe.hide("fill-liquid-fuel-barrel") -bobmods.lib.recipe.hide("liquid-fuel") -seablock.lib.hide("fluid", "liquid-fuel") -seablock.lib.hide("item", "liquid-fuel-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-liquid-fuel-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-liquid-fuel-barrel") +bobmods.lib.tech.remove_recipe_unlock("flammables", "bob-liquid-fuel") +bobmods.lib.recipe.hide("empty-bob-liquid-fuel-barrel") +bobmods.lib.recipe.hide("bob-liquid-fuel-barrel") +bobmods.lib.recipe.hide("bob-liquid-fuel") +seablock.lib.hide("fluid", "bob-liquid-fuel") +seablock.lib.hide("item", "bob-liquid-fuel-barrel") -- Swap out Nickel and Zinc plates -seablock.lib.substingredient("roboport-antenna-3", "nickel-plate", "titanium-plate", nil) -bobmods.lib.recipe.remove_ingredient("roboport-antenna-4", "nickel-plate") -seablock.lib.substingredient("silver-zinc-battery", "zinc-plate", "solid-zinc-oxide", nil) +seablock.lib.substingredient("bob-roboport-antenna-3", "bob-nickel-plate", "bob-titanium-plate", nil) +bobmods.lib.recipe.remove_ingredient("bob-roboport-antenna-4", "bob-nickel-plate") +seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "solid-zinc-oxide", nil) seablock.lib.unhide_recipe("zinc-ore-processing-alt") bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "zinc-ore-processing-alt") -bobmods.lib.tech.add_prerequisite("battery-3", "angels-zinc-smelting-2") +bobmods.lib.tech.add_prerequisite("bob-battery-3", "angels-zinc-smelting-2") if data.raw.recipe["pellet-zinc-smelting"] then data.raw.recipe["pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer( angelsmods.functions.get_object_icons("solid-zinc-oxide"), @@ -134,14 +134,14 @@ if data.raw.recipe["pellet-zinc-smelting"] then end if mods["angelsindustries"] then - seablock.lib.substingredient("angels-thorium-fuel-cell", "angels-plate-zinc", "lead-plate", nil) - seablock.lib.substingredient("angels-deuterium-fuel-cell", "angels-plate-zinc", "lead-plate", nil) + seablock.lib.substingredient("angels-thorium-fuel-cell", "angels-plate-zinc", "bob-lead-plate", nil) + seablock.lib.substingredient("angels-deuterium-fuel-cell", "angels-plate-zinc", "bob-lead-plate", nil) end -seablock.lib.hide_item("nickel-plate") -seablock.lib.hide_item("zinc-plate") +seablock.lib.hide_item("bob-nickel-plate") +seablock.lib.hide_item("bob-zinc-plate") bobmods.lib.recipe.hide("bob-zinc-plate") -bobmods.lib.tech.remove_recipe_unlock("zinc-processing", "bob-zinc-plate") +bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-zinc-plate") if mods["cargo-ships"] then seablock.lib.hide_item("oil_rig") diff --git a/SeaBlock/data-updates/wood.lua b/SeaBlock/data-updates/wood.lua index 3c600f3a..8d2098ca 100644 --- a/SeaBlock/data-updates/wood.lua +++ b/SeaBlock/data-updates/wood.lua @@ -1,30 +1,31 @@ -- Remove wood from basic underground belt and splitter recipes -seablock.lib.removeingredient("basic-underground-belt", "wood") -seablock.lib.removeingredient("basic-splitter", "wood") +seablock.lib.removeingredient("bob-basic-underground-belt", "wood") +seablock.lib.removeingredient("bob-basic-splitter", "wood") -- Can always apply productivity modules to furnace recipes, so make it official -for k, v in pairs(data.raw.module) do - if v.effect and v.effect.productivity and v.limitation then - table.insert(v.limitation, "sb-wood-bricks-charcoal") - end -end +-- for k, v in pairs(data.raw.module) do +-- if v.effect and v.effect.productivity and v.limitation then +-- table.insert(v.limitation, "sb-wood-bricks-charcoal") +-- end +-- end +angelsmods.functions.allow_productivity("sb-wood-bricks-charcoal") bobmods.lib.recipe.enabled("wooden-chest", false) -bobmods.lib.recipe.enabled("wooden-board", false) +bobmods.lib.recipe.enabled("bob-wooden-board", false) bobmods.lib.recipe.enabled("cellulose-fiber-raw-wood", false) bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing", "wood-pellets") bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "small-electric-pole") bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-chest") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-board") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "basic-circuit-board") +bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "bob-wooden-board") +bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "bob-basic-circuit-board") bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1") bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-wood-processing") bobmods.lib.tech.add_prerequisite("bio-wood-processing-2", "bio-processing-brown") bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "wood-charcoal") bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-resin-wood-reprocessing") -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bob-rubber") +bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bob-rubber") -- TODO : check if this is supposed to be bob-rubber bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-processor") bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-pellets") bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-bricks") From 543934f43480bbe7af431987d36ad2995e32f29e Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:36:48 +0200 Subject: [PATCH 016/117] data-final-fixes - SpaceMod compatibility --- SeaBlock/data-final-fixes/SpaceMod.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index 14871647..a06ae2d8 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -22,6 +22,7 @@ if settings.startup["SpaceX-ignore-tech-multiplier"] then "space-casings", "protection-fields", "fusion-reactor", + "fission-reactor", "space-thrusters", "fuel-cells", "habitation", @@ -45,6 +46,7 @@ local recipes = { "satellite", "drydock-assembly", "fusion-reactor", + "fission-reactor", "hull-component", "protection-field", "space-thruster", @@ -62,6 +64,7 @@ local techs = { "space-casings", "protection-fields", "fusion-reactor", + "fission-reactor", "space-thrusters", "fuel-cells", "habitation", @@ -81,10 +84,10 @@ local upgrades = { ["bob-construction-robot-4"] = "bob-construction-robot-5", -- CircuitProcessing replaces module-3 with module-4, so SpaceMod data-final-fixes -- doesn't find the modules it's expecting. - ["speed-module-4"] = "speed-module-8", - ["effectivity-module-4"] = "effectivity-module-8", - ["productivity-module-4"] = "productivity-module-8", - ["fusion-reactor-equipment-4"] = "fusion-reactor-equipment-4", -- for amount adjustment + ["speed-module-4"] = "speed-module-5", + ["efficiency-module-4"] = "efficiency-module-5", + ["productivity-module-4"] = "productivity-module-5", + ["bob-fission-reactor-equipment-4"] = "bob-fission-reactor-equipment-4", -- for amount adjustment } local function iterateingredients(recipe, func) @@ -112,7 +115,7 @@ local function doupgrade(ingredients) end if upgrade == "bob-construction-robot-5" then item[amountidx] = 1 - elseif upgrade == "fusion-reactor-equipment-4" then + elseif upgrade == "bob-fission-reactor-equipment-4" then item[amountidx] = item[amountidx] / 2 end end @@ -133,7 +136,7 @@ if data.raw.technology["ftl-theory-D"] then end if mods["bobtech"] then - bobmods.lib.tech.add_science_pack("ftl-theory-D2", "advanced-logistic-science-pack", 1) + bobmods.lib.tech.add_science_pack("ftl-theory-D2", "bob-advanced-logistic-science-pack", 1) bobmods.lib.tech.remove_prerequisite("ftl-theory-D1", "ftl-theory-D") bobmods.lib.tech.add_prerequisite("ftl-theory-D1", "ftl-theory-C") bobmods.lib.tech.add_prerequisite("ftl-theory-D2", "ftl-theory-D") From 31dc169f1cc6ed01b75a9e8f122a9beb01764da2 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:37:57 +0200 Subject: [PATCH 017/117] data-final-fixes - renamed bob-stuff --- SeaBlock/data-final-fixes.lua | 9 +-- SeaBlock/data-final-fixes/logistics.lua | 56 +++++++++---------- SeaBlock/data-final-fixes/recipe.lua | 8 +-- SeaBlock/data-final-fixes/tech-tree.lua | 30 +++++----- .../data-final-fixes/unobtainable_items.lua | 54 ++++++++++-------- 5 files changed, 84 insertions(+), 73 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index d82a2944..598d5559 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -18,9 +18,9 @@ for _, v in pairs(reactors) do end -- Refresh circuit board icon as it may have been overwritten -if data.raw.tool["sb-basic-circuit-board-tool"] and data.raw.item["basic-circuit-board"] then - seablock.lib.copy_icon(data.raw.tool["sb-basic-circuit-board-tool"], data.raw.item["basic-circuit-board"]) -end +-- if data.raw.tool["sb-basic-circuit-board-tool"] and data.raw.item["bob-basic-circuit-board"] then +-- seablock.lib.copy_icon(data.raw.tool["sb-basic-circuit-board-tool"], data.raw.item["bob-basic-circuit-board"]) +-- end require("data-final-fixes/logistics") require("data-final-fixes/icons") @@ -30,6 +30,7 @@ require("data-final-fixes/unobtainable_items") require("data-final-fixes/mapgen") require("data-final-fixes/SpaceMod") + data.raw.recipe["copper-cable"].allow_decomposition = true data.raw.recipe["paper-bleaching-1"].allow_decomposition = true @@ -39,4 +40,4 @@ for _, v in pairs(data.raw.character) do end end -bobmods.lib.tech.prerequisite_cleanup() +seablock.lib.removeingredient("automation-science-pack", "bob-glass") -- For some reason it isn't removed earlier diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index c8b5b5ed..c396b580 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -7,9 +7,9 @@ local function set_speed(type, name, speed) end end -set_speed("transport-belt", "basic-transport-belt", 7.5) -set_speed("underground-belt", "basic-underground-belt", 7.5) -set_speed("splitter", "basic-splitter", 7.5) +set_speed("transport-belt", "bob-basic-transport-belt", 7.5) +set_speed("underground-belt", "bob-basic-underground-belt", 7.5) +set_speed("splitter", "bob-basic-splitter", 7.5) set_speed("transport-belt", "transport-belt", 15) set_speed("underground-belt", "underground-belt", 15) @@ -23,31 +23,31 @@ set_speed("transport-belt", "express-transport-belt", 45) set_speed("underground-belt", "express-underground-belt", 45) set_speed("splitter", "express-splitter", 45) -set_speed("transport-belt", "turbo-transport-belt", 60) -set_speed("underground-belt", "turbo-underground-belt", 60) -set_speed("splitter", "turbo-splitter", 60) +set_speed("transport-belt", "bob-turbo-transport-belt", 60) +set_speed("underground-belt", "bob-turbo-underground-belt", 60) +set_speed("splitter", "bob-turbo-splitter", 60) -set_speed("transport-belt", "ultimate-transport-belt", 75) -set_speed("underground-belt", "ultimate-underground-belt", 75) -set_speed("splitter", "ultimate-splitter", 75) +set_speed("transport-belt", "bob-ultimate-transport-belt", 75) +set_speed("underground-belt", "bob-ultimate-underground-belt", 75) +set_speed("splitter", "bob-ultimate-splitter", 75) -- Increase energy consumption of bob's extra beacons -- Also reduce module slots and effectivity -if data.raw.beacon["beacon-2"] then - data.raw.beacon["beacon-2"].energy_usage = "960kW" - data.raw.beacon["beacon-2"].module_specification.module_slots = 2 - data.raw.beacon["beacon-2"].distribution_effectivity = 0.5 +if data.raw.beacon["bob-beacon-2"] then + data.raw.beacon["bob-beacon-2"].energy_usage = "960kW" + data.raw.beacon["bob-beacon-2"].module_slots = 2 + data.raw.beacon["bob-beacon-2"].distribution_effectivity = 0.5 end -if data.raw.beacon["beacon-3"] then - data.raw.beacon["beacon-3"].energy_usage = "1920kW" - data.raw.beacon["beacon-3"].module_specification.module_slots = 2 - data.raw.beacon["beacon-3"].distribution_effectivity = 0.5 +if data.raw.beacon["bob-beacon-3"] then + data.raw.beacon["bob-beacon-3"].energy_usage = "1920kW" + data.raw.beacon["bob-beacon-3"].module_slots = 2 + data.raw.beacon["bob-beacon-3"].distribution_effectivity = 0.5 end -- Undo boblogistcs changes to logistic system research bobmods.lib.tech.add_new_science_pack("logistic-system", "production-science-pack", 1) -if data.raw.tool["advanced-logistic-science-pack"] then - bobmods.lib.tech.add_new_science_pack("logistic-system", "advanced-logistic-science-pack", 1) +if data.raw.tool["bob-advanced-logistic-science-pack"] then + bobmods.lib.tech.add_new_science_pack("logistic-system", "bob-advanced-logistic-science-pack", 1) else bobmods.lib.tech.add_new_science_pack("logistic-system", "utility-science-pack", 1) end @@ -66,8 +66,8 @@ for _, v in pairs(logisticstechs) do bobmods.lib.tech.add_new_science_pack(v, "production-science-pack", 1) bobmods.lib.tech.add_new_science_pack(v, "utility-science-pack", 1) - if data.raw.tool["advanced-logistic-science-pack"] then - bobmods.lib.tech.add_new_science_pack(v, "advanced-logistic-science-pack", 1) + if data.raw.tool["bob-advanced-logistic-science-pack"] then + bobmods.lib.tech.add_new_science_pack(v, "bob-advanced-logistic-science-pack", 1) end end end @@ -81,16 +81,16 @@ bobmods.lib.tech.add_prerequisite("logistic-system-2", "utility-science-pack") -- No logistics chest at green science level. local function revertchests(tech) local neweffects = { - { type = "unlock-recipe", recipe = "logistic-chest-passive-provider" }, - { type = "unlock-recipe", recipe = "logistic-chest-storage" }, + { type = "unlock-recipe", recipe = "passive-provider-chest" }, + { type = "unlock-recipe", recipe = "storage-chest" }, } for k, v in pairs(tech.effects) do if v.type ~= "unlock-recipe" or ( - v.recipe ~= "logistic-chest-passive-provider" - and v.recipe ~= "logistic-chest-storage" - and v.recipe ~= "logistic-chest-requester" + v.recipe ~= "passive-provider-chest" + and v.recipe ~= "storage-chest" + and v.recipe ~= "requester-chest" ) then table.insert(neweffects, v) @@ -102,14 +102,14 @@ revertchests(data.raw.technology["logistic-robotics"]) revertchests(data.raw.technology["construction-robotics"]) local found = false for k, v in pairs(data.raw.technology["logistic-system"].effects) do - if v.type == "unlock-recipe" and v.recipe == "logistic-chest-requester" then + if v.type == "unlock-recipe" and v.recipe == "requester-chest" then found = true end end if not found then table.insert( data.raw.technology["logistic-system"].effects, - { type = "unlock-recipe", recipe = "logistic-chest-requester" } + { type = "unlock-recipe", recipe = "requester-chest" } ) end diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index a0834987..3b50ef9b 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -1,8 +1,8 @@ -- Revert massive buff of insulated wire recipe -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 }) +bobmods.lib.recipe.set_energy_required("bob-insulated-cable", 2) +seablock.lib.substingredient("bob-insulated-cable", "tinned-copper-cable", nil, 8) +seablock.lib.substingredient("bob-insulated-cable", "rubber", nil, 8) +bobmods.lib.recipe.set_result("bob-insulated-cable", { type = "item", name = "insulated-cable", amount = 8 }) -- Combine Stone and Crushed Stone local function replace_stone(recipe) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index e9987f57..8bcbbd7a 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -1,25 +1,25 @@ -- Remove empty bob's techs -bobmods.lib.tech.remove_prerequisite("cobalt-processing", "chemical-processing-1") -bobmods.lib.tech.remove_prerequisite("grinding", "chemical-processing-1") -bobmods.lib.tech.remove_prerequisite("lithium-processing", "chemical-processing-1") +bobmods.lib.tech.remove_prerequisite("bob-cobalt-processing", "bob-chemical-processing-1") +bobmods.lib.tech.remove_prerequisite("bob-grinding", "bob-chemical-processing-1") +bobmods.lib.tech.remove_prerequisite("bob-lithium-processing", "bob-chemical-processing-1") -bobmods.lib.tech.remove_prerequisite("cobalt-processing", "chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("silicon-processing", "chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("advanced-electronics", "chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("titanium-processing", "chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("tungsten-processing", "chemical-processing-2") +bobmods.lib.tech.remove_prerequisite("bob-cobalt-processing", "bob-chemical-processing-2") +bobmods.lib.tech.remove_prerequisite("bob-silicon-processing", "bob-chemical-processing-2") +bobmods.lib.tech.remove_prerequisite("advanced-circuit", "bob-chemical-processing-2") +bobmods.lib.tech.remove_prerequisite("bob-titanium-processing", "bob-chemical-processing-2") +bobmods.lib.tech.remove_prerequisite("bob-tungsten-processing", "bob-chemical-processing-2") -seablock.lib.hide_technology("electrolysis-1") -seablock.lib.hide_technology("electrolysis-2") -seablock.lib.hide_technology("chemical-processing-1") -seablock.lib.hide_technology("chemical-processing-2") +seablock.lib.hide_technology("bob-electrolysis-1") +seablock.lib.hide_technology("bob-electrolysis-2") +seablock.lib.hide_technology("bob-chemical-processing-1") +seablock.lib.hide_technology("bob-chemical-processing-2") bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing-2") bobmods.lib.tech.add_prerequisite("circuit-network", "bio-paper-1") bobmods.lib.tech.remove_prerequisite("rubbers", "circuit-network") -- Unhide solid fuel from hydrogen -seablock.lib.unhide_recipe("solid-fuel-from-hydrogen") -seablock.lib.add_recipe_unlock("flammables", "solid-fuel-from-hydrogen", 4) +seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen") +seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4) -bobmods.lib.tech.replace_prerequisite("lithium-processing", "chlorine-processing-4", "chlorine-processing-2") +bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "chlorine-processing-4", "chlorine-processing-2") diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index 41cee794..e5e036c1 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -27,9 +27,9 @@ local function updaterecipe(recipe) for _, v in pairs(recipe.ingredients) do updateline(v) end - if recipe.result and itemrename[recipe.result] then - recipe.result = itemrename[recipe.result] - end + -- if recipe.result and itemrename[recipe.result] then + -- recipe.result = itemrename[recipe.result] + -- end for _, v in pairs(recipe.results or {}) do updateline(v) end @@ -41,21 +41,21 @@ end -- Recipes to unconditionally remove local removerecipes = {} for _, v in ipairs({ - "alien-artifact-blue-from-basic", - "alien-artifact-green-from-basic", - "alien-artifact-orange-from-basic", - "alien-artifact-purple-from-basic", - "alien-artifact-red-from-basic", - "alien-artifact-yellow-from-basic", + "bob-alien-artifact-blue", + "bob-alien-artifact-green", + "bob-alien-artifact-orange", + "bob-alien-artifact-purple", + "bob-alien-artifact-red", + "bob-alien-artifact-yellow", "angels-chemical-void-gas-natural-1", "angels-chemical-void-liquid-condensates", "angels-water-void-crystal-matrix", - "angels-water-void-lithia-water", + "angels-water-void-bob-lithia-water", "angelsore1-crushed-hand", "angelsore3-crushed-hand", "big-burner-generator", "bio-tile", - "bob-coal-from-wood", + "bob-carbon-from-wood", "bob-resin-wood", "burner-generator", "burner-mining-drill", @@ -72,18 +72,18 @@ for _, v in ipairs({ "empty-diesel-fuel-barrel", "empty-gas-natural-1-barrel", "empty-liquid-condensates-barrel", - "empty-lithia-water-barrel", - "fill-crystal-matrix-barrel", + "empty-bob-lithia-water-barrel", + "crystal-matrix-barrel", "fill-diesel-fuel-barrel", - "fill-gas-natural-1-barrel", - "fill-liquid-condensates-barrel", - "fill-lithia-water-barrel", + "gas-natural-1-barrel", + "liquid-condensates-barrel", + "bob-lithia-water-barrel", "gas-fractioning-condensates", "gas-phosgene", "gas-separation", "oil-steam-boiler", "petroleum-generator", - "protection-field-goopless", + "protection-field-goopless", --where does this come from "pumpjack", "slag-processing-7", "slag-processing-8", @@ -108,7 +108,7 @@ for _, v in ipairs({ "burner-mining-drill", "coal", "coal-crushed", - "diesel-fuel", + "diesel-fuel", --doesn't seem to exist anymore ?? "diesel-fuel-barrel", "electric-mining-drill", "gas-natural-1", @@ -117,8 +117,8 @@ for _, v in ipairs({ "gas-phosgene-barrel", "liquid-condensates", "liquid-condensates-barrel", - "lithia-water", - "lithia-water-barrel", + "bob-lithia-water", + "bob-lithia-water-barrel", "oil-steam-boiler", "petroleum-generator", "pumpjack", @@ -252,6 +252,16 @@ end -- Clear the list of science packs that alien lab can take -- This prevents YAFC warning -if data.raw.lab["lab-alien"] then - data.raw.lab["lab-alien"].inputs = {} +if data.raw.lab["bob-lab-alien"] then + -- data.raw.lab["bob-lab-alien"].inputs = {} -- disabled because of the following +end +-- TODO: We now need a dummy lab that can take all the science packs or else some techs can't load (even if hidden) +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "space-science-pack") +if data.raw.tool["sct-bio-science-pack"] then + bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "sct-bio-science-pack") end +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "automation-science-pack") +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "logistic-science-pack") +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "chemical-science-pack") +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "production-science-pack") +bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "utility-science-pack") \ No newline at end of file From 899b2bfd419bbb489898bab1693ee47c0622132b Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:44:15 +0200 Subject: [PATCH 018/117] Fixed control.lua and remote.lua --- SeaBlock/control.lua | 36 ++++++++++++------------- SeaBlock/remote.lua | 64 ++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua index 53a43e5a..c8a4b2f7 100644 --- a/SeaBlock/control.lua +++ b/SeaBlock/control.lua @@ -12,8 +12,8 @@ end function seablock.create_rock_chest(surface, pos) local has_items = false - if global.starting_items and (not game.is_multiplayer()) then - for item, quantity in pairs(global.starting_items) do + if storage.starting_items and (not game.is_multiplayer()) then + for item, quantity in pairs(storage.starting_items) do if quantity > 0 then has_items = true break @@ -23,7 +23,7 @@ function seablock.create_rock_chest(surface, pos) if has_items then local chest = surface.create_entity({ name = "rock-chest", position = pos, force = game.forces.neutral }) - for item, quantity in pairs(global.starting_items) do + for item, quantity in pairs(storage.starting_items) do if quantity > 0 then chest.insert({ name = item, count = quantity }) end @@ -32,9 +32,9 @@ function seablock.create_rock_chest(surface, pos) end function seablock.have_item(player, itemname, crafted) - local unlock = global.unlocks[itemname] + local unlock = storage.unlocks[itemname] -- Special case for basic-circuit because it is part of starting equipment - if unlock and (itemname ~= "basic-circuit-board" or crafted) then + if unlock and (itemname ~= "bob-basic-circuit-board" or crafted) then for _, v in ipairs(unlock) do if player.force.technologies[v] then player.force.technologies[v].researched = true @@ -51,20 +51,20 @@ end local function init() set_pvp() - global.starting_items = seablock.populate_starting_items(game.item_prototypes) + storage.starting_items = seablock.populate_starting_items(prototypes.item) if remote.interfaces.freeplay then if remote.interfaces.freeplay.set_disable_crashsite then remote.call("freeplay", "set_disable_crashsite", true) end end - global.unlocks = { + storage.unlocks = { ["angels-ore3-crushed"] = { "sb-startup1", "bio-wood-processing" }, - ["basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" }, + ["bob-basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" }, } - if game.technology_prototypes["sct-automation-science-pack"] then - global.unlocks["lab"] = { "sct-automation-science-pack" } + if prototypes.technology["sct-automation-science-pack"] then + storage.unlocks["lab"] = { "sct-automation-science-pack" } else - global.unlocks["lab"] = { "sb-startup4" } + storage.unlocks["lab"] = { "sb-startup4" } end if remote.interfaces["freeplay"] then @@ -130,7 +130,7 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(e) if not inv then -- Compatibility with BlueprintLab_Bud17 return end - for k, v in pairs(global.unlocks) do + for k, v in pairs(storage.unlocks) do for _, v2 in ipairs(v) do if player.force.technologies[v2] @@ -153,13 +153,13 @@ script.on_configuration_changed(function(cfg) force.reset_recipes() for tech_name, tech in pairs(force.technologies) do if tech.researched then - for tech_name, effect in pairs(tech.effects) do + for tech_name, effect in pairs(tech.prototype.effects) do if effect.type == "unlock-recipe" then force.recipes[effect.recipe].enabled = true end end end - if game.technology_prototypes[tech_name].enabled then + if prototypes.technology[tech_name].enabled then force.technologies[tech_name].enabled = true end end @@ -183,9 +183,9 @@ script.on_load(function() end) script.on_event(defines.events.on_player_created, function(e) - if global.starting_items and game.is_multiplayer() then + if storage.starting_items and game.is_multiplayer() then local inv = game.players[e.player_index].get_main_inventory() - for item, quantity in pairs(global.starting_items) do + for item, quantity in pairs(storage.starting_items) do if quantity > 0 then inv.insert({ name = item, count = quantity }) end @@ -222,9 +222,9 @@ script.on_load(function() end) script.on_event(defines.events.on_player_created, function(e) - if global.starting_items and game.is_multiplayer() then + if storage.starting_items and game.is_multiplayer() then local inv = game.players[e.player_index].get_main_inventory() - for item, quantity in pairs(global.starting_items) do + for item, quantity in pairs(storage.starting_items) do if quantity > 0 then inv.insert({ name = item, count = quantity }) end diff --git a/SeaBlock/remote.lua b/SeaBlock/remote.lua index 82733888..26445f3e 100644 --- a/SeaBlock/remote.lua +++ b/SeaBlock/remote.lua @@ -1,23 +1,23 @@ require("__core__/lualib/util") local function get_unlocks() - return util.table.deepcopy(global.unlocks) + return util.table.deepcopy(storage.unlocks) end local function set_unlock(item, techs) - global.unlocks[item] = techs + storage.unlocks[item] = techs end local function get_starting_items() - return util.table.deepcopy(global.starting_items) + return util.table.deepcopy(storage.starting_items) end local function set_starting_item(item, quantity) - global.starting_items[item] = quantity + storage.starting_items[item] = quantity end local function set_starting_items(items) - global.starting_items = items + storage.starting_items = items end -- Presets for Milestones mod @@ -33,7 +33,7 @@ local function milestones_presets() { type = "item", name = "logistic-science-pack", quantity = 1 }, { type = "item", name = "military-science-pack", quantity = 1 }, { type = "item", name = "chemical-science-pack", quantity = 1 }, - script.active_mods["bobtech"] and { type = "item", name = "advanced-logistic-science-pack", quantity = 1 } or nil, + script.active_mods["bobtech"] and { type = "item", name = "bob-advanced-logistic-science-pack", quantity = 1 } or nil, { type = "item", name = "production-science-pack", quantity = 1 }, { type = "item", name = "utility-science-pack", quantity = 1 }, { type = "item", name = "space-science-pack", quantity = 1 }, @@ -43,7 +43,7 @@ local function milestones_presets() { type = "item", name = "military-science-pack", quantity = 1000, next = "x10" }, { type = "item", name = "chemical-science-pack", quantity = 1000, next = "x10" }, script.active_mods["bobtech"] - and { type = "item", name = "advanced-logistic-science-pack", quantity = 1000, next = "x10" } + and { type = "item", name = "bob-advanced-logistic-science-pack", quantity = 1000, next = "x10" } or nil, { type = "item", name = "production-science-pack", quantity = 1000, next = "x10" }, { type = "item", name = "utility-science-pack", quantity = 1000, next = "x10" }, @@ -51,39 +51,40 @@ local function milestones_presets() } -- Resources + --TODO: rename bob stuff grouped_milestones["resorces"] = { { type = "group", name = "Resources" }, { type = "item", name = "wood-charcoal", quantity = 1 }, - { type = "item", name = "basic-circuit-board", quantity = 1 }, + { type = "item", name = "bob-basic-circuit-board", quantity = 1 }, { type = "item", name = "electronic-circuit", quantity = 1 }, { type = "item", name = "advanced-circuit", quantity = 1 }, { type = "item", name = "processing-unit", quantity = 1 }, { type = "item", name = "advanced-processing-unit", quantity = 1 }, - { type = "item", name = "basic-circuit-board", quantity = 10000, next = "x10" }, + { type = "item", name = "bob-basic-circuit-board", quantity = 10000, next = "x10" }, { type = "item", name = "electronic-circuit", quantity = 10000, next = "x10" }, { type = "item", name = "advanced-circuit", quantity = 10000, next = "x10" }, { type = "item", name = "processing-unit", quantity = 1000, next = "x10" }, { type = "item", name = "advanced-processing-unit", quantity = 100, next = "x10" }, { type = "item", name = "steel-plate", quantity = 1 }, - { type = "item", name = "bronze-alloy", quantity = 1 }, - { type = "item", name = "invar-alloy", quantity = 1 }, - { type = "item", name = "brass-alloy", quantity = 1 }, - { type = "item", name = "glass", quantity = 1 }, - { type = "item", name = "silver-plate", quantity = 1 }, + { type = "item", name = "bob-bronze-alloy", quantity = 1 }, + { type = "item", name = "bob-invar-alloy", quantity = 1 }, + { type = "item", name = "bob-brass-alloy", quantity = 1 }, + { type = "item", name = "bob-glass", quantity = 1 }, + { type = "item", name = "bob-silver-plate", quantity = 1 }, - { type = "item", name = "aluminium-plate", quantity = 1 }, - { type = "item", name = "titanium-plate", quantity = 1 }, - { type = "item", name = "gold-plate", quantity = 1 }, - { type = "item", name = "cobalt-steel-alloy", quantity = 1 }, + { type = "item", name = "bob-aluminium-plate", quantity = 1 }, + { type = "item", name = "bob-titanium-plate", quantity = 1 }, + { type = "item", name = "bob-gold-plate", quantity = 1 }, + { type = "item", name = "bob-cobalt-steel-alloy", quantity = 1 }, { type = "item", name = "angels-plate-chrome", quantity = 1 }, { type = "item", name = "angels-plate-platinum", quantity = 1 }, - { type = "item", name = "tungsten-plate", quantity = 1 }, - { type = "item", name = "copper-tungsten-alloy", quantity = 1 }, - { type = "item", name = "tungsten-carbide", quantity = 1 }, - { type = "item", name = "nitinol-alloy", quantity = 1 }, + { type = "item", name = "bob-tungsten-plate", quantity = 1 }, + { type = "item", name = "bob-copper-tungsten-alloy", quantity = 1 }, + { type = "item", name = "bob-tungsten-carbide", quantity = 1 }, + { type = "item", name = "bob-nitinol-alloy", quantity = 1 }, { type = "item", name = "plastic-bar", quantity = 1 }, { type = "fluid", name = "liquid-resin", quantity = 100 }, @@ -120,29 +121,28 @@ local function milestones_presets() -- Vanilla modules grouped_milestones["modules"] = { { type = "item", name = "productivity-module", quantity = 1 }, - { type = "item", name = "productivity-module-4", quantity = 1 }, - { type = "item", name = "productivity-module-6", quantity = 1 }, + { type = "item", name = "bob-productivity-module-4", quantity = 1 }, + { type = "item", name = "bob-productivity-module-5", quantity = 1 }, } elseif script.active_mods["CircuitProcessing"] then -- Circuit Processing modules grouped_milestones["modules"] = { { type = "item", name = "productivity-module-2", quantity = 1 }, - { type = "item", name = "productivity-module-4", quantity = 1 }, - { type = "item", name = "productivity-module-6", quantity = 1 }, - { type = "item", name = "productivity-module-8", quantity = 1 }, + { type = "item", name = "bob-productivity-module-4", quantity = 1 }, + { type = "item", name = "bob-productivity-module-5", quantity = 1 }, } else -- Bob's Modules grouped_milestones["modules"] = { { type = "item", name = "productivity-module", quantity = 1 }, - { type = "item", name = "productivity-module-8", quantity = 1 }, + { type = "item", name = "bob-productivity-module-5", quantity = 1 }, } end grouped_milestones["progress2"] = { { type = "item", name = "beacon", quantity = 1 }, - script.active_mods["bobmodules"] and { type = "item", name = "beacon-2", quantity = 1 } or nil, - script.active_mods["bobmodules"] and { type = "item", name = "beacon-3", quantity = 1 } or nil, + script.active_mods["bobmodules"] and { type = "item", name = "bob-beacon-2", quantity = 1 } or nil, + script.active_mods["bobmodules"] and { type = "item", name = "bob-beacon-3", quantity = 1 } or nil, { type = "item", name = "rocket-fuel", quantity = 1 }, { type = "technology", name = "rocket-silo", quantity = 1 }, { type = "item", name = "nuclear-reactor", quantity = 1 }, @@ -155,7 +155,7 @@ local function milestones_presets() { type = "item", name = "drydock-structural", quantity = 10 }, { type = "item", name = "drydock-assembly", quantity = 2 }, { type = "item", name = "protection-field", quantity = 1 }, - { type = "item", name = "fusion-reactor", quantity = 1 }, + { type = "item", name = "fission-reactor", quantity = 1 }, { type = "item", name = "habitation", quantity = 1 }, { type = "item", name = "life-support", quantity = 1 }, { type = "item", name = "command", quantity = 1 }, @@ -218,7 +218,7 @@ local function milestones_presets() end local function get_jetpack_fuels() - return { ["enriched-fuel"] = 0.7 } + return { ["bob-enriched-fuel"] = 0.7 } end ---@param winning_force LuaForce From 581f59ef9614f9e83dbbcacecc307125ed3cda9f Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 15:45:56 +0200 Subject: [PATCH 019/117] Basic mapgen for 2.0 --- SeaBlock/data-final-fixes/mapgen.lua | 52 ++- SeaBlock/data.lua | 2 +- SeaBlock/new-mapgen.lua | 516 ++++++++++++++++++++++++ SeaBlock/{mapgen.lua => old-mapgen.lua} | 0 4 files changed, 567 insertions(+), 3 deletions(-) create mode 100644 SeaBlock/new-mapgen.lua rename SeaBlock/{mapgen.lua => old-mapgen.lua} (100%) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index f7ad3c9f..c47112d9 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -1,12 +1,44 @@ -- No resource placement for k, v in pairs(data.raw.resource) do v.autoplace = nil + -- if v.autoplace then + -- data.raw.resource[k].autoplace.default_enabled = false + -- end end +-- log("HELLO") +-- log(serpent.block(data.raw["planet"]["nauvis"].map_gen_settings)) +data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { + tile = { + settings = { + deepwater = {}, + water = {}, + ["sand-4"] = {}, + -- ["sand-5"] = {}, + } + }, + entity = { + settings = { + ["desert-garden"] = {}, + ["temperate-garden"] = {}, + ["swamp-garden"] = {}, + + ["desert-tree"] = {}, + ["temperate-tree"] = {}, + ["swamp-tree"] = {}, + } + } +} +data.raw["planet"]["nauvis"].map_gen_settings.autoplace_controls = nil + + -- No spawners for k, v in pairs(data.raw["unit-spawner"]) do v.autoplace = nil - v.control = nil + -- v.control = nil + if v.autoplace then + v.autoplace.default_enabled = false + end end -- No trees @@ -22,15 +54,28 @@ for k, v in pairs(data.raw.tree) do then v.autoplace = nil seablock.lib.add_flag("tree", v.name, "not-deconstructable") + else + v.autoplace.control = nil end end -- No rocks for k, v in pairs(data.raw["simple-entity"]) do v.autoplace = nil + -- if v.autoplace then + -- v.autoplace.default_enabled = false + -- end seablock.lib.add_flag("simple-entity", v.name, "not-deconstructable") end +for k, v in pairs(data.raw["optimized-decorative"]) do + v.autoplace = nil + -- if v.autoplace then + -- v.autoplace.default_enabled = false + -- end + seablock.lib.add_flag("optimized-decorative", v.name, "not-deconstructable") +end + local keepcontrols = {} local turrets = data.raw["turret"] for turret_name, turret in pairs(turrets) do @@ -39,10 +84,13 @@ for turret_name, turret in pairs(turrets) do end end +--keepcontrols["angels-fissure"] = true + local controls = data.raw["autoplace-control"] for k, v in pairs(controls) do if k ~= "enemy-base" and not keepcontrols[k] then - controls[k] = nil + -- data.raw["autoplace-control"][k].hidden = true + data.raw["autoplace-control"][k] = nil end end diff --git a/SeaBlock/data.lua b/SeaBlock/data.lua index 4bbdcfa5..3c5e750d 100644 --- a/SeaBlock/data.lua +++ b/SeaBlock/data.lua @@ -11,7 +11,7 @@ require("prototypes/recipe") require("prototypes/recipe-category") require("prototypes/technology") require("prototypes/rockchest") -require("mapgen") +require("new-mapgen") require("data-updates/Companion_Drones") require("data/tables") require("data/misc") diff --git a/SeaBlock/new-mapgen.lua b/SeaBlock/new-mapgen.lua new file mode 100644 index 00000000..3958a9d2 --- /dev/null +++ b/SeaBlock/new-mapgen.lua @@ -0,0 +1,516 @@ +data.raw.tile["sand-4"] = table.deepcopy(data.raw.tile["sand-1"]) +data.raw.tile["sand-5"] = table.deepcopy(data.raw.tile["sand-2"]) +data.raw.tile["sand-4"].name = "sand-4" +data.raw.tile["sand-5"].name = "sand-5" + +data.raw.tile["dry-dirt"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-3"].vehicle_friction_modifier = 1.8 + +data.raw.tile["dirt-4"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-5"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-6"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-7"].vehicle_friction_modifier = 1.8 + +data.raw.tile["grass-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-3"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-4"].vehicle_friction_modifier = 1.8 + +data.raw.tile["red-desert-0"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-3"].vehicle_friction_modifier = 1.8 + +data.raw.tile["sand-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-3"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-4"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-5"].vehicle_friction_modifier = 1.8 + +data.raw.tile["landfill"].vehicle_friction_modifier = 1.8 + +for _, v in pairs(data.raw.tile) do + v.autoplace = nil +end + +-- Want player to collide with cliffs +-- Want player to collide with water +-- Don't want cliffs to collide with water +-- Water tile's default collision mask includes player-layer and item-layer +-- So use train-layer as a substitute player-layer +data.raw.cliff["cliff"].collision_mask = { not_colliding_with_itself = true, layers = { object = true, train = true}} --TODO: check if this works/is the best solution + +local octaves = -3 +local persistence = 0.2 +local waterline = 9.4 +local elevation_scale = 5 +local function scale_elevation(x) + return (x - waterline) * elevation_scale + waterline +end +--[[ +-- low lying sand +data.raw.tile["sand-4"].autoplace = { + peaks = { + { -- Around cliff islands + influence = 5, + elevation_optimal = 0.3 * elevation_scale + waterline, + elevation_range = 0.3 * elevation_scale, + elevation_max_range = 0.3 * elevation_scale, + }, + { + influence = 0.77 * 8, -- Worm islands + min_influence = 0, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + tier_from_start_optimal = 8, + tier_from_start_max_range = 40, + tier_from_start_top_property_limit = 8, + }, + { -- Not in starting area + influence = -5, + starting_area_weight_optimal = 1, + starting_area_weight_range = 0, + starting_area_weight_max_range = 0, + }, + { + influence = 100, -- ... except for starting tile + min_influence = 0, + distance_optimal = 0, + distance_range = 0.1, + distance_max_range = 0.1, + }, + { + influence = -5, + }, + }, +} + +-- highground sand +data.raw.tile["sand-5"].autoplace = { + peaks = { + { + influence = 5, + min_influence = 0, + elevation_optimal = scale_elevation(15), + elevation_range = 5 * elevation_scale, + elevation_max_range = 5 * elevation_scale, + tier_from_start_optimal = 0.1, + tier_from_start_range = 0, + tier_from_start_max_range = 0, + tier_from_start_top_property_limit = 0.1, + }, + { + influence = 0.65, -- starting area garden islands + min_influence = 0, + max_influence = 1, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + tier_from_start_optimal = 0, + tier_from_start_range = 0.1, + tier_from_start_max_range = 0.1, + }, + { + influence = 1, + max_influence = 0, + starting_area_weight_optimal = 1, + starting_area_weight_range = 0, + starting_area_weight_max_range = 0, + }, + { + influence = -100, -- not on starting tile + max_influence = 0, + distance_optimal = 0, + distance_range = 3, + distance_max_range = 3, + }, + }, +} + +local plant_elevation_range = 9.9 * elevation_scale +data.raw.tree["desert-garden"].autoplace = { + max_probability = 0.2, + random_probability_penalty = 0.05, + sharpness = 1, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + { + influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands + min_influence = 0, + max_influence = 1, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + tier_from_start_optimal = 0, + tier_from_start_range = 0.1, + tier_from_start_max_range = 0.1, + }, + { + influence = 1, + max_influence = 0, + noise_layer = "desert-garden-noise", + noise_persistence = 0.8, + noise_octaves_difference = -0.5, + }, + }, + order = "yc", + tile_restriction = { "sand-5" }, +} + +data.raw.tree["temperate-garden"].autoplace = { + max_probability = 0.2, + random_probability_penalty = 0.05, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + { + influence = 1, + max_influence = 0, + noise_layer = "temperate-garden-noise", + noise_persistence = 0.8, + noise_octaves_difference = -0.5, + }, + }, + order = "ya", + tile_restriction = { "sand-5" }, +} + +data.raw.tree["swamp-garden"].autoplace = { + max_probability = 0.05, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + }, + order = "yb", + tile_restriction = { "sand-5" }, +} + +data.raw.tree["desert-tree"].autoplace = { + max_probability = 0.1, + random_probability_penalty = 0.025, + sharpness = 1, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + { + influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands + min_influence = 0, + max_influence = 1, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + tier_from_start_optimal = 0, + tier_from_start_range = 0.1, + tier_from_start_max_range = 0.1, + }, + { + influence = 1, + max_influence = 0, + noise_layer = "desert-tree-noise", + noise_persistence = 0.8, + noise_octaves_difference = -0.5, + }, + }, + order = "za", + tile_restriction = { "sand-5" }, +} +data.raw.tree["temperate-tree"].autoplace = { + max_probability = 0.1, + random_probability_penalty = 0.025, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + { + influence = 1, + max_influence = 0, + noise_layer = "temperate-tree-noise", + noise_persistence = 0.8, + noise_octaves_difference = -0.5, + }, + }, + order = "zc", + tile_restriction = { "sand-5" }, +} + +data.raw.tree["swamp-tree"].autoplace = { + max_probability = 0.05, + peaks = { + { + influence = 1, + min_influence = 0, + elevation_optimal = scale_elevation(20), + elevation_range = plant_elevation_range, + elevation_max_range = plant_elevation_range, + }, + { + influence = 1, + max_influence = 0, + noise_layer = "swamp-tree-noise", + noise_persistence = 0.8, + noise_octaves_difference = -0.5, + }, + }, + order = "zb", + tile_restriction = { "sand-5" }, +} + +data.raw.tile["water"].autoplace = { + peaks = { + { + influence = 0.1, -- shallow water around cliff islands + min_influence = 0, + elevation_optimal = -2 * elevation_scale + waterline, + elevation_range = 2.5 * elevation_scale, + elevation_max_range = 2.5 * elevation_scale, + }, + { + influence = 0.77 * 2, -- around worm islands + min_influence = 0, + max_influence = 1, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + }, + { + influence = 5, -- around starting tile + min_influence = 0, + distance_optimal = 0, + distance_range = 5, + distance_max_range = 5, + }, + }, +} + +data.raw.tile["deepwater"].autoplace = { + peaks = { + { + influence = 0.01, + }, + }, +} + +data.raw.fish["alien-fish-1"].autoplace = { + peaks = { + { + influence = -0.1, + max_influence = 0, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + }, + { + influence = 0.01, + }, + }, +} + +data.raw.fish["alien-fish-2"].autoplace = { + peaks = { + { + influence = 0.02, + min_influence = 0, + noise_layer = "enemy-base", + noise_octaves_difference = octaves, + noise_persistence = persistence, + }, + }, +} + +data.raw.fish["alien-fish-3"].autoplace = { + peaks = { + { + influence = 0.015, + min_influence = 0, + elevation_optimal = scale_elevation(10), + elevation_range = 5 * elevation_scale, + elevation_max_range = 5 * elevation_scale, + tier_from_start_optimal = 0.1, + tier_from_start_range = 0, + tier_from_start_max_range = 0, + tier_from_start_top_property_limit = 0.1, + }, + }, +} + + + +data:extend({ + { + type = "noise-layer", + name = "desert-tree-noise", + }, + { + type = "noise-layer", + name = "temperate-tree-noise", + }, + { + type = "noise-layer", + name = "swamp-tree-noise", + }, + { + type = "noise-layer", + name = "desert-garden-noise", + }, + { + type = "noise-layer", + name = "temperate-garden-noise", + }, + { + type = "noise-layer", + name = "swamp-garden-noise", + }, +}) + +data.raw["noise-expression"]["cliffiness"].expression = noise.define_noise_function(function(x, y, tile, map) + local t = noise.clamp((tile.tier - 0.2) * noise.ceil(noise.var("control-setting:cliffs:richness:multiplier")), 0, 1) -- No cliffs in starting area + return 100 * t +end) +]] + +data.extend{ + { + type = "noise-expression", + name = "octaves", + expression = "-3" + }, + + { + type = "noise-expression", + name = "persistence", + expression = "0.2" + }, + { + type = "noise-expression", + name = "waterline", + expression = "9.4" + }, + { + type = "noise-expression", + name = "elevation_scale", + expression = "5" + }, + { + type = "noise-function", + name = "scale_elevation", + parameters = {"x"}, + expression = "(x - waterline) * elevation_scale + waterline" + }, +} + +--[[local enemy_random_seed = 1 +local function new_random_seed() + enemy_random_seed = enemy_random_seed + 1 + return enemy_random_seed +end +local function worm_autoplace(distance, probability, order, falloff, control_name) + data.extend{{ + type = "noise-function", + name = "worm_placer", + parameters = {"distance", "probability", "falloff", "random_seed"}, + expression = "random_penalty{source = p1, amplitude = probability * 0.5, x = x + random_seed, y = 1}", --TODO: replace y with other constant or x or y + local_expressions = { + d = "distance - starting_area_radius", + p0 = "clamp((d - distance * 128) / 128, 0, 1)", + falloffFactor = "if(falloff, clamp(((distance + 2) * 128 - d) / 128, 0, 1), 1)", + p1 = "p0 * falloffFactor * probability * clamp((waterline - elevation), 0, 1)" + } + }} + + return { + control = control_name, + order = order, + force = "enemy", + probability_expression = "worm_placer(" .. distance ..", " .. probability .. ", " .. tostring(falloff) .. ", " .. new_random_seed() .. ")", + richness_expression = 1, + } +end + +data.raw.turret["small-worm-turret"].autoplace = worm_autoplace(0, 1, "z", true, "enemy-base") +data.raw.turret["medium-worm-turret"].autoplace = worm_autoplace(1, 1, "y", true, "enemy-base") +if data.raw.turret["bob-big-explosive-worm-turret"] then + data.raw.turret["bob-big-explosive-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") +end +if data.raw.turret["bob-big-fire-worm-turret"] then + data.raw.turret["bob-big-fire-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") +end +if data.raw.turret["bob-big-poison-worm-turret"] then + data.raw.turret["bob-big-poison-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") +end +if data.raw.turret["bob-big-piercing-worm-turret"] then + data.raw.turret["bob-big-piercing-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") +end +if data.raw.turret["bob-big-electric-worm-turret"] then + data.raw.turret["bob-big-electric-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") +end +if data.raw.turret["bob-giant-worm-turret"] then + data.raw.turret["bob-giant-worm-turret"].autoplace = worm_autoplace(2, 0.6, "u", false, "enemy-base") +end +if data.raw.turret["behemoth-worm-turret"] then + data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") + data.raw.turret["behemoth-worm-turret"].autoplace = worm_autoplace(2, 0.2, "t", false, "enemy-base") +else + data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(2, 1, "v", false, "enemy-base") +end +data.raw.tree["puffer-nest"].autoplace = worm_autoplace(0, 0.01, "s", false) + +for _, v in pairs(data.raw.turret) do + v.map_generator_bounding_box = nil +end]] + +-- old tries - meh/not working +-- data.raw["noise-expression"]["elevation"].local_expressions = {base = "max(basis_noise{x = x + 4000, y = y, seed0 = map_seed, seed1 = 5, input_scale = 1/64, output_scale = 6},0)"} +-- data.raw["noise-expression"]["elevation"].expression = "(base * elevation_scale) - (waterline * (elevation_scale - 1))" -- Increase gradient for cliffs while leaving waterline unchanged + +-- data.raw.tile["deepwater"].autoplace.probability_expression = "if(elevation <= (waterline*elevation_scale/2), 10, 0)" +-- data.raw.tile["sand-4"].autoplace.probability_expression = "if(distance <= 1, 10000, 0)" + +data.raw["noise-expression"]["elevation"].local_expressions = { + base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 5, input_scale = 1/32, output_scale = 6}", + starting_tile = "if(distance <= 1, 100, 0)", + --small_islands = "if(distance >= starting_area_radius/2, basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 3, input_scale = 1/32, output_scale = 10} - waterline, 0)" +} + +data.raw["noise-expression"]["elevation"].expression = "if(distance <= starting_area_radius/2, min(base - waterline, 0), base - waterline) + starting_tile"-- "min((base - waterline - 2) + starting_tile, 10) + small_islands" + +data.raw.tile["deepwater"].autoplace = {probability_expression = "if(-8 >= elevation, 200 * min(-6 - elevation, 1), -inf)"} +data.raw.tile["water"].autoplace = {probability_expression = "if(0 >= elevation, 100 * min(0 - elevation, 1), -inf)"} +data.raw.tile["sand-4"].autoplace = {probability_expression = "if(elevation >= 0, elevation, -inf)"} + +-- data.raw.tile["sand-5"].autoplace = {probability_expression = "if(elevation >= 0, elevation, -inf)"} -- decided against using this + +data.raw.tree["desert-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 1, source = 0.03, amplitude = 0.01}, -inf)"} --, tile_restriction = {"sand-5"}} +data.raw.tree["temperate-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 2, source = 0.03, amplitude = 0.01}, -inf)"} +data.raw.tree["swamp-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 3, source = 0.03, amplitude = 0.015}, -inf)"} + +data.raw.tree["desert-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 4, source = 0.03, amplitude = 0.01}, -inf)"} --, placement_density = 3} +data.raw.tree["temperate-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 5, source = 0.03, amplitude = 0.01}, -inf)"} +data.raw.tree["swamp-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 6, source = 0.03, amplitude = 0.015}, -inf)"} \ No newline at end of file diff --git a/SeaBlock/mapgen.lua b/SeaBlock/old-mapgen.lua similarity index 100% rename from SeaBlock/mapgen.lua rename to SeaBlock/old-mapgen.lua From 6a01ce4bbd9e81ce85f77bc9d7a72bad02ab48d7 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 4 May 2025 19:09:31 +0200 Subject: [PATCH 020/117] Fixed spacemod integration and missing bob-prefix --- SeaBlock/data-final-fixes/SpaceMod.lua | 9 +++------ SeaBlock/data-final-fixes/unobtainable_items.lua | 2 +- SeaBlock/data-updates/groups.lua | 1 - SeaBlock/data/ScienceCostTweakerM.lua | 2 +- SeaBlock/remote.lua | 6 +++--- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index a06ae2d8..d6e687fc 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -22,7 +22,6 @@ if settings.startup["SpaceX-ignore-tech-multiplier"] then "space-casings", "protection-fields", "fusion-reactor", - "fission-reactor", "space-thrusters", "fuel-cells", "habitation", @@ -46,7 +45,6 @@ local recipes = { "satellite", "drydock-assembly", "fusion-reactor", - "fission-reactor", "hull-component", "protection-field", "space-thruster", @@ -64,7 +62,6 @@ local techs = { "space-casings", "protection-fields", "fusion-reactor", - "fission-reactor", "space-thrusters", "fuel-cells", "habitation", @@ -84,9 +81,9 @@ local upgrades = { ["bob-construction-robot-4"] = "bob-construction-robot-5", -- CircuitProcessing replaces module-3 with module-4, so SpaceMod data-final-fixes -- doesn't find the modules it's expecting. - ["speed-module-4"] = "speed-module-5", - ["efficiency-module-4"] = "efficiency-module-5", - ["productivity-module-4"] = "productivity-module-5", + ["bob-speed-module-4"] = "bob-speed-module-5", + ["bob-efficiency-module-4"] = "bob-efficiency-module-5", + ["bob-productivity-module-4"] = "bob-productivity-module-5", ["bob-fission-reactor-equipment-4"] = "bob-fission-reactor-equipment-4", -- for amount adjustment } diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index e5e036c1..97edbd00 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -83,7 +83,7 @@ for _, v in ipairs({ "gas-separation", "oil-steam-boiler", "petroleum-generator", - "protection-field-goopless", --where does this come from + "protection-field-goopless", --comes from spacemod "pumpjack", "slag-processing-7", "slag-processing-8", diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua index dd42106c..14d8e2d0 100644 --- a/SeaBlock/data-updates/groups.lua +++ b/SeaBlock/data-updates/groups.lua @@ -31,7 +31,6 @@ if mods["SpaceMod"] then "ftl-drive", "fuel-cell", "fusion-reactor", - "fission-reactor", "habitation", "hull-component", "life-support", diff --git a/SeaBlock/data/ScienceCostTweakerM.lua b/SeaBlock/data/ScienceCostTweakerM.lua index cca988d9..931b20b7 100644 --- a/SeaBlock/data/ScienceCostTweakerM.lua +++ b/SeaBlock/data/ScienceCostTweakerM.lua @@ -16,7 +16,7 @@ if mods["ScienceCostTweakerM"] then { type = "item", name = "rocket-silo", amount = 1 }, { type = "item", name = "bob-nitinol-alloy", amount = 100 }, { type = "item", name = "bob-express-bulk-inserter", amount = 2 }, - { type = "item", name = "advanced-processing-unit", amount = 20 }, + { type = "item", name = "bob-advanced-processing-unit", amount = 20 }, }) bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "rocket-silo") bobmods.lib.tech.remove_prerequisite("sct-space-science-pack", "rocket-silo") diff --git a/SeaBlock/remote.lua b/SeaBlock/remote.lua index 26445f3e..0943720c 100644 --- a/SeaBlock/remote.lua +++ b/SeaBlock/remote.lua @@ -59,13 +59,13 @@ local function milestones_presets() { type = "item", name = "electronic-circuit", quantity = 1 }, { type = "item", name = "advanced-circuit", quantity = 1 }, { type = "item", name = "processing-unit", quantity = 1 }, - { type = "item", name = "advanced-processing-unit", quantity = 1 }, + { type = "item", name = "bob-advanced-processing-unit", quantity = 1 }, { type = "item", name = "bob-basic-circuit-board", quantity = 10000, next = "x10" }, { type = "item", name = "electronic-circuit", quantity = 10000, next = "x10" }, { type = "item", name = "advanced-circuit", quantity = 10000, next = "x10" }, { type = "item", name = "processing-unit", quantity = 1000, next = "x10" }, - { type = "item", name = "advanced-processing-unit", quantity = 100, next = "x10" }, + { type = "item", name = "bob-advanced-processing-unit", quantity = 100, next = "x10" }, { type = "item", name = "steel-plate", quantity = 1 }, { type = "item", name = "bob-bronze-alloy", quantity = 1 }, @@ -155,7 +155,7 @@ local function milestones_presets() { type = "item", name = "drydock-structural", quantity = 10 }, { type = "item", name = "drydock-assembly", quantity = 2 }, { type = "item", name = "protection-field", quantity = 1 }, - { type = "item", name = "fission-reactor", quantity = 1 }, + { type = "item", name = "fusion-reactor", quantity = 1 }, { type = "item", name = "habitation", quantity = 1 }, { type = "item", name = "life-support", quantity = 1 }, { type = "item", name = "command", quantity = 1 }, From 5d81e2f0bebcb5362e345e707963e8876ab4e14a Mon Sep 17 00:00:00 2001 From: elvanaud Date: Mon, 5 May 2025 17:20:28 +0200 Subject: [PATCH 021/117] Fixed thermal extractor fluid box and locale --- SeaBlock/data-updates/thermal-extractor.lua | 12 +++++++----- SeaBlock/locale/en/SeaBlock.cfg | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index 51a7fa31..1f15447d 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -55,14 +55,14 @@ data.raw["assembling-machine"]["thermal-extractor"] = extractor extractor.type = "assembling-machine" extractor.crafting_speed = 1 extractor.ingredient_count = 2 -extractor.fluid_boxes = { --TODO: check validity of fluid boxes +extractor.fluid_boxes = { { production_type = "input", base_area = 10, --base_level = -1, volume = 1000, pipe_covers = pipecoverspictures(), - pipe_connections = { { flow_direction = "input", position = { 3, 4.4 }, direction = defines.direction.north } }, + pipe_connections = { { flow_direction = "input", position = { 3, - 4 }, direction = defines.direction.north } }, }, { production_type = "output", @@ -70,7 +70,7 @@ extractor.fluid_boxes = { --TODO: check validity of fluid boxes --base_level = 1, volume = 1000, pipe_covers = pipecoverspictures(), - pipe_connections = { { flow_direction = "output", position = { -3, 4.4 }, direction = defines.direction.south } }, + pipe_connections = { { flow_direction = "output", position = { -3, 4 }, direction = defines.direction.south } }, }, } extractor.animation = { @@ -84,6 +84,7 @@ extractor.fixed_recipe = "thermal-extractor-water" bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction-2", "thermal-extractor-water") move_item("thermal-extractor", "water-treatment-building", "f[thermal-extractor]-b[extractor]", "item") bobmods.lib.recipe.add_ingredient("thermal-extractor", { type = "item", name = "thermal-bore", amount = 1 }) +extractor.vector_to_place_result = nil -- remove the yellow arrow of the mining drill local bore = data.raw["mining-drill"]["thermal-bore"] data.raw["mining-drill"]["thermal-bore"] = nil @@ -91,7 +92,7 @@ data.raw["assembling-machine"]["thermal-bore"] = bore bore.type = "assembling-machine" bore.crafting_speed = 1 bore.ingredient_count = 1 -bore.fluid_boxes = { --TODO: check this +bore.fluid_boxes = { { production_type = "output", base_area = 1, @@ -101,12 +102,13 @@ bore.fluid_boxes = { --TODO: check this pipe_connections = { { flow_direction = "output", - positions = { { 1, -1.4 }, { 1.4, -1 }, { -1, 1.4 }, { -1.4, 1 } }, + positions = { { 1, -1 }, { 1, -1 }, { -1, 1 }, { -1, 1 } }, direction = defines.direction.north, }, }, }, } +bore.vector_to_place_result = nil local function makesheet(sheet, count, d) local r = table.deepcopy(sheet) diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg index 9ada5263..64f8b568 100644 --- a/SeaBlock/locale/en/SeaBlock.cfg +++ b/SeaBlock/locale/en/SeaBlock.cfg @@ -12,6 +12,8 @@ liquid-raw-vegetable-oil-filtering-2=Raw vegetable oil ceramic filtering liquid-raw-fish-oil-filtering-1=Raw fish oil charcoal filtering liquid-raw-fish-oil-filtering-2=Raw fish oil ceramic filtering coke-purification-2=Charcoal purification +thermal-extractor-water=Produce thermal water +thermal-bore-water=Produce thermal water [item-name] charcoal=Charcoal From 8ac04f9d581e58cdb2af1a4e5888fd56420a3aab Mon Sep 17 00:00:00 2001 From: elvanaud Date: Tue, 29 Jul 2025 21:41:37 +0200 Subject: [PATCH 022/117] Fixed some bugs : - thermal extractor graphics has changed (still need to fix the animations) - Crash when not using bobwarfare - Unnecessary line of code since angels was patched (removing glass from red science recipe) - Somewhat cleaned the dummy lab code --- SeaBlock/data-final-fixes.lua | 2 - .../data-final-fixes/unobtainable_items.lua | 33 +++++++++++----- SeaBlock/data-updates/military.lua | 12 +++--- SeaBlock/data-updates/thermal-extractor.lua | 39 +++++++++++-------- 4 files changed, 53 insertions(+), 33 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 598d5559..3a628576 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -39,5 +39,3 @@ for _, v in pairs(data.raw.character) do table.insert(v.crafting_categories, "crafting-handonly") end end - -seablock.lib.removeingredient("automation-science-pack", "bob-glass") -- For some reason it isn't removed earlier diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index 97edbd00..e38f81ad 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -253,15 +253,30 @@ end -- Clear the list of science packs that alien lab can take -- This prevents YAFC warning if data.raw.lab["bob-lab-alien"] then - -- data.raw.lab["bob-lab-alien"].inputs = {} -- disabled because of the following + data.raw.lab["bob-lab-alien"].inputs = {} end --- TODO: We now need a dummy lab that can take all the science packs or else some techs can't load (even if hidden) -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "space-science-pack") + +-- We now need a dummy lab that can take all the science packs or else some techs can't load (even if hidden), (we could also use "bob-lab-alien" which is hidden in data-updates/military.lua) +local dummyLab = table.deepcopy(data.raw.lab["lab"]) +dummyLab.name = "dummy-lab" +dummyLab.hidden = true +--dummyLab.hidden_in_factoriopedia = true +bobmods.lib.safe_insert(dummyLab.inputs, "space-science-pack") if data.raw.tool["sct-bio-science-pack"] then - bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "sct-bio-science-pack") + bobmods.lib.safe_insert(dummyLab.inputs, "sct-bio-science-pack") end -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "automation-science-pack") -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "logistic-science-pack") -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "chemical-science-pack") -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "production-science-pack") -bobmods.lib.safe_insert(data.raw.lab["bob-lab-alien"].inputs, "utility-science-pack") \ No newline at end of file +bobmods.lib.safe_insert(dummyLab.inputs, "automation-science-pack") +bobmods.lib.safe_insert(dummyLab.inputs, "logistic-science-pack") +bobmods.lib.safe_insert(dummyLab.inputs, "chemical-science-pack") +bobmods.lib.safe_insert(dummyLab.inputs, "production-science-pack") +bobmods.lib.safe_insert(dummyLab.inputs, "utility-science-pack") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-science-pack-gold") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-purple") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-blue") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-red") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-green") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-orange") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-yellow") +bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack") + +data:extend({dummyLab}) \ No newline at end of file diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index 66231ff1..8a645de5 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -515,12 +515,14 @@ for _, v in pairs(mil_recipes) do end -- Remove hidden upgrade -data.raw["ammo-turret"]["bob-gun-turret-2"].next_upgrade = nil -data.raw["ammo-turret"]["bob-sniper-turret-2"].next_upgrade = nil +if mods["bobwarfare"] then + data.raw["ammo-turret"]["bob-gun-turret-2"].next_upgrade = nil + data.raw["ammo-turret"]["bob-sniper-turret-2"].next_upgrade = nil + data.raw["electric-turret"]["bob-plasma-turret-2"].next_upgrade = nil + data.raw["artillery-turret"]["bob-artillery-turret-2"].next_upgrade = nil + data.raw["artillery-wagon"]["bob-artillery-wagon-2"].next_upgrade = nil +end data.raw["electric-turret"]["laser-turret"].next_upgrade = nil -data.raw["electric-turret"]["bob-plasma-turret-2"].next_upgrade = nil -data.raw["artillery-turret"]["bob-artillery-turret-2"].next_upgrade = nil -data.raw["artillery-wagon"]["bob-artillery-wagon-2"].next_upgrade = nil bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-residual") diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index 1f15447d..c3f70a72 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -73,7 +73,7 @@ extractor.fluid_boxes = { pipe_connections = { { flow_direction = "output", position = { -3, 4 }, direction = defines.direction.south } }, }, } -extractor.animation = { +extractor.graphics_set.animation = { -- TODO: fix this animation north = makeextractorlayers(false, false), east = makeextractorlayers(true, true), south = makeextractorlayers(false, false), @@ -121,22 +121,27 @@ local function makesheet(sheet, count, d) end return r end -local function makeborelayers(d) - return { - layers = { - makesheet(bore.graphics_set.animation.layers[1], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), - makesheet(bore.graphics_set.animation.layers[2], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), - bore.wet_mining_graphics_set.animation.north.layers[1], - bore.wet_mining_graphics_set.animation.north.layers[2], - }, - } -end -bore.animation = { - north = makeborelayers(0), - east = makeborelayers(1), - south = makeborelayers(2), - west = makeborelayers(3), -} +-- local function makeborelayers(d) +-- return { +-- layers = { +-- makesheet(bore.graphics_set.animation.layers[1], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), +-- makesheet(bore.graphics_set.animation.layers[2], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), +-- bore.wet_mining_graphics_set.animation.north.layers[1], +-- bore.wet_mining_graphics_set.animation.north.layers[2], +-- }, +-- } +-- end +-- bore.animation = { +-- north = makeborelayers(0), +-- east = makeborelayers(1), +-- south = makeborelayers(2), +-- west = makeborelayers(3), +-- } +table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[1]) -- TODO: probably fix this graphic_set +table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[2]) +bore.graphics_set.animation.north.layers[3].repeat_count = 40 +bore.graphics_set.animation.north.layers[4].repeat_count = 40 + bore.crafting_categories = { "thermal-bore" } bore.fixed_recipe = "thermal-bore-water" bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction", "thermal-bore-water") From 600412463b38af0039eeecf46581e3ea99a5b99a Mon Sep 17 00:00:00 2001 From: elvanaud Date: Thu, 7 Aug 2025 15:13:22 +0200 Subject: [PATCH 023/117] Patched to use the new angels internal names Also fixed a couple bugs --- SeaBlock/control.lua | 4 +- SeaBlock/data-final-fixes.lua | 6 +- SeaBlock/data-final-fixes/icons.lua | 16 +- SeaBlock/data-final-fixes/mapgen.lua | 24 +-- SeaBlock/data-final-fixes/recipe.lua | 26 +-- SeaBlock/data-final-fixes/tech-tree.lua | 8 +- .../data-final-fixes/unobtainable_items.lua | 102 +++++----- SeaBlock/data-updates/algae.lua | 58 +++--- .../data-updates/building-prerequisites.lua | 60 +++--- SeaBlock/data-updates/catalyst-recipes.lua | 82 ++++---- SeaBlock/data-updates/clowns.lua | 48 ++--- SeaBlock/data-updates/coal.lua | 40 ++-- SeaBlock/data-updates/concrete.lua | 30 +-- SeaBlock/data-updates/fuel.lua | 52 +++--- SeaBlock/data-updates/groups.lua | 6 +- SeaBlock/data-updates/landfill.lua | 14 +- SeaBlock/data-updates/military.lua | 36 ++-- SeaBlock/data-updates/misc.lua | 130 ++++++------- SeaBlock/data-updates/other-mods.lua | 6 +- SeaBlock/data-updates/petrochem.lua | 100 +++++----- SeaBlock/data-updates/rubber.lua | 12 +- SeaBlock/data-updates/slag-processing.lua | 130 ++++++------- SeaBlock/data-updates/startup.lua | 26 +-- SeaBlock/data-updates/sulfur.lua | 22 +-- SeaBlock/data-updates/thermal-extractor.lua | 38 ++-- SeaBlock/data-updates/unobtainable-items.lua | 176 +++++++++--------- SeaBlock/data-updates/wood.lua | 57 +++--- SeaBlock/data/misc.lua | 2 +- SeaBlock/data/recipe.lua | 12 +- SeaBlock/data/tables.lua | 34 ++-- SeaBlock/data/tech-tree.lua | 50 ++--- SeaBlock/lib.lua | 45 +++-- SeaBlock/new-mapgen.lua | 12 +- SeaBlock/prototypes/item.lua | 4 +- SeaBlock/prototypes/recipe-category.lua | 8 +- SeaBlock/prototypes/recipe.lua | 50 ++--- SeaBlock/prototypes/rockchest.lua | 2 +- SeaBlock/prototypes/technology.lua | 12 +- SeaBlock/remote.lua | 15 +- 39 files changed, 787 insertions(+), 768 deletions(-) diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua index c8a4b2f7..9d69b582 100644 --- a/SeaBlock/control.lua +++ b/SeaBlock/control.lua @@ -22,7 +22,7 @@ function seablock.create_rock_chest(surface, pos) end if has_items then - local chest = surface.create_entity({ name = "rock-chest", position = pos, force = game.forces.neutral }) + local chest = surface.create_entity({ name = "sb-rock-chest", position = pos, force = game.forces.neutral }) for item, quantity in pairs(storage.starting_items) do if quantity > 0 then chest.insert({ name = item, count = quantity }) @@ -58,7 +58,7 @@ local function init() end end storage.unlocks = { - ["angels-ore3-crushed"] = { "sb-startup1", "bio-wood-processing" }, + ["angels-ore3-crushed"] = { "sb-startup1", "angels-bio-wood-processing" }, ["bob-basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" }, } if prototypes.technology["sct-automation-science-pack"] then diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 3a628576..bf3137aa 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -1,6 +1,6 @@ -- Adjust rubber production amount to how it was in petrochem 0.7.9. -- TODO: Revisit this after Angel adds more liquid rubber recipes -seablock.lib.substresult("liquid-rubber-1", "liquid-rubber", nil, 20) +seablock.lib.substresult("angels-liquid-rubber", "angels-liquid-rubber", nil, 20) -- Reduce burner heat source neighbour bonus local reactors = { @@ -32,10 +32,10 @@ require("data-final-fixes/SpaceMod") data.raw.recipe["copper-cable"].allow_decomposition = true -data.raw.recipe["paper-bleaching-1"].allow_decomposition = true +data.raw.recipe["angels-solid-paper"].allow_decomposition = true for _, v in pairs(data.raw.character) do if v.crafting_categories then - table.insert(v.crafting_categories, "crafting-handonly") + table.insert(v.crafting_categories, "sb-crafting-handonly") end end diff --git a/SeaBlock/data-final-fixes/icons.lua b/SeaBlock/data-final-fixes/icons.lua index 2bc55e44..8d3161ea 100644 --- a/SeaBlock/data-final-fixes/icons.lua +++ b/SeaBlock/data-final-fixes/icons.lua @@ -1,12 +1,12 @@ -- Revert Artisanal Reskins recipe icons if mods["reskins-angels"] then local slag_processing_list = { - "slag-processing-1", - "slag-processing-2", - "slag-processing-3", - "slag-processing-4", - "slag-processing-5", - "slag-processing-6", + "angels-slag-processing-1", + "angels-slag-processing-2", + "angels-slag-processing-3", + "angels-slag-processing-4", + "angels-slag-processing-5", + "angels-slag-processing-6", } for _, name in pairs(slag_processing_list) do seablock.reskins.clear_icon_specification(name, "recipe") @@ -15,5 +15,5 @@ end -- Remove I overlay from recipes seablock.reskins.clear_icon_specification("explosives", "recipe") -seablock.reskins.clear_icon_specification("liquid-rubber-1", "recipe") -seablock.reskins.clear_icon_specification("solid-rubber", "recipe") +seablock.reskins.clear_icon_specification("angels-liquid-rubber", "recipe") +seablock.reskins.clear_icon_specification("angels-solid-rubber", "recipe") diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index c47112d9..599eecdd 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -19,13 +19,13 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { }, entity = { settings = { - ["desert-garden"] = {}, - ["temperate-garden"] = {}, - ["swamp-garden"] = {}, + ["angels-desert-garden"] = {}, + ["angels-temperate-garden"] = {}, + ["angels-swamp-garden"] = {}, - ["desert-tree"] = {}, - ["temperate-tree"] = {}, - ["swamp-tree"] = {}, + ["angels-desert-tree"] = {}, + ["angels-temperate-tree"] = {}, + ["angels-swamp-tree"] = {}, } } } @@ -44,12 +44,12 @@ end -- No trees for k, v in pairs(data.raw.tree) do if - k ~= "temperate-garden" - and k ~= "desert-garden" - and k ~= "swamp-garden" - and k ~= "temperate-tree" - and k ~= "desert-tree" - and k ~= "swamp-tree" + k ~= "angels-temperate-garden" + and k ~= "angels-desert-garden" + and k ~= "angels-swamp-garden" + and k ~= "angels-temperate-tree" + and k ~= "angels-desert-tree" + and k ~= "angels-swamp-tree" and k ~= "puffer-nest" then v.autoplace = nil diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 3b50ef9b..9450e96b 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -1,8 +1,8 @@ -- Revert massive buff of insulated wire recipe bobmods.lib.recipe.set_energy_required("bob-insulated-cable", 2) -seablock.lib.substingredient("bob-insulated-cable", "tinned-copper-cable", nil, 8) -seablock.lib.substingredient("bob-insulated-cable", "rubber", nil, 8) -bobmods.lib.recipe.set_result("bob-insulated-cable", { type = "item", name = "insulated-cable", amount = 8 }) +seablock.lib.substingredient("bob-insulated-cable", "bob-tinned-copper-cable", nil, 8) +seablock.lib.substingredient("bob-insulated-cable", "bob-rubber", nil, 8) +bobmods.lib.recipe.set_result("bob-insulated-cable", { type = "item", name = "bob-insulated-cable", amount = 8 }) -- Combine Stone and Crushed Stone local function replace_stone(recipe) @@ -10,11 +10,11 @@ local function replace_stone(recipe) for _, ingredient in pairs(recipe.ingredients) do if ingredient.name == "stone" then ingredient.amount = ingredient.amount * 2 - elseif ingredient.name == "stone-crushed" then + elseif ingredient.name == "angels-stone-crushed" then ingredient.name = "stone" elseif ingredient[1] == "stone" then ingredient[2] = ingredient[2] * 2 - elseif ingredient[1] == "stone-crushed" then + elseif ingredient[1] == "angels-stone-crushed" then ingredient[1] = "stone" end end @@ -23,21 +23,21 @@ local function replace_stone(recipe) for _, result in pairs(recipe.results) do if result.name == "stone" then result.amount = result.amount * 2 - elseif result.name == "stone-crushed" then + elseif result.name == "angels-stone-crushed" then result.name = "stone" elseif result[1] == "stone" then result[2] = result[2] * 2 - elseif result[1] == "stone-crushed" then + elseif result[1] == "angels-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 + elseif recipe.result == "angels-stone-crushed" then recipe.result = "stone" end - if recipe.main_product == "stone-crushed" then + if recipe.main_product == "angels-stone-crushed" then recipe.main_product = "stone" end end @@ -52,11 +52,11 @@ for _, recipe in pairs(data.raw.recipe) do replace_stone(recipe) end end -bobmods.lib.recipe.hide("stone-crushed") -seablock.lib.hide("item", "stone-crushed") +bobmods.lib.recipe.hide("angels-stone-from-crushed-stone") +seablock.lib.hide("item", "angels-stone-crushed") -if data.raw.recipe["stone-crushed-dissolution"] then - data.raw.recipe["stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon( +if data.raw.recipe["angels-stone-crushed-dissolution"] then + data.raw.recipe["angels-stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon( nil, { { 142, 079, 028 }, { 107, 062, 021 }, { 075, 040, 015 } }, { "stone" } diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 8bcbbd7a..ce67b191 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -14,12 +14,12 @@ seablock.lib.hide_technology("bob-electrolysis-2") seablock.lib.hide_technology("bob-chemical-processing-1") seablock.lib.hide_technology("bob-chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing-2") -bobmods.lib.tech.add_prerequisite("circuit-network", "bio-paper-1") -bobmods.lib.tech.remove_prerequisite("rubbers", "circuit-network") +bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-bio-wood-processing-2") +bobmods.lib.tech.add_prerequisite("circuit-network", "angels-bio-paper-1") +bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network") -- Unhide solid fuel from hydrogen seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen") seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4) -bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "chlorine-processing-4", "chlorine-processing-2") +bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "angels-chlorine-processing-4", "angels-chlorine-processing-2") diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index e38f81ad..be91a495 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -1,8 +1,8 @@ -- Rename internal item names to keep mods like FNEI searching properly local itemrename = { - ["solid-coke"] = "wood-charcoal", - ["filter-coal"] = "filter-charcoal", - ["pellet-coke"] = "pellet-charcoal", + ["angels-solid-coke"] = "angels-wood-charcoal", + ["angels-filter-coal"] = "angels-filter-charcoal", + ["angels-pellet-coke"] = "angels-pellet-charcoal", } for k, v in pairs(itemrename) do @@ -47,53 +47,53 @@ for _, v in ipairs({ "bob-alien-artifact-purple", "bob-alien-artifact-red", "bob-alien-artifact-yellow", - "angels-chemical-void-gas-natural-1", - "angels-chemical-void-liquid-condensates", - "angels-water-void-crystal-matrix", - "angels-water-void-bob-lithia-water", - "angelsore1-crushed-hand", - "angelsore3-crushed-hand", + "angels-chemical-void-angels-gas-natural-1", + "angels-chemical-void-angels-liquid-condensates", + "angels-water-void-crystal-matrix", -- TODO: are those two already removed ? + --"angels-water-void-bob-lithia-water", + "angels-ore1-crushed-hand", + "angels-ore3-crushed-hand", "big-burner-generator", - "bio-tile", + "angels-bio-tile", "bob-carbon-from-wood", "bob-resin-wood", "burner-generator", "burner-mining-drill", - "carbon-from-charcoal", - "coal-cracking-1", - "coal-cracking-2", - "coal-cracking-3", - "coal-crushed", - "condensates-oil-refining", - "condensates-refining", + "angels-carbon-from-charcoal", + "angels-coal-cracking-1", + "angels-coal-cracking-2", + "angels-coal-cracking-3", + "angels-coal-crushed", + "angels-condensates-oil-refining", + "angels-condensates-refining", "diesel-fuel", "electric-mining-drill", - "empty-crystal-matrix-barrel", + "empty-crystal-matrix-barrel", -- TODO: where does this item come from ? "empty-diesel-fuel-barrel", - "empty-gas-natural-1-barrel", - "empty-liquid-condensates-barrel", + "empty-angels-gas-natural-1-barrel", + "empty-angels-liquid-condensates-barrel", "empty-bob-lithia-water-barrel", "crystal-matrix-barrel", - "fill-diesel-fuel-barrel", - "gas-natural-1-barrel", - "liquid-condensates-barrel", + "diesel-fuel-barrel", + "angels-gas-natural-1-barrel", + "angels-liquid-condensates-barrel", "bob-lithia-water-barrel", - "gas-fractioning-condensates", + "angels-gas-fractioning-condensates", "gas-phosgene", - "gas-separation", + "angels-gas-separation", "oil-steam-boiler", "petroleum-generator", "protection-field-goopless", --comes from spacemod "pumpjack", - "slag-processing-7", - "slag-processing-8", - "slag-processing-9", - "solid-coke", - "solid-coke-sulfur", - "thermal-water-filtering-1", - "thermal-water-filtering-2", - "water-thermal-lithia", - "wood-charcoal", + "angels-slag-processing-7", + "angels-slag-processing-8", + "angels-slag-processing-9", + "angels-solid-coke", + "angels-solid-coke-sulfur", + "angels-thermal-water-filtering-1", + "angels-thermal-water-filtering-2", + "water-thermal-lithia", -- TODO: where does this come from ? + "angels-wood-charcoal", }) do removerecipes[v] = true end @@ -103,20 +103,20 @@ end local unobtainable = {} for _, v in ipairs({ "big-burner-generator", - "bio-tile", + "angels-bio-tile", "burner-generator", "burner-mining-drill", "coal", - "coal-crushed", - "diesel-fuel", --doesn't seem to exist anymore ?? + "angels-coal-crushed", + "diesel-fuel", "diesel-fuel-barrel", "electric-mining-drill", - "gas-natural-1", - "gas-natural-1-barrel", - "gas-phosgene", + "angels-gas-natural-1", + "angels-gas-natural-1-barrel", + "gas-phosgene", -- TODO: what happened to those items ? I can't find them in angels/bob/ks power "gas-phosgene-barrel", - "liquid-condensates", - "liquid-condensates-barrel", + "angels-liquid-condensates", + "angels-liquid-condensates-barrel", "bob-lithia-water", "bob-lithia-water-barrel", "oil-steam-boiler", @@ -270,13 +270,15 @@ bobmods.lib.safe_insert(dummyLab.inputs, "logistic-science-pack") bobmods.lib.safe_insert(dummyLab.inputs, "chemical-science-pack") bobmods.lib.safe_insert(dummyLab.inputs, "production-science-pack") bobmods.lib.safe_insert(dummyLab.inputs, "utility-science-pack") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-science-pack-gold") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-purple") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-blue") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-red") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-green") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-orange") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-yellow") -bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack") +if mods["bobtech"] then + bobmods.lib.safe_insert(dummyLab.inputs, "bob-science-pack-gold") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-purple") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-blue") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-red") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-green") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-orange") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-yellow") + bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack") +end data:extend({dummyLab}) \ No newline at end of file diff --git a/SeaBlock/data-updates/algae.lua b/SeaBlock/data-updates/algae.lua index 6a8a0ada..9f39910a 100644 --- a/SeaBlock/data-updates/algae.lua +++ b/SeaBlock/data-updates/algae.lua @@ -1,67 +1,67 @@ -- Speed up algae farm -data.raw["assembling-machine"]["algae-farm"].crafting_speed = 0.75 +data.raw["assembling-machine"]["angels-algae-farm"].crafting_speed = 0.75 -- Green algae -bobmods.lib.recipe.set_category("algae-green", "bio-processing") +bobmods.lib.recipe.set_category("angels-algae-green", "angels-bio-processing") -- Improved algae processing -bobmods.lib.tech.remove_prerequisite("bio-processing-green", "water-treatment") -bobmods.lib.tech.add_prerequisite("bio-processing-green", "bio-wood-processing-2") -bobmods.lib.tech.add_prerequisite("bio-processing-green", "water-washing-1") -data.raw.technology["bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" } +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-green", "angels-water-treatment") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-green", "angels-bio-wood-processing-2") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-green", "angels-water-washing-1") +data.raw.technology["angels-bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" } -- Move Lithia Salt to Thermal Water Extraction -seablock.lib.moveeffect("algae-brown-burning", "bio-processing-green", "thermal-water-extraction", 2) -bobmods.lib.tech.add_prerequisite("bob-lithium-processing", "thermal-water-extraction") +seablock.lib.moveeffect("angels-algae-brown-burning", "angels-bio-processing-green", "angels-thermal-water-extraction", 2) +bobmods.lib.tech.add_prerequisite("bob-lithium-processing", "angels-thermal-water-extraction") -- Change lithium crafting category -bobmods.lib.recipe.set_category("lithium", "petrochem-electrolyser") -bobmods.lib.recipe.set_category("lithium-water-electrolysis", "petrochem-electrolyser") +bobmods.lib.recipe.set_category("bob-lithium", "angels-petrochem-electrolyser") +bobmods.lib.recipe.set_category("bob-lithium-water-electrolysis", "angels-petrochem-electrolyser") -bobmods.lib.tech.remove_recipe_unlock("water-treatment-3", "solid-lithium") -bobmods.lib.recipe.hide("solid-lithium") +bobmods.lib.tech.remove_recipe_unlock("angels-water-treatment-3", "angels-solid-lithium") +bobmods.lib.recipe.hide("angels-solid-lithium") -- TODO: move angels-solid-lithium to the same group as the recipe or the other way around -- Move Sodium Carbonate from Brown Algae to Sodium processing 2 -seablock.lib.moveeffect("algae-brown-burning-wash", "bio-processing-green", "sodium-processing-2", nil) +seablock.lib.moveeffect("angels-algae-brown-burning-wash", "angels-bio-processing-green", "angels-sodium-processing-2", nil) -- Move Methanol from Cellulose Fibre to Advanced chemistry 1 -seablock.lib.moveeffect("gas-methanol-from-wood", "bio-processing-green", "angels-advanced-chemistry-1", 5) +seablock.lib.moveeffect("angels-gas-methanol-from-wood", "angels-bio-processing-green", "angels-advanced-chemistry-1", 5) -- Make Red Algae depend on Blue Algae instead of Green Algae -bobmods.lib.tech.remove_prerequisite("bio-processing-red", "bio-processing-green") -bobmods.lib.tech.add_prerequisite("bio-processing-red", "bio-processing-blue") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-red", "angels-bio-processing-green") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-red", "angels-bio-processing-blue") -- Blue algae -bobmods.lib.tech.replace_prerequisite("bio-processing-blue", "bio-processing-red", "bio-processing-green") -bobmods.lib.tech.remove_prerequisite("bio-processing-blue", "chemical-science-pack") -bobmods.lib.tech.remove_science_pack("bio-processing-blue", "chemical-science-pack") -bobmods.lib.tech.remove_recipe_unlock("bio-processing-blue", "algae-farm-4") -bobmods.lib.recipe.set_category("algae-blue", "bio-processing-2") +bobmods.lib.tech.replace_prerequisite("angels-bio-processing-blue", "angels-bio-processing-red", "angels-bio-processing-green") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "chemical-science-pack") +bobmods.lib.tech.remove_science_pack("angels-bio-processing-blue", "chemical-science-pack") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-processing-blue", "angels-algae-farm-4") +bobmods.lib.recipe.set_category("angels-algae-blue", "angels-bio-processing-2") -- Red algae. Make Calcium carbonate in an assembling machine, not a liquefier -bobmods.lib.recipe.set_category("solid-calcium-carbonate", "advanced-crafting") +bobmods.lib.recipe.set_category("angels-solid-calcium-carbonate", "advanced-crafting") -- Alien bacteria -bobmods.lib.recipe.set_category("alien-bacteria", "bio-processing-3") +bobmods.lib.recipe.set_category("angels-alien-bacteria", "angels-bio-processing-3") -- Make these craftable by hand -bobmods.lib.recipe.set_category("solid-alginic-acid", "crafting") +bobmods.lib.recipe.set_category("angels-solid-alginic-acid", "crafting") -- Fix handcrafting trying to use wrong crafting path -data.raw.recipe["cellulose-fiber-raw-wood"].allow_as_intermediate = false +data.raw.recipe["angels-cellulose-fiber-raw-wood"].allow_as_intermediate = false -- Speed up algae->cellulose fiber crafting -data.raw.recipe["cellulose-fiber-algae"].energy_required = 2 +data.raw.recipe["angels-cellulose-fiber"].energy_required = 2 -- Speed up cellulose->wood pellet crafting -data.raw.recipe["wood-pellets"].energy_required = 3 +data.raw.recipe["angels-wood-pellets"].energy_required = 3 -- Reduce cost of Algae farm 2 angelsmods.functions.RB.build({ { type = "recipe", - name = "algae-farm-2", + name = "angels-algae-farm-2", energy_required = 5, enabled = false, ingredients = { @@ -71,6 +71,6 @@ angelsmods.functions.RB.build({ { type = "item", name = "t0-brick", amount = 11 }, { type = "item", name = "t0-pipe", amount = 18 }, }, - results = {{type = "item", name = "algae-farm-2", amount = 1}} + results = {{type = "item", name = "angels-algae-farm-2", amount = 1}} }, }) diff --git a/SeaBlock/data-updates/building-prerequisites.lua b/SeaBlock/data-updates/building-prerequisites.lua index 16e7fa7c..c0bffcb5 100644 --- a/SeaBlock/data-updates/building-prerequisites.lua +++ b/SeaBlock/data-updates/building-prerequisites.lua @@ -1,66 +1,66 @@ -- Bronze prerequisites bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "bob-alloy-processing") bobmods.lib.tech.add_prerequisite("angels-cooling", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("bio-nutrient-paste", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("ore-floatation", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("ore-processing-1", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("powder-metallurgy-2", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("strand-casting-1", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "bob-alloy-processing") -bobmods.lib.tech.add_prerequisite("water-washing-2", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-nutrient-paste", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-ore-floatation", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-ore-processing-1", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-powder-metallurgy-2", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-strand-casting-1", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "bob-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "bob-alloy-processing") -- Clay Brick prerequisites -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "angels-stone-smelting-1") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "angels-stone-smelting-1") bobmods.lib.tech.add_prerequisite("angels-cooling", "angels-stone-smelting-1") bobmods.lib.tech.add_prerequisite("angels-metallurgy-2", "angels-stone-smelting-1") bobmods.lib.tech.add_prerequisite("fluid-handling", "angels-stone-smelting-1") -bobmods.lib.tech.add_prerequisite("gardens", "angels-stone-smelting-1") +bobmods.lib.tech.add_prerequisite("angels-gardens", "angels-stone-smelting-1") -- Brass prerequisites bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "bob-zinc-processing") bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "bob-zinc-processing") bobmods.lib.tech.add_prerequisite("automation-3", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-desert-farm", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-refugium-puffer-1", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-desert-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-refugium-puffer-1", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farm", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farm", "bob-zinc-processing") bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("slag-processing-2", "bob-zinc-processing") -bobmods.lib.tech.add_prerequisite("water-treatment-3", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-slag-processing-2", "bob-zinc-processing") +bobmods.lib.tech.add_prerequisite("angels-water-treatment-3", "bob-zinc-processing") -- Concrete Brick prerequisites bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "angels-stone-smelting-2") bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("bio-desert-farm", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("bio-refugium-hatchery", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("slag-processing-2", "angels-stone-smelting-2") -bobmods.lib.tech.add_prerequisite("water-treatment-3", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-bio-desert-farm", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farm", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farm", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-bio-refugium-hatchery", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-slag-processing-2", "angels-stone-smelting-2") +bobmods.lib.tech.add_prerequisite("angels-water-treatment-3", "angels-stone-smelting-2") -- Titanium prerequisites bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "bob-titanium-processing") bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "bob-titanium-processing") bobmods.lib.tech.add_prerequisite("automation-4", "bob-titanium-processing") -bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "bob-titanium-processing") -bobmods.lib.tech.add_prerequisite("slag-processing-3", "bob-titanium-processing") -bobmods.lib.tech.add_prerequisite("water-treatment-4", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("angels-slag-processing-3", "bob-titanium-processing") +bobmods.lib.tech.add_prerequisite("angels-water-treatment-4", "bob-titanium-processing") -- Reinforced concrete brick bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "angels-stone-smelting-3") bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "angels-stone-smelting-3") -bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "angels-stone-smelting-3") -bobmods.lib.tech.add_prerequisite("slag-processing-3", "angels-stone-smelting-3") -bobmods.lib.tech.add_prerequisite("water-treatment-4", "angels-stone-smelting-3") +bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "angels-stone-smelting-3") +bobmods.lib.tech.add_prerequisite("angels-slag-processing-3", "angels-stone-smelting-3") +bobmods.lib.tech.add_prerequisite("angels-water-treatment-4", "angels-stone-smelting-3") -- Copper tungsten / tungsten carbide prerequisites -bobmods.lib.tech.add_prerequisite("ore-processing-5", "bob-tungsten-alloy-processing") +bobmods.lib.tech.add_prerequisite("angels-ore-processing-5", "bob-tungsten-alloy-processing") -- Nitinol prerequisites -bobmods.lib.tech.add_prerequisite("ore-processing-5", "bob-nitinol-processing") +bobmods.lib.tech.add_prerequisite("angels-ore-processing-5", "bob-nitinol-processing") -- Advanced circuit bobmods.lib.tech.add_prerequisite("tank", "advanced-circuit") -- Processing unit -bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "processing-unit") +bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "processing-unit") diff --git a/SeaBlock/data-updates/catalyst-recipes.lua b/SeaBlock/data-updates/catalyst-recipes.lua index 97d039ed..294ad382 100644 --- a/SeaBlock/data-updates/catalyst-recipes.lua +++ b/SeaBlock/data-updates/catalyst-recipes.lua @@ -1,65 +1,65 @@ -- Update catalyst recipes -bobmods.lib.tech.remove_recipe_unlock("basic-chemistry-3", "catalyst-metal-red") -seablock.lib.hide("item", "catalyst-metal-red") -bobmods.lib.recipe.hide("catalyst-metal-red") +bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry-3", "angels-catalyst-metal-red") +seablock.lib.hide("item", "angels-catalyst-metal-red") +bobmods.lib.recipe.hide("angels-catalyst-metal-red") -bobmods.lib.recipe.set_ingredients("catalyst-metal-green", { - { type = "item", name = "catalyst-metal-carrier", amount = 10 }, +bobmods.lib.recipe.set_ingredients("angels-catalyst-metal-green", { + { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 }, { type = "item", name = "copper-ore", amount = 1 }, { type = "item", name = "iron-ore", amount = 1 }, }) -bobmods.lib.recipe.set_ingredients("catalyst-metal-blue", { - { type = "item", name = "catalyst-metal-carrier", amount = 10 }, +bobmods.lib.recipe.set_ingredients("angels-catalyst-metal-blue", { + { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 }, { type = "item", name = "bob-bauxite-ore", amount = 1 }, { type = "item", name = "bob-silver-ore", amount = 1 }, }) -bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "catalyst-metal-purple") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "sb-catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("liquid-acetic-acid-catalyst", "catalyst-metal-red", "catalyst-metal-green") -bobmods.lib.recipe.replace_ingredient("gas-ammonia", "catalyst-metal-red", "catalyst-metal-green") -bobmods.lib.recipe.replace_ingredient("catalyst-steam-cracking-naphtha", "catalyst-metal-red", "catalyst-metal-green") +bobmods.lib.recipe.replace_ingredient("angels-liquid-acetic-acid-catalyst", "angels-catalyst-metal-red", "angels-catalyst-metal-green") +bobmods.lib.recipe.replace_ingredient("angels-gas-ammonia", "angels-catalyst-metal-red", "angels-catalyst-metal-green") +bobmods.lib.recipe.replace_ingredient("angels-catalyst-steam-cracking-naphtha", "angels-catalyst-metal-red", "angels-catalyst-metal-green") -bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanol", "catalyst-metal-green", "catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("gas-acid-catalyst", "catalyst-metal-green", "catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("liquid-styrene-catalyst", "catalyst-metal-green", "catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("gas-benzene-catalyst", "catalyst-metal-green", "catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("liquid-propionic-acid-catalyst", "catalyst-metal-green", "catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("catalyst-steam-cracking-butane", "catalyst-metal-green", "catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanol", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-gas-acid-catalyst", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-liquid-styrene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-gas-benzene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-liquid-propionic-acid", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") +bobmods.lib.recipe.replace_ingredient("angels-gas-butadiene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue") -bobmods.lib.recipe.replace_ingredient("liquid-naphtha-catalyst", "catalyst-metal-red", "catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("solid-sodium-cyanide", "catalyst-metal-green", "catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanation", "catalyst-metal-blue", "catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("gas-hydrazine", "catalyst-metal-blue", "catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanol", "catalyst-metal-blue", "catalyst-metal-purple") +bobmods.lib.recipe.replace_ingredient("angels-liquid-naphtha-catalyst", "angels-catalyst-metal-red", "sb-catalyst-metal-purple") +bobmods.lib.recipe.replace_ingredient("angels-solid-sodium-cyanide", "angels-catalyst-metal-green", "sb-catalyst-metal-purple") +bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanation", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple") +bobmods.lib.recipe.replace_ingredient("angels-gas-hydrazine", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple") +bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanol", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple") -bobmods.lib.recipe.replace_ingredient("cumene-process", "catalyst-metal-blue", "catalyst-metal-yellow") +bobmods.lib.recipe.replace_ingredient("angels-cumene-process", "angels-catalyst-metal-blue", "angels-catalyst-metal-yellow") bobmods.lib.recipe.add_new_ingredient( - "liquid-mineral-oil-catalyst", - { type = "item", name = "catalyst-metal-purple", amount = 1 } + "angels-liquid-mineral-oil-catalyst", + { type = "item", name = "sb-catalyst-metal-purple", amount = 1 } ) bobmods.lib.recipe.add_result( - "liquid-mineral-oil-catalyst", - { type = "item", name = "catalyst-metal-carrier", amount = 1 } + "angels-liquid-mineral-oil-catalyst", + { type = "item", name = "angels-catalyst-metal-carrier", amount = 1 } ) -bobmods.lib.tech.add_prerequisite("bio-plastic-2", "angels-advanced-chemistry-2") -bobmods.lib.tech.add_prerequisite("sodium-processing-2", "angels-advanced-chemistry-4") -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "basic-chemistry-3") -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "thermal-water-extraction-2") -bobmods.lib.tech.remove_prerequisite("angels-advanced-chemistry-1", "ore-floatation") +bobmods.lib.tech.add_prerequisite("angels-bio-plastic-2", "angels-advanced-chemistry-2") +bobmods.lib.tech.add_prerequisite("angels-sodium-processing-2", "angels-advanced-chemistry-4") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "angels-basic-chemistry-3") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "angels-thermal-water-extraction-2") +bobmods.lib.tech.remove_prerequisite("angels-advanced-chemistry-1", "angels-ore-floatation") bobmods.lib.tech.add_new_science_pack("angels-nitrogen-processing-3", "production-science-pack", 1) bobmods.lib.tech.add_prerequisite("angels-nitrogen-processing-3", "angels-advanced-chemistry-4") -bobmods.lib.tech.replace_prerequisite("resin-2", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2") +bobmods.lib.tech.replace_prerequisite("angels-resin-2", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2") seablock.lib.moveeffect("angels-air-filter-3", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2", 4) -seablock.lib.moveeffect("gas-melamine", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2") +seablock.lib.moveeffect("angels-gas-melamine", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2") -bobmods.lib.tech.add_new_science_pack("gas-synthesis", "production-science-pack", 1) -bobmods.lib.tech.add_prerequisite("gas-synthesis", "angels-advanced-chemistry-4") +bobmods.lib.tech.add_new_science_pack("angels-gas-synthesis", "production-science-pack", 1) +bobmods.lib.tech.add_prerequisite("angels-gas-synthesis", "angels-advanced-chemistry-4") -seablock.lib.moveeffect("liquid-mineral-oil-catalyst", "angels-advanced-chemistry-3", "angels-advanced-chemistry-4") -seablock.lib.moveeffect("catalyst-metal-carrier", "basic-chemistry-3", "angels-advanced-chemistry-1", 5) -seablock.lib.moveeffect("catalyst-metal-green", "angels-advanced-chemistry-1", "angels-advanced-chemistry-1", 6) -seablock.lib.moveeffect("catalyst-metal-blue", "angels-advanced-chemistry-3", "angels-advanced-chemistry-2", 8) -seablock.lib.moveeffect("catalyst-metal-yellow", "angels-advanced-chemistry-5", "angels-advanced-chemistry-5", 6) +seablock.lib.moveeffect("angels-liquid-mineral-oil-catalyst", "angels-advanced-chemistry-3", "angels-advanced-chemistry-4") +seablock.lib.moveeffect("angels-catalyst-metal-carrier", "angels-basic-chemistry-3", "angels-advanced-chemistry-1", 5) +seablock.lib.moveeffect("angels-catalyst-metal-green", "angels-advanced-chemistry-1", "angels-advanced-chemistry-1", 6) +seablock.lib.moveeffect("angels-catalyst-metal-blue", "angels-advanced-chemistry-3", "angels-advanced-chemistry-2", 8) +seablock.lib.moveeffect("angels-catalyst-metal-yellow", "angels-advanced-chemistry-5", "angels-advanced-chemistry-5", 6) diff --git a/SeaBlock/data-updates/clowns.lua b/SeaBlock/data-updates/clowns.lua index 09dc3911..db8cda39 100644 --- a/SeaBlock/data-updates/clowns.lua +++ b/SeaBlock/data-updates/clowns.lua @@ -19,13 +19,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore1" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore1", amount = 1 }, @@ -40,13 +40,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore2" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore2", amount = 1 }, @@ -61,13 +61,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore3" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore3", amount = 1 }, @@ -82,13 +82,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore4" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore4", amount = 1 }, @@ -103,13 +103,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore5" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore5", amount = 1 }, @@ -124,13 +124,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore6" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore6", amount = 1 }, @@ -146,13 +146,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore7" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore7", amount = 1 }, @@ -167,13 +167,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore8" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore8", amount = 1 }, @@ -188,13 +188,13 @@ if mods["Clowns-Extended-Minerals"] then "recipe-name.slag-processing", { "item-name.clown-mat", { "entity-name.clowns-ore9" }, "Ore" }, }, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "slag-processing-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "fluid", name = "mineral-sludge", amount = 25 }, + { type = "fluid", name = "angels-mineral-sludge", amount = 25 }, }, results = { { type = "item", name = "clowns-ore9", amount = 1 }, @@ -205,13 +205,13 @@ if mods["Clowns-Extended-Minerals"] then { type = "recipe", name = "sb-clowns-resource-1", - category = "ore-refining-t1", + category = "angels-ore-refining-t1", subgroup = "resource-refining-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "item", name = "solid-sand", amount = 1 }, + { type = "item", name = "angels-solid-sand", amount = 1 }, { type = "item", name = "stone", amount = 6 }, }, results = { @@ -223,14 +223,14 @@ if mods["Clowns-Extended-Minerals"] then { type = "recipe", name = "sb-clowns-resource-2", - category = "ore-refining-t1", + category = "angels-ore-refining-t1", subgroup = "resource-refining-2", enabled = false, allow_decomposition = false, energy_required = 4, ingredients = { - { type = "item", name = "solid-sand", amount = 5 }, - { type = "item", name = "blue-cellulose-fiber", amount = 1 }, + { type = "item", name = "angels-solid-sand", amount = 5 }, + { type = "item", name = "angels-blue-cellulose-fiber", amount = 1 }, }, results = { { type = "item", name = "clowns-resource2", amount = 5 }, @@ -249,6 +249,6 @@ if mods["Clowns-Extended-Minerals"] then seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-3", 7) seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-2", 4) seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-1", 1) - seablock.lib.add_recipe_unlock("water-washing-2", "sb-clowns-resource-1") + seablock.lib.add_recipe_unlock("angels-water-washing-2", "sb-clowns-resource-1") seablock.lib.add_recipe_unlock("angels-oil-processing", "sb-clowns-resource-2") end diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua index ebddc46c..383ace80 100644 --- a/SeaBlock/data-updates/coal.lua +++ b/SeaBlock/data-updates/coal.lua @@ -1,26 +1,26 @@ -- Coal removal -seablock.lib.substingredient("grenade", "coal", "wood-charcoal") -seablock.lib.substingredient("explosives", "coal", "wood-charcoal") -seablock.lib.substingredient("bob-solid-fuel-from-hydrogen", "coal", "wood-charcoal") +seablock.lib.substingredient("grenade", "coal", "angels-wood-charcoal") +seablock.lib.substingredient("explosives", "coal", "angels-wood-charcoal") +seablock.lib.substingredient("bob-solid-fuel-from-hydrogen", "coal", "angels-wood-charcoal") if mods["bobenemies"] then - seablock.lib.substingredient("bob-alien-poison", "coal", "wood-charcoal") - seablock.lib.substingredient("bob-alien-explosive", "coal", "wood-charcoal") + seablock.lib.substingredient("bob-alien-poison", "coal", "angels-wood-charcoal") + seablock.lib.substingredient("bob-alien-explosive", "coal", "angels-wood-charcoal") end -seablock.lib.substingredient("filter-coal", "coal", "wood-charcoal") -seablock.lib.substingredient("bob-carbon", "coal", "wood-charcoal") +seablock.lib.substingredient("angels-filter-coal", "coal", "angels-wood-charcoal") +seablock.lib.substingredient("bob-carbon", "coal", "angels-wood-charcoal") if mods["Transport_Drones"] then - seablock.lib.substingredient("road", "coal", "wood-charcoal") + seablock.lib.substingredient("road", "coal", "angels-wood-charcoal") end -seablock.lib.substingredient("carbon-separation-2", "coal", "wood-charcoal", 1) +seablock.lib.substingredient("angels-gas-carbon-dioxide", "coal", "angels-wood-charcoal", 1) if mods["angelsaddons-storage"] and data.raw.recipe["silo-coal"] then - seablock.lib.substingredient("silo-coal", "coal-crushed", "wood-charcoal", 10) + seablock.lib.substingredient("silo-coal", "angels-coal-crushed", "angels-wood-charcoal", 10) end -- Disable coal cracking technology seablock.lib.hide_technology("angels-coal-cracking") -seablock.lib.moveeffect("pellet-coke", "angels-coal-cracking", "angels-coal-processing-2") -angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-coke]") -angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-coke]", "recipe") +seablock.lib.moveeffect("angels-pellet-coke", "angels-coal-cracking", "angels-coal-processing-2") +angelsmods.functions.move_item("angels-pellet-coke", "angels-bio-processing-wood", "f[pellet-coke]") +angelsmods.functions.move_item("angels-pellet-coke", "angels-bio-processing-wood", "f[pellet-coke]", "recipe") -- Clear fuel value so these don't appear in Helmod's fuel picker data.raw.item["bob-carbon"].fuel_emissions_multiplier = nil @@ -29,18 +29,18 @@ data.raw.item["bob-carbon"].fuel_category = nil data.raw.item["coal"].fuel_emissions_multiplier = nil data.raw.item["coal"].fuel_value = nil data.raw.item["coal"].fuel_category = nil -data.raw.item["coal-crushed"].fuel_value = nil -data.raw.item["coal-crushed"].fuel_category = nil +data.raw.item["angels-coal-crushed"].fuel_value = nil +data.raw.item["angels-coal-crushed"].fuel_category = nil -data.raw.recipe["coolant-used-filtration-1"].localised_name = { "recipe-name.coolant-used-filtration-1" } -data.raw.recipe["coolant-used-filtration-2"].localised_name = { "recipe-name.coolant-used-filtration-2" } +data.raw.recipe["angels-coolant-used-filtration-1"].localised_name = { "recipe-name.coolant-used-filtration-1" } +data.raw.recipe["angels-coolant-used-filtration-2"].localised_name = { "recipe-name.coolant-used-filtration-2" } -- Move charcoal processing 3 to purple science -- Sodium carbonate is unusable before then bobmods.lib.tech.add_science_pack("angels-coal-processing-3", "chemical-science-pack", 1) bobmods.lib.tech.add_science_pack("angels-coal-processing-3", "production-science-pack", 1) -bobmods.lib.tech.remove_prerequisite("sodium-processing-2", "angels-coal-processing-3") -bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "sodium-processing-2") +bobmods.lib.tech.remove_prerequisite("angels-sodium-processing-2", "angels-coal-processing-3") +bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "angels-sodium-processing-2") -- Buff the Carbon 2 recipe to make it a bit more worthwhile -bobmods.lib.recipe.set_result("coke-purification-2", { type = "item", name = "solid-carbon", amount = 8 }) +bobmods.lib.recipe.set_result("angels-coke-purification-2", { type = "item", name = "angels-solid-carbon", amount = 8 }) diff --git a/SeaBlock/data-updates/concrete.lua b/SeaBlock/data-updates/concrete.lua index e4436d8d..2d44f8cb 100644 --- a/SeaBlock/data-updates/concrete.lua +++ b/SeaBlock/data-updates/concrete.lua @@ -1,57 +1,57 @@ -- Swap out concrete for bricks if data.raw.recipe["bob-burner-reactor-2"] then - seablock.lib.substingredient("bob-burner-reactor-2", "concrete", "concrete-brick", nil) + seablock.lib.substingredient("bob-burner-reactor-2", "concrete", "angels-concrete-brick", nil) bobmods.lib.tech.remove_prerequisite("bob-burner-reactor-2", "concrete") bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "angels-stone-smelting-2") end -seablock.lib.substingredient("centrifuge", "concrete", "concrete-brick", nil) +seablock.lib.substingredient("centrifuge", "concrete", "angels-concrete-brick", nil) if data.raw.recipe["fluid-reactor-2"] then - seablock.lib.substingredient("fluid-reactor-2", "concrete", "concrete-brick", nil) + seablock.lib.substingredient("fluid-reactor-2", "concrete", "angels-concrete-brick", nil) end -seablock.lib.substingredient("nuclear-reactor", "concrete", "concrete-brick", nil) -seablock.lib.substingredient("rocket-silo", "concrete", "reinforced-concrete-brick", nil) +seablock.lib.substingredient("nuclear-reactor", "concrete", "angels-concrete-brick", nil) +seablock.lib.substingredient("rocket-silo", "concrete", "angels-reinforced-concrete-brick", nil) bobmods.lib.tech.replace_prerequisite("uranium-processing", "concrete", "angels-stone-smelting-2") bobmods.lib.tech.replace_prerequisite("rocket-silo", "concrete", "angels-stone-smelting-3") -- Swap concrete tiles -local item = data.raw.item["concrete-brick"] +local item = data.raw.item["angels-concrete-brick"] if item and item.place_as_tile then item.place_as_tile["result"] = "concrete" end -item = data.raw.item["reinforced-concrete-brick"] +item = data.raw.item["angels-reinforced-concrete-brick"] if item and item.place_as_tile then item.place_as_tile["result"] = "refined-concrete" end item = data.raw.item["concrete"] if item and item.place_as_tile then - item.place_as_tile["result"] = "tile-concrete-brick" + item.place_as_tile["result"] = "angels-tile-concrete-brick" end item = data.raw.item["refined-concrete"] if item and item.place_as_tile then - item.place_as_tile["result"] = "tile-reinforced-concrete-brick" + item.place_as_tile["result"] = "angels-tile-reinforced-concrete-brick" end local tile = data.raw.tile["concrete"] if tile then - tile.minable["result"] = "concrete-brick" - tile.placeable_by = { item = "concrete-brick", count = 1 } + tile.minable["result"] = "angels-concrete-brick" + tile.placeable_by = { item = "angels-concrete-brick", count = 1 } tile.walking_speed_modifier = 1.4 end tile = data.raw.tile["refined-concrete"] if tile then - tile.minable["result"] = "reinforced-concrete-brick" - tile.placeable_by = { item = "reinforced-concrete-brick", count = 1 } + tile.minable["result"] = "angels-reinforced-concrete-brick" + tile.placeable_by = { item = "angels-reinforced-concrete-brick", count = 1 } tile.walking_speed_modifier = 1.55 end -tile = data.raw.tile["tile-concrete-brick"] +tile = data.raw.tile["angels-tile-concrete-brick"] if tile then tile.minable["result"] = "concrete" tile.placeable_by = { item = "concrete", count = 1 } tile.walking_speed_modifier = 1.4 end -tile = data.raw.tile["tile-reinforced-concrete-brick"] +tile = data.raw.tile["angels-tile-reinforced-concrete-brick"] if tile then tile.minable["result"] = "refined-concrete" tile.placeable_by = { item = "refined-concrete", count = 1 } diff --git a/SeaBlock/data-updates/fuel.lua b/SeaBlock/data-updates/fuel.lua index d363936c..9eb0d651 100644 --- a/SeaBlock/data-updates/fuel.lua +++ b/SeaBlock/data-updates/fuel.lua @@ -1,50 +1,50 @@ -- Reduce angels charcoal fuel value -data.raw.item["wood-bricks"].fuel_value = "18MJ" -data.raw.item["wood-charcoal"].fuel_value = "4MJ" -data.raw.item["pellet-coke"].fuel_value = "24MJ" +data.raw.item["angels-wood-bricks"].fuel_value = "18MJ" +data.raw.item["angels-wood-charcoal"].fuel_value = "4MJ" +data.raw.item["angels-pellet-coke"].fuel_value = "24MJ" -- Make hydrazine solid fuel match fuel_value -if data.raw.fluid["gas-hydrazine"] then - local hydrazinevalue = data.raw.fluid["gas-hydrazine"].fuel_value - data.raw.fluid["gas-hydrazine"].fuel_value = hydrazinevalue +if data.raw.fluid["angels-gas-hydrazine"] then + local hydrazinevalue = data.raw.fluid["angels-gas-hydrazine"].fuel_value + data.raw.fluid["angels-gas-hydrazine"].fuel_value = hydrazinevalue if hydrazinevalue:sub(-2) == "kJ" then local hydrazinevaluekj = tonumber(hydrazinevalue:sub(1, -3)) - seablock.lib.substingredient("solid-fuel-hydrazine", "gas-hydrazine", nil, math.floor(24000 / hydrazinevaluekj)) + seablock.lib.substingredient("angels-solid-fuel-hydrazine", "angels-gas-hydrazine", nil, math.floor(24000 / hydrazinevaluekj)) end end -- petroleum gas/methane has same solid fuel value as naphtha. -data.raw.fluid["liquid-fuel-oil"].fuel_value = "1MJ" -data.raw.fluid["liquid-naphtha"].fuel_value = "0.5MJ" -data.raw.fluid["gas-methane"].fuel_value = "0.5MJ" +data.raw.fluid["angels-liquid-fuel-oil"].fuel_value = "1MJ" +data.raw.fluid["angels-liquid-naphtha"].fuel_value = "0.5MJ" +data.raw.fluid["angels-gas-methane"].fuel_value = "0.5MJ" data.raw.fluid["crude-oil"].fuel_value = "0.5MJ" data.raw.item["bob-enriched-fuel"].fuel_value = "50MJ" data.raw.item["bob-enriched-fuel"].stack_size = 50 -data.raw.item["solid-carbon"].fuel_value = "2.5MJ" +data.raw.item["angels-solid-carbon"].fuel_value = "2.5MJ" -seablock.lib.substingredient("solid-fuel-methane", "gas-methane", nil, 40) -seablock.lib.substingredient("solid-fuel-naphtha", "liquid-naphtha", nil, 40) -seablock.lib.substingredient("solid-fuel-fuel-oil", "liquid-fuel-oil", nil, 20) +seablock.lib.substingredient("angels-solid-fuel-methane", "angels-gas-methane", nil, 40) +seablock.lib.substingredient("angels-solid-fuel-naphtha", "angels-liquid-naphtha", nil, 40) +seablock.lib.substingredient("angels-solid-fuel-fuel-oil", "angels-liquid-fuel-oil", nil, 20) for _, v in pairs({ "bob-hydrogen", - "gas-hydrogen", - "gas-ethane", - "gas-butane", - "gas-propene", - "gas-methanol", - "gas-ethylene", - "gas-benzene", - "gas-ethanol", + "angels-gas-hydrogen", + "angels-gas-ethane", + "angels-gas-butane", + "angels-gas-propene", + "angels-gas-methanol", + "angels-gas-ethylene", + "angels-gas-benzene", + "angels-gas-ethanol", "heavy-oil", "light-oil", "petroleum-gas", "bob-sour-gas", "bob-deuterium", - "gas-deuterium", -- TODO: not sure which one it's supposed to be - "gas-hydrazine", - "alien-fire", - "glycerol", + "angels-gas-deuterium", + "angels-gas-hydrazine", + "bob-alien-fire", + "angels-glycerol", "diesel-fuel", }) do if data.raw.fluid[v] then diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua index 14d8e2d0..6953ccb9 100644 --- a/SeaBlock/data-updates/groups.lua +++ b/SeaBlock/data-updates/groups.lua @@ -42,8 +42,8 @@ if mods["SpaceMod"] then end if mods["Explosive Excavation"] then - move_item("blasting-charge", "petrochem-solids", "b[petrochem-solids-2]-c[blasting-charge]") - move_item("blasting-charge", "petrochem-solids-2", "a[explosives]-g", "recipe") + move_item("blasting-charge", "angels-petrochem-solids", "b[petrochem-solids-2]-c[blasting-charge]") + move_item("blasting-charge", "angels-petrochem-solids-2", "a[explosives]-g", "recipe") end -move_item("bob-solid-fuel-from-hydrogen", "petrochem-fuel", "e[bob]-d", "recipe") +move_item("bob-solid-fuel-from-hydrogen", "angels-petrochem-fuel", "e[bob]-d", "recipe") diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index c6b11dfa..ef54b2bb 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -1,5 +1,5 @@ -- Will need a lot of landfill -seablock.lib.substingredient("landfill", "stone", "stone-crushed", 10) +seablock.lib.substingredient("landfill", "stone", "angels-stone-crushed", 10) for k, v in pairs(data.raw.item) do if string.sub(k, 1, 8) == "landfill" then v.stack_size = 1000 @@ -12,13 +12,13 @@ if settings.startup["sb-default-landfill"] and data.raw.item[settings.startup["s end local function BuffLandfill(recipe) - seablock.lib.substingredient(recipe, "solid-mud", nil, 5) + seablock.lib.substingredient(recipe, "angels-solid-mud", nil, 5) bobmods.lib.recipe.set_energy_required(recipe, 2) - bobmods.lib.tech.remove_recipe_unlock("water-washing-1", recipe) + bobmods.lib.tech.remove_recipe_unlock("angels-water-washing-1", recipe) bobmods.lib.tech.add_recipe_unlock("landfill", recipe) end -BuffLandfill("solid-mud-landfill") +BuffLandfill("angels-solid-mud-landfill") if mods["LandfillPainting"] then BuffLandfill("landfill-dry-dirt") @@ -27,16 +27,16 @@ if mods["LandfillPainting"] then BuffLandfill("landfill-red-desert-1") BuffLandfill("landfill-sand-3") else - bobmods.lib.tech.remove_recipe_unlock("water-washing-2", "solid-mud-landfill") + bobmods.lib.tech.remove_recipe_unlock("angels-water-washing-2", "angels-solid-mud-landfill") end -- Make landfill a red science tech -data.raw.technology["landfill"].prerequisites = { "water-washing-1" } +data.raw.technology["landfill"].prerequisites = { "angels-water-washing-1" } data.raw.technology["landfill"].unit = { count = 10, ingredients = { { "automation-science-pack", 1 } }, time = 15, } -bobmods.lib.tech.remove_prerequisite("water-washing-2", "landfill") +bobmods.lib.tech.remove_prerequisite("angels-water-washing-2", "landfill") bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index 8a645de5..f38b6f4e 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -318,8 +318,8 @@ local mil_recipes = { "bob-alien-science-pack-purple", "bob-alien-science-pack-red", "bob-alien-science-pack-yellow", - "angels-chemical-void-liquid-glycerol", - "angels-chemical-void-liquid-toluene", + "angels-chemical-void-angels-liquid-glycerol", + "angels-chemical-void-angels-liquid-toluene", "bob-ap-bullet", "bob-ap-bullet-magazine", "bob-ap-bullet-projectile", @@ -378,8 +378,8 @@ local mil_recipes = { "empty-bob-alien-explosive-barrel", "empty-bob-alien-fire-barrel", "empty-bob-alien-poison-barrel", - "empty-liquid-glycerol-barrel", - "empty-liquid-toluene-barrel", + "empty-angels-liquid-glycerol-barrel", + "empty-angels-liquid-toluene-barrel", "empty-bob-nitroglycerin-barrel", "bob-explosive-artillery-shell", "explosive-rocket", @@ -389,8 +389,8 @@ local mil_recipes = { "bob-alien-explosive-barrel", "bob-alien-fire-barrel", "bob-alien-poison-barrel", - "liquid-glycerol-barrel", - "liquid-toluene-barrel", + "angels-liquid-glycerol-barrel", + "angels-liquid-toluene-barrel", "bob-nitroglycerin-barrel", "bob-fire-artillery-shell", "bob-fire-capsule", @@ -401,7 +401,7 @@ local mil_recipes = { "flamethrower", "flamethrower-ammo", "flamethrower-turret", - "gas-fractioning-residual", + "angels-gas-fractioning-residual", "bob-gun-cotton", "bob-gunmetal-alloy", "bob-he-bullet", @@ -420,9 +420,9 @@ local mil_recipes = { "bob-laser-rifle-battery-ruby", "bob-laser-rifle-battery-sapphire", "bob-laser-rifle-battery-topaz", - "liquid-glycerol", - "liquid-toluene-from-benzene", - "liquid-toluene-from-naphtha", + "angels-liquid-glycerol", + "angels-liquid-toluene-from-benzene", + "angels-liquid-toluene", "bob-magazine", "bob-nitroglycerin", "bob-petroleum-jelly", @@ -460,8 +460,8 @@ local mil_recipes = { "bob-shotgun-uranium-shell", "slowdown-capsule", "bob-slowdown-mine", - "solid-nitroglycerin", - "solid-trinitrotoluene", + "angels-solid-nitroglycerin", + "angels-solid-trinitrotoluene", "bob-uranium-bullet", "bob-uranium-bullet-projectile", "uranium-cannon-shell", @@ -531,7 +531,7 @@ bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liqu bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-nitroglycerin-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-glycerol-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-toluene-barrel") -bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob--nitroglycerin-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob-nitroglycerin-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-acid-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-explosive-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-fire-barrel") @@ -560,10 +560,10 @@ bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-cannon-shell") bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-rounds-magazine") bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-gunmetal-alloy") -seablock.lib.substresult("nutrients-refining-2", "liquid-glycerol", "water", nil) -if data.raw.recipe["nutrients-refining-2"] then - data.raw.recipe["nutrients-refining-2"].icons = angelsmods.functions.create_liquid_recipe_icon({ - "liquid-fuel-oil", +seablock.lib.substresult("angels-nutrients-refining-2", "liquid-glycerol", "water", nil) +if data.raw.recipe["angels-nutrients-refining-2"] then + data.raw.recipe["angels-nutrients-refining-2"].icons = angelsmods.functions.create_liquid_recipe_icon({ + "angels-liquid-fuel-oil", { "__base__/graphics/icons/fluid/water.png", 64 }, }, { { 214, 146, 040 }, { 169, 130, 039 }, { 120, 083, 004 } }) end @@ -1009,7 +1009,7 @@ if mods["bobwarfare"] then bobmods.lib.tech.add_prerequisite("artillery", "bob-cobalt-processing") bobmods.lib.tech.add_prerequisite("artillery", "angels-stone-smelting-2") seablock.lib.substingredient("artillery-turret", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil) - seablock.lib.substingredient("artillery-turret", "concrete", "concrete-brick", nil) + seablock.lib.substingredient("artillery-turret", "concrete", "angels-concrete-brick", nil) seablock.lib.substingredient("artillery-turret", "steel-plate", "bob-cobalt-steel-alloy", nil) seablock.lib.substingredient("artillery-wagon", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil) seablock.lib.substingredient("artillery-wagon", "pipe", "bob-brass-pipe", nil) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index a6eb3931..fe41420c 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -5,8 +5,8 @@ if data.raw.item["wind-turbine-2"] then end -- No natural gas, use methane for manganese pellet smelting -seablock.lib.substingredient("pellet-manganese-smelting", "gas-natural-1", "gas-methane") -bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gas-extraction") +seablock.lib.substingredient("angels-solid-manganese-oxide-2", "angels-gas-natural-1", "angels-gas-methane") +bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "angels-oil-gas-extraction") bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "angels-advanced-gas-processing") -- Remove steel's prerequiste on Chemical processing 1 @@ -14,17 +14,17 @@ bobmods.lib.tech.remove_prerequisite("steel-processing", "bob-chemical-processin -- Move Water Treatment from Electronics to Slag Processing 1. Hydro Plant no longer requires Green Circuits -- Slag Processing 1 is first source of Sulfuric Waste Water -bobmods.lib.tech.remove_prerequisite("water-treatment", "angels-fluid-control") -bobmods.lib.tech.add_prerequisite("water-treatment", "slag-processing-1") +bobmods.lib.tech.remove_prerequisite("angels-water-treatment", "angels-fluid-control") +bobmods.lib.tech.add_prerequisite("angels-water-treatment", "angels-slag-processing-1") -- Allow skipping of waste water recycling -bobmods.lib.tech.remove_prerequisite("water-washing-1", "water-treatment") -bobmods.lib.tech.add_prerequisite("water-washing-1", "automation") -seablock.lib.moveeffect("yellow-waste-water-purification", "water-treatment-2", "water-treatment") +bobmods.lib.tech.remove_prerequisite("angels-water-washing-1", "angels-water-treatment") +bobmods.lib.tech.add_prerequisite("angels-water-washing-1", "automation") +seablock.lib.moveeffect("angels-yellow-waste-water-purification", "angels-water-treatment-2", "angels-water-treatment") bobmods.lib.tech.remove_prerequisite("bob-electronics", "bob-chemical-processing-1") -bobmods.lib.recipe.set_category("liquid-fish-atmosphere", "chemistry") +bobmods.lib.recipe.set_category("angels-liquid-fish-atmosphere", "chemistry") seablock.lib.hide_technology("oil-gathering") if not seablock.trigger.mining_productivity then @@ -51,7 +51,7 @@ end]] -- Add prerequisite for Tin and Lead if settings.startup["bobmods-logistics-beltoverhaul"].value then - bobmods.lib.tech.add_prerequisite("logistics", "ore-crushing") + bobmods.lib.tech.add_prerequisite("logistics", "angels-ore-crushing") end -- Tidy prerequisite for Brass @@ -64,23 +64,23 @@ end -- Move recipes that shouldn't be unlocked at startup if mods["bobenemies"] then - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-red-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-yellow-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-orange-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-blue-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-purple-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact-green-from-small") - seablock.lib.add_recipe_unlock("bio-processing-alien-3", "bob-alien-artifact") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-red-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-yellow-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-orange-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-blue-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-purple-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-green-from-small") + seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact") end bobmods.lib.tech.remove_prerequisite("bob-tungsten-processing", "angels-nickel-smelting-1") -bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-swamp-1", "solid-plastic") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-arboretum-swamp-1", "angels-solid-plastic") -- Buff Lime filtering -seablock.lib.substingredient("filter-lime", "solid-lime", nil, 1) -data.raw.recipe["filter-lime"].energy_required = 1 -data.raw.recipe["angels-sulfur-scrubber"].energy_required = 6 +seablock.lib.substingredient("angels-filter-lime", "angels-solid-lime", nil, 1) +data.raw.recipe["angels-filter-lime"].energy_required = 1 +data.raw.recipe["angels-sulfur-air-scrubbing"].energy_required = 6 -- Make Long Inserters a startup tech if data.raw.technology["logistics-0"] then @@ -90,20 +90,20 @@ end -- Adjust for handcrafting boards -- Divide by 2 -seablock.lib.substingredient("solid-alginic-acid", "algae-brown", nil, 5) -seablock.lib.substresult("solid-alginic-acid", "solid-alginic-acid", nil, 1) -data.raw.recipe["solid-alginic-acid"].energy_required = 5 +seablock.lib.substingredient("angels-solid-alginic-acid", "angels-algae-brown", nil, 5) +seablock.lib.substresult("angels-solid-alginic-acid", "angels-solid-alginic-acid", nil, 1) +data.raw.recipe["angels-solid-alginic-acid"].energy_required = 5 -- Divide by 5 -seablock.lib.substingredient("solid-wood-pulp", "cellulose-fiber", nil, 4) -seablock.lib.substingredient("solid-wood-pulp", "solid-alginic-acid", nil, 1) -seablock.lib.substresult("solid-wood-pulp", "solid-wood-pulp", nil, 4) -data.raw.recipe["solid-wood-pulp"].energy_required = 0.8 +seablock.lib.substingredient("angels-solid-wood-pulp", "angels-cellulose-fiber", nil, 4) +seablock.lib.substingredient("angels-solid-wood-pulp", "angels-solid-alginic-acid", nil, 1) +seablock.lib.substresult("angels-solid-wood-pulp", "angels-solid-wood-pulp", nil, 4) +data.raw.recipe["angels-solid-wood-pulp"].energy_required = 0.8 -- Tidy up ore silo prerequisites if mods["angelsaddons-storage"] then bobmods.lib.tech.remove_prerequisite("ore-silos", "angels-coal-processing") - bobmods.lib.tech.replace_prerequisite("ore-silos", "ore-crushing", "ore-advanced-crushing") + bobmods.lib.tech.replace_prerequisite("ore-silos", "angels-ore-crushing", "angels-ore-advanced-crushing") end -- Logistic System prerequisite of Pink Science @@ -112,19 +112,19 @@ if not data.raw.tool["bob-advanced-logistic-science-pack"] then end -- Saline rebalance -seablock.lib.substingredient("solid-salt-dissolving", "solid-salt", nil, 15) -seablock.lib.substingredient("solid-salt-dissolving", "water-purified", "water", 1000) -seablock.lib.substresult("solid-salt-dissolving", "water-saline", nil, 1000) -data.raw.recipe["solid-salt-dissolving"].energy_required = 5 +seablock.lib.substingredient("angels-solid-salt-dissolving", "angels-solid-salt", nil, 15) +seablock.lib.substingredient("angels-solid-salt-dissolving", "angels-water-purified", "water", 1000) +seablock.lib.substresult("angels-solid-salt-dissolving", "angels-water-saline", nil, 1000) +data.raw.recipe["angels-solid-salt-dissolving"].energy_required = 5 -- Add missing science packs for _, v in pairs({ - "bio-processing-alien-3", + "angels-bio-processing-alien-3", "bob-gem-processing-1", "bob-gem-processing-2", "bob-gem-processing-3", - "geode-crystallization-1", + "angels-geode-crystallization-1", "bob-polishing", }) do if data.raw.technology[v] then @@ -133,14 +133,14 @@ for _, v in pairs({ end bobmods.lib.tech.add_prerequisite("bob-polishing", "chemical-science-pack") -bobmods.lib.tech.add_prerequisite("geode-crystallization-1", "chemical-science-pack") +bobmods.lib.tech.add_prerequisite("angels-geode-crystallization-1", "chemical-science-pack") if mods["bobrevamp"] and not mods["bobclasses"] then bobmods.lib.tech.add_new_science_pack("bob-rtg", "production-science-pack", 1) bobmods.lib.tech.add_new_science_pack("bob-rtg", "utility-science-pack", 1) bobmods.lib.tech.add_prerequisite("bob-rtg", "utility-science-pack") bobmods.lib.tech.remove_prerequisite("bob-rtg", "angels-coal-processing-3") - bobmods.lib.tech.add_prerequisite("bob-rtg", "sodium-processing-2") + bobmods.lib.tech.add_prerequisite("bob-rtg", "angels-sodium-processing-2") end -- Swap gold for platinum @@ -149,10 +149,10 @@ if mods["bobmodules"] then seablock.lib.substingredient("bob-module-processor-board-3", "angels-wire-platinum", "angels-plate-platinum", nil) end bobmods.lib.tech.add_prerequisite("bob-advanced-processing-unit", "angels-platinum-smelting-1") -seablock.lib.substresult("angelsore-pure-mix2-processing", "platinum-ore", nil, 2) -seablock.lib.substresult("angelsore9-crystal-processing", "platinum-ore", nil, 2) +seablock.lib.substresult("angels-ore-pure-mix2-processing", "angels-platinum-ore", nil, 2) +seablock.lib.substresult("angels-ore9-crystal-processing", "angels-platinum-ore", nil, 2) -- Swap stiratite for crotinnium so all pure ores are used -seablock.lib.substingredient("angelsore-pure-mix2-processing", "angels-ore3-pure", "angels-ore4-pure", nil) +seablock.lib.substingredient("angels-ore-pure-mix2-processing", "angels-ore3-pure", "angels-ore4-pure", nil) -- Unhide rocket part to make it easier to view recipes if data.raw.recipe["rocket-part"] then @@ -180,7 +180,7 @@ seablock.lib.substingredient("bob-silicon-carbide", "bob-carbon", nil, 10) data.raw.recipe["bob-silicon-carbide"].results[1].amount = 20 seablock.lib.substingredient("bob-silicon-nitride", "bob-silicon-powder", nil, 10) -seablock.lib.substingredient("bob-silicon-nitride", "gas-nitrogen", nil, 130) +seablock.lib.substingredient("bob-silicon-nitride", "angels-gas-nitrogen", nil, 130) data.raw.recipe["bob-silicon-nitride"].results[1].amount = 10 seablock.lib.substingredient("bob-tungsten-carbide", "bob-tungsten-oxide", nil, 10) @@ -194,7 +194,7 @@ seablock.lib.substresult("bob-tungsten-carbide-2", "bob-tungsten-carbide", nil, bobmods.lib.recipe.set_energy_required("bob-tungsten-carbide-2", 6) seablock.lib.substingredient("bob-copper-tungsten-alloy", "bob-powdered-tungsten", nil, 15) -seablock.lib.substingredient("bob-copper-tungsten-alloy", "copper-plate", "powder-copper", 10) +seablock.lib.substingredient("bob-copper-tungsten-alloy", "copper-plate", "angels-powder-copper", 10) seablock.lib.substresult("bob-copper-tungsten-alloy", "bob-copper-tungsten-alloy", nil, 25) bobmods.lib.recipe.set_energy_required("bob-copper-tungsten-alloy", 8) bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "angels-copper-smelting-2") @@ -203,47 +203,47 @@ bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "angels-coppe if data.raw.technology["bob-electronics-machine-1"] then bobmods.lib.tech.add_prerequisite("bob-electronics-machine-1", "bob-electronics") end -bobmods.lib.tech.add_prerequisite("bio-pressing-1", "bio-nutrient-paste") +bobmods.lib.tech.add_prerequisite("angels-bio-pressing-1", "angels-bio-nutrient-paste") -bobmods.lib.tech.add_prerequisite("resins", "automation-2") +bobmods.lib.tech.add_prerequisite("angels-resins", "automation-2") bobmods.lib.tech.add_prerequisite("plastics", "automation-2") if mods["boblogistics"] then bobmods.lib.tech.add_prerequisite("bob-repair-pack-2", "military") end bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "fluid-handling") -bobmods.lib.tech.add_prerequisite("water-treatment-2", "fluid-handling") -bobmods.lib.tech.add_prerequisite("water-washing-2", "fluid-handling") +bobmods.lib.tech.add_prerequisite("angels-water-treatment-2", "fluid-handling") +bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "fluid-handling") -- Nerf early game glass. Just need a little bit for arboretums seablock.lib.substingredient("bob-glass", "bob-quartz", nil, 10) seablock.lib.substresult("bob-glass", "bob-glass", nil, 1) -- Biologically active tile has been hidden so no need for the prerequisites -bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-glass-smelting-1") -bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-stone-smelting-2") +bobmods.lib.tech.remove_prerequisite("angels-bio-farm-2", "angels-glass-smelting-1") +bobmods.lib.tech.remove_prerequisite("angels-bio-farm-2", "angels-stone-smelting-2") -- Rebalance glass mixture recipes -bobmods.lib.recipe.remove_ingredient("glass-mixture-1", "bob-quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-1", { type = "item", name = "bob-silicon-powder", amount = 1 }) +bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture", "bob-quartz") +bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture", { type = "item", name = "bob-silicon-powder", amount = 1 }) -bobmods.lib.recipe.remove_ingredient("glass-mixture-2", "bob-quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-2", { type = "item", name = "bob-silicon-powder", amount = 2 }) -bobmods.lib.recipe.set_result("glass-mixture-2", { type = "item", name = "solid-glass-mixture", amount = 3 }) -bobmods.lib.recipe.set_energy_required("glass-mixture-2", 6) +bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-2", "bob-quartz") +bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-2", { type = "item", name = "bob-silicon-powder", amount = 2 }) +bobmods.lib.recipe.set_result("angels-solid-glass-mixture-2", { type = "item", name = "angels-solid-glass-mixture", amount = 3 }) +bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-2", 6) -bobmods.lib.recipe.remove_ingredient("glass-mixture-3", "bob-quartz") -bobmods.lib.recipe.set_ingredient("glass-mixture-3", { type = "item", name = "bob-silicon-powder", amount = 1 }) -bobmods.lib.recipe.set_ingredient("glass-mixture-3", { type = "item", name = "solid-lime", amount = 2 }) -bobmods.lib.recipe.set_result("glass-mixture-3", { type = "item", name = "solid-glass-mixture", amount = 4 }) -bobmods.lib.recipe.set_energy_required("glass-mixture-3", 8) +bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-3", "bob-quartz") +bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-3", { type = "item", name = "bob-silicon-powder", amount = 1 }) +bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-3", { type = "item", name = "angels-solid-lime", amount = 2 }) +bobmods.lib.recipe.set_result("angels-solid-glass-mixture-3", { type = "item", name = "angels-solid-glass-mixture", amount = 4 }) +bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-3", 8) -bobmods.lib.recipe.set_energy_required("glass-mixture-4", 8) +bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-4", 8) -- Rebalance cement recipes -bobmods.lib.recipe.replace_ingredient("cement-mixture-1", "bob-quartz", "bob-silicon-powder") +bobmods.lib.recipe.replace_ingredient("angels-solid-cement", "bob-quartz", "bob-silicon-powder") -bobmods.lib.recipe.remove_ingredient("cement-mixture-2", "iron-ore") -bobmods.lib.recipe.replace_ingredient("cement-mixture-2", "bob-quartz", "bob-silicon-powder") -bobmods.lib.recipe.set_ingredient("cement-mixture-2", { type = "item", name = "solid-lime", amount = 4 }) -bobmods.lib.recipe.set_result("cement-mixture-2", { type = "item", name = "solid-cement", amount = 4 }) -bobmods.lib.recipe.set_energy_required("cement-mixture-2", 16) +bobmods.lib.recipe.remove_ingredient("angels-solid-cement-2", "iron-ore") +bobmods.lib.recipe.replace_ingredient("angels-solid-cement-2", "bob-quartz", "bob-silicon-powder") +bobmods.lib.recipe.set_ingredient("angels-solid-cement-2", { type = "item", name = "angels-solid-lime", amount = 4 }) +bobmods.lib.recipe.set_result("angels-solid-cement-2", { type = "item", name = "angels-solid-cement", amount = 4 }) +bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16) diff --git a/SeaBlock/data-updates/other-mods.lua b/SeaBlock/data-updates/other-mods.lua index 9240ddd9..964f932a 100644 --- a/SeaBlock/data-updates/other-mods.lua +++ b/SeaBlock/data-updates/other-mods.lua @@ -1,11 +1,11 @@ if mods["early_construction"] then - bobmods.lib.recipe.replace_ingredient("early-construction-robot", "coal", "wood-charcoal") + bobmods.lib.recipe.replace_ingredient("early-construction-robot", "coal", "angels-wood-charcoal") bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "military") - bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "bio-wood-processing-2") + bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "angels-bio-wood-processing-2") end if mods["grappling-gun"] then - bobmods.lib.recipe.replace_ingredient("grappling-gun-ammo", "coal", "wood-charcoal") + bobmods.lib.recipe.replace_ingredient("grappling-gun-ammo", "coal", "angels-wood-charcoal") end if mods["jetpack"] then diff --git a/SeaBlock/data-updates/petrochem.lua b/SeaBlock/data-updates/petrochem.lua index 7ba57a66..22715cc3 100644 --- a/SeaBlock/data-updates/petrochem.lua +++ b/SeaBlock/data-updates/petrochem.lua @@ -12,73 +12,73 @@ local function movealleffects(from, to) end data.raw.technology[from].effects = {} end -movealleffects("basic-chemistry-2", "basic-chemistry") -movealleffects("basic-chemistry-3", "basic-chemistry-2") +movealleffects("angels-basic-chemistry-2", "angels-basic-chemistry") +movealleffects("angels-basic-chemistry-3", "angels-basic-chemistry-2") movealleffects("angels-advanced-chemistry-3", "angels-advanced-chemistry-2") movealleffects("angels-advanced-chemistry-4", "angels-advanced-chemistry-3") movealleffects("angels-advanced-chemistry-5", "angels-advanced-chemistry-4") -movealleffects("chlorine-processing-3", "chlorine-processing-2") -movealleffects("chlorine-processing-4", "chlorine-processing-2") -bobmods.lib.tech.add_new_science_pack("basic-chemistry-2", "logistic-science-pack", 1) +movealleffects("angels-chlorine-processing-3", "angels-chlorine-processing-2") +movealleffects("angels-chlorine-processing-4", "angels-chlorine-processing-2") +bobmods.lib.tech.add_new_science_pack("angels-basic-chemistry-2", "logistic-science-pack", 1) bobmods.lib.tech.add_new_science_pack("angels-advanced-chemistry-3", "production-science-pack", 1) bobmods.lib.tech.add_new_science_pack("angels-advanced-chemistry-4", "utility-science-pack", 1) -bobmods.lib.tech.add_new_science_pack("chlorine-processing-2", "chemical-science-pack", 1) +bobmods.lib.tech.add_new_science_pack("angels-chlorine-processing-2", "chemical-science-pack", 1) bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-4", "angels-advanced-chemistry-3") bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-4", "utility-science-pack") -bobmods.lib.tech.add_prerequisite("chlorine-processing-2", "sodium-processing-1") -bobmods.lib.tech.add_prerequisite("chlorine-processing-2", "angels-advanced-chemistry-2") -seablock.lib.hide_technology("basic-chemistry-3") +bobmods.lib.tech.add_prerequisite("angels-chlorine-processing-2", "angels-sodium-processing-1") +bobmods.lib.tech.add_prerequisite("angels-chlorine-processing-2", "angels-advanced-chemistry-2") +seablock.lib.hide_technology("angels-basic-chemistry-3") seablock.lib.hide_technology("angels-advanced-chemistry-5") -seablock.lib.hide_technology("chlorine-processing-3") -seablock.lib.hide_technology("chlorine-processing-4") +seablock.lib.hide_technology("angels-chlorine-processing-3") +seablock.lib.hide_technology("angels-chlorine-processing-4") -- Move recipes back -seablock.lib.moveeffect("water-gas-shift-1", "basic-chemistry", "basic-chemistry-2") -seablock.lib.moveeffect("water-gas-shift-2", "basic-chemistry", "basic-chemistry-2") -bobmods.lib.tech.add_prerequisite("angels-nickel-smelting-1", "basic-chemistry-2") +seablock.lib.moveeffect("angels-water-gas-shift-1", "angels-basic-chemistry", "angels-basic-chemistry-2") +seablock.lib.moveeffect("angels-water-gas-shift-2", "angels-basic-chemistry", "angels-basic-chemistry-2") +bobmods.lib.tech.add_prerequisite("angels-nickel-smelting-1", "angels-basic-chemistry-2") -- Make Basic Chemistry depend on Wood Processing 2 -bobmods.lib.tech.add_prerequisite("basic-chemistry", "bio-wood-processing-2") +bobmods.lib.tech.add_prerequisite("angels-basic-chemistry", "angels-bio-wood-processing-2") -- Move Methane to Blue Science -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "gas-refinery-small-2") -bobmods.lib.tech.remove_recipe_unlock("flammables", "solid-fuel-methane") -bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-fractioning") -bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-refining") -bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "catalyst-steam-cracking-butane") -bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-butane") -bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-ethane") -bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-methane") -bobmods.lib.tech.remove_recipe_unlock("steam-cracking-2", "steam-cracking-oil-residual") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "angels-gas-refinery-small-2") +bobmods.lib.tech.remove_recipe_unlock("flammables", "angels-solid-fuel-methane") +bobmods.lib.tech.remove_recipe_unlock("angels-gas-processing", "angels-gas-fractioning") +bobmods.lib.tech.remove_recipe_unlock("angels-gas-processing", "angels-gas-refining") +bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-gas-butadiene") +bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-butane") +bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-gas-ethylene") +bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-methane") +bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-oil-residual") -bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-2", "catalyst-steam-cracking-butane") -bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refinery-small-2") -bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refining") -bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning") -bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "solid-fuel-methane") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-2", "angels-gas-butadiene") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refinery-small-2") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refining") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-fractioning") +bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-solid-fuel-methane") bobmods.lib.tech.add_recipe_unlock("fluid-handling", "angels-storage-tank-1") -bobmods.lib.tech.add_recipe_unlock("steam-cracking-1", "steam-cracking-oil-residual") -bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-butane") -bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-ethane") -bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-methane") -seablock.lib.add_recipe_unlock("bio-nutrient-paste", "gas-refinery-small", 2) +bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-oil-residual") +bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-butane") +bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-gas-ethylene") +bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-methane") +seablock.lib.add_recipe_unlock("angels-bio-nutrient-paste", "angels-gas-refinery-small", 2) -bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "gas-processing") -bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "steam-cracking-2") -bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "oil-gas-extraction") -bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "gas-processing") -bobmods.lib.tech.remove_prerequisite("bio-nutrient-paste", "gas-processing") -bobmods.lib.tech.remove_prerequisite("bio-processing-paste", "chlorine-processing-2") -bobmods.lib.tech.remove_prerequisite("gas-processing", "oil-gas-extraction") -bobmods.lib.tech.remove_prerequisite("steam-cracking-1", "gas-processing") -bobmods.lib.tech.remove_prerequisite("steam-cracking-2", "angels-advanced-chemistry-2") +bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "angels-gas-processing") +bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "angels-steam-cracking-2") +bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "angels-oil-gas-extraction") +bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "angels-gas-processing") +bobmods.lib.tech.remove_prerequisite("angels-bio-nutrient-paste", "angels-gas-processing") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-paste", "angels-chlorine-processing-2") +bobmods.lib.tech.remove_prerequisite("angels-gas-processing", "angels-oil-gas-extraction") +bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-1", "angels-gas-processing") +bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-2", "angels-advanced-chemistry-2") -bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "steam-cracking-2") -bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-nutrient-paste") -bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-refugium-puffer-1") +bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "angels-steam-cracking-2") +bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "angels-bio-nutrient-paste") +bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "angels-bio-refugium-puffer-1") bobmods.lib.tech.add_prerequisite("angels-oil-processing", "fluid-handling") -bobmods.lib.tech.add_prerequisite("bio-processing-paste", "chlorine-processing-1") -bobmods.lib.tech.add_prerequisite("steam-cracking-2", "angels-advanced-gas-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-paste", "angels-chlorine-processing-1") +bobmods.lib.tech.add_prerequisite("angels-steam-cracking-2", "angels-advanced-gas-processing") -bobmods.lib.tech.hide("gas-processing") -bobmods.lib.tech.hide("oil-gas-extraction") +bobmods.lib.tech.hide("angels-gas-processing") +bobmods.lib.tech.hide("angels-oil-gas-extraction") diff --git a/SeaBlock/data-updates/rubber.lua b/SeaBlock/data-updates/rubber.lua index 79dc193c..2cb5707a 100644 --- a/SeaBlock/data-updates/rubber.lua +++ b/SeaBlock/data-updates/rubber.lua @@ -1,13 +1,13 @@ bobmods.lib.recipe.hide("bob-rubber") bobmods.lib.tech.remove_recipe_unlock("circuit-network", "bob-insulated-cable") -bobmods.lib.tech.add_recipe_unlock("rubbers", "bob-insulated-cable") +bobmods.lib.tech.add_recipe_unlock("angels-rubbers", "bob-insulated-cable") -- Circuit network wires should not require rubber ---bobmods.lib.recipe.set_ingredients("green-wire", { { "solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) ---bobmods.lib.recipe.set_ingredients("red-wire", { { "solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) +--bobmods.lib.recipe.set_ingredients("green-wire", { { "angels-solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) +--bobmods.lib.recipe.set_ingredients("red-wire", { { "angels-solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) if mods["CircuitProcessing"] then - bobmods.lib.tech.add_prerequisite("efficiency-module", "rubbers") - bobmods.lib.tech.add_prerequisite("productivity-module", "rubbers") - bobmods.lib.tech.add_prerequisite("speed-module", "rubbers") + bobmods.lib.tech.add_prerequisite("efficiency-module", "angels-rubbers") + bobmods.lib.tech.add_prerequisite("productivity-module", "angels-rubbers") + bobmods.lib.tech.add_prerequisite("speed-module", "angels-rubbers") end diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 4f814197..7db872a3 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -1,17 +1,17 @@ -- Decrease amount of crushed stone for slag-slurry so it's still better than mineralized water crystallization -seablock.lib.substingredient("stone-crushed-dissolution", "stone-crushed", nil, 20) +seablock.lib.substingredient("angels-stone-crushed-dissolution", "angels-stone-crushed", nil, 20) -- Angels sludge crystalization usually gives normal smeltable ores. This would be far too easy, -- so change recipes to give the weird ores that need extra processing steps. for i = 1, 6 do - local recipe = data.raw.recipe["slag-processing-" .. i] + local recipe = data.raw.recipe["angels-slag-processing-" .. i] seablock.lib.copy_icon(recipe, {}) recipe.localised_name = { "recipe-name.slag-processing", { "item-name.angels-ore" .. i } } recipe.order = "a-a [angels-ore-" .. i .. "]" - recipe.category = "crystallizing" + recipe.category = "angels-crystallizing" recipe.energy_required = 4 - recipe.ingredients = { { type = "fluid", name = "mineral-sludge", amount = 25 } } + recipe.ingredients = { { type = "fluid", name = "angels-mineral-sludge", amount = 25 } } recipe.results = { { type = "item", name = "angels-ore" .. i, amount = 1 } } recipe.enabled = false @@ -20,27 +20,27 @@ end -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1, -- Angels ores 5, 6 (Rubyte, Bobmonium) available from Slag processing 1 -- Angels ores 2, 4 (Jivolite, Crotinnium) available from Advanced mechanical refining -bobmods.lib.recipe.enabled("angelsore1-crushed-smelting", false) -bobmods.lib.recipe.enabled("angelsore3-crushed-smelting", false) -seablock.lib.moveeffect("catalysator-brown", "slag-processing-1", "advanced-ore-refining-1", 3) -local slag1start = seablock.lib.findeffectidx(data.raw.technology["slag-processing-1"].effects, "slag-processing-1") -seablock.lib.moveeffect("slag-processing-5", "slag-processing-2", "slag-processing-1", slag1start + 3) -seablock.lib.moveeffect("slag-processing-6", "slag-processing-2", "slag-processing-1", slag1start + 4) +bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false) +bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false) +seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3) +local slag1start = seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1") +seablock.lib.moveeffect("angels-slag-processing-5", "angels-slag-processing-2", "angels-slag-processing-1", slag1start + 3) +seablock.lib.moveeffect("angels-slag-processing-6", "angels-slag-processing-2", "angels-slag-processing-1", slag1start + 4) local slag2start = 0 -seablock.lib.moveeffect("slag-processing-2", "slag-processing-1", "ore-advanced-crushing", slag2start + 1) -seablock.lib.moveeffect("slag-processing-4", "slag-processing-2", "ore-advanced-crushing", slag2start + 2) -seablock.lib.moveeffect("angelsore2-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 3) -seablock.lib.moveeffect("angelsore4-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 4) +seablock.lib.moveeffect("angels-slag-processing-2", "angels-slag-processing-1", "angels-ore-advanced-crushing", slag2start + 1) +seablock.lib.moveeffect("angels-slag-processing-4", "angels-slag-processing-2", "angels-ore-advanced-crushing", slag2start + 2) +seablock.lib.moveeffect("angels-ore2-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 3) +seablock.lib.moveeffect("angels-ore4-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 4) -seablock.lib.add_recipe_unlock("ore-crushing", "angelsore5-crushed", 3) -seablock.lib.add_recipe_unlock("ore-crushing", "angelsore6-crushed", 4) -seablock.lib.add_recipe_unlock("ore-crushing", "iron-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "copper-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "bob-lead-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "bob-tin-plate") -seablock.lib.add_recipe_unlock("ore-crushing", "bob-glass") +seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore5-crushed", 3) +seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore6-crushed", 4) +seablock.lib.add_recipe_unlock("angels-ore-crushing", "iron-plate") +seablock.lib.add_recipe_unlock("angels-ore-crushing", "copper-plate") +seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-lead-plate") +seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-tin-plate") +seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-glass") seablock.lib.unhide_recipe("iron-plate") seablock.lib.unhide_recipe("copper-plate") @@ -49,81 +49,81 @@ seablock.lib.unhide_recipe("bob-tin-plate") -- Hide unwanted recipes bobmods.lib.recipe.hide("bob-silver-plate") -bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore2-crushed-processing") -bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore4-crushed-processing") -bobmods.lib.recipe.hide("angelsore2-crushed-processing") -bobmods.lib.recipe.hide("angelsore4-crushed-processing") -bobmods.lib.recipe.hide("angelsore5-crushed-smelting") -bobmods.lib.recipe.hide("angelsore6-crushed-smelting") +bobmods.lib.tech.remove_recipe_unlock("angels-ore-crushing", "angels-ore2-crushed-processing") +bobmods.lib.tech.remove_recipe_unlock("angels-ore-crushing", "angels-ore4-crushed-processing") +bobmods.lib.recipe.hide("angels-ore2-crushed-processing") +bobmods.lib.recipe.hide("angels-ore4-crushed-processing") +bobmods.lib.recipe.hide("angels-ore5-crushed-smelting") +bobmods.lib.recipe.hide("angels-ore6-crushed-smelting") -- Add prerequisites -bobmods.lib.tech.add_prerequisite("ore-floatation", "ore-advanced-crushing") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "ore-advanced-crushing") +bobmods.lib.tech.add_prerequisite("angels-ore-floatation", "angels-ore-advanced-crushing") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "angels-ore-advanced-crushing") -- Move Mechanical Refining under Slag Processing 1 -seablock.lib.moveeffect("ore-crusher", "ore-crushing", "automation") -bobmods.lib.tech.remove_prerequisite("slag-processing-1", "ore-crushing") -bobmods.lib.tech.remove_prerequisite("slag-processing-1", "logistic-science-pack") -bobmods.lib.tech.remove_prerequisite("ore-crushing", "basic-chemistry") -bobmods.lib.tech.add_prerequisite("ore-crushing", "slag-processing-1") +seablock.lib.moveeffect("angels-ore-crusher", "angels-ore-crushing", "automation") +bobmods.lib.tech.remove_prerequisite("angels-slag-processing-1", "angels-ore-crushing") +bobmods.lib.tech.remove_prerequisite("angels-slag-processing-1", "logistic-science-pack") +bobmods.lib.tech.remove_prerequisite("angels-ore-crushing", "angels-basic-chemistry") +bobmods.lib.tech.add_prerequisite("angels-ore-crushing", "angels-slag-processing-1") -- Move crystallization ore recipes up above crushed ores -data.raw["item-subgroup"]["slag-processing-1"].order = "ab" +data.raw["item-subgroup"]["angels-slag-processing-1"].order = "ab" -- Red science level research for slag processing 1 -data.raw.technology["slag-processing-1"].unit = { +data.raw.technology["angels-slag-processing-1"].unit = { count = 20, ingredients = { { "automation-science-pack", 1 } }, time = 15, } -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "ore-powderizer") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "advanced-circuit") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "bob-advanced-processing-unit") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "angels-tungsten-smelting-1") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-2", "angels-ore-powderizer") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-2", "advanced-circuit") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-4", "bob-advanced-processing-unit") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-4", "angels-tungsten-smelting-1") -- Add an additional slag to the mixed sorting recipes for _, v in pairs({ -- Saphirite - "angelsore1-crushed-processing", - "angelsore1-chunk-processing", - "angelsore1-crystal-processing", + "angels-ore1-crushed-processing", + "angels-ore1-chunk-processing", + "angels-ore1-crystal-processing", -- Jivolite - "angelsore2-chunk-processing", - "angelsore2-crystal-processing", + "angels-ore2-chunk-processing", + "angels-ore2-crystal-processing", -- Stiratite - "angelsore3-crushed-processing", - "angelsore3-chunk-processing", - "angelsore3-crystal-processing", + "angels-ore3-crushed-processing", + "angels-ore3-chunk-processing", + "angels-ore3-crystal-processing", -- Crotinnium - "angelsore4-chunk-processing", - "angelsore4-crystal-processing", + "angels-ore4-chunk-processing", + "angels-ore4-crystal-processing", -- Rubyte - "angelsore5-crushed-processing", - "angelsore5-chunk-processing", - "angelsore5-crystal-processing", + "angels-ore5-crushed-processing", + "angels-ore5-chunk-processing", + "angels-ore5-crystal-processing", -- Bobmonium - "angelsore6-crushed-processing", - "angelsore6-chunk-processing", - "angelsore6-crystal-processing", + "angels-ore6-crushed-processing", + "angels-ore6-chunk-processing", + "angels-ore6-crystal-processing", }) do - seablock.lib.substresult(v, "slag", nil, 2) + seablock.lib.substresult(v, "angels-slag", nil, 2) end -- Change the recipe icon for Dirt water electrolysis to show slag icon -data.raw.recipe["dirt-water-separation"].icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("slag"), +data.raw.recipe["angels-dirt-water-separation"].icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-slag"), 1, angelsmods.petrochem.number_tint ) -data.raw.recipe["dirt-water-separation-2"].icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("slag"), +data.raw.recipe["angels-dirt-water-separation-2"].icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-slag"), 2, angelsmods.petrochem.number_tint ) -- Move Ferrous & Cupric concentrate anodizing recipes from Electrowinning cell to Electrolyser 4 -table.insert(data.raw["assembling-machine"]["angels-electrolyser-4"].crafting_categories, "petrochem-electrolyser-4") -bobmods.lib.recipe.set_category("angelsore8-anode-sludge", "petrochem-electrolyser-4") -bobmods.lib.recipe.set_category("angelsore9-anode-sludge", "petrochem-electrolyser-4") -bobmods.lib.tech.add_prerequisite("ore-electro-whinning-cell", "angels-advanced-chemistry-3") +table.insert(data.raw["assembling-machine"]["angels-electrolyser-4"].crafting_categories, "sb-petrochem-electrolyser-4") +bobmods.lib.recipe.set_category("angels-ore8-anode-sludge", "sb-petrochem-electrolyser-4") +bobmods.lib.recipe.set_category("angels-ore9-anode-sludge", "sb-petrochem-electrolyser-4") +bobmods.lib.tech.add_prerequisite("angels-ore-electro-whinning-cell", "angels-advanced-chemistry-3") diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index 7ec15b9d..0b48c219 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -12,7 +12,7 @@ local knowningredients = { { "iron-stick", 22 }, { "stone-brick", 10 }, }, - ["liquifier"] = { + ["angels-liquifier"] = { { "iron-plate", 10 }, { "bob-basic-circuit-board", 5 }, { "pipe-to-ground", 2 }, @@ -23,13 +23,13 @@ local knowningredients = { { "pipe", 1 }, { "iron-gear-wheel", 10 }, }, - ["crystallizer"] = { + ["angels-crystallizer"] = { { "iron-plate", 10 }, { "bob-basic-circuit-board", 5 }, { "bob-copper-pipe", 5 }, { "stone-brick", 10 }, }, - ["algae-farm"] = { + ["angels-algae-farm"] = { { "iron-plate", 10 }, { "bob-basic-circuit-board", 5 }, { "iron-stick", 10 }, @@ -41,12 +41,12 @@ local knowningredients = { { "pipe", 10 }, { "stone-brick", 10 }, }, - ["seafloor-pump"] = { + ["angels-seafloor-pump"] = { { "iron-plate", 5 }, { "bob-basic-circuit-board", 2 }, { "pipe", 5 }, }, - ["washing-plant"] = { + ["angels-washing-plant"] = { { "iron-plate", 10 }, { "bob-basic-circuit-board", 5 }, { "pipe", 10 }, @@ -58,17 +58,17 @@ local knowningredients = { { "bob-basic-circuit-board", 5 }, { "pipe", 5 }, }, - ["filtration-unit"] = { + ["angels-filtration-unit"] = { { "iron-plate", 5 }, { "bob-basic-circuit-board", 5 }, { "pipe", 10 }, { "stone-brick", 10 }, }, - ["filter-frame"] = { + ["angels-filter-frame"] = { { "iron-plate", 1 }, { "iron-stick", 2 }, }, - ["burner-ore-crusher"] = { + ["angels-burner-ore-crusher"] = { { "stone", 5 }, { "stone-furnace", 1 }, }, @@ -220,8 +220,8 @@ for k, v in pairs(seablock.startup_techs) do end -- Make bio-wood-processing a startup tutorial tech -data.raw.technology["bio-wood-processing"].prerequisites = { "sb-startup1" } -data.raw.technology["bio-wood-processing"].unit = { +data.raw.technology["angels-bio-wood-processing"].prerequisites = { "sb-startup1" } +data.raw.technology["angels-bio-wood-processing"].unit = { count = 1, ingredients = {}, time = 1, @@ -229,6 +229,6 @@ data.raw.technology["bio-wood-processing"].unit = { -- Remove cycle introduced in the tech tree -- Sectoid upgraded angelsbioprocessing by renaming the old prerequisite "basic-automation" into "electronics" -bobmods.lib.tech.remove_prerequisite("basic-chemistry", "electronics") -bobmods.lib.tech.remove_prerequisite("bio-processing-brown", "electronics") -bobmods.lib.tech.add_prerequisite("bio-processing-brown", "automation") \ No newline at end of file +bobmods.lib.tech.remove_prerequisite("angels-basic-chemistry", "electronics") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-brown", "electronics") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-brown", "automation") \ No newline at end of file diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua index 250b96a2..7c8ca237 100644 --- a/SeaBlock/data-updates/sulfur.lua +++ b/SeaBlock/data-updates/sulfur.lua @@ -7,38 +7,38 @@ local washing_fluid_box = { --TODO: check correctness of washing plant fluid box pipe_connections = { { position = { -2, 0 }, flow_direction = "output", direction = defines.direction.west } }, } for _, v in pairs({ "", "-2", "-3", "-4" }) do - local washingplant = data.raw["assembling-machine"]["washing-plant" .. v] + local washingplant = data.raw["assembling-machine"]["angels-washing-plant" .. v] if washingplant then table.insert(washingplant.fluid_boxes, washing_fluid_box) end end -seablock.lib.addresult("washing-1", { type = "fluid", name = "gas-hydrogen-sulfide", amount = 2 }) +seablock.lib.addresult("angels-water-heavy-mud", { type = "fluid", name = "angels-gas-hydrogen-sulfide", amount = 2 }) -- Sulfuric acid prerequisites -bobmods.lib.tech.add_prerequisite("angels-sulfur-processing-1", "water-washing-1") +bobmods.lib.tech.add_prerequisite("angels-sulfur-processing-1", "angels-water-washing-1") -- Sulfur 1 tech: Remove prerequisite Advanced lead smelting 1 bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-1", "angels-lead-smelting-1") -- Move Sulfur Dioxide Gas from Sulfur processing 2 to Sulfur processing 1 -bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-2", "gas-sulfur-dioxide") -bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "gas-sulfur-dioxide") +bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-2", "angels-gas-sulfur-dioxide") +bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "angels-gas-sulfur-dioxide") -- Move Sulfur from Sulfur processing 3 to Sulfur processing 1 -bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-3", "solid-sulfur") -bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "solid-sulfur") +bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-3", "angels-solid-sulfur") +bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "angels-solid-sulfur") -- Sulfur is now available sooner so no longer need Sulfur 2 as a prerequisite -- Basic chem 2 isn't strictly required but don't want too many techs to depend directly on Green Science tech bobmods.lib.tech.remove_prerequisite("explosives", "angels-sulfur-processing-2") -bobmods.lib.tech.add_prerequisite("explosives", "basic-chemistry-2") +bobmods.lib.tech.add_prerequisite("explosives", "angels-basic-chemistry-2") bobmods.lib.tech.remove_prerequisite("battery", "angels-sulfur-processing-2") -- Combine Sulfur 3 and 4 and move to Blue Science -seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime", 1) -seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-scrubber", 2) -seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime-used", 3) +seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime", 1) +seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-air-scrubbing", 2) +seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-recycling", 3) bobmods.lib.tech.hide("angels-sulfur-processing-4") bobmods.lib.tech.add_new_science_pack("angels-sulfur-processing-3", "chemical-science-pack", 1) diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index c3f70a72..b2b5a44f 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -49,9 +49,9 @@ local function makeextractorlayers(bottom, top) return { layers = layers } end -local extractor = data.raw["mining-drill"]["thermal-extractor"] -data.raw["mining-drill"]["thermal-extractor"] = nil -data.raw["assembling-machine"]["thermal-extractor"] = extractor +local extractor = data.raw["mining-drill"]["angels-thermal-extractor"] +data.raw["mining-drill"]["angels-thermal-extractor"] = nil +data.raw["assembling-machine"]["angels-thermal-extractor"] = extractor extractor.type = "assembling-machine" extractor.crafting_speed = 1 extractor.ingredient_count = 2 @@ -79,16 +79,16 @@ extractor.graphics_set.animation = { -- TODO: fix this animation south = makeextractorlayers(false, false), west = makeextractorlayers(true, true), } -extractor.crafting_categories = { "thermal-extractor" } -extractor.fixed_recipe = "thermal-extractor-water" -bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction-2", "thermal-extractor-water") -move_item("thermal-extractor", "water-treatment-building", "f[thermal-extractor]-b[extractor]", "item") -bobmods.lib.recipe.add_ingredient("thermal-extractor", { type = "item", name = "thermal-bore", amount = 1 }) +extractor.crafting_categories = { "sb-thermal-extractor" } +extractor.fixed_recipe = "sb-thermal-extractor-water" +bobmods.lib.tech.add_recipe_unlock("angels-thermal-water-extraction-2", "sb-thermal-extractor-water") +move_item("angels-thermal-extractor", "angels-water-treatment-building", "f[thermal-extractor]-b[extractor]", "item") +bobmods.lib.recipe.add_ingredient("angels-thermal-extractor", { type = "item", name = "angels-thermal-bore", amount = 1 }) extractor.vector_to_place_result = nil -- remove the yellow arrow of the mining drill -local bore = data.raw["mining-drill"]["thermal-bore"] -data.raw["mining-drill"]["thermal-bore"] = nil -data.raw["assembling-machine"]["thermal-bore"] = bore +local bore = data.raw["mining-drill"]["angels-thermal-bore"] +data.raw["mining-drill"]["angels-thermal-bore"] = nil +data.raw["assembling-machine"]["angels-thermal-bore"] = bore bore.type = "assembling-machine" bore.crafting_speed = 1 bore.ingredient_count = 1 @@ -142,15 +142,15 @@ table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[2 bore.graphics_set.animation.north.layers[3].repeat_count = 40 bore.graphics_set.animation.north.layers[4].repeat_count = 40 -bore.crafting_categories = { "thermal-bore" } -bore.fixed_recipe = "thermal-bore-water" -bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction", "thermal-bore-water") -move_item("thermal-bore", "water-treatment-building", "f[thermal-extractor]-a[bore]", "item") +bore.crafting_categories = { "sb-thermal-bore" } +bore.fixed_recipe = "sb-thermal-bore-water" +bobmods.lib.tech.add_recipe_unlock("angels-thermal-water-extraction", "sb-thermal-bore-water") +move_item("angels-thermal-bore", "angels-water-treatment-building", "f[thermal-extractor]-a[bore]", "item") -- Fish Pressing requires thermal water so add a prerequisite -if data.raw.technology["bio-pressing-fish"] then - bobmods.lib.tech.add_prerequisite("bio-pressing-fish", "thermal-water-extraction") +if data.raw.technology["angels-bio-pressing-fish"] then + bobmods.lib.tech.add_prerequisite("angels-bio-pressing-fish", "angels-thermal-water-extraction") else - bobmods.lib.tech.add_prerequisite("bio-pressing-fish-1", "thermal-water-extraction") + bobmods.lib.tech.add_prerequisite("angels-bio-pressing-fish-1", "angels-thermal-water-extraction") end -bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "bio-processing-brown") +bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "angels-bio-processing-brown") diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua index 9cc0985f..b9af1ffd 100644 --- a/SeaBlock/data-updates/unobtainable-items.lua +++ b/SeaBlock/data-updates/unobtainable-items.lua @@ -12,81 +12,81 @@ seablock.lib.hide("storage-tank", "topup-valve") -- Hide Multi-phase oil -- Hide gas fractioning - synthesis (only recipe available in advanced gas refinery) for _, item in pairs({ - { type = "assembling-machine", name = "electro-whinning-cell" }, - { type = "assembling-machine", name = "electro-whinning-cell-2" }, - { type = "assembling-machine", name = "gas-refinery" }, - { type = "assembling-machine", name = "gas-refinery-2" }, - { type = "assembling-machine", name = "gas-refinery-3" }, - { type = "assembling-machine", name = "gas-refinery-4" }, - { type = "assembling-machine", name = "separator" }, - { type = "assembling-machine", name = "separator-2" }, - { type = "assembling-machine", name = "separator-3" }, - { type = "assembling-machine", name = "separator-4" }, - { type = "fluid", name = "gas-chlor-methane" }, - { type = "fluid", name = "liquid-multi-phase-oil" }, - { type = "item", name = "electro-whinning-cell" }, - { type = "item", name = "electro-whinning-cell-2" }, - { type = "item", name = "gas-chlor-methane-barrel" }, - { type = "item", name = "gas-refinery" }, - { type = "item", name = "gas-refinery-2" }, - { type = "item", name = "gas-refinery-3" }, - { type = "item", name = "gas-refinery-4" }, - { type = "item", name = "liquid-multi-phase-oil-barrel" }, - { type = "item", name = "separator" }, - { type = "item", name = "separator-2" }, - { type = "item", name = "separator-3" }, - { type = "item", name = "separator-4" }, + { type = "assembling-machine", name = "angels-electro-whinning-cell" }, + { type = "assembling-machine", name = "angels-electro-whinning-cell-2" }, + { type = "assembling-machine", name = "angels-gas-refinery" }, + { type = "assembling-machine", name = "angels-gas-refinery-2" }, + { type = "assembling-machine", name = "angels-gas-refinery-3" }, + { type = "assembling-machine", name = "angels-gas-refinery-4" }, + { type = "assembling-machine", name = "angels-separator" }, + { type = "assembling-machine", name = "angels-separator-2" }, + { type = "assembling-machine", name = "angels-separator-3" }, + { type = "assembling-machine", name = "angels-separator-4" }, + { type = "fluid", name = "angels-gas-chlor-methane" }, + { type = "fluid", name = "angels-liquid-multi-phase-oil" }, + { type = "item", name = "angels-electro-whinning-cell" }, + { type = "item", name = "angels-electro-whinning-cell-2" }, + { type = "item", name = "angels-gas-chlor-methane-barrel" }, + { type = "item", name = "angels-gas-refinery" }, + { type = "item", name = "angels-gas-refinery-2" }, + { type = "item", name = "angels-gas-refinery-3" }, + { type = "item", name = "angels-gas-refinery-4" }, + { type = "item", name = "angels-liquid-multi-phase-oil-barrel" }, + { type = "item", name = "angels-separator" }, + { type = "item", name = "angels-separator-2" }, + { type = "item", name = "angels-separator-3" }, + { type = "item", name = "angels-separator-4" }, }) do seablock.lib.hide(item.type, item.name) end -bobmods.lib.recipe.hide("angels-chemical-void-gas-chlor-methane") -bobmods.lib.recipe.hide("angels-chemical-void-liquid-multi-phase-oil") -bobmods.lib.recipe.hide("electro-whinning-cell") -bobmods.lib.recipe.hide("electro-whinning-cell-2") -bobmods.lib.recipe.hide("empty-gas-chlor-methane-barrel") -bobmods.lib.recipe.hide("empty-liquid-multi-phase-oil-barrel") -bobmods.lib.recipe.hide("gas-chlor-methane-barrel") -bobmods.lib.recipe.hide("liquid-multi-phase-oil-barrel") -bobmods.lib.recipe.hide("gas-chlor-methane") -bobmods.lib.recipe.hide("gas-fractioning-synthesis") -bobmods.lib.recipe.hide("gas-refinery") -bobmods.lib.recipe.hide("gas-refinery-2") -bobmods.lib.recipe.hide("gas-refinery-3") -bobmods.lib.recipe.hide("gas-refinery-4") -bobmods.lib.recipe.hide("oil-separation") -bobmods.lib.recipe.hide("separator") -bobmods.lib.recipe.hide("separator-2") -bobmods.lib.recipe.hide("separator-3") -bobmods.lib.recipe.hide("separator-4") - -bobmods.lib.tech.remove_recipe_unlock("advanced-ore-refining-4", "electro-whinning-cell-2") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "separator-2") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "gas-refinery-2") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "separator-3") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "gas-refinery-3") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "separator-4") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-synthesis") -bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-refinery") -bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "gas-refinery-4") -bobmods.lib.tech.remove_recipe_unlock("chlorine-processing-2", "gas-chlor-methane") -bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-multi-phase-oil-barrel") -bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-multi-phase-oil-barrel") -bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "empty-gas-chlor-methane-barrel") +bobmods.lib.recipe.hide("angels-chemical-void-angels-gas-chlor-methane") +bobmods.lib.recipe.hide("angels-chemical-void-angels-liquid-multi-phase-oil") +bobmods.lib.recipe.hide("angels-electro-whinning-cell") +bobmods.lib.recipe.hide("angels-electro-whinning-cell-2") +bobmods.lib.recipe.hide("empty-angels-gas-chlor-methane-barrel") +bobmods.lib.recipe.hide("empty-angels-liquid-multi-phase-oil-barrel") +bobmods.lib.recipe.hide("angels-gas-chlor-methane-barrel") +bobmods.lib.recipe.hide("angels-liquid-multi-phase-oil-barrel") +bobmods.lib.recipe.hide("angels-gas-chlor-methane") +bobmods.lib.recipe.hide("angels-gas-fractioning-synthesis") +bobmods.lib.recipe.hide("angels-gas-refinery") +bobmods.lib.recipe.hide("angels-gas-refinery-2") +bobmods.lib.recipe.hide("angels-gas-refinery-3") +bobmods.lib.recipe.hide("angels-gas-refinery-4") +bobmods.lib.recipe.hide("angels-oil-separation") +bobmods.lib.recipe.hide("angels-separator") +bobmods.lib.recipe.hide("angels-separator-2") +bobmods.lib.recipe.hide("angels-separator-3") +bobmods.lib.recipe.hide("angels-separator-4") + +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-ore-refining-4", "angels-electro-whinning-cell-2") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "angels-separator-2") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "angels-gas-refinery-2") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "angels-separator-3") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "angels-gas-refinery-3") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "angels-separator-4") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "angels-gas-fractioning-synthesis") +bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refinery") +bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "angels-gas-refinery-4") +bobmods.lib.tech.remove_recipe_unlock("angels-chlorine-processing-2", "angels-gas-chlor-methane") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-angels-liquid-multi-phase-oil-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "angels-liquid-multi-phase-oil-barrel") +bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "empty-angels-gas-chlor-methane-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "fill-gas-chlor-methane-barrel") -bobmods.lib.tech.remove_recipe_unlock("ore-electro-whinning-cell", "electro-whinning-cell") +bobmods.lib.tech.remove_recipe_unlock("angels-ore-electro-whinning-cell", "angels-electro-whinning-cell") -bobmods.lib.recipe.replace_ingredient("paste-cellulose", "gas-chlor-methane", "gas-chlorine") +bobmods.lib.recipe.replace_ingredient("angels-paste-cellulose", "angels-gas-chlor-methane", "angels-gas-chlorine") -- Hide recipes that take Chrome Ingots -bobmods.lib.recipe.hide("molten-iron-smelting-5") +bobmods.lib.recipe.hide("angels-liquid-molten-iron-5") bobmods.lib.tech.hide("angels-iron-casting-4") -bobmods.lib.recipe.hide("molten-steel-smelting-5") +bobmods.lib.recipe.hide("angels-liquid-molten-steel-5") bobmods.lib.tech.hide("angels-steel-smelting-4") -bobmods.lib.recipe.hide("molten-titanium-smelting-5") -bobmods.lib.tech.remove_recipe_unlock("angels-titanium-casting-3", "molten-titanium-smelting-5") +bobmods.lib.recipe.hide("angels-liquid-molten-titanium-5") +bobmods.lib.tech.remove_recipe_unlock("angels-titanium-casting-3", "angels-liquid-molten-titanium-5") bobmods.lib.tech.remove_prerequisite("angels-titanium-casting-3", "angels-chrome-smelting-1") -- Hide steam inserter @@ -102,11 +102,11 @@ bobmods.lib.tech.remove_recipe_unlock(seablock.final_scripted_tech, "bob-steam-i -- Hide Liquid Fuel if data.raw.recipe["bob-enriched-fuel"] then bobmods.lib.recipe.set_ingredients("bob-enriched-fuel", { - { type = "fluid", name = "liquid-fuel-oil", amount = 80 }, - { type = "fluid", name = "gas-residual", amount = 20 }, + { type = "fluid", name = "angels-liquid-fuel-oil", amount = 80 }, + { type = "fluid", name = "angels-gas-residual", amount = 20 }, }) data.raw.recipe["bob-enriched-fuel"].icons = - angelsmods.functions.create_solid_recipe_icon({ "liquid-fuel-oil", "gas-residual" }, "bob-enriched-fuel") + angelsmods.functions.create_solid_recipe_icon({ "angels-liquid-fuel-oil", "angels-gas-residual" }, "bob-enriched-fuel") end bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-liquid-fuel-barrel") bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-liquid-fuel-barrel") @@ -120,14 +120,14 @@ seablock.lib.hide("item", "bob-liquid-fuel-barrel") -- Swap out Nickel and Zinc plates seablock.lib.substingredient("bob-roboport-antenna-3", "bob-nickel-plate", "bob-titanium-plate", nil) bobmods.lib.recipe.remove_ingredient("bob-roboport-antenna-4", "bob-nickel-plate") -seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "solid-zinc-oxide", nil) +seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "angels-solid-zinc-oxide", nil) -seablock.lib.unhide_recipe("zinc-ore-processing-alt") -bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "zinc-ore-processing-alt") +seablock.lib.unhide_recipe("angels-solid-zinc-oxide") +bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "angels-solid-zinc-oxide") bobmods.lib.tech.add_prerequisite("bob-battery-3", "angels-zinc-smelting-2") -if data.raw.recipe["pellet-zinc-smelting"] then - data.raw.recipe["pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("solid-zinc-oxide"), +if data.raw.recipe["angels-pellet-zinc-smelting"] then + data.raw.recipe["angels-pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer( + angelsmods.functions.get_object_icons("angels-solid-zinc-oxide"), 2, angelsmods.smelting.number_tint ) @@ -148,19 +148,19 @@ if mods["cargo-ships"] then end -- Hide the farm environment kits -seablock.lib.hide("item", "desert-upgrade") -seablock.lib.hide("item", "swamp-upgrade") -seablock.lib.hide("item", "temperate-upgrade") -bobmods.lib.tech.remove_recipe_unlock("bio-desert-farm", "desert-upgrade") -bobmods.lib.tech.remove_recipe_unlock("bio-swamp-farm", "swamp-upgrade") -bobmods.lib.tech.remove_recipe_unlock("bio-temperate-farm", "temperate-upgrade") -bobmods.lib.recipe.hide("desert-upgrade") -bobmods.lib.recipe.hide("swamp-upgrade") -bobmods.lib.recipe.hide("temperate-upgrade") - -bobmods.lib.recipe.remove_ingredient("desert-farm", "desert-upgrade") -bobmods.lib.recipe.add_ingredient("desert-farm", { type = "item", name = "token-bio", amount = 5 }) -bobmods.lib.recipe.remove_ingredient("swamp-farm", "swamp-upgrade") -bobmods.lib.recipe.add_ingredient("swamp-farm", { type = "item", name = "token-bio", amount = 5 }) -bobmods.lib.recipe.remove_ingredient("temperate-farm", "temperate-upgrade") -bobmods.lib.recipe.add_ingredient("temperate-farm", { type = "item", name = "token-bio", amount = 5 }) +seablock.lib.hide("item", "angels-desert-upgrade") +seablock.lib.hide("item", "angels-swamp-upgrade") +seablock.lib.hide("item", "angels-temperate-upgrade") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-desert-farm", "angels-desert-upgrade") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-swamp-farm", "angels-swamp-upgrade") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-temperate-farm", "angels-temperate-upgrade") +bobmods.lib.recipe.hide("angels-desert-upgrade") +bobmods.lib.recipe.hide("angels-swamp-upgrade") +bobmods.lib.recipe.hide("angels-temperate-upgrade") + +bobmods.lib.recipe.remove_ingredient("angels-desert-farm", "angels-desert-upgrade") +bobmods.lib.recipe.add_ingredient("angels-desert-farm", { type = "item", name = "angels-token-bio", amount = 5 }) +bobmods.lib.recipe.remove_ingredient("angels-swamp-farm", "angels-swamp-upgrade") +bobmods.lib.recipe.add_ingredient("angels-swamp-farm", { type = "item", name = "angels-token-bio", amount = 5 }) +bobmods.lib.recipe.remove_ingredient("angels-temperate-farm", "angels-temperate-upgrade") +bobmods.lib.recipe.add_ingredient("angels-temperate-farm", { type = "item", name = "angels-token-bio", amount = 5 }) diff --git a/SeaBlock/data-updates/wood.lua b/SeaBlock/data-updates/wood.lua index 8d2098ca..4a34af1e 100644 --- a/SeaBlock/data-updates/wood.lua +++ b/SeaBlock/data-updates/wood.lua @@ -12,36 +12,37 @@ angelsmods.functions.allow_productivity("sb-wood-bricks-charcoal") bobmods.lib.recipe.enabled("wooden-chest", false) bobmods.lib.recipe.enabled("bob-wooden-board", false) -bobmods.lib.recipe.enabled("cellulose-fiber-raw-wood", false) +bobmods.lib.recipe.enabled("angels-cellulose-fiber-raw-wood", false) -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing", "wood-pellets") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "small-electric-pole") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-chest") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "bob-wooden-board") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "bob-basic-circuit-board") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing", "angels-wood-pellets") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "small-electric-pole") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "wooden-chest") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "bob-wooden-board") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "bob-basic-circuit-board") -bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1") -bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-wood-processing") -bobmods.lib.tech.add_prerequisite("bio-wood-processing-2", "bio-processing-brown") -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "wood-charcoal") -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-resin-wood-reprocessing") -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bob-rubber") -- TODO : check if this is supposed to be bob-rubber -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-processor") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-pellets") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-bricks") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "sb-wood-bricks-charcoal") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "carbon-separation-2") +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-farm-1") +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-wood-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-wood-processing-2", "angels-bio-processing-brown") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-charcoal") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-bio-resin-wood-reprocessing") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "bob-rubber") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-bio-processor") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-pellets") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-bricks") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "sb-wood-bricks-charcoal") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-gas-carbon-dioxide") -bobmods.lib.tech.remove_prerequisite("bio-wood-processing-3", "angels-coal-processing") -bobmods.lib.tech.add_prerequisite("bio-wood-processing-3", "bio-arboretum-1") -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "wood-bricks") -bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-3", "cellulose-fiber-raw-wood") +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-3", "angels-coal-processing") +bobmods.lib.tech.add_prerequisite("angels-bio-wood-processing-3", "angels-bio-arboretum-1") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-wood-bricks") +bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-3", "angels-cellulose-fiber-raw-wood") -- Remove solid resin -bobmods.lib.recipe.hide("bio-resin-wood-reprocessing") -bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1") -bobmods.lib.tech.remove_recipe_unlock("resins", "solid-resin") -bobmods.lib.recipe.hide("solid-resin") -seablock.lib.hide_item("resin") -bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-temperate-1", "bio-resin-resin-liquification") -bobmods.lib.recipe.hide("bio-resin-resin-liquification") +bobmods.lib.recipe.hide("angels-bio-resin-wood-reprocessing") +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-farm-1") +bobmods.lib.tech.remove_recipe_unlock("angels-resins", "angels-solid-resin") +bobmods.lib.recipe.hide("angels-solid-resin") +seablock.lib.hide_item("angels-solid-resin") +seablock.lib.hide_item("bob-resin") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-arboretum-temperate-1", "angels-bio-resin-resin-liquification") +bobmods.lib.recipe.hide("angels-bio-resin-resin-liquification") diff --git a/SeaBlock/data/misc.lua b/SeaBlock/data/misc.lua index b0a5beb6..870eb547 100644 --- a/SeaBlock/data/misc.lua +++ b/SeaBlock/data/misc.lua @@ -31,4 +31,4 @@ angelsmods.trigger.smelting_products["gunmetal"].plate = false angelsmods.trigger.early_sulfuric_acid = true -- Copy Ore Processing Machine tech icon to Mechanical Refining -seablock.lib.copy_icon(data.raw.technology["ore-crushing"], data.raw.technology["advanced-ore-refining-1"]) +seablock.lib.copy_icon(data.raw.technology["angels-ore-crushing"], data.raw.technology["angels-advanced-ore-refining-1"]) diff --git a/SeaBlock/data/recipe.lua b/SeaBlock/data/recipe.lua index 1673a08b..709e1930 100644 --- a/SeaBlock/data/recipe.lua +++ b/SeaBlock/data/recipe.lua @@ -1,12 +1,12 @@ -- Buff Lead 3 -seablock.lib.substresult("anode-lead-smelting", "slag", "bob-quartz", 1) -seablock.lib.substingredient("anode-lead-smelting", "liquid-hexafluorosilicic-acid", nil, 20) +seablock.lib.substresult("angels-ingot-lead-3", "angels-slag", "bob-quartz", 1) +seablock.lib.substingredient("angels-ingot-lead-3", "angels-liquid-hexafluorosilicic-acid", nil, 20) -- Compost void recipe -angelsmods.functions.make_void("solid-compost", "bio", 5) +angelsmods.functions.make_void("angels-solid-compost", "bio", 5) -- Remove recipe Wood pellets > Carbon dioxide -- Move recipe Charcoal > Carbon dioxide from Basic chemistry to Wood processing 2 -bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "gas-carbon-dioxide-from-wood") -bobmods.lib.recipe.hide("gas-carbon-dioxide-from-wood") -bobmods.lib.tech.remove_recipe_unlock("basic-chemistry", "carbon-separation-2") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-gas-carbon-dioxide-from-wood") +bobmods.lib.recipe.hide("angels-gas-carbon-dioxide-from-wood") +bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry", "angels-carbon-separation-2") diff --git a/SeaBlock/data/tables.lua b/SeaBlock/data/tables.lua index f3c64e22..b51b088e 100644 --- a/SeaBlock/data/tables.lua +++ b/SeaBlock/data/tables.lua @@ -4,7 +4,7 @@ seablock.scripted_techs = { ["sb-startup1"] = true, ["sb-startup2"] = true, - ["bio-wood-processing"] = true, + ["angels-bio-wood-processing"] = true, ["sb-startup3"] = true, ["sb-startup4"] = true, } @@ -25,16 +25,16 @@ seablock.startup_techs = { ["angels-fluid-control"] = { true }, ["angels-sulfur-processing-1"] = { true }, ["automation"] = { true }, - ["basic-chemistry"] = { true }, + ["angels-basic-chemistry"] = { true }, -- Don't reduce the science pack cost of green algae - ["bio-processing-green"] = { false }, - ["bio-wood-processing-2"] = { true }, + ["angels-bio-processing-green"] = { false }, + ["angels-bio-wood-processing-2"] = { true }, ["bob-long-inserters-1"] = { true }, ["military"] = { true }, ["lamp"] = { true }, - ["slag-processing-1"] = { true }, + ["angels-slag-processing-1"] = { true }, ["steam-power"] = { true }, - ["water-washing-1"] = { true }, + ["angels-water-washing-1"] = { true }, } if data.raw.technology["logistics-0"] then @@ -48,26 +48,26 @@ end seablock.startup_recipes = { ["angels-electrolyser"] = true, ["angels-flare-stack"] = true, - ["burner-ore-crusher"] = true, - ["crystallizer"] = true, - ["dirt-water-separation"] = true, - ["liquifier"] = true, + ["angels-burner-ore-crusher"] = true, + ["angels-crystallizer"] = true, + ["angels-dirt-water-separation"] = true, + ["angels-liquifier"] = true, ["offshore-pump"] = true, ["sb-wood-foraging"] = true, ["sb-water-mineralized-crystallization"] = true, - ["slag-processing-stone"] = true, - ["stone-pipe"] = true, - ["stone-pipe-to-ground"] = true, + ["angels-stone-from-crushed-stone"] = true, + ["angels-stone-pipe"] = true, + ["angels-stone-pipe-to-ground"] = true, ["stone-brick"] = true, - ["stone-crushed"] = true, - ["water-mineralized"] = true, + ["angels-stone-crushed"] = true, + ["angels-water-mineralized"] = true, } if settings.startup["bobmods-assembly-multipurposefurnaces"] and settings.startup["bobmods-assembly-multipurposefurnaces"].value then - seablock.startup_recipes["stone-mixing-furnace"] = true + seablock.startup_recipes["bob-stone-mixing-furnace"] = true end -- seablock.final_scripted_tech @@ -77,4 +77,4 @@ if data.raw.technology["sct-automation-science-pack"] then seablock.final_scripted_tech = "sct-automation-science-pack" end -seablock.final_startup_tech = "slag-processing-1" +seablock.final_startup_tech = "angels-slag-processing-1" diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua index da40ab88..1faa338a 100644 --- a/SeaBlock/data/tech-tree.lua +++ b/SeaBlock/data/tech-tree.lua @@ -1,12 +1,12 @@ -- Add bio science to techs if mods["SpaceMod"] then - bobmods.lib.tech.add_new_science_pack("habitation", "token-bio", 1) - bobmods.lib.tech.add_new_science_pack("life-support-systems", "token-bio", 1) + bobmods.lib.tech.add_new_science_pack("habitation", "angels-token-bio", 1) + bobmods.lib.tech.add_new_science_pack("life-support-systems", "angels-token-bio", 1) end -- Remove empty tech Thermal water processing -bobmods.lib.tech.remove_prerequisite("water-treatment-4", "thermal-water-processing") -seablock.lib.hide_technology("thermal-water-processing") +bobmods.lib.tech.remove_prerequisite("angels-water-treatment-4", "angels-thermal-water-processing") +seablock.lib.hide_technology("angels-thermal-water-processing") -- Smelting techs don't need to depend on Coal processing 2 as carbon is unlocked earlier bobmods.lib.tech.remove_prerequisite("angels-aluminium-smelting-1", "angels-coal-processing-2") @@ -19,14 +19,14 @@ bobmods.lib.tech.remove_prerequisite("angels-zinc-smelting-2", "angels-coal-proc bobmods.lib.tech.remove_prerequisite("angels-chrome-smelting-1", "angels-coal-processing-3") bobmods.lib.tech.remove_prerequisite("angels-iron-smelting-2", "angels-coal-processing-2") -bobmods.lib.tech.replace_prerequisite("angels-coal-processing-2", "water-treatment-2", "basic-chemistry-3") +bobmods.lib.tech.replace_prerequisite("angels-coal-processing-2", "angels-water-treatment-2", "angels-basic-chemistry-3") -- Add other prerequisites -bobmods.lib.tech.add_prerequisite("gardens", "bob-electronics") +bobmods.lib.tech.add_prerequisite("angels-gardens", "bob-electronics") if mods["ScienceCostTweakerM"] then - bobmods.lib.tech.add_prerequisite("sct-bio-science-pack", "bio-arboretum-1") + bobmods.lib.tech.add_prerequisite("sct-bio-science-pack", "angels-bio-arboretum-1") bobmods.lib.tech.add_prerequisite("sb-bio-processing-advanced", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("utility-science-pack", "rubber") + bobmods.lib.tech.add_prerequisite("utility-science-pack", "angels-rubber") end bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "bob-silicon-processing") bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "bob-silicon-processing") @@ -35,25 +35,25 @@ bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "bob-silicon-proces -- Bio if mods["ScienceCostTweakerM"] then - bobmods.lib.tech.add_prerequisite("bio-desert-farming-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-swamp-farming-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-temperate-farming-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-pressing-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-arboretum-2", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-arboretum-desert-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-arboretum-swamp-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-processing-alien-2", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-refugium-hatchery", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-fermentation", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("bio-processing-crystal-splinter-1", "sct-bio-science-pack") - bobmods.lib.tech.add_prerequisite("gardens-3", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-desert-farming-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farming-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farming-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-pressing-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-2", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-desert-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-swamp-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-processing-alien-2", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-refugium-hatchery", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-fermentation", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-bio-processing-crystal-splinter-1", "sct-bio-science-pack") + bobmods.lib.tech.add_prerequisite("angels-gardens-3", "sct-bio-science-pack") end -- Logistics / Green -bobmods.lib.tech.add_prerequisite("water-washing-2", "logistic-science-pack") -bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "logistic-science-pack") -bobmods.lib.tech.add_prerequisite("bio-processing-blue", "logistic-science-pack") -bobmods.lib.tech.add_prerequisite("basic-chemistry-2", "logistic-science-pack") +bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "logistic-science-pack") +bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "logistic-science-pack") +bobmods.lib.tech.add_prerequisite("angels-bio-processing-blue", "logistic-science-pack") +bobmods.lib.tech.add_prerequisite("angels-basic-chemistry-2", "logistic-science-pack") -- Chemical / Blue @@ -110,7 +110,7 @@ bobmods.lib.tech.remove_prerequisite("automation-science-pack", "electronics") seablock.lib.hide_technology("automation-science-pack") seablock.lib.hide_technology("electronics") --new trigger tech in base game, we don't want it in seablock --- I think i found a bug: trigger techs still research even if hidden and disabled +-- I think i found a bug: trigger techs still research even if hidden and disabled --TODO: check this -- data.raw["technology"]["electronics"] = nil -- multiple different techs and shortcut will complain if we do that data.raw["technology"]["electronics"].research_trigger = nil data.raw["technology"]["electronics"].unit = {time = 1, count = 1, ingredients = {}} diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index aba6e3c1..c53d1867 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -21,6 +21,8 @@ end function seablock.lib.takeeffect(tech, name) if not data.raw.technology[tech] then + log("Warning: seablock.lib.takeeffect - can't find technology : " .. tech) + log(debug.traceback()) return nil end local effects = data.raw.technology[tech].effects or {} @@ -42,7 +44,8 @@ end function seablock.lib.moveeffect(name, fromtech, totech, insertindex) local effect = seablock.lib.takeeffect(fromtech, name) if not effect then - log("Effect " .. name .. " not found in tech " .. fromtech) + log("Warning : seablock.lib.moveeffect - Effect " .. name .. " not found in tech " .. fromtech) + log(debug.traceback()) return end if insertindex then @@ -95,12 +98,6 @@ function seablock.lib.add_recipe_unlock(technology, recipe, insertindex) end function seablock.lib.iteraterecipes(recipe, func) - -- if recipe.normal then --TODO: remove this - -- func(recipe.normal) - -- end - -- if recipe.expensive then - -- func(recipe.expensive) - -- end if recipe.ingredients then func(recipe) end @@ -138,6 +135,7 @@ function seablock.lib.substingredient(name, from, to, count) end seablock.lib.recipeforeach(name, from, dosubst, "ingredients") else + log("Warning : seablock.lib.substingredient - can't find recipe : " .. name) log(debug.traceback()) end end @@ -155,7 +153,8 @@ function seablock.lib.removeingredient(name, ingredient) end seablock.lib.iteraterecipes(t, doremove) else - log("sb - removeingredient - can't find recipe : " .. name) + log("Warning : seablock.lib.removeingredient - can't find recipe : " .. name) + log(debug.traceback()) end end @@ -171,6 +170,9 @@ function seablock.lib.substresult(name, from, to, count) end end seablock.lib.recipeforeach(name, from, dosubst, "results") + else + log("Warning : seablock.lib.substresult - can't find recipe : " .. name) + log(debug.traceback()) end end @@ -181,6 +183,9 @@ function seablock.lib.addresult(name, resulttable) table.insert(recipe.results, resulttable) end seablock.lib.iteraterecipes(t, doadd) + else + log("Warning: seablock.lib.addresult - can't find recipe : " .. name) + log(debug.traceback()) end end @@ -215,6 +220,9 @@ function seablock.lib.unhide_recipe(recipe_name) if not recipe.normal and not recipe.expensive then recipe.hidden = false end + else + log("Warning: seablock.lib.unhide_recipe - can't find recipe : " .. recipe_name) + log(debug.traceback()) end end @@ -234,7 +242,8 @@ function seablock.lib.hide_technology(technology_name) technology.enabled = false end else - log("Hide non existing tech : " .. technology_name) + log("Warning: seablock.lib.hide_technology - Hide non existing tech : " .. technology_name) + log(debug.traceback()) end end @@ -261,17 +270,22 @@ function seablock.lib.hide_item(item_name) item = data.raw.fluid[item_name] if item then item.hidden = true + else + log("Warning: seablock.lib.hide_item - can't find item or fluid : " .. item_name) + log(debug.traceback()) end end end function seablock.lib.hide(type_name, name) if not data.raw[type_name] then - log("seablock.lib.hide: Unknown type: " .. type_name) + log("Warning: seablock.lib.hide - Unknown type: " .. type_name) + log(debug.traceback()) else local item = data.raw[type_name][name] if not item then - log("Unknown " .. type_name .. ": " .. name) + log("Warning: seablock.lib.hide - Unknown " .. type_name .. ": " .. name) + log(debug.traceback()) else if type_name == "fluid" then item.hidden = true @@ -297,7 +311,8 @@ end function seablock.lib.remove_effect(technology_name, effect_type, effect_key, effect_value) local tech = data.raw.technology[technology_name] if not tech then - log("Unknown technology: " .. technology_name) + log("Warning: seablock.lib.remove_effect - Unknown technology: " .. technology_name) + log(debug.traceback()) return end @@ -313,13 +328,15 @@ end function seablock.lib.add_flag(type, name, flag) if not data.raw[type] then - log("Unknown type: " .. type) + log("Warning : seablock.lib.add_flag - Unknown type: " .. type) + log(debug.traceback()) return end local item = data.raw[type][name] if not item then - log("Unknown " .. type .. ": " .. name) + log("Warning : seablock.lib.add_flag - Unknown " .. type .. ": " .. name) + log(debug.traceback()) return end diff --git a/SeaBlock/new-mapgen.lua b/SeaBlock/new-mapgen.lua index 3958a9d2..6f587cd2 100644 --- a/SeaBlock/new-mapgen.lua +++ b/SeaBlock/new-mapgen.lua @@ -507,10 +507,10 @@ data.raw.tile["sand-4"].autoplace = {probability_expression = "if(elevation >= 0 -- data.raw.tile["sand-5"].autoplace = {probability_expression = "if(elevation >= 0, elevation, -inf)"} -- decided against using this -data.raw.tree["desert-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 1, source = 0.03, amplitude = 0.01}, -inf)"} --, tile_restriction = {"sand-5"}} -data.raw.tree["temperate-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 2, source = 0.03, amplitude = 0.01}, -inf)"} -data.raw.tree["swamp-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 3, source = 0.03, amplitude = 0.015}, -inf)"} +data.raw.tree["angels-desert-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 1, source = 0.03, amplitude = 0.01}, -inf)"} --, tile_restriction = {"sand-5"}} +data.raw.tree["angels-temperate-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 2, source = 0.03, amplitude = 0.01}, -inf)"} +data.raw.tree["angels-swamp-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 3, source = 0.03, amplitude = 0.015}, -inf)"} -data.raw.tree["desert-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 4, source = 0.03, amplitude = 0.01}, -inf)"} --, placement_density = 3} -data.raw.tree["temperate-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 5, source = 0.03, amplitude = 0.01}, -inf)"} -data.raw.tree["swamp-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 6, source = 0.03, amplitude = 0.015}, -inf)"} \ No newline at end of file +data.raw.tree["angels-desert-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 4, source = 0.03, amplitude = 0.01}, -inf)"} --, placement_density = 3} +data.raw.tree["angels-temperate-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 5, source = 0.03, amplitude = 0.01}, -inf)"} +data.raw.tree["angels-swamp-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 6, source = 0.03, amplitude = 0.015}, -inf)"} \ No newline at end of file diff --git a/SeaBlock/prototypes/item.lua b/SeaBlock/prototypes/item.lua index e2dd8deb..d1b8d5dd 100644 --- a/SeaBlock/prototypes/item.lua +++ b/SeaBlock/prototypes/item.lua @@ -1,10 +1,10 @@ data:extend({ { type = "item", - name = "catalyst-metal-purple", + name = "sb-catalyst-metal-purple", icon = "__SeaBlock__/graphics/icons/catalyst-metal-purple.png", icon_size = 32, - subgroup = "petrochem-catalysts", + subgroup = "angels-petrochem-catalysts", order = "c[catalyst-metal]-d[purple]", stack_size = 200, }, diff --git a/SeaBlock/prototypes/recipe-category.lua b/SeaBlock/prototypes/recipe-category.lua index ae9c42a2..87f5272b 100644 --- a/SeaBlock/prototypes/recipe-category.lua +++ b/SeaBlock/prototypes/recipe-category.lua @@ -1,19 +1,19 @@ data:extend({ { type = "recipe-category", - name = "crafting-handonly", + name = "sb-crafting-handonly", }, { type = "recipe-category", - name = "thermal-bore", + name = "sb-thermal-bore", }, { type = "recipe-category", - name = "thermal-extractor", + name = "sb-thermal-extractor", }, { type = "recipe-category", - name = "petrochem-electrolyser-4", + name = "sb-petrochem-electrolyser-4", }, }) diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua index a8a1861a..99807655 100644 --- a/SeaBlock/prototypes/recipe.lua +++ b/SeaBlock/prototypes/recipe.lua @@ -5,15 +5,15 @@ data:extend({ category = "smelting", enabled = false, energy_required = 3.5, - ingredients = { { type = "item", name = "wood-bricks", amount = 1 } }, - results = { { type = "item", name = "wood-charcoal", amount = 5 } }, - subgroup = "bio-processing-wood", + ingredients = { { type = "item", name = "angels-wood-bricks", amount = 1 } }, + results = { { type = "item", name = "angels-wood-charcoal", amount = 5 } }, + subgroup = "angels-bio-processing-wood", }, { type = "recipe", - name = "thermal-bore-water", - category = "thermal-bore", - subgroup = "water-treatment", + name = "sb-thermal-bore-water", + category = "sb-thermal-bore", + subgroup = "angels-water-treatment", order = "h[thermal-bore-water]", energy_required = 10, enabled = false, @@ -21,14 +21,14 @@ data:extend({ { type = "item", name = "bob-lithium-chloride", amount = 1 }, }, results = { - { type = "fluid", name = "thermal-water", amount = 20 }, + { type = "fluid", name = "angels-thermal-water", amount = 20 }, }, }, { type = "recipe", - name = "thermal-extractor-water", - category = "thermal-extractor", - subgroup = "water-treatment", + name = "sb-thermal-extractor-water", + category = "sb-thermal-extractor", + subgroup = "angels-water-treatment", order = "h[thermal-extractor-water]", energy_required = 5, enabled = false, @@ -37,19 +37,19 @@ data:extend({ { type = "item", name = "bob-lithium-chloride", amount = 2 }, }, results = { - { type = "fluid", name = "thermal-water", amount = 100 }, + { type = "fluid", name = "angels-thermal-water", amount = 100 }, }, }, { type = "recipe", name = "sb-water-mineralized-crystallization", - category = "crystallizing", - subgroup = "slag-processing-1", + category = "angels-crystallizing", + subgroup = "angels-slag-processing-1", order = "z[slag-processing]", enabled = true, energy_required = 2, ingredients = { - { type = "fluid", name = "water-mineralized", amount = 200 }, + { type = "fluid", name = "angels-water-mineralized", amount = 200 }, }, results = { { type = "item", name = "angels-ore1", amount = 2, probability = 0.55 }, @@ -60,8 +60,8 @@ data:extend({ type = "recipe", name = "sb-wood-foraging", localised_name = { "recipe-name.sb-wood-foraging" }, - category = "crafting-handonly", - subgroup = "bio-processing-green", + category = "sb-crafting-handonly", + subgroup = "angels-bio-processing-green", enabled = true, energy_required = 4, ingredients = {}, @@ -74,17 +74,17 @@ data:extend({ }, { type = "recipe", - name = "catalyst-metal-purple", + name = "sb-catalyst-metal-purple", category = "crafting", energy_required = 2, enabled = false, ingredients = { - { type = "item", name = "catalyst-metal-carrier", amount = 10 }, + { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 }, { type = "item", name = "bob-gold-ore", amount = 1 }, { type = "item", name = "bob-rutile-ore", amount = 1 }, }, results = { - { type = "item", name = "catalyst-metal-purple", amount = 10 }, + { type = "item", name = "sb-catalyst-metal-purple", amount = 10 }, }, }, { @@ -103,26 +103,26 @@ data:extend({ type = "recipe", name = "sb-blue-algae-liquefaction", icons = angelsmods.functions.create_liquid_recipe_icon({ - "blue-cellulose-fiber", + "angels-blue-cellulose-fiber", }, { { 100, 100, 100 }, { 171, 161, 055 }, { 127, 163, 109 } }), category = "oil-processing", enabled = false, energy_required = 5, ingredients = { - { type = "item", name = "blue-cellulose-fiber", amount = 20 }, + { type = "item", name = "angels-blue-cellulose-fiber", amount = 20 }, { type = "fluid", name = "steam", amount = 100 }, }, results = { { type = "fluid", name = "crude-oil", amount = 90 }, - { type = "fluid", name = "water-yellow-waste", amount = 70 }, - { type = "fluid", name = "gas-carbon-dioxide", amount = 20 }, + { type = "fluid", name = "angels-water-yellow-waste", amount = 70 }, + { type = "fluid", name = "angels-gas-carbon-dioxide", amount = 20 }, }, - subgroup = "bio-processing-blue", + subgroup = "angels-bio-processing-blue", order = "d[blue-algae-liquefaction]", }, }) -bobmods.lib.tech.add_prerequisite("angels-oil-processing", "bio-processing-blue") +bobmods.lib.tech.add_prerequisite("angels-oil-processing", "angels-bio-processing-blue") bobmods.lib.tech.add_recipe_unlock("angels-oil-processing", "sb-blue-algae-liquefaction") -- Setup recipe bases diff --git a/SeaBlock/prototypes/rockchest.lua b/SeaBlock/prototypes/rockchest.lua index 90434db8..dc6d9a6c 100644 --- a/SeaBlock/prototypes/rockchest.lua +++ b/SeaBlock/prototypes/rockchest.lua @@ -1,7 +1,7 @@ data:extend({ { type = "container", - name = "rock-chest", + name = "sb-rock-chest", localised_name = { "entity-name.home" }, icon = "__base__/graphics/icons/stone.png", icon_size = 32, diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index becff62f..327af0be 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -36,8 +36,8 @@ data:extend({ icon = "__SeaBlock__/graphics/technology/ore.png", icon_size = 128, effects = { - { type = "unlock-recipe", recipe = "angelsore1-crushed-smelting" }, - { type = "unlock-recipe", recipe = "angelsore3-crushed-smelting" }, + { type = "unlock-recipe", recipe = "angels-ore1-crushed-smelting" }, + { type = "unlock-recipe", recipe = "angels-ore3-crushed-smelting" }, { type = "unlock-recipe", recipe = "copper-cable" }, }, research_trigger = {type = "craft-item", item = "angels-ore3-crushed"} @@ -58,7 +58,7 @@ data:extend({ { type = "unlock-recipe", recipe = "burner-inserter" }, { type = "unlock-recipe", recipe = "iron-chest" }, }, - prerequisites = { "bio-wood-processing" }, + prerequisites = { "angels-bio-wood-processing" }, research_trigger = {type = "craft-item", item = "bob-basic-circuit-board"}, }, { @@ -81,7 +81,7 @@ data:extend({ icon_size = 128, order = "c-a", prerequisites = { - "bio-processing-red", + "angels-bio-processing-red", "advanced-circuit", "angels-stone-smelting-2", "bob-zinc-processing", @@ -90,7 +90,7 @@ data:extend({ effects = { { type = "unlock-recipe", - recipe = "algae-farm-4", + recipe = "angels-algae-farm-4", }, }, unit = { @@ -98,7 +98,7 @@ data:extend({ ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, - {"token-bio", 1 }, + { "angels-token-bio", 1 }, { "chemical-science-pack", 1 }, }, time = 30, diff --git a/SeaBlock/remote.lua b/SeaBlock/remote.lua index 0943720c..94b3b5b6 100644 --- a/SeaBlock/remote.lua +++ b/SeaBlock/remote.lua @@ -51,10 +51,9 @@ local function milestones_presets() } -- Resources - --TODO: rename bob stuff grouped_milestones["resorces"] = { { type = "group", name = "Resources" }, - { type = "item", name = "wood-charcoal", quantity = 1 }, + { type = "item", name = "angels-wood-charcoal", quantity = 1 }, { type = "item", name = "bob-basic-circuit-board", quantity = 1 }, { type = "item", name = "electronic-circuit", quantity = 1 }, { type = "item", name = "advanced-circuit", quantity = 1 }, @@ -87,12 +86,12 @@ local function milestones_presets() { type = "item", name = "bob-nitinol-alloy", quantity = 1 }, { type = "item", name = "plastic-bar", quantity = 1 }, - { type = "fluid", name = "liquid-resin", quantity = 100 }, - { type = "item", name = "rubber", quantity = 1 }, - { type = "item", name = "alien-bacteria", quantity = 1 }, + { type = "fluid", name = "angels-liquid-resin", quantity = 100 }, + { type = "item", name = "bob-rubber", quantity = 1 }, + { type = "item", name = "angels-alien-bacteria", quantity = 1 }, { type = "item", name = "sulfur", quantity = 1 }, - { type = "fluid", name = "mineral-sludge", quantity = 1 }, - { type = "fluid", name = "mineral-sludge", quantity = 10000, next = "x10" }, + { type = "fluid", name = "angels-mineral-sludge", quantity = 1 }, + { type = "fluid", name = "angels-mineral-sludge", quantity = 10000, next = "x10" }, } -- Progress @@ -114,7 +113,7 @@ local function milestones_presets() { type = "fluid", name = "liquid-fuel-oil", quantity = 1 }, { type = "item", name = "locomotive", quantity = 1 }, { type = "item", name = "construction-robot", quantity = 1 }, - { type = "item", name = "logistic-chest-requester", quantity = 1 }, + { type = "item", name = "requester-chest", quantity = 1 }, } if not script.active_mods["bobmodules"] then From f7c070458846c73d32ae1f20664180b6addf623e Mon Sep 17 00:00:00 2001 From: elvanaud Date: Thu, 7 Aug 2025 15:33:17 +0200 Subject: [PATCH 024/117] Renamed angels stuff --- SeaBlock/data-updates/military.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index f38b6f4e..c47f047c 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -29,8 +29,8 @@ local mil_items = { { type = "fluid", name = "bob-alien-explosive" }, { type = "fluid", name = "bob-alien-fire" }, { type = "fluid", name = "bob-alien-poison" }, - { type = "fluid", name = "liquid-glycerol" }, - { type = "fluid", name = "liquid-toluene" }, + { type = "fluid", name = "angels-liquid-glycerol" }, + { type = "fluid", name = "angels-liquid-toluene" }, { type = "fluid", name = "bob-nitroglycerin" }, { type = "gun", name = "combat-shotgun" }, { type = "gun", name = "flamethrower" }, @@ -95,8 +95,8 @@ local mil_items = { { type = "item", name = "bob-lab-alien" }, { type = "item", name = "land-mine" }, { type = "item", name = "bob-laser-rifle-battery-case" }, - { type = "item", name = "liquid-glycerol-barrel" }, - { type = "item", name = "liquid-toluene-barrel" }, + { type = "item", name = "angels-liquid-glycerol-barrel" }, + { type = "item", name = "angels-liquid-toluene-barrel" }, { type = "item", name = "bob-magazine" }, { type = "item", name = "bob-nitroglycerin-barrel" }, { type = "item", name = "bob-petroleum-jelly" }, @@ -560,7 +560,7 @@ bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-cannon-shell") bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-rounds-magazine") bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-gunmetal-alloy") -seablock.lib.substresult("angels-nutrients-refining-2", "liquid-glycerol", "water", nil) +seablock.lib.substresult("angels-nutrients-refining-2", "angels-liquid-glycerol", "water", nil) if data.raw.recipe["angels-nutrients-refining-2"] then data.raw.recipe["angels-nutrients-refining-2"].icons = angelsmods.functions.create_liquid_recipe_icon({ "angels-liquid-fuel-oil", From 7112f64e9f1eebb5db6552d0d695362dc84618e0 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sun, 10 Aug 2025 19:58:26 +0200 Subject: [PATCH 025/117] Added missing migrations and removed old bob valves code --- SeaBlock/data-updates/unobtainable-items.lua | 3 --- SeaBlock/migrations/SeaBlock_0.6.0.json | 25 ++++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua index b9af1ffd..10820b12 100644 --- a/SeaBlock/data-updates/unobtainable-items.lua +++ b/SeaBlock/data-updates/unobtainable-items.lua @@ -1,9 +1,6 @@ seablock.lib.hide("mining-drill", "burner-mining-drill") seablock.lib.hide("mining-drill", "electric-mining-drill") seablock.lib.hide("mining-drill", "pumpjack") -seablock.lib.hide("storage-tank", "overflow-valve") -seablock.lib.hide("storage-tank", "valve") -seablock.lib.hide("storage-tank", "topup-valve") -- Hide Oil & Gas Separator -- Hide Advanced Gas Refinery diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.json b/SeaBlock/migrations/SeaBlock_0.6.0.json index 9f9df572..40f18a87 100644 --- a/SeaBlock/migrations/SeaBlock_0.6.0.json +++ b/SeaBlock/migrations/SeaBlock_0.6.0.json @@ -1,8 +1,25 @@ { - "entity": [], + "entity": + [ + ["rock-chest", "sb-rock-chest"] + ], "item": [ - ["stone-crushed", "stone"] + ["stone-crushed", "stone"], + ["catalyst-metal-purple", "sb-catalyst-metal-purple"] + ], + "recipe": + [ + ["thermal-bore-water", "sb-thermal-bore-water"], + ["thermal-extractor-water", "sb-thermal-extractor-water"], + ["crafting-handonly", "sb-crafting-handonly"], + ["catalyst-metal-purple", "sb-catalyst-metal-purple"] + ], + "recipe-category": + [ + ["crafting-handonly", "sb-crafting-handonly"], + ["thermal-bore", "sb-thermal-bore"], + ["thermal-extractor", "sb-thermal-extractor"], + ["petrochem-electrolyser-4", "sb-petrochem-electrolyser-4"] ] - } - \ No newline at end of file +} \ No newline at end of file From 0a42856171e6acab015a5ece974c069cb03bbba9 Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sat, 30 Aug 2025 16:06:37 +0200 Subject: [PATCH 026/117] Quick patch so that the game loads, still need to redo the thermal bore --- SeaBlock/data-updates/thermal-extractor.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index b2b5a44f..cf993346 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -14,7 +14,7 @@ local function makeextractorlayers(bottom, top) local layers = {} if top then table.insert(layers, { - stripes = makestripes("__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16), + stripes = makestripes("__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16), priority = "high", width = 288, height = 288, @@ -30,13 +30,13 @@ local function makeextractorlayers(bottom, top) height = 288, line_length = 4, shift = { 0, 0 }, - filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", + filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", frame_count = 16, animation_speed = 0.5, }) if bottom then table.insert(layers, { - stripes = makestripes("__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16), + stripes = makestripes("__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16), priority = "high", width = 288, height = 288, @@ -137,10 +137,12 @@ end -- south = makeborelayers(2), -- west = makeborelayers(3), -- } -table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[1]) -- TODO: probably fix this graphic_set -table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[2]) -bore.graphics_set.animation.north.layers[3].repeat_count = 40 -bore.graphics_set.animation.north.layers[4].repeat_count = 40 +--table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[1]) -- TODO: probably fix this graphic_set +--table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[2]) +--bore.graphics_set.animation.north.layers[3].repeat_count = 40 +--bore.graphics_set.animation.north.layers[4].repeat_count = 40 + +table.insert(bore.graphics_set,1,bore.base_picture.sheet) bore.crafting_categories = { "sb-thermal-bore" } bore.fixed_recipe = "sb-thermal-bore-water" From 1882e24498d75b82bec5afad786fb569d55dc36b Mon Sep 17 00:00:00 2001 From: elvanaud Date: Sat, 30 Aug 2025 16:07:06 +0200 Subject: [PATCH 027/117] Removed dependency on hidden tech "electronics" --- SeaBlock/data/tech-tree.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua index 1faa338a..c26e1fc5 100644 --- a/SeaBlock/data/tech-tree.lua +++ b/SeaBlock/data/tech-tree.lua @@ -114,6 +114,8 @@ seablock.lib.hide_technology("electronics") --new trigger tech in base game, we -- data.raw["technology"]["electronics"] = nil -- multiple different techs and shortcut will complain if we do that data.raw["technology"]["electronics"].research_trigger = nil data.raw["technology"]["electronics"].unit = {time = 1, count = 1, ingredients = {}} +bobmods.lib.tech.remove_prerequisite("bob-electronics", "electronics") +bobmods.lib.tech.remove_prerequisite("bob-electronics", "automation-science-pack") seablock.lib.hide_technology("electric-mining-drill") seablock.lib.hide_technology("repair-pack") From 6399a1370472726c218984fa623bb9475a5299f5 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 5 Sep 2025 13:32:17 +0200 Subject: [PATCH 028/117] SeaBlockPack 2.0 and removed reskins mods --- SeaBlockMetaPack/info.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/SeaBlockMetaPack/info.json b/SeaBlockMetaPack/info.json index 29779670..756bf364 100644 --- a/SeaBlockMetaPack/info.json +++ b/SeaBlockMetaPack/info.json @@ -1,7 +1,7 @@ { "name": "SeaBlockMetaPack", "version": "1.1.4", - "factorio_version": "1.1", + "factorio_version": "2.0", "title": "Sea Block Pack - Official", "author": "Trainwreck", "contact": "https://forums.factorio.com/viewtopic.php?t=43759", @@ -14,10 +14,6 @@ "angelspetrochem", "angelsrefining", "angelssmelting", - "reskins-angels", - "reskins-bobs", - "reskins-compatibility", - "reskins-library", "bobassembly", "bobelectronics", "bobenemies", From 5f79738bc85c268cefc8cf7dfbd63ddbf0d0b76f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 5 Sep 2025 20:49:19 +0200 Subject: [PATCH 029/117] removed duplicate on_player_created event function and cleared player inventory before startup --- SeaBlock/control.lua | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua index 9d69b582..1cfb9f18 100644 --- a/SeaBlock/control.lua +++ b/SeaBlock/control.lua @@ -79,6 +79,8 @@ local function init() end end + + script.on_event(defines.events.on_player_joined_game, function(e) seablock.give_research(game.players[e.player_index].force) end) @@ -182,17 +184,6 @@ script.on_load(function() set_pvp() end) -script.on_event(defines.events.on_player_created, function(e) - if storage.starting_items and game.is_multiplayer() then - local inv = game.players[e.player_index].get_main_inventory() - for item, quantity in pairs(storage.starting_items) do - if quantity > 0 then - inv.insert({ name = item, count = quantity }) - end - end - end -end) - if script.active_mods["Companion_Drones"] then script.on_event(defines.events.on_player_created, function(e) local s = game.surfaces["nauvis"] @@ -222,8 +213,9 @@ script.on_load(function() end) script.on_event(defines.events.on_player_created, function(e) + game.get_player(e.player_index).get_main_inventory().clear() if storage.starting_items and game.is_multiplayer() then - local inv = game.players[e.player_index].get_main_inventory() + local inv = game.get_player(e.player_index).get_main_inventory() for item, quantity in pairs(storage.starting_items) do if quantity > 0 then inv.insert({ name = item, count = quantity }) From 999cc4d73e175ec927c5242fedecfc901bd35528 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 5 Sep 2025 20:59:09 +0200 Subject: [PATCH 030/117] added autoplace-controls todo --- SeaBlock/data-final-fixes/mapgen.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index 599eecdd..6b92b74f 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -86,6 +86,7 @@ end --keepcontrols["angels-fissure"] = true +-- TODO this should be changed as some controls are needed for scenarios which are loaded as background local controls = data.raw["autoplace-control"] for k, v in pairs(controls) do if k ~= "enemy-base" and not keepcontrols[k] then From f873cec0081d7d8456ded3a8f5afbd735341e847 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 11:33:53 +0200 Subject: [PATCH 031/117] Added new tile mapgen and entity autoplace --- SeaBlock/data-final-fixes/mapgen.lua | 6 +- SeaBlock/data.lua | 2 +- SeaBlock/lib.lua | 29 +++++++ SeaBlock/mapgen.lua | 114 +++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 SeaBlock/mapgen.lua diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index 6b92b74f..5259eb12 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -14,7 +14,7 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { deepwater = {}, water = {}, ["sand-4"] = {}, - -- ["sand-5"] = {}, + ["sand-5"] = {}, } }, entity = { @@ -26,6 +26,8 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { ["angels-desert-tree"] = {}, ["angels-temperate-tree"] = {}, ["angels-swamp-tree"] = {}, + + ["angels-puffer-nest"] = {}, } } } @@ -50,7 +52,7 @@ for k, v in pairs(data.raw.tree) do and k ~= "angels-temperate-tree" and k ~= "angels-desert-tree" and k ~= "angels-swamp-tree" - and k ~= "puffer-nest" + and k ~= "angels-puffer-nest" then v.autoplace = nil seablock.lib.add_flag("tree", v.name, "not-deconstructable") diff --git a/SeaBlock/data.lua b/SeaBlock/data.lua index 3c5e750d..4bbdcfa5 100644 --- a/SeaBlock/data.lua +++ b/SeaBlock/data.lua @@ -11,7 +11,7 @@ require("prototypes/recipe") require("prototypes/recipe-category") require("prototypes/technology") require("prototypes/rockchest") -require("new-mapgen") +require("mapgen") require("data-updates/Companion_Drones") require("data/tables") require("data/misc") diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index c53d1867..651fef63 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -2,6 +2,35 @@ seablock = seablock or {} seablock.lib = {} seablock.reskins = {} +---Sets a tile restriction on any specified prototype +---does not replace existing autoplace dict but creates if it doesnt exist +---@param ptype string "tile", "entity", ... +---@param name string name of prototype +---@param restriction string|table string for singular restrict, table for multiple restrictions +function seablock.lib.set_tile_restriction(ptype, name, restriction) + if (not data.raw[ptype]) then error ("Tried to set tile restriction on "..ptype.." "..name..": type does not exist") end + if (not data.raw[ptype][name]) then error("Tried to set tile restriction on "..ptype.." "..name..": "..name.." does not exist") end + + data.raw[ptype][name].autoplace = data.raw[ptype][name].autoplace or {} + + if (type(restriction) == "string") then restriction = { restriction } end + + data.raw[ptype][name].autoplace["tile_restriction"] = restriction +end + +---Sets a probability expression on any specified prototype +---does not replace existing autoplace dict but creates if it doesnt exist +---@param ptype string "tile", "entity", ... +---@param name string name of prototype +---@param expression string expression +function seablock.lib.set_probability_expression(ptype, name, expression) + if (not data.raw[ptype]) then error ("Tried to set probability expression on "..ptype.." "..name..": type does not exist") end + if (not data.raw[ptype][name]) then error("Tried to set probability expression on "..ptype.." "..name..": "..name.." does not exist") end + + data.raw[ptype][name].autoplace = data.raw[ptype][name].autoplace or {} + data.raw[ptype][name].autoplace["probability_expression"] = expression +end + function seablock.lib.findname(t, name) for i, v in ipairs(t) do if v.name == name then diff --git a/SeaBlock/mapgen.lua b/SeaBlock/mapgen.lua new file mode 100644 index 00000000..14274b72 --- /dev/null +++ b/SeaBlock/mapgen.lua @@ -0,0 +1,114 @@ +data.raw.tile["sand-4"] = table.deepcopy(data.raw.tile["sand-1"]) +data.raw.tile["sand-5"] = table.deepcopy(data.raw.tile["sand-2"]) +data.raw.tile["sand-4"].name = "sand-4" +data.raw.tile["sand-5"].name = "sand-5" + +data.raw.tile["dry-dirt"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-3"].vehicle_friction_modifier = 1.8 + +data.raw.tile["dirt-4"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-5"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-6"].vehicle_friction_modifier = 1.8 +data.raw.tile["dirt-7"].vehicle_friction_modifier = 1.8 + +data.raw.tile["grass-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-3"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["grass-4"].vehicle_friction_modifier = 1.8 + +data.raw.tile["red-desert-0"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["red-desert-3"].vehicle_friction_modifier = 1.8 + +data.raw.tile["sand-1"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-2"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-3"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-4"].vehicle_friction_modifier = 1.8 +data.raw.tile["sand-5"].vehicle_friction_modifier = 1.8 + +data.raw.tile["landfill"].vehicle_friction_modifier = 1.8 + +for _, v in pairs(data.raw.tile) do + v.autoplace = nil +end + +data.raw.cliff["cliff"].collision_mask = { not_colliding_with_itself = true, layers = { object = true, train = true}} + +data:extend({ + { + type = "noise-expression", + name = "waterline", + expression = "10" + }, + { + type = "noise-expression", + name = "distance_sigmoid", -- sigmoid to gradually increase island size while limiting the maximum size + local_expressions = { + amount = "3.5", + offset = "500", + scale = "300" + }, + expression = "amount/(1+e^(-(distance-offset)/scale))" + }, + { + type = "noise-function", + name = "random_tree_islands", + parameters = { "seed", "noise_seed", "frequency" }, + local_expressions = { + base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = noise_seed, input_scale = 1.99995}", + multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency)" + }, + expression = "if(multoctave >= 16, base, -inf)" + }, + { + type = "noise-function", + name = "random_garden_islands", + parameters = { "seed", "noise_seed", "frequency" }, + local_expressions = { + base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = noise_seed, input_scale = 1.99995}", + multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency)" + }, + expression = "if(multoctave >= 20, base, -inf)" + } +}) + +-- cant put that in data:extend since elevation exists in base game +local elevation = data.raw["noise-expression"]["elevation"] + +elevation.local_expressions = { + base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 5, input_scale = 1/32, output_scale = 6}", + starting_tile = "if(distance <= 1, 100, 0)", +} + +elevation.expression = "if(distance <= starting_area_radius/2, min(base - waterline, 0), base - waterline) + starting_tile + distance_sigmoid+1" + +------- Tiles ------- +-- Water +seablock.lib.set_probability_expression("tile", "deepwater", "if(elevation <= -8, elevation*-1, -inf)") +seablock.lib.set_probability_expression("tile", "water", "if(elevation < 0, elevation*-1, -inf)") + +-- Beaches +seablock.lib.set_probability_expression("tile", "sand-4", "if(elevation >= 0, elevation, -inf)") + +-- Landmass +seablock.lib.set_probability_expression("tile", "sand-5", "if(elevation >= 1.2, inf, -inf)") + +------- Trees ------- +-- Trees should only spawn on sand-5 which is the middle of each island +for _, name in pairs({ "angels-desert-garden", "angels-temperate-garden", "angels-swamp-garden", "angels-desert-tree", "angels-temperate-tree", "angels-swamp-tree", "angels-puffer-nest" }) do + seablock.lib.set_tile_restriction("tree", name, "sand-5") +end + +seablock.lib.set_probability_expression("tree", "angels-desert-garden", "random_garden_islands(1, 1, 0.4)") +seablock.lib.set_probability_expression("tree", "angels-desert-tree", "random_tree_islands(1, 2, 0.4)") + +seablock.lib.set_probability_expression("tree", "angels-temperate-garden", "random_garden_islands(2, 1, 0.6)") +seablock.lib.set_probability_expression("tree", "angels-temperate-tree", "random_tree_islands(2, 2, 0.6)") + +seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_garden_islands(3, 1, 0.5)") +seablock.lib.set_probability_expression("tree", "angels-swamp-tree", "random_tree_islands(3, 2, 0.5)") + +seablock.lib.set_probability_expression("tree", "angels-puffer-nest", "random_tree_islands(4, 1, 0.35)") \ No newline at end of file From 383c460fd6758d7e681a37b5e769eda9a04817fa Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:16:04 +0200 Subject: [PATCH 032/117] Added enemy autopalce --- SeaBlock/data-final-fixes/mapgen.lua | 12 ++++++ SeaBlock/mapgen.lua | 59 +++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index 5259eb12..61345f42 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -28,11 +28,21 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { ["angels-swamp-tree"] = {}, ["angels-puffer-nest"] = {}, + ["small-worm-turret"] = {}, + ["medium-worm-turret"] = {}, + ["big-worm-turret"] = {}, + ["behemoth-worm-turret"] = {} } } } data.raw["planet"]["nauvis"].map_gen_settings.autoplace_controls = nil +-- Enemies +for _,name in pairs({ "bob-big-explosive-worm-turret", "bob-big-fire-worm-turret", "bob-big-poison-worm-turret", "bob-big-piercing-worm-turret", "bob-giant-worm-turret" }) do + if (data.raw.turret[name]) then + data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings.entity.settings[name] = {} + end +end -- No spawners for k, v in pairs(data.raw["unit-spawner"]) do @@ -86,6 +96,8 @@ for turret_name, turret in pairs(turrets) do end end +log(helper.dump(data.raw["turret"])) + --keepcontrols["angels-fissure"] = true -- TODO this should be changed as some controls are needed for scenarios which are loaded as background diff --git a/SeaBlock/mapgen.lua b/SeaBlock/mapgen.lua index 14274b72..eee29c56 100644 --- a/SeaBlock/mapgen.lua +++ b/SeaBlock/mapgen.lua @@ -72,6 +72,19 @@ data:extend({ multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency)" }, expression = "if(multoctave >= 20, base, -inf)" + }, + { + type = "noise-function", + name = "worm_autoplace", + parameters = { "other_distance", "probability", "falloff", "seed" }, + local_expressions = { + d = "distance - starting_area_radius", + _falloff = "if(falloff == 1, clamp(((other_distance+2)*128-d)/128, 0, 1), 1)", + _waterline = "clamp(waterline-elevation, 0, 1)", + prob = "clamp((d-other_distance*128)/128, 0, 1) * _falloff * _waterline * probability", + pen = "random_penalty(x, y, prob, seed, probability*0.5)" + }, + expression = "pen" } }) @@ -98,7 +111,7 @@ seablock.lib.set_probability_expression("tile", "sand-5", "if(elevation >= 1.2, ------- Trees ------- -- Trees should only spawn on sand-5 which is the middle of each island -for _, name in pairs({ "angels-desert-garden", "angels-temperate-garden", "angels-swamp-garden", "angels-desert-tree", "angels-temperate-tree", "angels-swamp-tree", "angels-puffer-nest" }) do +for _, name in pairs({ "angels-desert-garden", "angels-temperate-garden", "angels-swamp-garden", "angels-desert-tree", "angels-temperate-tree", "angels-swamp-tree", }) do seablock.lib.set_tile_restriction("tree", name, "sand-5") end @@ -111,4 +124,46 @@ seablock.lib.set_probability_expression("tree", "angels-temperate-tree", "random seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_garden_islands(3, 1, 0.5)") seablock.lib.set_probability_expression("tree", "angels-swamp-tree", "random_tree_islands(3, 2, 0.5)") -seablock.lib.set_probability_expression("tree", "angels-puffer-nest", "random_tree_islands(4, 1, 0.35)") \ No newline at end of file +------- Biters ------- +local enemy_random_seed = 1 +local function new_random_seed() + enemy_random_seed = enemy_random_seed + 1 + return enemy_random_seed +end + +local function worm_autoplace(distance, probability, order, falloff, control_name) + return { + control = control_name, + order = order, + force = "enemy", + probability_expression = "worm_autoplace("..distance..","..probability..","..falloff..","..new_random_seed()..")", + richness_expression = 1, + } +end + +data.raw.turret["small-worm-turret"].autoplace = worm_autoplace(0, 1, "z", 1, "enemy-base") +data.raw.turret["medium-worm-turret"].autoplace = worm_autoplace(1, 1, "y", 1, "enemy-base") +data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +data.raw.turret["behemoth-worm-turret"].autoplace = worm_autoplace(2, 0.2, "t", 0, "enemy-base") + +seablock.lib.set_tile_restriction("tree", "angels-puffer-nest", {}) --clear tile restrictions +data.raw.tree["angels-puffer-nest"].autoplace = worm_autoplace(0, 0.01, "s", 0) + +if data.raw.turret["bob-big-explosive-worm-turret"] then + data.raw.turret["bob-big-explosive-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +end +if data.raw.turret["bob-big-fire-worm-turret"] then + data.raw.turret["bob-big-fire-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +end +if data.raw.turret["bob-big-poison-worm-turret"] then + data.raw.turret["bob-big-poison-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +end +if data.raw.turret["bob-big-piercing-worm-turret"] then + data.raw.turret["bob-big-piercing-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +end +if data.raw.turret["bob-big-electric-worm-turret"] then + data.raw.turret["bob-big-electric-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", 0, "enemy-base") +end +if data.raw.turret["bob-giant-worm-turret"] then + data.raw.turret["bob-giant-worm-turret"].autoplace = worm_autoplace(2, 0.6, "u", 0, "enemy-base") +end From cf63cf3fc10169cf4b6a6ea6b33c166f8d80022d Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:50:42 +0200 Subject: [PATCH 033/117] Changed Tree/Garden generation Added documentation for mapgen --- SeaBlock/mapgen.lua | 33 +- SeaBlock/mapgen.md | 11 + SeaBlock/new-mapgen.lua | 516 ----------------------- SeaBlock/old-mapgen.lua | 480 --------------------- SeaBlock/shifted_hyperbolic_rational.png | Bin 0 -> 23419 bytes 5 files changed, 26 insertions(+), 1014 deletions(-) create mode 100644 SeaBlock/mapgen.md delete mode 100644 SeaBlock/new-mapgen.lua delete mode 100644 SeaBlock/old-mapgen.lua create mode 100644 SeaBlock/shifted_hyperbolic_rational.png diff --git a/SeaBlock/mapgen.lua b/SeaBlock/mapgen.lua index eee29c56..df216ad1 100644 --- a/SeaBlock/mapgen.lua +++ b/SeaBlock/mapgen.lua @@ -1,3 +1,4 @@ +-- See mapgen.md for further information data.raw.tile["sand-4"] = table.deepcopy(data.raw.tile["sand-1"]) data.raw.tile["sand-5"] = table.deepcopy(data.raw.tile["sand-2"]) data.raw.tile["sand-4"].name = "sand-4" @@ -55,23 +56,19 @@ data:extend({ }, { type = "noise-function", - name = "random_tree_islands", - parameters = { "seed", "noise_seed", "frequency" }, - local_expressions = { - base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = noise_seed, input_scale = 1.99995}", - multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency)" - }, - expression = "if(multoctave >= 16, base, -inf)" + name = "shifted_hyperbolic_rational", + parameters = { "amplitude", "offset", "squish" }, + expression = "(amplitude*4)/(distance*squish-offset*squish) - (amplitude*4)/((distance*squish-offset*squish)^2)" }, { type = "noise-function", - name = "random_garden_islands", - parameters = { "seed", "noise_seed", "frequency" }, + name = "random_tree_islands", + parameters = { "seed", "noise_seed", "frequency", "limit" }, local_expressions = { base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = noise_seed, input_scale = 1.99995}", - multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency)" + multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency+shifted_hyperbolic_rational(20, 1, 0.3))" }, - expression = "if(multoctave >= 20, base, -inf)" + expression = "if(multoctave >= limit, base, -inf)" }, { type = "noise-function", @@ -115,16 +112,16 @@ for _, name in pairs({ "angels-desert-garden", "angels-temperate-garden", "angel seablock.lib.set_tile_restriction("tree", name, "sand-5") end -seablock.lib.set_probability_expression("tree", "angels-desert-garden", "random_garden_islands(1, 1, 0.4)") -seablock.lib.set_probability_expression("tree", "angels-desert-tree", "random_tree_islands(1, 2, 0.4)") +seablock.lib.set_probability_expression("tree", "angels-desert-garden", "random_tree_islands(1, 1, 0.4, 20)") +seablock.lib.set_probability_expression("tree", "angels-desert-tree", "random_tree_islands(1, 2, 0.4, 16)") -seablock.lib.set_probability_expression("tree", "angels-temperate-garden", "random_garden_islands(2, 1, 0.6)") -seablock.lib.set_probability_expression("tree", "angels-temperate-tree", "random_tree_islands(2, 2, 0.6)") +seablock.lib.set_probability_expression("tree", "angels-temperate-garden", "random_tree_islands(2, 1, 0.6, 20)") +seablock.lib.set_probability_expression("tree", "angels-temperate-tree", "random_tree_islands(2, 2, 0.6, 16)") -seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_garden_islands(3, 1, 0.5)") -seablock.lib.set_probability_expression("tree", "angels-swamp-tree", "random_tree_islands(3, 2, 0.5)") +seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_tree_islands(3, 1, 0.5, 20)") +seablock.lib.set_probability_expression("tree", "angels-swamp-tree", "random_tree_islands(3, 2, 0.5, 16)") -------- Biters ------- +------- Enemies ------- local enemy_random_seed = 1 local function new_random_seed() enemy_random_seed = enemy_random_seed + 1 diff --git a/SeaBlock/mapgen.md b/SeaBlock/mapgen.md new file mode 100644 index 00000000..fb57b23e --- /dev/null +++ b/SeaBlock/mapgen.md @@ -0,0 +1,11 @@ +# Mapgen Explanation +## Terrain +Islands and water are based on terrain elevation. Elevation itself uses a basis_noise as a baseline. A scaled sigmoid which is based on the distance is added to make the islands bigger the further you get out while still limiting the maximum size of each island.\ +Beaches only contain sand-4 while the inner landmass only contains sand-5. + +## Trees and Gardens +Trees and gardens can only spawn on sand-5 which ensures they only spawn in the middle of an island. A multioctave noise with "large islands" is then overlayed and ensures that the same type spawns in roughly the same area (desert only near desert, temperate only near temperate etc.). A basis_noise is used so trees don't appear too clustered in one spot. A shited hyperbolic rational is added to increase the chance of a tree/garden island within the spawn radius. This is to help the player obtain trees/gardens without having to fight enemies first. +![shifted hyperbolic rational](shifted_hyperbolic_rational.png)*shifted hyperbolic rational* + +## Enemies +The enemy autoplace function is a translation of the 1.1 autoplace function and mixes elevation and probabilities with random noise to get a dense yet random worm placement. \ No newline at end of file diff --git a/SeaBlock/new-mapgen.lua b/SeaBlock/new-mapgen.lua deleted file mode 100644 index 6f587cd2..00000000 --- a/SeaBlock/new-mapgen.lua +++ /dev/null @@ -1,516 +0,0 @@ -data.raw.tile["sand-4"] = table.deepcopy(data.raw.tile["sand-1"]) -data.raw.tile["sand-5"] = table.deepcopy(data.raw.tile["sand-2"]) -data.raw.tile["sand-4"].name = "sand-4" -data.raw.tile["sand-5"].name = "sand-5" - -data.raw.tile["dry-dirt"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-3"].vehicle_friction_modifier = 1.8 - -data.raw.tile["dirt-4"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-5"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-6"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-7"].vehicle_friction_modifier = 1.8 - -data.raw.tile["grass-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-3"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-4"].vehicle_friction_modifier = 1.8 - -data.raw.tile["red-desert-0"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-3"].vehicle_friction_modifier = 1.8 - -data.raw.tile["sand-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-3"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-4"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-5"].vehicle_friction_modifier = 1.8 - -data.raw.tile["landfill"].vehicle_friction_modifier = 1.8 - -for _, v in pairs(data.raw.tile) do - v.autoplace = nil -end - --- Want player to collide with cliffs --- Want player to collide with water --- Don't want cliffs to collide with water --- Water tile's default collision mask includes player-layer and item-layer --- So use train-layer as a substitute player-layer -data.raw.cliff["cliff"].collision_mask = { not_colliding_with_itself = true, layers = { object = true, train = true}} --TODO: check if this works/is the best solution - -local octaves = -3 -local persistence = 0.2 -local waterline = 9.4 -local elevation_scale = 5 -local function scale_elevation(x) - return (x - waterline) * elevation_scale + waterline -end ---[[ --- low lying sand -data.raw.tile["sand-4"].autoplace = { - peaks = { - { -- Around cliff islands - influence = 5, - elevation_optimal = 0.3 * elevation_scale + waterline, - elevation_range = 0.3 * elevation_scale, - elevation_max_range = 0.3 * elevation_scale, - }, - { - influence = 0.77 * 8, -- Worm islands - min_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 8, - tier_from_start_max_range = 40, - tier_from_start_top_property_limit = 8, - }, - { -- Not in starting area - influence = -5, - starting_area_weight_optimal = 1, - starting_area_weight_range = 0, - starting_area_weight_max_range = 0, - }, - { - influence = 100, -- ... except for starting tile - min_influence = 0, - distance_optimal = 0, - distance_range = 0.1, - distance_max_range = 0.1, - }, - { - influence = -5, - }, - }, -} - --- highground sand -data.raw.tile["sand-5"].autoplace = { - peaks = { - { - influence = 5, - min_influence = 0, - elevation_optimal = scale_elevation(15), - elevation_range = 5 * elevation_scale, - elevation_max_range = 5 * elevation_scale, - tier_from_start_optimal = 0.1, - tier_from_start_range = 0, - tier_from_start_max_range = 0, - tier_from_start_top_property_limit = 0.1, - }, - { - influence = 0.65, -- starting area garden islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - starting_area_weight_optimal = 1, - starting_area_weight_range = 0, - starting_area_weight_max_range = 0, - }, - { - influence = -100, -- not on starting tile - max_influence = 0, - distance_optimal = 0, - distance_range = 3, - distance_max_range = 3, - }, - }, -} - -local plant_elevation_range = 9.9 * elevation_scale -data.raw.tree["desert-garden"].autoplace = { - max_probability = 0.2, - random_probability_penalty = 0.05, - sharpness = 1, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "desert-garden-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "yc", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["temperate-garden"].autoplace = { - max_probability = 0.2, - random_probability_penalty = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "temperate-garden-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "ya", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["swamp-garden"].autoplace = { - max_probability = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - }, - order = "yb", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["desert-tree"].autoplace = { - max_probability = 0.1, - random_probability_penalty = 0.025, - sharpness = 1, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "desert-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "za", - tile_restriction = { "sand-5" }, -} -data.raw.tree["temperate-tree"].autoplace = { - max_probability = 0.1, - random_probability_penalty = 0.025, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "temperate-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "zc", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["swamp-tree"].autoplace = { - max_probability = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "swamp-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "zb", - tile_restriction = { "sand-5" }, -} - -data.raw.tile["water"].autoplace = { - peaks = { - { - influence = 0.1, -- shallow water around cliff islands - min_influence = 0, - elevation_optimal = -2 * elevation_scale + waterline, - elevation_range = 2.5 * elevation_scale, - elevation_max_range = 2.5 * elevation_scale, - }, - { - influence = 0.77 * 2, -- around worm islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - { - influence = 5, -- around starting tile - min_influence = 0, - distance_optimal = 0, - distance_range = 5, - distance_max_range = 5, - }, - }, -} - -data.raw.tile["deepwater"].autoplace = { - peaks = { - { - influence = 0.01, - }, - }, -} - -data.raw.fish["alien-fish-1"].autoplace = { - peaks = { - { - influence = -0.1, - max_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - { - influence = 0.01, - }, - }, -} - -data.raw.fish["alien-fish-2"].autoplace = { - peaks = { - { - influence = 0.02, - min_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - }, -} - -data.raw.fish["alien-fish-3"].autoplace = { - peaks = { - { - influence = 0.015, - min_influence = 0, - elevation_optimal = scale_elevation(10), - elevation_range = 5 * elevation_scale, - elevation_max_range = 5 * elevation_scale, - tier_from_start_optimal = 0.1, - tier_from_start_range = 0, - tier_from_start_max_range = 0, - tier_from_start_top_property_limit = 0.1, - }, - }, -} - - - -data:extend({ - { - type = "noise-layer", - name = "desert-tree-noise", - }, - { - type = "noise-layer", - name = "temperate-tree-noise", - }, - { - type = "noise-layer", - name = "swamp-tree-noise", - }, - { - type = "noise-layer", - name = "desert-garden-noise", - }, - { - type = "noise-layer", - name = "temperate-garden-noise", - }, - { - type = "noise-layer", - name = "swamp-garden-noise", - }, -}) - -data.raw["noise-expression"]["cliffiness"].expression = noise.define_noise_function(function(x, y, tile, map) - local t = noise.clamp((tile.tier - 0.2) * noise.ceil(noise.var("control-setting:cliffs:richness:multiplier")), 0, 1) -- No cliffs in starting area - return 100 * t -end) -]] - -data.extend{ - { - type = "noise-expression", - name = "octaves", - expression = "-3" - }, - - { - type = "noise-expression", - name = "persistence", - expression = "0.2" - }, - { - type = "noise-expression", - name = "waterline", - expression = "9.4" - }, - { - type = "noise-expression", - name = "elevation_scale", - expression = "5" - }, - { - type = "noise-function", - name = "scale_elevation", - parameters = {"x"}, - expression = "(x - waterline) * elevation_scale + waterline" - }, -} - ---[[local enemy_random_seed = 1 -local function new_random_seed() - enemy_random_seed = enemy_random_seed + 1 - return enemy_random_seed -end -local function worm_autoplace(distance, probability, order, falloff, control_name) - data.extend{{ - type = "noise-function", - name = "worm_placer", - parameters = {"distance", "probability", "falloff", "random_seed"}, - expression = "random_penalty{source = p1, amplitude = probability * 0.5, x = x + random_seed, y = 1}", --TODO: replace y with other constant or x or y - local_expressions = { - d = "distance - starting_area_radius", - p0 = "clamp((d - distance * 128) / 128, 0, 1)", - falloffFactor = "if(falloff, clamp(((distance + 2) * 128 - d) / 128, 0, 1), 1)", - p1 = "p0 * falloffFactor * probability * clamp((waterline - elevation), 0, 1)" - } - }} - - return { - control = control_name, - order = order, - force = "enemy", - probability_expression = "worm_placer(" .. distance ..", " .. probability .. ", " .. tostring(falloff) .. ", " .. new_random_seed() .. ")", - richness_expression = 1, - } -end - -data.raw.turret["small-worm-turret"].autoplace = worm_autoplace(0, 1, "z", true, "enemy-base") -data.raw.turret["medium-worm-turret"].autoplace = worm_autoplace(1, 1, "y", true, "enemy-base") -if data.raw.turret["bob-big-explosive-worm-turret"] then - data.raw.turret["bob-big-explosive-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-fire-worm-turret"] then - data.raw.turret["bob-big-fire-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-poison-worm-turret"] then - data.raw.turret["bob-big-poison-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-piercing-worm-turret"] then - data.raw.turret["bob-big-piercing-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-electric-worm-turret"] then - data.raw.turret["bob-big-electric-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-giant-worm-turret"] then - data.raw.turret["bob-giant-worm-turret"].autoplace = worm_autoplace(2, 0.6, "u", false, "enemy-base") -end -if data.raw.turret["behemoth-worm-turret"] then - data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") - data.raw.turret["behemoth-worm-turret"].autoplace = worm_autoplace(2, 0.2, "t", false, "enemy-base") -else - data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(2, 1, "v", false, "enemy-base") -end -data.raw.tree["puffer-nest"].autoplace = worm_autoplace(0, 0.01, "s", false) - -for _, v in pairs(data.raw.turret) do - v.map_generator_bounding_box = nil -end]] - --- old tries - meh/not working --- data.raw["noise-expression"]["elevation"].local_expressions = {base = "max(basis_noise{x = x + 4000, y = y, seed0 = map_seed, seed1 = 5, input_scale = 1/64, output_scale = 6},0)"} --- data.raw["noise-expression"]["elevation"].expression = "(base * elevation_scale) - (waterline * (elevation_scale - 1))" -- Increase gradient for cliffs while leaving waterline unchanged - --- data.raw.tile["deepwater"].autoplace.probability_expression = "if(elevation <= (waterline*elevation_scale/2), 10, 0)" --- data.raw.tile["sand-4"].autoplace.probability_expression = "if(distance <= 1, 10000, 0)" - -data.raw["noise-expression"]["elevation"].local_expressions = { - base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 5, input_scale = 1/32, output_scale = 6}", - starting_tile = "if(distance <= 1, 100, 0)", - --small_islands = "if(distance >= starting_area_radius/2, basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 3, input_scale = 1/32, output_scale = 10} - waterline, 0)" -} - -data.raw["noise-expression"]["elevation"].expression = "if(distance <= starting_area_radius/2, min(base - waterline, 0), base - waterline) + starting_tile"-- "min((base - waterline - 2) + starting_tile, 10) + small_islands" - -data.raw.tile["deepwater"].autoplace = {probability_expression = "if(-8 >= elevation, 200 * min(-6 - elevation, 1), -inf)"} -data.raw.tile["water"].autoplace = {probability_expression = "if(0 >= elevation, 100 * min(0 - elevation, 1), -inf)"} -data.raw.tile["sand-4"].autoplace = {probability_expression = "if(elevation >= 0, elevation, -inf)"} - --- data.raw.tile["sand-5"].autoplace = {probability_expression = "if(elevation >= 0, elevation, -inf)"} -- decided against using this - -data.raw.tree["angels-desert-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 1, source = 0.03, amplitude = 0.01}, -inf)"} --, tile_restriction = {"sand-5"}} -data.raw.tree["angels-temperate-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 2, source = 0.03, amplitude = 0.01}, -inf)"} -data.raw.tree["angels-swamp-garden"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 3, source = 0.03, amplitude = 0.015}, -inf)"} - -data.raw.tree["angels-desert-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 4, source = 0.03, amplitude = 0.01}, -inf)"} --, placement_density = 3} -data.raw.tree["angels-temperate-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 5, source = 0.03, amplitude = 0.01}, -inf)"} -data.raw.tree["angels-swamp-tree"].autoplace = {probability_expression = "if(elevation >= 0, random_penalty{x = x, y = y, seed = 6, source = 0.03, amplitude = 0.015}, -inf)"} \ No newline at end of file diff --git a/SeaBlock/old-mapgen.lua b/SeaBlock/old-mapgen.lua deleted file mode 100644 index e3cafabd..00000000 --- a/SeaBlock/old-mapgen.lua +++ /dev/null @@ -1,480 +0,0 @@ -data.raw.tile["sand-4"] = table.deepcopy(data.raw.tile["sand-1"]) -data.raw.tile["sand-5"] = table.deepcopy(data.raw.tile["sand-2"]) -data.raw.tile["sand-4"].name = "sand-4" -data.raw.tile["sand-5"].name = "sand-5" - -data.raw.tile["dry-dirt"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-3"].vehicle_friction_modifier = 1.8 - -data.raw.tile["dirt-4"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-5"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-6"].vehicle_friction_modifier = 1.8 -data.raw.tile["dirt-7"].vehicle_friction_modifier = 1.8 - -data.raw.tile["grass-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-3"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["grass-4"].vehicle_friction_modifier = 1.8 - -data.raw.tile["red-desert-0"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["red-desert-3"].vehicle_friction_modifier = 1.8 - -data.raw.tile["sand-1"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-2"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-3"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-4"].vehicle_friction_modifier = 1.8 -data.raw.tile["sand-5"].vehicle_friction_modifier = 1.8 - -data.raw.tile["landfill"].vehicle_friction_modifier = 1.8 - -for _, v in pairs(data.raw.tile) do - v.autoplace = nil -end - --- Want player to collide with cliffs --- Want player to collide with water --- Don't want cliffs to collide with water --- Water tile's default collision mask includes player-layer and item-layer --- So use train-layer as a substitute player-layer -data.raw.cliff["cliff"].collision_mask = { "object-layer", "train-layer", "not-colliding-with-itself" } - -local octaves = -3 -local persistence = 0.2 -local waterline = 9.4 -local elevation_scale = 5 -local function scale_elevation(x) - return (x - waterline) * elevation_scale + waterline -end --- low lying sand -data.raw.tile["sand-4"].autoplace = { - peaks = { - { -- Around cliff islands - influence = 5, - elevation_optimal = 0.3 * elevation_scale + waterline, - elevation_range = 0.3 * elevation_scale, - elevation_max_range = 0.3 * elevation_scale, - }, - { - influence = 0.77 * 8, -- Worm islands - min_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 8, - tier_from_start_max_range = 40, - tier_from_start_top_property_limit = 8, - }, - { -- Not in starting area - influence = -5, - starting_area_weight_optimal = 1, - starting_area_weight_range = 0, - starting_area_weight_max_range = 0, - }, - { - influence = 100, -- ... except for starting tile - min_influence = 0, - distance_optimal = 0, - distance_range = 0.1, - distance_max_range = 0.1, - }, - { - influence = -5, - }, - }, -} - --- highground sand -data.raw.tile["sand-5"].autoplace = { - peaks = { - { - influence = 5, - min_influence = 0, - elevation_optimal = scale_elevation(15), - elevation_range = 5 * elevation_scale, - elevation_max_range = 5 * elevation_scale, - tier_from_start_optimal = 0.1, - tier_from_start_range = 0, - tier_from_start_max_range = 0, - tier_from_start_top_property_limit = 0.1, - }, - { - influence = 0.65, -- starting area garden islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - starting_area_weight_optimal = 1, - starting_area_weight_range = 0, - starting_area_weight_max_range = 0, - }, - { - influence = -100, -- not on starting tile - max_influence = 0, - distance_optimal = 0, - distance_range = 3, - distance_max_range = 3, - }, - }, -} - -local plant_elevation_range = 9.9 * elevation_scale -data.raw.tree["desert-garden"].autoplace = { - max_probability = 0.2, - random_probability_penalty = 0.05, - sharpness = 1, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "desert-garden-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "yc", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["temperate-garden"].autoplace = { - max_probability = 0.2, - random_probability_penalty = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "temperate-garden-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "ya", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["swamp-garden"].autoplace = { - max_probability = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - }, - order = "yb", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["desert-tree"].autoplace = { - max_probability = 0.1, - random_probability_penalty = 0.025, - sharpness = 1, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 0.31, -- Trial and error value to generate size that approximately matches starting area islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - tier_from_start_optimal = 0, - tier_from_start_range = 0.1, - tier_from_start_max_range = 0.1, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "desert-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "za", - tile_restriction = { "sand-5" }, -} -data.raw.tree["temperate-tree"].autoplace = { - max_probability = 0.1, - random_probability_penalty = 0.025, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "temperate-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "zc", - tile_restriction = { "sand-5" }, -} - -data.raw.tree["swamp-tree"].autoplace = { - max_probability = 0.05, - peaks = { - { - influence = 1, - min_influence = 0, - elevation_optimal = scale_elevation(20), - elevation_range = plant_elevation_range, - elevation_max_range = plant_elevation_range, - }, - { - influence = 1, - max_influence = 0, - noise_layer = "swamp-tree-noise", - noise_persistence = 0.8, - noise_octaves_difference = -0.5, - }, - }, - order = "zb", - tile_restriction = { "sand-5" }, -} - -data.raw.tile["water"].autoplace = { - peaks = { - { - influence = 0.1, -- shallow water around cliff islands - min_influence = 0, - elevation_optimal = -2 * elevation_scale + waterline, - elevation_range = 2.5 * elevation_scale, - elevation_max_range = 2.5 * elevation_scale, - }, - { - influence = 0.77 * 2, -- around worm islands - min_influence = 0, - max_influence = 1, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - { - influence = 5, -- around starting tile - min_influence = 0, - distance_optimal = 0, - distance_range = 5, - distance_max_range = 5, - }, - }, -} - -data.raw.tile["deepwater"].autoplace = { - peaks = { - { - influence = 0.01, - }, - }, -} - -data.raw.fish["alien-fish-1"].autoplace = { - peaks = { - { - influence = -0.1, - max_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - { - influence = 0.01, - }, - }, -} - -data.raw.fish["alien-fish-2"].autoplace = { - peaks = { - { - influence = 0.02, - min_influence = 0, - noise_layer = "enemy-base", - noise_octaves_difference = octaves, - noise_persistence = persistence, - }, - }, -} - -data.raw.fish["alien-fish-3"].autoplace = { - peaks = { - { - influence = 0.015, - min_influence = 0, - elevation_optimal = scale_elevation(10), - elevation_range = 5 * elevation_scale, - elevation_max_range = 5 * elevation_scale, - tier_from_start_optimal = 0.1, - tier_from_start_range = 0, - tier_from_start_max_range = 0, - tier_from_start_top_property_limit = 0.1, - }, - }, -} - -local noise = require("noise") -local tne = noise.to_noise_expression -local enemy_random_seed = 1 -local function new_random_seed() - enemy_random_seed = enemy_random_seed + 1 - return enemy_random_seed -end -local function worm_autoplace(distance, probability, order, falloff, control_name) - local d = noise.var("distance") - noise.var("starting_area_radius") - local p = noise.clamp((d - distance * 128) / 128, 0, 1) - if falloff then - p = p * noise.clamp(((distance + 2) * 128 - d) / 128, 0, 1) - end - p = p * noise.clamp((waterline - noise.var("elevation")), 0, 1) - p = p * probability - p = noise.random_penalty(p, probability * 0.5, { - x = noise.var("x") + new_random_seed(), - }) - - return { - control = control_name, - order = order, - force = "enemy", - probability_expression = p, - richness_expression = tne(1), - } -end - -data.raw.turret["small-worm-turret"].autoplace = worm_autoplace(0, 1, "z", true, "enemy-base") -data.raw.turret["medium-worm-turret"].autoplace = worm_autoplace(1, 1, "y", true, "enemy-base") -if data.raw.turret["bob-big-explosive-worm-turret"] then - data.raw.turret["bob-big-explosive-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-fire-worm-turret"] then - data.raw.turret["bob-big-fire-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-poison-worm-turret"] then - data.raw.turret["bob-big-poison-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-piercing-worm-turret"] then - data.raw.turret["bob-big-piercing-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-big-electric-worm-turret"] then - data.raw.turret["bob-big-electric-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") -end -if data.raw.turret["bob-giant-worm-turret"] then - data.raw.turret["bob-giant-worm-turret"].autoplace = worm_autoplace(2, 0.6, "u", false, "enemy-base") -end -if data.raw.turret["behemoth-worm-turret"] then - data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(1.5, 0.5, "v", false, "enemy-base") - data.raw.turret["behemoth-worm-turret"].autoplace = worm_autoplace(2, 0.2, "t", false, "enemy-base") -else - data.raw.turret["big-worm-turret"].autoplace = worm_autoplace(2, 1, "v", false, "enemy-base") -end -data.raw.tree["puffer-nest"].autoplace = worm_autoplace(0, 0.01, "s", false) - -for _, v in pairs(data.raw.turret) do - v.map_generator_bounding_box = nil -end - -data:extend({ - { - type = "noise-layer", - name = "desert-tree-noise", - }, - { - type = "noise-layer", - name = "temperate-tree-noise", - }, - { - type = "noise-layer", - name = "swamp-tree-noise", - }, - { - type = "noise-layer", - name = "desert-garden-noise", - }, - { - type = "noise-layer", - name = "temperate-garden-noise", - }, - { - type = "noise-layer", - name = "swamp-garden-noise", - }, -}) - -local function make_basis_noise_function(seed0, seed1, outscale0, inscale0) - outscale0 = outscale0 or 1 - inscale0 = inscale0 or 1 / outscale0 - return function(x, y, inscale, outscale) - return tne({ - type = "function-application", - function_name = "factorio-basis-noise", - arguments = { - x = tne(x), - y = tne(y), - seed0 = tne(seed0), - seed1 = tne(seed1), - input_scale = tne((inscale or 1) * inscale0), - output_scale = tne((outscale or 1) * outscale0), - }, - }) - end -end - -data.raw["noise-expression"]["cliffiness"].expression = noise.define_noise_function(function(x, y, tile, map) - local t = noise.clamp((tile.tier - 0.2) * noise.ceil(noise.var("control-setting:cliffs:richness:multiplier")), 0, 1) -- No cliffs in starting area - return 100 * t -end) -data.raw["noise-expression"]["elevation"].expression = noise.define_noise_function(function(x, y, tile, map) - x = x + 40000 - y = y - local v = make_basis_noise_function(map.seed, 5, 6, 1 / 64)(x, y) - v = noise.max(v, 0) - v = (v * elevation_scale) - (waterline * (elevation_scale - 1)) -- Increase gradient for cliffs while leaving waterline unchanged - return v -end) diff --git a/SeaBlock/shifted_hyperbolic_rational.png b/SeaBlock/shifted_hyperbolic_rational.png new file mode 100644 index 0000000000000000000000000000000000000000..706bff5c6edb0dc3ae8688809245b44c1d9e004c GIT binary patch literal 23419 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 Date: Tue, 9 Sep 2025 12:54:58 +0200 Subject: [PATCH 034/117] Added fish --- SeaBlock/data-final-fixes/mapgen.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index 61345f42..00cc7f01 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -31,7 +31,11 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { ["small-worm-turret"] = {}, ["medium-worm-turret"] = {}, ["big-worm-turret"] = {}, - ["behemoth-worm-turret"] = {} + ["behemoth-worm-turret"] = {}, + + ["angels-alien-fish-1"] = {}, + ["angels-alien-fish-2"] = {}, + ["angels-alien-fish-3"] = {} } } } @@ -96,10 +100,6 @@ for turret_name, turret in pairs(turrets) do end end -log(helper.dump(data.raw["turret"])) - ---keepcontrols["angels-fissure"] = true - -- TODO this should be changed as some controls are needed for scenarios which are loaded as background local controls = data.raw["autoplace-control"] for k, v in pairs(controls) do From cda7f98c6839d6187377e4f35751a72e938e13ad Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:59:43 +0200 Subject: [PATCH 035/117] Added changelog --- SeaBlock/changelog.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 29a7db1b..7bebd256 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.0 +Date: 09.09.2025 + Changes: + - Factorio 2.0 update + - Changed to new mapgen + - Renamed Angel's and Bob's items +--------------------------------------------------------------------------------------------------- Version: 0.5.17 Date: ??.??.?? Changes: From 6eeae2dc0ae705d843142526a949db5bb9efae98 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:22:39 +0200 Subject: [PATCH 036/117] Readded Reskins mods except Angel's Reskins --- SeaBlock/changelog.txt | 1 + SeaBlockMetaPack/info.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 7bebd256..7af26a80 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -5,6 +5,7 @@ Date: 09.09.2025 - Factorio 2.0 update - Changed to new mapgen - Renamed Angel's and Bob's items + - Removed Artisanal Reskins: Angel's Mods until Angel's is fully updated --------------------------------------------------------------------------------------------------- Version: 0.5.17 Date: ??.??.?? diff --git a/SeaBlockMetaPack/info.json b/SeaBlockMetaPack/info.json index 756bf364..5a1aa7b7 100644 --- a/SeaBlockMetaPack/info.json +++ b/SeaBlockMetaPack/info.json @@ -14,6 +14,9 @@ "angelspetrochem", "angelsrefining", "angelssmelting", + "reskins-bobs", + "reskins-compatibility", + "reskins-library", "bobassembly", "bobelectronics", "bobenemies", From ba79cd408e209a71a80b0a9aaa89787a8195e053 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 15:00:13 +0200 Subject: [PATCH 037/117] Adjusted volume for wind-turbine-2 as it is otherwise way too loud in SeaBlock --- SeaBlock/data-updates/fuel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeaBlock/data-updates/fuel.lua b/SeaBlock/data-updates/fuel.lua index 9eb0d651..78347f47 100644 --- a/SeaBlock/data-updates/fuel.lua +++ b/SeaBlock/data-updates/fuel.lua @@ -58,7 +58,10 @@ if mods["KS_Power"] then seablock.lib.hide("burner-generator", "big-burner-generator") seablock.lib.hide("burner-generator", "burner-generator") seablock.lib.hide("generator", "petroleum-generator") + local turbine = data.raw["electric-energy-interface"]["wind-turbine-2"] + turbine.working_sound.sound.volume = 0.3 + if turbine and turbine.energy_source then turbine.energy_source.output_flow_limit = "15kW" end From 333221b38d026b687517c8b2e3690762069cd5db Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 17:27:08 +0200 Subject: [PATCH 038/117] Added localised name for landfill recipe Added mod conflicts: - space-age - quality --- SeaBlock/data-updates/landfill.lua | 2 ++ SeaBlockMetaPack/info.json | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index ef54b2bb..fd4a0155 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -40,3 +40,5 @@ data.raw.technology["landfill"].unit = { bobmods.lib.tech.remove_prerequisite("angels-water-washing-2", "landfill") bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) + +data.raw.recipe["landfill"].localised_name = {'sand-3-name.name'} diff --git a/SeaBlockMetaPack/info.json b/SeaBlockMetaPack/info.json index 5a1aa7b7..0761453f 100644 --- a/SeaBlockMetaPack/info.json +++ b/SeaBlockMetaPack/info.json @@ -42,6 +42,9 @@ "Milestones", "ScienceCostTweakerM", "SeaBlock", - "SpaceMod" + "SpaceMod", + + "! space-age", + "! quality" ] } From 1ef5a59b052cd68d8da918c2a4bcc9f2ed4eb50f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 9 Sep 2025 18:46:54 +0200 Subject: [PATCH 039/117] Fixed default ghost landfill type to default landfill in startup settings --- SeaBlock/data-updates/landfill.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index fd4a0155..780c157a 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -42,3 +42,16 @@ bobmods.lib.tech.remove_prerequisite("angels-water-washing-2", "landfill") bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) data.raw.recipe["landfill"].localised_name = {'sand-3-name.name'} + +local startup_landfill = "sand-3" +local setting = settings.startup["sb-default-landfill"] + +if setting and type(setting.value) == "string" then + local stripped = setting.value:gsub("^landfill%-", "") + if data.raw.tile[stripped] then + startup_landfill = stripped + end +end + +data.raw.tile["water"].default_cover_tile = startup_landfill +data.raw.tile["deepwater"].default_cover_tile = startup_landfill \ No newline at end of file From 4876734c0a491efde309768f12388cc4037d2dc1 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 10 Sep 2025 19:50:37 +0200 Subject: [PATCH 040/117] Removed normal/expensive from add_recipe_unlock function --- SeaBlock/lib.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 651fef63..9d5e03a2 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -113,12 +113,6 @@ function seablock.lib.add_recipe_unlock(technology, recipe, insertindex) then add_recipe_unlock(data.raw.technology[technology], recipe, insertindex) - if data.raw.technology[technology].normal then - add_recipe_unlock(data.raw.technology[technology].normal, recipe, insertindex) - end - if data.raw.technology[technology].expensive then - add_recipe_unlock(data.raw.technology[technology].expensive, recipe, insertindex) - end else log(debug.traceback()) bobmods.lib.error.technology(technology) From f81653296a52462bf1252036a8388c29d78e491d Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:39:18 +0200 Subject: [PATCH 041/117] Changed firemarm-magazine recipe to not include coal --- SeaBlock/data-final-fixes/recipe.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 9450e96b..08e11f3b 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -62,3 +62,6 @@ if data.raw.recipe["angels-stone-crushed-dissolution"] then { "stone" } ) end + +-- Recipe gets changed by bobwarfare to include coal which is unobtainable +bobmods.lib.recipe.set_ingredients("firearm-magazine", {{ type = "item", name = "iron-plate", amount = 4}}) --this function automatically clears previous ingredients \ No newline at end of file From 6dd96c1b5109041f2631a7302d52433d11026d0e Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 10 Sep 2025 20:51:35 +0200 Subject: [PATCH 042/117] Removed normal/expensive properties and logic --- SeaBlock/data-final-fixes/SpaceMod.lua | 7 +---- SeaBlock/data-final-fixes/recipe.lua | 17 ++-------- .../data-final-fixes/unobtainable_items.lua | 31 ++++++------------- SeaBlock/data-updates/misc.lua | 14 ++------- SeaBlock/lib.lua | 24 ++------------ 5 files changed, 17 insertions(+), 76 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index d6e687fc..5377957d 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -88,12 +88,7 @@ local upgrades = { } local function iterateingredients(recipe, func) - if recipe.normal then - func(recipe.normal.ingredients) - func(recipe.expensive.ingredients) - else - func(recipe.ingredients) - end + func(recipe.ingredients) end local function doupgrade(ingredients) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 08e11f3b..04392b3e 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -19,7 +19,7 @@ local function replace_stone(recipe) end end end - if recipe.results then + if recipe.results then --needed for recipes parameter- which have no results for _, result in pairs(recipe.results) do if result.name == "stone" then result.amount = result.amount * 2 @@ -32,25 +32,12 @@ local function replace_stone(recipe) end end end - if recipe.result == "stone" then - recipe.result_count = recipe.result_count or 1 * 2 - elseif recipe.result == "angels-stone-crushed" then - recipe.result = "stone" - end if recipe.main_product == "angels-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 + replace_stone(recipe) end bobmods.lib.recipe.hide("angels-stone-from-crushed-stone") seablock.lib.hide("item", "angels-stone-crushed") diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index be91a495..ec3f101a 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -146,14 +146,7 @@ for k, v in pairs(data.raw.technology) do end end -for k, v in pairs(recipes) do - local iset = {} - if v.normal then - iset = { v.normal, v.expensive } - else - iset = { v } - end - for _, recipe in ipairs(iset) do +for k, recipe in pairs(recipes) do local items = {} if recipe.ingredients then for _, ingredient in pairs(recipe.ingredients) do @@ -182,7 +175,6 @@ for k, v in pairs(recipes) do unobtainable[r] = nil end end - end end local work = true @@ -210,21 +202,16 @@ end -- Remove any recipe that uses an unobtainable ingredient local function keeprecipe(r) - local iset = {} - local count = 0 - table.insert(iset, r.ingredients) - table.insert(iset, (r.normal or {}).ingredients) - table.insert(iset, (r.expensive or {}).ingredients) - for _, ingredients in ipairs(iset) do - for _, v in ipairs(ingredients) do - local ingredient = v[1] or v.name - if ingredient and unobtainable[ingredient] then - count = count + 1 - break - end + if (not r.ingredients) then + return false + end + for _, v in ipairs(r.ingredients) do + local ingredient = v[1] or v.name + if ingredient and unobtainable[ingredient] then + return false end end - return count < #iset + return true end for k, v in pairs(data.raw.recipe) do diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index fe41420c..ab34c648 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -160,18 +160,8 @@ if data.raw.recipe["rocket-part"] then -- angelsmods.functions.unhide("rocket-part") local r = data.raw.recipe["rocket-part"] - if r.normal then - r.normal.hidden = false - r.normal.hide_from_player_crafting = true - end - if r.expensive then - r.expensive.hidden = false - r.expensive.hide_from_player_crafting = true - end - if not r.normal and not r.expensive then - r.hidden = false - r.hide_from_player_crafting = true - end + r.hidden = false + r.hide_from_player_crafting = true end -- Buff bob's silicon and tungsten recipes diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 9d5e03a2..b6bb1167 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -234,15 +234,7 @@ end function seablock.lib.unhide_recipe(recipe_name) local recipe = data.raw.recipe[recipe_name] if recipe then - if recipe.normal then - recipe.normal.hidden = false - end - if recipe.expensive then - recipe.expensive.hidden = false - end - if not recipe.normal and not recipe.expensive then - recipe.hidden = false - end + recipe.hidden = false else log("Warning: seablock.lib.unhide_recipe - can't find recipe : " .. recipe_name) log(debug.traceback()) @@ -252,18 +244,8 @@ end function seablock.lib.hide_technology(technology_name) local technology = data.raw.technology[technology_name] if technology then - if technology.normal then - technology.normal.hidden = true - technology.normal.enabled = false - end - if technology.expensive then - technology.expensive.hidden = true - technology.expensive.enabled = false - end - if not technology.normal and not technology.expensive then - technology.hidden = true - technology.enabled = false - end + technology.hidden = true + technology.enabled = false else log("Warning: seablock.lib.hide_technology - Hide non existing tech : " .. technology_name) log(debug.traceback()) From 3610ba86c70540ac748af9a2e46d96554681fefb Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 12 Sep 2025 13:37:22 +0200 Subject: [PATCH 043/117] Fixes issue #7 with wrong lead-plate and tin-plate recipe --- SeaBlock/data-updates/misc.lua | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index ab34c648..e4326da3 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -237,3 +237,29 @@ bobmods.lib.recipe.replace_ingredient("angels-solid-cement-2", "bob-quartz", "bo bobmods.lib.recipe.set_ingredient("angels-solid-cement-2", { type = "item", name = "angels-solid-lime", amount = 4 }) bobmods.lib.recipe.set_result("angels-solid-cement-2", { type = "item", name = "angels-solid-cement", amount = 4 }) bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16) + +local OV = angelsmods.functions.OV +OV.patch_recipes({ + { + name = "bob-tin-plate", + ingredients = { + { name = "bob-tin-ore", type = "item", amount = "+3" }, + }, + results = { + { name = "bob-tin-plate", type = "item", amount = "+2" }, + }, + localised_name = { "item-name.bob-tin-plate" }, + subgroup = "angels-tin-casting" + }, + { + name = "bob-lead-plate", + ingredients = { + { name = "bob-lead-ore", type = "item", amount = "+3" }, + }, + results = { + { name = "bob-lead-plate", type = "item", amount = "+2" }, + }, + localised_name = { "item-name.bob-lead-plate" }, + subgroup = "angels-lead-casting" + } +}) \ No newline at end of file From aecc5cc52324164f7c71ce9df47510eb6c632f2d Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 12 Sep 2025 14:04:03 +0200 Subject: [PATCH 044/117] Fixed several naming issues, #4 --- SeaBlock/data-updates/coal.lua | 2 ++ SeaBlock/data-updates/slag-processing.lua | 2 +- SeaBlock/locale/en/SeaBlock.cfg | 10 +++++----- SeaBlock/locale/ja/SeaBlock.cfg | 4 ++-- SeaBlock/locale/ru/SeaBlock.cfg | 4 ++-- SeaBlock/locale/uk/SeaBlock.cfg | 6 +++--- SeaBlock/prototypes/recipe.lua | 1 + 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua index 383ace80..c9f63e64 100644 --- a/SeaBlock/data-updates/coal.lua +++ b/SeaBlock/data-updates/coal.lua @@ -44,3 +44,5 @@ bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "angels-sodium-pro -- Buff the Carbon 2 recipe to make it a bit more worthwhile bobmods.lib.recipe.set_result("angels-coke-purification-2", { type = "item", name = "angels-solid-carbon", amount = 8 }) + +data.raw.recipe["angels-filter-coal"].localised_name = { "item-name.angels-filter-charcoal" } \ No newline at end of file diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 7db872a3..6f492090 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -6,7 +6,7 @@ seablock.lib.substingredient("angels-stone-crushed-dissolution", "angels-stone-c for i = 1, 6 do local recipe = data.raw.recipe["angels-slag-processing-" .. i] seablock.lib.copy_icon(recipe, {}) - recipe.localised_name = { "recipe-name.slag-processing", { "item-name.angels-ore" .. i } } + recipe.localised_name = { "recipe-name.angels-slag-processing", { "item-name.angels-ore" .. i } } recipe.order = "a-a [angels-ore-" .. i .. "]" recipe.category = "angels-crystallizing" diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg index 64f8b568..fcc541aa 100644 --- a/SeaBlock/locale/en/SeaBlock.cfg +++ b/SeaBlock/locale/en/SeaBlock.cfg @@ -12,16 +12,16 @@ liquid-raw-vegetable-oil-filtering-2=Raw vegetable oil ceramic filtering liquid-raw-fish-oil-filtering-1=Raw fish oil charcoal filtering liquid-raw-fish-oil-filtering-2=Raw fish oil ceramic filtering coke-purification-2=Charcoal purification -thermal-extractor-water=Produce thermal water -thermal-bore-water=Produce thermal water +sb-thermal-extractor-water=Produce thermal water +sb-thermal-bore-water=Produce thermal water [item-name] charcoal=Charcoal -filter-charcoal=Charcoal filter -pellet-charcoal=Charcoal pellet +angels-filter-charcoal=Charcoal filter +angels-pellet-charcoal=Charcoal pellet rocket-part=Rocket part sct-lab-lab2=Exoplanetary Studies Lab -catalyst-metal-purple=Purple metal catalyst +sb-catalyst-metal-purple=Purple metal catalyst [entity-name] home=Home diff --git a/SeaBlock/locale/ja/SeaBlock.cfg b/SeaBlock/locale/ja/SeaBlock.cfg index b4a0079c..5e4b1125 100644 --- a/SeaBlock/locale/ja/SeaBlock.cfg +++ b/SeaBlock/locale/ja/SeaBlock.cfg @@ -15,8 +15,8 @@ coke-purification-2=木炭浄化 [item-name] charcoal=木炭 -filter-charcoal=木炭ろ過器 -pellet-charcoal=木炭顆粒 +angels-filter-charcoal=木炭ろ過器 +angels-pellet-charcoal=木炭顆粒 rocket-part=ロケット部品 sct-lab-lab2=系外惑星研究所 diff --git a/SeaBlock/locale/ru/SeaBlock.cfg b/SeaBlock/locale/ru/SeaBlock.cfg index 69e6a4f0..40167b49 100644 --- a/SeaBlock/locale/ru/SeaBlock.cfg +++ b/SeaBlock/locale/ru/SeaBlock.cfg @@ -15,8 +15,8 @@ coke-purification-2=Очищение древесного угля [item-name] charcoal=Древесный уголь -filter-charcoal=Фильтр из древесного угля -pellet-charcoal=Гранулы древесного угля +angels-filter-charcoal=Фильтр из древесного угля +angels-pellet-charcoal=Гранулы древесного угля rocket-part=Часть ракеты sct-lab-lab2=Лаборатория экзопланетарных исследований diff --git a/SeaBlock/locale/uk/SeaBlock.cfg b/SeaBlock/locale/uk/SeaBlock.cfg index fe0cd248..6006546c 100644 --- a/SeaBlock/locale/uk/SeaBlock.cfg +++ b/SeaBlock/locale/uk/SeaBlock.cfg @@ -15,11 +15,11 @@ coke-purification-2=Очищення деревинного вугілля [item-name] charcoal=Деревне вугілля -filter-charcoal=Фільтр з деревинного вугілля -pellet-charcoal=Деревне вугілля в гранулах +angels-filter-charcoal=Фільтр з деревинного вугілля +angels-pellet-charcoal=Деревне вугілля в гранулах rocket-part=Частина ракети sct-lab-lab2=Лабораторія екзопланетарних досліджень -catalyst-metal-purple=Каталізатор з фіолетового металу +sb-catalyst-metal-purple=Каталізатор з фіолетового металу [entity-name] home=Головна diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua index 99807655..8317831f 100644 --- a/SeaBlock/prototypes/recipe.lua +++ b/SeaBlock/prototypes/recipe.lua @@ -2,6 +2,7 @@ data:extend({ { type = "recipe", name = "sb-wood-bricks-charcoal", + localised_name = { "item-name.angels-wood-charcoal" }, category = "smelting", enabled = false, energy_required = 3.5, From 653ab1acc0bde4e5478199bf3fbf114512acdb28 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 12 Sep 2025 14:55:27 +0200 Subject: [PATCH 045/117] Added item-group bob-gems to fix #10 --- SeaBlock/data-updates/groups.lua | 10 +++++++--- SeaBlock/data/misc.lua | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua index 6953ccb9..828b4f3b 100644 --- a/SeaBlock/data-updates/groups.lua +++ b/SeaBlock/data-updates/groups.lua @@ -4,10 +4,14 @@ if not mods["angelsindustries"] then -- Move misc sciencey things over to intermediate products tab for k, v in pairs(data.raw["item-subgroup"]) do if - v.group == "bob-resource-products" - or v.group == "bob-fluid-products" - -- or v.group == "bob-intermediate-products" --should not exist anymore + v.name == "bob-gems-crystallization" + or v.name == "bob-gems-raw" + or v.name == "bob-gems-cut" + or v.name == "bob-gems-polished" then + v.group = "bob-gems" + end + if (v.name == "bob-nuclear") then v.group = "intermediate-products" end end diff --git a/SeaBlock/data/misc.lua b/SeaBlock/data/misc.lua index 870eb547..cdedf13c 100644 --- a/SeaBlock/data/misc.lua +++ b/SeaBlock/data/misc.lua @@ -32,3 +32,14 @@ angelsmods.trigger.early_sulfuric_acid = true -- Copy Ore Processing Machine tech icon to Mechanical Refining seablock.lib.copy_icon(data.raw.technology["angels-ore-crushing"], data.raw.technology["angels-advanced-ore-refining-1"]) + +data:extend({ + { -- This was removed with bobs2.0 but is fitting for SeaBlock + -- TODO this might break when bio-processing-override-bob.lua gets changed + type = "item-group", + name = "bob-gems", + order = "d-g", + icon = "__bobplates__/graphics/icons/technology/gems.png", + icon_size = 64, + }, +}) \ No newline at end of file From a919b1dc20183f79a3f98ffa1b9aaf29bb92b45c Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 14 Sep 2025 15:20:22 +0200 Subject: [PATCH 046/117] Fix for #13 --- SeaBlock/data-final-fixes/recipe.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 04392b3e..b4a45987 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -51,4 +51,7 @@ if data.raw.recipe["angels-stone-crushed-dissolution"] then end -- Recipe gets changed by bobwarfare to include coal which is unobtainable -bobmods.lib.recipe.set_ingredients("firearm-magazine", {{ type = "item", name = "iron-plate", amount = 4}}) --this function automatically clears previous ingredients \ No newline at end of file +bobmods.lib.recipe.set_ingredients("firearm-magazine", {{ type = "item", name = "iron-plate", amount = 4}}) --this function automatically clears previous ingredients + +-- angelspetrochem changes petroleum-gas to angels-gas-methane +bobmods.lib.recipe.remove_ingredient("sct-t3-flash-fuel", "angels-gas-methane") \ No newline at end of file From da444672bee2de32054dcb351d5ce6e9724f1455 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 14 Sep 2025 15:45:15 +0200 Subject: [PATCH 047/117] Changed default landfill type --- SeaBlock/data-updates/landfill.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 780c157a..a8751778 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -43,7 +43,7 @@ bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) data.raw.recipe["landfill"].localised_name = {'sand-3-name.name'} -local startup_landfill = "sand-3" +local startup_landfill = "landfill" local setting = settings.startup["sb-default-landfill"] if setting and type(setting.value) == "string" then From f536ede91831aad7e6e939e2d0b03a2e121588c1 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 14 Sep 2025 18:46:58 +0200 Subject: [PATCH 048/117] Added tech dependency for battery to fix #14 --- SeaBlock/data-updates/misc.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index e4326da3..c94cbd22 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -262,4 +262,6 @@ OV.patch_recipes({ localised_name = { "item-name.bob-lead-plate" }, subgroup = "angels-lead-casting" } -}) \ No newline at end of file +}) + +bobmods.lib.tech.add_prerequisite("battery", "plastics") \ No newline at end of file From e9039d48a5dcdf42c6b92d91100a164775ec1adc Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 14 Sep 2025 23:13:10 +0200 Subject: [PATCH 049/117] Removed item angels-stone-crushed to force migration Changed angels-stone-crushed recipe icon to include stone instead --- SeaBlock/data-final-fixes/recipe.lua | 19 +++++++++++++++++-- SeaBlock/locale/en/SeaBlock.cfg | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index b4a45987..94222427 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -40,7 +40,9 @@ for _, recipe in pairs(data.raw.recipe) do replace_stone(recipe) end bobmods.lib.recipe.hide("angels-stone-from-crushed-stone") -seablock.lib.hide("item", "angels-stone-crushed") + +-- necessary to force migration +data.raw.item["angels-stone-crushed"] = nil if data.raw.recipe["angels-stone-crushed-dissolution"] then data.raw.recipe["angels-stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon( @@ -54,4 +56,17 @@ end bobmods.lib.recipe.set_ingredients("firearm-magazine", {{ type = "item", name = "iron-plate", amount = 4}}) --this function automatically clears previous ingredients -- angelspetrochem changes petroleum-gas to angels-gas-methane -bobmods.lib.recipe.remove_ingredient("sct-t3-flash-fuel", "angels-gas-methane") \ No newline at end of file +bobmods.lib.recipe.remove_ingredient("sct-t3-flash-fuel", "angels-gas-methane") + +data.raw.recipe["angels-stone-crushed"].icons = angelsmods.functions.add_icon_layer( + { + { + icon = "__angelsrefininggraphics__/graphics/icons/ore-crusher.png", + icon_size = 64, + scale = 0.5 + } + }, + angelsmods.functions.get_object_icons("stone"), + { 10, 10 }, + 0.5 +) \ No newline at end of file diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg index fcc541aa..f1ae7d75 100644 --- a/SeaBlock/locale/en/SeaBlock.cfg +++ b/SeaBlock/locale/en/SeaBlock.cfg @@ -14,6 +14,8 @@ liquid-raw-fish-oil-filtering-2=Raw fish oil ceramic filtering coke-purification-2=Charcoal purification sb-thermal-extractor-water=Produce thermal water sb-thermal-bore-water=Produce thermal water +angels-stone-crushed=Slag processing to stone +angels-stone-crushed-dissolution=Liquefy stone to slurry [item-name] charcoal=Charcoal From 4d838128cdcf93399a6ead3db4d7a2cbd55f38b2 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 14 Sep 2025 23:16:11 +0200 Subject: [PATCH 050/117] Fixed -charcoal migration issue #16 --- SeaBlock/migrations/SeaBlock_0.6.0.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.json b/SeaBlock/migrations/SeaBlock_0.6.0.json index 40f18a87..2b2ab32f 100644 --- a/SeaBlock/migrations/SeaBlock_0.6.0.json +++ b/SeaBlock/migrations/SeaBlock_0.6.0.json @@ -6,7 +6,9 @@ "item": [ ["stone-crushed", "stone"], - ["catalyst-metal-purple", "sb-catalyst-metal-purple"] + ["catalyst-metal-purple", "sb-catalyst-metal-purple"], + ["filter-charcoal", "angels-filter-charcoal"], + ["pellet-charcoal", "angels-pellet-charcoal"] ], "recipe": [ From fa11827e49653cc458af9f0c844cb0807f92e8cb Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:18:25 +0200 Subject: [PATCH 051/117] Updated battery recipe to include plastic --- SeaBlock/data-final-fixes/recipe.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 94222427..25f82148 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -69,4 +69,10 @@ data.raw.recipe["angels-stone-crushed"].icons = angelsmods.functions.add_icon_la angelsmods.functions.get_object_icons("stone"), { 10, 10 }, 0.5 -) \ No newline at end of file +) + +if settings.startup["bobmods-plates-batteryupdate"].value == true then + bobmods.lib.recipe.replace_ingredient("battery", "steel-plate", "plastic-bar") +else + bobmods.lib.recipe.replace_ingredient("battery", "iron-plate", "plastic-bar") +end \ No newline at end of file From 7ef5b47ac1010b68c6652ca63d3e1fc31367775d Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:45:26 +0200 Subject: [PATCH 052/117] Updated changelog --- SeaBlock/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 7af26a80..51d83482 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -6,6 +6,7 @@ Date: 09.09.2025 - Changed to new mapgen - Renamed Angel's and Bob's items - Removed Artisanal Reskins: Angel's Mods until Angel's is fully updated + - Replaced crushed stone for regular stone --------------------------------------------------------------------------------------------------- Version: 0.5.17 Date: ??.??.?? From 33fd45bb4fc62e80392d5334846781c69c9713b9 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:50:23 +0200 Subject: [PATCH 053/117] Updated changelog --- SeaBlock/changelog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 51d83482..3c157667 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -1,9 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 0.6.0 -Date: 09.09.2025 +Date: ??.??.?? Changes: - Factorio 2.0 update - - Changed to new mapgen + - Removed normal/expensive recipes + - Updated map generation - Renamed Angel's and Bob's items - Removed Artisanal Reskins: Angel's Mods until Angel's is fully updated - Replaced crushed stone for regular stone From a66dc465597685f8939545d160f3038e7a6e1a89 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:27:48 +0200 Subject: [PATCH 054/117] Changed mapgen to spawn more gardens --- SeaBlock/mapgen.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SeaBlock/mapgen.lua b/SeaBlock/mapgen.lua index df216ad1..37818122 100644 --- a/SeaBlock/mapgen.lua +++ b/SeaBlock/mapgen.lua @@ -66,7 +66,7 @@ data:extend({ parameters = { "seed", "noise_seed", "frequency", "limit" }, local_expressions = { base = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = noise_seed, input_scale = 1.99995}", - multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency+shifted_hyperbolic_rational(20, 1, 0.3))" + multoctave = "multioctave_noise{x = x, y = y, persistence = 0.75, seed0 = map_seed, seed1 = seed, octaves = 3, input_scale = 1/32, output_scale = 10} * (1+frequency+shifted_hyperbolic_rational(200, 0, 0.7))" }, expression = "if(multoctave >= limit, base, -inf)" }, @@ -112,13 +112,13 @@ for _, name in pairs({ "angels-desert-garden", "angels-temperate-garden", "angel seablock.lib.set_tile_restriction("tree", name, "sand-5") end -seablock.lib.set_probability_expression("tree", "angels-desert-garden", "random_tree_islands(1, 1, 0.4, 20)") +seablock.lib.set_probability_expression("tree", "angels-desert-garden", "random_tree_islands(1, 1, 0.6, 16)") seablock.lib.set_probability_expression("tree", "angels-desert-tree", "random_tree_islands(1, 2, 0.4, 16)") -seablock.lib.set_probability_expression("tree", "angels-temperate-garden", "random_tree_islands(2, 1, 0.6, 20)") +seablock.lib.set_probability_expression("tree", "angels-temperate-garden", "random_tree_islands(2, 1, 0.6, 16)") seablock.lib.set_probability_expression("tree", "angels-temperate-tree", "random_tree_islands(2, 2, 0.6, 16)") -seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_tree_islands(3, 1, 0.5, 20)") +seablock.lib.set_probability_expression("tree", "angels-swamp-garden", "random_tree_islands(3, 1, 0.6, 16)") seablock.lib.set_probability_expression("tree", "angels-swamp-tree", "random_tree_islands(3, 2, 0.5, 16)") ------- Enemies ------- From 61e611085963e794178c6034fef5ee3f8eb9102b Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:29:06 +0200 Subject: [PATCH 055/117] Made electronics craftable by assembling-machine and player --- SeaBlock/data-final-fixes.lua | 1 + SeaBlock/data-final-fixes/entities.lua | 37 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 SeaBlock/data-final-fixes/entities.lua diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index bf3137aa..4720cd91 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -29,6 +29,7 @@ require("data-final-fixes/tech-tree") require("data-final-fixes/unobtainable_items") require("data-final-fixes/mapgen") require("data-final-fixes/SpaceMod") +require("data-final-fixes/entities") data.raw.recipe["copper-cable"].allow_decomposition = true diff --git a/SeaBlock/data-final-fixes/entities.lua b/SeaBlock/data-final-fixes/entities.lua new file mode 100644 index 00000000..e3b05cb3 --- /dev/null +++ b/SeaBlock/data-final-fixes/entities.lua @@ -0,0 +1,37 @@ +local function add_category(type, entity_name, category) + if (not data.raw["recipe-category"][category]) then + error("Tried to add category to entity "..entity_name.." with type "..type..": Category does not exist") + end + + if (not data.raw[type]) then + error("Tried to add category to entity "..entity_name.." with type "..type..": Type does not exist") + end + + if (not data.raw[type][entity_name]) then + error("Tried to add category to entity "..entity_name.." with type "..type..": "..entity_name.." does not exist") + end + + data.raw[type][entity_name].crafting_categories = data.raw[type][entity_name].crafting_categories or {} + + table.insert(data.raw[type][entity_name].crafting_categories, category) +end + +-- crafting category "electronics" got removed from assembling machines since it is now part of Flugora +add_category("character", "character", "electronics") + +add_category("assembling-machine", "assembling-machine-1", "electronics") + +add_category("assembling-machine", "assembling-machine-2", "electronics") +add_category("assembling-machine", "assembling-machine-2", "electronics-with-fluid") + +add_category("assembling-machine", "assembling-machine-3", "electronics") +add_category("assembling-machine", "assembling-machine-3", "electronics-with-fluid") + +add_category("assembling-machine", "bob-assembling-machine-4", "electronics") +add_category("assembling-machine", "bob-assembling-machine-4", "electronics-with-fluid") + +add_category("assembling-machine", "bob-assembling-machine-5", "electronics") +add_category("assembling-machine", "bob-assembling-machine-5", "electronics-with-fluid") + +add_category("assembling-machine", "bob-assembling-machine-6", "electronics") +add_category("assembling-machine", "bob-assembling-machine-6", "electronics-with-fluid") \ No newline at end of file From 6fc935d4853b222bc7fd024f830dcc8d5018aa04 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 18:31:55 +0200 Subject: [PATCH 056/117] Fixed tech softlock for techs requiring electronics --- SeaBlock/data-final-fixes/tech-tree.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index ce67b191..4f295068 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -23,3 +23,11 @@ seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen") seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4) bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "angels-chlorine-processing-4", "angels-chlorine-processing-2") + +-- electronics is hidden since it is a trigger tech and is replaced by bob-electronics +bobmods.lib.tech.remove_prerequisite("automation-2", "electronics") +bobmods.lib.tech.remove_prerequisite("logistics-2", "electronics") +bobmods.lib.tech.remove_prerequisite("bob-chemical-plant", "electronics") + +-- repair-pack is now unlocked with military +bobmods.lib.tech.remove_prerequisite("bob-repair-pack-2", "repair-pack") \ No newline at end of file From c23dabdd0b9a340522bfecec286f43c200410eb7 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:05:02 +0200 Subject: [PATCH 057/117] Moved character crafting category --- SeaBlock/data-final-fixes.lua | 7 ++++--- SeaBlock/data-final-fixes/entities.lua | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 4720cd91..9bd7eaea 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -36,7 +36,8 @@ data.raw.recipe["copper-cable"].allow_decomposition = true data.raw.recipe["angels-solid-paper"].allow_decomposition = true for _, v in pairs(data.raw.character) do - if v.crafting_categories then - table.insert(v.crafting_categories, "sb-crafting-handonly") - end + v.crafting_categories = v.crafting_categories or {} + + table.insert(v.crafting_categories, "sb-crafting-handonly") + table.insert(v.crafting_categories, "electronics") end diff --git a/SeaBlock/data-final-fixes/entities.lua b/SeaBlock/data-final-fixes/entities.lua index e3b05cb3..bdd907c3 100644 --- a/SeaBlock/data-final-fixes/entities.lua +++ b/SeaBlock/data-final-fixes/entities.lua @@ -17,8 +17,6 @@ local function add_category(type, entity_name, category) end -- crafting category "electronics" got removed from assembling machines since it is now part of Flugora -add_category("character", "character", "electronics") - add_category("assembling-machine", "assembling-machine-1", "electronics") add_category("assembling-machine", "assembling-machine-2", "electronics") From 6b9514460676eaed11cbbd3d26bef2f5b6cdb588 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:11:13 +0200 Subject: [PATCH 058/117] data-final-fixes/SpaceMod.lua cleanup --- SeaBlock/data-final-fixes/SpaceMod.lua | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index 5377957d..8b08d308 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -87,35 +87,23 @@ local upgrades = { ["bob-fission-reactor-equipment-4"] = "bob-fission-reactor-equipment-4", -- for amount adjustment } -local function iterateingredients(recipe, func) - func(recipe.ingredients) -end - -local function doupgrade(ingredients) +local function do_upgrade(ingredients) for _, item in pairs(ingredients) do - local nameidx = 1 - local amountidx = 2 - if item.name then - nameidx = "name" - end - if item.amount then - amountidx = "amount" - end - local upgrade = upgrades[item[nameidx]] + local upgrade = upgrades[item.name] if upgrade and (data.raw.item[upgrade] or data.raw.module[upgrade]) then - item[nameidx] = upgrade + item.name = upgrade end if upgrade == "bob-construction-robot-5" then - item[amountidx] = 1 + item.amount = 1 elseif upgrade == "bob-fission-reactor-equipment-4" then - item[amountidx] = item[amountidx] / 2 + item.amount = item.amount / 2 end end end for _, recipe in pairs(recipes) do if data.raw.recipe[recipe] then - iterateingredients(data.raw.recipe[recipe], doupgrade) + do_upgrade(data.raw.recipe[recipe]) end end From b562fcaf847eeb4e671dae7c3e816f1f5f66f888 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:23:31 +0200 Subject: [PATCH 059/117] Fixing SpaceMod startup error --- SeaBlock/data-final-fixes/SpaceMod.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index 8b08d308..74426e68 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -87,12 +87,14 @@ local upgrades = { ["bob-fission-reactor-equipment-4"] = "bob-fission-reactor-equipment-4", -- for amount adjustment } -local function do_upgrade(ingredients) - for _, item in pairs(ingredients) do +local function do_upgrade(recipe) + for _, item in pairs(recipe.ingredients) do local upgrade = upgrades[item.name] + if upgrade and (data.raw.item[upgrade] or data.raw.module[upgrade]) then item.name = upgrade end + if upgrade == "bob-construction-robot-5" then item.amount = 1 elseif upgrade == "bob-fission-reactor-equipment-4" then From c5273e86daeb6e93187a66c5329cf7c2132c29f5 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:38:58 +0200 Subject: [PATCH 060/117] data-final-fixes/mapgen.lua cleanup --- SeaBlock/data-final-fixes/mapgen.lua | 25 ++++++------------------- SeaBlock/mapgen.md | 1 + 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index 00cc7f01..a72c5624 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -1,13 +1,8 @@ -- No resource placement -for k, v in pairs(data.raw.resource) do - v.autoplace = nil - -- if v.autoplace then - -- data.raw.resource[k].autoplace.default_enabled = false - -- end +for k, _ in pairs(data.raw.resource) do + data.raw.resource[k].autoplace = nil end --- log("HELLO") --- log(serpent.block(data.raw["planet"]["nauvis"].map_gen_settings)) data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { tile = { settings = { @@ -76,35 +71,27 @@ for k, v in pairs(data.raw.tree) do end -- No rocks -for k, v in pairs(data.raw["simple-entity"]) do +for _, v in pairs(data.raw["simple-entity"]) do v.autoplace = nil - -- if v.autoplace then - -- v.autoplace.default_enabled = false - -- end seablock.lib.add_flag("simple-entity", v.name, "not-deconstructable") end -for k, v in pairs(data.raw["optimized-decorative"]) do +for _, v in pairs(data.raw["optimized-decorative"]) do v.autoplace = nil - -- if v.autoplace then - -- v.autoplace.default_enabled = false - -- end seablock.lib.add_flag("optimized-decorative", v.name, "not-deconstructable") end local keepcontrols = {} local turrets = data.raw["turret"] -for turret_name, turret in pairs(turrets) do +for _, turret in pairs(turrets) do if turret.autoplace and turret.autoplace.control then keepcontrols[turret.autoplace.control] = true end end --- TODO this should be changed as some controls are needed for scenarios which are loaded as background local controls = data.raw["autoplace-control"] -for k, v in pairs(controls) do +for k, _ in pairs(controls) do if k ~= "enemy-base" and not keepcontrols[k] then - -- data.raw["autoplace-control"][k].hidden = true data.raw["autoplace-control"][k] = nil end end diff --git a/SeaBlock/mapgen.md b/SeaBlock/mapgen.md index fb57b23e..1c291970 100644 --- a/SeaBlock/mapgen.md +++ b/SeaBlock/mapgen.md @@ -1,3 +1,4 @@ +TODO - REMOVE BEFORE RELEASE # Mapgen Explanation ## Terrain Islands and water are based on terrain elevation. Elevation itself uses a basis_noise as a baseline. A scaled sigmoid which is based on the distance is added to make the islands bigger the further you get out while still limiting the maximum size of each island.\ From 267a833a103c4ad8883146f678d2473d8bbeca73 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 16 Sep 2025 12:44:39 +0200 Subject: [PATCH 061/117] More cleanup --- SeaBlock/data-final-fixes/mapgen.lua | 3 +-- SeaBlock/data-final-fixes/recipe.lua | 1 + SeaBlock/data-final-fixes/unobtainable_items.lua | 15 ++++++--------- SeaBlock/data-updates/SpaceMod.lua | 10 ---------- SeaBlock/data-updates/groups.lua | 5 ++--- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index a72c5624..c73ba41f 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -44,9 +44,8 @@ for _,name in pairs({ "bob-big-explosive-worm-turret", "bob-big-fire-worm-turret end -- No spawners -for k, v in pairs(data.raw["unit-spawner"]) do +for _, v in pairs(data.raw["unit-spawner"]) do v.autoplace = nil - -- v.control = nil if v.autoplace then v.autoplace.default_enabled = false end diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 25f82148..1bfbede5 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -71,6 +71,7 @@ data.raw.recipe["angels-stone-crushed"].icons = angelsmods.functions.add_icon_la 0.5 ) +-- bobmods switched plastic-bar for steel-plate in 2.0 if settings.startup["bobmods-plates-batteryupdate"].value == true then bobmods.lib.recipe.replace_ingredient("battery", "steel-plate", "plastic-bar") else diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index ec3f101a..b72a7297 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -13,23 +13,20 @@ for k, v in pairs(itemrename) do data.raw.item[v] = item end end + local function updateline(line) - local nameidx = "name" - if line[nameidx] == nil then - nameidx = 1 - end - local item = line[nameidx] + local item = line.name + if itemrename[item] then - line[nameidx] = itemrename[item] + line.name = itemrename[item] end end + local function updaterecipe(recipe) for _, v in pairs(recipe.ingredients) do updateline(v) end - -- if recipe.result and itemrename[recipe.result] then - -- recipe.result = itemrename[recipe.result] - -- end + for _, v in pairs(recipe.results or {}) do updateline(v) end diff --git a/SeaBlock/data-updates/SpaceMod.lua b/SeaBlock/data-updates/SpaceMod.lua index 77748b74..5f6767d4 100644 --- a/SeaBlock/data-updates/SpaceMod.lua +++ b/SeaBlock/data-updates/SpaceMod.lua @@ -20,16 +20,6 @@ if mods["SpaceMod"] then bobmods.lib.tech.add_prerequisite("space-assembly", "bob-robots-4") end - if not mods["bobmodules"] then - -- Do nothing - elseif mods["CircuitProcessing"] then - bobmods.lib.tech.add_prerequisite("space-assembly", "bob-efficiency-module-4") - bobmods.lib.tech.add_prerequisite("space-assembly", "bob-productivity-module-4") - bobmods.lib.tech.add_prerequisite("space-assembly", "bob-speed-module-4") - else - bobmods.lib.tech.add_prerequisite("space-assembly", "bob-productivity-module-5") - end - if mods["bobpower"] and settings.startup["bobmods-power-solar"].value == true then bobmods.lib.tech.add_prerequisite("space-construction", "bob-solar-energy-3") end diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua index 828b4f3b..fa7b20e3 100644 --- a/SeaBlock/data-updates/groups.lua +++ b/SeaBlock/data-updates/groups.lua @@ -1,8 +1,8 @@ local move_item = angelsmods.functions.move_item if not mods["angelsindustries"] then - -- Move misc sciencey things over to intermediate products tab - for k, v in pairs(data.raw["item-subgroup"]) do + -- Move all the gems to separate gems group + for _, v in pairs(data.raw["item-subgroup"]) do if v.name == "bob-gems-crystallization" or v.name == "bob-gems-raw" @@ -16,7 +16,6 @@ if not mods["angelsindustries"] then end end - --move_item("battery", "intermediate-products", "f-cba[battery]") -- already correctly set in bob2.0 move_item("iron-gear-wheel", "bob-gears", "aa[iron-gear-wheel]") move_item("bob-thorium-processing", "bob-nuclear", "l[thorium-processing]", "recipe") end From fab6cc9f14bce71230129c3ff0cdb3d6acbc1ce3 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 16 Sep 2025 13:10:45 +0200 Subject: [PATCH 062/117] Updated localised name for landfill recipe to fix #27 --- SeaBlock/data-updates/landfill.lua | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index a8751778..69bb4d50 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -6,9 +6,15 @@ for k, v in pairs(data.raw.item) do end end +local function strip_landfill_string(name) + return name:gsub("^landfill%-", "") +end + -- Set prefered type for basic landfill crafting if settings.startup["sb-default-landfill"] and data.raw.item[settings.startup["sb-default-landfill"].value] then data.raw.recipe["landfill"].results[1].name = settings.startup["sb-default-landfill"].value + + data.raw.recipe["landfill"].localised_name = {strip_landfill_string(settings.startup["sb-default-landfill"].value)..'-name.name'} end local function BuffLandfill(recipe) @@ -41,16 +47,14 @@ data.raw.technology["landfill"].unit = { bobmods.lib.tech.remove_prerequisite("angels-water-washing-2", "landfill") bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true) -data.raw.recipe["landfill"].localised_name = {'sand-3-name.name'} - local startup_landfill = "landfill" local setting = settings.startup["sb-default-landfill"] if setting and type(setting.value) == "string" then - local stripped = setting.value:gsub("^landfill%-", "") - if data.raw.tile[stripped] then - startup_landfill = stripped - end + local stripped = strip_landfill_string(setting.value) + if data.raw.tile[stripped] then + startup_landfill = stripped + end end data.raw.tile["water"].default_cover_tile = startup_landfill From f4313a9488eabc76e1b3f066c79bc65f6193627d Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 16 Sep 2025 16:33:25 +0200 Subject: [PATCH 063/117] Fixed #29 : graphics and fluid output of angels-thermal-bore which gets changed by SeaBlock --- SeaBlock/data-updates/thermal-extractor.lua | 72 +++++++++------------ 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index cf993346..a23e5cbf 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -96,53 +96,43 @@ bore.fluid_boxes = { { production_type = "output", base_area = 1, - --base_level = 1, volume = 500, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { - flow_direction = "output", - positions = { { 1, -1 }, { 1, -1 }, { -1, 1 }, { -1, 1 } }, - direction = defines.direction.north, - }, - }, + pipe_covers = bore.output_fluid_box.pipe_covers, + pipe_connections = bore.output_fluid_box.pipe_connections }, } bore.vector_to_place_result = nil -local function makesheet(sheet, count, d) - local r = table.deepcopy(sheet) - r.stripes = makestripes(r.filename, count) - r.frame_count = count - r.filename = nil - r.x = r.width * d - if r.hr_version then - r.hr_version = makesheet(r.hr_version, count, d) - end - return r -end --- local function makeborelayers(d) --- return { --- layers = { --- makesheet(bore.graphics_set.animation.layers[1], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), --- makesheet(bore.graphics_set.animation.layers[2], bore.wet_mining_graphics_set.animation.north.layers[1].frame_count, d), --- bore.wet_mining_graphics_set.animation.north.layers[1], --- bore.wet_mining_graphics_set.animation.north.layers[2], --- }, --- } --- end --- bore.animation = { --- north = makeborelayers(0), --- east = makeborelayers(1), --- south = makeborelayers(2), --- west = makeborelayers(3), --- } ---table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[1]) -- TODO: probably fix this graphic_set ---table.insert(bore.graphics_set.animation.north.layers,bore.base_picture.sheets[2]) ---bore.graphics_set.animation.north.layers[3].repeat_count = 40 ---bore.graphics_set.animation.north.layers[4].repeat_count = 40 +-- This is needed for the animation below +bore.base_picture.sheet.line_length = 1 +bore.base_picture.sheet.repeat_count = 16 + +-- Edit animation to include output pipe facing north and south +local working_animation = table.deepcopy(bore.graphics_set.animation.north) + +bore.graphics_set.animation = { + north = { + layers = { + table.deepcopy(bore.base_picture.sheet), + working_animation + } + }, + east = working_animation, + south = { + layers = { + table.deepcopy(bore.base_picture.sheet), + working_animation + } + }, + west = working_animation, +} + +-- Shift animation to make other pipe visible +bore.graphics_set.animation.south.layers[1].x = 576 -table.insert(bore.graphics_set,1,bore.base_picture.sheet) +-- Reset animation speed for directions without additional layers +bore.graphics_set.animation.east.animation_speed = 1 +bore.graphics_set.animation.west.animation_speed = 1 bore.crafting_categories = { "sb-thermal-bore" } bore.fixed_recipe = "sb-thermal-bore-water" From d12175f0faf8ed2c9db46995c66f78686344df10 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 16 Sep 2025 16:44:21 +0200 Subject: [PATCH 064/117] Fixed angels-thermal-extractor animation --- SeaBlock/data-updates/thermal-extractor.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index a23e5cbf..552fae1f 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -21,7 +21,7 @@ local function makeextractorlayers(bottom, top) shift = { 0, 0 }, frame_count = 16, x = 288 * 2, - animation_speed = 0.5, + animation_speed = 1, }) end table.insert(layers, { @@ -32,7 +32,7 @@ local function makeextractorlayers(bottom, top) shift = { 0, 0 }, filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png", frame_count = 16, - animation_speed = 0.5, + animation_speed = 1, }) if bottom then table.insert(layers, { @@ -43,7 +43,7 @@ local function makeextractorlayers(bottom, top) shift = { 0, 0 }, frame_count = 16, x = 0, - animation_speed = 0.5, + animation_speed = 1, }) end return { layers = layers } @@ -73,11 +73,11 @@ extractor.fluid_boxes = { pipe_connections = { { flow_direction = "output", position = { -3, 4 }, direction = defines.direction.south } }, }, } -extractor.graphics_set.animation = { -- TODO: fix this animation - north = makeextractorlayers(false, false), - east = makeextractorlayers(true, true), - south = makeextractorlayers(false, false), - west = makeextractorlayers(true, true), +extractor.graphics_set.animation = { + north = makeextractorlayers(true, true), + east = makeextractorlayers(false, false), + south = makeextractorlayers(true, true), + west = makeextractorlayers(false, false), } extractor.crafting_categories = { "sb-thermal-extractor" } extractor.fixed_recipe = "sb-thermal-extractor-water" From 2d7d921f719d2ec2839bde821370c37d7d9e1376 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 16 Sep 2025 17:52:39 +0200 Subject: [PATCH 065/117] Removed tech bob-chemical-plant to fix #28 --- SeaBlock/data-final-fixes/tech-tree.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 4f295068..64e6d719 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -30,4 +30,9 @@ bobmods.lib.tech.remove_prerequisite("logistics-2", "electronics") bobmods.lib.tech.remove_prerequisite("bob-chemical-plant", "electronics") -- repair-pack is now unlocked with military -bobmods.lib.tech.remove_prerequisite("bob-repair-pack-2", "repair-pack") \ No newline at end of file +bobmods.lib.tech.remove_prerequisite("bob-repair-pack-2", "repair-pack") + +bobmods.lib.tech.remove_prerequisite("lubricant", "bob-chemical-plant") +bobmods.lib.tech.remove_prerequisite("plastics", "bob-chemical-plant") + +bobmods.lib.tech.hide("bob-chemical-plant") \ No newline at end of file From f62bb2f8af9fa5bce9cd3f3fd7e79b8752fb0743 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 17 Sep 2025 13:09:08 +0200 Subject: [PATCH 066/117] Added sand-4 and sand-5 as tile condition for landfill --- SeaBlock/data-updates/landfill.lua | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 69bb4d50..203fd5d9 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -58,4 +58,27 @@ if setting and type(setting.value) == "string" then end data.raw.tile["water"].default_cover_tile = startup_landfill -data.raw.tile["deepwater"].default_cover_tile = startup_landfill \ No newline at end of file +data.raw.tile["deepwater"].default_cover_tile = startup_landfill + +if mods["LandfillPainting"] then + local terrains = { + "dry-dirt", + "dirt-4", + "grass-1", + "red-desert-1", + "sand-3" + } + + for _, name in pairs(terrains) do + data.raw.item["landfill-"..name].place_as_tile.tile_condition = data.raw.item["landfill-"..name].place_as_tile.tile_condition or {} + local tile_cond = data.raw.item["landfill-"..name].place_as_tile.tile_condition + + table.insert(tile_cond, "sand-4") + table.insert(tile_cond, "sand-5") + end +end + +local tile_cond = data.raw.item["landfill"].place_as_tile.tile_condition + +table.insert(tile_cond, "sand-4") +table.insert(tile_cond, "sand-5") \ No newline at end of file From 24387a62897601481c914ef61d1dcf5fee65498c Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 17 Sep 2025 13:19:55 +0200 Subject: [PATCH 067/117] Added tile_condition comment --- SeaBlock/data-updates/landfill.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 203fd5d9..d3006336 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -60,6 +60,7 @@ end data.raw.tile["water"].default_cover_tile = startup_landfill data.raw.tile["deepwater"].default_cover_tile = startup_landfill +-- Adds SeaBlock tiles to tile condition so they can be replaced with landfill when placing if mods["LandfillPainting"] then local terrains = { "dry-dirt", From 17bfedb799b28d7a6dacc2063cddbaf9899fe53e Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sat, 20 Sep 2025 16:43:53 +0200 Subject: [PATCH 068/117] Fixes hand craftable recipes --- SeaBlock/data-final-fixes.lua | 42 ++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 9bd7eaea..238a9bf2 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -39,5 +39,45 @@ for _, v in pairs(data.raw.character) do v.crafting_categories = v.crafting_categories or {} table.insert(v.crafting_categories, "sb-crafting-handonly") - table.insert(v.crafting_categories, "electronics") + table.insert(v.crafting_categories, "sb-hand-electronics") end + +local function add_recipe_category(recipe_name, category_name) + local recipe = data.raw.recipe[recipe_name] + if (not recipe) then error("Tried to set recipe category for recipe "..recipe_name..": Recipe not found") end + + recipe.additional_categories = recipe.additional_categories or {} + + table.insert(recipe.additional_categories, category_name) +end + +-- Adds handcrafting recipes because crafting category "electronics" is no longer craftable by hand +local handcrafting_recipes = { + "electronic-circuit", + "copper-cable", + "advanced-circuit", + "bob-tinned-copper-cable", + "bob-insulated-cable", + "bob-gilded-copper-cable", + "bob-wooden-board", + "bob-basic-circuit-board", + "bob-robot-brain", + "bob-robot-brain-2", + "bob-robot-brain-3", + "bob-robot-brain-4", + "bob-module-case", + "bob-module-contact", + "bob-speed-processor", + "bob-efficiency-processor", + "bob-productivity-processor", + "angels-wire-gold", + "angels-wire-platinum", + "angels-wire-silver", + "angels-wire-tin", + "cp-electronic-circuit-board", + "cp-advanced-circuit-board" +} + +for _, name in pairs(handcrafting_recipes) do + add_recipe_category(name, "crafting") +end \ No newline at end of file From 9aa6dbb7b713df51071fcf18809ea66b7b302634 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sat, 20 Sep 2025 16:46:08 +0200 Subject: [PATCH 069/117] Removed sb-hand-electronics crafting category --- SeaBlock/data-final-fixes.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 238a9bf2..fc5ebfdd 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -39,7 +39,6 @@ for _, v in pairs(data.raw.character) do v.crafting_categories = v.crafting_categories or {} table.insert(v.crafting_categories, "sb-crafting-handonly") - table.insert(v.crafting_categories, "sb-hand-electronics") end local function add_recipe_category(recipe_name, category_name) From ccf37ecf720c587ffdd655a26a7d6e95b9a31477 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sat, 20 Sep 2025 17:03:25 +0200 Subject: [PATCH 070/117] Removed recipe category from bob-phenolic-board --- SeaBlock/data-final-fixes.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index fc5ebfdd..d1535b84 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -79,4 +79,8 @@ local handcrafting_recipes = { for _, name in pairs(handcrafting_recipes) do add_recipe_category(name, "crafting") -end \ No newline at end of file +end + +-- Recipe was craftable with assembling-machine-1 even though it required a fluid +data.raw.recipe["bob-phenolic-board"].category = "electronics-with-fluid" +data.raw.recipe["bob-phenolic-board"].additional_categories = nil \ No newline at end of file From 23d1476b34094401eb44ad195daf5f82c221aae8 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 21 Sep 2025 14:22:29 +0200 Subject: [PATCH 071/117] Changed recycling recipe name --- SeaBlock/data-updates/sulfur.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua index 7c8ca237..bc4799c3 100644 --- a/SeaBlock/data-updates/sulfur.lua +++ b/SeaBlock/data-updates/sulfur.lua @@ -38,7 +38,7 @@ bobmods.lib.tech.remove_prerequisite("battery", "angels-sulfur-processing-2") -- Combine Sulfur 3 and 4 and move to Blue Science seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime", 1) seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-air-scrubbing", 2) -seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-recycling", 3) +seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-acid-recovery", 3) bobmods.lib.tech.hide("angels-sulfur-processing-4") bobmods.lib.tech.add_new_science_pack("angels-sulfur-processing-3", "chemical-science-pack", 1) From 28d2b04aabe722fcd3d9b4d6ee1d48e800b37c03 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:35:55 +0200 Subject: [PATCH 072/117] Updated add_category errors --- SeaBlock/data-final-fixes/entities.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SeaBlock/data-final-fixes/entities.lua b/SeaBlock/data-final-fixes/entities.lua index bdd907c3..c208e045 100644 --- a/SeaBlock/data-final-fixes/entities.lua +++ b/SeaBlock/data-final-fixes/entities.lua @@ -1,14 +1,14 @@ local function add_category(type, entity_name, category) if (not data.raw["recipe-category"][category]) then - error("Tried to add category to entity "..entity_name.." with type "..type..": Category does not exist") + error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": Category does not exist") end if (not data.raw[type]) then - error("Tried to add category to entity "..entity_name.." with type "..type..": Type does not exist") + error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": Type does not exist") end if (not data.raw[type][entity_name]) then - error("Tried to add category to entity "..entity_name.." with type "..type..": "..entity_name.." does not exist") + error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": \""..entity_name.."\" does not exist") end data.raw[type][entity_name].crafting_categories = data.raw[type][entity_name].crafting_categories or {} From 2452ad358c7925da49c57426491264485f533f9e Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:46:42 +0200 Subject: [PATCH 073/117] Outsourced add_category function to lib --- SeaBlock/data-final-fixes.lua | 11 +------ SeaBlock/data-final-fixes/entities.lua | 42 ++++++++------------------ SeaBlock/lib.lua | 21 +++++++++++++ 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index d1535b84..4ef12378 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -41,15 +41,6 @@ for _, v in pairs(data.raw.character) do table.insert(v.crafting_categories, "sb-crafting-handonly") end -local function add_recipe_category(recipe_name, category_name) - local recipe = data.raw.recipe[recipe_name] - if (not recipe) then error("Tried to set recipe category for recipe "..recipe_name..": Recipe not found") end - - recipe.additional_categories = recipe.additional_categories or {} - - table.insert(recipe.additional_categories, category_name) -end - -- Adds handcrafting recipes because crafting category "electronics" is no longer craftable by hand local handcrafting_recipes = { "electronic-circuit", @@ -78,7 +69,7 @@ local handcrafting_recipes = { } for _, name in pairs(handcrafting_recipes) do - add_recipe_category(name, "crafting") + seablock.lib.add_category("recipe", name, "crafting") end -- Recipe was craftable with assembling-machine-1 even though it required a fluid diff --git a/SeaBlock/data-final-fixes/entities.lua b/SeaBlock/data-final-fixes/entities.lua index c208e045..8d511dca 100644 --- a/SeaBlock/data-final-fixes/entities.lua +++ b/SeaBlock/data-final-fixes/entities.lua @@ -1,35 +1,19 @@ -local function add_category(type, entity_name, category) - if (not data.raw["recipe-category"][category]) then - error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": Category does not exist") - end - - if (not data.raw[type]) then - error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": Type does not exist") - end - - if (not data.raw[type][entity_name]) then - error("Tried to add category \""..category.."\" to entity \""..entity_name.."\" with type \""..type.."\": \""..entity_name.."\" does not exist") - end - - data.raw[type][entity_name].crafting_categories = data.raw[type][entity_name].crafting_categories or {} - - table.insert(data.raw[type][entity_name].crafting_categories, category) -end - -- crafting category "electronics" got removed from assembling machines since it is now part of Flugora -add_category("assembling-machine", "assembling-machine-1", "electronics") +if mods["bobassembly"] then + seablock.lib.add_category("assembling-machine", "assembling-machine-1", "electronics") -add_category("assembling-machine", "assembling-machine-2", "electronics") -add_category("assembling-machine", "assembling-machine-2", "electronics-with-fluid") + seablock.lib.add_category("assembling-machine", "assembling-machine-2", "electronics") + seablock.lib.add_category("assembling-machine", "assembling-machine-2", "electronics-with-fluid") -add_category("assembling-machine", "assembling-machine-3", "electronics") -add_category("assembling-machine", "assembling-machine-3", "electronics-with-fluid") + seablock.lib.add_category("assembling-machine", "assembling-machine-3", "electronics") + seablock.lib.add_category("assembling-machine", "assembling-machine-3", "electronics-with-fluid") -add_category("assembling-machine", "bob-assembling-machine-4", "electronics") -add_category("assembling-machine", "bob-assembling-machine-4", "electronics-with-fluid") + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-4", "electronics") + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-4", "electronics-with-fluid") -add_category("assembling-machine", "bob-assembling-machine-5", "electronics") -add_category("assembling-machine", "bob-assembling-machine-5", "electronics-with-fluid") + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-5", "electronics") + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-5", "electronics-with-fluid") -add_category("assembling-machine", "bob-assembling-machine-6", "electronics") -add_category("assembling-machine", "bob-assembling-machine-6", "electronics-with-fluid") \ No newline at end of file + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-6", "electronics") + seablock.lib.add_category("assembling-machine", "bob-assembling-machine-6", "electronics-with-fluid") +end diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index b6bb1167..756d45e1 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -582,3 +582,24 @@ function seablock.reskins.clear_icon_specification(name, type) entity.icon_mipmaps = nil end end + +function seablock.lib.add_category(type, prototype_name, category) + if (not data.raw["recipe-category"][category]) then + log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Category does not exist") + return + end + + if (not data.raw[type]) then + log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Type does not exist") + return + end + + if (not data.raw[type][prototype_name]) then + log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Prototype does not exist") + return + end + + data.raw[type][prototype_name].crafting_categories = data.raw[type][prototype_name].crafting_categories or {} + + table.insert(data.raw[type][prototype_name].crafting_categories, category) +end From 279a3a120485dfe875a405110c2134afbfee76ac Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:53:08 +0200 Subject: [PATCH 074/117] Made add_category error functions conform with seablock standards Fixed add_category for bobmodules and CircuitProcessing --- SeaBlock/data-final-fixes.lua | 22 ++++++++++++++-------- SeaBlock/lib.lua | 6 +++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 4ef12378..32a919b8 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -55,19 +55,25 @@ local handcrafting_recipes = { "bob-robot-brain-2", "bob-robot-brain-3", "bob-robot-brain-4", - "bob-module-case", - "bob-module-contact", - "bob-speed-processor", - "bob-efficiency-processor", - "bob-productivity-processor", "angels-wire-gold", "angels-wire-platinum", "angels-wire-silver", - "angels-wire-tin", - "cp-electronic-circuit-board", - "cp-advanced-circuit-board" + "angels-wire-tin" } +if mods["bobmodules"] then + table.insert(handcrafting_recipes, "bob-module-case") + table.insert(handcrafting_recipes, "bob-module-contact") + table.insert(handcrafting_recipes, "bob-speed-processor") + table.insert(handcrafting_recipes, "bob-efficiency-processor") + table.insert(handcrafting_recipes, "bob-productivity-processor") +end + +if mods["CircuitProcessing"] then + table.insert(handcrafting_recipes, "cp-electronic-circuit-board") + table.insert(handcrafting_recipes, "cp-advanced-circuit-board") +end + for _, name in pairs(handcrafting_recipes) do seablock.lib.add_category("recipe", name, "crafting") end diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 756d45e1..7e746a4c 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -585,17 +585,17 @@ end function seablock.lib.add_category(type, prototype_name, category) if (not data.raw["recipe-category"][category]) then - log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Category does not exist") + log("Warning: seablock.lib.add_category - Category \""..category.."\" does not exist") return end if (not data.raw[type]) then - log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Type does not exist") + log("Warning: seablock.lib.add_category - Type \""..type.."\" does not exist") return end if (not data.raw[type][prototype_name]) then - log("WARN: Tried to add category \""..category.."\" to prototype \""..prototype_name.."\" with type \""..type.."\": Prototype does not exist") + log("Warning: seablock.lib.add_category - Prototype \""..prototype_name.."\" does not exist") return end From 38818ab0a532373a42b79f583a95ca280049f119 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:08:04 +0200 Subject: [PATCH 075/117] Added add_recipe_category function Fixed bob-phenolic-board crafting category --- SeaBlock/data-final-fixes.lua | 10 ++++++---- SeaBlock/lib.lua | 36 ++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 32a919b8..6b27ad71 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -75,9 +75,11 @@ if mods["CircuitProcessing"] then end for _, name in pairs(handcrafting_recipes) do - seablock.lib.add_category("recipe", name, "crafting") + seablock.lib.add_recipe_category(name, "crafting") end --- Recipe was craftable with assembling-machine-1 even though it required a fluid -data.raw.recipe["bob-phenolic-board"].category = "electronics-with-fluid" -data.raw.recipe["bob-phenolic-board"].additional_categories = nil \ No newline at end of file +if mods["bobelectronics"] and mods["bobassembly"] then + -- Recipe was craftable with assembling-machine-1 even though it required a fluid + data.raw.recipe["bob-phenolic-board"].category = "electronics-with-fluid" + data.raw.recipe["bob-phenolic-board"].additional_categories = nil +end \ No newline at end of file diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 7e746a4c..78fcf622 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -583,7 +583,8 @@ function seablock.reskins.clear_icon_specification(name, type) end end -function seablock.lib.add_category(type, prototype_name, category) +-- Adds a crafting category to an entity +function seablock.lib.add_category(type, entity_name, category) if (not data.raw["recipe-category"][category]) then log("Warning: seablock.lib.add_category - Category \""..category.."\" does not exist") return @@ -594,12 +595,37 @@ function seablock.lib.add_category(type, prototype_name, category) return end - if (not data.raw[type][prototype_name]) then - log("Warning: seablock.lib.add_category - Prototype \""..prototype_name.."\" does not exist") + if (not data.raw[type][entity_name]) then + log("Warning: seablock.lib.add_category - Entity \""..entity_name.."\" does not exist") return end - data.raw[type][prototype_name].crafting_categories = data.raw[type][prototype_name].crafting_categories or {} + data.raw[type][entity_name].crafting_categories = data.raw[type][entity_name].crafting_categories or {} - table.insert(data.raw[type][prototype_name].crafting_categories, category) + table.insert(data.raw[type][entity_name].crafting_categories, category) end + +--- Adds a crafting category to a recipe. +--- If no category is set before it will be set to category_name. +--- Otherwise it will be safely added to additional_categories. +function seablock.lib.add_recipe_category(recipe_name, category_name) + local recipe = data.raw.recipe[recipe_name] + + if (not recipe) then + log("Warning: seablock.lib.add_recipe_category - Recipe \""..recipe_name.."\" not found") + return + end + + if (not data.raw["recipe-category"][category_name]) then + log("Warning: seablock.lib.add_recipe_category - Category \""..category_name.."\" does not exist") + return + end + + if (not recipe.category) then + recipe.category = category_name + else + recipe.additional_categories = recipe.additional_categories or {} + + table.insert(recipe.additional_categories, category_name) + end +end \ No newline at end of file From bb33d522b3f0c798b681d928b71fc6ad74867788 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:17:41 +0200 Subject: [PATCH 076/117] Decreased the number of islands further out --- SeaBlock/mapgen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/mapgen.lua b/SeaBlock/mapgen.lua index 37818122..795693bd 100644 --- a/SeaBlock/mapgen.lua +++ b/SeaBlock/mapgen.lua @@ -48,7 +48,7 @@ data:extend({ type = "noise-expression", name = "distance_sigmoid", -- sigmoid to gradually increase island size while limiting the maximum size local_expressions = { - amount = "3.5", + amount = "2", offset = "500", scale = "300" }, From c6f0dad0761f3b52cb2d312d643722a72f120830 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:47:09 +0200 Subject: [PATCH 077/117] Fixed bob-alien-science-pack dummylab insert error --- SeaBlock/data-final-fixes/unobtainable_items.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index b72a7297..629bcf01 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -255,7 +255,7 @@ bobmods.lib.safe_insert(dummyLab.inputs, "chemical-science-pack") bobmods.lib.safe_insert(dummyLab.inputs, "production-science-pack") bobmods.lib.safe_insert(dummyLab.inputs, "utility-science-pack") -if mods["bobtech"] then +if mods["bobtech"] and mods["bobenemies"] then bobmods.lib.safe_insert(dummyLab.inputs, "bob-science-pack-gold") bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-purple") bobmods.lib.safe_insert(dummyLab.inputs, "bob-alien-science-pack-blue") From 618d0eeb7584c4409c24cbd48e36d6a5331b85fa Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:58:56 +0200 Subject: [PATCH 078/117] Updated tile_condition to fix https://github.com/modded-factorio/SeaBlock/pull/343#issuecomment-3317024420 --- SeaBlock/data-updates/landfill.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index d3006336..55b3acbd 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -71,11 +71,12 @@ if mods["LandfillPainting"] then } for _, name in pairs(terrains) do - data.raw.item["landfill-"..name].place_as_tile.tile_condition = data.raw.item["landfill-"..name].place_as_tile.tile_condition or {} - local tile_cond = data.raw.item["landfill-"..name].place_as_tile.tile_condition + if (data.raw.item["landfill-"..name].place_as_tile.tile_condition) then + local tile_cond = data.raw.item["landfill-"..name].place_as_tile.tile_condition - table.insert(tile_cond, "sand-4") - table.insert(tile_cond, "sand-5") + table.insert(tile_cond, "sand-4") + table.insert(tile_cond, "sand-5") + end end end From ca7e2ea6bdebd35edda2e20391e00723971129bd Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 23 Sep 2025 17:21:40 +0200 Subject: [PATCH 079/117] Added move_stuck_player property to fix #11 --- SeaBlock/control.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua index 1cfb9f18..d454c45f 100644 --- a/SeaBlock/control.lua +++ b/SeaBlock/control.lua @@ -22,7 +22,7 @@ function seablock.create_rock_chest(surface, pos) end if has_items then - local chest = surface.create_entity({ name = "sb-rock-chest", position = pos, force = game.forces.neutral }) + local chest = surface.create_entity({ name = "sb-rock-chest", position = pos, force = game.forces.neutral, move_stuck_players = true }) for item, quantity in pairs(storage.starting_items) do if quantity > 0 then chest.insert({ name = item, count = quantity }) @@ -213,7 +213,7 @@ script.on_load(function() end) script.on_event(defines.events.on_player_created, function(e) - game.get_player(e.player_index).get_main_inventory().clear() + game.get_player(e.player_index).get_main_inventory().clear() if storage.starting_items and game.is_multiplayer() then local inv = game.get_player(e.player_index).get_main_inventory() for item, quantity in pairs(storage.starting_items) do From db15f0b98fee4b2e1026db633e188441df38913a Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 25 Sep 2025 11:29:55 +0200 Subject: [PATCH 080/117] Temporary fix for #33 --- SeaBlock/data-final-fixes.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 6b27ad71..423d69d4 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -82,4 +82,16 @@ if mods["bobelectronics"] and mods["bobassembly"] then -- Recipe was craftable with assembling-machine-1 even though it required a fluid data.raw.recipe["bob-phenolic-board"].category = "electronics-with-fluid" data.raw.recipe["bob-phenolic-board"].additional_categories = nil +end + + +--- TODO +--- This fix is only temporary +--- Needed because angelspetrochem moved the global_replace_item function to +--- data-updates stage (was in data-final-fixes stage) +if mods["bobplates"] and mods["angelspetrochem"] then + local OV = angelsmods.functions.OV + + OV.global_replace_item("bob-carbon", "angels-solid-carbon") + OV.execute() end \ No newline at end of file From 53d43b2ac5c227b0688b46a3c9272b27a5d6d503 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 25 Sep 2025 15:41:56 +0200 Subject: [PATCH 081/117] Cleanup All of the SpaceMod recipes get changed by SpaceMod itself or never took one of the upgrade ingredients --- SeaBlock/data-final-fixes.lua | 5 --- SeaBlock/data-final-fixes/SpaceMod.lua | 50 -------------------------- 2 files changed, 55 deletions(-) diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua index 423d69d4..2b8b6975 100644 --- a/SeaBlock/data-final-fixes.lua +++ b/SeaBlock/data-final-fixes.lua @@ -17,11 +17,6 @@ for _, v in pairs(reactors) do end end --- Refresh circuit board icon as it may have been overwritten --- if data.raw.tool["sb-basic-circuit-board-tool"] and data.raw.item["bob-basic-circuit-board"] then --- seablock.lib.copy_icon(data.raw.tool["sb-basic-circuit-board-tool"], data.raw.item["bob-basic-circuit-board"]) --- end - require("data-final-fixes/logistics") require("data-final-fixes/icons") require("data-final-fixes/recipe") diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index 74426e68..286d7027 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -38,24 +38,6 @@ if settings.startup["SpaceX-ignore-tech-multiplier"] then end end -local recipes = { - "low-density-structure", - "rocket-control-unit", - "assembly-robot", - "satellite", - "drydock-assembly", - "fusion-reactor", - "hull-component", - "protection-field", - "space-thruster", - "fuel-cell", - "habitation", - "life-support", - "command", - "astrometrics", - "ftl-drive", -} - local techs = { "space-assembly", "space-construction", @@ -77,38 +59,6 @@ local techs = { "ftl-propulsion", } -local upgrades = { - ["bob-construction-robot-4"] = "bob-construction-robot-5", - -- CircuitProcessing replaces module-3 with module-4, so SpaceMod data-final-fixes - -- doesn't find the modules it's expecting. - ["bob-speed-module-4"] = "bob-speed-module-5", - ["bob-efficiency-module-4"] = "bob-efficiency-module-5", - ["bob-productivity-module-4"] = "bob-productivity-module-5", - ["bob-fission-reactor-equipment-4"] = "bob-fission-reactor-equipment-4", -- for amount adjustment -} - -local function do_upgrade(recipe) - for _, item in pairs(recipe.ingredients) do - local upgrade = upgrades[item.name] - - if upgrade and (data.raw.item[upgrade] or data.raw.module[upgrade]) then - item.name = upgrade - end - - if upgrade == "bob-construction-robot-5" then - item.amount = 1 - elseif upgrade == "bob-fission-reactor-equipment-4" then - item.amount = item.amount / 2 - end - end -end - -for _, recipe in pairs(recipes) do - if data.raw.recipe[recipe] then - do_upgrade(data.raw.recipe[recipe]) - end -end - -- ftl-theory-D means SpaceMod bob's mode has activated if data.raw.technology["ftl-theory-D"] then for _, tech in pairs(techs) do From 98ccd109562e8da5fdc66e44bd397a84d130abdc Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 25 Sep 2025 15:50:37 +0200 Subject: [PATCH 082/117] Typos and comments --- SeaBlock/data-final-fixes/entities.lua | 2 +- SeaBlock/data-updates/landfill.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/entities.lua b/SeaBlock/data-final-fixes/entities.lua index 8d511dca..1ace4936 100644 --- a/SeaBlock/data-final-fixes/entities.lua +++ b/SeaBlock/data-final-fixes/entities.lua @@ -1,4 +1,4 @@ --- crafting category "electronics" got removed from assembling machines since it is now part of Flugora +-- crafting category "electronics" got removed from assembling machines since it is now part of Fulgora if mods["bobassembly"] then seablock.lib.add_category("assembling-machine", "assembling-machine-1", "electronics") diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 55b3acbd..257a1030 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -57,6 +57,7 @@ if setting and type(setting.value) == "string" then end end +-- For blueprint pasting on water data.raw.tile["water"].default_cover_tile = startup_landfill data.raw.tile["deepwater"].default_cover_tile = startup_landfill From ef144b33367b4fe139d4e818677d8205e5e404ef Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 25 Sep 2025 16:00:45 +0200 Subject: [PATCH 083/117] Removed resources for FNEI --- SeaBlock/data-updates/misc.lua | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index c94cbd22..0d8ad59c 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -36,18 +36,22 @@ if not seablock.trigger.mining_productivity then end end +-- Angels-sea-pump-resource is a virtual resource. +-- When the heavy offshore pump is placed, it is supposed to be replaced by the resource and a mining-drill. +-- Removing the resource causes placement of heavy pumps to crash new maps. +-- Crude-oil causes an error because of the trigger techs +local exclusion_map = { + ["angels-sea-pump-resource"] = true, + ["crude-oil"] = true +} + -- Remove resources so mining recipes don't show in FNEI -- Have to leave at least one resource or game will not load - ---TODO: handle this : ressource removal creates bugs ---[[for k, v in pairs(data.raw["resource"]) do - -- Sea-pump-resource is a virtual resource. - -- When the offshore pump is placed, it is supposed to be replaced by the resource and a mining-drill. - -- Removing the resource causes placement of heavy pumps to crash new maps. - if k ~= "sea-pump-resource" then +for k, _ in pairs(data.raw["resource"]) do + if (not exclusion_map[k]) then data.raw["resource"][k] = nil end -end]] +end -- Add prerequisite for Tin and Lead if settings.startup["bobmods-logistics-beltoverhaul"].value then From 2ee24dc037530d6280bc601f350bd378574c4253 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 25 Sep 2025 16:43:36 +0200 Subject: [PATCH 084/117] Final cleanup --- SeaBlock/data-updates/other-mods.lua | 12 ++++---- SeaBlock/data-updates/rubber.lua | 4 --- SeaBlock/data-updates/startup.lua | 8 ++--- SeaBlock/data-updates/sulfur.lua | 2 +- SeaBlock/data-updates/thermal-extractor.lua | 2 ++ SeaBlock/data/misc.lua | 2 +- SeaBlock/data/tech-tree.lua | 2 -- SeaBlock/lib.lua | 9 ------ SeaBlock/mapgen.md | 1 - SeaBlock/prototypes/rockchest.lua | 3 -- SeaBlock/prototypes/technology.lua | 31 -------------------- SeaBlock/shifted_hyperbolic_rational.png | Bin 23419 -> 0 bytes 12 files changed, 12 insertions(+), 64 deletions(-) delete mode 100644 SeaBlock/shifted_hyperbolic_rational.png diff --git a/SeaBlock/data-updates/other-mods.lua b/SeaBlock/data-updates/other-mods.lua index 964f932a..a040d574 100644 --- a/SeaBlock/data-updates/other-mods.lua +++ b/SeaBlock/data-updates/other-mods.lua @@ -33,13 +33,13 @@ if mods["jetpack"] then bobmods.lib.tech.add_science_pack("jetpack-4", "production-science-pack", 1) if mods["bobmodules"] then if mods["CircuitProcessing"] then - bobmods.lib.recipe.remove_ingredient("jetpack-4", "speed-module-4") - bobmods.lib.recipe.remove_ingredient("jetpack-4", "efficiency-module-4") - bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "speed-module-5", amount = 2 }) - bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "efficiency-module-5", amount = 2 }) + bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-speed-module-4") + bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-efficiency-module-4") + bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "bob-speed-module-5", amount = 2 }) + bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "bob-efficiency-module-5", amount = 2 }) else - bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "speed-module-5") - bobmods.lib.recipe.replace_ingredient("jetpack-4", "efficiency-module-3", "efficiency-module-5") + bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "bob-speed-module-5") + bobmods.lib.recipe.replace_ingredient("jetpack-4", "efficiency-module-3", "bob-efficiency-module-5") end end end diff --git a/SeaBlock/data-updates/rubber.lua b/SeaBlock/data-updates/rubber.lua index 2cb5707a..c23c5bd4 100644 --- a/SeaBlock/data-updates/rubber.lua +++ b/SeaBlock/data-updates/rubber.lua @@ -2,10 +2,6 @@ bobmods.lib.recipe.hide("bob-rubber") bobmods.lib.tech.remove_recipe_unlock("circuit-network", "bob-insulated-cable") bobmods.lib.tech.add_recipe_unlock("angels-rubbers", "bob-insulated-cable") --- Circuit network wires should not require rubber ---bobmods.lib.recipe.set_ingredients("green-wire", { { "angels-solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) ---bobmods.lib.recipe.set_ingredients("red-wire", { { "angels-solid-paper", 2 }, { "bob-tinned-copper-cable", 1 } }) - if mods["CircuitProcessing"] then bobmods.lib.tech.add_prerequisite("efficiency-module", "angels-rubbers") bobmods.lib.tech.add_prerequisite("productivity-module", "angels-rubbers") diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index 0b48c219..f0f39467 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -99,12 +99,8 @@ end if data.raw.technology["sct-automation-science-pack"] then bobmods.lib.tech.add_prerequisite("sct-automation-science-pack", "sct-lab-t1") - -- data.raw.technology["sct-automation-science-pack"].unit = { - -- count = 1, - -- ingredients = { { "sb-lab-tool", 1 } }, - -- time = 1, - -- } - data.raw.technology["sct-automation-science-pack"].research_trigger = {type = "craft-item", item = "lab"} + + data.raw.technology["sct-automation-science-pack"].research_trigger = { type = "craft-item", item = "lab" } data.raw.technology["sct-automation-science-pack"].unit = nil data.raw.technology["sct-lab-t1"].unit = { count = 1, diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua index bc4799c3..395438c0 100644 --- a/SeaBlock/data-updates/sulfur.lua +++ b/SeaBlock/data-updates/sulfur.lua @@ -1,5 +1,5 @@ -- Washing plant sulfur byproduct -local washing_fluid_box = { --TODO: check correctness of washing plant fluid box +local washing_fluid_box = { production_type = "output", pipe_covers = pipecoverspictures(), --base_level = 1, diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index 552fae1f..5691bf92 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -110,6 +110,8 @@ bore.base_picture.sheet.repeat_count = 16 -- Edit animation to include output pipe facing north and south local working_animation = table.deepcopy(bore.graphics_set.animation.north) +--- This animation is a translation of the mining_drill but for an assembling_machine +--- This is done because an assembling_machine has no base_picture so the northern and southern pipe extentions have to be added via animation bore.graphics_set.animation = { north = { layers = { diff --git a/SeaBlock/data/misc.lua b/SeaBlock/data/misc.lua index cdedf13c..7c4b312c 100644 --- a/SeaBlock/data/misc.lua +++ b/SeaBlock/data/misc.lua @@ -35,7 +35,7 @@ seablock.lib.copy_icon(data.raw.technology["angels-ore-crushing"], data.raw.tech data:extend({ { -- This was removed with bobs2.0 but is fitting for SeaBlock - -- TODO this might break when bio-processing-override-bob.lua gets changed + -- TODO this might break when bio-processing-override-bob.lua gets changed because it moves its gems to group bob-gems type = "item-group", name = "bob-gems", order = "d-g", diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua index c26e1fc5..170ad984 100644 --- a/SeaBlock/data/tech-tree.lua +++ b/SeaBlock/data/tech-tree.lua @@ -110,8 +110,6 @@ bobmods.lib.tech.remove_prerequisite("automation-science-pack", "electronics") seablock.lib.hide_technology("automation-science-pack") seablock.lib.hide_technology("electronics") --new trigger tech in base game, we don't want it in seablock --- I think i found a bug: trigger techs still research even if hidden and disabled --TODO: check this --- data.raw["technology"]["electronics"] = nil -- multiple different techs and shortcut will complain if we do that data.raw["technology"]["electronics"].research_trigger = nil data.raw["technology"]["electronics"].unit = {time = 1, count = 1, ingredients = {}} bobmods.lib.tech.remove_prerequisite("bob-electronics", "electronics") diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 78fcf622..5df267bf 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -265,12 +265,6 @@ function seablock.lib.hide_item(item_name) local item = data.raw.item[item_name] if item then item.hidden = true - -- if not item.flags then - -- item.flags = {} - -- end - -- if not seablock.lib.tablefind(item.flags, "hidden") then - -- table.insert(item.flags, "hidden") - -- end else item = data.raw.fluid[item_name] if item then @@ -298,9 +292,6 @@ function seablock.lib.hide(type_name, name) if not item.flags then item.flags = {} end - -- if not seablock.lib.tablefind(item.flags, "hidden") then - -- table.insert(item.flags, "hidden") - -- end item.hidden = true if type_name == "item" then diff --git a/SeaBlock/mapgen.md b/SeaBlock/mapgen.md index 1c291970..4358fb69 100644 --- a/SeaBlock/mapgen.md +++ b/SeaBlock/mapgen.md @@ -6,7 +6,6 @@ Beaches only contain sand-4 while the inner landmass only contains sand-5. ## Trees and Gardens Trees and gardens can only spawn on sand-5 which ensures they only spawn in the middle of an island. A multioctave noise with "large islands" is then overlayed and ensures that the same type spawns in roughly the same area (desert only near desert, temperate only near temperate etc.). A basis_noise is used so trees don't appear too clustered in one spot. A shited hyperbolic rational is added to increase the chance of a tree/garden island within the spawn radius. This is to help the player obtain trees/gardens without having to fight enemies first. -![shifted hyperbolic rational](shifted_hyperbolic_rational.png)*shifted hyperbolic rational* ## Enemies The enemy autoplace function is a translation of the 1.1 autoplace function and mixes elevation and probabilities with random noise to get a dense yet random worm placement. \ No newline at end of file diff --git a/SeaBlock/prototypes/rockchest.lua b/SeaBlock/prototypes/rockchest.lua index dc6d9a6c..b5185164 100644 --- a/SeaBlock/prototypes/rockchest.lua +++ b/SeaBlock/prototypes/rockchest.lua @@ -23,9 +23,6 @@ data:extend({ vehicle_impact_sound = { filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0 }, picture = { filename = "__base__/graphics/decorative/big-rock/big-rock-18.png", - -- width = 71, --old non hr version - -- height = 64, - -- shift = { 0.3125, 0.046875 }, width = 141, --taken from the old hr version height = 128, scale = 0.5, diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index 327af0be..20af9a19 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -1,35 +1,4 @@ data:extend({ - --[[{ - type = "tool", - name = "sb-angelsore3-tool", - localised_name = { "item-name.angels-ore3-crushed" }, - icon = "__angelsrefininggraphics__/graphics/icons/angels-ore3-crushed.png", - icon_size = 32, - hidden = true, - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "sb-basic-circuit-board-tool", - localised_name = { "item-name.basic-circuit-board" }, - icon = "__bobelectronics__/graphics/icons/basic-circuit-board.png", - icon_size = 64, - hidden = true, - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "sb-lab-tool", - localised_name = { "item-name.lab" }, - icon = "__base__/graphics/icons/lab.png", - icon_size = 64, - icon_mipmaps = 4, - hidden = true, - stack_size = 100, - durability = 1, - },]] { type = "technology", name = "sb-startup1", diff --git a/SeaBlock/shifted_hyperbolic_rational.png b/SeaBlock/shifted_hyperbolic_rational.png deleted file mode 100644 index 706bff5c6edb0dc3ae8688809245b44c1d9e004c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23419 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 Date: Fri, 26 Sep 2025 20:17:21 +0200 Subject: [PATCH 085/117] Added parameter- recipes back --- .../data-final-fixes/unobtainable_items.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index 629bcf01..748026c2 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -197,8 +197,25 @@ for k, _ in pairs(unobtainable) do seablock.lib.hide_item(k) end +local keep_unobtainable_recipes = { + ["parameter-0"] = true, + ["parameter-1"] = true, + ["parameter-2"] = true, + ["parameter-3"] = true, + ["parameter-4"] = true, + ["parameter-5"] = true, + ["parameter-6"] = true, + ["parameter-7"] = true, + ["parameter-8"] = true, + ["parameter-9"] = true +} + -- Remove any recipe that uses an unobtainable ingredient local function keeprecipe(r) + if (keep_unobtainable_recipes[r.name]) then + return true + end + if (not r.ingredients) then return false end From 8125a2e2f612046f7d5bf8ee7c0dce32876db5f7 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 28 Sep 2025 19:18:19 +0200 Subject: [PATCH 086/117] Added autoplace for fish --- SeaBlock/data-final-fixes/mapgen.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/mapgen.lua b/SeaBlock/data-final-fixes/mapgen.lua index c73ba41f..fa522f09 100644 --- a/SeaBlock/data-final-fixes/mapgen.lua +++ b/SeaBlock/data-final-fixes/mapgen.lua @@ -30,7 +30,9 @@ data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = { ["angels-alien-fish-1"] = {}, ["angels-alien-fish-2"] = {}, - ["angels-alien-fish-3"] = {} + ["angels-alien-fish-3"] = {}, + + ["fish"] = {} } } } From 089ce5dbe32b37edc0a83e8ab31729ccf1781a38 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 12 Oct 2025 18:06:17 +0200 Subject: [PATCH 087/117] angels-oil-gas-extraction is now base game oil-gathering, this commit fixes #44 --- SeaBlock/data-updates/misc.lua | 2 +- SeaBlock/data-updates/petrochem.lua | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index 0d8ad59c..385595fc 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -6,7 +6,7 @@ end -- No natural gas, use methane for manganese pellet smelting seablock.lib.substingredient("angels-solid-manganese-oxide-2", "angels-gas-natural-1", "angels-gas-methane") -bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "angels-oil-gas-extraction") +bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gathering") bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "angels-advanced-gas-processing") -- Remove steel's prerequiste on Chemical processing 1 diff --git a/SeaBlock/data-updates/petrochem.lua b/SeaBlock/data-updates/petrochem.lua index 22715cc3..90863006 100644 --- a/SeaBlock/data-updates/petrochem.lua +++ b/SeaBlock/data-updates/petrochem.lua @@ -65,11 +65,11 @@ seablock.lib.add_recipe_unlock("angels-bio-nutrient-paste", "angels-gas-refinery bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "angels-gas-processing") bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "angels-steam-cracking-2") -bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "angels-oil-gas-extraction") +bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "oil-gathering") bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "angels-gas-processing") bobmods.lib.tech.remove_prerequisite("angels-bio-nutrient-paste", "angels-gas-processing") bobmods.lib.tech.remove_prerequisite("angels-bio-processing-paste", "angels-chlorine-processing-2") -bobmods.lib.tech.remove_prerequisite("angels-gas-processing", "angels-oil-gas-extraction") +bobmods.lib.tech.remove_prerequisite("angels-gas-processing", "oil-gathering") bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-1", "angels-gas-processing") bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-2", "angels-advanced-chemistry-2") @@ -81,4 +81,3 @@ bobmods.lib.tech.add_prerequisite("angels-bio-processing-paste", "angels-chlorin bobmods.lib.tech.add_prerequisite("angels-steam-cracking-2", "angels-advanced-gas-processing") bobmods.lib.tech.hide("angels-gas-processing") -bobmods.lib.tech.hide("angels-oil-gas-extraction") From 17064fb45a46addb846aabd7b5e1dc68d0edceb6 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 17 Oct 2025 19:31:52 +0200 Subject: [PATCH 088/117] Reimplemented ore crystallization --- SeaBlock/data-updates/slag-processing.lua | 33 +++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 6f492090..04691945 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -1,5 +1,12 @@ -- Decrease amount of crushed stone for slag-slurry so it's still better than mineralized water crystallization -seablock.lib.substingredient("angels-stone-crushed-dissolution", "angels-stone-crushed", nil, 20) +seablock.lib.substingredient("angels-stone-crushed-dissolution", "angels-stone-crushed", "stone", 20) + +-- Update results of ore processing since Angel's changed that to be less convenient +data.raw.recipe["angels-ore-chunk-mix3-processing"].results = {{ type = "item", name = "bob-bauxite-ore", amount = 4 }} + +data.raw.recipe["angels-ore-crushed-mix3-processing"].results = {{ type = "item", name = "bob-lead-ore", amount = 4 }} + +data.raw.recipe["angels-ore-pure-mix2-processing"].results = {{ type = "item", name = "angels-platinum-ore", amount = 2 }} -- Angels sludge crystalization usually gives normal smeltable ores. This would be far too easy, -- so change recipes to give the weird ores that need extra processing steps. @@ -14,7 +21,23 @@ for i = 1, 6 do recipe.ingredients = { { type = "fluid", name = "angels-mineral-sludge", amount = 25 } } recipe.results = { { type = "item", name = "angels-ore" .. i, amount = 1 } } recipe.enabled = false - + recipe.hidden = false + + angelsmods.functions.allow_productivity("angels-slag-processing-" .. i) +end + +local function insert_effect(recipe_name, tech_name, index) + local tech = data.raw.technology[tech_name] + + if not tech then + return + end + + if index then + table.insert(tech.effects, index, { type = "unlock-recipe", recipe = recipe_name }) + else + table.insert(tech.effects, { type = "unlock-recipe", recipe = recipe_name }) + end end -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1, @@ -24,12 +47,12 @@ bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false) bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false) seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3) local slag1start = seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1") -seablock.lib.moveeffect("angels-slag-processing-5", "angels-slag-processing-2", "angels-slag-processing-1", slag1start + 3) -seablock.lib.moveeffect("angels-slag-processing-6", "angels-slag-processing-2", "angels-slag-processing-1", slag1start + 4) +insert_effect("angels-slag-processing-5", "angels-slag-processing-1", slag1start+3) +insert_effect("angels-slag-processing-6", "angels-slag-processing-1", slag1start+4) local slag2start = 0 seablock.lib.moveeffect("angels-slag-processing-2", "angels-slag-processing-1", "angels-ore-advanced-crushing", slag2start + 1) -seablock.lib.moveeffect("angels-slag-processing-4", "angels-slag-processing-2", "angels-ore-advanced-crushing", slag2start + 2) +insert_effect("angels-slag-processing-4", "angels-ore-advanced-crushing", slag2start+2) seablock.lib.moveeffect("angels-ore2-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 3) seablock.lib.moveeffect("angels-ore4-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 4) From 157c6be9590433c3765117d574dddeebee6aa642 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 17 Oct 2025 20:14:04 +0200 Subject: [PATCH 089/117] Fixed recipe names for unhidden recipes --- SeaBlock/data-final-fixes/tech-tree.lua | 1 + SeaBlock/data-updates/unobtainable-items.lua | 2 ++ 2 files changed, 3 insertions(+) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 64e6d719..833066a7 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -21,6 +21,7 @@ bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network") -- Unhide solid fuel from hydrogen seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen") seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4) +data.raw.recipe["bob-solid-fuel-from-hydrogen"].localised_name = nil bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "angels-chlorine-processing-4", "angels-chlorine-processing-2") diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua index 10820b12..1441fce3 100644 --- a/SeaBlock/data-updates/unobtainable-items.lua +++ b/SeaBlock/data-updates/unobtainable-items.lua @@ -121,6 +121,8 @@ seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "angel seablock.lib.unhide_recipe("angels-solid-zinc-oxide") bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "angels-solid-zinc-oxide") +data.raw.recipe["angels-solid-zinc-oxide"].localised_name = nil + bobmods.lib.tech.add_prerequisite("bob-battery-3", "angels-zinc-smelting-2") if data.raw.recipe["angels-pellet-zinc-smelting"] then data.raw.recipe["angels-pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer( From ca80772cd178d41ddc3c160b72427eef59663885 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sat, 18 Oct 2025 13:50:04 +0200 Subject: [PATCH 090/117] Removed uranium-mining tech --- SeaBlock/data-final-fixes/tech-tree.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 833066a7..a096942d 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -36,4 +36,7 @@ bobmods.lib.tech.remove_prerequisite("bob-repair-pack-2", "repair-pack") bobmods.lib.tech.remove_prerequisite("lubricant", "bob-chemical-plant") bobmods.lib.tech.remove_prerequisite("plastics", "bob-chemical-plant") -bobmods.lib.tech.hide("bob-chemical-plant") \ No newline at end of file +bobmods.lib.tech.hide("bob-chemical-plant") + +bobmods.lib.tech.hide("uranium-mining") +bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") \ No newline at end of file From 9efb230c2bd461d46e1a5b057a09d22c813529f0 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 19 Oct 2025 01:05:36 +0200 Subject: [PATCH 091/117] Fixed angels-bio-module researchability --- SeaBlock/data-final-fixes/tech-tree.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index a096942d..1bb63716 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -38,5 +38,13 @@ bobmods.lib.tech.remove_prerequisite("plastics", "bob-chemical-plant") bobmods.lib.tech.hide("bob-chemical-plant") +-- uranium mining only adds fluid inputs to mining drills which is never used bobmods.lib.tech.hide("uranium-mining") -bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") \ No newline at end of file +bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") + +-- needed for bio-module to be researchable +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module", "bob-pollution-create-module-1") +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-2", "bob-pollution-create-module-2") +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-3", "bob-pollution-create-module-3") +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-4", "bob-pollution-create-module-4") +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-5", "bob-pollution-create-module-5") \ No newline at end of file From d1c8ae5d1c37a5dd3fc80e961fbde5b6fb1de2cf Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:32:40 +0200 Subject: [PATCH 092/117] Fixed bob tech prerequisites --- SeaBlock/data-final-fixes/tech-tree.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 1bb63716..df9cdbbd 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -18,6 +18,19 @@ bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-bio-wood-process bobmods.lib.tech.add_prerequisite("circuit-network", "angels-bio-paper-1") bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network") +-- alien research is disabled with SeaBlock +bobmods.lib.tech.remove_prerequisite("bob-exoskeleton-equipment-3", "bob-alien-blue-research") + +bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-3", "bob-alien-research") +bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-4", "bob-alien-blue-research") +bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-4", "bob-alien-red-research") + +bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-orange-research") +bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-blue-research") +bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-green-research") + +bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "bob-alien-research") + -- Unhide solid fuel from hydrogen seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen") seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4) From 3debeac6a3ea8623499b1bed6fc7fd69ae950076 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 19 Oct 2025 15:45:15 +0200 Subject: [PATCH 093/117] Technology fixes (including uncraftable items which are now hidden) --- SeaBlock/data-final-fixes/logistics.lua | 9 ++++--- SeaBlock/data-final-fixes/tech-tree.lua | 34 ++++++++++++++++++++++--- SeaBlock/data-updates/military.lua | 5 ++++ SeaBlock/data-updates/misc.lua | 4 ++- SeaBlock/data-updates/sulfur.lua | 2 +- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index c396b580..54f9cc9b 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -58,7 +58,7 @@ local logisticstechs = { "logistic-system-2", "logistic-system-3", "angels-logistic-warehouses", - "logistic-silos", + "angels-logistic-silos", } for _, v in pairs(logisticstechs) do @@ -73,8 +73,8 @@ for _, v in pairs(logisticstechs) do end if mods["angelsaddons-storage"] then - bobmods.lib.tech.replace_prerequisite("logistic-silos", "logistic-system", "logistic-system-3") - bobmods.lib.tech.replace_prerequisite("angels-logistic-warehouses", "logistic-system", "logistic-silos") + bobmods.lib.tech.replace_prerequisite("angels-logistic-silos", "logistic-system", "logistic-system-3") + bobmods.lib.tech.replace_prerequisite("angels-logistic-warehouses", "logistic-system", "angels-logistic-silos") end bobmods.lib.tech.add_prerequisite("logistic-system-2", "utility-science-pack") @@ -133,3 +133,6 @@ for i = 2, 5 do robot.max_payload_size = 1 end end + +seablock.lib.hide_item("angels-silo-coal") +seablock.lib.hide("container", "angels-silo-coal") \ No newline at end of file diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index df9cdbbd..b3d475e6 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -25,9 +25,27 @@ bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-3", "bob-ali bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-4", "bob-alien-blue-research") bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-4", "bob-alien-red-research") -bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-orange-research") -bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-blue-research") -bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-green-research") +if data.raw.technology["bob-personal-laser-defense-equipment-6"] then + local tech = data.raw.technology["bob-personal-laser-defense-equipment-6"] + + tech.unit = { + count = 350, + time = 30, + ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "military-science-pack", 1 }, + { "production-science-pack", 1 }, + { "utility-science-pack", 1 }, + { "space-science-pack", 1 }, + } + } + + bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-orange-research") + bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-blue-research") + bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-green-research") +end bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "bob-alien-research") @@ -60,4 +78,12 @@ bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module", "bob-pollution-c bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-2", "bob-pollution-create-module-2") bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-3", "bob-pollution-create-module-3") bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-4", "bob-pollution-create-module-4") -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-5", "bob-pollution-create-module-5") \ No newline at end of file +bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-5", "bob-pollution-create-module-5") + +-- science pack prerequisites +-- bobmods.lib.tech.add_prerequisite("atomic-bomb", "") +bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "production-science-pack") +bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") +-- bobmods.lib.tech.add_prerequisite("", "") +-- bobmods.lib.tech.add_prerequisite("", "") +-- bobmods.lib.tech.add_prerequisite("", "") \ No newline at end of file diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index c47f047c..667bcb03 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -136,6 +136,8 @@ local mil_items = { { type = "unit", name = "bob-robot-gun-drone" }, { type = "unit", name = "bob-robot-laser-drone" }, { type = "unit", name = "bob-robot-plasma-drone" }, + { type = "item", name = "bob-explosive-rocket-warhead" }, + { type = "item", name = "bob-flame-rocket-warhead" }, } local mil_tech = { @@ -290,6 +292,9 @@ local mil_ammo = { { type = "ammo", name = "bob-shotgun-uranium-shell" }, { type = "ammo", name = "bob-uranium-cannon-shell" }, { type = "ammo", name = "uranium-rounds-magazine" }, + { type = "ammo", name = "uranium-cannon-shell"}, + { type = "ammo", name = "explosive-uranium-cannon-shell"}, + { type = "ammo", name = "bob-explosive-artillery-shell" }, { type = "capsule", name = "cluster-grenade" }, { type = "capsule", name = "defender-capsule" }, { type = "capsule", name = "destroyer-capsule" }, diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index 385595fc..0053c8e1 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -268,4 +268,6 @@ OV.patch_recipes({ } }) -bobmods.lib.tech.add_prerequisite("battery", "plastics") \ No newline at end of file +bobmods.lib.tech.add_prerequisite("battery", "plastics") + +bobmods.lib.item.hide("bob-alien-acid") \ No newline at end of file diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua index 395438c0..0a8faa4d 100644 --- a/SeaBlock/data-updates/sulfur.lua +++ b/SeaBlock/data-updates/sulfur.lua @@ -38,7 +38,7 @@ bobmods.lib.tech.remove_prerequisite("battery", "angels-sulfur-processing-2") -- Combine Sulfur 3 and 4 and move to Blue Science seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime", 1) seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-air-scrubbing", 2) -seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-acid-recovery", 3) +seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-cleaning", 3) bobmods.lib.tech.hide("angels-sulfur-processing-4") bobmods.lib.tech.add_new_science_pack("angels-sulfur-processing-3", "chemical-science-pack", 1) From 9eddf5d6b4ed322370d0b448dad3c7d6d8feae74 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 19 Oct 2025 19:08:04 +0200 Subject: [PATCH 094/117] Removed unecessary angels-bio-module prereq fix (is fixed in CircuitProcessing) --- SeaBlock/data-final-fixes/tech-tree.lua | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index b3d475e6..bbddf48e 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -73,17 +73,6 @@ bobmods.lib.tech.hide("bob-chemical-plant") bobmods.lib.tech.hide("uranium-mining") bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") --- needed for bio-module to be researchable -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module", "bob-pollution-create-module-1") -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-2", "bob-pollution-create-module-2") -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-3", "bob-pollution-create-module-3") -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-4", "bob-pollution-create-module-4") -bobmods.lib.tech.remove_prerequisite("angels-bio-yield-module-5", "bob-pollution-create-module-5") - -- science pack prerequisites --- bobmods.lib.tech.add_prerequisite("atomic-bomb", "") bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "production-science-pack") -bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") --- bobmods.lib.tech.add_prerequisite("", "") --- bobmods.lib.tech.add_prerequisite("", "") --- bobmods.lib.tech.add_prerequisite("", "") \ No newline at end of file +bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") \ No newline at end of file From c3ff2f94f7d3d32fa616bc3ee7199adced771a4f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sun, 19 Oct 2025 19:31:01 +0200 Subject: [PATCH 095/117] Adding shotgun recipe for blueprint-shotgun mod --- SeaBlock/data-final-fixes/recipe.lua | 11 +++++++++++ SeaBlock/lib.lua | 24 ++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 1bfbede5..608c23e0 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -76,4 +76,15 @@ if settings.startup["bobmods-plates-batteryupdate"].value == true then bobmods.lib.recipe.replace_ingredient("battery", "steel-plate", "plastic-bar") else bobmods.lib.recipe.replace_ingredient("battery", "iron-plate", "plastic-bar") +end + +if (mods["blueprint-shotgun"]) then + seablock.lib.unhide_recipe("shotgun") + seablock.lib.unhide_recipe("shotgun-shell") + + seablock.lib.unhide("gun", "shotgun") + seablock.lib.unhide("ammo", "shotgun-shell") + + bobmods.lib.tech.add_recipe_unlock("military", "shotgun") + bobmods.lib.tech.add_recipe_unlock("military", "shotgun-shell") end \ No newline at end of file diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 5df267bf..51b84efe 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -231,14 +231,26 @@ function seablock.lib.tablefind(table, item) return nil end -function seablock.lib.unhide_recipe(recipe_name) - local recipe = data.raw.recipe[recipe_name] - if recipe then - recipe.hidden = false - else - log("Warning: seablock.lib.unhide_recipe - can't find recipe : " .. recipe_name) +function seablock.lib.unhide(type_name, name) + if not data.raw[type_name] then + log("Warning: seablock.lib.unhide - unknown type: " .. type_name) log(debug.traceback()) + return end + + local item = data.raw[type_name][name] + + if not item then + log("Warning: seablock.lib.unhide - unknown " .. type_name .. ": " .. name) + log(debug.traceback()) + return + end + + item.hidden = false +end + +function seablock.lib.unhide_recipe(recipe_name) + seablock.lib.unhide("recipe", recipe_name) end function seablock.lib.hide_technology(technology_name) From 79ccf015c6fd7ee3f89d44a4c08fa64797b1c79e Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 31 Oct 2025 11:24:05 +0100 Subject: [PATCH 096/117] Removed hidden ingredients for angels and bobs to fix #50 --- SeaBlock/data-final-fixes/recipe.lua | 14 +++++++++++++- SeaBlock/data-updates/unobtainable-items.lua | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 608c23e0..98077b3b 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -87,4 +87,16 @@ if (mods["blueprint-shotgun"]) then bobmods.lib.tech.add_recipe_unlock("military", "shotgun") bobmods.lib.tech.add_recipe_unlock("military", "shotgun-shell") -end \ No newline at end of file +end + +bobmods.lib.recipe.replace_ingredient("bob-fission-reactor-equipment-4", "bob-alien-blue-alloy", "bob-cobalt-steel-alloy") +bobmods.lib.recipe.replace_ingredient("bob-fission-reactor-equipment-4", "bob-alien-fire", "angels-liquid-naphtha") + +bobmods.lib.recipe.replace_ingredient("bob-exoskeleton-equipment-3", "bob-alien-blue-alloy", "bob-cobalt-steel-alloy") + +bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", "bob-alien-blue-alloy", "bob-cobalt-steel-alloy") +bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", "bob-alien-orange-alloy", "bob-gold-plate") +bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", "bob-alien-poison", "angels-liquid-nitric-acid") + +bobmods.lib.recipe.hide("bob-rocket-engine") +bobmods.lib.item.hide("bob-rocket-engine") \ No newline at end of file diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua index 1441fce3..939e81cd 100644 --- a/SeaBlock/data-updates/unobtainable-items.lua +++ b/SeaBlock/data-updates/unobtainable-items.lua @@ -118,6 +118,8 @@ seablock.lib.hide("item", "bob-liquid-fuel-barrel") seablock.lib.substingredient("bob-roboport-antenna-3", "bob-nickel-plate", "bob-titanium-plate", nil) bobmods.lib.recipe.remove_ingredient("bob-roboport-antenna-4", "bob-nickel-plate") seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "angels-solid-zinc-oxide", nil) +seablock.lib.substingredient("angels-thorium-fuel-cell", "bob-zinc-plate", "steel-plate", nil) +seablock.lib.substingredient("angels-deuterium-fuel-cell", "bob-zinc-plate", "steel-plate", nil) seablock.lib.unhide_recipe("angels-solid-zinc-oxide") bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "angels-solid-zinc-oxide") From c37bf4d24989867971a2dfb96474c1c3fd30751f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 3 Nov 2025 18:37:51 +0100 Subject: [PATCH 097/117] Made beacons match their 1.1 effectiveness closer (#51) --- SeaBlock/data-final-fixes/logistics.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index 54f9cc9b..9634579e 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -31,17 +31,20 @@ set_speed("transport-belt", "bob-ultimate-transport-belt", 75) set_speed("underground-belt", "bob-ultimate-underground-belt", 75) set_speed("splitter", "bob-ultimate-splitter", 75) +-- Change base game beacon +data.raw.beacon["beacon"].distribution_effectivity = 1 + -- Increase energy consumption of bob's extra beacons -- Also reduce module slots and effectivity if data.raw.beacon["bob-beacon-2"] then data.raw.beacon["bob-beacon-2"].energy_usage = "960kW" data.raw.beacon["bob-beacon-2"].module_slots = 2 - data.raw.beacon["bob-beacon-2"].distribution_effectivity = 0.5 + data.raw.beacon["bob-beacon-2"].distribution_effectivity = 1 end if data.raw.beacon["bob-beacon-3"] then data.raw.beacon["bob-beacon-3"].energy_usage = "1920kW" data.raw.beacon["bob-beacon-3"].module_slots = 2 - data.raw.beacon["bob-beacon-3"].distribution_effectivity = 0.5 + data.raw.beacon["bob-beacon-3"].distribution_effectivity = 1 end -- Undo boblogistcs changes to logistic system research From 8a70f347f04e323f68785bdb6fe39ea2e2693e9f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 3 Nov 2025 18:45:54 +0100 Subject: [PATCH 098/117] Angels-chemical-plant got changed to chemical-plant --- SeaBlock/data-updates/startup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index f0f39467..609de7cf 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -52,7 +52,7 @@ local knowningredients = { { "pipe", 10 }, { "stone-brick", 10 }, }, - ["angels-chemical-plant"] = { + ["chemical-plant"] = { { "iron-plate", 5 }, { "iron-gear-wheel", 5 }, { "bob-basic-circuit-board", 5 }, From bec08a08d849314874acf777e759ca3b606e56d3 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 7 Nov 2025 19:34:15 +0100 Subject: [PATCH 099/117] Fixed beacon range --- SeaBlock/data-final-fixes/logistics.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index 9634579e..9728e848 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -40,11 +40,15 @@ if data.raw.beacon["bob-beacon-2"] then data.raw.beacon["bob-beacon-2"].energy_usage = "960kW" data.raw.beacon["bob-beacon-2"].module_slots = 2 data.raw.beacon["bob-beacon-2"].distribution_effectivity = 1 + + --TODO this got changed with bobs 2.0 - this replicates 1.1 behavior + data.raw.beacon["bob-beacon-2"].supply_area_distance = 6 end if data.raw.beacon["bob-beacon-3"] then data.raw.beacon["bob-beacon-3"].energy_usage = "1920kW" data.raw.beacon["bob-beacon-3"].module_slots = 2 data.raw.beacon["bob-beacon-3"].distribution_effectivity = 1 + data.raw.beacon["bob-beacon-2"].supply_area_distance = 9 end -- Undo boblogistcs changes to logistic system research From 751bee63e526b186ddf040fde082b5bed157fbf5 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 7 Nov 2025 19:39:25 +0100 Subject: [PATCH 100/117] Fixed typo in beacon range --- SeaBlock/data-final-fixes/logistics.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index 9728e848..5211e07f 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -48,7 +48,7 @@ if data.raw.beacon["bob-beacon-3"] then data.raw.beacon["bob-beacon-3"].energy_usage = "1920kW" data.raw.beacon["bob-beacon-3"].module_slots = 2 data.raw.beacon["bob-beacon-3"].distribution_effectivity = 1 - data.raw.beacon["bob-beacon-2"].supply_area_distance = 9 + data.raw.beacon["bob-beacon-3"].supply_area_distance = 9 end -- Undo boblogistcs changes to logistic system research From ce0f8abb5c7f103e9ea665dc104b9bb91c79b0cf Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 7 Nov 2025 20:02:30 +0100 Subject: [PATCH 101/117] Updated changelog --- SeaBlock/changelog.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 3c157667..2a1f75d0 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -6,8 +6,16 @@ Date: ??.??.?? - Removed normal/expensive recipes - Updated map generation - Renamed Angel's and Bob's items - - Removed Artisanal Reskins: Angel's Mods until Angel's is fully updated - Replaced crushed stone for regular stone + - Reimplemented (1.1) ore crystallization recipes (This got changed with angelsmods 2.0) + - Added extended beacon range to bob beacons (This got removed in bobmods 2.0) + - Changed beacon transmission efficiency to closer match 1.1 + - Added shotgun recipe when the mod "blueprint-shotgun" is loaded + - Removed techs: + - Uranium mining + - Changed several bobs and angels recipes back to their 1.1 version + - "battery" + - Adjusted volume of "wind-turbine-2" --------------------------------------------------------------------------------------------------- Version: 0.5.17 Date: ??.??.?? From 12379782d3305f107bdf5216b41c1a99b9be9a97 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Wed, 12 Nov 2025 20:14:41 +0100 Subject: [PATCH 102/117] Removing circular tech dependencies (#53) --- SeaBlock/data-final-fixes/tech-tree.lua | 15 ++++++++++++++- SeaBlock/data-updates/wood.lua | 2 +- SeaBlock/data/recipe.lua | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index bbddf48e..21bb9cf8 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -75,4 +75,17 @@ bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") -- science pack prerequisites bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "production-science-pack") -bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") \ No newline at end of file +bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") + +-- Not needed in SB +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "bob-zinc-processing") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "angels-stone-smelting-2") +bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "angels-aluminium-smelting-1") + +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing", "angels-wood-bricks") + +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-coal-processing") +seablock.lib.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-bricks", 3) + +bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-3", "angels-stone-smelting-1") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-bio-processor") \ No newline at end of file diff --git a/SeaBlock/data-updates/wood.lua b/SeaBlock/data-updates/wood.lua index 4a34af1e..0064ba80 100644 --- a/SeaBlock/data-updates/wood.lua +++ b/SeaBlock/data-updates/wood.lua @@ -24,7 +24,7 @@ bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-wood-processing") bobmods.lib.tech.add_prerequisite("angels-bio-wood-processing-2", "angels-bio-processing-brown") bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-charcoal") -bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-bio-resin-wood-reprocessing") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-bio-resin-wood-reprocessing") bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "bob-rubber") bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-bio-processor") bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-pellets") diff --git a/SeaBlock/data/recipe.lua b/SeaBlock/data/recipe.lua index 709e1930..3179f4bd 100644 --- a/SeaBlock/data/recipe.lua +++ b/SeaBlock/data/recipe.lua @@ -7,6 +7,6 @@ angelsmods.functions.make_void("angels-solid-compost", "bio", 5) -- Remove recipe Wood pellets > Carbon dioxide -- Move recipe Charcoal > Carbon dioxide from Basic chemistry to Wood processing 2 -bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-gas-carbon-dioxide-from-wood") +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-gas-carbon-dioxide-from-wood") bobmods.lib.recipe.hide("angels-gas-carbon-dioxide-from-wood") -bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry", "angels-carbon-separation-2") +bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry", "angels-carbon-separation-2") \ No newline at end of file From d271d84b39d4d541e2b5724f0d486e4c111e0fd6 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Sat, 15 Nov 2025 12:54:16 +0100 Subject: [PATCH 103/117] Fixed technology name --- SeaBlock/prototypes/technology.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index 20af9a19..0b57b29d 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -44,8 +44,8 @@ data:extend({ { type = "technology", name = "sb-bio-processing-advanced", - localised_name = { "technology-name.bio-processing-green" }, - localised_description = { "technology-description.bio-processing-green" }, + localised_name = { "technology-name.angels-bio-processing-green" }, + localised_description = { "technology-description.angels-bio-processing-green" }, icon = "__angelsbioprocessinggraphics__/graphics/technology/algae-farm-tech.png", icon_size = 128, order = "c-a", From 38727ce3268d09eb73edc7fc6c0a5af608a4fc6c Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:28:16 +0100 Subject: [PATCH 104/117] Fixed hidden charcoal silo --- SeaBlock/data-final-fixes/logistics.lua | 5 +---- SeaBlock/data-updates/coal.lua | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index 5211e07f..72adacf2 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -139,7 +139,4 @@ for i = 2, 5 do if robot then robot.max_payload_size = 1 end -end - -seablock.lib.hide_item("angels-silo-coal") -seablock.lib.hide("container", "angels-silo-coal") \ No newline at end of file +end \ No newline at end of file diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua index c9f63e64..336e35b7 100644 --- a/SeaBlock/data-updates/coal.lua +++ b/SeaBlock/data-updates/coal.lua @@ -12,8 +12,8 @@ if mods["Transport_Drones"] then seablock.lib.substingredient("road", "coal", "angels-wood-charcoal") end seablock.lib.substingredient("angels-gas-carbon-dioxide", "coal", "angels-wood-charcoal", 1) -if mods["angelsaddons-storage"] and data.raw.recipe["silo-coal"] then - seablock.lib.substingredient("silo-coal", "angels-coal-crushed", "angels-wood-charcoal", 10) +if mods["angelsaddons-storage"] and data.raw.recipe["angels-silo-coal"] then + seablock.lib.substingredient("angels-silo-coal", "angels-coal-crushed", "angels-wood-charcoal", 10) end -- Disable coal cracking technology From b65a13d22f669e0b4f2c34179d1c06892657b9eb Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:32:38 +0100 Subject: [PATCH 105/117] Fixed charcoal silo locale --- SeaBlock/data-final-fixes/logistics.lua | 2 +- SeaBlock/locale/en/SeaBlock.cfg | 4 ++-- SeaBlock/locale/ja/SeaBlock.cfg | 4 ++-- SeaBlock/locale/ru/SeaBlock.cfg | 4 ++-- SeaBlock/locale/uk/SeaBlock.cfg | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua index 72adacf2..3a5201c7 100644 --- a/SeaBlock/data-final-fixes/logistics.lua +++ b/SeaBlock/data-final-fixes/logistics.lua @@ -139,4 +139,4 @@ for i = 2, 5 do if robot then robot.max_payload_size = 1 end -end \ No newline at end of file +end diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg index f1ae7d75..ff7fa102 100644 --- a/SeaBlock/locale/en/SeaBlock.cfg +++ b/SeaBlock/locale/en/SeaBlock.cfg @@ -28,10 +28,10 @@ sb-catalyst-metal-purple=Purple metal catalyst [entity-name] home=Home sct-lab-lab2=Exoplanetary Studies Lab -silo-coal=Charcoal silo +angel-silo-coal=Charcoal silo [entity-description] -silo-coal=Silo with a "Charcoal" aesthetic. +angel-silo-coal=Silo with a "Charcoal" aesthetic. [technology-name] sb-startup1=Crush stiratite diff --git a/SeaBlock/locale/ja/SeaBlock.cfg b/SeaBlock/locale/ja/SeaBlock.cfg index 5e4b1125..d9cb1a76 100644 --- a/SeaBlock/locale/ja/SeaBlock.cfg +++ b/SeaBlock/locale/ja/SeaBlock.cfg @@ -23,10 +23,10 @@ sct-lab-lab2=系外惑星研究所 [entity-name] home=ホーム sct-lab-lab2=系外惑星研究所 -silo-coal=木炭サイロ +angel-silo-coal=木炭サイロ [entity-description] -silo-coal=「木炭」の美的要素を持つサイロ。 +angel-silo-coal=「木炭」の美的要素を持つサイロ。 [technology-name] sb-startup1=破砕スチラタイト diff --git a/SeaBlock/locale/ru/SeaBlock.cfg b/SeaBlock/locale/ru/SeaBlock.cfg index 40167b49..9e331076 100644 --- a/SeaBlock/locale/ru/SeaBlock.cfg +++ b/SeaBlock/locale/ru/SeaBlock.cfg @@ -22,10 +22,10 @@ sct-lab-lab2=Лаборатория экзопланетарных исслед [entity-name] sct-lab-lab2=Лаборатория экзопланетарных исследований -silo-coal=Древесноугольный элеватор +angel-silo-coal=Древесноугольный элеватор [entity-description] -silo-coal=Элеватор с эстетикой древесного угля. +angel-silo-coal=Элеватор с эстетикой древесного угля. [technology-name] sb-startup1=Измельчить ститарит diff --git a/SeaBlock/locale/uk/SeaBlock.cfg b/SeaBlock/locale/uk/SeaBlock.cfg index 6006546c..24bb6c3f 100644 --- a/SeaBlock/locale/uk/SeaBlock.cfg +++ b/SeaBlock/locale/uk/SeaBlock.cfg @@ -24,10 +24,10 @@ sb-catalyst-metal-purple=Каталізатор з фіолетового мет [entity-name] home=Головна sct-lab-lab2=Лабораторія екзопланетарних досліджень -silo-coal=Вугільне сховище +angel-silo-coal=Вугільне сховище [entity-description] -silo-coal=Сховище з "вугільною" естетикою. +angel-silo-coal=Сховище з "вугільною" естетикою. [technology-name] sb-startup1=Подрібнити стиратит From 0ec1891dc65cf94ccf00e6e295918157d796fabd Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:35:56 +0100 Subject: [PATCH 106/117] Fixed charcoal silo locale typo --- SeaBlock/locale/en/SeaBlock.cfg | 4 ++-- SeaBlock/locale/ja/SeaBlock.cfg | 4 ++-- SeaBlock/locale/ru/SeaBlock.cfg | 4 ++-- SeaBlock/locale/uk/SeaBlock.cfg | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg index ff7fa102..b93b8b10 100644 --- a/SeaBlock/locale/en/SeaBlock.cfg +++ b/SeaBlock/locale/en/SeaBlock.cfg @@ -28,10 +28,10 @@ sb-catalyst-metal-purple=Purple metal catalyst [entity-name] home=Home sct-lab-lab2=Exoplanetary Studies Lab -angel-silo-coal=Charcoal silo +angels-silo-coal=Charcoal silo [entity-description] -angel-silo-coal=Silo with a "Charcoal" aesthetic. +angels-silo-coal=Silo with a "Charcoal" aesthetic. [technology-name] sb-startup1=Crush stiratite diff --git a/SeaBlock/locale/ja/SeaBlock.cfg b/SeaBlock/locale/ja/SeaBlock.cfg index d9cb1a76..c9e58ef2 100644 --- a/SeaBlock/locale/ja/SeaBlock.cfg +++ b/SeaBlock/locale/ja/SeaBlock.cfg @@ -23,10 +23,10 @@ sct-lab-lab2=系外惑星研究所 [entity-name] home=ホーム sct-lab-lab2=系外惑星研究所 -angel-silo-coal=木炭サイロ +angels-silo-coal=木炭サイロ [entity-description] -angel-silo-coal=「木炭」の美的要素を持つサイロ。 +angels-silo-coal=「木炭」の美的要素を持つサイロ。 [technology-name] sb-startup1=破砕スチラタイト diff --git a/SeaBlock/locale/ru/SeaBlock.cfg b/SeaBlock/locale/ru/SeaBlock.cfg index 9e331076..b2aa9f4b 100644 --- a/SeaBlock/locale/ru/SeaBlock.cfg +++ b/SeaBlock/locale/ru/SeaBlock.cfg @@ -22,10 +22,10 @@ sct-lab-lab2=Лаборатория экзопланетарных исслед [entity-name] sct-lab-lab2=Лаборатория экзопланетарных исследований -angel-silo-coal=Древесноугольный элеватор +angels-silo-coal=Древесноугольный элеватор [entity-description] -angel-silo-coal=Элеватор с эстетикой древесного угля. +angels-silo-coal=Элеватор с эстетикой древесного угля. [technology-name] sb-startup1=Измельчить ститарит diff --git a/SeaBlock/locale/uk/SeaBlock.cfg b/SeaBlock/locale/uk/SeaBlock.cfg index 24bb6c3f..9d588e77 100644 --- a/SeaBlock/locale/uk/SeaBlock.cfg +++ b/SeaBlock/locale/uk/SeaBlock.cfg @@ -24,10 +24,10 @@ sb-catalyst-metal-purple=Каталізатор з фіолетового мет [entity-name] home=Головна sct-lab-lab2=Лабораторія екзопланетарних досліджень -angel-silo-coal=Вугільне сховище +angels-silo-coal=Вугільне сховище [entity-description] -angel-silo-coal=Сховище з "вугільною" естетикою. +angels-silo-coal=Сховище з "вугільною" естетикою. [technology-name] sb-startup1=Подрібнити стиратит From 0beff84650e19efafbd878907262ed4359cc5d7f Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:40:53 +0100 Subject: [PATCH 107/117] Removed unecessary angels-stone-crushed modification --- SeaBlock/data-final-fixes/recipe.lua | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index 98077b3b..dc1a13c4 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -58,19 +58,6 @@ bobmods.lib.recipe.set_ingredients("firearm-magazine", {{ type = "item", name = -- angelspetrochem changes petroleum-gas to angels-gas-methane bobmods.lib.recipe.remove_ingredient("sct-t3-flash-fuel", "angels-gas-methane") -data.raw.recipe["angels-stone-crushed"].icons = angelsmods.functions.add_icon_layer( - { - { - icon = "__angelsrefininggraphics__/graphics/icons/ore-crusher.png", - icon_size = 64, - scale = 0.5 - } - }, - angelsmods.functions.get_object_icons("stone"), - { 10, 10 }, - 0.5 -) - -- bobmods switched plastic-bar for steel-plate in 2.0 if settings.startup["bobmods-plates-batteryupdate"].value == true then bobmods.lib.recipe.replace_ingredient("battery", "steel-plate", "plastic-bar") From 48a029ac6092e3b74367dae2ba17dab7ae09498a Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:43:56 +0100 Subject: [PATCH 108/117] Added comments for recipe changes --- SeaBlock/data-final-fixes/recipe.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index dc1a13c4..d6433143 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -76,6 +76,7 @@ if (mods["blueprint-shotgun"]) then bobmods.lib.tech.add_recipe_unlock("military", "shotgun-shell") end +-- bob-alien-x-alloy is hidden by Sea Block bobmods.lib.recipe.replace_ingredient("bob-fission-reactor-equipment-4", "bob-alien-blue-alloy", "bob-cobalt-steel-alloy") bobmods.lib.recipe.replace_ingredient("bob-fission-reactor-equipment-4", "bob-alien-fire", "angels-liquid-naphtha") @@ -85,5 +86,6 @@ bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", "bob-alien-orange-alloy", "bob-gold-plate") bobmods.lib.recipe.replace_ingredient("bob-personal-laser-defense-equipment-6", "bob-alien-poison", "angels-liquid-nitric-acid") +-- No longer needed for rockets bobmods.lib.recipe.hide("bob-rocket-engine") bobmods.lib.item.hide("bob-rocket-engine") \ No newline at end of file From feb4488e61850602501bb8becfc67e6c12e3fe96 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 21:09:48 +0100 Subject: [PATCH 109/117] Added several comments and moved things from misc to slag-processing --- SeaBlock/data-final-fixes/recipe.lua | 1 + SeaBlock/data-final-fixes/tech-tree.lua | 15 +++++------- SeaBlock/data-updates/landfill.lua | 1 + SeaBlock/data-updates/misc.lua | 30 ----------------------- SeaBlock/data-updates/slag-processing.lua | 26 ++++++++++++++++++++ 5 files changed, 34 insertions(+), 39 deletions(-) diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua index d6433143..11ca2a73 100644 --- a/SeaBlock/data-final-fixes/recipe.lua +++ b/SeaBlock/data-final-fixes/recipe.lua @@ -64,6 +64,7 @@ if settings.startup["bobmods-plates-batteryupdate"].value == true then else bobmods.lib.recipe.replace_ingredient("battery", "iron-plate", "plastic-bar") end +bobmods.lib.tech.add_prerequisite("battery", "plastics") if (mods["blueprint-shotgun"]) then seablock.lib.unhide_recipe("shotgun") diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 21bb9cf8..efae2a3c 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -18,7 +18,7 @@ bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-bio-wood-process bobmods.lib.tech.add_prerequisite("circuit-network", "angels-bio-paper-1") bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network") --- alien research is disabled with SeaBlock +-- Alien research is disabled in Sea Block bobmods.lib.tech.remove_prerequisite("bob-exoskeleton-equipment-3", "bob-alien-blue-research") bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-3", "bob-alien-research") @@ -64,20 +64,17 @@ bobmods.lib.tech.remove_prerequisite("bob-chemical-plant", "electronics") -- repair-pack is now unlocked with military bobmods.lib.tech.remove_prerequisite("bob-repair-pack-2", "repair-pack") +-- Empty technology +bobmods.lib.tech.hide("bob-chemical-plant") + bobmods.lib.tech.remove_prerequisite("lubricant", "bob-chemical-plant") bobmods.lib.tech.remove_prerequisite("plastics", "bob-chemical-plant") -bobmods.lib.tech.hide("bob-chemical-plant") - --- uranium mining only adds fluid inputs to mining drills which is never used +-- uranium-mining only adds fluid inputs to mining drills which is never used bobmods.lib.tech.hide("uranium-mining") bobmods.lib.tech.remove_prerequisite("uranium-processing", "uranium-mining") --- science pack prerequisites -bobmods.lib.tech.add_prerequisite("bob-battery-equipment-4", "production-science-pack") -bobmods.lib.tech.add_prerequisite("bob-battery-equipment-6", "utility-science-pack") - --- Not needed in SB +-- Not needed in Sea Block bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "bob-zinc-processing") bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "angels-stone-smelting-2") bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "angels-aluminium-smelting-1") diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua index 257a1030..80e2d57f 100644 --- a/SeaBlock/data-updates/landfill.lua +++ b/SeaBlock/data-updates/landfill.lua @@ -81,6 +81,7 @@ if mods["LandfillPainting"] then end end +-- Paste over sand-4 and -5 local tile_cond = data.raw.item["landfill"].place_as_tile.tile_condition table.insert(tile_cond, "sand-4") diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index 0053c8e1..ae2823e7 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -160,8 +160,6 @@ seablock.lib.substingredient("angels-ore-pure-mix2-processing", "angels-ore3-pur -- Unhide rocket part to make it easier to view recipes if data.raw.recipe["rocket-part"] then - -- angelsmods.functions.remove_flag("rocket-part", "hidden") - -- angelsmods.functions.unhide("rocket-part") local r = data.raw.recipe["rocket-part"] r.hidden = false @@ -242,32 +240,4 @@ bobmods.lib.recipe.set_ingredient("angels-solid-cement-2", { type = "item", name bobmods.lib.recipe.set_result("angels-solid-cement-2", { type = "item", name = "angels-solid-cement", amount = 4 }) bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16) -local OV = angelsmods.functions.OV -OV.patch_recipes({ - { - name = "bob-tin-plate", - ingredients = { - { name = "bob-tin-ore", type = "item", amount = "+3" }, - }, - results = { - { name = "bob-tin-plate", type = "item", amount = "+2" }, - }, - localised_name = { "item-name.bob-tin-plate" }, - subgroup = "angels-tin-casting" - }, - { - name = "bob-lead-plate", - ingredients = { - { name = "bob-lead-ore", type = "item", amount = "+3" }, - }, - results = { - { name = "bob-lead-plate", type = "item", amount = "+2" }, - }, - localised_name = { "item-name.bob-lead-plate" }, - subgroup = "angels-lead-casting" - } -}) - -bobmods.lib.tech.add_prerequisite("battery", "plastics") - bobmods.lib.item.hide("bob-alien-acid") \ No newline at end of file diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 04691945..91721c21 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -150,3 +150,29 @@ table.insert(data.raw["assembling-machine"]["angels-electrolyser-4"].crafting_ca bobmods.lib.recipe.set_category("angels-ore8-anode-sludge", "sb-petrochem-electrolyser-4") bobmods.lib.recipe.set_category("angels-ore9-anode-sludge", "sb-petrochem-electrolyser-4") bobmods.lib.tech.add_prerequisite("angels-ore-electro-whinning-cell", "angels-advanced-chemistry-3") + +local OV = angelsmods.functions.OV +OV.patch_recipes({ + { + name = "bob-tin-plate", + ingredients = { + { name = "bob-tin-ore", type = "item", amount = "+3" }, + }, + results = { + { name = "bob-tin-plate", type = "item", amount = "+2" }, + }, + localised_name = { "item-name.bob-tin-plate" }, + subgroup = "angels-tin-casting" + }, + { + name = "bob-lead-plate", + ingredients = { + { name = "bob-lead-ore", type = "item", amount = "+3" }, + }, + results = { + { name = "bob-lead-plate", type = "item", amount = "+2" }, + }, + localised_name = { "item-name.bob-lead-plate" }, + subgroup = "angels-lead-casting" + } +}) \ No newline at end of file From 549ef21307adaa70641b6d277464ee10b4829181 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 21:17:09 +0100 Subject: [PATCH 110/117] Moved insert_effect function to seablock.lib --- SeaBlock/data-updates/slag-processing.lua | 20 +++----------------- SeaBlock/lib.lua | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 91721c21..8a6ab85b 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -26,20 +26,6 @@ for i = 1, 6 do angelsmods.functions.allow_productivity("angels-slag-processing-" .. i) end -local function insert_effect(recipe_name, tech_name, index) - local tech = data.raw.technology[tech_name] - - if not tech then - return - end - - if index then - table.insert(tech.effects, index, { type = "unlock-recipe", recipe = recipe_name }) - else - table.insert(tech.effects, { type = "unlock-recipe", recipe = recipe_name }) - end -end - -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1, -- Angels ores 5, 6 (Rubyte, Bobmonium) available from Slag processing 1 -- Angels ores 2, 4 (Jivolite, Crotinnium) available from Advanced mechanical refining @@ -47,12 +33,12 @@ bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false) bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false) seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3) local slag1start = seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1") -insert_effect("angels-slag-processing-5", "angels-slag-processing-1", slag1start+3) -insert_effect("angels-slag-processing-6", "angels-slag-processing-1", slag1start+4) +seablock.lib.insert_effect("angels-slag-processing-5", "angels-slag-processing-1", slag1start+3) +seablock.lib.insert_effect("angels-slag-processing-6", "angels-slag-processing-1", slag1start+4) local slag2start = 0 seablock.lib.moveeffect("angels-slag-processing-2", "angels-slag-processing-1", "angels-ore-advanced-crushing", slag2start + 1) -insert_effect("angels-slag-processing-4", "angels-ore-advanced-crushing", slag2start+2) +seablock.lib.insert_effect("angels-slag-processing-4", "angels-ore-advanced-crushing", slag2start+2) seablock.lib.moveeffect("angels-ore2-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 3) seablock.lib.moveeffect("angels-ore4-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 4) diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 51b84efe..efe14ab7 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -70,6 +70,20 @@ function seablock.lib.findeffectidx(effects, name) end end +function seablock.lib.insert_effect(recipe_name, tech_name, index) + local tech = data.raw.technology[tech_name] + + if not tech then + return + end + + if index then + table.insert(tech.effects, index, { type = "unlock-recipe", recipe = recipe_name }) + else + table.insert(tech.effects, { type = "unlock-recipe", recipe = recipe_name }) + end +end + function seablock.lib.moveeffect(name, fromtech, totech, insertindex) local effect = seablock.lib.takeeffect(fromtech, name) if not effect then From dce3fe7f1fc8137184d9b9b174f2c44c94a90d50 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 21:29:51 +0100 Subject: [PATCH 111/117] Adding comments to lib functions --- SeaBlock/data-updates/slag-processing.lua | 1 + SeaBlock/lib.lua | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 8a6ab85b..b364d83f 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -137,6 +137,7 @@ bobmods.lib.recipe.set_category("angels-ore8-anode-sludge", "sb-petrochem-electr bobmods.lib.recipe.set_category("angels-ore9-anode-sludge", "sb-petrochem-electrolyser-4") bobmods.lib.tech.add_prerequisite("angels-ore-electro-whinning-cell", "angels-advanced-chemistry-3") +-- This was changed by Angelsmods in 2.0 local OV = angelsmods.functions.OV OV.patch_recipes({ { diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index efe14ab7..24248eb6 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -70,6 +70,10 @@ function seablock.lib.findeffectidx(effects, name) end end +---Inserts recipe into tech at index +---@param recipe_name string +---@param tech_name string +---@param index integer function seablock.lib.insert_effect(recipe_name, tech_name, index) local tech = data.raw.technology[tech_name] @@ -600,7 +604,10 @@ function seablock.reskins.clear_icon_specification(name, type) end end --- Adds a crafting category to an entity +---Adds a crafting category to an entity +---@param type string assembling-machine, ... +---@param entity_name string +---@param category string function seablock.lib.add_category(type, entity_name, category) if (not data.raw["recipe-category"][category]) then log("Warning: seablock.lib.add_category - Category \""..category.."\" does not exist") @@ -625,6 +632,8 @@ end --- Adds a crafting category to a recipe. --- If no category is set before it will be set to category_name. --- Otherwise it will be safely added to additional_categories. +---@param recipe_name string +---@param category_name string function seablock.lib.add_recipe_category(recipe_name, category_name) local recipe = data.raw.recipe[recipe_name] From 6abcbb036de610c9458e7bdabe63ec8d2dde566e Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Tue, 18 Nov 2025 21:33:07 +0100 Subject: [PATCH 112/117] Removed mapgen.md file --- SeaBlock/mapgen.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 SeaBlock/mapgen.md diff --git a/SeaBlock/mapgen.md b/SeaBlock/mapgen.md deleted file mode 100644 index 4358fb69..00000000 --- a/SeaBlock/mapgen.md +++ /dev/null @@ -1,11 +0,0 @@ -TODO - REMOVE BEFORE RELEASE -# Mapgen Explanation -## Terrain -Islands and water are based on terrain elevation. Elevation itself uses a basis_noise as a baseline. A scaled sigmoid which is based on the distance is added to make the islands bigger the further you get out while still limiting the maximum size of each island.\ -Beaches only contain sand-4 while the inner landmass only contains sand-5. - -## Trees and Gardens -Trees and gardens can only spawn on sand-5 which ensures they only spawn in the middle of an island. A multioctave noise with "large islands" is then overlayed and ensures that the same type spawns in roughly the same area (desert only near desert, temperate only near temperate etc.). A basis_noise is used so trees don't appear too clustered in one spot. A shited hyperbolic rational is added to increase the chance of a tree/garden island within the spawn radius. This is to help the player obtain trees/gardens without having to fight enemies first. - -## Enemies -The enemy autoplace function is a translation of the 1.1 autoplace function and mixes elevation and probabilities with random noise to get a dense yet random worm placement. \ No newline at end of file From 1cb1ee14cfb63d9d55c3349487f98a652fe063a3 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Fri, 21 Nov 2025 12:42:14 +0100 Subject: [PATCH 113/117] Fixed tech prerequisite for bobsgreenhouse --- SeaBlock/data-final-fixes/tech-tree.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index efae2a3c..a95dd67d 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -85,4 +85,7 @@ bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-coa seablock.lib.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-bricks", 3) bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-3", "angels-stone-smelting-1") -bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-bio-processor") \ No newline at end of file +bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-bio-processor") + +-- Bobs Greenhouse +bobmods.lib.tech.replace_prerequisite("bob-greenhouse", "automation-science-pack", "sct-automation-science-pack") \ No newline at end of file From 19176413a61c47d6ef99c8fa22769a094d4b43ba Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:01:24 +0100 Subject: [PATCH 114/117] Merge updates --- SeaBlock/data-final-fixes/SpaceMod.lua | 18 ++++ .../data-final-fixes/unobtainable_items.lua | 2 +- SeaBlock/data-updates/startup.lua | 2 +- SeaBlock/data-updates/thermal-extractor.lua | 91 +++++++++---------- SeaBlock/lib.lua | 1 - SeaBlock/migrations/SeaBlock_0.6.0.lua | 2 + 6 files changed, 63 insertions(+), 53 deletions(-) diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua index c624ee37..d6c733b0 100644 --- a/SeaBlock/data-final-fixes/SpaceMod.lua +++ b/SeaBlock/data-final-fixes/SpaceMod.lua @@ -38,6 +38,24 @@ if settings.startup["SpaceX-ignore-tech-multiplier"] then end end +local recipes = { + "low-density-structure", + "rocket-control-unit", + "assembly-robot", + "satellite", + "drydock-assembly", + "fusion-reactor", + "hull-component", + "protection-field", + "space-thruster", + "fuel-cell", + "habitation", + "life-support", + "command", + "astrometrics", + "ftl-drive", +} + local techs = { "space-assembly", "space-construction", diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua index f51007a2..f1cadc10 100644 --- a/SeaBlock/data-final-fixes/unobtainable_items.lua +++ b/SeaBlock/data-final-fixes/unobtainable_items.lua @@ -22,7 +22,7 @@ local function updateline(line) end for _, recipe in pairs(data.raw.recipe) do - for _, v in pairs(recipe.ingredients) do + for _, v in pairs(recipe.ingredients or {}) do updateline(v) end diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index bc325181..a52acc6b 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -133,7 +133,7 @@ local function consumes_startup_item(recipe) ["copper-cable"] = true, ["stone-furnace"] = true, } - for k, v in pairs(recipe.ingredients) do + for k, v in pairs(recipe.ingredients or {}) do if ironnames[v.name] then found = true break diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua index c42c2e64..63296731 100644 --- a/SeaBlock/data-updates/thermal-extractor.lua +++ b/SeaBlock/data-updates/thermal-extractor.lua @@ -89,10 +89,8 @@ extractor.crafting_categories = { "sb-thermal-extractor" } extractor.fixed_recipe = "sb-thermal-extractor-water" bobmods.lib.tech.add_recipe_unlock("angels-thermal-water-extraction-2", "sb-thermal-extractor-water") move_item("angels-thermal-extractor", "angels-water-treatment-building", "f[thermal-extractor]-b[extractor]", "item") -bobmods.lib.recipe.add_ingredient( - "angels-thermal-extractor", - { type = "item", name = "angels-thermal-bore", amount = 1 } -) +bobmods.lib.recipe.add_ingredient("angels-thermal-extractor", { type = "item", name = "angels-thermal-bore", amount = 1 }) +extractor.vector_to_place_result = nil -- remove the yellow arrow of the mining drill local bore = data.raw["mining-drill"]["angels-thermal-bore"] data.raw["mining-drill"]["angels-thermal-bore"] = nil @@ -104,56 +102,49 @@ bore.fluid_boxes = { { production_type = "output", base_area = 1, - base_level = 1, - pipe_covers = pipecoverspictures(), - pipe_connections = { - { - type = "output", - position = { -5, -3 }, - }, - }, + volume = 500, + pipe_covers = bore.output_fluid_box.pipe_covers, + pipe_connections = bore.output_fluid_box.pipe_connections }, } -bore.animation = { - north = makeextractorlayers(false, false), - east = makeextractorlayers(true, true), - south = makeextractorlayers(false, false), - west = makeextractorlayers(true, true), -} -bore.crafting_categories = { "sb-thermal-bore" } -bore.fixed_recipe = "sb-thermal-bore-water" +bore.vector_to_place_result = nil -local function makesheet(sheet, count, d) - local r = table.deepcopy(sheet) - r.stripes = makestripes(r.filename, count) - r.frame_count = count - r.filename = nil - r.x = r.width * d - if r.hr_version then - r.hr_version = makesheet(r.hr_version, count, d) - end - return r -end -local function makeborelayers(d) - return { +-- This is needed for the animation below +bore.base_picture.sheet.line_length = 1 +bore.base_picture.sheet.repeat_count = 16 + +-- Edit animation to include output pipe facing north and south +local working_animation = table.deepcopy(bore.graphics_set.animation.north) + +--- This animation is a translation of the mining_drill but for an assembling_machine +--- This is done because an assembling_machine has no base_picture so the northern and southern pipe extentions have to be added via animation +bore.graphics_set.animation = { + north = { layers = { - makesheet(bore.base_picture.sheets[1], bore.animations.north.layers[1].frame_count, d), - makesheet(bore.base_picture.sheets[2], bore.animations.north.layers[1].frame_count, d), - bore.animations.north.layers[1], - bore.animations.north.layers[2], - }, - } -end -bore.animation = { - north = makeborelayers(0), - east = makeborelayers(1), - south = makeborelayers(2), - west = makeborelayers(3), + table.deepcopy(bore.base_picture.sheet), + working_animation + } + }, + east = working_animation, + south = { + layers = { + table.deepcopy(bore.base_picture.sheet), + working_animation + } + }, + west = working_animation, } -bore.crafting_categories = { "thermal-bore" } -bore.fixed_recipe = "thermal-bore-water" -bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction", "thermal-bore-water") -move_item("thermal-bore", "water-treatment-building", "f[thermal-extractor]-a[bore]", "item") + +-- Shift animation to make other pipe visible +bore.graphics_set.animation.south.layers[1].x = 576 + +-- Reset animation speed for directions without additional layers +bore.graphics_set.animation.east.animation_speed = 1 +bore.graphics_set.animation.west.animation_speed = 1 + +bore.crafting_categories = { "sb-thermal-bore" } +bore.fixed_recipe = "sb-thermal-bore-water" +bobmods.lib.tech.add_recipe_unlock("angels-thermal-water-extraction", "sb-thermal-bore-water") move_item("angels-thermal-bore", "angels-water-treatment-building", "f[thermal-extractor]-a[bore]", "item") -- Fish Pressing requires thermal water so add a prerequisite @@ -162,4 +153,4 @@ if data.raw.technology["angels-bio-pressing-fish"] then else bobmods.lib.tech.add_prerequisite("angels-bio-pressing-fish-1", "angels-thermal-water-extraction") end -bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "angels-bio-processing-brown") +bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "angels-bio-processing-brown") \ No newline at end of file diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 124fc69b..0d8458bd 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -209,7 +209,6 @@ function seablock.lib.substresult(name, from, to, count) end end end - seablock.lib.recipeforeach(name, from, dosubst, "results") else log("Warning : seablock.lib.substresult - can't find recipe : " .. name) log(debug.traceback()) diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.lua b/SeaBlock/migrations/SeaBlock_0.6.0.lua index 3fe5ccbc..0d0a134b 100644 --- a/SeaBlock/migrations/SeaBlock_0.6.0.lua +++ b/SeaBlock/migrations/SeaBlock_0.6.0.lua @@ -1,3 +1,5 @@ +local angelsmods = require("__angelsrefining__/prototypes/migration-functions") + for _, surface in pairs(game.surfaces) do for chunk in surface.get_chunks() do angelsmods.migration.replace_item(surface.find_entities(chunk.area), { From 2d4a67d4060d363eea1b8555ec2a89e026d76fe5 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:06:08 +0100 Subject: [PATCH 115/117] Changelog updates --- SeaBlock/changelog.txt | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt index 382417f7..ddf378bf 100644 --- a/SeaBlock/changelog.txt +++ b/SeaBlock/changelog.txt @@ -2,21 +2,31 @@ Version: 0.6.0 Date: ??.??.?? Changes: - - Factorio 2.0 update - - Removed normal/expensive recipes - - Updated map generation - - Added "angels-" prefix to all AngelsMods related prototypes - - Added "bob-" prefix to all BobsMods related prototypes - - Replaced crushed stone for regular stone - - Reimplemented (1.1) ore crystallization recipes (This got changed with angelsmods 2.0) - - Added extended beacon range to bob beacons (This got removed in bobmods 2.0) - - Changed beacon transmission efficiency to closer match 1.1 - - Added shotgun recipe when the mod "blueprint-shotgun" is loaded - - Removed techs: - - Uranium mining - - Changed several bobs and angels recipes back to their 1.1 version - - "battery" - - Adjusted volume of "wind-turbine-2" + - Basegame 2.0 changes + - Added/Modified library functions to include better warnings/new 2.0 code + - Removed all references of normal/expensive recipes + - Crafting category "electronics" is no longer craftable by hand (see Fulgora changes) and must thus be readded to handcrafting + - Updated the mapgen to implement the new 2.0 mapgen functions + - Added "tile_condition" to landfill (2.0) + - Replaced old research trigger with new 2.0 trigger tech + - Added incompatibility condition with "space-age" and "quality" for SeaBlockMetaPack + - BobsMods 2.0 changes + - Reimplemented "item-group": "bob-gems" since it is quite fitting in SB + - bobwarfare 2.0 now includes "coal" in "firearm-magazine" which is unobtainable so this change is reverted + - bobplates 2.0 uses "steel-plate"/"iron-plate" instead of "plastic-bar" in batteries, this change is reverted + - "bob-alien-x-alloy" is hidden in SB and must be removed from the equipment recipes + - "bob-rocket-engine" is no longer needed + - AngelsMods 2.0 changes + - The ore amount for tin and lead were changed in 2.0, this was reverted + - SpaceMod 2.0 changes + - None of the listed recipes took one of the listed upgrades or were already applied + - Because of the changes of bobmodules and circuitprocessing the tech prerequisites changed as well + - Miscellaneous 2.0 changes + - control.lua cleanup + - data-final-fixes.lua cleanup + - SCT 2.0 has replaced "automation-science-pack" with "sct-automation-science-pack" + - Added "shotgun" recipe if "blueprint-shotgun" is enabled + - Changed the volume of the "wind-turbine-2" as it is way too loud --------------------------------------------------------------------------------------------------- Version: 0.5.17 Date: ??.??.?? From 31e131fe8c7805dc59a344bb46dc8d5727f81ff0 Mon Sep 17 00:00:00 2001 From: Athena Faris <75452942+KompetenzAirbag@users.noreply.github.com> Date: Thu, 18 Dec 2025 18:14:09 +0100 Subject: [PATCH 116/117] Format and miscellaneous --- SeaBlock/control.lua | 30 ------------------------- SeaBlock/data-final-fixes/tech-tree.lua | 6 ++--- SeaBlock/data-updates/coal.lua | 2 -- SeaBlock/data-updates/military.lua | 23 ------------------- SeaBlock/data-updates/misc.lua | 4 +--- SeaBlock/data-updates/startup.lua | 1 - SeaBlock/data-updates/wood.lua | 8 ------- SeaBlock/data/tech-tree.lua | 2 -- SeaBlock/lib.lua | 30 ++++++++++--------------- SeaBlock/prototypes/recipe.lua | 1 + SeaBlockMetaPack/info.json | 1 + 11 files changed, 18 insertions(+), 90 deletions(-) diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua index 4eebde1d..4564038a 100644 --- a/SeaBlock/control.lua +++ b/SeaBlock/control.lua @@ -84,8 +84,6 @@ local function init() end end - - script.on_event(defines.events.on_player_joined_game, function(e) seablock.give_research(game.players[e.player_index].force) end) @@ -189,34 +187,6 @@ script.on_load(function() set_pvp() end) -if script.active_mods["Companion_Drones"] then - script.on_event(defines.events.on_player_created, function(e) - local s = game.surfaces["nauvis"] - if s then - local companions = s.find_entities_filtered({ name = "companion" }) - for _, companion in pairs(companions) do - local inventory = companion.get_main_inventory() - local i = companion.remove_item("coal") - -- Only do drone inventory cleanup if coal is found - -- Else players will get free wood pellets any time a new player joins - if i > 0 then - companion.insert("wood-pellets") - local grid = companion.grid - for _, item in pairs(grid.equipment) do - if (item.name == "companion-defense-equipment") or (item.name == "companion-shield-equipment") then - grid.take({ equipment = item }) - end - end - end - end - end - end) -end - -script.on_load(function() - set_pvp() -end) - script.on_event(defines.events.on_player_created, function(e) game.get_player(e.player_index).get_main_inventory().clear() if storage.starting_items and game.is_multiplayer() then diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua index 75be8800..a6f3266e 100644 --- a/SeaBlock/data-final-fixes/tech-tree.lua +++ b/SeaBlock/data-final-fixes/tech-tree.lua @@ -14,9 +14,9 @@ seablock.lib.hide_technology("bob-electrolysis-2") seablock.lib.hide_technology("bob-chemical-processing-1") seablock.lib.hide_technology("bob-chemical-processing-2") -bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-angels-bio-wood-processing-2") -bobmods.lib.tech.add_prerequisite("circuit-network", "angels-angels-bio-paper-1") -bobmods.lib.tech.remove_prerequisite("angels-angels-rubbers", "circuit-network") +bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-bio-wood-processing-2") +bobmods.lib.tech.add_prerequisite("circuit-network", "angels-bio-paper-1") +bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network") -- Alien research is disabled in Sea Block bobmods.lib.tech.remove_prerequisite("bob-exoskeleton-equipment-3", "bob-alien-blue-research") diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua index e88010af..64e10242 100644 --- a/SeaBlock/data-updates/coal.lua +++ b/SeaBlock/data-updates/coal.lua @@ -42,6 +42,4 @@ bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "angels-sodium-pro -- Buff the Carbon 2 recipe to make it a bit more worthwhile bobmods.lib.recipe.set_result("angels-coke-purification-2", { type = "item", name = "angels-solid-carbon", amount = 8 }) -data.raw.recipe["angels-filter-coal"].localised_name = { "item-name.angels-filter-charcoal" } - data.raw.recipe["angels-filter-coal"].localised_name = { "item-name.angels-filter-charcoal" } \ No newline at end of file diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua index d5be1143..4af968bd 100644 --- a/SeaBlock/data-updates/military.lua +++ b/SeaBlock/data-updates/military.lua @@ -481,32 +481,9 @@ for _, v in pairs(mil_ammo) do end end --- except = { --- ["follower-robot-count-1"] = true, --- ["follower-robot-count-2"] = true, --- ["follower-robot-count-3"] = true, --- ["follower-robot-count-4"] = true, --- ["follower-robot-count-5"] = true, --- ["follower-robot-count-6"] = true, --- ["follower-robot-count-7"] = true, --- ["energy-weapons-damage-7"] = true, --- ["physical-projectile-damage-7"] = true, --- ["refined-flammables-1"] = true, --- ["refined-flammables-2"] = true, --- ["refined-flammables-3"] = true, --- ["refined-flammables-4"] = true, --- ["refined-flammables-5"] = true, --- ["refined-flammables-6"] = true, --- ["refined-flammables-7"] = true, --- ["stronger-explosives-7"] = true, --- ["laser-shooting-speed-7"] = true, --- } for _, v in pairs(mil_tech) do if data.raw.technology[v] then seablock.lib.hide_technology(v) - -- if not except[v] then - -- data.raw.technology[v].unit.ingredients = {} --remove - -- end end end diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua index e4f36f14..0159e58a 100644 --- a/SeaBlock/data-updates/misc.lua +++ b/SeaBlock/data-updates/misc.lua @@ -243,6 +243,4 @@ bobmods.lib.recipe.remove_ingredient("angels-solid-cement-2", "iron-ore") bobmods.lib.recipe.replace_ingredient("angels-solid-cement-2", "bob-quartz", "bob-silicon-powder") bobmods.lib.recipe.set_ingredient("angels-solid-cement-2", { type = "item", name = "angels-solid-lime", amount = 4 }) bobmods.lib.recipe.set_result("angels-solid-cement-2", { type = "item", name = "angels-solid-cement", amount = 4 }) -bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16) - -bobmods.lib.item.hide("bob-alien-acid") \ No newline at end of file +bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16) \ No newline at end of file diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua index a52acc6b..c0a7abce 100644 --- a/SeaBlock/data-updates/startup.lua +++ b/SeaBlock/data-updates/startup.lua @@ -142,7 +142,6 @@ local function consumes_startup_item(recipe) return found end - -- Disable recipes that shouldn't consume startup items for k, v in pairs(data.raw.recipe) do if (v.enabled == nil or v.enabled == true) and consumes_startup_item(v) and not v.hidden then diff --git a/SeaBlock/data-updates/wood.lua b/SeaBlock/data-updates/wood.lua index 0064ba80..83422fe0 100644 --- a/SeaBlock/data-updates/wood.lua +++ b/SeaBlock/data-updates/wood.lua @@ -2,14 +2,6 @@ seablock.lib.removeingredient("bob-basic-underground-belt", "wood") seablock.lib.removeingredient("bob-basic-splitter", "wood") --- Can always apply productivity modules to furnace recipes, so make it official --- for k, v in pairs(data.raw.module) do --- if v.effect and v.effect.productivity and v.limitation then --- table.insert(v.limitation, "sb-wood-bricks-charcoal") --- end --- end -angelsmods.functions.allow_productivity("sb-wood-bricks-charcoal") - bobmods.lib.recipe.enabled("wooden-chest", false) bobmods.lib.recipe.enabled("bob-wooden-board", false) bobmods.lib.recipe.enabled("angels-cellulose-fiber-raw-wood", false) diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua index b4b61a21..30e4a6e5 100644 --- a/SeaBlock/data/tech-tree.lua +++ b/SeaBlock/data/tech-tree.lua @@ -109,7 +109,6 @@ if data.raw.technology["bob-gem-processing-3"] then bobmods.lib.tech.add_prerequisite("efficiency-module-3", "bob-gem-processing-3") end - bobmods.lib.tech.remove_prerequisite("automation-science-pack", "electronics") seablock.lib.hide_technology("automation-science-pack") @@ -129,7 +128,6 @@ bobmods.lib.tech.remove_prerequisite("stone-wall", "automation-science-pack") bobmods.lib.tech.remove_prerequisite("radar", "automation-science-pack") bobmods.lib.tech.remove_prerequisite("automation", "automation-science-pack") - -- Change order for esthetics of the tech tree data.raw["technology"]["military"].order = "z-[military]" diff --git a/SeaBlock/lib.lua b/SeaBlock/lib.lua index 0d8458bd..4a0d8b76 100644 --- a/SeaBlock/lib.lua +++ b/SeaBlock/lib.lua @@ -287,21 +287,6 @@ function seablock.lib.copy_icon(to, from) end end -function seablock.lib.hide_item(item_name) - local item = data.raw.item[item_name] - if item then - item.hidden = true - else - item = data.raw.fluid[item_name] - if item then - item.hidden = true - else - log("Warning: seablock.lib.hide_item - can't find item or fluid : " .. item_name) - log(debug.traceback()) - end - end -end - function seablock.lib.hide(type_name, name) if not data.raw[type_name] then log("Warning: seablock.lib.hide - Unknown type: " .. type_name) @@ -315,12 +300,13 @@ function seablock.lib.hide(type_name, name) if type_name == "fluid" then item.hidden = true else - if not item.flags then - item.flags = {} - end item.hidden = true if type_name == "item" then + if not item.flags then + item.flags = {} + end + table.insert(item.flags, "hide-from-bonus-gui") end @@ -330,6 +316,14 @@ function seablock.lib.hide(type_name, name) end end +function seablock.lib.hide_item(item_name) + if data.raw.item[item_name] then + seablock.lib.hide("item", item_name) + else + seablock.lib.hide("fluid", item_name) + end +end + function seablock.lib.remove_effect(technology_name, effect_type, effect_key, effect_value) local tech = data.raw.technology[technology_name] if not tech then diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua index 964a44c3..131ba475 100644 --- a/SeaBlock/prototypes/recipe.lua +++ b/SeaBlock/prototypes/recipe.lua @@ -4,6 +4,7 @@ data:extend({ name = "sb-wood-bricks-charcoal", localised_name = { "item-name.angels-wood-charcoal" }, category = "smelting", + allow_productivity = true, enabled = false, energy_required = 3.5, ingredients = { { type = "item", name = "angels-wood-bricks", amount = 1 } }, diff --git a/SeaBlockMetaPack/info.json b/SeaBlockMetaPack/info.json index 0761453f..ec4e74d9 100644 --- a/SeaBlockMetaPack/info.json +++ b/SeaBlockMetaPack/info.json @@ -14,6 +14,7 @@ "angelspetrochem", "angelsrefining", "angelssmelting", + "reskins-angels", "reskins-bobs", "reskins-compatibility", "reskins-library", From 34abbe90531ac756c8457f169a7dda997e73c06c Mon Sep 17 00:00:00 2001 From: KompetenzAirbag Date: Tue, 23 Dec 2025 12:05:03 +0100 Subject: [PATCH 117/117] Fixed breaking changes from AngelsMods --- SeaBlock/data-updates/slag-processing.lua | 4 ++-- SeaBlock/prototypes/technology.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua index 533ebff1..2623803b 100644 --- a/SeaBlock/data-updates/slag-processing.lua +++ b/SeaBlock/data-updates/slag-processing.lua @@ -18,8 +18,8 @@ end -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1, -- Angels ores 5, 6 (Rubyte, Bobmonium) available from Slag processing 1 -- Angels ores 2, 4 (Jivolite, Crotinnium) available from Advanced mechanical refining -bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false) -bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false) +bobmods.lib.recipe.enabled("iron-plate", false) +bobmods.lib.recipe.enabled("copper-plate", false) seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3) local slag1start = seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1") diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua index 0b57b29d..d5e80a55 100644 --- a/SeaBlock/prototypes/technology.lua +++ b/SeaBlock/prototypes/technology.lua @@ -5,8 +5,8 @@ data:extend({ icon = "__SeaBlock__/graphics/technology/ore.png", icon_size = 128, effects = { - { type = "unlock-recipe", recipe = "angels-ore1-crushed-smelting" }, - { type = "unlock-recipe", recipe = "angels-ore3-crushed-smelting" }, + { type = "unlock-recipe", recipe = "iron-plate" }, + { type = "unlock-recipe", recipe = "copper-plate" }, { type = "unlock-recipe", recipe = "copper-cable" }, }, research_trigger = {type = "craft-item", item = "angels-ore3-crushed"}