diff --git a/angelssmelting_0.4.6/info.json b/angelssmelting_0.4.6/info.json index 465b09e..dba1009 100644 --- a/angelssmelting_0.4.6/info.json +++ b/angelssmelting_0.4.6/info.json @@ -1,7 +1,7 @@ { "name": "angelssmelting", "version": "0.4.6", - "factorio_version": "0.16", + "factorio_version": "0.17", "title": "Angel's Smelting", "author": "Arch666Angel", "contact": "", diff --git a/angelssmelting_0.4.6/prototypes/buildings/blast-furnace.lua b/angelssmelting_0.4.6/prototypes/buildings/blast-furnace.lua index 68cf060..2d468b6 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/blast-furnace.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/blast-furnace.lua @@ -15,7 +15,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-blast-furnace", order = "a[blast-furnace]", place_result = "blast-furnace", @@ -121,7 +120,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-blast-furnace", order = "b[blast-furnace-2]", place_result = "blast-furnace-2", @@ -227,7 +225,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-blast-furnace", order = "c[blast-furnace-3]", place_result = "blast-furnace-3", @@ -333,7 +330,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-blast-furnace", order = "d[blast-furnace-4]", place_result = "blast-furnace-4", @@ -425,4 +421,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelssmelting_0.4.6/prototypes/buildings/casting-machine.lua b/angelssmelting_0.4.6/prototypes/buildings/casting-machine.lua index 190c1a8..e23e7e2 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/casting-machine.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/casting-machine.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-casting-machine", order = "a[casting-machine]", place_result = "casting-machine", @@ -133,7 +132,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-casting-machine", order = "b[casting-machine-2]", place_result = "casting-machine-2", @@ -245,7 +243,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-casting-machine", order = "c[casting-machine-3]", place_result = "casting-machine-3", @@ -357,7 +354,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-casting-machine", order = "d[casting-machine-4]", place_result = "casting-machine-4", @@ -455,4 +451,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/chemical-furnace.lua b/angelssmelting_0.4.6/prototypes/buildings/chemical-furnace.lua index 61ec458..156325b 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/chemical-furnace.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/chemical-furnace.lua @@ -15,7 +15,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-chemical-furnace", order = "a[angels-chemical-furnace]", place_result = "angels-chemical-furnace", @@ -122,7 +121,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-chemical-furnace", order = "b[angels-chemical-furnace-2]", place_result = "angels-chemical-furnace-2", @@ -229,7 +227,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-chemical-furnace", order = "c[angels-chemical-furnace-3]", place_result = "angels-chemical-furnace-3", @@ -336,7 +333,6 @@ } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-chemical-furnace", order = "d[angels-chemical-furnace-4]", place_result = "angels-chemical-furnace-4", @@ -429,4 +425,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelssmelting_0.4.6/prototypes/buildings/cooling-tower.lua b/angelssmelting_0.4.6/prototypes/buildings/cooling-tower.lua index 21860bd..cec73d8 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/cooling-tower.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/cooling-tower.lua @@ -5,7 +5,6 @@ data:extend( name = "cooling-tower", icon = "__angelssmelting__/graphics/icons/cooling-tower.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "water-treatment-building", order = "f[cooling-tower]", place_result = "cooling-tower", @@ -94,4 +93,4 @@ data:extend( close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/induction-furnace.lua b/angelssmelting_0.4.6/prototypes/buildings/induction-furnace.lua index fa9bd80..a4b6b7d 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/induction-furnace.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/induction-furnace.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-induction-furnace", order = "a[induction-furnace]", place_result = "induction-furnace", @@ -121,7 +120,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-induction-furnace", order = "b[induction-furnace-2]", place_result = "induction-furnace-2", @@ -219,7 +217,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-induction-furnace", order = "c[induction-furnace-3]", place_result = "induction-furnace-3", @@ -317,7 +314,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-induction-furnace", order = "d[induction-furnace-4]", place_result = "induction-furnace-4", @@ -401,4 +397,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/ore-processing-machine.lua b/angelssmelting_0.4.6/prototypes/buildings/ore-processing-machine.lua index 7113bee..f1fb754 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/ore-processing-machine.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/ore-processing-machine.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-processing-machine", order = "a[ore-processing-machine]", place_result = "ore-processing-machine", @@ -103,7 +102,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-processing-machine", order = "b[ore-processing-machine-2]", place_result = "ore-processing-machine-2", @@ -191,7 +189,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-processing-machine", order = "c[ore-processing-machine-3]", place_result = "ore-processing-machine-3", @@ -279,7 +276,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-processing-machine", order = "d[ore-processing-machine-4]", place_result = "ore-processing-machine-4", @@ -353,4 +349,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/pellet-press.lua b/angelssmelting_0.4.6/prototypes/buildings/pellet-press.lua index 2dba238..41419e5 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/pellet-press.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/pellet-press.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-pellet-press", order = "a[pellet-press]", place_result = "pellet-press", @@ -103,7 +102,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-pellet-press", order = "b[pellet-press-2]", place_result = "pellet-press-2", @@ -191,7 +189,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-pellet-press", order = "c[pellet-press-3]", place_result = "pellet-press-3", @@ -279,7 +276,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-pellet-press", order = "d[pellet-press-4]", place_result = "pellet-press-4", @@ -353,4 +349,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/powder-mixer.lua b/angelssmelting_0.4.6/prototypes/buildings/powder-mixer.lua index 8ffdeee..0a74829 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/powder-mixer.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/powder-mixer.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-powder-mixer", order = "a[powder-mixer]", place_result = "powder-mixer", @@ -104,7 +103,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-powder-mixer", order = "b[powder-mixer-2]", place_result = "powder-mixer-2", @@ -193,7 +191,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-powder-mixer", order = "c[powder-mixer-3]", place_result = "powder-mixer-3", @@ -282,7 +279,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-powder-mixer", order = "d[powder-mixer-4]", place_result = "powder-mixer-4", @@ -357,4 +353,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/sintering-oven.lua b/angelssmelting_0.4.6/prototypes/buildings/sintering-oven.lua index 7d6be89..3637f3f 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/sintering-oven.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/sintering-oven.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-sintering-oven", order = "a[sintering-oven]", place_result = "sintering-oven", @@ -103,7 +102,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-sintering-oven", order = "b[sintering-oven-2]", place_result = "sintering-oven-2", @@ -191,7 +189,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-sintering-oven", order = "c[sintering-oven-3]", place_result = "sintering-oven-3", @@ -279,7 +276,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-sintering-oven", order = "d[sintering-oven-4]", place_result = "sintering-oven-4", @@ -353,4 +349,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/buildings/strand-casting-machine.lua b/angelssmelting_0.4.6/prototypes/buildings/strand-casting-machine.lua index 7dd8f1f..182d325 100644 --- a/angelssmelting_0.4.6/prototypes/buildings/strand-casting-machine.lua +++ b/angelssmelting_0.4.6/prototypes/buildings/strand-casting-machine.lua @@ -15,7 +15,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-strand-casting-machine", order = "a[strand-casting-machine]", place_result = "strand-casting-machine", @@ -136,7 +135,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-strand-casting-machine", order = "b[strand-casting-machine-2]", place_result = "strand-casting-machine-2", @@ -257,7 +255,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-strand-casting-machine", order = "c[strand-casting-machine-3]", place_result = "strand-casting-machine-3", @@ -378,7 +375,6 @@ data:extend( } }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "angels-strand-casting-machine", order = "d[strand-casting-machine-4]", place_result = "strand-casting-machine-4", @@ -485,4 +481,4 @@ data:extend( }, }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-alloys.lua b/angelssmelting_0.4.6/prototypes/items/angels-alloys.lua index 4f0a42e..0d5147a 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-alloys.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-alloys.lua @@ -6,7 +6,6 @@ data:extend( name = "ingot-steel", icon = "__angelssmelting__/graphics/icons/ingot-steel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "f", stack_size = 200 @@ -30,7 +29,6 @@ data:extend( name = "powder-steel", icon = "__angelssmelting__/graphics/icons/powder-steel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-steel-casting", order = "g", stack_size = 200 @@ -40,7 +38,6 @@ data:extend( name = "angels-plate-steel", icon = "__angelssmelting__/graphics/icons/plate-steel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-steel-casting", order = "h", stack_size = 200 @@ -50,7 +47,6 @@ data:extend( name = "angels-roll-steel", icon = "__angelssmelting__/graphics/icons/roll-steel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-steel-casting", order = "i", stack_size = 200 @@ -75,7 +71,6 @@ data:extend( name = "angels-solder", icon = "__angelssmelting__/graphics/icons/solder.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-solder-casting", order = "a", stack_size = 200 @@ -85,10 +80,9 @@ data:extend( name = "angels-roll-solder", icon = "__angelssmelting__/graphics/icons/roll-solder.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-solder-casting", order = "b", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-aluminium.lua b/angelssmelting_0.4.6/prototypes/items/angels-aluminium.lua index 9088e38..a09ffe0 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-aluminium.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-aluminium.lua @@ -5,7 +5,6 @@ data:extend( name = "bauxite-ore", icon = "__angelssmelting__/graphics/icons/ore-bauxite.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-aluminium", icon = "__angelssmelting__/graphics/icons/processed-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-aluminium", icon = "__angelssmelting__/graphics/icons/pellet-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-sodium-aluminate", icon = "__angelssmelting__/graphics/icons/solid-sodium-aluminate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-aluminium-hydroxide", icon = "__angelssmelting__/graphics/icons/solid-aluminium-hydroxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "solid-aluminium-oxide", icon = "__angelssmelting__/graphics/icons/solid-aluminium-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "ingot-aluminium", icon = "__angelssmelting__/graphics/icons/ingot-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "g", stack_size = 200 @@ -75,7 +68,6 @@ data:extend( name = "powder-aluminium", icon = "__angelssmelting__/graphics/icons/powder-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium", order = "h", stack_size = 200 @@ -99,7 +91,6 @@ data:extend( name = "angels-plate-aluminium", icon = "__angelssmelting__/graphics/icons/plate-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium-casting", order = "i", stack_size = 200 @@ -109,10 +100,9 @@ data:extend( name = "angels-roll-aluminium", icon = "__angelssmelting__/graphics/icons/roll-aluminium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-aluminium-casting", order = "j", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-chrome.lua b/angelssmelting_0.4.6/prototypes/items/angels-chrome.lua index 3eb4ba2..23ae7a7 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-chrome.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-chrome.lua @@ -5,7 +5,6 @@ data:extend( name = "chrome-ore", icon = "__angelssmelting__/graphics/icons/ore-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-chrome", icon = "__angelssmelting__/graphics/icons/processed-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-chrome", icon = "__angelssmelting__/graphics/icons/pellet-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-chromate", icon = "__angelssmelting__/graphics/icons/solid-chromate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-dichromate", icon = "__angelssmelting__/graphics/icons/solid-dichromate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "solid-chrome-oxide", icon = "__angelssmelting__/graphics/icons/solid-chrome-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "ingot-chrome", icon = "__angelssmelting__/graphics/icons/ingot-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome", order = "g", stack_size = 200 @@ -89,7 +82,6 @@ data:extend( name = "angels-plate-chrome", icon = "__angelssmelting__/graphics/icons/plate-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome-casting", order = "h", stack_size = 200 @@ -99,7 +91,6 @@ data:extend( name = "powder-chrome", icon = "__angelssmelting__/graphics/icons/powder-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome-casting", order = "i", stack_size = 200 @@ -109,10 +100,9 @@ data:extend( name = "angels-roll-chrome", icon = "__angelssmelting__/graphics/icons/roll-chrome.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-chrome-casting", order = "j", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-cobalt.lua b/angelssmelting_0.4.6/prototypes/items/angels-cobalt.lua index f47b729..c297651 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-cobalt.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-cobalt.lua @@ -5,7 +5,6 @@ data:extend( name = "cobalt-ore", icon = "__angelssmelting__/graphics/icons/ore-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-cobalt", icon = "__angelssmelting__/graphics/icons/processed-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-cobalt", icon = "__angelssmelting__/graphics/icons/pellet-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-cobalt-hydroxide", icon = "__angelssmelting__/graphics/icons/solid-cobalt-hydroxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-cobalt-oxide", icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "ingot-cobalt", icon = "__angelssmelting__/graphics/icons/ingot-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "powder-cobalt", icon = "__angelssmelting__/graphics/icons/powder-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt", order = "g", stack_size = 200 @@ -89,7 +82,6 @@ data:extend( name = "angels-plate-cobalt", icon = "__angelssmelting__/graphics/icons/plate-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt-casting", order = "h", stack_size = 200 @@ -99,10 +91,9 @@ data:extend( name = "angels-roll-cobalt", icon = "__angelssmelting__/graphics/icons/roll-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-cobalt-casting", order = "i", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-copper.lua b/angelssmelting_0.4.6/prototypes/items/angels-copper.lua index 014ebf7..35a7b36 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-copper.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-copper.lua @@ -5,7 +5,6 @@ data:extend( name = "processed-copper", icon = "__angelssmelting__/graphics/icons/processed-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper", order = "b", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "pellet-copper", icon = "__angelssmelting__/graphics/icons/pellet-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper", order = "c", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "anode-copper", icon = "__angelssmelting__/graphics/icons/anode-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper", order = "d", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "ingot-copper", icon = "__angelssmelting__/graphics/icons/ingot-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper", order = "e", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "powder-copper", icon = "__angelssmelting__/graphics/icons/powder-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper", order = "ea", stack_size = 200 @@ -69,7 +64,6 @@ data:extend( name = "angels-plate-copper", icon = "__angelssmelting__/graphics/icons/plate-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper-casting", order = "a", stack_size = 200 @@ -79,7 +73,6 @@ data:extend( name = "angels-roll-copper", icon = "__angelssmelting__/graphics/icons/roll-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper-casting", order = "b", stack_size = 200 @@ -89,7 +82,6 @@ data:extend( name = "angels-wire-coil-copper", icon = "__angelssmelting__/graphics/icons/wire-coil-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper-casting", order = "c", stack_size = 200 @@ -99,11 +91,10 @@ data:extend( name = "angels-wire-copper", icon = "__angelssmelting__/graphics/icons/wire-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-copper-casting", order = "d", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-glass.lua b/angelssmelting_0.4.6/prototypes/items/angels-glass.lua index 5750edf..04adeea 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-glass.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-glass.lua @@ -5,7 +5,6 @@ data:extend( name = "solid-glass-mixture", icon = "__angelssmelting__/graphics/icons/glass-mixture.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-glass", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "angels-plate-glass", icon = "__angelssmelting__/graphics/icons/plate-glass.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-glass", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "angels-coil-glass-fiber", icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-glass", order = "c", stack_size = 200 @@ -45,4 +42,4 @@ data:extend( auto_barrel = false }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-gold.lua b/angelssmelting_0.4.6/prototypes/items/angels-gold.lua index 075215b..32b0030 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-gold.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-gold.lua @@ -5,7 +5,6 @@ data:extend( name = "gold-ore", icon = "__angelssmelting__/graphics/icons/ore-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-gold", icon = "__angelssmelting__/graphics/icons/processed-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-gold", icon = "__angelssmelting__/graphics/icons/pellet-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "cathode-gold", icon = "__angelssmelting__/graphics/icons/cathode-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "d", stack_size = 200 @@ -58,7 +54,6 @@ data:extend( name = "solid-sodium-gold-cyanide", icon = "__angelssmelting__/graphics/icons/solid-sodium-gold-cyanide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "e", stack_size = 200 @@ -68,7 +63,6 @@ data:extend( name = "ingot-gold", icon = "__angelssmelting__/graphics/icons/ingot-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold", order = "f", stack_size = 200 @@ -92,7 +86,6 @@ data:extend( name = "angels-plate-gold", icon = "__angelssmelting__/graphics/icons/plate-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold-casting", order = "g", stack_size = 200 @@ -102,7 +95,6 @@ data:extend( name = "angels-roll-gold", icon = "__angelssmelting__/graphics/icons/roll-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold-casting", order = "h", stack_size = 200 @@ -112,7 +104,6 @@ data:extend( name = "angels-wire-coil-gold", icon = "__angelssmelting__/graphics/icons/wire-coil-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold-casting", order = "i", stack_size = 200 @@ -122,7 +113,6 @@ data:extend( name = "angels-wire-gold", icon = "__angelssmelting__/graphics/icons/wire-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-gold-casting", order = "j", stack_size = 200 diff --git a/angelssmelting_0.4.6/prototypes/items/angels-iron.lua b/angelssmelting_0.4.6/prototypes/items/angels-iron.lua index a2b54a4..d051f16 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-iron.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-iron.lua @@ -5,7 +5,6 @@ data:extend( name = "processed-iron", icon = "__angelssmelting__/graphics/icons/processed-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "b", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "pellet-iron", icon = "__angelssmelting__/graphics/icons/pellet-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "c", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "solid-iron-hydroxide", icon = "__angelssmelting__/graphics/icons/solid-iron-hydroxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "d", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "ingot-iron", icon = "__angelssmelting__/graphics/icons/ingot-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "e", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "powder-iron", icon = "__angelssmelting__/graphics/icons/powder-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron", order = "ea", stack_size = 200 @@ -69,7 +64,6 @@ data:extend( name = "angels-plate-iron", icon = "__angelssmelting__/graphics/icons/plate-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron-casting", order = "g", stack_size = 200 @@ -79,10 +73,9 @@ data:extend( name = "angels-roll-iron", icon = "__angelssmelting__/graphics/icons/roll-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-iron-casting", order = "h", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-lead.lua b/angelssmelting_0.4.6/prototypes/items/angels-lead.lua index 840a0a5..d06a387 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-lead.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-lead.lua @@ -5,7 +5,6 @@ data:extend( name = "lead-ore", icon = "__angelssmelting__/graphics/icons/ore-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-lead", icon = "__angelssmelting__/graphics/icons/processed-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-lead", icon = "__angelssmelting__/graphics/icons/pellet-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-lead-oxide", icon = "__angelssmelting__/graphics/icons/solid-lead-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "d", stack_size = 200 @@ -58,7 +54,6 @@ data:extend( name = "anode-lead", icon = "__angelssmelting__/graphics/icons/anode-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "e", stack_size = 200 @@ -68,7 +63,6 @@ data:extend( name = "ingot-lead", icon = "__angelssmelting__/graphics/icons/ingot-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead", order = "f", stack_size = 200 @@ -92,10 +86,9 @@ data:extend( name = "angels-plate-lead", icon = "__angelssmelting__/graphics/icons/plate-lead.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-lead-casting", order = "g", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-manganese.lua b/angelssmelting_0.4.6/prototypes/items/angels-manganese.lua index 9c534ce..27c6a32 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-manganese.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-manganese.lua @@ -5,7 +5,6 @@ data:extend( name = "manganese-ore", icon = "__angelssmelting__/graphics/icons/ore-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-manganese", icon = "__angelssmelting__/graphics/icons/processed-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-manganese", icon = "__angelssmelting__/graphics/icons/pellet-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-manganese-oxide", icon = "__angelssmelting__/graphics/icons/solid-manganese-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "cathode-manganese", icon = "__angelssmelting__/graphics/icons/cathode-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "d", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "ingot-manganese", icon = "__angelssmelting__/graphics/icons/ingot-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese", order = "e", stack_size = 200 @@ -79,7 +73,6 @@ data:extend( name = "angels-plate-manganese", icon = "__angelssmelting__/graphics/icons/plate-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese-casting", order = "f", stack_size = 200 @@ -89,10 +82,9 @@ data:extend( name = "angels-roll-manganese", icon = "__angelssmelting__/graphics/icons/roll-manganese.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-manganese-casting", order = "g", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-nickel.lua b/angelssmelting_0.4.6/prototypes/items/angels-nickel.lua index 67df29e..c5c3613 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-nickel.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-nickel.lua @@ -5,7 +5,6 @@ data:extend( name = "nickel-ore", icon = "__angelssmelting__/graphics/icons/ore-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-nickel", icon = "__angelssmelting__/graphics/icons/processed-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-nickel", icon = "__angelssmelting__/graphics/icons/pellet-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "cathode-nickel", icon = "__angelssmelting__/graphics/icons/cathode-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-nickel-carbonyl", icon = "__angelssmelting__/graphics/icons/solid-nickel-carbonyl.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "ingot-nickel", icon = "__angelssmelting__/graphics/icons/ingot-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "powder-nickel", icon = "__angelssmelting__/graphics/icons/powder-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel", order = "g", stack_size = 200 @@ -89,7 +82,6 @@ data:extend( name = "angels-plate-nickel", icon = "__angelssmelting__/graphics/icons/plate-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel-casting", order = "h", stack_size = 200 @@ -99,10 +91,9 @@ data:extend( name = "angels-roll-nickel", icon = "__angelssmelting__/graphics/icons/roll-nickel.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-nickel-casting", order = "i", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-platinum.lua b/angelssmelting_0.4.6/prototypes/items/angels-platinum.lua index 82d6838..4d6b10f 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-platinum.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-platinum.lua @@ -5,7 +5,6 @@ data:extend( name = "platinum-ore", icon = "__angelssmelting__/graphics/icons/ore-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-platinum", icon = "__angelssmelting__/graphics/icons/processed-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-platinum", icon = "__angelssmelting__/graphics/icons/pellet-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-ammonium-chloroplatinate", icon = "__angelssmelting__/graphics/icons/solid-ammonium-chloroplatinate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "ingot-platinum", icon = "__angelssmelting__/graphics/icons/ingot-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum", order = "e", stack_size = 200 @@ -82,7 +77,6 @@ data:extend( name = "angels-plate-platinum", icon = "__angelssmelting__/graphics/icons/plate-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum-casting", order = "f", stack_size = 200 @@ -92,7 +86,6 @@ data:extend( name = "angels-roll-platinum", icon = "__angelssmelting__/graphics/icons/roll-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum-casting", order = "g", stack_size = 200 @@ -102,7 +95,6 @@ data:extend( name = "angels-wire-coil-platinum", icon = "__angelssmelting__/graphics/icons/wire-coil-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum-casting", order = "h", stack_size = 200 @@ -112,10 +104,9 @@ data:extend( name = "angels-wire-platinum", icon = "__angelssmelting__/graphics/icons/wire-platinum.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-platinum-casting", order = "i", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-silicon.lua b/angelssmelting_0.4.6/prototypes/items/angels-silicon.lua index 9bc76f7..b3331ed 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-silicon.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-silicon.lua @@ -5,7 +5,6 @@ data:extend( name = "quartz", icon = "__angelssmelting__/graphics/icons/ore-silica.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-silica", icon = "__angelssmelting__/graphics/icons/processed-silica.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-silica", icon = "__angelssmelting__/graphics/icons/pellet-silica.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "ingot-silicon", icon = "__angelssmelting__/graphics/icons/ingot-silicon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon", order = "d", stack_size = 200 @@ -85,7 +81,6 @@ data:extend( name = "angels-plate-silicon", icon = "__angelssmelting__/graphics/icons/plate-silicon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon-casting", order = "e", stack_size = 200 @@ -95,10 +90,9 @@ data:extend( name = "angels-roll-silicon", icon = "__angelssmelting__/graphics/icons/roll-silicon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silicon-casting", order = "f", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-silver.lua b/angelssmelting_0.4.6/prototypes/items/angels-silver.lua index 4659d0e..9ddbefc 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-silver.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-silver.lua @@ -5,7 +5,6 @@ data:extend( name = "silver-ore", icon = "__angelssmelting__/graphics/icons/ore-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-silver", icon = "__angelssmelting__/graphics/icons/processed-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-silver", icon = "__angelssmelting__/graphics/icons/pellet-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-silver-nitrate", icon = "__angelssmelting__/graphics/icons/solid-silver-nitrate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-sodium-silver-cyanide", icon = "__angelssmelting__/graphics/icons/solid-sodium-silver-cyanide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "cathode-silver", icon = "__angelssmelting__/graphics/icons/cathode-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "ingot-silver", icon = "__angelssmelting__/graphics/icons/ingot-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver", order = "g", stack_size = 200 @@ -89,7 +82,6 @@ data:extend( name = "angels-plate-silver", icon = "__angelssmelting__/graphics/icons/plate-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver-casting", order = "h", stack_size = 200 @@ -99,7 +91,6 @@ data:extend( name = "angels-roll-silver", icon = "__angelssmelting__/graphics/icons/roll-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver-casting", order = "i", stack_size = 200 @@ -109,7 +100,6 @@ data:extend( name = "angels-wire-coil-silver", icon = "__angelssmelting__/graphics/icons/wire-coil-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver-casting", order = "j", stack_size = 200 @@ -119,10 +109,9 @@ data:extend( name = "angels-wire-silver", icon = "__angelssmelting__/graphics/icons/wire-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-silver-casting", order = "k", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-stone.lua b/angelssmelting_0.4.6/prototypes/items/angels-stone.lua index f9db43f..bb83c1d 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-stone.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-stone.lua @@ -5,7 +5,6 @@ data:extend( name = "solid-lime", icon = "__angelssmelting__/graphics/icons/solid-lime.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "b", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "solid-cement", icon = "__angelssmelting__/graphics/icons/solid-cement.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "c", stack_size = 200 @@ -39,7 +37,6 @@ data:extend( name = "clay-brick-raw", icon = "__angelssmelting__/graphics/icons/brick-clay-raw.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "e", stack_size = 200 @@ -49,7 +46,6 @@ data:extend( name = "clay-brick", icon = "__angelssmelting__/graphics/icons/brick-clay.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "f", stack_size = 1000, @@ -65,7 +61,6 @@ data:extend( name = "concrete-brick", icon = "__angelssmelting__/graphics/icons/brick-concrete.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "g", stack_size = 1000, @@ -81,7 +76,6 @@ data:extend( name = "reinforced-concrete-brick", icon = "__angelssmelting__/graphics/icons/brick-reinforced.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-stone", order = "h", stack_size = 1000, @@ -93,4 +87,4 @@ data:extend( } }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-tin.lua b/angelssmelting_0.4.6/prototypes/items/angels-tin.lua index 65df676..bbae207 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-tin.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-tin.lua @@ -5,7 +5,6 @@ data:extend( name = "tin-ore", icon = "__angelssmelting__/graphics/icons/ore-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-tin", icon = "__angelssmelting__/graphics/icons/processed-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-tin", icon = "__angelssmelting__/graphics/icons/pellet-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "ingot-tin", icon = "__angelssmelting__/graphics/icons/ingot-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin", order = "d", stack_size = 200 @@ -59,7 +55,6 @@ data:extend( name = "angels-plate-tin", icon = "__angelssmelting__/graphics/icons/plate-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin-casting", order = "e", stack_size = 200 @@ -69,7 +64,6 @@ data:extend( name = "angels-wire-coil-tin", icon = "__angelssmelting__/graphics/icons/wire-coil-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin-casting", order = "f", stack_size = 200 @@ -79,10 +73,9 @@ data:extend( name = "angels-wire-tin", icon = "__angelssmelting__/graphics/icons/wire-tin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tin-casting", order = "g", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-titanium.lua b/angelssmelting_0.4.6/prototypes/items/angels-titanium.lua index 55bec99..458d056 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-titanium.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-titanium.lua @@ -5,7 +5,6 @@ data:extend( name = "rutile-ore", icon = "__angelssmelting__/graphics/icons/ore-rutile.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-titanium", icon = "__angelssmelting__/graphics/icons/processed-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-titanium", icon = "__angelssmelting__/graphics/icons/pellet-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium", order = "c", stack_size = 200 @@ -48,7 +45,6 @@ data:extend( name = "sponge-titanium", icon = "__angelssmelting__/graphics/icons/sponge-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium", order = "d", stack_size = 200 @@ -58,7 +54,6 @@ data:extend( name = "ingot-titanium", icon = "__angelssmelting__/graphics/icons/ingot-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium", order = "e", stack_size = 200 @@ -82,7 +77,6 @@ data:extend( name = "angels-plate-titanium", icon = "__angelssmelting__/graphics/icons/plate-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium-casting", order = "f", stack_size = 200 @@ -92,10 +86,9 @@ data:extend( name = "angels-roll-titanium", icon = "__angelssmelting__/graphics/icons/roll-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-titanium-casting", order = "f", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-tungsten.lua b/angelssmelting_0.4.6/prototypes/items/angels-tungsten.lua index 166eb4a..8672cec 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-tungsten.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-tungsten.lua @@ -5,7 +5,6 @@ data:extend( name = "tungsten-ore", icon = "__angelssmelting__/graphics/icons/ore-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-tungsten", icon = "__angelssmelting__/graphics/icons/processed-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-tungsten", icon = "__angelssmelting__/graphics/icons/pellet-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-ammonium-paratungstate", icon = "__angelssmelting__/graphics/icons/solid-ammonium-paratungstate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "solid-tungsten-oxide", icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "powder-tungsten", icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "f", stack_size = 200 @@ -65,7 +59,6 @@ data:extend( name = "casting-powder-tungsten", icon = "__angelssmelting__/graphics/icons/powder-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten", order = "g", stack_size = 200 @@ -101,10 +94,9 @@ data:extend( name = "angels-plate-tungsten", icon = "__angelssmelting__/graphics/icons/plate-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-tungsten-casting", order = "h", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/items/angels-zinc.lua b/angelssmelting_0.4.6/prototypes/items/angels-zinc.lua index fa6a59b..b0f7f67 100644 --- a/angelssmelting_0.4.6/prototypes/items/angels-zinc.lua +++ b/angelssmelting_0.4.6/prototypes/items/angels-zinc.lua @@ -5,7 +5,6 @@ data:extend( name = "zinc-ore", icon = "__angelssmelting__/graphics/icons/ore-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "a", stack_size = 200 @@ -15,7 +14,6 @@ data:extend( name = "processed-zinc", icon = "__angelssmelting__/graphics/icons/processed-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "b", stack_size = 200 @@ -25,7 +23,6 @@ data:extend( name = "pellet-zinc", icon = "__angelssmelting__/graphics/icons/pellet-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "c", stack_size = 200 @@ -35,7 +32,6 @@ data:extend( name = "solid-zinc-oxide", icon = "__angelssmelting__/graphics/icons/solid-zinc-oxide.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "d", stack_size = 200 @@ -45,7 +41,6 @@ data:extend( name = "cathode-zinc", icon = "__angelssmelting__/graphics/icons/cathode-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "e", stack_size = 200 @@ -55,7 +50,6 @@ data:extend( name = "ingot-zinc", icon = "__angelssmelting__/graphics/icons/ingot-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc", order = "f", stack_size = 200 @@ -79,7 +73,6 @@ data:extend( name = "angels-plate-zinc", icon = "__angelssmelting__/graphics/icons/plate-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc-casting", order = "g", stack_size = 200 @@ -89,10 +82,9 @@ data:extend( name = "angels-roll-zinc", icon = "__angelssmelting__/graphics/icons/roll-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "angels-zinc-casting", order = "h", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelssmelting_0.4.6/prototypes/smelting-override-bob.lua b/angelssmelting_0.4.6/prototypes/smelting-override-bob.lua index 286b3b8..db321ee 100644 --- a/angelssmelting_0.4.6/prototypes/smelting-override-bob.lua +++ b/angelssmelting_0.4.6/prototypes/smelting-override-bob.lua @@ -1,46 +1,51 @@ local OV = angelsmods.functions.OV local intermediatemulti = angelsmods.marathon.intermediatemulti +hide = function(name) + item = data.raw["item"][name] + item.flags = item.flags or {} + table.insert(item.flags,"hidden") +end OV.global_replace_item("angels-plate-tin", "tin-plate") -table.insert(data.raw["item"]["angels-plate-tin"].flags,"hidden") +hide("angels-plate-tin") OV.global_replace_item("angels-plate-silver", "silver-plate") -table.insert(data.raw["item"]["angels-plate-silver"].flags,"hidden") +hide("angels-plate-silver") OV.global_replace_item("angels-plate-lead", "lead-plate") -table.insert(data.raw["item"]["angels-plate-lead"].flags,"hidden") +hide("angels-plate-lead") OV.global_replace_item("angels-plate-glass", "glass") -table.insert(data.raw["item"]["angels-plate-glass"].flags,"hidden") +hide("angels-plate-glass") data.raw["recipe"]["angels-plate-glass-2"].normal.main_product= "glass" data.raw["recipe"]["angels-plate-glass-2"].expensive.main_product= "glass" data.raw["recipe"]["angels-plate-glass-3"].normal.main_product= "glass" data.raw["recipe"]["angels-plate-glass-3"].expensive.main_product= "glass" OV.global_replace_item("angels-plate-gold", "gold-plate") -table.insert(data.raw["item"]["angels-plate-gold"].flags,"hidden") +hide("angels-plate-gold") OV.global_replace_item("angels-plate-nickel", "nickel-plate") -table.insert(data.raw["item"]["angels-plate-nickel"].flags,"hidden") +hide("angels-plate-nickel") OV.global_replace_item("angels-plate-zinc", "zinc-plate") -table.insert(data.raw["item"]["angels-plate-zinc"].flags,"hidden") +hide("angels-plate-zinc") OV.global_replace_item("angels-plate-aluminium", "aluminium-plate") -table.insert(data.raw["item"]["angels-plate-aluminium"].flags,"hidden") +hide("angels-plate-aluminium") OV.global_replace_item("solid-lead-oxide", "lead-oxide") -table.insert(data.raw["item"]["solid-lead-oxide"].flags,"hidden") +hide("solid-lead-oxide") OV.global_replace_item("solid-aluminium-oxide", "alumina") -table.insert(data.raw["item"]["solid-aluminium-oxide"].flags,"hidden") +hide("solid-aluminium-oxide") OV.global_replace_item("solid-tungsten-oxide", "tungsten-oxide") -table.insert(data.raw["item"]["solid-tungsten-oxide"].flags,"hidden") +hide("solid-tungsten-oxide") OV.global_replace_item("powder-tungsten", "powdered-tungsten") -table.insert(data.raw["item"]["powder-tungsten"].flags,"hidden") +hide("powder-tungsten") OV.global_replace_item("solid-cobalt-oxide", "cobalt-oxide") -table.insert(data.raw["item"]["solid-cobalt-oxide"].flags,"hidden") +hide("solid-cobalt-oxide") OV.global_replace_item("solid-silver-nitrate", "silver-nitrate") -table.insert(data.raw["item"]["solid-silver-nitrate"].flags,"hidden") +hide("solid-silver-nitrate") OV.global_replace_item("angels-plate-titanium", "titanium-plate") -table.insert(data.raw["item"]["angels-plate-titanium"].flags,"hidden") +hide("angels-plate-titanium") OV.global_replace_item("angels-plate-tungsten", "tungsten-plate") -table.insert(data.raw["item"]["angels-plate-tungsten"].flags,"hidden") +hide("angels-plate-tungsten") OV.global_replace_item("angels-plate-silicon", "silicon") -table.insert(data.raw["item"]["angels-plate-silicon"].flags,"hidden") +hide("angels-plate-silicon") OV.global_replace_item("angels-plate-cobalt", "cobalt-plate") -table.insert(data.raw["item"]["angels-plate-cobalt"].flags,"hidden") +hide("angels-plate-cobalt") --REPLACE TECHS OV.global_replace_technology("aluminium-processing", "angels-aluminium-smelting-1") @@ -66,7 +71,7 @@ if data.raw.item["tinned-copper-cable"] then OV.global_replace_item("angels-wire-tin", "tinned-copper-cable") OV.global_replace_item("angels-wire-gold", "gilded-copper-cable") OV.global_replace_item("angels-solder", "solder") - table.insert(data.raw["item"]["angels-solder"].flags,"hidden") + hide("angels-solder") OV.disable_recipe({ "solder-alloy" }) OV.patch_recipes({ @@ -275,7 +280,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -303,8 +308,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -332,9 +337,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 = 30 }, @@ -499,8 +504,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -528,9 +533,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 = 30 }, @@ -558,10 +563,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 = 30 }, @@ -664,8 +669,8 @@ angelsmods.functions.allow_productivity("angels-plate-brass") -- { -- count = 50, -- ingredients = { - -- {"science-pack-1", 1}, - -- {"science-pack-2", 1}, + -- {"automation-science-pack", 1}, + -- {"logistic-science-pack", 1}, -- }, -- time = 30 -- }, @@ -771,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 = 30 }, @@ -875,8 +880,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -980,8 +985,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1084,9 +1089,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 = 30 }, diff --git a/angelssmelting_0.4.6/prototypes/smelting-override-vanilla.lua b/angelssmelting_0.4.6/prototypes/smelting-override-vanilla.lua index 99a0dd1..e48a280 100644 --- a/angelssmelting_0.4.6/prototypes/smelting-override-vanilla.lua +++ b/angelssmelting_0.4.6/prototypes/smelting-override-vanilla.lua @@ -1,24 +1,29 @@ local OV = angelsmods.functions.OV local intermediatemulti = angelsmods.marathon.intermediatemulti -table.insert(data.raw["item"]["angels-plate-tin"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-silver"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-lead"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-glass"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-gold"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-nickel"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-zinc"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-aluminium"].flags,"hidden") -table.insert(data.raw["item"]["solid-lead-oxide"].flags,"hidden") -table.insert(data.raw["item"]["solid-aluminium-oxide"].flags,"hidden") -table.insert(data.raw["item"]["solid-tungsten-oxide"].flags,"hidden") -table.insert(data.raw["item"]["powder-tungsten"].flags,"hidden") -table.insert(data.raw["item"]["solid-cobalt-oxide"].flags,"hidden") -table.insert(data.raw["item"]["solid-silver-nitrate"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-titanium"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-tungsten"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-silicon"].flags,"hidden") -table.insert(data.raw["item"]["angels-plate-cobalt"].flags,"hidden") +hide = function(name) + item = data.raw["item"][name] + item.flags = item.flags or {} + table.insert(item.flags,"hidden") +end +hide("angels-plate-tin") +hide("angels-plate-silver") +hide("angels-plate-lead") +hide("angels-plate-glass") +hide("angels-plate-gold") +hide("angels-plate-nickel") +hide("angels-plate-zinc") +hide("angels-plate-aluminium") +hide("solid-lead-oxide") +hide("solid-aluminium-oxide") +hide("solid-tungsten-oxide") +hide("powder-tungsten") +hide("solid-cobalt-oxide") +hide("solid-silver-nitrate") +hide("angels-plate-titanium") +hide("angels-plate-tungsten") +hide("angels-plate-silicon") +hide("angels-plate-cobalt") --REPLACE TECHS OV.disable_technology({"angels-aluminium-smelting-1", "angels-aluminium-smelting-2", "angels-aluminium-smelting-3"}) @@ -55,4 +60,4 @@ OV.patch_recipes({ { name = "stone-crushed", type = "item", amount = "solid-aluminium-oxide" }, }, } -}) \ No newline at end of file +}) diff --git a/angelssmelting_0.4.6/prototypes/smelting-override.lua b/angelssmelting_0.4.6/prototypes/smelting-override.lua index af28a78..08533fd 100644 --- a/angelssmelting_0.4.6/prototypes/smelting-override.lua +++ b/angelssmelting_0.4.6/prototypes/smelting-override.lua @@ -36,15 +36,20 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti }, { name = "steel-plate", subgroup = "angels-steel-casting", order = "zz" } }) - + + hide = function(name) + item = data.raw["item"][name] + item.flags = item.flags or {} + table.insert(item.flags,"hidden") + end OV.global_replace_item("angels-plate-steel", "steel-plate") - table.insert(data.raw["item"]["angels-plate-steel"].flags,"hidden") + hide("angels-plate-steel") OV.global_replace_item("angels-plate-iron", "iron-plate") - table.insert(data.raw["item"]["angels-plate-iron"].flags,"hidden") + hide("angels-plate-iron") OV.global_replace_item("angels-plate-copper", "copper-plate") - table.insert(data.raw["item"]["angels-plate-copper"].flags,"hidden") + hide("angels-plate-copper") OV.global_replace_item("angels-wire-copper", "copper-cable") - table.insert(data.raw["item"]["angels-wire-copper"].flags,"hidden") + hide("angels-wire-copper") --OVERRIDE FOR ANGELS if angelsmods.refining then @@ -77,10 +82,10 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti --OV.disable_recipe({ "angels-wire-platinum" }) --OV.disable_recipe({ "angels-wire-silver", "angels-wire-coil-silver-casting", "angels-wire-coil-silver-casting-fast", "angels-wire-coil-silver-converting" }) OV.disable_technology({ "angels-platinum-smelting-1", "angels-platinum-smelting-2", "angels-platinum-smelting-3" }) - table.insert(data.raw["item"]["angels-wire-tin"].flags,"hidden") - table.insert(data.raw["item"]["angels-wire-silver"].flags,"hidden") - table.insert(data.raw["item"]["angels-wire-gold"].flags,"hidden") - table.insert(data.raw["item"]["angels-wire-platinum"].flags,"hidden") + hide("angels-wire-tin") + hide("angels-wire-silver") + hide("angels-wire-gold") + hide("angels-wire-platinum") end else require("prototypes.smelting-override-vanilla") @@ -142,4 +147,4 @@ local intermediatemulti = angelsmods.marathon.intermediatemulti angelsmods.functions.allow_productivity("angels-clay-brick") angelsmods.functions.allow_productivity("angels-concrete") angelsmods.functions.allow_productivity("angels-concrete-brick") - angelsmods.functions.allow_productivity("angels-reinforced-concrete-brick") \ No newline at end of file + angelsmods.functions.allow_productivity("angels-reinforced-concrete-brick") diff --git a/angelssmelting_0.4.6/prototypes/technology/smelting-technology.lua b/angelssmelting_0.4.6/prototypes/technology/smelting-technology.lua index a94149a..a371d58 100644 --- a/angelssmelting_0.4.6/prototypes/technology/smelting-technology.lua +++ b/angelssmelting_0.4.6/prototypes/technology/smelting-technology.lua @@ -38,8 +38,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -84,9 +84,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 = 30 }, @@ -132,10 +132,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 = 30 }, @@ -171,8 +171,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -208,9 +208,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 = 30 }, @@ -255,10 +255,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 = 30 }, @@ -294,8 +294,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -336,9 +336,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 = 30 }, @@ -375,10 +375,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 = 30 }, @@ -413,7 +413,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -467,8 +467,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -514,9 +514,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 = 30 }, @@ -551,8 +551,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -584,8 +584,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -625,9 +625,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 = 30 }, @@ -663,8 +663,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -714,9 +714,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 = 30 }, @@ -758,10 +758,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 = 30 }, @@ -796,7 +796,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -850,8 +850,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -897,9 +897,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 = 30 }, @@ -935,7 +935,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -972,8 +972,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1014,9 +1014,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 = 30 }, @@ -1052,8 +1052,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1090,9 +1090,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 = 30 }, @@ -1133,10 +1133,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 = 30 }, @@ -1172,8 +1172,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1214,9 +1214,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 = 30 }, @@ -1252,10 +1252,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 = 30 }, @@ -1290,8 +1290,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1333,9 +1333,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 = 30 }, @@ -1382,10 +1382,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 = 30 }, @@ -1421,8 +1421,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1459,9 +1459,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 = 30 }, @@ -1498,10 +1498,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 = 30 }, @@ -1536,8 +1536,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1583,9 +1583,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 = 30 }, @@ -1631,10 +1631,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 = 30 }, @@ -1670,7 +1670,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -1710,8 +1710,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1746,9 +1746,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 = 30 }, @@ -1783,7 +1783,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -1825,8 +1825,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1863,9 +1863,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 = 30 }, @@ -1910,8 +1910,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1960,9 +1960,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 = 30 }, @@ -2008,10 +2008,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 = 30 }, @@ -2059,9 +2059,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 = 30 }, @@ -2102,10 +2102,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 = 30 }, @@ -2138,10 +2138,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 = 30 }, @@ -2177,8 +2177,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2211,9 +2211,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 = 30 }, @@ -2254,10 +2254,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 = 30 }, @@ -2301,8 +2301,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2339,9 +2339,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 = 30 }, @@ -2381,10 +2381,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 = 30 }, @@ -2416,7 +2416,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -2452,8 +2452,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2486,9 +2486,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 = 30 }, @@ -2526,7 +2526,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -2565,8 +2565,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2605,9 +2605,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 = 30 }, @@ -2646,10 +2646,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 = 30 }, @@ -2680,8 +2680,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2712,9 +2712,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 = 30 }, @@ -2745,9 +2745,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}, {"production-science-pack", 1}, }, time = 30 @@ -2779,11 +2779,11 @@ 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}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 30 }, @@ -2810,8 +2810,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2838,9 +2838,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 = 30 }, @@ -2867,9 +2867,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}, {"production-science-pack", 1}, }, time = 30 @@ -2897,11 +2897,11 @@ 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}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 30 }, @@ -2928,8 +2928,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -2960,9 +2960,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 = 30 }, @@ -2993,9 +2993,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}, {"production-science-pack", 1}, }, time = 30 @@ -3027,11 +3027,11 @@ 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}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 30 }, @@ -3058,11 +3058,11 @@ 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}, {"production-science-pack", 1}, - {"high-tech-science-pack", 1}, + {"utility-science-pack", 1}, }, time = 30 }, @@ -3115,8 +3115,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -3142,9 +3142,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 = 30 },