2.0 logic changes

SeaBlock/changelog.txt

@@ -2,9 +2,31 @@
 Version: 0.6.0
 Date: ??.??.??
   Changes:
-    - Factorio 2.0 update
-    - Added "angels-" prefix to all AngelsMods related prototypes
-    - Added "bob-" prefix to all BobsMods related prototypes
+    - 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: ??.??.??

SeaBlock/control.lua

@@ -84,6 +84,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)
@@ -187,17 +189,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"]
@@ -227,6 +218,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()
   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

SeaBlock/data-final-fixes.lua

@@ -17,18 +17,15 @@ 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["angels-solid-paper"].allow_decomposition = true
@@ -38,3 +35,58 @@ for _, v in pairs(data.raw.character) do
     table.insert(v.crafting_categories, "sb-crafting-handonly")
   end
 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
+
+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/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/logistics.lua

@@ -31,6 +31,9 @@ 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

SeaBlock/data-final-fixes/mapgen.lua

@@ -1,48 +1,99 @@
 -- No resource placement
-for k, v in pairs(data.raw.resource) do
-  v.autoplace = nil
+for k, _ in pairs(data.raw.resource) do
+  data.raw.resource[k].autoplace = nil
+end
+
+data.raw["planet"]["nauvis"].map_gen_settings.autoplace_settings = {
+  tile = {
+    settings = {
+      deepwater = {},
+      water = {},
+      ["sand-4"] = {},
+      ["sand-5"] = {},
+    }
+  },
+  entity = {
+    settings = {
+      ["angels-desert-garden"] = {},
+      ["angels-temperate-garden"] = {},
+      ["angels-swamp-garden"] = {},
+
+      ["angels-desert-tree"] = {},
+      ["angels-temperate-tree"] = {},
+      ["angels-swamp-tree"] = {},
+
+      ["angels-puffer-nest"] = {},
+      ["small-worm-turret"] = {},
+      ["medium-worm-turret"] = {},
+      ["big-worm-turret"] = {},
+      ["behemoth-worm-turret"] = {},
+
+      ["angels-alien-fish-1"] = {},
+      ["angels-alien-fish-2"] = {},
+      ["angels-alien-fish-3"] = {},
+
+      ["fish"] = {}
+    }
+  }
+}
+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
+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
 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"
-    and k ~= "puffer-nest"
+    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 ~= "angels-puffer-nest"
   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
+for _, v in pairs(data.raw["simple-entity"]) do
   v.autoplace = nil
   seablock.lib.add_flag("simple-entity", v.name, "not-deconstructable")
 end
 
+for _, v in pairs(data.raw["optimized-decorative"]) do
+  v.autoplace = nil
+  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
 
 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
-    controls[k] = nil
+    data.raw["autoplace-control"][k] = nil
   end
 end
 

SeaBlock/data-final-fixes/recipe.lua

@@ -38,3 +38,42 @@ 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
+
+-- angelspetrochem changes petroleum-gas to angels-gas-methane
+bobmods.lib.recipe.remove_ingredient("sct-t3-flash-fuel", "angels-gas-methane")
+
+-- 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
+  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")
+  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
+
+-- 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")
+
+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")
+
+-- No longer needed for rockets
+bobmods.lib.recipe.hide("bob-rocket-engine")
+bobmods.lib.item.hide("bob-rocket-engine")