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/.gitignore b/.gitignore index 85e49ae..318cbef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -.idea -*.zip \ No newline at end of file +*.bak +*.blend* +.idea \ No newline at end of file diff --git a/bzcarbon2/LICENSE.md b/LICENSE.md similarity index 100% rename from bzcarbon2/LICENSE.md rename to LICENSE.md diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..18690d6 --- /dev/null +++ b/Makefile @@ -0,0 +1,41 @@ +# 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/ + # Next 3 lines are dev only (uncomment zip lines and comment these) + #rm -rf ../../mods/$(v) + #mkdir ../../mods/$(v) + #cp -r * ../../mods/$(v) + +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 f794ae5..13e2a37 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,17 @@ -**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.** - # Graphite & Diamonds -Adds elemental carbon items to the game, including flake graphite, graphite, diamonds, graphene, and optionally fullerenes, nanotubes, and carbon black. It also adds a crucible intermediate. -If you enjoy vanilla Factorio, and would like to add a new resource or two, this mod might be what you're looking for. +[factorio mod page](https://mods.factorio.com/mod/bzcarbon) -If you use this alongside the other Very BZ mods, the game will become quite a bit more complex. While still far less than Angelbob or Pyanodons, it's a big step up from vanilla. +Adds elemental carbon resources and intermediates to the base game -If you want a vanilla-esque game with a just few tweaks, try with just this mod, or a less complex one like Titanium or Lead. +## 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) + +## Thanks to - [snouz](https://github.com/snouz) (logo inspiration, ore graphics templates) - [YassineMrabet](https://commons.wikimedia.org/wiki/File:Fullerene.png) (initial fullerene image, CC BY-SA 3.0 license, see link) - [dodo.the.last](https://mods.factorio.com/mod/big-data-string) (borrowed code for list feature) @@ -22,10 +20,15 @@ If you want a vanilla-esque game with a just few tweaks, try with just this mod, - [nihilistzsche](https://github.com/nihilistzsche) ### Localization + - [S3BA](https://github.com/S3BA-pl) (pl) - [Sakuro](https://github.com/sakuro) (ja) - [x2605](https://github.com/x2605) (ko) - [NathaU](https://github.com/NathaU) (de) - [Pergamum663](https://github.com/Pergamum663) (ru) - [sunnytan53](https://github.com/Pergamum663) (zh-CN) -- [CV514](https://github.com/CV514) (ru) \ No newline at end of file +- [CV514](https://github.com/CV514) (ru) + + +### FAQ and gameplay. +See mod page linked above diff --git a/bzcarbon2/carbon-recipe-final-stacking.lua b/bzcarbon2/carbon-recipe-final-stacking.lua deleted file mode 100644 index b23d169..0000000 --- a/bzcarbon2/carbon-recipe-final-stacking.lua +++ /dev/null @@ -1,38 +0,0 @@ --- Deadlock stacking recipes - -local util = require("data-util"); - -if deadlock and deadlock["add_stack"] then - deadlock.add_stack("flake-graphite", "__bzcarbon2__/graphics/icons/stacked/flake-graphite-stacked.png", "deadlock-stacking-1", 64) - deadlock.add_stack("graphite", "__bzcarbon2__/graphics/icons/stacked/graphite-stacked.png", "deadlock-stacking-1", 128) - deadlock.add_stack("diamond", "__bzcarbon2__/graphics/icons/stacked/diamond-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("graphene", "__bzcarbon2__/graphics/icons/stacked/graphene-stacked.png" , "deadlock-stacking-2", 128) - deadlock.add_stack("crucible", "__bzcarbon2__/graphics/icons/stacked/crucible-stacked.png" , "deadlock-stacking-2", 128) - if util.me.use_fullerenes() then - deadlock.add_stack("fullerenes", "__bzcarbon2__/graphics/icons/stacked/fullerene-stacked.png", "deadlock-stacking-2", 128) - deadlock.add_stack("nanotubes", "__bzcarbon2__/graphics/icons/stacked/nanotube-stacked.png", "deadlock-stacking-2", 128) - end - if util.me.use_carbon_black() then - deadlock.add_stack("carbon-black", "__bzcarbon2__/graphics/icons/stacked/carbon-black-stacked.png", "deadlock-stacking-2", 64) - end - if util.me.use_rough_diamond() then - deadlock.add_stack("rough-diamond", "__bzcarbon2__/graphics/icons/stacked/rough-diamond-stacked.png" , "deadlock-stacking-2", 64) - end -end - --- Deadlock crating recipes -if deadlock_crating then - deadlock_crating.add_crate("flake-graphite", "deadlock-crating-1") - deadlock_crating.add_crate("graphite", "deadlock-crating-1") - deadlock_crating.add_crate("diamond", "deadlock-crating-2") - deadlock_crating.add_crate("graphene", "deadlock-crating-2") - deadlock_crating.add_crate("crucible", "deadlock-crating-2") - if util.me.use_fullerenes() then - deadlock_crating.add_crate("fullerenes", "deadlock-crating-2") - deadlock_crating.add_crate("nanotubes", "deadlock-crating-2") - end - if util.me.use_carbon_black() then - deadlock_crating.add_crate("carbon-black", "deadlock-crating-2") - end -end - diff --git a/bzcarbon2/changelog.txt b/bzcarbon2/changelog.txt deleted file mode 100644 index b374cda..0000000 --- a/bzcarbon2/changelog.txt +++ /dev/null @@ -1,7 +0,0 @@ ---------------------------------------------------------------------------------------------------- -Version: 2.0.22 -Date: 19.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/bzcarbon2/info.json b/bzcarbon2/info.json deleted file mode 100644 index 6f3159a..0000000 --- a/bzcarbon2/info.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "bzcarbon2", - "version": "2.0.22", - "factorio_version": "2.0", - "title": "Graphite & Diamonds - Legacy", - "description": "Adds elemental carbon items to the game, including graphite, diamonds, graphene, and more.", - "author": "Brevven, cackling fiend", - "homepage": "https://discord.gg/ufvFUJtVwk", - "dependencies": [ - "base >= 2.0.42", - "? bztitanium", - "? bzsilicon", - "? bzzirconium", - "? bzfoundry2", - "? space-exploration", - "? aai-industry", - "? Krastorio2", - "? Krastorio2-spaced-out", - "? 248k-Redux", - "(?) modmashsplintersubspacelogistics", - "? deadlock-beltboxes-loaders", - "? DeadlockCrating", - "! space-age" - ] -} - diff --git a/bzcarbon2/prototypes/diamond-particle.lua b/bzcarbon2/prototypes/diamond-particle.lua deleted file mode 100644 index 1f7e885..0000000 --- a/bzcarbon2/prototypes/diamond-particle.lua +++ /dev/null @@ -1,80 +0,0 @@ -data:extend( -{ - { - type = "optimized-particle", - name = "diamond-particle", - flags = {"not-on-map"}, - life_time = 180, - pictures = - { - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-1.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-2.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-3.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-4.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - }, - shadows = - { - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-1.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-2.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-3.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - }, - { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-4.png", - priority = "extra-high", - width = 32, - height = 32, - frame_count = 1, - scale = 0.5 - } - } - } -} -) diff --git a/bzcarbon2/carbon-fiber-recipe-updates.lua b/carbon-fiber-recipe-updates.lua similarity index 100% rename from bzcarbon2/carbon-fiber-recipe-updates.lua rename to carbon-fiber-recipe-updates.lua diff --git a/bzcarbon2/carbon-matter.lua b/carbon-matter.lua similarity index 96% rename from bzcarbon2/carbon-matter.lua rename to carbon-matter.lua index 0fbb9df..d62bd8d 100644 --- a/bzcarbon2/carbon-matter.lua +++ b/carbon-matter.lua @@ -14,7 +14,7 @@ data:extend( icon_size = 256, }, { - icon = "__bzcarbon2__/graphics/icons/diamond.png", + icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128, scale = 0.7, } diff --git a/bzcarbon2/carbon-recipe-final-k2.lua b/carbon-recipe-final-k2.lua similarity index 100% rename from bzcarbon2/carbon-recipe-final-k2.lua rename to carbon-recipe-final-k2.lua diff --git a/bzcarbon2/carbon-recipe-final-rrr.lua b/carbon-recipe-final-rrr.lua similarity index 100% rename from bzcarbon2/carbon-recipe-final-rrr.lua rename to carbon-recipe-final-rrr.lua diff --git a/bzcarbon2/carbon-recipe-final-se.lua b/carbon-recipe-final-se.lua similarity index 100% rename from bzcarbon2/carbon-recipe-final-se.lua rename to carbon-recipe-final-se.lua diff --git a/carbon-recipe-final-stacking.lua b/carbon-recipe-final-stacking.lua new file mode 100644 index 0000000..b57cf81 --- /dev/null +++ b/carbon-recipe-final-stacking.lua @@ -0,0 +1,38 @@ +-- Deadlock stacking recipes + +local util = require("data-util"); + +if deadlock and deadlock["add_stack"] then + deadlock.add_stack("flake-graphite", "__bzcarbon__/graphics/icons/stacked/flake-graphite-stacked.png", "deadlock-stacking-1", 64) + deadlock.add_stack("graphite", "__bzcarbon__/graphics/icons/stacked/graphite-stacked.png", "deadlock-stacking-1", 128) + deadlock.add_stack("diamond", "__bzcarbon__/graphics/icons/stacked/diamond-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("graphene", "__bzcarbon__/graphics/icons/stacked/graphene-stacked.png" , "deadlock-stacking-2", 128) + deadlock.add_stack("crucible", "__bzcarbon__/graphics/icons/stacked/crucible-stacked.png" , "deadlock-stacking-2", 128) + if util.me.use_fullerenes() then + deadlock.add_stack("fullerenes", "__bzcarbon__/graphics/icons/stacked/fullerene-stacked.png", "deadlock-stacking-2", 128) + deadlock.add_stack("nanotubes", "__bzcarbon__/graphics/icons/stacked/nanotube-stacked.png", "deadlock-stacking-2", 128) + end + if util.me.use_carbon_black() then + deadlock.add_stack("carbon-black", "__bzcarbon__/graphics/icons/stacked/carbon-black-stacked.png", "deadlock-stacking-2", 64) + end + if util.me.use_rough_diamond() then + deadlock.add_stack("rough-diamond", "__bzcarbon__/graphics/icons/stacked/rough-diamond-stacked.png" , "deadlock-stacking-2", 64) + end +end + +-- Deadlock crating recipes +if deadlock_crating then + deadlock_crating.add_crate("flake-graphite", "deadlock-crating-1") + deadlock_crating.add_crate("graphite", "deadlock-crating-1") + deadlock_crating.add_crate("diamond", "deadlock-crating-2") + deadlock_crating.add_crate("graphene", "deadlock-crating-2") + deadlock_crating.add_crate("crucible", "deadlock-crating-2") + if util.me.use_fullerenes() then + deadlock_crating.add_crate("fullerenes", "deadlock-crating-2") + deadlock_crating.add_crate("nanotubes", "deadlock-crating-2") + end + if util.me.use_carbon_black() then + deadlock_crating.add_crate("carbon-black", "deadlock-crating-2") + end +end + diff --git a/bzcarbon2/carbon-recipe-k2.lua b/carbon-recipe-k2.lua similarity index 94% rename from bzcarbon2/carbon-recipe-k2.lua rename to carbon-recipe-k2.lua index 473d144..1b42ba0 100644 --- a/bzcarbon2/carbon-recipe-k2.lua +++ b/carbon-recipe-k2.lua @@ -14,7 +14,7 @@ data:extend({ name = "enriched-graphite", main_product = "graphite", icons = { - { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128}, { icon = util.k2assets().."/icons/fluids/hydrogen-chloride.png", icon_size = 64, scale=0.25, icon_mipmaps = 3, shift= {-8, -8}}, }, category = "chemistry", @@ -85,7 +85,7 @@ data:extend({ icons = { { - icon = "__bzcarbon2__/graphics/icons/graphite.png", + icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128, }, { @@ -130,7 +130,7 @@ data:extend({ name = "heavy-water-graphene", icons = { { icon = util.k2assets().."/icons/fluids/heavy-water.png", icon_size = 64, icon_mipmaps = 3,}, - { icon = "__bzcarbon2__/graphics/icons/graphene.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/graphene.png", icon_size = 128, scale=0.25, shift= {-8, -8}}, }, category = "kr-electrolysis", subgroup = "fluid-recipes", diff --git a/bzcarbon2/carbon-recipe-se.lua b/carbon-recipe-se.lua similarity index 95% rename from bzcarbon2/carbon-recipe-se.lua rename to carbon-recipe-se.lua index a46a9f5..485ee8a 100644 --- a/bzcarbon2/carbon-recipe-se.lua +++ b/carbon-recipe-se.lua @@ -43,7 +43,7 @@ data:extend({ }, icons = { - { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128}, { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}}, }, }, diff --git a/bzcarbon2/carbon-recipe-updates.lua b/carbon-recipe-updates.lua similarity index 99% rename from bzcarbon2/carbon-recipe-updates.lua rename to carbon-recipe-updates.lua index 0bf6fde..17ef7cb 100644 --- a/bzcarbon2/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -82,7 +82,7 @@ if util.me.use_fullerenes() then -- K2 util.add_ingredient("kr-biter-virus", "fullerenes", 100) util.add_ingredient("kr-creep-virus", "fullerenes", 100) - util.replace_some_ingredient("kr-biomass", "petroleum-gas", 25, "fullerenes", 25) + util.replace_some_ingredient("kr-biomass-growing", "petroleum-gas", 25, "fullerenes", 25) -- SE util.add_ingredient("se-vitalic-reagent", "fullerenes", 4) @@ -175,7 +175,7 @@ if util.k2() then util.add_ingredient("tungsten-carbide", "graphite", 4) util.replace_some_ingredient("kr-s-c-steel-beam", "iron-plate", 4, "graphite", 8) util.replace_some_ingredient("kr-s-c-steel-gear-wheel", "iron-plate", 2, "graphite", 4) -elseif mods.bzfoundry2 and util.me.foundry_enable() then +elseif mods.bzfoundry and util.me.foundry_enable() then util.replace_some_ingredient("steel-plate", "iron-plate", 1, "graphite", 1) util.replace_some_ingredient("tungsten-carbide", "tungsten-plate", 1, "graphite", 1) end diff --git a/bzcarbon2/carbon-recipe.lua b/carbon-recipe.lua similarity index 86% rename from bzcarbon2/carbon-recipe.lua rename to carbon-recipe.lua index f2d3d03..e8182f4 100644 --- a/bzcarbon2/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -20,12 +20,12 @@ data:extend({ { type = "item", name = "graphite", - icon = "__bzcarbon2__/graphics/icons/graphite.png", + icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128, pictures = { - {filename="__bzcarbon2__/graphics/icons/graphite.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/graphite-1.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/graphite-2.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/graphite.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/graphite-1.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/graphite-2.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -42,8 +42,8 @@ data:extend({ order = "d[graphite]", icons = (util.k2() and { - { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128}, - { icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/flake-graphite.png", icon_size = 128, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}}, } or nil), -- normal = (util.k2() and -- { @@ -70,7 +70,7 @@ data:extend({ type = "technology", name = "graphite-processing", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/graphite.png", + icon = "__bzcarbon__/graphics/icons/graphite.png", effects = {}, unit = { @@ -88,17 +88,17 @@ data:extend({ -- If no graphite ore, make it from coal or coke if not util.me.use_flake_graphite() then - if data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then + if data.raw.item["coke"] then data:extend({ { type = "recipe", name = "graphite", - icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size=128, - category = mods.bzfoundry2 and "founding" or "crafting", + icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128, + category = mods.bzfoundry and "founding" or "crafting", order = "d[graphite]", enabled = false, energy_required = 0.5, - ingredients = {util.item(mods["Krastorio2"] and "kr-coke" or "coke", 1)}, + ingredients = {util.item("coke", 1)}, results = {util.item("graphite", 2)}, } }) @@ -107,8 +107,8 @@ if not util.me.use_flake_graphite() then { type = "recipe", name = "graphite", - icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size=128, - category = mods.bzfoundry2 and "founding" or "crafting", + icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size=128, + category = mods.bzfoundry and "founding" or "crafting", subgroup = data.raw.item.graphite.subgroup, order = "d[graphite]", enabled = false, @@ -174,7 +174,7 @@ data:extend({ { type = "item", name = "diamond", - icon = "__bzcarbon2__/graphics/icons/diamond.png", + icon = "__bzcarbon__/graphics/icons/diamond.png", inventory_move_sound = item_sounds.brick_inventory_move, pick_sound = item_sounds.brick_inventory_pickup, drop_sound = item_sounds.brick_inventory_move, @@ -191,8 +191,8 @@ data:extend({ order = "d[diamond]", icons = (util.me.use_rough_diamond() and { - { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128}, - { icon = "__bzcarbon2__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/graphite-2.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } or nil), allow_productivity=true, enabled = false, @@ -215,9 +215,9 @@ data:extend({ order = "d[diamond]", icons = (util.k2() and { - { icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128}, - { icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, - } or {{ icon = "__bzcarbon2__/graphics/icons/diamond.png", icon_size = 128}}), + { icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/rough-diamond.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + } or {{ icon = "__bzcarbon__/graphics/icons/diamond.png", icon_size = 128}}), -- normal = (util.k2() and -- { -- enabled = false, @@ -250,7 +250,7 @@ data:extend({ type = "technology", name = "diamond-processing", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/diamond.png", + icon = "__bzcarbon__/graphics/icons/diamond.png", effects = { { @@ -282,7 +282,7 @@ data:extend({ { type = "item", name = "graphene", - icon = "__bzcarbon2__/graphics/icons/graphene.png", + icon = "__bzcarbon__/graphics/icons/graphene.png", icon_size = 128, inventory_move_sound = item_sounds.plastic_inventory_move, pick_sound = item_sounds.plastic_inventory_pickup, @@ -302,7 +302,7 @@ data:extend({ energy_required = 5, ingredients = (mods["space-age"] or util.k2()) and { {type="item", name="graphite", amount=1}, - {type="fluid", name=util.k2() and "kr-ammonia" or "ammonia", amount=5}, + {type="fluid", name="kr-ammonia", amount=5}, {type="fluid", name="sulfuric-acid", amount=5}, } or { {type="item", name="graphite", amount=1}, @@ -315,7 +315,7 @@ data:extend({ type = "technology", name = "graphene", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/graphene.png", + icon = "__bzcarbon__/graphics/icons/graphene.png", effects = { { @@ -361,7 +361,7 @@ data:extend({ { type = "item", name = "fullerenes", - icon = "__bzcarbon2__/graphics/icons/Fullerene.png", + icon = "__bzcarbon__/graphics/icons/Fullerene.png", icon_size = 128, inventory_move_sound = item_sounds.plastic_inventory_move, pick_sound = item_sounds.plastic_inventory_pickup, @@ -393,7 +393,7 @@ data:extend({ type = "technology", name = "fullerenes", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/Fullerene.png", + icon = "__bzcarbon__/graphics/icons/Fullerene.png", effects = { { @@ -418,7 +418,7 @@ data:extend({ { type = "item", name = "nanotubes", - icon = "__bzcarbon2__/graphics/icons/nanotube.png", + icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, inventory_move_sound = item_sounds.plastic_inventory_move, pick_sound = item_sounds.plastic_inventory_pickup, @@ -432,7 +432,7 @@ data:extend({ type = "recipe", name = "nanotubes", main_product = "nanotubes", - icon = "__bzcarbon2__/graphics/icons/nanotube.png", + icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, category = "chemistry", subgroup = "intermediate-product", @@ -456,7 +456,7 @@ data:extend({ type = "technology", name = "nanotubes", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/nanotube.png", + icon = "__bzcarbon__/graphics/icons/nanotube.png", effects = { { @@ -498,7 +498,7 @@ data:extend({ { type = "item", name = "carbon-black", - icon = "__bzcarbon2__/graphics/icons/carbon-black.png", + icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, inventory_move_sound = item_sounds.sulfur_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, @@ -511,7 +511,7 @@ data:extend({ { type = "recipe", name = "carbon-black", - icon = "__bzcarbon2__/graphics/icons/carbon-black.png", + icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, icon_mipmaps = 3, category = "chemistry", order = "d[graphite-carbon-black]", @@ -529,8 +529,8 @@ data:extend({ type = "recipe", name = "graphite-carbon-black", icons = { - { icon = "__bzcarbon2__/graphics/icons/carbon-black.png", icon_size = 64, icon_mipmaps = 3}, - { icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, icon_mipmaps = 3}, + { icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128}, }, category = "chemistry", order = "d[graphite]", @@ -550,7 +550,7 @@ data:extend({ { type = "item", name = "crucible", - icon = "__bzcarbon2__/graphics/icons/crucible.png", icon_size = 128, + icon = "__bzcarbon__/graphics/icons/crucible.png", icon_size = 128, inventory_move_sound = item_sounds.brick_inventory_move, pick_sound = item_sounds.brick_inventory_pickup, drop_sound = item_sounds.brick_inventory_move, @@ -618,8 +618,8 @@ if mods["space-age"] then type = "recipe", name = "graphitization", icons = { - {icon = "__bzcarbon2__/graphics/icons/graphite.png", icon_size = 128}, - {icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size = 128, scale = 0.125, shift={-8,-8}}, + {icon = "__bzcarbon__/graphics/icons/graphite.png", icon_size = 128}, + {icon = "__bzcarbon__/graphics/icons/rough-diamond.png", icon_size = 128, scale = 0.125, shift={-8,-8}}, }, category = "smelting", order = "d[graphite]", @@ -639,7 +639,7 @@ if mods["space-age"] then type = "technology", name = "diamond-processing-2", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/diamond.png", + icon = "__bzcarbon__/graphics/icons/diamond.png", effects = { { diff --git a/bzcarbon2/carbon-util.lua b/carbon-util.lua similarity index 83% rename from bzcarbon2/carbon-util.lua rename to carbon-util.lua index d5ece5a..f9a0554 100644 --- a/bzcarbon2/carbon-util.lua +++ b/carbon-util.lua @@ -15,18 +15,18 @@ function cutil.nanotube_recipe(recipe_name, item_name, tech) new_recipe.localised_name = {"recipe-name."..recipe_name} new_recipe.icons = { { icon = data.raw.recipe[recipe_name].icon, icon_size = data.raw.recipe[recipe_name].icon_size}, - { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } else new_recipe.localised_name = {"item-name."..item_name} if new_recipe.icons and #new_recipe.icons > 1 then table.insert(new_recipe.icons, - { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}} + { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}} ) else new_recipe.icons = { { icon = data.raw.item[item_name].icon, icon_size = data.raw.item[item_name].icon_size}, - { icon = "__bzcarbon2__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } end end diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..0f4e30f --- /dev/null +++ b/changelog.txt @@ -0,0 +1,515 @@ +--------------------------------------------------------------------------------------------------- +Version: 2.0.20 +Date: 2025-06-15 + Fixes: + - Fix load error in certain mod loadouts, especially with K2SO + - Address possible soft lock on Cerys by adding a small amount of furnaces to huge ruins +--------------------------------------------------------------------------------------------------- +Version: 2.0.19 +Date: 2025-05-07 + Fixes: + - Fix soft lock with K2 on graphene + - Fix some locale issues with K2 +--------------------------------------------------------------------------------------------------- +Version: 2.0.18 +Date: 2025-05-04 + Changes: + - Support for K2 spaced out + - Minor k2 2 tweaks +--------------------------------------------------------------------------------------------------- +Version: 2.0.17 +Date: 2025-05-03 + Changes: + - K2: Compatbility updates (with thanks to autechr3 and pla) +--------------------------------------------------------------------------------------------------- +Version: 2.0.16 +Date: 2025-04-20 + Changes: + - Any planet start on Vulcanus: Unlock crucible with foundry tech. +--------------------------------------------------------------------------------------------------- +Version: 2.0.15 +Date: 2025-04-19 + Fixes: + - Crushing Industry: Plastic uses carbon black instead of crushed coal + - Diamonds returned from LDS recipe are not affected by productivity + Changes: + - Space Age & Muluna: Can process rough diamonds earlier in tech tree +--------------------------------------------------------------------------------------------------- +Version: 2.0.14 +Date: 2025-04-08 + Changes: + - Space Age: Crusher recipe requires diamonds. + - Carbon black recipe uses crushed coal if available + - Further improved compatibility with Crushing Industry recipes + - Space Age: Asteroid crushing recipe now affected by productivity research + - Space Age: Low Density Structure recipes now affected by productivity reseearch +--------------------------------------------------------------------------------------------------- +Version: 2.0.13 +Date: 2025-03-22 + Changes: + - Set inventory sounds for some items + - Muluna: Nanotube recipe for alternate LDS + Fixes: + - Loads with Crafting Efficiency + - Improved compatibility with Muluna +--------------------------------------------------------------------------------------------------- +Version: 2.0.12 +Date: 2025-03-22 + Fixes: + - Fix startup crash introduced in factorio 2.0.42 +--------------------------------------------------------------------------------------------------- +Version: 2.0.11 +Date: 2025-03-04 + Changes: + - Align various electronic circuit recipes to all use graphite +--------------------------------------------------------------------------------------------------- +Version: 2.0.10 +Date: 2025-03-03 + Fixes: + - Better avoidance of possible infinite loop across mods. +--------------------------------------------------------------------------------------------------- +Version: 2.0.9 +Date: 2025-03-03 + Fixes: + - Nanotubes byproducts no longer affected by productivity + - Avoid possible infinite loop in certain mod loadouts, mostly when developing other mods. + Changes: + - Compatibility tweaks for Tungsten mod +--------------------------------------------------------------------------------------------------- +Version: 2.0.8 +Date: 2025-02-13 + Fixes: + - Space Age: With Hot metals, fix new LDS casting nanotube recipe. +--------------------------------------------------------------------------------------------------- +Version: 2.0.7 +Date: 2025-02-13 + Fixes: + - Space Age: Fix LDS recipes, plastic was not supposed to be removed. + Changes: + - Space Age: Add nanotubes recipe for casting LDS. + - Space Age: Show asteroid crushing recipe in signal GUI + - Space Age: Show alternative nanotube recipes in signal GUI +--------------------------------------------------------------------------------------------------- +Version: 2.0.6 +Date: 2025-02-05 + Fixes: + - Fix issues when flake graphite is disabled +--------------------------------------------------------------------------------------------------- +Version: 2.0.5 +Date: 2025-02-05 + Changes: + - Fix softlock in vanilla +--------------------------------------------------------------------------------------------------- +Version: 2.0.4 +Date: 2025-02-04 + Changes: + - Fix softlock with Muluna +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2025-01-31 + Changes: + - Add shiftite recipes for Janus mod. +--------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 2025-01-31 + Fixes: + - Fix compatibility issue with RCU Restored mod. + RCUs do not require graphene in Space Age, but still do in Vanilla. + Changes: + - In space age, Power Armor mk2 no longer requires graphene. Still requires in Vanilla. +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 2025-01-30 + Fixes: + - Space Age: With Titanium or Zirconium, unlock vacuum recipe earlier. + - Space Age: Fix unlock for polyacrylonitrile + - Space Age: Fix alternate ammonia recipe menu location + - Fix LDS localization +--------------------------------------------------------------------------------------------------- +Version: 2.0.0 +Date: 2025-01-29 + Changes: + - Update to Factorio 2.0 and Space Age, can be added to existing games. + Use /bz-regenerate to see help on regenerating ore patches (especially useful on Vulcanus) + - Space Age: Diamond ore patches are only on Vulcanus. Graphite is on Nauvis + - Updates to Space Age carbon fiber (Note: 2.0 vanilla carbon fiber is not yet available) + - New graphics for flake graphite, rough diamonds and some other items. + - Improved graphics for graphite and diamond ore patches. +--------------------------------------------------------------------------------------------------- +Version: 0.5.9 +Date: 2024-02-17 + Fixes: + - Fix possible soft lock on Warptorio 2 Expnasion +--------------------------------------------------------------------------------------------------- +Version: 0.5.8 +Date: 2023-12-24 + Localization: + - ja updates thanks to Sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.5.7 +Date: 2023-02-12 + Changes: + - Minor reordering of mod startup settings + - Improved support for Crafting Efficieny mod, thanks to nihilistzsche +--------------------------------------------------------------------------------------------------- +Version: 0.5.6 +Date: 2023-01-17 + Features: + - Support for Crafting Efficieny mod (note: technology icon cropping issues) + Changes: + - Carbon fiber, polyacrylonitrile, and rough diamond processing can benefit from productivity + Localization: + - ru updates thanks to CV514 +--------------------------------------------------------------------------------------------------- +Version: 0.5.5 +Date: 2022-12-28 + Changes: + - Less graphite needed for electronic circuits +--------------------------------------------------------------------------------------------------- +Version: 0.5.4 +Date: 2022-12-25 + Fixes: + - SE: Fix some data recipes that were not requiring enough blank data cards +--------------------------------------------------------------------------------------------------- +Version: 0.5.3 +Date: 2022-12-24 + Localization: + - Chinese (simplified) thanks to sunnytan53 + - ru updates thanks to Pergamum663 + - ja updates thanks to sakuro +--------------------------------------------------------------------------------------------------- +Version: 0.5.2 +Date: 2022-12-08 + Changes: + - Enable rough diamond stacking, stacked mining. + - SE: Landfill from graphite + - Compatibility fix for ModMash Splinter Subspace Logistics +--------------------------------------------------------------------------------------------------- +Version: 0.5.1 +Date: 2022-12-05 + Fixes: + - Add missing locale string for new setting + - LDS recipe only shows once in nanotube tech now, instead of twice. + - When carbon fiber is enabled, it should now fully replace plastic in all LDS recipes. +--------------------------------------------------------------------------------------------------- +Version: 0.5.0 +Date: 2022-12-04 + Features: + - When used with Salt & Chlorine mod, option for carbon fiber (default on). +--------------------------------------------------------------------------------------------------- +Version: 0.4.7 +Date: 2022-09-25 + Changes: + - Updated some nanotube recipes to more closely mirror their counterparts in all mod loadouts. + Fixes: + - Attempt to fix issue with K2, S3, Omni mods, 248k, when used with nanotubes. +--------------------------------------------------------------------------------------------------- +Version: 0.4.6 +Date: 2022-08-23 + Changes: + - Balance some Deep Core Mining outputs for focused recipes and sorting recipes +--------------------------------------------------------------------------------------------------- +Version: 0.4.5 +Date: 2022-08-18 + Fixes: + - Fix multiple prerequisite issue +--------------------------------------------------------------------------------------------------- +Version: 0.4.4 +Date: 2022-08-17 + Fixes: + - SE: Disable matter recipes at start + Changes: + - Minor tech tree tweak for nanobots +--------------------------------------------------------------------------------------------------- +Version: 0.4.3 +Date: 2022-08-16 + Features: + - Support for SE matter fusion and SE+K2 matter liberation +--------------------------------------------------------------------------------------------------- +Version: 0.4.2 +Date: 2022-08-12 + Changes: + - When using AAI miner vehicles, enable barreling of steam for mining graphite +--------------------------------------------------------------------------------------------------- +Version: 0.4.1 +Date: 2022-08-08 + Changes: + - Compatibility with updates to Tungsten mod + Fixes: + - SE + K2: Enriched graphite recipe in correct subgroup. +--------------------------------------------------------------------------------------------------- +Version: 0.4.0 +Date: 2022-08-07 + Changes: + - All mods that have early recipes requiring electronic circuits should be more compatible now. +--------------------------------------------------------------------------------------------------- +Version: 0.3.10 +Date: 2022-08-06 + Fixes: + - Steam is now properly required in vtk deepcore mining + - Bypass setting fixed for added products +--------------------------------------------------------------------------------------------------- +Version: 0.3.9 +Date: 2022-08-03 + Fixes: + - Balance no-uranium vtk deepcore mining recipe. + - Add some missing vtk deepcore mining strings +--------------------------------------------------------------------------------------------------- +Version: 0.3.8 +Date: 2022-08-02 + Changes: + - Tech tree tweak to smooth unlocks. + - Asteroid Mining compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.3.7 +Date: 2022-07-23 + Changes: + - Made compatible with Fluidless_Mining_and_Ore_Washing by allowing fluid recipes in aseembling + machine 1 when enabled. May change if a better solution is found later. +--------------------------------------------------------------------------------------------------- +Version: 0.3.6 +Date: 2022-07-22 + Fixes: + - Fix bob's electronic's basic electronic components recipe changes +--------------------------------------------------------------------------------------------------- +Version: 0.3.5 +Date: 2022-07-20 + Features: + - K2: Add an enriched graphite recipe with improved graphite ratio and corresponding tech. + Changes: + - Fix basic splitter recipe to be pre-electronics friendly. + If this breaks your mall, use bypass recipe setting. + - Tech tree tweak: laser (instead of laser-turret) depends on diamond processing +--------------------------------------------------------------------------------------------------- +Version: 0.3.4 +Date: 2022-07-14 + Localization: + - ru locale thanks to Pergamum663 +--------------------------------------------------------------------------------------------------- +Version: 0.3.3 +Date: 2022-07-13 + Changes: + - VTK Deep Core Ore Chunk refining and sorting outputs less diamond and more graphite. +--------------------------------------------------------------------------------------------------- +Version: 0.3.2 +Date: 2022-07-09 + Changes: + - Temporary en locale strings for procedural deep core mining recipes +--------------------------------------------------------------------------------------------------- +Version: 0.3.1 +Date: 2022-07-01 + Changes: + - SE 0.6: Subgroup for carbon items +--------------------------------------------------------------------------------------------------- +Version: 0.3.0 +Date: 2022-07-01 + Changes: + - Support for Space Exploration 0.6 +--------------------------------------------------------------------------------------------------- +Version: 0.2.0 +Date: 2022-06-26 + Features: + - Beta support for 248k. Carbon fiber uses graphite. More changes to come. +--------------------------------------------------------------------------------------------------- +Version: 0.1.10 +Date: 2022-06-09 + Changes: + - SE: Diamond synthesis with vulcanite can use prod modules. +--------------------------------------------------------------------------------------------------- +Version: 0.1.9 +Date: 2022-06-05 + Localization: + - de l10n thanks to NathaU +--------------------------------------------------------------------------------------------------- +Version: 0.1.8 +Date: 2022-05-30 + Changes: + - AAI: Improve AAI tech tree when Graphite enabled: steam power after basic fluid handling. + - K2: Do not unlock electric mining drill with automation core. + - K2: Fullerenes no longer required for slowdown capsules, due to earlier unlock in K2. +--------------------------------------------------------------------------------------------------- +Version: 0.1.7 +Date: 2022-04-25 + Fixes: + - Move K2 electric mining drill unlock behind automation core tech. +--------------------------------------------------------------------------------------------------- +Version: 0.1.6 +Date: 2022-04-22 + Fixes: + - Fix a minimal mode steel production deadlock. +--------------------------------------------------------------------------------------------------- +Version: 0.1.5 +Date: 2022-02-22 + Localization: + - ko l10n thanks to x2605 + Fixes: + - Returned diamonds no longer affected by prod modules + - K2: "smelting crafting" recipes are hidden from player crafting, as in K2 base. +--------------------------------------------------------------------------------------------------- +Version: 0.1.3 +Date: 2022-02-12 + Localization: + - ja l10n thanks to sakuro + Changes: + - More tech tree tweaks (K2+AAI) +--------------------------------------------------------------------------------------------------- +Version: 0.1.2 +Date: 2022-01-30 + Changes: + - More minor tech tree tweaks + - More compatibility tweaks +--------------------------------------------------------------------------------------------------- +Version: 0.1.1 +Date: 2022-01-29 + Changes: + - SE ballistic shielding data recipe + - Minor rough diamond icon tweak + - Minor description tweaks + - Minor tech tree tweaks +--------------------------------------------------------------------------------------------------- +Version: 0.1.0 +Date: 2022-01-27 + Changes: + - This is feeling more like beta than alpha now. + Fixes: + - SE rough-diamond ore should be properly rare. + - SE without flake graphite should now work +--------------------------------------------------------------------------------------------------- +Version: 0.0.21 +Date: 2022-01-25 + Changes: + - SE core mining omni - no diamonds, fix graphite balance + - Minor compatibility tweaks +--------------------------------------------------------------------------------------------------- +Version: 0.0.20 +Date: 2022-01-19 + Features: + - New setting to remove flake graphite + Changes: + - Minor tech tree tweaks + - Repair pack recipe tweak + - Minor 5d compatibility improvements + - Minor FE+ compatibility improvements +--------------------------------------------------------------------------------------------------- +Version: 0.0.19 +Date: 2022-01-18 + Fixes: + - Prod modules work with Schall Recipe Scaling recipes +--------------------------------------------------------------------------------------------------- +Version: 0.0.18 +Date: 2022-01-17 + Changes: + - Minor modded tech tree tweaks + Fixes: + - Fix Schall Recipe Scaling issue with diamonds in furnaces + - Attempted to fix an issue when low density structure has no expensive recipe +--------------------------------------------------------------------------------------------------- +Version: 0.0.17 +Date: 2022-01-15 + Fixes: + - LDS recipe string fixes with new option + - Schall RS fixes with new option +--------------------------------------------------------------------------------------------------- +Version: 0.0.16 +Date: 2022-01-14 + Changes: + - LDS Nanotube recipe now uses 2xN pattern. +--------------------------------------------------------------------------------------------------- +Version: 0.0.15 +Date: 2022-01-13 + Features: + - Setting to enable reusing diamond grinding grit for LDS recipes +--------------------------------------------------------------------------------------------------- +Version: 0.0.14 +Date: 2022-01-12 + Changes: + - Safe compatibility check for Bob's Electronics SE KR thanks to MdRuz + - Crucibles work with Deadlock stacking/crating +--------------------------------------------------------------------------------------------------- +Version: 0.0.13 +Date: 2022-01-12 + Changes: + - Move electric drill back before electronics to avoid deadlock. +--------------------------------------------------------------------------------------------------- +Version: 0.0.12 +Date: 2022-01-08 + Changes: + - Change burner phase vanilla recipes a bit to avoid possible deadlocks +--------------------------------------------------------------------------------------------------- +Version: 0.0.11 +Date: 2022-01-06 + Changes: + - Tweak icons for visibility, especially graphene + Localization: + - pl l10n, thanks to S3BA +--------------------------------------------------------------------------------------------------- +Version: 0.0.10 +Date: 2022-01-05 + Features: + - Add setting to dump modified recipes to file +--------------------------------------------------------------------------------------------------- +Version: 0.0.9 +Date: 2022-01-04 + Changes: + - K2: Advanced crafting steel recipes + Features: + - Strange matter compatibility + Fixes: + - Locale string +--------------------------------------------------------------------------------------------------- +Version: 0.0.8 +Date: 2022-01-04 + Changes: + - Minor tech tree tweaks + Features: + - K2: Matter conversion + - SE: Delivery capsule recipes +--------------------------------------------------------------------------------------------------- +Version: 0.0.7 +Date: 2022-01-04 + Changes: + - SE - non-pulverizer recipe for graphite to fix deadlock +--------------------------------------------------------------------------------------------------- +Version: 0.0.6 +Date: 2022-01-03 + Changes: + - Tungsten sets basic rocket-engine-nozzle recipe, this mod updates it with graphite + - More minor compatibility +--------------------------------------------------------------------------------------------------- +Version: 0.0.5 +Date: 2022-01-02 + Fixes: + - Fix issue with crucible if certain mods were not enabled + - Deadlock: Fix crating of diamonds +--------------------------------------------------------------------------------------------------- +Version: 0.0.4 +Date: 2022-01-01 + Changes: + - SE: More facility recipes, Nutrient gel, LDS diamonds, alt lube, unlocks + - K2 green circuit fix + - AAI green circuit fix +--------------------------------------------------------------------------------------------------- +Version: 0.0.3 +Date: 2021-12-31 + Changes: + - Diamonds no longer used in centrifuge + - Diamonds now used in laser turrets + - Module 2s require 1 diamond now. + - If tier 5 or 4 modules exist, use more diamonds there instead of tier 2 + - Some minor SE recipe updates + - Other minor compatibility tweaks + Fixes: + - Now loads with FE+ (loose compatibility) +--------------------------------------------------------------------------------------------------- +Version: 0.0.2 +Date: 2021-12-31 + Fixes: + - Works with Deadlock's Stacked Mining now. +--------------------------------------------------------------------------------------------------- +Version: 0.0.1 +Date: 2021-12-30 + Features: + - Alpha version (things might change, possibly a lot) + - Adds Flake Graphite, Graphite, Diamonds, Graphene + - Optionally adds Fullerenes (default on), Carbon black (default off) + - Initial compatibility with Krastorio 2, Space Exploration diff --git a/bzcarbon2/compatibility/248k.lua b/compatibility/248k.lua similarity index 100% rename from bzcarbon2/compatibility/248k.lua rename to compatibility/248k.lua diff --git a/bzcarbon2/compatibility/any-planet-start.lua b/compatibility/any-planet-start.lua similarity index 100% rename from bzcarbon2/compatibility/any-planet-start.lua rename to compatibility/any-planet-start.lua diff --git a/bzcarbon2/compatibility/orewashing.lua b/compatibility/orewashing.lua similarity index 100% rename from bzcarbon2/compatibility/orewashing.lua rename to compatibility/orewashing.lua diff --git a/bzcarbon2/compatibility/vtkdeepcoremining.lua b/compatibility/vtkdeepcoremining.lua similarity index 100% rename from bzcarbon2/compatibility/vtkdeepcoremining.lua rename to compatibility/vtkdeepcoremining.lua diff --git a/bzcarbon2/control-util.lua b/control-util.lua similarity index 100% rename from bzcarbon2/control-util.lua rename to control-util.lua diff --git a/bzcarbon2/control.lua b/control.lua similarity index 100% rename from bzcarbon2/control.lua rename to control.lua diff --git a/bzcarbon2/data-final-fixes.lua b/data-final-fixes.lua similarity index 96% rename from bzcarbon2/data-final-fixes.lua rename to data-final-fixes.lua index d621509..74f5df1 100644 --- a/bzcarbon2/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -21,7 +21,7 @@ if data.raw.recipe["supercapacitor"] then new_recipe.localised_name = {"item-name.supercapacitor"} new_recipe.icons = { { icon = data.raw.item["supercapacitor"].icon, icon_size = data.raw.item["supercapacitor"].icon_size}, - { icon = "__bzcarbon2__/graphics/icons/graphene.png", icon_size = 128, scale=0.125, shift= {-8, -8}, tint={1,1,1}}, + { icon = "__bzcarbon__/graphics/icons/graphene.png", icon_size = 128, scale=0.125, shift= {-8, -8}, tint={1,1,1}}, } new_recipe.icon = nil new_recipe.icon_size = nil @@ -34,7 +34,7 @@ end -- Green circuits in final fixes due to K2 shenanigans if mods.MDbobelectronics or mods.MDbobelectronics2 or mods.bobelectronics then util.replace_ingredient("basic-electronic-components", "coal", "graphite") - util.replace_ingredient("basic-electronic-components", mods["Krastorio2"] and "kr-coke" or "coke", "graphite") + util.replace_ingredient("basic-electronic-components", "coke", "graphite") else -- Electronic circuits need final fixes function modify_ec(recipe_name, to_replace) @@ -119,7 +119,7 @@ end util.remove_ingredient("electric-furnace", "cuw") -- support new tungsten -- Vanilla burner phase tweaks -- green circuits after electronics -if not util.k2() and not mods["aai-industry"] and not mods.bzaluminum2 then +if not util.k2() and not mods["aai-industry"] and not mods.bzaluminum then util.replace_ingredient("electric-mining-drill", "electronic-circuit", "copper-cable", 6) -- Most of this can go post 2.0 @@ -151,7 +151,7 @@ end util.add_prerequisite("nanobots", "electronics") -if not mods.bzaluminum2 then +if not mods.bzaluminum then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) end diff --git a/bzcarbon2/data-updates.lua b/data-updates.lua similarity index 100% rename from bzcarbon2/data-updates.lua rename to data-updates.lua diff --git a/bzcarbon2/data-util.lua b/data-util.lua similarity index 99% rename from bzcarbon2/data-util.lua rename to data-util.lua index 1433824..d867278 100644 --- a/bzcarbon2/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/bzcarbon2/data.lua b/data.lua similarity index 100% rename from bzcarbon2/data.lua rename to data.lua diff --git a/bzcarbon2/graphics/entity/ores/hr-diamond.png b/graphics/entity/ores/hr-diamond.png similarity index 100% rename from bzcarbon2/graphics/entity/ores/hr-diamond.png rename to graphics/entity/ores/hr-diamond.png diff --git a/sources/graphics/entity/ores/hr-diamond.xcf b/graphics/entity/ores/hr-diamond.xcf similarity index 100% rename from sources/graphics/entity/ores/hr-diamond.xcf rename to graphics/entity/ores/hr-diamond.xcf diff --git a/bzcarbon2/graphics/entity/ores/hr-graphite.png b/graphics/entity/ores/hr-graphite.png similarity index 100% rename from bzcarbon2/graphics/entity/ores/hr-graphite.png rename to graphics/entity/ores/hr-graphite.png diff --git a/sources/graphics/entity/ores/hr-graphite.xcf b/graphics/entity/ores/hr-graphite.xcf similarity index 100% rename from sources/graphics/entity/ores/hr-graphite.xcf rename to graphics/entity/ores/hr-graphite.xcf diff --git a/graphics/entity/particle/graphite-particle-1.png b/graphics/entity/particle/graphite-particle-1.png new file mode 100644 index 0000000..1b76c18 Binary files /dev/null and b/graphics/entity/particle/graphite-particle-1.png differ diff --git a/graphics/entity/particle/graphite-particle-2.png b/graphics/entity/particle/graphite-particle-2.png new file mode 100644 index 0000000..0bf7c6b Binary files /dev/null and b/graphics/entity/particle/graphite-particle-2.png differ diff --git a/graphics/entity/particle/graphite-particle-3.png b/graphics/entity/particle/graphite-particle-3.png new file mode 100644 index 0000000..35c156a Binary files /dev/null and b/graphics/entity/particle/graphite-particle-3.png differ diff --git a/graphics/entity/particle/graphite-particle-4.png b/graphics/entity/particle/graphite-particle-4.png new file mode 100644 index 0000000..9f5115c Binary files /dev/null and b/graphics/entity/particle/graphite-particle-4.png differ diff --git a/graphics/entity/particle/graphite-particle-shadow-1.png b/graphics/entity/particle/graphite-particle-shadow-1.png new file mode 100644 index 0000000..89bfee9 Binary files /dev/null and b/graphics/entity/particle/graphite-particle-shadow-1.png differ diff --git a/graphics/entity/particle/graphite-particle-shadow-2.png b/graphics/entity/particle/graphite-particle-shadow-2.png new file mode 100644 index 0000000..7834934 Binary files /dev/null and b/graphics/entity/particle/graphite-particle-shadow-2.png differ diff --git a/graphics/entity/particle/graphite-particle-shadow-3.png b/graphics/entity/particle/graphite-particle-shadow-3.png new file mode 100644 index 0000000..6ef2544 Binary files /dev/null and b/graphics/entity/particle/graphite-particle-shadow-3.png differ diff --git a/graphics/entity/particle/graphite-particle-shadow-4.png b/graphics/entity/particle/graphite-particle-shadow-4.png new file mode 100644 index 0000000..a8aa006 Binary files /dev/null and b/graphics/entity/particle/graphite-particle-shadow-4.png differ diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png b/graphics/entity/particle/hr-graphite-particle-1.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-1.png rename to graphics/entity/particle/hr-graphite-particle-1.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png b/graphics/entity/particle/hr-graphite-particle-2.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-2.png rename to graphics/entity/particle/hr-graphite-particle-2.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png b/graphics/entity/particle/hr-graphite-particle-3.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-3.png rename to graphics/entity/particle/hr-graphite-particle-3.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png b/graphics/entity/particle/hr-graphite-particle-4.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-4.png rename to graphics/entity/particle/hr-graphite-particle-4.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png b/graphics/entity/particle/hr-graphite-particle-shadow-1.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-1.png rename to graphics/entity/particle/hr-graphite-particle-shadow-1.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png b/graphics/entity/particle/hr-graphite-particle-shadow-2.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-2.png rename to graphics/entity/particle/hr-graphite-particle-shadow-2.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png b/graphics/entity/particle/hr-graphite-particle-shadow-3.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-3.png rename to graphics/entity/particle/hr-graphite-particle-shadow-3.png diff --git a/bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png b/graphics/entity/particle/hr-graphite-particle-shadow-4.png similarity index 100% rename from bzcarbon2/graphics/entity/particle/hr-graphite-particle-shadow-4.png rename to graphics/entity/particle/hr-graphite-particle-shadow-4.png diff --git a/bzcarbon2/graphics/icons/Fullerene.png b/graphics/icons/Fullerene.png similarity index 100% rename from bzcarbon2/graphics/icons/Fullerene.png rename to graphics/icons/Fullerene.png diff --git a/sources/graphics/icons/Fullerene.xcf b/graphics/icons/Fullerene.xcf similarity index 100% rename from sources/graphics/icons/Fullerene.xcf rename to graphics/icons/Fullerene.xcf diff --git a/bzcarbon2/graphics/icons/activated-carbon.png b/graphics/icons/activated-carbon.png similarity index 100% rename from bzcarbon2/graphics/icons/activated-carbon.png rename to graphics/icons/activated-carbon.png diff --git a/bzcarbon2/graphics/icons/carbon-black.png b/graphics/icons/carbon-black.png similarity index 100% rename from bzcarbon2/graphics/icons/carbon-black.png rename to graphics/icons/carbon-black.png diff --git a/sources/graphics/icons/carbon-black.xcf b/graphics/icons/carbon-black.xcf similarity index 100% rename from sources/graphics/icons/carbon-black.xcf rename to graphics/icons/carbon-black.xcf diff --git a/bzcarbon2/graphics/icons/carbon-fiber.png b/graphics/icons/carbon-fiber.png similarity index 100% rename from bzcarbon2/graphics/icons/carbon-fiber.png rename to graphics/icons/carbon-fiber.png diff --git a/sources/graphics/icons/carbon-fiber.xcf b/graphics/icons/carbon-fiber.xcf similarity index 100% rename from sources/graphics/icons/carbon-fiber.xcf rename to graphics/icons/carbon-fiber.xcf diff --git a/bzcarbon2/graphics/icons/crucible.png b/graphics/icons/crucible.png similarity index 100% rename from bzcarbon2/graphics/icons/crucible.png rename to graphics/icons/crucible.png diff --git a/sources/graphics/icons/crucible.xcf b/graphics/icons/crucible.xcf similarity index 100% rename from sources/graphics/icons/crucible.xcf rename to graphics/icons/crucible.xcf diff --git a/bzcarbon2/graphics/icons/diamond.png b/graphics/icons/diamond.png similarity index 100% rename from bzcarbon2/graphics/icons/diamond.png rename to graphics/icons/diamond.png diff --git a/sources/graphics/icons/diamond.xcf b/graphics/icons/diamond.xcf similarity index 100% rename from sources/graphics/icons/diamond.xcf rename to graphics/icons/diamond.xcf diff --git a/bzcarbon2/graphics/icons/flake-graphite-1.png b/graphics/icons/flake-graphite-1.png similarity index 100% rename from bzcarbon2/graphics/icons/flake-graphite-1.png rename to graphics/icons/flake-graphite-1.png diff --git a/bzcarbon2/graphics/icons/flake-graphite-2.png b/graphics/icons/flake-graphite-2.png similarity index 100% rename from bzcarbon2/graphics/icons/flake-graphite-2.png rename to graphics/icons/flake-graphite-2.png diff --git a/bzcarbon2/graphics/icons/flake-graphite-3.png b/graphics/icons/flake-graphite-3.png similarity index 100% rename from bzcarbon2/graphics/icons/flake-graphite-3.png rename to graphics/icons/flake-graphite-3.png diff --git a/bzcarbon2/graphics/icons/flake-graphite-4.png b/graphics/icons/flake-graphite-4.png similarity index 100% rename from bzcarbon2/graphics/icons/flake-graphite-4.png rename to graphics/icons/flake-graphite-4.png diff --git a/bzcarbon2/graphics/icons/flake-graphite.png b/graphics/icons/flake-graphite.png similarity index 100% rename from bzcarbon2/graphics/icons/flake-graphite.png rename to graphics/icons/flake-graphite.png diff --git a/bzcarbon2/graphics/icons/graphene.png b/graphics/icons/graphene.png similarity index 100% rename from bzcarbon2/graphics/icons/graphene.png rename to graphics/icons/graphene.png diff --git a/sources/graphics/icons/graphene.xcf b/graphics/icons/graphene.xcf similarity index 100% rename from sources/graphics/icons/graphene.xcf rename to graphics/icons/graphene.xcf diff --git a/bzcarbon2/graphics/icons/graphite-1.png b/graphics/icons/graphite-1.png similarity index 100% rename from bzcarbon2/graphics/icons/graphite-1.png rename to graphics/icons/graphite-1.png diff --git a/sources/graphics/icons/graphite-1.xcf b/graphics/icons/graphite-1.xcf similarity index 100% rename from sources/graphics/icons/graphite-1.xcf rename to graphics/icons/graphite-1.xcf diff --git a/bzcarbon2/graphics/icons/graphite-2.png b/graphics/icons/graphite-2.png similarity index 100% rename from bzcarbon2/graphics/icons/graphite-2.png rename to graphics/icons/graphite-2.png diff --git a/sources/graphics/icons/graphite-2.xcf b/graphics/icons/graphite-2.xcf similarity index 100% rename from sources/graphics/icons/graphite-2.xcf rename to graphics/icons/graphite-2.xcf diff --git a/bzcarbon2/graphics/icons/graphite.png b/graphics/icons/graphite.png similarity index 100% rename from bzcarbon2/graphics/icons/graphite.png rename to graphics/icons/graphite.png diff --git a/sources/graphics/icons/graphite.xcf b/graphics/icons/graphite.xcf similarity index 100% rename from sources/graphics/icons/graphite.xcf rename to graphics/icons/graphite.xcf diff --git a/bzcarbon2/graphics/icons/nanotube.png b/graphics/icons/nanotube.png similarity index 100% rename from bzcarbon2/graphics/icons/nanotube.png rename to graphics/icons/nanotube.png diff --git a/sources/graphics/icons/nanotube.xcf b/graphics/icons/nanotube.xcf similarity index 100% rename from sources/graphics/icons/nanotube.xcf rename to graphics/icons/nanotube.xcf diff --git a/bzcarbon2/graphics/icons/pan.png b/graphics/icons/pan.png similarity index 100% rename from bzcarbon2/graphics/icons/pan.png rename to graphics/icons/pan.png diff --git a/bzcarbon2/graphics/icons/rough-diamond-1.png b/graphics/icons/rough-diamond-1.png similarity index 100% rename from bzcarbon2/graphics/icons/rough-diamond-1.png rename to graphics/icons/rough-diamond-1.png diff --git a/bzcarbon2/graphics/icons/rough-diamond-2.png b/graphics/icons/rough-diamond-2.png similarity index 100% rename from bzcarbon2/graphics/icons/rough-diamond-2.png rename to graphics/icons/rough-diamond-2.png diff --git a/bzcarbon2/graphics/icons/rough-diamond-3.png b/graphics/icons/rough-diamond-3.png similarity index 100% rename from bzcarbon2/graphics/icons/rough-diamond-3.png rename to graphics/icons/rough-diamond-3.png diff --git a/bzcarbon2/graphics/icons/rough-diamond-4.png b/graphics/icons/rough-diamond-4.png similarity index 100% rename from bzcarbon2/graphics/icons/rough-diamond-4.png rename to graphics/icons/rough-diamond-4.png diff --git a/bzcarbon2/graphics/icons/rough-diamond.png b/graphics/icons/rough-diamond.png similarity index 100% rename from bzcarbon2/graphics/icons/rough-diamond.png rename to graphics/icons/rough-diamond.png diff --git a/bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png b/graphics/icons/stacked/carbon-black-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/carbon-black-stacked.png rename to graphics/icons/stacked/carbon-black-stacked.png diff --git a/sources/graphics/icons/stacked/carbon-black-stacked.xcf b/graphics/icons/stacked/carbon-black-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/carbon-black-stacked.xcf rename to graphics/icons/stacked/carbon-black-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/crucible-stacked.png b/graphics/icons/stacked/crucible-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/crucible-stacked.png rename to graphics/icons/stacked/crucible-stacked.png diff --git a/sources/graphics/icons/stacked/crucible-stacked.xcf b/graphics/icons/stacked/crucible-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/crucible-stacked.xcf rename to graphics/icons/stacked/crucible-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/diamond-stacked.png b/graphics/icons/stacked/diamond-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/diamond-stacked.png rename to graphics/icons/stacked/diamond-stacked.png diff --git a/sources/graphics/icons/stacked/diamond-stacked.xcf b/graphics/icons/stacked/diamond-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/diamond-stacked.xcf rename to graphics/icons/stacked/diamond-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png b/graphics/icons/stacked/flake-graphite-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/flake-graphite-stacked.png rename to graphics/icons/stacked/flake-graphite-stacked.png diff --git a/sources/graphics/icons/stacked/flake-graphite-stacked.xcf b/graphics/icons/stacked/flake-graphite-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/flake-graphite-stacked.xcf rename to graphics/icons/stacked/flake-graphite-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/fullerene-stacked.png b/graphics/icons/stacked/fullerene-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/fullerene-stacked.png rename to graphics/icons/stacked/fullerene-stacked.png diff --git a/sources/graphics/icons/stacked/fullerene-stacked.xcf b/graphics/icons/stacked/fullerene-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/fullerene-stacked.xcf rename to graphics/icons/stacked/fullerene-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/graphene-stacked.png b/graphics/icons/stacked/graphene-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/graphene-stacked.png rename to graphics/icons/stacked/graphene-stacked.png diff --git a/sources/graphics/icons/stacked/graphene-stacked.xcf b/graphics/icons/stacked/graphene-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/graphene-stacked.xcf rename to graphics/icons/stacked/graphene-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/graphite-stacked.png b/graphics/icons/stacked/graphite-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/graphite-stacked.png rename to graphics/icons/stacked/graphite-stacked.png diff --git a/sources/graphics/icons/stacked/graphite-stacked.xcf b/graphics/icons/stacked/graphite-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/graphite-stacked.xcf rename to graphics/icons/stacked/graphite-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/nanotube-stacked.png b/graphics/icons/stacked/nanotube-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/nanotube-stacked.png rename to graphics/icons/stacked/nanotube-stacked.png diff --git a/sources/graphics/icons/stacked/nanotube-stacked.xcf b/graphics/icons/stacked/nanotube-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/nanotube-stacked.xcf rename to graphics/icons/stacked/nanotube-stacked.xcf diff --git a/bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png b/graphics/icons/stacked/rough-diamond-stacked.png similarity index 100% rename from bzcarbon2/graphics/icons/stacked/rough-diamond-stacked.png rename to graphics/icons/stacked/rough-diamond-stacked.png diff --git a/sources/graphics/icons/stacked/rough-diamond-stacked.xcf b/graphics/icons/stacked/rough-diamond-stacked.xcf similarity index 100% rename from sources/graphics/icons/stacked/rough-diamond-stacked.xcf rename to graphics/icons/stacked/rough-diamond-stacked.xcf diff --git a/bzcarbon2/graphics/technology/carbon-fiber.png b/graphics/technology/carbon-fiber.png similarity index 100% rename from bzcarbon2/graphics/technology/carbon-fiber.png rename to graphics/technology/carbon-fiber.png diff --git a/bzcarbon2/graphics/technology/diamond-processing.png b/graphics/technology/diamond-processing.png similarity index 100% rename from bzcarbon2/graphics/technology/diamond-processing.png rename to graphics/technology/diamond-processing.png diff --git a/bzcarbon2/graphics/technology/fluid-mining.png b/graphics/technology/fluid-mining.png similarity index 100% rename from bzcarbon2/graphics/technology/fluid-mining.png rename to graphics/technology/fluid-mining.png diff --git a/bzcarbon2/graphics/technology/graphite-processing.png b/graphics/technology/graphite-processing.png similarity index 100% rename from bzcarbon2/graphics/technology/graphite-processing.png rename to graphics/technology/graphite-processing.png diff --git a/info.json b/info.json new file mode 100644 index 0000000..3cc817e --- /dev/null +++ b/info.json @@ -0,0 +1,27 @@ +{ + "name": "bzcarbon", + "version": "2.0.20", + "factorio_version": "2.0", + "title": "Graphite & Diamonds", + "author": "Brevven", + "contact": "", + "homepage": "", + "dependencies": [ + "base >= 2.0.42", + "? space-age", + "? bztitanium", + "? bzsilicon", + "? bzzirconium", + "? bzfoundry", + "? space-exploration", + "? aai-industry", + "? Krastorio2", + "? Krastorio2-spaced-out", + "? 248k-Redux", + "(?) modmashsplintersubspacelogistics", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating" + ], + "description": "Adds elemental carbon items to the game, including graphite, diamonds, graphene, and more.\n\nCompatible with Space Age, and more. A standalone piece of BZ Mods" +} + diff --git a/bzcarbon2/locale/de/carbon.cfg b/locale/de/carbon.cfg similarity index 100% rename from bzcarbon2/locale/de/carbon.cfg rename to locale/de/carbon.cfg diff --git a/bzcarbon2/locale/en/carbon.cfg b/locale/en/carbon.cfg similarity index 100% rename from bzcarbon2/locale/en/carbon.cfg rename to locale/en/carbon.cfg diff --git a/bzcarbon2/locale/ja/carbon.cfg b/locale/ja/carbon.cfg similarity index 100% rename from bzcarbon2/locale/ja/carbon.cfg rename to locale/ja/carbon.cfg diff --git a/bzcarbon2/locale/ko/carbon.cfg b/locale/ko/carbon.cfg similarity index 100% rename from bzcarbon2/locale/ko/carbon.cfg rename to locale/ko/carbon.cfg diff --git a/bzcarbon2/locale/pl/carbon.cfg b/locale/pl/carbon.cfg similarity index 100% rename from bzcarbon2/locale/pl/carbon.cfg rename to locale/pl/carbon.cfg diff --git a/bzcarbon2/locale/ru/carbon.cfg b/locale/ru/carbon.cfg similarity index 100% rename from bzcarbon2/locale/ru/carbon.cfg rename to locale/ru/carbon.cfg diff --git a/bzcarbon2/locale/zh-CN/bzcarbon.cfg b/locale/zh-CN/bzcarbon.cfg similarity index 100% rename from bzcarbon2/locale/zh-CN/bzcarbon.cfg rename to locale/zh-CN/bzcarbon.cfg diff --git a/bzcarbon2/map-gen-preset-updates.lua b/map-gen-preset-updates.lua similarity index 100% rename from bzcarbon2/map-gen-preset-updates.lua rename to map-gen-preset-updates.lua diff --git a/bzcarbon2/me.lua b/me.lua similarity index 99% rename from bzcarbon2/me.lua rename to me.lua index c63d486..d749a88 100644 --- a/bzcarbon2/me.lua +++ b/me.lua @@ -1,6 +1,6 @@ local me = {} -me.name = "bzcarbon2" +me.name = "bzcarbon" me.resources = {} -- see end of file me.list = {} diff --git a/migrations/bzcarbon.0.4.7.json b/migrations/bzcarbon.0.4.7.json new file mode 100644 index 0000000..1d6aeab --- /dev/null +++ b/migrations/bzcarbon.0.4.7.json @@ -0,0 +1,8 @@ +{ + "recipe": [ + ["imersium-gear-wheel-nanotubes", "kr-s-c-imersium-gear-wheel-nanotubes"], + ["imersium-beam-nanotubes", "kr-s-c-imersium-beam-nanotubes"], + ["aeroframe-scaffold-nanotubes", "se-aeroframe-scaffold-nanotubes"], + ["nanomaterial-nanotubes", "se-nanomaterial-nanotubes"] + ] +} diff --git a/bzcarbon2/nanotubes-final.lua b/nanotubes-final.lua similarity index 100% rename from bzcarbon2/nanotubes-final.lua rename to nanotubes-final.lua diff --git a/bzcarbon2/prototypes/activated-carbon.lua b/prototypes/activated-carbon.lua similarity index 82% rename from bzcarbon2/prototypes/activated-carbon.lua rename to prototypes/activated-carbon.lua index 67774c8..160732f 100644 --- a/bzcarbon2/prototypes/activated-carbon.lua +++ b/prototypes/activated-carbon.lua @@ -7,7 +7,7 @@ if mods["wood-industry"] then precursor = "charcoal" end { type = "item", name = "activated-carbon", - icon = "__bzcarbon2__/graphics/icons/activated-carbon.png", + icon = "__bzcarbon__/graphics/icons/activated-carbon.png", icon_size = 128, subgroup = "intermediate-product", order = "g[activated-carbon]", @@ -20,7 +20,7 @@ if mods["wood-industry"] then precursor = "charcoal" end order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["ammonia"] and + ingredients = data.raw.fluid["kr-ammonia"] and { util.item(precursor), util.fluid("steam"), @@ -38,14 +38,14 @@ if mods["wood-industry"] then precursor = "charcoal" end name = "activated-carbon-black", localised_name = {"item-name.activated-carbon"}, icons = { - { icon = "__bzcarbon2__/graphics/icons/activated-carbon.png", icon_size = 128}, - { icon = "__bzcarbon2__/graphics/icons/carbon-black.png", icon_size = 64, scale = 0.25, shift = {-8, -8}}, + { icon = "__bzcarbon__/graphics/icons/activated-carbon.png", icon_size = 128}, + { icon = "__bzcarbon__/graphics/icons/carbon-black.png", icon_size = 64, scale = 0.25, shift = {-8, -8}}, }, category = "chemistry", order = "d[graphite-carbon-fiber]", enabled = false, energy_required = 2.5, - ingredients = data.raw.fluid["ammonia"] and + ingredients = data.raw.fluid["kr-ammonia"] and { util.item("carbon-black", 5), util.fluid("steam"), diff --git a/bzcarbon2/prototypes/basic-crusher.lua b/prototypes/basic-crusher.lua similarity index 100% rename from bzcarbon2/prototypes/basic-crusher.lua rename to prototypes/basic-crusher.lua diff --git a/bzcarbon2/prototypes/carbon-asteroid-updates.lua b/prototypes/carbon-asteroid-updates.lua similarity index 83% rename from bzcarbon2/prototypes/carbon-asteroid-updates.lua rename to prototypes/carbon-asteroid-updates.lua index 174afc1..8e2b30a 100644 --- a/bzcarbon2/prototypes/carbon-asteroid-updates.lua +++ b/prototypes/carbon-asteroid-updates.lua @@ -18,10 +18,10 @@ if mods["space-age"] then icons = { {icon="__space-age__/graphics/icons/carbonic-asteroid-crushing.png", size=64}, - {icon="__bzcarbon2__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}}, - {icon="__bzcarbon2__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}}, + {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}}, + {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}}, }, - category = "crushing", + category = "kr-crushing", subgroup="space-crushing", order = "b-a-z-b", auto_recycle = false, diff --git a/bzcarbon2/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua similarity index 88% rename from bzcarbon2/prototypes/carbon-fiber.lua rename to prototypes/carbon-fiber.lua index 492304d..a693eab 100644 --- a/bzcarbon2/prototypes/carbon-fiber.lua +++ b/prototypes/carbon-fiber.lua @@ -19,7 +19,7 @@ if mods["space-age"] then util.item("spoilage", 1), }, results = { - util.fluid("ammonia", 10), + util.fluid("kr-ammonia", 10), }, } }) @@ -28,7 +28,7 @@ data:extend({ { type = "item", name = "polyacrylonitrile", - icon = "__bzcarbon2__/graphics/icons/pan.png", + icon = "__bzcarbon__/graphics/icons/pan.png", icon_size = 128, subgroup = "intermediate-product", order = "g[graphite-acrylic-fiber]", @@ -58,10 +58,10 @@ if mods["space-age"] then util.remove_ingredient("polyacrylonitrile", "petroleum-gas") util.add_ingredient("polyacrylonitrile", "jelly", 10) util.add_ingredient("polyacrylonitrile", "jelly", 10) - util.add_ingredient("polyacrylonitrile", "ammonia", 10) - util.add_ingredient("carbon-fiber", "ammonia", 10) + util.add_ingredient("polyacrylonitrile", "kr-ammonia", 10) + util.add_ingredient("carbon-fiber", "kr-ammonia", 10) util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile") - util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon2__/graphics/icons/carbon-fiber.png", icon_size = 128,} }) + util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} }) util.add_unlock("biochamber", "ammonia-from-spoilage") util.add_unlock("carbon-fiber", "polyacrylonitrile") else @@ -69,7 +69,7 @@ else { type = "item", name = "carbon-fiber", - icon = "__bzcarbon2__/graphics/icons/carbon-fiber.png", + icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128, subgroup = "intermediate-product", order = "g[graphite-carbon-fiber]", @@ -97,7 +97,7 @@ else type = "technology", name = "carbon-fiber", icon_size = 256, - icon = "__bzcarbon2__/graphics/technology/carbon-fiber.png", + icon = "__bzcarbon__/graphics/technology/carbon-fiber.png", effects = { {type="unlock-recipe", recipe="polyacrylonitrile"}, {type="unlock-recipe", recipe="carbon-fiber"}, diff --git a/prototypes/diamond-particle.lua b/prototypes/diamond-particle.lua new file mode 100644 index 0000000..f526947 --- /dev/null +++ b/prototypes/diamond-particle.lua @@ -0,0 +1,144 @@ +data:extend( +{ + { + type = "optimized-particle", + name = "diamond-particle", + flags = {"not-on-map"}, + life_time = 180, + pictures = + { + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-1.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-1.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-2.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-2.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-3.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-3.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-4.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-4.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + } + }, + shadows = + { + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-shadow-1.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-1.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-shadow-2.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-2.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-shadow-3.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-3.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + }, + { + filename = "__bzcarbon__/graphics/entity/particle/graphite-particle-shadow-4.png", + priority = "extra-high", + width = 16, + height = 16, + frame_count = 1, + hr_version = + { + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-4.png", + priority = "extra-high", + width = 32, + height = 32, + frame_count = 1, + scale = 0.5 + } + } + } + } +} +) diff --git a/bzcarbon2/prototypes/diamond.lua b/prototypes/diamond.lua similarity index 78% rename from bzcarbon2/prototypes/diamond.lua rename to prototypes/diamond.lua index 0bc8c46..9dc97a1 100644 --- a/bzcarbon2/prototypes/diamond.lua +++ b/prototypes/diamond.lua @@ -28,7 +28,7 @@ data:extend({ { type = "resource", name = "diamond", - icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", + icon = "__bzcarbon__/graphics/icons/rough-diamond.png", icon_size = 128, flags = {"placeable-neutral"}, order="a-b-a", @@ -56,7 +56,7 @@ data:extend({ { sheet = { - filename = "__bzcarbon2__/graphics/entity/ores/hr-diamond.png", + filename = "__bzcarbon__/graphics/entity/ores/hr-diamond.png", priority = "extra-high", size = 128, frame_count = 8, @@ -69,13 +69,13 @@ data:extend({ type = "item", name = "rough-diamond", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/rough-diamond.png", + icon = "__bzcarbon__/graphics/icons/rough-diamond.png", pictures = { - {filename="__bzcarbon2__/graphics/icons/rough-diamond.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/rough-diamond-1.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/rough-diamond-2.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/rough-diamond-3.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/rough-diamond-4.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/rough-diamond.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/rough-diamond-1.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/rough-diamond-2.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/rough-diamond-3.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/rough-diamond-4.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, diff --git a/bzcarbon2/prototypes/graphite-particle.lua b/prototypes/graphite-particle.lua similarity index 64% rename from bzcarbon2/prototypes/graphite-particle.lua rename to prototypes/graphite-particle.lua index 12898a9..703192f 100644 --- a/bzcarbon2/prototypes/graphite-particle.lua +++ b/prototypes/graphite-particle.lua @@ -8,7 +8,7 @@ data:extend( pictures = { { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-1.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-1.png", priority = "extra-high", width = 32, height = 32, @@ -16,7 +16,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-2.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-2.png", priority = "extra-high", width = 32, height = 32, @@ -24,7 +24,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-3.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-3.png", priority = "extra-high", width = 32, height = 32, @@ -32,7 +32,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-4.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-4.png", priority = "extra-high", width = 32, height = 32, @@ -43,7 +43,7 @@ data:extend( shadows = { { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-1.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-1.png", priority = "extra-high", width = 32, height = 32, @@ -51,7 +51,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-2.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-2.png", priority = "extra-high", width = 32, height = 32, @@ -59,7 +59,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-3.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-3.png", priority = "extra-high", width = 32, height = 32, @@ -67,7 +67,7 @@ data:extend( scale = 0.5 }, { - filename = "__bzcarbon2__/graphics/entity/particle/hr-graphite-particle-shadow-4.png", + filename = "__bzcarbon__/graphics/entity/particle/hr-graphite-particle-shadow-4.png", priority = "extra-high", width = 32, height = 32, diff --git a/bzcarbon2/prototypes/graphite.lua b/prototypes/graphite.lua similarity index 77% rename from bzcarbon2/prototypes/graphite.lua rename to prototypes/graphite.lua index 34d7293..a4eaaa9 100644 --- a/bzcarbon2/prototypes/graphite.lua +++ b/prototypes/graphite.lua @@ -28,7 +28,7 @@ data:extend({ { type = "resource", name = "graphite", - icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", + icon = "__bzcarbon__/graphics/icons/flake-graphite.png", icon_size = 128, flags = {"placeable-neutral"}, order="a-b-a", @@ -60,7 +60,7 @@ data:extend({ { sheet = { - filename = "__bzcarbon2__/graphics/entity/ores/hr-graphite.png", + filename = "__bzcarbon__/graphics/entity/ores/hr-graphite.png", priority = "extra-high", size = 128, frame_count = 8, @@ -73,13 +73,13 @@ data:extend({ type = "item", name = "flake-graphite", icon_size = 128, - icon = "__bzcarbon2__/graphics/icons/flake-graphite.png", + icon = "__bzcarbon__/graphics/icons/flake-graphite.png", pictures = { - {filename="__bzcarbon2__/graphics/icons/flake-graphite.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/flake-graphite-1.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/flake-graphite-2.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/flake-graphite-3.png", size=128, scale=0.25}, - {filename="__bzcarbon2__/graphics/icons/flake-graphite-4.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/flake-graphite.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/flake-graphite-1.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/flake-graphite-2.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/flake-graphite-3.png", size=128, scale=0.25}, + {filename="__bzcarbon__/graphics/icons/flake-graphite-4.png", size=128, scale=0.25}, }, inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, diff --git a/bzcarbon2/settings-util.lua b/settings-util.lua similarity index 100% rename from bzcarbon2/settings-util.lua rename to settings-util.lua diff --git a/bzcarbon2/settings.lua b/settings.lua similarity index 98% rename from bzcarbon2/settings.lua rename to settings.lua index e125c21..996a706 100644 --- a/bzcarbon2/settings.lua +++ b/settings.lua @@ -62,7 +62,7 @@ if not mods["space-age"] and not mods["rso-mod"] then }, }) end -if mods.bzchlorine2 then +if mods.bzchlorine then data:extend({ { type = "string-setting", diff --git a/bzcarbon2/strange-matter.lua b/strange-matter.lua similarity index 94% rename from bzcarbon2/strange-matter.lua rename to strange-matter.lua index aff7bfa..b2b36a4 100644 --- a/bzcarbon2/strange-matter.lua +++ b/strange-matter.lua @@ -1,7 +1,7 @@ local util = require("data-util"); local ore = "flake-graphite" -local ore_icon = "__bzcarbon2__/graphics/icons/flake-graphite.png" +local ore_icon = "__bzcarbon__/graphics/icons/flake-graphite.png" if util.me.use_flake_graphite() and mods["StrangeMatter"] then data:extend({ diff --git a/bzcarbon2/tech-triggers.lua b/tech-triggers.lua similarity index 100% rename from bzcarbon2/tech-triggers.lua rename to tech-triggers.lua diff --git a/bzcarbon2/thumbnail.png b/thumbnail.png similarity index 100% rename from bzcarbon2/thumbnail.png rename to thumbnail.png diff --git a/sources/thumbnail.xcf b/thumbnail.xcf similarity index 100% rename from sources/thumbnail.xcf rename to thumbnail.xcf