Skip to content

Commit 221faf9

Browse files
QatavinKiwiHawk
andauthored
Em plant recipe fixes #516 #517
* Update accumulators.lua * Update poles.lua * Update solar-panels.lua * Update beacon.lua * Update module-merged.lua * Update module.lua * Update assembly-electronics.lua * Allow modules to use Electronics Assembly Machines #517 * Allow modules to use Electronics Assembly Machines #517 * Allow modules to use Electronics Assembly Machines #517 * Updating mod versions and changelogs * Allow modules to use Electronics Assembly Machines #517 --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
1 parent ec61580 commit 221faf9

File tree

13 files changed

+154
-36
lines changed

13 files changed

+154
-36
lines changed

bobassembly/changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 2.0.5
3+
Date: ???
4+
Bugfixes:
5+
- Prevent electric poles, solar panels, etc from being crafted in electronics assembly machines #516
6+
---------------------------------------------------------------------------------------------------
27
Version: 2.0.4
38
Date: 15. 01. 2026
49
Changes:

bobassembly/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bobassembly",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"factorio_version": "2.0",
55
"title": "Bob's Assembling machines mod",
66
"author": "Bobingabout",

bobassembly/prototypes/assembly-electronics.lua

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,4 +620,22 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
620620
data.raw["assembling-machine"]["bob-electronics-machine-3"].fluid_boxes[1].pipe_picture_frozen = pipefrozenpatch
621621
data.raw["assembling-machine"]["bob-electronics-machine-3"].fluid_boxes[1].pipe_covers_frozen = pcfrozenpatch
622622
end
623+
624+
if mods["space-age"] then
625+
-- Prevent non electronics recipes from being craftable in an electronics assembly machine
626+
for _, recipe_name in pairs({
627+
"accumulator",
628+
"beacon",
629+
"big-electric-pole",
630+
"discharge-defense-equipment",
631+
"lightning-rod",
632+
"medium-electric-pole",
633+
"small-electric-pole",
634+
"solar-panel",
635+
"substation",
636+
}) do
637+
bobmods.lib.recipe.set_category(recipe_name, "crafting")
638+
bobmods.lib.recipe.add_additional_category(recipe_name, "electromagnetics")
639+
end
640+
end
623641
end

bobmodules/changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 2.0.6
3+
Date: ???
4+
Changes:
5+
- Allow modules to be crafted in electronics assembly machines #517
6+
---------------------------------------------------------------------------------------------------
27
Version: 2.0.5
38
Date: 15. 01. 2026
49
Changes:

bobmodules/data-updates.lua

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,6 @@ require("prototypes.recipe.module-updates")
44
require("prototypes.recipe.module-merged-updates")
55
require("prototypes.technology.module-updates")
66

7-
if mods["aai-industry"] then
8-
if not mods["bobgreenhouse"] then
9-
bobmods.lib.recipe.replace_ingredient("bob-module-circuit-board", "bob-wooden-board", "bob-phenolic-board")
10-
end
11-
end
12-
13-
bobmods.lib.recipe.add_additional_category("bob-module-circuit-board", "electronics-with-fluid")
14-
bobmods.lib.recipe.add_additional_category("bob-module-processor-board", "electronics-with-fluid")
15-
bobmods.lib.recipe.add_additional_category("bob-module-processor-board-2", "electronics-with-fluid")
16-
bobmods.lib.recipe.add_additional_category("bob-module-processor-board-3", "electronics-with-fluid")
17-
18-
bobmods.lib.recipe.add_additional_category("bob-module-case", "electronics")
19-
bobmods.lib.recipe.add_additional_category("bob-module-contact", "electronics")
20-
bobmods.lib.recipe.add_additional_category("bob-speed-processor", "electronics")
21-
bobmods.lib.recipe.add_additional_category("bob-speed-processor-2", "electronics")
22-
bobmods.lib.recipe.add_additional_category("bob-speed-processor-3", "electronics")
23-
bobmods.lib.recipe.add_additional_category("bob-efficiency-processor", "electronics")
24-
bobmods.lib.recipe.add_additional_category("bob-efficiency-processor-2", "electronics")
25-
bobmods.lib.recipe.add_additional_category("bob-efficiency-processor-3", "electronics")
26-
bobmods.lib.recipe.add_additional_category("bob-productivity-processor", "electronics")
27-
bobmods.lib.recipe.add_additional_category("bob-productivity-processor-2", "electronics")
28-
bobmods.lib.recipe.add_additional_category("bob-productivity-processor-3", "electronics")
29-
bobmods.lib.recipe.add_additional_category("bob-pollution-clean-processor", "electronics")
30-
bobmods.lib.recipe.add_additional_category("bob-pollution-clean-processor-2", "electronics")
31-
bobmods.lib.recipe.add_additional_category("bob-pollution-clean-processor-3", "electronics")
32-
bobmods.lib.recipe.add_additional_category("bob-pollution-create-processor", "electronics")
33-
bobmods.lib.recipe.add_additional_category("bob-pollution-create-processor-2", "electronics")
34-
bobmods.lib.recipe.add_additional_category("bob-pollution-create-processor-3", "electronics")
35-
if mods["quality"] then
36-
bobmods.lib.recipe.add_additional_category("bob-quality-processor", "electronics")
37-
bobmods.lib.recipe.add_additional_category("bob-quality-processor-2", "electronics")
38-
bobmods.lib.recipe.add_additional_category("bob-quality-processor-3", "electronics")
39-
end
40-
417
if mods["quality"] then
428
bobmods.lib.recipe.update_recycling_recipe({
439
"bob-module-contact",

bobmodules/prototypes/beacon.lua

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,8 @@ data:extend({
154154
})
155155

156156
data.raw.beacon["beacon"].next_upgrade = "bob-beacon-2"
157+
158+
if mods["space-age"] then
159+
bobmods.lib.recipe.add_additional_category("bob-beacon-2", "electromagnetics")
160+
bobmods.lib.recipe.add_additional_category("bob-beacon-3", "electromagnetics")
161+
end

bobmodules/prototypes/recipe/module-merged.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then
2828
results = { { type = "item", name = "bob-god-module-productivity", amount = 1 } },
2929
},
3030
})
31+
3132
if mods["quality"] then
3233
data:extend({
3334
{

bobmodules/prototypes/recipe/module-updates.lua

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,79 @@ else
104104
bobmods.lib.recipe.add_ingredient("bob-quality-module-5", { type = "item", name = "processing-unit", amount = 4 })
105105
end
106106
end
107+
108+
if mods["aai-industry"] then
109+
if not mods["bobgreenhouse"] then
110+
bobmods.lib.recipe.replace_ingredient("bob-module-circuit-board", "bob-wooden-board", "bob-phenolic-board")
111+
end
112+
end
113+
114+
bobmods.lib.recipe.add_additional_category("bob-module-circuit-board", "electronics-with-fluid")
115+
bobmods.lib.recipe.add_additional_category("bob-module-processor-board", "electronics-with-fluid")
116+
bobmods.lib.recipe.add_additional_category("bob-module-processor-board-2", "electronics-with-fluid")
117+
bobmods.lib.recipe.add_additional_category("bob-module-processor-board-3", "electronics-with-fluid")
118+
119+
for _, recipe_name in pairs({
120+
"bob-module-case",
121+
"bob-module-contact",
122+
"bob-speed-processor",
123+
"bob-speed-processor-2",
124+
"bob-speed-processor-3",
125+
"bob-efficiency-processor",
126+
"bob-efficiency-processor-2",
127+
"bob-efficiency-processor-3",
128+
"bob-productivity-processor",
129+
"bob-productivity-processor-2",
130+
"bob-productivity-processor-3",
131+
"bob-pollution-clean-processor",
132+
"bob-pollution-clean-processor-2",
133+
"bob-pollution-clean-processor-3",
134+
"bob-pollution-create-processor",
135+
"bob-pollution-create-processor-2",
136+
"bob-pollution-create-processor-3",
137+
"bob-efficiency-module-4",
138+
"bob-efficiency-module-5",
139+
"bob-god-module",
140+
"bob-god-module-productivity",
141+
"bob-pollution-clean-module-1",
142+
"bob-pollution-clean-module-2",
143+
"bob-pollution-clean-module-3",
144+
"bob-pollution-clean-module-4",
145+
"bob-pollution-clean-module-5",
146+
"bob-pollution-create-module-1",
147+
"bob-pollution-create-module-2",
148+
"bob-pollution-create-module-3",
149+
"bob-pollution-create-module-4",
150+
"bob-pollution-create-module-5",
151+
"bob-productivity-module-4",
152+
"bob-productivity-module-5",
153+
"bob-speed-module-4",
154+
"bob-speed-module-5",
155+
"efficiency-module",
156+
"efficiency-module-2",
157+
"efficiency-module-3",
158+
"productivity-module",
159+
"productivity-module-2",
160+
"productivity-module-3",
161+
"speed-module",
162+
"speed-module-2",
163+
"speed-module-3",
164+
}) do
165+
bobmods.lib.recipe.add_additional_category(recipe_name, "electronics")
166+
end
167+
168+
if mods["quality"] then
169+
for _, recipe_name in pairs({
170+
"bob-god-module-quality",
171+
"bob-quality-module-4",
172+
"bob-quality-module-5",
173+
"bob-quality-processor",
174+
"bob-quality-processor-2",
175+
"bob-quality-processor-3",
176+
"quality-module",
177+
"quality-module-2",
178+
"quality-module-3",
179+
}) do
180+
bobmods.lib.recipe.add_additional_category(recipe_name, "electronics")
181+
end
182+
end

bobpower/changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 2.0.4
3+
Date: ???
4+
Changes:
5+
- Allow higher tier electric poles, solar panels, etc. to be crafted in Electromagnetic plant #516
6+
---------------------------------------------------------------------------------------------------
27
Version: 2.0.3
38
Date: 15. 01. 2026
49
Changes:

bobpower/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bobpower",
3-
"version": "2.0.3",
3+
"version": "2.0.4",
44
"factorio_version": "2.0",
55
"title": "Bob's Power mod",
66
"author": "Bobingabout",

0 commit comments

Comments
 (0)