From 3e48a550325e82345b04c2b8e54ce90a85104497 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sat, 6 Jan 2024 20:26:50 -0800 Subject: [PATCH] Fix for multiplayer related to new SE integration files (#161) * Move conditional on require function to inside file * Move conditional on require function to inside file * Move conditional on require function to inside file * Move conditional on require function to inside file * Move conditional on require function to inside file * Move conditional on require function to inside file * Move conditional on require function to inside file * Update se-updates.lua * Move conditional on require function to inside file * Move conditional on require function to inside file --- bobassembly/data-updates.lua | 5 ++--- bobassembly/prototypes/se-updates.lua | 4 ++++ bobclasses/data-updates.lua | 4 +--- bobclasses/prototypes/se-updates.lua | 4 ++++ bobequipment/data-updates.lua | 4 +--- bobequipment/prototypes/se-updates.lua | 4 ++++ boblogistics/data-updates.lua | 4 +--- boblogistics/prototypes/se-updates.lua | 4 ++++ bobmining/data-updates.lua | 4 +--- bobmining/prototypes/se-updates.lua | 4 ++++ 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/bobassembly/data-updates.lua b/bobassembly/data-updates.lua index c8b2bf43..c1f201ec 100644 --- a/bobassembly/data-updates.lua +++ b/bobassembly/data-updates.lua @@ -8,9 +8,8 @@ require("prototypes.chemical-mixing-furnace-updates") require("prototypes.distillery-updates") require("prototypes.fluid-furnace-updates") require("prototypes.centrifuge-updates") -if mods["space-exploration"] then - require("prototypes.se-updates") -end + +require("prototypes.se-updates") data.raw.fluid["crude-oil"].fuel_value = "1.9MJ" data.raw.fluid["crude-oil"].emissions_multiplier = 10 diff --git a/bobassembly/prototypes/se-updates.lua b/bobassembly/prototypes/se-updates.lua index 1d8c91b2..3770cda3 100644 --- a/bobassembly/prototypes/se-updates.lua +++ b/bobassembly/prototypes/se-updates.lua @@ -1,3 +1,5 @@ +if mods["space-exploration"] then + --Assembling machines if data.raw.item["assembling-machine-6"] then data.raw.recipe["assembling-machine-4"].normal = { @@ -899,3 +901,5 @@ if data.raw.item["electric-furnace-3"] then { "se-material-science-pack-4", 1 }, } end + +end diff --git a/bobclasses/data-updates.lua b/bobclasses/data-updates.lua index f572280a..24b8050f 100644 --- a/bobclasses/data-updates.lua +++ b/bobclasses/data-updates.lua @@ -23,6 +23,4 @@ end require("prototypes.recipe-updates") -if mods["space-exploration"] then - require("prototypes.se-updates") -end +require("prototypes.se-updates") diff --git a/bobclasses/prototypes/se-updates.lua b/bobclasses/prototypes/se-updates.lua index d0535c69..2388154b 100644 --- a/bobclasses/prototypes/se-updates.lua +++ b/bobclasses/prototypes/se-updates.lua @@ -1,3 +1,5 @@ +if mods["space-exploration"] then + --Body parts bobmods.lib.recipe.replace_ingredient("player-boots-2", "steel-plate", "se-beryllium-plate") bobmods.lib.recipe.replace_ingredient("player-head-2", "steel-plate", "se-beryllium-plate") @@ -189,3 +191,5 @@ data.raw.character["bob-character-fighter-2"].healing_per_tick = 0.02 data.raw.character["bob-character-miner"].healing_per_tick = 0.0005 data.raw.character["bob-character-miner-2"].healing_per_tick = 0.001 data.raw.character["bob-character-prospector"].healing_per_tick = 0.01 + +end diff --git a/bobequipment/data-updates.lua b/bobequipment/data-updates.lua index 5a61e4ed..6f010509 100644 --- a/bobequipment/data-updates.lua +++ b/bobequipment/data-updates.lua @@ -1,6 +1,4 @@ require("prototypes.recipe.updates") require("prototypes.technology.technology-updates") -if mods["space-exploration"] then - require("prototypes.se-updates") -end +require("prototypes.se-updates") diff --git a/bobequipment/prototypes/se-updates.lua b/bobequipment/prototypes/se-updates.lua index bd62dd22..0b899962 100644 --- a/bobequipment/prototypes/se-updates.lua +++ b/bobequipment/prototypes/se-updates.lua @@ -1,3 +1,5 @@ +if mods["space-exploration"] then + --Portable solar panels data.raw.recipe["solar-panel-equipment-2"].ingredients = { { type = "item", name = "solar-panel-equipment", amount = 1 }, @@ -842,3 +844,5 @@ if data.raw.item["alien-artifact"] then ) end end + +end diff --git a/boblogistics/data-updates.lua b/boblogistics/data-updates.lua index 588732b5..3d1397c7 100644 --- a/boblogistics/data-updates.lua +++ b/boblogistics/data-updates.lua @@ -174,6 +174,4 @@ if settings.startup["bobmods-logistics-highpipes"].value == true then bobmods.logistics.scale_machine_output_base_level() end -if mods["space-exploration"] then - require("prototypes.se-updates") -end +require("prototypes.se-updates") diff --git a/boblogistics/prototypes/se-updates.lua b/boblogistics/prototypes/se-updates.lua index 3139aa64..ec1a96f9 100644 --- a/boblogistics/prototypes/se-updates.lua +++ b/boblogistics/prototypes/se-updates.lua @@ -1,3 +1,5 @@ +if mods["space-exploration"] then + --Pipes data.raw.item["copper-pipe-to-ground"].subgroup = "pipe" @@ -1163,3 +1165,5 @@ data.raw.technology["inserter-capacity-bonus-8"].unit.ingredients = { { "se-material-science-pack-4", 1 }, { "se-deep-space-science-pack-1", 1 }, } + +end diff --git a/bobmining/data-updates.lua b/bobmining/data-updates.lua index c2c42a35..13eae399 100644 --- a/bobmining/data-updates.lua +++ b/bobmining/data-updates.lua @@ -3,6 +3,4 @@ require("prototypes.areadrill-updates") require("prototypes.pumpjack-updates") require("prototypes.water-miner-updates") -if mods["space-exploration"] then - require("prototypes.se-updates") -end +require("prototypes.se-updates") diff --git a/bobmining/prototypes/se-updates.lua b/bobmining/prototypes/se-updates.lua index bcd5919e..dbc7d15e 100644 --- a/bobmining/prototypes/se-updates.lua +++ b/bobmining/prototypes/se-updates.lua @@ -1,3 +1,5 @@ +if mods["space-exploration"] then + --Mining drills if data.raw.item["bob-mining-drill-4"] then data.raw.recipe["bob-mining-drill-1"].ingredients = { @@ -306,3 +308,5 @@ if data.raw.item["bob-pumpjack-4"] then { "se-biological-science-pack-4", 1 }, } end + +end