Skip to content

Commit 3e60d98

Browse files
committed
Make unit tests pass with Bob's Mining
1 parent d4fc4f6 commit 3e60d98

File tree

9 files changed

+17
-40
lines changed

9 files changed

+17
-40
lines changed

bobgreenhouse/prototypes/technology.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ data:extend({
44
name = "bob-greenhouse",
55
icon = "__bobgreenhouse__/graphics/icons/technology/greenhouse.png",
66
icon_size = 128,
7-
prerequisites = {},
7+
prerequisites = {
8+
"steam-power",
9+
},
810
effects = {
911
{
1012
type = "unlock-recipe",

boblogistics/prototypes/entity/inserter.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ data.raw.inserter["steam-inserter"].energy_source = {
114114
},
115115
},
116116
}
117+
bobmods.lib.tech.add_recipe_unlock("steam-power", "steam-inserter")
117118

118119
data:extend({
119120
util.merge({

bobmining/prototypes/areadrills.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
219219
order = "d-a-b-1",
220220
prerequisites = {
221221
"steel-processing",
222-
"electronics",
222+
"electric-mining-drill",
223223
},
224224
unit = {
225225
count = 50,
@@ -294,6 +294,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
294294
order = "d-a-b-4",
295295
prerequisites = {
296296
"bob-area-drills-3",
297+
"production-science-pack",
297298
},
298299
unit = {
299300
count = 150,

bobmining/prototypes/drills.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
217217
order = "d-a-a-1",
218218
prerequisites = {
219219
"steel-processing",
220-
"electronics",
220+
"electric-mining-drill",
221221
},
222222
unit = {
223223
count = 50,
@@ -292,6 +292,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
292292
order = "d-a-a-4",
293293
prerequisites = {
294294
"bob-drills-3",
295+
"production-science-pack",
295296
},
296297
unit = {
297298
count = 150,

bobmining/prototypes/pumpjacks.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then
672672
order = "d-a-c-4",
673673
prerequisites = {
674674
"bob-pumpjacks-3",
675+
"production-science-pack",
675676
},
676677
unit = {
677678
count = 150,

bobmining/prototypes/steam-drills.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if settings.startup["bobmods-mining-steamminingdrills"].value == true then
2626
{
2727
type = "recipe",
2828
name = "steam-mining-drill",
29+
enabled = false,
2930
energy_required = 1,
3031
ingredients = {
3132
{ type = "item", name = "burner-mining-drill", amount = 1 },
@@ -47,7 +48,7 @@ if settings.startup["bobmods-mining-steamminingdrills"].value == true then
4748
},
4849
}),
4950
})
50-
51+
bobmods.lib.tech.add_recipe_unlock("steam-power", "steam-mining-drill")
5152
data.raw["mining-drill"]["steam-mining-drill"].resource_searching_radius = 1.99
5253
data.raw["mining-drill"]["steam-mining-drill"].radius_visualisation_picture = {
5354
filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-radius-visualization.png",

bobplates/prototypes/technology.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ data:extend({
44
name = "electrolysis-1",
55
icon = "__bobplates__/graphics/icons/technology/electrolysis.png",
66
icon_size = 128,
7-
prerequisites = {},
7+
prerequisites = {
8+
"steam-power"
9+
},
810
effects = {
911
{
1012
type = "unlock-recipe",
@@ -68,7 +70,9 @@ data:extend({
6870
name = "chemical-processing-1",
6971
icon = "__bobplates__/graphics/icons/technology/chemical-processing.png",
7072
icon_size = 128,
71-
prerequisites = {},
73+
prerequisites = {
74+
"steam-power",
75+
},
7276
effects = {
7377
{
7478
type = "unlock-recipe",

bobtech/prototypes/technology/technology-updates.lua

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,12 @@ if settings.startup["bobmods-burnerphase"].value == true then
215215
if data.raw.technology["electrolysis-1"] then
216216
bobmods.lib.tech.add_prerequisite("electrolysis-1", "automation-science-pack")
217217
bobmods.lib.tech.add_prerequisite("electrolysis-1", "electricity")
218-
bobmods.lib.tech.add_prerequisite("electrolysis-1", "steam-power")
219218
end
220219
if data.raw.technology["alloy-processing"] then
221220
bobmods.lib.tech.add_prerequisite("alloy-processing", "automation-science-pack")
222221
end
223222
if data.raw.technology["chemical-processing-1"] then
224223
bobmods.lib.tech.add_prerequisite("chemical-processing-1", "automation-science-pack")
225-
bobmods.lib.tech.add_prerequisite("chemical-processing-1", "steam-power")
226224
end
227225
if data.raw.technology["air-compressor-1"] then
228226
bobmods.lib.tech.add_prerequisite("air-compressor-1", "automation-science-pack")
@@ -235,24 +233,12 @@ if settings.startup["bobmods-burnerphase"].value == true then
235233
if data.raw.technology["bob-greenhouse"] then
236234
bobmods.lib.tech.add_prerequisite("bob-greenhouse", "automation-science-pack")
237235
bobmods.lib.tech.add_prerequisite("bob-greenhouse", "electricity")
238-
bobmods.lib.tech.add_prerequisite("bob-greenhouse", "steam-power")
239236
end
240237
if data.raw.technology["water-miner-1"] then
241238
bobmods.lib.tech.add_prerequisite("water-miner-1", "automation-science-pack")
242239
bobmods.lib.tech.add_prerequisite("water-miner-1", "electricity")
243240
end
244241

245-
bobmods.lib.tech.add_recipe_unlock("steam-power", "boiler")
246-
bobmods.lib.tech.add_recipe_unlock("steam-power", "offshore-pump")
247-
if data.raw.recipe["steam-mining-drill"] then
248-
data.raw.recipe["steam-mining-drill"].enabled = false
249-
bobmods.lib.tech.add_recipe_unlock("steam-power", "steam-mining-drill")
250-
end
251-
if data.raw.recipe["steam-inserter"] then
252-
data.raw.recipe["steam-inserter"].enabled = false
253-
bobmods.lib.tech.add_recipe_unlock("steam-power", "steam-inserter")
254-
end
255-
256242
if data.raw.technology["basic-automation"] then
257243
bobmods.lib.tech.add_prerequisite("automation", "basic-automation")
258244
bobmods.lib.tech.replace_science_pack("basic-automation", "automation-science-pack", "steam-science-pack")

bobtech/prototypes/technology/technology.lua

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,6 @@ if settings.startup["bobmods-burnerphase"].value == true then
136136
},
137137
})
138138

139-
data:extend({
140-
{
141-
type = "technology",
142-
name = "steam-power",
143-
icon = "__base__/graphics/icons/fluid/steam.png",
144-
icon_size = 64,
145-
prerequisites = {},
146-
effects = {},
147-
unit = {
148-
count = 10,
149-
ingredients = {
150-
{ "steam-science-pack", 1 },
151-
},
152-
time = 10,
153-
},
154-
ignore_tech_cost_multiplier = true,
155-
order = "c-a",
156-
},
157-
})
158-
159139
bobmods.lib.recipe.enabled("automation-science-pack", false)
160140
bobmods.lib.recipe.enabled("boiler", false)
161141
bobmods.lib.recipe.enabled("steam-engine", false)

0 commit comments

Comments
 (0)