Commit: 540b2fa05cec5bb7d395719b48a5a9d691b4cca8 - factorio_calc (hg)

Just a simple, and painful to use calculator for the game Factorio written in Python

Commit MetaInfo

• Revision: 540b2fa05cec5bb7d395719b48a5a9d691b4cca8 (tree)
• Zeit: 2019-03-30 11:08:48
• Autor: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Log Message

Update to 0.17 item database and the XML based format.

Ändern Zusammenfassung

• modified: items.xml
• add: item-db-0.16.pickle
• add: items-0.16.xml
• delete: item-db.pickle

Diff

diff -r 0114c5c1cd03 -r 540b2fa05cec item-db-0.16.pickle
Binary file item-db-0.16.pickle has changed

diff -r 0114c5c1cd03 -r 540b2fa05cec item-db.pickle
Binary file item-db.pickle has changed

diff -r 0114c5c1cd03 -r 540b2fa05cec items-0.16.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/items-0.16.xml	Fri Mar 29 19:08:48 2019 -0700
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<factorio_calc_item_db version="1.0">
+  <item id="coal" name="Coal" />
+  <item id="copper" name="Copper" />
+  <item id="iron_ore" name="Iron Ore" />
+  <item id="light_oil" name="Light Oil" />
+  <item id="lube" name="Lube" />
+  <item id="pet_gas" name="Pet Gas" />
+  <item id="stone_brick" name="Stone brick" />
+  <item id="water" name="Water" />
+  <item id="concrete" name="Concrete" time="10" produced="10">
+    <ingredient idref="stone_brick" count="5" />
+    <ingredient idref="iron_ore" count="1" />
+    <ingredient idref="water" count="100" />
+  </item>
+  <item id="iron" name="Iron" time="15/8" produced="1">
+    <ingredient idref="iron_ore" count="1" />
+  </item>
+  <item id="plastic" name="Plastic" time="1" produced="2">
+    <ingredient idref="coal" count="1" />
+    <ingredient idref="pet_gas" count="10" />
+  </item>
+  <item id="solid_fuel" name="Solid Fuel" time="3" produced="1">
+    <ingredient idref="light_oil" count="10" />
+  </item>
+  <item id="sulfur" name="Sulfur" time="1" produced="2">
+    <ingredient idref="water" count="30" />
+    <ingredient idref="pet_gas" count="30" />
+  </item>
+  <item id="wire" name="Wire" time="1/2" produced="2">
+    <ingredient idref="copper" count="1" />
+  </item>
+  <item id="bullets" name="Bullets" time="1" produced="1">
+    <ingredient idref="iron" count="4" />
+  </item>
+  <item id="circuit" name="Circuit" time="1/2" produced="1">
+    <ingredient idref="iron" count="1" />
+    <ingredient idref="wire" count="3" />
+  </item>
+  <item id="explosives" name="Explosives" time="5" produced="2">
+    <ingredient idref="sulfur" count="1" />
+    <ingredient idref="coal" count="1" />
+    <ingredient idref="water" count="10" />
+  </item>
+  <item id="gear" name="Gear" time="1/2" produced="1">
+    <ingredient idref="iron" count="2" />
+  </item>
+  <item id="grenade" name="Grenade" time="8" produced="1">
+    <ingredient idref="iron" count="5" />
+    <ingredient idref="coal" count="10" />
+  </item>
+  <item id="pipe" name="Pipe" time="1/2" produced="1">
+    <ingredient idref="iron" count="1" />
+  </item>
+  <item id="rocket_fuel" name="Rocket Fuel" time="30" produced="1">
+    <ingredient idref="solid_fuel" count="10" />
+  </item>
+  <item id="steel" name="Steel" time="35/2" produced="1">
+    <ingredient idref="iron" count="5" />
+  </item>
+  <item id="sulfuric_acid" name="Sulfuric Acid" time="1" produced="50">
+    <ingredient idref="sulfur" count="5" />
+    <ingredient idref="iron" count="1" />
+    <ingredient idref="water" count="100" />
+  </item>
+  <item id="adv_circuit" name="Adv Circuit" time="6" produced="1">
+    <ingredient idref="circuit" count="2" />
+    <ingredient idref="plastic" count="2" />
+    <ingredient idref="wire" count="4" />
+  </item>
+  <item id="assembly_1" name="Assembly 1" time="1/2" produced="1">
+    <ingredient idref="circuit" count="3" />
+    <ingredient idref="gear" count="5" />
+    <ingredient idref="iron" count="9" />
+  </item>
+  <item id="battery" name="Battery" time="5" produced="1">
+    <ingredient idref="copper" count="1" />
+    <ingredient idref="iron" count="1" />
+    <ingredient idref="sulfuric_acid" count="20" />
+  </item>
+  <item id="cargo_wagon" name="Cargo Wagon" time="1/2" produced="1">
+    <ingredient idref="gear" count="10" />
+    <ingredient idref="iron" count="10" />
+    <ingredient idref="steel" count="10" />
+  </item>
+  <item id="chemical_plant" name="Chemical Plant" time="5" produced="1">
+    <ingredient idref="steel" count="5" />
+    <ingredient idref="gear" count="5" />
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="pipe" count="5" />
+  </item>
+  <item id="electric_miner" name="Electric miner" time="2" produced="1">
+    <ingredient idref="circuit" count="3" />
+    <ingredient idref="gear" count="5" />
+    <ingredient idref="iron" count="10" />
+  </item>
+  <item id="engine" name="Engine" time="10" produced="1">
+    <ingredient idref="steel" count="1" />
+    <ingredient idref="gear" count="1" />
+    <ingredient idref="pipe" count="1" />
+  </item>
+  <item id="exp_cannon_shell" name="Exp Cannon Shell" time="8" produced="1">
+    <ingredient idref="explosives" count="2" />
+    <ingredient idref="plastic" count="2" />
+    <ingredient idref="steel" count="2" />
+  </item>
+  <item id="low_density_struct" name="Low Density Struct" time="30" produced="1">
+    <ingredient idref="steel" count="10" />
+    <ingredient idref="copper" count="5" />
+    <ingredient idref="plastic" count="5" />
+  </item>
+  <item id="medium_pole" name="Medium Pole" time="1/2" produced="1">
+    <ingredient idref="steel" count="2" />
+    <ingredient idref="copper" count="2" />
+  </item>
+  <item id="piercing_bullets" name="Piercing Bullets" time="3" produced="1">
+    <ingredient idref="bullets" count="1" />
+    <ingredient idref="steel" count="1" />
+    <ingredient idref="copper" count="5" />
+  </item>
+  <item id="pumpjack" name="Pumpjack" time="5" produced="1">
+    <ingredient idref="steel" count="4" />
+    <ingredient idref="gear" count="10" />
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="pipe" count="10" />
+  </item>
+  <item id="radar" name="Radar" time="1/2" produced="1">
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="gear" count="5" />
+    <ingredient idref="iron" count="10" />
+  </item>
+  <item id="refinery" name="Refinery" time="8" produced="1">
+    <ingredient idref="steel" count="15" />
+    <ingredient idref="gear" count="10" />
+    <ingredient idref="stone_brick" count="10" />
+    <ingredient idref="circuit" count="10" />
+    <ingredient idref="pipe" count="10" />
+  </item>
+  <item id="solar_panel" name="Solar Panel" time="10" produced="1">
+    <ingredient idref="steel" count="5" />
+    <ingredient idref="copper" count="5" />
+    <ingredient idref="circuit" count="15" />
+  </item>
+  <item id="turret" name="Turret" time="8" produced="1">
+    <ingredient idref="gear" count="10" />
+    <ingredient idref="iron" count="10" />
+    <ingredient idref="copper" count="20" />
+  </item>
+  <item id="accumulator" name="Accumulator" time="10" produced="1">
+    <ingredient idref="battery" count="5" />
+    <ingredient idref="iron" count="2" />
+  </item>
+  <item id="artillery_shell" name="Artillery Shell" time="15" produced="1">
+    <ingredient idref="exp_cannon_shell" count="4" />
+    <ingredient idref="radar" count="1" />
+    <ingredient idref="explosives" count="8" />
+  </item>
+  <item id="black_science" name="Black Science" time="10" produced="2">
+    <ingredient idref="grenade" count="1" />
+    <ingredient idref="piercing_bullets" count="1" />
+    <ingredient idref="turret" count="1" />
+  </item>
+  <item id="blue_science" name="Blue Science" time="12" produced="1">
+    <ingredient idref="adv_circuit" count="1" />
+    <ingredient idref="engine" count="1" />
+    <ingredient idref="electric_miner" count="1" />
+  </item>
+  <item id="centrifuge" name="Centrifuge" time="4" produced="1">
+    <ingredient idref="concrete" count="100" />
+    <ingredient idref="steel" count="50" />
+    <ingredient idref="adv_circuit" count="100" />
+    <ingredient idref="gear" count="100" />
+  </item>
+  <item id="defender" name="Defender" time="8" produced="1">
+    <ingredient idref="piercing_bullets" count="1" />
+    <ingredient idref="circuit" count="2" />
+    <ingredient idref="gear" count="3" />
+  </item>
+  <item id="efficiency_module_1" name="Efficiency Module 1" time="15" produced="1">
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="adv_circuit" count="5" />
+  </item>
+  <item id="electric_engine" name="Electric Engine" time="10" produced="1">
+    <ingredient idref="engine" count="1" />
+    <ingredient idref="circuit" count="2" />
+    <ingredient idref="lube" count="15" />
+  </item>
+  <item id="electric_furnace" name="Electric Furnace" time="5" produced="1">
+    <ingredient idref="steel" count="10" />
+    <ingredient idref="adv_circuit" count="5" />
+    <ingredient idref="stone_brick" count="10" />
+  </item>
+  <item id="locomotive" name="Locomotive" time="4" produced="1">
+    <ingredient idref="engine" count="20" />
+    <ingredient idref="circuit" count="10" />
+    <ingredient idref="steel" count="30" />
+  </item>
+  <item id="processing_unit" name="Processing unit" time="10" produced="1">
+    <ingredient idref="circuit" count="20" />
+    <ingredient idref="adv_circuit" count="2" />
+    <ingredient idref="sulfuric_acid" count="5" />
+  </item>
+  <item id="productivity_module_1" name="Productivity Module 1" time="15" produced="1">
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="adv_circuit" count="5" />
+  </item>
+  <item id="roboport" name="Roboport" time="5" produced="1">
+    <ingredient idref="adv_circuit" count="45" />
+    <ingredient idref="gear" count="45" />
+    <ingredient idref="steel" count="45" />
+  </item>
+  <item id="speed_module_1" name="Speed Module 1" time="15" produced="1">
+    <ingredient idref="circuit" count="5" />
+    <ingredient idref="adv_circuit" count="5" />
+  </item>
+  <item id="substation" name="Substation" time="1/2" produced="1">
+    <ingredient idref="steel" count="10" />
+    <ingredient idref="adv_circuit" count="5" />
+    <ingredient idref="copper" count="5" />
+  </item>
+  <item id="distractor" name="Distractor" time="15" produced="1">
+    <ingredient idref="defender" count="4" />
+    <ingredient idref="adv_circuit" count="3" />
+  </item>
+  <item id="purple_science" name="Purple Science" time="14" produced="2">
+    <ingredient idref="electric_engine" count="1" />
+    <ingredient idref="electric_furnace" count="1" />
+  </item>
+  <item id="robot_frame" name="Robot Frame" time="20" produced="1">
+    <ingredient idref="electric_engine" count="1" />
+    <ingredient idref="battery" count="2" />
+    <ingredient idref="circuit" count="3" />
+    <ingredient idref="steel" count="1" />
+  </item>
+  <item id="rocket_control" name="Rocket Control" time="30" produced="1">
+    <ingredient idref="speed_module_1" count="1" />
+    <ingredient idref="processing_unit" count="1" />
+  </item>
+  <item id="speed_module_2" name="Speed Module 2" time="30" produced="1">
+    <ingredient idref="speed_module_1" count="4" />
+    <ingredient idref="adv_circuit" count="5" />
+    <ingredient idref="processing_unit" count="5" />
+  </item>
+  <item id="yellow_science" name="Yellow Science" time="14" produced="2">
+    <ingredient idref="battery" count="1" />
+    <ingredient idref="processing_unit" count="3" />
+    <ingredient idref="speed_module_1" count="1" />
+    <ingredient idref="wire" count="30" />
+  </item>
+  <item id="destroyer" name="Destroyer" time="15" produced="1">
+    <ingredient idref="distractor" count="4" />
+    <ingredient idref="speed_module_1" count="1" />
+  </item>
+  <item id="speed_module_3" name="Speed Module 3" time="60" produced="1">
+    <ingredient idref="speed_module_2" count="5" />
+    <ingredient idref="adv_circuit" count="5" />
+    <ingredient idref="processing_unit" count="5" />
+  </item>
+</factorio_calc_item_db>

diff -r 0114c5c1cd03 -r 540b2fa05cec items.xml
--- a/items.xml	Fri Mar 29 19:06:38 2019 -0700
+++ b/items.xml	Fri Mar 29 19:08:48 2019 -0700
@@ -6,23 +6,21 @@
   <item id="light_oil" name="Light Oil" />
   <item id="lube" name="Lube" />
   <item id="pet_gas" name="Pet Gas" />
-  <item id="stone_brick" name="Stone brick" />
+  <item id="stone" name="Stone" />
   <item id="water" name="Water" />
-  <item id="concrete" name="Concrete" time="10" produced="10">
-    <ingredient idref="stone_brick" count="5" />
-    <ingredient idref="iron_ore" count="1" />
-    <ingredient idref="water" count="100" />
-  </item>
-  <item id="iron" name="Iron" time="15/8" produced="1">
+  <item id="iron" name="Iron" time="16/5" produced="1">
     <ingredient idref="iron_ore" count="1" />
   </item>
   <item id="plastic" name="Plastic" time="1" produced="2">
     <ingredient idref="coal" count="1" />
-    <ingredient idref="pet_gas" count="10" />
+    <ingredient idref="pet_gas" count="20" />
   </item>
-  <item id="solid_fuel" name="Solid Fuel" time="3" produced="1">
+  <item id="solid_fuel" name="Solid Fuel" time="2" produced="1">
     <ingredient idref="light_oil" count="10" />
   </item>
+  <item id="stone_brick" name="Stone brick" time="16/5" produced="1">
+    <ingredient idref="stone" count="2" />
+  </item>
   <item id="sulfur" name="Sulfur" time="1" produced="2">
     <ingredient idref="water" count="30" />
     <ingredient idref="pet_gas" count="30" />
@@ -37,7 +35,12 @@
     <ingredient idref="iron" count="1" />
     <ingredient idref="wire" count="3" />
   </item>
-  <item id="explosives" name="Explosives" time="5" produced="2">
+  <item id="concrete" name="Concrete" time="10" produced="10">
+    <ingredient idref="stone_brick" count="5" />
+    <ingredient idref="iron_ore" count="1" />
+    <ingredient idref="water" count="100" />
+  </item>
+  <item id="explosives" name="Explosives" time="4" produced="2">
     <ingredient idref="sulfur" count="1" />
     <ingredient idref="coal" count="1" />
     <ingredient idref="water" count="10" />
@@ -49,13 +52,16 @@
     <ingredient idref="iron" count="5" />
     <ingredient idref="coal" count="10" />
   </item>
+  <item id="iron_stick" name="Iron Stick" time="1/2" produced="2">
+    <ingredient idref="iron" count="1" />
+  </item>
   <item id="pipe" name="Pipe" time="1/2" produced="1">
     <ingredient idref="iron" count="1" />
   </item>
   <item id="rocket_fuel" name="Rocket Fuel" time="30" produced="1">
     <ingredient idref="solid_fuel" count="10" />
   </item>
-  <item id="steel" name="Steel" time="35/2" produced="1">
+  <item id="steel" name="Steel" time="16" produced="1">
     <ingredient idref="iron" count="5" />
   </item>
   <item id="sulfuric_acid" name="Sulfuric Acid" time="1" produced="50">
@@ -63,6 +69,9 @@
     <ingredient idref="iron" count="1" />
     <ingredient idref="water" count="100" />
   </item>
+  <item id="wall" name="Wall" time="1/2" produced="1">
+    <ingredient idref="stone_brick" count="5" />
+  </item>
   <item id="adv_circuit" name="Adv Circuit" time="6" produced="1">
     <ingredient idref="circuit" count="2" />
     <ingredient idref="plastic" count="2" />
@@ -73,15 +82,15 @@
     <ingredient idref="gear" count="5" />
     <ingredient idref="iron" count="9" />
   </item>
-  <item id="battery" name="Battery" time="5" produced="1">
+  <item id="battery" name="Battery" time="4" produced="1">
     <ingredient idref="copper" count="1" />
     <ingredient idref="iron" count="1" />
     <ingredient idref="sulfuric_acid" count="20" />
   </item>
-  <item id="cargo_wagon" name="Cargo Wagon" time="1/2" produced="1">
+  <item id="cargo_wagon" name="Cargo Wagon" time="1" produced="1">
     <ingredient idref="gear" count="10" />
-    <ingredient idref="iron" count="10" />
-    <ingredient idref="steel" count="10" />
+    <ingredient idref="iron" count="20" />
+    <ingredient idref="steel" count="20" />
   </item>
   <item id="chemical_plant" name="Chemical Plant" time="5" produced="1">
     <ingredient idref="steel" count="5" />
@@ -97,20 +106,26 @@
   <item id="engine" name="Engine" time="10" produced="1">
     <ingredient idref="steel" count="1" />
     <ingredient idref="gear" count="1" />
-    <ingredient idref="pipe" count="1" />
+    <ingredient idref="pipe" count="2" />
   </item>
   <item id="exp_cannon_shell" name="Exp Cannon Shell" time="8" produced="1">
     <ingredient idref="explosives" count="2" />
     <ingredient idref="plastic" count="2" />
     <ingredient idref="steel" count="2" />
   </item>
-  <item id="low_density_struct" name="Low Density Struct" time="30" produced="1">
-    <ingredient idref="steel" count="10" />
-    <ingredient idref="copper" count="5" />
+  <item id="inserter" name="Inserter" time="1/2" produced="1">
+    <ingredient idref="circuit" count="1" />
+    <ingredient idref="gear" count="1" />
+    <ingredient idref="iron" count="1" />
+  </item>
+  <item id="low_density_struct" name="Low Density Struct" time="20" produced="1">
+    <ingredient idref="steel" count="2" />
+    <ingredient idref="copper" count="20" />
     <ingredient idref="plastic" count="5" />
   </item>
   <item id="medium_pole" name="Medium Pole" time="1/2" produced="1">
     <ingredient idref="steel" count="2" />
+    <ingredient idref="iron_stick" count="4" />
     <ingredient idref="copper" count="2" />
   </item>
   <item id="piercing_bullets" name="Piercing Bullets" time="3" produced="1">
@@ -119,7 +134,7 @@
     <ingredient idref="copper" count="5" />
   </item>
   <item id="pumpjack" name="Pumpjack" time="5" produced="1">
-    <ingredient idref="steel" count="4" />
+    <ingredient idref="steel" count="5" />
     <ingredient idref="gear" count="10" />
     <ingredient idref="circuit" count="5" />
     <ingredient idref="pipe" count="10" />
@@ -129,6 +144,21 @@
     <ingredient idref="gear" count="5" />
     <ingredient idref="iron" count="10" />
   </item>
+  <item id="rail" name="Rail" time="1/2" produced="2">
+    <ingredient idref="steel" count="1" />
+    <ingredient idref="iron_stick" count="1" />
+    <ingredient idref="stone" count="1" />
+  </item>
+  <item id="red_science" name="Red Science" time="5" produced="1">
+    <ingredient idref="copper" count="1" />
+    <ingredient idref="gear" count="1" />
+  </item>
+  <item id="refined_concrete" name="Refined Concrete" time="15" produced="10">
+    <ingredient idref="concrete" count="20" />
+    <ingredient idref="iron_stick" count="8" />
+    <ingredient idref="steel" count="1" />
+    <ingredient idref="water" count="100" />
+  </item>
   <item id="refinery" name="Refinery" time="8" produced="1">
     <ingredient idref="steel" count="15" />
     <ingredient idref="gear" count="10" />
@@ -146,6 +176,10 @@
     <ingredient idref="iron" count="10" />
     <ingredient idref="copper" count="20" />
   </item>
+  <item id="yellow_belt" name="Yellow Belt" time="1/2" produced="2">
+    <ingredient idref="gear" count="1" />
+    <ingredient idref="iron" count="1" />
+  </item>
   <item id="accumulator" name="Accumulator" time="10" produced="1">
     <ingredient idref="battery" count="5" />
     <ingredient idref="iron" count="2" />
@@ -158,12 +192,12 @@
   <item id="black_science" name="Black Science" time="10" produced="2">
     <ingredient idref="grenade" count="1" />
     <ingredient idref="piercing_bullets" count="1" />
-    <ingredient idref="turret" count="1" />
+    <ingredient idref="wall" count="2" />
   </item>
-  <item id="blue_science" name="Blue Science" time="12" produced="1">
-    <ingredient idref="adv_circuit" count="1" />
-    <ingredient idref="engine" count="1" />
-    <ingredient idref="electric_miner" count="1" />
+  <item id="blue_science" name="Blue Science" time="24" produced="2">
+    <ingredient idref="adv_circuit" count="3" />
+    <ingredient idref="engine" count="2" />
+    <ingredient idref="solid_fuel" count="1" />
   </item>
   <item id="centrifuge" name="Centrifuge" time="4" produced="1">
     <ingredient idref="concrete" count="100" />
@@ -171,11 +205,6 @@
     <ingredient idref="adv_circuit" count="100" />
     <ingredient idref="gear" count="100" />
   </item>
-  <item id="defender" name="Defender" time="8" produced="1">
-    <ingredient idref="piercing_bullets" count="1" />
-    <ingredient idref="circuit" count="2" />
-    <ingredient idref="gear" count="3" />
-  </item>
   <item id="efficiency_module_1" name="Efficiency Module 1" time="15" produced="1">
     <ingredient idref="circuit" count="5" />
     <ingredient idref="adv_circuit" count="5" />
@@ -190,6 +219,10 @@
     <ingredient idref="adv_circuit" count="5" />
     <ingredient idref="stone_brick" count="10" />
   </item>
+  <item id="green_science" name="Green Science" time="6" produced="1">
+    <ingredient idref="inserter" count="1" />
+    <ingredient idref="yellow_belt" count="1" />
+  </item>
   <item id="locomotive" name="Locomotive" time="4" produced="1">
     <ingredient idref="engine" count="20" />
     <ingredient idref="circuit" count="10" />
@@ -218,13 +251,10 @@
     <ingredient idref="adv_circuit" count="5" />
     <ingredient idref="copper" count="5" />
   </item>
-  <item id="distractor" name="Distractor" time="15" produced="1">
-    <ingredient idref="defender" count="4" />
-    <ingredient idref="adv_circuit" count="3" />
-  </item>
-  <item id="purple_science" name="Purple Science" time="14" produced="2">
-    <ingredient idref="electric_engine" count="1" />
+  <item id="purple_science" name="Purple Science" time="21" produced="3">
     <ingredient idref="electric_furnace" count="1" />
+    <ingredient idref="productivity_module_1" count="1" />
+    <ingredient idref="rail" count="30" />
   </item>
   <item id="robot_frame" name="Robot Frame" time="20" produced="1">
     <ingredient idref="electric_engine" count="1" />
@@ -241,19 +271,27 @@
     <ingredient idref="adv_circuit" count="5" />
     <ingredient idref="processing_unit" count="5" />
   </item>
-  <item id="yellow_science" name="Yellow Science" time="14" produced="2">
-    <ingredient idref="battery" count="1" />
-    <ingredient idref="processing_unit" count="3" />
-    <ingredient idref="speed_module_1" count="1" />
-    <ingredient idref="wire" count="30" />
-  </item>
-  <item id="destroyer" name="Destroyer" time="15" produced="1">
-    <ingredient idref="distractor" count="4" />
-    <ingredient idref="speed_module_1" count="1" />
+  <item id="defender" name="Defender" time="8" produced="1">
+    <ingredient idref="piercing_bullets" count="1" />
+    <ingredient idref="robot_frame" count="1" />
+    <ingredient idref="gear" count="3" />
   </item>
   <item id="speed_module_3" name="Speed Module 3" time="60" produced="1">
     <ingredient idref="speed_module_2" count="5" />
     <ingredient idref="adv_circuit" count="5" />
     <ingredient idref="processing_unit" count="5" />
   </item>
+  <item id="yellow_science" name="Yellow Science" time="21" produced="3">
+    <ingredient idref="robot_frame" count="1" />
+    <ingredient idref="processing_unit" count="2" />
+    <ingredient idref="low_density_struct" count="3" />
+  </item>
+  <item id="distractor" name="Distractor" time="15" produced="1">
+    <ingredient idref="defender" count="4" />
+    <ingredient idref="adv_circuit" count="3" />
+  </item>
+  <item id="destroyer" name="Destroyer" time="15" produced="1">
+    <ingredient idref="distractor" count="4" />
+    <ingredient idref="speed_module_1" count="1" />
+  </item>
 </factorio_calc_item_db>