Skip to content

Commit 71e93bb

Browse files
committed
Merge branch 'pr/349' of https://github.com/modded-factorio/SeaBlock into pr/349
2 parents b77ce19 + b115482 commit 71e93bb

16 files changed

Lines changed: 174 additions & 55 deletions

SeaBlock/control.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ function seablock.create_rock_chest(surface, pos)
2222
end
2323

2424
if has_items then
25-
local chest = surface.create_entity({ name = "sb-rock-chest", position = pos, force = game.forces.neutral, move_stuck_players = true })
25+
local chest = surface.create_entity({
26+
name = "sb-rock-chest",
27+
position = pos,
28+
force = game.forces.neutral,
29+
move_stuck_players = true,
30+
})
2631
for item, quantity in pairs(storage.starting_items) do
2732
if quantity > 0 then
2833
chest.insert({ name = item, count = quantity })
@@ -79,8 +84,6 @@ local function init()
7984
end
8085
end
8186

82-
83-
8487
script.on_event(defines.events.on_player_joined_game, function(e)
8588
seablock.give_research(game.players[e.player_index].force)
8689
end)

SeaBlock/data-final-fixes/logistics.lua

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if data.raw.beacon["bob-beacon-2"] then
3838
data.raw.beacon["bob-beacon-2"].module_slots = 2
3939
data.raw.beacon["bob-beacon-2"].distribution_effectivity = 1
4040

41-
--TODO this got changed with bobs 2.0 - this replicates 1.1 behavior
41+
--TODO this got changed with bobs 2.0 - this replicates 1.1 behavior
4242
data.raw.beacon["bob-beacon-2"].supply_area_distance = 6
4343
end
4444
if data.raw.beacon["bob-beacon-3"] then
@@ -91,11 +91,7 @@ local function revertchests(tech)
9191
for k, v in pairs(tech.effects) do
9292
if
9393
v.type ~= "unlock-recipe"
94-
or (
95-
v.recipe ~= "passive-provider-chest"
96-
and v.recipe ~= "storage-chest"
97-
and v.recipe ~= "requester-chest"
98-
)
94+
or (v.recipe ~= "passive-provider-chest" and v.recipe ~= "storage-chest" and v.recipe ~= "requester-chest")
9995
then
10096
table.insert(neweffects, v)
10197
end
@@ -111,10 +107,7 @@ for k, v in pairs(data.raw.technology["logistic-system"].effects) do
111107
end
112108
end
113109
if not found then
114-
table.insert(
115-
data.raw.technology["logistic-system"].effects,
116-
{ type = "unlock-recipe", recipe = "requester-chest" }
117-
)
110+
table.insert(data.raw.technology["logistic-system"].effects, { type = "unlock-recipe", recipe = "requester-chest" })
118111
end
119112

120113
if mods["angelsindustries"] then

SeaBlock/data-final-fixes/tech-tree.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network")
2222
seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen")
2323
seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4)
2424

25-
bobmods.lib.tech.replace_prerequisite("bob-lithium-processing", "angels-chlorine-processing-4", "angels-chlorine-processing-2")
25+
bobmods.lib.tech.replace_prerequisite(
26+
"bob-lithium-processing",
27+
"angels-chlorine-processing-4",
28+
"angels-chlorine-processing-2"
29+
)

SeaBlock/data-updates/algae.lua

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ bobmods.lib.tech.add_prerequisite("angels-bio-processing-green", "angels-water-w
1111
data.raw.technology["angels-bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" }
1212

1313
-- Move Lithia Salt to Thermal Water Extraction
14-
seablock.lib.moveeffect("angels-algae-brown-burning", "angels-bio-processing-green", "angels-thermal-water-extraction", 2)
14+
seablock.lib.moveeffect(
15+
"angels-algae-brown-burning",
16+
"angels-bio-processing-green",
17+
"angels-thermal-water-extraction",
18+
2
19+
)
1520
bobmods.lib.tech.add_prerequisite("bob-lithium-processing", "angels-thermal-water-extraction")
1621

1722
-- Change lithium crafting category
@@ -22,17 +27,31 @@ bobmods.lib.tech.remove_recipe_unlock("angels-water-treatment-3", "angels-solid-
2227
bobmods.lib.recipe.hide("angels-solid-lithium") -- TODO: move angels-solid-lithium to the same group as the recipe or the other way around
2328

2429
-- Move Sodium Carbonate from Brown Algae to Sodium processing 2
25-
seablock.lib.moveeffect("angels-algae-brown-burning-wash", "angels-bio-processing-green", "angels-sodium-processing-2", nil)
30+
seablock.lib.moveeffect(
31+
"angels-algae-brown-burning-wash",
32+
"angels-bio-processing-green",
33+
"angels-sodium-processing-2",
34+
nil
35+
)
2636

2737
-- Move Methanol from Cellulose Fibre to Advanced chemistry 1
28-
seablock.lib.moveeffect("angels-gas-methanol-from-wood", "angels-bio-processing-green", "angels-advanced-chemistry-1", 5)
38+
seablock.lib.moveeffect(
39+
"angels-gas-methanol-from-wood",
40+
"angels-bio-processing-green",
41+
"angels-advanced-chemistry-1",
42+
5
43+
)
2944

3045
-- Make Red Algae depend on Blue Algae instead of Green Algae
3146
bobmods.lib.tech.remove_prerequisite("angels-bio-processing-red", "angels-bio-processing-green")
3247
bobmods.lib.tech.add_prerequisite("angels-bio-processing-red", "angels-bio-processing-blue")
3348

3449
-- Blue algae
35-
bobmods.lib.tech.replace_prerequisite("angels-bio-processing-blue", "angels-bio-processing-red", "angels-bio-processing-green")
50+
bobmods.lib.tech.replace_prerequisite(
51+
"angels-bio-processing-blue",
52+
"angels-bio-processing-red",
53+
"angels-bio-processing-green"
54+
)
3655
bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "chemical-science-pack")
3756
bobmods.lib.tech.remove_science_pack("angels-bio-processing-blue", "chemical-science-pack")
3857
bobmods.lib.tech.remove_recipe_unlock("angels-bio-processing-blue", "angels-algae-farm-4")
@@ -71,6 +90,6 @@ angelsmods.functions.RB.build({
7190
{ type = "item", name = "t0-brick", amount = 11 },
7291
{ type = "item", name = "t0-pipe", amount = 18 },
7392
},
74-
results = {{type = "item", name = "angels-algae-farm-2", amount = 1}}
93+
results = { { type = "item", name = "angels-algae-farm-2", amount = 1 } },
7594
},
7695
})

SeaBlock/data-updates/catalyst-recipes.lua

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,72 @@ bobmods.lib.recipe.set_ingredients("angels-catalyst-metal-blue", {
1515
})
1616
bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "sb-catalyst-metal-purple")
1717

18-
bobmods.lib.recipe.replace_ingredient("angels-liquid-acetic-acid-catalyst", "angels-catalyst-metal-red", "angels-catalyst-metal-green")
18+
bobmods.lib.recipe.replace_ingredient(
19+
"angels-liquid-acetic-acid-catalyst",
20+
"angels-catalyst-metal-red",
21+
"angels-catalyst-metal-green"
22+
)
1923
bobmods.lib.recipe.replace_ingredient("angels-gas-ammonia", "angels-catalyst-metal-red", "angels-catalyst-metal-green")
20-
bobmods.lib.recipe.replace_ingredient("angels-catalyst-steam-cracking-naphtha", "angels-catalyst-metal-red", "angels-catalyst-metal-green")
24+
bobmods.lib.recipe.replace_ingredient(
25+
"angels-catalyst-steam-cracking-naphtha",
26+
"angels-catalyst-metal-red",
27+
"angels-catalyst-metal-green"
28+
)
2129

22-
bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanol", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
23-
bobmods.lib.recipe.replace_ingredient("angels-gas-acid-catalyst", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
24-
bobmods.lib.recipe.replace_ingredient("angels-liquid-styrene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
30+
bobmods.lib.recipe.replace_ingredient(
31+
"angels-gas-synthesis-methanol",
32+
"angels-catalyst-metal-green",
33+
"angels-catalyst-metal-blue"
34+
)
35+
bobmods.lib.recipe.replace_ingredient(
36+
"angels-gas-acid-catalyst",
37+
"angels-catalyst-metal-green",
38+
"angels-catalyst-metal-blue"
39+
)
40+
bobmods.lib.recipe.replace_ingredient(
41+
"angels-liquid-styrene",
42+
"angels-catalyst-metal-green",
43+
"angels-catalyst-metal-blue"
44+
)
2545
bobmods.lib.recipe.replace_ingredient("angels-gas-benzene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
26-
bobmods.lib.recipe.replace_ingredient("angels-liquid-propionic-acid", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
27-
bobmods.lib.recipe.replace_ingredient("angels-gas-butadiene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
46+
bobmods.lib.recipe.replace_ingredient(
47+
"angels-liquid-propionic-acid",
48+
"angels-catalyst-metal-green",
49+
"angels-catalyst-metal-blue"
50+
)
51+
bobmods.lib.recipe.replace_ingredient(
52+
"angels-gas-butadiene",
53+
"angels-catalyst-metal-green",
54+
"angels-catalyst-metal-blue"
55+
)
2856

29-
bobmods.lib.recipe.replace_ingredient("angels-liquid-naphtha-catalyst", "angels-catalyst-metal-red", "sb-catalyst-metal-purple")
30-
bobmods.lib.recipe.replace_ingredient("angels-solid-sodium-cyanide", "angels-catalyst-metal-green", "sb-catalyst-metal-purple")
31-
bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanation", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple")
57+
bobmods.lib.recipe.replace_ingredient(
58+
"angels-liquid-naphtha-catalyst",
59+
"angels-catalyst-metal-red",
60+
"sb-catalyst-metal-purple"
61+
)
62+
bobmods.lib.recipe.replace_ingredient(
63+
"angels-solid-sodium-cyanide",
64+
"angels-catalyst-metal-green",
65+
"sb-catalyst-metal-purple"
66+
)
67+
bobmods.lib.recipe.replace_ingredient(
68+
"angels-gas-synthesis-methanation",
69+
"angels-catalyst-metal-blue",
70+
"sb-catalyst-metal-purple"
71+
)
3272
bobmods.lib.recipe.replace_ingredient("angels-gas-hydrazine", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple")
33-
bobmods.lib.recipe.replace_ingredient("angels-gas-synthesis-methanol", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple")
73+
bobmods.lib.recipe.replace_ingredient(
74+
"angels-gas-synthesis-methanol",
75+
"angels-catalyst-metal-blue",
76+
"sb-catalyst-metal-purple"
77+
)
3478

35-
bobmods.lib.recipe.replace_ingredient("angels-cumene-process", "angels-catalyst-metal-blue", "angels-catalyst-metal-yellow")
79+
bobmods.lib.recipe.replace_ingredient(
80+
"angels-cumene-process",
81+
"angels-catalyst-metal-blue",
82+
"angels-catalyst-metal-yellow"
83+
)
3684

3785
bobmods.lib.recipe.add_new_ingredient(
3886
"angels-liquid-mineral-oil-catalyst",
@@ -58,7 +106,11 @@ seablock.lib.moveeffect("angels-gas-melamine", "angels-nitrogen-processing-3", "
58106
bobmods.lib.tech.add_new_science_pack("angels-gas-synthesis", "production-science-pack", 1)
59107
bobmods.lib.tech.add_prerequisite("angels-gas-synthesis", "angels-advanced-chemistry-4")
60108

61-
seablock.lib.moveeffect("angels-liquid-mineral-oil-catalyst", "angels-advanced-chemistry-3", "angels-advanced-chemistry-4")
109+
seablock.lib.moveeffect(
110+
"angels-liquid-mineral-oil-catalyst",
111+
"angels-advanced-chemistry-3",
112+
"angels-advanced-chemistry-4"
113+
)
62114
seablock.lib.moveeffect("angels-catalyst-metal-carrier", "angels-basic-chemistry-3", "angels-advanced-chemistry-1", 5)
63115
seablock.lib.moveeffect("angels-catalyst-metal-green", "angels-advanced-chemistry-1", "angels-advanced-chemistry-1", 6)
64116
seablock.lib.moveeffect("angels-catalyst-metal-blue", "angels-advanced-chemistry-3", "angels-advanced-chemistry-2", 8)

SeaBlock/data-updates/fuel.lua

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ if data.raw.fluid["angels-gas-hydrazine"] then
99
data.raw.fluid["angels-gas-hydrazine"].fuel_value = hydrazinevalue
1010
if hydrazinevalue:sub(-2) == "kJ" then
1111
local hydrazinevaluekj = tonumber(hydrazinevalue:sub(1, -3))
12-
seablock.lib.substingredient("angels-solid-fuel-hydrazine", "angels-gas-hydrazine", nil, math.floor(24000 / hydrazinevaluekj))
12+
seablock.lib.substingredient(
13+
"angels-solid-fuel-hydrazine",
14+
"angels-gas-hydrazine",
15+
nil,
16+
math.floor(24000 / hydrazinevaluekj)
17+
)
1318
end
1419
end
1520

SeaBlock/data-updates/military.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ local mil_ammo = {
289289
{ type = "ammo", name = "bob-shotgun-uranium-shell" },
290290
{ type = "ammo", name = "bob-uranium-cannon-shell" },
291291
{ type = "ammo", name = "uranium-rounds-magazine" },
292-
{ type = "ammo", name = "uranium-cannon-shell"},
293-
{ type = "ammo", name = "explosive-uranium-cannon-shell"},
292+
{ type = "ammo", name = "uranium-cannon-shell" },
293+
{ type = "ammo", name = "explosive-uranium-cannon-shell" },
294294
{ type = "ammo", name = "bob-explosive-artillery-shell" },
295295
{ type = "capsule", name = "cluster-grenade" },
296296
{ type = "capsule", name = "defender-capsule" },
@@ -501,7 +501,6 @@ if mods["bobwarfare"] then
501501
end
502502
data.raw["electric-turret"]["laser-turret"].next_upgrade = nil
503503

504-
505504
bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-residual")
506505
bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-glycerol-barrel")
507506
bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-toluene-barrel")

SeaBlock/data-updates/misc.lua

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,35 @@ bobmods.lib.tech.remove_prerequisite("angels-bio-farm-2", "angels-stone-smelting
221221

222222
-- Rebalance glass mixture recipes
223223
bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture", "bob-quartz")
224-
bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture", { type = "item", name = "bob-silicon-powder", amount = 1 })
224+
bobmods.lib.recipe.set_ingredient(
225+
"angels-solid-glass-mixture",
226+
{ type = "item", name = "bob-silicon-powder", amount = 1 }
227+
)
225228

226229
bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-2", "bob-quartz")
227-
bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-2", { type = "item", name = "bob-silicon-powder", amount = 2 })
228-
bobmods.lib.recipe.set_result("angels-solid-glass-mixture-2", { type = "item", name = "angels-solid-glass-mixture", amount = 3 })
230+
bobmods.lib.recipe.set_ingredient(
231+
"angels-solid-glass-mixture-2",
232+
{ type = "item", name = "bob-silicon-powder", amount = 2 }
233+
)
234+
bobmods.lib.recipe.set_result(
235+
"angels-solid-glass-mixture-2",
236+
{ type = "item", name = "angels-solid-glass-mixture", amount = 3 }
237+
)
229238
bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-2", 6)
230239

231240
bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-3", "bob-quartz")
232-
bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-3", { type = "item", name = "bob-silicon-powder", amount = 1 })
233-
bobmods.lib.recipe.set_ingredient("angels-solid-glass-mixture-3", { type = "item", name = "angels-solid-lime", amount = 2 })
234-
bobmods.lib.recipe.set_result("angels-solid-glass-mixture-3", { type = "item", name = "angels-solid-glass-mixture", amount = 4 })
241+
bobmods.lib.recipe.set_ingredient(
242+
"angels-solid-glass-mixture-3",
243+
{ type = "item", name = "bob-silicon-powder", amount = 1 }
244+
)
245+
bobmods.lib.recipe.set_ingredient(
246+
"angels-solid-glass-mixture-3",
247+
{ type = "item", name = "angels-solid-lime", amount = 2 }
248+
)
249+
bobmods.lib.recipe.set_result(
250+
"angels-solid-glass-mixture-3",
251+
{ type = "item", name = "angels-solid-glass-mixture", amount = 4 }
252+
)
235253
bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-3", 8)
236254

237255
bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-4", 8)

SeaBlock/data-updates/other-mods.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ if mods["jetpack"] then
3636
bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-speed-module-4")
3737
bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-efficiency-module-4")
3838
bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "bob-speed-module-5", amount = 2 })
39-
bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "bob-efficiency-module-5", amount = 2 })
39+
bobmods.lib.recipe.add_new_ingredient(
40+
"jetpack-4",
41+
{ type = "item", name = "bob-efficiency-module-5", amount = 2 }
42+
)
4043
else
4144
bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "bob-speed-module-5")
4245
bobmods.lib.recipe.replace_ingredient("jetpack-4", "efficiency-module-3", "bob-efficiency-module-5")

SeaBlock/data-updates/slag-processing.lua

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ end
2121
bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false)
2222
bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false)
2323
seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3)
24-
local slag1start = seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1")
24+
local slag1start =
25+
seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1")
2526
seablock.lib.insert_effect("angels-slag-processing-5", "angels-slag-processing-1", slag1start + 3)
2627
seablock.lib.insert_effect("angels-slag-processing-6", "angels-slag-processing-1", slag1start + 4)
2728

2829
local slag2start = 0
29-
seablock.lib.moveeffect("angels-slag-processing-2", "angels-slag-processing-1", "angels-ore-advanced-crushing", slag2start + 1)
30+
seablock.lib.moveeffect(
31+
"angels-slag-processing-2",
32+
"angels-slag-processing-1",
33+
"angels-ore-advanced-crushing",
34+
slag2start + 1
35+
)
3036
seablock.lib.insert_effect("angels-slag-processing-4", "angels-ore-advanced-crushing", slag2start + 2)
3137
seablock.lib.moveeffect("angels-ore2-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 3)
3238
seablock.lib.moveeffect("angels-ore4-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 4)
3339

34-
3540
seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore5-crushed", 3)
3641
seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore6-crushed", 4)
3742
seablock.lib.add_recipe_unlock("angels-ore-crushing", "iron-plate")

0 commit comments

Comments
 (0)