Skip to content

Commit f2848b0

Browse files
author
notnotmelon
committed
Formatting
1 parent 58e20e0 commit f2848b0

11 files changed

Lines changed: 65 additions & 64 deletions

‎compat/gregtorio.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ data.raw.technology["factory-architecture-t1"].prerequisites = {
44
"logistics",
55
"smelt-iron-ingots",
66
"craft-iron-tools"
7-
}
7+
}

‎compat/pyanodon.lua‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,28 @@ data.raw.technology["factory-connection-type-chest"].unit.ingredients = {
3333
}
3434

3535
data.raw.recipe["factory-1"].ingredients = {
36-
{type = "item", name = "concrete", amount = 500},
37-
{type = "item", name = "steel-plate", amount = 100},
36+
{type = "item", name = "concrete", amount = 500},
37+
{type = "item", name = "steel-plate", amount = 100},
3838
{type = "item", name = "tinned-cable", amount = 100},
3939
{type = "item", name = "treated-wood", amount = 100},
4040
}
4141

4242
data.raw.recipe["factory-2"].ingredients = {
43-
{type = "item", name = "factory-1", amount = 1},
44-
{type = "item", name = "py-asphalt", amount = 300},
43+
{type = "item", name = "factory-1", amount = 1},
44+
{type = "item", name = "py-asphalt", amount = 300},
4545
{type = "item", name = "concrete-wall", amount = 100},
46-
{type = "item", name = "fiberboard", amount = 100},
47-
{type = "item", name = "bolts", amount = 500},
48-
{type = "item", name = "tinned-cable", amount = 100},
46+
{type = "item", name = "fiberboard", amount = 100},
47+
{type = "item", name = "bolts", amount = 500},
48+
{type = "item", name = "tinned-cable", amount = 100},
4949
}
5050

51+
local heating_unit = mods.pyalternativeenergy and "heating-system" or "simik"
5152
data.raw.recipe["factory-3"].ingredients = {
52-
{type = "item", name = "factory-2", amount = 1},
53-
{type = "item", name = "super-steel", amount = 500},
54-
{type = "item", name = "super-alloy", amount = 500},
55-
{type = "item", name = mods.pyalternativeenergy and "heating-system" or "simik", amount = 1},
56-
{type = "item", name = "tinned-cable", amount = 100},
53+
{type = "item", name = "factory-2", amount = 1},
54+
{type = "item", name = "super-steel", amount = 500},
55+
{type = "item", name = "super-alloy", amount = 500},
56+
{type = "item", name = heating_unit, amount = 1},
57+
{type = "item", name = "tinned-cable", amount = 100},
5758
{type = "item", name = "nexelit-substation", amount = 2},
58-
{type = "item", name = "fiberglass", amount = 200},
59-
}
59+
{type = "item", name = "fiberglass", amount = 200},
60+
}

‎lib/string.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ end
3232
---@param ending string
3333
---@return boolean
3434
string.ends_with = function(s, ending)
35-
return ending == "" or s:sub(-#ending) == ending
36-
end
35+
return ending == "" or s:sub(- #ending) == ending
36+
end

‎migrations/item-request-proxy.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ for _, factory in pairs(storage.factories or {}) do
77
end
88
end
99
end
10-
end
10+
end

‎migrations/new-factory-preview.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ for _, player in pairs(game.players) do
99
if camera_frame then camera_frame.destroy() end
1010
end
1111

12-
storage.player_preview_active = nil
12+
storage.player_preview_active = nil

‎prototypes/factory.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,4 +509,4 @@ if mods["space-exploration"] then
509509
data.raw["storage-tank"]["space-factory-1"].collision_mask.layers.moving_tile = nil
510510
data.raw["storage-tank"]["space-factory-2"].collision_mask.layers.moving_tile = nil
511511
data.raw["storage-tank"]["space-factory-3"].collision_mask.layers.moving_tile = nil
512-
end
512+
end

‎prototypes/quality-tooltips.lua‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ local function add_quality_factoriopedia_info(entity, factoriopedia_info)
3434
end
3535

3636
add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-1"], {
37-
{"interior-space", function(entity, quality_level) return "30×30" end},
37+
{"interior-space", function(entity, quality_level) return "30×30" end},
3838
{"connections", function(entity, quality_level)
3939
local connection_count
4040
if quality_level <= 0 then
@@ -56,7 +56,7 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-1"], {
5656
})
5757

5858
add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-2"], {
59-
{"interior-space", function(entity, quality_level) return "46×46" end},
59+
{"interior-space", function(entity, quality_level) return "46×46" end},
6060
{"connections", function(entity, quality_level)
6161
local connection_count
6262
if quality_level <= 0 then
@@ -78,7 +78,7 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-2"], {
7878
})
7979

8080
add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-3"], {
81-
{"interior-space", function(entity, quality_level) return "60×60" end},
81+
{"interior-space", function(entity, quality_level) return "60×60" end},
8282
{"connections", function(entity, quality_level)
8383
local connection_count
8484
if quality_level <= 0 then
@@ -102,7 +102,7 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["factory-3"], {
102102
if not settings.startup["Factorissimo2-space-architecture"].value then return end
103103

104104
add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-1"], {
105-
{"interior-space", function(entity, quality_level) return "30×30" end},
105+
{"interior-space", function(entity, quality_level) return "30×30" end},
106106
{"connections", function(entity, quality_level)
107107
local connection_count
108108
if quality_level <= 0 then
@@ -124,7 +124,7 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-1"], {
124124
})
125125

126126
add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-2"], {
127-
{"interior-space", function(entity, quality_level) return "46×46" end},
127+
{"interior-space", function(entity, quality_level) return "46×46" end},
128128
{"connections", function(entity, quality_level)
129129
local connection_count
130130
if quality_level <= 0 then
@@ -146,7 +146,7 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-2"], {
146146
})
147147

148148
add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-3"], {
149-
{"interior-space", function(entity, quality_level) return "60×60" end},
149+
{"interior-space", function(entity, quality_level) return "60×60" end},
150150
{"connections", function(entity, quality_level)
151151
local connection_count
152152
if quality_level <= 0 then
@@ -165,4 +165,4 @@ add_quality_factoriopedia_info(data.raw["storage-tank"]["space-factory-3"], {
165165
return connection_count
166166
end},
167167
{"fluid-transfer-speed", function(entity, quality_level) return tostring(FACTORY_PUMPING_SPEED * get_quality_buff(quality_level)) .. "/s" end}
168-
})
168+
})

‎prototypes/recipe.lua‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,50 +96,50 @@ if settings.startup["Factorissimo2-space-architecture"].value then
9696
if mods["space-exploration"] then
9797
data.raw.recipe["space-factory-1"].ingredients = {
9898
{type = "item", name = "se-space-solar-panel", amount = 10},
99-
{type = "item", name = "se-aeroframe-pole", amount = 1000},
100-
{type = "item", name = "se-heat-shielding", amount = 1000},
101-
{type = "item", name = "se-space-platform-scaffold", amount = 30*30},
102-
{type = "item", name = "substation", amount = 50},
99+
{type = "item", name = "se-aeroframe-pole", amount = 1000},
100+
{type = "item", name = "se-heat-shielding", amount = 1000},
101+
{type = "item", name = "se-space-platform-scaffold", amount = 30 * 30},
102+
{type = "item", name = "substation", amount = 50},
103103
}
104104
data.raw.recipe["space-factory-2"].ingredients = {
105-
{type = "item", name = "se-space-solar-panel-2", amount = 20},
106-
{type = "item", name = "se-aeroframe-scaffold", amount = 1500},
107-
{type = "item", name = "se-heat-shielding", amount = 1500},
108-
{type = "item", name = "se-space-platform-plating", amount = 46*46},
109-
{type = "item", name = "se-pylon", amount = 50},
105+
{type = "item", name = "se-space-solar-panel-2", amount = 20},
106+
{type = "item", name = "se-aeroframe-scaffold", amount = 1500},
107+
{type = "item", name = "se-heat-shielding", amount = 1500},
108+
{type = "item", name = "se-space-platform-plating", amount = 46 * 46},
109+
{type = "item", name = "se-pylon", amount = 50},
110110
}
111111
data.raw.recipe["space-factory-3"].ingredients = {
112-
{type = "item", name = "se-space-solar-panel-3", amount = 30},
113-
{type = "item", name = "se-aeroframe-bulkhead", amount = 2000},
114-
{type = "item", name = "se-heavy-composite", amount = 2000},
115-
{type = "item", name = "se-spaceship-floor", amount = 60*60},
116-
{type = "item", name = "se-pylon-construction", amount = 50},
117-
{type = "item", name = "se-deep-space-transport-belt-black", amount = 10},
112+
{type = "item", name = "se-space-solar-panel-3", amount = 30},
113+
{type = "item", name = "se-aeroframe-bulkhead", amount = 2000},
114+
{type = "item", name = "se-heavy-composite", amount = 2000},
115+
{type = "item", name = "se-spaceship-floor", amount = 60 * 60},
116+
{type = "item", name = "se-pylon-construction", amount = 50},
117+
{type = "item", name = "se-deep-space-transport-belt-black", amount = 10},
118118
}
119119
data.raw.recipe["space-factory-1"].category = "space-manufacturing"
120120
data.raw.recipe["space-factory-2"].category = "space-manufacturing"
121121
data.raw.recipe["space-factory-3"].category = "space-manufacturing"
122122
elseif mods["space-age"] then
123123
data.raw.recipe["space-factory-1"].ingredients = {
124-
{type = "item", name = "factory-1", amount = 1},
125-
{type = "item", name = "low-density-structure", amount = 500},
126-
{type = "item", name = "solar-panel", amount = 10},
127-
{type = "item", name = "space-platform-foundation", amount = 300},
124+
{type = "item", name = "factory-1", amount = 1},
125+
{type = "item", name = "low-density-structure", amount = 500},
126+
{type = "item", name = "solar-panel", amount = 10},
127+
{type = "item", name = "space-platform-foundation", amount = 300},
128128
}
129129
data.raw.recipe["space-factory-2"].ingredients = {
130-
{type = "item", name = "factory-2", amount = 1},
131-
{type = "item", name = "low-density-structure", amount = 1000},
132-
{type = "item", name = "solar-panel", amount = 30},
133-
{type = "item", name = "space-platform-foundation", amount = 600},
130+
{type = "item", name = "factory-2", amount = 1},
131+
{type = "item", name = "low-density-structure", amount = 1000},
132+
{type = "item", name = "solar-panel", amount = 30},
133+
{type = "item", name = "space-platform-foundation", amount = 600},
134134
}
135135
data.raw.recipe["space-factory-3"].ingredients = {
136-
{type = "item", name = "factory-3", amount = 1},
137-
{type = "item", name = "low-density-structure", amount = 2000},
138-
{type = "item", name = "solar-panel", amount = 50},
139-
{type = "item", name = "space-platform-foundation", amount = 900},
136+
{type = "item", name = "factory-3", amount = 1},
137+
{type = "item", name = "low-density-structure", amount = 2000},
138+
{type = "item", name = "solar-panel", amount = 50},
139+
{type = "item", name = "space-platform-foundation", amount = 900},
140140
}
141141
data.raw.recipe["space-factory-1"].category = "metallurgy"
142142
data.raw.recipe["space-factory-2"].category = "metallurgy"
143143
data.raw.recipe["space-factory-3"].category = "metallurgy"
144144
end
145-
end
145+
end

‎prototypes/space-age-rebalance.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,4 @@ data.raw["recipe"]["space-factory-2"].surface_conditions = {{
209209
data.raw["recipe"]["space-factory-3"].surface_conditions = {{
210210
property = "gravity",
211211
max = 0.1
212-
}}
212+
}}

‎prototypes/space-location.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:extend {{
2626
},
2727
}}
2828

29-
data:extend{{
29+
data:extend {{
3030
type = "sprite",
3131
name = "factory-floor-space",
3232
filename = "__factorissimo-2-notnotmelon__/graphics/icon/factory-floor-space.png",

0 commit comments

Comments
 (0)