Skip to content

Commit aa9ecb4

Browse files
przemo1232przemo1232
committed
remove shorthand recipe declarations
1 parent fad989d commit aa9ecb4

File tree

11 files changed

+184
-183
lines changed

11 files changed

+184
-183
lines changed

‎changelog.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 3.2.4
3+
Date: tba
4+
Internal:
5+
- removed shorthand recipe declarations
6+
---------------------------------------------------------------------------------------------------
27
Version: 3.2.3
38
Date: 2025-04-15
49
Features:

‎prototypes/buildings/atomizer-mk00.lua‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ RECIPE {
44
energy_required = 0.5,
55
enabled = false,
66
ingredients = {
7-
{"washer-mk00", 1},
8-
{"iron-plate", 15},
9-
{"copper-plate", 20},
10-
{"pipe", 10}
7+
{type = "item", name = "washer-mk00", amount = 1},
8+
{type = "item", name = "iron-plate", amount = 15},
9+
{type = "item", name = "copper-plate", amount = 20},
10+
{type = "item", name = "pipe", amount = 10}
1111
},
1212
results = {
13-
{"atomizer-mk00", 1}
13+
{type = "item", name = "atomizer-mk00", amount = 1}
1414
}
1515
}:add_unlock("atomizer-mk00")
1616

@@ -50,7 +50,7 @@ ENTITY {
5050
effectivity = 1,
5151
fuel_inventory_size = 1,
5252
burnt_inventory_size = 1,
53-
emissions_per_minute = { pollution = 0.06 }
53+
emissions_per_minute = {pollution = 0.06}
5454
},
5555
energy_usage = "300kW",
5656
graphics_set = {
@@ -135,4 +135,4 @@ ENTITY {
135135
apparent_volume = 2.5
136136
},
137137
_upgrade = "atomizer-mk01"
138-
}
138+
}

‎prototypes/buildings/automated-screener-mk00.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ RECIPE {
44
energy_required = 10,
55
enabled = false,
66
ingredients = {
7-
{"iron-plate", 40},
8-
{"iron-gear-wheel", 10},
9-
{"stone-brick", 16}
7+
{type = "item", name = "iron-plate", amount = 40},
8+
{type = "item", name = "iron-gear-wheel", amount = 10},
9+
{type = "item", name = "stone-brick", amount = 16}
1010
},
1111
results = {
12-
{"automated-screener-mk00", 1}
12+
{type = "item", name = "automated-screener-mk00", amount = 1}
1313
}
1414
}:add_unlock("glass")
1515

1616
ITEM {
1717
type = "item",
1818
name = "automated-screener-mk00",
1919
icon = "__PyBlock__/graphics/icons/automated-screener-mk00.png",
20-
icon_size = 64,
20+
icon_size = 64,
2121
flags = {},
2222
subgroup = "py-fusion-buildings-mk00",
2323
order = "d",
@@ -49,7 +49,7 @@ ENTITY {
4949
effectivity = 1,
5050
fuel_inventory_size = 1,
5151
burnt_inventory_size = 1,
52-
emissions_per_minute = { pollution = 0.06 }
52+
emissions_per_minute = {pollution = 0.06}
5353
},
5454
energy_usage = "80kW",
5555
graphics_set = {

‎prototypes/buildings/compost-plant-mk00.lua‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ RECIPE {
44
energy_required = 0.5,
55
enabled = false,
66
ingredients = {
7-
{"boiler", 2},
8-
{"steel-plate", 20},
9-
{"iron-gear-wheel", 10},
10-
{"steam-engine", 2},
7+
{type = "item", name = "boiler", amount = 2},
8+
{type = "item", name = "steel-plate", amount = 20},
9+
{type = "item", name = "iron-gear-wheel", amount = 10},
10+
{type = "item", name = "steam-engine", amount = 2},
1111
},
1212
results = {
13-
{"compost-plant-mk00", 1}
13+
{type = "item", name = "compost-plant-mk00", amount = 1}
1414
}
1515
}:add_unlock("compost")
1616

@@ -54,8 +54,8 @@ ENTITY {
5454
volume = 200,
5555
pipe_covers = pipecoverspictures(),
5656
pipe_connections = {
57-
{ flow_direction = "input-output", position = {-5, 1}, direction = 12 },
58-
{ flow_direction = "input-output", position = {5, 1}, direction = 4 },
57+
{flow_direction = "input-output", position = {-5, 1}, direction = 12},
58+
{flow_direction = "input-output", position = {5, 1}, direction = 4},
5959
},
6060
filter = "steam",
6161
production_type = "input-output",

‎prototypes/buildings/ddc-mk00.lua‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
function make_2way_animation_from_spritesheet(animation)
32
local function make_animation_layer(idx, anim)
43
return
@@ -28,8 +27,8 @@ function make_2way_animation_from_spritesheet(animation)
2827

2928
local function make_animation(idx)
3029
if animation.layers then
31-
local tab = { layers = {} }
32-
for k,v in ipairs(animation.layers) do
30+
local tab = {layers = {}}
31+
for k, v in ipairs(animation.layers) do
3332
table.insert(tab.layers, make_animation_layer_with_hr_version(idx, v))
3433
end
3534
return tab
@@ -48,31 +47,31 @@ function make_2way_animation_from_spritesheet(animation)
4847
end
4948

5049
RECIPE {
51-
type = "recipe",
52-
name = "ddc-mk00",
53-
energy_required = 8,
54-
enabled = true,
55-
ingredients =
56-
{
57-
{name = "iron-plate", amount = 15},
58-
{name = "stone-furnace", amount = 1},
59-
{name = "pipe", amount = 5}
60-
},
61-
results = {
62-
{name = "ddc-mk00", amount = 1}
63-
}
50+
type = "recipe",
51+
name = "ddc-mk00",
52+
energy_required = 8,
53+
enabled = true,
54+
ingredients =
55+
{
56+
{type = "item", name = "iron-plate", amount = 15},
57+
{type = "item", name = "stone-furnace", amount = 1},
58+
{type = "item", name = "pipe", amount = 5}
59+
},
60+
results = {
61+
{type = "item", name = "ddc-mk00", amount = 1}
62+
}
6463
}
6564

6665
ITEM {
67-
type = "item",
68-
name = "ddc-mk00",
69-
icon = "__PyBlock__/graphics/icons/distilator-mk00.png",
70-
icon_size = 64,
71-
flags = {},
72-
subgroup = "py-cp-buildings-mk00",
73-
order = "k",
74-
place_result = "ddc-mk00",
75-
stack_size = 20
66+
type = "item",
67+
name = "ddc-mk00",
68+
icon = "__PyBlock__/graphics/icons/distilator-mk00.png",
69+
icon_size = 64,
70+
flags = {},
71+
subgroup = "py-cp-buildings-mk00",
72+
order = "k",
73+
place_result = "ddc-mk00",
74+
stack_size = 20
7675
}
7776

7877
ENTITY {
@@ -84,16 +83,16 @@ ENTITY {
8483
minable = {mining_time = 1, result = "ddc-mk00"},
8584
max_health = 200,
8685
corpse = "medium-remnants",
87-
repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" },
88-
mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" },
89-
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
90-
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
91-
vehicle_impact_sound = { filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0 },
92-
working_sound = { sound = { filename = "__base__/sound/furnace.ogg" }},
86+
repair_sound = {filename = "__base__/sound/manual-repair-simple.ogg"},
87+
mined_sound = {filename = "__base__/sound/deconstruct-bricks.ogg"},
88+
open_sound = {filename = "__base__/sound/machine-open.ogg", volume = 0.85},
89+
close_sound = {filename = "__base__/sound/machine-close.ogg", volume = 0.75},
90+
vehicle_impact_sound = {filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0},
91+
working_sound = {sound = {filename = "__base__/sound/furnace.ogg"}},
9392
resistances = {
94-
{ type = "fire", percent = 90 },
95-
{ type = "explosion", percent = 30 },
96-
{ type = "impact", percent = 30 }
93+
{type = "fire", percent = 90},
94+
{type = "explosion", percent = 30},
95+
{type = "impact", percent = 30}
9796
},
9897
collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
9998
selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
@@ -103,17 +102,17 @@ ENTITY {
103102
volume = 100,
104103
pipe_covers = pipecoverspictures(),
105104
pipe_connections = {
106-
{ flow_direction = "output", position = {-1, -1}, direction = 0 },
107-
{ flow_direction = "output", position = {-1, -1}, direction = 12 }
105+
{flow_direction = "output", position = {-1, -1}, direction = 0},
106+
{flow_direction = "output", position = {-1, -1}, direction = 12}
108107
}
109108
},
110109
{
111110
production_type = "output",
112111
volume = 100,
113112
pipe_covers = pipecoverspictures(),
114113
pipe_connections = {
115-
{ flow_direction = "output", position = {1, 1}, direction = 4 },
116-
{ flow_direction = "output", position = {1, 1}, direction = 8 }
114+
{flow_direction = "output", position = {1, 1}, direction = 4},
115+
{flow_direction = "output", position = {1, 1}, direction = 8}
117116
}
118117
}
119118
},
@@ -142,7 +141,7 @@ ENTITY {
142141
}
143142
},
144143
graphics_set = {
145-
animation = make_2way_animation_from_spritesheet({ layers = {
144+
animation = make_2way_animation_from_spritesheet {layers = {
146145
{
147146
filename = "__PyBlock__/graphics/ddc-mk00.png",
148147
priority = "extra-high",
@@ -182,7 +181,7 @@ ENTITY {
182181
scale = 0.5
183182
}
184183
}
185-
}}),
184+
}},
186185
working_visualisations = {
187186
{
188187
north_position = {0.0, 0.0},
@@ -212,7 +211,7 @@ ENTITY {
212211
scale = 0.5
213212
}
214213
},
215-
light = {intensity = 1, size = 1, color = {r=1.0, g=1.0, b=1.0}}
214+
light = {intensity = 1, size = 1, color = {r = 1.0, g = 1.0, b = 1.0}}
216215
}
217216
}
218217
}

‎prototypes/buildings/fwf-mk00.lua‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ RECIPE {
44
energy_required = 1,
55
enabled = true,
66
ingredients = {
7-
{"stone-brick", 50},
8-
{"iron-plate", 25},
9-
{"pipe", 5},
10-
{"copper-cable", 2},
11-
{"iron-gear-wheel", 20},
7+
{type = "item", name = "stone-brick", amount = 50},
8+
{type = "item", name = "iron-plate", amount = 25},
9+
{type = "item", name = "pipe", amount = 5},
10+
{type = "item", name = "copper-cable", amount = 2},
11+
{type = "item", name = "iron-gear-wheel", amount = 20},
1212
},
1313
results = {
14-
{"fwf-mk00", 1}
14+
{type = "item", name = "fwf-mk00", amount = 1}
1515
}
1616
}
1717

@@ -31,7 +31,7 @@ ENTITY {
3131
type = "assembling-machine",
3232
name = "fwf-mk00",
3333
icon = "__PyBlock__/graphics/icons/fwf-mk00.png",
34-
icon_size = 32,
34+
icon_size = 32,
3535
flags = {"placeable-neutral", "player-creation"},
3636
minable = {mining_time = 0.5, result = "fwf-mk00"},
3737
fast_replaceable_group = "fwf",
@@ -47,28 +47,28 @@ ENTITY {
4747
module_slots = 12
4848
},
4949
allowed_effects = {},
50-
crafting_categories = {"fwf-basic","fwf"},
50+
crafting_categories = {"fwf-basic", "fwf"},
5151
crafting_speed = 0.1,
5252
energy_source =
5353
{
54-
type = "fluid",
55-
effectivity = 1,
56-
emissions = 1,
57-
fluid_box =
54+
type = "fluid",
55+
effectivity = 1,
56+
emissions = 1,
57+
fluid_box =
5858
{
59-
base_area = 1,
60-
height = 2,
61-
base_level = -1,
62-
pipe_covers = pipecoverspictures(),
63-
pipe_connections =
59+
base_area = 1,
60+
height = 2,
61+
base_level = -1,
62+
pipe_covers = pipecoverspictures(),
63+
pipe_connections =
6464
{
65-
{type = "input-output", position = {-6,1}},
66-
{type = "input-output", position = {6, 1} },
65+
{type = "input-output", position = {-6, 1}},
66+
{type = "input-output", position = {6, 1}},
6767
},
68-
filter = "steam",
69-
production_type = "input-output",
68+
filter = "steam",
69+
production_type = "input-output",
7070
},
71-
scale_fluid_usage = true,
71+
scale_fluid_usage = true,
7272
},
7373
energy_usage = "100kW",
7474
animation = {

‎prototypes/buildings/shunt-inserter.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ RECIPE {
44
energy_required = 0.5,
55
enabled = false,
66
ingredients = {
7-
{"pipe", 2 },
8-
{"iron-gear-wheel", 1 },
9-
{"iron-plate", 2 },
7+
{type = "item", name = "pipe", amount = 2},
8+
{type = "item", name = "iron-gear-wheel", amount = 1},
9+
{type = "item", name = "iron-plate", amount = 2},
1010
},
1111
results = {
12-
{"shunt-inserter", 1}
12+
{type = "item", name = "shunt-inserter", amount = 1}
1313
}
1414
}:add_unlock("atomizer-mk00")
1515

@@ -20,12 +20,12 @@ ITEM {
2020
{
2121
icon = table.deepcopy(data.raw.item["burner-inserter"].icon),
2222
icon_size = 64,
23-
tint = { 0.75, 0.75, 0.75, 1 }
23+
tint = {0.75, 0.75, 0.75, 1}
2424
},
2525
{
2626
icon = data.raw.fluid["steam"].icon,
2727
icon_size = 64,
28-
shift = { -8, 8 },
28+
shift = {-8, 8},
2929
scale = 0.25
3030
}
3131
},
@@ -43,12 +43,12 @@ ENTITY {
4343
{
4444
icon = table.deepcopy(data.raw.item["burner-inserter"].icon),
4545
icon_size = 64,
46-
tint = { 0.75, 0.75, 0.75, 1 }
46+
tint = {0.75, 0.75, 0.75, 1}
4747
},
4848
{
4949
icon = data.raw.fluid["steam"].icon,
5050
icon_size = 64,
51-
shift = { -8, 8 },
51+
shift = {-8, 8},
5252
scale = 0.25
5353
}
5454
},
@@ -68,8 +68,8 @@ ENTITY {
6868
volume = 20,
6969
pipe_covers = py.pipe_covers(true, true, true, true),
7070
pipe_connections = {
71-
{ flow_direction = "input-output", position = {0, 0}, direction = 4 },
72-
{ flow_direction = "input-output", position = {0, 0}, direction = 12 },
71+
{flow_direction = "input-output", position = {0, 0}, direction = 4},
72+
{flow_direction = "input-output", position = {0, 0}, direction = 12},
7373
},
7474
production_type = "input-output",
7575
filter = "steam",
@@ -99,6 +99,6 @@ ENTITY {
9999
}
100100

101101
data.raw["inserter"]["shunt-inserter"].icon_draw_specification.shift = {0.25, -0.25}
102-
data.raw["inserter"]["shunt-inserter"].hand_base_picture.tint = { 0.75, 0.75, 0.75, 1 }
103-
data.raw["inserter"]["shunt-inserter"].hand_open_picture.tint = { 0.75, 0.75, 0.75, 1 }
104-
data.raw["inserter"]["shunt-inserter"].hand_closed_picture.tint = { 0.75, 0.75, 0.75, 1 }
102+
data.raw["inserter"]["shunt-inserter"].hand_base_picture.tint = {0.75, 0.75, 0.75, 1}
103+
data.raw["inserter"]["shunt-inserter"].hand_open_picture.tint = {0.75, 0.75, 0.75, 1}
104+
data.raw["inserter"]["shunt-inserter"].hand_closed_picture.tint = {0.75, 0.75, 0.75, 1}

0 commit comments

Comments
 (0)