diff --git a/aluminum-burner-phase.lua b/aluminum-burner-phase.lua new file mode 100644 index 0000000..8e3f984 --- /dev/null +++ b/aluminum-burner-phase.lua @@ -0,0 +1,23 @@ +local util = require("data-util"); + +if not mods.Krastorio2 and not mods["aai-industry"] then + util.replace_ingredient("offshore-pump", "electronic-circuit", "aluminum-cable") + util.replace_ingredient("lab", "electronic-circuit", "aluminum-cable") + util.replace_ingredient("electric-mining-drill", "electronic-circuit", "aluminum-cable") + util.replace_ingredient("assembling-machine-1", "electronic-circuit", "aluminum-cable") + util.replace_ingredient("radar", "electronic-circuit", "aluminum-cable") + + -- Keep repair pack raw ingredients close to the same + util.remove_ingredient("repair-pack", "electronic-circuit") + util.add_ingredient("repair-pack", "aluminum-cable", 3) + util.add_to_ingredient("repair-pack", "iron-gear-wheel", 1) + + util.add_effect("electronics", { type = "unlock-recipe", recipe = "electronic-circuit" }) + util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" }) + util.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" }) + util.remove_recipe_effect("automation", "long-handed-inserter") + util.set_enabled("electronic-circuit", false) + util.set_enabled("inserter", false) + util.add_prerequisite("logistic-science-pack", "electronics") + util.add_prerequisite("electronics", "copper-processing") +end diff --git a/aluminum-ore.lua b/aluminum-ore.lua new file mode 100644 index 0000000..eb5c32e --- /dev/null +++ b/aluminum-ore.lua @@ -0,0 +1,83 @@ +local resource_autoplace = require('resource-autoplace'); +local noise = require('noise'); + +local util = require("data-util"); + +data:extend({ + { + type = "autoplace-control", + category = "resource", + name = "aluminum-ore", + richness = true, + order = "b-e" + }, + { + type = "noise-layer", + name = "aluminum-ore" + }, + { + type = "resource", + icon_size = 64, icon_mipmaps = 3, + name = "aluminum-ore", + icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + flags = {"placeable-neutral"}, + order="a-b-a", + map_color = {r=0.35, g=0.10, b=0.10}, + minable = + { + hardness = 1, + mining_particle = mods.bztitanium and "titanium-ore-particle" or "iron-ore-particle", + mining_time = 1, + result = "aluminum-ore" + }, + collision_box = {{ -0.1, -0.1}, {0.1, 0.1}}, + selection_box = {{ -0.5, -0.5}, {0.5, 0.5}}, + + autoplace = resource_autoplace.resource_autoplace_settings{ + name = "aluminum-ore", + order = "b-z", + base_density = 6, + base_spots_per_km2 = 1, + has_starting_area_placement = true, + regular_rq_factor_multiplier = 1.2, + starting_rq_factor_multiplier = 1.7, + }, + + stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, + stages = + { + sheet = + { + filename = "__bzaluminum__/graphics/entity/ores/aluminum-ore.png", + priority = "extra-high", + size = 64, + frame_count = 8, + variation_count = 8, + hr_version = + { + filename = "__bzaluminum__/graphics/entity/ores/hr-aluminum-ore.png", + priority = "extra-high", + size = 128, + frame_count = 8, + variation_count = 8, + scale = 0.5 + } + } + }, + }, + { + type = "item", + name = "aluminum-ore", + icon_size = 64, icon_mipmaps = 3, + icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + pictures = { + {filename="__bzaluminum__/graphics/icons/aluminum-ore.png", size=64, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-1.png", size=64, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.25}, + }, + subgroup = "raw-resource", + order = "t-c-a", + stack_size = util.get_stack_size(50) + }, +}) diff --git a/lead-recipe-final-rrr.lua b/aluminum-recipe-final-rrr.lua similarity index 65% rename from lead-recipe-final-rrr.lua rename to aluminum-recipe-final-rrr.lua index 6e57a43..4a05fd4 100644 --- a/lead-recipe-final-rrr.lua +++ b/aluminum-recipe-final-rrr.lua @@ -1,15 +1,15 @@ -local util = require("__bzlead__.data-util"); +local util = require("data-util"); if mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then table.insert(data.raw.recipe["rrr-stone-processing"].results, - {name = "lead-ore", probability = 0.25, amount = 1} + {name = "aluminum-ore", probability = 0.25, amount = 1} ) end if data.raw.recipe["rrr-raw-ores-processing"] then table.insert(data.raw.recipe["rrr-raw-ores-processing"].results, - {name = "lead-ore", probability = 0.75, amount = 10} + {name = "aluminum-ore", probability = 0.75, amount = 10} ) end diff --git a/lead-recipe-modules.lua b/aluminum-recipe-modules.lua similarity index 100% rename from lead-recipe-modules.lua rename to aluminum-recipe-modules.lua diff --git a/aluminum-recipe.lua b/aluminum-recipe.lua new file mode 100644 index 0000000..f608a2a --- /dev/null +++ b/aluminum-recipe.lua @@ -0,0 +1,131 @@ +-- Aluminum smelting + +local util = require("data-util"); + +local alumina_results = {} + +if mods.bzsilicon and not mods.Krastorio2 then + alumina_results ={ + {type="item", name = "alumina", amount=1, probability=0.95}, + {type="item", name = "silica", amount=1, probability=0.05}, + } +elseif mods.bzsilicon and mods.Krastorio2 then + alumina_results ={ + {type="item", name = "alumina", amount=5, probability=0.95}, + {type="item", name = "silica", amount=1, probability=0.05}, + } +elseif mods.Krastorio2 then + alumina_results ={ + {type="item", name = "alumina", amount=5}, + } +else + alumina_results ={ + {type="item", name = "alumina", amount=1}, + } +end + +if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] ) then +data:extend({ + { + type = "recipe", + name = "alumina", + category = "smelting", + subgroup = "raw-material", + order = "d[alumina]", + icons = (mods["Krastorio2"] and + { + { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + } or { + { icon = "__bzaluminum__/graphics/icons/aluminaaluminum-plate.png", icon_size = 128}, + } +), + enabled = true, + energy_required = mods.Krastorio2 and 16 or 3.2, + ingredients = {{"aluminum-ore", mods.Krastorio2 and 10 or 1}}, + results = alumina_results, + }, + { + type = "recipe", + name = "aluminum-plate", + category = "smelting", + subgroup = "raw-material", + order = "d[aluminum-plate]", + icons = (mods["Krastorio2"] and + { + { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, + } or { + { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, + } +), + normal = (mods["Krastorio2"] and + { + enabled = true, + energy_required = 16, + ingredients = {{"alumina", 10}}, + results = { + {type="item", name = "aluminum-plate", amount=10} + } + } or + { + enabled = true, + energy_required = 3.2, + ingredients = {{"alumina", 1}}, + results = { + {type="item", name = "aluminum-plate", amount=1} + } + }), + expensive = + { + enabled = true, + energy_required = 3.2, + ingredients = {{"alumina", 2}}, + results = { + {type="item", name = "aluminum-plate", amount=1}, + } + } + }, + { + type = "item", + name = "alumina", + icon = "__bzaluminum__/graphics/icons/alumina.png", + icon_size = 128, + subgroup = "raw-material", + order = "b[alumina]", + stack_size = util.get_stack_size(100) + }, + { + type = "item", + name = "aluminum-plate", + icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", + icon_size = 128, + subgroup = "raw-material", + order = "b[aluminum-plate]", + stack_size = util.get_stack_size(100) + }, +}) + +data:extend({ + { + type = "item", + name = "aluminum-cable", + icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", + icon_size = 64, icon_mipmaps = 4, + subgroup = "intermediate-product", + order = "b[aluminum-cable]", + stack_size = util.get_stack_size(100), + }, + { + type = "recipe", + name = "aluminum-cable", + category = "crafting", + order = "d[aluminum-cable]", + enabled = true, + energy_required = 0.5, + ingredients = {{"aluminum-plate", 2}}, + results = {{"aluminum-cable", 1}}, + } +}) + +end diff --git a/changelog.txt b/changelog.txt index 66ebe40..dbc3437 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ --------------------------------------------------------------------------------------------------- Version: 0.0.1 -Date: 2021-11-29 +Date: 2022-01-29 Features: - Alpha version diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 9ae9778..fd8128d 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,46 +1,22 @@ -require("lead-recipe-final-stacking") -require("lead-recipe-modules") -require("lead-recipe-colors") -require("lead-recipe-final-5d") -require("lead-recipe-final-rrr") +require("aluminum-recipe-final-stacking") +require("aluminum-recipe-modules") +-- require("aluminum-recipe-final-5d") +require("aluminum-recipe-final-rrr") + +require("aluminum-burner-phase") ----- - -local util = require("__bzlead__.data-util"); - -if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then --- If furnaces are treated as furnaces, we need 2 outputs -for i, entity in pairs(data.raw.furnace) do - if entity.result_inventory_size ~= nil and entity.result_inventory_size < 2 and util.contains(entity.crafting_categories, "smelting") then - entity.result_inventory_size = 2 - end -end -end - -if mods["Krastorio2"] then - util.replace_ingredient("rifle-magazine", "iron-plate", "lead-plate") - util.replace_ingredient("anti-material-rifle-magazine", "iron-plate", "lead-plate") - util.replace_some_ingredient("kr-crusher", "iron-beam", 5, "lead-plate", 5) - util.replace_ingredient("kr-shelter", "iron-plate", "lead-plate") - util.add_ingredient("kr-advanced-furnace", "lead-plate", 20) - util.replace_ingredient("uranium-fuel-cell", "steel-plate", "lead-plate") - util.replace_some_ingredient("kr-fluid-storage-1", "steel-plate", 10, "lead-plate", 10) - util.replace_some_ingredient("kr-fluid-storage-2", "steel-plate", 30, "lead-plate", 30) -end - -if mods["modmashsplintergold"] then - if mods["Krastorio2"] then - util.replace_ingredient("rifle-magazine-with-gold", "iron-plate", "lead-plate") - util.replace_ingredient("anti-material-rifle-magazine-with-gold", "iron-plate", "lead-plate") - end -end +local util = require("data-util"); if mods["space-exploration"] then -- Organization - data.raw.item["lead-plate"].subgroup = "plates" - data.raw.recipe["lead-plate"].subgroup = "plates" + data.raw.item["aluminum-plate"].subgroup = "plates" + data.raw.recipe["aluminum-plate"].subgroup = "plates" -- core mining balancing - util.add_to_product("se-core-fragment-omni", "lead-ore", -4) + util.add_to_product("se-core-fragment-omni", "aluminum-ore", -3) end + + +-- Must be last +util.create_list() diff --git a/data-updates.lua b/data-updates.lua index d28c4b0..7dcf709 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -1,5 +1,29 @@ -require("lead-recipe-updates") -require("lead-matter") -require("omni") +require("aluminum-recipe-updates") +require("aluminum-matter") +-- require("omni") require("map-gen-preset-updates") require("strange-matter") + +if data.raw.resource["copper-ore"] then + if mods["space-exploration"] then + local noise = require('noise'); + -- decrease richness of copper a bit + data.raw.resource["copper-ore"].autoplace.richness_expression = + data.raw.resource["copper-ore"].autoplace.richness_expression * noise.to_noise_expression(3/4) + else + log("Replacing vanilla copper-ore autoplace") + local resource_autoplace = require('resource-autoplace'); + data.raw.resource["copper-ore"].autoplace = resource_autoplace.resource_autoplace_settings{ + name = "copper-ore", + order = "b", + base_density = 6, -- decreased from 8 in vanilla + has_starting_area_placement = true, + regular_rq_factor_multiplier = 1.1, + starting_rq_factor_multiplier = 1.1, + candidate_spot_count = 22, + } + end +end + +-- Must be last +util.create_list() diff --git a/data.lua b/data.lua index 164915b..8046849 100644 --- a/data.lua +++ b/data.lua @@ -1,9 +1,8 @@ -require("lead-ore") -require("lead-ore-particle") -require("lead-recipe") -require("other-entities") -require("lead-enriched") -- Enriched Ti for Krastorio 2 -require("lead-recipe-se") -- Space Exploration special recipes (depends on K2 if present) -require("lead-compressed") -require("lead-sim") +require("aluminum-ore") +require("aluminum-recipe") +-- require("aluminum-enriched") -- Enriched Al for Krastorio 2 +-- require("aluminum-recipe-se") +-- require("aluminum-compressed") +-- Must be last +util.create_list() diff --git a/graphics/entity/ores/aluminum-ore.png b/graphics/entity/ores/aluminum-ore.png new file mode 100644 index 0000000..ba1b856 Binary files /dev/null and b/graphics/entity/ores/aluminum-ore.png differ diff --git a/graphics/entity/ores/hr-aluminum-ore.png b/graphics/entity/ores/hr-aluminum-ore.png new file mode 100644 index 0000000..d342591 Binary files /dev/null and b/graphics/entity/ores/hr-aluminum-ore.png differ diff --git a/graphics/entity/ores/hr-aluminum-ore.xcf b/graphics/entity/ores/hr-aluminum-ore.xcf new file mode 100644 index 0000000..ac97d8f Binary files /dev/null and b/graphics/entity/ores/hr-aluminum-ore.xcf differ diff --git a/graphics/entity/ores/hr-zircon.png b/graphics/entity/ores/hr-zircon.png deleted file mode 100644 index 27579a9..0000000 Binary files a/graphics/entity/ores/hr-zircon.png and /dev/null differ diff --git a/graphics/entity/ores/hr-zircon.xcf b/graphics/entity/ores/hr-zircon.xcf deleted file mode 100644 index 75c42f7..0000000 Binary files a/graphics/entity/ores/hr-zircon.xcf and /dev/null differ diff --git a/graphics/entity/ores/zircon.png b/graphics/entity/ores/zircon.png deleted file mode 100644 index a529067..0000000 Binary files a/graphics/entity/ores/zircon.png and /dev/null differ diff --git a/graphics/entity/ores/zircon.xcf b/graphics/entity/ores/zircon.xcf deleted file mode 100644 index 0a0ac0b..0000000 Binary files a/graphics/entity/ores/zircon.xcf and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-1.png b/graphics/entity/zircon-particle/hr-zircon-particle-1.png deleted file mode 100644 index e241086..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-1.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-2.png b/graphics/entity/zircon-particle/hr-zircon-particle-2.png deleted file mode 100644 index 7099218..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-2.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-3.png b/graphics/entity/zircon-particle/hr-zircon-particle-3.png deleted file mode 100644 index cf15c66..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-3.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-4.png b/graphics/entity/zircon-particle/hr-zircon-particle-4.png deleted file mode 100644 index 307d7cd..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-4.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png deleted file mode 100644 index ebef3b3..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png deleted file mode 100644 index b9fc4f5..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png deleted file mode 100644 index a3b24e4..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png deleted file mode 100644 index 02cca1a..0000000 Binary files a/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-1.png b/graphics/entity/zircon-particle/zircon-particle-1.png deleted file mode 100644 index 1b76c18..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-1.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-2.png b/graphics/entity/zircon-particle/zircon-particle-2.png deleted file mode 100644 index 0bf7c6b..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-2.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-3.png b/graphics/entity/zircon-particle/zircon-particle-3.png deleted file mode 100644 index 35c156a..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-3.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-4.png b/graphics/entity/zircon-particle/zircon-particle-4.png deleted file mode 100644 index 9f5115c..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-4.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-shadow-1.png b/graphics/entity/zircon-particle/zircon-particle-shadow-1.png deleted file mode 100644 index 89bfee9..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-shadow-1.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-shadow-2.png b/graphics/entity/zircon-particle/zircon-particle-shadow-2.png deleted file mode 100644 index 7834934..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-shadow-2.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-shadow-3.png b/graphics/entity/zircon-particle/zircon-particle-shadow-3.png deleted file mode 100644 index 6ef2544..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-shadow-3.png and /dev/null differ diff --git a/graphics/entity/zircon-particle/zircon-particle-shadow-4.png b/graphics/entity/zircon-particle/zircon-particle-shadow-4.png deleted file mode 100644 index a8aa006..0000000 Binary files a/graphics/entity/zircon-particle/zircon-particle-shadow-4.png and /dev/null differ diff --git a/graphics/icons/zirconia.blend b/graphics/icons/alumina.blend similarity index 100% rename from graphics/icons/zirconia.blend rename to graphics/icons/alumina.blend diff --git a/graphics/icons/zirconia.blend.png b/graphics/icons/alumina.blend.png similarity index 100% rename from graphics/icons/zirconia.blend.png rename to graphics/icons/alumina.blend.png diff --git a/graphics/icons/zirconia.blend1 b/graphics/icons/alumina.blend1 similarity index 100% rename from graphics/icons/zirconia.blend1 rename to graphics/icons/alumina.blend1 diff --git a/graphics/icons/alumina.png b/graphics/icons/alumina.png new file mode 100644 index 0000000..274d8c2 Binary files /dev/null and b/graphics/icons/alumina.png differ diff --git a/graphics/icons/alumina.xcf b/graphics/icons/alumina.xcf new file mode 100644 index 0000000..f80711f Binary files /dev/null and b/graphics/icons/alumina.xcf differ diff --git a/graphics/icons/aluminum-cable.xcf b/graphics/icons/aluminum-cable.xcf new file mode 100644 index 0000000..6a16389 Binary files /dev/null and b/graphics/icons/aluminum-cable.xcf differ diff --git a/graphics/icons/zircon-2.png b/graphics/icons/aluminum-ore-2.png similarity index 100% rename from graphics/icons/zircon-2.png rename to graphics/icons/aluminum-ore-2.png diff --git a/graphics/icons/zircon-2.xcf b/graphics/icons/aluminum-ore-2.xcf similarity index 100% rename from graphics/icons/zircon-2.xcf rename to graphics/icons/aluminum-ore-2.xcf diff --git a/graphics/icons/zircon-3.png b/graphics/icons/aluminum-ore-3.png similarity index 100% rename from graphics/icons/zircon-3.png rename to graphics/icons/aluminum-ore-3.png diff --git a/graphics/icons/zircon-3.xcf b/graphics/icons/aluminum-ore-3.xcf similarity index 100% rename from graphics/icons/zircon-3.xcf rename to graphics/icons/aluminum-ore-3.xcf diff --git a/graphics/icons/zircon-4.png b/graphics/icons/aluminum-ore-4.png similarity index 100% rename from graphics/icons/zircon-4.png rename to graphics/icons/aluminum-ore-4.png diff --git a/graphics/icons/zircon-4.xcf b/graphics/icons/aluminum-ore-4.xcf similarity index 100% rename from graphics/icons/zircon-4.xcf rename to graphics/icons/aluminum-ore-4.xcf diff --git a/graphics/icons/zircon-powder.png b/graphics/icons/aluminum-ore-powder.png similarity index 100% rename from graphics/icons/zircon-powder.png rename to graphics/icons/aluminum-ore-powder.png diff --git a/graphics/icons/zircon-powder.xcf b/graphics/icons/aluminum-ore-powder.xcf similarity index 100% rename from graphics/icons/zircon-powder.xcf rename to graphics/icons/aluminum-ore-powder.xcf diff --git a/graphics/icons/zircon-stacked-new.xcf b/graphics/icons/aluminum-ore-stacked-new.xcf similarity index 100% rename from graphics/icons/zircon-stacked-new.xcf rename to graphics/icons/aluminum-ore-stacked-new.xcf diff --git a/graphics/icons/zircon.png b/graphics/icons/aluminum-ore.png similarity index 100% rename from graphics/icons/zircon.png rename to graphics/icons/aluminum-ore.png diff --git a/graphics/icons/zircon.xcf b/graphics/icons/aluminum-ore.xcf similarity index 100% rename from graphics/icons/zircon.xcf rename to graphics/icons/aluminum-ore.xcf diff --git a/graphics/icons/aluminum-plate.png b/graphics/icons/aluminum-plate.png new file mode 100644 index 0000000..289dd5e Binary files /dev/null and b/graphics/icons/aluminum-plate.png differ diff --git a/graphics/icons/aluminum-plate.xcf b/graphics/icons/aluminum-plate.xcf new file mode 100644 index 0000000..97667c5 Binary files /dev/null and b/graphics/icons/aluminum-plate.xcf differ diff --git a/graphics/icons/cermet.blend b/graphics/icons/cermet.blend deleted file mode 100644 index 268b4ea..0000000 Binary files a/graphics/icons/cermet.blend and /dev/null differ diff --git a/graphics/icons/cermet.blend1 b/graphics/icons/cermet.blend1 deleted file mode 100644 index 5aed875..0000000 Binary files a/graphics/icons/cermet.blend1 and /dev/null differ diff --git a/graphics/icons/cermet.png b/graphics/icons/cermet.png deleted file mode 100644 index a6e6649..0000000 Binary files a/graphics/icons/cermet.png and /dev/null differ diff --git a/graphics/icons/cermet.xcf b/graphics/icons/cermet.xcf deleted file mode 100644 index 4874ad7..0000000 Binary files a/graphics/icons/cermet.xcf and /dev/null differ diff --git a/graphics/icons/enriched-zircon-2.png b/graphics/icons/enriched-aluminum-ore-2.png similarity index 100% rename from graphics/icons/enriched-zircon-2.png rename to graphics/icons/enriched-aluminum-ore-2.png diff --git a/graphics/icons/enriched-zircon-2.xcf b/graphics/icons/enriched-aluminum-ore-2.xcf similarity index 100% rename from graphics/icons/enriched-zircon-2.xcf rename to graphics/icons/enriched-aluminum-ore-2.xcf diff --git a/graphics/icons/enriched-zircon-3.png b/graphics/icons/enriched-aluminum-ore-3.png similarity index 100% rename from graphics/icons/enriched-zircon-3.png rename to graphics/icons/enriched-aluminum-ore-3.png diff --git a/graphics/icons/enriched-zircon-3.xcf b/graphics/icons/enriched-aluminum-ore-3.xcf similarity index 100% rename from graphics/icons/enriched-zircon-3.xcf rename to graphics/icons/enriched-aluminum-ore-3.xcf diff --git a/graphics/icons/enriched-zircon-4.png b/graphics/icons/enriched-aluminum-ore-4.png similarity index 100% rename from graphics/icons/enriched-zircon-4.png rename to graphics/icons/enriched-aluminum-ore-4.png diff --git a/graphics/icons/enriched-zircon-4.xcf b/graphics/icons/enriched-aluminum-ore-4.xcf similarity index 100% rename from graphics/icons/enriched-zircon-4.xcf rename to graphics/icons/enriched-aluminum-ore-4.xcf diff --git a/graphics/icons/enriched-zircon.png b/graphics/icons/enriched-aluminum-ore.png similarity index 100% rename from graphics/icons/enriched-zircon.png rename to graphics/icons/enriched-aluminum-ore.png diff --git a/graphics/icons/enriched-zircon.xcf b/graphics/icons/enriched-aluminum-ore.xcf similarity index 100% rename from graphics/icons/enriched-zircon.xcf rename to graphics/icons/enriched-aluminum-ore.xcf diff --git a/graphics/icons/stacked/zirconia-stacked.png b/graphics/icons/stacked/alumina-stacked.png similarity index 100% rename from graphics/icons/stacked/zirconia-stacked.png rename to graphics/icons/stacked/alumina-stacked.png diff --git a/graphics/icons/stacked/zirconia-stacked.xcf b/graphics/icons/stacked/alumina-stacked.xcf similarity index 100% rename from graphics/icons/stacked/zirconia-stacked.xcf rename to graphics/icons/stacked/alumina-stacked.xcf diff --git a/graphics/icons/stacked/zircon-stacked.png b/graphics/icons/stacked/aluminum-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/zircon-stacked.png rename to graphics/icons/stacked/aluminum-ore-stacked.png diff --git a/graphics/icons/stacked/zircon-stacked.xcf b/graphics/icons/stacked/aluminum-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/zircon-stacked.xcf rename to graphics/icons/stacked/aluminum-ore-stacked.xcf diff --git a/graphics/icons/stacked/zirconium-plate-stacked.png b/graphics/icons/stacked/aluminum-plate-stacked.png similarity index 100% rename from graphics/icons/stacked/zirconium-plate-stacked.png rename to graphics/icons/stacked/aluminum-plate-stacked.png diff --git a/graphics/icons/stacked/zirconium-plate-stacked.xcf b/graphics/icons/stacked/aluminum-plate-stacked.xcf similarity index 100% rename from graphics/icons/stacked/zirconium-plate-stacked.xcf rename to graphics/icons/stacked/aluminum-plate-stacked.xcf diff --git a/graphics/icons/stacked/cermet-stacked.png b/graphics/icons/stacked/cermet-stacked.png deleted file mode 100644 index 672af04..0000000 Binary files a/graphics/icons/stacked/cermet-stacked.png and /dev/null differ diff --git a/graphics/icons/stacked/cermet-stacked.xcf b/graphics/icons/stacked/cermet-stacked.xcf deleted file mode 100644 index 85b1d46..0000000 Binary files a/graphics/icons/stacked/cermet-stacked.xcf and /dev/null differ diff --git a/graphics/icons/stacked/enriched-zircon-stacked.png b/graphics/icons/stacked/enriched-aluminum-ore-stacked.png similarity index 100% rename from graphics/icons/stacked/enriched-zircon-stacked.png rename to graphics/icons/stacked/enriched-aluminum-ore-stacked.png diff --git a/graphics/icons/stacked/enriched-zircon-stacked.xcf b/graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf similarity index 100% rename from graphics/icons/stacked/enriched-zircon-stacked.xcf rename to graphics/icons/stacked/enriched-aluminum-ore-stacked.xcf diff --git a/graphics/icons/zirconia.png b/graphics/icons/zirconia.png deleted file mode 100644 index 1ae8200..0000000 Binary files a/graphics/icons/zirconia.png and /dev/null differ diff --git a/graphics/icons/zirconia.xcf b/graphics/icons/zirconia.xcf deleted file mode 100644 index 9161cf1..0000000 Binary files a/graphics/icons/zirconia.xcf and /dev/null differ diff --git a/graphics/icons/zirconium-plate-2.xcf b/graphics/icons/zirconium-plate-2.xcf deleted file mode 100644 index b8f17d1..0000000 Binary files a/graphics/icons/zirconium-plate-2.xcf and /dev/null differ diff --git a/graphics/icons/zirconium-plate-new.xcf b/graphics/icons/zirconium-plate-new.xcf deleted file mode 100644 index 80d9a5a..0000000 Binary files a/graphics/icons/zirconium-plate-new.xcf and /dev/null differ diff --git a/graphics/icons/zirconium-plate-old.png b/graphics/icons/zirconium-plate-old.png deleted file mode 100644 index 1303083..0000000 Binary files a/graphics/icons/zirconium-plate-old.png and /dev/null differ diff --git a/graphics/icons/zirconium-plate-old.xcf b/graphics/icons/zirconium-plate-old.xcf deleted file mode 100644 index 1e8db90..0000000 Binary files a/graphics/icons/zirconium-plate-old.xcf and /dev/null differ diff --git a/graphics/icons/zirconium-plate.blend b/graphics/icons/zirconium-plate.blend deleted file mode 100644 index ae245d5..0000000 Binary files a/graphics/icons/zirconium-plate.blend and /dev/null differ diff --git a/graphics/icons/zirconium-plate.blend1 b/graphics/icons/zirconium-plate.blend1 deleted file mode 100644 index e6cc43a..0000000 Binary files a/graphics/icons/zirconium-plate.blend1 and /dev/null differ diff --git a/graphics/icons/zirconium-plate.png b/graphics/icons/zirconium-plate.png deleted file mode 100644 index fd6f353..0000000 Binary files a/graphics/icons/zirconium-plate.png and /dev/null differ diff --git a/graphics/icons/zirconium-plate.xcf b/graphics/icons/zirconium-plate.xcf deleted file mode 100644 index e33405f..0000000 Binary files a/graphics/icons/zirconium-plate.xcf and /dev/null differ diff --git a/graphics/technology/cermet.png b/graphics/technology/cermet.png deleted file mode 100644 index f032e04..0000000 Binary files a/graphics/technology/cermet.png and /dev/null differ diff --git a/graphics/technology/zirconia-processing.png b/graphics/technology/zirconia-processing.png deleted file mode 100644 index f4f912c..0000000 Binary files a/graphics/technology/zirconia-processing.png and /dev/null differ diff --git a/graphics/technology/zirconium-processing.png b/graphics/technology/zirconium-processing.png deleted file mode 100644 index 703a119..0000000 Binary files a/graphics/technology/zirconium-processing.png and /dev/null differ diff --git a/graphics/technology/zirconium-processing.xcf b/graphics/technology/zirconium-processing.xcf deleted file mode 100644 index a3cf7c2..0000000 Binary files a/graphics/technology/zirconium-processing.xcf and /dev/null differ diff --git a/info.json b/info.json index 5a31ed5..e9d1507 100644 --- a/info.json +++ b/info.json @@ -1,18 +1,19 @@ { - "name": "bzmod", + "name": "bzaluminum", "version": "0.0.1", "factorio_version": "1.1", - "title": "Mod", + "title": "Aluminum", "author": "Brevven", "contact": "", "homepage": "", "dependencies": [ "base >= 1.1.0", "? space-exploration", + "? aai-industry", "? Krastorio2", "? deadlock-beltboxes-loaders", "? DeadlockCrating" ], - "description": "Adds ... to the game" + "description": "Adds aluminum, alumina, and cable and alloys and more to the game\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods." } diff --git a/lead-ore-particle.lua b/lead-ore-particle.lua deleted file mode 100644 index 556a29a..0000000 --- a/lead-ore-particle.lua +++ /dev/null @@ -1,144 +0,0 @@ -data:extend( -{ - { - type = "optimized-particle", - name = "lead-ore-particle", - flags = {"not-on-map"}, - life_time = 180, - pictures = - { - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-1.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-2.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-3.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-4.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - } - }, - shadows = - { - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-shadow-1.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-shadow-2.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-shadow-3.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/lead-ore-particle-shadow-4.png", - priority = "extra-high", - width = 16, - height = 16, - frame_count = 1, - hr_version = - { - filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - } - } - } -} -) diff --git a/lead-ore.lua b/lead-ore.lua deleted file mode 100644 index 9737b5a..0000000 --- a/lead-ore.lua +++ /dev/null @@ -1,96 +0,0 @@ -local resource_autoplace = require('resource-autoplace'); -local noise = require('noise'); - -local util = require("__bzlead__.data-util"); - -data:extend({ - { - type = "autoplace-control", - category = "resource", - name = "lead-ore", - richness = true, - order = "b-e" - }, - { - type = "noise-layer", - name = "lead-ore" - }, - { - type = "resource", - icon_size = 64, icon_mipmaps = 3, - name = "lead-ore", - icon = "__bzlead__/graphics/icons/lead-ore.png", - flags = {"placeable-neutral"}, - order="a-b-a", - map_color = {r=0.35, g=0.10, b=0.10}, - minable = - { - hardness = 1, - mining_particle = "lead-ore-particle", - mining_time = 1, - result = "lead-ore" - }, - collision_box = {{ -0.1, -0.1}, {0.1, 0.1}}, - selection_box = {{ -0.5, -0.5}, {0.5, 0.5}}, - - autoplace = resource_autoplace.resource_autoplace_settings{ - name = "lead-ore", - order = "b-z", - base_density = 6, - base_spots_per_km2 = 1, - has_starting_area_placement = true, - regular_rq_factor_multiplier = 1.2, - starting_rq_factor_multiplier = 1.7, - }, - - stage_counts = {15000, 9500, 5500, 2900, 1300, 400, 150, 80}, - stages = - { - sheet = - { - filename = "__bzlead__/graphics/entity/ores/lead-ore.png", - priority = "extra-high", - size = 64, - frame_count = 8, - variation_count = 8, - hr_version = - { - filename = "__bzlead__/graphics/entity/ores/hr-lead-ore.png", - priority = "extra-high", - size = 128, - frame_count = 8, - variation_count = 8, - scale = 0.5 - } - } - }, - }, - { - type = "item", - name = "lead-ore", - icon_size = 64, icon_mipmaps = 3, - icon = "__bzlead__/graphics/icons/lead-ore.png", - pictures = { - {filename="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/lead-ore-1.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/lead-ore-2.png", size=64, scale=0.25}, - {filename="__bzlead__/graphics/icons/lead-ore-3.png", size=64, scale=0.25}, - }, - subgroup = "raw-resource", - order = "t-c-a", - stack_size = util.get_stack_size(50) - }, -}) - -local richness = data.raw.resource["lead-ore"].autoplace.richness_expression - --- Modify lead autoplace richness: --- Up to 200 tiles it's standard --- From 200 to 700 tiles, richness scales linearly down, until --- From 700 tiles onward, it's about 1/6th the richness. -data.raw.resource["lead-ore"].autoplace.richness_expression = - richness * noise.if_else_chain( - noise.less_than(noise.distance_from(noise.var("x"), noise.var("y"), noise.var("starting_positions")), noise.to_noise_expression(200)), 1, - noise.less_than(noise.distance_from(noise.var("x"), noise.var("y"), noise.var("starting_positions")), noise.to_noise_expression(700)), - 100 / (noise.distance_from(noise.var("x"), noise.var("y"), noise.var("starting_positions")) - 100), - 0.17) diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg new file mode 100644 index 0000000..3d57157 --- /dev/null +++ b/locale/en/aluminum.cfg @@ -0,0 +1,50 @@ +[entity-name] +aluminum-ore=Aluminum + +[autoplace-control-names] +aluminum-ore=[item=aluminum-ore] Aluminum ore + +[item-name] +aluminum-ore=Aluminum ore +aluminum-dust=Aluminum dust +aluminum-plate=Aluminum plate +aluminum-2219=Aluminum 2219 +enriched-aluminum=Enriched aluminum +compressed-aluminum-ore=Compressed aluminum ore + +[item-description] +aluminum-ore=Can be smelted into aluminum plates +enriched-aluminum=Can be efficiently smelted into aluminum plates +aluminum-2219=An aerospace-grade aluminum alloy + +[technology-name] +enriched-aluminum=Enriched Aluminum +aluminum-matter-processing=Aluminum conversion + +[technology-description] +enriched-aluminum=Enrich aluminum ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. + +[recipe-name] +enriched-aluminum=__ITEM__enriched-aluminum__ +aluminum-plate=__ITEM__aluminum-plate__ +smelt-compressed-aluminum-ore=__ITEM__aluminum-plate__ +aluminum-dust=__ITEM__aluminum-dust__ +dirty-water-filtration-aluminum=Filter dirty water [item=aluminum-ore] +bz-aluminum-ingot=Aluminum ingot + +[recipe-description] +enriched-aluminum=Enrich aluminum ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. + +dirty-water-filtration-aluminum=Filter dirty water, giving aluminum ore [item=aluminum-ore], copper ore [item=copper-ore] and stone [item=stone] (probabilistically). + +# Settings + +[mod-setting-name] +bzaluminum-recipe-bypass=Bypass recipes +bzaluminum-more-entities=Aluminum entities +bzaluminum-sulfuric=Use aluminum in sulfuric acid. Default "yes". Use with care. + +[mod-setting-description] +bzaluminum-recipe-bypass=Skip modifying these recipes (comma-separated list). +bzaluminum-more-entities=Adds aluminum entities (currently just a aluminum chest). +bzaluminum-sulfuric=Adds compatibility for old saves. Do NOT change to "no" for new saves. Will be removed (and always "yes") in 2022. diff --git a/locale/en/lead.cfg b/locale/en/lead.cfg deleted file mode 100644 index 3ba4775..0000000 --- a/locale/en/lead.cfg +++ /dev/null @@ -1,51 +0,0 @@ -[entity-name] -lead-ore=Lead -lead-chest=Lead chest - -[autoplace-control-names] -lead-ore=[item=lead-ore] Lead ore - -[item-name] -lead-ore=Lead ore -lead-dust=Lead dust -lead-plate=Lead plate -lead-alloy=__ITEM__lead-plate__ -enriched-lead=Enriched lead -lead-chest=Lead chest -compressed-lead-ore=Compressed lead ore - -[item-description] -lead-ore=Can be smelted into lead plates -enriched-lead=Can be efficiently smelted into lead plates - -[technology-name] -enriched-lead=Enriched Lead -lead-matter-processing=Lead conversion - -[technology-description] -enriched-lead=Enrich lead ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. - -[recipe-name] -enriched-lead=__ITEM__enriched-lead__ -lead-plate=__ITEM__lead-plate__ -smelt-compressed-lead-ore=__ITEM__lead-plate__ -lead-dust=__ITEM__lead-dust__ -dirty-water-filtration-lead=Filter dirty water [item=lead-ore] -bz-lead-ingot=Lead ingot - -[recipe-description] -enriched-lead=Enrich lead ore, purifying with sulfuric acid [fluid=sulfuric-acid] and water [fluid=water], improving the final yield. Produce dirty water [fluid=dirty-water] as a byproduct. - -dirty-water-filtration-lead=Filter dirty water, giving lead ore [item=lead-ore], copper ore [item=coppper-ore] and stone [item=stone] (probabilistically). - -# Settings - -[mod-setting-name] -bzlead-recipe-bypass=Bypass recipes -bzlead-more-entities=Lead entities -bzlead-sulfuric=Use lead in sulfuric acid. Default "yes". Use with care. - -[mod-setting-description] -bzlead-recipe-bypass=Skip modifying these recipes (comma-separated list). -bzlead-more-entities=Adds lead entities (currently just a lead chest). -bzlead-sulfuric=Adds compatibility for old saves. Do NOT change to "no" for new saves. Will be removed (and always "yes") in 2022. diff --git a/map-gen-preset-updates.lua b/map-gen-preset-updates.lua index b3256ff..85903fe 100644 --- a/map-gen-preset-updates.lua +++ b/map-gen-preset-updates.lua @@ -4,7 +4,7 @@ if data.raw["map-gen-presets"] and data.raw["map-gen-presets"].default then preset.basic_settings and preset.basic_settings.autoplace_controls and preset.basic_settings.autoplace_controls["iron-ore"] then - preset.basic_settings.autoplace_controls["lead-ore"] = preset.basic_settings.autoplace_controls["iron-ore"] + preset.basic_settings.autoplace_controls["aluminum-ore"] = preset.basic_settings.autoplace_controls["iron-ore"] end end end diff --git a/me.lua b/me.lua index 5bd08b4..45b91d7 100644 --- a/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzmod" +me.name = "bzaluminum" function me.mod_setting() return me.get_setting("bzmod-setting") == "yes" @@ -20,4 +20,11 @@ if me.get_setting(me.name.."-recipe-bypass") then end end +function me.add_modified(name) + if me.get_setting(me.name.."-list") then + table.insert(me.list, name) + end +end + + return me diff --git a/settings.lua b/settings.lua index 2936f59..7067a79 100644 --- a/settings.lua +++ b/settings.lua @@ -1,23 +1,17 @@ +local util = require("data-util"); + data:extend({ { type = "string-setting", - name = "bzlead-recipe-bypass", + name = util.me.name.."-recipe-bypass", setting_type = "startup", default_value = "", allow_blank = true, }, { - type = "string-setting", - name = "bzlead-more-entities", + type = "bool-setting", + name = util.me.name.."-list", setting_type = "startup", - default_value = "no", - allowed_values = {"yes", "no"}, - }, - { -- TODO remove this in 2022 - type = "string-setting", - name = "bzlead-sulfuric", - setting_type = "startup", - default_value = "yes", - allowed_values = {"yes", "no"}, + default_value = false, }, }) diff --git a/thumbnail.png b/thumbnail.png index 9531a24..a4aea80 100644 Binary files a/thumbnail.png and b/thumbnail.png differ diff --git a/thumbnail.xcf b/thumbnail.xcf index 1ac0079..5856720 100644 Binary files a/thumbnail.xcf and b/thumbnail.xcf differ