diff --git a/aluminum-enriched.lua b/aluminum-enriched.lua index d28a834..c8ebd51 100644 --- a/aluminum-enriched.lua +++ b/aluminum-enriched.lua @@ -8,12 +8,12 @@ data:extend( type = "item", name = "enriched-aluminum", icon_size = 128, - icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", pictures = { - {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}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-1.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-2.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/enriched-aluminum-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-aluminum]", @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-aluminum", main_product = "enriched-aluminum", - icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", + icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, category = "chemistry", energy_required = 3, @@ -57,8 +57,8 @@ data:extend( name = "enriched-alumina", icons = { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128 }, - { icon = "__bzaluminum__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128 }, + { icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/aluminum-matter.lua b/aluminum-matter.lua index f04cb2e..92caa5c 100644 --- a/aluminum-matter.lua +++ b/aluminum-matter.lua @@ -15,7 +15,7 @@ data:extend( icon_size = 256, }, { - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, scale = 1.4, } diff --git a/aluminum-ore.lua b/aluminum-ore.lua index a988470..4dcd811 100644 --- a/aluminum-ore.lua +++ b/aluminum-ore.lua @@ -18,7 +18,7 @@ data:extend({ type = "resource", icon_size = 64, icon_mipmaps = 3, name = "aluminum-ore", - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=1.00, g=0.80, b=0.50}, @@ -49,14 +49,14 @@ data:extend({ { sheet = { - filename = "__bzaluminum__/graphics/entity/ores/aluminum-ore.png", + filename = "__bzaluminum2__/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", + filename = "__bzaluminum2__/graphics/entity/ores/hr-aluminum-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -70,12 +70,12 @@ data:extend({ type = "item", name = "aluminum-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bzaluminum__/graphics/icons/aluminum-ore.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", pictures = { - {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}, + {filename="__bzaluminum2__/graphics/icons/aluminum-ore.png", size=64, scale=0.5}, + {filename="__bzaluminum2__/graphics/icons/aluminum-ore-2.png", size=64, scale=0.5}, + {filename="__bzaluminum2__/graphics/icons/aluminum-ore-3.png", size=64, scale=0.5}, + {filename="__bzaluminum2__/graphics/icons/aluminum-ore-4.png", size=64, scale=0.5}, }, subgroup = "raw-resource", order = "t-c-a", diff --git a/aluminum-recipe-final-stacking.lua b/aluminum-recipe-final-stacking.lua index ad55755..c21240e 100644 --- a/aluminum-recipe-final-stacking.lua +++ b/aluminum-recipe-final-stacking.lua @@ -3,31 +3,31 @@ local util = require("data-util"); if deadlock then - deadlock.add_stack("aluminum-ore", "__bzaluminum__/graphics/icons/stacked/aluminum-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("aluminum-plate", "__bzaluminum__/graphics/icons/stacked/aluminum-plate-stacked.png", "deadlock-stacking-1", 128) - deadlock.add_stack("alumina", "__bzaluminum__/graphics/icons/stacked/alumina-stacked.png" , "deadlock-stacking-1", 128) + deadlock.add_stack("aluminum-ore", "__bzaluminum2__/graphics/icons/stacked/aluminum-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("aluminum-plate", "__bzaluminum2__/graphics/icons/stacked/aluminum-plate-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("alumina", "__bzaluminum2__/graphics/icons/stacked/alumina-stacked.png" , "deadlock-stacking-1", 128) deadlock.add_stack("aluminum-cable", nil, "deadlock-stacking-1", 128) - deadlock.add_stack("acsr-cable", "__bzaluminum__/graphics/icons/stacked/acsr-cable-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("spark-plug", "__bzaluminum__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("aluminum-6061", "__bzaluminum__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("aluminum-2219", "__bzaluminum__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("acsr-cable", "__bzaluminum2__/graphics/icons/stacked/acsr-cable-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("spark-plug", "__bzaluminum2__/graphics/icons/stacked/spark-plug-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-6061", "__bzaluminum2__/graphics/icons/stacked/aluminum-6061-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("aluminum-2219", "__bzaluminum2__/graphics/icons/stacked/aluminum-2219-stacked.png" , "deadlock-stacking-3", 128) if mods.bztitanium then - deadlock.add_stack("ti-sapphire", "__bzaluminum__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("ti-sapphire", "__bzaluminum2__/graphics/icons/stacked/ti-sapphire-stacked.png" , "deadlock-stacking-3", 128) end if mods.Krastorio2 then - deadlock.add_stack("enriched-aluminum", "__bzaluminum__/graphics/icons/stacked/enriched-aluminum-ore-stacked.png" , "deadlock-stacking-3", 128) + deadlock.add_stack("enriched-aluminum", "__bzaluminum2__/graphics/icons/stacked/enriched-aluminum-ore-stacked.png" , "deadlock-stacking-3", 128) util.set_icons("deadlock-stacks-stack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, {icon="__deadlock-beltboxes-loaders__/graphics/icons/square/arrow-d-64.png", icon_size=64, scale=.25}, }) util.set_icons("deadlock-stacks-unstack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, {icon="__deadlock-beltboxes-loaders__/graphics/icons/square/arrow-u-64.png", icon_size=64, scale=.25}, }) util.set_item_icons("deadlock-stack-automation-core", { - {icon="__bzaluminum__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, + {icon="__bzaluminum2__/graphics/icons/stacked/automation-core-stacked.png", icon_size=64}, }) end if mods["space-exploration"] then diff --git a/aluminum-recipe-se.lua b/aluminum-recipe-se.lua index f558bd8..024a647 100644 --- a/aluminum-recipe-se.lua +++ b/aluminum-recipe-se.lua @@ -40,7 +40,7 @@ if mods["space-exploration"] then { type = "item", name = "aluminum-ingot", - icons = {{icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128}}, + icons = {{icon = "__bzaluminum2__/graphics/icons/aluminum-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "aluminum", @@ -52,7 +52,7 @@ if mods["space-exploration"] then max_temperature = 660, base_color = {r=230, g=230, b=220}, flow_color = {r=230, g=230, b=220}, - icons = {{icon = "__bzaluminum__/graphics/icons/molten-aluminum.png", icon_size = 128}}, + icons = {{icon = "__bzaluminum2__/graphics/icons/molten-aluminum.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -97,8 +97,8 @@ if mods["space-exploration"] then name = "aluminum-ingot-to-plate", icons = { - {icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128, icon_mipmaps = 3}, - {icon = "__bzaluminum__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128, icon_mipmaps = 3}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { { type = "item", name = "aluminum-plate", amount = 10}, diff --git a/aluminum-recipe.lua b/aluminum-recipe.lua index ce39235..20a9cb4 100644 --- a/aluminum-recipe.lua +++ b/aluminum-recipe.lua @@ -35,10 +35,10 @@ data:extend({ 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}}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { - { icon = "__bzaluminum__/graphics/icons/alumina.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128}, } ), enabled = true, @@ -55,10 +55,10 @@ data:extend({ 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.125, shift= {-8, -8}}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", icon_size = 128}, + { icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128}, } ), enabled = true, @@ -71,13 +71,13 @@ data:extend({ { type = "item", name = "alumina", - icon = "__bzaluminum__/graphics/icons/alumina.png", + icon = "__bzaluminum2__/graphics/icons/alumina.png", icon_size = 128, pictures = { - {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}, + {filename="__bzaluminum2__/graphics/icons/alumina.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-1.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-2.png", size=128, scale=0.25}, + {filename="__bzaluminum2__/graphics/icons/alumina-3.png", size=128, scale=0.25}, }, subgroup = "raw-material", order = "b[alumina]", @@ -86,7 +86,7 @@ data:extend({ { type = "item", name = "aluminum-plate", - icon = "__bzaluminum__/graphics/icons/aluminum-plate.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-plate.png", icon_size = 128, subgroup = "raw-material", order = "b[aluminum-plate]", @@ -147,7 +147,7 @@ data:extend({ { type = "technology", name = "reinforced-cable", - icon = "__bzaluminum__/graphics/technology/reinforced-cable.png", + icon = "__bzaluminum2__/graphics/technology/reinforced-cable.png", icon_size = 256, effects = { { type = "unlock-recipe", recipe = "acsr-cable" }, @@ -166,7 +166,7 @@ data:extend({ { type = "item", name = "aluminum-cable", - icon = "__bzaluminum__/graphics/icons/aluminum-cable.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4, subgroup = util.cablesg, order = "b[aaac-cable]", @@ -185,7 +185,7 @@ data:extend({ { type = "item", name = "acsr-cable", - icon = "__bzaluminum__/graphics/icons/acsr-cable.png", + icon = "__bzaluminum2__/graphics/icons/acsr-cable.png", icon_size = 128, subgroup = util.cablesg, order = "b[acsr-cable]", @@ -217,8 +217,8 @@ if mods.Krastorio2 then 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}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, { @@ -233,8 +233,8 @@ if mods.Krastorio2 then 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}}, + {icon = "__bzaluminum2__/graphics/icons/aluminum-cable.png", icon_size = 64, icon_mipmaps = 4}, + {icon = "__bzaluminum2__/graphics/icons/enriched-aluminum.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, }, }) @@ -254,7 +254,7 @@ data:extend({ { type = "item", name = "spark-plug", - icon = "__bzaluminum__/graphics/icons/spark-plug.png", + icon = "__bzaluminum2__/graphics/icons/spark-plug.png", icon_size = 128, subgroup = "intermediate-product", order = "b[spark-plug]", @@ -294,7 +294,7 @@ data:extend({ { type = "item", name = "aluminum-6061", - icon = "__bzaluminum__/graphics/icons/aluminum-6061.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-6061.png", icon_size = 128, subgroup = "raw-material", order = "zz[aluminum-6061]", @@ -314,7 +314,7 @@ data:extend({ { type = "technology", name = "basic-alloys", - icon = "__bzaluminum__/graphics/icons/aluminum-6061.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-6061.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "aluminum-6061" }, @@ -353,7 +353,7 @@ data:extend({ { type = "item", name = "aluminum-2219", - icon = "__bzaluminum__/graphics/icons/aluminum-2219.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-2219.png", icon_size = 128, subgroup = "raw-material", order = "zz[aluminum-2219]", @@ -373,7 +373,7 @@ data:extend({ { type = "technology", name = "aerospace-alloys", - icon = "__bzaluminum__/graphics/icons/aluminum-2219.png", + icon = "__bzaluminum2__/graphics/icons/aluminum-2219.png", icon_size = 128, effects = { { type = "unlock-recipe", recipe = "aluminum-2219" }, @@ -397,7 +397,7 @@ if mods.bztitanium then { type = "item", name = "ti-sapphire", - icon = "__bzaluminum__/graphics/icons/ti-sapphire.png", + icon = "__bzaluminum2__/graphics/icons/ti-sapphire.png", icon_size = 128, subgroup = "intermediate-product", order = "zz[sapphire-ti]", @@ -406,7 +406,7 @@ if mods.bztitanium then { type = "recipe", name = "ti-sapphire", - icon = "__bzaluminum__/graphics/icons/ti-sapphire.png", + icon = "__bzaluminum2__/graphics/icons/ti-sapphire.png", icon_size = 128, category = "chemistry", subgroup = "intermediate-product", diff --git a/compatibility/248k-recipes.lua b/compatibility/248k-recipes.lua index 1b49d4e..30031ea 100644 --- a/compatibility/248k-recipes.lua +++ b/compatibility/248k-recipes.lua @@ -23,7 +23,7 @@ data:extend({ 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} + icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8} }, } }, diff --git a/data.lua b/data.lua index 0f18495..241f20f 100644 --- a/data.lua +++ b/data.lua @@ -10,10 +10,10 @@ local util = require("data-util"); if mods.Krastorio2 then if data.raw.item["kr-automation-core"] then - data.raw.item["kr-automation-core"].icon = "__bzaluminum__/graphics/icons/automation-core.png" + data.raw.item["kr-automation-core"].icon = "__bzaluminum2__/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" + data.raw.technology["kr-automation-core"].icon = "__bzaluminum2__/graphics/technology/automation-core.png" end end diff --git a/info.json b/info.json index 8b1e2a7..43026c7 100644 --- a/info.json +++ b/info.json @@ -1,9 +1,9 @@ { - "name": "bzaluminum", + "name": "bzaluminum2", "version": "2.0.0", "factorio_version": "2.0", "title": "Aluminum", - "author": "Brevven", + "author": "Brevven, cackling fiend", "contact": "", "homepage": "", "dependencies": [ @@ -25,7 +25,8 @@ "(?) bobtech", "(?) bobassembly", "(?) bobpower", - "(?) scattergun_turret" + "(?) scattergun_turret", + "! space-age" ], "description": "Adds aluminum, alumina, cables, alloys and more to the game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods." } diff --git a/me.lua b/me.lua index 49275ee..a5241a3 100644 --- a/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzaluminum" +me.name = "bzaluminum2" me.list = {} diff --git a/strange-matter.lua b/strange-matter.lua index 00bf2ee..36c2084 100644 --- a/strange-matter.lua +++ b/strange-matter.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local ore = "aluminum-ore" -local ore_icon = "__bzaluminum__/graphics/icons/aluminum-ore.png" +local ore_icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png" if mods["StrangeMatter"] then data:extend({