Skip to content

updated to support angels 2.0 dev branch #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pezzawinkle merged 1 commit into from
Jan 6, 2026
Merged

updated to support angels 2.0 dev branch #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
Expand Down
22 changes: 11 additions & 11 deletions Clowns-AngelBob-Nuclear/prototypes/more-overrides.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ 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
--hide advanced uranium processing, as it is integrated into the normal cycle
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})
Expand Down Expand Up @@ -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=
{
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Clowns-AngelBob-Nuclear/prototypes/overrides.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ 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
--update nuclear cells
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
24 changes: 12 additions & 12 deletions Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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(
{
{
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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}
},
},
}
Expand Down Expand Up @@ -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}
},
}
})
Expand Down
8 changes: 4 additions & 4 deletions Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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",
},
}
Expand Down
4 changes: 2 additions & 2 deletions Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
2 changes: 1 addition & 1 deletion Clowns-AngelBob-Nuclear/prototypes/technology/nuclear-reprocessing.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions Clowns-Extended-Minerals/data-updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions Clowns-Extended-Minerals/prototypes/categories.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
Expand Down
2 changes: 1 addition & 1 deletion Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
10 changes: 5 additions & 5 deletions Clowns-Extended-Minerals/prototypes/items/item-builder.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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},
Expand All @@ -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},
Expand All @@ -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},
Expand All @@ -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},
Expand Down
Loading