Skip to content

Commit d48735f

Browse files
adoubrovskyadoubrovsky
authored
Merge pull request #486 from adoubrovsky/linearized-dependencies-hightech
Linearized dependencies hightech
2 parents 9ea09ad + 7378c0a commit d48735f

35 files changed

Lines changed: 493 additions & 18 deletions

‎prototypes/buildings/advanced-foundry.lua‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,18 @@ RECIPE {
178178
{type = "item", name = "electric-engine-unit", amount = 4},
179179
{type = "item", name = "titanium-plate", amount = 10},
180180
{type = "item", name = "super-steel", amount = 20},
181+
{type = "item", name = "nbti-alloy", amount = 20},
182+
{type = "item", name = "py-heat-exchanger", amount = 1},
181183
},
182184
results = {
183185
{type = "item", name = "advanced-foundry-mk03", amount = 1}
184186
}
185187
}
186188

189+
if mods.pyhightech then
190+
RECIPE("advanced-foundry-mk03"):add_ingredient_unsafe {type = "item", name = "paramagnetic-material", amount = 20}:add_ingredient_unsafe {type = "item", name = "harmonic-absorber", amount = 15}
191+
end
192+
187193
RECIPE {
188194
type = "recipe",
189195
name = "advanced-foundry-mk04",
@@ -193,9 +199,17 @@ RECIPE {
193199
{type = "item", name = "advanced-foundry-mk03", amount = 1},
194200
{type = "item", name = "low-density-structure", amount = 20},
195201
{type = "item", name = "nbfe-alloy", amount = 10},
196-
{type = "item", name = "lead-plate", amount = 40}
202+
{type = "item", name = "lead-plate", amount = 40},
203+
{type = "item", name = "super-alloy", amount = 30},
204+
{type = "item", name = "wall-shield", amount = 5},
205+
{type = "item", name = "science-coating", amount = 2},
206+
{type = "item", name = "control-unit", amount = 5}
197207
},
198208
results = {
199209
{type = "item", name = "advanced-foundry-mk04", amount = 1}
200210
}
201211
}
212+
213+
if mods.pyhightech then
214+
RECIPE("advanced-foundry-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 6}:add_ingredient_unsafe {type = "item", name = "pi-josephson-junction", amount = 4}
215+
end

‎prototypes/buildings/automated-factory.lua‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ if mods["pyrawores"] then
2828
RECIPE("automated-factory-mk01"):replace_ingredient("advanced-circuit", "electronic-circuit"):remove_unlock("advanced-circuit"):add_unlock("fast-inserter")
2929
end
3030

31+
if mods.pyhightech then
32+
RECIPE("automated-factory-mk01"):replace_ingredient("advanced-circuit", "electronic-circuit")
33+
end
34+
3135
for i = 1, 4 do
3236
if not mods.pyrawores and i == 2 then return end
3337

@@ -163,13 +167,19 @@ RECIPE {
163167
{type = "item", name = "niobium-plate", amount = 25},
164168
{type = "item", name = "processing-unit", amount = 10},
165169
{type = "item", name = "titanium-plate", amount = 30},
166-
{type = "item", name = "super-steel", amount = 30}
170+
{type = "item", name = "super-steel", amount = 30},
171+
{type = "item", name = "nbti-alloy", amount = 20},
172+
{type = "item", name = "py-heat-exchanger", amount = 1}
167173
},
168174
results = {
169175
{type = "item", name = "automated-factory-mk03", amount = 1}
170176
}
171177
}
172178

179+
if mods.pyhightech then
180+
RECIPE("automated-factory-mk03"):add_ingredient_unsafe {type = "item", name = "paramagnetic-material", amount = 25}:add_ingredient_unsafe {type = "item", name = "volumetric-capacitor", amount = 10}:add_ingredient_unsafe {type = "item", name = "biopolymer", amount = 10}
181+
end
182+
173183
RECIPE {
174184
type = "recipe",
175185
name = "automated-factory-mk04",
@@ -180,9 +190,17 @@ RECIPE {
180190
{type = "item", name = "low-density-structure", amount = 10},
181191
{type = "item", name = "nbfe-alloy", amount = 10},
182192
{type = "item", name = "lead-plate", amount = 10},
193+
{type = "item", name = "super-alloy", amount = 30},
194+
{type = "item", name = "wall-shield", amount = 5},
195+
{type = "item", name = "science-coating", amount = 2},
196+
{type = "item", name = "control-unit", amount = 5}
183197

184198
},
185199
results = {
186200
{type = "item", name = "automated-factory-mk04", amount = 1}
187201
}
188202
}
203+
204+
if mods.pyhightech then
205+
RECIPE("automated-factory-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "quantum-vortex-storage-system", amount = 4}
206+
end

‎prototypes/buildings/ball-mill.lua‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ if mods.pyrawores then
1919
RECIPE("ball-mill-mk01"):add_ingredient_unsafe {type = "item", name = "py-asphalt", amount = 50}
2020
end
2121

22+
if mods.pyhightech then
23+
RECIPE("ball-mill-mk01"):remove_ingredient("py-asphalt"):add_ingredient {type = "item", name = "electronic-circuit", amount = 10}
24+
end
25+
2226
for i = 1, 4 do
2327
if not mods.pyrawores and i == 2 then return end
2428

@@ -127,24 +131,38 @@ RECIPE {
127131
{type = "item", name = "processing-unit", amount = 10},
128132
{type = "item", name = "titanium-plate", amount = 50},
129133
{type = "item", name = "super-steel", amount = 15},
134+
{type = "item", name = "nbti-alloy", amount = 10},
135+
{type = "item", name = "agitator-mk01", amount = 1},
130136
},
131137
results = {
132138
{type = "item", name = "ball-mill-mk03", amount = 1}
133139
}
134140
}
135141

142+
if mods.pyhightech then
143+
RECIPE("ball-mill-mk03"):add_ingredient_unsafe {type = "item", name = "heavy-fermion", amount = 40}:add_ingredient_unsafe {type = "item", name = "re-magnet", amount = 30}:add_ingredient_unsafe {type = "item", name = "harmonic-absorber", amount = 10}
144+
end
145+
136146
RECIPE {
137147
type = "recipe",
138148
name = "ball-mill-mk04",
139149
energy_required = 0.5,
140150
enabled = false,
141151
ingredients = {
142-
{type = "item", name = "ball-mill-mk03", amount = 1},
143-
{type = "item", name = "concrete", amount = 35},
144-
{type = "item", name = "nbfe-alloy", amount = 10},
145-
{type = "item", name = "lead-plate", amount = 30},
152+
{type = "item", name = "ball-mill-mk03", amount = 1},
153+
{type = "item", name = "concrete", amount = 35},
154+
{type = "item", name = "nbfe-alloy", amount = 10},
155+
{type = "item", name = "lead-plate", amount = 30},
156+
{type = "item", name = "super-alloy", amount = 20},
157+
{type = "item", name = "boron-carbide", amount = 30},
158+
{type = "item", name = "science-coating", amount = 1},
159+
{type = "item", name = "control-unit", amount = 5},
146160
},
147161
results = {
148162
{type = "item", name = "ball-mill-mk04", amount = 1}
149163
}
150164
}
165+
166+
if mods.pyhightech then
167+
RECIPE("ball-mill-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "nv-center", amount = 2}
168+
end

‎prototypes/buildings/borax-mine.lua‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,19 @@ RECIPE {
168168
{type = "item", name = "electric-engine-unit", amount = 6},
169169
{type = "item", name = "express-transport-belt", amount = 15},
170170
{type = "item", name = "titanium-plate", amount = 40},
171-
{type = "item", name = "super-steel", amount = 30}
171+
{type = "item", name = "super-steel", amount = 30},
172+
{type = "item", name = "nenbit-matrix", amount = 20},
173+
{type = "item", name = "molybdenum-plate", amount = 15}
172174
},
173175
results = {
174176
{type = "item", name = "borax-mine-mk03", amount = 1}
175177
}
176178
}
177179

180+
if mods.pyhightech then
181+
RECIPE("borax-mine-mk03"):add_ingredient_unsafe {type = "item", name = "phosphate-glass", amount = 40}:add_ingredient_unsafe {type = "item", name = "harmonic-absorber", amount = 20}:add_ingredient_unsafe {type = "item", name = "carbon-aerogel", amount = 20}
182+
end
183+
178184
RECIPE {
179185
type = "recipe",
180186
name = "borax-mine-mk04",
@@ -186,8 +192,16 @@ RECIPE {
186192
{type = "item", name = "nbfe-alloy", amount = 15},
187193
{type = "item", name = "low-density-structure", amount = 10},
188194
{type = "item", name = "lead-plate", amount = 20},
195+
{type = "item", name = "super-alloy", amount = 15},
196+
{type = "item", name = "boron-carbide", amount = 30},
197+
{type = "item", name = "science-coating", amount = 1},
198+
{type = "item", name = "control-unit", amount = 5},
189199
},
190200
results = {
191201
{type = "item", name = "borax-mine-mk04", amount = 1}
192202
}
193203
}
204+
205+
if mods.pyhightech then
206+
RECIPE("borax-mine-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "parametric-oscilator", amount = 1}
207+
end

‎prototypes/buildings/botanical-nursery.lua‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,19 @@ RECIPE {
182182
{type = "item", name = "niobium-plate", amount = 40},
183183
{type = "item", name = "kevlar", amount = 15},
184184
{type = "item", name = "titanium-plate", amount = 10},
185-
{type = "item", name = "stainless-steel", amount = 10}
185+
{type = "item", name = "stainless-steel", amount = 10},
186+
{type = "item", name = "nbti-alloy", amount = 10},
187+
{type = "item", name = "nmf-mk01", amount = 1}
186188
},
187189
results = {
188190
{type = "item", name = "botanical-nursery-mk03", amount = 1}
189191
}
190192
}
191193

194+
if mods.pyhightech then
195+
RECIPE("botanical-nursery-mk03"):add_ingredient_unsafe {type = "item", name = "phosphate-glass", amount = 50}:add_ingredient_unsafe {type = "item", name = "biopolymer", amount = 35}:add_ingredient_unsafe {type = "item", name = "aerogel", amount = 15}
196+
end
197+
192198
RECIPE {
193199
type = "recipe",
194200
name = "botanical-nursery-mk04",
@@ -200,8 +206,16 @@ RECIPE {
200206
{type = "item", name = "nbfe-alloy", amount = 20},
201207
{type = "item", name = "tin-plate", amount = 20},
202208
{type = "item", name = "super-steel", amount = 30},
209+
{type = "item", name = "super-alloy", amount = 10},
210+
{type = "item", name = "boron-carbide", amount = 10},
211+
{type = "item", name = "science-coating", amount = 1},
212+
{type = "item", name = "control-unit", amount = 3},
203213
},
204214
results = {
205215
{type = "item", name = "botanical-nursery-mk04", amount = 1}
206216
}
207217
}
218+
219+
if mods.pyhightech then
220+
RECIPE("botanical-nursery-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "hyperelastic-material", amount = 4}
221+
end

‎prototypes/buildings/carbon-filter.lua‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,17 @@ RECIPE {
168168
{type = "item", name = "kevlar", amount = 10},
169169
{type = "item", name = "titanium-plate", amount = 30},
170170
{type = "item", name = "stainless-steel", amount = 15},
171+
{type = "item", name = "nbti-alloy", amount = 15},
171172
},
172173
results = {
173174
{type = "item", name = "carbon-filter-mk03", amount = 1}
174175
}
175176
}
176177

178+
if mods.pyhightech then
179+
RECIPE("carbon-filter-mk03"):add_ingredient_unsafe {type = "item", name = "re-magnet", amount = 30}:add_ingredient_unsafe {type = "item", name = "superconductor", amount = 20}:add_ingredient_unsafe {type = "item", name = "paramagnetic-material", amount = 15}
180+
end
181+
177182
RECIPE {
178183
type = "recipe",
179184
name = "carbon-filter-mk04",
@@ -185,8 +190,16 @@ RECIPE {
185190
{type = "item", name = "nbfe-alloy", amount = 5},
186191
{type = "item", name = "tin-plate", amount = 30},
187192
{type = "item", name = "super-steel", amount = 20},
193+
{type = "item", name = "super-alloy", amount = 10},
194+
{type = "item", name = "wall-shield", amount = 4},
195+
{type = "item", name = "science-coating", amount = 1},
196+
{type = "item", name = "control-unit", amount = 3}
188197
},
189198
results = {
190199
{type = "item", name = "carbon-filter-mk04", amount = 1}
191200
}
192201
}
202+
203+
if mods.pyhightech then
204+
RECIPE("carbon-filter-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "quantum-vortex-storage-system", amount = 2}
205+
end

‎prototypes/buildings/classifier.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,19 @@ RECIPE {
138138
{type = "item", name = "niobium-plate", amount = 10},
139139
{type = "item", name = "titanium-plate", amount = 20},
140140
{type = "item", name = "stainless-steel", amount = 15},
141+
{type = "item", name = "nenbit-matrix", amount = 10},
142+
{type = "item", name = "sc-unit", amount = 1},
143+
{type = "item", name = "boron-carbide", amount = 15},
141144
},
142145
results = {
143146
{type = "item", name = "classifier-mk03", amount = 1}
144147
}
145148
}
146149

150+
if mods.pyhightech then
151+
RECIPE("classifier-mk03"):add_ingredient_unsafe {type = "item", name = "diamagnetic-material", amount = 20}:add_ingredient_unsafe {type = "item", name = "harmonic-absorber", amount = 15}
152+
end
153+
147154
RECIPE {
148155
type = "recipe",
149156
name = "classifier-mk04",
@@ -154,8 +161,16 @@ RECIPE {
154161
{type = "item", name = "low-density-structure", amount = 5},
155162
{type = "item", name = "nbfe-alloy", amount = 10},
156163
{type = "item", name = "super-steel", amount = 30},
164+
{type = "item", name = "super-alloy", amount = 10},
165+
{type = "item", name = "wall-shield", amount = 2},
166+
{type = "item", name = "science-coating", amount = 1},
167+
{type = "item", name = "control-unit", amount = 5},
157168
},
158169
results = {
159170
{type = "item", name = "classifier-mk04", amount = 1}
160171
}
161172
}
173+
174+
if mods.pyhightech then
175+
RECIPE("classifier-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "var-josephson-junction", amount = 2}
176+
end

‎prototypes/buildings/desulfurizator-unit.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,19 @@ RECIPE {
164164
{type = "item", name = "kevlar", amount = 30},
165165
{type = "item", name = "titanium-plate", amount = 40},
166166
{type = "item", name = "stainless-steel", amount = 30},
167+
{type = "item", name = "nbti-alloy", amount = 15},
168+
{type = "item", name = "boron-carbide", amount = 20},
169+
{type = "item", name = "py-heat-exchanger", amount = 1},
167170
},
168171
results = {
169172
{type = "item", name = "desulfurizator-unit-mk03", amount = 1}
170173
}
171174
}
172175

176+
if mods.pyhightech then
177+
RECIPE("desulfurizator-unit-mk03"):add_ingredient_unsafe {type = "item", name = "biopolymer", amount = 15}:add_ingredient_unsafe {type = "item", name = "carbon-aerogel", amount = 20}
178+
end
179+
173180
RECIPE {
174181
type = "recipe",
175182
name = "desulfurizator-unit-mk04",
@@ -180,8 +187,16 @@ RECIPE {
180187
{type = "item", name = "pump", amount = 4},
181188
{type = "item", name = "nbfe-alloy", amount = 20},
182189
{type = "item", name = "low-density-structure", amount = 10},
190+
{type = "item", name = "super-alloy", amount = 20},
191+
{type = "item", name = "wall-shield", amount = 2},
192+
{type = "item", name = "science-coating", amount = 1},
193+
{type = "item", name = "control-unit", amount = 5},
183194
},
184195
results = {
185196
{type = "item", name = "desulfurizator-unit-mk04", amount = 1}
186197
}
187198
}
199+
200+
if mods.pyhightech then
201+
RECIPE("desulfurizator-unit-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 5}:add_ingredient_unsafe {type = "item", name = "quantum-dots", amount = 5}
202+
end

‎prototypes/buildings/distilator.lua‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,18 @@ RECIPE {
240240
{type = "item", name = "niobium-pipe", amount = 15},
241241
{type = "item", name = "titanium-plate", amount = 10},
242242
{type = "item", name = "super-steel", amount = 30},
243+
{type = "item", name = "nbti-alloy", amount = 15},
244+
{type = "item", name = "sc-unit", amount = 4}
243245
},
244246
results = {
245247
{type = "item", name = "distilator-mk03", amount = 1}
246248
}
247249
}
248250

251+
if mods.pyhightech then
252+
RECIPE("distilator-mk03"):add_ingredient_unsafe {type = "item", name = "phosphate-glass", amount = 15}:add_ingredient_unsafe {type = "item", name = "biopolymer", amount = 10}:add_ingredient_unsafe {type = "item", name = "aerogel", amount = 10}
253+
end
254+
249255
RECIPE {
250256
type = "recipe",
251257
name = "distilator-mk04",
@@ -256,8 +262,17 @@ RECIPE {
256262
{type = "item", name = "pump", amount = 4},
257263
{type = "item", name = "nbfe-alloy", amount = 15},
258264
{type = "item", name = "lead-plate", amount = 20},
265+
{type = "item", name = "super-alloy", amount = 10},
266+
{type = "item", name = "nbti-alloy", amount = 10},
267+
{type = "item", name = "agzn-alloy", amount = 5},
268+
{type = "item", name = "science-coating", amount = 2},
269+
{type = "item", name = "control-unit", amount = 5}
259270
},
260271
results = {
261272
{type = "item", name = "distilator-mk04", amount = 1}
262273
}
263274
}
275+
276+
if mods.pyhightech then
277+
RECIPE("distilator-mk04"):replace_ingredient_unsafe("control-unit", "intelligent-unit"):add_ingredient_unsafe {type = "item", name = "superconductor-servomechanims", amount = 6}:add_ingredient_unsafe {type = "item", name = "var-josephson-junction", amount = 4}
278+
end

0 commit comments

Comments
 (0)