SeaBlock and SeaBlockPack 2.0

SeaBlock/changelog.txt

@@ -1,4 +1,22 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.0
+Date: ??.??.??
+  Changes:
+    - Factorio 2.0 update
+      - Removed normal/expensive recipes
+      - Updated map generation
+    - Renamed Angel's and Bob's items
+    - 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: ??.??.??
   Changes:

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
@@ -22,8 +22,8 @@ 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 })
-    for item, quantity in pairs(global.starting_items) do
+    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 })
       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 = {
-    ["angels-ore3-crushed"] = { "sb-startup1", "bio-wood-processing" },
-    ["basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" },
+  storage.unlocks = {
+    ["angels-ore3-crushed"] = { "sb-startup1", "angels-bio-wood-processing" },
+    ["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
@@ -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)
@@ -130,7 +132,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 +155,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
@@ -182,17 +184,6 @@ script.on_load(function()
   set_pvp()
 end)
 
-script.on_event(defines.events.on_player_created, function(e)
-  if global.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
-      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,9 +213,10 @@ script.on_load(function()
 end)
 
 script.on_event(defines.events.on_player_created, function(e)
-  if global.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
+  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
       if quantity > 0 then
         inv.insert({ name = item, count = quantity })
       end

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 = {
@@ -17,26 +17,76 @@ 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["basic-circuit-board"] then
-  seablock.lib.copy_icon(data.raw.tool["sb-basic-circuit-board-tool"], data.raw.item["basic-circuit-board"])
-end
-
 require("data-final-fixes/logistics")
 require("data-final-fixes/icons")
 require("data-final-fixes/recipe")
 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
-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")
-  end
+  v.crafting_categories = v.crafting_categories or {}
+
+  table.insert(v.crafting_categories, "sb-crafting-handonly")
+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",
+  "angels-wire-gold",
+  "angels-wire-platinum",
+  "angels-wire-silver",
+  "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
 
-bobmods.lib.tech.prerequisite_cleanup()
+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_recipe_category(name, "crafting")
+end
+
+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

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,53 +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.
-  ["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
-}
-
-local function iterateingredients(recipe, func)
-  if recipe.normal then
-    func(recipe.normal.ingredients)
-    func(recipe.expensive.ingredients)
-  else
-    func(recipe.ingredients)
-  end
-end
-
-local function doupgrade(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]]
-    if upgrade and (data.raw.item[upgrade] or data.raw.module[upgrade]) then
-      item[nameidx] = upgrade
-    end
-    if upgrade == "bob-construction-robot-5" then
-      item[amountidx] = 1
-    elseif upgrade == "fusion-reactor-equipment-4" then
-      item[amountidx] = item[amountidx] / 2
-    end
-  end
-end
-
-for _, recipe in pairs(recipes) do
-  if data.raw.recipe[recipe] then
-    iterateingredients(data.raw.recipe[recipe], doupgrade)
-  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
@@ -133,7 +68,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")

SeaBlock/data-final-fixes/entities.lua

@@ -0,0 +1,19 @@
+-- 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")
+
+  seablock.lib.add_category("assembling-machine", "assembling-machine-2", "electronics")
+  seablock.lib.add_category("assembling-machine", "assembling-machine-2", "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")
+
+  seablock.lib.add_category("assembling-machine", "bob-assembling-machine-4", "electronics")
+  seablock.lib.add_category("assembling-machine", "bob-assembling-machine-4", "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")
+
+  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

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")