Skip to content

SE 2.0 compatibility #21

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

Open
NathaU wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SE 2.0 compatibility #21

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
6 changes: 3 additions & 3 deletions carbon-recipe-se.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ data:extend({
always_show_made_in = true,
allow_as_intermediate = false,
ingredients = {
{name = "graphite", amount = 20},
{name = "se-vulcanite-block", amount = 1},
{type="item", name = "graphite", amount = 20},
{type="item", name = "se-vulcanite-block", amount = 1},
},
results = {
{name = "diamond", amount = 3},
{type="item", name = "diamond", amount = 3},
},
icons =
{
Expand Down
4 changes: 2 additions & 2 deletions carbon-recipe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ data:extend({

enabled = false,
allow_productivity=true,
energy_required = 0.5,
energy_required = util.k2() and 0.25 or 0.5,
ingredients = {util.item("flake-graphite", 1)},
results = {util.item("graphite")},
-- expensive =
Expand Down Expand Up @@ -582,7 +582,7 @@ end


-- Space exploration subgroups
if mods["space-exploration"] and string.sub(mods["space-exploration"], 1, 3) == "0.6" then
if mods["space-exploration"] and util.se6() then
data:extend({
{
type = "item-subgroup",
Expand Down
24 changes: 12 additions & 12 deletions data-util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ function util.se_landfill(params)
category = "hard-recycling",
order = "z-b-"..params.ore,
subgroup = "terrain",
result = "landfill",
ingredients = {{params.ore, 50}},
results = {{type="item", name="landfill", amount=1}},
ingredients = {{type="item", name=params.ore, amount=50}},
}
})
util.add_unlock("se-recycling-facility", lname)
Expand Down Expand Up @@ -611,15 +611,15 @@ function util.se_matter(params)
energy_required = params.energy_required,
enabled = false,
ingredients = {
{sedata, 1},
{type="item", name=sedata, amount=1},
{type="fluid", name="se-particle-stream", amount=50},
{type="fluid", name="se-space-coolant-supercooled", amount=25},
},
results = {
{params.ore, params.quant_out},
{"se-contaminated-scrap", 1},
{type=item, name=sedata, amount=1, probability=.99},
{type=item, name=sejunk, amount=1, probability=.01},
{type="item", name=params.ore, amount=params.quant_out},
{type="item", name="se-contaminated-scrap", amount=1},
{type="item", name=sedata, amount=1, probability=.99},
{type="item", name=sejunk, amount=1, probability=.01},
{type="fluid", name="se-space-coolant-hot", amount=25, ignored_by_stats=25, ignored_by_productivity=25},
}
}
Expand Down Expand Up @@ -650,13 +650,13 @@ function util.se_matter(params)
energy_required = 30,
enabled = false,
ingredients = {
{"se-kr-matter-liberation-data", 1},
{params.ore, params.quant_in},
{type="item", name="se-kr-matter-liberation-data", amount=1},
{type="item", name=params.ore, amount=params.quant_in},
{type="fluid", name="se-particle-stream", amount=50},
},
results = {
{type=item, name="se-kr-matter-liberation-data", amount=1, probability=.99},
{type=item, name=sejunk, amount=1, probability=.01},
{type="item", name="se-kr-matter-liberation-data", amount=1, probability=.99},
{type="item", name=sejunk, amount=1, probability=.01},
{type="fluid", name="se-particle-stream", amount=params.stream_out, ignored_by_stats=50, ignored_by_productivity=50},
}
}
Expand Down Expand Up @@ -968,7 +968,7 @@ function set_ingredient(recipe, ingredient, quantity)
return
end
end
table.insert(recipe.ingredients, {ingredient, quantity})
table.insert(recipe.ingredients, {type="item", name=ingredient, amount=quantity})
end
end
-- Add a given quantity of product to a given recipe.
Expand Down