diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua index 76503a2a..346324bc 100644 --- a/angelsrefining/prototypes/override/refining-override-sorting.lua +++ b/angelsrefining/prototypes/override/refining-override-sorting.lua @@ -442,12 +442,12 @@ OV.patch_recipes(merge_table_of_tables({ -- SAPHIRITE create_sorting_recipes("saphirite", "angelsore1%s", { ["!!"] = { special_vanilla, special_vanilla, special_vanilla, true }, - ["iron-ore"] = special_vanilla and { 1, 1, 2, 2 } or { 2, 2, 3, 16 }, + ["iron-ore"] = special_vanilla and { 1, 1, 2, 2 } or { 2, 2, 3, 12 }, ["angels-iron-nugget"] = special_vanilla and { 1, 2, 3, 5 }, ["angels-iron-pebbles"] = special_vanilla and { 2, 4, 3, 3 }, ["angels-iron-slag"] = special_vanilla and { 0, 0, 1, 1 }, - ["copper-ore"] = not special_vanilla and { 1, 1, 1, 8 }, - ["quartz"] = not special_vanilla and { 0, 1, 1, 4 }, + ["copper-ore"] = not special_vanilla and { 1, 1, 1, 6 }, + ["quartz"] = not special_vanilla and { 0, 1, 1, 3 }, ["nickel-ore"] = not special_vanilla and { 0, 1, 1, 2 }, ["rutile-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["tungsten-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -455,12 +455,12 @@ OV.patch_recipes(merge_table_of_tables({ -- JIVOLITE create_sorting_recipes("jivolite", "angelsore2%s", { ["!!"] = { special_vanilla, special_vanilla, special_vanilla, true }, - ["iron-ore"] = special_vanilla and { 2, 2, 3, 5 } or { 2, 2, 3, 16 }, + ["iron-ore"] = special_vanilla and { 2, 2, 3, 5 } or { 2, 2, 3, 12 }, ["angels-iron-nugget"] = special_vanilla and { 1, 2, 3, 4 }, ["angels-iron-pebbles"] = special_vanilla and { 1, 1, 2, 4 }, ["angels-iron-slag"] = special_vanilla and { 0, 1, 2, 2 }, - ["copper-ore"] = not special_vanilla and { 1, 1, 1, 8 }, - ["bauxite-ore"] = not special_vanilla and { 0, 1, 1, 4 }, + ["copper-ore"] = not special_vanilla and { 1, 1, 1, 6 }, + ["bauxite-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["zinc-ore"] = not special_vanilla and { 0, 1, 1, 2 }, ["cobalt-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["tungsten-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -468,12 +468,12 @@ OV.patch_recipes(merge_table_of_tables({ -- STIRATITE create_sorting_recipes("stiratite", "angelsore3%s", { ["!!"] = { special_vanilla, special_vanilla, special_vanilla, true }, - ["copper-ore"] = special_vanilla and { 2, 2, 4, 3 } or { 2, 2, 3, 16 }, + ["copper-ore"] = special_vanilla and { 2, 2, 4, 3 } or { 2, 2, 3, 12 }, ["angels-copper-nugget"] = special_vanilla and { 1, 2, 2, 4 }, ["angels-copper-pebbles"] = special_vanilla and { 0, 2, 3, 5 }, ["angels-copper-slag"] = special_vanilla and { 0, 0, 1, 1 }, - ["iron-ore"] = not special_vanilla and { 1, 1, 1, 8 }, - ["silver-ore"] = not special_vanilla and { 0, 1, 1, 4 }, + ["iron-ore"] = not special_vanilla and { 1, 1, 1, 6 }, + ["silver-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["tin-ore"] = not special_vanilla and { 0, 1, 1, 2 }, ["uranium-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["tungsten-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -481,12 +481,12 @@ OV.patch_recipes(merge_table_of_tables({ -- CROTINIUM create_sorting_recipes("crotinnium", "angelsore4%s", { ["!!"] = { special_vanilla, special_vanilla, special_vanilla, true }, - ["copper-ore"] = special_vanilla and { 0, 1, 2, 3 } or { 2, 2, 3, 16 }, + ["copper-ore"] = special_vanilla and { 0, 1, 2, 3 } or { 2, 2, 3, 12 }, ["angels-copper-nugget"] = special_vanilla and { 2, 2, 4, 5 }, ["angels-copper-pebbles"] = special_vanilla and { 1, 3, 3, 4 }, ["angels-copper-slag"] = special_vanilla and { 0, 1, 1, 2 }, - ["iron-ore"] = not special_vanilla and { 1, 1, 1, 8 }, - ["lead-ore"] = not special_vanilla and { 0, 1, 1, 4 }, + ["iron-ore"] = not special_vanilla and { 1, 1, 1, 6 }, + ["lead-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["bauxite-ore"] = not special_vanilla and { 0, 1, 1, 2 }, ["rutile-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["cobalt-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -494,9 +494,9 @@ OV.patch_recipes(merge_table_of_tables({ -- RUBYTE create_sorting_recipes("rubyte", "angelsore5%s", { ["!!"] = not special_vanilla and { false, false, false, true }, - ["lead-ore"] = not special_vanilla and { 2, 2, 3, 16 }, - ["nickel-ore"] = not special_vanilla and { 1, 1, 1, 8 }, - ["bauxite-ore"] = not special_vanilla and { 0, 1, 1, 4 }, + ["lead-ore"] = not special_vanilla and { 2, 2, 3, 12 }, + ["nickel-ore"] = not special_vanilla and { 1, 1, 1, 6 }, + ["bauxite-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["quartz"] = not special_vanilla and { 0, 1, 1, 2 }, ["gold-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["uranium-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -504,9 +504,9 @@ OV.patch_recipes(merge_table_of_tables({ -- BOBMONIUM create_sorting_recipes("bobmonium", "angelsore6%s", { ["!!"] = not special_vanilla and { false, false, false, true }, - ["tin-ore"] = not special_vanilla and { 2, 2, 3, 16 }, - ["quartz"] = not special_vanilla and { 1, 1, 1, 8 }, - ["silver-ore"] = not special_vanilla and { 0, 1, 1, 4 }, + ["tin-ore"] = not special_vanilla and { 2, 2, 3, 12 }, + ["quartz"] = not special_vanilla and { 1, 1, 1, 6 }, + ["silver-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["zinc-ore"] = not special_vanilla and { 0, 1, 1, 2 }, ["gold-ore"] = not special_vanilla and { 0, 0, 1, 1 }, ["cobalt-ore"] = not special_vanilla and { 0, 0, 0, 1 }, @@ -515,9 +515,9 @@ OV.patch_recipes(merge_table_of_tables({ ore_enabled("ferrous") and create_sorting_recipes("ferrous", "angelsore8%s", { ["!!"] = not special_vanilla and { true, true, true, true }, - ["iron-ore"] = not special_vanilla and { 2, 3, 6, 16 }, - ["manganese-ore"] = not special_vanilla and { 2, 2, 2, 8 }, - ["nickel-ore"] = not special_vanilla and { 0, 1, 1, 6 }, + ["iron-ore"] = not special_vanilla and { 2, 3, 6, 12 }, + ["manganese-ore"] = not special_vanilla and { 2, 2, 2, 6 }, + ["nickel-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["cobalt-ore"] = not special_vanilla and { 0, 0, 1, 3 }, ["chrome-ore"] = not special_vanilla and { 0, 0, 0, 1 }, }, true) @@ -526,9 +526,9 @@ OV.patch_recipes(merge_table_of_tables({ ore_enabled("cupric") and create_sorting_recipes("cupric", "angelsore9%s", { ["!!"] = not special_vanilla and { true, true, true, true }, - ["copper-ore"] = not special_vanilla and { 2, 3, 6, 16 }, - ["tin-ore"] = not special_vanilla and { 2, 2, 2, 8 }, - ["silver-ore"] = not special_vanilla and { 0, 1, 1, 6 }, + ["copper-ore"] = not special_vanilla and { 2, 3, 6, 12 }, + ["tin-ore"] = not special_vanilla and { 2, 2, 2, 6 }, + ["silver-ore"] = not special_vanilla and { 0, 1, 1, 3 }, ["gold-ore"] = not special_vanilla and { 0, 0, 1, 3 }, ["platinum-ore"] = not special_vanilla and { 0, 0, 0, 1 }, ["quartz"] = not (special_vanilla or ore_enabled("platinum-ore")) and { 0, 0, 0, 1 },