forked from cacklingfiend/bzgold2
Update bz mods to version 2
This commit is contained in:
parent
e900b41958
commit
25c42d3708
9 changed files with 50 additions and 130 deletions
|
|
@ -44,7 +44,7 @@ if get_setting("bz-recipe-bypass") then
|
||||||
end
|
end
|
||||||
|
|
||||||
function util.is_foundry()
|
function util.is_foundry()
|
||||||
return mods.bzfoundry and not me.get_setting("bzfoundry-minimal")
|
return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal")
|
||||||
end
|
end
|
||||||
|
|
||||||
function should_force(options)
|
function should_force(options)
|
||||||
|
|
|
||||||
|
|
@ -8,15 +8,15 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"base >= 2.0.0",
|
"base >= 2.0.0",
|
||||||
"? bzfoundry >= 0.2.1",
|
"? bzfoundry2 >= 2.0.0",
|
||||||
"? bztitanium >= 2.0.26",
|
"? bztitanium >= 2.0.26",
|
||||||
"? bzlead >= 2.0.28",
|
"? bzlead >= 2.0.28",
|
||||||
"? bzzirconium >= 2.1.13",
|
"? bzzirconium >= 2.1.13",
|
||||||
"? bztungsten >= 0.6.0",
|
"? bztungsten >= 0.6.0",
|
||||||
"? bzcarbon >= 2.0.21",
|
"? bzcarbon >= 2.0.21",
|
||||||
"? bztin >= 2.1.15",
|
"? bztin >= 2.1.15",
|
||||||
"? bzgas",
|
"? bzgas2",
|
||||||
"? bzchlorine",
|
"? bzchlorine2",
|
||||||
"? 248k-Redux >= 0.1.22",
|
"? 248k-Redux >= 0.1.22",
|
||||||
"? space-exploration >= 0.7.34",
|
"? space-exploration >= 0.7.34",
|
||||||
"? aai-industry",
|
"? aai-industry",
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ if util.me.catalysis() then
|
||||||
|
|
||||||
|
|
||||||
local base = "stone"
|
local base = "stone"
|
||||||
if mods.bzaluminum then base = "alumina"
|
if mods.bzaluminum2 then base = "alumina"
|
||||||
elseif mods.bzsilicon then base = "silica"
|
elseif mods.bzsilicon then base = "silica"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ if util.me.silver() then
|
||||||
util.add_unlock("silver-processing", "electronic-circuit-silver")
|
util.add_unlock("silver-processing", "electronic-circuit-silver")
|
||||||
end
|
end
|
||||||
|
|
||||||
if mods["aai-industry"] and not mods.bzgas then
|
if mods["aai-industry"] and not mods.bzgas2 then
|
||||||
local ec2 = futil.table.deepcopy(data.raw.recipe["electronic-circuit"])
|
local ec2 = futil.table.deepcopy(data.raw.recipe["electronic-circuit"])
|
||||||
ec2.name = "electronic-circuit-stone-silver"
|
ec2.name = "electronic-circuit-stone-silver"
|
||||||
data:extend({ec2})
|
data:extend({ec2})
|
||||||
|
|
|
||||||
|
|
@ -59,20 +59,12 @@ data:extend({
|
||||||
{
|
{
|
||||||
sheet =
|
sheet =
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/gold-ore.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
size = 64,
|
|
||||||
frame_count = 8,
|
|
||||||
variation_count = 8,
|
|
||||||
hr_version =
|
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/hr-gold-ore.png",
|
filename = "__bzgold__/graphics/entity/ores/hr-gold-ore.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
size = 128,
|
size = 128,
|
||||||
frame_count = 8,
|
frame_count = 8,
|
||||||
variation_count = 8,
|
variation_count = 8,
|
||||||
scale = 0.5
|
scale = 0.5
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -116,135 +108,71 @@ data:extend({
|
||||||
pictures =
|
pictures =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-1.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-1.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-1.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-2.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-2.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-2.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-3.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-3.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-3.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-4.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-4.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-4.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shadows =
|
shadows =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-shadow-1.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-1.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-shadow-2.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-2.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-shadow-3.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-3.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/gold-ore-particle-shadow-4.png",
|
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
width = 16,
|
width = 32,
|
||||||
height = 16,
|
height = 32,
|
||||||
frame_count = 1,
|
frame_count = 1,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/particle/hr-gold-ore-particle-shadow-4.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
width = 32,
|
|
||||||
height = 32,
|
|
||||||
frame_count = 1,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,11 @@ local util = require("data-util");
|
||||||
if util.me.palladium() then
|
if util.me.palladium() then
|
||||||
|
|
||||||
local ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="stone", amount=2}}
|
local ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="stone", amount=2}}
|
||||||
if mods.bzzirconium and mods.bzaluminum then
|
if mods.bzzirconium and mods.bzaluminum2 then
|
||||||
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=1}, {type="item", name="alumina", amount=1}}
|
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=1}, {type="item", name="alumina", amount=1}}
|
||||||
elseif mods.bzzirconium then
|
elseif mods.bzzirconium then
|
||||||
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=2}}
|
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=2}}
|
||||||
elseif mods.bzaluminum then
|
elseif mods.bzaluminum2 then
|
||||||
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="alumina", amount=2}}
|
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="alumina", amount=2}}
|
||||||
elseif mods.bzsilicon then
|
elseif mods.bzsilicon then
|
||||||
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="silica", amount=3}}
|
ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="silica", amount=3}}
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ if data.raw.resource["copper-ore"] then
|
||||||
data.raw.resource["copper-ore"].autoplace = resource_autoplace.resource_autoplace_settings{
|
data.raw.resource["copper-ore"].autoplace = resource_autoplace.resource_autoplace_settings{
|
||||||
name = "copper-ore",
|
name = "copper-ore",
|
||||||
order = "b",
|
order = "b",
|
||||||
base_density = mods.bzaluminum and 3 or 4,
|
base_density = mods.bzaluminum2 and 3 or 4,
|
||||||
has_starting_area_placement = true,
|
has_starting_area_placement = true,
|
||||||
regular_rq_factor_multiplier = 1.1,
|
regular_rq_factor_multiplier = 1.1,
|
||||||
starting_rq_factor_multiplier = 1.1,
|
starting_rq_factor_multiplier = 1.1,
|
||||||
|
|
@ -152,20 +152,12 @@ data:extend({
|
||||||
{
|
{
|
||||||
sheet =
|
sheet =
|
||||||
{
|
{
|
||||||
filename = "__bzgold__/graphics/entity/ores/rich-copper-ore.png",
|
filename = "__bzgold__/graphics/entity/ores/hr-rich-copper-ore.png",
|
||||||
priority = "extra-high",
|
priority = "extra-high",
|
||||||
size = 64,
|
size = 128,
|
||||||
frame_count = 8,
|
frame_count = 8,
|
||||||
variation_count = 8,
|
variation_count = 8,
|
||||||
hr_version =
|
scale = 0.5
|
||||||
{
|
|
||||||
filename = "__bzgold__/graphics/entity/ores/hr-rich-copper-ore.png",
|
|
||||||
priority = "extra-high",
|
|
||||||
size = 128,
|
|
||||||
frame_count = 8,
|
|
||||||
variation_count = 8,
|
|
||||||
scale = 0.5
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -103,12 +103,12 @@ if util.me.silver() then
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
if mods.bzfoundry then
|
if mods.bzfoundry2 then
|
||||||
util.set_category("silver-brazing-alloy", "basic-founding")
|
util.set_category("silver-brazing-alloy", "basic-founding")
|
||||||
util.set_subgroup("silver-brazing-alloy", "foundry-intermediate")
|
util.set_subgroup("silver-brazing-alloy", "foundry-intermediate")
|
||||||
end
|
end
|
||||||
|
|
||||||
local prereqs= mods.bzaluminum and {"copper-processing"} or {"automation"}
|
local prereqs= mods.bzaluminum2 and {"copper-processing"} or {"automation"}
|
||||||
data:extend({
|
data:extend({
|
||||||
{
|
{
|
||||||
type = "technology",
|
type = "technology",
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ if util.me.platinum() then
|
||||||
local base = "stone"
|
local base = "stone"
|
||||||
if mods.bzzirconium then
|
if mods.bzzirconium then
|
||||||
base = "zirconia"
|
base = "zirconia"
|
||||||
elseif mods.bzaluminum then
|
elseif mods.bzaluminum2 then
|
||||||
base = "alumina"
|
base = "alumina"
|
||||||
elseif mods.bzsilicon then
|
elseif mods.bzsilicon then
|
||||||
base = "silica"
|
base = "silica"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue