diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index bbf3e21..0000000 --- a/.editorconfig +++ /dev/null @@ -1,3 +0,0 @@ -[*] -indent_style = space -indent_size = 2 \ No newline at end of file diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..e04c9b6 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* brevven diff --git a/.gitignore b/.gitignore index 85e49ae..72c1b51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -.idea -*.zip \ No newline at end of file +*.bak +*.blend* diff --git a/bzzirconium2/LICENSE.md b/LICENSE.md similarity index 100% rename from bzzirconium2/LICENSE.md rename to LICENSE.md diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..11be59f --- /dev/null +++ b/Makefile @@ -0,0 +1,37 @@ +# General makefile for factorio mods. +# +# Presumes the development work is done in a /dev// +# directory where this makefile resides. This directory must be parallel to +# the /mods/ directory where mods are installed. Run `make +# install` from dev/ to install the mod as a zip file. That zip file +# should also be ready to upload to the mod portal + +.PHONY: copy lint-changelog install + +libdir = "../bzlib" +libfiles = $(shell ls $(libdir)/*.lua | grep -o '[^/]*.lua') +pwd = $(shell pwd) +v = $(shell basename "$(pwd)")_$(shell jq -r .version info.json) + +link: + for f in $(libfiles) ; do \ + echo "using $(libdir)/$$f" ;\ + cp $(libdir)/$$f .; \ + done; + +copy: link + rm -rf ../$(v) + mkdir -p ../$(v) + cp -rf * ../$(v) + rm -f ../$(v).zip + cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*" + +install: lint-changelog copy + cp -f ../$(v).zip ../../mods/ + +lint-changelog: copy + python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip + +zorro: + python3 ../da-changelog-tools_0.0.14/changelog-checker.py --zorro --changelog ../$(v).zip + diff --git a/README.md b/README.md index 82c0885..4e26678 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,15 @@ -**This is an unofficial forked version and it stays until Brevven takes over again.** - -**Compatibility with Space Age is explicitly excluded. Stick to the original mod for Space Age.** - # Zirconium -Adds mineable zircon, zirconia, zirconium plates, and more to the game. Modifies several recipes to use new resources and intermediates. With Space Age enabled, provides alternate production chains on other planets, as well as making rockets a little bit trickier to make on space platforms. If Tin is enabled, zircaloy is also available. -On its own this mod won't raise the complexity of the game substantially, but this mod is more complex than Titanium or Lead. +[factorio mod page](https://mods.factorio.com/mod/bzzirconium) -Zircon is available early game and mineable by hand but very little is needed early on, and there's a setting to disable the need until after logistic science. Refined products become available later. If Titanium is enabled, making zirconia from zircon will also (optionally) yield titanium ore as a byproduct. There's an option to enable the cermet intermediates. +## Version History +See changelog.txt -## Credits -- Brevven ([Original mod](https://mods.factorio.com/mod/bzsilicon)) -- [cackling fiend](https://mods.factorio.com/user/cackling.fiend) (mod integrations and maintenance) +## Created by + +- [brevven](https://mods.factorio.com/user/brevven) (code, design, graphics) + +### Thanks to - [snouz](https://mods.factorio.com/user/snouz) (recolored ore graphics, thumbnail style) - Krastorio2 team for magazine icons, and some related code in magazine.lua (Licensed under GNU LGPL v3.0) @@ -26,4 +24,4 @@ Zircon is available early game and mineable by hand but very little is needed ea - [S3BA](https://github.com/S3BA-pl) (pl) - [x2605](https://github.com/x2605) (ko) - [Pergamum663](https://github.com/Pergamum663) (ru) -- [NathanU](https://github.com/NathanU) (de) \ No newline at end of file +- [NathanU](https://github.com/NathanU) (de) diff --git a/bzzirconium2/basic-foundry.lua b/basic-foundry.lua similarity index 100% rename from bzzirconium2/basic-foundry.lua rename to basic-foundry.lua diff --git a/bzzirconium2/changelog.txt b/bzzirconium2/changelog.txt deleted file mode 100644 index 7b955ca..0000000 --- a/bzzirconium2/changelog.txt +++ /dev/null @@ -1,7 +0,0 @@ ---------------------------------------------------------------------------------------------------- -Version: 2.1.14 -Date: 21.10.2025 - Legacy version meant to be played with my other forks and ATOM. - - Bug Fixes: - - Various mod compatibility fixes \ No newline at end of file diff --git a/bzzirconium2/compatibility/hot-metals.lua b/bzzirconium2/compatibility/hot-metals.lua deleted file mode 100644 index d9b1b03..0000000 --- a/bzzirconium2/compatibility/hot-metals.lua +++ /dev/null @@ -1,17 +0,0 @@ -local util = require("data-util"); - -util.add_hot_metals({ - {name="zirconium-plate", icons={ - { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128}, - { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, - }}, - {name="zircaloy-4", icons={ - { icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128}, - { icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128, tint={.9,.3,0, .5}}, - }}, - -}) - -if HotMetals then - table.insert(HotMetals.craftingCategories, "basic-metallurgy") -end diff --git a/bzzirconium2/info.json b/bzzirconium2/info.json deleted file mode 100644 index 5881845..0000000 --- a/bzzirconium2/info.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "bzzirconium2", - "version": "2.1.14", - "factorio_version": "2.0", - "title": "Zirconium - Legacy", - "description": "Adds zircon, zirconia, zirconium, and more to the base game.", - "author": "Brevven, cackling fiend", - "homepage": "https://discord.gg/ufvFUJtVwk", - "dependencies": [ - "base >= 2.0.0", - "? space-exploration", - "? aai-industry", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "? omnimatter", - "? bzsilicon2", - "? bzlead2", - "? bztitanium2 >= 2.0.27", - "? bztungsten2 >= 2.0.0", - "! space-age" - ] -} \ No newline at end of file diff --git a/bzzirconium2/zirconium-recipe-se.lua b/bzzirconium2/zirconium-recipe-se.lua deleted file mode 100644 index 75b5ea8..0000000 --- a/bzzirconium2/zirconium-recipe-se.lua +++ /dev/null @@ -1,112 +0,0 @@ --- Additional recipes if Space Exploration mod is enabled -local util = require("data-util"); - -if mods["space-exploration"] then - se_delivery_cannon_recipes["zircon"] = {name= "zircon"} - se_delivery_cannon_recipes["zircaloy-4"] = {name= "zircaloy-4"} - se_delivery_cannon_recipes["zirconia"] = {name= "zirconia"} - se_delivery_cannon_recipes["zirconium-plate"] = {name= "zirconium-plate"} - util.se_landfill({ore="zircon"}) - - util.se_matter({ore="zircon", energy_required=1.5, quant_out=10, stream_out=60}) - data:extend({ - { - type = "item-subgroup", - name = "zirconium", - group = "resources", - order = "a-h-z-z", - } - }) - util.set_item_subgroup("zirconia", "zirconium") - util.set_item_subgroup("zirconium-plate", "zirconium") - data.raw.recipe["zirconia"].subgroup = "zirconium" - data:extend({ - { - type = "item", - name = "zirconium-ingot", - icons = {{icon = "__bzzirconium2__/graphics/icons/zirconium-ingot.png", icon_size = 128}}, - order = "b-b", - stack_size = 50, - subgroup = "zirconium", - }, - { - type = "fluid", - name = "molten-zirconium", - default_temperature = 1852, - max_temperature = 1852, - base_color = {r=121, g=80, b=80}, - flow_color = {r=121, g=80, b=80}, - icons = {{icon = "__bzzirconium2__/graphics/icons/molten-zirconium.png", icon_size = 128}}, - order = "a[molten]-a", - pressure_to_speed_ratio = 0.4, - flow_to_energy_ratio = 0.59, - auto_barrel = false, - subgroup = "fluid", - }, - { - type = "recipe", - category = "smelting", - name = "molten-zirconium", - main_product = "molten-zirconium", - subgroup = "zirconium", - results = { - {type = "fluid", name = "molten-zirconium", amount = util.k2() and 750 or 900}, - }, - energy_required = 60, - ingredients = { - { type = "item", name = "zirconia", amount = 24}, - {type = "fluid", name = "se-pyroflux", amount = 10}, - }, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - order = "a-a" - }, - { - type = "recipe", - name = "zirconium-ingot", - category = "casting", - results = {{type = "item", name = "zirconium-ingot", amount = 1}}, - energy_required = 75, - ingredients = { - {type = "fluid", name = "molten-zirconium", amount = 750}, - }, - enabled = false, - always_show_made_in = true, - allow_as_intermediate = false, - }, - { - type = "recipe", - category = "crafting", - name = "zirconium-ingot-to-plate", - - icons = { - {icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3}, - {icon = "__bzzirconium2__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, - }, - results = { - {type = "item", name = "zirconium-plate", amount = 10}, - }, - energy_required = 5, - ingredients = { - {type = "item", name = "zirconium-ingot", amount = 1} - }, - enabled = false, - always_show_made_in = true, - allow_decomposition = false, - order = "a-c-b" - }, - }) - util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"}) - util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"}) - util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"}) - util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"}) - util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"}) - util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"}) - if util.k2() then - util.set_item_subgroup("enriched-zircon", "zirconium") - se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"} - end - se_delivery_cannon_recipes["zirconium-ingot"] = {name= "zirconium-ingot"} - -end diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..37d7e65 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,467 @@ +--------------------------------------------------------------------------------------------------- +Version: 2.1.12 +Date: 2025-05-04 + Changes: + - Support for Krastorio2 spaced out +--------------------------------------------------------------------------------------------------- +Version: 2.1.11 +Date: 2025-05-04 + Fixes: + - Fix issue introduced in 2.1.10 that disabled Zircaloy +--------------------------------------------------------------------------------------------------- +Version: 2.1.10 +Date: 2025-05-03 + Changes: + - Fix load issue with bob's + - K2 updated compatibility, thanks to autechr3 and pla +--------------------------------------------------------------------------------------------------- +Version: 2.1.9 +Date: 2025-04-20 + Changes: + - When Cerys mod is enabled, concrete recycles into (and requires) more zircon + - Any Planet Start on Vulcanus, tweak tech tree a bit. +--------------------------------------------------------------------------------------------------- +Version: 2.1.8 +Date: 2025-04-08 + Changes: + - Space Age: Asteroid crushing recipe now affected by productivity research +--------------------------------------------------------------------------------------------------- +Version: 2.1.7 +Date: 2025-03-22 + Changes: + - Set inventory sounds for some items + - Minor compatibility tweaks + Fixes: + - Loads with Crafting Efficiency mod + - Improved compatibility with muluna + - Other incidental fixes +--------------------------------------------------------------------------------------------------- +Version: 2.1.6 +Date: 2025-02-20 + Fixes: + - Space Age: Disable some recipes until appropriate tech is discovered + - Plutonium Energy MOX fuel cell uses zirconium +--------------------------------------------------------------------------------------------------- +Version: 2.1.5 +Date: 2025-02-13 + Changes: + - Show asteroid crushing recipe in signal GUI +--------------------------------------------------------------------------------------------------- +Version: 2.1.4 +Date: 2025-02-08 + Fixes: + - Fix start of game soft lock with Lignumis mod +--------------------------------------------------------------------------------------------------- +Version: 2.1.3 +Date: 2025-02-01 + Fixes: + - Fix /bz-regenerate command + Changes: + - With Wooden Industry, cermet can be made in kiln + - Other minor compatibility changes +--------------------------------------------------------------------------------------------------- +Version: 2.1.2 +Date: 2025-01-31 + Changes: + - Add shiftite recipe for Janus mod +--------------------------------------------------------------------------------------------------- +Version: 2.1.1 +Date: 2025-01-25 + Fixes: + - Improve compatibility with mods that change armor recipes in certain ways + Changes: + - When byproducts are turned off, don't add extra furnace output +--------------------------------------------------------------------------------------------------- +Version: 2.1.0 +Date: 2025-01-19 + Changes: + - Space Age: Changes to Vulcanus production chains: + Most recipes made from lava now have a byproduct of both stone and zircon. So, recyclers + are no longer required for full automation, but will help with balancing once available. + LDS casting now requires zirconia. + - Space Age & Wooden Industry: With kilns available, basic foundry is disabled by default, but + there's an option to keep it available. +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2025-01-15 + Fixes: + - Space Age: fix recycling +--------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 2025-01-14 + Fixes: + - Working with Asteroid Mining +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 2025-01-14 + Fixes: + - Basic foundry supports hot metals + - Prevent a mod load error, improve general mod compatibility +--------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 2025-01-13 + Changes: + - Compatible with 2.0 and Space Age + - New zircon item graphics, improved zircon entity graphics + - Zirconium smelting takes one more step than in 1.1, but has more forgiving ratios. + - Some recipe and tech tree reworks. Cermet no longer used in LDS. + - With Space Age, add an inefficient basic foundry for creating simple alloys on Nauvis. It cannnot craft advanced foundry recipes. + - Alternative production chains on Vulcanus and Gleba. Uses recyclers on Fulgora.... +--------------------------------------------------------------------------------------------------- +Version: 0.7.3 +Date: 2024-02-07 + Fixes: + - SE: Attempt a fix for mod load error when used without Tungsten. +--------------------------------------------------------------------------------------------------- +Version: 0.7.2 +Date: 2023-12-23 + Fixes: + - Fix locale string, en + - K2SE matter stabilizer fix + Localization: + - ja updates by Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.7.1 +Date: 2023-03-13 + Fixes: + - Fix issue with K2 without modded stack sizes +--------------------------------------------------------------------------------------------------- +Version: 0.7.0 +Date: 2023-03-12 + Features: + - BETA: New explosive rounds magazine item, optional. (Damage values may change) + - New setting to disable the need for zircon in the early game. + Changes: + - Trees should spawn less often on ore +--------------------------------------------------------------------------------------------------- +Version: 0.6.15 +Date: 2023-02-12 + Changes: + - Crafting efficiency improvements, thanks to nihilistzsche +--------------------------------------------------------------------------------------------------- +Version: 0.6.14 +Date: 2023-01-17 + Changes: + - Deadlock stacking/crating: zircon moved to tier 1 + Features: + - (Beta) Add support for crafting efficiency mod +--------------------------------------------------------------------------------------------------- +Version: 0.6.13 +Date: 2022-12-24 + Fixes: + - Modules for GDIW, etc + Localization: + - de updates thanks to NathanU + - zh updates thanks to sunnytan53 + Changes: + - SE ingot in delivery cannon +--------------------------------------------------------------------------------------------------- +Version: 0.6.12 +Date: 2022-10-11 + Fixes: + - Fix asteroid mining +--------------------------------------------------------------------------------------------------- +Version: 0.6.11 +Date: 2022-08-24 + Changes: + - SE: Support for Shivero's nuclear + Localization: + - ja updates by Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.6.10 +Date: 2022-08-17 + Fixes: + - SE: Disable matter recipes at start +--------------------------------------------------------------------------------------------------- +Version: 0.6.9 +Date: 2022-08-09 + Features: + - Support for SE matter fusion and SE+K2 matter liberation +--------------------------------------------------------------------------------------------------- +Version: 0.6.8 +Date: 2022-08-02 + Changes: + - Asteroid Mining compatibility + Fixes: + - Fix changelog +--------------------------------------------------------------------------------------------------- +Version: 0.6.7 +Date: 2022-07-11 + Changes: + - Atomic Overhaul compatibility + - Double Furnace recipe + Localization: + - ru locale updates thanks to Pergamum663 +--------------------------------------------------------------------------------------------------- +Version: 0.6.6 +Date: 2022-07-08 + Fixes: + - Tin: Zircaloy 4 unlocks on zirconia processing in all loadouts. + - Tin: Zircaloy 4 should correctly be made in foundry if enabled. + Localization: + - ja locale updates thanks to Sakuro + Changes: + - Added chat command ZirconiumRecipes to unlock all zirconium recipes. + Use if a recipe does not unlock properly. +--------------------------------------------------------------------------------------------------- +Version: 0.6.5 +Date: 2022-07-05 + Changes: + - With Tin enabled, use Zircaloy-4 in nuclear recipes + - Reduce amount of zirconium needed for explosives + - Some other minor recipe tweaks +--------------------------------------------------------------------------------------------------- +Version: 0.6.4 +Date: 2022-07-03 + Fixes: + - SE: Fix ingot locale string + - SE: Prod modules for molten + Changes: + - SE: Remove byproduct from molten altogether, regardless of setting. + - SE: Ingot time reduced a bit +--------------------------------------------------------------------------------------------------- +Version: 0.6.3 +Date: 2022-07-02 + Fixes: + - More SE subgroup cleanup + - Locale string fix for new setting +--------------------------------------------------------------------------------------------------- +Version: 0.6.2 +Date: 2022-07-02 + Fixes: + - SE K2 subgroup cleanup + Features: + - Setting to turn off byproduct when used with Titanium mod +--------------------------------------------------------------------------------------------------- +Version: 0.6.1 +Date: 2022-07-02 + Changes: + - SE Update smelting unlock +--------------------------------------------------------------------------------------------------- +Version: 0.6.0 +Date: 2022-07-01 + Changes: + - Support for Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- +Version: 0.5.7 +Date: 2022-06-05 + Changes: + - K2 & Dectorio: Ploppable rock recipes now require zircon + - Reduced zircon richness around starting area a little bit more, yet again +--------------------------------------------------------------------------------------------------- +Version: 0.5.6 +Date: 2022-02-22 + Localization: + - ko locale, thanks to x2605 + - ja locale updates thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.5.5 +Date: 2022-02-02 + Changes: + - Zircon/stone sorting is now behind a setting, default off. It is no longer necessary for + original balance purposes. If you use these recipes, update your mod startup settings before + saving your game. + - Huge rocks have a little more zircon, in general. + - Big rocks have a little less zircon, in general + - Reduced zircon richness around starting area a little bit more + Fixes: + - Rocks will have less zircon whenever alien biomes mod is used. +--------------------------------------------------------------------------------------------------- +Version: 0.5.4 +Date: 2022-01-31 + Fixes: + - LDS recipe compatibility fixes +--------------------------------------------------------------------------------------------------- +Version: 0.5.3 +Date: 2022-01-30 + Changes: + - K2: Dirty water filtration quantity + - Cermet requires 2 zirconia (result quantity also increased by 1) + - Minor compatibility tweaks + Fixes: + - Most rocks should now have Zircon in Space Exploration, too +--------------------------------------------------------------------------------------------------- +Version: 0.5.2 +Date: 2022-01-20 + Changes: + - MadClown's vanilla nuclear, Science compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.1 +Date: 2022-01-19 + Fixes: + - Fix issue with richness scaling too fast +--------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2022-01-15 + Changes: + - New default setting for cermet: + Cermet is used in LDS (instead of pure Zirconia). Recipe is balanced + around this. In space exploration, Cermet is also used in Aeroframe Scaffolds. + This may eventually become the only option when cermet is enabled, if + supporting the setting gets too difficult. I will support the setting + for at least a few months. + - New Cermet Graphics + - Cermet tech is available earlier. + - Zircon used instead of iron ore in concrete (use Bypass recipes if you wish) + - Zirconium processing no longer a prerequisite to chemical science +--------------------------------------------------------------------------------------------------- +Version: 0.4.4 +Date: 2022-01-07 + Changes: + - Update plate icon +--------------------------------------------------------------------------------------------------- +Version: 0.4.3 +Date: 2022-01-06 + Localization: + - Polish (pl) l10n, thanks to S3BA +--------------------------------------------------------------------------------------------------- +Version: 0.4.2 +Date: 2022-01-05 + Localization: + - Simplified Chinese (zh_CN) l10n, thanks to PlexPt +--------------------------------------------------------------------------------------------------- +Version: 0.4.1 +Date: 2022-01-05 + Fixes: + - Big rocks now also give zircon + Changes: + - Zircon is less rich closer to starting position, same richness after 200 tiles. +--------------------------------------------------------------------------------------------------- +Version: 0.4.0 +Date: 2022-01-03 + Changes: + - Tungsten sets basic rocket-engine-nozzle recipe, this mod updates it with zirconia +--------------------------------------------------------------------------------------------------- +Version: 0.3.2 +Date: 2021-12-31 + Features: + - Rocks now give some zircon + Localization: + - JA l10n updates +--------------------------------------------------------------------------------------------------- +Version: 0.3.1 +Date: 2021-12-24 + Changes: + - SE: Cermet available earlier +--------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2021-11-06 + Changes: + - K2: beta compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.2.0 +Date: 2021-10-11 + Fixes: + - K2: Enriched zircon icon size + - SE: Balance core mining + - SE: Landfill recipe + - Bulk rail loader for zircon + Changes: + - K2: Enrichment byproduct if titanium enabled, too. + +--------------------------------------------------------------------------------------------------- +Version: 0.1.2 +Date: 2021-08-16 + Fixes: + - Enable prod modules on all intermediates + - Power Armor MK3 compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.1.1 +Date: 2021-07-26 + Changes: + - SE: experimental alloys data recipe + - Add a tech description for cermet tech + - Minor refactor +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 2021-07-21 + Features: + - Officially in "beta" now. + - True Nukes compatibility + - Hazmat Suit compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.0.14 +Date: 2021-07-07 + Localization: + - Russian locale thanks to Thar0l + Features: + - Some minor bobplates compatibility improvements +--------------------------------------------------------------------------------------------------- +Version: 0.0.13 +Date: 2021-07-04 + Localization: + - German locale thanks to Yokmp +--------------------------------------------------------------------------------------------------- +Version: 0.0.12 +Date: 2021-07-01 + Features: + - Strange Matter compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.0.11 +Date: 2021-06-29 + Features: + - Realistic Fusion Power compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.0.10 +Date: 2021-06-29 + Changes: + - Updated zirconium plate icon + - Ordering of plate + Features: + - More compatibility : RITEG +--------------------------------------------------------------------------------------------------- +Version: 0.0.9 +Date: 2021-06-26 + Features: + - More compatibility including plutonium energy +--------------------------------------------------------------------------------------------------- +Version: 0.0.8 +Date: 2021-06-20 + Features: + - Nixie tubes + Fixes: + - Fix en locale string when K2 is enabled. +--------------------------------------------------------------------------------------------------- +Version: 0.0.7 +Date: 2021-06-17 + Features: + - More compatibility: zombie's, bob's machines, mining, etc + Localization: + - ja locale thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.0.6 +Date: 2021-06-16 + Changes: + - Sorting recipes are fully probabilistic to fix crafting ui confusion + - Small tweak to electric furnace recipe + - K2 stone brick is now 50/50 stone/zircon +--------------------------------------------------------------------------------------------------- +Version: 0.0.5 +Date: 2021-06-16 + Features: + - Recipe bypass setting +--------------------------------------------------------------------------------------------------- +Version: 0.0.4 +Date: 2021-06-15 + Features: + - FE+ compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.0.3 +Date: 2021-06-12 + Features: + - Realistic Reactors, etc. + Fixes: + - Minor string fixes +--------------------------------------------------------------------------------------------------- +Version: 0.0.2 +Date: 2021-06-12 + Features: + - Nuclear Fuel, Nuclear Furnace, Rampant Industry, Tier 4 modules + Changes: + - Update some stacked icons +--------------------------------------------------------------------------------------------------- +Version: 0.0.1 +Date: 2021-06-10 + Features: + - Zirconium, Zirconia, Zircon, Cermet added to game. + - Compatible with space exploration, krastorio2, deadlock stacking/crating, etc. diff --git a/compatibility/hot-metals.lua b/compatibility/hot-metals.lua new file mode 100644 index 0000000..761c6b4 --- /dev/null +++ b/compatibility/hot-metals.lua @@ -0,0 +1,17 @@ +local util = require("data-util"); + +util.add_hot_metals({ + {name="zirconium-plate", icons={ + { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128}, + { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, tint={.9,.3,0, .5}}, + }}, + {name="zircaloy-4", icons={ + { icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128}, + { icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128, tint={.9,.3,0, .5}}, + }}, + +}) + +if HotMetals then + table.insert(HotMetals.craftingCategories, "basic-metallurgy") +end diff --git a/bzzirconium2/control-util.lua b/control-util.lua similarity index 100% rename from bzzirconium2/control-util.lua rename to control-util.lua diff --git a/bzzirconium2/control.lua b/control.lua similarity index 100% rename from bzzirconium2/control.lua rename to control.lua diff --git a/bzzirconium2/data-final-fixes.lua b/data-final-fixes.lua similarity index 95% rename from bzzirconium2/data-final-fixes.lua rename to data-final-fixes.lua index 540e41e..d2064d8 100644 --- a/bzzirconium2/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -8,7 +8,7 @@ if mods["space-exploration"] then util.add_to_product("se-core-fragment-omni", "zircon", -3) end -if mods["bztitanium2"] then +if mods.bztitanium then if util.me.byproduct() then -- If furnaces are treated as furnaces, we need 2 outputs util.set_minimum_furnace_outputs("smelting", 2) diff --git a/bzzirconium2/data-updates.lua b/data-updates.lua similarity index 100% rename from bzzirconium2/data-updates.lua rename to data-updates.lua diff --git a/bzzirconium2/data-util.lua b/data-util.lua similarity index 98% rename from bzzirconium2/data-util.lua rename to data-util.lua index bc3e734..c4144a0 100644 --- a/bzzirconium2/data-util.lua +++ b/data-util.lua @@ -99,7 +99,7 @@ if get_setting("bz-recipe-bypass") then end function util.is_foundry() - return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal") + return mods.bzfoundry and not me.get_setting("bzfoundry-minimal") end function should_force(options) @@ -504,8 +504,8 @@ function util.se_landfill(params) category = "hard-recycling", order = "z-b-"..params.ore, subgroup = "terrain", - results = {{ type = "item", name = "landfill", amount = 1 }}, - ingredients = {{ type = "item", name = params.ore, amount = 50}}, + result = "landfill", + ingredients = {{params.ore, 50}}, } }) util.add_unlock("se-recycling-facility", lname) @@ -584,6 +584,7 @@ end -- se matter -- params: ore, energy_required, quant_out, quant_in, icon_size, stream_out function util.se_matter(params) + if mods["space-exploration"] > "0.6" then if not params.quant_in then params.quant_in = params.quant_out end if not params.icon_size then params.icon_size = 64 end local fname = "matter-fusion-"..params.ore @@ -610,15 +611,15 @@ function util.se_matter(params) energy_required = params.energy_required, enabled = false, ingredients = { - {type="item", name=sedata, amount=1}, + {sedata, 1}, {type="fluid", name="se-particle-stream", amount=50}, {type="fluid", name="se-space-coolant-supercooled", amount=25}, }, results = { - {type="item", name=params.ore, amount=params.quant_out}, - {type="item", name="se-contaminated-scrap", amount=1}, - {type="item", name=sedata, amount=1, probability=.99}, - {type="item", name=sejunk, amount=1, probability=.01}, + {params.ore, params.quant_out}, + {"se-contaminated-scrap", 1}, + {type=item, name=sedata, amount=1, probability=.99}, + {type=item, name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-space-coolant-hot", amount=25, ignored_by_stats=25, ignored_by_productivity=25}, } } @@ -649,13 +650,13 @@ function util.se_matter(params) energy_required = 30, enabled = false, ingredients = { - {type="item", name="se-kr-matter-liberation-data", amount=1}, - {type="item", name=params.ore, amount=params.quant_in}, + {"se-kr-matter-liberation-data", 1}, + {params.ore, params.quant_in}, {type="fluid", name="se-particle-stream", amount=50}, }, results = { - {type="item", name="se-kr-matter-liberation-data", amount=1, probability=.99}, - {type="item", name=sejunk, amount=1, probability=.01}, + {type=item, name="se-kr-matter-liberation-data", amount=1, probability=.99}, + {type=item, name=sejunk, amount=1, probability=.01}, {type="fluid", name="se-particle-stream", amount=params.stream_out, ignored_by_stats=50, ignored_by_productivity=50}, } } @@ -683,7 +684,7 @@ function util.se_matter(params) {"se-astronomic-science-pack-4", 1}, {"se-energy-science-pack-4", 1}, {"se-material-science-pack-4", 1}, - {"kr-matter-tech-card", 1}, + {"matter-tech-card", 1}, {"se-deep-space-science-pack-1", 1}, } @@ -694,6 +695,7 @@ function util.se_matter(params) end util.add_unlock("bz-advanced-stream-production", lname) end + end end -- deprecated diff --git a/bzzirconium2/data.lua b/data.lua similarity index 100% rename from bzzirconium2/data.lua rename to data.lua diff --git a/bzzirconium2/graphics/entity/ores/hr-zircon.png b/graphics/entity/ores/hr-zircon.png similarity index 100% rename from bzzirconium2/graphics/entity/ores/hr-zircon.png rename to graphics/entity/ores/hr-zircon.png diff --git a/sources/graphics/entity/ores/hr-zircon.xcf b/graphics/entity/ores/hr-zircon.xcf similarity index 100% rename from sources/graphics/entity/ores/hr-zircon.xcf rename to graphics/entity/ores/hr-zircon.xcf diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-1.png b/graphics/entity/zircon-particle/hr-zircon-particle-1.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-1.png rename to graphics/entity/zircon-particle/hr-zircon-particle-1.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-2.png b/graphics/entity/zircon-particle/hr-zircon-particle-2.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-2.png rename to graphics/entity/zircon-particle/hr-zircon-particle-2.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-3.png b/graphics/entity/zircon-particle/hr-zircon-particle-3.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-3.png rename to graphics/entity/zircon-particle/hr-zircon-particle-3.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-4.png b/graphics/entity/zircon-particle/hr-zircon-particle-4.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-4.png rename to graphics/entity/zircon-particle/hr-zircon-particle-4.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png rename to graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png rename to graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png rename to graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png diff --git a/bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png b/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png similarity index 100% rename from bzzirconium2/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png rename to graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png diff --git a/bzzirconium2/graphics/icons/am-magazine.png b/graphics/icons/am-magazine.png similarity index 100% rename from bzzirconium2/graphics/icons/am-magazine.png rename to graphics/icons/am-magazine.png diff --git a/sources/graphics/icons/am-magazine.xcf b/graphics/icons/am-magazine.xcf similarity index 100% rename from sources/graphics/icons/am-magazine.xcf rename to graphics/icons/am-magazine.xcf diff --git a/bzzirconium2/graphics/icons/cermet-1.png b/graphics/icons/cermet-1.png similarity index 100% rename from bzzirconium2/graphics/icons/cermet-1.png rename to graphics/icons/cermet-1.png diff --git a/sources/graphics/icons/cermet-1.xcf b/graphics/icons/cermet-1.xcf similarity index 100% rename from sources/graphics/icons/cermet-1.xcf rename to graphics/icons/cermet-1.xcf diff --git a/bzzirconium2/graphics/icons/cermet-2.png b/graphics/icons/cermet-2.png similarity index 100% rename from bzzirconium2/graphics/icons/cermet-2.png rename to graphics/icons/cermet-2.png diff --git a/sources/graphics/icons/cermet-2.xcf b/graphics/icons/cermet-2.xcf similarity index 100% rename from sources/graphics/icons/cermet-2.xcf rename to graphics/icons/cermet-2.xcf diff --git a/bzzirconium2/graphics/icons/cermet-3.png b/graphics/icons/cermet-3.png similarity index 100% rename from bzzirconium2/graphics/icons/cermet-3.png rename to graphics/icons/cermet-3.png diff --git a/sources/graphics/icons/cermet-3.xcf b/graphics/icons/cermet-3.xcf similarity index 100% rename from sources/graphics/icons/cermet-3.xcf rename to graphics/icons/cermet-3.xcf diff --git a/bzzirconium2/graphics/icons/cermet-4.png b/graphics/icons/cermet-4.png similarity index 100% rename from bzzirconium2/graphics/icons/cermet-4.png rename to graphics/icons/cermet-4.png diff --git a/sources/graphics/icons/cermet-4.xcf b/graphics/icons/cermet-4.xcf similarity index 100% rename from sources/graphics/icons/cermet-4.xcf rename to graphics/icons/cermet-4.xcf diff --git a/bzzirconium2/graphics/icons/cermet.png b/graphics/icons/cermet.png similarity index 100% rename from bzzirconium2/graphics/icons/cermet.png rename to graphics/icons/cermet.png diff --git a/sources/graphics/icons/cermet.xcf b/graphics/icons/cermet.xcf similarity index 100% rename from sources/graphics/icons/cermet.xcf rename to graphics/icons/cermet.xcf diff --git a/bzzirconium2/graphics/icons/enriched-zircon-2.png b/graphics/icons/enriched-zircon-2.png similarity index 100% rename from bzzirconium2/graphics/icons/enriched-zircon-2.png rename to graphics/icons/enriched-zircon-2.png diff --git a/sources/graphics/icons/enriched-zircon-2.xcf b/graphics/icons/enriched-zircon-2.xcf similarity index 100% rename from sources/graphics/icons/enriched-zircon-2.xcf rename to graphics/icons/enriched-zircon-2.xcf diff --git a/bzzirconium2/graphics/icons/enriched-zircon-3.png b/graphics/icons/enriched-zircon-3.png similarity index 100% rename from bzzirconium2/graphics/icons/enriched-zircon-3.png rename to graphics/icons/enriched-zircon-3.png diff --git a/sources/graphics/icons/enriched-zircon-3.xcf b/graphics/icons/enriched-zircon-3.xcf similarity index 100% rename from sources/graphics/icons/enriched-zircon-3.xcf rename to graphics/icons/enriched-zircon-3.xcf diff --git a/bzzirconium2/graphics/icons/enriched-zircon-4.png b/graphics/icons/enriched-zircon-4.png similarity index 100% rename from bzzirconium2/graphics/icons/enriched-zircon-4.png rename to graphics/icons/enriched-zircon-4.png diff --git a/sources/graphics/icons/enriched-zircon-4.xcf b/graphics/icons/enriched-zircon-4.xcf similarity index 100% rename from sources/graphics/icons/enriched-zircon-4.xcf rename to graphics/icons/enriched-zircon-4.xcf diff --git a/bzzirconium2/graphics/icons/enriched-zircon.png b/graphics/icons/enriched-zircon.png similarity index 100% rename from bzzirconium2/graphics/icons/enriched-zircon.png rename to graphics/icons/enriched-zircon.png diff --git a/sources/graphics/icons/enriched-zircon.xcf b/graphics/icons/enriched-zircon.xcf similarity index 100% rename from sources/graphics/icons/enriched-zircon.xcf rename to graphics/icons/enriched-zircon.xcf diff --git a/bzzirconium2/graphics/icons/magazine.png b/graphics/icons/magazine.png similarity index 100% rename from bzzirconium2/graphics/icons/magazine.png rename to graphics/icons/magazine.png diff --git a/sources/graphics/icons/magazine.xcf b/graphics/icons/magazine.xcf similarity index 100% rename from sources/graphics/icons/magazine.xcf rename to graphics/icons/magazine.xcf diff --git a/bzzirconium2/graphics/icons/molten-zirconium.png b/graphics/icons/molten-zirconium.png similarity index 100% rename from bzzirconium2/graphics/icons/molten-zirconium.png rename to graphics/icons/molten-zirconium.png diff --git a/sources/graphics/icons/molten-zirconium.xcf b/graphics/icons/molten-zirconium.xcf similarity index 100% rename from sources/graphics/icons/molten-zirconium.xcf rename to graphics/icons/molten-zirconium.xcf diff --git a/bzzirconium2/graphics/icons/r-magazine.png b/graphics/icons/r-magazine.png similarity index 100% rename from bzzirconium2/graphics/icons/r-magazine.png rename to graphics/icons/r-magazine.png diff --git a/sources/graphics/icons/r-magazine.xcf b/graphics/icons/r-magazine.xcf similarity index 100% rename from sources/graphics/icons/r-magazine.xcf rename to graphics/icons/r-magazine.xcf diff --git a/bzzirconium2/graphics/icons/stacked/cermet-stacked.png b/graphics/icons/stacked/cermet-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/cermet-stacked.png rename to graphics/icons/stacked/cermet-stacked.png diff --git a/sources/graphics/icons/stacked/cermet-stacked.xcf b/graphics/icons/stacked/cermet-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/cermet-stacked.xcf rename to graphics/icons/stacked/cermet-stacked.xcf diff --git a/bzzirconium2/graphics/icons/stacked/enriched-zircon-stacked.png b/graphics/icons/stacked/enriched-zircon-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/enriched-zircon-stacked.png rename to graphics/icons/stacked/enriched-zircon-stacked.png diff --git a/sources/graphics/icons/stacked/enriched-zircon-stacked.xcf b/graphics/icons/stacked/enriched-zircon-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/enriched-zircon-stacked.xcf rename to graphics/icons/stacked/enriched-zircon-stacked.xcf diff --git a/bzzirconium2/graphics/icons/stacked/zircaloy-4-stacked.png b/graphics/icons/stacked/zircaloy-4-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/zircaloy-4-stacked.png rename to graphics/icons/stacked/zircaloy-4-stacked.png diff --git a/sources/graphics/icons/stacked/zircaloy-4-stacked.xcf b/graphics/icons/stacked/zircaloy-4-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/zircaloy-4-stacked.xcf rename to graphics/icons/stacked/zircaloy-4-stacked.xcf diff --git a/bzzirconium2/graphics/icons/stacked/zircon-stacked.png b/graphics/icons/stacked/zircon-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/zircon-stacked.png rename to graphics/icons/stacked/zircon-stacked.png diff --git a/sources/graphics/icons/stacked/zircon-stacked.xcf b/graphics/icons/stacked/zircon-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/zircon-stacked.xcf rename to graphics/icons/stacked/zircon-stacked.xcf diff --git a/bzzirconium2/graphics/icons/stacked/zirconia-stacked.png b/graphics/icons/stacked/zirconia-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/zirconia-stacked.png rename to graphics/icons/stacked/zirconia-stacked.png diff --git a/sources/graphics/icons/stacked/zirconia-stacked.xcf b/graphics/icons/stacked/zirconia-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/zirconia-stacked.xcf rename to graphics/icons/stacked/zirconia-stacked.xcf diff --git a/bzzirconium2/graphics/icons/stacked/zirconium-plate-stacked.png b/graphics/icons/stacked/zirconium-plate-stacked.png similarity index 100% rename from bzzirconium2/graphics/icons/stacked/zirconium-plate-stacked.png rename to graphics/icons/stacked/zirconium-plate-stacked.png diff --git a/sources/graphics/icons/stacked/zirconium-plate-stacked.xcf b/graphics/icons/stacked/zirconium-plate-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/zirconium-plate-stacked.xcf rename to graphics/icons/stacked/zirconium-plate-stacked.xcf diff --git a/bzzirconium2/graphics/icons/zircaloy-4.png b/graphics/icons/zircaloy-4.png similarity index 100% rename from bzzirconium2/graphics/icons/zircaloy-4.png rename to graphics/icons/zircaloy-4.png diff --git a/sources/graphics/icons/zircaloy-4.xcf b/graphics/icons/zircaloy-4.xcf similarity index 100% rename from sources/graphics/icons/zircaloy-4.xcf rename to graphics/icons/zircaloy-4.xcf diff --git a/bzzirconium2/graphics/icons/zircon-1.png b/graphics/icons/zircon-1.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon-1.png rename to graphics/icons/zircon-1.png diff --git a/bzzirconium2/graphics/icons/zircon-2.png b/graphics/icons/zircon-2.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon-2.png rename to graphics/icons/zircon-2.png diff --git a/bzzirconium2/graphics/icons/zircon-3.png b/graphics/icons/zircon-3.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon-3.png rename to graphics/icons/zircon-3.png diff --git a/bzzirconium2/graphics/icons/zircon-4.png b/graphics/icons/zircon-4.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon-4.png rename to graphics/icons/zircon-4.png diff --git a/bzzirconium2/graphics/icons/zircon-powder.png b/graphics/icons/zircon-powder.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon-powder.png rename to graphics/icons/zircon-powder.png diff --git a/sources/graphics/icons/zircon-powder.xcf b/graphics/icons/zircon-powder.xcf similarity index 100% rename from sources/graphics/icons/zircon-powder.xcf rename to graphics/icons/zircon-powder.xcf diff --git a/sources/graphics/icons/zircon-stacked-new.xcf b/graphics/icons/zircon-stacked-new.xcf similarity index 100% rename from sources/graphics/icons/zircon-stacked-new.xcf rename to graphics/icons/zircon-stacked-new.xcf diff --git a/bzzirconium2/graphics/icons/zircon.png b/graphics/icons/zircon.png similarity index 100% rename from bzzirconium2/graphics/icons/zircon.png rename to graphics/icons/zircon.png diff --git a/bzzirconium2/graphics/icons/zirconia.png b/graphics/icons/zirconia.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconia.png rename to graphics/icons/zirconia.png diff --git a/sources/graphics/icons/zirconia.xcf b/graphics/icons/zirconia.xcf similarity index 100% rename from sources/graphics/icons/zirconia.xcf rename to graphics/icons/zirconia.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-ingot.png b/graphics/icons/zirconium-ingot.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-ingot.png rename to graphics/icons/zirconium-ingot.png diff --git a/sources/graphics/icons/zirconium-ingot.xcf b/graphics/icons/zirconium-ingot.xcf similarity index 100% rename from sources/graphics/icons/zirconium-ingot.xcf rename to graphics/icons/zirconium-ingot.xcf diff --git a/sources/graphics/icons/zirconium-plate-2.xcf b/graphics/icons/zirconium-plate-2.xcf similarity index 100% rename from sources/graphics/icons/zirconium-plate-2.xcf rename to graphics/icons/zirconium-plate-2.xcf diff --git a/sources/graphics/icons/zirconium-plate-new.xcf b/graphics/icons/zirconium-plate-new.xcf similarity index 100% rename from sources/graphics/icons/zirconium-plate-new.xcf rename to graphics/icons/zirconium-plate-new.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-plate-old.png b/graphics/icons/zirconium-plate-old.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-plate-old.png rename to graphics/icons/zirconium-plate-old.png diff --git a/sources/graphics/icons/zirconium-plate-old.xcf b/graphics/icons/zirconium-plate-old.xcf similarity index 100% rename from sources/graphics/icons/zirconium-plate-old.xcf rename to graphics/icons/zirconium-plate-old.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-plate.png b/graphics/icons/zirconium-plate.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-plate.png rename to graphics/icons/zirconium-plate.png diff --git a/sources/graphics/icons/zirconium-plate.xcf b/graphics/icons/zirconium-plate.xcf similarity index 100% rename from sources/graphics/icons/zirconium-plate.xcf rename to graphics/icons/zirconium-plate.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-sponge-1.png b/graphics/icons/zirconium-sponge-1.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-sponge-1.png rename to graphics/icons/zirconium-sponge-1.png diff --git a/sources/graphics/icons/zirconium-sponge-1.xcf b/graphics/icons/zirconium-sponge-1.xcf similarity index 100% rename from sources/graphics/icons/zirconium-sponge-1.xcf rename to graphics/icons/zirconium-sponge-1.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-sponge-2.png b/graphics/icons/zirconium-sponge-2.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-sponge-2.png rename to graphics/icons/zirconium-sponge-2.png diff --git a/sources/graphics/icons/zirconium-sponge-2.xcf b/graphics/icons/zirconium-sponge-2.xcf similarity index 100% rename from sources/graphics/icons/zirconium-sponge-2.xcf rename to graphics/icons/zirconium-sponge-2.xcf diff --git a/bzzirconium2/graphics/icons/zirconium-sponge.png b/graphics/icons/zirconium-sponge.png similarity index 100% rename from bzzirconium2/graphics/icons/zirconium-sponge.png rename to graphics/icons/zirconium-sponge.png diff --git a/sources/graphics/icons/zirconium-sponge.xcf b/graphics/icons/zirconium-sponge.xcf similarity index 100% rename from sources/graphics/icons/zirconium-sponge.xcf rename to graphics/icons/zirconium-sponge.xcf diff --git a/bzzirconium2/graphics/technology/cermet.png b/graphics/technology/cermet.png similarity index 100% rename from bzzirconium2/graphics/technology/cermet.png rename to graphics/technology/cermet.png diff --git a/sources/graphics/technology/cermet.xcf b/graphics/technology/cermet.xcf similarity index 100% rename from sources/graphics/technology/cermet.xcf rename to graphics/technology/cermet.xcf diff --git a/bzzirconium2/graphics/technology/zirconia-processing.png b/graphics/technology/zirconia-processing.png similarity index 100% rename from bzzirconium2/graphics/technology/zirconia-processing.png rename to graphics/technology/zirconia-processing.png diff --git a/bzzirconium2/graphics/technology/zirconium-processing.png b/graphics/technology/zirconium-processing.png similarity index 100% rename from bzzirconium2/graphics/technology/zirconium-processing.png rename to graphics/technology/zirconium-processing.png diff --git a/sources/graphics/technology/zirconium-processing.xcf b/graphics/technology/zirconium-processing.xcf similarity index 100% rename from sources/graphics/technology/zirconium-processing.xcf rename to graphics/technology/zirconium-processing.xcf diff --git a/info.json b/info.json new file mode 100644 index 0000000..3fb6b2a --- /dev/null +++ b/info.json @@ -0,0 +1,26 @@ +{ + "name": "bzzirconium", + "version": "2.1.12", + "factorio_version": "2.0", + "title": "Zirconium", + "author": "Brevven", + "contact": "", + "homepage": "", + "dependencies": [ + "base >= 1.1.0", + "? space-age", + "? space-exploration", + "? aai-industry", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating", + "? omnimatter", + "? bzsilicon", + "? bzlead", + "? bztitanium >= 0.12.4", + "? bztungsten >= 0.5.0" + ], + "description": "Adds zircon, zirconia, zirconium, and more to the base game.\n\nCompatible with Space Age and many other mods. A standalone piece of BZ Mods." +} + diff --git a/bzzirconium2/locale/de/zirconium.cfg b/locale/de/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/de/zirconium.cfg rename to locale/de/zirconium.cfg diff --git a/bzzirconium2/locale/en/zirconium.cfg b/locale/en/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/en/zirconium.cfg rename to locale/en/zirconium.cfg diff --git a/bzzirconium2/locale/ja/zirconium.cfg b/locale/ja/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/ja/zirconium.cfg rename to locale/ja/zirconium.cfg diff --git a/bzzirconium2/locale/ko/zirconium.cfg b/locale/ko/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/ko/zirconium.cfg rename to locale/ko/zirconium.cfg diff --git a/bzzirconium2/locale/pl/zirconium.cfg b/locale/pl/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/pl/zirconium.cfg rename to locale/pl/zirconium.cfg diff --git a/bzzirconium2/locale/ru/zirconium.cfg b/locale/ru/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/ru/zirconium.cfg rename to locale/ru/zirconium.cfg diff --git a/bzzirconium2/locale/zh-CN/zirconium.cfg b/locale/zh-CN/zirconium.cfg similarity index 100% rename from bzzirconium2/locale/zh-CN/zirconium.cfg rename to locale/zh-CN/zirconium.cfg diff --git a/bzzirconium2/magazine.lua b/magazine.lua similarity index 97% rename from bzzirconium2/magazine.lua rename to magazine.lua index 80d87dd..555ccce 100644 --- a/bzzirconium2/magazine.lua +++ b/magazine.lua @@ -6,12 +6,12 @@ if util.me.ammo() then util.item("zirconium-plate", 1), } local ct = 1 - if mods.bztungsten2 then + if mods.bztungsten then table.insert(mag, util.item("tungsten-carbide", 1)) ct = ct + 1 end -- add any other count-incrementing ingredients before silica, oil, and magazine - if mods["bzsilicon2"] then + if mods.bzsilicon then table.insert(mag, util.item("silica", ct)) end table.insert(mag, {type="fluid", name="heavy-oil", amount=ct}) @@ -23,7 +23,7 @@ if util.me.ammo() then { type = "ammo", name = "explosive-rounds-magazine", - icon = "__bzzirconium2__/graphics/icons/magazine.png", + icon = "__bzzirconium__/graphics/icons/magazine.png", icon_size = 64, icon_mipmaps = 4, ammo_category = "bullet", ammo_type = @@ -113,7 +113,7 @@ if util.me.ammo() then { type = "ammo", name = "explosive-rounds-rifle-magazine", - icon = "__bzzirconium2__/graphics/icons/r-magazine.png", + icon = "__bzzirconium__/graphics/icons/r-magazine.png", inventory_move_sound = item_sounds.ammo_small_inventory_move, pick_sound = item_sounds.ammo_small_inventory_pickup, drop_sound = item_sounds.ammo_small_inventory_move, @@ -230,7 +230,7 @@ if util.me.ammo() then { type = "ammo", name = "explosive-rounds-anti-material-rifle-magazine", - icon = "__bzzirconium2__/graphics/icons/am-magazine.png", + icon = "__bzzirconium__/graphics/icons/am-magazine.png", icon_size = 64, icon_mipmaps = 4, ammo_type = { diff --git a/bzzirconium2/map-gen-preset-updates.lua b/map-gen-preset-updates.lua similarity index 100% rename from bzzirconium2/map-gen-preset-updates.lua rename to map-gen-preset-updates.lua diff --git a/bzzirconium2/me.lua b/me.lua similarity index 98% rename from bzzirconium2/me.lua rename to me.lua index 2a7c845..3743cac 100644 --- a/bzzirconium2/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzzirconium2" +me.name = "bzzirconium" me.resources = {{"zircon", "nauvis"}} me.recipes = {"zirconium-plate", "zirconia", "cermet", "enriched-zirconia-smelting", diff --git a/bzzirconium2/omni.lua b/omni.lua similarity index 100% rename from bzzirconium2/omni.lua rename to omni.lua diff --git a/bzzirconium2/settings-util.lua b/settings-util.lua similarity index 100% rename from bzzirconium2/settings-util.lua rename to settings-util.lua diff --git a/bzzirconium2/settings.lua b/settings.lua similarity index 100% rename from bzzirconium2/settings.lua rename to settings.lua diff --git a/bzzirconium2/strange-matter.lua b/strange-matter.lua similarity index 91% rename from bzzirconium2/strange-matter.lua rename to strange-matter.lua index 4e01a0c..2193121 100644 --- a/bzzirconium2/strange-matter.lua +++ b/strange-matter.lua @@ -1,8 +1,8 @@ -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); local ore = "zircon" -local ore_icon = "__bzzirconium2__/graphics/icons/zircon.png" +local ore_icon = "__bzzirconium__/graphics/icons/zircon.png" if mods["StrangeMatter"] then data:extend({ diff --git a/bzzirconium2/tech-updates.lua b/tech-updates.lua similarity index 97% rename from bzzirconium2/tech-updates.lua rename to tech-updates.lua index 3144f52..5f27a10 100644 --- a/bzzirconium2/tech-updates.lua +++ b/tech-updates.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); util.add_prerequisite("advanced-material-processing", "zirconia-processing") util.add_prerequisite("low-density-structure", "zirconia-processing") diff --git a/bzzirconium2/thumbnail.png b/thumbnail.png similarity index 100% rename from bzzirconium2/thumbnail.png rename to thumbnail.png diff --git a/sources/thumbnail.xcf b/thumbnail.xcf similarity index 100% rename from sources/thumbnail.xcf rename to thumbnail.xcf diff --git a/bzzirconium2/vulcanus.lua b/vulcanus.lua similarity index 100% rename from bzzirconium2/vulcanus.lua rename to vulcanus.lua diff --git a/bzzirconium2/zircon-compressed.lua b/zircon-compressed.lua similarity index 92% rename from bzzirconium2/zircon-compressed.lua rename to zircon-compressed.lua index 2f85c13..498e84c 100644 --- a/bzzirconium2/zircon-compressed.lua +++ b/zircon-compressed.lua @@ -24,7 +24,7 @@ if simpleCompress then tungstenRecipe.results = { {type="item", name = "tungsten-plate", amount=simpleCompress.CompressedSmeltAmount}, } - tungstenRecipe.icons = {{ icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128 }} + tungstenRecipe.icons = {{ icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128 }} tungstenRecipe.subgroup = "raw-material" tungstenRecipe.order = "d[tungsten-plate]" end diff --git a/bzzirconium2/zircon-matter.lua b/zircon-matter.lua similarity index 87% rename from bzzirconium2/zircon-matter.lua rename to zircon-matter.lua index c58100d..81946ac 100644 --- a/bzzirconium2/zircon-matter.lua +++ b/zircon-matter.lua @@ -1,5 +1,5 @@ -- Matter recipes for Krastorio2 -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); if util.k2() then util.k2matter({ @@ -15,7 +15,7 @@ if util.k2() then unlocked_by = "zirconium-matter-processing", }, k2baseicon = "stone", - icon = { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size = 128, scale = 0.5} + icon = { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale = 0.5} }, false) util.k2matter({ diff --git a/bzzirconium2/zircon-particle.lua b/zircon-particle.lua similarity index 62% rename from bzzirconium2/zircon-particle.lua rename to zircon-particle.lua index 251e0fe..0282303 100644 --- a/bzzirconium2/zircon-particle.lua +++ b/zircon-particle.lua @@ -8,7 +8,7 @@ data:extend( pictures = { { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-1.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-1.png", priority = "extra-high", width = 32, height = 32, @@ -16,7 +16,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-2.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-2.png", priority = "extra-high", width = 32, height = 32, @@ -24,7 +24,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-3.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-3.png", priority = "extra-high", width = 32, height = 32, @@ -32,7 +32,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-4.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-4.png", priority = "extra-high", width = 32, height = 32, @@ -43,7 +43,7 @@ data:extend( shadows = { { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png", priority = "extra-high", width = 32, height = 32, @@ -51,7 +51,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png", priority = "extra-high", width = 32, height = 32, @@ -59,7 +59,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png", priority = "extra-high", width = 32, height = 32, @@ -67,7 +67,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png", + filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png", priority = "extra-high", width = 32, height = 32, diff --git a/bzzirconium2/zircon-rocks.lua b/zircon-rocks.lua similarity index 100% rename from bzzirconium2/zircon-rocks.lua rename to zircon-rocks.lua diff --git a/bzzirconium2/zircon.lua b/zircon.lua similarity index 81% rename from bzzirconium2/zircon.lua rename to zircon.lua index d35aef3..d80a653 100644 --- a/bzzirconium2/zircon.lua +++ b/zircon.lua @@ -23,7 +23,7 @@ data:extend({ { type = "resource", name = "zircon", - icon = "__bzzirconium2__/graphics/icons/zircon.png", + icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, flags = {"placeable-neutral"}, order="a-b-a", @@ -54,7 +54,7 @@ data:extend({ { sheet = { - filename = "__bzzirconium2__/graphics/entity/ores/hr-zircon.png", + filename = "__bzzirconium__/graphics/entity/ores/hr-zircon.png", priority = "extra-high", size = 128, frame_count = 8, @@ -67,13 +67,13 @@ data:extend({ type = "item", name = "zircon", icon_size = 128, - icon = "__bzzirconium2__/graphics/icons/zircon.png", + icon = "__bzzirconium__/graphics/icons/zircon.png", pictures = { - {filename="__bzzirconium2__/graphics/icons/zircon.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/zircon-1.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/zircon-2.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/zircon-3.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/zircon-4.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/zircon.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/zircon-1.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/zircon-2.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/zircon-3.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/zircon-4.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, diff --git a/bzzirconium2/zirconium-asteroid-updates.lua b/zirconium-asteroid-updates.lua similarity index 92% rename from bzzirconium2/zirconium-asteroid-updates.lua rename to zirconium-asteroid-updates.lua index 81e3249..84be43b 100644 --- a/bzzirconium2/zirconium-asteroid-updates.lua +++ b/zirconium-asteroid-updates.lua @@ -11,7 +11,7 @@ if mods["space-age"] then icons = { {icon="__space-age__/graphics/icons/advanced-oxide-asteroid-crushing.png", icon_size=64}, - {icon="__bzzirconium2__/graphics/icons/zirconia.png", icon_size=128, scale=0.1875, shift={0,8}}, + {icon="__bzzirconium__/graphics/icons/zirconia.png", icon_size=128, scale=0.1875, shift={0,8}}, }, category = "crushing", subgroup="space-crushing", diff --git a/bzzirconium2/zirconium-enriched.lua b/zirconium-enriched.lua similarity index 78% rename from bzzirconium2/zirconium-enriched.lua rename to zirconium-enriched.lua index 71da0fe..e6c75f1 100644 --- a/bzzirconium2/zirconium-enriched.lua +++ b/zirconium-enriched.lua @@ -1,5 +1,5 @@ -- Enriched Titanium for Krastorio2 -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); if util.k2() then data:extend({ @@ -7,12 +7,12 @@ data:extend({ type = "item", name = "enriched-zircon", icon_size = 128, - icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png", + icon = "__bzzirconium__/graphics/icons/enriched-zircon.png", pictures = { - {filename="__bzzirconium2__/graphics/icons/enriched-zircon.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.25}, - {filename="__bzzirconium2__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.25}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon.png", size=128, scale=0.125}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.125}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.125}, + {filename="__bzzirconium__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.125}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-zircon]", @@ -21,7 +21,7 @@ data:extend({ { type = "recipe", name = "enriched-zircon", - icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png", + icon = "__bzzirconium__/graphics/icons/enriched-zircon.png", icon_size = 128, category = "chemistry", main_product = "enriched-zircon", @@ -41,7 +41,7 @@ data:extend({ { {type = "item", name = "enriched-zircon", amount = 6}, {type = "fluid", name = "kr-dirty-water", amount = 25, ignored_by_stats=25, ignored_by_productivity=25}, - (mods["bztitanium2"] and util.me.byproduct()) and {type = "item", name = "titanium-ore", amount = 1} or nil, + (mods.bztitanium and util.me.byproduct()) and {type = "item", name = "titanium-ore", amount = 1} or nil, }, crafting_machine_tint = { @@ -57,8 +57,8 @@ data:extend({ name = "enriched-zirconia-smelting", icons = { - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3, }, - { icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3, }, + { icon = "__bzzirconium__/graphics/icons/enriched-zircon.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, }, category = "smelting", energy_required = 24, @@ -105,7 +105,7 @@ data:extend({ {type = "fluid", name = "water", amount = 90, ignored_by_stats=90, ignored_by_productivity=90}, {type = "item", name = "stone", probability = 0.20, amount = 1}, {type = "item", name = "zircon", probability = 0.20, amount = 1}, - (mods["bztitanium2"] and util.me.byproduct()) and + (mods.bztitanium and util.me.byproduct()) and {type = "item", name = "titanium-ore", probability = 0.20, amount = 1} or nil, }, crafting_machine_tint = diff --git a/bzzirconium2/zirconium-recipe-final-rrr.lua b/zirconium-recipe-final-rrr.lua similarity index 89% rename from bzzirconium2/zirconium-recipe-final-rrr.lua rename to zirconium-recipe-final-rrr.lua index 357b685..b61dbab 100644 --- a/bzzirconium2/zirconium-recipe-final-rrr.lua +++ b/zirconium-recipe-final-rrr.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); if mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then diff --git a/bzzirconium2/zirconium-recipe-final-stacking.lua b/zirconium-recipe-final-stacking.lua similarity index 60% rename from bzzirconium2/zirconium-recipe-final-stacking.lua rename to zirconium-recipe-final-stacking.lua index 3c352d6..5e0f1e8 100644 --- a/bzzirconium2/zirconium-recipe-final-stacking.lua +++ b/zirconium-recipe-final-stacking.lua @@ -1,16 +1,16 @@ -- Deadlock stacking recipes -local util = require("data-util"); +local util = require("__bzzirconium__.data-util"); if deadlock and deadlock["add_stack"] then - deadlock.add_stack("zircon", "__bzzirconium2__/graphics/icons/stacked/zircon-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("zirconia", "__bzzirconium2__/graphics/icons/stacked/zirconia-stacked.png", "deadlock-stacking-2", 128) - deadlock.add_stack("zirconium-plate", "__bzzirconium2__/graphics/icons/stacked/zirconium-plate-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("zircon", "__bzzirconium__/graphics/icons/stacked/zircon-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("zirconia", "__bzzirconium__/graphics/icons/stacked/zirconia-stacked.png", "deadlock-stacking-2", 128) + deadlock.add_stack("zirconium-plate", "__bzzirconium__/graphics/icons/stacked/zirconium-plate-stacked.png" , "deadlock-stacking-2", 128) if util.me.use_cermet() then - deadlock.add_stack("cermet", "__bzzirconium2__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128) + deadlock.add_stack("cermet", "__bzzirconium__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128) end if util.k2() then - deadlock.add_stack("enriched-zircon", "__bzzirconium2__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("enriched-zircon", "__bzzirconium__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128) end if util.k2() or mods["space-exploration"] then deadlock.add_stack("zirconium-tungstate", nil, "deadlock-stacking-2", 64) diff --git a/zirconium-recipe-se.lua b/zirconium-recipe-se.lua new file mode 100644 index 0000000..539943d --- /dev/null +++ b/zirconium-recipe-se.lua @@ -0,0 +1,201 @@ +-- Additional recipes if Space Exploration mod is enabled +local util = require("__bzzirconium__.data-util"); + +if mods["space-exploration"] then + se_delivery_cannon_recipes["zircon"] = {name= "zircon"} + se_delivery_cannon_recipes["zircaloy-4"] = {name= "zircaloy-4"} + se_delivery_cannon_recipes["zirconia"] = {name= "zirconia"} + se_delivery_cannon_recipes["zirconium-plate"] = {name= "zirconium-plate"} + util.se_landfill({ore="zircon"}) + +if string.sub(mods["space-exploration"], 1, 3) == "0.6" then + util.se_matter({ore="zircon", energy_required=1.5, quant_out=10, stream_out=60}) + data:extend({ + { + type = "item-subgroup", + name = "zirconium", + group = "resources", + order = "a-h-z-z", + } + }) + util.set_item_subgroup("zirconia", "zirconium") + util.set_item_subgroup("zirconium-plate", "zirconium") + data.raw.recipe["zirconia"].subgroup = "zirconium" + data:extend({ + { + type = "item", + name = "zirconium-ingot", + icons = {{icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128}}, + order = "b-b", + stack_size = 50, + subgroup = "zirconium", + }, + { + type = "fluid", + name = "molten-zirconium", + default_temperature = 1852, + max_temperature = 1852, + base_color = {r=121, g=80, b=80}, + flow_color = {r=121, g=80, b=80}, + icons = {{icon = "__bzzirconium__/graphics/icons/molten-zirconium.png", icon_size = 128}}, + order = "a[molten]-a", + pressure_to_speed_ratio = 0.4, + flow_to_energy_ratio = 0.59, + auto_barrel = false, + subgroup = "fluid", + }, + { + type = "recipe", + category = "smelting", + name = "molten-zirconium", + main_product = "molten-zirconium", + subgroup = "zirconium", + results = { + {type = "fluid", name = "molten-zirconium", amount = util.k2() and 750 or 900}, + }, + energy_required = 60, + ingredients = { + {name = "zirconia", amount = 24}, + {type = "fluid", name = "se-pyroflux", amount = 10}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + order = "a-a" + }, + { + type = "recipe", + name = "zirconium-ingot", + category = "casting", + results = {{"zirconium-ingot", 1}}, + energy_required = 75, + ingredients = { + {type = "fluid", name = "molten-zirconium", amount = 750}, + }, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + }, + { + type = "recipe", + category = "crafting", + name = "zirconium-ingot-to-plate", + + icons = { + {icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3}, + {icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + }, + results = { + {name = "zirconium-plate", amount = 10}, + }, + energy_required = 5, + ingredients = { + {name = "zirconium-ingot", amount = 1} + }, + enabled = false, + always_show_made_in = true, + allow_decomposition = false, + order = "a-c-b" + }, + }) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"}) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"}) + util.add_effect("se-pyroflux-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "molten-zirconium"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot"}) + util.add_effect("se-vulcanite-smelting", {type = "unlock-recipe", recipe= "zirconium-ingot-to-plate"}) + if util.k2() then + util.set_item_subgroup("enriched-zircon", "zirconium") + se_delivery_cannon_recipes["enriched-zirconium"] = {name= "enriched-zirconium"} + end + se_delivery_cannon_recipes["zirconium-ingot"] = {name= "zirconium-ingot"} + +else + -- Organization + data.raw.item["zirconia"].subgroup = "plates" + data.raw.recipe["zirconia"].subgroup = "plates" + data.raw.item["zirconium-plate"].subgroup = "plates" + data.raw.recipe["zirconium-plate"].subgroup = "plates" + + if util.k2() then + data:extend({ + { + type = "recipe", + name = "enriched-zirconia-smelting-vulcanite", + category = "smelting", + order = "z[zirconium-plate]", + energy_required = 24, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "enriched-zircon", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "zirconia", amount = 24}, + }, + icons = + { + { icon = "__bzzirconium__/graphics/icons/zirconia.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-zirconia-smelting-vulcanite"}) + data.raw.recipe["enriched-zircon"].order= "d[zircon]" + se_delivery_cannon_recipes["enriched-zircon"] = {name= "enriched-zircon"} + else + data:extend({ + { + type = "recipe", + name = "zircon-smelting-vulcanite", + category = "smelting", + order = "z[zirconium-plate]", + energy_required = 16, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "zircon", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "zirconia", amount = 24}, + }, + icons = + { + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3,}, + { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, + }, + }}) + util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "zircon-smelting-vulcanite"}) + end + data:extend({ + { + type = "recipe", + name = "zirconia-smelting-vulcanite", + category = "smelting", + order = "z[zirconium-plate]", + energy_required = 16, + enabled = false, + always_show_made_in = true, + allow_as_intermediate = false, + ingredients = { + {name = "zirconia", amount = 24}, + {name = "se-vulcanite-block", amount = 1}, + }, + results = { + {name = "zirconium-plate", amount = 12}, + }, + icons = + { + { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3,}, + { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, + }, + }, + }) + util.add_effect("se-processing-vulcanite", {type = "unlock-recipe", recipe= "zirconia-smelting-vulcanite"}) +end +end diff --git a/bzzirconium2/zirconium-recipe-updates-lds.lua b/zirconium-recipe-updates-lds.lua similarity index 100% rename from bzzirconium2/zirconium-recipe-updates-lds.lua rename to zirconium-recipe-updates-lds.lua diff --git a/bzzirconium2/zirconium-recipe-updates.lua b/zirconium-recipe-updates.lua similarity index 96% rename from bzzirconium2/zirconium-recipe-updates.lua rename to zirconium-recipe-updates.lua index 314873a..cb839f6 100644 --- a/bzzirconium2/zirconium-recipe-updates.lua +++ b/zirconium-recipe-updates.lua @@ -1,9 +1,9 @@ local util = require("data-util"); -local nuclear_plate = mods["bzlead2"] and "lead-plate" or "iron-plate" +local nuclear_plate = mods.bzlead and "lead-plate" or "iron-plate" local nuclear_z = data.raw.item["zircaloy-4"] and "zircaloy-4" or "zirconium-plate" -if mods.bzfoundry2 and data.raw.item["foundry"] then +if mods.bzfoundry and data.raw.item["foundry"] then util.set_to_founding("zircaloy-4") end @@ -15,7 +15,7 @@ end util.replace_ingredient("metallurgic-science-pack", "tungsten-plate", "zirconium-tungstate") util.add_ingredient("cryogenic-plant", "zirconium-tungstate", 20) -if mods["space-age"] and mods["bztin2"] and util.me.basic_foundry() then +if mods["space-age"] and mods.bztin and util.me.basic_foundry() then util.copy_recipe("bronze-plate", "bronze-plate-basic") util.set_category("bronze-plate-basic", "basic-metallurgy") util.set_localised_name("bronze-plate-basic", {"item-name.bronze-plate"}) @@ -34,7 +34,7 @@ if util.me.early() then end if not util.k2() then util.replace_some_ingredient("steel-furnace", "stone-brick", 4, "zirconia", 6) - if mods["bzsilicon2"] then -- this uses enough stone, we can just replace + if mods.bzsilicon then -- this uses enough stone, we can just replace util.replace_ingredient("electric-furnace", "stone-brick", "zirconia") else util.replace_some_ingredient("electric-furnace", "stone-brick", 5, "zirconia", 5) @@ -63,7 +63,7 @@ if not mods.Atomic_Overhaul then util.replace_some_ingredient("uranium-fuel-cell", nuclear_plate, 5, nuclear_z, ufc_amt) end -if not mods.bztungsten2 then +if not mods.bztungsten then util.add_ingredient("nuclear-fuel", nuclear_z, 1) end @@ -121,7 +121,7 @@ if util.k2() then util.replace_some_ingredient("se-stone-brick-vulcanite", "stone", 2, "zircon", 2) end - if not mods.bztungsten2 then + if not mods.bztungsten then util.add_ingredient("matter-research-data", "zirconia", 5) end end @@ -136,7 +136,7 @@ if mods["space-exploration"] then util.add_ingredient("se-quantum-processor", "cermet", 1) util.add_ingredient("se-space-mechanical-laboratory", "cermet", 40) end - if not mods.bztungsten2 then + if not mods.bztungsten then util.add_ingredient("se-hot-thermodynamics-data", "zirconium-plate", 1) util.add_product("se-hot-thermodynamics-data", {type="item", name="zirconium-plate", amount=1, probability=0.50}) end diff --git a/bzzirconium2/zirconium-recipe.lua b/zirconium-recipe.lua similarity index 76% rename from bzzirconium2/zirconium-recipe.lua rename to zirconium-recipe.lua index 35580e5..7defd77 100644 --- a/bzzirconium2/zirconium-recipe.lua +++ b/zirconium-recipe.lua @@ -7,7 +7,7 @@ data:extend({ { type = "item", name = "zirconia", - icon = "__bzzirconium2__/graphics/icons/zirconia.png", + icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, inventory_move_sound = item_sounds.brick_inventory_move, pick_sound = item_sounds.brick_inventory_pickup, @@ -26,10 +26,10 @@ data:extend({ order = "z[zirconia]", icons = (util.k2() and { - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128 }, - { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128 }, + { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, } or { - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128, }, + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, }, } ), -- (util.k2() and @@ -38,16 +38,16 @@ data:extend({ -- enabled = false, -- energy_required = 8, -- ingredients = {util.item("zircon", 5)}, - -- results = mods["bztitanium"] and util.me.byproduct() and { - -- { type = "item", name = "zirconia", amount_min=4, amount_max=5}, - -- { type = "item", name = "titanium-ore", amount=1, probability=.5} + -- results = mods.bztitanium and util.me.byproduct() and { + -- {name="zirconia", amount_min=4, amount_max=5}, + -- {name="titanium-ore", amount=1, probability=.5} -- } or {util.item("zirconia", 5)} -- } or main_product = "zirconia", enabled = false, energy_required = 6.4, ingredients = {util.item("zircon", 1)}, - results = mods["bztitanium2"] and util.me.byproduct() and { + results = mods.bztitanium and util.me.byproduct() and { {type="item", name="zirconia", amount=2, probability=.95}, {type="item", name="titanium-ore", amount=1, probability=.1} } or {util.item("zirconia", 2)} @@ -57,20 +57,20 @@ data:extend({ -- enabled = false, -- energy_required = 3.2, -- ingredients = {util.item("zircon", 1)}, - -- results = mods["bztitanium"] and util.me.byproduct() and { - -- util.item("zirconia", 1), { type = "item", name = "titanium-ore", amount=1, probability=.05} + -- results = mods.bztitanium and util.me.byproduct() and { + -- util.item("zirconia", 1), {name="titanium-ore", amount=1, probability=.05} -- } or {util.item("zirconia", 2)} -- } }, { type = "item", name = "zirconium-sponge", - icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", + icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png", icon_size = 128, pictures = { - {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge-1.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge-2.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/zirconium-sponge.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/zirconium-sponge-1.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/zirconium-sponge-2.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.wire_inventory_move, pick_sound = item_sounds.wire_inventory_pickup, @@ -97,7 +97,7 @@ data:extend({ { type = "item", name = "zirconium-plate", - icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", + icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, subgroup = "raw-material", order = "d[zirconium-plate]", @@ -117,10 +117,10 @@ data:extend({ order = "d[zirconium-plate]", icons = (util.k2() and { - { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128 }, - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128 }, + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128, }, + { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, }, } ), -- (util.k2() and @@ -146,7 +146,7 @@ data:extend({ type = "technology", name = "zirconia-processing", icon_size = 340, - icon = "__bzzirconium2__/graphics/technology/zirconia-processing.png", + icon = "__bzzirconium__/graphics/technology/zirconia-processing.png", effects = { { @@ -161,7 +161,7 @@ data:extend({ type = "technology", name = "zirconium-processing", icon_size = 128, - icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", + icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", effects = { { @@ -191,28 +191,28 @@ data:extend({ -- cermet only if setting enabled if util.me.use_cermet() then local cermet_i = {util.item("zirconia", 2), util.item("copper-plate", 1)} -if mods["bztitanium2"] and data.raw.item["titanium-plate"] then - local tme = require("__bztitanium2__.me"); +if mods.bztitanium and data.raw.item["titanium-plate"] then + local tme = require("__bztitanium__.me"); table.insert(cermet_i, util.item(tme.titanium_plate, 1)) end -if mods["bzsilicon2"] then +if mods.bzsilicon then table.insert(cermet_i, util.item("silica", 1)) end -if mods.bzaluminum2 then +if mods.bzaluminum then table.insert(cermet_i, util.item("alumina", 1)) end data:extend({ { type = "item", name = "cermet", - icon = "__bzzirconium2__/graphics/icons/cermet.png", + icon = "__bzzirconium__/graphics/icons/cermet.png", icon_size = 128, pictures = { - {filename = "__bzzirconium2__/graphics/icons/cermet.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/cermet-1.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/cermet-2.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/cermet-3.png", size=128, scale=0.25}, - {filename = "__bzzirconium2__/graphics/icons/cermet-4.png", size=128, scale=0.25}, + {filename = "__bzzirconium__/graphics/icons/cermet.png", size=128, scale=0.125}, + {filename = "__bzzirconium__/graphics/icons/cermet-1.png", size=128, scale=0.125}, + {filename = "__bzzirconium__/graphics/icons/cermet-2.png", size=128, scale=0.125}, + {filename = "__bzzirconium__/graphics/icons/cermet-3.png", size=128, scale=0.125}, + {filename = "__bzzirconium__/graphics/icons/cermet-4.png", size=128, scale=0.125}, }, inventory_move_sound = item_sounds.wire_inventory_move, pick_sound = item_sounds.wire_inventory_pickup, @@ -230,7 +230,7 @@ data:extend({ allow_productivity = true, auto_recycle = false, order = "z[zirconia]", - icons = { { icon = "__bzzirconium2__/graphics/icons/cermet.png", icon_size = 128, } }, + icons = { { icon = "__bzzirconium__/graphics/icons/cermet.png", icon_size = 128, } }, enabled = false, energy_required = #cermet_i + 1, ingredients = cermet_i, @@ -240,7 +240,7 @@ data:extend({ type = "technology", name = "cermet", icon_size = 512, - icon = "__bzzirconium2__/graphics/technology/cermet.png", + icon = "__bzzirconium__/graphics/technology/cermet.png", effects = { { @@ -263,7 +263,7 @@ data:extend({ order = "c" }, }) -if mods["bztitanium2"] then +if mods.bztitanium then util.add_prerequisite("cermet", util.titanium_processing) end end @@ -278,7 +278,7 @@ data:extend({ subgroup = "raw-resource", order = "bzz", icons = { - { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128, scale=0.25, shift={4,4}}, + { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128, scale=0.25, shift={4,4}}, { icon = "__base__/graphics/icons/stone.png", icon_size=64, scale=0.25, shift={-4,-4}}, }, enabled = not mods.quality, @@ -298,7 +298,7 @@ data:extend({ order = "bzz", icons = { { icon = "__base__/graphics/icons/stone.png", icon_size=64, scale=0.5, shift={4,4} }, - { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128, scale=0.125, shift={-4,-4}}, + { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128, scale=0.125, shift={-4,-4}}, }, enabled = not mods.quality, energy_required = 1, @@ -321,12 +321,10 @@ end if mods["space-age"] then -- Gleba local synth_i = "stone" -if mods["bzsilicon2"] then +if mods.bzsilicon then synth_i = "silica" elseif data.raw.item["sand"] then synth_i = "sand" -elseif data.raw.item["kr-sand"] then - synth_i = "kr-sand" end data:extend({ { @@ -336,8 +334,8 @@ data:extend({ subgroup = "raw-material", order = "z[zircon]", icons = { - { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128}, - { icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", icon_size=128, scale=0.25, shift={-8,-8}}, + { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128}, + { icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png", icon_size=128, scale=0.25, shift={-8,-8}}, }, enabled = false, energy_required = 10, @@ -356,7 +354,7 @@ data:extend({ subgroup = "raw-material", order = "z[zircon]", icons = { - { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size=128}, + { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size=128}, { icon = "__space-age__/graphics/icons/pentapod-egg.png", icon_size=64, scale=0.25, shift={-4,-4}}, }, enabled = false, @@ -382,7 +380,7 @@ data:extend({ allow_productivity = true, subgroup = "vulcanus-processes", order = "d[zirconium-plate]", - icons ={{ icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128}}, + icons ={{ icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128}}, enabled = false, energy_required = 3.2, ingredients = {util.item("zirconium-sponge", 1), util.fluid("vacuum")}, @@ -397,7 +395,7 @@ data:extend({ order = "d[zirconium-gettering]", icons = { util.vacuum_icon, - { icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", icon_size = 128, scale=0.125, shift = {-8, -8}}, + { icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png", icon_size = 128, scale=0.125, shift = {-8, -8}}, }, enabled = false, allow_productivity = true, @@ -415,12 +413,12 @@ util.add_unlock("foundry", "zirconium-gettering") end -- Zirconium Tungstate, only if needed -if mods["space-age"] or (mods.bztungsten2 and (util.k2() or mods["space-exploration"])) then +if mods["space-age"] or (mods.bztungsten and (util.k2() or mods["space-exploration"])) then data:extend({ { type = "item", name = "zirconium-tungstate", - icons = {{icon = "__bzzirconium2__/graphics/icons/zircon-powder.png", + icons = {{icon = "__bzzirconium__/graphics/icons/zircon-powder.png", icon_size = 64, tint = {a=1, r=.95, g=.75, b=0}}}, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -451,7 +449,7 @@ end end -- Zircaloy-4 only if needed -if mods["bztin2"] and not mods.bobplates then +if mods.bztin and not mods.bobplates then require("basic-foundry") local zircaloyi = { util.item("zirconium-sponge", 17), @@ -462,7 +460,7 @@ data:extend({ { type = "item", name = "zircaloy-4", - icons = {{icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128}}, + icons = {{icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128}}, inventory_move_sound = item_sounds.metal_small_inventory_move, pick_sound = item_sounds.metal_small_inventory_pickup, drop_sound = item_sounds.metal_small_inventory_move,