diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-alien-crystal.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-alien-crystal.lua index 6c39b711d..f8a1f60d1 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-alien-crystal.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-alien-crystal.lua @@ -147,7 +147,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-splinter-blue", localised_name = { "recipe-name.angels-crystal-powder-from-splinter" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-bio-biter-processing-crystal-splinter", enabled = false, auto_recycle = false, @@ -179,7 +179,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-splinter-red", localised_name = { "recipe-name.angels-crystal-powder-from-splinter" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-bio-biter-processing-crystal-splinter", enabled = false, auto_recycle = false, @@ -211,7 +211,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-splinter-green", localised_name = { "recipe-name.angels-crystal-powder-from-splinter" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-bio-biter-processing-crystal-splinter", enabled = false, auto_recycle = false, @@ -387,7 +387,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-shard-blue", localised_name = { "recipe-name.angels-crystal-powder-from-shard" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-2", subgroup = "angels-bio-biter-processing-crystal-shard", enabled = false, energy_required = 2, @@ -418,7 +418,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-shard-red", localised_name = { "recipe-name.angels-crystal-powder-from-shard" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-2", subgroup = "angels-bio-biter-processing-crystal-shard", enabled = false, auto_recycle = false, @@ -450,7 +450,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-shard-green", localised_name = { "recipe-name.angels-crystal-powder-from-shard" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-2", subgroup = "angels-bio-biter-processing-crystal-shard", enabled = false, auto_recycle = false, @@ -626,7 +626,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-full-blue", localised_name = { "recipe-name.angels-crystal-powder-from-full" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-3", subgroup = "angels-bio-biter-processing-crystal-full", enabled = false, auto_recycle = false, @@ -658,7 +658,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-full-red", localised_name = { "recipe-name.angels-crystal-powder-from-full" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-3", subgroup = "angels-bio-biter-processing-crystal-full", enabled = false, auto_recycle = false, @@ -690,7 +690,7 @@ data:extend({ type = "recipe", name = "angels-crystal-powder-full-green", localised_name = { "recipe-name.angels-crystal-powder-from-full" }, - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-3", subgroup = "angels-bio-biter-processing-crystal-full", enabled = false, auto_recycle = false, diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua index 50c0c9247..624417e53 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua @@ -180,7 +180,7 @@ data:extend({ { type = "recipe", name = "angels-crystal-powder-from-dust", - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-bio-biter-processing-crystal-full", enabled = false, auto_recycle = false, diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua index e2cbc0d44..dc943bb9a 100644 --- a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua +++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua @@ -33,7 +33,7 @@ data:extend({ { type = "recipe", name = "angels-bio-puffer-egg-shell-powder", - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-2", subgroup = "angels-bio-puffer-egg", enabled = false, auto_recycle = false, diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua index 4be1ffdfc..d5091dc98 100644 --- a/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua +++ b/angelsbioprocessing/prototypes/technology/bio-processing-alien.lua @@ -337,7 +337,7 @@ data:extend({ "angels-bio-processing-alien-2", "angels-bio-refugium-puffer-2", "angels-bio-processing-crystal-splinter-1", - "angels-ore-powderizer", + "angels-ore-advanced-floatation", "angels-slag-processing-2", }, effects = { @@ -439,6 +439,7 @@ data:extend({ prerequisites = { "angels-bio-processing-crystal-shard-1", "angels-bio-refugium-biter-3", + "angels-advanced-ore-refining-3", }, effects = { { diff --git a/angelsrefining/locale/en/ore-refining.cfg b/angelsrefining/locale/en/ore-refining.cfg index f3514da81..d53687cff 100644 --- a/angelsrefining/locale/en/ore-refining.cfg +++ b/angelsrefining/locale/en/ore-refining.cfg @@ -42,9 +42,9 @@ angels-electro-whinning-cell=Electrowinning cell 1 angels-electro-whinning-cell-2=Electrowinning cell 2 angels-electro-whinning-cell-3=Electrowinning cell 3 -angels-ore-powderizer=Ore powderizer 1 -angels-ore-powderizer-2=Ore powderizer 2 -angels-ore-powderizer-3=Ore powderizer 3 +angels-powderizer=Powderizer 1 +angels-powderizer-2=Powderizer 2 +angels-powderizer-3=Powderizer 3 angels-filtration-unit=Filtration unit 1 angels-filtration-unit-2=Filtration unit 2 @@ -90,9 +90,9 @@ angels-electro-whinning-cell=Uses an electrolytic bath for additional purificati angels-electro-whinning-cell-2=Uses an electrolytic bath for additional purification. angels-electro-whinning-cell-3=Uses an electrolytic bath for additional purification. -angels-ore-powderizer=Uses milling drums to turn solid material into powder. -angels-ore-powderizer-2=Uses milling drums to turn solid material into powder. -angels-ore-powderizer-3=Uses milling drums to turn solid material into powder. +angels-powderizer=Turns solid material into powder. +angels-powderizer-2=Turns solid material into powder. +angels-powderizer-3=Turns solid material into powder. angels-filtration-unit=Filters out impurities from liquids. angels-filtration-unit-2=Filters out impurities from liquids. diff --git a/angelsrefining/migrations/angelsrefining_1.1.0.json b/angelsrefining/migrations/angelsrefining_1.1.0.json index 41b65dead..baf44db9e 100644 --- a/angelsrefining/migrations/angelsrefining_1.1.0.json +++ b/angelsrefining/migrations/angelsrefining_1.1.0.json @@ -33,9 +33,9 @@ ["ore-leaching-plant", "angels-ore-leaching-plant"], ["ore-leaching-plant-2", "angels-ore-leaching-plant-2"], ["ore-leaching-plant-3", "angels-ore-leaching-plant-3"], - ["ore-powderizer", "angels-ore-powderizer"], - ["ore-powderizer-2", "angels-ore-powderizer-2"], - ["ore-powderizer-3", "angels-ore-powderizer-3"], + ["ore-powderizer", "angels-powderizer"], + ["ore-powderizer-2", "angels-powderizer-2"], + ["ore-powderizer-3", "angels-powderizer-3"], ["ore-refinery", "angels-ore-refinery"], ["ore-refinery-2", "angels-ore-refinery-2"], ["ore-sorting-facility", "angels-ore-sorting-facility"], @@ -123,9 +123,9 @@ ["ore-leaching-plant", "angels-ore-leaching-plant"], ["ore-leaching-plant-2", "angels-ore-leaching-plant-2"], ["ore-leaching-plant-3", "angels-ore-leaching-plant-3"], - ["ore-powderizer", "angels-ore-powderizer"], - ["ore-powderizer-2", "angels-ore-powderizer-2"], - ["ore-powderizer-3", "angels-ore-powderizer-3"], + ["ore-powderizer", "angels-powderizer"], + ["ore-powderizer-2", "angels-powderizer-2"], + ["ore-powderizer-3", "angels-powderizer-3"], ["ore-refinery", "angels-ore-refinery"], ["ore-refinery-2", "angels-ore-refinery-2"], ["ore-sorting-facility", "angels-ore-sorting-facility"], @@ -389,9 +389,9 @@ ["ore-leaching-plant", "angels-ore-leaching-plant"], ["ore-leaching-plant-2", "angels-ore-leaching-plant-2"], ["ore-leaching-plant-3", "angels-ore-leaching-plant-3"], - ["ore-powderizer", "angels-ore-powderizer"], - ["ore-powderizer-2", "angels-ore-powderizer-2"], - ["ore-powderizer-3", "angels-ore-powderizer-3"], + ["ore-powderizer", "angels-powderizer"], + ["ore-powderizer-2", "angels-powderizer-2"], + ["ore-powderizer-3", "angels-powderizer-3"], ["ore-refinery", "angels-ore-refinery"], ["ore-refinery-2", "angels-ore-refinery-2"], ["ore-sorting-facility", "angels-ore-sorting-facility"], diff --git a/angelsrefining/prototypes/buildings/powderizer.lua b/angelsrefining/prototypes/buildings/powderizer.lua index 84ca1dad0..4de79163a 100644 --- a/angelsrefining/prototypes/buildings/powderizer.lua +++ b/angelsrefining/prototypes/buildings/powderizer.lua @@ -1,4 +1,4 @@ -circuit_connector_definitions["angels-ore-powderizer"] = circuit_connector_definitions.create_vector(universal_connector_template, { +circuit_connector_definitions["angels-powderizer"] = circuit_connector_definitions.create_vector(universal_connector_template, { { variation = 25, main_offset = util.by_pixel(-18, -17.625), shadow_offset = util.by_pixel(-18, -17.625), show_shadow = true }, { variation = 25, main_offset = util.by_pixel(-18, -17.625), shadow_offset = util.by_pixel(-18, -17.625), show_shadow = true }, { variation = 25, main_offset = util.by_pixel(-18, -17.625), shadow_offset = util.by_pixel(-18, -17.625), show_shadow = true }, @@ -8,21 +8,21 @@ circuit_connector_definitions["angels-ore-powderizer"] = circuit_connector_defin data:extend({ { type = "item", - name = "angels-ore-powderizer", + name = "angels-powderizer", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", icon_size = 32, }, }, 1, angelsmods.refining.number_tint), - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", order = "a", - place_result = "angels-ore-powderizer", + place_result = "angels-powderizer", stack_size = 10, }, { type = "assembling-machine", - name = "angels-ore-powderizer", + name = "angels-powderizer", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", @@ -30,9 +30,9 @@ data:extend({ }, }, 1, angelsmods.refining.number_tint), flags = { "placeable-neutral", "player-creation" }, - minable = { mining_time = 1, result = "angels-ore-powderizer" }, - fast_replaceable_group = "angels-ore-powderizer", - next_upgrade = "angels-ore-powderizer-2", + minable = { mining_time = 1, result = "angels-powderizer" }, + fast_replaceable_group = "angels-powderizer", + next_upgrade = "angels-powderizer-2", max_health = 300, corpse = "big-remnants", dying_explosion = "medium-explosion", @@ -40,7 +40,7 @@ data:extend({ selection_box = { { -1.0, -1.0 }, { 1.0, 1.0 } }, module_slots = 1, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "angels-ore-refining-t1-5" }, + crafting_categories = { "angels-powderizing-1" }, crafting_speed = 1.5, energy_source = { type = "electric", @@ -48,7 +48,7 @@ data:extend({ emissions_per_minute = { pollution = 2.4 }, }, energy_usage = "100kW", - circuit_connector = circuit_connector_definitions["angels-ore-powderizer"], + circuit_connector = circuit_connector_definitions["angels-powderizer"], circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { animation = { @@ -71,21 +71,21 @@ data:extend({ }, { type = "item", - name = "angels-ore-powderizer-2", + name = "angels-powderizer-2", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", icon_size = 32, }, }, 2, angelsmods.refining.number_tint), - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", order = "b", - place_result = "angels-ore-powderizer-2", + place_result = "angels-powderizer-2", stack_size = 10, }, { type = "assembling-machine", - name = "angels-ore-powderizer-2", + name = "angels-powderizer-2", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", @@ -93,9 +93,9 @@ data:extend({ }, }, 2, angelsmods.refining.number_tint), flags = { "placeable-neutral", "player-creation" }, - minable = { mining_time = 1, result = "angels-ore-powderizer-2" }, - fast_replaceable_group = "angels-ore-powderizer", - next_upgrade = "angels-ore-powderizer-3", + minable = { mining_time = 1, result = "angels-powderizer-2" }, + fast_replaceable_group = "angels-powderizer", + next_upgrade = "angels-powderizer-3", max_health = 300, corpse = "big-remnants", dying_explosion = "medium-explosion", @@ -103,7 +103,7 @@ data:extend({ selection_box = { { -1.0, -1.0 }, { 1.0, 1.0 } }, module_slots = 2, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "angels-ore-refining-t1-5" }, + crafting_categories = { "angels-powderizing-1", "angels-powderizing-2" }, crafting_speed = 2, energy_source = { type = "electric", @@ -111,7 +111,7 @@ data:extend({ emissions_per_minute = { pollution = 3 }, }, energy_usage = "125kW", - circuit_connector = circuit_connector_definitions["angels-ore-powderizer"], + circuit_connector = circuit_connector_definitions["angels-powderizer"], circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { animation = { @@ -134,21 +134,21 @@ data:extend({ }, { type = "item", - name = "angels-ore-powderizer-3", + name = "angels-powderizer-3", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", icon_size = 32, }, }, 3, angelsmods.refining.number_tint), - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", order = "c", - place_result = "angels-ore-powderizer-3", + place_result = "angels-powderizer-3", stack_size = 10, }, { type = "assembling-machine", - name = "angels-ore-powderizer-3", + name = "angels-powderizer-3", icons = angelsmods.functions.add_number_icon_layer({ { icon = "__angelsrefininggraphics__/graphics/icons/powderizer-ico.png", @@ -156,8 +156,8 @@ data:extend({ }, }, 3, angelsmods.refining.number_tint), flags = { "placeable-neutral", "player-creation" }, - minable = { mining_time = 1, result = "angels-ore-powderizer-3" }, - fast_replaceable_group = "angels-ore-powderizer", + minable = { mining_time = 1, result = "angels-powderizer-3" }, + fast_replaceable_group = "angels-powderizer", max_health = 300, corpse = "big-remnants", dying_explosion = "medium-explosion", @@ -165,7 +165,7 @@ data:extend({ selection_box = { { -1.0, -1.0 }, { 1.0, 1.0 } }, module_slots = 3, allowed_effects = { "consumption", "speed", "pollution", "productivity" }, - crafting_categories = { "angels-ore-refining-t1-5" }, + crafting_categories = { "angels-powderizing-1", "angels-powderizing-2", "angels-powderizing-3" }, crafting_speed = 3, energy_source = { type = "electric", @@ -173,7 +173,7 @@ data:extend({ emissions_per_minute = { pollution = 3.6 }, }, energy_usage = "150kW", - circuit_connector = circuit_connector_definitions["angels-ore-powderizer"], + circuit_connector = circuit_connector_definitions["angels-powderizer"], circuit_wire_max_distance = default_circuit_wire_max_distance, graphics_set = { animation = { diff --git a/angelsrefining/prototypes/items/refining-items.lua b/angelsrefining/prototypes/items/refining-items.lua index 535c9fc6d..9b1426b61 100644 --- a/angelsrefining/prototypes/items/refining-items.lua +++ b/angelsrefining/prototypes/items/refining-items.lua @@ -854,7 +854,7 @@ data:extend({ name = "angels-milling-drum", icon = "__angelsrefininggraphics__/graphics/icons/milling-drum.png", icon_size = 32, - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", order = "z[milling-drum]-a[new]", stack_size = 200, }, @@ -863,7 +863,7 @@ data:extend({ name = "angels-milling-drum-lubricated", icon = "__angelsrefininggraphics__/graphics/icons/milling-drum-lubricated.png", icon_size = 32, - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", order = "z[milling-drum]-b[lubricated]", stack_size = 200, }, diff --git a/angelsrefining/prototypes/override/recycling.lua b/angelsrefining/prototypes/override/recycling.lua index 7d7f5783d..3887136d6 100644 --- a/angelsrefining/prototypes/override/recycling.lua +++ b/angelsrefining/prototypes/override/recycling.lua @@ -27,9 +27,9 @@ local updated_recipes = { "angels-ore-leaching-plant", "angels-ore-leaching-plant-2", "angels-ore-leaching-plant-3", - "angels-ore-powderizer", - "angels-ore-powderizer-2", - "angels-ore-powderizer-3", + "angels-powderizer", + "angels-powderizer-2", + "angels-powderizer-3", "angels-ore-refinery", "angels-ore-refinery-2", "angels-ore-sorting-facility", diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua index ebf412261..2719e60b8 100644 --- a/angelsrefining/prototypes/override/refining-override-sorting.lua +++ b/angelsrefining/prototypes/override/refining-override-sorting.lua @@ -537,18 +537,12 @@ else else -- hide milling drums OV.hide_recipe({ - "angels-ore-powderizer", - "angels-ore-powderizer-2", - "angels-ore-powderizer-3", "angels-milling-drum", "angels-milling-drum-lubricated", }) - angelsmods.functions.hide("angels-ore-powderizer") - angelsmods.functions.hide("angels-ore-powderizer-2") - angelsmods.functions.hide("angels-ore-powderizer-3") angelsmods.functions.hide("angels-milling-drum") angelsmods.functions.hide("angels-milling-drum-lubricated") - OV.remove_unlock("angels-advanced-ore-refining-3", "angels-ore-powderizer-3") + OV.remove_unlock("angels-advanced-ore-refining-3", "angels-powderizer-3") end end diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua index 051b3de31..c9ba9de8e 100644 --- a/angelsrefining/prototypes/recipe-builder-fallbacks.lua +++ b/angelsrefining/prototypes/recipe-builder-fallbacks.lua @@ -249,8 +249,8 @@ angelsmods.functions.RB.set_fallback("item", "wash-1", { { "block-production-1", angelsmods.functions.RB.set_fallback("item", "wash-2", { { "block-production-2", 3 }, { "angels-washing-plant" } }) angelsmods.functions.RB.set_fallback("item", "orepowder-1", { { "block-production-2", 1 } }) -angelsmods.functions.RB.set_fallback("item", "orepowder-2", { { "block-mprocessing-3", 1 }, { "angels-ore-powderizer" } }) -angelsmods.functions.RB.set_fallback("item", "orepowder-3", { { "block-mprocessing-4", 1 }, { "angels-ore-powderizer-2" } }) +angelsmods.functions.RB.set_fallback("item", "orepowder-2", { { "block-mprocessing-3", 1 }, { "angels-powderizer" } }) +angelsmods.functions.RB.set_fallback("item", "orepowder-3", { { "block-mprocessing-4", 1 }, { "angels-powderizer-2" } }) angelsmods.functions.RB.set_fallback("item", "oreelectro-1", { { "block-mprocessing-4", 3 } }) angelsmods.functions.RB.set_fallback( diff --git a/angelsrefining/prototypes/recipes/refining-entity-angels.lua b/angelsrefining/prototypes/recipes/refining-entity-angels.lua index 670936288..362443482 100644 --- a/angelsrefining/prototypes/recipes/refining-entity-angels.lua +++ b/angelsrefining/prototypes/recipes/refining-entity-angels.lua @@ -622,8 +622,8 @@ angelsmods.functions.RB.build({ --ORE POWDERIZER { type = "recipe", - name = "angels-ore-powderizer", - localised_name = { "entity-name.angels-ore-powderizer" }, + name = "angels-powderizer", + localised_name = { "entity-name.angels-powderizer" }, energy_required = 5, enabled = false, ingredients = { @@ -632,12 +632,12 @@ angelsmods.functions.RB.build({ { type = "item", name = "t2-brick", amount = 1 }, { type = "item", name = "t2-gears", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer", amount = 1 } }, }, { type = "recipe", - name = "angels-ore-powderizer-2", - localised_name = { "entity-name.angels-ore-powderizer-2" }, + name = "angels-powderizer-2", + localised_name = { "entity-name.angels-powderizer-2" }, energy_required = 5, enabled = false, ingredients = { @@ -646,12 +646,12 @@ angelsmods.functions.RB.build({ { type = "item", name = "t3-gears", amount = 1 }, { type = "item", name = "t3-brick", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer-2", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer-2", amount = 1 } }, }, { type = "recipe", - name = "angels-ore-powderizer-3", - localised_name = { "entity-name.angels-ore-powderizer-3" }, + name = "angels-powderizer-3", + localised_name = { "entity-name.angels-powderizer-3" }, energy_required = 5, enabled = false, ingredients = { @@ -660,7 +660,7 @@ angelsmods.functions.RB.build({ { type = "item", name = "t4-gears", amount = 1 }, { type = "item", name = "t4-brick", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer-3", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer-3", amount = 1 } }, }, --ELECTRO WHINNING CELL { diff --git a/angelsrefining/prototypes/recipes/refining-entity.lua b/angelsrefining/prototypes/recipes/refining-entity.lua index e1f518d81..5b27d6952 100644 --- a/angelsrefining/prototypes/recipes/refining-entity.lua +++ b/angelsrefining/prototypes/recipes/refining-entity.lua @@ -470,36 +470,36 @@ data:extend({ --ORE POWDERIZER { type = "recipe", - name = "angels-ore-powderizer", - localised_name = { "entity-name.angels-ore-powderizer" }, + name = "angels-powderizer", + localised_name = { "entity-name.angels-powderizer" }, energy_required = 2, enabled = false, ingredients = { { type = "item", name = "angels-void", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer", amount = 1 } }, }, { type = "recipe", - name = "angels-ore-powderizer-2", - localised_name = { "entity-name.angels-ore-powderizer-2" }, + name = "angels-powderizer-2", + localised_name = { "entity-name.angels-powderizer-2" }, energy_required = 2, enabled = false, ingredients = { { type = "item", name = "angels-void", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer-2", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer-2", amount = 1 } }, }, { type = "recipe", - name = "angels-ore-powderizer-3", - localised_name = { "entity-name.angels-ore-powderizer-3" }, + name = "angels-powderizer-3", + localised_name = { "entity-name.angels-powderizer-3" }, energy_required = 2, enabled = false, ingredients = { { type = "item", name = "angels-void", amount = 1 }, }, - results = { { type = "item", name = "angels-ore-powderizer-3", amount = 1 } }, + results = { { type = "item", name = "angels-powderizer-3", amount = 1 } }, }, --ELECTRO WHINNING CELL { diff --git a/angelsrefining/prototypes/recipes/refining-static.lua b/angelsrefining/prototypes/recipes/refining-static.lua index a99aed6d3..153f5a492 100644 --- a/angelsrefining/prototypes/recipes/refining-static.lua +++ b/angelsrefining/prototypes/recipes/refining-static.lua @@ -248,7 +248,7 @@ data:extend({ { type = "recipe", name = "angels-ore8-powder", - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-ore-processing-a", energy_required = 2, enabled = false, @@ -299,7 +299,7 @@ data:extend({ { type = "recipe", name = "angels-ore9-powder", - category = "angels-ore-refining-t1-5", + category = "angels-powderizing-1", subgroup = "angels-ore-processing-a", energy_required = 2, enabled = false, @@ -1077,7 +1077,7 @@ data:extend({ type = "recipe", name = "angels-milling-drum", category = "crafting", - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", energy_required = 1, enabled = false, ingredients = { @@ -1094,7 +1094,7 @@ data:extend({ type = "recipe", name = "angels-milling-drum-lubricated", category = "crafting-with-fluid", - subgroup = "angels-ore-powderizer", + subgroup = "angels-powderizer", energy_required = 1, enabled = false, ingredients = { diff --git a/angelsrefining/prototypes/refining-category.lua b/angelsrefining/prototypes/refining-category.lua index 15604f1dc..915b764f7 100644 --- a/angelsrefining/prototypes/refining-category.lua +++ b/angelsrefining/prototypes/refining-category.lua @@ -7,13 +7,16 @@ data:extend({ { type = "recipe-category", name = "angels-manual-crafting" }, -- used for manual crafting in character only }, { type = "recipe-category", name = "angels-ore-refining-t1" }, -- crusher - { type = "recipe-category", name = "angels-ore-refining-t1-5" }, -- powderizer { type = "recipe-category", name = "angels-ore-refining-t2" }, -- flotation { type = "recipe-category", name = "angels-ore-refining-t3" }, -- leaching { type = "recipe-category", name = "angels-ore-refining-t3b" }, -- leaching 2 { type = "recipe-category", name = "angels-ore-refining-t3-5" }, -- electrowinning { type = "recipe-category", name = "angels-ore-refining-t4" }, -- refinery + { type = "recipe-category", name = "angels-powderizing-1" }, -- powderizer + { type = "recipe-category", name = "angels-powderizing-2" }, + { type = "recipe-category", name = "angels-powderizing-3" }, + { type = "recipe-category", name = "angels-ore-sorting" }, { type = "recipe-category", name = "angels-ore-sorting-2" }, { type = "recipe-category", name = "angels-ore-sorting-3" }, @@ -225,7 +228,7 @@ data:extend({ }, { type = "item-subgroup", - name = "angels-ore-powderizer", + name = "angels-powderizer", group = "angels-resource-refining", order = "z[building]-f[powderizer]", }, diff --git a/angelsrefining/prototypes/technology/refining-technology.lua b/angelsrefining/prototypes/technology/refining-technology.lua index e3b102f65..f0a7ca29d 100644 --- a/angelsrefining/prototypes/technology/refining-technology.lua +++ b/angelsrefining/prototypes/technology/refining-technology.lua @@ -696,7 +696,7 @@ data:extend({ }, { type = "unlock-recipe", - recipe = "angels-ore-powderizer-3", + recipe = "angels-powderizer-3", }, { type = "unlock-recipe", @@ -942,7 +942,7 @@ data:extend({ effects = { { type = "unlock-recipe", - recipe = "angels-ore-powderizer", + recipe = "angels-powderizer", }, { type = "unlock-recipe", @@ -993,7 +993,7 @@ data:extend({ effects = { { type = "unlock-recipe", - recipe = "angels-ore-powderizer-2", + recipe = "angels-powderizer-2", }, { type = "unlock-recipe", diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt index 0834101d4..576343ac3 100644 --- a/angelssmelting/changelog.txt +++ b/angelssmelting/changelog.txt @@ -2,6 +2,8 @@ Version: 2.0.0 Date: ??? Changes: + - Moved ingot powder receipes to powderizer machines (852) + - Added minimum machine tier to powderizer recipes (852) - Removed references to normal / expensive recipes (945) - Rebalance Tungsten Smelting Recipes (980) - Adjusted the recipes for Bob's Assembling Machines (985) diff --git a/angelssmelting/prototypes/override/smelting-override-cobalt.lua b/angelssmelting/prototypes/override/smelting-override-cobalt.lua index 7a2678719..601e79db8 100644 --- a/angelssmelting/prototypes/override/smelting-override-cobalt.lua +++ b/angelssmelting/prototypes/override/smelting-override-cobalt.lua @@ -111,11 +111,6 @@ end -- POWDER --------------------------------------------------------------------- ------------------------------------------------------------------------------- if angelsmods.trigger.smelting_products["cobalt"].powder then - if mods["angelsindustries"] and angelsmods.industries.tech then - else -- not angels industry tech mode - OV.remove_unlock("angels-cobalt-smelting-2", "angels-powder-cobalt") - OV.add_unlock("angels-cobalt-smelting-1", "angels-powder-cobalt") - end else angelsmods.functions.hide("angels-powder-cobalt") OV.disable_recipe({ "angels-powder-cobalt" }) diff --git a/angelssmelting/prototypes/override/smelting-override-silicon.lua b/angelssmelting/prototypes/override/smelting-override-silicon.lua index 7c57067ac..7b3a43e8b 100644 --- a/angelssmelting/prototypes/override/smelting-override-silicon.lua +++ b/angelssmelting/prototypes/override/smelting-override-silicon.lua @@ -135,6 +135,7 @@ if angelsmods.trigger.smelting_products["silicon"].powder then { name = "bob-silicon-powder", subgroup = "angels-silicon", + category = "angels-powderizing-1", energy_required = 0.5, ingredients = { { "!!" }, diff --git a/angelssmelting/prototypes/override/smelting-override-tungsten.lua b/angelssmelting/prototypes/override/smelting-override-tungsten.lua index 59735692a..b4580e5f5 100644 --- a/angelssmelting/prototypes/override/smelting-override-tungsten.lua +++ b/angelssmelting/prototypes/override/smelting-override-tungsten.lua @@ -115,12 +115,6 @@ if angelsmods.trigger.smelting_products["tungsten"].plate then OV.remove_prereq("bob-tungsten-processing", "bob-nickel-processing") end - - if mods["angelsindustries"] and angelsmods.industries.tech then - else -- not angels industry tech mode - OV.remove_prereq("angels-tungsten-smelting-1", "angels-cobalt-smelting-2") - OV.add_prereq("angels-tungsten-smelting-1", "angels-cobalt-smelting-1") - end else angelsmods.functions.hide("angels-casting-powder-tungsten") angelsmods.functions.hide("angels-plate-tungsten") diff --git a/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua b/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua index 24c6e645f..b0bfe3615 100644 --- a/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua +++ b/angelssmelting/prototypes/recipes/smelting-alloy-steel.lua @@ -21,7 +21,7 @@ data:extend({ { type = "recipe", name = "angels-powder-steel", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-iron", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-aluminium.lua b/angelssmelting/prototypes/recipes/smelting-aluminium.lua index c75197216..0fce841d4 100644 --- a/angelssmelting/prototypes/recipes/smelting-aluminium.lua +++ b/angelssmelting/prototypes/recipes/smelting-aluminium.lua @@ -166,7 +166,7 @@ data:extend({ { type = "recipe", name = "angels-powder-aluminium", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-aluminium", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-chrome.lua b/angelssmelting/prototypes/recipes/smelting-chrome.lua index 7881353af..e4024a15a 100644 --- a/angelssmelting/prototypes/recipes/smelting-chrome.lua +++ b/angelssmelting/prototypes/recipes/smelting-chrome.lua @@ -166,7 +166,7 @@ data:extend({ { type = "recipe", name = "angels-powder-chrome", - category = "advanced-crafting", + category = "angels-powderizing-3", subgroup = "angels-chrome", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-cobalt.lua b/angelssmelting/prototypes/recipes/smelting-cobalt.lua index 12d7518e7..55f15ee7d 100644 --- a/angelssmelting/prototypes/recipes/smelting-cobalt.lua +++ b/angelssmelting/prototypes/recipes/smelting-cobalt.lua @@ -170,7 +170,7 @@ data:extend({ { type = "recipe", name = "angels-powder-cobalt", - category = "advanced-crafting", + category = "angels-powderizing-3", subgroup = "angels-cobalt", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-copper.lua b/angelssmelting/prototypes/recipes/smelting-copper.lua index f90e99575..5f23a36c1 100644 --- a/angelssmelting/prototypes/recipes/smelting-copper.lua +++ b/angelssmelting/prototypes/recipes/smelting-copper.lua @@ -124,7 +124,7 @@ data:extend({ { type = "recipe", name = "angels-powder-copper", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-copper", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-gold.lua b/angelssmelting/prototypes/recipes/smelting-gold.lua index 0aeb9e585..b026d47a6 100644 --- a/angelssmelting/prototypes/recipes/smelting-gold.lua +++ b/angelssmelting/prototypes/recipes/smelting-gold.lua @@ -174,7 +174,7 @@ data:extend({ { type = "recipe", name = "angels-powder-gold", - category = "advanced-crafting", + category = "angels-powderizing-3", subgroup = "angels-gold", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-iron.lua b/angelssmelting/prototypes/recipes/smelting-iron.lua index 708bbc000..d21fc87a4 100644 --- a/angelssmelting/prototypes/recipes/smelting-iron.lua +++ b/angelssmelting/prototypes/recipes/smelting-iron.lua @@ -133,7 +133,7 @@ data:extend({ { type = "recipe", name = "angels-powder-iron", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-iron", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-lead.lua b/angelssmelting/prototypes/recipes/smelting-lead.lua index 26b5d3723..556407336 100644 --- a/angelssmelting/prototypes/recipes/smelting-lead.lua +++ b/angelssmelting/prototypes/recipes/smelting-lead.lua @@ -175,7 +175,7 @@ data:extend({ { type = "recipe", name = "angels-powder-lead", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-lead", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-manganese.lua b/angelssmelting/prototypes/recipes/smelting-manganese.lua index cc868cf02..73e4be20c 100644 --- a/angelssmelting/prototypes/recipes/smelting-manganese.lua +++ b/angelssmelting/prototypes/recipes/smelting-manganese.lua @@ -175,7 +175,7 @@ data:extend({ { type = "recipe", name = "angels-powder-manganese", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-manganese", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-nickel.lua b/angelssmelting/prototypes/recipes/smelting-nickel.lua index bddf58b12..471a8c8e0 100644 --- a/angelssmelting/prototypes/recipes/smelting-nickel.lua +++ b/angelssmelting/prototypes/recipes/smelting-nickel.lua @@ -140,7 +140,7 @@ data:extend({ { type = "recipe", name = "angels-powder-nickel", - category = "advanced-crafting", + category = "angels-powderizing-2", subgroup = "angels-nickel", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-platinum.lua b/angelssmelting/prototypes/recipes/smelting-platinum.lua index 42075e484..80a3c52d3 100644 --- a/angelssmelting/prototypes/recipes/smelting-platinum.lua +++ b/angelssmelting/prototypes/recipes/smelting-platinum.lua @@ -138,7 +138,7 @@ data:extend({ { type = "recipe", name = "angels-powder-platinum", - category = "advanced-crafting", + category = "angels-powderizing-3", subgroup = "angels-platinum", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-silicon.lua b/angelssmelting/prototypes/recipes/smelting-silicon.lua index 4a5f356e9..fc7e823b1 100644 --- a/angelssmelting/prototypes/recipes/smelting-silicon.lua +++ b/angelssmelting/prototypes/recipes/smelting-silicon.lua @@ -156,7 +156,7 @@ data:extend({ { type = "recipe", name = "angels-powder-silicon", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-silicon", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-silver.lua b/angelssmelting/prototypes/recipes/smelting-silver.lua index cf59339af..8f0ce40b7 100644 --- a/angelssmelting/prototypes/recipes/smelting-silver.lua +++ b/angelssmelting/prototypes/recipes/smelting-silver.lua @@ -149,7 +149,7 @@ data:extend({ { type = "recipe", name = "angels-powder-silver", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-silver", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-tin.lua b/angelssmelting/prototypes/recipes/smelting-tin.lua index cefce21db..1408324a5 100644 --- a/angelssmelting/prototypes/recipes/smelting-tin.lua +++ b/angelssmelting/prototypes/recipes/smelting-tin.lua @@ -105,7 +105,7 @@ data:extend({ { type = "recipe", name = "angels-powder-tin", - category = "advanced-crafting", + category = "angels-powderizing-1", subgroup = "angels-tin", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-titanium.lua b/angelssmelting/prototypes/recipes/smelting-titanium.lua index c98b5a0ca..df553d63e 100644 --- a/angelssmelting/prototypes/recipes/smelting-titanium.lua +++ b/angelssmelting/prototypes/recipes/smelting-titanium.lua @@ -156,7 +156,7 @@ data:extend({ { type = "recipe", name = "angels-powder-titanium", - category = "advanced-crafting", + category = "angels-powderizing-3", subgroup = "angels-titanium", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/recipes/smelting-zinc.lua b/angelssmelting/prototypes/recipes/smelting-zinc.lua index 58078b40d..d695f9a94 100644 --- a/angelssmelting/prototypes/recipes/smelting-zinc.lua +++ b/angelssmelting/prototypes/recipes/smelting-zinc.lua @@ -180,7 +180,7 @@ data:extend({ { type = "recipe", name = "angels-powder-zinc", - category = "advanced-crafting", + category = "angels-powderizing-2", subgroup = "angels-zinc", energy_required = 0.5, enabled = false, diff --git a/angelssmelting/prototypes/technology/smelting-cobalt.lua b/angelssmelting/prototypes/technology/smelting-cobalt.lua index 8f1cbdede..36f12ecfe 100644 --- a/angelssmelting/prototypes/technology/smelting-cobalt.lua +++ b/angelssmelting/prototypes/technology/smelting-cobalt.lua @@ -51,6 +51,7 @@ data:extend({ --"angels-metallurgy-4", "angels-ore-processing-3", "angels-cobalt-smelting-1", + "angels-powder-metallurgy-4", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-copper.lua b/angelssmelting/prototypes/technology/smelting-copper.lua index e2b7ecc7e..6aeda07cf 100644 --- a/angelssmelting/prototypes/technology/smelting-copper.lua +++ b/angelssmelting/prototypes/technology/smelting-copper.lua @@ -42,6 +42,7 @@ data:extend({ "angels-ore-processing-1", "angels-copper-smelting-1", "angels-basic-chemistry", + "angels-powder-metallurgy-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-gold.lua b/angelssmelting/prototypes/technology/smelting-gold.lua index 79a5ed489..42264b21e 100644 --- a/angelssmelting/prototypes/technology/smelting-gold.lua +++ b/angelssmelting/prototypes/technology/smelting-gold.lua @@ -50,6 +50,7 @@ data:extend({ "angels-ore-processing-3", "angels-gold-smelting-1", "angels-nitrogen-processing-2", + "angels-powder-metallurgy-4", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-iron.lua b/angelssmelting/prototypes/technology/smelting-iron.lua index 2730d90ee..2a1eca04a 100644 --- a/angelssmelting/prototypes/technology/smelting-iron.lua +++ b/angelssmelting/prototypes/technology/smelting-iron.lua @@ -42,6 +42,7 @@ data:extend({ "angels-ore-processing-1", "angels-iron-smelting-1", "angels-coal-processing", + "angels-powder-metallurgy-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-nickel.lua b/angelssmelting/prototypes/technology/smelting-nickel.lua index cb9765c64..c106e87f0 100644 --- a/angelssmelting/prototypes/technology/smelting-nickel.lua +++ b/angelssmelting/prototypes/technology/smelting-nickel.lua @@ -44,6 +44,7 @@ data:extend({ "angels-ore-processing-2", "angels-nickel-smelting-1", "angels-sulfur-processing-1", + "angels-powder-metallurgy-3" }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-silicon.lua b/angelssmelting/prototypes/technology/smelting-silicon.lua index 5b5d5457c..9e4657df6 100644 --- a/angelssmelting/prototypes/technology/smelting-silicon.lua +++ b/angelssmelting/prototypes/technology/smelting-silicon.lua @@ -7,9 +7,10 @@ data:extend({ icon = "__angelssmeltinggraphics__/graphics/technology/casting-silicon-tech.png", icon_size = 256, prerequisites = { - "angels-metallurgy-2", + --"angels-metallurgy-2", "angels-coal-processing", "angels-nitrogen-processing-1", + "angels-powder-metallurgy-2", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-support.lua b/angelssmelting/prototypes/technology/smelting-support.lua index 7583f08d2..bc8dde536 100644 --- a/angelssmelting/prototypes/technology/smelting-support.lua +++ b/angelssmelting/prototypes/technology/smelting-support.lua @@ -226,6 +226,10 @@ data:extend({ type = "unlock-recipe", recipe = "angels-powder-mixer", }, + { + type = "unlock-recipe", + recipe = "angels-powderizer", + }, }, unit = { count = 100, @@ -255,6 +259,10 @@ data:extend({ type = "unlock-recipe", recipe = "angels-powder-mixer-2", }, + { + type = "unlock-recipe", + recipe = "angels-powderizer-2", + }, }, unit = { count = 150, @@ -285,6 +293,10 @@ data:extend({ type = "unlock-recipe", recipe = "angels-powder-mixer-3", }, + { + type = "unlock-recipe", + recipe = "angels-powderizer-3", + }, }, unit = { count = 200, diff --git a/angelssmelting/prototypes/technology/smelting-titanium.lua b/angelssmelting/prototypes/technology/smelting-titanium.lua index 29ac94452..a68c4c609 100644 --- a/angelssmelting/prototypes/technology/smelting-titanium.lua +++ b/angelssmelting/prototypes/technology/smelting-titanium.lua @@ -54,6 +54,7 @@ data:extend({ --"angels-metallurgy-4", "angels-ore-processing-3", "angels-titanium-smelting-1", + "angels-powder-metallurgy-4", }, effects = { { diff --git a/angelssmelting/prototypes/technology/smelting-zinc.lua b/angelssmelting/prototypes/technology/smelting-zinc.lua index 4d93ba899..3403bda43 100644 --- a/angelssmelting/prototypes/technology/smelting-zinc.lua +++ b/angelssmelting/prototypes/technology/smelting-zinc.lua @@ -50,6 +50,7 @@ data:extend({ "angels-ore-processing-2", "angels-zinc-smelting-1", "angels-coal-processing", + "angels-powder-metallurgy-3", }, effects = { {