Factorio v2.0 changes

#402 Update data to changes in factorio v2
deniszholob · Oct 23, 2024 · 25fdd9e · 25fdd9e
1 parent 9c91168
commit 25fdd9e
Show file tree

Hide file tree

Showing 22 changed files with 230 additions and 238 deletions.
diff --git a/src/app/cheat-sheets/game-base/basic-power/basic-power.component.html b/src/app/cheat-sheets/game-base/basic-power/basic-power.component.html
@@ -58,8 +58,10 @@ <h4 class="card-title" id="steam-power">Steam Power</h4>
       A
       <a href="https://wiki.factorio.com/Boiler" target="_blank" rel="noopener">steam boiler</a>
       can convert up to
-      {{ sheetData?.steam_boiler_fluid }}
-      units of water into steam per second, providing
+      {{ sheetData?.steam_boiler_water }}
+      units of water into 
+      {{ sheetData?.steam_boiler_steam }}
+      units of steam per second, providing
       {{ sheetData?.steam_boiler_energy }}
       of steam (at 165 °C).
     </li>
@@ -72,7 +74,7 @@ <h4 class="card-title" id="steam-power">Steam Power</h4>
       A
       <a href="https://wiki.factorio.com/Steam_engine" target="_blank" rel="noopener">steam engine</a>
       can convert
-      {{ sheetData?.steam_engine_fluid }}
+      {{ sheetData?.steam_engine_steam }}
       units of steam (at 165 °C) per second into
       {{ sheetData?.steam_engine_power }}
       of electric power.

diff --git a/src/app/cheat-sheets/game-base/basic-power/basic-power.data.ts b/src/app/cheat-sheets/game-base/basic-power/basic-power.data.ts
@@ -7,23 +7,27 @@ export const BASIC_POWER_DATA: RawData<BasicPowerData> = {
     icon: 'Accumulator',
   },
   data: {
-    steamRatioPower: '36MW',
+    steamRatioPower: '360MW',
     steamRatio: [
       {
         iconId: 'Offshore_pump',
         count: 1,
       },
       {
         iconId: 'Boiler',
-        count: 20,
+        count: 200,
       },
       {
         iconId: 'Steam_engine',
-        count: 40,
+        count: 400,
       },
       {
         iconId: 'Electric_mining_drill',
-        count: 18,
+        count: 180,
+      },
+      {
+        iconId: 'Transport_belt',
+        count: 6,
       },
     ],
     solarRatioPower: '1MW',
@@ -38,9 +42,10 @@ export const BASIC_POWER_DATA: RawData<BasicPowerData> = {
       },
     ],
     offshore_pump_water: 1200,
-    steam_boiler_fluid: 60,
+    steam_boiler_water: 6,
+    steam_boiler_steam: 60,
     steam_boiler_energy: '1.8MJ',
-    steam_engine_fluid: 30,
+    steam_engine_steam: 30,
     steam_engine_power: '0.9MW',
     solar_energy_max: 60,
     solar_energy_avg: 42,

diff --git a/src/app/cheat-sheets/game-base/cs-common-ratios/common-ratios.data.ts b/src/app/cheat-sheets/game-base/cs-common-ratios/common-ratios.data.ts
@@ -15,7 +15,7 @@ export interface RatioSection {
 const _SCIENCE_RATIOS: Ratio[] = [
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=automation-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=automation-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -33,7 +33,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=logistic-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=logistic-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -61,7 +61,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=military-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=military-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -89,7 +89,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=chemical-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=chemical-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -117,7 +117,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=production-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=production-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -145,7 +145,7 @@ const _SCIENCE_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=utility-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=utility-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -167,13 +167,13 @@ const _SCIENCE_RATIOS: Ratio[] = [
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Low_density_structure',
-        count: 40,
+        count: 30,
       },
     ],
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-60&rate=s&min=4&items=space-science-pack:r:5/2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&buildings=assembling-machine-3&items=space-science-pack:r:5/2',
     name: '',
     ratio: [
       {
@@ -184,18 +184,18 @@ const _SCIENCE_RATIOS: Ratio[] = [
       },
       {
         machineIconId: 'Assembling_machine_3',
-        productIconId: 'Rocket_control_unit',
-        count: 60,
+        productIconId: 'Processing_unit',
+        count: 22,
       },
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Rocket_fuel',
-        count: 63,
+        count: 31.5,
       },
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Low_density_structure',
-        count: 44,
+        count: 33,
       },
       {
         machineIconId: 'Assembling_machine_3',
@@ -207,18 +207,13 @@ const _SCIENCE_RATIOS: Ratio[] = [
         productIconId: 'Accumulator',
         count: 2,
       },
-      {
-        machineIconId: 'Assembling_machine_3',
-        productIconId: 'Processing_unit',
-        count: 2,
-      },
     ],
   },
 ];
 const _ELECTRONICS_RATIOS: Ratio[] = [
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=electronic-circuit:f:2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=electronic-circuit:f:2',
     name: '',
     ratio: [
       {
@@ -236,7 +231,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=advanced-circuit:f:6',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=advanced-circuit:f:6',
     name: '',
     description: "Doesn't take into account Wire for GC",
     ratio: [
@@ -265,7 +260,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=processing-unit:f:5',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=processing-unit:f:5',
     name: '',
     description: "Doesn't take into account GC for RC",
     ratio: [
@@ -289,7 +284,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-60&rate=s&min=4&items=speed-module:f:2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module:f:2',
     name: '',
     ratio: [
       {
@@ -312,7 +307,7 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=speed-module-3:f:2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module-3:f:2',
     name: '',
     description: 'Same for Other Modules',
     ratio: [
@@ -325,18 +320,18 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Speed_module_2',
-        count: 5,
+        count: 4,
       },
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Speed_module',
-        count: 10,
+        count: 8,
       },
     ],
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=speed-module-3:f:2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=speed-module-3:f:2',
     name: '',
     ratio: [
       {
@@ -348,30 +343,30 @@ const _ELECTRONICS_RATIOS: Ratio[] = [
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Processing_unit',
-        count: 10,
+        count: 8.4,
       },
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Advanced_circuit',
-        count: 38,
+        count: 31,
       },
       {
         machineIconId: 'Assembling_machine_3',
         productIconId: 'Electronic_circuit',
-        count: 18,
+        count: 15,
       },
       {
         machineIconId: 'Chemical_plant',
         productIconId: 'Plastic_bar',
-        count: 8,
+        count: 6.5,
       },
     ],
   },
 ];
 const _PRODUCTION_RATIOS: Ratio[] = [
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=uranium-rounds-magazine:f:10',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=uranium-rounds-magazine:f:10',
     name: '',
     ratio: [
       {
@@ -394,7 +389,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=rail:f:2',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=rail:f:2',
     name: '',
     ratio: [
       {
@@ -418,7 +413,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&min=4&items=flying-robot-frame:f:20',
+      'https://kirkmcdonald.github.io/calc.html#min=4&items=flying-robot-frame:f:20',
     name: '',
     ratio: [
       {
@@ -456,7 +451,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=rocket-fuel:f:6',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=rocket-fuel:f:6',
     name: 'SF*1*1/2 = RF*1.25*10/30',
     ratio: [
       {
@@ -474,7 +469,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=battery:f:20',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=battery:f:20',
     name: '',
     ratio: [
       {
@@ -497,7 +492,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=processing-unit:f:75',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=processing-unit:f:75',
     name: '',
     ratio: [
       {
@@ -517,7 +512,7 @@ const _PRODUCTION_RATIOS: Ratio[] = [
 const _MISC_RATIOS: Ratio[] = [
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=transport-belt:f:1',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=transport-belt:f:1',
     name: '',
     ratio: [
       {
@@ -535,7 +530,7 @@ const _MISC_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=inserter:f:1',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=inserter:f:1',
     name: '',
     ratio: [
       {
@@ -558,7 +553,7 @@ const _MISC_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&items=electric-engine-unit:f:16',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&items=electric-engine-unit:f:16',
     name: '',
     ratio: [
       {
@@ -576,7 +571,7 @@ const _MISC_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=4&furnace=stone-furnace&items=stone-wall:f:1',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=4&furnace=stone-furnace&items=stone-wall:f:1',
     name: '',
     ratio: [
       {
@@ -595,7 +590,7 @@ const _MISC_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&furnace=stone-furnace&items=iron-gear-wheel:f:1',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&furnace=stone-furnace&items=iron-gear-wheel:f:1',
     name: '',
     ratio: [
       {
@@ -614,7 +609,7 @@ const _MISC_RATIOS: Ratio[] = [
   },
   {
     source:
-      'https://kirkmcdonald.github.io/calc.html#data=0-17-1&rate=s&min=2&furnace=stone-furnace&items=iron-gear-wheel:f:1',
+      'https://kirkmcdonald.github.io/calc.html#rate=s&min=2&furnace=stone-furnace&items=iron-gear-wheel:f:1',
     name: '',
     ratio: [
       {

diff --git a/src/app/cheat-sheets/game-base/cs-common-ratios/cs-common-ratios.component.html b/src/app/cheat-sheets/game-base/cs-common-ratios/cs-common-ratios.component.html
@@ -60,11 +60,12 @@ <h4 id="rocket">Rocket Components</h4>
       <a href="https://wiki.factorio.com/Space_science_pack" target="_blank" rel="noopener">Space Science</a>
       (no productivity modules in the silo);
       <br />
-      a rocket needs 1000 of each component of the rocket part + the requirements for the
+      a rocket needs 1000 (100*10) of each component of the rocket part + the requirements for the
       <a href="https://wiki.factorio.com/Satellite">satellite</a>.
     </li>
-    <li>This is a ratio of (1000 * 30s) : (1050 * 30s) : (1100 * 20s) or simplified of 60 : 63 : 44.</li>
-    <li>Where 20s and 30s are the respective crafting speeds.</li>
-    <li>Module ratio is approximate with lvl 3 productivity modules</li>
+    <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>
+    <li>Where 20s and 30s are the respective crafting speeds of recipes.</li>
+    <li><strong>Note:</strong> This produces 2.5 science/min, however the silo is capable of 2.9 science/min</li>
+    <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>
   </ul>
 </app-cheat-sheet-template>