diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bbf3e21 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,3 @@ +[*] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/README.md b/README.md index a28a2f5..1faf65d 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ See changelog.txt - [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates) - FreeSVG/OpenClipart for spark plug: https://freesvg.org/spark-plug-vector-image - Krastorio2 team for automation-core icons (Licensed under GNU LGPL v3.0) +- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (Update to 2.0) ### Compatibility - [U.N.Owen](https://mods.factorio.com/user/U.N.Owen) diff --git a/aluminum-burner-phase.lua b/aluminum-burner-phase.lua index b7a590e..00a4a50 100644 --- a/aluminum-burner-phase.lua +++ b/aluminum-burner-phase.lua @@ -25,27 +25,28 @@ end util.replace_ingredient("lab", "copper-plate", "aluminum-plate") util.replace_ingredient("lab", "copper-cable", "aluminum-cable") +util.replace_ingredient("lab", "basic-circuit-board", "aluminum-cable") -- Bob's if mods.Krastorio2 then - util.replace_ingredient("automation-core", "copper-plate", "aluminum-plate") + util.replace_ingredient("kr-automation-core", "copper-plate", "aluminum-plate") util.replace_ingredient("kr-wind-turbine", "copper-cable", "aluminum-cable") util.replace_ingredient("kr-crusher", "copper-cable", "aluminum-cable") util.replace_ingredient("kr-sentinel", "copper-cable", "aluminum-cable") util.replace_ingredient("repair-pack", "copper-plate", "aluminum-plate") - util.remove_ingredient("basic-tech-card", "copper-cable") - util.add_ingredient("basic-tech-card", "aluminum-cable", 1) + util.remove_ingredient("kr-basic-tech-card", "copper-cable") + util.add_ingredient("kr-basic-tech-card", "aluminum-cable", 1) util.add_prerequisite("automation-science-pack", "copper-processing") if mods.bobassembly then util.set_prerequisite("basic-automation", {"kr-automation-core"}) - util.set_tech_recipe("basic-automation", {{"basic-tech-card", 1}}) + util.set_tech_recipe("basic-automation", {{"kr-basic-tech-card", 1}}) end util.remove_prerequisite("automation", "smelting") -- Bitumen mod -- For warptorio2 expansion with K2 util.remove_prerequisite("laboratory", "automation-science-pack") - util.set_tech_recipe("laboratory", {{"basic-tech-card", 1}}) + util.set_tech_recipe("laboratory", {{"kr-basic-tech-card", 1}}) end @@ -73,11 +74,11 @@ if mods["aai-industry"] and mods.Krastorio2 then util.remove_prerequisite("fuel-processing", "automation-science-pack") util.remove_prerequisite("electricity", "automation-science-pack") util.remove_prerequisite("kr-sentinel", "automation-science-pack") - util.set_tech_recipe("logistics", {{"basic-tech-card", 1}}) - util.set_tech_recipe("fuel-processing", {{"basic-tech-card", 1}}) - util.set_tech_recipe("electricity", {{"basic-tech-card", 1}}) - util.set_tech_recipe("kr-sentinel", {{"basic-tech-card", 1}}) - util.set_tech_recipe("kr-basic-fluid-handling", {{"basic-tech-card", 1}}) + util.set_tech_recipe("logistics", {{"kr-basic-tech-card", 1}}) + util.set_tech_recipe("fuel-processing", {{"kr-basic-tech-card", 1}}) + util.set_tech_recipe("electricity", {{"kr-basic-tech-card", 1}}) + util.set_tech_recipe("kr-sentinel", {{"kr-basic-tech-card", 1}}) + util.set_tech_recipe("kr-basic-fluid-handling", {{"kr-basic-tech-card", 1}}) util.add_prerequisite("deadlock-stacking-1", "automation-science-pack") util.add_prerequisite("kr-radar", "automation-science-pack") @@ -121,9 +122,10 @@ require("compatibility/textplates") -- All customizations or custom unlocks prior to this block util.add_unlock_force("electronics", "electronic-circuit") -util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable") -util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable") -util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate") +-- Disabled for now because replace_ingredients_prior_to has an infinite recursion +--util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable") +--util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable") +--util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate") -- Any post-fixes (eg aluminum back to copper) after this block util.remove_prerequisite("copper-processing", "automation") diff --git a/aluminum-enriched.lua b/aluminum-enriched.lua index a9783db..d28a834 100644 --- a/aluminum-enriched.lua +++ b/aluminum-enriched.lua @@ -10,14 +10,14 @@ data:extend( icon_size = 128, icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", pictures = { - {filename="__bzaluminum__/graphics/icons/enriched-aluminum.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-1.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.125}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-1.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-aluminum]", - stack_size = util.get_stack_size(100) + stack_size = 100 }, { type = "recipe", @@ -41,7 +41,7 @@ data:extend( results = { {type = "item", name = "enriched-aluminum", amount = 6}, - {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25} + {type = "fluid", name = "kr-dirty-water", amount = 25, catalyst_amount = 25} }, crafting_machine_tint = { @@ -66,28 +66,28 @@ data:extend( always_show_made_in = true, always_show_products = true, allow_productivity = true, - ingredients = { {"enriched-aluminum", 5} }, - results = { {"alumina", 5} }, + ingredients = { {type="item", name="enriched-aluminum", amount=5} }, + results = { {type="item", name="alumina", amount=5} }, order = "b[alumina]-b[enriched-alumina]", }, { type = "recipe", name = "dirty-water-filtration-aluminum", - category = "fluid-filtration", + category = "kr-fluid-filtration", icons = { { - icon = data.raw.fluid["dirty-water"].icon, - icon_size = data.raw.fluid["dirty-water"].icon_size + icon = data.raw.fluid["kr-dirty-water"].icon, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size }, { icon = data.raw.item["aluminum-ore"].icon, icon_size = data.raw.item["aluminum-ore"].icon_size, - scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["aluminum-ore"].icon_size), + scale = 0.20, shift = {0, 4} } }, - icon_size = data.raw.fluid["dirty-water"].icon_size, + icon_size = data.raw.fluid["kr-dirty-water"].icon_size, energy_required = 2, enabled = false, allow_as_intermediate = false, @@ -95,7 +95,7 @@ data:extend( always_show_products = true, ingredients = { - {type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100}, + {type = "fluid", name = "kr-dirty-water", amount = 100, catalyst_amount = 100}, }, results = { diff --git a/aluminum-matter.lua b/aluminum-matter.lua index 9e04457..f04cb2e 100644 --- a/aluminum-matter.lua +++ b/aluminum-matter.lua @@ -1,7 +1,7 @@ -- Matter recipes for Krastorio2 if mods["Krastorio2"] then local util = require("data-util"); -local matter = require("__Krastorio2__/lib/public/data-stages/matter-util") +local matter = require("__Krastorio2__/prototypes/libraries/matter") data:extend( { @@ -28,44 +28,41 @@ data:extend( { {"production-science-pack", 1}, {"utility-science-pack", 1}, - {"matter-tech-card", 1} + {"kr-matter-tech-card", 1} }, time = 45 } }, }) -local flake_graphite_matter = +local aluminum_ore_matter = { - item_name = "aluminum-ore", - minimum_conversion_quantity = 10, - matter_value = 5, + material = { type = "item", name = "aluminum-ore", amount = 10 }, + matter_count = 5, energy_required = 1, need_stabilizer = false, unlocked_by_technology = "aluminum-matter-processing" } -matter.createMatterRecipe(flake_graphite_matter) +matter.make_recipes(aluminum_ore_matter) -local graphite_matter = +local alumina_matter = { - item_name = "alumina", - minimum_conversion_quantity = 10, - matter_value = 7.5, + material = { type = "item", name = "alumina", amount = 10 }, + matter_count = 7.5, energy_required = 2, only_deconversion = true, need_stabilizer = true, unlocked_by_technology = "aluminum-matter-processing" } -matter.createMatterRecipe(graphite_matter) -local graphite_matter = +matter.make_recipes(alumina_matter) +local aluminum_plate_matter = { - item_name = "aluminum-plate", - minimum_conversion_quantity = 10, - matter_value = 10, + material = { type = "item", name = "aluminum-plate", amount = 10 }, + matter_count = 10, energy_required = 3, only_deconversion = true, need_stabilizer = true, unlocked_by_technology = "aluminum-matter-processing" } -matter.createMatterRecipe(graphite_matter) +matter.make_recipes(aluminum_plate_matter) end diff --git a/aluminum-ore.lua b/aluminum-ore.lua index b1fbd8a..a988470 100644 --- a/aluminum-ore.lua +++ b/aluminum-ore.lua @@ -1,8 +1,11 @@ local resource_autoplace = require('resource-autoplace'); -local noise = require('noise'); local util = require("data-util"); +data.raw.planet.nauvis.map_gen_settings.autoplace_controls["aluminum-ore"] = {} +data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["aluminum-ore"] = {} +resource_autoplace.initialize_patch_set("aluminum-ore", true) + data:extend({ { type = "autoplace-control", @@ -12,10 +15,6 @@ data:extend({ order = "b-e" }, { - type = "noise-layer", - name = "aluminum-ore" - }, - { type = "resource", icon_size = 64, icon_mipmaps = 3, name = "aluminum-ore", @@ -73,13 +72,13 @@ data:extend({ 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-2.png", size=64, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.25}, - {filename="__bzaluminum__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore.png", size=64, scale=0.5}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.5}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.5}, + {filename="__bzaluminum__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.5}, }, subgroup = "raw-resource", order = "t-c-a", - stack_size = util.get_stack_size(50) + stack_size = 50 }, }) diff --git a/aluminum-recipe-modules.lua b/aluminum-recipe-modules.lua index f0d670d..83eb619 100644 --- a/aluminum-recipe-modules.lua +++ b/aluminum-recipe-modules.lua @@ -1,15 +1,9 @@ +-- Enable prod modules for some recipes +-- Recipes with very specific ratios are deliberately excluded local util = require("data-util") for i, recipe in pairs(util.me.recipes) do if data.raw.recipe[recipe] then - for j, module in pairs(data.raw.module) do - if module.effect then - for effect_name, effect in pairs(module.effect) do - if effect_name == "productivity" and effect.bonus > 0 and module.limitation and #module.limitation > 0 then - table.insert(module.limitation, recipe) - end - end - end - end + data.raw.recipe[recipe].allow_productivity = true end -end +end \ No newline at end of file diff --git a/aluminum-recipe-se.lua b/aluminum-recipe-se.lua index bbf5f85..f558bd8 100644 --- a/aluminum-recipe-se.lua +++ b/aluminum-recipe-se.lua @@ -24,7 +24,6 @@ if mods["space-exploration"] then starting_rq_factor_multiplier = 1.5, } -if string.sub(mods["space-exploration"], 1, 3) == "0.6" then util.se_matter({ore="aluminum-ore", energy_required=1, quant_out=10, stream_out=60}) data:extend({ { @@ -71,7 +70,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then }, energy_required = 60, ingredients = { - {name = "alumina", amount = 24}, + { type = "item", name = "alumina", amount = 24}, {type = "fluid", name = "se-pyroflux", amount = 10}, }, enabled = false, @@ -83,7 +82,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then type = "recipe", name = "aluminum-ingot", category = "casting", - results = {{"aluminum-ingot", 1}}, + results = {{type="item", name="aluminum-ingot", amount=1}}, energy_required = 25, ingredients = { {type = "fluid", name = "molten-aluminum", amount = 250}, @@ -102,11 +101,11 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then {icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { - {name = "aluminum-plate", amount = 10}, + { type = "item", name = "aluminum-plate", amount = 10}, }, energy_required = 5, ingredients = { - {name = "aluminum-ingot", amount = 1} + { type = "item", name = "aluminum-ingot", amount = 1} }, enabled = false, always_show_made_in = true, @@ -126,101 +125,4 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then end se_delivery_cannon_recipes["aluminum-ingot"] = {name= "aluminum-ingot"} -else - -- Organization - data.raw.item["aluminum-plate"].subgroup = "plates" - data.raw.recipe["aluminum-plate"].subgroup = "plates" - - if mods["Krastorio2"] then - data:extend({ - { - type = "recipe", - name = "enriched-alumina-smelting-vulcanite", - category = "smelting", - order = "d[alumina]", - energy_required = 24, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "enriched-aluminum", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "alumina", amount = 12}, - }, - icons = - { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128 }, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, - }, - - }, - }) - table.insert(data.raw.technology["se-processing-vulcanite"].effects, - {type = "unlock-recipe", recipe= "enriched-alumina-smelting-vulcanite"}) - data.raw.recipe["enriched-alumina"].order= "d[alumina]" - se_delivery_cannon_recipes["enriched-aluminum"] = {name= "enriched-aluminum"} - else - data:extend({ - { - type = "recipe", - name = "alumina-smelting-vulcanite", - category = "smelting", - subgroup = "plates", - order = "d[alumina]", - energy_required = 24, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "aluminum-ore", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "alumina", amount = util.me.byproduct() and 10 or 12}, - }, - icons = - { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-10, -10}}, - }, - - - }, - }) - if util.me.byproduct() then util.add_product("alumina-smelting-vulcanite", {"silica", 2}, {force=true}) end - table.insert(data.raw.technology["se-processing-vulcanite"].effects, - {type = "unlock-recipe", recipe= "alumina-smelting-vulcanite"}) - end - data:extend({ - { - type = "recipe", - name = "aluminum-plate-smelting-vulcanite", - category = "smelting", - subgroup = "plates", - order = "d[aluminum-plate]", - energy_required = 24, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - ingredients = { - {name = "alumina", amount = 8}, - {name = "se-vulcanite-block", amount = 1}, - }, - results = { - {name = "aluminum-plate", amount = 12}, - }, - icons = - { - { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, - { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-10, -10}}, - }, - - - }, - }) - table.insert(data.raw.technology["se-processing-vulcanite"].effects, - {type = "unlock-recipe", recipe= "aluminum-plate-smelting-vulcanite"}) -end end diff --git a/aluminum-recipe-updates-power.lua b/aluminum-recipe-updates-power.lua index 3a1db1b..bb43d8e 100644 --- a/aluminum-recipe-updates-power.lua +++ b/aluminum-recipe-updates-power.lua @@ -29,12 +29,12 @@ if mods["space-exploration"] then util.remove_product("se-recycle-large-electric-pole", "copper-cable") util.remove_product("se-recycle-substation", "copper-cable") - util.add_product("se-recycle-small-iron-electric-pole", {"aluminum-cable", 1}) - util.add_product("se-recycle-small-electric-pole", {"aluminum-cable", 1}) - util.add_product("se-recycle-medium-electric-pole", {"acsr-cable", 1}) - util.add_product("se-recycle-big-electric-pole", {"acsr-cable", 2}) - util.add_product("se-recycle-large-electric-pole", {"acsr-cable", 4}) - util.add_product("se-recycle-substation", {"acsr-cable", 4}) + util.add_product("se-recycle-small-iron-electric-pole", {type="item", name="aluminum-cable", amount=1}) + util.add_product("se-recycle-small-electric-pole", {type="item", name="aluminum-cable", amount=1}) + util.add_product("se-recycle-medium-electric-pole", {type="item", name="acsr-cable", amount=1}) + util.add_product("se-recycle-big-electric-pole", {type="item", name="acsr-cable", amount=2}) + util.add_product("se-recycle-large-electric-pole", {type="item", name="acsr-cable", amount=4}) + util.add_product("se-recycle-substation", {type="item", name="acsr-cable", amount=4}) end -- final amounts apply to all mod loadouts diff --git a/aluminum-recipe-updates-transport.lua b/aluminum-recipe-updates-transport.lua index e0e8131..125d697 100644 --- a/aluminum-recipe-updates-transport.lua +++ b/aluminum-recipe-updates-transport.lua @@ -178,6 +178,17 @@ util.replace_ingredient("fluid-wagon-immortal-mk2", "iron-plate", "aluminum-6061 util.replace_ingredient("cargo-wagon-immortal-mk3", "iron-plate", "aluminum-6061") util.replace_ingredient("fluid-wagon-immortal-mk3", "iron-plate", "aluminum-6061") +-- Xenos +util.replace_ingredient("vehicle-almf", "iron-plate", "aluminum-6061") +util.add_prerequisite("vehicle-almf", "basic-alloys") +util.replace_some_ingredient("vehicle-amt-b", "steel-plate", 10, "aluminum-6061", 20) +util.add_prerequisite("vehicle-amt-b", "basic-alloys") +util.replace_some_ingredient("robot-specialized-main-module", "steel-plate", 1, "aluminum-6061", 2) +util.replace_ingredient("robot-main-module", "iron-plate", "aluminum-6061") +util.add_prerequisite("active-factory-protection", "basic-alloys") +util.replace_ingredient("vehicle-lat", "iron-plate", "aluminum-2219") +util.add_prerequisite("vehicle-lat", "aerospace-alloys") + -- Battery locomotive util.add_ingredient("battery-locomotive", "aluminum-6061", 30) diff --git a/aluminum-recipe-updates.lua b/aluminum-recipe-updates.lua index 1262066..946484f 100644 --- a/aluminum-recipe-updates.lua +++ b/aluminum-recipe-updates.lua @@ -77,15 +77,18 @@ end util.replace_ingredient("kr-shelter", "copper-cable", "aluminum-cable") +local glass = mods["Krastorio2"] and "kr-glass" or "glass" +local sand = mods["Krastorio2"] and "kr-sand" or "sand" + -- Glass -- k2 -util.replace_some_ingredient("glass", "sand", 3, "alumina", 1) +util.replace_some_ingredient(glass, sand, 3, "alumina", 1) -- aai util.multiply_recipe("glass-from-sand", 4) -util.replace_some_ingredient("glass-from-sand", "sand", 3, "alumina", 1) +util.replace_some_ingredient("glass-from-sand", sand, 3, "alumina", 1) util.set_category("glass-from-sand", "basic-founding") -- se -util.replace_some_ingredient("se-glass-vulcanite", "sand", 3, "alumina", 1) +util.replace_some_ingredient("se-glass-vulcanite", sand, 3, "alumina", 1) -- sand-and-glass util.multiply_recipe("sng-glass-plate", 4) @@ -107,10 +110,9 @@ end -- k2 if mods.Krastorio2 then - util.replace_some_ingredient("inserter-parts", "iron-stick", 2, "aluminum-plate", 1) + util.replace_some_ingredient("kr-inserter-parts", "iron-stick", 2, "aluminum-plate", 1) util.add_ingredient("inserter", "iron-stick", 1) -- nice symmetry util.replace_ingredient("fast-inserter", "steel-plate", "aluminum-plate") - util.replace_ingredient("filter-inserter", "steel-plate", "aluminum-plate") util.replace_ingredient("kr-wind-turbine", "iron-plate", "aluminum-plate") util.replace_ingredient("battery-equipment", "iron-plate", "aluminum-plate") @@ -118,8 +120,8 @@ if mods.Krastorio2 then util.replace_ingredient("big-battery-equipment", "iron-plate", "aluminum-plate") util.replace_ingredient("personal-submachine-laser-defense-mk1-equipment", "iron-plate", "aluminum-plate") - util.replace_ingredient("additional-engine", "steel-plate", "aluminum-6061") - util.replace_ingredient("advanced-additional-engine", "steel-plate", "aluminum-6061") + util.replace_ingredient("kr-additional-engine-equipment", "steel-plate", "aluminum-6061") + util.replace_ingredient("kr-advanced-additional-engine-equipment", "steel-plate", "aluminum-6061") util.replace_ingredient("vehicle-roboport", "steel-plate", "aluminum-6061") @@ -139,7 +141,7 @@ util.replace_ingredient("chute-miniloader", "iron-plate", "aluminum-plate") if mods["space-exploration"] then - util.add_product("se-scrap-recycling", {name="aluminum-ore", amount=1, probability=0.1}) + util.add_product("se-scrap-recycling", {type="item", name="aluminum-ore", amount=1, probability=0.1}) util.replace_ingredient("se-adaptive-armour-equipment-1", "titanium-plate", "alumina") util.replace_ingredient("se-adaptive-armour-equipment-1", "steel-plate", "alumina") @@ -172,9 +174,7 @@ util.replace_ingredient("Schall-fast-inserter-R4", "iron-plate", "aluminum-plate util.replace_ingredient("Schall-fast-inserter-R5", "iron-plate", "aluminum-plate") util.replace_ingredient("very-long-handed-inserter", "iron-plate", "aluminum-plate") util.replace_ingredient("FastLongInserters_fast-inserter", "iron-plate", "aluminum-plate") -util.replace_ingredient("FastLongInserters_filter-inserter", "iron-plate", "aluminum-plate") util.replace_ingredient("FastLongInserters_stack-inserter", "iron-plate", "aluminum-plate") -util.replace_ingredient("FastLongInserters_stack-filter-inserter", "iron-plate", "aluminum-plate") -- Robocharger util.add_ingredient("robocharger", "aluminum-6061", 35) @@ -195,7 +195,7 @@ util.replace_some_ingredient("Teslacharge-pack", "steel-plate", 4, "aluminum-pla if mods.leighzerscrapyards then util.add_to_product("scrap-processing", "iron-plate", -1) util.add_to_product("scrap-processing", "copper-plate", -1) - util.add_product("scrap-processing", {"aluminum-plate", 2}) + util.add_product("scrap-processing", {type="item", name="aluminum-plate", amount=2}) end @@ -239,4 +239,3 @@ if mods.bobassembly then util.add_prerequisite("electronics-machine-1", "electronics") end - diff --git a/aluminum-recipe.lua b/aluminum-recipe.lua index c045c19..ce39235 100644 --- a/aluminum-recipe.lua +++ b/aluminum-recipe.lua @@ -43,7 +43,7 @@ data:extend({ ), enabled = true, energy_required = mods.Krastorio2 and 16 or 3.2, - ingredients = {{"aluminum-ore", mods.Krastorio2 and 10 or 1}}, + ingredients = {{type = "item", name = "aluminum-ore", amount = mods.Krastorio2 and 10 or 1}}, subgroup = "raw-material", results = alumina_results, }, @@ -60,33 +60,13 @@ data:extend({ } 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}, - } - } + ), + enabled = true, + energy_required = mods["Krastorio2"] and 16 or 3.2, + ingredients = {{type="item", name="alumina", amount=mods["Krastorio2"] and 10 or 1}}, + results = { + {type="item", name = "aluminum-plate", amount=mods["Krastorio2"] and 10 or 1} + }, }, { type = "item", @@ -94,14 +74,14 @@ data:extend({ icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128, pictures = { - {filename="__bzaluminum__/graphics/icons/alumina.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/alumina-1.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/alumina-2.png", size=128, scale=0.125}, - {filename="__bzaluminum__/graphics/icons/alumina-3.png", size=128, scale=0.125}, + {filename="__bzaluminum__/graphics/icons/alumina.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/alumina-1.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/alumina-2.png", size=128, scale=0.25}, + {filename="__bzaluminum__/graphics/icons/alumina-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "b[alumina]", - stack_size = util.get_stack_size(100) + stack_size = 100 }, { type = "item", @@ -110,7 +90,7 @@ data:extend({ icon_size = 128, subgroup = "raw-material", order = "b[aluminum-plate]", - stack_size = util.get_stack_size(100) + stack_size = 100 }, }) @@ -150,9 +130,10 @@ data:extend({ unit = { count = 10, time = 15, ingredients = mods.Krastorio2 and - {{"basic-tech-card", 1}} or {{"automation-science-pack", 1}}, + {{"kr-basic-tech-card", 1}} or {{"automation-science-pack", 1}}, }, prerequisites = {}, + ignore_tech_cost_multiplier = true, order = "b-b", }, }) @@ -189,7 +170,7 @@ data:extend({ icon_size = 64, icon_mipmaps = 4, subgroup = util.cablesg, order = "b[aaac-cable]", - stack_size = util.get_stack_size(100), + stack_size = 100, }, { type = "recipe", @@ -198,8 +179,8 @@ data:extend({ order = "d[aaac-cable]", enabled = true, energy_required = 0.5, - ingredients = {{"aluminum-plate", 2}}, - results = {{"aluminum-cable", 1}}, + ingredients = {{type="item", name="aluminum-plate", amount=2}}, + results = {{type="item", name="aluminum-cable", amount=1}}, }, { type = "item", @@ -217,8 +198,8 @@ data:extend({ order = "d[acsr-cable]", enabled = false, energy_required = 0.5, - ingredients = {{"aluminum-cable", 6}, {"steel-plate", 1}}, - results = {{"acsr-cable", 3}}, + ingredients = {{type="item", name="aluminum-cable", amount=6}, {type="item", name="steel-plate", amount=1}}, + results = {{type="item", name="acsr-cable", amount=3}}, } }) @@ -227,14 +208,14 @@ if mods.Krastorio2 then { type = "recipe", name = "aluminum-cable-s-c", - category = "smelting-crafting", - subgroup = "smelting-crafting", + category = "kr-smelting-crafting", + subgroup = "kr-smelting-crafting", order = "d[aaac-cable]", enabled = false, energy_required = 0.5, hide_from_player_crafting = true, - ingredients = {{"aluminum-ore", 4}}, - results = {{"aluminum-cable", 1}}, + ingredients = {{type="item", name="aluminum-ore", amount=4}}, + results = {{type="item", name="aluminum-cable", amount=1}}, icons = { {icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, {icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, @@ -243,14 +224,14 @@ if mods.Krastorio2 then { type = "recipe", name = "aluminum-cable-enriched-s-c", - category = "smelting-crafting", - subgroup = "smelting-crafting", + category = "kr-smelting-crafting", + subgroup = "kr-smelting-crafting", order = "d[aaac-cable]", enabled = false, energy_required = 0.5, hide_from_player_crafting = true, - ingredients = {{"enriched-aluminum", 2}}, - results = {{"aluminum-cable", 1}}, + ingredients = {{type="item", name="enriched-aluminum", amount=2}}, + results = {{type="item", name="aluminum-cable", amount=1}}, icons = { {icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, {icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, @@ -262,12 +243,12 @@ if mods.Krastorio2 then end local plug = { - {"alumina", 1}, - {"copper-plate", 1}, - {"iron-plate", 1}, -- replace with tungsten plate later + {type="item", name="alumina", amount=1}, + {type="item", name="copper-plate", amount=1}, + {type="item", name="iron-plate", amount=1}, -- replace with tungsten plate later } if mods.bzzirconium then - table.insert(plug, {"zirconia", 1}) + table.insert(plug, {type="item", name="zirconia", amount=1}) end data:extend({ { @@ -287,7 +268,7 @@ data:extend({ enabled = false, energy_required = 2, ingredients = plug, - results = {{"spark-plug", #plug}}, + results = {{type = "item", name = "spark-plug", amount = #plug}}, } }) util.add_effect("engine", { type = "unlock-recipe", recipe = "spark-plug" }) @@ -302,11 +283,11 @@ aluminum_6061["aluminum-plate"] = 18 aluminum_6061["copper-plate"] = 1 aluminum_6061["iron-plate"] = 1 if mods.bzsilicon or mods.Krastorio2 then - aluminum_6061["silicon"] = 1 + aluminum_6061[mods.Krastorio2 and "kr-silicon" or "silicon"] = 1 aluminum_6061["aluminum-plate"] = aluminum_6061["aluminum-plate"] - 1 end if mods.Krastorio2 then - aluminum_6061["rare-metals"] = 1 + aluminum_6061["kr-rare-metals"] = 1 aluminum_6061["aluminum-plate"] = aluminum_6061["aluminum-plate"] - 1 end data:extend({ @@ -328,7 +309,7 @@ data:extend({ enabled = false, energy_required = 100, ingredients = {}, - results = {{"aluminum-6061", 20}}, + results = {{type="item", name="aluminum-6061", amount=20}}, }, { type = "technology", @@ -365,7 +346,7 @@ if mods.bzzirconium then aluminum_2219["aluminum-plate"] = aluminum_2219["aluminum-plate"] - 1 end if mods.Krastorio2 then - aluminum_2219["rare-metals"] = 1 + aluminum_2219["kr-rare-metals"] = 1 aluminum_2219["aluminum-plate"] = aluminum_2219["aluminum-plate"] - 1 end data:extend({ @@ -387,7 +368,7 @@ data:extend({ enabled = false, energy_required = 100, ingredients = {}, - results = {{"aluminum-2219", 20}}, + results = {{type="item", name="aluminum-2219", amount=20}}, }, { type = "technology", @@ -433,11 +414,11 @@ if mods.bztitanium then enabled = false, energy_required = 10, ingredients = { - {"alumina", 10}, - {util.titanium_plate, 1}, - {type="fluid", name=mods.Krastorio2 and "ammonia" or "sulfuric-acid", amount=5}, + {type="item", name="alumina", amount=10}, + {type="item", name=util.titanium_plate, amount=1}, + {type="fluid", name=mods.Krastorio2 and "kr-ammonia" or "sulfuric-acid", amount=5}, }, - results = {{"ti-sapphire", 1}}, + results = {{type="item", name="ti-sapphire", amount=1}}, }, }) util.add_effect("laser", {type="unlock-recipe", recipe="ti-sapphire"}) @@ -456,8 +437,8 @@ data:extend({ category = "double-smelting", enabled = false, energy_required = 3.2, - ingredients = {{"aluminum-ore", 1}}, - results = {{"aluminum-plate", 1}}, + ingredients = {{type="item", name="aluminum-ore", amount=1}}, + results = {{type="item", name="aluminum-plate", amount=1}}, } }) util.add_effect("double-smelting-tech-steel", {type = "unlock-recipe", recipe = "double-aluminum"}) diff --git a/changelog.txt b/changelog.txt index bb37861..9c86971 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,23 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.28 +Date: 2024-03-15 + Fixes: + - With Bob's Electronics, fixed soft locks on lab recipe when used without Natural Gas +--------------------------------------------------------------------------------------------------- +Version: 0.4.27 +Date: 2024-02-17 + Fixes: + - Prevent possible soft lock with Warptorio 2 Expansion + Changes: + - Some improved recipe compatibility for Xenos mods +--------------------------------------------------------------------------------------------------- +Version: 0.4.26 +Date: 2023-12-26 + Changes: + - Copper processing tech ignores science multiplier + Localization: + - ja updates by Sakuro +--------------------------------------------------------------------------------------------------- Version: 0.4.25 Date: 2023-05-16 Changes: diff --git a/compatibility/248k-recipes.lua b/compatibility/248k-recipes.lua index 7852c92..1b49d4e 100644 --- a/compatibility/248k-recipes.lua +++ b/compatibility/248k-recipes.lua @@ -1,5 +1,5 @@ -if mods["248k"] then +if mods["248k-Redux"] then data:extend({ { @@ -20,7 +20,7 @@ data:extend({ always_show_made_in = true, icons = { { - icon = "__248k__/ressources/fluids/el_dirty_water.png", icon_size = 64, + icon = "__248k-Redux-graphics__/ressources/fluids/el_dirty_water.png", icon_size = 64, }, { icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8} diff --git a/control-util.lua b/control-util.lua index cd2b0f2..9000745 100644 --- a/control-util.lua +++ b/control-util.lua @@ -26,4 +26,61 @@ function util.force_enable_recipe(event, recipe_name) end end + +function util.warptorio2_expansion_helper() + if script.active_mods["warptorio2_expansion"] then + function check_container_for_items(container,items) + local has_all =true + for k=1,#items do + if container.get_item_count(items[k].name) 0) then - if data.raw.recipe[recipe_name].icon then - data.raw.recipe[recipe_name].icons = {{ - icon=data.raw.recipe[recipe_name].icon, - icon_size=data.raw.recipe[recipe_name].icon_size, - icon_mipmaps=data.raw.recipe[recipe_name].icon_mipmaps, - }} - elseif data.raw.item[data.raw.recipe[recipe_name].main_product] then - data.raw.recipe[recipe_name].icons = {{ - icon=data.raw.item[data.raw.recipe[recipe_name].main_product].icon, - icon_size=data.raw.item[data.raw.recipe[recipe_name].main_product].icon_size, - icon_mipmaps=data.raw.item[data.raw.recipe[recipe_name].main_product].icon_mipmaps, - }} - elseif data.raw.item[data.raw.recipe[recipe_name].result] then - data.raw.recipe[recipe_name].icons = {{ - icon=data.raw.item[data.raw.recipe[recipe_name].result].icon, - icon_size=data.raw.item[data.raw.recipe[recipe_name].result].icon_size, - icon_mipmaps=data.raw.item[data.raw.recipe[recipe_name].result].icon_mipmaps, - }} - elseif data.raw.recipe[recipe_name].normal and - data.raw.item[data.raw.recipe[recipe_name].normal.result] then - data.raw.recipe[recipe_name].icons = {{ - icon=data.raw.item[data.raw.recipe[recipe_name].normal.result].icon, - icon_size=data.raw.item[data.raw.recipe[recipe_name].normal.result].icon_size, - icon_mipmaps=data.raw.item[data.raw.recipe[recipe_name].normal.result].icon_mipmaps, - }} - end - data.raw.recipe[recipe_name].icon = nil - data.raw.recipe[recipe_name].icon_size = nil + data.raw.recipe[recipe_name].icons = {} + if data.raw.recipe[recipe_name].icon then + data.raw.recipe[recipe_name].icons = {{ + icon=data.raw.recipe[recipe_name].icon, + icon_size=data.raw.recipe[recipe_name].icon_size, + icon_mipmaps=data.raw.recipe[recipe_name].icon_mipmaps, + }} + data.raw.recipe[recipe_name].icon = nil + data.raw.recipe[recipe_name].icon_size = nil + end end table.insert(data.raw.recipe[recipe_name].icons, icon) end @@ -1137,8 +1030,6 @@ function util.add_to_ingredient(recipe, ingredient, amount, options) if not should_force(options) and bypass(recipe_name) then return end if data.raw.recipe[recipe] then add_to_ingredient(data.raw.recipe[recipe], ingredient, amount) - add_to_ingredient(data.raw.recipe[recipe].normal, ingredient, amount) - add_to_ingredient(data.raw.recipe[recipe].expensive, ingredient, amount) end end @@ -1161,8 +1052,6 @@ function util.add_to_product(recipe_name, product, amount, options) if not should_force(options) and bypass(recipe_name) then return end if data.raw.recipe[recipe_name] then add_to_product(data.raw.recipe[recipe_name], product, amount) - add_to_product(data.raw.recipe[recipe_name].normal, product, amount) - add_to_product(data.raw.recipe[recipe_name].expensive, product, amount) end end @@ -1285,10 +1174,8 @@ function remove_prior_unlocks(tech, recipe) util.remove_recipe_effect(tech, recipe) if technology.prerequisites then for i, prerequisite in pairs(technology.prerequisites) do - if string.sub(prerequisite, 1, 3) ~= 'ei_' then - -- log("BZZZ removing prior unlocks for " .. recipe .. " from " .. tech ..", checking " .. prerequisite) -- Handy Debug :| - remove_prior_unlocks(prerequisite, recipe) - end + -- log("BZZZ removing prior unlocks for " .. tech ..", checking " .. prerequisite) -- Handy Debug :| + remove_prior_unlocks(prerequisite, recipe) end end end @@ -1330,9 +1217,7 @@ function replace_ingredients_prior_to(tech, old, new, multiplier) if technology.prerequisites then for i, prerequisite in pairs(technology.prerequisites) do -- log("BZZZ checking " .. prerequisite) -- Handy Debug :| - if string.sub(prerequisite, 1, 3) ~= 'ei_' then - replace_ingredients_prior_to(prerequisite, old, new, multiplier) - end + replace_ingredients_prior_to(prerequisite, old, new, multiplier) end end end diff --git a/data.lua b/data.lua index 4f6e69c..0f18495 100644 --- a/data.lua +++ b/data.lua @@ -9,8 +9,8 @@ local util = require("data-util"); if mods.Krastorio2 then - if data.raw.item["automation-core"] then - data.raw.item["automation-core"].icon = "__bzaluminum__/graphics/icons/automation-core.png" + if data.raw.item["kr-automation-core"] then + data.raw.item["kr-automation-core"].icon = "__bzaluminum__/graphics/icons/automation-core.png" end if data.raw.technology["kr-automation-core"] then data.raw.technology["kr-automation-core"].icon = "__bzaluminum__/graphics/technology/automation-core.png" diff --git a/info.json b/info.json index 93c1218..8b1e2a7 100644 --- a/info.json +++ b/info.json @@ -1,25 +1,25 @@ { "name": "bzaluminum", - "version": "0.4.25", - "factorio_version": "1.1", + "version": "2.0.0", + "factorio_version": "2.0", "title": "Aluminum", "author": "Brevven", "contact": "", "homepage": "", "dependencies": [ - "base >= 1.1.0", - "bzfoundry >= 0.2.1", + "base >= 2.0.0", + "bzfoundry >= 2.0.0", "~ bz-dsr-bridge", - "? bztitanium >= 1.0.3", - "? bzlead", - "? bzzirconium >= 0.5.4", + "? bztitanium >= 2.0.26", + "? bzlead >= 2.0.28", + "? bzzirconium >= 2.1.13", "? bztungsten >= 0.5.4", - "? bzcarbon >= 0.1.2", - "? space-exploration", - "? aai-industry", - "? Krastorio2", + "? bzcarbon >= 2.0.21", + "? space-exploration >= 0.7.34", + "? aai-industry >= 0.6.13", + "? Krastorio2 >= 2.0.8", "? sand-and-glass", - "? 248k", + "? 248k-Redux", "? deadlock-beltboxes-loaders", "? DeadlockCrating", "(?) bobtech", diff --git a/locale/en/aluminum.cfg b/locale/en/aluminum.cfg index 8cd0579..b060b93 100644 --- a/locale/en/aluminum.cfg +++ b/locale/en/aluminum.cfg @@ -1,6 +1,9 @@ [entity-name] aluminum-ore=__ITEM__aluminum_upper__ ore +[entity-description] +wpe_broken_lab=To repair, insert 100[item=iron-plate], 100[item=iron-gear-wheel], 50[item=repair-pack] + # VTK Deep Core Mining aluminum-ore-patch=__ITEM__aluminum_upper__ ore patch aluminum-ore-patch-chunk=__ENTITY__aluminum-ore-patch__ chunk diff --git a/locale/ja/aluminum.cfg b/locale/ja/aluminum.cfg index ab52a9b..89eac84 100644 --- a/locale/ja/aluminum.cfg +++ b/locale/ja/aluminum.cfg @@ -1,42 +1,54 @@ [entity-name] -aluminum-ore=アルミニウム鉱石 +aluminum-ore=__ITEM__aluminum_upper__鉱石 + +# VTK Deep Core Mining +aluminum-ore-patch=__ITEM__aluminum_upper__ ore patch +aluminum-ore-patch-chunk=__ENTITY__aluminum-ore-patch__ chunk +aluminum-ore-patch-ore=__ENTITY__aluminum-ore-patch__ ore + [autoplace-control-names] -aluminum-ore=[item=aluminum-ore] アルミニウム鉱石 +aluminum-ore=[item=aluminum-ore] __ITEM__aluminum_upper__鉱石 [item-name] -aluminum-ore=アルミニウム鉱石 +aluminum_upper=アルミニウム +aluminum_lower=アルミニウム +aluminum-ore=__ITEM__aluminum_upper__鉱石 alumina=アルミナ -aluminum-dust=アルミニウム粉末 -aluminum-plate=アルミニウム板 -aluminum-ingot=アルミニウムのインゴット -aluminum-cable=アルミニウム線 -aluminum-2219=A2219アルミニウム合金 -aluminum-6061=A6061アルミニウム合金 -enriched-aluminum=純化アルミニウム -compressed-aluminum-ore=Compressed aluminum ore +aluminum-dust=__ITEM__aluminum_upper__ dust +aluminum-plate=__ITEM__aluminum_upper__板 +aluminum-ingot=__ITEM__aluminum_upper__インゴット +aluminum-cable=__ITEM__aluminum_upper__線 +aluminum-2219=A2219__ITEM__aluminum_lower__合金 +aluminum-6061=A6061__ITEM__aluminum_lower__合金 +enriched-aluminum=純化__ITEM__aluminum_lower__ +compressed-aluminum-ore=Compressed __ITEM__aluminum_lower__ ore acsr-cable=ACSRケーブル spark-plug=点火プラグ ti-sapphire=チタンサファイア結晶 +vtk-deepcore-mining-aluminum-ore-chunk=__ITEM__aluminum_upper__ ore chunk [item-description] -aluminum-ore=精錬してアルミニウム板を得ることができます -enriched-aluminum=精練して効率的にアルミニウム板を得ることができます -aluminum-2219=航空宇宙グレードのアルミニウム合金 -aluminum-6061=一般的なアルミニウム合金 +aluminum-ore=製錬して__ITEM__aluminum-plate__を得ることができます +enriched-aluminum=製錬して効率的に__ITEM__aluminum-plate__を得ることができます +aluminum-2219=航空宇宙グレードの__ITEM__aluminum_lower__合金 +aluminum-6061=一般的な__ITEM__aluminum_lower__合金 aluminum-cable=AAACケーブル -acsr-cable=鋼鉄で強度を増したアルミニウム導体 +acsr-cable=鋼鉄で強度を増した__ITEM__aluminum_lower__導体 spark-plug=点火装置 +[fluid-name] +molten-aluminum=溶融__ITEM__aluminum_lower__ + [technology-name] -aluminum-matter-processing=アルミニウム変換 +aluminum-matter-processing=__ITEM__aluminum_upper__変換 reinforced-cable=強化ケーブル aerospace-alloys=航空宇宙用合金 basic-alloys=基本的な合金 copper-processing=銅処理 [technology-description] -enriched-aluminum=アルミニウム鉱石を硫酸[fluid=sulfuric-acid] と水で[fluid=water] 処理し、収量を改善します。副産物として汚水[fluid=dirty-water] を生産します。 +enriched-aluminum=__ITEM__aluminum-ore__を硫酸[fluid=sulfuric-acid] と水で[fluid=water] 処理し、収量を改善します。副産物として汚水[fluid=dirty-water] を生産します。 reinforced-cable=大電力のための大型ケーブル aerospace-alloys=過酷な用途に適した合金 @@ -47,14 +59,16 @@ aluminum-plate=__ITEM__aluminum-plate__ smelt-compressed-aluminum-ore=__ITEM__aluminum-plate__ aluminum-dust=__ITEM__aluminum-dust__ dirty-water-filtration-aluminum=汚水をろ過[item=aluminum-ore] -bz-aluminum-ingot=アルミニウムのインゴット +bz-aluminum-ingot=__ITEM__aluminum_upper__インゴット alumina-smelting-vulcanite=__ITEM__alumina__ ti-sapphire=__ITEM__ti-sapphire__ +vtk-deepcore-mining-ore-chunk-refining-aluminum-ore-focus=__ITEM__aluminum_upper__ focused ore chunk refining +vtk-deepcore-mining-aluminum-ore-chunk-refining=__ITEM__vtk-deepcore-mining-aluminum-ore-chunk__ refining [recipe-description] -enriched-aluminum=アルミニウム鉱石を硫酸[fluid=sulfuric-acid] と水で[fluid=water] 処理し、収量を改善します。副産物として汚水[fluid=dirty-water] を生産します。 +enriched-aluminum=__ITEM__aluminum-ore__を硫酸[fluid=sulfuric-acid] と水で[fluid=water] 処理し、収量を改善します。副産物として汚水[fluid=dirty-water] を生産します。 -dirty-water-filtration-aluminum=汚水をろ過し、アルミニウム鉱石[item=aluminum-ore] と他のアイテムを確率的に生産します。 +dirty-water-filtration-aluminum=汚水をろ過し、__ITEM__aluminum-ore__[item=aluminum-ore] と他のアイテムを確率的に生産します。 # Settings @@ -67,5 +81,5 @@ bzaluminum-starting-items=燃料式インサータを所持してゲームを開 [mod-setting-description] bzaluminum-recipe-bypass=指定したレシピの改変を行わない (コンマ区切り)。 bzaluminum-list=有効にすると、テキストコマンド [color=orange]BZList[/color] で、改変されたレシピの完全なリストを script-output ディレクトリにファイルとして書き出します。\n他の設定を終えた後は無効にすることを推奨します。 -bzaluminum-byproduct=有効かつ Silica を使用する場合、アルミニウム生産時に副産物として珪砂も生産されます。 +bzaluminum-byproduct=有効かつ Silica を使用する場合、__ITEM__aluminum_lower__生産時に副産物として珪砂も生産されます。 bzaluminum-starting-items=燃料式インサータの作成にはアルミニウムが必要なので、アルミナは手作業で運ぶ必要があります。本設定をオンにしておき燃料式インサータを入手すれば、新規ゲームでの進捗をわずかに稼ぐことができます。 diff --git a/strange-matter.lua b/strange-matter.lua index 50f04c0..00bf2ee 100644 --- a/strange-matter.lua +++ b/strange-matter.lua @@ -15,7 +15,7 @@ data:extend({ enabled = false, energy_required = 1, ingredients = {{type="fluid", name="strange-matter", amount = 2}}, - result = ore, + results = {{type="item", name=ore, amount=1}}, category = "crafting-with-fluid", subgroup = "synthesis", },