Skip to content

Commit 5b81441

Browse files
QatavinKiwiHawk
Qatavin
and
KiwiHawk
authored
Productivity removal (#264)
* Remove productivity * Remove productivity from solid fuel, to match enriched fuel * Remove productivity from vanilla sulfur * Remove productivity, make bob-fluid subgroup conditional * Make bob-fluid subgroup part of Plates only * Remove productivity, make bob-fluid subgroup conditional * Update fluid.lua Add subgroup "fluid". Remove conditional to change to "bob-fluid" (this conditional has been combined with the one in fluid-recipes.lua) * Remove productivity, make bob-fluid subgroup conditional * Remove productivity, make bob-fluid subgroup conditional * Remove ignored_by_productivity, make revamped rocket-fuel non-productive * Remove productivity * Remove unneeded ignored_by_productivity * Remove productivity * Fix gas sweetening locale, make capitalization consistent * Change default recipe category for Ferric Chloride Solution Else if Electronics is the only Bob's mod enabled, this recipe ends up on a tab on it's own * Formatting * Only add Bob's Materials group if bobplates mod is enabled * Formatting --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
1 parent 835d40e commit 5b81441

File tree

19 files changed

+91
-144
lines changed

19 files changed

+91
-144
lines changed

‎bobelectronics/graphics/icons/technology/fluids.png‎

-5.96 KB
Binary file not shown.

‎bobelectronics/graphics/icons/technology/intermediates.png‎

-8.36 KB
Binary file not shown.

‎bobelectronics/graphics/icons/technology/resources.png‎

-6.88 KB
Binary file not shown.

‎bobelectronics/prototypes/category.lua‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,77 +15,28 @@ data:extend({
1515
type = "recipe-category",
1616
name = "electronics-with-fluid",
1717
},
18-
19-
{
20-
type = "item-group",
21-
name = "bob-fluid-products",
22-
order = "c-f",
23-
icon = "__bobelectronics__/graphics/icons/technology/fluids.png",
24-
icon_size = 64,
25-
},
26-
27-
{
28-
type = "item-subgroup",
29-
name = "bob-fluid",
30-
group = "bob-fluid-products",
31-
order = "a-a",
32-
},
33-
34-
{
35-
type = "item-group",
36-
name = "bob-resource-products",
37-
order = "c-g",
38-
icon = "__bobelectronics__/graphics/icons/technology/resources.png",
39-
icon_size = 64,
40-
},
41-
4218
{
4319
type = "item-subgroup",
4420
name = "bob-resource",
45-
group = "bob-resource-products",
46-
order = "b-b",
47-
},
48-
{
49-
type = "item-subgroup",
50-
name = "bob-resource-chemical",
51-
group = "bob-resource-products",
52-
order = "b-b-a",
53-
},
54-
{
55-
type = "item-subgroup",
56-
name = "bob-material-smelting",
57-
group = "bob-resource-products",
58-
order = "c-a-a",
59-
},
60-
{
61-
type = "item-subgroup",
62-
name = "bob-material-chemical",
63-
group = "bob-resource-products",
64-
order = "c-a-b",
65-
},
66-
{
67-
type = "item-subgroup",
68-
name = "bob-alloy",
69-
group = "bob-resource-products",
70-
order = "c-b",
21+
group = "intermediate-products",
22+
order = "e-a1",
7123
},
72-
7324
{
7425
type = "item-subgroup",
7526
name = "bob-electronic-components",
7627
group = "intermediate-products",
77-
order = "e-a1",
28+
order = "e-a2",
7829
},
7930
{
8031
type = "item-subgroup",
8132
name = "bob-boards",
8233
group = "intermediate-products",
83-
order = "e-a2",
34+
order = "e-a3",
8435
},
8536
{
8637
type = "item-subgroup",
8738
name = "bob-electronic-boards",
8839
group = "intermediate-products",
89-
order = "e-a3",
40+
order = "e-a4",
9041
},
9142
})

‎bobelectronics/prototypes/chemicals.lua‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ data:extend({
44
name = "ferric-chloride-solution",
55
icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png",
66
icon_size = 32,
7-
subgroup = "bob-fluid",
7+
subgroup = "fluid",
88
default_temperature = 25,
99
heat_capacity = "1kJ",
1010
base_color = { r = 0.7, g = 0.6, b = 0.2 },
@@ -18,7 +18,7 @@ data:extend({
1818
name = "ferric-chloride-solution",
1919
icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png",
2020
icon_size = 32,
21-
subgroup = "bob-fluid",
21+
subgroup = "fluid-recipes",
2222
order = "b[fluid-chemistry]-a[ferric-chloride-solution]",
2323
category = "chemistry",
2424
enabled = false,
@@ -36,10 +36,14 @@ data:extend({
3636
tertiary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 },
3737
},
3838
allow_decomposition = false,
39-
allow_productivity = true,
4039
},
4140
})
4241

42+
if data.raw["item-subgroup"]["bob-fluid"] then
43+
data.raw.recipe["ferric-chloride-solution"].subgroup = "bob-fluid"
44+
data.raw.fluid["ferric-chloride-solution"].subgroup = "bob-fluid"
45+
end
46+
4347
data:extend({
4448
{
4549
type = "recipe",

‎bobelectronics/prototypes/resource.lua‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data:extend({
4242
name = "bob-resin-oil",
4343
localised_name = { "item-name.resin" },
4444
category = "chemistry",
45-
subgroup = "bob-resource-chemical",
45+
subgroup = "bob-resource",
4646
energy_required = 1,
4747
enabled = false,
4848
ingredients = {
@@ -86,7 +86,7 @@ data:extend({
8686
type = "recipe",
8787
name = "bob-rubber",
8888
localised_name = { "item-name.rubber" },
89-
subgroup = "bob-material-smelting",
89+
subgroup = "bob-resource",
9090
category = "smelting",
9191
energy_required = 3.5,
9292
enabled = false,
@@ -105,7 +105,7 @@ data:extend({
105105
name = "synthetic-wood",
106106
icon = "__bobelectronics__/graphics/icons/synthetic-wood.png",
107107
icon_size = 32,
108-
subgroup = "bob-resource-chemical",
108+
subgroup = "bob-resource",
109109
localised_name = { "recipe-name.synthetic-wood" },
110110
category = "chemistry",
111111
energy_required = 1,
@@ -170,7 +170,7 @@ if data.raw.item["tin-plate"] then
170170
name = "solder-alloy",
171171
icon = "__bobelectronics__/graphics/icons/solder-plate.png",
172172
icon_size = 32,
173-
subgroup = "bob-alloy",
173+
subgroup = "raw-material",
174174
order = "c-b-h[solder]",
175175
stack_size = 200,
176176
drop_sound = {
@@ -202,6 +202,9 @@ if data.raw.item["tin-plate"] then
202202
allow_productivity = true,
203203
},
204204
})
205+
if data.raw["item-subgroup"]["bob-alloy"] then
206+
data.raw.item["solder-alloy"].subgroup = "bob-alloy"
207+
end
205208
if data.raw.item["silver-plate"] then
206209
table.insert(data.raw.recipe["solder-alloy"].ingredients, { type = "item", name = "silver-plate", amount = 1 })
207210
end

‎bobplates/data-updates.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ if data.raw["god-controller"] and data.raw["god-controller"]["default"] then
77
data.raw["god-controller"]["default"].inventory_size = settings.startup["bobmods-plates-inventorysize"].value
88
end
99

10+
--Sulfur update
11+
data.raw.recipe["sulfur"].allow_productivity = false
12+
data.raw.recipe["sulfuric-acid"].allow_productivity = false
13+
1014
--Electrolyser power
1115
if settings.startup["bobmods-plates-expensive-electrolysis"].value == true then
1216
if feature_flags["quality"] then

‎bobplates/prototypes/category.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,19 +316,19 @@ data:extend({
316316
type = "item-subgroup",
317317
name = "bob-electronic-components",
318318
group = "intermediate-products",
319-
order = "e-a1",
319+
order = "e-a2",
320320
},
321321
{
322322
type = "item-subgroup",
323323
name = "bob-boards",
324324
group = "intermediate-products",
325-
order = "e-a2",
325+
order = "e-a3",
326326
},
327327
{
328328
type = "item-subgroup",
329329
name = "bob-electronic-boards",
330330
group = "intermediate-products",
331-
order = "e-a3",
331+
order = "e-a4",
332332
},
333333

334334
{

‎bobplates/prototypes/recipe/chemistry-recipe.lua‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ data:extend({
142142
{ type = "fluid", name = "oxygen", amount = 12.5 },
143143
},
144144
allow_decomposition = false,
145-
allow_productivity = true,
146145
},
147146

148147
{
@@ -169,7 +168,6 @@ data:extend({
169168
tertiary = { r = 0.25, g = 0.5, b = 0.25, a = 0.000 },
170169
},
171170
allow_decomposition = false,
172-
allow_productivity = true,
173171
},
174172

175173
{
@@ -192,7 +190,6 @@ data:extend({
192190
{ type = "fluid", name = "hydrogen", amount = 10 },
193191
},
194192
allow_decomposition = false,
195-
allow_productivity = true,
196193
},
197194

198195
{
@@ -214,7 +211,6 @@ data:extend({
214211
{ type = "fluid", name = "hydrogen", amount = 20 },
215212
},
216213
allow_decomposition = false,
217-
allow_productivity = true,
218214
},
219215

220216
{
@@ -239,7 +235,6 @@ data:extend({
239235
secondary = { r = 0.7, g = 0.0, b = 0.0, a = 0.000 },
240236
tertiary = { r = 0.8, g = 0.0, b = 1.0, a = 0.000 },
241237
},
242-
allow_productivity = true,
243238
},
244239

245240
{
@@ -264,7 +259,6 @@ data:extend({
264259
secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 },
265260
tertiary = { r = 0.2, g = 0.7, b = 0.0, a = 0.000 },
266261
},
267-
allow_productivity = true,
268262
},
269263

270264
{
@@ -289,7 +283,6 @@ data:extend({
289283
secondary = { r = 1.0, g = 0.7, b = 0.0, a = 0.000 },
290284
tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 },
291285
},
292-
allow_productivity = true,
293286
},
294287

295288
{
@@ -315,7 +308,6 @@ data:extend({
315308
tertiary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 },
316309
},
317310
allow_decomposition = false,
318-
allow_productivity = true,
319311
},
320312

321313
{
@@ -367,7 +359,6 @@ data:extend({
367359
tertiary = { r = 0.564, g = 0.795, b = 0.000, a = 0.000 }, -- #8fca0000
368360
},
369361
allow_decomposition = false,
370-
allow_productivity = true,
371362
},
372363

373364
{
@@ -391,7 +382,6 @@ data:extend({
391382
tertiary = { r = 0.9, g = 0.9, b = 0.25, a = 0.000 },
392383
},
393384
allow_decomposition = false,
394-
allow_productivity = true,
395385
},
396386

397387
{
@@ -418,7 +408,6 @@ data:extend({
418408
tertiary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 },
419409
},
420410
allow_decomposition = false,
421-
allow_productivity = true,
422411
},
423412

424413
{
@@ -482,7 +471,6 @@ data:extend({
482471
},
483472
results = { { type = "item", name = "salt", amount = 1 } },
484473
allow_decomposition = false,
485-
allow_productivity = true,
486474
},
487475

488476
{
@@ -520,7 +508,6 @@ data:extend({
520508
tertiary = { r = 0.960, g = 0.806, b = 0.000, a = 0.000 }, -- #f4cd0000
521509
},
522510
allow_decomposition = false,
523-
allow_productivity = true,
524511
},
525512

526513
{
@@ -541,7 +528,6 @@ data:extend({
541528
secondary = { r = 0.7, g = 0.5, b = 0.0, a = 0.000 },
542529
tertiary = { r = 0.5, g = 0.05, b = 0.4, a = 0.000 },
543530
},
544-
allow_productivity = true,
545531
},
546532

547533
{
@@ -776,7 +762,6 @@ data:extend({
776762
secondary = { r = 1.0, g = 1.0, b = 1.0, a = 0.000 },
777763
tertiary = { r = 0.9, g = 0.9, b = 0.45, a = 0.000 },
778764
},
779-
allow_productivity = true,
780765
},
781766

782767
{
@@ -799,7 +784,6 @@ data:extend({
799784
tertiary = { r = 0.960, g = 0.806, b = 0.000 },
800785
},
801786
allow_decomposition = false,
802-
allow_productivity = true,
803787
},
804788

805789
{
@@ -826,7 +810,6 @@ data:extend({
826810
tertiary = { r = 0.564, g = 0.795, b = 0.000 },
827811
},
828812
allow_decomposition = false,
829-
allow_productivity = true,
830813
},
831814

832815
{
@@ -873,7 +856,6 @@ data:extend({
873856
{ type = "fluid", name = "oxygen", amount = 12.5 },
874857
},
875858
allow_decomposition = false,
876-
allow_productivity = true,
877859
},
878860
})
879861

@@ -904,7 +886,6 @@ if not feature_flags["quality"] then
904886
secondary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 },
905887
tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 },
906888
},
907-
allow_productivity = true,
908889
},
909890

910891
{

‎bobplates/prototypes/recipe/resource-recipe.lua‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ data:extend({
249249
secondary = { r = 0.589, g = 0.540, b = 0.615, a = 0.361 },
250250
tertiary = { r = 0.469, g = 0.145, b = 0.695, a = 0.000 },
251251
},
252-
allow_productivity = true,
253252
},
254253

255254
{
@@ -273,3 +272,7 @@ data:extend({
273272
},
274273
},
275274
})
275+
276+
data.raw.recipe["solid-fuel-from-petroleum-gas"].allow_productivity = false
277+
data.raw.recipe["solid-fuel-from-light-oil"].allow_productivity = false
278+
data.raw.recipe["solid-fuel-from-heavy-oil"].allow_productivity = false

0 commit comments

Comments
 (0)