Skip to content

Commit

Permalink
Fix for multiplayer related to new SE integration files (#161)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Qatavin authored Jan 7, 2024
1 parent f618959 commit 3e48a55
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 15 deletions.
5 changes: 2 additions & 3 deletions bobassembly/data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bobassembly/prototypes/se-updates.lua
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -899,3 +901,5 @@ if data.raw.item["electric-furnace-3"] then
{ "se-material-science-pack-4", 1 },
}
end

end
4 changes: 1 addition & 3 deletions bobclasses/data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,4 @@ end

require("prototypes.recipe-updates")

if mods["space-exploration"] then
require("prototypes.se-updates")
end
require("prototypes.se-updates")
4 changes: 4 additions & 0 deletions bobclasses/prototypes/se-updates.lua
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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
4 changes: 1 addition & 3 deletions bobequipment/data-updates.lua
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 4 additions & 0 deletions bobequipment/prototypes/se-updates.lua
Original file line number Diff line number Diff line change
@@ -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 },
Expand Down Expand Up @@ -842,3 +844,5 @@ if data.raw.item["alien-artifact"] then
)
end
end

end
4 changes: 1 addition & 3 deletions boblogistics/data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")
4 changes: 4 additions & 0 deletions boblogistics/prototypes/se-updates.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
if mods["space-exploration"] then

--Pipes

data.raw.item["copper-pipe-to-ground"].subgroup = "pipe"
Expand Down Expand Up @@ -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
4 changes: 1 addition & 3 deletions bobmining/data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")
4 changes: 4 additions & 0 deletions bobmining/prototypes/se-updates.lua
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -306,3 +308,5 @@ if data.raw.item["bob-pumpjack-4"] then
{ "se-biological-science-pack-4", 1 },
}
end

end

0 comments on commit 3e48a55

Please sign in to comment.