Skip to content

Commit d49e589

Browse files
KiwiHawkKiwiHawk
committed
Bob's 2.1 Compatibility #1291
- Swap Invar / Cobalt Steel - Add missing prerequisites - Hide Cobalt processing tech
1 parent a4d0772 commit d49e589

11 files changed

Lines changed: 198 additions & 54 deletions

‎angelspetrochem/prototypes/override/angelssmelting.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ else
3232
"angels-solid-sodium-cyanide",
3333
"angels-solid-sodium-carbonate",
3434
"angels-solid-sodium-sulfate",
35+
"angels-solid-sodium-carbonate-electrolysis",
3536
})
36-
angelsmods.functions.hide("angels-solid-sodium-cyanide")
37+
angelsmods.functions.hide({ "angels-solid-sodium-cyanide", "angels-solid-sodium-carbonate" })
3738
OV.remove_prereq("angels-sodium-processing-1", "angels-chlorine-processing-1")
3839
OV.add_prereq("angels-sodium-processing-1", "angels-chlorine-processing-3")
3940
end

‎angelspetrochem/prototypes/override/bobplates.lua‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,24 @@ if mods["bobplates"] or mods["bobelectronics"] then
232232
},
233233
},
234234
})
235-
if mods["bobequipment"] then
236-
OV.add_prereq("bob-personal-roboport-mk3-equipment", "angels-rubbers")
237-
end
238-
if mods["boblogistics"] then
239-
OV.add_prereq("bob-robo-modular-3", "angels-rubbers")
240-
OV.add_prereq("bob-robots-2", "angels-rubbers")
241-
end
242-
if mods["bobmodules"] then
243-
OV.add_prereq("effect-transmission-2", "angels-rubbers")
244-
end
245-
if mods["bobpower"] then
246-
OV.add_prereq("bob-electric-pole-3", "angels-rubbers")
247-
OV.add_prereq("bob-electric-substation-3", "angels-rubbers")
248-
end
249-
if mods["bobvehicleequipment"] then
250-
OV.add_prereq("bob-vehicle-roboport-equipment-3", "angels-rubbers")
235+
if mods["bobelectronics"] then
236+
if mods["bobequipment"] then
237+
OV.add_prereq("bob-personal-roboport-mk3-equipment", "angels-rubbers")
238+
end
239+
if mods["boblogistics"] then
240+
OV.add_prereq("bob-robo-modular-3", "angels-rubbers")
241+
OV.add_prereq("bob-robots-2", "angels-rubbers")
242+
end
243+
if mods["bobmodules"] then
244+
OV.add_prereq("effect-transmission-2", "angels-rubbers")
245+
end
246+
if mods["bobpower"] then
247+
OV.add_prereq("bob-electric-pole-3", "angels-rubbers")
248+
OV.add_prereq("bob-electric-substation-3", "angels-rubbers")
249+
end
250+
if mods["bobvehicleequipment"] then
251+
OV.add_prereq("bob-vehicle-roboport-equipment-3", "angels-rubbers")
252+
end
251253
end
252254
if mods["bobwarfare"] then
253255
OV.add_prereq("bob-walking-vehicle", "angels-rubbers")

‎angelsrefining/prototypes/override/refining-override-boblogistics.lua‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,16 @@ if mods["boblogistics"] then
3939
)
4040

4141
--repair pack techs
42-
OV.patch_recipes({
43-
{
44-
name = "bob-repair-pack-3",
45-
ingredients = {
46-
{ name = "bob-brass-gear-wheel", amount = "bob-cobalt-steel-gear-wheel" },
47-
{ name = "bob-invar-alloy", amount = "bob-cobalt-steel-alloy" },
42+
if mods["bobplates"] then
43+
OV.patch_recipes({
44+
{
45+
name = "bob-repair-pack-3",
46+
ingredients = {
47+
{ name = "bob-brass-gear-wheel", amount = "bob-cobalt-steel-gear-wheel" },
48+
{ name = "bob-invar-alloy", amount = "bob-cobalt-steel-alloy" },
49+
},
4850
},
49-
},
50-
})
51-
OV.add_prereq("bob-repair-pack-3", {
52-
mods["bobplates"] and "bob-brass-processing" or "steel-axe",
53-
mods["bobplates"] and "bob-invar-processing" or "steel-processing",
54-
})
55-
OV.remove_prereq("bob-repair-pack-3", "bob-cobalt-processing")
51+
})
52+
OV.add_prereq("bob-repair-pack-3", "bob-invar-processing")
53+
end
5654
end

‎angelsrefining/prototypes/override/refining-override-bobmodules.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if mods["bobmodules"] then
99
OV.add_prereq("modules", "angels-chlorine-processing-1")
1010
end
1111

12-
if mods["angelssmelting"] and angelsmods.trigger.smelting_products["silver"].wire then
12+
if mods["angelssmelting"] then
1313
OV.add_prereq("modules", "angels-silver-smelting-1")
1414
elseif mods["bobplates"] then
1515
OV.add_prereq("modules", "bob-lead-processing")

‎angelsrefining/prototypes/override/refining-override-bobplates.lua‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,16 @@ if mods["bobplates"] then
104104
OV.set_science_pack("bob-acid-rocket", "production-science-pack", 1)
105105
OV.set_science_pack("bob-flame-rocket", "production-science-pack", 1)
106106
OV.set_science_pack("bob-poison-rocket", "production-science-pack", 1)
107+
OV.add_prereq({
108+
"bob-ap-bullets",
109+
"bob-shotgun-ap-shells",
110+
"bob-piercing-rocket",
111+
"bob-electric-rocket",
112+
"bob-explosive-rocket",
113+
"bob-acid-rocket",
114+
"bob-flame-rocket",
115+
"bob-poison-rocket",
116+
}, "production-science-pack")
107117
end
108118
end
109119
end

‎angelsrefining/prototypes/override/refining-override-bobwarfare.lua‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ local move_item = angelsmods.functions.move_item
55
-- so we try to organize it a bit to 'empty' some tabs
66
if mods["bobwarfare"] and not mods["angelsexploration"] then
77
local intermediate_subgroup = "bob-ammo-parts"
8-
data.raw["item-subgroup"][intermediate_subgroup].group = "combat"
9-
data.raw["item-subgroup"][intermediate_subgroup].order = "z"
108

119
move_item("bob-bullet-projectile", intermediate_subgroup, "a[bullet-projectile]-a[regular]")
1210
move_item("bob-ap-bullet-projectile", intermediate_subgroup, "a[bullet-projectile]-b[pierce]")

‎angelssmelting/prototypes/override/recycling.lua‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,50 @@ local updated_recipes = {
4444
"assembling-machine-3",
4545
"bob-area-mining-drill-2",
4646
"bob-area-mining-drill-3",
47+
"bob-armoured-cargo-wagon",
48+
"bob-armoured-fluid-wagon",
49+
"bob-armoured-locomotive",
50+
"bob-artillery-wagon-2",
4751
"bob-assembling-machine-4",
4852
"bob-assembling-machine-5",
4953
"bob-assembling-machine-6",
54+
"bob-boiler-4",
55+
"bob-cargo-wagon-2",
5056
"bob-centrifuge-2",
57+
"bob-electric-chemical-mixing-furnace",
58+
"bob-electric-furnace-2",
5159
"bob-electronic-components",
5260
"bob-electronics-machine-1",
5361
"bob-electronics-machine-2",
5462
"bob-electronics-machine-3",
63+
"bob-fluid-generator-3",
64+
"bob-fluid-wagon-2",
5565
"bob-gun-turret-3",
66+
"bob-heat-exchanger-3",
67+
"bob-heat-pipe-3",
5668
"bob-integrated-electronics",
69+
"bob-laser-turret-3",
70+
"bob-locomotive-2",
5771
"bob-mech-leg-segment",
5872
"bob-mining-drill-2",
5973
"bob-mining-drill-3",
6074
"bob-module-processor-board",
6175
"bob-module-processor-board-3",
76+
"bob-oil-boiler-3",
77+
"bob-plasma-turret-1",
78+
"bob-plasma-turret-2",
79+
"bob-power-armor-mk3",
6280
"bob-processing-electronics",
6381
"bob-pump-3",
82+
"bob-roboport-door-2",
6483
"bob-robot-tool-combat-2",
6584
"bob-sniper-turret-2",
6685
"bob-sniper-turret-3",
6786
"bob-steam-engine-4",
87+
"bob-storage-tank-3",
88+
"bob-storage-tank-all-corners-3",
89+
"bob-vehicle-big-turret-equipment-1",
90+
"bob-vehicle-big-turret-equipment-2",
6891
"centrifuge",
6992
"processing-unit",
7093
"tank",

‎angelssmelting/prototypes/override/smelting-override-alloy-cobalt-steel.lua‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ if mods["bobplates"] then
1616
)
1717
data.raw["item"]["bob-cobalt-steel-alloy"].icon = "__angelssmeltinggraphics__/graphics/icons/plate-cobalt-steel.png"
1818
data.raw["item"]["bob-cobalt-steel-alloy"].icon_size = 32
19-
OV.add_prereq("bob-cobalt-processing", "angels-cobalt-steel-smelting-1")
2019
angelsmods.functions.allow_productivity("angels-plate-cobalt-steel")
21-
OV.set_research_difficulty("bob-cobalt-processing", "bob-cobalt-steel-alloy", 10, "craft-item")
20+
OV.global_replace_technology("bob-cobalt-processing", "bob-brass-processing")
21+
22+
angelsmods.functions.hide("bob-cobalt-steel-bearing-ball")
23+
angelsmods.functions.hide("bob-cobalt-steel-bearing")
24+
angelsmods.functions.hide("bob-cobalt-steel-gear-wheel")
25+
OV.disable_recipe({ "bob-cobalt-steel-bearing-ball", "bob-cobalt-steel-bearing", "bob-cobalt-steel-gear-wheel" })
26+
OV.global_replace_item("bob-cobalt-steel-gear-wheel", "bob-brass-gear-wheel")
27+
OV.global_replace_item("bob-cobalt-steel-bearing", "bob-brass-bearing")
28+
data.raw.recipe["bob-cobalt-steel-bearing-recycling"] = nil
29+
data.raw.recipe["bob-cobalt-steel-gear-wheel-recycling"] = nil
2230
else
2331
angelsmods.functions.hide("angels-liquid-molten-cobalt-steel")
2432
OV.disable_recipe({ "angels-liquid-molten-cobalt-steel" })

‎angelssmelting/prototypes/override/smelting-override-bobplates.lua‎

Lines changed: 108 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,48 @@
11
local OV = angelsmods.functions.OV
22

33
if mods["bobplates"] then
4-
-- Swap Cobalt Steel and Brass
4+
-- Swap Cobalt Steel for Invar
55
for _, recipe_name in pairs({
66
"artillery-turret",
77
"artillery-wagon",
8-
"bob-area-mining-drill-2",
8+
"bob-armoured-cargo-wagon",
9+
"bob-armoured-fluid-wagon",
10+
"bob-armoured-locomotive",
11+
"bob-cargo-wagon-2",
912
"bob-exoskeleton-equipment-2",
13+
"bob-fluid-wagon-2",
1014
"bob-gun-turret-3",
11-
"bob-mining-drill-2",
12-
"bob-pumpjack-1",
13-
"bob-radar-3",
15+
"bob-laser-turret-3",
16+
"bob-locomotive-2",
17+
"bob-plasma-turret-1",
1418
"bob-rifle",
19+
"bob-roboport-door-2",
1520
"bob-robot-tool-combat-2",
1621
"bob-sniper-rifle",
1722
"bob-sniper-turret-2",
18-
"centrifuge",
23+
"bob-vehicle-big-turret-equipment-1",
1924
"combat-shotgun",
20-
"steam-turbine",
25+
"power-armor-mk2",
2126
"tank",
27+
}) do
28+
OV.patch_recipes({
29+
{
30+
name = recipe_name,
31+
ingredients = {
32+
{ type = "item", name = "bob-invar-alloy", amount = "bob-cobalt-steel-alloy" },
33+
},
34+
},
35+
})
36+
end
37+
38+
-- Swap Cobalt Steel for Brass
39+
for _, recipe_name in pairs({
40+
"beacon",
41+
"bob-area-mining-drill-2",
42+
"bob-mining-drill-2",
43+
"bob-pumpjack-1",
44+
"bob-radar-3",
45+
"centrifuge",
2246
}) do
2347
OV.patch_recipes({
2448
{
@@ -30,6 +54,32 @@ if mods["bobplates"] then
3054
})
3155
end
3256

57+
-- Swap Invar for Cobalt Steel
58+
for _, recipe_name in pairs({
59+
"bob-artillery-wagon-2",
60+
"bob-boiler-4",
61+
"bob-electric-chemical-mixing-furnace",
62+
"bob-electric-furnace-2",
63+
"bob-fluid-generator-3",
64+
"bob-heat-exchanger-3",
65+
"bob-heat-pipe-3",
66+
"bob-oil-boiler-3",
67+
"bob-plasma-turret-2",
68+
"bob-power-armor-mk3",
69+
"bob-storage-tank-3",
70+
"bob-storage-tank-all-corners-3",
71+
"bob-vehicle-big-turret-equipment-2",
72+
}) do
73+
OV.patch_recipes({
74+
{
75+
name = recipe_name,
76+
ingredients = {
77+
{ type = "item", name = "bob-cobalt-steel-alloy", amount = "bob-invar-alloy" },
78+
},
79+
},
80+
})
81+
end
82+
3383
for _, recipe_name in pairs({
3484
"bob-area-mining-drill-3",
3585
"bob-centrifuge-2",
@@ -62,18 +112,57 @@ if mods["bobplates"] then
62112
})
63113
end
64114

65-
OV.add_prereq("bob-area-drills-2", "bob-brass-processing")
66-
OV.add_prereq("bob-drills-3", "bob-brass-processing")
67-
OV.add_prereq("bob-turrets-3", "bob-brass-processing")
115+
OV.add_prereq({
116+
"artillery",
117+
"bob-armoured-fluid-wagon",
118+
"bob-armoured-railway",
119+
"bob-fluid-wagon-2",
120+
"bob-laser-turrets-3",
121+
"bob-plasma-turrets-1",
122+
"bob-railway-2",
123+
"bob-robo-modular-2",
124+
"bob-sniper-turrets-2",
125+
"bob-turrets-3",
126+
"bob-vehicle-big-turret-equipment-1",
127+
"bob-vehicle-roboport-equipment-2",
128+
"distractor",
129+
"personal-roboport-mk2-equipment",
130+
"power-armor-mk2",
131+
"tank",
132+
}, "angels-invar-smelting-1")
133+
134+
OV.add_prereq({
135+
"advanced-material-processing-3",
136+
"bob-alien-blue-research",
137+
"bob-artillery-wagon-2",
138+
"bob-boiler-4",
139+
"bob-centrifuge-2",
140+
"bob-fluid-generator-3",
141+
"bob-fluid-handling-3",
142+
"bob-heat-exchanger-3",
143+
"bob-heat-pipe-3",
144+
"bob-multi-purpose-furnace-1",
145+
"bob-oil-boiler-3",
146+
"bob-plasma-turrets-2",
147+
"bob-power-armor-3",
148+
"bob-vehicle-big-turret-equipment-2",
149+
"bob-walking-vehicle",
150+
}, "angels-cobalt-steel-smelting-1")
68151

69-
OV.remove_prereq("bob-turrets-3", "bob-cobalt-processing")
152+
OV.remove_prereq({
153+
"bob-alien-blue-research",
154+
}, "bob-cobalt-processing")
70155

71-
angelsmods.functions.hide("bob-cobalt-steel-bearing-ball")
72-
angelsmods.functions.hide("bob-cobalt-steel-bearing")
73-
angelsmods.functions.hide("bob-cobalt-steel-gear-wheel")
74-
OV.disable_recipe({ "bob-cobalt-steel-bearing-ball", "bob-cobalt-steel-bearing", "bob-cobalt-steel-gear-wheel" })
75-
OV.global_replace_item("bob-cobalt-steel-gear-wheel", "bob-brass-gear-wheel")
76-
OV.global_replace_item("bob-cobalt-steel-bearing", "bob-brass-bearing")
77-
data.raw.recipe["bob-cobalt-steel-bearing-recycling"] = nil
78-
data.raw.recipe["bob-cobalt-steel-gear-wheel-recycling"] = nil
156+
OV.remove_prereq({
157+
"advanced-material-processing-3",
158+
"bob-boiler-4",
159+
"bob-electronics-machine-2",
160+
"bob-fluid-generator-3",
161+
"bob-fluid-handling-3",
162+
"bob-heat-exchanger-3",
163+
"bob-heat-pipe-3",
164+
"bob-multi-purpose-furnace-1",
165+
"bob-oil-boiler-3",
166+
"bob-power-armor-3",
167+
}, "bob-invar-processing")
79168
end

‎angelssmelting/prototypes/override/smelting-override-lead.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ if angelsmods.trigger.smelting_products["lead"].plate then
7777
angelsmods.functions.hide("angels-plate-lead")
7878
OV.copy_item_properties("angels-plate-lead", "bob-lead-plate")
7979
OV.disable_recipe({ "bob-lead-plate", "bob-lead-plate-2" })
80+
if mods["bobwarfare"] then
81+
OV.add_prereq("military-2", "angels-lead-smelting-1")
82+
end
8083
end
8184
else
8285
angelsmods.functions.hide("angels-plate-lead")

0 commit comments

Comments
 (0)