diff --git a/angelspetrochem_0.7.12/info.json b/angelspetrochem_0.7.12/info.json index 14a9cf1..2da04bd 100644 --- a/angelspetrochem_0.7.12/info.json +++ b/angelspetrochem_0.7.12/info.json @@ -1,7 +1,7 @@ { "name": "angelspetrochem", "version": "0.7.12", - "factorio_version": "0.16", + "factorio_version": "0.17", "title": "Angel's Petro Chemical Processing", "author": "Arch666Angel", "contact": "", @@ -13,4 +13,4 @@ "? bobplates >= 0.15.0", "? bobassembly >= 0.15.0" ] -} \ No newline at end of file +} diff --git a/angelspetrochem_0.7.12/prototypes/buildings/advanced-chemical-plant.lua b/angelspetrochem_0.7.12/prototypes/buildings/advanced-chemical-plant.lua index ca847e9..31ccfb7 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/advanced-chemical-plant.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/advanced-chemical-plant.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "i", place_result = "advanced-chemical-plant", @@ -155,7 +154,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "j", place_result = "advanced-chemical-plant-2", @@ -281,4 +279,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/air-filter.lua b/angelspetrochem_0.7.12/prototypes/buildings/air-filter.lua index f5d0dd1..e50357b 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/air-filter.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/air-filter.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "i", place_result = "angels-air-filter", @@ -111,7 +110,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "j", place_result = "angels-air-filter-2", @@ -193,4 +191,4 @@ data:extend( pipe_covers = pipecoverspictures() }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/chemical-plant.lua b/angelspetrochem_0.7.12/prototypes/buildings/chemical-plant.lua index c13952c..748dcde 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/chemical-plant.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/chemical-plant.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "a[chemical-plant]", place_result = "angels-chemical-plant", @@ -178,7 +177,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "b[chemical-plant-2]", place_result = "angels-chemical-plant-2", @@ -341,7 +339,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "c[chemical-plant-3]", place_result = "angels-chemical-plant-3", @@ -504,7 +501,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "d[chemical-plant-4]", place_result = "angels-chemical-plant-4", @@ -653,4 +649,4 @@ data:extend( } }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/electric-boiler.lua b/angelspetrochem_0.7.12/prototypes/buildings/electric-boiler.lua index cdbdc30..ca47749 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/electric-boiler.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/electric-boiler.lua @@ -5,7 +5,6 @@ data:extend( name = "angels-electric-boiler", icon = "__angelspetrochem__/graphics/icons/electric-boiler.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "i[separator]", place_result = "angels-electric-boiler", @@ -230,4 +229,4 @@ data:extend( burning_cooldown = 20 }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/electrolyser.lua b/angelspetrochem_0.7.12/prototypes/buildings/electrolyser.lua index 05014a2..6b9766b 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/electrolyser.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/electrolyser.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "a[angels-electrolyser]", place_result = "angels-electrolyser", @@ -159,7 +158,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "b[angels-electrolyser-2]", place_result = "angels-electrolyser-2", @@ -303,7 +301,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "c[angels-electrolyser-3]", place_result = "angels-electrolyser-3", @@ -447,7 +444,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-electrolyser", order = "d[angels-electrolyser-4]", place_result = "angels-electrolyser-4", @@ -577,4 +573,4 @@ data:extend( pipe_covers = pipecoverspictures() }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/flare-stack.lua b/angelspetrochem_0.7.12/prototypes/buildings/flare-stack.lua index 8912bf9..b2748a2 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/flare-stack.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/flare-stack.lua @@ -5,7 +5,6 @@ data:extend( name = "angels-flare-stack", icon = "__angelspetrochem__/graphics/icons/flare-stack.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "i", place_result = "angels-flare-stack", @@ -131,4 +130,4 @@ data:extend( close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/fluid-splitter.lua b/angelspetrochem_0.7.12/prototypes/buildings/fluid-splitter.lua index b1beca4..0f53515 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/fluid-splitter.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/fluid-splitter.lua @@ -4,7 +4,6 @@ data:extend( type = "item", name = "angels-fluid-splitter-2-way", icon = "__angelspetrochem__/graphics/icons/fluid-splitter-1.png", - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "e[angels-fluid-splitter-2-way]", place_result = "angels-fluid-splitter-2-way", @@ -145,7 +144,6 @@ data:extend( type = "item", name = "angels-fluid-splitter-3-way", icon = "__angelspetrochem__/graphics/icons/fluid-splitter-2.png", - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "e[angels-fluid-splitter-3-way]", place_result = "angels-fluid-splitter-3-way", @@ -285,4 +283,4 @@ data:extend( close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/gas-refinery.lua b/angelspetrochem_0.7.12/prototypes/buildings/gas-refinery.lua index 2face55..51ebf66 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/gas-refinery.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/gas-refinery.lua @@ -16,7 +16,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "e[gas-refinery]", place_result = "gas-refinery-small", @@ -148,7 +147,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "f[gas-refinery-2]", place_result = "gas-refinery-small-2", @@ -280,7 +278,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "g[gas-refinery-3]", place_result = "gas-refinery-small-3", @@ -412,7 +409,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "h[gas-refinery-4]", place_result = "gas-refinery-small-4", @@ -545,7 +541,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "e[gas-refinery]", place_result = "gas-refinery", @@ -690,7 +685,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "f[gas-refinery-2]", place_result = "gas-refinery-2", @@ -835,7 +829,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "g[gas-refinery-3]", place_result = "gas-refinery-3", @@ -980,7 +973,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "h[gas-refinery-4]", place_result = "gas-refinery-4", @@ -1111,4 +1103,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/heavy-pump.lua b/angelspetrochem_0.7.12/prototypes/buildings/heavy-pump.lua index eb00fab..8072cf4 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/heavy-pump.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/heavy-pump.lua @@ -5,7 +5,6 @@ data:extend( name = "heavy-pump", icon = "__angelspetrochem__/graphics/icons/heavy-pump.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-well-head", order = "g[heavy-pump]", place_result = "heavy-pump", @@ -124,4 +123,4 @@ data:extend( pipe_covers = pipecoverspictures(), }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/oil-refinery.lua b/angelspetrochem_0.7.12/prototypes/buildings/oil-refinery.lua index d7530ea..656c617 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/oil-refinery.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/oil-refinery.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "f[refinery-2]", place_result = "oil-refinery-2", @@ -183,7 +182,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "g[refinery-3]", place_result = "oil-refinery-3", @@ -351,7 +349,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-vanilla", order = "h[refinery-4]", place_result = "oil-refinery-4", @@ -505,4 +502,4 @@ data:extend( pipe_covers = pipecoverspictures() }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/pipes-overlay.lua b/angelspetrochem_0.7.12/prototypes/buildings/pipes-overlay.lua index cc5ad37..2e0bf39 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/pipes-overlay.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/pipes-overlay.lua @@ -21,8 +21,8 @@ function electrolyserpictures() { filename = "__angelspetrochem__/graphics/entity/electrolyser/pipe-south.png", priority = "extra-high", - width = 48, - height = 48, + width = 41, + height = 40, shift = {5/32, -8/32} }, west = @@ -199,4 +199,4 @@ function polypictures3() shift = {16/32, 0} } } -end \ No newline at end of file +end diff --git a/angelspetrochem_0.7.12/prototypes/buildings/separator.lua b/angelspetrochem_0.7.12/prototypes/buildings/separator.lua index 9773ce3..97f1f17 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/separator.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/separator.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "a[separator]", place_result = "separator", @@ -136,7 +135,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "b[separator-2]", place_result = "separator-2", @@ -257,7 +255,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "c[separator-3]", place_result = "separator-3", @@ -378,7 +375,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-separator-gas-refinery", order = "d[separator-4]", place_result = "separator-4", @@ -485,4 +481,4 @@ data:extend( pipe_covers = pipecoverspictures() }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/steam-cracker.lua b/angelspetrochem_0.7.12/prototypes/buildings/steam-cracker.lua index b0ac283..e9802fc 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/steam-cracker.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/steam-cracker.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "a", place_result = "steam-cracker", @@ -182,7 +181,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "b", place_result = "steam-cracker-2", @@ -333,7 +331,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "c", place_result = "steam-cracker-3", @@ -484,7 +481,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "petrochem-steam-cracker-advanced-chemical-plant", order = "d", place_result = "steam-cracker-4", @@ -621,4 +617,4 @@ data:extend( pipe_covers = pipecoverspictures() }, } - ) \ No newline at end of file + ) diff --git a/angelspetrochem_0.7.12/prototypes/buildings/storage-tanks.lua b/angelspetrochem_0.7.12/prototypes/buildings/storage-tanks.lua index f5d89f5..31cc4fd 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/storage-tanks.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/storage-tanks.lua @@ -5,7 +5,6 @@ data:extend( name = "angels-storage-tank-1", icon = "__angelspetrochem__/graphics/icons/storage-tank-1.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-tanks", order = "b[angels-storage-tank-1]", place_result = "angels-storage-tank-1", @@ -116,7 +115,6 @@ data:extend( name = "angels-storage-tank-2", icon = "__angelspetrochem__/graphics/icons/storage-tank-2.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-tanks", order = "c[angels-storage-tank-2]", place_result = "angels-storage-tank-2", @@ -227,7 +225,6 @@ data:extend( name = "angels-storage-tank-3", icon = "__angelspetrochem__/graphics/icons/storage-tank-3.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-tanks", order = "d", place_result = "angels-storage-tank-3", diff --git a/angelspetrochem_0.7.12/prototypes/buildings/valves.lua b/angelspetrochem_0.7.12/prototypes/buildings/valves.lua index ab40a65..e98a7a5 100644 --- a/angelspetrochem_0.7.12/prototypes/buildings/valves.lua +++ b/angelspetrochem_0.7.12/prototypes/buildings/valves.lua @@ -6,7 +6,6 @@ data:extend( name = "valve-check", icon = "__angelspetrochem__/graphics/icons/valve-check.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "a[valve-check]", place_result = "valve-check", @@ -136,7 +135,6 @@ data:extend( name = "valve-return", icon = "__angelspetrochem__/graphics/icons/valve-return.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "b[valve-return]", place_result = "valve-return", @@ -266,7 +264,6 @@ data:extend( name = "valve-overflow", icon = "__angelspetrochem__/graphics/icons/valve-overflow.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "c[valve-overflow]", place_result = "valve-overflow", @@ -397,7 +394,6 @@ data:extend( name = "valve-underflow", icon = "__angelspetrochem__/graphics/icons/valve-underflow.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "d[valve-underflow]", place_result = "valve-underflow", @@ -528,7 +524,6 @@ data:extend( name = "valve-converter", icon = "__angelspetrochem__/graphics/icons/valve-converter.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-fluid-control", order = "d[valve-converter]", place_result = "valve-converter", diff --git a/angelspetrochem_0.7.12/prototypes/items/petrochem-basics.lua b/angelspetrochem_0.7.12/prototypes/items/petrochem-basics.lua index 54c5836..edb99f5 100644 --- a/angelspetrochem_0.7.12/prototypes/items/petrochem-basics.lua +++ b/angelspetrochem_0.7.12/prototypes/items/petrochem-basics.lua @@ -105,7 +105,6 @@ data:extend( name = "chemical-void", icon = "__angelspetrochem__/graphics/icons/solid-sodium-hydroxide.png", icon_size = 32, - flags = {"goes-to-main-inventory", "hidden"}, subgroup = "petrochem-raw", order = "a[chemical-void]", stack_size = 200 diff --git a/angelspetrochem_0.7.12/prototypes/items/petrochem-chlorine.lua b/angelspetrochem_0.7.12/prototypes/items/petrochem-chlorine.lua index f599049..8bd4572 100644 --- a/angelspetrochem_0.7.12/prototypes/items/petrochem-chlorine.lua +++ b/angelspetrochem_0.7.12/prototypes/items/petrochem-chlorine.lua @@ -90,7 +90,6 @@ data:extend( name = "solid-sodium-chlorate", icon = "__angelspetrochem__/graphics/icons/solid-sodium-chlorate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-chlorate]", stack_size = 200 @@ -100,7 +99,6 @@ data:extend( name = "solid-sodium-perchlorate", icon = "__angelspetrochem__/graphics/icons/solid-sodium-perchlorate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-chlorate]", stack_size = 200 diff --git a/angelspetrochem_0.7.12/prototypes/items/petrochem-solids.lua b/angelspetrochem_0.7.12/prototypes/items/petrochem-solids.lua index 7d66f30..9883223 100644 --- a/angelspetrochem_0.7.12/prototypes/items/petrochem-solids.lua +++ b/angelspetrochem_0.7.12/prototypes/items/petrochem-solids.lua @@ -49,7 +49,6 @@ data:extend( name = "solid-resin", icon = "__angelspetrochem__/graphics/icons/solid-resin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-resin]", stack_size = 200 @@ -59,7 +58,6 @@ data:extend( name = "solid-rubber", icon = "__angelspetrochem__/graphics/icons/solid-rubber.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-rubber]", stack_size = 200 @@ -69,7 +67,6 @@ data:extend( name = "fluorite-ore", icon = "__angelspetrochem__/graphics/icons/ore-fluorite.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[fluorite-ore]", stack_size = 200 @@ -80,7 +77,6 @@ data:extend( name = "solid-calcium-chloride", icon = "__angelspetrochem__/graphics/icons/solid-calcium-chloride.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-calcium-chloride]", stack_size = 200 @@ -90,7 +86,6 @@ data:extend( name = "solid-oil-residual", icon = "__angelspetrochem__/graphics/icons/solid-oil-residual.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-oil-residual]", stack_size = 200 @@ -101,7 +96,6 @@ data:extend( name = "solid-sodium", icon = "__angelspetrochem__/graphics/icons/solid-sodium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium]", stack_size = 200 @@ -111,7 +105,6 @@ data:extend( name = "solid-sodium-hydroxide", icon = "__angelspetrochem__/graphics/icons/solid-sodium-hydroxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-hydroxide]", stack_size = 200 @@ -121,7 +114,6 @@ data:extend( name = "solid-sodium-carbonate", icon = "__angelspetrochem__/graphics/icons/solid-sodium-carbonate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-carbonate]", stack_size = 200 @@ -131,7 +123,6 @@ data:extend( name = "solid-sodium-hypochlorite", icon = "__angelspetrochem__/graphics/icons/solid-sodium-hypochlorite.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-hypochlorite]", stack_size = 200 @@ -141,7 +132,6 @@ data:extend( name = "solid-sodium-cyanide", icon = "__angelspetrochem__/graphics/icons/solid-sodium-cyanide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-cyanide]", stack_size = 200 @@ -152,7 +142,6 @@ data:extend( name = "catalyst-metal-carrier", icon = "__angelspetrochem__/graphics/icons/catalyst-metal-carrier.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[catalyst-metal-carrier]", stack_size = 200 @@ -162,7 +151,6 @@ data:extend( name = "catalyst-metal-red", icon = "__angelspetrochem__/graphics/icons/catalyst-metal-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "b[catalyst-metal-red]", stack_size = 200 @@ -172,7 +160,6 @@ data:extend( name = "catalyst-metal-green", icon = "__angelspetrochem__/graphics/icons/catalyst-metal-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "c[catalyst-metal-red]", stack_size = 200 @@ -182,7 +169,6 @@ data:extend( name = "catalyst-metal-blue", icon = "__angelspetrochem__/graphics/icons/catalyst-metal-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "c[catalyst-metal-blue]", stack_size = 200 @@ -192,7 +178,6 @@ data:extend( name = "catalyst-metal-yellow", icon = "__angelspetrochem__/graphics/icons/catalyst-metal-yellow.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "d[catalyst-metal-yellow]", stack_size = 200 @@ -203,7 +188,6 @@ data:extend( name = "coal-crushed", icon = "__angelspetrochem__/graphics/icons/coal-crushed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[carbon]", fuel_category = "chemical", @@ -215,7 +199,6 @@ data:extend( name = "solid-coke", icon = "__angelspetrochem__/graphics/icons/solid-coke.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[carbon]", fuel_category = "chemical", @@ -227,7 +210,6 @@ data:extend( name = "pellet-coke", icon = "__angelspetrochem__/graphics/icons/pellet-coke.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[coke]", fuel_category = "chemical", @@ -239,7 +221,6 @@ data:extend( name = "solid-carbon", icon = "__angelspetrochem__/graphics/icons/solid-carbon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[carbon]", fuel_category = "chemical", @@ -252,7 +233,6 @@ data:extend( name = "solid-salt", icon = "__angelspetrochem__/graphics/icons/solid-salt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "water-salination", order = "a", stack_size = 200 @@ -262,7 +242,6 @@ data:extend( name = "solid-lithium", icon = "__angelspetrochem__/graphics/icons/solid-lithium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "water-salination", order = "a", stack_size = 200 @@ -272,7 +251,6 @@ data:extend( name = "solid-ammonium-nitrate", icon = "__angelspetrochem__/graphics/icons/solid-ammonium-nitrate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-nitrogen", order = "a", stack_size = 200 @@ -282,7 +260,6 @@ data:extend( name = "solid-ammonium-perchlorate", icon = "__angelspetrochem__/graphics/icons/solid-ammonium-perchlorate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-nitrogen", order = "a", stack_size = 200 @@ -293,7 +270,6 @@ data:extend( name = "rocket-fuel-capsule", icon = "__angelspetrochem__/graphics/icons/rocket-fuel-capsule.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-nitrogen", order = "a", stack_size = 200 @@ -303,7 +279,6 @@ data:extend( name = "rocket-oxidizer-capsule", icon = "__angelspetrochem__/graphics/icons/rocket-oxidizer-capsule.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-nitrogen", order = "a", stack_size = 200 @@ -313,7 +288,6 @@ data:extend( name = "rocket-booster", icon = "__angelspetrochem__/graphics/icons/rocket-booster.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-nitrogen", order = "a", fuel_category = "chemical", diff --git a/angelspetrochem_0.7.12/prototypes/items/petrochem-sulfur.lua b/angelspetrochem_0.7.12/prototypes/items/petrochem-sulfur.lua index 708d47f..8593884 100644 --- a/angelspetrochem_0.7.12/prototypes/items/petrochem-sulfur.lua +++ b/angelspetrochem_0.7.12/prototypes/items/petrochem-sulfur.lua @@ -48,7 +48,6 @@ data:extend( name = "solid-calcium-sulfate", icon = "__angelspetrochem__/graphics/icons/solid-calcium-sulfate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-calcium-sulfate]", stack_size = 200 @@ -58,7 +57,6 @@ data:extend( name = "solid-sodium-sulfate", icon = "__angelspetrochem__/graphics/icons/solid-sodium-sulfate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a", stack_size = 200 @@ -68,7 +66,6 @@ data:extend( name = "filter-lime", icon = "__angelspetrochem__/graphics/icons/filter-lime.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a", stack_size = 200 @@ -78,7 +75,6 @@ data:extend( name = "filter-lime-used", icon = "__angelspetrochem__/graphics/icons/filter-lime-used.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "c", stack_size = 200 diff --git a/angelspetrochem_0.7.12/prototypes/petrochem-global-override.lua b/angelspetrochem_0.7.12/prototypes/petrochem-global-override.lua index c704f6a..89192a4 100644 --- a/angelspetrochem_0.7.12/prototypes/petrochem-global-override.lua +++ b/angelspetrochem_0.7.12/prototypes/petrochem-global-override.lua @@ -103,6 +103,11 @@ local OV = angelsmods.functions.OV end --OVERRIDE FOR BOBs +hide = function(name) + item = data.raw["item"][name] + item.flags = item.flags or {} + table.insert(item.flags,"hidden") +end if bobmods then if bobmods.plates then OV.global_replace_item("carbon", "solid-carbon") @@ -115,15 +120,15 @@ if bobmods then OV.global_replace_item("oxygen", "gas-oxygen") OV.global_replace_item("ferric-chloride-solution", "liquid-ferric-chloride-solution") OV.global_replace_item("sodium-hydroxide", "solid-sodium-hydroxide") - table.insert(data.raw["item"]["sodium-hydroxide"].flags,"hidden") + hide("sodium-hydroxide") OV.global_replace_item("sulfur-dioxide", "gas-sulfur-dioxide") OV.global_replace_item("liquid-air", "gas-compressed-air") OV.global_replace_item({ "solid-resin"}, "resin") - table.insert(data.raw["item"]["solid-resin"].flags,"hidden") + hide("solid-resin") OV.global_replace_item("calcium-chloride", "solid-calcium-chloride") OV.global_replace_item("solid-rubber", "rubber") - table.insert(data.raw["item"]["solid-rubber"].flags,"hidden") + hide("solid-rubber") OV.patch_recipes({ { name = "solid-rubber", results = { diff --git a/angelspetrochem_0.7.12/prototypes/petrochem-override.lua b/angelspetrochem_0.7.12/prototypes/petrochem-override.lua index 02de33b..0caa023 100644 --- a/angelspetrochem_0.7.12/prototypes/petrochem-override.lua +++ b/angelspetrochem_0.7.12/prototypes/petrochem-override.lua @@ -76,7 +76,7 @@ local OV = angelsmods.functions.OV OV.patch_recipes({ { name = "bob-resin-wood", energy_required = 5, - ingredients = { { name = "raw-wood", type = "item", amount = "+4" } }, + ingredients = { { name = "wood", type = "item", amount = "+4" } }, }, }) end diff --git a/angelspetrochem_0.7.12/prototypes/recipes/petrochem-sulfur - Kopie.lua b/angelspetrochem_0.7.12/prototypes/recipes/petrochem-sulfur - Kopie.lua index 72a7ac3..7a2ae57 100644 --- a/angelspetrochem_0.7.12/prototypes/recipes/petrochem-sulfur - Kopie.lua +++ b/angelspetrochem_0.7.12/prototypes/recipes/petrochem-sulfur - Kopie.lua @@ -5,7 +5,6 @@ data:extend( name = "filter-lime", icon = "__angelspetrochem__/graphics/icons/solid-calcium-sulfate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "petrochem-raw", order = "a[solid-sodium-sulfate]", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "filter-lime-used", icon = "__angelsbioprocessing__/graphics/icons/solid-calcium-carbonate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-red", order = "c[solid-calcium-carbonate]", stack_size = 200 diff --git a/angelspetrochem_0.7.12/prototypes/technology/angels-technology.lua b/angelspetrochem_0.7.12/prototypes/technology/angels-technology.lua index ff67540..48e01ef 100644 --- a/angelspetrochem_0.7.12/prototypes/technology/angels-technology.lua +++ b/angelspetrochem_0.7.12/prototypes/technology/angels-technology.lua @@ -44,7 +44,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -83,7 +83,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -125,8 +125,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -156,7 +156,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -195,8 +195,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -234,8 +234,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -275,8 +275,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -314,8 +314,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -353,8 +353,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -380,8 +380,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -421,8 +421,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -474,8 +474,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -539,9 +539,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -583,9 +583,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"alien-science-pack", 1}, }, time = 15 @@ -624,9 +624,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -664,9 +664,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -708,8 +708,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -740,9 +740,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -776,8 +776,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -816,9 +816,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -845,8 +845,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -873,9 +873,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -902,9 +902,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"alien-science-pack", 1}, }, time = 15 @@ -932,8 +932,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -960,9 +960,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -989,13 +989,13 @@ data:extend( { count = 30, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, order = "c-a" }, } -) \ No newline at end of file +) diff --git a/angelspetrochem_0.7.12/prototypes/technology/petrochem-technology.lua b/angelspetrochem_0.7.12/prototypes/technology/petrochem-technology.lua index e837cb3..b8295f9 100644 --- a/angelspetrochem_0.7.12/prototypes/technology/petrochem-technology.lua +++ b/angelspetrochem_0.7.12/prototypes/technology/petrochem-technology.lua @@ -48,7 +48,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -91,7 +91,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -137,7 +137,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -171,7 +171,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -206,8 +206,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -242,9 +242,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -278,7 +278,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -312,8 +312,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -348,9 +348,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -388,7 +388,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 15 }, @@ -435,8 +435,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -479,9 +479,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -520,10 +520,10 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, - {"high-tech-science-pack", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 15 }, @@ -562,8 +562,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -597,9 +597,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -650,9 +650,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -699,9 +699,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -741,8 +741,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -792,8 +792,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -823,9 +823,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -867,8 +867,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -906,9 +906,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -934,8 +934,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -979,8 +979,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1036,8 +1036,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1110,9 +1110,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1174,10 +1174,10 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, - {"high-tech-science-pack", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 15 }, @@ -1223,9 +1223,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1267,8 +1267,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1303,9 +1303,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1339,8 +1339,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1387,9 +1387,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1416,8 +1416,8 @@ data:extend( { count = 30, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1448,8 +1448,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1476,9 +1476,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1505,10 +1505,10 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, - {"high-tech-science-pack", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 15 }, @@ -1539,8 +1539,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1567,9 +1567,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1597,9 +1597,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1630,8 +1630,8 @@ data:extend( { count = 30, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1666,10 +1666,10 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, - {"high-tech-science-pack", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 15 }, @@ -1700,8 +1700,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 15 }, @@ -1732,9 +1732,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 15 }, @@ -1762,8 +1762,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, {"military-science-pack", 1}, }, time = 15 @@ -1791,9 +1791,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, {"military-science-pack", 1}, }, time = 15