Skip to content

Commit 62efb2b

Browse files
deniszholobdeniszholob
committed
Factorio v2.0 changes
#402 Update data to changes in factorio v2
1 parent 5387ec5 commit 62efb2b

22 files changed

+230
-238
lines changed

‎src/app/cheat-sheets/game-base/basic-power/basic-power.component.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ <h4 class="card-title" id="steam-power">Steam Power</h4>
5858
A
5959
<a href="https://wiki.factorio.com/Boiler" target="_blank" rel="noopener">steam boiler</a>
6060
can convert up to
61-
{{ sheetData?.steam_boiler_fluid }}
62-
units of water into steam per second, providing
61+
{{ sheetData?.steam_boiler_water }}
62+
units of water into
63+
{{ sheetData?.steam_boiler_steam }}
64+
units of steam per second, providing
6365
{{ sheetData?.steam_boiler_energy }}
6466
of steam (at 165 °C).
6567
</li>
@@ -72,7 +74,7 @@ <h4 class="card-title" id="steam-power">Steam Power</h4>
7274
A
7375
<a href="https://wiki.factorio.com/Steam_engine" target="_blank" rel="noopener">steam engine</a>
7476
can convert
75-
{{ sheetData?.steam_engine_fluid }}
77+
{{ sheetData?.steam_engine_steam }}
7678
units of steam (at 165 °C) per second into
7779
{{ sheetData?.steam_engine_power }}
7880
of electric power.

‎src/app/cheat-sheets/game-base/basic-power/basic-power.data.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,27 @@ export const BASIC_POWER_DATA: RawData<BasicPowerData> = {
77
icon: 'Accumulator',
88
},
99
data: {
10-
steamRatioPower: '36MW',
10+
steamRatioPower: '360MW',
1111
steamRatio: [
1212
{
1313
iconId: 'Offshore_pump',
1414
count: 1,
1515
},
1616
{
1717
iconId: 'Boiler',
18-
count: 20,
18+
count: 200,
1919
},
2020
{
2121
iconId: 'Steam_engine',
22-
count: 40,
22+
count: 400,
2323
},
2424
{
2525
iconId: 'Electric_mining_drill',
26-
count: 18,
26+
count: 180,
27+
},
28+
{
29+
iconId: 'Transport_belt',
30+
count: 6,
2731
},
2832
],
2933
solarRatioPower: '1MW',
@@ -38,9 +42,10 @@ export const BASIC_POWER_DATA: RawData<BasicPowerData> = {
3842
},
3943
],
4044
offshore_pump_water: 1200,
41-
steam_boiler_fluid: 60,
45+
steam_boiler_water: 6,
46+
steam_boiler_steam: 60,
4247
steam_boiler_energy: '1.8MJ',
43-
steam_engine_fluid: 30,
48+
steam_engine_steam: 30,
4449
steam_engine_power: '0.9MW',
4550
solar_energy_max: 60,
4651
solar_energy_avg: 42,

‎src/app/cheat-sheets/game-base/cs-common-ratios/common-ratios.data.ts‎

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface RatioSection {
1515
const _SCIENCE_RATIOS: Ratio[] = [
1616
{
1717
source:
18-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=automation-science-pack:r:5/2',
18+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=automation-science-pack:r:5/2',
1919
name: '',
2020
ratio: [
2121
{
@@ -33,7 +33,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
3333
},
3434
{
3535
source:
36-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=logistic-science-pack:r:5/2',
36+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=logistic-science-pack:r:5/2',
3737
name: '',
3838
ratio: [
3939
{
@@ -61,7 +61,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
6161
},
6262
{
6363
source:
64-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=military-science-pack:r:5/2',
64+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=military-science-pack:r:5/2',
6565
name: '',
6666
ratio: [
6767
{
@@ -89,7 +89,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
8989
},
9090
{
9191
source:
92-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=chemical-science-pack:r:5/2',
92+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=chemical-science-pack:r:5/2',
9393
name: '',
9494
ratio: [
9595
{
@@ -117,7 +117,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
117117
},
118118
{
119119
source:
120-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=production-science-pack:r:5/2',
120+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=production-science-pack:r:5/2',
121121
name: '',
122122
ratio: [
123123
{
@@ -145,7 +145,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
145145
},
146146
{
147147
source:
148-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=utility-science-pack:r:5/2',
148+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=utility-science-pack:r:5/2',
149149
name: '',
150150
ratio: [
151151
{
@@ -167,13 +167,13 @@ const _SCIENCE_RATIOS: Ratio[] = [
167167
{
168168
machineIconId: 'Assembling_machine_3',
169169
productIconId: 'Low_density_structure',
170-
count: 40,
170+
count: 30,
171171
},
172172
],
173173
},
174174
{
175175
source:
176-
'https://kirkmcdonald.github.io/calc.html#data=0-17-60&rate=s&min=4&items=space-science-pack:r:5/2',
176+
'https://kirkmcdonald.github.io/calc.html#rate=s&buildings=assembling-machine-3&items=space-science-pack:r:5/2',
177177
name: '',
178178
ratio: [
179179
{
@@ -184,18 +184,18 @@ const _SCIENCE_RATIOS: Ratio[] = [
184184
},
185185
{
186186
machineIconId: 'Assembling_machine_3',
187-
productIconId: 'Rocket_control_unit',
188-
count: 60,
187+
productIconId: 'Processing_unit',
188+
count: 22,
189189
},
190190
{
191191
machineIconId: 'Assembling_machine_3',
192192
productIconId: 'Rocket_fuel',
193-
count: 63,
193+
count: 31.5,
194194
},
195195
{
196196
machineIconId: 'Assembling_machine_3',
197197
productIconId: 'Low_density_structure',
198-
count: 44,
198+
count: 33,
199199
},
200200
{
201201
machineIconId: 'Assembling_machine_3',
@@ -207,18 +207,13 @@ const _SCIENCE_RATIOS: Ratio[] = [
207207
productIconId: 'Accumulator',
208208
count: 2,
209209
},
210-
{
211-
machineIconId: 'Assembling_machine_3',
212-
productIconId: 'Processing_unit',
213-
count: 2,
214-
},
215210
],
216211
},
217212
];
218213
const _ELECTRONICS_RATIOS: Ratio[] = [
219214
{
220215
source:
221-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=electronic-circuit:f:2',
216+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=electronic-circuit:f:2',
222217
name: '',
223218
ratio: [
224219
{
@@ -236,7 +231,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
236231
},
237232
{
238233
source:
239-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=advanced-circuit:f:6',
234+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=advanced-circuit:f:6',
240235
name: '',
241236
description: "Doesn't take into account Wire for GC",
242237
ratio: [
@@ -265,7 +260,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
265260
},
266261
{
267262
source:
268-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=processing-unit:f:5',
263+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=processing-unit:f:5',
269264
name: '',
270265
description: "Doesn't take into account GC for RC",
271266
ratio: [
@@ -289,7 +284,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
289284
},
290285
{
291286
source:
292-
'https://kirkmcdonald.github.io/calc.html#data=0-17-60&rate=s&min=4&items=speed-module:f:2',
287+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module:f:2',
293288
name: '',
294289
ratio: [
295290
{
@@ -312,7 +307,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
312307
},
313308
{
314309
source:
315-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=speed-module-3:f:2',
310+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module-3:f:2',
316311
name: '',
317312
description: 'Same for Other Modules',
318313
ratio: [
@@ -325,18 +320,18 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
325320
{
326321
machineIconId: 'Assembling_machine_3',
327322
productIconId: 'Speed_module_2',
328-
count: 5,
323+
count: 4,
329324
},
330325
{
331326
machineIconId: 'Assembling_machine_3',
332327
productIconId: 'Speed_module',
333-
count: 10,
328+
count: 8,
334329
},
335330
],
336331
},
337332
{
338333
source:
339-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=speed-module-3:f:2',
334+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module-3:f:2',
340335
name: '',
341336
ratio: [
342337
{
@@ -348,30 +343,30 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
348343
{
349344
machineIconId: 'Assembling_machine_3',
350345
productIconId: 'Processing_unit',
351-
count: 10,
346+
count: 8.4,
352347
},
353348
{
354349
machineIconId: 'Assembling_machine_3',
355350
productIconId: 'Advanced_circuit',
356-
count: 38,
351+
count: 31,
357352
},
358353
{
359354
machineIconId: 'Assembling_machine_3',
360355
productIconId: 'Electronic_circuit',
361-
count: 18,
356+
count: 15,
362357
},
363358
{
364359
machineIconId: 'Chemical_plant',
365360
productIconId: 'Plastic_bar',
366-
count: 8,
361+
count: 6.5,
367362
},
368363
],
369364
},
370365
];
371366
const _PRODUCTION_RATIOS: Ratio[] = [
372367
{
373368
source:
374-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=uranium-rounds-magazine:f:10',
369+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=uranium-rounds-magazine:f:10',
375370
name: '',
376371
ratio: [
377372
{
@@ -394,7 +389,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
394389
},
395390
{
396391
source:
397-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=rail:f:2',
392+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=rail:f:2',
398393
name: '',
399394
ratio: [
400395
{
@@ -418,7 +413,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
418413
},
419414
{
420415
source:
421-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&min=4&items=flying-robot-frame:f:20',
416+
'https://kirkmcdonald.github.io/calc.html#min=4&items=flying-robot-frame:f:20',
422417
name: '',
423418
ratio: [
424419
{
@@ -456,7 +451,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
456451
},
457452
{
458453
source:
459-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=rocket-fuel:f:6',
454+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=rocket-fuel:f:6',
460455
name: 'SF*1*1/2 = RF*1.25*10/30',
461456
ratio: [
462457
{
@@ -474,7 +469,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
474469
},
475470
{
476471
source:
477-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=battery:f:20',
472+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=battery:f:20',
478473
name: '',
479474
ratio: [
480475
{
@@ -497,7 +492,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
497492
},
498493
{
499494
source:
500-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=processing-unit:f:75',
495+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=processing-unit:f:75',
501496
name: '',
502497
ratio: [
503498
{
@@ -517,7 +512,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
517512
const _MISC_RATIOS: Ratio[] = [
518513
{
519514
source:
520-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=transport-belt:f:1',
515+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=transport-belt:f:1',
521516
name: '',
522517
ratio: [
523518
{
@@ -535,7 +530,7 @@ const _MISC_RATIOS: Ratio[] = [
535530
},
536531
{
537532
source:
538-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=inserter:f:1',
533+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=inserter:f:1',
539534
name: '',
540535
ratio: [
541536
{
@@ -558,7 +553,7 @@ const _MISC_RATIOS: Ratio[] = [
558553
},
559554
{
560555
source:
561-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=electric-engine-unit:f:16',
556+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=electric-engine-unit:f:16',
562557
name: '',
563558
ratio: [
564559
{
@@ -576,7 +571,7 @@ const _MISC_RATIOS: Ratio[] = [
576571
},
577572
{
578573
source:
579-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&furnace=stone-furnace&items=stone-wall:f:1',
574+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&furnace=stone-furnace&items=stone-wall:f:1',
580575
name: '',
581576
ratio: [
582577
{
@@ -595,7 +590,7 @@ const _MISC_RATIOS: Ratio[] = [
595590
},
596591
{
597592
source:
598-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&furnace=stone-furnace&items=iron-gear-wheel:f:1',
593+
'https://kirkmcdonald.github.io/calc.html#rate=s&furnace=stone-furnace&items=iron-gear-wheel:f:1',
599594
name: '',
600595
ratio: [
601596
{
@@ -614,7 +609,7 @@ const _MISC_RATIOS: Ratio[] = [
614609
},
615610
{
616611
source:
617-
'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=2&furnace=stone-furnace&items=iron-gear-wheel:f:1',
612+
'https://kirkmcdonald.github.io/calc.html#rate=s&min=2&furnace=stone-furnace&items=iron-gear-wheel:f:1',
618613
name: '',
619614
ratio: [
620615
{

‎src/app/cheat-sheets/game-base/cs-common-ratios/cs-common-ratios.component.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ <h4 id="rocket">Rocket Components</h4>
6060
<a href="https://wiki.factorio.com/Space_science_pack" target="_blank" rel="noopener">Space Science</a>
6161
(no productivity modules in the silo);
6262
<br />
63-
a rocket needs 1000 of each component of the rocket part + the requirements for the
63+
a rocket needs 1000 (100*10) of each component of the rocket part + the requirements for the
6464
<a href="https://wiki.factorio.com/Satellite">satellite</a>.
6565
</li>
66-
<li>This is a ratio of (1000 * 30s) : (1050 * 30s) : (1100 * 20s) or simplified of 60 : 63 : 44.</li>
67-
<li>Where 20s and 30s are the respective crafting speeds.</li>
68-
<li>Module ratio is approximate with lvl 3 productivity modules</li>
66+
<li>This is a ratio of (1100i * 10s) : (1050i * 15s) : (1100i * 15s) = 11000 : 15750 : 11000 or if divided by 250 then simplified to 44 : 63 : 44.</li>
67+
<li>Where 20s and 30s are the respective crafting speeds of recipes.</li>
68+
<li><strong>Note:</strong> This produces 2.5 science/min, however the silo is capable of 2.9 science/min</li>
69+
<li><strong>Module Ratio</strong> is approximate with lvl 3 productivity modules and lvl 1 speed modules in 1 beacon then silo is capable of 3.9 science/min</li>
6970
</ul>
7071
</app-cheat-sheet-template>

0 commit comments

Comments
 (0)