diff --git a/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua b/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua index ef1ccc1..75d0a83 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua @@ -51,7 +51,7 @@ data:extend( max_temperature = 100, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, - subgroup = "water-treatment-fluid", + subgroup = "angels-water-treatment-fluid", order = "k", }, } diff --git a/Clowns-AngelBob-Nuclear/prototypes/more-overrides.lua b/Clowns-AngelBob-Nuclear/prototypes/more-overrides.lua index 2237adb..392fa90 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/more-overrides.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/more-overrides.lua @@ -2,7 +2,7 @@ local OV = angelsmods.functions.OV --set nuclear cell plate local n_plate="iron-plate" if mods["bobplates"] then - n_plate="lead-plate" + n_plate="bob-lead-plate" elseif mods["angelsindustries"] and angelsmods.industries.overhaul then n_plate="angels-plate-lead" --should only activate if not with bobs end @@ -10,12 +10,12 @@ end data.raw.recipe["advanced-uranium-processing"].hidden=true --Add ingredients to thermonuclear bomb -data.raw["recipe"]["thermonuclear-bomb"].ingredients = {{"rocket-control-unit", 200}} +--data.raw["recipe"]["thermonuclear-bomb"].ingredients = {{"rocket-control-unit", 200}} --modules if mods["bobmodules"] then - table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"speed-module-5", 3}) - table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"productivity-module-5", 3}) - table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"efficiency-module-5", 3}) + table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"bob-speed-module-5", 3}) + table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"bob-productivity-module-5", 3}) + table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"bob-efficiency-module-5", 3}) else table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"speed-module-3", 3}) table.insert(data.raw["recipe"]["thermonuclear-bomb"].ingredients, {"productivity-module-3", 3}) @@ -51,11 +51,11 @@ if mods["angelsindustries"] and angelsmods.industries.overhaul then end --updates to the plutonium bomb -if data.raw.item["electronic-logic-board"] then - clowns.functions.replace_ing("plutonium-atomic-bomb","electronic-logic-board","rocket-control-unit","ing") -elseif data.raw.item["processing-unit"] then - clowns.functions.replace_ing("plutonium-atomic-bomb","processing-unit","rocket-control-unit","ing") -end +--if data.raw.item["electronic-logic-board"] then +-- clowns.functions.replace_ing("plutonium-atomic-bomb","electronic-logic-board","rocket-control-unit","ing") +--elseif data.raw.item["processing-unit"] then +-- clowns.functions.replace_ing("plutonium-atomic-bomb","processing-unit","rocket-control-unit","ing") +--end --assuming bobs reprocessing recipe is well balanced (may be clobbered by angels) data.raw.recipe["nuclear-fuel-reprocessing"].results= { @@ -93,7 +93,7 @@ if settings.startup["reprocessing-overhaul"].value and data.raw.item["lead-oxide clowns.functions.remove_res("thorium-fuel-reprocessing",n_plate,"res") if data.raw.recipe["advanced-thorium-nuclear-fuel-reprocessing"] then clowns.functions.add_to_table("advanced-thorium-nuclear-fuel-reprocessing",{type="item",name="lead-oxide",amount= 2,probability=rec_chance},"res") - clowns.functions.add_to_table("advanced-thorium-nuclear-fuel-reprocessing|b",{type="item",name="lead-oxide",amount= 2,probability=rec_chance},"res") + clowns.functions.add_to_table("advanced-thorium-nuclear-fuel-reprocessing-b",{type="item",name="lead-oxide",amount= 2,probability=rec_chance},"res") --table.insert(data.raw.recipe["advanced-thorium-nuclear-fuel-reprocessing"].results,{type="item",name="lead-oxide",amount= 2,probability=rec_chance}) --table.insert(data.raw.recipe["advanced-thorium-nuclear-fuel-reprocessing|b"].results,{type="item",name="lead-oxide",amount= 2,probability=rec_chance}) end diff --git a/Clowns-AngelBob-Nuclear/prototypes/overrides.lua b/Clowns-AngelBob-Nuclear/prototypes/overrides.lua index 4742115..2d07b8d 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/overrides.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/overrides.lua @@ -12,7 +12,7 @@ if data.raw.item["thorium-fuel-cell"] then clowns.functions.replace_ing("radiothermal-fuel","iron-plate",plate,"ing") else angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-2") - angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing|b") + angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-b") end angelsmods.functions.make_void("water-radioactive-waste", "water") if mods["angelsindustries"] then @@ -20,10 +20,10 @@ if mods["angelsindustries"] then clowns.functions.replace_ing("angels-advanced-mixed-oxide-reprocessing","uranium-235","35pc-uranium","res") --lower plutonium returns on thorium reprocessing angelsmods.functions.OV.patch_recipes({ - {name = "advanced-thorium-nuclear-fuel-reprocessing|b", results = {{"plutonium-239", 2}}}, + {name = "advanced-thorium-nuclear-fuel-reprocessing-b", results = {{"plutonium-239", 2}}}, {name = "advanced-thorium-nuclear-fuel-reprocessing", results = {{"thorium-232", 0}}}, {name = "thorium-mixed-oxide", results={{"angels-thorium-fuel-cell", 2}, {"thorium-fuel-cell", 0}}}, - {name = "clowns-centrifuging-20%-hexafluoride", results = {{type = "item", name = "uranium-234", amount = 1, probability = 0.000055}}}, + {name = "clowns-centrifuging-20pc-hexafluoride", results = {{type = "item", name = "angels-uranium-234", amount = 1, probability = 0.000055}}}, }) data.raw.recipe["advanced-thorium-nuclear-fuel-reprocessing"].localised_name={"recipe-name.advanced-clowns-amox-reprocessing"} end \ No newline at end of file diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua index f65dcd1..a2c341c 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua @@ -8,8 +8,8 @@ data:extend( category = "chemistry", ingredients = { - {type="item", name="used-up-uranium-fuel-cell", amount=5}, - {type="fluid", name="liquid-nitric-acid", amount=300}--20 + {type="item", name="depleted-uranium-fuel-cell", amount=5}, + {type="fluid", name="angels-liquid-nitric-acid", amount=300}--20 }, icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}}, icon_size=32, @@ -32,8 +32,8 @@ data:extend( category = "chemistry", ingredients = { - {type="item", name="used-up-uranium-fuel-cell", amount=5}, - {type="fluid", name="liquid-nitric-acid", amount=350}--20 + {type="item", name="depleted-uranium-fuel-cell", amount=5}, + {type="fluid", name="angels-liquid-nitric-acid", amount=350}--20 }, icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}}, icon_size=32, @@ -56,8 +56,8 @@ data:extend( category = "chemistry", ingredients = { - {type="item", name="used-up-uranium-fuel-cell", amount=5}, - {type="fluid", name="liquid-nitric-acid", amount=300}--20 + {type="item", name="depleted-uranium-fuel-cell", amount=5}, + {type="fluid", name="angels-liquid-nitric-acid", amount=300}--20 }, icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png",icon_size=32}}, icon_size=32, @@ -72,8 +72,8 @@ data:extend( }, }, }) -if data.raw.item["thorium-fuel-cell"] or data.raw.item["angels-thorium-fuel-cell"] then - local ucell = data.raw.item["thorium-fuel-cell"] and "used-up-thorium-fuel-cell" or data.raw.item["angels-thorium-fuel-cell"] and "used-up-angels-thorium-fuel-cell" +if data.raw.item["bob-thorium-fuel-cell"] or data.raw.item["angels-thorium-fuel-cell"] then + local ucell = data.raw.item["bob-thorium-fuel-cell"] and "bob-depleted-thorium-fuel-cell" or data.raw.item["angels-thorium-fuel-cell"] and "angels-depleted-thorium-fuel-cell" data:extend( { { @@ -111,7 +111,7 @@ data:extend( ingredients = { {type="item", name=ucell, amount=5}, - {type="fluid", name="liquid-nitric-acid", amount=300}--20 (matching the waste liq) + {type="fluid", name="angels-liquid-nitric-acid", amount=300}--20 (matching the waste liq) }, icons= {{icon = "__Clowns-Nuclear__/graphics/icons/thorium-nuclear-fuel-reprocessing.png", icon_size = 32,}}, icon_size=32, @@ -134,7 +134,7 @@ data:extend( ingredients = { {type="item", name=ucell, amount=5}, - {type="fluid", name="liquid-nitric-acid", amount=150}--making this path lower than the other one, to give options, may need balance + {type="fluid", name="angels-liquid-nitric-acid", amount=150}--making this path lower than the other one, to give options, may need balance }, icons= {{icon = "__Clowns-Nuclear__/graphics/icons/thorium-nuclear-fuel-reprocessing.png", icon_size = 32,}}, icon_size=32, @@ -190,7 +190,7 @@ end order = "c-b-b", results = { - {type="item", name="used-up-uranium-fuel-cell", amount=1} + {type="item", name="depleted-uranium-fuel-cell", amount=1} }, }, } @@ -232,7 +232,7 @@ if mods["angelsindustries"] and angelsmods.industries.overhaul then order = "c-b-b", results = { - {type="item", name="used-up-uranium-fuel-cell", amount=1} + {type="item", name="depleted-uranium-fuel-cell", amount=1} }, } }) diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua index 5f0e051..a6591a0 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua @@ -3,8 +3,8 @@ data:extend( { type = "recipe", name = "radioactive-waste-water-purification", - category = "water-treatment", - subgroup = "water-cleaning", + category = "angels-water-treatment", + subgroup = "angels-water-cleaning", energy_required = 10, enabled = false, ingredients = @@ -13,10 +13,10 @@ data:extend( }, results= { - {type="fluid", name="water-red-waste", amount=100}, + {type="fluid", name="angels-water-red-waste", amount=100}, {type="item", name="polonium-210", amount=1}, }, - icons = angelsmods.functions.create_liquid_recipe_icon({"polonium-210","water-red-waste"}, "WsCCl"), + icons = angelsmods.functions.create_liquid_recipe_icon({"polonium-210","angels-water-red-waste"}, "WsCCl"), order = "k", }, } diff --git a/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua b/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua index f74f739..8260a20 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua @@ -6,7 +6,7 @@ data.raw.technology["advanced-uranium-processing-1"].effects = {type = "unlock-recipe", recipe = "solid-uranium-hexafluoride"}, {type = "unlock-recipe", recipe = "solid-uranium-tetrafluoride"}, {type = "unlock-recipe", recipe = "solid-uranium-oxide-1"}, - {type = "unlock-recipe", recipe = "clowns-centrifuging-20%-hexafluoride"}, + {type = "unlock-recipe", recipe = "clowns-centrifuging-20pc-hexafluoride"}, } --clobber vanilla and angels nuclear fuel recipes if data.raw.technology["angels-nuclear-fuel"] then @@ -52,4 +52,4 @@ clowns.functions.add_unlock(centri_2,"clowns-centrifuging-65pc") clowns.functions.add_unlock(centri_2,"clowns-centrifuging-70pc") clowns.functions.add_unlock(centri_2,"clowns-centrifuging-75pc") clowns.functions.add_unlock(centri_2,"clowns-centrifuging-80pc") -clowns.functions.add_unlock("water-treatment-4","radioactive-waste-water-purification") +clowns.functions.add_unlock("angels-water-treatment-4","radioactive-waste-water-purification") diff --git a/Clowns-AngelBob-Nuclear/prototypes/technology/nuclear-reprocessing.lua b/Clowns-AngelBob-Nuclear/prototypes/technology/nuclear-reprocessing.lua index 44641eb..10246ca 100644 --- a/Clowns-AngelBob-Nuclear/prototypes/technology/nuclear-reprocessing.lua +++ b/Clowns-AngelBob-Nuclear/prototypes/technology/nuclear-reprocessing.lua @@ -45,7 +45,7 @@ data:extend( }, { type = "unlock-recipe", - recipe = "advanced-thorium-nuclear-fuel-reprocessing|b" + recipe = "advanced-thorium-nuclear-fuel-reprocessing-b" }, { type = "unlock-recipe", diff --git a/Clowns-Extended-Minerals/data-updates.lua b/Clowns-Extended-Minerals/data-updates.lua index 4baa505..2be61b9 100644 --- a/Clowns-Extended-Minerals/data-updates.lua +++ b/Clowns-Extended-Minerals/data-updates.lua @@ -14,12 +14,13 @@ for i=1,15 do --allow for many options, particularly for the second step (minimu end end end +angelsmods.trigger.ores["platinum"] = true angelsmods.functions.remove_flag("platinum-ore","hidden") --ADD RESOURCE PROCESSING RECIPES TO THE APPROPRIATE TECHNOLOGIES -table.insert(data.raw["technology"]["oil-gas-extraction"].effects, {type = "unlock-recipe", recipe = "clowns-resource2-liquification"}) +table.insert(data.raw["technology"]["angels-oil-gas-extraction"].effects, {type = "unlock-recipe", recipe = "clowns-resource2-liquification"}) if not clowns.special_vanilla then - table.insert(data.raw["technology"]["water-washing-2"].effects, {type = "unlock-recipe", recipe = "clowns-resource1-sluicing"}) --is this not a processing item? + table.insert(data.raw["technology"]["angels-water-washing-2"].effects, {type = "unlock-recipe", recipe = "clowns-resource1-sluicing"}) --is this not a processing item? end --pyanodon updates diff --git a/Clowns-Extended-Minerals/prototypes/categories.lua b/Clowns-Extended-Minerals/prototypes/categories.lua index 4e0715b..7640a1e 100644 --- a/Clowns-Extended-Minerals/prototypes/categories.lua +++ b/Clowns-Extended-Minerals/prototypes/categories.lua @@ -8,61 +8,61 @@ data:extend( { type = "item-subgroup", name = "clowns-ores", - group = "resource-refining", + group = "angels-resource-refining", order = "m-aaa-a", }, { type = "item-subgroup", name = "clowns-ore-processing-a", - group = "resource-refining", + group = "angels-resource-refining", order = "j-a", }, { type = "item-subgroup", name = "clowns-ore-processing-b", - group = "resource-refining", + group = "angels-resource-refining", order = "j-b", }, { type = "item-subgroup", name = "clowns-ore-processing-c", - group = "resource-refining", + group = "angels-resource-refining", order = "j-c", }, { type = "item-subgroup", name = "clowns-ore-processing-d", - group = "resource-refining", + group = "angels-resource-refining", order = "j-d", }, { type = "item-subgroup", name = "clowns-ore-sorting-t1", - group = "resource-refining", + group = "angels-resource-refining", order = "j-f", }, { type = "item-subgroup", name = "clowns-ore-sorting-t2", - group = "resource-refining", + group = "angels-resource-refining", order = "j-g", }, { type = "item-subgroup", name = "clowns-ore-sorting-t3", - group = "resource-refining", + group = "angels-resource-refining", order = "j-h", }, { type = "item-subgroup", name = "clowns-ore-sorting-t4", - group = "resource-refining", + group = "angels-resource-refining", order = "j-i", }, { type = "item-subgroup", name = "ore-sorting-advanced-2", - group = "resource-refining", + group = "angels-resource-refining", order = "j-e", }, } diff --git a/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua b/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua index 239cae5..edd8ada 100644 --- a/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua +++ b/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua @@ -1,7 +1,7 @@ local temp_triggers = {} local trigger_tab = {"phosphorus","osmium","magnesium","limestone","sand","calcium-sulfate","sodium-carbonate","uranium","fluorite","platinum"} if not special_vanilla then - table.insert(trigger_tab,"solid-lithium") + table.insert(trigger_tab,"angels-solid-lithium") end if mods["pycoalprocessing"] then table.insert(trigger_tab,"raw-borax") diff --git a/Clowns-Extended-Minerals/prototypes/items/item-builder.lua b/Clowns-Extended-Minerals/prototypes/items/item-builder.lua index 147166d..8e3e966 100644 --- a/Clowns-Extended-Minerals/prototypes/items/item-builder.lua +++ b/Clowns-Extended-Minerals/prototypes/items/item-builder.lua @@ -80,7 +80,7 @@ for _, name in pairs({"clowns-ore11","clowns-ore12","clowns-ore13","clowns-ore14 { type = "item-subgroup", name = "mixed-ore-".. name, - group = "resource-refining", + group = "angels-resource-refining", order = "j-e", }, --Crushed @@ -133,7 +133,7 @@ for _, name in pairs({"clowns-ore11","clowns-ore12","clowns-ore13","clowns-ore14 name = ""..name.."-sludge", localised_name = {"item-name.clown-mat",{"entity-name."..name},"Sludge"}, icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, {shifts[name].A, shifts[name].A, shifts[name].B, shifts[name].B}), - subgroup = "fluids-refining", + subgroup = "angels-fluids-refining", default_temperature = 25, heat_capacity = "1kJ", base_color = shifts[name].A,--{r = 132 / 255, g = 176 / 255, b = 11 / 255}, @@ -146,7 +146,7 @@ for _, name in pairs({"clowns-ore11","clowns-ore12","clowns-ore13","clowns-ore14 name = ""..name.."-solution", localised_name = {"item-name.clown-mat",{"entity-name."..name},"Solution"}, icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, {shifts[name].A, nil, shifts[name].B}), - subgroup = "fluids-refining", + subgroup = "angels-fluids-refining", default_temperature = 25, heat_capacity = "1kJ", base_color = shifts[name].A,--{r = 255 / 255, g = 119 / 255, b = 0 / 255}, @@ -159,7 +159,7 @@ for _, name in pairs({"clowns-ore11","clowns-ore12","clowns-ore13","clowns-ore14 name = ""..name.."-anode-sludge", localised_name = {"item-name.clown-mat",{"entity-name."..name},"Anode Sludge"}, icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, {shifts[name].A, shifts[name].A, shifts[name].C, shifts[name].E}), - subgroup = "fluids-refining", + subgroup = "angels-fluids-refining", default_temperature = 25, heat_capacity = "1kJ", base_color = shifts[name].A,--{r = 255 / 255, g = 119 / 255, b = 0 / 255}, @@ -172,7 +172,7 @@ for _, name in pairs({"clowns-ore11","clowns-ore12","clowns-ore13","clowns-ore14 name = ""..name.."-slime", localised_name = {"item-name.clown-mat",{"entity-name."..name},"Essence"}, icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, {shifts[name].B, nil, shifts[name].D}), - subgroup = "fluids-refining", + subgroup = "angels-fluids-refining", default_temperature = 25, heat_capacity = "1kJ", base_color = shifts[name].A,--{r = 255 / 255, g = 119 / 255, b = 0 / 255}, diff --git a/Clowns-Extended-Minerals/prototypes/lookup-tables.lua b/Clowns-Extended-Minerals/prototypes/lookup-tables.lua index 68e267b..c267bc7 100644 --- a/Clowns-Extended-Minerals/prototypes/lookup-tables.lua +++ b/Clowns-Extended-Minerals/prototypes/lookup-tables.lua @@ -14,33 +14,33 @@ clowns.tables.get_trigger_name = { --[[V]]["angels-copper-nugget"] = special_vanilla and "copper" or "unused", -- special vanilla only --[[V]]["angels-copper-pebbles"] = special_vanilla and "copper" or "unused", -- special vanilla only --[[V]]["angels-copper-slag"] = special_vanilla and "copper" or "unused", -- special vanilla only - --[[A/B]]["tin-ore"] = "tin", - --[[A/B]]["lead-ore"] = "lead", - --[[A/B]]["quartz"] = "silicon", - --[[A/B]]["nickel-ore"] = "nickel", - --[[A/B]]["manganese-ore"] = "manganese", - --[[A/B]]["zinc-ore"] = "zinc", - --[[A/B]]["bauxite-ore"] = "aluminium", - --[[A/B]]["cobalt-ore"] = "cobalt", - --[[A/B]]["silver-ore"] = "silver", - --[[A/B]]["gold-ore"] = "gold", - --[[A/B]]["rutile-ore"] = "titanium", + --[[A/B]]["bob-tin-ore"] = "tin", + --[[A/B]]["bob-lead-ore"] = "lead", + --[[A/B]]["bob-quartz"] = "silicon", + --[[A/B]]["bob-nickel-ore"] = "nickel", + --[[A/B]]["angels-manganese-ore"] = "manganese", + --[[A/B]]["bob-zinc-ore"] = "zinc", + --[[A/B]]["bob-bauxite-ore"] = "aluminium", + --[[A/B]]["bob-cobalt-ore"] = "cobalt", + --[[A/B]]["bob-silver-ore"] = "silver", + --[[A/B]]["bob-gold-ore"] = "gold", + --[[A/B]]["bob-rutile-ore"] = "titanium", --[[A/B]]["uranium-ore"] = "uranium", - --[[A/B]]["tungsten-ore"] = "tungsten", - --[[A/B]]["thorium-ore"] = "thorium", - --[[A/B]]["chrome-ore"] = "chrome", - --[[A/B]]["platinum-ore"] = "platinum", + --[[A/B]]["bob-tungsten-ore"] = "tungsten", + --[[A/B]]["bob-thorium-ore"] = "thorium", + --[[A/B]]["angels-chrome-ore"] = "chrome", + --[[A/B]]["angels-platinum-ore"] = "platinum", --[[C]]["phosphorus-ore"] = "phosphorus", --[[C]]["magnesium-ore"] = "magnesium", --[[C]]["osmium-ore"] = "osmium", - --[[A]]["solid-limestone"] = "limestone", - --[[A]]["solid-calcium-sulfate"] = "calcium-sulfate", - --[[A]]["solid-lithium"] = "solid-lithium", - --[[A]]["solid-sand"] = "sand", - --[[A]]["solid-sodium-carbonate"] = "sodium-carbonate", - --[[A]]["fluorite-ore"] = "fluorite", -- byproduct + --[[A]]["angels-solid-limestone"] = "limestone", + --[[A]]["angels-solid-calcium-sulfate"] = "calcium-sulfate", + --[[A]]["angels-solid-lithium"] = "angels-solid-lithium", + --[[A]]["angels-solid-sand"] = "sand", + --[[A]]["angels-solid-sodium-carbonate"] = "sodium-carbonate", + --[[A]]["angels-fluorite-ore"] = "fluorite", -- byproduct --[[P]]["raw-borax"] = "borax", --pycoal --[[P]]["nexelit-ore"] = "nexelit", --pycoal @@ -50,94 +50,94 @@ clowns.tables.get_trigger_name = { --[[P]]["regolite-rock"] ="regolites", --pyfusion --[[P]]["kimberlite-rock"] ="kimberlite", --pyfusion diamond mine on volcanic-tube } -local icon_lookup_table_fallback = {icon = "__angelsrefining__/graphics/icons/void.png"} +local icon_lookup_table_fallback = {icon = "__angelsrefininggraphics__/graphics/icons/void.png"} clowns.tables.icon_lookup_table = { - ["bauxite-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-bauxite.png"} or + ["bauxite-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-bauxite.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/bauxite-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/bauxite-ore.png"} or icon_lookup_table_fallback, - ["cobalt-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-cobalt.png"} or + ["cobalt-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-cobalt.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/cobalt-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/cobalt-ore.png"} or icon_lookup_table_fallback, - ["copper-nugget"] = {icon = "__angelsrefining__/graphics/icons/copper-nugget.png"}, + ["copper-nugget"] = {icon = "__angelsrefininggraphics__/graphics/icons/copper-nugget.png"}, ["copper-ore"] = {icon = "__base__/graphics/icons/copper-ore.png", icon_size = 64}, - ["copper-slag"] = {icon = "__angelsrefining__/graphics/icons/copper-slag.png"}, + ["copper-slag"] = {icon = "__angelsrefininggraphics__/graphics/icons/copper-slag.png"}, - ["fluorite-ore"] = {icon = "__angelsrefining__/graphics/icons/ore-fluorite.png"}, + ["fluorite-ore"] = {icon = "__angelsrefininggraphics__/graphics/icons/ore-fluorite.png"}, - ["gold-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-gold.png"} or + ["gold-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-gold.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/gold-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/gold-ore.png"} or icon_lookup_table_fallback, - ["iron-nugget"] = {icon = "__angelsrefining__/graphics/icons/iron-nugget.png"}, + ["iron-nugget"] = {icon = "__angelsrefininggraphics__/graphics/icons/iron-nugget.png"}, ["iron-ore"] = {icon = "__base__/graphics/icons/iron-ore.png", icon_size = 64}, - ["iron-slag"] = {icon = "__angelsrefining__/graphics/icons/iron-slag.png"}, + ["iron-slag"] = {icon = "__angelsrefininggraphics__/graphics/icons/iron-slag.png"}, - ["solid-lithium"] = {icon = "__angelsrefining__/graphics/icons/solid-lithium.png"}, + ["solid-lithium"] = {icon = "__angelsrefininggraphics__/graphics/icons/solid-lithium.png"}, - ["lead-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-lead.png"} or + ["lead-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-lead.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/lead-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/lead-ore.png"} or icon_lookup_table_fallback, - ["nickel-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-nickel.png"} or + ["nickel-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-nickel.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/nickel-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/nickel-ore.png"} or icon_lookup_table_fallback, - ["platinum-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-platinum.png"} or + ["platinum-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-platinum.png"} or icon_lookup_table_fallback, - ["rutile-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-rutile.png"} or + ["rutile-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-rutile.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/rutile-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/rutile-ore.png"} or icon_lookup_table_fallback, - ["quartz"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-silica.png"} or + ["quartz"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-silica.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/quartz.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/quartz.png"} or icon_lookup_table_fallback, - ["silver-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-silver.png"} or + ["silver-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-silver.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/silver-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/silver-ore.png"} or icon_lookup_table_fallback, - ["thorium-ore"] = mods["angelsindustries"] and angelsmods.industries.overhaul and {icon = "__angelssmelting__/graphics/icons/ore-thorium.png", icon_size = 64} or + ["thorium-ore"] = mods["angelsindustries"] and angelsmods.industries.overhaul and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-thorium.png", icon_size = 64} or mods["bobplates"] and {icon = "__boblibrary__/graphics/icons/ore-5.png", tint = {b = 0.25, g = 1, r = 1}} or icon_lookup_table_fallback, - ["tin-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-tin.png"} or + ["tin-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-tin.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/tin-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/tin-ore.png"} or icon_lookup_table_fallback, - ["tungsten-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-tungsten.png"} or + ["tungsten-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-tungsten.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/tungsten-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/tungsten-ore.png"} or icon_lookup_table_fallback, ["uranium-ore"] = {icon = "__base__/graphics/icons/uranium-ore.png", icon_size = 64}, - ["zinc-ore"] = mods["angelssmelting"] and {icon = "__angelssmelting__/graphics/icons/ore-zinc.png"} or + ["zinc-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-zinc.png"} or mods["bobores"] and {icon = "__bobores__/graphics/icons/zinc-ore.png"} or mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/zinc-ore.png"} or icon_lookup_table_fallback, - ["phosphorus-ore"] = {icon = "__Clowns-Processing__/graphics/icons/phosphorus-ore.png"}, + ["phosphorus-ore"] = {icon = "__Clowns-Processing__/graphics/icons/phosphorus-ore.png", icon_size = 32}, ["osmium-ore"] = {icon = "__Clowns-Processing__/graphics/icons/osmium-ore.png"}, - ["manganese-ore"] = {icon = "__angelssmelting__/graphics/icons/ore-manganese.png"}, - ["magnesium-ore"] = {icon = "__Clowns-Processing__/graphics/icons/magnesium-ore.png"}, - ["chrome-ore"] = {icon = "__angelssmelting__/graphics/icons/ore-chrome.png"}, + ["manganese-ore"] = {icon = "__angelssmeltinggraphics__/graphics/icons/ore-manganese.png"}, + ["magnesium-ore"] = {icon = "__Clowns-Processing__/graphics/icons/magnesium-ore.png", icon_size = 32}, + ["chrome-ore"] = {icon = "__angelssmeltinggraphics__/graphics/icons/ore-chrome.png"}, ["raw-borax"] = {icon = "__pycoalprocessinggraphics__/graphics/icons/mip/raw-borax.png", icon_size = 64} or icon_lookup_table_fallback, @@ -222,28 +222,28 @@ clowns.tables.adamantite = { ["angels-iron-nugget"] = special_vanilla and {1, 1, 4, 2}, ["angels-iron-pebbles"] = special_vanilla and {2, 3, 1, 2}, ["angels-iron-slag"] = special_vanilla and {0, 0, 1, 4}, - ["tin-ore"] = (not special_vanilla) and {1, 1, 1, 2}, - ["fluorite-ore"] = {0, 1, 1, 1}, -- forced on all the time from processing - ["chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["rutile-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-tin-ore"] = (not special_vanilla) and {1, 1, 1, 2}, + ["angels-fluorite-ore"] = {0, 1, 1, 1}, -- forced on all the time from processing + ["angels-chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-rutile-ore"] = (not special_vanilla) and {0, 0, 1, 1}, ["osmium-ore"] = {0, 0, 0, 1} } clowns.tables.antitate = { ["!!"] = (not special_vanilla) and {false, false, false, true}, - ["tin-ore"] = (not special_vanilla) and {2, 2, 3, 3}, - ["solid-lithium"] = (not special_vanilla) and {1, 1, 1, 2}, - ["nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["chrome-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-tin-ore"] = (not special_vanilla) and {2, 2, 3, 3}, + ["angels-solid-lithium"] = (not special_vanilla) and {1, 1, 1, 2}, + ["bob-nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-chrome-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.progalena = { ["!!"] = (not special_vanilla) and {false, false, false, true}, - ["lead-ore"] = (not special_vanilla) and {2, 2, 3, 3}, - ["solid-calcium-sulfate"] = (not special_vanilla) and {1, 1, 1, 2}, - ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-lead-ore"] = (not special_vanilla) and {2, 2, 3, 3}, + ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {1, 1, 1, 2}, + ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1}, ["uranium-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.orichalcite = { @@ -252,11 +252,11 @@ clowns.tables.orichalcite = { ["angels-copper-nugget"] = special_vanilla and {1, 2, 4, 3}, ["angels-copper-pebbles"] = special_vanilla and {2, 3, 1, 2}, ["angels-copper-slag"] = special_vanilla and {0, 0, 2, 4}, - ["manganese-ore"] = (not special_vanilla) and {1, 1, 1, 2}, - ["nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["gold-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1}, + ["angels-manganese-ore"] = (not special_vanilla) and {1, 1, 1, 2}, + ["bob-nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1}, } clowns.tables.phosphorite = { ["!!"] = {special_vanilla, special_vanilla, special_vanilla, true}, @@ -265,19 +265,19 @@ clowns.tables.phosphorite = { ["angels-iron-pebbles"] = special_vanilla and {1, 3, 1, 4}, ["angels-iron-slag"] = special_vanilla and {1, 1, 2, 2}, ["phosphorus-ore"] = {2, 2, 3, 3}, - ["solid-limestone"] = {1, 1, 1, 2}, --always active with processing/petrochem + ["angels-solid-limestone"] = {1, 1, 1, 2}, --always active with processing/petrochem ["uranium-ore"] = {0, 0, 1, 1}, - ["lead-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-lead-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.sanguinate = { ["!!"] = (not special_vanilla) and {false, false, false, true}, - ["manganese-ore"] = (not special_vanilla) and {2, 2, 3, 3}, - ["quartz"] = (not special_vanilla) and {1, 1, 1, 2}, - ["solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem - ["fluorite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem + ["angels-manganese-ore"] = (not special_vanilla) and {2, 2, 3, 3}, + ["bob-quartz"] = (not special_vanilla) and {1, 1, 1, 2}, + ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem + ["angels-fluorite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem ["phosphorus-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["rutile-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-rutile-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.elionagate = { ["!!"] = {special_vanilla, special_vanilla, special_vanilla, true}, @@ -285,68 +285,68 @@ clowns.tables.elionagate = { ["angels-copper-nugget"] = special_vanilla and {0, 0, 2, 3}, ["angels-copper-pebbles"] = special_vanilla and {0, 5, 5, 6}, ["angels-copper-slag"] = special_vanilla and {1, 2, 3, 4}, - ["lead-ore"] = (not special_vanilla) and {1, 1, 1, 2}, - ["cobalt-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1}, + ["bob-lead-ore"] = (not special_vanilla) and {1, 1, 1, 2}, + ["bob-cobalt-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1}, } clowns.tables.metagarnierite = { ["!!"] = (not special_vanilla) and {false, false, false, true}, ["magnesium-ore"] = (not special_vanilla) and {2, 2, 3, 3}, ["iron-ore"] = (not special_vanilla) and {1, 1, 1, 2}, - ["nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["manganese-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["bauxite-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["zinc-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-manganese-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-bauxite-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-zinc-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.novaleucoxene = { ["!!"] = (not special_vanilla) and {false, false, false, true}, ["iron-ore"] = (not special_vanilla) and {2, 1, 2, 2}, - ["quartz"] = (not special_vanilla) and {1, 1, 1, 2}, - ["solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1}, - ["rutile-ore"] = (not special_vanilla) and {0, 2, 2, 2}, - ["solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1}, - ["bauxite-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-quartz"] = (not special_vanilla) and {1, 1, 1, 2}, + ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-rutile-ore"] = (not special_vanilla) and {0, 2, 2, 2}, + ["angels-solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-bauxite-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.stannic = { ["!!"] = (not special_vanilla) and {true, true, true, true}, - ["tin-ore"] = (not special_vanilla) and {2, 3, 4, 4}, - ["quartz"] = (not special_vanilla) and {2, 2, 2, 2}, - ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["zinc-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-tin-ore"] = (not special_vanilla) and {2, 3, 4, 4}, + ["bob-quartz"] = (not special_vanilla) and {2, 2, 2, 2}, + ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-zinc-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.plumbic = { ["!!"] = (not special_vanilla) and {true, true, true, true}, - ["lead-ore"] = (not special_vanilla) and {2, 3, 4, 4}, - ["solid-calcium-sulfate"] = (not special_vanilla) and {2, 2, 2, 2}, - ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["gold-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-lead-ore"] = (not special_vanilla) and {2, 3, 4, 4}, + ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {2, 2, 2, 2}, + ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.manganic = { ["!!"] = (not special_vanilla) and {true, true, true, true}, - ["manganese-ore"] = (not special_vanilla) and {2, 3, 4, 4}, + ["angels-manganese-ore"] = (not special_vanilla) and {2, 3, 4, 4}, ["magnesium-ore"] = (not special_vanilla) and {2, 2, 2, 2}, - ["bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1}, - ["chrome-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1}, + ["angels-chrome-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.titanic = { ["!!"] = (not special_vanilla) and {true, true, true, true}, ["iron-ore"] = (not special_vanilla) and {2, 3, 4, 4}, - ["nickel-ore"] = (not special_vanilla) and {2, 2, 2, 2}, - ["rutile-ore"] = (not special_vanilla) and {0, 1, 1, 1}, - ["cobalt-ore"] = (not special_vanilla) and {0, 0, 1, 1}, - ["tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1} + ["bob-nickel-ore"] = (not special_vanilla) and {2, 2, 2, 2}, + ["bob-rutile-ore"] = (not special_vanilla) and {0, 1, 1, 1}, + ["bob-cobalt-ore"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.tables.phosphic = { ["!!"] = (not special_vanilla) and {true, true, true, true}, ["phosphorus-ore"] = (not special_vanilla) and {2, 3, 4, 4}, ["copper-ore"] = (not special_vanilla) and {2, 2, 2, 2}, - ["quartz"] = (not special_vanilla) and {0, 1, 1, 1}, - ["solid-limestone"] = (not special_vanilla) and {0, 0, 1, 1}, + ["bob-quartz"] = (not special_vanilla) and {0, 1, 1, 1}, + ["angels-solid-limestone"] = (not special_vanilla) and {0, 0, 1, 1}, ["uranium-ore"] = (not special_vanilla) and {0, 0, 0, 1} } clowns.functions.get_icon_table = function(table) @@ -354,7 +354,7 @@ clowns.functions.get_icon_table = function(table) for i,icon in pairs(table) do if type(icon) =="table" then list[i]={ - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup(table[i].name, 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"} } @@ -368,27 +368,27 @@ end clowns.tables.crushed_mix_processing = { special_vanilla and {type = "item", name = "phosphorus-ore", amount = 4} or {type = "item", name = "iron-ore", amount = 9}, (not special_vanilla) and {type = "item", name = "copper-ore", amount = 9}, - (not special_vanilla) and {type = "item", name = "tin-ore", amount = 9}, - (not special_vanilla) and {type = "item", name = "lead-ore", amount = 9}, - (not special_vanilla) and {type = "item", name = "manganese-ore", amount = 9}, + (not special_vanilla) and {type = "item", name = "bob-tin-ore", amount = 9}, + (not special_vanilla) and {type = "item", name = "bob-lead-ore", amount = 9}, + (not special_vanilla) and {type = "item", name = "angels-manganese-ore", amount = 9}, (not special_vanilla) and {type = "item", name = "phosphorus-ore", amount = 9}, {type = "item", name = "raw-borax", amount = special_vanilla and 6 or 9}, } clowns.tables.chunk_mix_processing = { - {type = "item", name = "fluorite-ore", amount = special_vanilla and 3 or 8}, - (not special_vanilla) and {type = "item", name = "quartz", amount = 8}, - (not special_vanilla) and {type = "item", name = "nickel-ore", amount = 8}, - (not special_vanilla) and {type = "item", name = "zinc-ore", amount = 8}, - (not special_vanilla) and {type = "item", name = "bauxite-ore", amount = 8}, - (not special_vanilla) and {type = "item", name = "silver-ore", amount = 8}, + {type = "item", name = "angels-fluorite-ore", amount = special_vanilla and 3 or 8}, + (not special_vanilla) and {type = "item", name = "bob-quartz", amount = 8}, + (not special_vanilla) and {type = "item", name = "bob-nickel-ore", amount = 8}, + (not special_vanilla) and {type = "item", name = "bob-zinc-ore", amount = 8}, + (not special_vanilla) and {type = "item", name = "bob-bauxite-ore", amount = 8}, + (not special_vanilla) and {type = "item", name = "bob-silver-ore", amount = 8}, {type = "item", name = "niobium-ore", amount = 8}, --these are temp placeholders, the base ores are not declared until data-updates {type = "item", name = "nexelit-ore", amount = 8}, {type = "item", name = "rare-earth-dust", amount = 8} } clowns.tables.crystal_mix_processing = { - (not special_vanilla) and {type = "item", name = "cobalt-ore", amount = 7}, - (not special_vanilla) and {type = "item", name = "gold-ore", amount = 7}, - (not special_vanilla) and {type = "item", name = "rutile-ore", amount = 7}, + (not special_vanilla) and {type = "item", name = "bob-cobalt-ore", amount = 7}, + (not special_vanilla) and {type = "item", name = "bob-gold-ore", amount = 7}, + (not special_vanilla) and {type = "item", name = "bob-rutile-ore", amount = 7}, (not special_vanilla) and {type = "item", name = "uranium-ore", amount = 7}, {type = "item", name = "magnesium-ore", amount = special_vanlla and 4 or 7}, {type = "item", name = "molybdenum-ore", amount = 8}, --these are temp placeholders, the base ores are not declared until data-updates @@ -396,10 +396,10 @@ clowns.tables.crystal_mix_processing = { } clowns.tables.pure_mix_processing = { - (not special_vanilla) and {type = "item", name = "tungsten-ore", amount = 5}, - (not special_vanilla) and {type = "item", name = "thorium-ore", amount = 5}, - (not special_vanilla) and {type = "item", name = "chrome-ore", amount = 5}, - (not special_vanilla) and {type = "item", name = "platinum-ore", amount = 5}, + (not special_vanilla) and {type = "item", name = "bob-tungsten-ore", amount = 5}, + (not special_vanilla) and {type = "item", name = "bob-thorium-ore", amount = 5}, + (not special_vanilla) and {type = "item", name = "angels-chrome-ore", amount = 5}, + (not special_vanilla) and {type = "item", name = "angels-platinum-ore", amount = 5}, {type = "item", name = "osmium-ore", amount = special_vanlla and 6 or 5}, {type = "item", name = "kimberlite-rock", amount = 8} --these are temp placeholders, the base ores are not declared until data-updates } \ No newline at end of file diff --git a/Clowns-Extended-Minerals/prototypes/pyanodon_updates.lua b/Clowns-Extended-Minerals/prototypes/pyanodon_updates.lua index 4475178..ff47c93 100644 --- a/Clowns-Extended-Minerals/prototypes/pyanodon_updates.lua +++ b/Clowns-Extended-Minerals/prototypes/pyanodon_updates.lua @@ -9,7 +9,7 @@ if mods["pycoalprocessing"] then { name = "clowns-crushed-mix7-processing", results = {{"!!"},{type = "item", name = "raw-borax", amount = special_vanilla and 6 or 9}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("raw-borax", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -24,7 +24,7 @@ if mods["pycoalprocessing"] then { name = "clowns-chunk-mix7-processing", results = {{"!!"},{type = "item", name = "nexelit-ore", amount = 8}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("nexelit-ore", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -40,7 +40,7 @@ if mods["pycoalprocessing"] then { name = "clowns-chunk-mix8-processing", results = {{"!!"},{type = "item", name = "niobium-ore", amount = 8}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("niobium-ore", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -56,7 +56,7 @@ if mods["pycoalprocessing"] then { name = "clowns-chunk-mix9-processing", results = {{"!!"},{type = "item", name = "rare-earth-dust", amount = 8}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("rare-earth-dust", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -113,7 +113,7 @@ if mods["pycoalprocessing"] then { name = "clowns-crystal-mix6-processing", results = {{"!!"},{type = "item", name = "molybdenum-ore", amount = special_vanilla and 4 or 5}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("molybdenum-ore", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -127,7 +127,7 @@ if mods["pycoalprocessing"] then { name = "clowns-crystal-mix7-processing", results = {{"!!"},{type = "item", name = "regolite-rock", amount = special_vanilla and 4 or 5}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("regolite-rock", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { @@ -141,7 +141,7 @@ if mods["pycoalprocessing"] then { name = "clowns-pure-mix6-processing", results = {{"!!"},{type = "item", name = "kimberlite-rock", amount = 5}}, - icons = {{icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + icons = {{icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, clowns.tables.tweaked_icon_lookup("kimberlite-rock", 0.5, {10, 10}), {icon = "__Clowns-Processing__/graphics/icons/advsorting-overlay.png"}}, ingredients = special_vanilla and { diff --git a/Clowns-Extended-Minerals/prototypes/recipes/liquification.lua b/Clowns-Extended-Minerals/prototypes/recipes/liquification.lua index a1a0360..fbda73c 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/liquification.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/liquification.lua @@ -3,8 +3,8 @@ data:extend( { type = "recipe", name = "clowns-resource2-liquification", - category = "liquifying", - subgroup = "petrochem-carbon-oil-feed", + category = "angels-liquifying", + subgroup = "angels-petrochem-carbon-oil-feed", enabled = false, energy_required = 2, ingredients = @@ -14,7 +14,7 @@ data:extend( }, results= { - {type="item", name="solid-oil-residual", amount=1}, + {type="item", name="angels-solid-oil-residual", amount=1}, {type="fluid", name="crude-oil", amount=10} }, icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-resource2.png", diff --git a/Clowns-Extended-Minerals/prototypes/recipes/mining.lua b/Clowns-Extended-Minerals/prototypes/recipes/mining.lua index bb44965..cdc0b83 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/mining.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/mining.lua @@ -8,7 +8,7 @@ data:extend( name = "limestone-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/solid-limestone.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-limestone.png", icon_size = 32, ingredients = {}, results = @@ -59,7 +59,7 @@ data:extend( name = "angels-ore1-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore1.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore1.png", icon_size = 32, ingredients = {}, results = @@ -77,7 +77,7 @@ data:extend( name = "angels-ore2-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore2.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore2.png", icon_size = 32, ingredients = {}, results = @@ -95,7 +95,7 @@ data:extend( name = "angels-ore3-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore3.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore3.png", icon_size = 32, ingredients = {}, results = @@ -113,7 +113,7 @@ data:extend( name = "angels-ore4-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore4.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore4.png", icon_size = 32, ingredients = {}, results = @@ -131,7 +131,7 @@ data:extend( name = "angels-ore5-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore5.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore5.png", icon_size = 32, ingredients = {}, results = @@ -149,7 +149,7 @@ data:extend( name = "angels-ore6-mining", category = "shaft-mining", hidden = false, - icon = "__angelsrefining__/graphics/icons/angels-ore6.png", + icon = "__angelsrefininggraphics__/graphics/icons/angels-ore6.png", icon_size = 32, ingredients = {}, results = diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua index a0baff6..cd84df6 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua @@ -1,32 +1,32 @@ --build basic table local ore_table = clowns.tables.ores local ore_material = { - ["clowns-ore1"] = {order = "a", acid = "liquid-sulfuric-acid", geode="purple"}, - ["clowns-ore2"] = {order = "b", acid = "liquid-sulfuric-acid", geode="lightgreen"}, - ["clowns-ore3"] = {order = "c", acid = "liquid-sulfuric-acid", geode="red"}, - ["clowns-ore4"] = {order = "d", acid = "liquid-sulfuric-acid", geode="lightgreen"}, - ["clowns-ore5"] = {order = "e", acid = "liquid-sulfuric-acid", geode="yellow"}, - ["clowns-ore6"] = {order = "f", acid = "liquid-sulfuric-acid", geode="cyan"}, - ["clowns-ore7"] = {order = "g", acid = "liquid-sulfuric-acid", geode="blue"}, - ["clowns-ore8"] = {order = "h", acid = "liquid-sulfuric-acid", geode="lightgreen"}, - ["clowns-ore9"] = {order = "i", acid = "liquid-sulfuric-acid", geode="cyan"}, + ["clowns-ore1"] = {order = "a", acid = "angels-liquid-sulfuric-acid", geode="purple"}, + ["clowns-ore2"] = {order = "b", acid = "angels-liquid-sulfuric-acid", geode="lightgreen"}, + ["clowns-ore3"] = {order = "c", acid = "angels-liquid-sulfuric-acid", geode="red"}, + ["clowns-ore4"] = {order = "d", acid = "angels-liquid-sulfuric-acid", geode="lightgreen"}, + ["clowns-ore5"] = {order = "e", acid = "angels-liquid-sulfuric-acid", geode="yellow"}, + ["clowns-ore6"] = {order = "f", acid = "angels-liquid-sulfuric-acid", geode="cyan"}, + ["clowns-ore7"] = {order = "g", acid = "angels-liquid-sulfuric-acid", geode="blue"}, + ["clowns-ore8"] = {order = "h", acid = "angels-liquid-sulfuric-acid", geode="lightgreen"}, + ["clowns-ore9"] = {order = "i", acid = "angels-liquid-sulfuric-acid", geode="cyan"}, } local acid_wastewater = { - ["liquid-sulfuric-acid"] = "water-yellow-waste", - ["liquid-hydrofluoric-acid"] = "water-greenyellow-waste", - ["liquid-nitric-acid"] = "water-red-waste", - ["liquid-hydrochloric-acid"] = "water-green-waste", + ["angels-liquid-sulfuric-acid"] = "angels-water-yellow-waste", + ["angels-liquid-hydrofluoric-acid"] = "angels-water-greenyellow-waste", + ["angels-liquid-nitric-acid"] = "angels-water-red-waste", + ["angels-liquid-hydrochloric-acid"] = "angels-water-green-waste", ["liquid-boric-acid"] = "", --currently no wastewater - ["liquid-phosphoric-acid"] = "water-yellow-waste", --currently no wastewater + ["liquid-phosphoric-acid"] = "angels-water-yellow-waste", --currently no wastewater } --check if angels setting is active and modify acids if mods["angelspetrochem"] and settings.startup["angels-enable-acids"].value then - ore_material["clowns-ore1"].acid = "liquid-hydrofluoric-acid" - ore_material["clowns-ore3"].acid = "liquid-nitric-acid" - ore_material["clowns-ore4"].acid = "liquid-hydrochloric-acid" - ore_material["clowns-ore5"].acid = "liquid-nitric-acid" - ore_material["clowns-ore7"].acid = "liquid-hydrofluoric-acid" - ore_material["clowns-ore8"].acid = "liquid-hydrochloric-acid" + ore_material["clowns-ore1"].acid = "angels-liquid-hydrofluoric-acid" + ore_material["clowns-ore3"].acid = "angels-liquid-nitric-acid" + ore_material["clowns-ore4"].acid = "angels-liquid-hydrochloric-acid" + ore_material["clowns-ore5"].acid = "angels-liquid-nitric-acid" + ore_material["clowns-ore7"].acid = "angels-liquid-hydrofluoric-acid" + ore_material["clowns-ore8"].acid = "angels-liquid-hydrochloric-acid" ore_material["clowns-ore9"].acid = "liquid-phosphoric-acid" end for _, ore in pairs(ore_table) do @@ -37,7 +37,7 @@ for _, ore in pairs(ore_table) do type = "recipe", name = ore.."-crushed", localised_name = {"recipe-name.clowns-mix",{"entity-name."..ore},"Crushing"}, - category = "ore-refining-t1", + category = "angels-ore-refining-t1", subgroup = "clowns-ore-processing-a", energy_required = 1, enabled = false, @@ -46,7 +46,7 @@ for _, ore in pairs(ore_table) do results= { {type = "item", name = ore.."-crushed", amount = 2}, - {type = "item", name = "stone-crushed", amount = 1} + {type = "item", name = "angels-stone-crushed", amount = 1} }, icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/crushed.png", icon_size = 32, @@ -57,20 +57,20 @@ for _, ore in pairs(ore_table) do type = "recipe", name = ore.."-chunk", localised_name = {"recipe-name.clowns-mix",{"entity-name."..ore},"Hydro Refining"}, - category = "ore-refining-t2",--t2 + category = "angels-ore-refining-t2",--t2 subgroup = "clowns-ore-processing-b", energy_required = 2, enabled = false, ingredients = { {type = "item", name = ore.."-crushed", amount = 2}, - {type = "fluid", name = "water-purified", amount = 50}, + {type = "fluid", name = "angels-water-purified", amount = 50}, }, results= { {type = "item", name = ore.."-chunk", amount = 2}, {type = "fluid", name = acid_wastewater[ore_material[ore].acid], amount = 50}, - {type = "item", name = "geode-"..ore_material[ore].geode, amount = 1, probability = 0.5}, + {type = "item", name = "angels-geode-"..ore_material[ore].geode, amount = 1, probability = 0.5}, }, icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/chunk.png", icon_size = 32, @@ -80,7 +80,7 @@ for _, ore in pairs(ore_table) do { type = "recipe", name = ore.."-crystal", - category = "ore-refining-t3", --t3 + category = "angels-ore-refining-t3", --t3 subgroup = "clowns-ore-processing-c", energy_required = 2, enabled = false, @@ -101,7 +101,7 @@ for _, ore in pairs(ore_table) do { type = "recipe", name = ore.."-pure", - category = "ore-refining-t4", --t4 + category = "angels-ore-refining-t4", --t4 subgroup = "clowns-ore-processing-d", energy_required = 2, enabled = false, diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua index 6cc7f8c..072ec91 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua @@ -4,8 +4,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "manganese-pure-processing", - category = "ore-sorting-2", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-2", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, @@ -14,19 +14,19 @@ if not clowns.special_vanilla then { {type="item", name="clowns-ore6-crushed", amount=2}, {type="item", name="angels-ore2-crushed", amount=2}, - {type="item", name="catalysator-brown", amount=1}, + {type="item", name="angels-catalysator-brown", amount=1}, }, results = { - {type="item", name="manganese-ore", amount=4}, + {type="item", name="angels-manganese-ore", amount=4}, }, icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/ore-manganese.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ore-manganese.png", scale = 0.5, shift = {8, 8}, }, @@ -38,8 +38,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "phosphorus-pure-processing", - category = "ore-sorting", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1, @@ -47,7 +47,7 @@ if not clowns.special_vanilla then { {type="item", name="clowns-ore5-crushed", amount=2}, {type="item", name="angels-ore6-crushed", amount=2}, - {type="item", name="catalysator-brown", amount=1}, + {type="item", name="angels-catalysator-brown", amount=1}, }, results = { @@ -56,12 +56,13 @@ if not clowns.special_vanilla then icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { icon = "__Clowns-Processing__/graphics/icons/phosphorus-ore.png", scale = 0.5, shift = {8, 8}, + icon_size = 32, }, }, @@ -71,8 +72,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "chrome-pure-processing", - category = "ore-sorting-3", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-3", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1.5, @@ -80,21 +81,22 @@ if not clowns.special_vanilla then { {type="item", name="clowns-ore7-crystal", amount=2}, {type="item", name="angels-ore1-crystal", amount=2}, - {type="item", name="catalysator-orange", amount=1}, + {type="item", name="angels-catalysator-orange", amount=1}, }, results = { - {type="item", name="chrome-ore", amount=4}, + {type="item", name="angels-chrome-ore", amount=4}, }, icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/ore-chrome.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ore-chrome.png", scale = 0.5, shift = {8, 8}, + icon_size = 32, }, }, @@ -104,8 +106,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "magnesium-pure-processing", - category = "ore-sorting-2", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-2", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1, @@ -115,7 +117,7 @@ if not clowns.special_vanilla then {type="item", name="clowns-resource1", amount=20}, {type="item",name="angels-ore3-chunk",amount=2}, {type="item",name="angels-ore4-chunk",amount=2}, - {type="item", name="catalysator-green", amount=1}, + {type="item", name="angels-catalysator-green", amount=1}, }, results = { @@ -124,11 +126,12 @@ if not clowns.special_vanilla then icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { icon = "__Clowns-Processing__/graphics/icons/magnesium-ore.png", scale = 0.5, + icon_size = 32, shift = {8, 8}, }, @@ -139,8 +142,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "platinum-pure-processing", - category = "ore-sorting-4", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-4", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1.5, @@ -149,19 +152,19 @@ if not clowns.special_vanilla then {type="item", name="clowns-ore2-pure", amount=2}, {type="item", name="angels-ore4-pure", amount=2}, {type="item", name="angels-ore5-pure", amount=2}, - {type="item", name="catalysator-orange", amount=1}, + {type="item", name="angels-catalysator-orange", amount=1}, }, results = { - {type="item", name="platinum-ore", amount=6}, + {type="item", name="angels-platinum-ore", amount=6}, }, icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { - icon = "__angelssmelting__/graphics/icons/ore-platinum.png", + icon = "__angelssmeltinggraphics__/graphics/icons/ore-platinum.png", scale = 0.5, shift = {8, 8}, }, @@ -173,8 +176,8 @@ if not clowns.special_vanilla then { type = "recipe", name = "osmium-pure-processing", - category = "ore-sorting-4", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-4", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1.5, @@ -183,7 +186,7 @@ if not clowns.special_vanilla then {type="item", name="clowns-ore1-pure", amount=2}, {type="item", name="angels-ore1-pure", amount=2}, {type="item", name="angels-ore4-pure", amount=2}, - {type="item", name="catalysator-orange", amount=1}, + {type="item", name="angels-catalysator-orange", amount=1}, }, results = { @@ -192,7 +195,7 @@ if not clowns.special_vanilla then icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { icon = "__Clowns-Processing__/graphics/icons/osmium-ore.png", @@ -214,8 +217,8 @@ if mods["Clowns-AngelBob-Nuclear"] then { type = "recipe", name = "thorium-pure-processing", - category = "ore-sorting-4", - subgroup = "ore-sorting-advanced", + category = "angels-ore-sorting-4", + subgroup = "angels-ore-sorting-advanced", allow_decomposition = false, enabled = false, energy_required = 1.5, @@ -224,16 +227,16 @@ if mods["Clowns-AngelBob-Nuclear"] then {type="item", name="clowns-ore3-crystal", amount=2}, {type="item", name="angels-ore2-crystal", amount=2}, {type="item", name="angels-ore5-crystal", amount=2}, - {type="item", name="catalysator-orange", amount=1} + {type="item", name="angels-catalysator-orange", amount=1} }, results = { - {type="item", name="thorium-ore", amount=3} + {type="item", name="angels-thorium-ore", amount=3} }, icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { icon = "__Clowns-Nuclear__/graphics/icons/ore-5.png", diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua index 292642c..498592b 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua @@ -68,16 +68,16 @@ local create_mixed_sorting = function(num,tier) elseif cat == drum then --add milling drum and spent drum --pretty sure this is done in that other script anyway elseif cat == acid then --(add acid from a lookup table) --pretty sure this is done in that other script anyway else --add catalyser - table.insert(ing_norm, {type = "item", name = "catalysator-"..cat, amount = 1}) + table.insert(ing_norm, {type = "item", name = "angels-catalysator-"..cat, amount = 1}) --table.insert(ing_exp, {type = "item", name = "catalysator-"..cat, amount = 1}) end --create recipe --order setting local n_order="d" - local cat= "ore-sorting-"..tier + local cat= "angels-ore-sorting-"..tier if style=="crushed" then n_order="a" - cat="ore-sorting" + cat="angels-ore-sorting" elseif style=="chunk" then n_order="b" elseif style=="crystal" then @@ -99,7 +99,7 @@ local create_mixed_sorting = function(num,tier) results = {{type = "item", name = "angels-void", amount = 1}}, icons = { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, }, icon_size = 32, order = n_order.."[clowns-" .. style .. "-mix".. num .."-processing]", @@ -124,25 +124,25 @@ data:extend( { type = "item-subgroup", name = "clowns-ore-sorting-1", - group = "resource-refining", + group = "angels-resource-refining", order = "l", }, { type = "item-subgroup", name = "clowns-ore-sorting-2", - group = "resource-refining", + group = "angels-resource-refining", order = "m", }, { type = "item-subgroup", name = "clowns-ore-sorting-3", - group = "resource-refining", + group = "angels-resource-refining", order = "n", }, { type = "item-subgroup", name = "clowns-ore-sorting-4", - group = "resource-refining", + group = "angels-resource-refining", order = "o", } } @@ -156,7 +156,7 @@ local create_adv_mixed_sorting = function(num) { type = "item-subgroup", name = "clowns-ore".. num .. "-refining", - group = "resource-refining", + group = "angels-resource-refining", order = "k-"..num-10, }, @@ -165,7 +165,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-crushed", localised_name = {"recipe-name.clowns-mix","Crushed",{"entity-name.clowns-ore"..num}}, - category = "ore-refining-t1", + category = "angels-ore-refining-t1", subgroup = "clowns-ore".. num .. "-refining", energy_required = 1, enabled = false, @@ -184,7 +184,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-crushed-processing", localised_name = {"recipe-name.clowns-proc","Crushed",{"entity-name.clowns-ore"..num}}, - category = "ore-sorting", + category = "angels-ore-sorting", subgroup = "clowns-ore-sorting-1", energy_required = 1, allow_decomposition = false, @@ -196,8 +196,8 @@ local create_adv_mixed_sorting = function(num) {type = "item", name = "angels-void", amount = 1} }, icons = { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/crushed.png", scale = 0.5, shift = {-10, 10}} + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/crushed.png", icon_size = 32, scale = 0.5, shift = {-10, 10}} }, icon_size = 32, order = "b["..num.."]" @@ -207,17 +207,17 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-powder", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Powder"}, - category = "ore-refining-t1-5",--t-1-5 + category = "angels-ore-refining-t1-5",--t-1-5 subgroup = "clowns-ore".. num .. "-refining", energy_required = 2, enabled = false, ingredients = { {type = "item", name = "clowns-ore"..num.."-crushed", amount = 3}, - {type = "item", name = "milling-drum", amount = 1} + {type = "item", name = "angels-milling-drum-lubricated", amount = 1} }, results = { {type = "item", name = "clowns-ore"..num.."-powder", amount = 3}, - {type = "item", name = "milling-drum-used", amount = 1} + {type = "item", name = "angels-milling-drum", amount = 1} }, main_product = "clowns-ore"..num.."-powder", icon_size = 32, @@ -227,7 +227,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-powder-processing", localised_name = {"recipe-name.clowns-proc",{"entity-name.clowns-ore"..num},"Powder"}, - category = "ore-sorting", + category = "angels-ore-sorting", subgroup = "clowns-ore-sorting-2", energy_required = 1, allow_decomposition = false, @@ -239,8 +239,8 @@ local create_adv_mixed_sorting = function(num) {type = "item", name = "angels-void", amount = 1} }, icons = { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/powder.png", scale = 0.5, shift = {-10, 10}} + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/powder.png", icon_size = 32, scale = 0.5, shift = {-10, 10}} }, icon_size = 32, order = "d["..num.."]" @@ -259,7 +259,7 @@ local create_adv_mixed_sorting = function(num) {type = "item", name = blends[num][1].."-chunk", amount = 1}, {type = "item", name = blends[num][2].."-chunk", amount = 1}, {type = "item", name = blends[num][3].."-chunk", amount = 1}, - {type = "fluid", name = "thermal-water", amount = 20}, + {type = "fluid", name = "angels-thermal-water", amount = 20}, {type = "fluid", name = "sulfuric-acid", amount = 20} }, results = { @@ -272,17 +272,17 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-dust", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Dust"}, - category = "ore-refining-t2",--t2 + category = "angels-ore-refining-t2",--t2 subgroup = "clowns-ore".. num .. "-refining", energy_required = 4, enabled = false, ingredients = { {type = "fluid", name = "clowns-ore"..num.."-sludge", amount = 4}, - {type="item", name="solid-sodium-hydroxide", amount=2} + {type="item", name="angels-solid-sodium-hydroxide", amount=2} }, results = { {type = "item", name = "clowns-ore"..num.."-dust", amount = 4}, - {type = "fluid", name = "water-yellow-waste", amount = 20} + {type = "fluid", name = "angels-water-yellow-waste", amount = 20} }, main_product = "clowns-ore"..num.."-dust", icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/dust.png", @@ -293,7 +293,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-dust-processing", localised_name = {"recipe-name.clowns-proc",{"entity-name.clowns-ore"..num},"Dust"}, - category = "ore-sorting-3", + category = "angels-ore-sorting-3", subgroup = "clowns-ore-sorting-3", energy_required = 1.5, allow_decomposition = false, @@ -305,8 +305,8 @@ local create_adv_mixed_sorting = function(num) {type = "item", name = "angels-void", amount = 1} }, icons = { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/dust.png", scale = 0.5, shift = {-10, 10}} + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/dust.png", icon_size = 32, scale = 0.5, shift = {-10, 10}} }, icon_size = 32, order = "g["..num.."]" @@ -316,7 +316,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-solution", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Solution"}, - category = "ore-refining-t3",--t3 + category = "angels-ore-refining-t3",--t3 subgroup = "clowns-ore".. num .. "-refining", energy_required = 2, enabled = false, @@ -337,19 +337,19 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-anode-sludge-filtering", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Filtering"}, - category = "filtering-2", + category = "angels-filtering-2", subgroup = "clowns-ore".. num .. "-refining", energy_required = 2, enabled = false, ingredients = { {type = "fluid", name = "clowns-ore"..num.."-solution", amount = 60}, - {type = "fluid", name = "water-purified", amount = 50}, - {type = "item", name = "filter-ceramic", amount = 1} + {type = "fluid", name = "angels-water-purified", amount = 50}, + {type = "item", name = "angels-filter-ceramic", amount = 1} }, results = { {type = "fluid", name = "clowns-ore"..num.."-slime", amount = 60}, - {type = "fluid", name = "water-yellow-waste", amount = 10}, - {type = "item", name = "filter-ceramic-used", amount = 1} + {type = "fluid", name = "angels-water-yellow-waste", amount = 10}, + {type = "item", name = "angels-filter-ceramic-used", amount = 1} }, main_product = "clowns-ore"..num.."-slime", icons = angelsmods.functions.create_viscous_liquid_filtering_recipe_icon( @@ -363,18 +363,18 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-anode-sludge", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Sludge"}, - category = "ore-refining-t3-5",--t3-5 + category = "angels-ore-refining-t3-5",--t3-5 subgroup = "clowns-ore".. num .. "-refining", energy_required = 2, enabled = false, ingredients = { {type = "fluid", name = "clowns-ore"..num.."-slime", amount = 60}, - {type="fluid", name="liquid-ferric-chloride-solution", amount=2} --change a few of them to HCl later? + {type="fluid", name="angels-liquid-ferric-chloride-solution", amount=2} --change a few of them to HCl later? }, results = { {type = "fluid", name = "clowns-ore"..num.."-anode-sludge", amount = 60}, - {type = "fluid", name = "water-yellow-waste", amount = 20}, - {type = "item", name = "slag", amount = 1} + {type = "fluid", name = "angels-water-yellow-waste", amount = 20}, + {type = "item", name = "angels-slag", amount = 1} }, main_product = "clowns-ore"..num.."-anode-sludge", icon_size = 32, @@ -384,7 +384,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-crystal", localised_name = {"recipe-name.clowns-mix",{"entity-name.clowns-ore"..num},"Crystal"}, - category = "crystallizing", + category = "angels-crystallizing", subgroup = "clowns-ore".. num .. "-refining", energy_required = 2, enabled = false, @@ -401,7 +401,7 @@ local create_adv_mixed_sorting = function(num) type = "recipe", name = "clownsore"..num.."-crystal-processing", localised_name = {"recipe-name.clowns-proc",{"entity-name.clowns-ore"..num},"Crystal"}, - category = "ore-sorting-4", + category = "angels-ore-sorting-4", subgroup = "clowns-ore-sorting-4", energy_required = 1.5, allow_decomposition = false, @@ -413,8 +413,8 @@ local create_adv_mixed_sorting = function(num) {type = "item", name = "angels-void", amount = 1} }, icons = { - {icon = "__angelsrefining__/graphics/icons/sort-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/crystal.png", scale = 0.5, shift = {-10, 10}} + {icon = "__angelsrefininggraphics__/graphics/icons/sort-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/clowns-ore"..num.."/crystal.png", icon_size = 32, scale = 0.5, shift = {-10, 10}} }, icon_size = 32, order = "l["..num.."]" diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting.lua index 3455912..dcfef18 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting.lua @@ -228,17 +228,17 @@ local create_basic_recipe = function(refinery_product, recipe_base_name, adv) type = "recipe", name = ore.."-crushed-processing", localised_name = {"recipe-name.clowns-refining","Crushed",{"entity-name."..ore}}, - category = "ore-sorting", + category = "angels-ore-sorting", subgroup = "clowns-ore-sorting-t1", allow_decomposition = false, enabled = false, energy_required = 1, ingredients = {{type = "item", name = ore.."-crushed", amount = 4}}, - results = {{type = "item", name = "slag", amount = 1}}, + results = {{type = "item", name = "angels-slag", amount = 1}}, icons = { - {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/crushed.png", scale = 0.5, shift = {-8, 8},} + {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/crushed.png", icon_size = 32, scale = 0.5, shift = {-8, 8},} }, icon_size = 32, order = "a["..ore.."]", @@ -248,17 +248,17 @@ local create_basic_recipe = function(refinery_product, recipe_base_name, adv) type = "recipe", name = ore.."-chunk-processing", localised_name = {"recipe-name.clowns-refining",{"entity-name."..ore},"Chunk"}, - category = "ore-sorting-2", + category = "angels-ore-sorting-2", subgroup = "clowns-ore-sorting-t2", allow_decomposition = false, enabled = false, energy_required = 1.5, ingredients = {{type = "item", name = ore.."-chunk", amount = 6}}, - results= {{type = "item", name = "slag", amount = 1},}, + results= {{type = "item", name = "angels-slag", amount = 1},}, icons = { - {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/chunk.png", scale = 0.5, shift = {-8, 8},} + {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/chunk.png", icon_size = 32, scale = 0.5, shift = {-8, 8},} }, icon_size = 32, order = "a["..ore.."]", @@ -268,17 +268,17 @@ local create_basic_recipe = function(refinery_product, recipe_base_name, adv) type = "recipe", name = ore.."-crystal-processing", localised_name = {"recipe-name.clowns-refining",{"entity-name."..ore},"Crystal"}, - category = "ore-sorting-3", + category = "angels-ore-sorting-3", subgroup = "clowns-ore-sorting-t3", allow_decomposition = false, enabled = false, energy_required = 2, ingredients = {{type = "item", name = ore.."-crystal", amount = 8}}, - results = {{type = "item", name = "slag", amount = 1},}, + results = {{type = "item", name = "angels-slag", amount = 1},}, icons = { - {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/crystal.png", scale = 0.5, shift = {-8, 8},} + {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/crystal.png", icon_size = 32, scale = 0.5, shift = {-8, 8},} }, icon_size = 32, order = "a["..ore.."]", @@ -288,7 +288,7 @@ local create_basic_recipe = function(refinery_product, recipe_base_name, adv) type = "recipe", name = ore.."-pure-processing", localised_name = {"recipe-name.clowns-refining","Purified",{"entity-name."..ore}}, - category = "ore-sorting-4", + category = "angels-ore-sorting-4", subgroup = "clowns-ore-sorting-t4", allow_decomposition = false, enabled = false, @@ -297,8 +297,8 @@ local create_basic_recipe = function(refinery_product, recipe_base_name, adv) results = {{type = "item", name = "angels-void", amount = 1}}, icons = { - {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png"}, - {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/pure.png", scale = 0.5, shift = {-8, 8},} + {icon = "__Clowns-Extended-Minerals__/graphics/icons/sorting-icon.png", icon_size = 32}, + {icon = "__Clowns-Extended-Minerals__/graphics/icons/"..ore.."/pure.png", icon_size = 32, scale = 0.5, shift = {-8, 8},} }, icon_size = 32, order = "a["..ore.."]", @@ -390,7 +390,7 @@ local create_sorting_mix_recipe = function(recipe_base_name, ore_result_products if type(icon_name) == "table" then recipe.icons = icon_name -- maybe improve this? else - recipe.icon = string.format("__angelsrefining__/graphics/icons/%s", icon_name) + recipe.icon = string.format("__angelsrefininggraphics__/graphics/icons/%s", icon_name) end end local ingredients_override = (ingredients_overrides or {})[recipe_index] diff --git a/Clowns-Extended-Minerals/prototypes/recipes/sluicing.lua b/Clowns-Extended-Minerals/prototypes/recipes/sluicing.lua index 1f51ea5..ebc878e 100644 --- a/Clowns-Extended-Minerals/prototypes/recipes/sluicing.lua +++ b/Clowns-Extended-Minerals/prototypes/recipes/sluicing.lua @@ -15,17 +15,17 @@ data:extend( }, results = { - {type="fluid", name="water-saline", amount=10}, + {type="fluid", name="angels-water-saline", amount=10}, {type="item", name="iron-ore", amount=1, probability = 0.2,}, - {type="item", name="tin-ore", amount=1, probability = 0.1,}, - {type="item", name="crystal-dust", amount=1, probability = 0.1,}, - {type="item", name="gold-ore", amount=1, probability = 0.05,}, - {type="item", name="chrome-ore", amount=1, probability = 0.01,}, - {type="item", name="platinum-ore", amount=1, probability = 0.01,} + {type="item", name="bob-tin-ore", amount=1, probability = 0.1,}, + {type="item", name="angels-crystal-dust", amount=1, probability = 0.1,}, + {type="item", name="angels-gold-ore", amount=1, probability = 0.05,}, + {type="item", name="angels-chrome-ore", amount=1, probability = 0.01,}, + {type="item", name="angels-platinum-ore", amount=1, probability = 0.01,} --Rare earth metals, zirconium }, energy_required = 5, - subgroup = "water-washing", + subgroup = "angels-water-washing", order = "k-b-a", }, @@ -43,16 +43,16 @@ data:extend( }, results = { - {type="fluid", name="water-saline", amount=10}, - {type="item", name="gold-ore", amount=1, probability = 0.1,}, - {type="item", name="chrome-ore", amount=1, probability = 0.03,}, - {type="item", name="rutile-ore", amount=1, probability = 0.03,}, - {type="item", name="platinum-ore", amount=1, probability = 0.03,}, + {type="fluid", name="angels-water-saline", amount=10}, + {type="item", name="bob-gold-ore", amount=1, probability = 0.1,}, + {type="item", name="angels-chrome-ore", amount=1, probability = 0.03,}, + {type="item", name="bob-rutile-ore", amount=1, probability = 0.03,}, + {type="item", name="angels-platinum-ore", amount=1, probability = 0.03,}, {type="item", name="uranium-ore", amount=1, probability = 0.01,}, - {type="item", name="thorium-ore", amount=1, probability = 0.01,}, + {type="item", name="angels-thorium-ore", amount=1, probability = 0.01,}, }, energy_required = 5, - subgroup = "water-washing", + subgroup = "angels-water-washing", order = "k-b-b", } } diff --git a/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua b/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua index 39010d8..6fd8c22 100644 --- a/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua +++ b/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua @@ -30,9 +30,9 @@ data:extend( type = "technology", name = "clowns-ore-crushing", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/mechanical-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/mechanical-refining.png", effects = crushing_eff, - prerequisites = {"ore-crushing"}, + prerequisites = {"angels-ore-crushing"}, unit = { ingredients = @@ -48,9 +48,9 @@ data:extend( type = "technology", name = "clowns-ore-floatation", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/hydro-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/hydro-refining.png", effects = flotation_eff, - prerequisites = {"ore-floatation", "clowns-ore-crushing"}, + prerequisites = {"angels-ore-floatation", "clowns-ore-crushing"}, unit = { ingredients = @@ -67,9 +67,9 @@ data:extend( type = "technology", name = "clowns-ore-leaching", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/chemical-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/chemical-refining.png", effects = leeching_eff, - prerequisites = {"ore-leaching", "clowns-ore-floatation"}, + prerequisites = {"angels-ore-leaching", "clowns-ore-floatation"}, unit = { ingredients = @@ -87,9 +87,9 @@ data:extend( type = "technology", name = "clowns-ore-refining", icon_size = 256, - icon = "__angelsrefining__/graphics/technology/thermal-refining.png", + icon = "__angelsrefininggraphics__/graphics/technology/thermal-refining.png", effects = refining_eff, - prerequisites = {"ore-refining", "clowns-ore-leaching"}, + prerequisites = {"angels-ore-refining", "clowns-ore-leaching"}, unit = { ingredients = @@ -119,18 +119,18 @@ end --add in advanced ore stuffs if not clowns.special_vanilla then for i=11,15,1 do - table.insert(data.raw.technology["ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed"}) - table.insert(data.raw.technology["ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed-processing"}) - table.insert(data.raw.technology["ore-powderizer"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-powder"}) - table.insert(data.raw.technology["ore-powderizer"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-powder-processing"}) - table.insert(data.raw.technology["ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-sludge"}) - table.insert(data.raw.technology["ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-dust"}) - table.insert(data.raw.technology["ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-dust-processing"}) - table.insert(data.raw.technology["ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-solution"}) - table.insert(data.raw.technology["ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-anode-sludge-filtering"}) - table.insert(data.raw.technology["ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-anode-sludge"}) - table.insert(data.raw.technology["ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crystal"}) - table.insert(data.raw.technology["ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crystal-processing"}) + table.insert(data.raw.technology["angels-ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed"}) + table.insert(data.raw.technology["angels-ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed-processing"}) + table.insert(data.raw.technology["angels-ore-powderizer"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-powder"}) + table.insert(data.raw.technology["angels-ore-powderizer"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-powder-processing"}) + table.insert(data.raw.technology["angels-ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-sludge"}) + table.insert(data.raw.technology["angels-ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-dust"}) + table.insert(data.raw.technology["angels-ore-advanced-floatation"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-dust-processing"}) + table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-solution"}) + table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-anode-sludge-filtering"}) + table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-anode-sludge"}) + table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crystal"}) + table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crystal-processing"}) end else --special vanilla case --table.insert(data.raw.technology["ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed"}) diff --git a/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua b/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua index 36dbaa8..b050ece 100644 --- a/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua +++ b/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua @@ -5,7 +5,7 @@ if not clowns.special_vanilla then type = "technology", name = "water-washing-3", icon_size = 128, - icon = "__angelsrefining__/graphics/technology/washing-plant-tech.png", + icon = "__angelsrefininggraphics__/graphics/technology/washing-plant-tech.png", effects = { { @@ -13,7 +13,7 @@ if not clowns.special_vanilla then recipe = "clowns-resource1-sluicing-advanced" }, }, - prerequisites = {"water-washing-2"}, + prerequisites = {"angels-water-washing-2"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/buildings/centrifuge.lua b/Clowns-Processing/prototypes/buildings/centrifuge.lua index eb0b4fc..dfa8bb1 100644 --- a/Clowns-Processing/prototypes/buildings/centrifuge.lua +++ b/Clowns-Processing/prototypes/buildings/centrifuge.lua @@ -54,14 +54,14 @@ if settings.startup["MCP_enable_centrifuges"].value then {type = "item", name = "processing-unit", amount = 100} } if data.raw.item["titanium-plate"] then - ings_2[#ings_2+1] = {type = "item", name = "titanium-plate", amount = 50} + ings_2[#ings_2+1] = {type = "item", name = "bob-titanium-plate", amount = 50} else --vanilla materials ings_2[#ings_2+1] = {type = "item", name = "steel-plate", amount = 200} end if data.raw.item["titanium-gear-wheel"] then - ings_2[#ings_2+1] = {type = "item", name = "titanium-gear-wheel", amount = 100} + ings_2[#ings_2+1] = {type = "item", name = "bob-titanium-gear-wheel", amount = 100} else --vanilla materials - ings_2[#ings_2+1] = {type = "item", name = "concrete-brick", amount = 200} + ings_2[#ings_2+1] = {type = "item", name = "angels-concrete-brick", amount = 200} end centrifuge_2r.ingredients = ings_2 @@ -80,8 +80,8 @@ if settings.startup["MCP_enable_centrifuges"].value then { {type = "item", name = "centrifuge-mk2", amount = 1} } - if data.raw.item["advanced-processing-unit"] then - ings_3[#ings_3+1]= {type="item", name="advanced-processing-unit", amount=100} + if data.raw.item["bobadvanced-processing-unit"] then + ings_3[#ings_3+1]= {type="item", name="bob-advanced-processing-unit", amount=100} else ings_3[#ings_3+1] = {type = "item", name = "processing-unit", amount = 200} end @@ -90,7 +90,7 @@ if settings.startup["MCP_enable_centrifuges"].value then ings_3[#ings_3+1] = {type = "item", name = "bob-tungsten-gear-wheel", amount = 100} elseif data.raw.item["angels-tungsten-plate"] then ings_3[#ings_3+1] = {type = "item", name = "angels-tungsten-plate", amount = 200} - ings_3[#ings_3+1] = {type = "item", name = "concrete-brick", amount = 300} + ings_3[#ings_3+1] = {type = "item", name = "angels-concrete-brick", amount = 300} else --vanilla materials ings_3[#ings_3+1] = {type = "item", name = "steel-plate", amount = 300} ings_3[#ings_3+1] = {type = "item", name = "concrete", amount = 300} diff --git a/Clowns-Processing/prototypes/buildings/sluicer.lua b/Clowns-Processing/prototypes/buildings/sluicer.lua index 62d39fc..85baa8b 100644 --- a/Clowns-Processing/prototypes/buildings/sluicer.lua +++ b/Clowns-Processing/prototypes/buildings/sluicer.lua @@ -26,7 +26,7 @@ data:extend( } }, 1, angelsmods.refining.number_tint), - subgroup = "washing-building", + subgroup = "angels-washing-building", order = "c-a", place_result = "sluicer", stack_size = 20, @@ -153,7 +153,7 @@ data:extend( } }, 2, angelsmods.refining.number_tint), - subgroup = "washing-building", + subgroup = "angels-washing-building", order = "c-a", place_result = "sluicer-2", stack_size = 20, diff --git a/Clowns-Processing/prototypes/categories.lua b/Clowns-Processing/prototypes/categories.lua index 726bf10..570fc36 100644 --- a/Clowns-Processing/prototypes/categories.lua +++ b/Clowns-Processing/prototypes/categories.lua @@ -192,7 +192,7 @@ data:extend( { type = "item-subgroup", name = "bio-processing-violet", - group = mods["angelsbioprocessing"] and "bio-processing-nauvis" or "resource-refining", + group = mods["angelsbioprocessing"] and "angels-bio-processing-nauvis" or "angels-resource-refining", order = "d-a", --should be after blue algae }, { @@ -246,13 +246,13 @@ data:extend( { type = "item-subgroup", name = "clowns-electrolysis", - group = "petrochem-refining", + group = "angels-petrochem-refining", order = "caa", }, { type = "item-subgroup", name = "clown-ores", - group = "resource-refining", + group = "angels-resource-refining", order = "ac", }, } diff --git a/Clowns-Processing/prototypes/items/angels-bioprocessing.lua b/Clowns-Processing/prototypes/items/angels-bioprocessing.lua index 4fabb2b..7118d7d 100644 --- a/Clowns-Processing/prototypes/items/angels-bioprocessing.lua +++ b/Clowns-Processing/prototypes/items/angels-bioprocessing.lua @@ -4,7 +4,7 @@ if mods["angelsbioprocessing"] then --this path is currently incomplete. --[[{ type = "item", name = "algae-orange", - icon = "__angelsbioprocessing__/graphics/icons/algae-brown.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/algae-brown.png", icon_size = 32, subgroup = "bio-processing-brown", order = "a", @@ -13,7 +13,7 @@ if mods["angelsbioprocessing"] then --this path is currently incomplete. { type = "item", name = "algae-violet", - icons = {{icon="__angelsbioprocessing__/graphics/icons/algae-brown.png",tint={127,0,255}, icon_size = 32}}, + icons = {{icon="__angelsbioprocessinggraphics__/graphics/icons/algae-brown.png",tint={127,0,255}, icon_size = 32}}, subgroup = "bio-processing-violet", order = "a", stack_size = 200 diff --git a/Clowns-Processing/prototypes/items/vanilla-items.lua b/Clowns-Processing/prototypes/items/vanilla-items.lua index 708cfa4..b53077e 100644 --- a/Clowns-Processing/prototypes/items/vanilla-items.lua +++ b/Clowns-Processing/prototypes/items/vanilla-items.lua @@ -6,7 +6,7 @@ data:extend( name = "catalyst-metal-violet", icon = "__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png", icon_size = 32, - subgroup = "petrochem-catalysts", + subgroup = "angels-petrochem-catalysts", order = "f", stack_size = 200 }, diff --git a/Clowns-Processing/prototypes/overrides.lua b/Clowns-Processing/prototypes/overrides.lua index 94f0ca2..dfb41de 100644 --- a/Clowns-Processing/prototypes/overrides.lua +++ b/Clowns-Processing/prototypes/overrides.lua @@ -210,17 +210,17 @@ else end --update aluminium if angelsmods.trigger.smelting_products["aluminium"].plate then - data.raw.recipe["molten-aluminium-smelting-3"].order = "i[liquid-molten-aluminium]-d" - data.raw.recipe["molten-aluminium-smelting-3"].icons = angelsmods.functions.add_number_icon_layer( + data.raw.recipe["angels-liquid-molten-aluminium-3"].order = "i[liquid-molten-aluminium]-d" + data.raw.recipe["angels-liquid-molten-aluminium-3"].icons = angelsmods.functions.add_number_icon_layer( angelsmods.functions.get_object_icons("liquid-molten-aluminium"), 4, angelsmods.smelting.number_tint) end --update titanium sponge if angelsmods.trigger.smelting_products["titanium"].plate then - data.raw.recipe["liquid-titanium-tetrachloride-smelting"].icons = angelsmods.functions.add_number_icon_layer( - {{icon = "__angelssmelting__/graphics/icons/sponge-titanium.png", icon_size = 32}}, + data.raw.recipe["angels-liquid-titanium-tetrachloride"].icons = angelsmods.functions.add_number_icon_layer( + {{icon = "__angelssmeltinggraphics__/graphics/icons/sponge-titanium.png", icon_size = 32}}, 1, angelsmods.smelting.number_tint) data.raw.recipe["sponge-magnesium-titanium-smelting"].icons = angelsmods.functions.add_number_icon_layer( - {{icon = "__angelssmelting__/graphics/icons/sponge-titanium.png", icon_size = 32}}, + {{icon = "__angelssmeltinggraphics__/graphics/icons/sponge-titanium.png", icon_size = 32}}, 2, angelsmods.smelting.number_tint) end \ No newline at end of file diff --git a/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua b/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua index ae1857c..c632ee5 100644 --- a/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua +++ b/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua @@ -21,7 +21,7 @@ if mods["angelsbioprocessing"] then { {type="item", name="algae-orange", amount=40}, }, - icon = "__angelsbioprocessing__/graphics/icons/algae-green.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/algae-green.png", icon_size = 32, order = "a", },]] @@ -29,14 +29,14 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "algae-violet", - category = "bio-processing-4", + category = "angels-bio-processing-4", subgroup = "bio-processing-violet", enabled = false, energy_required = 20, ingredients = { - {type="fluid", name="water-mineralized", amount=100}, - {type="fluid", name="gas-carbon-dioxide", amount=100} + {type="fluid", name="angels-water-mineralized", amount=100}, + {type="fluid", name="angels-gas-carbon-dioxide", amount=100} }, results= { @@ -48,7 +48,7 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "methylmercury-algae", - category = "liquifying", + category = "angels-liquifying", subgroup = "bio-processing-violet", enabled = false, energy_required = 3, @@ -73,22 +73,22 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "swamp-garden-generation", - icon = "__angelsbioprocessing__/graphics/icons/swamp-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/swamp-garden.png", icon_size = 32, - category = "swamp-farming", - subgroup = "farming-swamp-seed", + category = "angels-swamp-farming", + subgroup = "angels-farming-swamp-seed", order = "g[temperate-garden-generation]-c", energy_required = 600, enabled = false, ingredients = { - {type = "item", name = "solid-soil", amount = 1000}, - {type = "fluid", name = "water-viscous-mud", amount = 1000}, - {type = "item", name = "solid-fertilizer", amount = 200} + {type = "item", name = "angels-solid-soil", amount = 1000}, + {type = "fluid", name = "angels-water-viscous-mud", amount = 1000}, + {type = "item", name = "angels-solid-fertilizer", amount = 200} }, results = { - {type = "item", name = "swamp-garden", amount = 1} + {type = "item", name = "angels-swamp-garden", amount = 1} }, }, @@ -96,21 +96,21 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "temperate-garden-generation", - category = "temperate-farming", - subgroup = "farming-temperate-seed", + category = "angels-temperate-farming", + subgroup = "angels-farming-temperate-seed", enabled = false, energy_required = 1000, ingredients = { - {type = "item", name = "solid-compost", amount = 500}, + {type = "item", name = "angels-solid-compost", amount = 500}, {type = "fluid", name = "water", amount = 1000}, - {type = "item", name = "solid-fertilizer", amount = 500} + {type = "item", name = "angels-solid-fertilizer", amount = 500} }, results= { - {type = "item", name = "temperate-garden", amount = 1} + {type = "item", name = "angels-temperate-garden", amount = 1} }, - icon = "__angelsbioprocessing__/graphics/icons/temperate-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/temperate-garden.png", icon_size = 32, order = "g[temperate-garden-generation]-c", }, @@ -118,21 +118,21 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "desert-garden-generation", - category = "desert-farming", - subgroup = "farming-desert-seed", + category = "angels-desert-farming", + subgroup = "angels-farming-desert-seed", enabled = false, energy_required = 1000, ingredients = { - {type = "item", name = "solid-sand", amount = 500}, - {type = "fluid", name = "water-saline", amount = 1000}, - {type = "item", name = "solid-fertilizer", amount = 500} + {type = "item", name = "angels-solid-sand", amount = 500}, + {type = "fluid", name = "angels-water-saline", amount = 1000}, + {type = "item", name = "angels-solid-fertilizer", amount = 500} }, results= { - {type = "item", name = "desert-garden", amount = 1} + {type = "item", name = "angels-desert-garden", amount = 1} }, - icon = "__angelsbioprocessing__/graphics/icons/desert-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/desert-garden.png", icon_size = 32, order = "g[temperate-garden-generation]-c", }, @@ -140,21 +140,21 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "temperate-garden-mutation", - category = "seed-extractor", - subgroup = "farming-temperate-seed", + category = "angels-seed-extractor", + subgroup = "angels-farming-temperate-seed", enabled = false, energy_required = 600, ingredients = { - {type = "item", name = "desert-garden", amount = 1}, - {type = "item", name = "swamp-garden", amount = 1}, + {type = "item", name = "angels-desert-garden", amount = 1}, + {type = "item", name = "angels-swamp-garden", amount = 1}, {type = "item", name = "uranium-235", amount = 1}, }, results= { - {type = "item", name = "temperate-garden", amount = 1} + {type = "item", name = "angels-temperate-garden", amount = 1} }, - icon = "__angelsbioprocessing__/graphics/icons/temperate-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/temperate-garden.png", icon_size = 32, order = "mc", }, @@ -162,21 +162,21 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "desert-garden-mutation", - category = "seed-extractor", - subgroup = "farming-desert-seed", + category = "angels-seed-extractor", + subgroup = "angels-farming-desert-seed", enabled = false, energy_required = 600, ingredients = { - {type = "item", name = "temperate-garden", amount = 1}, - {type = "item", name = "swamp-garden", amount = 1}, + {type = "item", name = "angels-temperate-garden", amount = 1}, + {type = "item", name = "angels-swamp-garden", amount = 1}, {type = "item", name = "uranium-235", amount = 1}, }, results= { - {type = "item", name = "desert-garden", amount = 1} + {type = "item", name = "angels-desert-garden", amount = 1} }, - icon = "__angelsbioprocessing__/graphics/icons/desert-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/desert-garden.png", icon_size = 32, order = "mc", }, @@ -184,21 +184,21 @@ if mods["angelsbioprocessing"] then { type = "recipe", name = "swamp-garden-mutation", - category = "seed-extractor", - subgroup = "farming-swamp-seed", + category = "angels-seed-extractor", + subgroup = "angels-farming-swamp-seed", enabled = false, energy_required = 600, ingredients = { - {type = "item", name = "desert-garden", amount = 1}, - {type = "item", name = "temperate-garden", amount = 1}, + {type = "item", name = "angels-desert-garden", amount = 1}, + {type = "item", name = "angels-temperate-garden", amount = 1}, {type = "item", name = "uranium-235", amount = 1}, }, results= { - {type = "item", name = "swamp-garden", amount = 1} + {type = "item", name = "angels-swamp-garden", amount = 1} }, - icon = "__angelsbioprocessing__/graphics/icons/swamp-garden.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/swamp-garden.png", icon_size = 32, order = "mc", }, @@ -208,7 +208,7 @@ if mods["angelsbioprocessing"] then name = "diammonium-phosphate-fertilizer", icons = { { - icon = "__angelsbioprocessing__/graphics/icons/solid-fertilizer.png", + icon = "__angelsbioprocessinggraphics__/graphics/icons/solid-fertilizer.png", icon_size = 32, icon_mipmaps = 1 }, { @@ -225,11 +225,11 @@ if mods["angelsbioprocessing"] then ingredients = { {type="fluid", name="liquid-phosphoric-acid", amount=10}, - {type="fluid", name="gas-ammonia", amount=10}, + {type="fluid", name="angels-gas-ammonia", amount=10}, }, results = { - {type="item", name="solid-fertilizer", amount=1} + {type="item", name="angels-solid-fertilizer", amount=1} }, }, }) diff --git a/Clowns-Processing/prototypes/recipes/angels-smelting.lua b/Clowns-Processing/prototypes/recipes/angels-smelting.lua index 376261b..60be071 100644 --- a/Clowns-Processing/prototypes/recipes/angels-smelting.lua +++ b/Clowns-Processing/prototypes/recipes/angels-smelting.lua @@ -9,50 +9,50 @@ if mods["bobplates"] or (mods["angelsindustries"] and angelsmods.industries.over { type = "recipe", name = "molten-iron-smelting-6", - category = "induction-smelting", + category = "angels-induction-smelting", subgroup = "angels-iron-casting", energy_required = 4, enabled = false, ingredients = { - {type="item", name="ingot-iron", amount=12}, + {type="item", name="angels-ingot-iron", amount=12}, {type="item", name="ingot-magnesium", amount=12}, - {type="item", name="ingot-manganese", amount=12}, + {type="item", name="angels-ingot-manganese", amount=12}, }, results= { - {type="fluid", name="liquid-molten-iron", amount=360}, + {type="fluid", name="angels-liquid-molten-iron", amount=360}, }, icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("liquid-molten-iron"), + angelsmods.functions.get_object_icons("angels-liquid-molten-iron"), 6, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-f", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-iron"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-liquid-molten-iron"), } else --include a magnesium sink for vanilla cases recipe[#recipe+1]= { type = "recipe", name = "molten-steel-smelting-c2", - category = "induction-smelting-2", + category = "angels-induction-smelting-2", subgroup = "angels-steel-casting", energy_required = 4, enabled = false, ingredients = { - {type="item", name="ingot-steel", amount=12}, + {type="item", name="angels-ingot-steel", amount=12}, {type="item", name="ingot-magnesium", amount=12}, {type="item", name="solid-white-phosphorus", amount=12}, }, results= { - {type="fluid", name="liquid-molten-steel", amount=360}, + {type="fluid", name="angels-liquid-molten-steel", amount=360}, }, icons =angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("liquid-molten-steel"), + angelsmods.functions.get_object_icons("angels-liquid-molten-steel"), 2, angelsmods.smelting.number_tint), order = "i[liquid-molten-iron]-b", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-steel"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-liquid-molten-steel"), } end @@ -62,49 +62,49 @@ if angelsmods.trigger.smelting_products["aluminium"].plate then { type = "recipe", name = "molten-aluminium-smelting-4", - category = "induction-smelting", + category = "angels-induction-smelting", subgroup = "angels-aluminium-casting", energy_required = 4, enabled = false, ingredients = { - {type="item", name="ingot-aluminium", amount=12}, + {type="item", name="angels-ingot-aluminium", amount=12}, {type="item", name="ingot-magnesium", amount=12} }, results= { - {type="fluid", name="liquid-molten-aluminium", amount=240}, + {type="fluid", name="angels-liquid-molten-aluminium", amount=240}, }, icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + angelsmods.functions.get_object_icons("angels-liquid-molten-aluminium"), 3, angelsmods.smelting.number_tint), order = "i[liquid-molten-aluminium]-c", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-liquid-molten-aluminium"), } if angelsmods.trigger.smelting_products["zinc"].plate then recipe[#recipe+1]= { type = "recipe", name = "molten-aluminium-smelting-5", - category = "induction-smelting", + category = "angels-induction-smelting", subgroup = "angels-aluminium-casting", energy_required = 4, enabled = false, ingredients = { - {type="item", name="ingot-aluminium", amount=12}, + {type="item", name="angels-ingot-aluminium", amount=12}, {type="item", name="ingot-magnesium", amount=12}, - {type="item", name="ingot-zinc", amount=12}, + {type="item", name="angels-ingot-zinc", amount=12}, }, results= { - {type="fluid", name="liquid-molten-aluminium", amount=360}, + {type="fluid", name="angels-liquid-molten-aluminium", amount=360}, }, icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("liquid-molten-aluminium"), + angelsmods.functions.get_object_icons("angels-liquid-molten-aluminium"), 5, angelsmods.smelting.number_tint), order = "i[liquid-molten-aluminium]-e", - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-aluminium"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-liquid-molten-aluminium"), } end end @@ -114,24 +114,24 @@ if angelsmods.trigger.smelting_products["brass"].plate then { type = "recipe", name = "angels-brass-smelting-4", - category = "induction-smelting", + category = "angels-induction-smelting", subgroup = "angels-alloys-casting", energy_required = 4, enabled = false, ingredients = { - {type="item", name="ingot-copper", amount=18}, - {type="item", name="ingot-zinc", amount=12}, + {type="item", name="angels-ingot-copper", amount=18}, + {type="item", name="angels-ingot-zinc", amount=12}, {type="item", name="solid-white-phosphorus", amount=6}, }, results= { - {type="fluid", name="liquid-molten-brass", amount=360}, + {type="fluid", name="angels-liquid-molten-brass", amount=360}, }, icons = angelsmods.functions.add_number_icon_layer( - {{icon = "__angelssmelting__/graphics/icons/molten-brass.png",icon_size = 64, icon_mipmaps = 4, scale = 32/64}}, + {{icon = "__angelssmeltinggraphics__/graphics/icons/molten-brass.png",icon_size = 64, icon_mipmaps = 4, scale = 32/64}}, 4, angelsmods.smelting.number_tint), - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-brass"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-liquid-molten-brass"), order = "b[brass]-a[liquid-molten-brass]-d", } end @@ -141,21 +141,21 @@ if angelsmods.trigger.smelting_products["titanium"].plate then { type = "recipe", name = "sponge-magnesium-titanium-smelting", - category = "chemical-smelting", + category = "angels-chemical-smelting", subgroup = "angels-titanium", energy_required = 6, enabled = false, ingredients = { - {type="fluid", name="liquid-titanium-tetrachloride", amount=90}, - {type="item", name="solid-sodium", amount=8}, + {type="fluid", name="angels-liquid-titanium-tetrachloride", amount=90}, + {type="item", name="angels-solid-sodium", amount=8}, }, results= { - {type="item", name="sponge-titanium", amount=24}, - {type="item", name="solid-salt", amount=8} + {type="item", name="angels-sponge-titanium", amount=24}, + {type="item", name="angels-solid-salt", amount=8} }, - main_product= "sponge-titanium", + main_product= "angels-sponge-titanium", icon_size = 32, order = "ea", } @@ -163,25 +163,25 @@ if angelsmods.trigger.smelting_products["titanium"].plate then { type = "recipe", name = "pellet-magnesium-titanium-smelting", - category = "chemical-smelting", + category = "angels-chemical-smelting", subgroup = "angels-titanium", energy_required = 6, enabled = false, ingredients = { - {type="item", name="pellet-titanium", amount=8}, + {type="item", name="angels-pellet-titanium", amount=8}, {type="item", name="ingot-magnesium", amount=6}, }, results= { - {type="item", name="ingot-titanium", amount=24}, + {type="item", name="angels-ingot-titanium", amount=24}, {type="item", name="magnesium-ore", amount=6} }, - main_product= "ingot-titanium", + main_product= "angels-ingot-titanium", icons = angelsmods.functions.add_number_icon_layer( - angelsmods.functions.get_object_icons("ingot-titanium"), + angelsmods.functions.get_object_icons("angels-ingot-titanium"), 3, angelsmods.smelting.number_tint), - crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("ingot-titanium"), + crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("angels-ingot-titanium"), order = "f[ingot-titanium]-c", } end diff --git a/Clowns-Processing/prototypes/recipes/bobs.lua b/Clowns-Processing/prototypes/recipes/bobs.lua index 8e59614..9909957 100644 --- a/Clowns-Processing/prototypes/recipes/bobs.lua +++ b/Clowns-Processing/prototypes/recipes/bobs.lua @@ -30,25 +30,25 @@ end name = "sand-sluicing", category = "sluicing", enabled = false, - icon = "__angelsrefining__/graphics/icons/solid-sand.png", + icon = "__angelsrefininggraphics__/graphics/icons/solid-sand.png", icon_size = 32, ingredients = { - {type = "item", name = "solid-sand", amount = 10}, + {type = "item", name = "angels-solid-sand", amount = 10}, {type = "fluid", name = "water", amount = 10} }, results = { - {type = "fluid", name = "water-thin-mud", amount = 10}, + {type = "fluid", name = "angels-water-thin-mud", amount = 10}, {type = "item", name = "iron-ore", amount = 1, probability = 0.2}, {type = "item", name = "copper-ore", amount = 1, probability = 0.1}, - {type = "item", name = "crystal-dust", amount = 1, probability = 0.1}, - angelsmods.trigger.ores["gold"] and {type = "item", name = "gold-ore", amount = 1, probability = 0.05} or {type = "item", name = "uranium-ore", amount = 1, probability = 0.001}, + {type = "item", name = "angels-crystal-dust", amount = 1, probability = 0.1}, + angelsmods.trigger.ores["gold"] and {type = "item", name = "bob-gold-ore", amount = 1, probability = 0.05} or {type = "item", name = "uranium-ore", amount = 1, probability = 0.001}, {type = "item", name = "osmium-ore", amount = 1, probability = 0.01}, - angelsmods.trigger.ores["platinum"] and {type = "item", name = "platinum-ore", amount = 1, probability = 0.01} or nil, + angelsmods.trigger.ores["platinum"] and {type = "item", name = "angels-platinum-ore", amount = 1, probability = 0.01} or nil, }, energy_required = 5, - subgroup = "water-washing", + subgroup = "angels-water-washing", order = "k-a", }, } diff --git a/Clowns-Processing/prototypes/recipes/petrochem.lua b/Clowns-Processing/prototypes/recipes/petrochem.lua index a91f8ce..99001bc 100644 --- a/Clowns-Processing/prototypes/recipes/petrochem.lua +++ b/Clowns-Processing/prototypes/recipes/petrochem.lua @@ -3,22 +3,22 @@ data:extend( { type = "recipe", name = "catalytic-water-separation-oxygen", - category = "petrochem-electrolyser", + category = "angels-petrochem-electrolyser", subgroup = "clowns-electrolysis", order = "a", energy_required = 2, enabled = false, ingredients = { - {type = "fluid", name = "water-purified", amount = 1000}, + {type = "fluid", name = "angels-water-purified", amount = 1000}, {type = "item", name = "catalyst-metal-violet", amount = 1} }, results= { - {type = "fluid", name = "gas-oxygen", amount = 800}, - {type = "item", name = "catalyst-metal-carrier", amount = 1} + {type = "fluid", name = "angels-gas-oxygen", amount = 800}, + {type = "item", name = "angels-catalyst-metal-carrier", amount = 1} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-oxygen"}, "OOH",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), + icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-oxygen"}, "OOH",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), crafting_machine_tint = { primary = {r = 1, g = 0, b = 0, a = 0}, @@ -29,22 +29,22 @@ data:extend( { type = "recipe", name = "catalytic-water-separation-hydrogen", - category = "petrochem-electrolyser", + category = "angels-petrochem-electrolyser", subgroup = "clowns-electrolysis", order = "b", energy_required = 2, enabled = false, ingredients = { - {type = "fluid", name = "water-purified", amount = 1000}, + {type = "fluid", name = "angels-water-purified", amount = 1000}, {type = "item", name = "catalyst-metal-violet", amount = 1} }, results = { - {type = "fluid", name = "gas-hydrogen", amount = 1200}, - {type = "item", name = "catalyst-metal-carrier", amount = 1} + {type = "fluid", name = "angels-gas-hydrogen", amount = 1200}, + {type = "item", name = "angels-catalyst-metal-carrier", amount = 1} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-hydrogen"}, "HHO",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), + icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-hydrogen"}, "HHO",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), crafting_machine_tint = { primary = {r = 1, g = 0, b = 0, a = 0}, @@ -63,15 +63,15 @@ data:extend( enabled = false, ingredients = { - {type = "fluid", name = "gas-compressed-air", amount = 1000}, + {type = "fluid", name = "angels-gas-compressed-air", amount = 1000}, {type = "item", name = "catalyst-metal-violet", amount = 1} }, results = { - {type = "fluid", name = "gas-nitrogen", amount = 1000}, - {type = "item", name = "catalyst-metal-carrier", amount = 1} + {type = "fluid", name = "angels-gas-nitrogen", amount = 1000}, + {type = "item", name = "angels-catalyst-metal-carrier", amount = 1} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-nitrogen"}, "NNO",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), + icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-nitrogen"}, "NNO",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), }, { type = "recipe", @@ -83,65 +83,65 @@ data:extend( enabled = false, ingredients = { - {type = "fluid", name = "gas-compressed-air", amount = 1000}, + {type = "fluid", name = "angels-gas-compressed-air", amount = 1000}, {type = "item", name = "catalyst-metal-violet", amount = 1} }, results = { - {type = "fluid", name = "gas-oxygen", amount = 1000}, - {type = "item", name = "catalyst-metal-carrier", amount = 1} + {type = "fluid", name = "angels-gas-oxygen", amount = 1000}, + {type = "item", name = "angels-catalyst-metal-carrier", amount = 1} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-oxygen"}, "OON",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), + icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-oxygen"}, "OON",{{"__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",icon_size=32}}), }, { type = "recipe", name = "hydrochloric-acid-separation", - category = "petrochem-electrolyser", + category = "angels-petrochem-electrolyser", subgroup = "clowns-electrolysis", order = "e", energy_required = 2, enabled = false, ingredients = { - {type = "fluid", name = "liquid-hydrochloric-acid", amount = 100} + {type = "fluid", name = "angels-liquid-hydrochloric-acid", amount = 100} }, results = { - {type = "fluid", name = "gas-chlorine", amount = 40}, - {type = "fluid", name = "gas-hydrogen", amount = 60} + {type = "fluid", name = "angels-gas-chlorine", amount = 40}, + {type = "fluid", name = "angels-gas-hydrogen", amount = 60} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-chlorine","gas-hydrogen"}, "CHOc"), + icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-chlorine","angels-gas-hydrogen"}, "CHOc"), }, { type = "recipe", name = "hydrofluoric-acid-separation", - category = "petrochem-electrolyser", + category = "angels-petrochem-electrolyser", subgroup = "clowns-electrolysis", order = "f", energy_required = 2, enabled = false, ingredients = { - {type = "fluid", name = "liquid-hydrofluoric-acid", amount = 100} + {type = "fluid", name = "angels-liquid-hydrofluoric-acid", amount = 100} }, results = { {type = "fluid", name = "gas-fluorine", amount = 40}, - {type = "fluid", name = "gas-hydrogen", amount = 60} + {type = "fluid", name = "angels-gas-hydrogen", amount = 60} }, - icons = angelsmods.functions.create_gas_recipe_icon({"gas-fluorine","gas-hydrogen"}, "FHH",{"liquid-hydrofluoric-acid"}), + icons = angelsmods.functions.create_gas_recipe_icon({"gas-fluorine","angels-gas-hydrogen"}, "FHH",{"angels-liquid-hydrofluoric-acid"}), }, { type = "recipe", name = "catalyst-metal-violet", category = "crafting-with-fluid", - subgroup = "petrochem-catalysts", + subgroup = "angels-petrochem-catalysts", energy_required = 2, enabled = false, ingredients = { - {type = "item", name = "catalyst-metal-carrier", amount = 10}, - {type = "item", name = clowns.special_vanilla and "solid-sodium" or "platinum-ore", amount = 1}, + {type = "item", name = "angels-catalyst-metal-carrier", amount = 10}, + {type = "item", name = clowns.special_vanilla and "angels-solid-sodium" or "angels-platinum-ore", amount = 1}, {type = "fluid", name = "liquid-mercury", amount = 10}, }, results = diff --git a/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua b/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua index b28bbb6..b2ead16 100644 --- a/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua +++ b/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua @@ -57,7 +57,7 @@ data:extend( { type = "recipe", name = "depleted-uranium-ore-processing", - category = "ore-processing-3", + category = "angels-ore-processing-3", subgroup = "clowns-depleted-uranium", energy_required = 2, enabled = false, @@ -75,7 +75,7 @@ data:extend( { type = "recipe", name = "depleted-uranium-processed-processing", - category = "pellet-pressing-2", + category = "angels-pellet-pressing-2", subgroup = "clowns-depleted-uranium", energy_required = 2, enabled = false, @@ -93,7 +93,7 @@ data:extend( { type = "recipe", name = "depleted-uranium-pellet-smelting", - category = "blast-smelting-4", + category = "angels-blast-smelting-4", subgroup = "clowns-depleted-uranium", energy_required = 4, enabled = false, @@ -111,7 +111,7 @@ data:extend( { type = "recipe", name = "casting-powder-depleted-uranium-1", - category = "powder-mixing-3", + category = "angels-powder-mixing-3", subgroup = "clowns-depleted-uranium-casting", energy_required = 4, enabled = false, @@ -130,7 +130,7 @@ data:extend( { type = "recipe", name = "casting-powder-depleted-uranium-2", - category = "powder-mixing-4", + category = "angels-powder-mixing-4", subgroup = "clowns-depleted-uranium-casting", energy_required = 4, enabled = false, @@ -149,14 +149,14 @@ data:extend( { type = "recipe", name = "casting-powder-depleted-uranium-3", - category = "powder-mixing-4", + category = "angels-powder-mixing-4", subgroup = "clowns-depleted-uranium-casting", energy_required = 4, enabled = false, ingredients = { {type = "item", name = "powder-depleted-uranium", amount = 12}, - {type = "item", name = "powder-aluminium", amount = 12}, + {type = "item", name = "angels-powder-aluminium", amount = 12}, }, results = { @@ -168,7 +168,7 @@ data:extend( { type = "recipe", name = "casting-powder-depleted-uranium-4", - category = "powder-mixing-4", + category = "angels-powder-mixing-4", subgroup = "clowns-depleted-uranium-casting", energy_required = 4, enabled = false, @@ -176,7 +176,7 @@ data:extend( { {type = "item", name = "powder-depleted-uranium", amount = 12}, {type = "item", name = "powder-osmium", amount = 12}, - {type = "item", name = "powder-aluminium", amount = 12}, + {type = "item", name = "angels-powder-aluminium", amount = 12}, }, results = { @@ -189,7 +189,7 @@ data:extend( { type = "recipe", name = "clowns-plate-depleted-uranium", - category = "sintering-4", + category = "angels-sintering-4", subgroup = "clowns-depleted-uranium-casting", enabled = false, energy_required = 4, @@ -211,7 +211,7 @@ data:extend( { type = "recipe", name = "magnesium-ore-processing", - category = "ore-processing-3", + category = "angels-ore-processing-3", subgroup = "clowns-magnesium", energy_required = 2, enabled = false, @@ -229,7 +229,7 @@ data:extend( { type = "recipe", name = "magnesium-processed-processing", - category = "pellet-pressing-2", + category = "angels-pellet-pressing-2", subgroup = "clowns-magnesium", energy_required = 2, enabled = false, @@ -247,21 +247,21 @@ data:extend( { type = "recipe", name = "magnesium-pellet-smelting", - category = "blast-smelting-4", + category = "angels-blast-smelting-4", subgroup = "clowns-magnesium", energy_required = 4, enabled = false, ingredients = { {type = "item", name = "pellet-magnesium", amount = 8}, - {type = "item", name = "solid-coke", amount = 2}, - {type = "item", name = "solid-limestone", amount = 2}, - {type = "fluid", name = "liquid-hydrochloric-acid", amount = 30} + {type = "item", name = "angels-solid-coke", amount = 2}, + {type = "item", name = "angels-solid-limestone", amount = 2}, + {type = "fluid", name = "angels-liquid-hydrochloric-acid", amount = 30} }, results = { {type = "item", name = "ingot-magnesium", amount = 24}, - {type = "item", name = "solid-calcium-chloride", amount = 2}, + {type = "item", name = "angels-solid-calcium-chloride", amount = 2}, }, icon = "__Clowns-Processing__/graphics/icons/ingot-magnesium.png", icon_size = 32, @@ -271,7 +271,7 @@ data:extend( { type = "recipe", name = "molten-magnesium-smelting", - category = "induction-smelting-4", + category = "angels-induction-smelting-4", subgroup = "clowns-magnesium-casting", energy_required = 4, enabled = false, @@ -290,7 +290,7 @@ data:extend( { type = "recipe", name = "clowns-plate-magnesium", - category = "casting-4", + category = "angels-casting-4", subgroup = "clowns-magnesium-casting", enabled = false, energy_required = 4, @@ -312,21 +312,21 @@ data:extend( { type = "recipe", name = "thermal-filtering-mercury", - category = "water-treatment", - subgroup = "water-treatment", + category = "angels-water-treatment", + subgroup = "angels-water-treatment", enabled = false, energy_required = 1, ingredients = { - {type = "fluid", name = "thermal-water", amount = 100} + {type = "fluid", name = "angels-thermal-water", amount = 100} }, results = { {type = "fluid", name = "liquid-mercury", amount = 40}, - {type = "fluid", name = "water-purified", amount = 60}, + {type = "fluid", name = "angels-water-purified", amount = 60}, }, icons = angelsmods.functions.create_liquid_recipe_icon({ - "water-purified", + "angels-water-purified", "liquid-mercury", }, {{238,113,22},{203,99,15},{167,78,13}}), order = "h" @@ -341,22 +341,22 @@ if mods["angelsbioprocessing"] then type = "recipe", name = "dimethylmercury-synthesis", category = "chemistry", - subgroup = "petrochem-chlorine", + subgroup = "angels-petrochem-chlorine", enabled = false, energy_required = 10, ingredients = { {type = "fluid", name = "liquid-mercury", amount = 10}, - {type = "fluid", name = "gas-chlor-methane", amount = 20}, - {type = "item", name = "solid-sodium", amount = 2}, + {type = "fluid", name = "angels-gas-chlor-methane", amount = 20}, + {type = "item", name = "angels-solid-sodium", amount = 2}, }, results = { {type = "fluid", name = "liquid-dimethylmercury", amount = 10}, - {type = "item", name = "solid-salt", amount = 2}, + {type = "item", name = "angels-solid-salt", amount = 2}, }, icons = angelsmods.functions.create_viscous_liquid_recipe_icon( - {"solid-salt"}, + {"angels-solid-salt"}, {{ 118, 141, 138 },{ 94, 113, 110 },{ 94, 113, 110 }}), order = "z" }, @@ -372,14 +372,14 @@ data:extend( { type = "recipe", name = "osmium-ore-processing", - category = "ore-processing", + category = "angels-ore-processing", subgroup = "clowns-osmium", energy_required = 2, enabled = false, ingredients = { {type = "item", name = "osmium-ore", amount = 4}, - {type="item", name="solid-sodium-carbonate", amount=6}, + {type="item", name="angels-solid-sodium-carbonate", amount=6}, }, results = { @@ -392,14 +392,14 @@ data:extend( { type = "recipe", name = "osmium-processed-processing", - category = "pellet-pressing", + category = "angels-pellet-pressing", subgroup = "clowns-osmium", energy_required = 2, enabled = false, ingredients = { {type = "item", name = "processed-osmium", amount = 3}, - {type = "item", name = "solid-ammonium-perchlorate", amount = 6}, + {type = "item", name = "angels-solid-ammonium-perchlorate", amount = 6}, }, results = { @@ -411,7 +411,7 @@ data:extend( { type = "recipe", name = "osmium-pellet-smelting", - category = "blast-smelting", + category = "angels-blast-smelting", subgroup = "clowns-osmium", energy_required = 4, localised_name = {"item-name.powder-osmium"}, @@ -423,7 +423,7 @@ data:extend( results = { {type = "item", name = "powder-osmium", amount = 24}, - {type = "item", name = "solid-salt", amount = 6}, + {type = "item", name = "angels-solid-salt", amount = 6}, }, icons = angelsmods.functions.get_object_icons("powder-osmium"), order = "d", @@ -432,14 +432,14 @@ data:extend( { type = "recipe", name = "casting-powder-osmium", - category = "powder-mixing", + category = "angels-powder-mixing", subgroup = "clowns-osmium-casting", energy_required = 4, enabled = false, ingredients = { {type = "item", name = "powder-osmium", amount = 8}, - {type = "item", name = "solid-sodium-hydroxide", amount = 8}, + {type = "item", name = "angels-solid-sodium-hydroxide", amount = 8}, }, results = { @@ -453,7 +453,7 @@ data:extend( { type = "recipe", name = "clowns-plate-osmium", - category = "sintering-4", + category = "angels-sintering-4", subgroup = "clowns-osmium-casting", enabled = false, energy_required = 4, @@ -478,28 +478,28 @@ data:extend( icons = { { - icon = "__Clowns-Processing__/graphics/icons/sorting.png" + icon = "__Clowns-Processing__/graphics/icons/sorting.png", icon_size = 32 }, { - icon = "__angelsrefining__/graphics/icons/stone-crushed.png", + icon = "__angelsrefininggraphics__/graphics/icons/stone-crushed.png", scale = 0.5, shift = {8, 8}, }, }, icon_size = 32, - category = "ore-sorting", - subgroup = "ore-sorting-t1", + category = "angels-ore-sorting", + subgroup = "angels-ore-sorting-t1", order = "i", energy_required = 1, enabled = false, allow_decomposition = false, ingredients = { - {type = "item", name = "stone-crushed", amount = 20}, + {type = "item", name = "angels-stone-crushed", amount = 20}, }, results = { - {type = "item", name = "slag", amount = 7}, + {type = "item", name = "angels-slag", amount = 7}, {type = "item", name = "phosphorus-ore", amount = 1}, }, }, @@ -509,7 +509,7 @@ data:extend( name = "white-phosphorus-smelting", icon = "__Clowns-Processing__/graphics/icons/solid-white-phosphorus.png", icon_size = 32, - category = "chemical-smelting", + category = "angels-chemical-smelting", subgroup = "clowns-phosphorus", order = "a", energy_required = 10, @@ -518,13 +518,13 @@ data:extend( ingredients = { {type = "item", name = "phosphorus-ore", amount = 24}, - {type = "item", name = "solid-sand", amount = 2}, - {type = "item", name = "solid-carbon", amount = 2} + {type = "item", name = "angels-solid-sand", amount = 2}, + {type = "item", name = "angels-solid-carbon", amount = 2} }, results = { {type = "item", name = "solid-white-phosphorus", amount = 24},--Should make phosphorus gas - {type = "fluid", name = "gas-carbon-monoxide", amount = 10} + {type = "fluid", name = "angels-gas-carbon-monoxide", amount = 10} }, }, --phosphoric acid @@ -541,12 +541,12 @@ data:extend( ingredients = { {type = "item", name = "phosphorus-ore", amount = 8}, - {type = "fluid", name = "liquid-sulfuric-acid", amount = 10}, + {type = "fluid", name = "angels-liquid-sulfuric-acid", amount = 10}, }, results = { {type = "fluid", name = "liquid-phosphoric-acid", amount = 10}, - {type = "item", name = "solid-calcium-sulfate", amount = 1} + {type = "item", name = "angels-solid-calcium-sulfate", amount = 1} }, }, --phosphoric acid 2 @@ -555,7 +555,7 @@ data:extend( name = "white-phosphorus-smelting-2", icon = "__Clowns-Processing__/graphics/icons/solid-white-phosphorus.png", icon_size = 32, - category = "chemical-smelting-2", + category = "angels-chemical-smelting-2", subgroup = "clowns-phosphorus", order = "a", energy_required = 10, @@ -578,39 +578,39 @@ data:extend( { type = "recipe", name = "intermediate-salination", - category = "salination-plant", - subgroup = "water-salination", + category = "angels-salination-plant", + subgroup = "angels-water-salination", energy_required = 5, enabled = false, ingredients = { - {type = "fluid", name = "water-saline", amount = 1000} + {type = "fluid", name = "angels-water-saline", amount = 1000} }, results = { - {type = "item", name = "solid-salt", amount = 10}, + {type = "item", name = "angels-solid-salt", amount = 10}, {type = "item", name = "magnesium-ore", amount = 5}, }, - icons = angelsmods.functions.create_solid_recipe_icon({"solid-salt"}, "magnesium-ore", {"water-saline"}), + icons = angelsmods.functions.create_solid_recipe_icon({"angels-solid-salt"}, "magnesium-ore", {"angels-water-saline"}), order = "f", }, { type = "recipe", name = "advanced-salination", - category = "salination-plant", - subgroup = "water-salination", + category = "angels-salination-plant", + subgroup = "angels-water-salination", energy_required = 5, enabled = false, ingredients = { - {type = "fluid", name = "water-saline", amount = 1000} + {type = "fluid", name = "angels-water-saline", amount = 1000} }, results = { {type = "item", name = "magnesium-ore", amount = 10}, }, main_product = "", - icons = angelsmods.functions.create_solid_recipe_icon(nil, "magnesium-ore", {"water-saline"}), + icons = angelsmods.functions.create_solid_recipe_icon(nil, "magnesium-ore", {"angels-water-saline"}), order = "g", }, ---------------------------- @@ -677,7 +677,7 @@ data:extend( ingredients = { {type = "item", name = "solid-uranium-oxide", amount = 12}, - {type = "fluid", name = "liquid-hydrofluoric-acid", amount = 10} + {type = "fluid", name = "angels-liquid-hydrofluoric-acid", amount = 10} }, results = { @@ -690,7 +690,7 @@ data:extend( name = "solid-uranium-oxide-1", icon = "__Clowns-Processing__/graphics/icons/solid-uranium-oxide.png", icon_size = 32, - category = "chemical-smelting-3", + category = "angels-chemical-smelting-3", subgroup = "clowns-uranium", order = "c", energy_required = 10, @@ -699,7 +699,7 @@ data:extend( ingredients = { {type = "item", name = "uranium-ore", amount = 24}, - {type = "fluid", name = "gas-hydrogen", amount = 40} + {type = "fluid", name = "angels-gas-hydrogen", amount = 40} }, results = { @@ -714,7 +714,7 @@ data:extend( name = "solid-uranium-oxide-2", icon = "__Clowns-Processing__/graphics/icons/solid-uranium-oxide.png", icon_size = 32, - category = "chemical-smelting-4", + category = "angels-chemical-smelting-4", subgroup = "clowns-uranium", order = "d", energy_required = 10, @@ -723,7 +723,7 @@ data:extend( ingredients = { {type = "item", name = "solid-ammonium-diuranate", amount = 24}, - {type = "fluid", name = "gas-hydrogen", amount = 40} + {type = "fluid", name = "angels-gas-hydrogen", amount = 40} }, results = { @@ -748,7 +748,7 @@ data:extend( ingredients = { {type = "item", name = "solid-uranyl-nitrate", amount = 12}, - {type = "fluid", name = "gas-ammonia", amount = 10} + {type = "fluid", name = "angels-gas-ammonia", amount = 10} }, results = { @@ -770,7 +770,7 @@ data:extend( ingredients = { {type = "item", name = "uranium-ore", amount = 10},--20% less ingredients - {type = "fluid", name = "liquid-nitric-acid", amount = 10} + {type = "fluid", name = "angels-liquid-nitric-acid", amount = 10} }, results = { diff --git a/Clowns-Processing/prototypes/technology-updates.lua b/Clowns-Processing/prototypes/technology-updates.lua index 07702ea..c816cee 100644 --- a/Clowns-Processing/prototypes/technology-updates.lua +++ b/Clowns-Processing/prototypes/technology-updates.lua @@ -32,10 +32,10 @@ end if angelsmods.trigger.smelting_products["titanium"].plate then table.insert(unlock_lists,{"angels-titanium-smelting-2","sponge-magnesium-titanium-smelting"}) table.insert(unlock_lists,{"angels-titanium-smelting-3","pellet-magnesium-titanium-smelting"}) - if data.raw.technology["sodium-processing"] then - OV.add_prereq("angels-titanium-smelting-2", "sodium-processing") + if data.raw.technology["angels-sodium-processing"] then + OV.add_prereq("angels-titanium-smelting-2", "angels-sodium-processing") else - OV.add_prereq("angels-titanium-smelting-2", "sodium-processing-1") + OV.add_prereq("angels-titanium-smelting-2", "angels-sodium-processing-1") end end if data.raw.recipe["molten-steel-smelting-c2"] then diff --git a/Clowns-Processing/prototypes/technology/depleted-uranium.lua b/Clowns-Processing/prototypes/technology/depleted-uranium.lua index a828963..eb35b0c 100644 --- a/Clowns-Processing/prototypes/technology/depleted-uranium.lua +++ b/Clowns-Processing/prototypes/technology/depleted-uranium.lua @@ -29,7 +29,7 @@ if settings.startup["depleted-uranium"].value then recipe = "clowns-plate-depleted-uranium" }, }, - prerequisites = {"nuclear-power", "powder-metallurgy-4", "ore-processing-3"}, + prerequisites = {"nuclear-power", "angels-powder-metallurgy-4", "angels-ore-processing-3"}, unit = { ingredients = @@ -64,7 +64,7 @@ if settings.startup["depleted-uranium"].value then recipe = "casting-powder-depleted-uranium-4" }, }, - prerequisites = {"advanced-depleted-uranium-smelting-1", "advanced-osmium-smelting", "powder-metallurgy-5", "angels-aluminium-smelting-2"}, + prerequisites = {"advanced-depleted-uranium-smelting-1", "advanced-osmium-smelting", "angels-powder-metallurgy-5", "angels-aluminium-smelting-2"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/technology/gardens.lua b/Clowns-Processing/prototypes/technology/gardens.lua index 0fbed79..b919cb0 100644 --- a/Clowns-Processing/prototypes/technology/gardens.lua +++ b/Clowns-Processing/prototypes/technology/gardens.lua @@ -4,13 +4,13 @@ if mods["angelsbioprocessing"] then { type = "technology", name = "garden-mutation", - icon = "__angelsbioprocessing__/graphics/technology/seed-extractor-tech.png", + icon = "__angelsbioprocessinggraphics__/graphics/technology/seed-extractor-tech.png", icon_size = 128, order = "c", prerequisites = { "nuclear-power", - "gardens-3", + "angels-gardens-3", "utility-science-pack" }, effects = @@ -37,7 +37,7 @@ if mods["angelsbioprocessing"] then {"logistic-science-pack", 4}, {"chemical-science-pack", 4}, {"utility-science-pack", 4}, - {"token-bio", 1} + {"angels-token-bio", 1} }, time = 30 }, @@ -51,7 +51,7 @@ if mods["angelsbioprocessing"] then "temperate-garden-generation" } for _,rec in pairs(recipes) do - table.insert(data.raw["technology"]["bio-farm-2"].effects,{type = "unlock-recipe", recipe = rec}) + table.insert(data.raw["technology"]["angels-bio-farm-2"].effects,{type = "unlock-recipe", recipe = rec}) end - table.insert(data.raw["technology"]["bio-farm-2"].prerequisites,"phosphorus-processing-1") + table.insert(data.raw["technology"]["angels-bio-farm-2"].prerequisites,"phosphorus-processing-1") end \ No newline at end of file diff --git a/Clowns-Processing/prototypes/technology/magnesium.lua b/Clowns-Processing/prototypes/technology/magnesium.lua index 9a6ce93..d25f7c5 100644 --- a/Clowns-Processing/prototypes/technology/magnesium.lua +++ b/Clowns-Processing/prototypes/technology/magnesium.lua @@ -28,7 +28,7 @@ data:extend( recipe = "clowns-plate-magnesium" }, }, - prerequisites = {"ore-processing-3", "water-treatment-4"}, + prerequisites = {"angels-ore-processing-3", "angels-water-treatment-4"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/technology/mercury.lua b/Clowns-Processing/prototypes/technology/mercury.lua index 6f3ccea..4e2b71c 100644 --- a/Clowns-Processing/prototypes/technology/mercury.lua +++ b/Clowns-Processing/prototypes/technology/mercury.lua @@ -12,7 +12,7 @@ data:extend( recipe = "thermal-filtering-mercury" }, }, - prerequisites = {"thermal-water-extraction-2"}, + prerequisites = {"angels-thermal-water-extraction-2"}, unit = { ingredients = @@ -56,7 +56,7 @@ if mods["angelsbioprocessing"] then recipe = "neurotoxin-capsule" }, }, - prerequisites = {"mercury-processing-1", "bio-processing-blue", "military-3"}, + prerequisites = {"mercury-processing-1", "angels-bio-processing-blue", "military-3"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/technology/osmium.lua b/Clowns-Processing/prototypes/technology/osmium.lua index 6dcab69..288cec0 100644 --- a/Clowns-Processing/prototypes/technology/osmium.lua +++ b/Clowns-Processing/prototypes/technology/osmium.lua @@ -32,7 +32,7 @@ data:extend( recipe = "osmium-rounds-magazine" }, }, - prerequisites = {"powder-metallurgy-4", "ore-processing-3", "military-3"}, + prerequisites = {"angels-powder-metallurgy-4", "angels-ore-processing-3", "military-3"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/technology/phosphorus.lua b/Clowns-Processing/prototypes/technology/phosphorus.lua index ec6feb1..504ee02 100644 --- a/Clowns-Processing/prototypes/technology/phosphorus.lua +++ b/Clowns-Processing/prototypes/technology/phosphorus.lua @@ -20,7 +20,7 @@ data:extend( recipe = "phosphoric-acid-1" }, }, - prerequisites = {"basic-chemistry-2", "angels-metallurgy-2", "angels-sulfur-processing-1", "ore-crushing"}, + prerequisites = {"angels-basic-chemistry-2", "angels-metallurgy-2", "angels-sulfur-processing-1", "angels-ore-crushing"}, unit = { ingredients = diff --git a/Clowns-Processing/prototypes/technology/salination.lua b/Clowns-Processing/prototypes/technology/salination.lua index af5b0ce..bdfbfd5 100644 --- a/Clowns-Processing/prototypes/technology/salination.lua +++ b/Clowns-Processing/prototypes/technology/salination.lua @@ -3,11 +3,11 @@ data:extend( { type = "technology", name = "water-treatment-5", - icon = "__angelsrefining__/graphics/technology/water-treatment.png", + icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png", icon_size = 128, prerequisites = { - "water-treatment-4", + "angels-water-treatment-4", }, effects = {