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..751553b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -.idea -*.zip \ No newline at end of file +*.bak diff --git a/bztitanium2/LICENSE.md b/LICENSE.md similarity index 100% rename from bztitanium2/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 7b4c58f..60bd04c 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,16 @@ -**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.** - # Titanium -Adds Titanium ore to the game, and allows production of Titanium plates. This mod is more of a "Vanilla+" type mod than a true game changer. -If you enjoy vanilla Factorio but want something a little bit more complex, try out this mod! If you're starting a game with a compatible mod (such as Krastorio 2) and want to add an extra resource, try it out! If you enjoy this mod, see Lead for a similar mod with more of an early game focus. +[factorio mod page](https://mods.factorio.com/mod/bztitanium) -However, if you are looking for another Bobs/Angels or Pyanodon, this mod won't scratch that itch (though it will provide a few minor tweaks to those mods!) +Adds titanium ore and plates to the base game. It requires lubricant to mine. +Most recipes that should be lightweight that use steel now use titanium. Other minor recipe tweaks as well. -Titanium processing can be unlocked in the chemical science era. The biggest change to the base game is that Flying Robot Frames and Low Density Structures now require Titanium Plates instead of Steel Plates. Out of the box, Titanium ore requires Lubricant to mine. +## 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) - [snouz](https://github.com/snouz) (graphics) ### Compatibility diff --git a/bztitanium2/changelog.txt b/bztitanium2/changelog.txt deleted file mode 100644 index ed4f0a3..0000000 --- a/bztitanium2/changelog.txt +++ /dev/null @@ -1,7 +0,0 @@ ---------------------------------------------------------------------------------------------------- -Version: 2.0.27 -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/bztitanium2/compatibility/data/hot-metals.lua b/bztitanium2/compatibility/data/hot-metals.lua deleted file mode 100644 index 46da73e..0000000 --- a/bztitanium2/compatibility/data/hot-metals.lua +++ /dev/null @@ -1,7 +0,0 @@ -local util = require("data-util") -util.add_hot_metals({ - {name="titanium-plate", icons={ - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64}, - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, - }}, -}) diff --git a/bztitanium2/info.json b/bztitanium2/info.json deleted file mode 100644 index 7ccc9c8..0000000 --- a/bztitanium2/info.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "bztitanium2", - "version": "2.0.27", - "factorio_version": "2.0", - "title": "Titanium - Legacy", - "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.", - "author": "Brevven, cackling fiend", - "homepage": "https://discord.gg/ufvFUJtVwk", - "dependencies": [ - "base >= 1.0.0", - "? aai-industry", - "? space-exploration", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? Rich-Rocks-Requiem", - "? FactorioExtended-Plus-Core", - "? Pre0-17-60Oil", - "? Deadlock-SE-bridge", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "? modmashsplinterresources", - "? EndgameCombat", - "(?) Power Armor MK3", - "? 248k-Redux", - "? tenebris", - "? Cerys-Moon-of-Fulgora", - "(?) atan-nuclear-science", - "(?) casting", - "? hot-metals", - "! nullius", - "! space-age" - ] -} \ No newline at end of file diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..fec3e15 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,703 @@ +--------------------------------------------------------------------------------------------------- +Version: 2.0.26 +Date: 2025-06-15 + Fixes: + - Fix load error in certain mod loadouts, especially with K2SO +--------------------------------------------------------------------------------------------------- +Version: 2.0.25 +Date: 2025-05-04 + Changes: + - Support for Krastorio2 spaced out + - Further tweaks to K2 2 integration +--------------------------------------------------------------------------------------------------- +Version: 2.0.24 +Date: 2025-05-03 + Changes: + - Tweak recipe when used with ElAdamo's casting +--------------------------------------------------------------------------------------------------- +Version: 2.0.23 +Date: 2025-05-03 + Fixes: + - Fix load issue with Bob's + Changes: + - K2: Updated compatibility (with thanks to autechr3 and pla) +--------------------------------------------------------------------------------------------------- +Version: 2.0.22 +Date: 2025-03-10 + Changes: + - Set custom inventory sounds for some items + Fixes: + - Loads with Crafting Efficiency + - Improved compatiblity with Muluna +--------------------------------------------------------------------------------------------------- +Version: 2.0.21 +Date: 2025-03-10 + Changes: + - Minor icon tweak +--------------------------------------------------------------------------------------------------- +Version: 2.0.20 +Date: 2025-02-01 + Changes: + - Add shiftite recipe for Janus mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.19 +Date: 2025-01-25 + Fixes: + - Improve compatiblity with mods that change armor recipes in certain ways +--------------------------------------------------------------------------------------------------- +Version: 2.0.18 +Date: 2025-01-19 + Changes: + - Cerys: Steam turbines now correctly return Titanium plates when recycled +--------------------------------------------------------------------------------------------------- +Version: 2.0.17 +Date: 2025-01-14 + Changes: + - Support for Asteroid Mining mod + - Space Age: More vacuum created per unit titanium +--------------------------------------------------------------------------------------------------- +Version: 2.0.16 +Date: 2025-01-07 + Fixes: + - Improve compatibility with some mods. +--------------------------------------------------------------------------------------------------- +Version: 2.0.15 +Date: 2025-01-06 + Fixes: + - Fix crash when used with Quality but not Space Age + Changes: + - Do more to respect disabling of certain recycling recipes. + - Boost scrap recycling to have 2% chance of titanium plate unless tin mod is also active. +--------------------------------------------------------------------------------------------------- +Version: 2.0.14 +Date: 2025-01-05 + Changes: + - Prevent tech soft lock in Any Planet Start +--------------------------------------------------------------------------------------------------- +Version: 2.0.13 +Date: 2025-01-05 + Fixes: + - Fix compatibility with Any Planet Start on Vulcanus/Fulgora (and potential others that rely on Uranium Mining tech) +--------------------------------------------------------------------------------------------------- +Version: 2.0.12 +Date: 2025-01-04 + Changes: + - Capture bot rocket requires titanium instead of steel + - Add weights for rockets + - Hot metals: use default cooling time +--------------------------------------------------------------------------------------------------- +Version: 2.0.11 +Date: 2025-01-01 + Changes: + - Use old hr version for all entities + - Support hot metals +--------------------------------------------------------------------------------------------------- +Version: 2.0.10 +Date: 2024-12-29 + Changes: + - Added "/bz-regenerate" command for regenerating ore patches, especially useful when adding to an existing game +--------------------------------------------------------------------------------------------------- +Version: 2.0.9 +Date: 2024-12-28 + Changes: + - Compatible with Tenebris +--------------------------------------------------------------------------------------------------- +Version: 2.0.8 +Date: 2024-12-28 + Fixes: + - Compatibility with Nuclear Science mod (atan-nuclear-science) +--------------------------------------------------------------------------------------------------- +Version: 2.0.7 +Date: 2024-12-27 + Fixes: + - Fix size of ore pictures + - Ensure recycling changes always happen regardless of mod load order + - Proper workaround for ore generation when added to exsting game: acts as normal generation now + Changes: + - LDS casting now uses titanium plates, with vacuum (thanks SafTheLamb for the recipe idea) +--------------------------------------------------------------------------------------------------- +Version: 2.0.6 +Date: 2024-12-27 + Changes: + - Gleba process now produces jellynut seeds to keep the farms planting. +--------------------------------------------------------------------------------------------------- +Version: 2.0.5 +Date: 2024-12-26 + Changes: + - Enable productivity on more recipes +--------------------------------------------------------------------------------------------------- +Version: 2.0.4 +Date: 2024-12-26 + Fixes: + - Compatibility with 5dims for 2.0 +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2024-12-24 + Fixes: + - Fix runtime crash with Cerys mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 2024-12-24 + Fixes: + - Attempt fix for crash related to recipe results without names. +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 2024-12-24 + Fixes: + - Fix number of slots in recycling machines to accomdodate extra titanium plate output +--------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 2024-12-24 + Features: + - Works with Factorio 2.0 vanilla and Space Age. + Can be added to existing games, but currently uses a workaround to generate ore patches on new chunks when added to an existing game due to an issue (https://forums.factorio.com/124996) + And thank's to Eradicator's script to make natural looking ore patches for the workaround (https://forums.factorio.com/72723) + - Compatibility with other mods is not confirmed, but many will still work + - Some new uses for titanium with Space Age, including belt and inserter progression + - Alternate titanium production chains on Vulcanus and Gleba, recycling on Fulgora. These production chains may need further balancing or updates. + Note: If you'd like to avoid changing scrap recycling on Fulgora, add "scrap-recycling" to Bypass recipes mod setting +--------------------------------------------------------------------------------------------------- +Version: 1.2.13 +Date: 2023-12-23 + Fixes: + - Minor mod compatibility fixes. + Localization: + - ja l10n updates, thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 1.2.12 +Date: 2023-02-12 + Changes: + - Crafting efficiency improvements, thanks to nihilistzsche +--------------------------------------------------------------------------------------------------- +Version: 1.2.11 +Date: 2023-01-17 + Features: + - (Beta) Crafting efficiency compatibility + Localization: + - ru updates thanks to CV514 +--------------------------------------------------------------------------------------------------- +Version: 1.2.10 +Date: 2022-12-27 + Fixes: + - 248k + LootingRemnants startup fix, thanks to SrConrabo + - Attempt a fix for K2+SE, and some other mods, when used without Tungsten +--------------------------------------------------------------------------------------------------- +Version: 1.2.9 +Date: 2022-12-24 + Localization: + - zh-CN by sunnytan53 + Fixes: + - Modules with GDIW + Changes: + - SE ingots in delivery cannon +--------------------------------------------------------------------------------------------------- +Version: 1.2.8 +Date: 2022-08-23 + Changes: + - Recipe compatibility with new advanced belts mod +--------------------------------------------------------------------------------------------------- +Version: 1.2.7 +Date: 2022-08-17 + Fixes: + - SE: Disable matter recipes at start +--------------------------------------------------------------------------------------------------- +Version: 1.2.6 +Date: 2022-08-16 + Changes: + - More small mod compatibility - various high-tier belts and inserters including + Bob's logistics, better belts, ultimate belts. (Use recipe bypass setting if necessary) + Features: + - Support for SE matter fusion and SE+K2 matter liberation +--------------------------------------------------------------------------------------------------- +Version: 1.2.5 +Date: 2022-07-03 + Fixes: + - Compatibility with AutoTrainDepot & EndgameCombat +--------------------------------------------------------------------------------------------------- +Version: 1.2.4 +Date: 2022-07-03 + Fixes: + - Compatibility between all of Titanium/EndgameCombat/Krastorio2 +--------------------------------------------------------------------------------------------------- +Version: 1.2.3 +Date: 2022-07-03 + Fixes: + - SE: Molten can use prod modules +--------------------------------------------------------------------------------------------------- +Version: 1.2.2 +Date: 2022-07-02 + Fixes: + - SE/K2 subgroup cleanup + - SE ingot -> plate icon +--------------------------------------------------------------------------------------------------- +Version: 1.2.1 +Date: 2022-07-02 + Changes: + - SE: Pyroflux tech name +--------------------------------------------------------------------------------------------------- +Version: 1.2.0 +Date: 2022-07-01 + Changes: + - Compatible with Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- +Version: 1.1.1 +Date: 2022-06-26 + Fixes: + - 248k+K2 fix +--------------------------------------------------------------------------------------------------- +Version: 1.1.0 +Date: 2022-06-26 + Features: + - Beta support for 248k. This is an initial release and may change in the future + Titanium plate items merged into one. Multiple production chains +--------------------------------------------------------------------------------------------------- +Version: 1.0.9 +Date: 2022-05-25 + Features: + - Fix a breakage when used with simple compress mod. +--------------------------------------------------------------------------------------------------- +Version: 1.0.8 +Date: 2022-02-22 + Features: + - SE Space Trains & Space trains compatibility +--------------------------------------------------------------------------------------------------- +Version: 1.0.7 +Date: 2022-02-22 + Localization: + - ko locale, thanks to x2605 +--------------------------------------------------------------------------------------------------- +Version: 1.0.6 +Date: 2022-02-16 + Fixes: + - Fix for FE+ and 5dim's used together. +--------------------------------------------------------------------------------------------------- +Version: 1.0.5 +Date: 2022-02-11 + Fixes: + - Fix for Endgame Combat + Power Armor Mk3 +--------------------------------------------------------------------------------------------------- +Version: 1.0.4 +Date: 2022-02-04 + Fixes: + - Fix for some possible 5dim's loadouts +--------------------------------------------------------------------------------------------------- +Version: 1.0.3 +Date: 2022-01-24 + Changes: + - Small compatibility tweaks + - K2: Dirty water filtration water amount +--------------------------------------------------------------------------------------------------- +Version: 1.0.2 +Date: 2022-01-06 + Changes: + - pl l10n updates, thanks to S3BA + - ja l10n updates, thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 1.0.1 +Date: 2022-01-04 + Changes: + - SE+K2: Space loader recipe + Features: + - Space extension endgame recipes + - Other minor compatibility updates +--------------------------------------------------------------------------------------------------- +Version: 1.0.0 +Date: 2021-11-06 + Changes: + - Arbitrary decision to mark 1.0, as features have been stable for a time. + - K2: Beta compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.12.7 +Date: 2021-10-11 + Fixes: + - SE: Balance core mining + - SE: Landfill recipe +--------------------------------------------------------------------------------------------------- +Version: 0.12.6 +Date: 2021-08-13 + Fixes: + - SE: LDS no longer uses steel. +--------------------------------------------------------------------------------------------------- +Version: 0.12.5 +Date: 2021-07-28 + Fixes: + - Fix major recipe bug introduced in 0.12.4 (thanks GeneralTank for report). + - Completed refactor to remove legacy helper functions. +--------------------------------------------------------------------------------------------------- +Version: 0.12.4 +Date: 2021-07-26 + Changes: + - SE: Experimental alloys data recipe + - Minor refactor +--------------------------------------------------------------------------------------------------- +Version: 0.12.3 +Date: 2021-07-12 + Features: + - Setting for fluid amount + - Useful Eqipment compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.12.2 +Date: 2021-07-01 + Features: + - Strange matter compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.12.1 +Date: 2021-06-16 + Localization: + - pl locale, thanks to TheoMarque + - ja locale typo fix thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.12.0 +Date: 2021-06-16 + Features: + - Bypass setting +--------------------------------------------------------------------------------------------------- +Version: 0.11.0 +Date: 2021-06-14 + Features: + - EndgameCombat compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.14 +Date: 2021-05-23 + Features: + - Nuclear furnace compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.13 +Date: 2021-05-21 + Features: + - FastFurnaces compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.12 +Date: 2021-05-18 + Features: + - EVE Weaponry compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.11 +Date: 2021-05-05 + Fixes: + - Fix crash when expected equipment techs are not present. +--------------------------------------------------------------------------------------------------- +Version: 0.10.10 +Date: 2021-05-01 + Fixes: + - Fixed startup error with angels smelting. + - Fixed equipment not using titanium + Features: + - Some basic compatibility with angels smelting (without bobs) + Localization: + - Japanese localization, thanks to user Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.10.9 +Date: 2021-04-30 + Localization: + - German localization, thanks to user yokmp +--------------------------------------------------------------------------------------------------- +Version: 0.10.8 +Date: 2021-04-22 + Fixes: + - Mod setting description was not showing. +--------------------------------------------------------------------------------------------------- +Version: 0.10.7 +Date: 2021-04-13 + Features: + - Modmash splinter gold LDS recipe +--------------------------------------------------------------------------------------------------- +Version: 0.10.6 +Date: 2021-03-18 + Fixes: + - Fix and improve FE+ compatiblity broken in 0.10.3 +--------------------------------------------------------------------------------------------------- +Version: 0.10.5 +Date: 2021-03-18 + Features: + - Omnimatter compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.4 +Date: 2021-03-14 + Fixes: + - Fix py/angel/bob compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.10.3 +Date: 2021-03-14 + Features: + - Supersonic trains recipes + - Modmash refined ore balance + - Minor refactor +--------------------------------------------------------------------------------------------------- +Version: 0.10.2 +Date: 2021-03-10 + Features: + - Map gen presets handling +--------------------------------------------------------------------------------------------------- +Version: 0.10.1 +Date: 2021-03-09 + Features: + - SimpleCompress support +--------------------------------------------------------------------------------------------------- +Version: 0.10.0 +Date: 2021-03-08 + Changes: + - New graphics by snouz (ore, icons, technology) + - New mod icon + - Added mipmaps to icons +--------------------------------------------------------------------------------------------------- +Version: 0.9.17 +Date: 2021-03-06 + Features: + - The Big Furnace recipe +--------------------------------------------------------------------------------------------------- +Version: 0.9.16 +Date: 2021-02-12 + Fixes: + - Another tiny py compatibility tweak. +--------------------------------------------------------------------------------------------------- +Version: 0.9.15 +Date: 2021-01-29 + Fixes: + - K2 stack size fix for no changes +--------------------------------------------------------------------------------------------------- +Version: 0.9.14 +Date: 2021-01-25 + Changes: + - Rich Rocks Requiem for K2 support +--------------------------------------------------------------------------------------------------- +Version: 0.9.13 +Date: 2021-01-24 + Changes: + - Update K2 Matter & Enriched tech icons +--------------------------------------------------------------------------------------------------- +Version: 0.9.12 +Date: 2021-01-19 + Changes: + - SE delivery cannon recipes +--------------------------------------------------------------------------------------------------- +Version: 0.9.11 +Date: 2021-01-18 + Changes: + - SE/K2 - vulcanite smelting icon + - K2 stack sizes +--------------------------------------------------------------------------------------------------- +Version: 0.9.10 +Date: 2021-01-16 + Changes: + - More very minor compatibility tweaks for py + - Remove some logspam +--------------------------------------------------------------------------------------------------- +Version: 0.9.9 +Date: 2021-01-09 + Changes: + - Matter to titanium ore recipe cost + - Very minor compatibility tweaks for py +--------------------------------------------------------------------------------------------------- +Version: 0.9.8 +Date: 2021-01-07 + Fixes: + - Bugfix for space exploration deadlock beltbox edge cases +--------------------------------------------------------------------------------------------------- +Version: 0.9.7 +Date: 2020-12-29 + Fixes: + - Bugfix for py +--------------------------------------------------------------------------------------------------- +Version: 0.9.6 +Date: 2020-12-29 + Changes: + - Compatibility with bobrevamp without bobores +--------------------------------------------------------------------------------------------------- +Version: 0.9.5 +Date: 2020-12-29 + Changes: + - Base "naive" compatibility with AngelBob +--------------------------------------------------------------------------------------------------- +Version: 0.9.4 +Date: 2020-12-29 + Changes: + - Base "naive" compatibility with Pyanodon's Raw Ores (pyrawores) - we just use their plates an remove our ore/plates. +--------------------------------------------------------------------------------------------------- +Version: 0.9.3 +Date: 2020-12-22 + Changes: + - Titanium plates now used in heat exchangers + Localization: + - English localization updates for K2. + - Space Exploration - Titanium now used in more recipes +--------------------------------------------------------------------------------------------------- +Version: 0.9.2 +Date: 2020-12-17 + Localization: + - Russian localization, thanks to thinOptimist (https://mods.factorio.com/user/thinOptimist) +--------------------------------------------------------------------------------------------------- +Version: 0.9.1 +Date: 2020-12-12 + Features: + - New ore icons. +--------------------------------------------------------------------------------------------------- +Version: 0.9.0 +Date: 2020-12-10 + Features: + - Compatible with Modmash + Fixes: + - FE+ compatibility tweak +--------------------------------------------------------------------------------------------------- +Version: 0.8.3 +Date: 2020-12-07 + Features: + - Compatible with 5Dim's +--------------------------------------------------------------------------------------------------- +Version: 0.8.2 +Date: 2020-12-03 + Fixes: + - Allow prod modules in vulcanite block smelting +--------------------------------------------------------------------------------------------------- +Version: 0.8.1 +Date: 2020-12-03 + Features: + - Deadlock stacking for K2 Enriched Titanium (and crating, when crating is compatible with 1.1) +--------------------------------------------------------------------------------------------------- +Version: 0.8.0 +Date: 2020-11-27 + Features: + - Space Exploration Vulcanite + Titanium smelting (with and without Krastorio 2) + - Initial work for 5Dim's mod. (Not available until 5Dim's is updated to 1.1) + Changes: + - Minor capitalization fixes + Fixes: + - Fixed compatibility issue with new space exploration core fragment handling (in 0.5.x) +--------------------------------------------------------------------------------------------------- +Version: 0.7.0 +Date: 2020-11-23 + Changes: + - Support 1.1 +--------------------------------------------------------------------------------------------------- +Version: 0.6.11 +Date: 2020-11-23 + Fixes: + - Smooth a rough edge on new plate graphics + - Stacked plate (deadlock) graphics now match new graphics +--------------------------------------------------------------------------------------------------- +Version: 0.6.10 +Date: 2020-11-22 + Features: + - Rust-free underwater pipe support. + - Hover-Car support + - Extend Hovercrafts support to Hovercrafts_Realism +--------------------------------------------------------------------------------------------------- +Version: 0.6.9 +Date: 2020-11-21 + Fixes: + - K2: Fix advanced steam turbine recipe +--------------------------------------------------------------------------------------------------- +Version: 0.6.8 +Date: 2020-11-16 + Changes: + - K2: Enriched titanium smelting now allows prod modules. +--------------------------------------------------------------------------------------------------- +Version: 0.6.7 +Date: 2020-11-14 + Changes: + - Attempt at a new, hi-def titanium plate (no ore graphics update yet) +--------------------------------------------------------------------------------------------------- +Version: 0.6.6 +Date: 2020-11-09 + Changes: + - K2 deadlock advanced tier loader & stacking beltbox +--------------------------------------------------------------------------------------------------- +Version: 0.6.5 +Date: 2020-11-08 + Features: + - Deadlock stacking & crating recipes +--------------------------------------------------------------------------------------------------- +Version: 0.6.4 +Date: 2020-11-08 + Features: + - Recipe for space loader/beltbox from Deadlock beltbox crate-Space Exploration bridge +--------------------------------------------------------------------------------------------------- +Version: 0.6.3 +Date: 2020-10-29 + Changes: + - Minor tech tweaks +--------------------------------------------------------------------------------------------------- +Version: 0.6.2 +Date: 2020-10-18 + Changes: + - A few more Space Exploration tweaks. +--------------------------------------------------------------------------------------------------- +Version: 0.6.1 +Date: 2020-10-06 + Changes: + - Made Titanium a little less common + - A few Space Exploration changes. +--------------------------------------------------------------------------------------------------- +Version: 0.6.0 +Date: 2020-09-26 + Changes: + - Initial FactorioExtended Plus (FE+) compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.5.5 +Date: 2020-09-26 + Changes: + - Support for jetpacks + - Support for hovercrafts + - Support for better cargo planes + - Support for raven vehicle + - Support for chopper +--------------------------------------------------------------------------------------------------- +Version: 0.5.4 +Date: 2020-09-25 + Changes: + - Krastorio 2 update: Add titanium to a few more recipes. + - Support for HelicopterRevival +--------------------------------------------------------------------------------------------------- +Version: 0.5.3 +Date: 2020-09-20 + Changes: + - Krastorio 2 compatibility: matter conversion for titanium + Settings: + - Allow some choice of mining fluid. +--------------------------------------------------------------------------------------------------- +Version: 0.5.2 +Date: 2020-09-20 + Features: + - Use in memory storage units, because why not. +--------------------------------------------------------------------------------------------------- +Version: 0.5.1 +Date: 2020-09-19 + Changes: + - Krastorio 2 compatibility: dirty water filtration for titanium. +--------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2020-09-15 + Features: + - Support Aircraft mod. +--------------------------------------------------------------------------------------------------- +Version: 0.4.1 +Date: 2020-09-14 + Changes: + - Some more flavorful recipe changes for Krastorio 2. +--------------------------------------------------------------------------------------------------- +Version: 0.4.0 +Date: 2020-09-13 + Features: + - Support for Krastorio 2, including enriched titanium. +--------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2020-08-30 + Changes: + - Support alternate LDS in Space Exploration. +--------------------------------------------------------------------------------------------------- +Version: 0.2.0 +Date: 2020-08-09 + Changes: + - Compatible with Factorio 1.0 +--------------------------------------------------------------------------------------------------- +Version: 0.1.1 +Date: 2019-07-31 + Changes: + - Updated science requirements for factorio 0.17.60 update. +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 2019-07-22 + Features: + - Initial version. + - No mod compatibility guarantees. + - Some Space Exploration compatibility. diff --git a/bztitanium2/compatibility/248k-final.lua b/compatibility/248k-final.lua similarity index 95% rename from bztitanium2/compatibility/248k-final.lua rename to compatibility/248k-final.lua index a4ecfda..59e39a9 100644 --- a/bztitanium2/compatibility/248k-final.lua +++ b/compatibility/248k-final.lua @@ -1,6 +1,6 @@ local util = require("data-util"); -if mods["248k-Redux"] then +if mods["248k"] then local ti2 = "fi_materials_titan" -- Swap out all 248k titanium for BZ titanium_plate diff --git a/bztitanium2/compatibility/248k.lua b/compatibility/248k.lua similarity index 100% rename from bztitanium2/compatibility/248k.lua rename to compatibility/248k.lua diff --git a/compatibility/data/hot-metals.lua b/compatibility/data/hot-metals.lua new file mode 100644 index 0000000..0fbf36a --- /dev/null +++ b/compatibility/data/hot-metals.lua @@ -0,0 +1,7 @@ +local util = require("data-util") +util.add_hot_metals({ + {name="titanium-plate", icons={ + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, tint={.9,.3,0, .5}}, + }}, +}) diff --git a/bztitanium2/compatibility/titanium-auto-train-depot-final.lua b/compatibility/titanium-auto-train-depot-final.lua similarity index 100% rename from bztitanium2/compatibility/titanium-auto-train-depot-final.lua rename to compatibility/titanium-auto-train-depot-final.lua diff --git a/bztitanium2/compatibility/titanium-endgame-combat-data.lua b/compatibility/titanium-endgame-combat-data.lua similarity index 85% rename from bztitanium2/compatibility/titanium-endgame-combat-data.lua rename to compatibility/titanium-endgame-combat-data.lua index 380dd5e..5790510 100644 --- a/bztitanium2/compatibility/titanium-endgame-combat-data.lua +++ b/compatibility/titanium-endgame-combat-data.lua @@ -2,7 +2,7 @@ if mods["EndgameCombat"] and not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] then local dummy_items = {"cobalt-steel", "nickel", "aluminium"} -if not mods.bztungsten2 then +if not mods.bztungsten then table.insert(dummy_items, "tungsten") end for i, dummy in pairs(dummy_items) do @@ -10,7 +10,7 @@ for i, dummy in pairs(dummy_items) do data:extend({{ type = "item", name = dummy, - icon = "__bztitanium2__/graphics/icons/titanium-plate.png", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "zzzz-dummy", @@ -25,7 +25,7 @@ for i, dummy in pairs(dummy_techs) do type = "technology", name = dummy, icon_size = 256, icon_mipmaps = 4, - icon = "__bztitanium2__/graphics/technology/titanium-processing.png", + icon = "__bztitanium__/graphics/technology/titanium-processing.png", effects = nil, unit = { diff --git a/bztitanium2/compatibility/titanium-endgame-combat-final.lua b/compatibility/titanium-endgame-combat-final.lua similarity index 94% rename from bztitanium2/compatibility/titanium-endgame-combat-final.lua rename to compatibility/titanium-endgame-combat-final.lua index 316b2a9..d1de5ae 100644 --- a/bztitanium2/compatibility/titanium-endgame-combat-final.lua +++ b/compatibility/titanium-endgame-combat-final.lua @@ -5,7 +5,7 @@ if mods.EndgameCombat and not mods["pyrawores"] and not mods["bobplates"] and no local util = require("data-util"); local dummy_items = {"cobalt-steel", "nickel", "aluminium"} -if not mods.bztungsten2 then +if not mods.bztungsten then table.insert(dummy_items, "tungsten") end for i, dummy in pairs(dummy_items) do @@ -13,7 +13,7 @@ for i, dummy in pairs(dummy_items) do end local dummy_techs = {"cobalt-processing", "nickel-processing", "aluminium-processing"} -if not mods.bztungsten2 then +if not mods.bztungsten then table.insert(dummy_techs, "tungsten-processing") end for i, dummy in pairs(dummy_techs) do @@ -32,7 +32,7 @@ util.remove_prerequisite("acid-turrets", "aluminium-processing") util.remove_ingredient("power-armor-mk3", "copper-tungsten-alloy") util.remove_prerequisite("power-armor-mk3", "nitinol-processing") -if not mods.bztungsten2 then +if not mods.bztungsten then util.remove_prerequisite("power-armor-mk3", "tungsten-processing") util.remove_ingredient("lightning-turret", "tungsten") diff --git a/bztitanium2/control-util.lua b/control-util.lua similarity index 100% rename from bztitanium2/control-util.lua rename to control-util.lua diff --git a/bztitanium2/control.lua b/control.lua similarity index 100% rename from bztitanium2/control.lua rename to control.lua diff --git a/bztitanium2/data-final-fixes.lua b/data-final-fixes.lua similarity index 94% rename from bztitanium2/data-final-fixes.lua rename to data-final-fixes.lua index 55314ab..e481f19 100644 --- a/bztitanium2/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -25,7 +25,7 @@ require("compatibility/titanium-endgame-combat-final") require("compatibility/titanium-auto-train-depot-final") -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); -- this is introduced in casting mod data final fixes util.replace_some_ingredient("adamo-casting-space-platform-foundation", "molten-iron", 450, util.me.titanium_plate, 15) diff --git a/bztitanium2/data-updates.lua b/data-updates.lua similarity index 100% rename from bztitanium2/data-updates.lua rename to data-updates.lua diff --git a/bztitanium2/data-util.lua b/data-util.lua similarity index 99% rename from bztitanium2/data-util.lua rename to data-util.lua index 9ddd0f3..e30ba66 100644 --- a/bztitanium2/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/bztitanium2/data.lua b/data.lua similarity index 100% rename from bztitanium2/data.lua rename to data.lua diff --git a/bztitanium2/graphics/entity/ores/hr-titanium-ore.png b/graphics/entity/ores/hr-titanium-ore.png similarity index 100% rename from bztitanium2/graphics/entity/ores/hr-titanium-ore.png rename to graphics/entity/ores/hr-titanium-ore.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png diff --git a/bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png b/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png similarity index 100% rename from bztitanium2/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png rename to graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png diff --git a/bztitanium2/graphics/icons/enriched-titanium-2.png b/graphics/icons/enriched-titanium-2.png similarity index 100% rename from bztitanium2/graphics/icons/enriched-titanium-2.png rename to graphics/icons/enriched-titanium-2.png diff --git a/bztitanium2/graphics/icons/enriched-titanium-3.png b/graphics/icons/enriched-titanium-3.png similarity index 100% rename from bztitanium2/graphics/icons/enriched-titanium-3.png rename to graphics/icons/enriched-titanium-3.png diff --git a/bztitanium2/graphics/icons/enriched-titanium-4.png b/graphics/icons/enriched-titanium-4.png similarity index 100% rename from bztitanium2/graphics/icons/enriched-titanium-4.png rename to graphics/icons/enriched-titanium-4.png diff --git a/bztitanium2/graphics/icons/enriched-titanium.png b/graphics/icons/enriched-titanium.png similarity index 100% rename from bztitanium2/graphics/icons/enriched-titanium.png rename to graphics/icons/enriched-titanium.png diff --git a/bztitanium2/graphics/icons/molten-titanium.png b/graphics/icons/molten-titanium.png similarity index 100% rename from bztitanium2/graphics/icons/molten-titanium.png rename to graphics/icons/molten-titanium.png diff --git a/sources/graphics/icons/molten-titanium.xcf b/graphics/icons/molten-titanium.xcf similarity index 100% rename from sources/graphics/icons/molten-titanium.xcf rename to graphics/icons/molten-titanium.xcf diff --git a/bztitanium2/graphics/icons/stacked/enriched-titanium-stacked.png b/graphics/icons/stacked/enriched-titanium-stacked.png similarity index 100% rename from bztitanium2/graphics/icons/stacked/enriched-titanium-stacked.png rename to graphics/icons/stacked/enriched-titanium-stacked.png diff --git a/bztitanium2/graphics/icons/stacked/titanium-ore-stacked.png b/graphics/icons/stacked/titanium-ore-stacked.png similarity index 100% rename from bztitanium2/graphics/icons/stacked/titanium-ore-stacked.png rename to graphics/icons/stacked/titanium-ore-stacked.png diff --git a/bztitanium2/graphics/icons/stacked/titanium-plate-stacked.png b/graphics/icons/stacked/titanium-plate-stacked.png similarity index 100% rename from bztitanium2/graphics/icons/stacked/titanium-plate-stacked.png rename to graphics/icons/stacked/titanium-plate-stacked.png diff --git a/bztitanium2/graphics/icons/titanium-ingot.png b/graphics/icons/titanium-ingot.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-ingot.png rename to graphics/icons/titanium-ingot.png diff --git a/sources/graphics/icons/titanium-ingot.xcf b/graphics/icons/titanium-ingot.xcf similarity index 100% rename from sources/graphics/icons/titanium-ingot.xcf rename to graphics/icons/titanium-ingot.xcf diff --git a/bztitanium2/graphics/icons/titanium-ore-2.png b/graphics/icons/titanium-ore-2.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-ore-2.png rename to graphics/icons/titanium-ore-2.png diff --git a/bztitanium2/graphics/icons/titanium-ore-3.png b/graphics/icons/titanium-ore-3.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-ore-3.png rename to graphics/icons/titanium-ore-3.png diff --git a/bztitanium2/graphics/icons/titanium-ore-4.png b/graphics/icons/titanium-ore-4.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-ore-4.png rename to graphics/icons/titanium-ore-4.png diff --git a/bztitanium2/graphics/icons/titanium-ore.png b/graphics/icons/titanium-ore.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-ore.png rename to graphics/icons/titanium-ore.png diff --git a/bztitanium2/graphics/icons/titanium-plate.png b/graphics/icons/titanium-plate.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-plate.png rename to graphics/icons/titanium-plate.png diff --git a/bztitanium2/graphics/icons/titanium-powder.png b/graphics/icons/titanium-powder.png similarity index 100% rename from bztitanium2/graphics/icons/titanium-powder.png rename to graphics/icons/titanium-powder.png diff --git a/sources/graphics/old-files/enriched-titanium-stacked.xcf b/graphics/old-files/enriched-titanium-stacked.xcf similarity index 100% rename from sources/graphics/old-files/enriched-titanium-stacked.xcf rename to graphics/old-files/enriched-titanium-stacked.xcf diff --git a/sources/graphics/old-files/enriched-titanium.xcf b/graphics/old-files/enriched-titanium.xcf similarity index 100% rename from sources/graphics/old-files/enriched-titanium.xcf rename to graphics/old-files/enriched-titanium.xcf diff --git a/graphics/old-files/hr-titanium-ore.png b/graphics/old-files/hr-titanium-ore.png new file mode 100644 index 0000000..40d4bc7 Binary files /dev/null and b/graphics/old-files/hr-titanium-ore.png differ diff --git a/sources/graphics/old-files/hr-titanium-ore.xcf b/graphics/old-files/hr-titanium-ore.xcf similarity index 100% rename from sources/graphics/old-files/hr-titanium-ore.xcf rename to graphics/old-files/hr-titanium-ore.xcf diff --git a/sources/graphics/old-files/titanium-ore (2).xcf b/graphics/old-files/titanium-ore (2).xcf similarity index 100% rename from sources/graphics/old-files/titanium-ore (2).xcf rename to graphics/old-files/titanium-ore (2).xcf diff --git a/graphics/old-files/titanium-ore - Copy.png b/graphics/old-files/titanium-ore - Copy.png new file mode 100644 index 0000000..40d4bc7 Binary files /dev/null and b/graphics/old-files/titanium-ore - Copy.png differ diff --git a/graphics/old-files/titanium-ore-n.png b/graphics/old-files/titanium-ore-n.png new file mode 100644 index 0000000..5ea2221 Binary files /dev/null and b/graphics/old-files/titanium-ore-n.png differ diff --git a/sources/graphics/old-files/titanium-ore-stacked.xcf b/graphics/old-files/titanium-ore-stacked.xcf similarity index 100% rename from sources/graphics/old-files/titanium-ore-stacked.xcf rename to graphics/old-files/titanium-ore-stacked.xcf diff --git a/sources/graphics/old-files/titanium-ore.xcf b/graphics/old-files/titanium-ore.xcf similarity index 100% rename from sources/graphics/old-files/titanium-ore.xcf rename to graphics/old-files/titanium-ore.xcf diff --git a/sources/graphics/old-files/titanium-plate-3.xcf b/graphics/old-files/titanium-plate-3.xcf similarity index 100% rename from sources/graphics/old-files/titanium-plate-3.xcf rename to graphics/old-files/titanium-plate-3.xcf diff --git a/graphics/old-files/titanium-plate-old.png b/graphics/old-files/titanium-plate-old.png new file mode 100644 index 0000000..aba7eea Binary files /dev/null and b/graphics/old-files/titanium-plate-old.png differ diff --git a/sources/graphics/old-files/titanium-plate-stacked.xcf b/graphics/old-files/titanium-plate-stacked.xcf similarity index 100% rename from sources/graphics/old-files/titanium-plate-stacked.xcf rename to graphics/old-files/titanium-plate-stacked.xcf diff --git a/sources/graphics/old-files/titanium-plate.xcf b/graphics/old-files/titanium-plate.xcf similarity index 100% rename from sources/graphics/old-files/titanium-plate.xcf rename to graphics/old-files/titanium-plate.xcf diff --git a/sources/graphics/old-files/titanium-powder.xcf b/graphics/old-files/titanium-powder.xcf similarity index 100% rename from sources/graphics/old-files/titanium-powder.xcf rename to graphics/old-files/titanium-powder.xcf diff --git a/sources/graphics/old-files/titanium-processing (2).xcf b/graphics/old-files/titanium-processing (2).xcf similarity index 100% rename from sources/graphics/old-files/titanium-processing (2).xcf rename to graphics/old-files/titanium-processing (2).xcf diff --git a/sources/graphics/old-files/titanium-processing.xcf b/graphics/old-files/titanium-processing.xcf similarity index 100% rename from sources/graphics/old-files/titanium-processing.xcf rename to graphics/old-files/titanium-processing.xcf diff --git a/sources/graphics/old-files/titanium-thumbnail.xcf b/graphics/old-files/titanium-thumbnail.xcf similarity index 100% rename from sources/graphics/old-files/titanium-thumbnail.xcf rename to graphics/old-files/titanium-thumbnail.xcf diff --git a/bztitanium2/graphics/technology/fluid-mining.png b/graphics/technology/fluid-mining.png similarity index 100% rename from bztitanium2/graphics/technology/fluid-mining.png rename to graphics/technology/fluid-mining.png diff --git a/bztitanium2/graphics/technology/titanium-processing.png b/graphics/technology/titanium-processing.png similarity index 100% rename from bztitanium2/graphics/technology/titanium-processing.png rename to graphics/technology/titanium-processing.png diff --git a/info.json b/info.json new file mode 100644 index 0000000..017e81a --- /dev/null +++ b/info.json @@ -0,0 +1,34 @@ +{ + "name": "bztitanium", + "version": "2.0.26", + "factorio_version": "2.0", + "title": "Titanium", + "author": "Brevven", + "contact": "", + "homepage": "", + "dependencies": [ + "base >= 1.0.0", + "? aai-industry", + "? space-exploration", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? Rich-Rocks-Requiem", + "? FactorioExtended-Plus-Core", + "? Pre0-17-60Oil", + "? Deadlock-SE-bridge", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating", + "? modmashsplinterresources", + "? EndgameCombat", + "(?) Power Armor MK3", + "? 248k-Redux", + "? tenebris", + "? Cerys-Moon-of-Fulgora", + "(?) atan-nuclear-science", + "(?) casting", + "? hot-metals", + "! nullius" + ], + "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.\n\nCompatible with Space Age.\n\nA standalone piece of BZ Mods, with graphics by snouz." +} + diff --git a/bztitanium2/locale/de/titanium.cfg b/locale/de/titanium.cfg similarity index 100% rename from bztitanium2/locale/de/titanium.cfg rename to locale/de/titanium.cfg diff --git a/bztitanium2/locale/en/titanium.cfg b/locale/en/titanium.cfg similarity index 100% rename from bztitanium2/locale/en/titanium.cfg rename to locale/en/titanium.cfg diff --git a/bztitanium2/locale/ja/titanium.cfg b/locale/ja/titanium.cfg similarity index 100% rename from bztitanium2/locale/ja/titanium.cfg rename to locale/ja/titanium.cfg diff --git a/bztitanium2/locale/ko/titanium.cfg b/locale/ko/titanium.cfg similarity index 100% rename from bztitanium2/locale/ko/titanium.cfg rename to locale/ko/titanium.cfg diff --git a/bztitanium2/locale/pl/titanium.cfg b/locale/pl/titanium.cfg similarity index 100% rename from bztitanium2/locale/pl/titanium.cfg rename to locale/pl/titanium.cfg diff --git a/bztitanium2/locale/ru/titanium.cfg b/locale/ru/titanium.cfg similarity index 100% rename from bztitanium2/locale/ru/titanium.cfg rename to locale/ru/titanium.cfg diff --git a/bztitanium2/locale/zh-CN/titanium.cfg b/locale/zh-CN/titanium.cfg similarity index 100% rename from bztitanium2/locale/zh-CN/titanium.cfg rename to locale/zh-CN/titanium.cfg diff --git a/bztitanium2/map-gen-preset-updates.lua b/map-gen-preset-updates.lua similarity index 100% rename from bztitanium2/map-gen-preset-updates.lua rename to map-gen-preset-updates.lua diff --git a/bztitanium2/me.lua b/me.lua similarity index 98% rename from bztitanium2/me.lua rename to me.lua index 740e58f..e3436b4 100644 --- a/bztitanium2/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bztitanium2" +me.name = "bztitanium" me.resources = {{"titanium-ore", "nauvis"}} me.fluid_mining = true me.titanium_plate = "" diff --git a/migrations/bztitanium.1.1.0.json b/migrations/bztitanium.1.1.0.json new file mode 100644 index 0000000..684ed29 --- /dev/null +++ b/migrations/bztitanium.1.1.0.json @@ -0,0 +1,7 @@ +{ + "item": + [ + ["fi_materials_titan", "titanium-plate"] + ] +} + diff --git a/bztitanium2/omni.lua b/omni.lua similarity index 100% rename from bztitanium2/omni.lua rename to omni.lua diff --git a/bztitanium2/settings-util.lua b/settings-util.lua similarity index 100% rename from bztitanium2/settings-util.lua rename to settings-util.lua diff --git a/bztitanium2/settings.lua b/settings.lua similarity index 100% rename from bztitanium2/settings.lua rename to settings.lua diff --git a/bztitanium2/strange-matter.lua b/strange-matter.lua similarity index 90% rename from bztitanium2/strange-matter.lua rename to strange-matter.lua index 2601443..6a4ca64 100644 --- a/bztitanium2/strange-matter.lua +++ b/strange-matter.lua @@ -1,8 +1,8 @@ -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); local ore = "titanium-ore" -local ore_icon = "__bztitanium2__/graphics/icons/titanium-ore.png" +local ore_icon = "__bztitanium__/graphics/icons/titanium-ore.png" if mods["StrangeMatter"] then data:extend({ diff --git a/bztitanium2/thumbnail.png b/thumbnail.png similarity index 100% rename from bztitanium2/thumbnail.png rename to thumbnail.png diff --git a/bztitanium2/titanium-compressed.lua b/titanium-compressed.lua similarity index 100% rename from bztitanium2/titanium-compressed.lua rename to titanium-compressed.lua diff --git a/bztitanium2/titanium-data-settings.lua b/titanium-data-settings.lua similarity index 76% rename from bztitanium2/titanium-data-settings.lua rename to titanium-data-settings.lua index c0fac63..a0a8714 100644 --- a/bztitanium2/titanium-data-settings.lua +++ b/titanium-data-settings.lua @@ -1,14 +1,14 @@ -- Settings, etc. -- -- Finalize tech tree based on settings and other dependent mods. -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); local mining_fluid if settings.startup["bztitanium-mining-fluid"] then mining_fluid = settings.startup["bztitanium-mining-fluid"].value end -if mining_fluid == "kr-chlorine" and data.raw.fluid["kr-chlorine"] and util.k2() then +if mining_fluid == "chlorine" and data.raw.fluid["chlorine"] and util.k2() then data.raw.technology[util.me.titanium_processing].prerequisites = {"kr-fluids-chemistry"} data.raw.technology[util.me.titanium_processing].unit.ingredients = util.ALC else diff --git a/bztitanium2/titanium-enriched.lua b/titanium-enriched.lua similarity index 82% rename from bztitanium2/titanium-enriched.lua rename to titanium-enriched.lua index 348bb75..12d985d 100644 --- a/bztitanium2/titanium-enriched.lua +++ b/titanium-enriched.lua @@ -1,5 +1,5 @@ -- Enriched Titanium for Krastorio2 -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if util.k2() then data:extend( @@ -8,12 +8,12 @@ data:extend( type = "item", name = "enriched-titanium", icon_size = 64, icon_mipmaps = 3, - icon = "__bztitanium2__/graphics/icons/enriched-titanium.png", + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", pictures = { - {filename="__bztitanium2__/graphics/icons/enriched-titanium.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/enriched-titanium-2.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/enriched-titanium-3.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/enriched-titanium-4.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/enriched-titanium.png", size=64, scale=0.25}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-2.png", size=64, scale=0.25}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-3.png", size=64, scale=0.25}, + {filename="__bztitanium__/graphics/icons/enriched-titanium-4.png", size=64, scale=0.25}, }, subgroup = "raw-material", order = "e05-a[enriched-ores]-a1[enriched-titanium]", @@ -23,7 +23,7 @@ data:extend( type = "recipe", name = "enriched-titanium", main_product = "enriched-titanium", - icon = "__bztitanium2__/graphics/icons/enriched-titanium.png", + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, icon_mipmaps = 3, category = "chemistry", energy_required = 3, @@ -57,8 +57,8 @@ data:extend( name = "enriched-titanium-plate", icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, }, - { icon = "__bztitanium2__/graphics/icons/enriched-titanium.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, }, + { icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, }, category = "smelting", energy_required = 16, @@ -84,7 +84,7 @@ data:extend( tint = { a=1.0, b=0.75, r=0.75, g=0.75 } }, { - icon = "__bztitanium2__/graphics/icons/enriched-titanium.png", + icon = "__bztitanium__/graphics/icons/enriched-titanium.png", icon_size = 64, icon_mipmaps = 3, scale = 2, shift = {48, 48} diff --git a/bztitanium2/titanium-matter.lua b/titanium-matter.lua similarity index 91% rename from bztitanium2/titanium-matter.lua rename to titanium-matter.lua index 92d8d1c..9ffe34b 100644 --- a/bztitanium2/titanium-matter.lua +++ b/titanium-matter.lua @@ -1,5 +1,5 @@ -- Matter recipes for Krastorio2 -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if util.k2() then data:extend( @@ -14,7 +14,7 @@ data:extend( icon_size = 256, }, { - icon = "__bztitanium2__/graphics/icons/titanium-ore.png", + icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale = 1.5, } diff --git a/bztitanium2/titanium-ore-particle.lua b/titanium-ore-particle.lua similarity index 60% rename from bztitanium2/titanium-ore-particle.lua rename to titanium-ore-particle.lua index a5efcfe..feef5f6 100644 --- a/bztitanium2/titanium-ore-particle.lua +++ b/titanium-ore-particle.lua @@ -8,7 +8,7 @@ data:extend( pictures = { { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-1.png", priority = "extra-high", width = 32, height = 32, @@ -16,7 +16,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-2.png", priority = "extra-high", width = 32, height = 32, @@ -24,7 +24,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-3.png", priority = "extra-high", width = 32, height = 32, @@ -32,7 +32,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-4.png", priority = "extra-high", width = 32, height = 32, @@ -43,7 +43,7 @@ data:extend( shadows = { { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-1.png", priority = "extra-high", width = 32, height = 32, @@ -51,7 +51,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-2.png", priority = "extra-high", width = 32, height = 32, @@ -59,7 +59,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-3.png", priority = "extra-high", width = 32, height = 32, @@ -67,7 +67,7 @@ data:extend( scale = 0.5 }, { - filename = "__bztitanium2__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png", + filename = "__bztitanium__/graphics/entity/titanium-ore-particle/hr-titanium-ore-particle-shadow-4.png", priority = "extra-high", width = 32, height = 32, diff --git a/bztitanium2/titanium-ore.lua b/titanium-ore.lua similarity index 79% rename from bztitanium2/titanium-ore.lua rename to titanium-ore.lua index 1233776..10a12d5 100644 --- a/bztitanium2/titanium-ore.lua +++ b/titanium-ore.lua @@ -1,5 +1,5 @@ local resource_autoplace = require('resource-autoplace'); -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); local item_sounds = require('__base__.prototypes.item_sounds') if mods["FactorioExtended-Plus-Core"] then @@ -30,7 +30,7 @@ data:extend({ type = "resource", icon_size = 64, icon_mipmaps = 3, name = "titanium-ore", - icon = "__bztitanium2__/graphics/icons/titanium-ore.png", + icon = "__bztitanium__/graphics/icons/titanium-ore.png", flags = {"placeable-neutral"}, order="a-b-a", map_color = {r=0.65, g=0.80, b=0.80}, @@ -59,7 +59,7 @@ data:extend({ { sheet = { - filename = "__bztitanium2__/graphics/entity/ores/hr-titanium-ore.png", + filename = "__bztitanium__/graphics/entity/ores/hr-titanium-ore.png", priority = "extra-high", size = 128, frame_count = 8, @@ -72,15 +72,15 @@ data:extend({ type = "item", name = "titanium-ore", icon_size = 64, icon_mipmaps = 3, - icon = "__bztitanium2__/graphics/icons/titanium-ore.png", + icon = "__bztitanium__/graphics/icons/titanium-ore.png", inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, drop_sound = item_sounds.resource_inventory_move, pictures = { - {filename="__bztitanium2__/graphics/icons/titanium-ore.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/titanium-ore-2.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/titanium-ore-3.png", size=64, scale=0.5}, - {filename="__bztitanium2__/graphics/icons/titanium-ore-4.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/titanium-ore.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/titanium-ore-2.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/titanium-ore-3.png", size=64, scale=0.5}, + {filename="__bztitanium__/graphics/icons/titanium-ore-4.png", size=64, scale=0.5}, }, subgroup = "raw-resource", order = "t-c-a", diff --git a/bztitanium2/titanium-recipe-final-5d.lua b/titanium-recipe-final-5d.lua similarity index 92% rename from bztitanium2/titanium-recipe-final-5d.lua rename to titanium-recipe-final-5d.lua index 0cac02e..75cba58 100644 --- a/bztitanium2/titanium-recipe-final-5d.lua +++ b/titanium-recipe-final-5d.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if mods["5dim_core"] then @@ -16,7 +16,7 @@ if mods["5dim_core"] then category = "industrial-furnace", subgroup = "plates-industrial-ore", order = "ad[titanium-plate]", - icon = "__bztitanium2__/graphics/icons/titanium-plate.png", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = false, energy_required = 140, @@ -38,14 +38,14 @@ if mods["5dim_core"] then name = "titanium-dust", subgroup = "plates-dust", order = "d[titanium-plate]", - icon = "__bztitanium2__/graphics/icons/titanium-powder.png", + icon = "__bztitanium__/graphics/icons/titanium-powder.png", icon_size = 64, icon_mipmaps = 3, stack_size = 200 }, { type = "recipe", name = "titanium-plate-dust", - icon = "__bztitanium2__/graphics/icons/titanium-plate.png", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "plates-plates2", order = "d[titanium-plate]", @@ -78,7 +78,7 @@ if mods["5dim_core"] then category = "industrial-furnace", subgroup = "plates-industrial-dust", order = "ad[titanium-plate]", - icon = "__bztitanium2__/graphics/icons/titanium-plate.png", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, enabled = false, energy_required = 140, diff --git a/bztitanium2/titanium-recipe-final-k2.lua b/titanium-recipe-final-k2.lua similarity index 96% rename from bztitanium2/titanium-recipe-final-k2.lua rename to titanium-recipe-final-k2.lua index aa8ba15..5bc4c37 100644 --- a/bztitanium2/titanium-recipe-final-k2.lua +++ b/titanium-recipe-final-k2.lua @@ -1,7 +1,7 @@ -- Final Krastorio 2 changes -- There are other K2 changes throughout -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if util.k2() then -- Titanium modifies flying robot frames, so use them in a reasonable tech card in Krastorio 2 util.multiply_recipe("kr-advanced-tech-card", 2) diff --git a/bztitanium2/titanium-recipe-final-modmash.lua b/titanium-recipe-final-modmash.lua similarity index 85% rename from bztitanium2/titanium-recipe-final-modmash.lua rename to titanium-recipe-final-modmash.lua index c44f9c5..c653a2b 100644 --- a/bztitanium2/titanium-recipe-final-modmash.lua +++ b/titanium-recipe-final-modmash.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if mods["modmashsplinter"] then if mods["modmashsplinterresources"] then @@ -6,13 +6,13 @@ if mods["modmashsplinter"] then data.raw.recipe["alien-enrichment-process-to-titanium-ore"].icons = { { icon = "__modmashsplinterresources__/graphics/icons/alien-ooze.png", icon_size = 64}, - { icon = "__bztitanium2__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, } if mods["modmashsplinterenrichment"] then data.raw.recipe["ore-enrichment-process-titanium-ore"].icons = { { icon = "__base__/graphics/icons/fluid/steam.png", icon_size = 64}, - { icon = "__bztitanium2__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, 8}}, } end end diff --git a/bztitanium2/titanium-recipe-final-rrr.lua b/titanium-recipe-final-rrr.lua similarity index 100% rename from bztitanium2/titanium-recipe-final-rrr.lua rename to titanium-recipe-final-rrr.lua diff --git a/bztitanium2/titanium-recipe-final-se.lua b/titanium-recipe-final-se.lua similarity index 93% rename from bztitanium2/titanium-recipe-final-se.lua rename to titanium-recipe-final-se.lua index 1a9477c..1624803 100644 --- a/bztitanium2/titanium-recipe-final-se.lua +++ b/titanium-recipe-final-se.lua @@ -1,5 +1,5 @@ -- Additions for Space Exploration mod. -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if data.raw.recipe["se-space-pipe"] then diff --git a/bztitanium2/titanium-recipe-final-stacking.lua b/titanium-recipe-final-stacking.lua similarity index 58% rename from bztitanium2/titanium-recipe-final-stacking.lua rename to titanium-recipe-final-stacking.lua index 31b6721..e36b3f8 100644 --- a/bztitanium2/titanium-recipe-final-stacking.lua +++ b/titanium-recipe-final-stacking.lua @@ -1,12 +1,12 @@ -- Deadlock stacking recipes -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); if deadlock and deadlock["add_stack"] then - deadlock.add_stack("titanium-ore", "__bztitanium2__/graphics/icons/stacked/titanium-ore-stacked.png", "deadlock-stacking-2", 64) - deadlock.add_stack(util.me.titanium_plate, "__bztitanium2__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("titanium-ore", "__bztitanium__/graphics/icons/stacked/titanium-ore-stacked.png", "deadlock-stacking-2", 64) + deadlock.add_stack(util.me.titanium_plate, "__bztitanium__/graphics/icons/stacked/titanium-plate-stacked.png" , "deadlock-stacking-2", 64) if util.k2() then - deadlock.add_stack("enriched-titanium", "__bztitanium2__/graphics/icons/stacked/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64) + deadlock.add_stack("enriched-titanium", "__bztitanium__/graphics/icons/stacked/enriched-titanium-stacked.png" , "deadlock-stacking-2", 64) end if data.raw.item["titanium-ingot"] then deadlock.add_stack("titanium-ingot", nil, "deadlock-stacking-2", nil) diff --git a/bztitanium2/titanium-recipe-se.lua b/titanium-recipe-se.lua similarity index 85% rename from bztitanium2/titanium-recipe-se.lua rename to titanium-recipe-se.lua index 04ca3cc..81a61fa 100644 --- a/bztitanium2/titanium-recipe-se.lua +++ b/titanium-recipe-se.lua @@ -21,7 +21,7 @@ if util.se6() then { type = "item", name = "titanium-ingot", - icons = {{icon = "__bztitanium2__/graphics/icons/titanium-ingot.png", icon_size = 128}}, + icons = {{icon = "__bztitanium__/graphics/icons/titanium-ingot.png", icon_size = 128}}, order = "b-b", stack_size = 50, subgroup = "titanium", @@ -33,7 +33,7 @@ if util.se6() then max_temperature = 1668, base_color = {r=191, g=219, b=233}, flow_color = {r=191, g=219, b=233}, - icons = {{icon = "__bztitanium2__/graphics/icons/molten-titanium.png", icon_size = 128}}, + icons = {{icon = "__bztitanium__/graphics/icons/molten-titanium.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 util.se6() then name = "titanium-ingot-to-plate", icons = { - {icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3}, - {icon = "__bztitanium2__/graphics/icons/titanium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, + {icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3}, + {icon = "__bztitanium__/graphics/icons/titanium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}}, }, results = { {type="item", name = "titanium-plate", amount = 10}, @@ -121,15 +121,15 @@ else always_show_made_in = true, allow_as_intermediate = false, ingredients = { - { type = "item", name = "enriched-titanium", amount = 8}, - { type = "item", name = "se-vulcanite-block", amount = 1}, + {name = "enriched-titanium", amount = 8}, + {name = "se-vulcanite-block", amount = 1}, }, results = { {name = util.me.titanium_plate, amount = 6}, }, icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3 }, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3 }, { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, }, }, @@ -151,15 +151,15 @@ else always_show_made_in = true, allow_as_intermediate = false, ingredients = { - { type = "item", name = "titanium-ore", amount = 20}, - { type = "item", name = "se-vulcanite-block", amount = 1}, + {name = "titanium-ore", amount = 20}, + {name = "se-vulcanite-block", amount = 1}, }, results = { {name = util.me.titanium_plate, amount = 6}, }, icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, }, }, diff --git a/bztitanium2/titanium-recipe-updates-transport.lua b/titanium-recipe-updates-transport.lua similarity index 95% rename from bztitanium2/titanium-recipe-updates-transport.lua rename to titanium-recipe-updates-transport.lua index f7f7b2a..2c56a2a 100644 --- a/bztitanium2/titanium-recipe-updates-transport.lua +++ b/titanium-recipe-updates-transport.lua @@ -1,4 +1,4 @@ -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); -- Various vehicle/transport mod changes if mods["Aircraft"] then @@ -55,10 +55,10 @@ end -- Just a general compatiblity improvement with py alien life enabled alongside jetpack or other equipment mods if mods["pyalienlife"] then - util.remove_prerequisite("modular-armor", "advanced-circuit") + util.remove_prerequisite("modular-armor", "advanced-electronics") end -if not mods.bzaluminum2 then +if not mods.bzaluminum then -- se space trains util.add_ingredient("recipe-space-locomotive", util.me.titanium_plate, 10) util.add_ingredient("recipe-space-fluid-wagon", util.me.titanium_plate, 10) diff --git a/bztitanium2/titanium-recipe-updates.lua b/titanium-recipe-updates.lua similarity index 94% rename from bztitanium2/titanium-recipe-updates.lua rename to titanium-recipe-updates.lua index 6c45524..c6a3df6 100644 --- a/bztitanium2/titanium-recipe-updates.lua +++ b/titanium-recipe-updates.lua @@ -1,6 +1,6 @@ -- Titanium recipe & tech changes -- -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); util.add_fluid_mining() -- Space Age @@ -8,7 +8,7 @@ if mods["space-age"] then util.replace_some_ingredient("space-platform-foundation", "steel-plate", 15, util.me.titanium_plate, 15) util.replace_ingredient("electromagnetic-plant", "steel-plate", util.me.titanium_plate) util.add_ingredient("superconductor", util.me.titanium_plate, 1) - util.add_product("scrap-recycling", {type="item", name=util.me.titanium_plate, amount=1, probability=mods["bztin2"] and 0.01 or 0.02}) + util.add_product("scrap-recycling", {type="item", name=util.me.titanium_plate, amount=1, probability=mods.bztin and 0.01 or 0.02}) util.replace_ingredient("capture-bot-rocket", "steel-plate", "titanium-plate") util.add_unlock("foundry", "titanium-sublimation") @@ -178,7 +178,7 @@ util.add_ingredient("BetterBelts_ultra-underground-belt-v1", util.me.titanium_pl util.add_ingredient("ultra-fast-belt", util.me.titanium_plate, 5) util.add_ingredient("ultra-fast-underground-belt", util.me.titanium_plate, 20) util.add_ingredient("ultra-fast-belt-loader", util.me.titanium_plate, 10) -if not mods.bzaluminum2 then +if not mods.bzaluminum then util.replace_ingredient("extreme-fast-belt", "express-transport-belt", util.me.titanium_plate, 10) util.replace_ingredient("extreme-fast-underground-belt", "express-underground-belt", util.me.titanium_plate, 40) util.replace_ingredient("extreme-fast-belt-loader", "express-transport-belt-loader", util.me.titanium_plate, 20) @@ -187,7 +187,7 @@ end -- Advanced belts util.add_ingredient("extreme-belt", util.me.titanium_plate, 5) -- Advanced util.add_ingredient("extreme-underground", util.me.titanium_plate, 20) -if not mods.bzaluminum2 then +if not mods.bzaluminum then util.add_ingredient("ultimate-belt", util.me.titanium_plate, 10) -- Elite util.add_ingredient("ultimate-underground", util.me.titanium_plate, 40) end @@ -201,7 +201,11 @@ util.replace_ingredient("ultimate-underground-belt", "steel-plate", util.me.tita util.replace_ingredient("turbo-splitter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("ultimate-splitter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-inserter", "steel-plate", util.me.titanium_plate) +util.replace_ingredient("turbo-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-stack-inserter", "steel-plate", util.me.titanium_plate) +util.replace_ingredient("turbo-stack-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("turbo-inserter", "steel-plate", util.me.titanium_plate) +util.replace_ingredient("express-filter-inserter", "steel-plate", util.me.titanium_plate) util.replace_ingredient("express-stack-inserter", "steel-plate", util.me.titanium_plate) +util.replace_ingredient("express-stack-filter-inserter", "steel-plate", util.me.titanium_plate) diff --git a/bztitanium2/titanium-recipe.lua b/titanium-recipe.lua similarity index 85% rename from bztitanium2/titanium-recipe.lua rename to titanium-recipe.lua index 40a25f9..ed04988 100644 --- a/bztitanium2/titanium-recipe.lua +++ b/titanium-recipe.lua @@ -1,6 +1,6 @@ -- Titanium smelting -local util = require("data-util"); +local util = require("__bztitanium__.data-util"); local item_sounds = require('__base__.prototypes.item_sounds') if mods["FactorioExtended-Plus-Core"] then @@ -29,8 +29,8 @@ data:extend({ order = "d[titanium-plate]", icons = (util.k2() and { - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, - { icon = "__bztitanium2__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3,}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or nil), enabled = false, allow_productivity = true, @@ -47,7 +47,7 @@ data:extend({ { type = "item", name = util.me.titanium_plate, - icon = "__bztitanium2__/graphics/icons/titanium-plate.png", + icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3, subgroup = "raw-material", order = "b[titanium-plate]", @@ -61,7 +61,7 @@ data:extend({ type = "technology", name = "titanium-processing", icon_size = 256, icon_mipmaps = 4, - icon = "__bztitanium2__/graphics/technology/titanium-processing.png", + icon = "__bztitanium__/graphics/technology/titanium-processing.png", effects = { { @@ -111,7 +111,7 @@ data:extend({ subgroup = "vulcanus-processes", order = "d[titanium-ore]", icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, icon_mipmaps = 3}, { icon = "__base__/graphics/icons/stone.png", icon_size = 64, scale = 0.25, shift = {-8, -8}}, }, enabled = false, @@ -129,7 +129,7 @@ data:extend({ order = "d[titanium-sublimation]", icons = { util.vacuum_icon, - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, scale=0.25, icon_mipmaps = 3, shift = {-8, -8}}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, scale=0.25, icon_mipmaps = 3, shift = {-8, -8}}, }, enabled = false, allow_productivity = true, @@ -149,7 +149,7 @@ data:extend({ subgroup = "vulcanus-processes", order = "d[titanium-ore]", icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3}, + { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3}, util.vacuum_icon_small, }, enabled = false, @@ -166,7 +166,7 @@ data:extend({ name = "titanium-extraction", category = "organic-or-hand-crafting", icons = { - { icon = "__bztitanium2__/graphics/icons/titanium-ore.png", icon_size = 64, scale = 0.5, icon_mipmaps = 3, shift = {6,8}}, + { icon = "__bztitanium__/graphics/icons/titanium-ore.png", icon_size = 64, scale = 0.5, icon_mipmaps = 3, shift = {6,8}}, { icon = "__space-age__/graphics/icons/jellynut.png", icon_size = 64, scale = 0.5, shift = {-6, -8}}, }, surface_conditions =