Cleanup
This commit is contained in:
Simon Brodtmann
parent
447c47f0f3
commit
3051414d98
42 changed files with 156 additions and 1038 deletions
|
|
@ -48,7 +48,6 @@ thxbob.lib.tech.add_recipe_unlock("advanced-material-processing-2", "bi-crushed-
|
|||
thxbob.lib.tech.add_recipe_unlock("advanced-material-processing-2", "bi-crushed-stone-3")
|
||||
thxbob.lib.tech.add_recipe_unlock("advanced-material-processing-2", "bi-crushed-stone-4")
|
||||
thxbob.lib.tech.add_recipe_unlock("advanced-material-processing-2", "bi-crushed-stone-5")
|
||||
--~ thxbob.lib.tech.add_prerequisite("advanced-material-processing-2", "concrete")
|
||||
|
||||
-- Add Wooden Chests
|
||||
thxbob.lib.tech.add_recipe_unlock("logistics", "bi-wooden-chest-large")
|
||||
|
|
@ -56,25 +55,9 @@ thxbob.lib.tech.add_recipe_unlock("logistics-2", "bi-wooden-chest-huge")
|
|||
thxbob.lib.tech.add_recipe_unlock("logistics-3", "bi-wooden-chest-giga")
|
||||
|
||||
-- Add Big and Huge electric poles to tech tree
|
||||
--~ if mods["IndustrialRevolution"] then
|
||||
--~ -- Our large wooden poles are unlocked by the "Logistics" research and require small
|
||||
--~ -- electric poles, which are unlocked by IR2 after the Iron Age has been reached. So,
|
||||
--~ -- if IR2 is active, we won't unlock our poles and use IR2's large wooden poles for
|
||||
--~ -- our huge poles instead.
|
||||
--~ local big_pole = "bi-wooden-pole-big"
|
||||
--~ thxbob.lib.tech.add_recipe_unlock ("electric-energy-distribution-1", big_pole)
|
||||
--~ thxbob.lib.tech.add_recipe_unlock ("electric-energy-distribution-2", "bi-wooden-pole-huge")
|
||||
|
||||
--~ -- Adjust localizations
|
||||
--~ for k, v in ipairs({"electric-pole", "item", "recipe"}) do
|
||||
--~ BioInd.show("Changing localization for", v)
|
||||
--~ data.raw[v][big_pole].localised_name = {"entity-name.bi-wooden-pole-bigger"}
|
||||
--~ data.raw[v][big_pole].localised_description = {"entity-description.bi-wooden-pole-bigger"}
|
||||
--~ end
|
||||
--~ else
|
||||
thxbob.lib.tech.add_recipe_unlock ("logistics", "bi-wooden-pole-big")
|
||||
thxbob.lib.tech.add_recipe_unlock ("logistics", "bi-wooden-pole-big")
|
||||
thxbob.lib.tech.add_recipe_unlock ("electric-energy-distribution-2", "bi-wooden-pole-huge")
|
||||
--~ end
|
||||
|
||||
--- Wood Floors
|
||||
-- Make wood placeable only if Dectorio isn't installed. Should leave existing flooring intact.
|
||||
|
|
@ -153,14 +136,12 @@ if BI.Settings.BI_Solar_Additions then
|
|||
thxbob.lib.tech.add_recipe_unlock("electric-energy-distribution-2", "bi-large-substation")
|
||||
thxbob.lib.tech.add_recipe_unlock("bob-solar-energy-2", "bi-bio-solar-farm")
|
||||
thxbob.lib.tech.add_recipe_unlock("bob-solar-energy-2", "bi-solar-boiler-hidden-panel")
|
||||
--~ thxbob.lib.tech.add_recipe_unlock("bob-solar-energy-2", "bi-solar-boiler")
|
||||
else
|
||||
else
|
||||
thxbob.lib.tech.add_recipe_unlock("electric-energy-accumulators", "bi-bio-accumulator")
|
||||
thxbob.lib.tech.add_recipe_unlock("electric-energy-distribution-2", "bi-large-substation")
|
||||
thxbob.lib.tech.add_recipe_unlock("solar-energy", "bi-bio-solar-farm")
|
||||
thxbob.lib.tech.add_recipe_unlock("solar-energy", "bi-solar-boiler-hidden-panel")
|
||||
--~ thxbob.lib.tech.add_recipe_unlock("solar-energy", "bi-solar-boiler")
|
||||
end
|
||||
end
|
||||
|
||||
if data.raw.technology["bob-solar-energy-3"] then
|
||||
thxbob.lib.tech.add_recipe_unlock("bob-solar-energy-3", "bi-solar-mat")
|
||||
|
|
@ -254,9 +235,7 @@ if BI.Settings.BI_Solar_Additions then
|
|||
name = "angels-electric-boiler",
|
||||
amount = 1}
|
||||
)
|
||||
--~ thxbob.lib.recipe.remove_ingredient ("bi-solar-boiler", "boiler")
|
||||
--~ thxbob.lib.recipe.add_new_ingredient ("bi-solar-boiler", {type = "item", name = "angels-electric-boiler", amount = 1})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
require("prototypes.Bio_Farm.compatible_recipes") -- Bob and Angels mesh
|
||||
|
|
@ -277,8 +256,7 @@ end
|
|||
|
||||
-- Adds Bio recipes
|
||||
if BI.Settings.BI_Bio_Fuel then
|
||||
--~ thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-bio-reactor")
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-cellulose-1")
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-cellulose-1")
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-cellulose-2")
|
||||
|
||||
-- Remove unlock for biomass-1 and add it again so all biomass recipes are next to each
|
||||
|
|
@ -294,22 +272,15 @@ if BI.Settings.BI_Bio_Fuel then
|
|||
end
|
||||
|
||||
-- Added for 0.17.49/0.18.17 (changed for 0.18.29)
|
||||
--~ thxbob.lib.tech.add_recipe_unlock("bi-tech-coal-processing-1", "bi-basic-gas-processing")
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-coal-processing-2", "bi-basic-gas-processing")
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-coal-processing-2", "bi-basic-gas-processing")
|
||||
|
||||
--~ -- Blacklist bioreactor in Assembler Pipe Passthrough
|
||||
--~ if mods["assembler-pipe-passthrough"] then
|
||||
--~ appmod.blacklist['bi-bio-reactor'] = true
|
||||
--~ end
|
||||
|
||||
if mods["angelspetrochem"] then
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-sulfur-angels")
|
||||
else
|
||||
thxbob.lib.tech.add_recipe_unlock("bi-tech-advanced-biotechnology", "bi-sulfur")
|
||||
end
|
||||
--~ thxbob.lib.recipe.add_new_ingredient("bi-adv-fertilizer-1", {type = "fluid", name = "bi-biomass", amount = 10})
|
||||
--~ thxbob.lib.recipe.add_new_ingredient("bi-adv-fertilizer-2", {type = "fluid", name = "bi-biomass", amount = 10})
|
||||
else
|
||||
else
|
||||
thxbob.lib.recipe.add_new_ingredient("bi-adv-fertilizer-1", {type = "item", name = "fertilizer", amount = 50})
|
||||
thxbob.lib.recipe.remove_ingredient ("bi-adv-fertilizer-2", "fertilizer")
|
||||
thxbob.lib.recipe.add_new_ingredient("bi-adv-fertilizer-2", {type = "item", name = "fertilizer", amount = 30})
|
||||
|
|
@ -427,9 +398,7 @@ if data.raw.item["ash"] and mods["pycoalprocessing"] then
|
|||
data.raw.recipe["bi-ash-2"].icon_size = 64
|
||||
data.raw.recipe["bi-stone-brick"].icon = ICONPATH .. "py_bi_stone_brick.png"
|
||||
data.raw.recipe["bi-stone-brick"].icon_size = 64
|
||||
--~ data.raw.recipe["bi-sulfur"].icon = ICONPATH .. "py_bio_sulfur.png"
|
||||
--~ data.raw.recipe["bi-sulfur"].icon_size = 64
|
||||
end
|
||||
end
|
||||
|
||||
----- If Bob's bobrevamp, then ----
|
||||
if mods["bobrevamp"] then
|
||||
|
|
@ -448,20 +417,7 @@ end
|
|||
|
||||
|
||||
-- We may need liquid air and nitrogen -- but not if any of the following mods is active!
|
||||
--~ local mod_list = {"angelspetrochem", "Krastorio", "Krastorio2", "pyrawores"}
|
||||
--~ local check = true
|
||||
--~ for for m, mod_name in ipairs(mod_list) do
|
||||
--~ if mod[mod_name] then
|
||||
--~ check = false
|
||||
--~ break
|
||||
--~ else
|
||||
--~ BioInd.writeDebug("Check passed: %s is not active", mod_name)
|
||||
--~ end
|
||||
--~ end
|
||||
|
||||
--~ if not (mods["angelspetrochem"] or mods["Krastorio"] or mods["Krastorio2"] or mods["pyrawores"]) then
|
||||
--~ if check then
|
||||
--~ BioInd.writeDebug("We can create the fluids now, if we need to!")
|
||||
|
||||
local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
|
||||
|
||||
|
|
@ -492,8 +448,7 @@ end
|
|||
order = "a[fluid]-b[nitrogen]"
|
||||
},
|
||||
})
|
||||
--~ BI_Functions.lib.allow_productivity("bi-nitrogen")
|
||||
BioInd.writeDebug("Made recipe for \"nitrogen\".")
|
||||
BioInd.writeDebug("Made recipe for \"nitrogen\".")
|
||||
|
||||
if not data.raw.fluid["liquid-air"] then
|
||||
data:extend({
|
||||
|
|
@ -520,8 +475,7 @@ end
|
|||
order = "a[fluid]-b[liquid-air]"
|
||||
},
|
||||
})
|
||||
--~ BI_Functions.lib.allow_productivity("bi-liquid-air")
|
||||
BioInd.writeDebug("Made recipe for \"liquid-air\".")
|
||||
BioInd.writeDebug("Made recipe for \"liquid-air\".")
|
||||
end
|
||||
|
||||
-- Recipes for "bi-liquid-air" and "bi-nitrogen" aren't needed!
|
||||
|
|
@ -642,7 +596,6 @@ local h_type
|
|||
for h_key, h_names in pairs(BI.hidden_entities.types) do
|
||||
h_type = BioInd.HE_map[h_key]
|
||||
for h_name, h in pairs(h_names) do
|
||||
--~ BioInd.writeDebug("h_type: %s\th_name: %s\th:%s", {h_type, h_name, h})
|
||||
data.raw[h_type][h_name].resistances = resistances
|
||||
BioInd.writeDebug("Added resistances to %s (%s): %s",
|
||||
{h_name, h_type, data.raw[h_type][h_name].resistances})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue