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/bzlead2/LICENSE.md b/LICENSE.md similarity index 100% rename from bzlead2/LICENSE.md rename to LICENSE.md diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b5e4c50 --- /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 zorro + +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 f35886e..93150d2 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,23 @@ -**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.** - # Lead -This mod adds lead ore and lead plates to the base game, and optionally lead expansion bolts. Lead is an early game resource. It's meant to make the early game a little more challenging without fundamentally changing it. It also adds small amounts of complexity later in the game. Lead can be mined without fluid and by hand. Smelting lead ore will yield lead plates, with (optionally) copper ore as a byproduct. +[factorio mod page](https://mods.factorio.com/mod/bzlead) -Lead is common near the starting area, but does not scale as much with distance as other resources. +Adds lead ore and plates to the base game, an early-game resource. +Modifies ammunition, pipes, batteries and a few other things. Further mod compatibility is planned. -If you enjoy vanilla Factorio but want something a little bit more complex, try out this mod! See Titanium for a similar mod with more of a "mid game" focus. +## Version History +See changelog.txt -## Credits -- Brevven ([Original mod](https://mods.factorio.com/mod/bzcarbon)) -- [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) - [snouz](https://github.com/snouz) (graphics) ### Compatibility & bug fixes - [nihilistzsche](https://github.com/nihilistzsche) - [orangedude27](https://github.com/orangedude27) + ### Localization - [Sakuro](https://github.com/sakuro) (ja) - [TheoMarque](https://github.com/TheoMarque) (pl) @@ -29,4 +28,4 @@ If you enjoy vanilla Factorio but want something a little bit more complex, try - [x2605](https://github.com/x2605) (ko) - [Pergamum663](https://github.com/Pergamum663) (ru) - [RiCZrd](https://mods.factorio.com/user/RiCZrd) (cs) -- [sunnytan53](https://github.com/sunnytan53) (zh\_CN) \ No newline at end of file +- [sunnytan53](https://github.com/sunnytan53) (zh\_CN) diff --git a/bzlead2/changelog.txt b/bzlead2/changelog.txt deleted file mode 100644 index 3ca53b5..0000000 --- a/bzlead2/changelog.txt +++ /dev/null @@ -1,7 +0,0 @@ ---------------------------------------------------------------------------------------------------- -Version: 2.0.29 -Date: 20.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/bzlead2/compatibility/data/hot-metals.lua b/bzlead2/compatibility/data/hot-metals.lua deleted file mode 100644 index 821a467..0000000 --- a/bzlead2/compatibility/data/hot-metals.lua +++ /dev/null @@ -1,13 +0,0 @@ -local util = require("data-util"); - -util.add_hot_metals({ - {name="lead-plate", icons={ - { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, - }}, - {name="lead-expansion-bolt", icons={ - { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128}, - { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}}, - }}, -}) - diff --git a/bzlead2/info.json b/bzlead2/info.json deleted file mode 100644 index a7464e6..0000000 --- a/bzlead2/info.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "bzlead2", - "version": "2.0.29", - "factorio_version": "2.0", - "title": "Lead", - "description": "Adds lead ore to the base game as an early game resource.\n\nLead is used in ammunition, pipes, batteries and more.", - "author": "Brevven, cackling fiend", - "homepage": "https://discord.gg/ufvFUJtVwk", - "dependencies": [ - "base >= 2.0.0", - "? bzsilicon", - "? hot-metals", - "? space-exploration", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? Rich-Rocks-Requiem", - "? 248k-Redux", - "? tenebris", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "! space-age" - ] -} diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..6d47194 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,630 @@ +--------------------------------------------------------------------------------------------------- +Version: 2.0.27 +Date: 2025-06-15 + Fixes: + - Krastorio2: Update more tier 1 magazine recipes for 2.0, with thanks to Tvede-dk + - Fix load error with certain loadouts, especially with K2SO + Changes: + - Cerys: fuel cell recipe update +--------------------------------------------------------------------------------------------------- +Version: 2.0.26 +Date: 2025-05-05 + Fixes: + - Fix startup with deadlock stacking introduced in 2.0.25 +--------------------------------------------------------------------------------------------------- +Version: 2.0.25 +Date: 2025-05-04 + Changes: + - Support for Krastorio2 spaced out + - Tweaks for k2 2 integration +--------------------------------------------------------------------------------------------------- +Version: 2.0.24 +Date: 2025-05-03 + Fixes: + - Fix load issue with Bob's + Changes: + - K2 compatibility updates, thanks to autechr3 and pla +--------------------------------------------------------------------------------------------------- +Version: 2.0.23 +Date: 2025-04-08 + Changes: + - Space Age: Asteroid crushing recipe now affected by productivity research +--------------------------------------------------------------------------------------------------- +Version: 2.0.22 +Date: 2025-03-22 + Changes: + - Set custom inventory sounds for some items + Fixes: + - Loads with Crafting Efficiency + - Improved compatibility with Muluna +--------------------------------------------------------------------------------------------------- +Version: 2.0.21 +Date: 2025-03-10 + Fixes: + - Add missing locale string + Changes: + - Minor graphical tweaks +--------------------------------------------------------------------------------------------------- +Version: 2.0.20 +Date: 2025-02-20 + Fixes: + - Plutionium Energy MOX fuel recipe now uses lead +--------------------------------------------------------------------------------------------------- +Version: 2.0.19 +Date: 2025-02-13 + Changes: + - Show asteroid crushing recipe in signal GUI +--------------------------------------------------------------------------------------------------- +Version: 2.0.18 +Date: 2025-02-11 + Fixes: + - Allow productivity modules for lead plates in all circumstances. +--------------------------------------------------------------------------------------------------- +Version: 2.0.17 +Date: 2025-02-01 + Changes: + - Add shiftite recipe for Janus mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.16 +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.0.15 +Date: 2025-01-16 + Fixes: + - Fix recycling alongside some other mods, including Deadlock's Stacking Beltboxes +--------------------------------------------------------------------------------------------------- +Version: 2.0.14 +Date: 2025-01-14 + Changes: + - Minor tweaks to recipe order + - Support for Asteroid Mining mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.13 +Date: 2025-01-07 + Fixes: + - Improve some mod compatibility +--------------------------------------------------------------------------------------------------- +Version: 2.0.12 +Date: 2025-01-06 + Changes: + - Do more to respect disabling of recycling recipes + - Lead ore no longer recycles into chelated lead. +--------------------------------------------------------------------------------------------------- +Version: 2.0.11 +Date: 2025-01-05 + Changes: + - Vulcanus rocks now have some lead ore to avoids possible soft locks + - Gleba highlands have rocks with lead ore to avoid possible soft locks +--------------------------------------------------------------------------------------------------- +Version: 2.0.10 +Date: 2025-01-04 + Changes: + - Update weights for rockets + - Hot metals: use default cooling time + - Tweaks for upcoming Silica & Silicon update +--------------------------------------------------------------------------------------------------- +Version: 2.0.9 +Date: 2025-01-01 + Fixes: + - Fix surface condition error in vanilla + Features: + - Hot metals mod support + - Casting for lead expansion bolts +--------------------------------------------------------------------------------------------------- +Version: 2.0.8 +Date: 2025-01-01 + Fixes: + - Fix some localization for alternate ammunition recipes + - Use old hr version for entities (now that hr is the only resolution supported) +--------------------------------------------------------------------------------------------------- +Version: 2.0.7 +Date: 2025-01-01 + Fixes: + - Lead chests can no longer be built on space platforms + - Hide lead chest remnant in Factoriopedia +--------------------------------------------------------------------------------------------------- +Version: 2.0.6 +Date: 2024-12-31 + Localization: + - ja locale updates for 2.0 thanks to Sakuro + - some de locale updates thanks to NathaU +--------------------------------------------------------------------------------------------------- +Version: 2.0.5 +Date: 2024-12-29 + Fixes: + - Fix alternative ammunition recipes +--------------------------------------------------------------------------------------------------- +Version: 2.0.4 +Date: 2024-12-29 + Changes: + - Recipe updates for Transplutonic mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2024-12-29 + Changes: + - Added "/bz-regenerate" command for regenerating ore patches, especially useful when adding to an existing game +--------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 2024-12-28 + Changes: + - Compatible with Tenebris +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 2024-12-28 + Fixes: + - Fix soft lock on thruster oxidizer by unlocking alternative crushing at the right time. +--------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 2024-12-28 + Features: + - Working with Factorio 2.0 and Space Age + - Brand new common intermediate: lead expansion bolt, used primarily in structures (can be disabled in settings) + - Alternate processes for creating lead plates on Vulcans and Gleba, and recycling on Fulgora. + - A few new uses for lead in Space Age, including in the fusion system + - Confirmed compatible with Cerys and 5dim's + - Compatibility with other mods is not confirmed, but many will still work +--------------------------------------------------------------------------------------------------- +Version: 1.2.20 +Date: 2023-12-24 + Fixes: + - SE: Fix issue with scrap recycling, thanks to orangedude27 +--------------------------------------------------------------------------------------------------- +Version: 1.2.19 +Date: 2023-12-24 + Localization: + - ja locale updates thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 1.2.18 +Date: 2023-02-12 + Changes: + - Crafting efficiency improvements, thanks to nihilistzsche +--------------------------------------------------------------------------------------------------- +Version: 1.2.17 +Date: 2023-01-17 + Features: + - (Beta) Crafting efficiency compatibility +--------------------------------------------------------------------------------------------------- +Version: 1.2.16 +Date: 2022-12-24 + Localization: + - zh-CN by sunnytan53 + Changes: + - SE ingot in delivery cannon +--------------------------------------------------------------------------------------------------- +Version: 1.2.15 +Date: 2022-10-30 + Fixes: + - When Lead + K2 are used with some mods like GDIW, prod modules can be used as expected. +--------------------------------------------------------------------------------------------------- +Version: 1.2.14 +Date: 2022-08-34 + Changes: + - SE: Support for Shivero's Nuclear +--------------------------------------------------------------------------------------------------- +Version: 1.2.13 +Date: 2022-08-17 + Fixes: + - SE: Disable matter recipes at start +--------------------------------------------------------------------------------------------------- +Version: 1.2.12 +Date: 2022-08-16 + Features: + - Support for SE matter fusion and SE+K2 matter liberation +--------------------------------------------------------------------------------------------------- +Version: 1.2.11 +Date: 2022-08-05 + Features: + - Some support for ScienceCostTweaker - green science +--------------------------------------------------------------------------------------------------- +Version: 1.2.10 +Date: 2022-07-22 + Localization: + - cs (Czech) locale updates thanks to RiCZrd + Fixes: + - Fix in-game changelog +--------------------------------------------------------------------------------------------------- +Version: 1.2.9 +Date: 2022-07-10 + Changes: + - Leighzer's scrap compatibility + Localization: + - ru l10n updates thanks to Pergamum663 +--------------------------------------------------------------------------------------------------- +Version: 1.2.8 +Date: 2022-07-09 + Changes: + - Atomic Overhaul compatibility +--------------------------------------------------------------------------------------------------- +Version: 1.2.7 +Date: 2022-07-09 + Localization: + - Japanese (ja) locale updates thanks to sakuro + Changes: + - Space Exploration: efficiency module uses battery instead of copper cable. This gets lead + A little more involved in science production. (Use bypass recipes setting if needed) +--------------------------------------------------------------------------------------------------- +Version: 1.2.6 +Date: 2022-07-03 + Fixes: + - SE: Productivity modules in molten lead + - SE: Time for ingot +--------------------------------------------------------------------------------------------------- +Version: 1.2.5 +Date: 2022-07-02 + Fixes: + - Fix for subgroup fix +--------------------------------------------------------------------------------------------------- +Version: 1.2.4 +Date: 2022-07-02 + Fixes: + - SE ingot -> plate recipe + - SE/K2 subgroup fixes +--------------------------------------------------------------------------------------------------- +Version: 1.2.3 +Date: 2022-07-02 + Features: + - Setting to turn off copper byproduct in lead production +--------------------------------------------------------------------------------------------------- +Version: 1.2.2 +Date: 2022-07-02 + Changes: + - SE: Pyroflux tech compatibility +--------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: 2022-07-01 + Fixes: + - Deadlock stacking / crating fix +--------------------------------------------------------------------------------------------------- +Version: 1.2.0 +Date: 2022-07-01 + Changes: + - Compatible with Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- +Version: 1.1.0 +Date: 2022-06-26 + Features: + - Beta support for 248k. This is an initial release and may change in the future + Lead plate items merged into one. Multiple production chains +--------------------------------------------------------------------------------------------------- +Version: 1.0.5 +Date: 2022-06-01 + Fixes: + - K2: Dirty water filtration description icons + Changes: + - K2: Dirty water filtration outputs smoothed out. Overall ratios remain the same. +--------------------------------------------------------------------------------------------------- +Version: 1.0.4 +Date: 2022-05-30 + Changes: + - Compat with large electric pole +--------------------------------------------------------------------------------------------------- +Version: 1.0.3 +Date: 2022-02-25 + Changes: + - Compatibility with some more containers (warehouses, etc). +--------------------------------------------------------------------------------------------------- +Version: 1.0.2 +Date: 2022-02-22 + Localization: + - Korean (ko) l10n thanks to x2605 +--------------------------------------------------------------------------------------------------- +Version: 1.0.1 +Date: 2022-02-04 + Changes: + - K2: Filter dirty water quantity + Fixes: + - Fix for some possible 5dim's loadouts +--------------------------------------------------------------------------------------------------- +Version: 1.0.0 +Date: 2022-01-20 + Changes: + - We're calling this 1.0.0 + - MadClown's vanilla nuclear compatibility + Localization: + - Japanese (ja) locale updates thanks to sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.6.5 +Date: 2022-01-10 + Fixes: + - Fix ammuntion options for K2 +--------------------------------------------------------------------------------------------------- +Version: 0.6.4 +Date: 2022-01-06 + Localization: + - Polish (pl) l10n updates, thanks to S3BA +--------------------------------------------------------------------------------------------------- +Version: 0.6.3 +Date: 2022-01-05 + Localization: + - Simplified Chinese (zh_CN) l10n, thanks to PlexPt +--------------------------------------------------------------------------------------------------- +Version: 0.6.2 +Date: 2022-01-03 + Changes: + - Add an option for more ammunition recipes. +--------------------------------------------------------------------------------------------------- +Version: 0.6.1 +Date: 2022-01-01 + Changes: + - Remove sulfuric acid setting. Use Bypass recipes setting instead + - More turret & artillery compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.6.0 +Date: 2021-11-06 + Changes: + - K2: Compatible with beta +--------------------------------------------------------------------------------------------------- +Version: 0.5.9 +Date: 2021-10-11 + Fixes: + - SE: Balance core mining + - SE: Landfill recipe +--------------------------------------------------------------------------------------------------- +Version: 0.5.8 +Date: 2021-08-05 + Changes: + - SE Vulcanite lead recipe balanced + - SE meteor defense recipes updated +--------------------------------------------------------------------------------------------------- +Version: 0.5.7 +Date: 2021-07-26 + Changes: + - SE: Experimental alloy data recipe + - Minor refactor +--------------------------------------------------------------------------------------------------- +Version: 0.5.6 +Date: 2021-07-25 + Features: + - Schall's, more compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.5 +Date: 2021-07-21 + Features: + - True Nukes compatibility + Changes: + - Solar panel recipe when bzsilicon is active. +--------------------------------------------------------------------------------------------------- +Version: 0.5.4 +Date: 2021-07-06 + Features: + - Very basic Industrial Revolution 2 compatibility. + - Nuclear Reprocessing Rebalance compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.3 +Date: 2021-07-01 + Features: + - Strange matter compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.2 +Date: 2021-06-29 + Features: + - RITEG compatibility + - Car turret compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.1 +Date: 2021-06-26 + Localization: + - ja locale updates thanks to Sakuro + Features: + - Plutonium Energy compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2021-06-16 + Features: + - Recipe bypass setting + Localization: + - Tweak to pl l10n, thanks to TheoMarque +--------------------------------------------------------------------------------------------------- +Version: 0.4.11 +Date: 2021-06-13 + Features: + - Endgame Combat Compatibility + - Rocket turrets, K2 Turrets standalone + - Realistic Reactors, Nuclear Locomotive, Unranium Rework, etc +--------------------------------------------------------------------------------------------------- +Version: 0.4.10 +Date: 2021-06-13 + Features: + - Nuclear Fuel compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.4.9 +Date: 2021-06-05 + Changes: + - More very minor recipe tweaks + Localization: + - More l10n (sakuro) +--------------------------------------------------------------------------------------------------- +Version: 0.4.8 +Date: 2021-05-25 + Changes: + - Very minor recipe tweaks + Features: + - Additional turrets, howitzer compat +--------------------------------------------------------------------------------------------------- +Version: 0.4.7 +Date: 2021-05-25 + Features: + - King Jo's compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.4.6 +Date: 2021-05-23 + Features: + - Nuclear furnace, mega furnace compat +--------------------------------------------------------------------------------------------------- +Version: 0.4.5 +Date: 2021-05-22 + Fixes: + - Issue with lead chest image size non-hr +--------------------------------------------------------------------------------------------------- +Version: 0.4.4 +Date: 2021-05-21 + Features: + - SE: Lead ore in scrap recycling +--------------------------------------------------------------------------------------------------- +Version: 0.4.3 +Date: 2021-05-21 + Features: + - Add option for lead in sulfuric acid introduced on 0.4.0. To be removed in 2022 + Localization: + - Minor pl l10n per TheoMarque +--------------------------------------------------------------------------------------------------- +Version: 0.4.2 +Date: 2021-05-21 + Features: + - Compatibility: Geothermal +--------------------------------------------------------------------------------------------------- +Version: 0.4.1 +Date: 2021-05-18 + Features: + - Compatibility: More Ammo, Rampant Arsenal, Light artillery, Bigger artillery, HMG Turret +--------------------------------------------------------------------------------------------------- +Version: 0.4.0 +Date: 2021-05-17 + Changes: + - Minor "breaking" change - lead required for sulfuric acid (i.e. lead chamber process) +--------------------------------------------------------------------------------------------------- +Version: 0.3.14 +Date: 2021-05-05 + Features: + - Minor space exploration recipe updates +--------------------------------------------------------------------------------------------------- +Version: 0.3.13 +Date: 2021-04-30 + Localization: + - German localization, thanks to user yokmp +--------------------------------------------------------------------------------------------------- +Version: 0.3.12 +Date: 2021-04-28 + Localization: + - Russian localization, thanks to user Spectrus1702 +--------------------------------------------------------------------------------------------------- +Version: 0.3.11 +Date: 2021-04-19 + Localization: + - Polish localization, thanks to user TheoMarque +--------------------------------------------------------------------------------------------------- +Version: 0.3.10 +Date: 2021-04-15 + Localization: + - Japanese l10n fixes, thanks to user sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.3.9 +Date: 2021-04-13 + Features: + - ModMash+K2 ammunition recipes +--------------------------------------------------------------------------------------------------- +Version: 0.3.8 +Date: 2021-04-11 + Localization: + - Japanese localization, thanks to user sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.3.7 +Date: 2021-03-18 + Features: + - Omnimatter initial compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.3.6 +Date: 2021-03-15 + Fixes: + - Optimize menu simulation a bit +--------------------------------------------------------------------------------------------------- +Version: 0.3.4 +Date: 2021-03-14 + Features: + - Menu simulation for lead ammo + - Modular turret mount recipes +--------------------------------------------------------------------------------------------------- +Version: 0.3.3 +Date: 2021-03-12 + Features: + - VTK Cannon Turret recipes + - Vanilla Flamethrower and Artillery Turret recipes + - K2 Turret recipes +--------------------------------------------------------------------------------------------------- +Version: 0.3.2 +Date: 2021-03-11 + Features: + - Map gen presets handling + Changes: + - Slightly increase starting area lead, greatly reduce distant lead. +--------------------------------------------------------------------------------------------------- +Version: 0.3.1 +Date: 2021-03-09 + Features: + - SimpleCompress support + - StorageTank2 recipe +--------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2021-03-07 + Changes: + - Graphics revamp by snouz (new icons, entities, chest remnant, mipmaps) + - New mod icon +--------------------------------------------------------------------------------------------------- +Version: 0.2.6 +Date: 2021-03-06 + Features: + - Inifinite Buffer Fluid Tank recipe + - eve-weaponry recipe +--------------------------------------------------------------------------------------------------- +Version: 0.2.5 +Date: 2021-03-06 + Features: + - WeaponPack recipes +--------------------------------------------------------------------------------------------------- +Version: 0.2.4 +Date: 2021-03-06 + Features: + - The Big Furnace recipe +--------------------------------------------------------------------------------------------------- +Version: 0.2.3 +Date: 2021-02-28 + Features: + - Optional entity: lead chest. Default off +--------------------------------------------------------------------------------------------------- +Version: 0.2.2 +Date: 2021-01-29 + Fixes: + - K2 stack size fix for no changes +--------------------------------------------------------------------------------------------------- +Version: 0.2.1 +Date: 2021-01-27 + Fixes: + - Rich Rocks Requiem dependency +--------------------------------------------------------------------------------------------------- +Version: 0.2.0 +Date: 2021-01-25 + Features: + - Rich Rocks Requiem for K2 compatibility + - 5dims compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.1.4 +Date: 2021-01-22 + Fixes: + - Attempt to fix a load error by failing gracefully +--------------------------------------------------------------------------------------------------- +Version: 0.1.3 +Date: 2021-01-19 + Changes: + - SE Delivery Cannon Capsules +--------------------------------------------------------------------------------------------------- +Version: 0.1.2 +Date: 2021-01-18 + Fixes: + - Breakage with only SE +--------------------------------------------------------------------------------------------------- +Version: 0.1.1 +Date: 2021-01-18 + Fixes: + - L10n of main recipe + Changes: + - Organization of plates in Space Exploration +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 2021-01-18 + Features: + - Lead added to game. + - Compatible with space exploration, krastorio2, deadlock stacking/crating diff --git a/bzlead2/compatibility/248k.lua b/compatibility/248k.lua similarity index 95% rename from bzlead2/compatibility/248k.lua rename to compatibility/248k.lua index 1e0125f..5e69008 100644 --- a/bzlead2/compatibility/248k.lua +++ b/compatibility/248k.lua @@ -3,7 +3,7 @@ local util = require("data-util"); local pb2 = "fu_lead_item" -if mods["248k-Redux"] then +if mods["248k"] then -- Swap out all 248k titanium for BZ titanium_plate for i, recipe in pairs(data.raw.recipe) do util.replace_ingredient(recipe.name, pb2, "lead-plate") diff --git a/compatibility/data/hot-metals.lua b/compatibility/data/hot-metals.lua new file mode 100644 index 0000000..03b1e1e --- /dev/null +++ b/compatibility/data/hot-metals.lua @@ -0,0 +1,13 @@ +local util = require("data-util"); + +util.add_hot_metals({ + {name="lead-plate", icons={ + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64}, + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, + }}, + {name="lead-expansion-bolt", icons={ + { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128}, + { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}}, + }}, +}) + diff --git a/bzlead2/compatibility/sciencecosttweakerm.lua b/compatibility/sciencecosttweakerm.lua similarity index 100% rename from bzlead2/compatibility/sciencecosttweakerm.lua rename to compatibility/sciencecosttweakerm.lua diff --git a/bzlead2/control-util.lua b/control-util.lua similarity index 100% rename from bzlead2/control-util.lua rename to control-util.lua diff --git a/bzlead2/control.lua b/control.lua similarity index 100% rename from bzlead2/control.lua rename to control.lua diff --git a/bzlead2/data-final-fixes.lua b/data-final-fixes.lua similarity index 92% rename from bzlead2/data-final-fixes.lua rename to data-final-fixes.lua index cd87934..abe6676 100644 --- a/bzlead2/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -4,7 +4,7 @@ require("lead-recipe-final-rrr") require("lead-recipe-final-stacking") ---- -local util = require("__bzlead2__.data-util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then @@ -18,7 +18,7 @@ if util.k2() then local lead_bolt = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" util.replace_ingredient("kr-rifle-magazine", "iron-plate", "lead-plate") util.replace_ingredient("kr-anti-materiel-rifle-magazine", "iron-plate", "lead-plate") - util.replace_some_ingredient("kr-crusher", "kr-iron-beam", 5, lead_bolt, 5) + util.replace_some_ingredient("kr-crusher", "iron-beam", 5, lead_bolt, 5) util.replace_ingredient("kr-shelter", "iron-plate", lead_bolt) util.add_ingredient("kr-advanced-furnace", lead_bolt, 20) util.replace_ingredient("uranium-fuel-cell", "steel-plate", "lead-plate") diff --git a/bzlead2/data-updates.lua b/data-updates.lua similarity index 100% rename from bzlead2/data-updates.lua rename to data-updates.lua diff --git a/bzlead2/data-util.lua b/data-util.lua similarity index 99% rename from bzlead2/data-util.lua rename to data-util.lua index 1aac670..98ed044 100644 --- a/bzlead2/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) diff --git a/bzlead2/data.lua b/data.lua similarity index 100% rename from bzlead2/data.lua rename to data.lua diff --git a/bzlead2/graphics/entity/hr-lead-chest-remnants.png b/graphics/entity/hr-lead-chest-remnants.png similarity index 100% rename from bzlead2/graphics/entity/hr-lead-chest-remnants.png rename to graphics/entity/hr-lead-chest-remnants.png diff --git a/bzlead2/graphics/entity/hr-lead-chest-shadow.png b/graphics/entity/hr-lead-chest-shadow.png similarity index 100% rename from bzlead2/graphics/entity/hr-lead-chest-shadow.png rename to graphics/entity/hr-lead-chest-shadow.png diff --git a/bzlead2/graphics/entity/hr-lead-chest.png b/graphics/entity/hr-lead-chest.png similarity index 100% rename from bzlead2/graphics/entity/hr-lead-chest.png rename to graphics/entity/hr-lead-chest.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png diff --git a/bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png b/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png similarity index 100% rename from bzlead2/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png rename to graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png diff --git a/bzlead2/graphics/entity/ores/hr-lead-ore.png b/graphics/entity/ores/hr-lead-ore.png similarity index 100% rename from bzlead2/graphics/entity/ores/hr-lead-ore.png rename to graphics/entity/ores/hr-lead-ore.png diff --git a/bzlead2/graphics/icons/enriched-lead-1.png b/graphics/icons/enriched-lead-1.png similarity index 100% rename from bzlead2/graphics/icons/enriched-lead-1.png rename to graphics/icons/enriched-lead-1.png diff --git a/bzlead2/graphics/icons/enriched-lead-2.png b/graphics/icons/enriched-lead-2.png similarity index 100% rename from bzlead2/graphics/icons/enriched-lead-2.png rename to graphics/icons/enriched-lead-2.png diff --git a/bzlead2/graphics/icons/enriched-lead-3.png b/graphics/icons/enriched-lead-3.png similarity index 100% rename from bzlead2/graphics/icons/enriched-lead-3.png rename to graphics/icons/enriched-lead-3.png diff --git a/bzlead2/graphics/icons/enriched-lead.png b/graphics/icons/enriched-lead.png similarity index 100% rename from bzlead2/graphics/icons/enriched-lead.png rename to graphics/icons/enriched-lead.png diff --git a/bzlead2/graphics/icons/lead-chest.png b/graphics/icons/lead-chest.png similarity index 100% rename from bzlead2/graphics/icons/lead-chest.png rename to graphics/icons/lead-chest.png diff --git a/sources/graphics/icons/lead-expansion-bolt.blend b/graphics/icons/lead-expansion-bolt.blend similarity index 100% rename from sources/graphics/icons/lead-expansion-bolt.blend rename to graphics/icons/lead-expansion-bolt.blend diff --git a/sources/graphics/icons/lead-expansion-bolt.blend1 b/graphics/icons/lead-expansion-bolt.blend1 similarity index 100% rename from sources/graphics/icons/lead-expansion-bolt.blend1 rename to graphics/icons/lead-expansion-bolt.blend1 diff --git a/bzlead2/graphics/icons/lead-expansion-bolt.png b/graphics/icons/lead-expansion-bolt.png similarity index 100% rename from bzlead2/graphics/icons/lead-expansion-bolt.png rename to graphics/icons/lead-expansion-bolt.png diff --git a/bzlead2/graphics/icons/lead-ingot.png b/graphics/icons/lead-ingot.png similarity index 100% rename from bzlead2/graphics/icons/lead-ingot.png rename to graphics/icons/lead-ingot.png diff --git a/sources/graphics/icons/lead-ingot.xcf b/graphics/icons/lead-ingot.xcf similarity index 100% rename from sources/graphics/icons/lead-ingot.xcf rename to graphics/icons/lead-ingot.xcf diff --git a/bzlead2/graphics/icons/lead-ore-1.png b/graphics/icons/lead-ore-1.png similarity index 100% rename from bzlead2/graphics/icons/lead-ore-1.png rename to graphics/icons/lead-ore-1.png diff --git a/bzlead2/graphics/icons/lead-ore-2.png b/graphics/icons/lead-ore-2.png similarity index 100% rename from bzlead2/graphics/icons/lead-ore-2.png rename to graphics/icons/lead-ore-2.png diff --git a/bzlead2/graphics/icons/lead-ore-3.png b/graphics/icons/lead-ore-3.png similarity index 100% rename from bzlead2/graphics/icons/lead-ore-3.png rename to graphics/icons/lead-ore-3.png diff --git a/bzlead2/graphics/icons/lead-ore.png b/graphics/icons/lead-ore.png similarity index 100% rename from bzlead2/graphics/icons/lead-ore.png rename to graphics/icons/lead-ore.png diff --git a/bzlead2/graphics/icons/lead-plate.png b/graphics/icons/lead-plate.png similarity index 100% rename from bzlead2/graphics/icons/lead-plate.png rename to graphics/icons/lead-plate.png diff --git a/bzlead2/graphics/icons/lead-powder.png b/graphics/icons/lead-powder.png similarity index 100% rename from bzlead2/graphics/icons/lead-powder.png rename to graphics/icons/lead-powder.png diff --git a/bzlead2/graphics/icons/molten-lead-sa.png b/graphics/icons/molten-lead-sa.png similarity index 100% rename from bzlead2/graphics/icons/molten-lead-sa.png rename to graphics/icons/molten-lead-sa.png diff --git a/sources/graphics/icons/molten-lead-sa.xcf b/graphics/icons/molten-lead-sa.xcf similarity index 100% rename from sources/graphics/icons/molten-lead-sa.xcf rename to graphics/icons/molten-lead-sa.xcf diff --git a/bzlead2/graphics/icons/molten-lead.png b/graphics/icons/molten-lead.png similarity index 100% rename from bzlead2/graphics/icons/molten-lead.png rename to graphics/icons/molten-lead.png diff --git a/sources/graphics/icons/molten-lead.xcf b/graphics/icons/molten-lead.xcf similarity index 100% rename from sources/graphics/icons/molten-lead.xcf rename to graphics/icons/molten-lead.xcf diff --git a/bzlead2/graphics/icons/stacked/enriched-lead-stacked.png b/graphics/icons/stacked/enriched-lead-stacked.png similarity index 100% rename from bzlead2/graphics/icons/stacked/enriched-lead-stacked.png rename to graphics/icons/stacked/enriched-lead-stacked.png diff --git a/bzlead2/graphics/icons/stacked/lead-ore-stacked.png b/graphics/icons/stacked/lead-ore-stacked.png similarity index 100% rename from bzlead2/graphics/icons/stacked/lead-ore-stacked.png rename to graphics/icons/stacked/lead-ore-stacked.png diff --git a/bzlead2/graphics/icons/stacked/lead-plate-stacked.png b/graphics/icons/stacked/lead-plate-stacked.png similarity index 100% rename from bzlead2/graphics/icons/stacked/lead-plate-stacked.png rename to graphics/icons/stacked/lead-plate-stacked.png diff --git a/sources/graphics/old-files/enriched-lead-1.xcf b/graphics/old-files/enriched-lead-1.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead-1.xcf rename to graphics/old-files/enriched-lead-1.xcf diff --git a/sources/graphics/old-files/enriched-lead-2.xcf b/graphics/old-files/enriched-lead-2.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead-2.xcf rename to graphics/old-files/enriched-lead-2.xcf diff --git a/sources/graphics/old-files/enriched-lead-3.xcf b/graphics/old-files/enriched-lead-3.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead-3.xcf rename to graphics/old-files/enriched-lead-3.xcf diff --git a/sources/graphics/old-files/enriched-lead-4.xcf b/graphics/old-files/enriched-lead-4.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead-4.xcf rename to graphics/old-files/enriched-lead-4.xcf diff --git a/sources/graphics/old-files/enriched-lead-stacked.xcf b/graphics/old-files/enriched-lead-stacked.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead-stacked.xcf rename to graphics/old-files/enriched-lead-stacked.xcf diff --git a/sources/graphics/old-files/enriched-lead.xcf b/graphics/old-files/enriched-lead.xcf similarity index 100% rename from sources/graphics/old-files/enriched-lead.xcf rename to graphics/old-files/enriched-lead.xcf diff --git a/sources/graphics/old-files/hr-lead-chest.xcf b/graphics/old-files/hr-lead-chest.xcf similarity index 100% rename from sources/graphics/old-files/hr-lead-chest.xcf rename to graphics/old-files/hr-lead-chest.xcf diff --git a/graphics/old-files/hr-lead-ore.png b/graphics/old-files/hr-lead-ore.png new file mode 100644 index 0000000..40d4bc7 Binary files /dev/null and b/graphics/old-files/hr-lead-ore.png differ diff --git a/sources/graphics/old-files/hr-lead-ore.xcf b/graphics/old-files/hr-lead-ore.xcf similarity index 100% rename from sources/graphics/old-files/hr-lead-ore.xcf rename to graphics/old-files/hr-lead-ore.xcf diff --git a/graphics/old-files/iron-chest.png b/graphics/old-files/iron-chest.png new file mode 100644 index 0000000..5d7a5c0 Binary files /dev/null and b/graphics/old-files/iron-chest.png differ diff --git a/sources/graphics/old-files/lead-chest.xcf b/graphics/old-files/lead-chest.xcf similarity index 100% rename from sources/graphics/old-files/lead-chest.xcf rename to graphics/old-files/lead-chest.xcf diff --git a/graphics/old-files/lead-ore - Copy.png b/graphics/old-files/lead-ore - Copy.png new file mode 100644 index 0000000..40d4bc7 Binary files /dev/null and b/graphics/old-files/lead-ore - Copy.png differ diff --git a/sources/graphics/old-files/lead-ore-n-2.xcf b/graphics/old-files/lead-ore-n-2.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-n-2.xcf rename to graphics/old-files/lead-ore-n-2.xcf diff --git a/sources/graphics/old-files/lead-ore-n-3.xcf b/graphics/old-files/lead-ore-n-3.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-n-3.xcf rename to graphics/old-files/lead-ore-n-3.xcf diff --git a/sources/graphics/old-files/lead-ore-n-4.xcf b/graphics/old-files/lead-ore-n-4.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-n-4.xcf rename to graphics/old-files/lead-ore-n-4.xcf diff --git a/graphics/old-files/lead-ore-n.png b/graphics/old-files/lead-ore-n.png new file mode 100644 index 0000000..5ea2221 Binary files /dev/null and b/graphics/old-files/lead-ore-n.png differ diff --git a/sources/graphics/old-files/lead-ore-n.xcf b/graphics/old-files/lead-ore-n.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-n.xcf rename to graphics/old-files/lead-ore-n.xcf diff --git a/sources/graphics/old-files/lead-ore-stacked.xcf b/graphics/old-files/lead-ore-stacked.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-stacked.xcf rename to graphics/old-files/lead-ore-stacked.xcf diff --git a/sources/graphics/old-files/lead-ore-x-2.xcf b/graphics/old-files/lead-ore-x-2.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-x-2.xcf rename to graphics/old-files/lead-ore-x-2.xcf diff --git a/sources/graphics/old-files/lead-ore-x-3.xcf b/graphics/old-files/lead-ore-x-3.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-x-3.xcf rename to graphics/old-files/lead-ore-x-3.xcf diff --git a/sources/graphics/old-files/lead-ore-x-4.xcf b/graphics/old-files/lead-ore-x-4.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-x-4.xcf rename to graphics/old-files/lead-ore-x-4.xcf diff --git a/sources/graphics/old-files/lead-ore-x.xcf b/graphics/old-files/lead-ore-x.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore-x.xcf rename to graphics/old-files/lead-ore-x.xcf diff --git a/sources/graphics/old-files/lead-ore.xcf b/graphics/old-files/lead-ore.xcf similarity index 100% rename from sources/graphics/old-files/lead-ore.xcf rename to graphics/old-files/lead-ore.xcf diff --git a/sources/graphics/old-files/lead-plate-2.xcf b/graphics/old-files/lead-plate-2.xcf similarity index 100% rename from sources/graphics/old-files/lead-plate-2.xcf rename to graphics/old-files/lead-plate-2.xcf diff --git a/sources/graphics/old-files/lead-plate-3.xcf b/graphics/old-files/lead-plate-3.xcf similarity index 100% rename from sources/graphics/old-files/lead-plate-3.xcf rename to graphics/old-files/lead-plate-3.xcf diff --git a/graphics/old-files/lead-plate-old.png b/graphics/old-files/lead-plate-old.png new file mode 100644 index 0000000..aba7eea Binary files /dev/null and b/graphics/old-files/lead-plate-old.png differ diff --git a/sources/graphics/old-files/lead-plate-stacked.xcf b/graphics/old-files/lead-plate-stacked.xcf similarity index 100% rename from sources/graphics/old-files/lead-plate-stacked.xcf rename to graphics/old-files/lead-plate-stacked.xcf diff --git a/sources/graphics/old-files/lead-plate.xcf b/graphics/old-files/lead-plate.xcf similarity index 100% rename from sources/graphics/old-files/lead-plate.xcf rename to graphics/old-files/lead-plate.xcf diff --git a/sources/graphics/old-files/lead-powder.xcf b/graphics/old-files/lead-powder.xcf similarity index 100% rename from sources/graphics/old-files/lead-powder.xcf rename to graphics/old-files/lead-powder.xcf diff --git a/graphics/old-files/lead-processing.png b/graphics/old-files/lead-processing.png new file mode 100644 index 0000000..f37ae04 Binary files /dev/null and b/graphics/old-files/lead-processing.png differ diff --git a/sources/graphics/old-files/lead-processing.xcf b/graphics/old-files/lead-processing.xcf similarity index 100% rename from sources/graphics/old-files/lead-processing.xcf rename to graphics/old-files/lead-processing.xcf diff --git a/graphics/old-files/lead-thumbnail.png b/graphics/old-files/lead-thumbnail.png new file mode 100644 index 0000000..d8b4a49 Binary files /dev/null and b/graphics/old-files/lead-thumbnail.png differ diff --git a/sources/graphics/old-files/lead-thumbnail.xcf b/graphics/old-files/lead-thumbnail.xcf similarity index 100% rename from sources/graphics/old-files/lead-thumbnail.xcf rename to graphics/old-files/lead-thumbnail.xcf diff --git a/info.json b/info.json new file mode 100644 index 0000000..e915e3c --- /dev/null +++ b/info.json @@ -0,0 +1,24 @@ +{ + "name": "bzlead", + "version": "2.0.27", + "factorio_version": "2.0", + "title": "Lead", + "author": "Brevven", + "contact": "", + "homepage": "", + "dependencies": [ + "base >= 1.1.0", + "? space-age", + "? bzsilicon", + "? hot-metals", + "? space-exploration", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? Rich-Rocks-Requiem", + "? 248k-Redux", + "? tenebris", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating" + ], + "description": "Adds lead ore to the base game as an early game resource.\n\nLead is used in ammunition, pipes, batteries and more. Compatible with Space Age, RSO, and other mods.\n\nA standalone piece of BZ Mods, with graphics by snouz." +} diff --git a/bzlead2/lead-asteroid-updates.lua b/lead-asteroid-updates.lua similarity index 95% rename from bzlead2/lead-asteroid-updates.lua rename to lead-asteroid-updates.lua index 30eee0d..bb2ab06 100644 --- a/bzlead2/lead-asteroid-updates.lua +++ b/lead-asteroid-updates.lua @@ -20,7 +20,7 @@ if mods["space-age"] then { {icon="__space-age__/graphics/icons/metallic-asteroid-crushing.png", size=64}, {icon="__base__/graphics/icons/iron-ore.png", size=64, scale=0.25, shift={-8,0}}, - {icon="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, + {icon="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}}, }, category = "crushing", subgroup="space-crushing", diff --git a/bzlead2/lead-compressed.lua b/lead-compressed.lua similarity index 94% rename from bzlead2/lead-compressed.lua rename to lead-compressed.lua index 1e7b417..05bbf7e 100644 --- a/bzlead2/lead-compressed.lua +++ b/lead-compressed.lua @@ -29,7 +29,7 @@ if simpleCompress then } or { {type="item", name = "lead-plate", amount=simpleCompress.CompressedSmeltAmount}, } - leadRecipe.icons = {{ icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64 }} + leadRecipe.icons = {{ icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64 }} leadRecipe.subgroup = "raw-material" leadRecipe.order = "d[lead-plate]" end diff --git a/bzlead2/lead-enriched.lua b/lead-enriched.lua similarity index 84% rename from bzlead2/lead-enriched.lua rename to lead-enriched.lua index d62f037..7597222 100644 --- a/bzlead2/lead-enriched.lua +++ b/lead-enriched.lua @@ -8,13 +8,13 @@ data:extend( type = "item", name = "enriched-lead", icon_size = 64, - icon = "__bzlead2__/graphics/icons/enriched-lead.png", + icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_mipmaps = 3, pictures = { - {filename="__bzlead2__/graphics/icons/enriched-lead.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/enriched-lead.png", size=64, scale=0.25}, + {filename="__bzlead__/graphics/icons/enriched-lead-1.png", size=64, scale=0.25}, + {filename="__bzlead__/graphics/icons/enriched-lead-2.png", size=64, scale=0.25}, + {filename="__bzlead__/graphics/icons/enriched-lead-3.png", size=64, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-lead]", @@ -24,7 +24,7 @@ data:extend( type = "recipe", name = "enriched-lead", main_product = "enriched-lead", - icon = "__bzlead2__/graphics/icons/enriched-lead.png", + icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, category = "chemistry", @@ -60,8 +60,8 @@ data:extend( name = "enriched-lead-plate", icons = { - { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 }, - { icon = "__bzlead2__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, diff --git a/bzlead2/lead-matter.lua b/lead-matter.lua similarity index 95% rename from bzlead2/lead-matter.lua rename to lead-matter.lua index 3a1b1b3..9d8f239 100644 --- a/bzlead2/lead-matter.lua +++ b/lead-matter.lua @@ -14,7 +14,7 @@ data:extend( icon_size = 256, }, { - icon = "__bzlead2__/graphics/icons/lead-ore.png", + icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale = 1.25, } diff --git a/bzlead2/lead-ore-particle.lua b/lead-ore-particle.lua similarity index 62% rename from bzlead2/lead-ore-particle.lua rename to lead-ore-particle.lua index bb4d645..5d094dc 100644 --- a/bzlead2/lead-ore-particle.lua +++ b/lead-ore-particle.lua @@ -8,7 +8,7 @@ data:extend( pictures = { { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png", priority = "extra-high", width = 32, height = 32, @@ -16,7 +16,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png", priority = "extra-high", width = 32, height = 32, @@ -24,7 +24,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png", priority = "extra-high", width = 32, height = 32, @@ -32,7 +32,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png", priority = "extra-high", width = 32, height = 32, @@ -43,7 +43,7 @@ data:extend( shadows = { { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png", priority = "extra-high", width = 32, height = 32, @@ -51,7 +51,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png", priority = "extra-high", width = 32, height = 32, @@ -59,7 +59,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png", priority = "extra-high", width = 32, height = 32, @@ -67,7 +67,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png", + filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png", priority = "extra-high", width = 32, height = 32, diff --git a/bzlead2/lead-ore.lua b/lead-ore.lua similarity index 85% rename from bzlead2/lead-ore.lua rename to lead-ore.lua index 8f1672c..4868082 100644 --- a/bzlead2/lead-ore.lua +++ b/lead-ore.lua @@ -1,5 +1,5 @@ local resource_autoplace = require('resource-autoplace') -local util = require("data-util"); +local util = require("__bzlead__.data-util"); local item_sounds = require('__base__.prototypes.item_sounds') data.raw.planet.nauvis.map_gen_settings.autoplace_controls["lead-ore"] = {} @@ -29,7 +29,7 @@ data:extend({ icon_size = 64, icon_mipmaps = 3, category="basic-solid", name = "lead-ore", - icon = "__bzlead2__/graphics/icons/lead-ore.png", + icon = "__bzlead__/graphics/icons/lead-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.35, g=0.10, b=0.10}, @@ -57,7 +57,7 @@ data:extend({ stages = { sheet = { - filename = "__bzlead2__/graphics/entity/ores/hr-lead-ore.png", + filename = "__bzlead__/graphics/entity/ores/hr-lead-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -70,12 +70,12 @@ data:extend({ type = "item", name = "lead-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bzlead2__/graphics/icons/lead-ore.png", + icon = "__bzlead__/graphics/icons/lead-ore.png", pictures = { - {filename="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/lead-ore-1.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/lead-ore-2.png", size=64, scale=0.5}, - {filename="__bzlead2__/graphics/icons/lead-ore-3.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/lead-ore-1.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/lead-ore-2.png", size=64, scale=0.5}, + {filename="__bzlead__/graphics/icons/lead-ore-3.png", size=64, scale=0.5}, }, subgroup = "raw-resource", order = "t-c-a", diff --git a/bzlead2/lead-recipe-colors.lua b/lead-recipe-colors.lua similarity index 91% rename from bzlead2/lead-recipe-colors.lua rename to lead-recipe-colors.lua index eaa0c05..b1f07e1 100644 --- a/bzlead2/lead-recipe-colors.lua +++ b/lead-recipe-colors.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); diff --git a/bzlead2/lead-recipe-final-5d.lua b/lead-recipe-final-5d.lua similarity index 91% rename from bzlead2/lead-recipe-final-5d.lua rename to lead-recipe-final-5d.lua index ccedb9e..7694bb4 100644 --- a/bzlead2/lead-recipe-final-5d.lua +++ b/lead-recipe-final-5d.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); if mods["5dim_core"] then local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" @@ -16,7 +16,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" category = "industrial-furnace", subgroup = "plates-industrial-ore", order = "ad[lead-plate]", - icon = "__bzlead2__/graphics/icons/lead-plate.png", + icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = true, energy_required = 65, @@ -35,14 +35,14 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" name = "lead-dust", subgroup = "plates-dust", order = "d[lead-plate]", - icon = "__bzlead2__/graphics/icons/lead-powder.png", + icon = "__bzlead__/graphics/icons/lead-powder.png", icon_size = 64, icon_mipmaps = 3, stack_size = 200 }, { type = "recipe", name = "lead-plate-dust", - icon = "__bzlead2__/graphics/icons/lead-plate.png", + icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "plates-plates2", order = "d[lead-plate]", @@ -60,7 +60,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" type = "recipe", name = "lead-dust", main_product = "lead-dust", - icon = "__bzlead2__/graphics/icons/lead-powder.png", + icon = "__bzlead__/graphics/icons/lead-powder.png", icon_size = 64, icon_mipmaps = 3, category = "mashering", subgroup = "", @@ -80,7 +80,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" category = "industrial-furnace", subgroup = "plates-industrial-dust", order = "ad[lead-plate]", - icon = "__bzlead2__/graphics/icons/lead-plate.png", + icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = true, energy_required = 65, diff --git a/bzlead2/lead-recipe-final-rrr.lua b/lead-recipe-final-rrr.lua similarity index 90% rename from bzlead2/lead-recipe-final-rrr.lua rename to lead-recipe-final-rrr.lua index 134e9ab..6e57a43 100644 --- a/bzlead2/lead-recipe-final-rrr.lua +++ b/lead-recipe-final-rrr.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); if mods["Rich-Rocks-Requiem"] then if data.raw.recipe["rrr-stone-processing"] then diff --git a/bzlead2/lead-recipe-final-stacking.lua b/lead-recipe-final-stacking.lua similarity index 59% rename from bzlead2/lead-recipe-final-stacking.lua rename to lead-recipe-final-stacking.lua index 16b59d0..4619c65 100644 --- a/bzlead2/lead-recipe-final-stacking.lua +++ b/lead-recipe-final-stacking.lua @@ -1,11 +1,11 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); -- Deadlock stacking recipes if deadlock and deadlock["add_stack"] then - deadlock.add_stack("lead-ore", "__bzlead2__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("lead-plate", "__bzlead2__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("lead-ore", "__bzlead__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("lead-plate", "__bzlead__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64) if util.k2() then - deadlock.add_stack("enriched-lead", "__bzlead2__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64) + deadlock.add_stack("enriched-lead", "__bzlead__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64) end if data.raw.item["lead-ingot"] then deadlock.add_stack("lead-ingot", nil, "deadlock-stacking-1", nil) diff --git a/bzlead2/lead-recipe-final.lua b/lead-recipe-final.lua similarity index 100% rename from bzlead2/lead-recipe-final.lua rename to lead-recipe-final.lua diff --git a/bzlead2/lead-recipe-se.lua b/lead-recipe-se.lua similarity index 88% rename from bzlead2/lead-recipe-se.lua rename to lead-recipe-se.lua index c1626eb..16f8766 100644 --- a/bzlead2/lead-recipe-se.lua +++ b/lead-recipe-se.lua @@ -20,7 +20,7 @@ if mods["space-exploration"] then { type = "item", name = "lead-ingot", - icons = {{icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128}}, + icons = {{icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "lead", @@ -32,7 +32,7 @@ if mods["space-exploration"] then max_temperature = 600, base_color = {r=121, g=80, b=80}, flow_color = {r=121, g=80, b=80}, - icons = {{icon = "__bzlead2__/graphics/icons/molten-lead.png", icon_size = 128}}, + icons = {{icon = "__bzlead__/graphics/icons/molten-lead.png", icon_size = 128}}, order = "a[molten]-a", pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, @@ -77,8 +77,8 @@ if mods["space-exploration"] then name = "lead-ingot-to-plate", icons = { - {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3}, - {icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { {type="item", name = "lead-plate", amount = 10}, @@ -104,7 +104,7 @@ if mods["space-exploration"] then data.raw.recipe["enriched-lead-plate"].order= "d[lead-plate]" se_delivery_cannon_recipes["enriched-lead"] = {name= "enriched-lead"} else - if util.me.byproduct() then util.add_product("molten-lead", { type = "item", name = "copper-ore", amount = 6 }) end + if util.me.byproduct() then util.add_product("molten-lead", {"copper-ore", 6}) end end se_delivery_cannon_recipes["lead-ingot"] = {name="lead-ingot"} end \ No newline at end of file diff --git a/bzlead2/lead-recipe-updates.lua b/lead-recipe-updates.lua similarity index 99% rename from bzlead2/lead-recipe-updates.lua rename to lead-recipe-updates.lua index 1ea9603..9a29d0b 100644 --- a/bzlead2/lead-recipe-updates.lua +++ b/lead-recipe-updates.lua @@ -1,6 +1,6 @@ -- Titanium recipe & tech changes -- -local util = require("data-util"); +local util = require("__bzlead__.data-util"); local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate" @@ -282,7 +282,7 @@ util.add_ingredient("storehouse-basic", "lead-plate", 8) -- Leighzer's scrap if mods.leighzerscrapyards then util.add_to_product("scrap-processing", "iron-plate", -1) - util.add_product("scrap-processing", { type = "item", name = "lead-plate", amount = 1 }) + util.add_product("scrap-processing", {"lead-plate", 1}) end util.add_minable_result("simple-entity", "huge-volcanic-rock", {type="item", name="lead-ore", amount_min=10, amount_max=24}) diff --git a/bzlead2/lead-recipe.lua b/lead-recipe.lua similarity index 89% rename from bzlead2/lead-recipe.lua rename to lead-recipe.lua index 2131137..c2a7564 100644 --- a/bzlead2/lead-recipe.lua +++ b/lead-recipe.lua @@ -1,6 +1,6 @@ -- Lead smelting -local util = require("data-util"); +local util = require("__bzlead__.data-util"); local item_sounds = require('__base__.prototypes.item_sounds') if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then @@ -12,10 +12,10 @@ data:extend({ order = "d[lead-plate]", icons = (util.k2() and { - { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, - { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { - { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, }, } ), main_product = util.me.lead_plate, @@ -59,7 +59,7 @@ data:extend({ { type = "item", name = util.me.lead_plate, - icon = "__bzlead2__/graphics/icons/lead-plate.png", + icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[lead-plate]", @@ -107,7 +107,7 @@ data:extend({ subgroup = "intermediate-product", rocket_capacity = 1000, stack_size=100, - icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", + icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, order = "a[basic-intermediates]-e[expansion-bolt]", weight = 2*kg, @@ -136,9 +136,9 @@ data:extend({ subgroup = "vulcanus-processes", order = "z[casting]-d[casting-solder]", icons = { - {icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}}, + {icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}}, {icon = "__space-age__/graphics/icons/fluid/molten-iron.png", icon_size = 64, shift={-4,-4}}, - {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}}, + {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}}, }, enabled = false, ingredients = { @@ -162,7 +162,7 @@ data:extend({ { type = "fluid", name = "molten-lead", - icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", + icon = "__bzlead__/graphics/icons/molten-lead-sa.png", subgroup = "fluid", order = "b[new-fluid]-b[vulcanus]-d[molten-lead]", default_temperature = 1500, @@ -177,7 +177,7 @@ data:extend({ name = "molten-lead-from-lava", icons = { {icon = "__base__/graphics/icons/stone.png", icon_size=64, shift={-8,8}}, - {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}}, + {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}}, {icon = "__space-age__/graphics/icons/fluid/lava.png", icon_size=64, shift={0,-8}}, }, category = "metallurgy", @@ -231,8 +231,8 @@ data:extend({ subgroup = "vulcanus-processes", order = "b[casting]-d[casting-lead]", icons = { - {icon = "__bzlead2__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}}, - {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}}, + {icon = "__bzlead__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}}, + {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}}, }, enabled = false, ingredients = @@ -256,7 +256,7 @@ data:extend({ type = "item", name = "chelated-lead", icons = { - {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64} + {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64} }, subgroup = "agriculture-processes", order = "b[agriculture]-c[lead]", @@ -275,7 +275,7 @@ data:extend({ order = "e[chelation]-a[lead]", icons = { {icon = "__space-age__/graphics/icons/yumako-mash.png", size=64, shift={-4,-4}}, - {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}}, + {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}}, }, enabled = false, allow_productivity = true, @@ -301,7 +301,7 @@ data:extend({ auto_recycle_helper = false, icons = { {icon = "__base__/graphics/icons/fluid/sulfuric-acid.png", size = 64, shift={-4,-4}}, - {icon = "__bzlead2__/graphics/icons/lead-ore.png", size = 64, shift={4,4}}, + {icon = "__bzlead__/graphics/icons/lead-ore.png", size = 64, shift={4,4}}, }, enabled = false, allow_productivity = true, @@ -366,7 +366,7 @@ data:extend({ icons = (util.k2() and { { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, - { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or { { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, }, }), @@ -374,7 +374,7 @@ data:extend({ { enabled = true, energy_required = 16, - ingredients = {{ type = "item", name = "lead-ore", amount = 10 }}, + ingredients = {{"lead-ore", 10}}, results = { {type="item", name = "lead-ingot", amount_min=4, amount_max=5}, {type="item", name = "copper-ore", amount_min=1, amount_max=2}, @@ -383,7 +383,7 @@ data:extend({ { enabled = true, energy_required = 6.4, - ingredients = {{ type = "item", name = "lead-ore", amount = 2 }}, + ingredients = {{"lead-ore", 2}}, results = { {type="item", name = "lead-ingot", amount=2, probability=5/6}, {type="item", name = "copper-ore", amount=1, probability=1/3}, @@ -393,7 +393,7 @@ data:extend({ { enabled = true, energy_required = 12.8, - ingredients = {{ type = "item", name = "lead-ore", amount = 4 }}, + ingredients = {{"lead-ore", 4}}, results = { {type="item", name = "lead-ingot", amount=2, probability=5/6}, {type="item", name = "copper-ore", amount=2, probability=1/3}, @@ -419,7 +419,7 @@ data:extend({ { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -451,7 +451,7 @@ data:extend({ { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -468,7 +468,7 @@ data:extend({ { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -500,7 +500,7 @@ data:extend({ { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -6}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}}, }, }, @@ -522,7 +522,7 @@ data:extend({ { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64, scale=0.25, shift= {8, -8}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, @@ -556,7 +556,7 @@ data:extend({ { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64}, { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64, scale=0.25, shift= {8, -8}}, - { icon = "__bzlead2__/graphics/icons/lead-plate.png", + { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, }, diff --git a/bzlead2/lead-sim.lua b/lead-sim.lua similarity index 91% rename from bzlead2/lead-sim.lua rename to lead-sim.lua index 2503bfd..9cc3551 100644 --- a/bzlead2/lead-sim.lua +++ b/lead-sim.lua @@ -11,7 +11,7 @@ if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then data.raw["utility-constants"]["default"].main_menu_simulations["lead-ammo"] = { checkboard = false, - save = "__bzlead2__/menu-simulations/lead-ammo-sim.zip", length = 15*60, + save = "__bzlead__/menu-simulations/lead-ammo-sim.zip", length = 15*60, init = [[ local logo = game.surfaces.nauvis.find_entities_filtered{ diff --git a/bzlead2/locale/cs/lead.cfg b/locale/cs/lead.cfg similarity index 100% rename from bzlead2/locale/cs/lead.cfg rename to locale/cs/lead.cfg diff --git a/bzlead2/locale/de/lead.cfg b/locale/de/lead.cfg similarity index 100% rename from bzlead2/locale/de/lead.cfg rename to locale/de/lead.cfg diff --git a/bzlead2/locale/en/lead.cfg b/locale/en/lead.cfg similarity index 100% rename from bzlead2/locale/en/lead.cfg rename to locale/en/lead.cfg diff --git a/bzlead2/locale/ja/lead.cfg b/locale/ja/lead.cfg similarity index 100% rename from bzlead2/locale/ja/lead.cfg rename to locale/ja/lead.cfg diff --git a/bzlead2/locale/ko/lead.cfg b/locale/ko/lead.cfg similarity index 100% rename from bzlead2/locale/ko/lead.cfg rename to locale/ko/lead.cfg diff --git a/bzlead2/locale/pl/lead.cfg b/locale/pl/lead.cfg similarity index 100% rename from bzlead2/locale/pl/lead.cfg rename to locale/pl/lead.cfg diff --git a/bzlead2/locale/ru/lead.cfg b/locale/ru/lead.cfg similarity index 100% rename from bzlead2/locale/ru/lead.cfg rename to locale/ru/lead.cfg diff --git a/bzlead2/locale/zh-CN/lead.cfg b/locale/zh-CN/lead.cfg similarity index 100% rename from bzlead2/locale/zh-CN/lead.cfg rename to locale/zh-CN/lead.cfg diff --git a/bzlead2/map-gen-preset-updates.lua b/map-gen-preset-updates.lua similarity index 100% rename from bzlead2/map-gen-preset-updates.lua rename to map-gen-preset-updates.lua diff --git a/bzlead2/me.lua b/me.lua similarity index 98% rename from bzlead2/me.lua rename to me.lua index bfcc419..0864b75 100644 --- a/bzlead2/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzlead2" +me.name = "bzlead" me.resources = {{"lead-ore", "nauvis"}} me.fluid_mining = false me.lead_ore = "lead-ore" diff --git a/bzlead2/menu-simulations/lead-ammo-sim.zip b/menu-simulations/lead-ammo-sim.zip similarity index 100% rename from bzlead2/menu-simulations/lead-ammo-sim.zip rename to menu-simulations/lead-ammo-sim.zip diff --git a/migrations/bzlead.1.1.0.json b/migrations/bzlead.1.1.0.json new file mode 100644 index 0000000..05c8ea3 --- /dev/null +++ b/migrations/bzlead.1.1.0.json @@ -0,0 +1,7 @@ +{ + "item": + [ + ["fu_lead_item", "lead-plate"] + ] +} + diff --git a/bzlead2/omni.lua b/omni.lua similarity index 79% rename from bzlead2/omni.lua rename to omni.lua index 3f54567..a80c779 100644 --- a/bzlead2/omni.lua +++ b/omni.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then if omni and omni.matter then @@ -10,7 +10,7 @@ if omni and omni.matter then data.raw.recipe["omnicium-plate-mix"].icons = { {icon = data.raw.item["omnicium-plate"].icons[1].icon}, - {icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}}, + {icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}}, {icon = "__base__/graphics/icons/iron-ore.png", scale =0.25, icon_size=64, shift={-6, 6}}, } end diff --git a/bzlead2/other-entities.lua b/other-entities.lua similarity index 86% rename from bzlead2/other-entities.lua rename to other-entities.lua index 4e6babb..ecfae7e 100644 --- a/bzlead2/other-entities.lua +++ b/other-entities.lua @@ -1,4 +1,4 @@ -local leadutil = require("data-util"); +local leadutil = require("__bzlead__.data-util"); require("data-util") if leadutil.me.more_entities() and data.raw.item["lead-plate"] then @@ -7,7 +7,7 @@ data:extend({ { type = "item", name = "lead-chest", - icon = "__bzlead2__/graphics/icons/lead-chest.png", + icon = "__bzlead__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, subgroup = "storage", order = "a[items]-az[lead-chest]", @@ -24,7 +24,7 @@ data:extend({ { type = "container", name = "lead-chest", - icon = "__bzlead2__/graphics/icons/lead-chest.png", + icon = "__bzlead__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, flags = {"placeable-neutral", "player-creation"}, minable = {mining_time = 0.2, result = "lead-chest"}, @@ -55,7 +55,7 @@ data:extend({ layers = { { - filename = "__bzlead2__/graphics/entity/hr-lead-chest.png", + filename = "__bzlead__/graphics/entity/hr-lead-chest.png", priority = "extra-high", width = 66, height = 76, @@ -63,7 +63,7 @@ data:extend({ scale = 0.5 }, { - filename = "__bzlead2__/graphics/entity/hr-lead-chest-shadow.png", + filename = "__bzlead__/graphics/entity/hr-lead-chest-shadow.png", priority = "extra-high", width = 110, height = 50, @@ -80,7 +80,7 @@ data:extend({ { type = "corpse", name = "lead-chest-remnants", - icon = "__bzlead2__/graphics/icons/lead-chest.png", + icon = "__bzlead__/graphics/icons/lead-chest.png", icon_size = 64, icon_mipmaps = 3, flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"}, subgroup = "storage-remnants", @@ -95,7 +95,7 @@ data:extend({ hidden_in_factoriopedia = true, animation = { - filename = "__bzlead2__/graphics/entity/hr-lead-chest-remnants.png", + filename = "__bzlead__/graphics/entity/hr-lead-chest-remnants.png", line_length = 1, width = 126, height = 78, diff --git a/bzlead2/settings-util.lua b/settings-util.lua similarity index 100% rename from bzlead2/settings-util.lua rename to settings-util.lua diff --git a/bzlead2/settings.lua b/settings.lua similarity index 100% rename from bzlead2/settings.lua rename to settings.lua diff --git a/bzlead2/strange-matter.lua b/strange-matter.lua similarity index 92% rename from bzlead2/strange-matter.lua rename to strange-matter.lua index 3480b4d..450c8d7 100644 --- a/bzlead2/strange-matter.lua +++ b/strange-matter.lua @@ -1,8 +1,8 @@ -local util = require("data-util"); +local util = require("__bzlead__.data-util"); local ore = "lead-ore" -local ore_icon = "__bzlead2__/graphics/icons/lead-ore.png" +local ore_icon = "__bzlead__/graphics/icons/lead-ore.png" if mods["StrangeMatter"] then data:extend({ diff --git a/bzlead2/thumbnail.png b/thumbnail.png similarity index 100% rename from bzlead2/thumbnail.png rename to thumbnail.png