diff --git a/.gitignore b/.gitignore index c5678a0..d929479 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.zip -.idea \ No newline at end of file +.idea +.vscode \ No newline at end of file diff --git a/README.md b/README.md index 7c16569..4a8ff35 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ This mod extends the early game of Space Age by putting you on the moon "Lignumi The duration of the stay on Lignumis will be rather short. The impact of the later game will still be substantial (once implemented). +**If you start a new game, check out the setting for adding Basic circuit boards.** + ## Mod recommendations The following mods can be a great addition for this mod: @@ -10,6 +12,10 @@ The following mods can be a great addition for this mod: There will be fewer inserters that need to be fueled manually. +#### [Diversitree](https://mods.factorio.com/mod/Diversitree) + +Planted trees will have more than one variant. + #### [Hot metals](https://mods.factorio.com/mod/hot-metals) If you like the idea that metals need to cool down after being smolten in a furnace, Lignumis gold has support for hot metals. @@ -22,23 +28,44 @@ If you want more of it than Lignumis offers, add this mod. It adds ammo for shot If you like go more into the charcoal direction. It has no overlap with Lignumis and starts to get relevant on Nauvis. -#### [Fulgora: Coralmium Agriculture](https://mods.factorio.com/mod/fulgora-coralmium-agriculture) and [Wooden Vulcanus: Sulfuric Bacteria](https://mods.factorio.com/mod/vulcanus-sulfuric-bacteria) +#### [Wooden Fulgora: Coralmium Agriculture](https://mods.factorio.com/mod/fulgora-coralmium-agriculture), [Wooden Vulcanus: Sulfuric Bacteria](https://mods.factorio.com/mod/vulcanus-sulfuric-bacteria) and [Wooden Aquilo: Seabloom Algaculture](https://mods.factorio.com/mod/aquilo-seabloom-algaculture) For wood on the other planets. +#### [AAI Loaders](https://mods.factorio.com/mod/aai-loaders) + +A wooden loader is added when this mod is active. Also supports [AAI Loaders, a sane rebalance](https://mods.factorio.com/mod/aai-loaders-sane). + +#### [AAI Industry](https://mods.factorio.com/mod/aai-industry) + +Add this for increased complexity in the early Nauvis game. It has no effect on Lignumis, but Lignumis changes a few recipes this mod adds. + +#### [Brevven's mods](https://mods.factorio.com/user/brevven) + +For even more complexity after Lignumis. They currently don't change anything on Lignumis itself. + ## Compatibility with other planet mods The following planet mods are tested for (at least technical) compatibility: - [Castra](https://mods.factorio.com/mod/castra) -- [Cerys](https://mods.factorio.com/mod/Cerys-Moon-of-Fulgora) +- [Cerys](https://mods.factorio.com/mod/Cerys-Moon-of-Fulgora) + [Wooden Cerys: Lunaponics](https://mods.factorio.com/mod/cerys-lunaponics) - [Corrundum](https://mods.factorio.com/mod/corrundum) +- [Cubium](https://mods.factorio.com/mod/cubium) +- [Dea Dia System](https://mods.factorio.com/mod/dea-dia-system) - [Janus](https://mods.factorio.com/mod/janus) - [Maraxsis](https://mods.factorio.com/mod/maraxsis) +- [Moshine](https://mods.factorio.com/mod/Moshine) - [Muluna](https://mods.factorio.com/mod/planet-muluna) - [Terra Palus](https://mods.factorio.com/mod/terrapalus) - [Secretas & Frozeta](https://mods.factorio.com/mod/secretas) +## Problematic / incompatible mods + +* Mods that let you start on a different planet: They are supported, but you are missing half of the content of this mod. +* Alien Biomes: Lignumis won't have any trees. It's playable, but not as intended. +* The rest of the Wooden Universe: I marked the ones incompatible that don't make sense to combine or that wouldn't add more that is not already included. + ## Add compatibility to your mod Lignumis, by default, adds wood and steam science packs during `data-updates.lua` to all technologies that match certain criteria. @@ -68,6 +95,8 @@ These technologies are skipped even if they are matches according to above lists Use this list if you want to have wood and steam science packs added to most of your technologies, but skip some. Lignumis uses this list for technologies that match the whitelist but are required for coming back to Lignumis in order to create the science pack export. +As an alternative, you can add `lignumis_skip_science_packs = true` to any technology. + #### `lab_blacklist` Don't touch inputs for labs in this list. @@ -82,19 +111,20 @@ If your modded lab is special and it should not support these science packs, use - https://lua-api.factorio.com/latest/types/TreeVariation.html - Improve transition to Nauvis a bit more - Add late-game recipe for oil from wood pulp -- Replace usage of gold cable with basic circuits made of wood and gold cable, add option for progressive circuit recipes and add recipe prod research -- Compatibility with [Amator Phasma's Coal & Steam (forked)](https://mods.factorio.com/mod/apm_power_ldinc) -- Compatibility with [AAI Industry](https://mods.factorio.com/mod/aai-industry) +- Find a better message when transitioning to Nauvis +- Add information in Factoriopedia - Compatibility with [On Wayward Seas](https://mods.factorio.com/mod/wayward-seas) -- Compatibility with [Planet Picker](https://mods.factorio.com/mod/planet-picker) -- Compatibility with [Visible Planets in Space](https://mods.factorio.com/mod/visible-planets) - Compatibility with [Noble Metals](https://mods.factorio.com/mod/bzgold) once it's updated +- Check if creating a separate group for Lignumis recipes/items makes sense +- Only create 1 cutscene per game in multiplayer +- Think about moving Lumber mill to later and let it use electricity. ## Credits ### Translations - Simplified chinese (zh-CN): cyx2015s +- Polish (pl): StarGazer ### Assets diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 58ce704..ccbe2c2 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,4 +1,102 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.26 +Date: 28.02.2025 + Bug Fixes: + - Add missing dependency +--------------------------------------------------------------------------------------------------- +Version: 1.0.25 +Date: 28.02.2025 + Changes: + - Move assets to a separate mod + Bug Fixes: + - Don't trigger changing surface trigger for non player controllers + - Fix crash due to nil value in recipe ingredients +--------------------------------------------------------------------------------------------------- +Version: 1.0.24 +Date: 28.02.2025 + Changes: + - AAI Industry: Burner agricultural towers can burn processed fuel + - Add "pressing" recipe category to assemblers + - Add optional Basic circuit board (default off to not break existing games) + Bug Fixes: + - AAI Loaders: Fix circuit recipe name and icon +--------------------------------------------------------------------------------------------------- +Version: 1.0.23 +Date: 26.02.2025 + Changes: + - Add compatibility for the mod "Nuclear Science" +--------------------------------------------------------------------------------------------------- +Version: 1.0.22 +Date: 26.02.2025 + Changes: + - Balance moist stromatolite remnant desiccation (more steam, less peat; replace furnaces if they don't work anymore) + - Burner long handed inserter uses less energy + - Update polish translations + - Add compatibility for the mods "AAI Loaders" / "AAI Loaders, a sane rebalance" +--------------------------------------------------------------------------------------------------- +Version: 1.0.21 +Date: 25.02.2025 + Changes: + - Add more crafting categories to the assemblers (needed for early Nauvis crafting) + - Always show physical weapon technologies level 3 (for when you skipped it on Lignumis) + - Add polish translations (thanks StarGazer) + - Add recipe for Burner assembling machine for Nauvis (using electronic circuits) + - Burner assembler emits pollution on Nauvis + - Modding: Add lignumis_skip_science_packs as a way to prevent science packs being added to technologies +--------------------------------------------------------------------------------------------------- +Version: 1.0.20 +Date: 24.02.2025 + Changes: + - Add compatibility for the mod "Diversitree" + - Add "ignore_tech_cost_multiplier" to "tree-seeding + Bug Fixes: + - Update compatibility for Cerys +--------------------------------------------------------------------------------------------------- +Version: 1.0.19 +Date: 23.02.2025 + Changes: + - Add setting "Enable progressive technologies" +--------------------------------------------------------------------------------------------------- +Version: 1.0.18 +Date: 16.02.2025 + Breaking Changes: + - Double numbers for gold ore (both production and usage; it doesn't really break anything but it could mess with the throughput) + Changes: + - AAI Industry: Keep the technology changes AAI Industry makes + - Autoplaced gold stromatolites are trees now that can be harvested by the agricultural tower + - Use Bioprocessing tab (you need to install the new dependency) + Bug Fixes: + - AAI Industry: Wood science pack can be crafted by hand +--------------------------------------------------------------------------------------------------- +Version: 1.0.17 +Date: 16.02.2025 + Bug Fixes: + - Basic radar can be crafted in the steam assembler again + - Wood liquefaction is available both for steam assembler and assembler mk2 + - Fix crash with "Fulgora Lives" active +--------------------------------------------------------------------------------------------------- +Version: 1.0.16 +Date: 15.02.2025 + Bug Fixes: + - Fix trees not being plantable on Nauvis with Alien Biomes active + - Add compatibility for mods that change the quality technologies +--------------------------------------------------------------------------------------------------- +Version: 1.0.15 +Date: 15.02.2025 + Changes: + - Add compatibility with AAI Industry + - Add compatibility with Planet Picker + - Improve progressive belt recipes (yellow undies and splitters used to require both the lower tier and yellow belts) + - Nutrients from wood pulp can be crafted in the biochamber + - Have a separate recipe for steam science that only uses steam as fuel for the steam assembler (no two input pipes with the same fluid anymore) + - You can't leave Lignumis before researching Nauvis discovery + - Prevent getting Stuck on Nauvis by changing prerequisites of Nauvis technologies and removing pre-research on Lignumis +--------------------------------------------------------------------------------------------------- +Version: 1.0.14 +Date: 14.02.2025 + Changes: + - Add compatibility to stable Factorio version again +--------------------------------------------------------------------------------------------------- Version: 1.0.13 Date: 13.02.2025 Changes: diff --git a/lignumis/data-final-fixes.lua b/lignumis/data-final-fixes.lua index 866c65d..02e2978 100644 --- a/lignumis/data-final-fixes.lua +++ b/lignumis/data-final-fixes.lua @@ -1 +1,2 @@ -require("prototypes/content/final") \ No newline at end of file +require("prototypes/content/final") +require("prototypes/compatibility/final") \ No newline at end of file diff --git a/lignumis/data-updates.lua b/lignumis/data-updates.lua index bac377e..3ab5349 100644 --- a/lignumis/data-updates.lua +++ b/lignumis/data-updates.lua @@ -1,2 +1,3 @@ require("prototypes/content/updates") -require("prototypes/integrations/updates") \ No newline at end of file +require("prototypes/integrations/updates") +require("prototypes/compatibility/updates") \ No newline at end of file diff --git a/lignumis/data.lua b/lignumis/data.lua index 26aeedd..6508692 100644 --- a/lignumis/data.lua +++ b/lignumis/data.lua @@ -6,7 +6,7 @@ Lignumis = { science_pack_blacklist = { "wood-science-pack", "steam-science-pack", -- Lignumis "nanite-science-pack", "quantum-science-pack", "ring-science-pack", -- Metal and Stars - "cerys-science-pack" -- Cerys + "cerys-science-pack", "cerysian-science-pack" -- Cerys }, -- These technologies are skipped even if they are matches according to above lists @@ -15,16 +15,27 @@ Lignumis = { "logistic-system", "space-platform-thruster", "kovarex-enrichment-process", - "astroponics" + "astroponics", + "planet-discovery-nauvis", + "planet-discovery-lignumis" }, -- Add wood and steam science packs to all labs' inputs except these lab_blacklist = { "wood-lab", -- Lignumis "cerys-lab" -- Cerys - } + }, + + assets = "__lignumis-assets__/" } +Lignumis.graphics = Lignumis.assets .. "graphics/" +Lignumis.sound = Lignumis.assets .. "sound/" + +if not settings.startup["lignumis-technology-progression"].value then + Lignumis.science_pack_whitelist = {} +end + require("__cf-lib__/util") require("prototypes/content/data") diff --git a/lignumis/graphics/empty-quality-catalyst-slot.png b/lignumis/graphics/empty-quality-catalyst-slot.png deleted file mode 100644 index 156373e..0000000 Binary files a/lignumis/graphics/empty-quality-catalyst-slot.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-remnants.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-remnants.png deleted file mode 100644 index 2e2d49d..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-working.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-working.png deleted file mode 100644 index 89fedd7..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-working.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper.png deleted file mode 100644 index ec277aa..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-remnants.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-remnants.png deleted file mode 100644 index 986e6b4..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-working.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-working.png deleted file mode 100644 index 6e77498..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-working.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold.png b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold.png deleted file mode 100644 index 0e709f0..0000000 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-base.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-base.png deleted file mode 100644 index 8683315..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-base.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png deleted file mode 100644 index 8b1ac5c..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png deleted file mode 100644 index 1526d02..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png deleted file mode 100644 index cacc464..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png deleted file mode 100644 index 90e93dd..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png deleted file mode 100644 index 31740b6..0000000 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png and /dev/null differ diff --git a/lignumis/graphics/entity/basic-radar.png b/lignumis/graphics/entity/basic-radar.png deleted file mode 100644 index d6f27d6..0000000 Binary files a/lignumis/graphics/entity/basic-radar.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-base.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-base.png deleted file mode 100644 index 4aed8ad..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-base.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.png deleted file mode 100644 index 5d6fde4..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.png deleted file mode 100644 index 0d6f2f8..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.png deleted file mode 100644 index 8ba0ade..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.png deleted file mode 100644 index eb2b874..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.png deleted file mode 100644 index 1bfc96e..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.png deleted file mode 100644 index 096ffef..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.png deleted file mode 100644 index 3933139..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.png deleted file mode 100644 index 177e4db..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.png deleted file mode 100644 index bd7eeee..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.png deleted file mode 100644 index 414f62b..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.png deleted file mode 100644 index 9b2ee2e..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.png deleted file mode 100644 index e05375e..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.png deleted file mode 100644 index f4bf2f0..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.png deleted file mode 100644 index 57d12ad..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.png deleted file mode 100644 index db1671b..0000000 Binary files a/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine-remnants.png b/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine-remnants.png deleted file mode 100644 index e69a8ca..0000000 Binary files a/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine.png b/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine.png deleted file mode 100644 index ab57916..0000000 Binary files a/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-base.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-base.png deleted file mode 100644 index a0bc27d..0000000 Binary files a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-base.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-closed.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-closed.png deleted file mode 100644 index c053e4c..0000000 Binary files a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-closed.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-open.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-open.png deleted file mode 100644 index 2acadd0..0000000 Binary files a/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-open.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-inserter/burner-inserter-platform.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-platform.png deleted file mode 100644 index 14e2f25..0000000 Binary files a/lignumis/graphics/entity/burner-inserter/burner-inserter-platform.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-inserter/burner-inserter-remnants.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-remnants.png deleted file mode 100644 index 7b6e67c..0000000 Binary files a/lignumis/graphics/entity/burner-inserter/burner-inserter-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.png deleted file mode 100644 index 060bc5d..0000000 Binary files a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.png deleted file mode 100644 index fb85c55..0000000 Binary files a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.png deleted file mode 100644 index 142bdcd..0000000 Binary files a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.png deleted file mode 100644 index 7727b3b..0000000 Binary files a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.png deleted file mode 100644 index 75560a3..0000000 Binary files a/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-E.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-E.png deleted file mode 100644 index d05bbf8..0000000 Binary files a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-E.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-N.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-N.png deleted file mode 100644 index a6fb519..0000000 Binary files a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-N.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-S.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-S.png deleted file mode 100644 index 35686e6..0000000 Binary files a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-S.png and /dev/null differ diff --git a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-W.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-W.png deleted file mode 100644 index 3ef46c2..0000000 Binary files a/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-W.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-patch.png b/lignumis/graphics/entity/gold-patch.png deleted file mode 100644 index 7126493..0000000 Binary files a/lignumis/graphics/entity/gold-patch.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png deleted file mode 100644 index 128d746..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png deleted file mode 100644 index dc05d92..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png deleted file mode 100644 index fff5959..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png deleted file mode 100644 index 2a35731..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-east.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-east.png deleted file mode 100644 index 19cbe46..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-east.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-north.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-north.png deleted file mode 100644 index 2a97937..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-north.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-south.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-south.png deleted file mode 100644 index 91215a3..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-south.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-west.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-west.png deleted file mode 100644 index 86512d4..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-west.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png deleted file mode 100644 index bd08152..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-down.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-down.png deleted file mode 100644 index a1c9d48..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-down.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-left.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-left.png deleted file mode 100644 index ea878fa..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-left.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-right.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-right.png deleted file mode 100644 index 849f635..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-up.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-up.png deleted file mode 100644 index 60cfe92..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-up.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png deleted file mode 100644 index 55417c5..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png deleted file mode 100644 index 006c388..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png deleted file mode 100644 index 2e7404a..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png deleted file mode 100644 index feba002..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png deleted file mode 100644 index 5a64abe..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png deleted file mode 100644 index dd0de5f..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-down.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-down.png deleted file mode 100644 index 9ca4227..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-down.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-left.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-left.png deleted file mode 100644 index 7b29ab7..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-left.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-right.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-right.png deleted file mode 100644 index 9f7d8fe..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-up.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-up.png deleted file mode 100644 index 660428a..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-up.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png deleted file mode 100644 index a09c842..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png deleted file mode 100644 index 362e2f4..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png deleted file mode 100644 index c539d5d..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png deleted file mode 100644 index 1dab1a9..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png deleted file mode 100644 index 62bada5..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png deleted file mode 100644 index cb4a8a4..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-E.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png deleted file mode 100644 index 1d04745..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-N.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png deleted file mode 100644 index b0a3397..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-S.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png b/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png deleted file mode 100644 index 4b701e1..0000000 Binary files a/lignumis/graphics/entity/gold-pipe/machine-gold-pipe-W.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png deleted file mode 100644 index 324ce78..0000000 Binary files a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png deleted file mode 100644 index c478f13..0000000 Binary files a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank.png deleted file mode 100644 index 194a8fb..0000000 Binary files a/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-01.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-01.png deleted file mode 100644 index 5198bef..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-01.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-02.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-02.png deleted file mode 100644 index bae2b1e..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-02.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-03.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-03.png deleted file mode 100644 index 4ce510d..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-03.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-04.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-04.png deleted file mode 100644 index f498cb5..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-04.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-05.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-05.png deleted file mode 100644 index 9501179..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-05.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-06.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-06.png deleted file mode 100644 index 3fa7581..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-06.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-07.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-07.png deleted file mode 100644 index 673fcbe..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-07.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-08.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-08.png deleted file mode 100644 index 247eb98..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-08.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-09.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-09.png deleted file mode 100644 index f5920ee..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-09.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-10.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-10.png deleted file mode 100644 index 1956f43..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-10.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-11.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-11.png deleted file mode 100644 index bc21ca8..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-11.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-12.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-12.png deleted file mode 100644 index b86ddbe..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-12.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-13.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-13.png deleted file mode 100644 index 37d75d5..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-13.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-14.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-14.png deleted file mode 100644 index 9473eb9..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-14.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-15.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-15.png deleted file mode 100644 index 4c369bf..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-15.png and /dev/null differ diff --git a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-16.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-16.png deleted file mode 100644 index 0be1a65..0000000 Binary files a/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-16.png and /dev/null differ diff --git a/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine-remnants.png b/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine-remnants.png deleted file mode 100644 index 4643d31..0000000 Binary files a/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine.png b/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine.png deleted file mode 100644 index a7573e8..0000000 Binary files a/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine.png and /dev/null differ diff --git a/lignumis/graphics/entity/stone-furnace/stone-furnace-remnants.png b/lignumis/graphics/entity/stone-furnace/stone-furnace-remnants.png deleted file mode 100644 index aa316c3..0000000 Binary files a/lignumis/graphics/entity/stone-furnace/stone-furnace-remnants.png and /dev/null differ diff --git a/lignumis/graphics/entity/stone-furnace/stone-furnace.png b/lignumis/graphics/entity/stone-furnace/stone-furnace.png deleted file mode 100644 index 383eb4b..0000000 Binary files a/lignumis/graphics/entity/stone-furnace/stone-furnace.png and /dev/null differ diff --git a/lignumis/graphics/entity/wood-lab/wood-lab-light.png b/lignumis/graphics/entity/wood-lab/wood-lab-light.png deleted file mode 100644 index 93c9cb6..0000000 Binary files a/lignumis/graphics/entity/wood-lab/wood-lab-light.png and /dev/null differ diff --git a/lignumis/graphics/entity/wood-lab/wood-lab.png b/lignumis/graphics/entity/wood-lab/wood-lab.png deleted file mode 100644 index 4571af4..0000000 Binary files a/lignumis/graphics/entity/wood-lab/wood-lab.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/06-rocket-silo.png b/lignumis/graphics/entity/wooden-rocket-silo/06-rocket-silo.png deleted file mode 100644 index 8ef0ddb..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/06-rocket-silo.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png b/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png deleted file mode 100644 index 9357e27..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png b/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png deleted file mode 100644 index 2d681fc..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png b/lignumis/graphics/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png deleted file mode 100644 index 0592e38..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png b/lignumis/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png deleted file mode 100644 index 337e192..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png and /dev/null differ diff --git a/lignumis/graphics/entity/wooden-rocket-silo/rocket-static-pod.png b/lignumis/graphics/entity/wooden-rocket-silo/rocket-static-pod.png deleted file mode 100644 index 0790c5d..0000000 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/rocket-static-pod.png and /dev/null differ diff --git a/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png b/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png deleted file mode 100644 index 85fe0c5..0000000 Binary files a/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png and /dev/null differ diff --git a/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png b/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png deleted file mode 100644 index f4c1447..0000000 Binary files a/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png and /dev/null differ diff --git a/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png b/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png deleted file mode 100644 index 3b8ec27..0000000 Binary files a/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png and /dev/null differ diff --git a/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png b/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png deleted file mode 100644 index 46f39f1..0000000 Binary files a/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/active-noise-cancelling.png b/lignumis/graphics/icons/active-noise-cancelling.png deleted file mode 100644 index 2a7f38c..0000000 Binary files a/lignumis/graphics/icons/active-noise-cancelling.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-construction-robot-copper.png b/lignumis/graphics/icons/basic-construction-robot-copper.png deleted file mode 100644 index 74e53f8..0000000 Binary files a/lignumis/graphics/icons/basic-construction-robot-copper.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-construction-robot-gold.png b/lignumis/graphics/icons/basic-construction-robot-gold.png deleted file mode 100644 index 812c6e0..0000000 Binary files a/lignumis/graphics/icons/basic-construction-robot-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-gun-turret.png b/lignumis/graphics/icons/basic-gun-turret.png deleted file mode 100644 index 2c76f81..0000000 Binary files a/lignumis/graphics/icons/basic-gun-turret.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png b/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png deleted file mode 100644 index 3f951a2..0000000 Binary files a/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png b/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png deleted file mode 100644 index d4139f9..0000000 Binary files a/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png b/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png deleted file mode 100644 index 83115bb..0000000 Binary files a/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png b/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png deleted file mode 100644 index 43986f5..0000000 Binary files a/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-radar.png b/lignumis/graphics/icons/basic-radar.png deleted file mode 100644 index 3dc6c8e..0000000 Binary files a/lignumis/graphics/icons/basic-radar.png and /dev/null differ diff --git a/lignumis/graphics/icons/basic-repair-pack.png b/lignumis/graphics/icons/basic-repair-pack.png deleted file mode 100644 index 8f496fb..0000000 Binary files a/lignumis/graphics/icons/basic-repair-pack.png and /dev/null differ diff --git a/lignumis/graphics/icons/burner-agricultural-tower.png b/lignumis/graphics/icons/burner-agricultural-tower.png deleted file mode 100644 index 7537661..0000000 Binary files a/lignumis/graphics/icons/burner-agricultural-tower.png and /dev/null differ diff --git a/lignumis/graphics/icons/burner-assembling-machine.png b/lignumis/graphics/icons/burner-assembling-machine.png deleted file mode 100644 index d8923f9..0000000 Binary files a/lignumis/graphics/icons/burner-assembling-machine.png and /dev/null differ diff --git a/lignumis/graphics/icons/burner-inserter.png b/lignumis/graphics/icons/burner-inserter.png deleted file mode 100644 index 06476fe..0000000 Binary files a/lignumis/graphics/icons/burner-inserter.png and /dev/null differ diff --git a/lignumis/graphics/icons/burner-long-handed-inserter.png b/lignumis/graphics/icons/burner-long-handed-inserter.png deleted file mode 100644 index 2907b4f..0000000 Binary files a/lignumis/graphics/icons/burner-long-handed-inserter.png and /dev/null differ diff --git a/lignumis/graphics/icons/burner-mining-drill.png b/lignumis/graphics/icons/burner-mining-drill.png deleted file mode 100644 index 23f5e12..0000000 Binary files a/lignumis/graphics/icons/burner-mining-drill.png and /dev/null differ diff --git a/lignumis/graphics/icons/casting-gold.png b/lignumis/graphics/icons/casting-gold.png deleted file mode 100644 index 84732d3..0000000 Binary files a/lignumis/graphics/icons/casting-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/cupriavidus-necator-1.png b/lignumis/graphics/icons/cupriavidus-necator-1.png deleted file mode 100644 index 67e2eac..0000000 Binary files a/lignumis/graphics/icons/cupriavidus-necator-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/cupriavidus-necator-2.png b/lignumis/graphics/icons/cupriavidus-necator-2.png deleted file mode 100644 index f591447..0000000 Binary files a/lignumis/graphics/icons/cupriavidus-necator-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/cupriavidus-necator-3.png b/lignumis/graphics/icons/cupriavidus-necator-3.png deleted file mode 100644 index c5b6eef..0000000 Binary files a/lignumis/graphics/icons/cupriavidus-necator-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/dead-cupriavidus-necator-1.png b/lignumis/graphics/icons/dead-cupriavidus-necator-1.png deleted file mode 100644 index cf41702..0000000 Binary files a/lignumis/graphics/icons/dead-cupriavidus-necator-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/dead-cupriavidus-necator-2.png b/lignumis/graphics/icons/dead-cupriavidus-necator-2.png deleted file mode 100644 index 12c868e..0000000 Binary files a/lignumis/graphics/icons/dead-cupriavidus-necator-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/dead-cupriavidus-necator-3.png b/lignumis/graphics/icons/dead-cupriavidus-necator-3.png deleted file mode 100644 index 6929a9d..0000000 Binary files a/lignumis/graphics/icons/dead-cupriavidus-necator-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-bacteria-1.png b/lignumis/graphics/icons/gold-bacteria-1.png deleted file mode 100644 index 334c03a..0000000 Binary files a/lignumis/graphics/icons/gold-bacteria-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-bacteria-2.png b/lignumis/graphics/icons/gold-bacteria-2.png deleted file mode 100644 index eba29ef..0000000 Binary files a/lignumis/graphics/icons/gold-bacteria-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-bacteria-3.png b/lignumis/graphics/icons/gold-bacteria-3.png deleted file mode 100644 index d3cbb20..0000000 Binary files a/lignumis/graphics/icons/gold-bacteria-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-bacteria.png b/lignumis/graphics/icons/gold-bacteria.png deleted file mode 100644 index caac312..0000000 Binary files a/lignumis/graphics/icons/gold-bacteria.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-cable.png b/lignumis/graphics/icons/gold-cable.png deleted file mode 100644 index 89d4bd9..0000000 Binary files a/lignumis/graphics/icons/gold-cable.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-ore-1.png b/lignumis/graphics/icons/gold-ore-1.png deleted file mode 100644 index 0f30043..0000000 Binary files a/lignumis/graphics/icons/gold-ore-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-ore-2.png b/lignumis/graphics/icons/gold-ore-2.png deleted file mode 100644 index 606281c..0000000 Binary files a/lignumis/graphics/icons/gold-ore-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-ore-3.png b/lignumis/graphics/icons/gold-ore-3.png deleted file mode 100644 index 440cd46..0000000 Binary files a/lignumis/graphics/icons/gold-ore-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-ore.png b/lignumis/graphics/icons/gold-ore.png deleted file mode 100644 index 0295900..0000000 Binary files a/lignumis/graphics/icons/gold-ore.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-patch.png b/lignumis/graphics/icons/gold-patch.png deleted file mode 100644 index 36de4d8..0000000 Binary files a/lignumis/graphics/icons/gold-patch.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-pipe-to-ground.png b/lignumis/graphics/icons/gold-pipe-to-ground.png deleted file mode 100644 index 08d8b9b..0000000 Binary files a/lignumis/graphics/icons/gold-pipe-to-ground.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-pipe.png b/lignumis/graphics/icons/gold-pipe.png deleted file mode 100644 index c9fe002..0000000 Binary files a/lignumis/graphics/icons/gold-pipe.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-plate.png b/lignumis/graphics/icons/gold-plate.png deleted file mode 100644 index 01440a9..0000000 Binary files a/lignumis/graphics/icons/gold-plate.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-storage-tank.png b/lignumis/graphics/icons/gold-storage-tank.png deleted file mode 100644 index c062f7a..0000000 Binary files a/lignumis/graphics/icons/gold-storage-tank.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-1.png b/lignumis/graphics/icons/gold-stromatolite-seed-1.png deleted file mode 100644 index 420eb6f..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-2.png b/lignumis/graphics/icons/gold-stromatolite-seed-2.png deleted file mode 100644 index 12cd0d9..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-3.png b/lignumis/graphics/icons/gold-stromatolite-seed-3.png deleted file mode 100644 index b28decb..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-4.png b/lignumis/graphics/icons/gold-stromatolite-seed-4.png deleted file mode 100644 index 1322b63..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-4.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-5.png b/lignumis/graphics/icons/gold-stromatolite-seed-5.png deleted file mode 100644 index 64ec62a..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-5.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed.png b/lignumis/graphics/icons/gold-stromatolite-seed.png deleted file mode 100644 index f7fd366..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed.png and /dev/null differ diff --git a/lignumis/graphics/icons/gold-stromatolite.png b/lignumis/graphics/icons/gold-stromatolite.png deleted file mode 100644 index 080ff19..0000000 Binary files a/lignumis/graphics/icons/gold-stromatolite.png and /dev/null differ diff --git a/lignumis/graphics/icons/hot-gold-plate.png b/lignumis/graphics/icons/hot-gold-plate.png deleted file mode 100644 index 962c5ed..0000000 Binary files a/lignumis/graphics/icons/hot-gold-plate.png and /dev/null differ diff --git a/lignumis/graphics/icons/lignumis-medium-wriggler-corpse.png b/lignumis/graphics/icons/lignumis-medium-wriggler-corpse.png new file mode 100644 index 0000000..4d78edf Binary files /dev/null and b/lignumis/graphics/icons/lignumis-medium-wriggler-corpse.png differ diff --git a/lignumis/graphics/icons/lignumis-medium-wriggler.png b/lignumis/graphics/icons/lignumis-medium-wriggler.png new file mode 100644 index 0000000..55fd48b Binary files /dev/null and b/lignumis/graphics/icons/lignumis-medium-wriggler.png differ diff --git a/lignumis/graphics/icons/lignumis-small-wriggler-corpse.png b/lignumis/graphics/icons/lignumis-small-wriggler-corpse.png new file mode 100644 index 0000000..532e60d Binary files /dev/null and b/lignumis/graphics/icons/lignumis-small-wriggler-corpse.png differ diff --git a/lignumis/graphics/icons/lignumis-small-wriggler.png b/lignumis/graphics/icons/lignumis-small-wriggler.png new file mode 100644 index 0000000..0337f96 Binary files /dev/null and b/lignumis/graphics/icons/lignumis-small-wriggler.png differ diff --git a/lignumis/graphics/icons/lignumis.png b/lignumis/graphics/icons/lignumis.png deleted file mode 100644 index cce5b7c..0000000 Binary files a/lignumis/graphics/icons/lignumis.png and /dev/null differ diff --git a/lignumis/graphics/icons/lumber-1.png b/lignumis/graphics/icons/lumber-1.png deleted file mode 100644 index 5330628..0000000 Binary files a/lignumis/graphics/icons/lumber-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/lumber-2.png b/lignumis/graphics/icons/lumber-2.png deleted file mode 100644 index 89fbea1..0000000 Binary files a/lignumis/graphics/icons/lumber-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/lumber.png b/lignumis/graphics/icons/lumber.png deleted file mode 100644 index fab15ce..0000000 Binary files a/lignumis/graphics/icons/lumber.png and /dev/null differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-1.png b/lignumis/graphics/icons/moist-stromatolite-remnant-1.png deleted file mode 100644 index 6c611c3..0000000 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-1.png and /dev/null differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-2.png b/lignumis/graphics/icons/moist-stromatolite-remnant-2.png deleted file mode 100644 index b814b6f..0000000 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-2.png and /dev/null differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-3.png b/lignumis/graphics/icons/moist-stromatolite-remnant-3.png deleted file mode 100644 index c405013..0000000 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-3.png and /dev/null differ diff --git a/lignumis/graphics/icons/molten-gold.png b/lignumis/graphics/icons/molten-gold.png deleted file mode 100644 index a40dd4f..0000000 Binary files a/lignumis/graphics/icons/molten-gold.png and /dev/null differ diff --git a/lignumis/graphics/icons/peat.png b/lignumis/graphics/icons/peat.png deleted file mode 100644 index ac800e4..0000000 Binary files a/lignumis/graphics/icons/peat.png and /dev/null differ diff --git a/lignumis/graphics/icons/provisional-rocket-part.png b/lignumis/graphics/icons/provisional-rocket-part.png deleted file mode 100644 index 99bd4eb..0000000 Binary files a/lignumis/graphics/icons/provisional-rocket-part.png and /dev/null differ diff --git a/lignumis/graphics/icons/provisional-rocket-silo.png b/lignumis/graphics/icons/provisional-rocket-silo.png deleted file mode 100644 index ed29f7f..0000000 Binary files a/lignumis/graphics/icons/provisional-rocket-silo.png and /dev/null differ diff --git a/lignumis/graphics/icons/quality-gold-catalyst.png b/lignumis/graphics/icons/quality-gold-catalyst.png deleted file mode 100644 index 5b257b3..0000000 Binary files a/lignumis/graphics/icons/quality-gold-catalyst.png and /dev/null differ diff --git a/lignumis/graphics/icons/starmap-planet-lignumis.png b/lignumis/graphics/icons/starmap-planet-lignumis.png deleted file mode 100644 index a2728c7..0000000 Binary files a/lignumis/graphics/icons/starmap-planet-lignumis.png and /dev/null differ diff --git a/lignumis/graphics/icons/steam-assembling-machine.png b/lignumis/graphics/icons/steam-assembling-machine.png deleted file mode 100644 index 2945346..0000000 Binary files a/lignumis/graphics/icons/steam-assembling-machine.png and /dev/null differ diff --git a/lignumis/graphics/icons/steam-science-pack.png b/lignumis/graphics/icons/steam-science-pack.png deleted file mode 100644 index fceda3c..0000000 Binary files a/lignumis/graphics/icons/steam-science-pack.png and /dev/null differ diff --git a/lignumis/graphics/icons/stone-furnace.png b/lignumis/graphics/icons/stone-furnace.png deleted file mode 100644 index 54c3cab..0000000 Binary files a/lignumis/graphics/icons/stone-furnace.png and /dev/null differ diff --git a/lignumis/graphics/icons/wood-armor.png b/lignumis/graphics/icons/wood-armor.png deleted file mode 100644 index 118a2e8..0000000 Binary files a/lignumis/graphics/icons/wood-armor.png and /dev/null differ diff --git a/lignumis/graphics/icons/wood-darts-magazine.png b/lignumis/graphics/icons/wood-darts-magazine.png deleted file mode 100644 index 3bb538d..0000000 Binary files a/lignumis/graphics/icons/wood-darts-magazine.png and /dev/null differ diff --git a/lignumis/graphics/icons/wood-lab.png b/lignumis/graphics/icons/wood-lab.png deleted file mode 100644 index 43a574e..0000000 Binary files a/lignumis/graphics/icons/wood-lab.png and /dev/null differ diff --git a/lignumis/graphics/icons/wood-pulp.png b/lignumis/graphics/icons/wood-pulp.png deleted file mode 100644 index 57f0918..0000000 Binary files a/lignumis/graphics/icons/wood-pulp.png and /dev/null differ diff --git a/lignumis/graphics/icons/wood-science-pack.png b/lignumis/graphics/icons/wood-science-pack.png deleted file mode 100644 index e6b999d..0000000 Binary files a/lignumis/graphics/icons/wood-science-pack.png and /dev/null differ diff --git a/lignumis/graphics/icons/wooden-gear-wheel.png b/lignumis/graphics/icons/wooden-gear-wheel.png deleted file mode 100644 index 634fda1..0000000 Binary files a/lignumis/graphics/icons/wooden-gear-wheel.png and /dev/null differ diff --git a/lignumis/graphics/noise-map-icon.png b/lignumis/graphics/noise-map-icon.png deleted file mode 100644 index 3c1d512..0000000 Binary files a/lignumis/graphics/noise-map-icon.png and /dev/null differ diff --git a/lignumis/graphics/orbit-lignumis.png b/lignumis/graphics/orbit-lignumis.png deleted file mode 100644 index ed59fb1..0000000 Binary files a/lignumis/graphics/orbit-lignumis.png and /dev/null differ diff --git a/lignumis/graphics/quality-catalyst-icon-red.png b/lignumis/graphics/quality-catalyst-icon-red.png deleted file mode 100644 index 2a5fa37..0000000 Binary files a/lignumis/graphics/quality-catalyst-icon-red.png and /dev/null differ diff --git a/lignumis/graphics/technology/active-noise-cancelling.png b/lignumis/graphics/technology/active-noise-cancelling.png deleted file mode 100644 index ab65d3b..0000000 Binary files a/lignumis/graphics/technology/active-noise-cancelling.png and /dev/null differ diff --git a/lignumis/graphics/technology/basic-construction-robotics-copper.png b/lignumis/graphics/technology/basic-construction-robotics-copper.png deleted file mode 100644 index 1c0cbde..0000000 Binary files a/lignumis/graphics/technology/basic-construction-robotics-copper.png and /dev/null differ diff --git a/lignumis/graphics/technology/basic-construction-robotics-gold.png b/lignumis/graphics/technology/basic-construction-robotics-gold.png deleted file mode 100644 index 97bff95..0000000 Binary files a/lignumis/graphics/technology/basic-construction-robotics-gold.png and /dev/null differ diff --git a/lignumis/graphics/technology/basic-gun-turret.png b/lignumis/graphics/technology/basic-gun-turret.png deleted file mode 100644 index 83396c2..0000000 Binary files a/lignumis/graphics/technology/basic-gun-turret.png and /dev/null differ diff --git a/lignumis/graphics/technology/basic-radar.png b/lignumis/graphics/technology/basic-radar.png deleted file mode 100644 index 53d8fda..0000000 Binary files a/lignumis/graphics/technology/basic-radar.png and /dev/null differ diff --git a/lignumis/graphics/technology/basic-repair-pack.png b/lignumis/graphics/technology/basic-repair-pack.png deleted file mode 100644 index 5b740f7..0000000 Binary files a/lignumis/graphics/technology/basic-repair-pack.png and /dev/null differ diff --git a/lignumis/graphics/technology/burner-automation.png b/lignumis/graphics/technology/burner-automation.png deleted file mode 100644 index f034cc2..0000000 Binary files a/lignumis/graphics/technology/burner-automation.png and /dev/null differ diff --git a/lignumis/graphics/technology/gold-fluid-handling.png b/lignumis/graphics/technology/gold-fluid-handling.png deleted file mode 100644 index ed8d0fe..0000000 Binary files a/lignumis/graphics/technology/gold-fluid-handling.png and /dev/null differ diff --git a/lignumis/graphics/technology/lignumis.png b/lignumis/graphics/technology/lignumis.png deleted file mode 100644 index 5ceaff4..0000000 Binary files a/lignumis/graphics/technology/lignumis.png and /dev/null differ diff --git a/lignumis/graphics/technology/nauvis.png b/lignumis/graphics/technology/nauvis.png deleted file mode 100644 index 163196f..0000000 Binary files a/lignumis/graphics/technology/nauvis.png and /dev/null differ diff --git a/lignumis/graphics/technology/provisional-rocketry.png b/lignumis/graphics/technology/provisional-rocketry.png deleted file mode 100644 index 183175a..0000000 Binary files a/lignumis/graphics/technology/provisional-rocketry.png and /dev/null differ diff --git a/lignumis/graphics/technology/steam-automation.png b/lignumis/graphics/technology/steam-automation.png deleted file mode 100644 index 63f897c..0000000 Binary files a/lignumis/graphics/technology/steam-automation.png and /dev/null differ diff --git a/lignumis/graphics/technology/steam-science-pack.png b/lignumis/graphics/technology/steam-science-pack.png deleted file mode 100644 index dbc469f..0000000 Binary files a/lignumis/graphics/technology/steam-science-pack.png and /dev/null differ diff --git a/lignumis/graphics/technology/wood-science-pack.png b/lignumis/graphics/technology/wood-science-pack.png deleted file mode 100644 index 3538e9d..0000000 Binary files a/lignumis/graphics/technology/wood-science-pack.png and /dev/null differ diff --git a/lignumis/graphics/terrain/natural-gold-soil.png b/lignumis/graphics/terrain/natural-gold-soil.png deleted file mode 100644 index 6c4a2a9..0000000 Binary files a/lignumis/graphics/terrain/natural-gold-soil.png and /dev/null differ diff --git a/lignumis/info.json b/lignumis/info.json index 284f016..8e2e907 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,6 +1,6 @@ { "name": "lignumis", - "version": "1.0.13", + "version": "1.0.26", "title": "Lignumis", "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.", "author": "cackling fiend", @@ -9,22 +9,28 @@ "dependencies": [ "base", "space-age >= 2.0.28", + "lignumis-assets", "flib", "PlanetsLib >= 1.1.26", "astroponics >= 1.2.0", - "cf-lib >= 0.0.4", + "cf-lib >= 0.0.8", "mf-core >= 1.0.3", "mf-buildings >= 1.0.7", "mf-logistics >= 1.0.1", - "Wood-Walls >= 1.2.1", + "Wood-Walls >= 1.2.0", "pollution-as-surface-property", + "bioprocessing-tab", "?hot-metals >= 1.1.0", "?wood-military >= 2.3.3", "?metal-and-stars", + "?aai-industry", + "?planet-picker", + "?Diversitree", + "?aai-loaders", + "?atan-nuclear-science", "!apm_power_ldinc", "!wood-logistics", "!early-agriculture", - "!wood-universe-modpack", - "!aai-industry" + "!wood-universe-modpack" ] } \ No newline at end of file diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 9c81d4a..aec044b 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -1,6 +1,3 @@ -surface-condition-too-low=__1__ does not fit. -surface-condition-too-high=__1__ does not fit. - [mod-name] lignumis=○ Lignumis @@ -47,6 +44,7 @@ wood-splitter=Wood splitter basic-radar=Basic radar active-noise-cancelling-tower=Active noise cancelling tower quality-assembler=Quality assembler +aai-wood-loader=Wood loader [entity-description] lumber-mill=Advanced machine to process wood. @@ -77,6 +75,7 @@ dead-cupriavidus-necator=Dead Cupriavidus necator gold-quality-catalyst=Gold quality catalyst wood-armor=Wood armor wood-darts-magazine=Wood darts magazine +basic-circuit-board=Basic circuit board [item-description] wooden-wall=Use wooden walls to protect your base from the locals and to reduce noise levels. @@ -93,9 +92,6 @@ moist-stromatolite-remnant-desiccation-without-steam=Desiccate moist stromatolit gold-stromatolite-seed-to-peat=Process gold stromatolite seed wood-liquefaction=Wood liquefaction provisional-rocket-part=Provisional rocket part -wood-splitter-electronic-circuit=Wood splitter -lumber-mill-electronic-circuit=Lumber mill -burner-agricultural-tower-electronic-circuit=Burner agricultural tower cupriavidus-necator-starter=Cupriavidus necator (starter culture) plastic-from-cupriavidus-necator=Bioplastic plastic-from-dead-cupriavidus-necator=Bioplastic @@ -150,6 +146,7 @@ wood-logistics=Slow but automatic transportation of goods. tree-seeding=[entity=burner-agricultural-tower] allows planting seeds into seedable soil. Planted seeds grow into trees that can be harvested.\n[entity=tree-plant] can grow on grass and dirt. [entity=gold-stromatolite] can grow on [tile=natural-gold-soil]. active-noise-cancelling=Helps handling noise. quality-assembler=High-end assembler to craft only the finest quality machines using a special resource only found on Lignumis. +automation-science-pack=Leave Lignumis to enable advanced technology research. [modifier-description] basic-gun-turret-attack-bonus=Basic gun turret damage: +__1__ @@ -166,11 +163,17 @@ quality-catalyst=Quality catalyst lignumis-belt-progression=Enable progressive belt recipes lignumis-inserter-progression=Enable progressive inserter recipes lignumis-ammo-progression=Enable progressive ammo recipes +lignumis-technology-progression=Enable progressive technologies +lignumis-basic-circuit-board=Enable basic circuit board +lignumis-circuit-progression=Enable progressive circuit recipes [mod-setting-description] lignumis-belt-progression=Yellow belts will require wood belts to craft. lignumis-inserter-progression=Yellow electric inserter will require burner inserter to craft. lignumis-ammo-progression=Firearm magazines will require wooden darts magazines to craft. +lignumis-technology-progression=Adds wood and steam science packs to most late game technologies. Disabling this removes the relevance of Lignumis' science packs in the late game. +lignumis-basic-circuit-board=Recipes use basic circuit boards instead of gold cables and gold plates where appropriate. Both gold and copper recipes will be added. +lignumis-circuit-progression=Electric circuits will require basic circuit boards to craft. [entity-status] no-quality-catalyst=No quality catalyst @@ -185,5 +188,6 @@ quality-catalyst=Quality catalyst [lignumis] start-new-game=Lignumis is meant to be played in a fresh game as it extends the early game before Nauvis. provisional-rocket-silo-button=Escape to Nauvis -provisional-rocket-silo-button-tooltip=Your personal inventory must be empty! +provisional-rocket-silo-button-tooltip-inventory=Your personal inventory must be empty! +provisional-rocket-silo-button-tooltip-nauvis=You don't know yet where to go! provisional-rocket-silo-description=Fill the rocket inventory and launch the rocket to escape to Nauvis.\nBe sure to take material to jumpstart your iron, copper and wood production. diff --git a/lignumis/locale/pl/strings.cfg b/lignumis/locale/pl/strings.cfg new file mode 100644 index 0000000..63bbb52 --- /dev/null +++ b/lignumis/locale/pl/strings.cfg @@ -0,0 +1,187 @@ +[mod-name] +lignumis=○ Lignumis + +[mod-description] +lignumis=Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. + +[space-location-name] +lignumis=Lignumis + +[space-location-description] +lignumis=Lignumis to księżyc orbitujący wokół Nauvis. Jest dość podobny do Nauvis, ale wydaje się być młodszy i ma mniej zasobów. + +[airborne-pollutant-name] +noise=Hałas + +[airborne-pollutant-name-with-amount] +noise=__1__ Hałas + +[entity-name] +wood-lab=Drewniana stacja badawcza +peat=Torf +burner-agricultural-tower=Spalinowa wieża rolnicza +burner-assembling-machine=Spalinowy automat montażowy +burner-long-handed-inserter=Spalinowy daleko ramienny podajnik +lumber-mill=Tartak +gold-stromatolite=Gold stromatolite +gold-stromatolite-plant=Gold stromatolite plant +gold-stromatolite-lignumis=Gold stromatolite +gold-patch=Złoże złota +deep-miner=Wiertnica głębinowa +gold-pipe=Złota rura +gold-pipe-to-ground=podziemna złota rura +gold-storage-tank=złoty zbiornik +desiccation-furnace=Piec osuszający +steam-assembling-machine=Parowy automat montażowy +provisional-rocket-silo=Prowizoryczny silos rakietowy +provisional-rocket-silo-ready=Prowizoryczny silos rakietowy (Gotowy) +basic-gun-turret=Podstawowa wieżyczka obronna +basic-construction-robot-gold=Podstawowy robot konstrukcyjny (złoty) +basic-construction-robot-copper=Podstawowy robot konstrukcyjny (miedziany) +wood-transport-belt=drewniany taśmociąg +wood-underground-belt=drewniany taśmociąg podziemny +wood-splitter=drewniany roździlacz +basic-radar=Podstawowy radar +active-noise-cancelling-tower=Wieża z aktywnym tłumieniem hałasu +quality-assembler=Zaawansowany automat montażowy + +[entity-description] +lumber-mill=Zaawansowana maszyna do obróbki drewna. +quality-assembler=Automat montażowy wysokiej klasy do wytwarzania tylko najlepszej jakości maszyn. Nadaje jedną darmową kategorię jakości dla wykonanego przedmiotu, zużywając [item=katalizator złotej jakości.]. Surface conditions and ingredients are otherwise unchanged. + +[equipment-name] +basic-portable-generator-equipment-gold=Podstawowy przenośny generator energii (złoty) +basic-portable-generator-equipment-copper=Podstawowy przenośny generator energii (miedziany) +basic-personal-roboport-equipment-gold=Podstawowy osobisty roboport (złoty) +basic-personal-roboport-equipment-copper=Podstawowy osobisty roboport (miedziany) + +[item-name] +wooden-gear-wheel=Drewniana zębatka +wood-science-pack=Drewniany Pakiet Naukowy +peat=Torf +gold-stromatolite-seed=Złote nasiono stromatolitu. +gold-ore=Ruda złota. +gold-bacteria=Bakteria złota +gold-plate=Złota płytka +gold-cable=Złoty kabel +moist-stromatolite-remnant=Wilgotny fragment stromatolitu +steam-science-pack=parowy pakiet naukowy +destination-nauvis=Podróż na Nauvis +lumber=drewno +basic-repair-pack=podstawowy zestaw naprawczy +cupriavidus-necator=Cupriavidus necator +dead-cupriavidus-necator=Dead Cupriavidus necator +gold-quality-catalyst=katalizator złotej jakości. +wood-armor=drewniany pancerz +wood-darts-magazine=drewniane rzutki (amunicja) + +[item-description] +wooden-wall=Użyj drewnianych ścian, aby chronić swoją bazę przed miejscowymi i zredukować poziom hałasu. +stone-wall=Lepsza ochrona akustyczna i fizyczna niż drewniana alternatywa.. +destination-nauvis=Włóż ten przedmiot do rakiety, aby podróżować na Nauvis. Pamiętaj, że nie wrócisz przez dłuższy czas.\n__REMARK_COLOR_BEGIN__BETA notice: Keep at most 40 item stack in your inventory before leaving as the current transition to Nauvis is a temporary implementation. Be sure to take material to jumpstart your iron, copper and wood production.__REMARK_COLOR_END__ + +[fluid-name] +wood-pulp=Miazga drzewna +molten-gold=Płynne złoto + +[recipe-name] +moist-stromatolite-remnant-desiccation=Osusz resztki mokrego stromatolitu +moist-stromatolite-remnant-desiccation-without-steam=Osusz resztki mokrego stromatolitu +gold-stromatolite-seed-to-peat=rzetwórz nasiona złotego stromatolitu +wood-liquefaction=upłynnianie drewna +provisional-rocket-part=Część tymczasowa rakiety +cupriavidus-necator-starter=Cupriavidus necator (starter culture) +plastic-from-cupriavidus-necator=Bioplastic +plastic-from-dead-cupriavidus-necator=Bioplastic +low-density-structure-gold=Lekka struktura złota +rocket-fuel-from-wood-pulp-and-peat=Bio-rocket-fuel +nutrients-from-wood-pulp=Składniki odżywcze z miazgi drzewnej +active-noise-cancelling=Aktywna redukcja hałasu + +[recipe-description] +moist-stromatolite-remnant-desiccation-without-steam=Służy do równoważenia produkcji pary. +gold-stromatolite-seed-to-peat=Służy do usuwania nadmiaru nasion złotego stromatolitu. + +[technology-name] +wood-science-pack=drewniany pakiet naukowy +burner-automation=Spalinowy automat montażowy +planet-discovery-nauvis=Odkryto Planete Nauvis. +planet-discovery-lignumis=Odkryto Księzyc Lignumis. +iron-processing=Przetwarzanie żelaza +copper-processing=przetwarzanie miedzi +lumber-mill=Tartak +deep-miner=Wiertnica Głębinowa +gold-fluid-handling=obsługa płynów 2 (złota) +steam-automation=automat montażowy na pare wodną +steam-science-pack=parowy pakiet naukowy +wood-liquefaction=Upłynnianie drewna +provisional-rocketry=Prowizoryczny silos rakietowy +basic-gun-turret=podstawowa wieżyczka obronna +basic-construction-robotics-gold=podstawowy robot konstrukcyjny (złoty) +basic-construction-robotics-copper=podstawowy robot konstrukcyjny (miedziany) +wood-logistics=Logistyka drewna" +automation=automat montażowy na prąd +tree-seeding=podstawowa wieża rolnicza +basic-repair-pack=podstawowy zestaw naprawczy +basic-radar=podstawowy radar +active-noise-cancelling=Aktywna redukcja hałasu +quality-assembler=Zaawansowany automat montażowy + +[technology-description] +wood-science-pack=Pozwala na badanie podstawowych technologii opartych na produktach drewnianych. +burner-automation=Technologia podstawowej automatyzacji przy użyciu maszyn na paliwo stałe. +planet-discovery-nauvis=Umiarkowana planeta oferująca wszystkie powszechne zasoby. +planet-discovery-lignumis=Księżyc orbitujący wokół Nauvis, który nie ma wiele do zaoferowania oprócz roślinności i metalu, który może być przydatny. +lumber-mill=Zaawansowana maszyna do przetwarzania drewna. +deep-miner=Otwiera dostęp do ogromnych złóż złota, które wcześniej były nieosiągalne. +steam-automation=Pozwala na badanie bardziej zaawansowanych technologii opartych na produktach drewnianych i złocie. +wood-liquefaction=Upłynnianie drewna otwiera nowe możliwości. +provisional-rocketry=Musimy jakoś opuścić ten księżyc. To nasza jedyna szansa! +basic-gun-turret=Najprostsza automatyczna obrona. To niewiele, ale na razie musi wystarczyć. +basic-construction-robotics-gold=Podstawowa pomoc przy osobistych potrzebach budowlanych. +basic-construction-robotics-copper=Podstawowa pomoc przy osobistych potrzebach budowlanych. +wood-logistics=Powolny, ale automatyczny transport towarów. +tree-seeding=[entity=burner-agricultural-tower] umożliwia sadzenie nasion w glebie, która może być obsiewana. Posadzone nasiona rosną w drzewa, które mogą być zbierane.\n[entity=tree-plant] rośnie na trawie i ziemi. [entity=gold-stromatolite] może rosnąć na [tile=natural-gold-soil]. +active-noise-cancelling=Pomaga w radzeniu sobie z hałasem. +quality-assembler=Zaawansowany automat montażowy do wytwarzania tylko najwyższej jakości maszyn, używając specjalnego surowca, który można znaleźć tylko na Lignumis. +automation-science-pack=Opuszczenie Lignumis umożliwia badania zaawansowanych technologii.. + +[modifier-description] +basic-gun-turret-attack-bonus=obrażenia bazowe podstawowej wieżyczki obronnej: +__1__ + +[tile-name] +wood-floor=drewniane pientro +natural-gold-soil=Gleba wzbogacona złotem + +[fuel-category-name] +wood=Paliwo drzewne +quality-catalyst=katalizator jakości + +[mod-setting-name] +lignumis-belt-progression=Włącz postęp w przepisach na taśmociągi +lignumis-inserter-progression=Włącz postęp w przepisach na wkładacze +lignumis-ammo-progression=Włącz postęp w przepisach na amunicję +lignumis-technology-progression=Włącz postęp w technologiach + +[mod-setting-description] +lignumis-belt-progression=Żółte taśmy transportowe będą wymagały drewnianych taśmociągów do wytworzenia. +lignumis-inserter-progression=Żółty elektryczny podajnik będzie wymagał podajnika na paliwo stałe do wytworzenia. +lignumis-ammo-progression=Magazynki do broni palnej będą wymagały magazynków na drewniane rzutki (amunicja) do wytworzenia. +lignumis-technology-progression= Dodaje drewniane i parowe pakiety naukowe do większości technologii z późnej gry. Wyłączenie tego usuwa znaczenie pakietów naukowych Lignumis w późnej grze. + +[entity-status] +no-quality-catalyst=katalizator bez jakości + +[description] +accepted-catalysts=Akceptowane katalizatory +quality-catalyst-energy-value=Wartość jakości + +[gui] +quality-catalyst=katalizator jakości + +[lignumis] +start-new-game=Lignumis jest przeznaczone do gry w nowej rozgrywce, ponieważ rozszerza początkową fazę gry przed Nauvis. +provisional-rocket-silo-button=Ucieczka do Nauvis +provisional-rocket-silo-button-tooltip-inventory=Twoje osobiste inwentarze muszą być puste! +provisional-rocket-silo-button-tooltip-nauvis=Jeszcze nie wiesz, dokąd iść! +provisional-rocket-silo-description=Wypełnij inwentarz rakiety i wystrzel rakietę, aby uciec do Nauvis.\nUpewnij się, że zabierasz materiały do uruchomienia produkcji żelaza, miedzi i drewna. diff --git a/lignumis/prototypes/compatibility/aai-industry.lua b/lignumis/prototypes/compatibility/aai-industry.lua new file mode 100644 index 0000000..83e9047 --- /dev/null +++ b/lignumis/prototypes/compatibility/aai-industry.lua @@ -0,0 +1,32 @@ +local Technology = require("__cf-lib__/data/Technology") + +if not mods["aai-industry"] then return end + +data.raw.recipe["wood-science-pack"].allow_hand_crafting = true + +local burner_mechanics = Technology:new("burner-mechanics") +burner_mechanics:addPrerequisite("iron-processing") +burner_mechanics:removeRecipe("burner-inserter") +burner_mechanics:removeRecipe("burner-mining-drill") +burner_mechanics:removeRecipe("burner-assembling-machine") + +data.raw.recipe["burner-inserter"].enabled = true +data.raw.recipe["burner-mining-drill"].enabled = true + +local burner_automation = Technology:new("burner-automation") +burner_automation:addRecipe("burner-assembling-machine") + +local wall = data.raw["wall"]["concrete-wall"] +wall.emissions_per_second = wall.emissions_per_second or {} +wall.emissions_per_second.noise = -30 / 60 + +data.raw["lab"]["wood-lab"].next_upgrade = "burner-lab" + +table.insert(data.raw["agricultural-tower"]["burner-agricultural-tower"].energy_source.fuel_categories, "processed-chemical") + +if settings.startup["lignumis-basic-circuit-board"].value then + table.insert(data.raw["recipe"]["electric-mining-drill"].ingredients, { type = "item", name = "basic-circuit-board", amount = 2 }) + table.insert(data.raw["recipe"]["inserter"].ingredients, { type = "item", name = "basic-circuit-board", amount = 1 }) + table.insert(data.raw["recipe"]["burner-lab"].ingredients, { type = "item", name = "basic-circuit-board", amount = 10 }) + table.insert(data.raw["recipe"]["assembling-machine-1"].ingredients, { type = "item", name = "basic-circuit-board", amount = 5 }) +end \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/aai-loaders.lua b/lignumis/prototypes/compatibility/aai-loaders.lua new file mode 100644 index 0000000..77b4c84 --- /dev/null +++ b/lignumis/prototypes/compatibility/aai-loaders.lua @@ -0,0 +1,63 @@ +local Recipe = require("__cf-lib__/data/Recipe") +local Technology = require("__cf-lib__/data/Technology") + +if not mods["aai-loaders"] then return end + +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + +local recipe = { + ingredients = { + { type = "item", name = "lumber", amount = 5 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 10 } or + { type = "item", name = "gold-cable", amount = 10 }, + { type = "item", name = "wood-transport-belt", amount = 1 } + }, + energy_required = 1 +} + +AAILoaders.make_tier({ + name = "wood", + transport_belt = "wood-transport-belt", + color = { 163, 117, 102 }, + fluid = "steam", + fluid_per_minute = 7.5, + fluid_technology_prerequisites = { "gold-fluid-handling" }, + technology = { + unit = { + count = 25, + ingredients = { { "wood-science-pack", 1 } }, + time = 15 + }, + prerequisites = { "wood-logistics" } + }, + recipe = recipe, + unlubricated_recipe = mods["aai-loaders-sane"] and recipe or { + ingredients = { + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "gold-cable", amount = 100 }, + { type = "item", name = "wood-transport-belt", amount = 1 } + }, + energy_required = 5 + }, + next_upgrade = "aai-loader", + localise = false +}) + +if not basic_circuit_board then + local nauvis_recipe = Recipe:new("aai-wood-loader"):clone("wood-loader-electronic-circuit") + nauvis_recipe:replaceIngredient("gold-cable", "electronic-circuit") + nauvis_recipe:unlockedByTechnology("electronics") + nauvis_recipe:assign({ + localised_name = { "entity-name.aai-wood-loader" }, + icons = table.assign( + table.deepcopy(data.raw.item["aai-wood-loader"].icons), + { { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } } + ) + }) + nauvis_recipe:apply() +end + +if mods["aai-loaders-sane"] then + Technology:new("wood-logistics"):addRecipe("aai-wood-loader") + data.raw.technology["aai-wood-loader"] = nil +end diff --git a/lignumis/prototypes/compatibility/alien-biomes.lua b/lignumis/prototypes/compatibility/alien-biomes.lua index ebc234e..cd6813c 100644 --- a/lignumis/prototypes/compatibility/alien-biomes.lua +++ b/lignumis/prototypes/compatibility/alien-biomes.lua @@ -3,4 +3,14 @@ if not mods["alien-biomes"] then return end local settings = data.raw.planet["lignumis"]["map_gen_settings"].autoplace_settings["decorative"].settings settings["medium-rock"] = nil settings["small-rock"] = nil -settings["tiny-rock"] = nil \ No newline at end of file +settings["tiny-rock"] = nil + +-- Fix trees not being plantable on Alien Biomes tiles +local tile_restriction = data.raw["plant"]["tree-plant"].autoplace.tile_restriction +for _, tile in pairs(alien_biomes.all_tiles()) do + if tile.tags and (table.contains(tile.tags, "dirt") or table.contains(tile.tags, "grass")) then + if not table.contains(tile_restriction, tile.name) then + table.insert(tile_restriction, tile.name) + end + end +end \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index c6832f0..f664573 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -1,4 +1,7 @@ require("hot-metals") require("wood-military") require("metal-and-stars") -require("alien-biomes") \ No newline at end of file +require("alien-biomes") +require("planet-picker") +require("aai-loaders") +require("nuclear-science") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/final.lua b/lignumis/prototypes/compatibility/final.lua new file mode 100644 index 0000000..13dc3b3 --- /dev/null +++ b/lignumis/prototypes/compatibility/final.lua @@ -0,0 +1,3 @@ +if not data.raw.technology["legendary-quality"] then + table.removeValue(data.raw.technology["quality-assembler"].prerequisites, "legendary-quality") +end \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/hot-metals.lua b/lignumis/prototypes/compatibility/hot-metals.lua index 83ca8ec..34043eb 100644 --- a/lignumis/prototypes/compatibility/hot-metals.lua +++ b/lignumis/prototypes/compatibility/hot-metals.lua @@ -1,3 +1,3 @@ if not mods["hot-metals"] then return end -table.insert(HotMetals.items, { name = "gold-plate", iconFolder = "__lignumis__/graphics/icons/" }) \ No newline at end of file +table.insert(HotMetals.items, { name = "gold-plate", iconFolder = Lignumis.graphics .. "icons/" }) \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/metal-and-stars.lua b/lignumis/prototypes/compatibility/metal-and-stars.lua index 8e8dba5..c1fb9f8 100644 --- a/lignumis/prototypes/compatibility/metal-and-stars.lua +++ b/lignumis/prototypes/compatibility/metal-and-stars.lua @@ -3,4 +3,4 @@ if not mods["metal-and-stars"] then return end data.raw.recipe["gold-plate"].enabled = true data.raw.recipe["gold-cable"].enabled = true -data.raw.item["gold-plate"].icon = "__lignumis__/graphics/icons/gold-plate.png" \ No newline at end of file +data.raw.item["gold-plate"].icon = Lignumis.graphics .. "icons/gold-plate.png" \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/nuclear-science.lua b/lignumis/prototypes/compatibility/nuclear-science.lua new file mode 100644 index 0000000..dad7df4 --- /dev/null +++ b/lignumis/prototypes/compatibility/nuclear-science.lua @@ -0,0 +1,4 @@ +if not mods["atan-nuclear-science"] then return end + +table.insert(data.raw["assembling-machine"]["burner-assembling-machine"].crafting_categories, "advanced-centrifuging-or-crafting") +table.insert(data.raw["assembling-machine"]["steam-assembling-machine"].crafting_categories, "advanced-centrifuging-or-crafting") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/planet-picker.lua b/lignumis/prototypes/compatibility/planet-picker.lua new file mode 100644 index 0000000..170924a --- /dev/null +++ b/lignumis/prototypes/compatibility/planet-picker.lua @@ -0,0 +1,7 @@ +local Technology = require("__cf-lib__/data/Technology") + +if not mods["planet-picker"] and not mods["any-planet-start"] then return end + +local technology = Technology:new("planet-discovery-lignumis") +technology:setPrerequisites({ "space-platform-thruster" }) +technology:addIngredients({ "logistic-science-pack", "chemical-science-pack", "space-science-pack" }) diff --git a/lignumis/prototypes/compatibility/updates.lua b/lignumis/prototypes/compatibility/updates.lua new file mode 100644 index 0000000..7591d8b --- /dev/null +++ b/lignumis/prototypes/compatibility/updates.lua @@ -0,0 +1 @@ +require("aai-industry") \ No newline at end of file diff --git a/lignumis/prototypes/content/active-noise-cancelling-tower.lua b/lignumis/prototypes/content/active-noise-cancelling-tower.lua index 79ad117..a9e0d84 100644 --- a/lignumis/prototypes/content/active-noise-cancelling-tower.lua +++ b/lignumis/prototypes/content/active-noise-cancelling-tower.lua @@ -13,7 +13,7 @@ data:extend({ name = "active-noise-cancelling-tower", icons = { { icon = "__base__/graphics/icons/programmable-speaker.png" }, - { icon = "__lignumis__/graphics/icons/active-noise-cancelling.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/active-noise-cancelling.png", scale = 0.25, shift = { 8, 8 } } }, icon_draw_specification = { shift = { 0, -1 }, scale = 0.75, scale_for_many = 0.5 }, flags = { "placeable-neutral", "player-creation" }, @@ -84,7 +84,7 @@ data:extend({ name = "active-noise-cancelling-tower", icons = { { icon = "__base__/graphics/icons/programmable-speaker.png" }, - { icon = "__lignumis__/graphics/icons/active-noise-cancelling.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/active-noise-cancelling.png", scale = 0.25, shift = { 8, 8 } } }, subgroup = "circuit-network", order = "d[other]-c[active-noise-cancelling-tower]", @@ -111,7 +111,7 @@ data:extend({ { type = "recipe", name = "active-noise-cancelling", - icons = { { icon = "__lignumis__/graphics/icons/active-noise-cancelling.png" } }, + icons = { { icon = Lignumis.graphics .. "icons/active-noise-cancelling.png" } }, enabled = false, energy_required = 1000000, ingredients = {}, @@ -124,7 +124,7 @@ data:extend({ { type = "technology", name = "active-noise-cancelling", - icon = "__lignumis__/graphics/technology/active-noise-cancelling.png", + icon = Lignumis.graphics .. "technology/active-noise-cancelling.png", icon_size = 128, effects = { { diff --git a/lignumis/prototypes/content/basic-circuit-boards.lua b/lignumis/prototypes/content/basic-circuit-boards.lua new file mode 100644 index 0000000..7c12dcc --- /dev/null +++ b/lignumis/prototypes/content/basic-circuit-boards.lua @@ -0,0 +1,58 @@ +local item_sounds = require("__base__.prototypes.item_sounds") +local Technology = require("__cf-lib__/data/Technology") + +if not settings.startup["lignumis-basic-circuit-board"].value then return end + +data:extend({ + { + type = "item", + name = "basic-circuit-board", + icon = Lignumis.graphics .. "icons/basic-circuit-board.png", + subgroup = "intermediate-product", + order = "c[circuits]-0[basic-circuit-board]", + inventory_move_sound = item_sounds.electric_small_inventory_move, + pick_sound = item_sounds.electric_small_inventory_pickup, + drop_sound = item_sounds.electric_small_inventory_move, + stack_size = 200, + weight = 0.5 * kg + }, + { + type = "recipe", + name = "basic-circuit-board", + category = "wood-processing-or-assembling", + icons = { + { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" }, + { icon = Lignumis.graphics .. "icons/gold-cable.png", scale = 0.25, shift = { 8, 8 } } + }, + ingredients = { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "gold-cable", amount = 2 } + }, + results = { { type = "item", name = "basic-circuit-board", amount = 2 } }, + enabled = true, + allow_productivity = true + }, + { + type = "recipe", + name = "basic-circuit-board-copper", + localised_name = { "item-name.basic-circuit-board" }, + category = "wood-processing-or-assembling", + icons = { + { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" }, + { icon = "__base__/graphics/icons/copper-cable.png", scale = 0.25, shift = { 8, 8 } } + }, + ingredients = { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "copper-cable", amount = 2 } + }, + results = { { type = "item", name = "basic-circuit-board", amount = 2 } }, + enabled = false, + allow_productivity = true + } +}) + +Technology:new("copper-processing"):addRecipe("basic-circuit-board-copper") + +if settings.startup["lignumis-circuit-progression"].value then + table.insert(data.raw.recipe["electronic-circuit"].ingredients, { type = "item", name = "basic-circuit-board", amount = 1 }) +end \ No newline at end of file diff --git a/lignumis/prototypes/content/basic-construction-robots.lua b/lignumis/prototypes/content/basic-construction-robots.lua index 3d58393..a9fd4bf 100644 --- a/lignumis/prototypes/content/basic-construction-robots.lua +++ b/lignumis/prototypes/content/basic-construction-robots.lua @@ -1,20 +1,22 @@ local item_sounds = require("__base__.prototypes.item_sounds") local item_tints = require("__base__.prototypes.item-tints") +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + local function robot(color) local result = table.deepcopy(data.raw["construction-robot"]["construction-robot"]) result.name = "basic-construction-robot-" .. color - result.icon = "__lignumis__/graphics/icons/basic-construction-robot-" .. color .. ".png" + result.icon = Lignumis.graphics .. "icons/basic-construction-robot-" .. color .. ".png" result.minable.result = "basic-construction-robot-" .. color result.max_health = 50 result.speed = 0.04 result.max_energy = "2MJ" - result.idle.filename = "__lignumis__/graphics/entity/basic-construction-robot/basic-construction-robot-" .. + result.idle.filename = Lignumis.graphics .. "entity/basic-construction-robot/basic-construction-robot-" .. color .. ".png" - result.in_motion.filename = "__lignumis__/graphics/entity/basic-construction-robot/basic-construction-robot-" .. + result.in_motion.filename = Lignumis.graphics .. "entity/basic-construction-robot/basic-construction-robot-" .. color .. ".png" result.working.filename = - "__lignumis__/graphics/entity/basic-construction-robot/basic-construction-robot-" .. color .. "-working.png" + Lignumis.graphics .. "entity/basic-construction-robot/basic-construction-robot-" .. color .. "-working.png" return result end @@ -22,7 +24,7 @@ local function robot_item(color, order) return { type = "item", name = "basic-construction-robot-" .. color, - icon = "__lignumis__/graphics/icons/basic-construction-robot-" .. color .. ".png", + icon = Lignumis.graphics .. "icons/basic-construction-robot-" .. color .. ".png", subgroup = "logistic-network", order = "a[robot]-b" .. order .. "[basic-construction-robot-" .. color .. "]", inventory_move_sound = item_sounds.robotic_inventory_move, @@ -40,7 +42,7 @@ local function robot_recipe(color, ingredients) name = "basic-construction-robot-" .. color, enabled = false, energy_required = 10, - ingredients = ingredients, + ingredients = table.trim(ingredients), results = { { type = "item", name = "basic-construction-robot-" .. color, amount = 1 } } } end @@ -50,7 +52,7 @@ local function generator(color) type = "generator-equipment", name = "basic-portable-generator-equipment-" .. color, sprite = { - filename = "__lignumis__/graphics/equipment/basic-portable-generator-equipment-" .. + filename = Lignumis.graphics .. "equipment/basic-portable-generator-equipment-" .. color .. ".png", width = 128, height = 128, @@ -92,7 +94,7 @@ local function generator_item(color, order) return { type = "item", name = "basic-portable-generator-equipment-" .. color, - icon = "__lignumis__/graphics/icons/basic-portable-generator-equipment-" .. color .. ".png", + icon = Lignumis.graphics .. "icons/basic-portable-generator-equipment-" .. color .. ".png", subgroup = "equipment", order = "a[energy-source]-a" .. order .. "[basic-portable-generator-equipment-" .. color .. "]", inventory_move_sound = item_sounds.robotic_inventory_move, @@ -109,7 +111,7 @@ local function generator_recipe(color, ingredients) name = "basic-portable-generator-equipment-" .. color, enabled = false, energy_required = 10, - ingredients = ingredients, + ingredients = table.trim(ingredients), results = { { type = "item", name = "basic-portable-generator-equipment-" .. color, amount = 1 } } } end @@ -118,7 +120,7 @@ local function roboport(color) local result = table.deepcopy(data.raw["roboport-equipment"]["personal-roboport-equipment"]) result.name = "basic-personal-roboport-equipment-" .. color result.take_result = "basic-personal-roboport-equipment-" .. color - result.sprite.filename = "__lignumis__/graphics/equipment/basic-personal-roboport-equipment-" .. color .. ".png" + result.sprite.filename = Lignumis.graphics .. "equipment/basic-personal-roboport-equipment-" .. color .. ".png" result.energy_source.input_flow_limit = "400kW" result.energy_source.buffer_capacity = "10MJ" result.charging_energy = "500kW" @@ -130,7 +132,7 @@ local function roboport_item(color, order) return { type = "item", name = "basic-personal-roboport-equipment-" .. color, - icon = "__lignumis__/graphics/icons/basic-personal-roboport-equipment-" .. color .. ".png", + icon = Lignumis.graphics .. "icons/basic-personal-roboport-equipment-" .. color .. ".png", place_as_equipment_result = "basic-personal-roboport-equipment-" .. color, subgroup = "utility-equipment", order = "e[robotics]-a" .. order .. "[basic-personal-roboport-equipment-" .. color .. "]", @@ -147,7 +149,7 @@ local function roboport_recipe(color, ingredients) name = "basic-personal-roboport-equipment-" .. color, enabled = false, energy_required = 10, - ingredients = ingredients, + ingredients = table.trim(ingredients), results = { { type = "item", name = "basic-personal-roboport-equipment-" .. color, amount = 1 } } } end @@ -155,7 +157,7 @@ end local gold_robot_technology = { type = "technology", name = "basic-construction-robotics-gold", - icon = "__lignumis__/graphics/technology/basic-construction-robotics-gold.png", + icon = Lignumis.graphics .. "technology/basic-construction-robotics-gold.png", icon_size = 256, effects = { { @@ -189,7 +191,7 @@ local gold_robot_technology = { local copper_robot_technology = { type = "technology", name = "basic-construction-robotics-copper", - icon = "__lignumis__/graphics/technology/basic-construction-robotics-copper.png", + icon = Lignumis.graphics .. "technology/basic-construction-robotics-copper.png", icon_size = 256, effects = { { @@ -222,7 +224,8 @@ data:extend({ robot_recipe("gold", { { type = "item", name = "gold-plate", amount = 2 }, { type = "item", name = "wooden-gear-wheel", amount = 5 }, - { type = "item", name = "gold-cable", amount = 10 } + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } }), generator("gold"), generator_item("gold", 0), @@ -233,7 +236,8 @@ data:extend({ roboport("gold"), roboport_item("gold", 0), roboport_recipe("gold", { - { type = "item", name = "gold-plate", amount = 10 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 5 or 10 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 10 } or nil, { type = "item", name = "wooden-gear-wheel", amount = 10 } }), @@ -241,9 +245,9 @@ data:extend({ robot("copper"), robot_item("copper", 1), robot_recipe("copper", { - { type = "item", name = "iron-plate", amount = 2 }, + { type = "item", name = "copper-plate", amount = 2 }, { type = "item", name = "iron-gear-wheel", amount = 5 }, - { type = "item", name = "electronic-circuit", amount = 10 } + { type = "item", name = "electronic-circuit", amount = 5 } }), generator("copper"), generator_item("copper", 1), @@ -254,9 +258,9 @@ data:extend({ roboport("copper"), roboport_item("copper", 1), roboport_recipe("copper", { - { type = "item", name = "copper-plate", amount = 10 }, - { type = "item", name = "iron-gear-wheel", amount = 10 }, - { type = "item", name = "electronic-circuit", amount = 20 } + { type = "item", name = "copper-plate", amount = 5 }, + { type = "item", name = "electronic-circuit", amount = 10 }, + { type = "item", name = "iron-gear-wheel", amount = 10 } }), -- Technology diff --git a/lignumis/prototypes/content/basic-gun-turret.lua b/lignumis/prototypes/content/basic-gun-turret.lua index b9eb15a..92eaeb7 100644 --- a/lignumis/prototypes/content/basic-gun-turret.lua +++ b/lignumis/prototypes/content/basic-gun-turret.lua @@ -2,40 +2,40 @@ local item_sounds = require("__base__.prototypes.item_sounds") local turret = table.deepcopy(data.raw["ammo-turret"]["gun-turret"]) turret.name = "basic-gun-turret" -turret.icon = "__lignumis__/graphics/icons/basic-gun-turret.png" +turret.icon = Lignumis.graphics .. "icons/basic-gun-turret.png" turret.minable.result = "basic-gun-turret" turret.max_health = 300 turret.rotation_speed = 0.01 turret.attacking_speed = 0.35 -turret.folded_animation.layers[1].filename = "__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png" +turret.folded_animation.layers[1].filename = Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-raising.png" turret.preparing_animation.layers[1].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-raising.png" turret.prepared_animation.layers[1].stripes[1].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-1.png" turret.prepared_animation.layers[1].stripes[2].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-2.png" turret.prepared_animation.layers[1].stripes[3].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-3.png" turret.prepared_animation.layers[1].stripes[4].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-4.png" turret.attacking_animation.layers[1].stripes[1].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-1.png" turret.attacking_animation.layers[1].stripes[2].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-2.png" turret.attacking_animation.layers[1].stripes[3].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-3.png" turret.attacking_animation.layers[1].stripes[4].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-shooting-4.png" turret.folding_animation.layers[1].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-raising.png" turret.graphics_set.base_visualisation.animation.layers[1].filename = -"__lignumis__/graphics/entity/basic-gun-turret/basic-gun-turret-base.png" +Lignumis.graphics .. "entity/basic-gun-turret/basic-gun-turret-base.png" turret.attack_parameters.range = 18 local turret_item = { type = "item", name = "basic-gun-turret", - icon = "__lignumis__/graphics/icons/basic-gun-turret.png", + icon = Lignumis.graphics .. "icons/basic-gun-turret.png", subgroup = "turret", order = "b[turret]-0[basic-gun-turret]", inventory_move_sound = item_sounds.turret_inventory_move, @@ -61,7 +61,7 @@ local turret_recipe = { local turret_technology = { type = "technology", name = "basic-gun-turret", - icon = "__lignumis__/graphics/technology/basic-gun-turret.png", + icon = Lignumis.graphics .. "technology/basic-gun-turret.png", icon_size = 256, effects = { { diff --git a/lignumis/prototypes/content/basic-radar.lua b/lignumis/prototypes/content/basic-radar.lua index 469bc8b..c2336f3 100644 --- a/lignumis/prototypes/content/basic-radar.lua +++ b/lignumis/prototypes/content/basic-radar.lua @@ -2,11 +2,13 @@ local hit_effects = require("__base__.prototypes.entity.hit-effects") local item_sounds = require("__base__.prototypes.item_sounds") local item_tints = require("__base__.prototypes.item-tints") +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + data:extend({ { type = "radar", name = "basic-radar", - icon = "__lignumis__/graphics/icons/basic-radar.png", + icon = Lignumis.graphics .. "icons/basic-radar.png", flags = { "placeable-player", "player-creation" }, minable = { mining_time = 0.1, result = "basic-radar" }, fast_replaceable_group = "small-radar", @@ -41,7 +43,7 @@ data:extend({ pictures = { layers = { { - filename = "__lignumis__/graphics/entity/basic-radar.png", + filename = Lignumis.graphics .. "entity/basic-radar.png", priority = "low", width = 128, height = 128, @@ -61,7 +63,7 @@ data:extend({ { type = "item", name = "basic-radar", - icon = "__lignumis__/graphics/icons/basic-radar.png", + icon = Lignumis.graphics .. "icons/basic-radar.png", subgroup = "defensive-structure", order = "d[radar]-0[basic-radar]", inventory_move_sound = item_sounds.metal_large_inventory_move, @@ -74,14 +76,13 @@ data:extend({ { type = "recipe", name = "basic-radar", - category = "crafting-with-fluid", + category = "crafting-with-steam", energy_required = 10, ingredients = { - { type = "item", name = "stone-brick", amount = 4 }, - { type = "item", name = "wooden-gear-wheel", amount = 4 }, - { type = "item", name = "gold-plate", amount = 4 }, - { type = "item", name = "gold-cable", amount = 4 }, - { type = "fluid", name = "steam", amount = 20 } + { type = "item", name = "stone-brick", amount = 4 }, + { type = "item", name = "wooden-gear-wheel", amount = 4 }, + { type = "item", name = "gold-plate", amount = 4 }, + { type = "item", name = basic_circuit_board and "basic-circuit-board" or "gold-cable", amount = 4 } }, results = { { type = "item", name = "basic-radar", amount = 1 } }, enabled = false @@ -89,7 +90,7 @@ data:extend({ { type = "technology", name = "basic-radar", - icon = "__lignumis__/graphics/technology/basic-radar.png", + icon = Lignumis.graphics .. "technology/basic-radar.png", icon_size = 256, effects = { { diff --git a/lignumis/prototypes/content/basic-repair-pack.lua b/lignumis/prototypes/content/basic-repair-pack.lua index da6a1e7..84d2687 100644 --- a/lignumis/prototypes/content/basic-repair-pack.lua +++ b/lignumis/prototypes/content/basic-repair-pack.lua @@ -8,7 +8,7 @@ data:extend({ { type = "repair-tool", name = "basic-repair-pack", - icon = "__lignumis__/graphics/icons/basic-repair-pack.png", + icon = Lignumis.graphics .. "icons/basic-repair-pack.png", subgroup = "tool", order = "b[repair]-0[basic-repair-pack]", inventory_move_sound = item_sounds.repair_pack_inventory_move, @@ -33,7 +33,7 @@ data:extend({ { type = "technology", name = "basic-repair-pack", - icon = "__lignumis__/graphics/technology/basic-repair-pack.png", + icon = Lignumis.graphics .. "technology/basic-repair-pack.png", icon_size = 256, effects = { { diff --git a/lignumis/prototypes/content/burner-agricultural-tower.lua b/lignumis/prototypes/content/burner-agricultural-tower.lua index 4bec13f..3233527 100644 --- a/lignumis/prototypes/content/burner-agricultural-tower.lua +++ b/lignumis/prototypes/content/burner-agricultural-tower.lua @@ -1,16 +1,17 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local gfx = "__lignumis__/graphics/entity/burner-agricultural-tower/" +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local gfx = Lignumis.graphics .. "entity/burner-agricultural-tower/" local agricultural_tower = table.deepcopy(data.raw["agricultural-tower"]["agricultural-tower"]) agricultural_tower.name = "burner-agricultural-tower" agricultural_tower.minable.result = "burner-agricultural-tower" agricultural_tower.next_upgrade = "agricultural-tower" agricultural_tower.corpses = "burner-agricultural-tower-remnants" -agricultural_tower.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" +agricultural_tower.icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" agricultural_tower.graphics_set.animation.layers[1].filename = gfx .. "burner-agricultural-tower-base.png" agricultural_tower.graphics_set.working_visualisations[1].animation.filename = gfx .. -"burner-agricultural-tower-base.png" + "burner-agricultural-tower-base.png" agricultural_tower.energy_source = { type = "burner", fuel_categories = { "chemical" }, @@ -22,7 +23,13 @@ agricultural_tower.resistances = nil agricultural_tower.input_inventory_size = 1 agricultural_tower.output_inventory_size = 3 agricultural_tower.radius = 2 -agricultural_tower.surface_conditions[1].min = 900 +if agricultural_tower.surface_conditions then + for _, condition in pairs(agricultural_tower.surface_conditions) do + if condition.property == "pressure" then + condition.min = 900 + end + end +end local crane = agricultural_tower.crane crane.parts[1].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-1-1.png", gfx .. @@ -52,7 +59,7 @@ crane.speed = { local remnants = table.deepcopy(data.raw["corpse"]["agricultural-tower-remnants"]) remnants.name = "burner-agricultural-tower-remnants" -remnants.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" +remnants.icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" remnants.animation.filename = gfx .. "burner-agricultural-tower-remnants.png" remnants.order = "a[0-burner-agricultural-tower]" @@ -62,7 +69,7 @@ data:extend({ { type = "item", name = "burner-agricultural-tower", - icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png", + icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png", subgroup = "agriculture", order = "0[burner-agricultural-tower]", inventory_move_sound = item_sounds.mechanical_large_inventory_move, @@ -80,24 +87,8 @@ data:extend({ { type = "item", name = "stone-brick", amount = 5 }, { type = "item", name = "wooden-gear-wheel", amount = 20 }, { type = "item", name = "lumber", amount = 20 }, - { type = "item", name = "gold-plate", amount = 20 } - }, - results = { { type = "item", name = "burner-agricultural-tower", amount = 1 } }, - enabled = false - }, - { - type = "recipe", - name = "burner-agricultural-tower-electronic-circuit", - icons = { - { icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - }, - energy_required = 10, - ingredients = { - { type = "item", name = "stone-brick", amount = 5 }, - { type = "item", name = "wooden-gear-wheel", amount = 20 }, - { type = "item", name = "lumber", amount = 20 }, - { type = "item", name = "electronic-circuit", amount = 10 } + { type = "item", name = "gold-plate", amount = basic_circuit_board and 10 or 20 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 10 } or nil }, results = { { type = "item", name = "burner-agricultural-tower", amount = 1 } }, enabled = false @@ -114,10 +105,34 @@ tech.unit = { }, time = 10 } +tech.ignore_tech_cost_multiplier = true data.raw.technology["fish-breeding"].prerequisites = { "agricultural-science-pack" } -table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "burner-agricultural-tower-electronic-circuit" -}) +if not basic_circuit_board then + data:extend({ + { + type = "recipe", + name = "burner-agricultural-tower-electronic-circuit", + localised_name = { "entity-name.burner-agricultural-tower" }, + icons = { + { icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + }, + energy_required = 10, + ingredients = { + { type = "item", name = "stone-brick", amount = 5 }, + { type = "item", name = "wooden-gear-wheel", amount = 20 }, + { type = "item", name = "lumber", amount = 20 }, + { type = "item", name = "electronic-circuit", amount = 10 } + }, + results = { { type = "item", name = "burner-agricultural-tower", amount = 1 } }, + enabled = false + } + }) + + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "burner-agricultural-tower-electronic-circuit" + }) +end diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua index e121c90..72ec137 100644 --- a/lignumis/prototypes/content/burner-assembling-machine.lua +++ b/lignumis/prototypes/content/burner-assembling-machine.lua @@ -1,21 +1,26 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local gfx = "__lignumis__/graphics/entity/burner-assembling-machine/" +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local gfx = Lignumis.graphics .. "entity/burner-assembling-machine/" local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"]) assembling_machine.name = "burner-assembling-machine" -assembling_machine.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" +assembling_machine.icon = Lignumis.graphics .. "icons/burner-assembling-machine.png" assembling_machine.minable.result = "burner-assembling-machine" assembling_machine.next_upgrade = "steam-assembling-machine" assembling_machine.corpse = "burner-assembling-machine-remnants" assembling_machine.resistances = nil assembling_machine.graphics_set.animation.layers[1].filename = -gfx .. "burner-assembling-machine.png" + gfx .. "burner-assembling-machine.png" assembling_machine.crafting_categories = { - "crafting", "basic-crafting", + "crafting", + "electronics", + "pressing", + "wood-processing-or-assembling", "organic-or-assembling", - "wood-processing-or-assembling" + "electronics-or-assembling", + "metallurgy-or-assembling" } assembling_machine.crafting_speed = 0.25 assembling_machine.energy_source = { @@ -23,7 +28,7 @@ assembling_machine.energy_source = { fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 1, - emissions_per_minute = { noise = 50 }, + emissions_per_minute = { noise = 50, pollution = 6 }, smoke = { { name = "smoke", @@ -39,7 +44,7 @@ assembling_machine.energy_usage = "75kW" local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"]) remnants.name = "burner-assembling-machine-remnants" -remnants.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" +remnants.icon = Lignumis.graphics .. "icons/burner-assembling-machine.png" remnants.animation[1].filename = gfx .. "burner-assembling-machine-remnants.png" remnants.animation[2].filename = gfx .. "burner-assembling-machine-remnants.png" remnants.animation[3].filename = gfx .. "burner-assembling-machine-remnants.png" @@ -51,7 +56,7 @@ data:extend({ { type = "item", name = "burner-assembling-machine", - icon = "__lignumis__/graphics/icons/burner-assembling-machine.png", + icon = Lignumis.graphics .. "icons/burner-assembling-machine.png", subgroup = "production-machine", order = "0[burner-assembling-machine]", inventory_move_sound = item_sounds.mechanical_inventory_move, @@ -67,7 +72,8 @@ data:extend({ ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 5 }, { type = "item", name = "lumber", amount = 8 }, - { type = "item", name = "gold-cable", amount = 20 } + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } }, results = { { type = "item", name = "burner-assembling-machine", amount = 1 } }, energy_required = 4 @@ -75,7 +81,7 @@ data:extend({ { type = "technology", name = "burner-automation", - icon = "__lignumis__/graphics/technology/burner-automation.png", + icon = Lignumis.graphics .. "technology/burner-automation.png", icon_size = 256, effects = { { @@ -96,3 +102,30 @@ data:extend({ ignore_tech_cost_multiplier = true } }) + +if not basic_circuit_board then + data:extend({ + { + type = "recipe", + name = "burner-assembling-machine-electronic-circuit", + localised_name = { "entity-name.burner-assembling-machine" }, + icons = { + { icon = Lignumis.graphics .. "icons/burner-assembling-machine.png" }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + }, + enabled = false, + ingredients = { + { type = "item", name = "wooden-gear-wheel", amount = 5 }, + { type = "item", name = "lumber", amount = 8 }, + { type = "item", name = "electronic-circuit", amount = 5 } + }, + results = { { type = "item", name = "burner-assembling-machine", amount = 1 } }, + energy_required = 4 + } + }) + + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "burner-assembling-machine-electronic-circuit" + }) +end diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index 257c584..27e1d99 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -1,10 +1,11 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local gfx = "__lignumis__/graphics/entity/burner-long-handed-inserter/" +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local gfx = Lignumis.graphics .. "entity/burner-long-handed-inserter/" local long_handed_inserter = table.deepcopy(data.raw["inserter"]["long-handed-inserter"]) long_handed_inserter.name = "burner-long-handed-inserter" -long_handed_inserter.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" +long_handed_inserter.icon = Lignumis.graphics .. "icons/burner-long-handed-inserter.png" long_handed_inserter.minable.result = "burner-long-handed-inserter" long_handed_inserter.next_upgrade = "long-handed-inserter" long_handed_inserter.corpse = "burner-long-handed-inserter-remnants" @@ -13,8 +14,8 @@ long_handed_inserter.hand_base_picture.filename = gfx .. "burner-long-handed-ins long_handed_inserter.hand_closed_picture.filename = gfx .. "burner-long-handed-inserter-hand-closed.png" long_handed_inserter.hand_open_picture.filename = gfx .. "burner-long-handed-inserter-hand-open.png" long_handed_inserter.platform_picture.sheet.filename = gfx .. "burner-long-handed-inserter-platform.png" -long_handed_inserter.energy_per_movement = "100kJ" -long_handed_inserter.energy_per_rotation = "100kJ" +long_handed_inserter.energy_per_movement = "70kJ" +long_handed_inserter.energy_per_rotation = "70kJ" long_handed_inserter.energy_source = { type = "burner", fuel_categories = { "chemical" }, @@ -36,7 +37,7 @@ long_handed_inserter.rotation_speed = 0.014 local remnants = table.deepcopy(data.raw["corpse"]["long-handed-inserter-remnants"]) remnants.name = "burner-long-handed-inserter-remnants" -remnants.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" +remnants.icon = Lignumis.graphics .. "icons/burner-long-handed-inserter.png" remnants.animation[1].filename = gfx .. "burner-long-handed-inserter-remnants.png" remnants.animation[2].filename = gfx .. "burner-long-handed-inserter-remnants.png" remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.png" @@ -49,7 +50,7 @@ data:extend({ { type = "item", name = "burner-long-handed-inserter", - icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png", + icon = Lignumis.graphics .. "icons/burner-long-handed-inserter.png", subgroup = "inserter", color_hint = { text = "L" }, order = "b0[burner-long-handed-inserter]", @@ -65,9 +66,10 @@ data:extend({ enabled = false, ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 1 }, - { type = "item", name = "burner-inserter", amount = 1 }, - { type = "item", name = "gold-cable", amount = 4 } + { type = "item", name = "burner-inserter", amount = 1 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 1 } or + { type = "item", name = "gold-cable", amount = 2 } }, results = { { type = "item", name = "burner-long-handed-inserter", amount = 1 } } } -}) \ No newline at end of file +}) diff --git a/lignumis/prototypes/content/data.lua b/lignumis/prototypes/content/data.lua index 42fdb57..2a4a1d5 100644 --- a/lignumis/prototypes/content/data.lua +++ b/lignumis/prototypes/content/data.lua @@ -1,3 +1,4 @@ +require("item-subgroups") require("technology") require("lignumis/planet") require("lignumis/autoplace-controls") @@ -28,5 +29,7 @@ require("active-noise-cancelling-tower") require("quality-assembler") require("decoratives") require("wood-military") +require("basic-circuit-boards") +require("enemies") require("noise") diff --git a/lignumis/prototypes/content/desiccation-furnace.lua b/lignumis/prototypes/content/desiccation-furnace.lua index 7f2f583..d4bfb04 100644 --- a/lignumis/prototypes/content/desiccation-furnace.lua +++ b/lignumis/prototypes/content/desiccation-furnace.lua @@ -5,12 +5,12 @@ local machinepipes = require("prototypes/content/gold/machinepipes") local furnace = table.deepcopy(data.raw.furnace["stone-furnace"]) furnace.name = "desiccation-furnace" furnace.icons = { - { icon = "__lignumis__/graphics/icons/stone-furnace.png" }, + { icon = Lignumis.graphics .. "icons/stone-furnace.png" }, { icon = "__base__/graphics/icons/fluid/steam.png", scale = 0.25, shift = { 8, -8 } } } furnace.fluid_boxes = { { - volume = 100, + volume = 200, pipe_picture = machinepipes(), pipe_covers = pipecovers(), pipe_connections = { @@ -21,22 +21,22 @@ furnace.fluid_boxes = { } furnace.crafting_categories = { "desiccation" } furnace.minable.result = "desiccation-furnace" -furnace.graphics_set.animation.layers[1].filename = "__lignumis__/graphics/entity/stone-furnace/stone-furnace.png" +furnace.graphics_set.animation.layers[1].filename = Lignumis.graphics .. "entity/stone-furnace/stone-furnace.png" furnace.fluid_boxes[1].pipe_covers.north.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-north.png" furnace.fluid_boxes[1].pipe_covers.east.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-east.png" furnace.fluid_boxes[1].pipe_covers.south.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-south.png" furnace.fluid_boxes[1].pipe_covers.west.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-west.png" local furnace_item = { type = "item", name = "desiccation-furnace", icons = { - { icon = "__lignumis__/graphics/icons/stone-furnace.png" }, + { icon = Lignumis.graphics .. "icons/stone-furnace.png" }, { icon = "__base__/graphics/icons/fluid/steam.png", scale = 0.25, shift = { 8, -8 } } }, subgroup = "smelting-machine", diff --git a/lignumis/prototypes/content/enemies.lua b/lignumis/prototypes/content/enemies.lua new file mode 100644 index 0000000..f2539b1 --- /dev/null +++ b/lignumis/prototypes/content/enemies.lua @@ -0,0 +1,534 @@ +local particle_animations = require("__space-age__/prototypes/particle-animations") +local base_sounds = require("__base__.prototypes.entity.sounds") +local space_age_sounds = require("__space-age__.prototypes.entity.sounds") +local simulations = require("__space-age__.prototypes.factoriopedia-simulations") +local enemy_autoplace = require("__base__.prototypes.entity.enemy-autoplace-utils") +local biter_ai_settings = require ("__base__.prototypes.entity.biter-ai-settings") + +local blood_particles = { + "blood-particle-small", +} + +for _, particle_name in ipairs(blood_particles) do + local new_particle = table.deepcopy(data.raw["optimized-particle"][particle_name]) + local scale = new_particle.pictures.sheet.scale + local shift = new_particle.pictures.sheet.shift + new_particle.name = "lignumis-" .. particle_name + new_particle.pictures = { + sheet = { + filename = "__space-age__/graphics/particle/gleba-blood-particle/gleba-blood-particle.png", + line_length = 12, + width = 32, + height = 24, + frame_count = 12, + variation_count = 7, + scale = scale * 0.25, + shift = shift + } + } + data:extend({ new_particle }) +end + +function gleba_hit_effects(offset_deviation, offset) + local offset = offset or { 0, 0 } + return { + type = "create-entity", + entity_name = "gleba-enemy-damaged-explosion", + offset_deviation = offset_deviation or { { -0.5, -0.5 }, { 0.5, 0.5 } }, + offsets = { offset }, + damage_type_filters = "fire" + } +end + +function wriggler_spritesheet(name, frames, speed, scale, tint, flag) + speed = speed or 1.0 + local is_shadow = string.sub(name, -string.len("-shadow")) == "-shadow" + local is_decay = string.find(name, "decay") + if is_decay and is_shadow then return nil end + return util.sprite_load("__space-age__/graphics/entity/wriggler/wriggler-" .. name, + { + slice = 5, + frame_count = frames, + direction_count = 16, + scale = 0.5 * 1.2 * scale, + multiply_shift = scale, + animation_speed = speed, + draw_as_shadow = is_shadow, + tint_as_overlay = tint and true or nil, + tint = tint, + flags = (not is_shadow) and { flag } or nil, + surface = "gleba", + usage = "enemy" + } + ) +end + +function wriggler_corpse_spritesheet(name, frames, speed, scale, tint) + return wriggler_spritesheet(name, frames, speed, scale, tint, "corpse-decay") +end + +local default_ended_in_water_trigger_effect = function() + return { + { + type = "create-particle", + probability = 1, + affects_target = false, + show_in_tooltip = false, + particle_name = "tintable-water-particle", + apply_tile_tint = "secondary", + offset_deviation = { { -0.05, -0.05 }, { 0.05, 0.05 } }, + initial_height = 0, + initial_height_deviation = 0.02, + initial_vertical_speed = 0.05, + initial_vertical_speed_deviation = 0.05, + speed_from_center = 0.01, + speed_from_center_deviation = 0.006, + frame_speed = 1, + frame_speed_deviation = 0, + tail_length = 2, + tail_length_deviation = 1, + tail_width = 3 + }, + { + type = "create-particle", + repeat_count = 10, + repeat_count_deviation = 6, + probability = 0.03, + affects_target = false, + show_in_tooltip = false, + particle_name = "tintable-water-particle", + apply_tile_tint = "primary", + offsets = { + { 0, 0 }, + { 0.01563, -0.09375 }, + { 0.0625, 0.09375 }, + { -0.1094, 0.0625 } + }, + offset_deviation = { { -0.2969, -0.1992 }, { 0.2969, 0.1992 } }, + initial_height = 0, + initial_height_deviation = 0.02, + initial_vertical_speed = 0.053, + initial_vertical_speed_deviation = 0.005, + speed_from_center = 0.02, + speed_from_center_deviation = 0.006, + frame_speed = 1, + frame_speed_deviation = 0, + tail_length = 9, + tail_length_deviation = 0, + tail_width = 1 + }, + { + type = "play-sound", + sound = base_sounds.small_splash + } + } +end + +local make_particle = function(params) + if not params then error("No params given to make_particle function") end + local name = params.name or error("No name given") + + local ended_in_water_trigger_effect = params.ended_in_water_trigger_effect or default_ended_in_water_trigger_effect() + if params.ended_in_water_trigger_effect == false then + ended_in_water_trigger_effect = nil + end + + local particle = { + type = "optimized-particle", + name = name, + life_time = params.life_time or (60 * 15), + fade_away_duration = params.fade_away_duration, + render_layer = params.render_layer or "projectile", + render_layer_when_on_ground = params.render_layer_when_on_ground or "corpse", + regular_trigger_effect_frequency = params.regular_trigger_effect_frequency or 2, + regular_trigger_effect = params.regular_trigger_effect, + ended_in_water_trigger_effect = ended_in_water_trigger_effect, + pictures = params.pictures, + shadows = params.shadows, + draw_shadow_when_on_ground = params.draw_shadow_when_on_ground, + movement_modifier_when_on_ground = params.movement_modifier_when_on_ground, + movement_modifier = params.movement_modifier, + vertical_acceleration = params.vertical_acceleration, + mining_particle_frame_speed = params.mining_particle_frame_speed, + } + return particle +end + +local function lerp_color(a, b, amount) + return { + a[1] + amount * (b[1] - a[1]), + a[2] + amount * (b[2] - a[2]), + a[3] + amount * (b[3] - a[3]), + a[4] + amount * (b[4] - a[4]), + } +end + +function make_wriggler(prefix, scale, health, damage, tints, factoriopedia_simulation, factoriopedia_simulation_premature, + sounds) + -- Premature version loses health so that the swarm will get removed (more efficient). + -- Spawner-spawned versions are stable so that the area is not full of corpses. + local tint_mask = tints.mask + local tint_body = tints.body + + local function attack_parameters(lifesteal) + local cooldown = 26 + return { + ammo_category = "melee", + ammo_type = { + target_type = "entity", + action = { + type = "direct", + action_delivery = { + type = "instant", + source_effects = lifesteal and { + { + type = "damage", + damage = { amount = -health / 50 / 60 * cooldown * 1.1, type = "poison" } -- offsets negative regeneration when attacking + } + } or nil, + target_effects = { + { + type = "damage", + damage = { amount = 5 * damage, type = "physical" } + }, + { + type = "damage", + damage = { amount = 5 * damage, type = "poison" } + } + } + } + } + }, + animation = { + layers = { + wriggler_spritesheet("attack", 19, 0.48, scale, tint_body), + wriggler_spritesheet("attack-tint", 19, 0.48, scale, tint_mask), + wriggler_spritesheet("attack-shadow", 19, 0.48, scale), + } + }, + cooldown = cooldown, + cooldown_deviation = 0.1, + range = 1.8 * scale, + range_mode = "bounding-box-to-bounding-box", + sound = sounds.attack_sound, + type = "projectile" + } + end + + local wriggler = { + type = "unit", + name = prefix .. "wriggler-pentapod-premature", + icon = "__lignumis__/graphics/icons/" .. prefix .. "wriggler.png", + subgroup = "enemies", + order = "gleba-a-wriggler-" .. tostring(scale), + factoriopedia_simulation = factoriopedia_simulation_premature, + collision_box = { { -0.2 * scale, -0.2 * scale }, { 0.2 * scale, 0.2 * scale } }, + sticker_box = { { -0.5 * scale, -0.5 * scale }, { 0.5 * scale, 0.5 * scale } }, + selection_box = { { -0.9 * scale, -0.9 * scale }, { 0.9 * scale, 0.9 * scale } }, + collision_mask = { layers = { player = true, train = true, is_object = true }, not_colliding_with_itself = true }, + flags = { "placeable-player", "placeable-enemy", "placeable-off-grid", "not-repairable", "breaths-air" }, + absorptions_to_join_attack = { noise = 1 }, + ai_settings = biter_ai_settings, + attack_parameters = attack_parameters(true), + corpse = prefix .. "wriggler-pentapod-corpse", + damaged_trigger_effect = gleba_hit_effects(), + distance_per_frame = 0.125, + distraction_cooldown = 300, + dying_explosion = prefix .. "wriggler-die", + dying_sound = sounds.dying_sound, + healing_per_tick = -health / 50 / 60, + impact_category = "organic", + max_health = health, + max_pursue_distance = 50, + min_pursue_time = 600, + movement_speed = 0.2 * (1 + (scale - 1) / 2), + resistances = { + { + percent = 50, + type = "laser" + } + }, + run_animation = { + layers = { + wriggler_spritesheet("run", 21, 0.48, scale, tint_body), + wriggler_spritesheet("run-tint", 21, 0.48, scale, tint_mask), + wriggler_spritesheet("run-shadow", 21, 0.48, scale), + } + }, + running_sound_animation_positions = { 2 }, + vision_distance = 20, + water_reflection = { + orientation_to_variation = false, + rotate = true, + pictures = { + filename = "__base__/graphics/entity/biter/biter-reflection.png", + height = 28, + priority = "extra-high", + scale = 2.5 * scale, + shift = { 0.15625, 0.46875 }, + variation_count = 1, + width = 20 + } + }, + walking_sound = sounds.walking_sound, + working_sound = sounds.working_sound, + warcry = sounds.warcry, + } + + local wriggler_stable = table.deepcopy(wriggler) + wriggler_stable.name = prefix .. "wriggler-pentapod" + wriggler_stable.factoriopedia_simulation = factoriopedia_simulation + wriggler_stable.healing_per_tick = health / 500 / 60 + wriggler_stable.absorptions_to_join_attack = { noise = 1 } + wriggler_stable.attack_parameters = attack_parameters(false) + + local wriggler_corpse = { + type = "corpse", + name = prefix .. "wriggler-pentapod-corpse", + icon = "__lignumis__/graphics/icons/" .. prefix .. "wriggler-corpse.png", + subgroup = "corpses", + order = "c[corpse]-d[gleba-enemies-corpses]-d[wriggler]" .. tostring(scale), + hidden_in_factoriopedia = true, + selection_box = { { -0.8, -0.8 }, { 0.8, 0.8 } }, + selectable_in_game = false, + animation = { + layers = { + wriggler_corpse_spritesheet("death", 17, 0.48, scale, tint_body), + wriggler_corpse_spritesheet("death-tint", 17, 0.48, scale, tint_mask), + wriggler_corpse_spritesheet("death-shadow", 17, 0.48, scale), + } + }, + decay_animation = { + layers = { + wriggler_corpse_spritesheet("decay", 9, nil, scale, tint_body), + wriggler_corpse_spritesheet("decay-tint", 9, nil, scale, tint_mask), + wriggler_corpse_spritesheet("decay-shadow", 9, nil, scale), + } + }, + dying_speed = 0.015 / scale, + decay_frame_transition_duration = 150, + time_before_removed = 1 * 60 * 60, -- 1 minute + use_decay_layer = true, + + direction_shuffle = { { 1, 2, 3, 16 }, { 4, 5, 6, 7 }, { 8, 9, 10, 11 }, { 12, 13, 14, 15 } }, + shuffle_directions_at_frame = 0, + final_render_layer = "lower-object-above-shadow", + flags = { + "placeable-neutral", + "placeable-off-grid", + "building-direction-8-way", + "not-repairable", + "not-on-map" + }, + ground_patch = { + sheet = + util.sprite_load("__space-age__/graphics/entity/wriggler/blood-puddle-var-main", + { + flags = { "low-object" }, + variation_count = 4, + scale = 0.4 * scale, + multiply_shift = 0.125, + } + ) + }, + ground_patch_fade_in_delay = 20, + ground_patch_fade_in_speed = 0.002, + ground_patch_fade_out_duration = 50 * 60 / 7.5, + ground_patch_fade_out_start = 50 * 60 / 7.5, + ground_patch_render_layer = "decals" + } + + local wrigger_explosion = { + type = "explosion", + name = prefix .. "wriggler-die", + scale = 0.25, + icon = "__space-age__/graphics/icons/medium-wriggler-corpse.png", + order = "a[corpse]-f[wriggler]", + flags = { "not-on-map" }, + hidden = true, + subgroup = "enemy-death-explosions", + animations = util.empty_sprite(), + created_effect = { + type = "direct", + action_delivery = { + type = "instant", + target_effects = { + { + type = "create-particle", + repeat_count = 13, + repeat_count_deviation = 1, + probability = 1, + affects_target = false, + show_in_tooltip = false, + particle_name = "lignumis-blood-particle-small", + offsets = { { 0, 0 } }, + offset_deviation = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + initial_height = 0.1, + initial_height_deviation = 0.1, + initial_vertical_speed = 0.009, + initial_vertical_speed_deviation = 0.009, + speed_from_center = 0.05, + speed_from_center_deviation = 0.05, + frame_speed = 1, + frame_speed_deviation = 0, + tail_length = 5, + tail_length_deviation = 5, + tail_width = 3, + rotate_offsets = false + }, + { + type = "create-particle", + repeat_count = 12, + repeat_count_deviation = 3, + probability = 1, + affects_target = false, + show_in_tooltip = false, + particle_name = "lignumis-blood-particle-small", + offsets = { + { 0, -0.4 }, + { 0, 0.5 }, + { 0, 0.6 } + }, + offset_deviation = { { -0.25, -0.25 }, { 0.25, 0.25 } }, + initial_height = 0.1, + initial_height_deviation = 0.1, + initial_vertical_speed = 0.055, + initial_vertical_speed_deviation = 0.075, + speed_from_center = 0.03, + speed_from_center_deviation = 0.03, + frame_speed = 1, + frame_speed_deviation = 0, + tail_length = 52, + tail_length_deviation = 25, + tail_width = 3, + rotate_offsets = false + }, + --{ + -- type = "create-particle", + -- repeat_count = 2, + -- repeat_count_deviation = 0, + -- probability = 1, + -- affects_target = false, + -- show_in_tooltip = false, + -- particle_name = "pentapod-entrails-particle-small", + -- offsets = { + -- { 0, -0.4 } + -- }, + -- offset_deviation = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + -- initial_height = 0.1, + -- initial_height_deviation = 0.1, + -- initial_vertical_speed = 0.06, + -- initial_vertical_speed_deviation = 0.05, + -- speed_from_center = 0.07, + -- speed_from_center_deviation = 0, + -- frame_speed = 1, + -- frame_speed_deviation = 0, + -- rotate_offsets = false + --}, + --{ + -- type = "create-particle", + -- repeat_count = 10, + -- repeat_count_deviation = 0, + -- probability = 1, + -- affects_target = false, + -- show_in_tooltip = false, + -- particle_name = prefix .. "wriggler-skin-particle", + -- offsets = { + -- { 0, -0.4 } + -- }, + -- offset_deviation = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + -- initial_height = 0.1, + -- initial_height_deviation = 0.1, + -- initial_vertical_speed = 0.05, + -- initial_vertical_speed_deviation = 0.02, + -- speed_from_center = 0.02, + -- speed_from_center_deviation = 0.1, + -- frame_speed = 1, + -- frame_speed_deviation = 0, + -- rotate_offsets = false + --}, + { + type = "play-sound", + sound = base_sounds.medium_gore + }, + } + } + } + } + + data:extend { + --wriggler, + wriggler_stable, + wriggler_corpse, + wrigger_explosion, + make_particle + { + name = prefix .. "wriggler-skin-particle", + life_time = 300, + pictures = particle_animations.get_pentpod_skin_particles_small({ scale = 1 * scale, tint = lerp_color(tint_mask, { 255, 255, 255, 255 }, 0.7) }), + shadows = particle_animations.get_pentpod_skin_particles_small({ scale = 1 * scale, tint = shadowtint(), shift = util.by_pixel(1, 0) }), + ended_in_water_trigger_effect = default_ended_in_water_trigger_effect(), + render_layer_when_on_ground = "lower-object-above-shadow" + }, + } +end + +local function fade(tint, amount) -- fades to minimal opacity grey. Low opacity is good for the mask to let the base layer show htough (instead of having a grey mask) + return lerp_color(tint, { 1, 1, 1, 2 }, amount) +end + +local function grey_overlay(tint, amount) -- fades to opaque grey. Full opacity is required for body. + return lerp_color(tint, { 127, 127, 127, 255 }, amount) +end + +-- mask tint is vibrant and only on the mask +-- body tint applies to the whole body and should be near 127 grey, just adds a hint of saturation +local gleba_small_mask_tint = { 103, 151, 11, 255 } +local gleba_small_body_tint = { 125, 124, 111, 255 } + +make_wriggler("lignumis-small-", 0.2, 20, 0.1, + { + mask = fade(lerp_color(gleba_small_mask_tint, { 255, 200, 0, 255 }, 0.2), 0.2), + body = grey_overlay(lerp_color(gleba_small_body_tint, { 255, 0, 0, 255 }, 0.2), 0.2) + }, + simulations.factoriopedia_gleba_enemy_small_wriggler, + simulations.factoriopedia_gleba_enemy_small_wriggler_premature, + space_age_sounds.wriggler_pentapod.small +) + +make_wriggler("lignumis-medium-", 0.4, 40, 0.2, + { + mask = fade(lerp_color(gleba_small_mask_tint, { 255, 200, 0, 255 }, 0.4), 0.2), + body = grey_overlay(lerp_color(gleba_small_body_tint, { 255, 0, 0, 255 }, 0.4), 0.2) + }, + simulations.factoriopedia_gleba_enemy_small_wriggler, + simulations.factoriopedia_gleba_enemy_small_wriggler_premature, + space_age_sounds.wriggler_pentapod.small +) + +local spawner = table.deepcopy(data.raw["unit-spawner"]["gleba-spawner-small"]) +table.assign(spawner, { + name = "lignumis-spawner-small", + result_units = { + { "lignumis-small-wriggler-pentapod", { { 0.0, 0.9 }, { 0.5, 0.9 }, { 0.6, 0.5 } } }, + { "lignumis-medium-wriggler-pentapod", { { 0.1, 0 }, { 0.4, 0 }, { 1, 0.9 } } } + }, + max_count_of_owned_units = 7, + max_friends_around_to_spawn = 5, + spawning_cooldown = { 360, 150 }, + spawning_radius = 10, + spawning_spacing = 3, + max_spawn_shift = 0, + max_richness_for_spawn_shift = 100, + call_for_help_radius = 50, + --spawning_cooldown = { 60, 20 }, + --spawning_radius = 4, + --call_for_help_radius = 20, + autoplace = enemy_autoplace.enemy_spawner_autoplace("enemy_autoplace_base(0, 6)"), + absorptions_per_second = { noise = { absolute = 20, proportional = 0.01 } }, +}) +spawner.collision_mask = nil +spawner.loot = nil +spawner.dying_trigger_effect[1].entity_name = "lignumis-small-wriggler-pentapod" + +data:extend({ spawner }) diff --git a/lignumis/prototypes/content/gold/intermediates.lua b/lignumis/prototypes/content/gold/intermediates.lua index b2440f1..90c92a2 100644 --- a/lignumis/prototypes/content/gold/intermediates.lua +++ b/lignumis/prototypes/content/gold/intermediates.lua @@ -5,7 +5,7 @@ data:extend({ { type = "item", name = "gold-plate", - icon = "__lignumis__/graphics/icons/gold-plate.png", + icon = Lignumis.graphics .. "icons/gold-plate.png", subgroup = "raw-material", color_hint = { text = "C" }, order = "a[smelting]-0[gold-plate]", @@ -19,14 +19,14 @@ data:extend({ name = "gold-plate", category = "smelting", energy_required = 3.2, - ingredients = { { type = "item", name = "gold-ore", amount = 1 } }, + ingredients = { { type = "item", name = "gold-ore", amount = 2 } }, results = { { type = "item", name = "gold-plate", amount = 1 } }, allow_productivity = true }, { type = "item", name = "gold-cable", - icon = "__lignumis__/graphics/icons/gold-cable.png", + icon = Lignumis.graphics .. "icons/gold-cable.png", subgroup = "intermediate-product", order = "a[basic-intermediates]-b0[gold-cable]", inventory_move_sound = item_sounds.wire_inventory_move, @@ -46,7 +46,7 @@ data:extend({ { type = "fluid", name = "molten-gold", - icon = "__lignumis__/graphics/icons/molten-gold.png", + icon = Lignumis.graphics .. "icons/molten-gold.png", subgroup = "fluid", order = "b[new-fluid]-0[lignumis]-a[molten-gold]", default_temperature = 1500, @@ -82,7 +82,7 @@ data:extend({ category = "metallurgy", subgroup = "vulcanus-processes", order = "b[casting]-c[casting-gold]", - icon = "__lignumis__/graphics/icons/casting-gold.png", + icon = Lignumis.graphics .. "icons/casting-gold.png", enabled = false, ingredients = { { type = "fluid", name = "molten-gold", amount = 20, fluidbox_multiplier = 10 }, diff --git a/lignumis/prototypes/content/gold/machinepipes.lua b/lignumis/prototypes/content/gold/machinepipes.lua index e5f44e4..a949ee5 100644 --- a/lignumis/prototypes/content/gold/machinepipes.lua +++ b/lignumis/prototypes/content/gold/machinepipes.lua @@ -3,7 +3,7 @@ return function() { north = { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-N.png", + filename = Lignumis.graphics .. "entity/gold-pipe/machine-gold-pipe-N.png", priority = "extra-high", width = 71, height = 38, @@ -12,7 +12,7 @@ return function() }, east = { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-E.png", + filename = Lignumis.graphics .. "entity/gold-pipe/machine-gold-pipe-E.png", priority = "extra-high", width = 42, height = 76, @@ -21,7 +21,7 @@ return function() }, south = { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-S.png", + filename = Lignumis.graphics .. "entity/gold-pipe/machine-gold-pipe-S.png", priority = "extra-high", width = 88, height = 61, @@ -30,7 +30,7 @@ return function() }, west = { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-W.png", + filename = Lignumis.graphics .. "entity/gold-pipe/machine-gold-pipe-W.png", priority = "extra-high", width = 39, height = 73, diff --git a/lignumis/prototypes/content/gold/pipecovers.lua b/lignumis/prototypes/content/gold/pipecovers.lua index c22936e..ef5e242 100644 --- a/lignumis/prototypes/content/gold/pipecovers.lua +++ b/lignumis/prototypes/content/gold/pipecovers.lua @@ -4,7 +4,7 @@ return function() north = { layers = { { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-north.png", priority = "extra-high", width = 128, height = 128, @@ -23,7 +23,7 @@ return function() east = { layers = { { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-east.png", priority = "extra-high", width = 128, height = 128, @@ -42,7 +42,7 @@ return function() south = { layers = { { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-south.png", priority = "extra-high", width = 128, height = 128, @@ -61,7 +61,7 @@ return function() west = { layers = { { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-west.png", priority = "extra-high", width = 128, height = 128, diff --git a/lignumis/prototypes/content/gold/pipes.lua b/lignumis/prototypes/content/gold/pipes.lua index 5c631c1..4e555a4 100644 --- a/lignumis/prototypes/content/gold/pipes.lua +++ b/lignumis/prototypes/content/gold/pipes.lua @@ -39,43 +39,43 @@ end local pipe = table.deepcopy(data.raw.pipe["pipe"]) pipe.name = "gold-pipe" -pipe.icon = "__lignumis__/graphics/icons/gold-pipe.png" +pipe.icon = Lignumis.graphics .. "icons/gold-pipe.png" pipe.corpse = "gold-pipe-remnants" pipe.next_upgrade = "pipe" pipe.fluid_box.volume = 50 pipe.minable.result = "gold-pipe" -pipe.fluid_box.pipe_covers.north.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" -pipe.fluid_box.pipe_covers.east.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png" -pipe.fluid_box.pipe_covers.south.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png" -pipe.fluid_box.pipe_covers.west.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png" +pipe.fluid_box.pipe_covers.north.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-north.png" +pipe.fluid_box.pipe_covers.east.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-east.png" +pipe.fluid_box.pipe_covers.south.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-south.png" +pipe.fluid_box.pipe_covers.west.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-west.png" pipe.pictures.straight_vertical_single.filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png" -pipe.pictures.straight_vertical.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-straight-vertical-single.png" +pipe.pictures.straight_vertical.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-straight-vertical.png" pipe.pictures.straight_vertical_window.filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-straight-vertical-window.png" pipe.pictures.straight_horizontal_window.filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png" -pipe.pictures.straight_horizontal.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png" -pipe.pictures.corner_up_right.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png" -pipe.pictures.corner_up_left.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png" -pipe.pictures.corner_down_right.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png" -pipe.pictures.corner_down_left.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png" -pipe.pictures.t_up.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-t-up.png" -pipe.pictures.t_down.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-t-down.png" -pipe.pictures.t_right.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-t-right.png" -pipe.pictures.t_left.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-t-left.png" -pipe.pictures.cross.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cross.png" -pipe.pictures.ending_up.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-ending-up.png" -pipe.pictures.ending_down.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-ending-down.png" -pipe.pictures.ending_right.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-ending-right.png" -pipe.pictures.ending_left.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-ending-left.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-straight-horizontal-window.png" +pipe.pictures.straight_horizontal.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-straight-horizontal.png" +pipe.pictures.corner_up_right.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-corner-up-right.png" +pipe.pictures.corner_up_left.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-corner-up-left.png" +pipe.pictures.corner_down_right.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-corner-down-right.png" +pipe.pictures.corner_down_left.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-corner-down-left.png" +pipe.pictures.t_up.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-t-up.png" +pipe.pictures.t_down.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-t-down.png" +pipe.pictures.t_right.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-t-right.png" +pipe.pictures.t_left.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-t-left.png" +pipe.pictures.cross.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cross.png" +pipe.pictures.ending_up.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-ending-up.png" +pipe.pictures.ending_down.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-ending-down.png" +pipe.pictures.ending_right.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-ending-right.png" +pipe.pictures.ending_left.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-ending-left.png" local pipe_item = { type = "item", name = "gold-pipe", - icon = "__lignumis__/graphics/icons/gold-pipe.png", + icon = Lignumis.graphics .. "icons/gold-pipe.png", subgroup = "energy-pipe-distribution", order = "a[pipe]-a[gold-pipe]", inventory_move_sound = item_sounds.metal_small_inventory_move, @@ -98,7 +98,7 @@ local pipe_recipe = { local pipe_remnants = { type = "corpse", name = "gold-pipe-remnants", - icon = "__lignumis__/graphics/icons/gold-pipe.png", + icon = Lignumis.graphics .. "icons/gold-pipe.png", flags = { "placeable-neutral", "not-on-map" }, hidden_in_factoriopedia = true, subgroup = "energy-pipe-distribution-remnants", @@ -111,7 +111,7 @@ local pipe_remnants = { final_render_layer = "remnants", remove_on_tile_placement = false, animation = make_rotated_animation_variations_from_sheet(2, { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-remnants.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-remnants.png", width = 122, height = 120, line_length = 1, @@ -123,7 +123,7 @@ local pipe_remnants = { local pipe_to_ground = table.deepcopy(data.raw["pipe-to-ground"]["pipe-to-ground"]) pipe_to_ground.name = "gold-pipe-to-ground" -pipe_to_ground.icon = "__lignumis__/graphics/icons/gold-pipe-to-ground.png" +pipe_to_ground.icon = Lignumis.graphics .. "icons/gold-pipe-to-ground.png" pipe_to_ground.corpse = "gold-pipe-to-ground-remnants" pipe_to_ground.next_upgrade = "pipe-to-ground" pipe_to_ground.fluid_box.volume = 50 @@ -135,23 +135,23 @@ for _, connection in pairs(pipe_to_ground.fluid_box.pipe_connections) do end pipe_to_ground.fluid_box.pipe_covers.north.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-north.png" pipe_to_ground.fluid_box.pipe_covers.east.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-east.png" pipe_to_ground.fluid_box.pipe_covers.south.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-south.png" pipe_to_ground.fluid_box.pipe_covers.west.layers[1].filename = -"__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png" +Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-west.png" -pipe_to_ground.pictures.north.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png" -pipe_to_ground.pictures.east.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png" -pipe_to_ground.pictures.south.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png" -pipe_to_ground.pictures.west.filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png" +pipe_to_ground.pictures.north.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-to-ground-up.png" +pipe_to_ground.pictures.east.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-to-ground-right.png" +pipe_to_ground.pictures.south.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-to-ground-down.png" +pipe_to_ground.pictures.west.filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-to-ground-left.png" local pipe_to_ground_item = { type = "item", name = "gold-pipe-to-ground", - icon = "__lignumis__/graphics/icons/gold-pipe-to-ground.png", + icon = Lignumis.graphics .. "icons/gold-pipe-to-ground.png", subgroup = "energy-pipe-distribution", order = "a[pipe]-b[gold-pipe-to-ground]", inventory_move_sound = item_sounds.metal_small_inventory_move, @@ -176,7 +176,7 @@ local pipe_to_ground_recipe = { local pipe_to_ground_remnants = { type = "corpse", name = "gold-pipe-to-ground-remnants", - icon = "__lignumis__/graphics/icons/gold-pipe-to-ground.png", + icon = Lignumis.graphics .. "icons/gold-pipe-to-ground.png", flags = { "placeable-neutral", "not-on-map" }, hidden_in_factoriopedia = true, subgroup = "energy-pipe-distribution-remnants", @@ -189,7 +189,7 @@ local pipe_to_ground_remnants = { final_render_layer = "remnants", remove_on_tile_placement = false, animation = { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png", + filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-to-ground-remnants.png", width = 90, height = 80, line_length = 1, @@ -202,7 +202,7 @@ local pipe_to_ground_remnants = { local tank = { type = "storage-tank", name = "gold-storage-tank", - icon = "__lignumis__/graphics/icons/gold-storage-tank.png", + icon = Lignumis.graphics .. "icons/gold-storage-tank.png", icon_size = 64, icon_mipmaps = 4, flags = { "placeable-player", "player-creation" }, @@ -231,7 +231,7 @@ local tank = { picture = { sheets = { { - filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank.png", + filename = Lignumis.graphics .. "entity/gold-storage-tank/gold-storage-tank.png", priority = "extra-high", width = 128, height = 160, @@ -240,7 +240,7 @@ local tank = { shift = util.by_pixel(0, -8) }, { - filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank.png", + filename = Lignumis.graphics .. "entity/gold-storage-tank/gold-storage-tank.png", priority = "extra-high", y = 160, width = 160, @@ -253,7 +253,7 @@ local tank = { } }, window_background = { - filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png", + filename = Lignumis.graphics .. "entity/gold-storage-tank/gold-storage-tank-window-background.png", priority = "extra-high", width = 20, height = 41, @@ -332,15 +332,15 @@ local tank = { circuit_wire_max_distance = default_circuit_wire_max_distance, } -tank.fluid_box.pipe_covers.north.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" -tank.fluid_box.pipe_covers.east.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png" -tank.fluid_box.pipe_covers.south.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png" -tank.fluid_box.pipe_covers.west.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png" +tank.fluid_box.pipe_covers.north.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-north.png" +tank.fluid_box.pipe_covers.east.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-east.png" +tank.fluid_box.pipe_covers.south.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-south.png" +tank.fluid_box.pipe_covers.west.layers[1].filename = Lignumis.graphics .. "entity/gold-pipe/gold-pipe-cover-west.png" local tank_item = { type = "item", name = "gold-storage-tank", - icon = "__lignumis__/graphics/icons/gold-storage-tank.png", + icon = Lignumis.graphics .. "icons/gold-storage-tank.png", subgroup = "storage", order = "b[fluid]-a[gold-storage-tank]", inventory_move_sound = item_sounds.metal_large_inventory_move, @@ -365,7 +365,7 @@ local tank_recipe = { local tank_remnants = { type = "corpse", name = "gold-storage-tank-remnants", - icon = "__lignumis__/graphics/icons/gold-storage-tank.png", + icon = Lignumis.graphics .. "icons/gold-storage-tank.png", flags = { "placeable-neutral", "building-direction-8-way", "not-on-map" }, hidden_in_factoriopedia = true, subgroup = "storage-remnants", @@ -380,7 +380,7 @@ local tank_remnants = { remove_on_tile_placement = false, animation = make_rotated_animation_variations_from_sheet(1, { - filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png", + filename = Lignumis.graphics .. "entity/gold-storage-tank/gold-storage-tank-remnants.png", line_length = 1, width = 284, height = 188, diff --git a/lignumis/prototypes/content/gold/resource.lua b/lignumis/prototypes/content/gold/resource.lua index 1ea9e53..ae125b0 100644 --- a/lignumis/prototypes/content/gold/resource.lua +++ b/lignumis/prototypes/content/gold/resource.lua @@ -1,72 +1,72 @@ -local item_sounds = require("__base__.prototypes.item_sounds") -local resource_autoplace = require("resource-autoplace") - -resource_autoplace.initialize_patch_set("gold-patch", true) - -data:extend({ - { - name = "deep-mining", - type = "resource-category", - }, - { - type = "resource", - name = "gold-patch", - icon = "__lignumis__/graphics/icons/gold-patch.png", - icon_size = 64, - flags = { "placeable-neutral" }, - category = "deep-mining", - order = "a-b-a", - infinite = false, - highlight = true, - resource_patch_search_radius = 12, - tree_removal_probability = 1, - tree_removal_max_distance = 32 * 32, - minable = { - mining_time = 1, - result = "gold-ore", - }, - collision_box = { { -4.4, -4.4 }, { 4.4, 4.4 } }, - --collision_mask = {"item-layer", "water-tile"}, - selection_box = { { -3.5, -3.5 }, { 3.5, 3.5 } }, - autoplace = { - probability_expression = - "0.03 * control:lignumis_gold:frequency - abs(basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/16, output_scale = 1/3})", - richness_expression = - "(sqrt(x^2 + y^2) * 1000 + basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 1000000, input_scale = 1/16, output_scale = 1/3} * 1000) * control:lignumis_gold:richness", - tile_restriction = { "natural-gold-soil" } - }, - stage_counts = { 0 }, - stages = { - sheet = { - filename = "__lignumis__/graphics/entity/gold-patch.png", - priority = "extra-high", - width = 975, - height = 664, - scale = 0.5, - frame_count = 1, - variation_count = 1 - } - }, - map_color = { r = 1, g = 0.82, b = 0.28 }, - map_grid = false - }, - { - type = "item", - name = "gold-ore", - icon = "__lignumis__/graphics/icons/gold-ore.png", - pictures = { - { size = 64, filename = "__lignumis__/graphics/icons/gold-ore-1.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-ore-2.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-ore-3.png", scale = 0.5, mipmap_count = 4 }, - }, - flags = { "always-show" }, - subgroup = "raw-resource", - order = "f[gold-ore]", - inventory_move_sound = item_sounds.resource_inventory_move, - pick_sound = item_sounds.resource_inventory_pickup, - drop_sound = item_sounds.resource_inventory_move, - stack_size = 50, - default_import_location = "lignumis", - weight = 2 * kg - } -}) +local item_sounds = require("__base__.prototypes.item_sounds") +local resource_autoplace = require("resource-autoplace") + +resource_autoplace.initialize_patch_set("gold-patch", true) + +data:extend({ + { + name = "deep-mining", + type = "resource-category", + }, + { + type = "resource", + name = "gold-patch", + icon = Lignumis.graphics .. "icons/gold-patch.png", + icon_size = 64, + flags = { "placeable-neutral" }, + category = "deep-mining", + order = "a-b-a", + infinite = false, + highlight = true, + resource_patch_search_radius = 12, + tree_removal_probability = 1, + tree_removal_max_distance = 32 * 32, + minable = { + mining_time = 1, + result = "gold-ore", + }, + collision_box = { { -4.4, -4.4 }, { 4.4, 4.4 } }, + --collision_mask = {"item-layer", "water-tile"}, + selection_box = { { -3.5, -3.5 }, { 3.5, 3.5 } }, + autoplace = { + probability_expression = + "0.03 * control:lignumis_gold:frequency - abs(basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/16, output_scale = 1/3})", + richness_expression = + "(sqrt(x^2 + y^2) * 1000 + basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 1000000, input_scale = 1/16, output_scale = 1/3} * 1000) * control:lignumis_gold:richness", + tile_restriction = { "natural-gold-soil" } + }, + stage_counts = { 0 }, + stages = { + sheet = { + filename = Lignumis.graphics .. "entity/gold-patch.png", + priority = "extra-high", + width = 975, + height = 664, + scale = 0.5, + frame_count = 1, + variation_count = 1 + } + }, + map_color = { r = 1, g = 0.82, b = 0.28 }, + map_grid = false + }, + { + type = "item", + name = "gold-ore", + icon = Lignumis.graphics .. "icons/gold-ore.png", + pictures = { + { size = 64, filename = Lignumis.graphics .. "icons/gold-ore-1.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-ore-2.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-ore-3.png", scale = 0.5, mipmap_count = 4 }, + }, + flags = { "always-show" }, + subgroup = "raw-resource", + order = "f[gold-ore]", + inventory_move_sound = item_sounds.resource_inventory_move, + pick_sound = item_sounds.resource_inventory_pickup, + drop_sound = item_sounds.resource_inventory_move, + stack_size = 50, + default_import_location = "lignumis", + weight = 2 * kg + } +}) diff --git a/lignumis/prototypes/content/gold/stromatolite.lua b/lignumis/prototypes/content/gold/stromatolite.lua index 9fdb060..315757f 100644 --- a/lignumis/prototypes/content/gold/stromatolite.lua +++ b/lignumis/prototypes/content/gold/stromatolite.lua @@ -1,8 +1,9 @@ local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") local stromatolite = table.deepcopy(data.raw["simple-entity"]["copper-stromatolite"]) +stromatolite.type = "tree" stromatolite.name = "gold-stromatolite" -stromatolite.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" +stromatolite.icon = Lignumis.graphics .. "icons/gold-stromatolite.png" stromatolite.autoplace = { probability_expression = "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/8, output_scale = 1/8}", @@ -18,7 +19,7 @@ stromatolite.minable.results = { stromatolite.map_color = { 255, 171, 0, 0.5 } stromatolite.pictures = { { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-01.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-01.png", width = 209, height = 138, shift = { 0.304688, -0.4 }, @@ -26,105 +27,105 @@ stromatolite.pictures = { }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-02.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-02.png", width = 165, height = 129, shift = { 0.0, 0.0390625 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-03.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-03.png", width = 151, height = 139, shift = { 0.151562, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-04.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-04.png", width = 216, height = 110, shift = { 0.390625, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-05.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-05.png", width = 154, height = 147, shift = { 0.328125, 0.0703125 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-06.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-06.png", width = 154, height = 132, shift = { 0.16875, -0.1 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-07.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-07.png", width = 193, height = 130, shift = { 0.3, -0.2 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-08.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-08.png", width = 136, height = 117, shift = { 0.0, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-09.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-09.png", width = 157, height = 115, shift = { 0.1, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-10.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-10.png", width = 198, height = 153, shift = { 0.325, -0.1 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-11.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-11.png", width = 190, height = 115, shift = { 0.453125, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-12.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-12.png", width = 229, height = 126, shift = { 0.539062, -0.015625 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-13.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-13.png", width = 151, height = 125, shift = { 0.0703125, 0.179688 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-14.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-14.png", width = 137, height = 117, shift = { 0.160938, 0.0 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-15.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-15.png", width = 201, height = 141, shift = { 0.242188, -0.195312 }, scale = 0.4 }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-16.png", + filename = Lignumis.graphics .. "entity/gold-stromatolite/gold-stromatolite-16.png", width = 209, height = 154, shift = { 0.351562, -0.1 }, @@ -135,7 +136,7 @@ stromatolite.pictures = { local plant = table.deepcopy(data.raw["plant"]["tree-plant"]) plant.name = "gold-stromatolite-plant" plant.localised_name = { "entity-name.gold-stromatolite-plant" } -plant.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" +plant.icon = Lignumis.graphics .. "icons/gold-stromatolite.png" plant.map_color = { 255, 171, 0, 0.5 } plant.agricultural_tower_tint = { primary = { r = 255, g = 171, b = 0, a = 1 }, @@ -146,7 +147,7 @@ plant.minable = { mining_time = 2, results = { { type = "item", name = "moist-stromatolite-remnant", amount = 25 }, - { type = "item", name = "gold-bacteria", amount = 15 }, + { type = "item", name = "gold-bacteria", amount = 30 }, { type = "item", name = "gold-stromatolite-seed", amount_min = 1, amount_max = 3 } } } @@ -167,16 +168,16 @@ local seed = { type = "item", name = "gold-stromatolite-seed", localised_name = { "item-name.gold-stromatolite-seed" }, - icon = "__lignumis__/graphics/icons/gold-stromatolite-seed.png", + icon = Lignumis.graphics .. "icons/gold-stromatolite-seed.png", pictures = { - { size = 64, filename = "__lignumis__/graphics/icons/gold-stromatolite-seed-1.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-stromatolite-seed-2.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-stromatolite-seed-3.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-stromatolite-seed-4.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-stromatolite-seed-5.png", scale = 0.5, mipmap_count = 4 } + { size = 64, filename = Lignumis.graphics .. "icons/gold-stromatolite-seed-1.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-stromatolite-seed-2.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-stromatolite-seed-3.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-stromatolite-seed-4.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-stromatolite-seed-5.png", scale = 0.5, mipmap_count = 4 } }, flags = { "always-show" }, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "a[seeds]-d[gold-stromatolite-seed]", plant_result = "gold-stromatolite-plant", place_result = "gold-stromatolite-plant", @@ -193,15 +194,15 @@ local seed = { local bacteria = { type = "item", name = "gold-bacteria", - icon = "__lignumis__/graphics/icons/gold-bacteria.png", + icon = Lignumis.graphics .. "icons/gold-bacteria.png", pictures = { - { size = 64, filename = "__lignumis__/graphics/icons/gold-bacteria.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-bacteria-1.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-bacteria-2.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/gold-bacteria-3.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-bacteria.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-bacteria-1.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-bacteria-2.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/gold-bacteria-3.png", scale = 0.5, mipmap_count = 4 }, }, flags = { "always-show" }, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "b[agriculture]-e[gold-bacteria]", inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, @@ -216,13 +217,13 @@ local bacteria = { local remnant = { type = "item", name = "moist-stromatolite-remnant", - icon = "__lignumis__/graphics/icons/moist-stromatolite-remnant-1.png", + icon = Lignumis.graphics .. "icons/moist-stromatolite-remnant-1.png", pictures = { - { size = 64, filename = "__lignumis__/graphics/icons/moist-stromatolite-remnant-1.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/moist-stromatolite-remnant-2.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = "__lignumis__/graphics/icons/moist-stromatolite-remnant-3.png", scale = 0.5, mipmap_count = 4 } + { size = 64, filename = Lignumis.graphics .. "icons/moist-stromatolite-remnant-1.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/moist-stromatolite-remnant-2.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/moist-stromatolite-remnant-3.png", scale = 0.5, mipmap_count = 4 } }, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "b[agriculture]-f[moist-stromatolite-remnant]", inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, @@ -236,18 +237,18 @@ local desiccation_recipe = { type = "recipe", name = "moist-stromatolite-remnant-desiccation", icons = { - { icon = "__lignumis__/graphics/icons/peat.png" }, + { icon = Lignumis.graphics .. "icons/peat.png" }, { icon = "__base__/graphics/icons/fluid/steam.png", scale = 0.25, shift = { 8, 8 } }, - { icon = "__lignumis__/graphics/icons/moist-stromatolite-remnant-1.png", scale = 0.25, shift = { -8, 8 } } + { icon = Lignumis.graphics .. "icons/moist-stromatolite-remnant-1.png", scale = 0.25, shift = { -8, 8 } } }, category = "desiccation", - subgroup = "raw-material", + subgroup = "lignumis-bioprocessing", order = "b0[desiccation]", - energy_required = 9.6, - ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 6 } }, + energy_required = 16, + ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 10 } }, results = { { type = "item", name = "peat", amount = 1 }, - { type = "fluid", name = "steam", amount = 60, temperature = 165 } + { type = "fluid", name = "steam", amount = 150, temperature = 165 } }, enabled = false } @@ -256,14 +257,14 @@ local desiccation_recipe_no_steam = { type = "recipe", name = "moist-stromatolite-remnant-desiccation-without-steam", icons = { - { icon = "__lignumis__/graphics/icons/peat.png" }, - { icon = "__lignumis__/graphics/icons/moist-stromatolite-remnant-1.png", scale = 0.25, shift = { -8, 8 } } + { icon = Lignumis.graphics .. "icons/peat.png" }, + { icon = Lignumis.graphics .. "icons/moist-stromatolite-remnant-1.png", scale = 0.25, shift = { -8, 8 } } }, category = "smelting", - subgroup = "raw-material", + subgroup = "lignumis-bioprocessing", order = "b1[desiccation]", - energy_required = 9.6, - ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 2 } }, + energy_required = 16, + ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 10 } }, results = { { type = "item", name = "peat", amount = 1 } }, enabled = false } @@ -272,11 +273,11 @@ local seed__to_peat_recipe = { type = "recipe", name = "gold-stromatolite-seed-to-peat", icons = { - { icon = "__lignumis__/graphics/icons/peat.png" }, - { icon = "__lignumis__/graphics/icons/gold-stromatolite-seed.png", scale = 0.25, shift = { -8, 8 } } + { icon = Lignumis.graphics .. "icons/peat.png" }, + { icon = Lignumis.graphics .. "icons/gold-stromatolite-seed.png", scale = 0.25, shift = { -8, 8 } } }, category = "basic-crafting", - subgroup = "raw-material", + subgroup = "lignumis-bioprocessing", order = "b2[gold-stromatolite-seed-to-peat]", energy_required = 3.2, ingredients = { { type = "item", name = "gold-stromatolite-seed", amount = 10 } }, diff --git a/lignumis/prototypes/content/gold/tiles.lua b/lignumis/prototypes/content/gold/tiles.lua index a8bd838..11d6ac6 100644 --- a/lignumis/prototypes/content/gold/tiles.lua +++ b/lignumis/prototypes/content/gold/tiles.lua @@ -1,45 +1,45 @@ -local tile_collision_masks = require("__base__/prototypes/tile/tile-collision-masks") -local tile_trigger_effects = require("__base__.prototypes.tile.tile-trigger-effects") -local semi_wet_sound = sound_variations("__space-age__/sound/walking/semi-wet-rock", 10, 0.7) -local tile_sounds = require("__space-age__/prototypes/tile/tile-sounds") - -data:extend({ - { - type = "item-subgroup", - name = "lignumis-tiles", - group = "tiles", - order = "h" - }, - { - type = "tile", - name = "natural-gold-soil", - order = "d[gold]-c[natural-gold-soil]", - subgroup = "lignumis-tiles", - collision_mask = tile_collision_masks.ground(), - layer_group = "ground-natural", - layer = 85, - searchable = true, - transitions = lava_stone_transitions, - transitions_between_transitions = data.raw["tile"]["landfill"].transitions_between_transitions, - trigger_effect = tile_trigger_effects.landfill_trigger_effect(), - sprite_usage_surface = "any", - variants = tile_variations_template_with_transitions( - "__lignumis__/graphics/terrain/natural-gold-soil.png", - { - max_size = 4, - [1] = { weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 } }, - [2] = { probability = 1, weights = { 0.018, 0.020, 0.015, 0.025, 0.015, 0.020, 0.025, 0.015, 0.025, 0.025, 0.010, 0.025, 0.020, 0.025, 0.025, 0.010 }, }, - [4] = { probability = 0.1, weights = { 0.018, 0.020, 0.015, 0.025, 0.015, 0.020, 0.025, 0.015, 0.025, 0.025, 0.010, 0.025, 0.020, 0.025, 0.025, 0.010 }, }, - } - ), - walking_sound = semi_wet_sound, - landing_steps_sound = tile_sounds.landing.semi_wet, - build_sound = data.raw["tile"]["landfill"].build_sound, - map_color = { 109, 99, 13 }, - scorch_mark_color = { r = 0.329, g = 0.242 * 2, b = 0.177, a = 1.000 }, - autoplace = { - probability_expression = - "multioctave_noise{x = x, y = y, persistence = 1, seed0 = map_seed, seed1 = 2000000, octaves = 3, input_scale = 1/32, output_scale = 0.6 * sqrt(2)} * 20 - 18" - }, - } -}) +local tile_collision_masks = require("__base__/prototypes/tile/tile-collision-masks") +local tile_trigger_effects = require("__base__.prototypes.tile.tile-trigger-effects") +local semi_wet_sound = sound_variations("__space-age__/sound/walking/semi-wet-rock", 10, 0.7) +local tile_sounds = require("__space-age__/prototypes/tile/tile-sounds") + +data:extend({ + { + type = "item-subgroup", + name = "lignumis-tiles", + group = "tiles", + order = "h" + }, + { + type = "tile", + name = "natural-gold-soil", + order = "d[gold]-c[natural-gold-soil]", + subgroup = "lignumis-tiles", + collision_mask = tile_collision_masks.ground(), + layer_group = "ground-natural", + layer = 85, + searchable = true, + transitions = lava_stone_transitions, + transitions_between_transitions = data.raw["tile"]["landfill"].transitions_between_transitions, + trigger_effect = tile_trigger_effects.landfill_trigger_effect(), + sprite_usage_surface = "any", + variants = tile_variations_template_with_transitions( + Lignumis.graphics .. "terrain/natural-gold-soil.png", + { + max_size = 4, + [1] = { weights = { 0.085, 0.085, 0.085, 0.085, 0.087, 0.085, 0.065, 0.085, 0.045, 0.045, 0.045, 0.045, 0.005, 0.025, 0.045, 0.045 } }, + [2] = { probability = 1, weights = { 0.018, 0.020, 0.015, 0.025, 0.015, 0.020, 0.025, 0.015, 0.025, 0.025, 0.010, 0.025, 0.020, 0.025, 0.025, 0.010 }, }, + [4] = { probability = 0.1, weights = { 0.018, 0.020, 0.015, 0.025, 0.015, 0.020, 0.025, 0.015, 0.025, 0.025, 0.010, 0.025, 0.020, 0.025, 0.025, 0.010 }, }, + } + ), + walking_sound = semi_wet_sound, + landing_steps_sound = tile_sounds.landing.semi_wet, + build_sound = data.raw["tile"]["landfill"].build_sound, + map_color = { 109, 99, 13 }, + scorch_mark_color = { r = 0.329, g = 0.242 * 2, b = 0.177, a = 1.000 }, + autoplace = { + probability_expression = + "multioctave_noise{x = x, y = y, persistence = 1, seed0 = map_seed, seed1 = 2000000, octaves = 3, input_scale = 1/32, output_scale = 0.6 * sqrt(2)} * 20 - 18" + }, + } +}) diff --git a/lignumis/prototypes/content/item-subgroups.lua b/lignumis/prototypes/content/item-subgroups.lua new file mode 100644 index 0000000..48c03fe --- /dev/null +++ b/lignumis/prototypes/content/item-subgroups.lua @@ -0,0 +1,7 @@ +data:extend({ + { + type = "item-subgroup", + name = "lignumis-bioprocessing", + group = "bioprocessing" + } +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/lignumis/planet.lua b/lignumis/prototypes/content/lignumis/planet.lua index 6579879..ab09ca6 100644 --- a/lignumis/prototypes/content/lignumis/planet.lua +++ b/lignumis/prototypes/content/lignumis/planet.lua @@ -29,14 +29,14 @@ PlanetsLib:extend({ orientation = 0.16, sprite = { type = "sprite", - filename = "__lignumis__/graphics/orbit-lignumis.png", + filename = Lignumis.graphics .. "orbit-lignumis.png", size = 131 }, }, magnitude = 0.35, subgroup = "satellites", - icon = "__lignumis__/graphics/icons/lignumis.png", - starmap_icon = "__lignumis__/graphics/icons/starmap-planet-lignumis.png", + icon = Lignumis.graphics .. "icons/lignumis.png", + starmap_icon = Lignumis.graphics .. "icons/starmap-planet-lignumis.png", starmap_icon_size = 2048, gravity_pull = 4, order = "a[nauvis]-a[lignumis]", @@ -61,7 +61,7 @@ PlanetsLib:extend({ clouds = effects.default_clouds_effect_properties() }, persistent_ambient_sounds = { - base_ambience = { filename = "__lignumis__/sound/ambient/forest-ambience.ogg", volume = 0.1 }, + base_ambience = { filename = Lignumis.sound .. "ambient/forest-ambience.ogg", volume = 0.1 }, wind = { filename = "__base__/sound/wind/wind.ogg", volume = 0.8 }, crossfade = { order = { "wind", "base_ambience" }, @@ -127,7 +127,7 @@ data:extend({ name = "lignumis-1", track_type = "main-track", planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-1.ogg", + sound = Lignumis.sound .. "music/lignumis-1.ogg", weight = 10 }, { @@ -135,7 +135,7 @@ data:extend({ name = "lignumis-2", track_type = "main-track", planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-2.ogg", + sound = Lignumis.sound .. "music/lignumis-2.ogg", weight = 10 }, { @@ -143,7 +143,7 @@ data:extend({ name = "lignumis-3", track_type = "main-track", planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-3.ogg", + sound = Lignumis.sound .. "music/lignumis-3.ogg", weight = 7 }, { @@ -151,7 +151,7 @@ data:extend({ name = "lignumis-4", track_type = "main-track", planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-4.ogg", + sound = Lignumis.sound .. "music/lignumis-4.ogg", weight = 8 }, { @@ -159,7 +159,7 @@ data:extend({ name = "lignumis-5", track_type = "main-track", planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-5.ogg", + sound = Lignumis.sound .. "music/lignumis-5.ogg", weight = 4 } }) diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 44f4aae..1d2f6ff 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -1,6 +1,8 @@ local LumberMillFactory = require(MF.buildings .. "LumberMill") local LumberMill = LumberMillFactory() +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + data:extend({ { type = "recipe-category", @@ -26,13 +28,14 @@ local lumber_mill_item = LumberMill.ItemBuilder:new() }) LumberMill.RecipeBuilder:new() - :ingredients({ + :ingredients(table.trim({ { type = "item", name = "stone-brick", amount = 40 }, { type = "item", name = "lumber", amount = 100 }, { type = "item", name = "wooden-gear-wheel", amount = 100 }, - { type = "item", name = "gold-plate", amount = 60 }, + { type = "item", name = "gold-plate", amount = basic_circuit_board and 30 or 60 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 30 } or nil, { type = "item", name = "burner-assembling-machine", amount = 5 } - }) + })) :apply({ category = "wood-processing-or-assembling" }) @@ -44,24 +47,27 @@ LumberMill.TechnologyBuilder:new() :ingredients({ { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }) :apply() -LumberMill.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "stone-brick", amount = 40 }, - { type = "item", name = "lumber", amount = 50 }, - { type = "item", name = "iron-gear-wheel", amount = 50 }, - { type = "item", name = "electronic-circuit", amount = 20 }, - { type = "item", name = "assembling-machine-1", amount = 2 } - }) - :apply({ - name = "lumber-mill-electronic-circuit", - category = "wood-processing-or-assembling", - icons = { - { icon = lumber_mill_item.icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - } - }) +if not basic_circuit_board then + LumberMill.RecipeBuilder:new() + :ingredients({ + { type = "item", name = "stone-brick", amount = 40 }, + { type = "item", name = "lumber", amount = 50 }, + { type = "item", name = "iron-gear-wheel", amount = 50 }, + { type = "item", name = "electronic-circuit", amount = 20 }, + { type = "item", name = "assembling-machine-1", amount = 2 } + }) + :apply({ + name = "lumber-mill-electronic-circuit", + localised_name = { "entity-name.lumber-mill" }, + category = "wood-processing-or-assembling", + icons = { + { icon = lumber_mill_item.icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + }) -table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "lumber-mill-electronic-circuit" -}) + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "lumber-mill-electronic-circuit" + }) +end diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua index 0991942..d4e0ba6 100644 --- a/lignumis/prototypes/content/lumber.lua +++ b/lignumis/prototypes/content/lumber.lua @@ -1,33 +1,33 @@ -local item_sounds = require("__base__.prototypes.item_sounds") - -data:extend({ - { - type = "item", - name = "lumber", - icon = "__lignumis__/graphics/icons/lumber.png", - pictures = { - { filename = "__lignumis__/graphics/icons/lumber.png", size = 64, scale = 0.5, mipmap_count = 4 }, - { filename = "__lignumis__/graphics/icons/lumber-1.png", size = 64, scale = 0.5, mipmap_count = 4 }, - { filename = "__lignumis__/graphics/icons/lumber-2.png", size = 64, scale = 0.5, mipmap_count = 4 }, - }, - subgroup = "intermediate-product", - order = "A[basic-intermediates]-c[lumber]", - inventory_move_sound = item_sounds.wood_inventory_move, - pick_sound = item_sounds.wood_inventory_pickup, - drop_sound = item_sounds.wood_inventory_move, - stack_size = 100, - random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, - fuel_category = "wood", - fuel_value = "4MJ" - }, - { - type = "recipe", - name = "lumber", - category = "wood-processing-or-assembling", - allow_productivity = true, - allow_as_intermediate = true, - ingredients = { { type = "item", name = "wood", amount = 2 } }, - results = { { type = "item", name = "lumber", amount = 1 } }, - energy_required = 1 - } -}) +local item_sounds = require("__base__.prototypes.item_sounds") + +data:extend({ + { + type = "item", + name = "lumber", + icon = Lignumis.graphics .. "icons/lumber.png", + pictures = { + { filename = Lignumis.graphics .. "icons/lumber.png", size = 64, scale = 0.5, mipmap_count = 4 }, + { filename = Lignumis.graphics .. "icons/lumber-1.png", size = 64, scale = 0.5, mipmap_count = 4 }, + { filename = Lignumis.graphics .. "icons/lumber-2.png", size = 64, scale = 0.5, mipmap_count = 4 }, + }, + subgroup = "intermediate-product", + order = "A[basic-intermediates]-c[lumber]", + inventory_move_sound = item_sounds.wood_inventory_move, + pick_sound = item_sounds.wood_inventory_pickup, + drop_sound = item_sounds.wood_inventory_move, + stack_size = 100, + random_tint_color = { 1.0, 0.95, 0.9, 1.0 }, + fuel_category = "wood", + fuel_value = "4MJ" + }, + { + type = "recipe", + name = "lumber", + category = "wood-processing-or-assembling", + allow_productivity = true, + allow_as_intermediate = true, + ingredients = { { type = "item", name = "wood", amount = 2 } }, + results = { { type = "item", name = "lumber", amount = 1 } }, + energy_required = 1 + } +}) diff --git a/lignumis/prototypes/content/mid-game-recipes.lua b/lignumis/prototypes/content/mid-game-recipes.lua index 7dec68e..7344436 100644 --- a/lignumis/prototypes/content/mid-game-recipes.lua +++ b/lignumis/prototypes/content/mid-game-recipes.lua @@ -17,9 +17,9 @@ data:extend({ results = { { type = "item", name = "cupriavidus-necator", amount_min = 4, amount_max = 10, probability = 0.1 } }, result_is_always_fresh = true, icons = { - { icon = "__lignumis__/graphics/icons/cupriavidus-necator-1.png" }, - { icon = "__lignumis__/graphics/icons/peat.png", scale = 0.25, shift = { 8, 8 } }, - { icon = "__lignumis__/graphics/icons/wood-pulp.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/cupriavidus-necator-1.png" }, + { icon = Lignumis.graphics .. "icons/peat.png", scale = 0.25, shift = { 8, 8 } }, + { icon = Lignumis.graphics .. "icons/wood-pulp.png", scale = 0.25, shift = { 8, 8 } } }, crafting_machine_tint = { primary = { r = 1.000, g = 1.000, b = 1.000, a = 1.000 }, -- #fefeffff @@ -30,6 +30,7 @@ data:extend({ enabled = false, allow_quality = false, preserve_products_in_machine_output = true, + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-b[cupriavidus-necator-starter]", }, { @@ -55,16 +56,17 @@ data:extend({ }, enabled = false, allow_productivity = true, - preserve_products_in_machine_output = true + preserve_products_in_machine_output = true, + subgroup = "lignumis-bioprocessing", }, { type = "item", name = "cupriavidus-necator", - icon = "__lignumis__/graphics/icons/cupriavidus-necator-1.png", + icon = Lignumis.graphics .. "icons/cupriavidus-necator-1.png", pictures = { - { filename = "__lignumis__/graphics/icons/cupriavidus-necator-1.png", size = 64, scale = 0.5 }, - { filename = "__lignumis__/graphics/icons/cupriavidus-necator-2.png", size = 64, scale = 0.5 }, - { filename = "__lignumis__/graphics/icons/cupriavidus-necator-3.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/cupriavidus-necator-1.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/cupriavidus-necator-2.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/cupriavidus-necator-3.png", size = 64, scale = 0.5 }, }, stack_size = 1000, spoil_result = "dead-cupriavidus-necator", @@ -72,7 +74,7 @@ data:extend({ inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, drop_sound = space_age_item_sounds.agriculture_inventory_move, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-c1[cupriavidus-necator]", default_import_location = "lignumis", weight = 1 * kg @@ -80,17 +82,17 @@ data:extend({ { type = "item", name = "dead-cupriavidus-necator", - icon = "__lignumis__/graphics/icons/dead-cupriavidus-necator-1.png", + icon = Lignumis.graphics .. "icons/dead-cupriavidus-necator-1.png", pictures = { - { filename = "__lignumis__/graphics/icons/dead-cupriavidus-necator-1.png", size = 64, scale = 0.5 }, - { filename = "__lignumis__/graphics/icons/dead-cupriavidus-necator-2.png", size = 64, scale = 0.5 }, - { filename = "__lignumis__/graphics/icons/dead-cupriavidus-necator-3.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/dead-cupriavidus-necator-1.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/dead-cupriavidus-necator-2.png", size = 64, scale = 0.5 }, + { filename = Lignumis.graphics .. "icons/dead-cupriavidus-necator-3.png", size = 64, scale = 0.5 }, }, stack_size = 1000, inventory_move_sound = space_age_item_sounds.agriculture_inventory_move, pick_sound = space_age_item_sounds.agriculture_inventory_pickup, drop_sound = space_age_item_sounds.agriculture_inventory_move, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-c2[dead-cupriavidus-necator]", default_import_location = "lignumis", weight = 1 * kg @@ -101,7 +103,7 @@ data:extend({ category = "organic-or-chemistry", icons = { { icon = "__base__/graphics/icons/plastic-bar.png" }, - { icon = "__lignumis__/graphics/icons/cupriavidus-necator-1.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/cupriavidus-necator-1.png", scale = 0.25, shift = { 8, 8 } } }, energy_required = 12.8, enabled = false, @@ -118,7 +120,7 @@ data:extend({ quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff }, enabled = false, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-d1[plastic]", allow_productivity = true }, @@ -128,7 +130,7 @@ data:extend({ category = "organic-or-chemistry", icons = { { icon = "__base__/graphics/icons/plastic-bar.png" }, - { icon = "__lignumis__/graphics/icons/dead-cupriavidus-necator-1.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/dead-cupriavidus-necator-1.png", scale = 0.25, shift = { 8, 8 } } }, energy_required = 12.8, enabled = false, @@ -145,7 +147,7 @@ data:extend({ quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff }, enabled = false, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-d2[plastic]", allow_productivity = true }, @@ -165,19 +167,20 @@ data:extend({ allow_productivity = true, icons = { { icon = "__base__/graphics/icons/low-density-structure.png" }, - { icon = "__lignumis__/graphics/icons/gold-plate.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/gold-plate.png", scale = 0.25, shift = { 8, 8 } } } }, { type = "recipe", name = "nutrients-from-wood-pulp", - category = "chemistry", + category = "organic-or-chemistry", energy_required = 1, enabled = false, auto_recycle = false, ingredients = { { type = "fluid", name = "wood-pulp", amount = 10 } }, results = { { type = "item", name = "nutrients", amount = 5 } }, allow_productivity = true, + subgroup = "lignumis-bioprocessing", icons = { { icon = "__space-age__/graphics/icons/nutrients.png" }, { icon = "__base__/graphics/icons/wood.png", scale = 0.25, shift = { 8, 8 } } @@ -205,10 +208,10 @@ data:extend({ allow_productivity = true, icons = { { icon = "__base__/graphics/icons/rocket-fuel.png" }, - { icon = "__lignumis__/graphics/icons/peat.png", scale = 0.25, shift = { 8, 8 } }, - { icon = "__lignumis__/graphics/icons/wood-pulp.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/peat.png", scale = 0.25, shift = { 8, 8 } }, + { icon = Lignumis.graphics .. "icons/wood-pulp.png", scale = 0.25, shift = { 8, 8 } } }, - subgroup = "agriculture-processes", + subgroup = "lignumis-bioprocessing", order = "0[lignumis]-e[rocket-fuel]", } }) diff --git a/lignumis/prototypes/content/noise.lua b/lignumis/prototypes/content/noise.lua index db5b72d..423ef0b 100644 --- a/lignumis/prototypes/content/noise.lua +++ b/lignumis/prototypes/content/noise.lua @@ -1,117 +1,117 @@ --- Entities added by Lignumis define noise emissions/absorption in their own file. - -local function emit(type, name, amount) - local entity = data.raw[type][name] - entity.energy_source = entity.energy_source or {} - entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute or {} - entity.energy_source.emissions_per_minute.noise = amount -end - -local function emit_constant(type, name, amount) - local entity = data.raw[type][name] - entity.emissions_per_second = entity.emissions_per_second or {} - entity.emissions_per_second.noise = amount / 60 -end - -data:extend({ - { - type = "airborne-pollutant", - name = "noise", - chart_color = { r = 183, g = 0, b = 225, a = 149 }, - icon = { - filename = "__lignumis__/graphics/noise-map-icon.png", - priority = "high", - size = 64, - flags = { "gui-icon" } - }, - affects_evolution = true, - affects_water_tint = false, - } -}) - - --- Nauvis enemies use noise - -data.raw["unit-spawner"]["spitter-spawner"].absorptions_per_second.noise = { absolute = 200, proportional = 0.01 } -data.raw["unit-spawner"]["biter-spawner"].absorptions_per_second.noise = { absolute = 200, proportional = 0.01 } -data.raw["unit"]["small-biter"].absorptions_to_join_attack.noise = 1 -data.raw["unit"]["medium-biter"].absorptions_to_join_attack.noise = 5 -data.raw["unit"]["big-biter"].absorptions_to_join_attack.noise = 20 -data.raw["unit"]["behemoth-biter"].absorptions_to_join_attack.noise = 100 -data.raw["unit"]["small-spitter"].absorptions_to_join_attack.noise = 1 -data.raw["unit"]["medium-spitter"].absorptions_to_join_attack.noise = 3 -data.raw["unit"]["big-spitter"].absorptions_to_join_attack.noise = 8 -data.raw["unit"]["behemoth-spitter"].absorptions_to_join_attack.noise = 50 - - --- All trees absorb noise - -for _, tree in pairs(data.raw.tree) do - emit_constant("tree", tree.name, -6) -end -emit_constant("plant", "tree-plant", -6) - - --- Tiles absorb noise - -local tiles = {"grass-1", "grass-2", "grass-3", "grass-4", "water", "deepwater", "natural-gold-soil"} -for _, tile in pairs(tiles) do - if not data.raw.tile[tile].absorptions_per_second then - data.raw.tile[tile].absorptions_per_second = {} - end - data.raw.tile[tile].absorptions_per_second.noise = 0.001 -end - - --- Walls absorb noise - -emit_constant("wall", "wooden-wall", -10) -emit_constant("wall", "stone-wall", -20) -emit_constant("gate", "gate", -10) - - --- Buildings emit noise - -emit("furnace", "stone-furnace", 10) -emit("furnace", "electric-furnace", 10) -emit("mining-drill", "burner-mining-drill", 50) -emit("mining-drill", "electric-mining-drill", 100) -emit("mining-drill", "big-mining-drill", 200) ---emit("mining-drill", "deep-miner", 2000) ---emit("agricultural-tower", "burner-agricultural-tower", 100) -emit("agricultural-tower", "agricultural-tower", 100) ---emit("assembling-machine", "burner-assembling-machine", 50) ---emit("assembling-machine", "steam-assembling-machine", 50) -emit("assembling-machine", "assembling-machine-1", 10) -emit("assembling-machine", "assembling-machine-2", 15) -emit("assembling-machine", "assembling-machine-3", 20) -emit("assembling-machine", "chemical-plant", 10) -emit("boiler", "boiler", 5) -emit("generator", "steam-engine", 10) -emit("boiler", "heat-exchanger", 1) -emit("generator", "steam-turbine", 20) ---emit("rocket-silo", "provisional-rocket-silo", 10000) ---emit_constant("rocket-silo", "provisional-rocket-silo", 1000) -emit("rocket-silo", "rocket-silo", 10000) -emit_constant("rocket-silo", "rocket-silo", 1000) ---emit("lab", "wood-lab", 10) -emit("lab", "lab", 5) -emit("lab", "biolab", 20) -emit("locomotive", "locomotive", 200) -emit_constant("locomotive", "locomotive", 10) - ---emit_constant("transport-belt", "wood-transport-belt", 3) -emit_constant("transport-belt", "transport-belt", 4) -emit_constant("transport-belt", "fast-transport-belt", 8) -emit_constant("transport-belt", "express-transport-belt", 12) -emit_constant("transport-belt", "turbo-transport-belt", 16) ---emit_constant("underground-belt", "wood-underground-belt", 30) -emit_constant("underground-belt", "underground-belt", 40) -emit_constant("underground-belt", "fast-underground-belt", 50) -emit_constant("underground-belt", "express-underground-belt", 60) -emit_constant("underground-belt", "turbo-underground-belt", 80) ---emit_constant("splitter", "wood-splitter", 60) -emit_constant("splitter", "splitter", 70) -emit_constant("splitter", "fast-splitter", 80) -emit_constant("splitter", "express-splitter", 90) +-- Entities added by Lignumis define noise emissions/absorption in their own file. + +local function emit(type, name, amount) + local entity = data.raw[type][name] + entity.energy_source = entity.energy_source or {} + entity.energy_source.emissions_per_minute = entity.energy_source.emissions_per_minute or {} + entity.energy_source.emissions_per_minute.noise = amount +end + +local function emit_constant(type, name, amount) + local entity = data.raw[type][name] + entity.emissions_per_second = entity.emissions_per_second or {} + entity.emissions_per_second.noise = amount / 60 +end + +data:extend({ + { + type = "airborne-pollutant", + name = "noise", + chart_color = { r = 183, g = 0, b = 225, a = 149 }, + icon = { + filename = Lignumis.graphics .. "noise-map-icon.png", + priority = "high", + size = 64, + flags = { "gui-icon" } + }, + affects_evolution = true, + affects_water_tint = false, + } +}) + + +-- Nauvis enemies use noise + +data.raw["unit-spawner"]["spitter-spawner"].absorptions_per_second.noise = { absolute = 200, proportional = 0.01 } +data.raw["unit-spawner"]["biter-spawner"].absorptions_per_second.noise = { absolute = 200, proportional = 0.01 } +data.raw["unit"]["small-biter"].absorptions_to_join_attack.noise = 1 +data.raw["unit"]["medium-biter"].absorptions_to_join_attack.noise = 5 +data.raw["unit"]["big-biter"].absorptions_to_join_attack.noise = 20 +data.raw["unit"]["behemoth-biter"].absorptions_to_join_attack.noise = 100 +data.raw["unit"]["small-spitter"].absorptions_to_join_attack.noise = 1 +data.raw["unit"]["medium-spitter"].absorptions_to_join_attack.noise = 3 +data.raw["unit"]["big-spitter"].absorptions_to_join_attack.noise = 8 +data.raw["unit"]["behemoth-spitter"].absorptions_to_join_attack.noise = 50 + + +-- All trees absorb noise + +for _, tree in pairs(data.raw.tree) do + emit_constant("tree", tree.name, -6) +end +emit_constant("plant", "tree-plant", -6) + + +-- Tiles absorb noise + +local tiles = {"grass-1", "grass-2", "grass-3", "grass-4", "water", "deepwater", "natural-gold-soil"} +for _, tile in pairs(tiles) do + if not data.raw.tile[tile].absorptions_per_second then + data.raw.tile[tile].absorptions_per_second = {} + end + data.raw.tile[tile].absorptions_per_second.noise = 0.001 +end + + +-- Walls absorb noise + +emit_constant("wall", "wooden-wall", -10) +emit_constant("wall", "stone-wall", -20) +emit_constant("gate", "gate", -10) + + +-- Buildings emit noise + +emit("furnace", "stone-furnace", 10) +emit("furnace", "electric-furnace", 10) +emit("mining-drill", "burner-mining-drill", 50) +emit("mining-drill", "electric-mining-drill", 100) +emit("mining-drill", "big-mining-drill", 200) +--emit("mining-drill", "deep-miner", 2000) +--emit("agricultural-tower", "burner-agricultural-tower", 100) +emit("agricultural-tower", "agricultural-tower", 100) +--emit("assembling-machine", "burner-assembling-machine", 50) +--emit("assembling-machine", "steam-assembling-machine", 50) +emit("assembling-machine", "assembling-machine-1", 10) +emit("assembling-machine", "assembling-machine-2", 15) +emit("assembling-machine", "assembling-machine-3", 20) +emit("assembling-machine", "chemical-plant", 10) +emit("boiler", "boiler", 5) +emit("generator", "steam-engine", 10) +emit("boiler", "heat-exchanger", 1) +emit("generator", "steam-turbine", 20) +--emit("rocket-silo", "provisional-rocket-silo", 10000) +--emit_constant("rocket-silo", "provisional-rocket-silo", 1000) +emit("rocket-silo", "rocket-silo", 10000) +emit_constant("rocket-silo", "rocket-silo", 1000) +--emit("lab", "wood-lab", 10) +emit("lab", "lab", 5) +emit("lab", "biolab", 20) +emit("locomotive", "locomotive", 200) +emit_constant("locomotive", "locomotive", 10) + +--emit_constant("transport-belt", "wood-transport-belt", 3) +emit_constant("transport-belt", "transport-belt", 4) +emit_constant("transport-belt", "fast-transport-belt", 8) +emit_constant("transport-belt", "express-transport-belt", 12) +emit_constant("transport-belt", "turbo-transport-belt", 16) +--emit_constant("underground-belt", "wood-underground-belt", 30) +emit_constant("underground-belt", "underground-belt", 40) +emit_constant("underground-belt", "fast-underground-belt", 50) +emit_constant("underground-belt", "express-underground-belt", 60) +emit_constant("underground-belt", "turbo-underground-belt", 80) +--emit_constant("splitter", "wood-splitter", 60) +emit_constant("splitter", "splitter", 70) +emit_constant("splitter", "fast-splitter", 80) +emit_constant("splitter", "express-splitter", 90) emit_constant("splitter", "turbo-splitter", 100) \ No newline at end of file diff --git a/lignumis/prototypes/content/peat.lua b/lignumis/prototypes/content/peat.lua index 9140da2..e96f8d3 100644 --- a/lignumis/prototypes/content/peat.lua +++ b/lignumis/prototypes/content/peat.lua @@ -1,89 +1,89 @@ -local sounds = require("__base__.prototypes.entity.sounds") -local resource_autoplace = require("resource-autoplace") -local item_sounds = require("__base__.prototypes.item_sounds") -local item_tints = require("__base__.prototypes.item-tints") - -local grass_driving_sound = { - sound = { - filename = "__base__/sound/driving/vehicle-surface-grass.ogg", volume = 0.5, - advanced_volume_control = { fades = { fade_in = { curve_type = "cosine", from = { control = 0.5, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } } - }, - fade_ticks = 6 -} - -data:extend({ - { - type = "resource", - name = "peat", - icon = "__lignumis__/graphics/icons/peat.png", - flags = { "placeable-neutral" }, - order = "a-b-b", - tree_removal_probability = 0.1, - tree_removal_max_distance = 32 * 32, - minable = { - count = 2, - mining_particle = "wooden-particle", - mining_time = 1, - results = { - { - type = "item", - name = "peat", - amount = 2 - }, - { - type = "item", - name = "wood", - amount_min = 1, - amount_max = 8, - probability = 0.1 - } - } - }, - walking_sound = sounds.plant, - driving_sound = grass_driving_sound, - collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, - selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - autoplace = resource_autoplace.resource_autoplace_settings { - name = "lignumis_peat", - order = "b", - base_density = 2, - base_spots_per_km2 = 5, - has_starting_area_placement = true, - regular_rq_factor_multiplier = 1, - starting_rq_factor_multiplier = 1, - candidate_spot_count = 21 - }, - stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 }, - stages = { - sheet = { - filename = "__base__/graphics/entity/iron-ore/iron-ore.png", - priority = "extra-high", - size = 128, - frame_count = 8, - variation_count = 8, - scale = 0.5, - tint = { b = 0.24, g = 0.50, r = 0.79 } - } - }, - map_color = { 0.4, 0.2470, 0.1176 }, - mining_visualisation_tint = { b = 0.24, g = 0.50, r = 0.79 }, - factoriopedia_simulation = { - init = " game.simulation.camera_position = {0, -0.5}\n\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -2.5}, amount = 100}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -2.5}, amount = 500}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -2.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -2.5}, amount = 200}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-4.5, -0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, -1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, -0.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -0.5}, amount = 650}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -0.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -1.5}, amount = 800}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -1.5}, amount = 650}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -1.5}, amount = 450}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -0.5}, amount = 1050}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -1.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, -1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, -0.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -1.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -0.5}, amount = 500}\n game.surfaces[1].create_entity{name = \"peat\", position = {4.5, -0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, 1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, 0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, 0.5}, amount = 200}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, 1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 1.5}, amount = 550}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 0.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, 0.5}, amount = 700}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 1.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, 1.5}, amount = 300}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 0.5}, amount = 550}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, 0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, 1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, 0.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 0.5}, amount = 300}\n game.surfaces[1].create_entity{name = \"peat\", position = {4.5, 0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 2.5}, amount = 50}\n " - } - }, - { - type = "item", - name = "peat", - icon = "__lignumis__/graphics/icons/peat.png", - subgroup = "raw-resource", - order = "a[peat]", - inventory_move_sound = item_sounds.landfill_inventory_move, - pick_sound = item_sounds.landfill_inventory_pickup, - drop_sound = item_sounds.landfill_inventory_move, - stack_size = 100, - weight = 2 * kg, - random_tint_color = item_tints.iron_rust, - fuel_category = "chemical", - fuel_value = "8MJ", - } +local sounds = require("__base__.prototypes.entity.sounds") +local resource_autoplace = require("resource-autoplace") +local item_sounds = require("__base__.prototypes.item_sounds") +local item_tints = require("__base__.prototypes.item-tints") + +local grass_driving_sound = { + sound = { + filename = "__base__/sound/driving/vehicle-surface-grass.ogg", volume = 0.5, + advanced_volume_control = { fades = { fade_in = { curve_type = "cosine", from = { control = 0.5, volume_percentage = 0.0 }, to = { 1.5, 100.0 } } } } + }, + fade_ticks = 6 +} + +data:extend({ + { + type = "resource", + name = "peat", + icon = Lignumis.graphics .. "icons/peat.png", + flags = { "placeable-neutral" }, + order = "a-b-b", + tree_removal_probability = 0.1, + tree_removal_max_distance = 32 * 32, + minable = { + count = 2, + mining_particle = "wooden-particle", + mining_time = 1, + results = { + { + type = "item", + name = "peat", + amount = 2 + }, + { + type = "item", + name = "wood", + amount_min = 1, + amount_max = 8, + probability = 0.1 + } + } + }, + walking_sound = sounds.plant, + driving_sound = grass_driving_sound, + collision_box = { { -0.1, -0.1 }, { 0.1, 0.1 } }, + selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, + autoplace = resource_autoplace.resource_autoplace_settings { + name = "lignumis_peat", + order = "b", + base_density = 2, + base_spots_per_km2 = 5, + has_starting_area_placement = true, + regular_rq_factor_multiplier = 1, + starting_rq_factor_multiplier = 1, + candidate_spot_count = 21 + }, + stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 }, + stages = { + sheet = { + filename = "__base__/graphics/entity/iron-ore/iron-ore.png", + priority = "extra-high", + size = 128, + frame_count = 8, + variation_count = 8, + scale = 0.5, + tint = { b = 0.24, g = 0.50, r = 0.79 } + } + }, + map_color = { 0.4, 0.2470, 0.1176 }, + mining_visualisation_tint = { b = 0.24, g = 0.50, r = 0.79 }, + factoriopedia_simulation = { + init = " game.simulation.camera_position = {0, -0.5}\n\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -2.5}, amount = 100}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -2.5}, amount = 500}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -2.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -2.5}, amount = 200}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-4.5, -0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, -1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, -0.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, -0.5}, amount = 650}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -0.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, -1.5}, amount = 800}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, -1.5}, amount = 650}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -1.5}, amount = 450}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, -0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -0.5}, amount = 1050}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, -1.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, -1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, -0.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -1.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, -0.5}, amount = 500}\n game.surfaces[1].create_entity{name = \"peat\", position = {4.5, -0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, 1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-3.5, 0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-2.5, 0.5}, amount = 200}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, 1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 1.5}, amount = 550}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 0.5}, amount = 850}\n game.surfaces[1].create_entity{name = \"peat\", position = {-1.5, 0.5}, amount = 700}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 1.5}, amount = 250}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, 1.5}, amount = 300}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 0.5}, amount = 550}\n game.surfaces[1].create_entity{name = \"peat\", position = {0.5, 0.5}, amount = 1000}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, 1.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 1.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {3.5, 0.5}, amount = 150}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 0.5}, amount = 300}\n game.surfaces[1].create_entity{name = \"peat\", position = {4.5, 0.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {-0.5, 2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {1.5, 2.5}, amount = 50}\n game.surfaces[1].create_entity{name = \"peat\", position = {2.5, 2.5}, amount = 50}\n " + } + }, + { + type = "item", + name = "peat", + icon = Lignumis.graphics .. "icons/peat.png", + subgroup = "raw-resource", + order = "a[peat]", + inventory_move_sound = item_sounds.landfill_inventory_move, + pick_sound = item_sounds.landfill_inventory_pickup, + drop_sound = item_sounds.landfill_inventory_move, + stack_size = 100, + weight = 2 * kg, + random_tint_color = item_tints.iron_rust, + fuel_category = "chemical", + fuel_value = "8MJ", + } }) \ No newline at end of file diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua index 5ee0727..2b45880 100644 --- a/lignumis/prototypes/content/quality-assembler.lua +++ b/lignumis/prototypes/content/quality-assembler.lua @@ -8,7 +8,7 @@ data:extend({ type = "burner-usage", name = "quality-catalyst", empty_slot_sprite = { - filename = "__lignumis__/graphics/empty-quality-catalyst-slot.png", + filename = Lignumis.graphics .. "empty-quality-catalyst-slot.png", priority = "extra-high-no-scale", size = 64, flags = { "gui-icon" }, @@ -16,7 +16,7 @@ data:extend({ empty_slot_caption = { "gui.quality-catalyst" }, empty_slot_description = { "gui.quality-catalyst-description" }, icon = { - filename = "__lignumis__/graphics/quality-catalyst-icon-red.png", + filename = Lignumis.graphics .. "quality-catalyst-icon-red.png", priority = "extra-high-no-scale", width = 64, height = 64, @@ -34,7 +34,7 @@ data:extend({ { type = "item", name = "gold-quality-catalyst", - icon = "__lignumis__/graphics/icons/quality-gold-catalyst.png", + icon = Lignumis.graphics .. "icons/quality-gold-catalyst.png", subgroup = "raw-material", color_hint = { text = "C" }, order = "a[smelting]-0[gold-plate]", diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index 24b79b2..f1db17e 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -2,11 +2,11 @@ local item_sounds = require("__base__.prototypes.item_sounds") local pipecovers = require("prototypes/content/gold/pipecovers") local machinepipes = require("prototypes/content/gold/machinepipes") -local gfx = "__lignumis__/graphics/entity/steam-assembling-machine/" +local gfx = Lignumis.graphics .. "entity/steam-assembling-machine/" local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"]) assembling_machine.name = "steam-assembling-machine" -assembling_machine.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" +assembling_machine.icon = Lignumis.graphics .. "icons/steam-assembling-machine.png" assembling_machine.minable.result = "steam-assembling-machine" assembling_machine.next_upgrade = "assembling-machine-1" assembling_machine.module_slots = nil @@ -16,11 +16,15 @@ assembling_machine.graphics_set = table.deepcopy(data.raw["assembling-machine"][ assembling_machine.graphics_set.animation.layers[1].filename = gfx .. "steam-assembling-machine.png" assembling_machine.crafting_categories = { - "crafting", "basic-crafting", - "organic-or-assembling", + "crafting", + "electronics", + "pressing", "wood-processing-or-assembling", - "crafting-with-fluid" + "organic-or-assembling", + "electronics-or-assembling", + "metallurgy-or-assembling", + "crafting-with-steam" } assembling_machine.crafting_speed = 0.5 assembling_machine.energy_usage = "25kW" @@ -49,19 +53,23 @@ assembling_machine.fluid_boxes[2].pipe_covers = pipecovers() local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"]) remnants.name = "steam-assembling-machine-remnants" -remnants.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" +remnants.icon = Lignumis.graphics .. "icons/steam-assembling-machine.png" remnants.animation[1].filename = gfx .. "steam-assembling-machine-remnants.png" remnants.animation[2].filename = gfx .. "steam-assembling-machine-remnants.png" remnants.animation[3].filename = gfx .. "steam-assembling-machine-remnants.png" remnants.order = "1[steam-assembling-machine]" data:extend({ + { + type = "recipe-category", + name = "crafting-with-steam" + }, assembling_machine, remnants, { type = "item", name = "steam-assembling-machine", - icon = "__lignumis__/graphics/icons/steam-assembling-machine.png", + icon = Lignumis.graphics .. "icons/steam-assembling-machine.png", subgroup = "production-machine", order = "1[steam-assembling-machine]", inventory_move_sound = item_sounds.mechanical_inventory_move, @@ -84,7 +92,7 @@ data:extend({ { type = "technology", name = "steam-automation", - icon = "__lignumis__/graphics/technology/steam-automation.png", + icon = Lignumis.graphics .. "technology/steam-automation.png", icon_size = 256, effects = { { diff --git a/lignumis/prototypes/content/steam-science.lua b/lignumis/prototypes/content/steam-science.lua index 83779a4..e9e672f 100644 --- a/lignumis/prototypes/content/steam-science.lua +++ b/lignumis/prototypes/content/steam-science.lua @@ -1,12 +1,13 @@ local item_tints = require("__base__.prototypes.item-tints") local item_sounds = require("__base__.prototypes.item_sounds") +local Technology = require("__cf-lib__/data/Technology") data:extend({ { type = "tool", name = "steam-science-pack", localised_description = { "item-description.science-pack" }, - icon = "__lignumis__/graphics/icons/steam-science-pack.png", + icon = Lignumis.graphics .. "icons/steam-science-pack.png", subgroup = "science-pack", color_hint = { text = "A" }, order = "1[steam-science-pack]", @@ -25,12 +26,29 @@ data:extend({ { type = "recipe", name = "steam-science-pack", + category = "crafting-with-steam", + enabled = false, + energy_required = 20, + ingredients = { + { type = "item", name = "gold-plate", amount = 2 } + }, + results = { { type = "item", name = "steam-science-pack", amount = 2 } }, + crafting_machine_tint = { + primary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, + secondary = { r = 0.65, g = 0.27, b = 0.18, a = 1.000 }, + }, + allow_productivity = true + }, + { + type = "recipe", + name = "steam-science-pack-steam", + localised_name = { "item-name.steam-science-pack" }, category = "crafting-with-fluid", enabled = false, energy_required = 20, ingredients = { { type = "item", name = "gold-plate", amount = 2 }, - { type = "fluid", name = "steam", amount = 10 } + { type = "fluid", name = "steam", amount = 20 } }, results = { { type = "item", name = "steam-science-pack", amount = 2 } }, crafting_machine_tint = { @@ -42,7 +60,7 @@ data:extend({ { type = "technology", name = "steam-science-pack", - icon = "__lignumis__/graphics/technology/steam-science-pack.png", + icon = Lignumis.graphics .. "technology/steam-science-pack.png", icon_size = 256, essential = true, effects = { @@ -59,3 +77,5 @@ data:extend({ } } }) + +Technology:new("automation-2"):addRecipe("steam-science-pack-steam") \ No newline at end of file diff --git a/lignumis/prototypes/content/technology.lua b/lignumis/prototypes/content/technology.lua index a028168..c83db13 100644 --- a/lignumis/prototypes/content/technology.lua +++ b/lignumis/prototypes/content/technology.lua @@ -2,7 +2,7 @@ data:extend({ { type = "technology", name = "planet-discovery-lignumis", - icons = PlanetsLib.technology_icons_moon("__lignumis__/graphics/technology/lignumis.png", 256), + icons = PlanetsLib.technology_icons_moon(Lignumis.graphics .. "technology/lignumis.png", 256), essential = true, effects = { { @@ -20,94 +20,10 @@ data:extend({ time = 10 } }, - { - type = "technology", - name = "planet-discovery-nauvis", - icons = util.technology_icon_constant_planet("__lignumis__/graphics/technology/nauvis.png"), - icon_size = 256, - essential = true, - effects = { - { - type = "unlock-space-location", - space_location = "nauvis", - use_icon_overlay_constant = true - }, - { - type = "unlock-space-platforms", - modifier = true, - hidden = true - } - }, - prerequisites = { "provisional-rocketry" }, - unit = { - count = 100, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 30 - } - }, - { - type = "technology", - name = "iron-processing", - icon = "__base__/graphics/icons/iron-plate.png", - icon_size = 64, - essential = true, - effects = { - { - type = "unlock-recipe", - recipe = "iron-plate" - }, - { - type = "unlock-recipe", - recipe = "iron-chest" - }, - { - type = "unlock-recipe", - recipe = "iron-gear-wheel" - } - }, - prerequisites = { "planet-discovery-nauvis" }, - unit = { - count = 50, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 15 - } - }, - { - type = "technology", - name = "copper-processing", - icon = "__base__/graphics/icons/copper-plate.png", - icon_size = 64, - essential = true, - effects = { - { - type = "unlock-recipe", - recipe = "copper-plate" - }, - { - type = "unlock-recipe", - recipe = "copper-cable" - } - }, - prerequisites = { "planet-discovery-nauvis" }, - unit = { - count = 50, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 15 - } - }, { type = "technology", name = "gold-fluid-handling", - icon = "__lignumis__/graphics/technology/gold-fluid-handling.png", + icon = Lignumis.graphics .. "technology/gold-fluid-handling.png", icon_size = 256, prerequisites = { "burner-automation" }, effects = { @@ -145,7 +61,7 @@ data:extend({ { type = "technology", name = "provisional-rocketry", - icon = "__lignumis__/graphics/technology/provisional-rocketry.png", + icon = Lignumis.graphics .. "technology/provisional-rocketry.png", icon_size = 256, essential = true, effects = @@ -166,3 +82,84 @@ data:extend({ } } }) + +if not mods["planet-picker"] and not mods["any-planet-start"] then + data:extend({ + { + type = "technology", + name = "planet-discovery-nauvis", + icons = util.technology_icon_constant_planet(Lignumis.graphics .. "technology/nauvis.png"), + icon_size = 256, + essential = true, + effects = { + { + type = "unlock-space-location", + space_location = "nauvis", + use_icon_overlay_constant = true + }, + { + type = "unlock-space-platforms", + modifier = true, + hidden = true + } + }, + prerequisites = { "provisional-rocketry" }, + unit = { + count = 100, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 30 + } + }, + { + type = "technology", + name = "iron-processing", + icon = "__base__/graphics/icons/iron-plate.png", + icon_size = 64, + essential = true, + effects = { + { + type = "unlock-recipe", + recipe = "iron-plate" + }, + { + type = "unlock-recipe", + recipe = "iron-chest" + }, + { + type = "unlock-recipe", + recipe = "iron-gear-wheel" + } + }, + prerequisites = { "planet-discovery-nauvis" }, + research_trigger = { + type = "mine-entity", + entity = "iron-ore" + } + }, + { + type = "technology", + name = "copper-processing", + icon = "__base__/graphics/icons/copper-plate.png", + icon_size = 64, + essential = true, + effects = { + { + type = "unlock-recipe", + recipe = "copper-plate" + }, + { + type = "unlock-recipe", + recipe = "copper-cable" + } + }, + prerequisites = { "planet-discovery-nauvis" }, + research_trigger = { + type = "mine-entity", + entity = "copper-ore" + } + } + }) +end diff --git a/lignumis/prototypes/content/wood-lab.lua b/lignumis/prototypes/content/wood-lab.lua index 2f6748f..39d7020 100644 --- a/lignumis/prototypes/content/wood-lab.lua +++ b/lignumis/prototypes/content/wood-lab.lua @@ -1,15 +1,17 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local gfx = "__lignumis__/graphics/entity/wood-lab/" +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value +local gfx = Lignumis.graphics .. "entity/wood-lab/" data:extend({ { type = "lab", name = "wood-lab", - icon = "__lignumis__/graphics/icons/wood-lab.png", + icon = Lignumis.graphics .. "icons/wood-lab.png", flags = { "placeable-player", "player-creation" }, minable = { mining_time = 0.2, result = "wood-lab" }, fast_replaceable_group = "lab", + next_upgrade = "lab", max_health = 150, corpse = "lab-remnants", dying_explosion = "lab-explosion", @@ -130,7 +132,7 @@ data:extend({ { type = "item", name = "wood-lab", - icon = "__lignumis__/graphics/icons/wood-lab.png", + icon = Lignumis.graphics .. "icons/wood-lab.png", subgroup = "production-machine", order = "y0[lab]", inventory_move_sound = item_sounds.lab_inventory_move, @@ -147,7 +149,8 @@ data:extend({ { type = "item", name = "lumber", amount = 10 }, { type = "item", name = "wooden-gear-wheel", amount = 10 }, { type = "item", name = "stone-brick", amount = 10 }, - { type = "item", name = "gold-plate", amount = 20 } + { type = "item", name = "gold-plate", amount = basic_circuit_board and 10 or 20 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 10 } or nil }, results = { { type = "item", name = "wood-lab", amount = 1 } }, enabled = false diff --git a/lignumis/prototypes/content/wood-liquefaction.lua b/lignumis/prototypes/content/wood-liquefaction.lua index a1753af..8d5f7c6 100644 --- a/lignumis/prototypes/content/wood-liquefaction.lua +++ b/lignumis/prototypes/content/wood-liquefaction.lua @@ -1,3 +1,5 @@ +local Technology = require("__cf-lib__/data/Technology") + data:extend({ { type = "fluid", @@ -6,7 +8,7 @@ data:extend({ fuel_value = "250kJ", base_color = { r = 0.57, g = 0.392, b = 0.114 }, flow_color = { r = 0.57, g = 0.392, b = 0.114 }, - icon = "__lignumis__/graphics/icons/wood-pulp.png", + icon = Lignumis.graphics .. "icons/wood-pulp.png", icon_size = 64, icon_mipmaps = 4, subgroup = "fluid", @@ -14,12 +16,41 @@ data:extend({ }, { type = "recipe", - category = "crafting-with-fluid", name = "wood-liquefaction", + category = "crafting-with-steam", icon_size = 64, icon_mipmaps = 4, icons = { - { icon = "__lignumis__/graphics/icons/wood-pulp.png" }, + { icon = Lignumis.graphics .. "icons/wood-pulp.png" }, + { icon = "__base__/graphics/icons/wood.png", scale = 0.25, shift = { 8, 8 } }, + }, + subgroup = "fluid-recipes", + order = "a[oil-processing]-d[wood-liquefaction]", + enabled = false, + energy_required = 3, + crafting_machine_tint = { + primary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + secondary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + tertiary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + quaternary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 } + }, + ingredients = { + { type = "item", name = "wood", amount = 1 } + }, + results = { + { type = "fluid", name = "wood-pulp", amount = 10 } + }, + allow_productivity = true + }, + { + type = "recipe", + name = "wood-liquefaction-steam", + localised_name = { "recipe-name.wood-liquefaction" }, + category = "crafting-with-fluid", + icon_size = 64, + icon_mipmaps = 4, + icons = { + { icon = Lignumis.graphics .. "icons/wood-pulp.png" }, { icon = "__base__/graphics/icons/wood.png", scale = 0.25, shift = { 8, 8 } }, }, subgroup = "fluid-recipes", @@ -48,7 +79,7 @@ data:extend({ icon_mipmaps = 4, icons = { { icon = "__base__/graphics/technology/oil-processing.png", icon_size = 256 }, - { icon = "__lignumis__/graphics/icons/wood-pulp.png", icon_size = 64, scale = 1 } + { icon = Lignumis.graphics .. "icons/wood-pulp.png", icon_size = 64, scale = 1 } }, effects = { { @@ -68,3 +99,5 @@ data:extend({ order = "w" } }) + +Technology:new("automation-2"):addRecipe("wood-liquefaction-steam") \ No newline at end of file diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 2fa41ae..4caedcd 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -1,72 +1,78 @@ -local BeltFactory = require(MF.logistics .. "Belts") -local Belt = BeltFactory("wood", "brown", "slow") - -Belt.EntityBuilder:new() - :itemsPerSecond(7.5) - :nextTier("") - :undergroundDistance(4) - :animationSpeedMultiplier(1.01) - :apply({ - transportBelt = { - emissions_per_second = { noise = 0.05 } - }, - undergroundBelt = { - emissions_per_second = { noise = 0.5 } - }, - splitter = { - emissions_per_second = { noise = 1 } - } - }) - -local splitter_item = Belt.ItemBuilder:new() - :order("0") - :apply() - .splitter - -Belt.RecipeBuilder:new() - :beltAmount(2) - :ingredients("transportBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wooden-gear-wheel", amount = 1 } - }) - :ingredients("undergroundBelt", { - { type = "item", name = "lumber", amount = 1 }, - { type = "item", name = "wood-transport-belt", amount = 4 }, - }) - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "gold-cable", amount = 10 } - }) - :apply() - -Belt.TechnologyBuilder:new() - :prerequisites({ "wood-science-pack" }) - :ingredients({ { "wood-science-pack", 1 } }) - :count(10) - :time(10) - :apply() - -data:extend({ - Belt.RecipeBuilder:new() - :ingredients("splitter", { - { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "electronic-circuit", amount = 2 } - }) - :build({ - splitter = { - name = "wood-splitter-electronic-circuit", - icons = { - { icon = splitter_item.icon }, - { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } - } - } - }) - .splitter -}) - -table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "wood-splitter-electronic-circuit" -}) +local BeltFactory = require(MF.logistics .. "Belts") +local Belt = BeltFactory("wood", "brown", "slow") + +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + +Belt.EntityBuilder:new() + :itemsPerSecond(7.5) + :nextTier("") + :undergroundDistance(4) + :animationSpeedMultiplier(1.01) + :apply({ + transportBelt = { + emissions_per_second = { noise = 0.05 } + }, + undergroundBelt = { + emissions_per_second = { noise = 0.5 } + }, + splitter = { + emissions_per_second = { noise = 1 } + } + }) + +local splitter_item = Belt.ItemBuilder:new() + :order("0") + :apply() + .splitter + +Belt.RecipeBuilder:new() + :beltAmount(2) + :ingredients("transportBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wooden-gear-wheel", amount = 1 } + }) + :ingredients("undergroundBelt", { + { type = "item", name = "lumber", amount = 1 }, + { type = "item", name = "wood-transport-belt", amount = 4 }, + }) + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 10 } + }) + :apply() + +Belt.TechnologyBuilder:new() + :prerequisites({ "wood-science-pack" }) + :ingredients({ { "wood-science-pack", 1 } }) + :count(10) + :time(10) + :apply() + +if not basic_circuit_board then + data:extend({ + Belt.RecipeBuilder:new() + :ingredients("splitter", { + { type = "item", name = "wood-transport-belt", amount = 2 }, + { type = "item", name = "lumber", amount = 2 }, + { type = "item", name = "electronic-circuit", amount = 2 } + }) + :build({ + splitter = { + name = "wood-splitter-electronic-circuit", + localised_name = { "entity-name.wood-splitter" }, + icons = { + { icon = splitter_item.icon }, + { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } } + } + } + }) + .splitter + }) + + table.insert(data.raw.technology["electronics"].effects, { + type = "unlock-recipe", + recipe = "wood-splitter-electronic-circuit" + }) +end diff --git a/lignumis/prototypes/content/wood-military.lua b/lignumis/prototypes/content/wood-military.lua index c6a4715..8f00a69 100644 --- a/lignumis/prototypes/content/wood-military.lua +++ b/lignumis/prototypes/content/wood-military.lua @@ -39,7 +39,7 @@ data:extend({ { type = "ammo", name = "wood-darts-magazine", - icon = "__lignumis__/graphics/icons/wood-darts-magazine.png", + icon = Lignumis.graphics .. "icons/wood-darts-magazine.png", ammo_category = "bullet", ammo_type = { cooldown_modifier = 1 / 0.75, @@ -88,7 +88,7 @@ data:extend({ { type = "armor", name = "wood-armor", - icon = "__lignumis__/graphics/icons/wood-armor.png", + icon = Lignumis.graphics .. "icons/wood-armor.png", resistances = { { type = "physical", diff --git a/lignumis/prototypes/content/wood-science.lua b/lignumis/prototypes/content/wood-science.lua index b8b724c..1e2e29c 100644 --- a/lignumis/prototypes/content/wood-science.lua +++ b/lignumis/prototypes/content/wood-science.lua @@ -6,7 +6,7 @@ data:extend({ type = "tool", name = "wood-science-pack", localised_description = { "item-description.science-pack" }, - icon = "__lignumis__/graphics/icons/wood-science-pack.png", + icon = Lignumis.graphics .. "icons/wood-science-pack.png", subgroup = "science-pack", color_hint = { text = "A" }, order = "0[wood-science-pack]", @@ -41,7 +41,7 @@ data:extend({ { type = "technology", name = "wood-science-pack", - icon = "__lignumis__/graphics/technology/wood-science-pack.png", + icon = Lignumis.graphics .. "technology/wood-science-pack.png", icon_size = 256, essential = true, effects = diff --git a/lignumis/prototypes/content/wooden-gearwheel.lua b/lignumis/prototypes/content/wooden-gearwheel.lua index 1216a01..0a7e5b5 100644 --- a/lignumis/prototypes/content/wooden-gearwheel.lua +++ b/lignumis/prototypes/content/wooden-gearwheel.lua @@ -1,24 +1,24 @@ -local item_tints = require("__base__.prototypes.item-tints") -local item_sounds = require("__base__.prototypes.item_sounds") - -data:extend({ - { - type = "item", - name = "wooden-gear-wheel", - icon = "__lignumis__/graphics/icons/wooden-gear-wheel.png", - subgroup = "intermediate-product", - order = "a[basic-intermediates]-0[wooden-gear-wheel]", - inventory_move_sound = item_sounds.wood_inventory_move, - pick_sound = item_sounds.wood_inventory_pickup, - drop_sound = item_sounds.wood_inventory_move, - stack_size = 100, - random_tint_color = item_tints.iron_rust - }, - { - type = "recipe", - name = "wooden-gear-wheel", - ingredients = { { type = "item", name = "lumber", amount = 1 } }, - results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } }, - allow_productivity = true - } +local item_tints = require("__base__.prototypes.item-tints") +local item_sounds = require("__base__.prototypes.item_sounds") + +data:extend({ + { + type = "item", + name = "wooden-gear-wheel", + icon = Lignumis.graphics .. "icons/wooden-gear-wheel.png", + subgroup = "intermediate-product", + order = "a[basic-intermediates]-0[wooden-gear-wheel]", + inventory_move_sound = item_sounds.wood_inventory_move, + pick_sound = item_sounds.wood_inventory_pickup, + drop_sound = item_sounds.wood_inventory_move, + stack_size = 100, + random_tint_color = item_tints.iron_rust + }, + { + type = "recipe", + name = "wooden-gear-wheel", + ingredients = { { type = "item", name = "lumber", amount = 1 } }, + results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } }, + allow_productivity = true + } }) \ No newline at end of file diff --git a/lignumis/prototypes/content/wooden-rocket-silo.lua b/lignumis/prototypes/content/wooden-rocket-silo.lua index d9fa71e..20afc59 100644 --- a/lignumis/prototypes/content/wooden-rocket-silo.lua +++ b/lignumis/prototypes/content/wooden-rocket-silo.lua @@ -1,9 +1,11 @@ local pipecovers = require("prototypes/content/gold/pipecovers") local machinepipes = require("prototypes/content/gold/machinepipes") +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value + local silo = table.deepcopy(data.raw["rocket-silo"]["rocket-silo"]) silo.name = "provisional-rocket-silo" -silo.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" +silo.icon = Lignumis.graphics .. "icons/provisional-rocket-silo.png" silo.module_slots = 0 silo.allowed_effects = { "consumption", "pollution", "speed" } silo.minable = { mining_time = 1, result = "provisional-rocket-silo" } @@ -30,11 +32,11 @@ silo.energy_usage = "1MW" silo.rocket_entity = "provisional-rocket" silo.fixed_recipe = "provisional-rocket-part" silo.door_opening_speed = 1 / (20 * 60) -silo.base_day_sprite.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/06-rocket-silo.png" -silo.base_front_sprite.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png" -silo.arm_01_back_animation.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png" -silo.arm_02_right_animation.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png" -silo.arm_03_front_animation.filename = "__lignumis__/graphics/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png" +silo.base_day_sprite.filename = Lignumis.graphics .. "entity/wooden-rocket-silo/06-rocket-silo.png" +silo.base_front_sprite.filename = Lignumis.graphics .. "entity/wooden-rocket-silo/14-rocket-silo-front.png" +silo.arm_01_back_animation.filename = Lignumis.graphics .. "entity/wooden-rocket-silo/08-rocket-silo-arms-back.png" +silo.arm_02_right_animation.filename = Lignumis.graphics .. "entity/wooden-rocket-silo/08-rocket-silo-arms-right.png" +silo.arm_03_front_animation.filename = Lignumis.graphics .. "entity/wooden-rocket-silo/13-rocket-silo-arms-front.png" silo.fluid_boxes = { { production_type = "input", @@ -59,7 +61,7 @@ local silo_item = table.deepcopy(data.raw["item"]["rocket-silo"]) silo_item.name = "provisional-rocket-silo" silo_item.order = "0[provisional-rocket-silo]" silo_item.place_result = "provisional-rocket-silo" -silo_item.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" +silo_item.icon = Lignumis.graphics .. "icons/provisional-rocket-silo.png" local silo_recipe = table.deepcopy(data.raw["recipe"]["rocket-silo"]) silo_recipe.name = "provisional-rocket-silo" @@ -69,7 +71,8 @@ silo_recipe.ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 250 }, { type = "item", name = "stone-brick", amount = 500 }, { type = "item", name = "gold-plate", amount = 500 }, - { type = "item", name = "gold-cable", amount = 100 } + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 100 } or + { type = "item", name = "gold-cable", amount = 100 } } local rocket = table.deepcopy(data.raw["rocket-silo-rocket"]["rocket-silo-rocket"]) @@ -79,22 +82,23 @@ rocket.rising_speed = 1 / (14 * 60) rocket.engine_starting_speed = 1 / (11 * 60) rocket.flying_speed = 1 / (4000 * 60) rocket.flying_acceleration = 0.005 -rocket.rocket_sprite.layers[1].filename = "__lignumis__/graphics/entity/wooden-rocket-silo/rocket-static-pod.png" +rocket.rocket_sprite.layers[1].filename = Lignumis.graphics .. "entity/wooden-rocket-silo/rocket-static-pod.png" local rocket_part_recipe = { type = "recipe", name = "provisional-rocket-part", - icon = "__lignumis__/graphics/icons/provisional-rocket-part.png", + icon = Lignumis.graphics .. "icons/provisional-rocket-part.png", energy_required = 6, enabled = false, hide_from_player_crafting = true, category = "rocket-building", ingredients = { - { type = "item", name = "lumber", amount = 5 }, - { type = "item", name = "wooden-gear-wheel", amount = 5 }, - { type = "item", name = "gold-plate", amount = 5 }, - { type = "item", name = "gold-cable", amount = 5 }, - { type = "fluid", name = "wood-pulp", amount = 5 } + { type = "item", name = "lumber", amount = basic_circuit_board and 3 or 5 }, + { type = "item", name = "wooden-gear-wheel", amount = basic_circuit_board and 4 or 5 }, + { type = "item", name = "gold-plate", amount = 5 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 5 } or + { type = "item", name = "gold-cable", amount = 5 }, + { type = "fluid", name = "wood-pulp", amount = 5 } }, results = { { type = "item", name = "rocket-part", amount = 1 } }, allow_productivity = true @@ -129,7 +133,7 @@ local silo_ready_item = table.deepcopy(data.raw["item"]["rocket-silo"]) silo_ready_item.name = "provisional-rocket-silo-ready" silo_ready_item.order = "0[provisional-rocket-silo-ready]" silo_ready_item.place_result = "provisional-rocket-silo-ready" -silo_ready_item.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" +silo_ready_item.icon = Lignumis.graphics .. "icons/provisional-rocket-silo.png" data:extend({ silo, diff --git a/lignumis/prototypes/integrations/Wood-Walls.lua b/lignumis/prototypes/integrations/Wood-Walls.lua index 7262078..479f2cd 100644 --- a/lignumis/prototypes/integrations/Wood-Walls.lua +++ b/lignumis/prototypes/integrations/Wood-Walls.lua @@ -1,3 +1,6 @@ local recipe = data.raw.recipe["wooden-wall"] recipe.ingredients = { { type = "item", name = "lumber", amount = 4 } } -recipe.results = { { type = "item", name = "wooden-wall", amount = 1 } } \ No newline at end of file +recipe.results = { { type = "item", name = "wooden-wall", amount = 1 } } + +-- https://mods.factorio.com/mod/Wood-Walls/discussion/679915cbb8bf3c84c65db404 +data.raw.corpse["woodenwall-remnants"].icon = "__Wood-Walls__/graphics/wooden-wall/wooden-wall.png" \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla-updates.lua b/lignumis/prototypes/integrations/vanilla-updates.lua index 3b5a41a..b8584a6 100644 --- a/lignumis/prototypes/integrations/vanilla-updates.lua +++ b/lignumis/prototypes/integrations/vanilla-updates.lua @@ -1,6 +1,6 @@ -- Add wood and steam science packs as ingredients to technologies that require Nauvis science packs. for _, technology in pairs(data.raw.technology) do - if technology.unit and technology.unit.ingredients and not table.contains(Lignumis.science_blacklist, technology.name) then + if not technology.lignumis_skip_science_packs and technology.unit and technology.unit.ingredients and not table.contains(Lignumis.science_blacklist, technology.name) then local ingredients = technology.unit.ingredients local noMatches = table.filter(ingredients, function(ingredient) return table.contains(Lignumis.science_pack_blacklist, ingredient[1]) @@ -24,4 +24,4 @@ for _, lab in pairs(data.raw.lab) do "steam-science-pack" }, lab.inputs) end -end \ No newline at end of file +end diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 68bc1b5..75b9b74 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -1,40 +1,44 @@ local Technology = require("__cf-lib__/data/Technology") +local Recipe = require("__cf-lib__/data/Recipe") + +local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value -- Burner mining drill local drill = data.raw["mining-drill"]["burner-mining-drill"] local drill_animation = drill.graphics_set.animation drill.resource_searching_radius = 1.99 -drill.icon = "__lignumis__/graphics/icons/burner-mining-drill.png" +drill.icon = Lignumis.graphics .. "icons/burner-mining-drill.png" drill.impact_category = "wood" drill.radius_visualisation_picture = table.deepcopy(data.raw["mining-drill"]["electric-mining-drill"].radius_visualisation_picture) -drill_animation.north.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-N.png" -drill_animation.east.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-E.png" -drill_animation.south.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-S.png" -drill_animation.west.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-W.png" +drill_animation.north.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-N.png" +drill_animation.east.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-E.png" +drill_animation.south.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-S.png" +drill_animation.west.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-W.png" local drill_item = data.raw["item"]["burner-mining-drill"] -drill_item.icon = "__lignumis__/graphics/icons/burner-mining-drill.png" +drill_item.icon = Lignumis.graphics .. "icons/burner-mining-drill.png" local drill_recipe = data.raw["recipe"]["burner-mining-drill"] drill_recipe.ingredients = { - { type = "item", name = "wooden-gear-wheel", amount = 3 }, { type = "item", name = "stone-furnace", amount = 1 }, - { type = "item", name = "lumber", amount = 3 } + { type = "item", name = "wooden-gear-wheel", amount = basic_circuit_board and 2 or 3 }, + { type = "item", name = "lumber", amount = basic_circuit_board and 2 or 3 }, + basic_circuit_board and { type = "item", name = "basic-circuit-board", amount = 2 } or nil } -- Burner inserter local burner_inserter = data.raw["inserter"]["burner-inserter"] -burner_inserter.icon = "__lignumis__/graphics/icons/burner-inserter.png" -burner_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-base.png" -burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-closed.png" -burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-open.png" -burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-platform.png" +burner_inserter.icon = Lignumis.graphics .. "icons/burner-inserter.png" +burner_inserter.hand_base_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-base.png" +burner_inserter.hand_closed_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-closed.png" +burner_inserter.hand_open_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-open.png" +burner_inserter.platform_picture.sheet.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-platform.png" burner_inserter.energy_source.initial_fuel_percent = 0.15 -data.raw.item["burner-inserter"].icon = "__lignumis__/graphics/icons/burner-inserter.png" +data.raw.item["burner-inserter"].icon = Lignumis.graphics .. "icons/burner-inserter.png" data.raw.recipe["burner-inserter"].ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 1 }, @@ -45,12 +49,12 @@ data.raw.recipe["burner-inserter"].ingredients = { -- Stone furnace local stone_furnace = data.raw["furnace"]["stone-furnace"] -stone_furnace.icon = "__lignumis__/graphics/icons/stone-furnace.png" -stone_furnace.graphics_set.animation.layers[1].filename = "__lignumis__/graphics/entity/stone-furnace/stone-furnace.png" +stone_furnace.icon = Lignumis.graphics .. "icons/stone-furnace.png" +stone_furnace.graphics_set.animation.layers[1].filename = Lignumis.graphics .. "entity/stone-furnace/stone-furnace.png" local stone_furnace_remnants = data.raw["corpse"]["stone-furnace-remnants"] -stone_furnace_remnants.icon = "__lignumis__/graphics/icons/stone-furnace.png" -stone_furnace_remnants.animation[1].filename = "__lignumis__/graphics/entity/stone-furnace/stone-furnace-remnants.png" +stone_furnace_remnants.icon = Lignumis.graphics .. "icons/stone-furnace.png" +stone_furnace_remnants.animation[1].filename = Lignumis.graphics .. "entity/stone-furnace/stone-furnace-remnants.png" -- Lab @@ -71,7 +75,14 @@ data.raw["ammo-turret"]["gun-turret"].attack_parameters.range = 20 -- Agricultural tower -data.raw["agricultural-tower"]["agricultural-tower"].surface_conditions[1].min = 900 +local agricultural_tower = data.raw["agricultural-tower"]["agricultural-tower"] +if agricultural_tower.surface_conditions then + for _, condition in pairs(agricultural_tower.surface_conditions) do + if condition.property == "pressure" then + condition.min = 900 + end + end +end -- Wood processing @@ -106,6 +117,10 @@ tree_plant.minable.count = nil tree_plant.surface_conditions[1].min = 900 table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil") +if mods["Diversitree"] then + data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900 +end + table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "wood-processing-or-assembling") table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling") table.insert(data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories, "wood-processing-or-assembling") @@ -114,29 +129,22 @@ table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_cat -- Disable vanilla early game recipes -data.raw.recipe["iron-plate"].enabled = false -data.raw.recipe["iron-gear-wheel"].enabled = false -data.raw.recipe["iron-chest"].enabled = false -data.raw.recipe["copper-plate"].enabled = false -data.raw.recipe["copper-cable"].enabled = false -data.raw.recipe["transport-belt"].enabled = false +if not mods["planet-picker"] and not mods["any-planet-start"] then + data.raw.recipe["iron-plate"].enabled = false + data.raw.recipe["iron-gear-wheel"].enabled = false + data.raw.recipe["iron-chest"].enabled = false + data.raw.recipe["copper-plate"].enabled = false + data.raw.recipe["copper-cable"].enabled = false + data.raw.recipe["transport-belt"].enabled = false +end -- Progressive recipes if settings.startup["lignumis-belt-progression"].value then - table.insert( - data.raw.recipe["transport-belt"].ingredients, - { type = "item", name = "wood-transport-belt", amount = 2 } - ) - table.insert( - data.raw.recipe["underground-belt"].ingredients, - { type = "item", name = "wood-underground-belt", amount = 2 } - ) - table.insert( - data.raw.recipe["splitter"].ingredients, - { type = "item", name = "wood-splitter", amount = 1 } - ) + Recipe:new("transport-belt"):replaceIngredient("iron-plate", "wood-transport-belt", 2) + Recipe:new("underground-belt"):replaceIngredient("transport-belt", "wood-underground-belt", 2) + Recipe:new("splitter"):replaceIngredient("transport-belt", "wood-splitter", 1) end if settings.startup["lignumis-inserter-progression"].value then @@ -149,152 +157,144 @@ end -- Adjust vanilla technologies -local automation_science_pack_technology = data.raw.technology["automation-science-pack"] -automation_science_pack_technology.prerequisites = { "planet-discovery-nauvis" } -automation_science_pack_technology.research_trigger = nil -automation_science_pack_technology.unit = { - count = 100, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 30 -} +if not mods["planet-picker"] and not mods["any-planet-start"] then + local automation_science_pack_technology = data.raw.technology["automation-science-pack"] + automation_science_pack_technology.enabled = false + automation_science_pack_technology.visible_when_disabled = true + automation_science_pack_technology.research_trigger = nil + automation_science_pack_technology.unit = { + count = 1, + ingredients = {}, + time = 1 + } -local electronics_technology = data.raw.technology["electronics"] -electronics_technology.prerequisites = { "copper-processing" } -electronics_technology.research_trigger = nil -electronics_technology.unit = { - count = 50, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 15 -} + if not mods["aai-industry"] then + local electronics_technology = data.raw.technology["electronics"] + electronics_technology.prerequisites = { "copper-processing" } -local steam_power_technology = data.raw.technology["steam-power"] -steam_power_technology.prerequisites = { "iron-processing" } -steam_power_technology.research_trigger = nil -steam_power_technology.unit = { - count = 50, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 } - }, - time = 15 -} + local steam_power_technology = data.raw.technology["steam-power"] + steam_power_technology.prerequisites = { "iron-processing" } + end -local automation_technology = data.raw.technology["automation"] -automation_technology.ignore_tech_cost_multiplier = false + local automation_technology = data.raw.technology["automation"] + automation_technology.ignore_tech_cost_multiplier = false -local logistics_technology = data.raw.technology["logistics"] -table.insert(logistics_technology.effects, { - type = "unlock-recipe", - recipe = "transport-belt" -}) + local logistics_technology = data.raw.technology["logistics"] + table.insert(logistics_technology.effects, { + type = "unlock-recipe", + recipe = "transport-belt" + }) -local landfill_technology = data.raw.technology["landfill"] -landfill_technology.prerequisites = { "burner-automation" } -landfill_technology.unit = { - count = 50, - ingredients = { { "wood-science-pack", 1 } }, - time = 15 -} + local landfill_technology = data.raw.technology["landfill"] + landfill_technology.prerequisites = { "burner-automation" } + landfill_technology.unit = { + count = 50, + ingredients = { { "wood-science-pack", 1 } }, + time = 15 + } -local robots_speed_technology_1 = data.raw.technology["worker-robots-speed-1"] -robots_speed_technology_1.prerequisites = { "provisional-rocketry", "basic-construction-robotics-gold" } -robots_speed_technology_1.unit = { - count = 100, - ingredients = { { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }, - time = 15 -} + local robots_speed_technology_1 = data.raw.technology["worker-robots-speed-1"] + robots_speed_technology_1.prerequisites = { "provisional-rocketry", "basic-construction-robotics-gold" } + robots_speed_technology_1.unit = { + count = 100, + ingredients = { { "wood-science-pack", 1 }, { "steam-science-pack", 1 } }, + time = 15 + } -local robots_speed_technology_2 = data.raw.technology["worker-robots-speed-2"] -robots_speed_technology_2.prerequisites = { - "worker-robots-speed-1", - "logistic-science-pack" -} -robots_speed_technology_2.unit = { - count = 100, - ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } }, - time = 30 -} + local robots_speed_technology_2 = data.raw.technology["worker-robots-speed-2"] + robots_speed_technology_2.prerequisites = { + "worker-robots-speed-1", + "logistic-science-pack" + } + robots_speed_technology_2.unit = { + count = 100, + ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } }, + time = 30 + } -local robots_speed_technology_3 = data.raw.technology["worker-robots-speed-3"] -robots_speed_technology_3.prerequisites = { "worker-robots-speed-2", "chemical-science-pack" } -robots_speed_technology_3.unit = { - count = 150, - ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 } }, - time = 30 -} + local robots_speed_technology_3 = data.raw.technology["worker-robots-speed-3"] + robots_speed_technology_3.prerequisites = { "robotics", "chemical-science-pack" } + robots_speed_technology_3.unit = { + count = 150, + ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 } }, + time = 30 + } -local robots_speed_technology_4 = data.raw.technology["worker-robots-speed-4"] -robots_speed_technology_4.prerequisites = { "worker-robots-speed-3", "utility-science-pack" } -robots_speed_technology_4.unit.ingredients = { - { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "utility-science-pack", 1 } -} + local robots_speed_technology_4 = data.raw.technology["worker-robots-speed-4"] + robots_speed_technology_4.prerequisites = { "worker-robots-speed-3", "utility-science-pack" } + robots_speed_technology_4.unit.ingredients = { + { "automation-science-pack", 1 }, + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "utility-science-pack", 1 } + } -local physical_damage_technology_1 = data.raw.technology["physical-projectile-damage-1"] -physical_damage_technology_1.prerequisites = { "basic-gun-turret" } -physical_damage_technology_1.unit.ingredients = { { "wood-science-pack", 1 } } -table.insert(physical_damage_technology_1.effects, { - type = "turret-attack", - turret_id = "basic-gun-turret", - modifier = 0.2 -}) + local physical_damage_technology_1 = data.raw.technology["physical-projectile-damage-1"] + physical_damage_technology_1.prerequisites = { "basic-gun-turret" } + physical_damage_technology_1.unit.ingredients = { { "wood-science-pack", 1 } } + table.insert(physical_damage_technology_1.effects, { + type = "turret-attack", + turret_id = "basic-gun-turret", + modifier = 0.2 + }) -local weapon_speed_technology_1 = data.raw.technology["weapon-shooting-speed-1"] -weapon_speed_technology_1.prerequisites = table.deepcopy(physical_damage_technology_1.prerequisites) -weapon_speed_technology_1.unit.ingredients = table.deepcopy(physical_damage_technology_1.unit.ingredients) + local weapon_speed_technology_1 = data.raw.technology["weapon-shooting-speed-1"] + weapon_speed_technology_1.prerequisites = table.deepcopy(physical_damage_technology_1.prerequisites) + weapon_speed_technology_1.unit.ingredients = table.deepcopy(physical_damage_technology_1.unit.ingredients) -local physical_damage_technology_2 = data.raw.technology["physical-projectile-damage-2"] -physical_damage_technology_2.prerequisites = { "physical-projectile-damage-1", "steam-science-pack" } -physical_damage_technology_2.unit.ingredients = { { "wood-science-pack", 1 }, { "steam-science-pack", 1 } } -table.insert(physical_damage_technology_2.effects, { - type = "turret-attack", - turret_id = "basic-gun-turret", - modifier = 0.2 -}) + local physical_damage_technology_2 = data.raw.technology["physical-projectile-damage-2"] + physical_damage_technology_2.prerequisites = { "physical-projectile-damage-1", "steam-science-pack" } + physical_damage_technology_2.unit.ingredients = { { "wood-science-pack", 1 }, { "steam-science-pack", 1 } } + table.insert(physical_damage_technology_2.effects, { + type = "turret-attack", + turret_id = "basic-gun-turret", + modifier = 0.2 + }) -local weapon_speed_technology_2 = data.raw.technology["weapon-shooting-speed-2"] -weapon_speed_technology_2.prerequisites = { "weapon-shooting-speed-1", "steam-science-pack" } -weapon_speed_technology_2.unit.ingredients = table.deepcopy(physical_damage_technology_2.unit.ingredients) + local weapon_speed_technology_2 = data.raw.technology["weapon-shooting-speed-2"] + weapon_speed_technology_2.prerequisites = { "weapon-shooting-speed-1", "steam-science-pack" } + weapon_speed_technology_2.unit.ingredients = table.deepcopy(physical_damage_technology_2.unit.ingredients) -local physical_damage_technology_3 = data.raw.technology["physical-projectile-damage-3"] -physical_damage_technology_3.prerequisites = { "physical-projectile-damage-2", "logistic-science-pack" } -physical_damage_technology_3.unit.ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } } -table.insert(physical_damage_technology_3.effects, { - type = "turret-attack", - turret_id = "basic-gun-turret", - modifier = 0.3 -}) + local physical_damage_technology_3 = data.raw.technology["physical-projectile-damage-3"] + physical_damage_technology_3.prerequisites = { "military-2", "logistic-science-pack" } + physical_damage_technology_3.unit.ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } } + physical_damage_technology_3.upgrade = false + table.insert(physical_damage_technology_3.effects, { + type = "turret-attack", + turret_id = "basic-gun-turret", + modifier = 0.3 + }) -local weapon_speed_technology_3 = data.raw.technology["weapon-shooting-speed-3"] -weapon_speed_technology_3.prerequisites = { "weapon-shooting-speed-2", "logistic-science-pack" } -weapon_speed_technology_3.unit.ingredients = table.deepcopy(physical_damage_technology_3.unit.ingredients) + local weapon_speed_technology_3 = data.raw.technology["weapon-shooting-speed-3"] + weapon_speed_technology_3.prerequisites = { "military-2", "logistic-science-pack" } + weapon_speed_technology_3.unit.ingredients = table.deepcopy(physical_damage_technology_3.unit.ingredients) + weapon_speed_technology_3.upgrade = false -local physical_damage_technology_4 = data.raw.technology["physical-projectile-damage-4"] -physical_damage_technology_4.prerequisites = { "physical-projectile-damage-3", "military-science-pack" } -table.insert(physical_damage_technology_4.effects, { - type = "turret-attack", - turret_id = "basic-gun-turret", - modifier = 0.3 -}) + local physical_damage_technology_4 = data.raw.technology["physical-projectile-damage-4"] + physical_damage_technology_4.prerequisites = { "physical-projectile-damage-3", "military-science-pack" } + table.insert(physical_damage_technology_4.effects, { + type = "turret-attack", + turret_id = "basic-gun-turret", + modifier = 0.3 + }) -local weapon_speed_technology_4 = data.raw.technology["weapon-shooting-speed-4"] -weapon_speed_technology_4.prerequisites = { "weapon-shooting-speed-3", "military-science-pack" } + local weapon_speed_technology_4 = data.raw.technology["weapon-shooting-speed-4"] + weapon_speed_technology_4.prerequisites = { "weapon-shooting-speed-3", "military-science-pack" } -local production_science_pack_technology = Technology:new("production-science-pack") -production_science_pack_technology:replacePrerequisite("advanced-material-processing-2", "space-platform-thruster") -production_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack", "space-science-pack" }) + local production_science_pack_technology = Technology:new("production-science-pack") + production_science_pack_technology:replacePrerequisite("advanced-material-processing-2", "space-platform-thruster") + production_science_pack_technology:addIngredients({ "space-science-pack" }) + if settings.startup["lignumis-technology-progression"].value then + production_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) + end -local utility_science_pack_technology = Technology:new("utility-science-pack") -utility_science_pack_technology:setPrerequisites({ "space-platform-thruster" }) -utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack", "space-science-pack" }) + local utility_science_pack_technology = Technology:new("utility-science-pack") + utility_science_pack_technology:setPrerequisites({ "space-platform-thruster" }) + utility_science_pack_technology:addIngredients({ "space-science-pack" }) + if settings.startup["lignumis-technology-progression"].value then + utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) + end +end if not mods["planet-muluna"] then -- Muluna does the same Technology:new("logistic-robotics"):addRecipe("requester-chest") diff --git a/lignumis/scripts/init-new.lua b/lignumis/scripts/init-new.lua index efe1a07..1acc2fb 100644 --- a/lignumis/scripts/init-new.lua +++ b/lignumis/scripts/init-new.lua @@ -62,6 +62,7 @@ end InitNew.on_init = function() if game.tick > 0 then return end + if script.active_mods["planet-picker"] or script.active_mods["any-planet-start"] then return end init_intro() init_space_locations() diff --git a/lignumis/scripts/init.lua b/lignumis/scripts/init.lua index 54e8f15..0a5715f 100644 --- a/lignumis/scripts/init.lua +++ b/lignumis/scripts/init.lua @@ -37,6 +37,7 @@ end -- Initialize the freeplay scenario local function init_freeplay(event) + if script.active_mods["planet-picker"] or script.active_mods["any-planet-start"] then return end if storage.crashed_ship_lignumis then return end local player = game.get_player(event.player_index) @@ -63,7 +64,9 @@ local function init_freeplay(event) table.deepcopy(storage.crashed_ship_parts)) util.remove_safe(player, storage.crashed_ship_items) util.remove_safe(player, storage.crashed_debris_items) - player.character.get_main_inventory().sort_and_merge() + if player.character then + player.character.get_main_inventory().sort_and_merge() + end storage.crash_site_cutscene_active = true crash_site.create_cutscene(player, { -5, -4 }) @@ -85,9 +88,20 @@ end -- Watch Nauvis being visited for the first time Init.events[defines.events.on_player_changed_surface] = function(event) local player = game.get_player(event.player_index) + + if player.controller_type ~= defines.controllers.character then return end + if player and player.surface.name == "nauvis" then storage.nauvis_visited = true end + + if player and player.surface.name ~= "lignumis" and player.force then + local automation = player.force.technologies["automation-science-pack"] + if not automation.researched then + automation.enabled = true + automation.researched = true + end + end end diff --git a/lignumis/scripts/wooden-rocket-silo.lua b/lignumis/scripts/wooden-rocket-silo.lua index 1d0f6bd..0693d13 100644 --- a/lignumis/scripts/wooden-rocket-silo.lua +++ b/lignumis/scripts/wooden-rocket-silo.lua @@ -15,11 +15,16 @@ local function build_gui(player, rocket_silo) local launch_button = { type = "button", name = "provisional-rocket-silo-launch-button", caption = { "lignumis.provisional-rocket-silo-button" } } local inventory = player.get_main_inventory() - launch_button.enabled = inventory.is_empty() - if not launch_button.enabled then - launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip" } + local is_inventory_empty = inventory.is_empty() + local is_nauvis_researched = player.force.technologies["planet-discovery-nauvis"].researched + launch_button.enabled = is_inventory_empty and is_nauvis_researched + if not is_inventory_empty then + launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip-inventory" } + elseif not is_nauvis_researched then + launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip-nauvis" } end + storage.rocket_silo_guis = storage.rocket_silo_guis or {} storage.rocket_silo_guis[player.index] = { fake_silo = rocket_silo, diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 3ecebc1..71cd595 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -13,16 +13,51 @@ data:extend({ default_value = true, order = "b" }, + { + type = "bool-setting", + name = "lignumis-ammo-progression", + setting_type = "startup", + default_value = true, + order = "c" + }, + { + type = "bool-setting", + name = "lignumis-technology-progression", + setting_type = "startup", + default_value = true, + order = "d" + }, + { + type = "bool-setting", + name = "lignumis-basic-circuit-board", + setting_type = "startup", + default_value = false, + order = "e" + }, + { + type = "bool-setting", + name = "lignumis-circuit-progression", + setting_type = "startup", + default_value = false, + order = "f" + } }) -if not mods["wood-military"] then - data:extend({ - { - type = "bool-setting", - name = "lignumis-ammo-progression", - setting_type = "startup", - default_value = true, - order = "c" - } - }) +if mods["aai-industry"] then + data.raw["bool-setting"]["lignumis-inserter-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-inserter-progression"].hidden = true +end + +if mods["wood-military"] then + data.raw["bool-setting"]["lignumis-ammo-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-ammo-progression"].hidden = true +end + +if mods["planet-picker"] or mods["any-planet-start"] then + data.raw["bool-setting"]["lignumis-belt-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-belt-progression"].hidden = true + data.raw["bool-setting"]["lignumis-inserter-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-inserter-progression"].hidden = true + data.raw["bool-setting"]["lignumis-ammo-progression"].forced_value = false + data.raw["bool-setting"]["lignumis-ammo-progression"].hidden = true end diff --git a/lignumis/sound/ambient/forest-ambience.ogg b/lignumis/sound/ambient/forest-ambience.ogg deleted file mode 100644 index 18d0262..0000000 Binary files a/lignumis/sound/ambient/forest-ambience.ogg and /dev/null differ diff --git a/lignumis/sound/music/lignumis-1.ogg b/lignumis/sound/music/lignumis-1.ogg deleted file mode 100644 index 0b2955d..0000000 Binary files a/lignumis/sound/music/lignumis-1.ogg and /dev/null differ diff --git a/lignumis/sound/music/lignumis-2.ogg b/lignumis/sound/music/lignumis-2.ogg deleted file mode 100644 index 1765b14..0000000 Binary files a/lignumis/sound/music/lignumis-2.ogg and /dev/null differ diff --git a/lignumis/sound/music/lignumis-3.ogg b/lignumis/sound/music/lignumis-3.ogg deleted file mode 100644 index c280ddf..0000000 Binary files a/lignumis/sound/music/lignumis-3.ogg and /dev/null differ diff --git a/lignumis/sound/music/lignumis-4.ogg b/lignumis/sound/music/lignumis-4.ogg deleted file mode 100644 index 8991623..0000000 Binary files a/lignumis/sound/music/lignumis-4.ogg and /dev/null differ diff --git a/lignumis/sound/music/lignumis-5.ogg b/lignumis/sound/music/lignumis-5.ogg deleted file mode 100644 index 8f69d7b..0000000 Binary files a/lignumis/sound/music/lignumis-5.ogg and /dev/null differ diff --git a/sources/.$tech tree.drawio.bkp b/sources/.$tech tree.drawio.bkp deleted file mode 100644 index ed7e5ad..0000000 --- a/sources/.$tech tree.drawio.bkp +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sources/empty-quality-catalyst-slot.afphoto b/sources/empty-quality-catalyst-slot.afphoto deleted file mode 100644 index 47742f9..0000000 Binary files a/sources/empty-quality-catalyst-slot.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-copper-remnants.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-copper-remnants.afphoto deleted file mode 100644 index f1e2309..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-copper-remnants.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-copper-working.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-copper-working.afphoto deleted file mode 100644 index 74d3226..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-copper-working.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-copper.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-copper.afphoto deleted file mode 100644 index 508c9e6..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-copper.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-gold-remnants.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-gold-remnants.afphoto deleted file mode 100644 index 4c45c0d..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-gold-remnants.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-gold-working.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-gold-working.afphoto deleted file mode 100644 index d5d10df..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-gold-working.afphoto and /dev/null differ diff --git a/sources/entity/basic-construction-robot/basic-construction-robot-gold.afphoto b/sources/entity/basic-construction-robot/basic-construction-robot-gold.afphoto deleted file mode 100644 index 0ee5c71..0000000 Binary files a/sources/entity/basic-construction-robot/basic-construction-robot-gold.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto deleted file mode 100644 index bbdc39b..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-raising.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-raising.afphoto deleted file mode 100644 index 5ab20dd..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-raising.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-1.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-1.afphoto deleted file mode 100644 index a079bc1..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-1.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-2.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-2.afphoto deleted file mode 100644 index a0f49ca..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-2.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-3.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-3.afphoto deleted file mode 100644 index db9d3aa..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-3.afphoto and /dev/null differ diff --git a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-4.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-4.afphoto deleted file mode 100644 index 17c8ae9..0000000 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-4.afphoto and /dev/null differ diff --git a/sources/entity/basic-radar.afphoto b/sources/entity/basic-radar.afphoto deleted file mode 100644 index ba218b6..0000000 Binary files a/sources/entity/basic-radar.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto deleted file mode 100644 index 46bfc42..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto deleted file mode 100644 index 8bae083..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto deleted file mode 100644 index 05fc5bd..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto deleted file mode 100644 index a17746b..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto deleted file mode 100644 index 6fb0a23..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto deleted file mode 100644 index 53176f9..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto deleted file mode 100644 index 937c2d2..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto deleted file mode 100644 index 8ce55b6..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto deleted file mode 100644 index e0c442d..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto deleted file mode 100644 index c296939..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto deleted file mode 100644 index 7386a5e..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto deleted file mode 100644 index 8599507..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto deleted file mode 100644 index 98b8aec..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto deleted file mode 100644 index a82c368..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto deleted file mode 100644 index 6144d37..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto and /dev/null differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto deleted file mode 100644 index 9489c35..0000000 Binary files a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto and /dev/null differ diff --git a/sources/entity/burner-assembling-machine/burner-assembling-machine-remnants.afphoto b/sources/entity/burner-assembling-machine/burner-assembling-machine-remnants.afphoto deleted file mode 100644 index c383e6a..0000000 Binary files a/sources/entity/burner-assembling-machine/burner-assembling-machine-remnants.afphoto and /dev/null differ diff --git a/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto b/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto deleted file mode 100644 index ac8b350..0000000 Binary files a/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto and /dev/null differ diff --git a/sources/entity/burner-inserter/burner-inserter-hand-base.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-base.afphoto deleted file mode 100644 index 0d59d16..0000000 Binary files a/sources/entity/burner-inserter/burner-inserter-hand-base.afphoto and /dev/null differ diff --git a/sources/entity/burner-inserter/burner-inserter-hand-closed.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-closed.afphoto deleted file mode 100644 index 60300d4..0000000 Binary files a/sources/entity/burner-inserter/burner-inserter-hand-closed.afphoto and /dev/null differ diff --git a/sources/entity/burner-inserter/burner-inserter-hand-open.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-open.afphoto deleted file mode 100644 index 530f070..0000000 Binary files a/sources/entity/burner-inserter/burner-inserter-hand-open.afphoto and /dev/null differ diff --git a/sources/entity/burner-inserter/burner-inserter-platform.afphoto b/sources/entity/burner-inserter/burner-inserter-platform.afphoto deleted file mode 100644 index 69d7e12..0000000 Binary files a/sources/entity/burner-inserter/burner-inserter-platform.afphoto and /dev/null differ diff --git a/sources/entity/burner-inserter/burner-inserter-remnants.afphoto b/sources/entity/burner-inserter/burner-inserter-remnants.afphoto deleted file mode 100644 index 4d1c37a..0000000 Binary files a/sources/entity/burner-inserter/burner-inserter-remnants.afphoto and /dev/null differ diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto deleted file mode 100644 index 7c4b714..0000000 Binary files a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto and /dev/null differ diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto deleted file mode 100644 index c9be707..0000000 Binary files a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto and /dev/null differ diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto deleted file mode 100644 index 2d57991..0000000 Binary files a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto and /dev/null differ diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto deleted file mode 100644 index ff52a0c..0000000 Binary files a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto and /dev/null differ diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto deleted file mode 100644 index 0fb7989..0000000 Binary files a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto and /dev/null differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto deleted file mode 100644 index 79f5359..0000000 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto and /dev/null differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto deleted file mode 100644 index 2295da5..0000000 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto and /dev/null differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto deleted file mode 100644 index 3ac6e24..0000000 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto and /dev/null differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto deleted file mode 100644 index d8a8fd4..0000000 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto and /dev/null differ diff --git a/sources/entity/gold-patch.png b/sources/entity/gold-patch.png deleted file mode 100644 index 296e521..0000000 Binary files a/sources/entity/gold-patch.png and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-corner-down-left.afphoto b/sources/entity/gold-pipe/gold-pipe-corner-down-left.afphoto deleted file mode 100644 index 56d1016..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-down-left.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-corner-down-right.afphoto b/sources/entity/gold-pipe/gold-pipe-corner-down-right.afphoto deleted file mode 100644 index 8198cbe..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-down-right.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-corner-up-left.afphoto b/sources/entity/gold-pipe/gold-pipe-corner-up-left.afphoto deleted file mode 100644 index a425027..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-up-left.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-corner-up-right.afphoto b/sources/entity/gold-pipe/gold-pipe-corner-up-right.afphoto deleted file mode 100644 index 5a00e01..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-up-right.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto deleted file mode 100644 index 623402e..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto deleted file mode 100644 index 3aca06b..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto deleted file mode 100644 index 78a8f23..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto deleted file mode 100644 index 1046839..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-cross.afphoto b/sources/entity/gold-pipe/gold-pipe-cross.afphoto deleted file mode 100644 index 5f3e8a8..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-cross.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto deleted file mode 100644 index 152d706..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto deleted file mode 100644 index e93d51e..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto deleted file mode 100644 index ed8ba60..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto deleted file mode 100644 index 5edc12f..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-remnants.afphoto b/sources/entity/gold-pipe/gold-pipe-remnants.afphoto deleted file mode 100644 index 3b9c248..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-remnants.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-horizontal-window.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-horizontal-window.afphoto deleted file mode 100644 index 736c1d4..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-horizontal-window.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto deleted file mode 100644 index 09a5e1f..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-vertical-single.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-vertical-single.afphoto deleted file mode 100644 index 7f11cba..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical-single.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-vertical-window.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-vertical-window.afphoto deleted file mode 100644 index 379e21b..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical-window.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto deleted file mode 100644 index b0caad4..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-down.afphoto b/sources/entity/gold-pipe/gold-pipe-t-down.afphoto deleted file mode 100644 index 2271491..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-t-down.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-left.afphoto b/sources/entity/gold-pipe/gold-pipe-t-left.afphoto deleted file mode 100644 index 7bb3ca2..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-t-left.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-right.afphoto b/sources/entity/gold-pipe/gold-pipe-t-right.afphoto deleted file mode 100644 index 31f362b..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-t-right.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-up.afphoto b/sources/entity/gold-pipe/gold-pipe-t-up.afphoto deleted file mode 100644 index 97a150f..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-t-up.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-to-ground-down.afphoto b/sources/entity/gold-pipe/gold-pipe-to-ground-down.afphoto deleted file mode 100644 index f4c2d27..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-down.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-to-ground-left.afphoto b/sources/entity/gold-pipe/gold-pipe-to-ground-left.afphoto deleted file mode 100644 index 218dba0..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-left.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-to-ground-remnants.afphoto b/sources/entity/gold-pipe/gold-pipe-to-ground-remnants.afphoto deleted file mode 100644 index bf07fc4..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-remnants.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-to-ground-right.afphoto b/sources/entity/gold-pipe/gold-pipe-to-ground-right.afphoto deleted file mode 100644 index e99f51b..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-right.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/gold-pipe-to-ground-up.afphoto b/sources/entity/gold-pipe/gold-pipe-to-ground-up.afphoto deleted file mode 100644 index cfcf3c1..0000000 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-up.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto deleted file mode 100644 index 1becdbd..0000000 Binary files a/sources/entity/gold-pipe/machine-gold-pipe-E.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto deleted file mode 100644 index 5a73450..0000000 Binary files a/sources/entity/gold-pipe/machine-gold-pipe-N.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto deleted file mode 100644 index 1d88b69..0000000 Binary files a/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto and /dev/null differ diff --git a/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto b/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto deleted file mode 100644 index d135dbc..0000000 Binary files a/sources/entity/gold-pipe/machine-gold-pipe-W.afphoto and /dev/null differ diff --git a/sources/entity/gold-storage-tank/gold-storage-tank-remnants.afphoto b/sources/entity/gold-storage-tank/gold-storage-tank-remnants.afphoto deleted file mode 100644 index 9576ec8..0000000 Binary files a/sources/entity/gold-storage-tank/gold-storage-tank-remnants.afphoto and /dev/null differ diff --git a/sources/entity/gold-storage-tank/gold-storage-tank-window-background.png b/sources/entity/gold-storage-tank/gold-storage-tank-window-background.png deleted file mode 100644 index 202cfc9..0000000 Binary files a/sources/entity/gold-storage-tank/gold-storage-tank-window-background.png and /dev/null differ diff --git a/sources/entity/gold-storage-tank/gold-storage-tank.afphoto b/sources/entity/gold-storage-tank/gold-storage-tank.afphoto deleted file mode 100644 index c1e6465..0000000 Binary files a/sources/entity/gold-storage-tank/gold-storage-tank.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-01.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-01.afphoto deleted file mode 100644 index ed99daf..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-01.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-02.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-02.afphoto deleted file mode 100644 index 0696358..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-02.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-03.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-03.afphoto deleted file mode 100644 index 80bee16..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-03.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-04.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-04.afphoto deleted file mode 100644 index f82f175..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-04.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto deleted file mode 100644 index 7d9989d..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-06.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-06.afphoto deleted file mode 100644 index 86b36cb..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-06.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-07.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-07.afphoto deleted file mode 100644 index 64da69d..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-07.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-08.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-08.afphoto deleted file mode 100644 index c134141..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-08.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-09.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-09.afphoto deleted file mode 100644 index 4e9aed4..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-09.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-10.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-10.afphoto deleted file mode 100644 index 07e9d55..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-10.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-11.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-11.afphoto deleted file mode 100644 index 4673431..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-11.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-12.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-12.afphoto deleted file mode 100644 index 0771293..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-12.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-13.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-13.afphoto deleted file mode 100644 index 0992ea9..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-13.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-14.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-14.afphoto deleted file mode 100644 index 080edd2..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-14.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-15.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-15.afphoto deleted file mode 100644 index 7c91d3c..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-15.afphoto and /dev/null differ diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-16.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-16.afphoto deleted file mode 100644 index c335b22..0000000 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-16.afphoto and /dev/null differ diff --git a/sources/entity/steam-assembling-machine/steam-assembling-machine-remnants.afphoto b/sources/entity/steam-assembling-machine/steam-assembling-machine-remnants.afphoto deleted file mode 100644 index 8642912..0000000 Binary files a/sources/entity/steam-assembling-machine/steam-assembling-machine-remnants.afphoto and /dev/null differ diff --git a/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto b/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto deleted file mode 100644 index cd7326f..0000000 Binary files a/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto and /dev/null differ diff --git a/sources/entity/stone-furnace/stone-furnace-remnants.afphoto b/sources/entity/stone-furnace/stone-furnace-remnants.afphoto deleted file mode 100644 index bb1ba83..0000000 Binary files a/sources/entity/stone-furnace/stone-furnace-remnants.afphoto and /dev/null differ diff --git a/sources/entity/stone-furnace/stone-furnace.afphoto b/sources/entity/stone-furnace/stone-furnace.afphoto deleted file mode 100644 index ed72794..0000000 Binary files a/sources/entity/stone-furnace/stone-furnace.afphoto and /dev/null differ diff --git a/sources/entity/wood-lab/wood-lab-light.afphoto b/sources/entity/wood-lab/wood-lab-light.afphoto deleted file mode 100644 index e0d2010..0000000 Binary files a/sources/entity/wood-lab/wood-lab-light.afphoto and /dev/null differ diff --git a/sources/entity/wood-lab/wood-lab.afphoto b/sources/entity/wood-lab/wood-lab.afphoto deleted file mode 100644 index f8ee4be..0000000 Binary files a/sources/entity/wood-lab/wood-lab.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto b/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto deleted file mode 100644 index 2402e06..0000000 Binary files a/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-back.afphoto b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-back.afphoto deleted file mode 100644 index c0a032b..0000000 Binary files a/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-back.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-right.afphoto b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-right.afphoto deleted file mode 100644 index 410031c..0000000 Binary files a/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-right.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/13-rocket-silo-arms-front.afphoto b/sources/entity/wooden-rocket-silo/13-rocket-silo-arms-front.afphoto deleted file mode 100644 index d48946f..0000000 Binary files a/sources/entity/wooden-rocket-silo/13-rocket-silo-arms-front.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/14-rocket-silo-front.afphoto b/sources/entity/wooden-rocket-silo/14-rocket-silo-front.afphoto deleted file mode 100644 index 37a3fb9..0000000 Binary files a/sources/entity/wooden-rocket-silo/14-rocket-silo-front.afphoto and /dev/null differ diff --git a/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto b/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto deleted file mode 100644 index cdd5034..0000000 Binary files a/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto and /dev/null differ diff --git a/sources/equipment/basic-personal-roboport-equipment-copper.afphoto b/sources/equipment/basic-personal-roboport-equipment-copper.afphoto deleted file mode 100644 index 9e0be37..0000000 Binary files a/sources/equipment/basic-personal-roboport-equipment-copper.afphoto and /dev/null differ diff --git a/sources/equipment/basic-personal-roboport-equipment-gold.afphoto b/sources/equipment/basic-personal-roboport-equipment-gold.afphoto deleted file mode 100644 index f3e1502..0000000 Binary files a/sources/equipment/basic-personal-roboport-equipment-gold.afphoto and /dev/null differ diff --git a/sources/equipment/portable-engine-copper.afphoto b/sources/equipment/portable-engine-copper.afphoto deleted file mode 100644 index 5f2bb5d..0000000 Binary files a/sources/equipment/portable-engine-copper.afphoto and /dev/null differ diff --git a/sources/equipment/portable-engine-gold.afphoto b/sources/equipment/portable-engine-gold.afphoto deleted file mode 100644 index b1eb1de..0000000 Binary files a/sources/equipment/portable-engine-gold.afphoto and /dev/null differ diff --git a/sources/icons/active-noise-cancelling.afphoto b/sources/icons/active-noise-cancelling.afphoto deleted file mode 100644 index fcbfabb..0000000 Binary files a/sources/icons/active-noise-cancelling.afphoto and /dev/null differ diff --git a/sources/icons/basic-construction-robot-copper.afphoto b/sources/icons/basic-construction-robot-copper.afphoto deleted file mode 100644 index 4c935b7..0000000 Binary files a/sources/icons/basic-construction-robot-copper.afphoto and /dev/null differ diff --git a/sources/icons/basic-construction-robot-gold.afphoto b/sources/icons/basic-construction-robot-gold.afphoto deleted file mode 100644 index 4a24f87..0000000 Binary files a/sources/icons/basic-construction-robot-gold.afphoto and /dev/null differ diff --git a/sources/icons/basic-gun-turret.afphoto b/sources/icons/basic-gun-turret.afphoto deleted file mode 100644 index 80e4891..0000000 Binary files a/sources/icons/basic-gun-turret.afphoto and /dev/null differ diff --git a/sources/icons/basic-personal-roboport-equipment-copper.afphoto b/sources/icons/basic-personal-roboport-equipment-copper.afphoto deleted file mode 100644 index de2efbd..0000000 Binary files a/sources/icons/basic-personal-roboport-equipment-copper.afphoto and /dev/null differ diff --git a/sources/icons/basic-personal-roboport-equipment-gold.afphoto b/sources/icons/basic-personal-roboport-equipment-gold.afphoto deleted file mode 100644 index ad9c44d..0000000 Binary files a/sources/icons/basic-personal-roboport-equipment-gold.afphoto and /dev/null differ diff --git a/sources/icons/basic-radar.afphoto b/sources/icons/basic-radar.afphoto deleted file mode 100644 index e17965f..0000000 Binary files a/sources/icons/basic-radar.afphoto and /dev/null differ diff --git a/sources/icons/basic-repair-pack.afphoto b/sources/icons/basic-repair-pack.afphoto deleted file mode 100644 index 768ad73..0000000 Binary files a/sources/icons/basic-repair-pack.afphoto and /dev/null differ diff --git a/sources/icons/burner-agricultural-tower.afphoto b/sources/icons/burner-agricultural-tower.afphoto deleted file mode 100644 index 2f7772b..0000000 Binary files a/sources/icons/burner-agricultural-tower.afphoto and /dev/null differ diff --git a/sources/icons/burner-assembling-machine.afphoto b/sources/icons/burner-assembling-machine.afphoto deleted file mode 100644 index 7301ac6..0000000 Binary files a/sources/icons/burner-assembling-machine.afphoto and /dev/null differ diff --git a/sources/icons/burner-inserter.afphoto b/sources/icons/burner-inserter.afphoto deleted file mode 100644 index 3af976c..0000000 Binary files a/sources/icons/burner-inserter.afphoto and /dev/null differ diff --git a/sources/icons/burner-long-handed-inserter.afphoto b/sources/icons/burner-long-handed-inserter.afphoto deleted file mode 100644 index 8be9253..0000000 Binary files a/sources/icons/burner-long-handed-inserter.afphoto and /dev/null differ diff --git a/sources/icons/burner-mining-drill.afphoto b/sources/icons/burner-mining-drill.afphoto deleted file mode 100644 index a856d93..0000000 Binary files a/sources/icons/burner-mining-drill.afphoto and /dev/null differ diff --git a/sources/icons/casting-gold.afphoto b/sources/icons/casting-gold.afphoto deleted file mode 100644 index 536c887..0000000 Binary files a/sources/icons/casting-gold.afphoto and /dev/null differ diff --git a/sources/icons/cupriavidus-necator-1.afphoto b/sources/icons/cupriavidus-necator-1.afphoto deleted file mode 100644 index 49b61d8..0000000 Binary files a/sources/icons/cupriavidus-necator-1.afphoto and /dev/null differ diff --git a/sources/icons/cupriavidus-necator-2.afphoto b/sources/icons/cupriavidus-necator-2.afphoto deleted file mode 100644 index 1406bfe..0000000 Binary files a/sources/icons/cupriavidus-necator-2.afphoto and /dev/null differ diff --git a/sources/icons/cupriavidus-necator-3.afphoto b/sources/icons/cupriavidus-necator-3.afphoto deleted file mode 100644 index 3da0f07..0000000 Binary files a/sources/icons/cupriavidus-necator-3.afphoto and /dev/null differ diff --git a/sources/icons/dead-cupriavidus-necator-1.afphoto b/sources/icons/dead-cupriavidus-necator-1.afphoto deleted file mode 100644 index 46c27f3..0000000 Binary files a/sources/icons/dead-cupriavidus-necator-1.afphoto and /dev/null differ diff --git a/sources/icons/dead-cupriavidus-necator-2.afphoto b/sources/icons/dead-cupriavidus-necator-2.afphoto deleted file mode 100644 index 140c8e7..0000000 Binary files a/sources/icons/dead-cupriavidus-necator-2.afphoto and /dev/null differ diff --git a/sources/icons/dead-cupriavidus-necator-3.afphoto b/sources/icons/dead-cupriavidus-necator-3.afphoto deleted file mode 100644 index ccbb28c..0000000 Binary files a/sources/icons/dead-cupriavidus-necator-3.afphoto and /dev/null differ diff --git a/sources/icons/gold-bacteria-1.afphoto b/sources/icons/gold-bacteria-1.afphoto deleted file mode 100644 index 9197950..0000000 Binary files a/sources/icons/gold-bacteria-1.afphoto and /dev/null differ diff --git a/sources/icons/gold-bacteria-2.afphoto b/sources/icons/gold-bacteria-2.afphoto deleted file mode 100644 index c6774ed..0000000 Binary files a/sources/icons/gold-bacteria-2.afphoto and /dev/null differ diff --git a/sources/icons/gold-bacteria-3.afphoto b/sources/icons/gold-bacteria-3.afphoto deleted file mode 100644 index 7fbe4fc..0000000 Binary files a/sources/icons/gold-bacteria-3.afphoto and /dev/null differ diff --git a/sources/icons/gold-bacteria.afphoto b/sources/icons/gold-bacteria.afphoto deleted file mode 100644 index 88a77a5..0000000 Binary files a/sources/icons/gold-bacteria.afphoto and /dev/null differ diff --git a/sources/icons/gold-ore-1.png b/sources/icons/gold-ore-1.png deleted file mode 100644 index 3fa7d2f..0000000 Binary files a/sources/icons/gold-ore-1.png and /dev/null differ diff --git a/sources/icons/gold-ore-2.png b/sources/icons/gold-ore-2.png deleted file mode 100644 index ac85aca..0000000 Binary files a/sources/icons/gold-ore-2.png and /dev/null differ diff --git a/sources/icons/gold-ore-3.png b/sources/icons/gold-ore-3.png deleted file mode 100644 index b087c62..0000000 Binary files a/sources/icons/gold-ore-3.png and /dev/null differ diff --git a/sources/icons/gold-ore.png b/sources/icons/gold-ore.png deleted file mode 100644 index 0ea33cd..0000000 Binary files a/sources/icons/gold-ore.png and /dev/null differ diff --git a/sources/icons/gold-patch.png b/sources/icons/gold-patch.png deleted file mode 100644 index 35e4072..0000000 Binary files a/sources/icons/gold-patch.png and /dev/null differ diff --git a/sources/icons/gold-pipe-to-ground.afphoto b/sources/icons/gold-pipe-to-ground.afphoto deleted file mode 100644 index 548ad97..0000000 Binary files a/sources/icons/gold-pipe-to-ground.afphoto and /dev/null differ diff --git a/sources/icons/gold-pipe.afphoto b/sources/icons/gold-pipe.afphoto deleted file mode 100644 index 80c8eda..0000000 Binary files a/sources/icons/gold-pipe.afphoto and /dev/null differ diff --git a/sources/icons/gold-plate.png b/sources/icons/gold-plate.png deleted file mode 100644 index 75ddece..0000000 Binary files a/sources/icons/gold-plate.png and /dev/null differ diff --git a/sources/icons/gold-storage-tank.afphoto b/sources/icons/gold-storage-tank.afphoto deleted file mode 100644 index e5b541a..0000000 Binary files a/sources/icons/gold-storage-tank.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-1.afphoto b/sources/icons/gold-stromatolite-seed-1.afphoto deleted file mode 100644 index 6d46e0e..0000000 Binary files a/sources/icons/gold-stromatolite-seed-1.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-2.afphoto b/sources/icons/gold-stromatolite-seed-2.afphoto deleted file mode 100644 index 197af7d..0000000 Binary files a/sources/icons/gold-stromatolite-seed-2.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-3.afphoto b/sources/icons/gold-stromatolite-seed-3.afphoto deleted file mode 100644 index e30041b..0000000 Binary files a/sources/icons/gold-stromatolite-seed-3.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-4.afphoto b/sources/icons/gold-stromatolite-seed-4.afphoto deleted file mode 100644 index 883de08..0000000 Binary files a/sources/icons/gold-stromatolite-seed-4.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-5.afphoto b/sources/icons/gold-stromatolite-seed-5.afphoto deleted file mode 100644 index af0f2c5..0000000 Binary files a/sources/icons/gold-stromatolite-seed-5.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite-seed-6.afphoto b/sources/icons/gold-stromatolite-seed-6.afphoto deleted file mode 100644 index 37da034..0000000 Binary files a/sources/icons/gold-stromatolite-seed-6.afphoto and /dev/null differ diff --git a/sources/icons/gold-stromatolite.afphoto b/sources/icons/gold-stromatolite.afphoto deleted file mode 100644 index fcd503c..0000000 Binary files a/sources/icons/gold-stromatolite.afphoto and /dev/null differ diff --git a/sources/icons/gold-wire.png b/sources/icons/gold-wire.png deleted file mode 100644 index 47639d8..0000000 Binary files a/sources/icons/gold-wire.png and /dev/null differ diff --git a/sources/icons/hot-gold-plate.afphoto b/sources/icons/hot-gold-plate.afphoto deleted file mode 100644 index 773a506..0000000 Binary files a/sources/icons/hot-gold-plate.afphoto and /dev/null differ diff --git a/sources/icons/lignumis-medium-wriggler-corpse.png b/sources/icons/lignumis-medium-wriggler-corpse.png new file mode 100644 index 0000000..4d78edf Binary files /dev/null and b/sources/icons/lignumis-medium-wriggler-corpse.png differ diff --git a/sources/icons/lignumis-medium-wriggler.png b/sources/icons/lignumis-medium-wriggler.png new file mode 100644 index 0000000..55fd48b Binary files /dev/null and b/sources/icons/lignumis-medium-wriggler.png differ diff --git a/sources/icons/lignumis-small-wriggler-corpse.png b/sources/icons/lignumis-small-wriggler-corpse.png new file mode 100644 index 0000000..532e60d Binary files /dev/null and b/sources/icons/lignumis-small-wriggler-corpse.png differ diff --git a/sources/icons/lignumis-small-wriggler.png b/sources/icons/lignumis-small-wriggler.png new file mode 100644 index 0000000..0337f96 Binary files /dev/null and b/sources/icons/lignumis-small-wriggler.png differ diff --git a/sources/icons/lignumis.afphoto b/sources/icons/lignumis.afphoto deleted file mode 100644 index 43bfeea..0000000 Binary files a/sources/icons/lignumis.afphoto and /dev/null differ diff --git a/sources/icons/lumber-mill.afphoto b/sources/icons/lumber-mill.afphoto deleted file mode 100644 index 24a6ed6..0000000 Binary files a/sources/icons/lumber-mill.afphoto and /dev/null differ diff --git a/sources/icons/molten-gold.afphoto b/sources/icons/molten-gold.afphoto deleted file mode 100644 index f477dfc..0000000 Binary files a/sources/icons/molten-gold.afphoto and /dev/null differ diff --git a/sources/icons/peat.afphoto b/sources/icons/peat.afphoto deleted file mode 100644 index 0d1881e..0000000 Binary files a/sources/icons/peat.afphoto and /dev/null differ diff --git a/sources/icons/provisional-rocket-part.afphoto b/sources/icons/provisional-rocket-part.afphoto deleted file mode 100644 index 1076b02..0000000 Binary files a/sources/icons/provisional-rocket-part.afphoto and /dev/null differ diff --git a/sources/icons/provisional-rocket-silo.afphoto b/sources/icons/provisional-rocket-silo.afphoto deleted file mode 100644 index c038497..0000000 Binary files a/sources/icons/provisional-rocket-silo.afphoto and /dev/null differ diff --git a/sources/icons/quality-gold-catalyst.afphoto b/sources/icons/quality-gold-catalyst.afphoto deleted file mode 100644 index 1e30188..0000000 Binary files a/sources/icons/quality-gold-catalyst.afphoto and /dev/null differ diff --git a/sources/icons/starmap-planet-lignumis.afphoto b/sources/icons/starmap-planet-lignumis.afphoto deleted file mode 100644 index 0a2afc8..0000000 Binary files a/sources/icons/starmap-planet-lignumis.afphoto and /dev/null differ diff --git a/sources/icons/starmap-planet-lignumis_old.afphoto b/sources/icons/starmap-planet-lignumis_old.afphoto deleted file mode 100644 index 22072a6..0000000 Binary files a/sources/icons/starmap-planet-lignumis_old.afphoto and /dev/null differ diff --git a/sources/icons/steam-assembling-machine.afphoto b/sources/icons/steam-assembling-machine.afphoto deleted file mode 100644 index 8ba8f9e..0000000 Binary files a/sources/icons/steam-assembling-machine.afphoto and /dev/null differ diff --git a/sources/icons/steam-assembling-machine_old.afphoto b/sources/icons/steam-assembling-machine_old.afphoto deleted file mode 100644 index a3e7db2..0000000 Binary files a/sources/icons/steam-assembling-machine_old.afphoto and /dev/null differ diff --git a/sources/icons/steam-science-pack.afphoto b/sources/icons/steam-science-pack.afphoto deleted file mode 100644 index 5f100f6..0000000 Binary files a/sources/icons/steam-science-pack.afphoto and /dev/null differ diff --git a/sources/icons/stone-furnace.afphoto b/sources/icons/stone-furnace.afphoto deleted file mode 100644 index c2592e4..0000000 Binary files a/sources/icons/stone-furnace.afphoto and /dev/null differ diff --git a/sources/icons/wood-armor.afphoto b/sources/icons/wood-armor.afphoto deleted file mode 100644 index a002418..0000000 Binary files a/sources/icons/wood-armor.afphoto and /dev/null differ diff --git a/sources/icons/wood-darts-magazine.afphoto b/sources/icons/wood-darts-magazine.afphoto deleted file mode 100644 index 06a35b2..0000000 Binary files a/sources/icons/wood-darts-magazine.afphoto and /dev/null differ diff --git a/sources/icons/wood-lab.afphoto b/sources/icons/wood-lab.afphoto deleted file mode 100644 index cf496ea..0000000 Binary files a/sources/icons/wood-lab.afphoto and /dev/null differ diff --git a/sources/icons/wood-pulp.afphoto b/sources/icons/wood-pulp.afphoto deleted file mode 100644 index 8b2b1dd..0000000 Binary files a/sources/icons/wood-pulp.afphoto and /dev/null differ diff --git a/sources/icons/wood-science-pack.afphoto b/sources/icons/wood-science-pack.afphoto deleted file mode 100644 index 1a85c33..0000000 Binary files a/sources/icons/wood-science-pack.afphoto and /dev/null differ diff --git a/sources/icons/wood-splitter.afphoto b/sources/icons/wood-splitter.afphoto deleted file mode 100644 index 589985b..0000000 Binary files a/sources/icons/wood-splitter.afphoto and /dev/null differ diff --git a/sources/icons/wood-transport-belt.afphoto b/sources/icons/wood-transport-belt.afphoto deleted file mode 100644 index 03d5b56..0000000 Binary files a/sources/icons/wood-transport-belt.afphoto and /dev/null differ diff --git a/sources/icons/wood-underground-belt.afphoto b/sources/icons/wood-underground-belt.afphoto deleted file mode 100644 index 7904f86..0000000 Binary files a/sources/icons/wood-underground-belt.afphoto and /dev/null differ diff --git a/sources/icons/wooden-gear-wheel.afphoto b/sources/icons/wooden-gear-wheel.afphoto deleted file mode 100644 index 2fa77c1..0000000 Binary files a/sources/icons/wooden-gear-wheel.afphoto and /dev/null differ diff --git a/sources/noise-map-icon.afphoto b/sources/noise-map-icon.afphoto deleted file mode 100644 index 7322ec8..0000000 Binary files a/sources/noise-map-icon.afphoto and /dev/null differ diff --git a/sources/orbit-lignumis.afphoto b/sources/orbit-lignumis.afphoto deleted file mode 100644 index fb79f65..0000000 Binary files a/sources/orbit-lignumis.afphoto and /dev/null differ diff --git a/sources/peat.afphoto b/sources/peat.afphoto deleted file mode 100644 index 55b1982..0000000 Binary files a/sources/peat.afphoto and /dev/null differ diff --git a/sources/quality-catalyst-icon-red.afphoto b/sources/quality-catalyst-icon-red.afphoto deleted file mode 100644 index 30852cc..0000000 Binary files a/sources/quality-catalyst-icon-red.afphoto and /dev/null differ diff --git a/sources/tech tree.drawio b/sources/tech tree.drawio deleted file mode 100644 index 6ce64eb..0000000 --- a/sources/tech tree.drawio +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sources/technology/basic-construction-robotics-copper.afphoto b/sources/technology/basic-construction-robotics-copper.afphoto deleted file mode 100644 index 164b487..0000000 Binary files a/sources/technology/basic-construction-robotics-copper.afphoto and /dev/null differ diff --git a/sources/technology/basic-construction-robotics-gold.afphoto b/sources/technology/basic-construction-robotics-gold.afphoto deleted file mode 100644 index e961996..0000000 Binary files a/sources/technology/basic-construction-robotics-gold.afphoto and /dev/null differ diff --git a/sources/technology/basic-gun-turret.afphoto b/sources/technology/basic-gun-turret.afphoto deleted file mode 100644 index 12d312c..0000000 Binary files a/sources/technology/basic-gun-turret.afphoto and /dev/null differ diff --git a/sources/technology/basic-radar.afphoto b/sources/technology/basic-radar.afphoto deleted file mode 100644 index b84fed5..0000000 Binary files a/sources/technology/basic-radar.afphoto and /dev/null differ diff --git a/sources/technology/basic-repair-pack.afphoto b/sources/technology/basic-repair-pack.afphoto deleted file mode 100644 index 4754cbe..0000000 Binary files a/sources/technology/basic-repair-pack.afphoto and /dev/null differ diff --git a/sources/technology/burner-automation.afphoto b/sources/technology/burner-automation.afphoto deleted file mode 100644 index 5c10a58..0000000 Binary files a/sources/technology/burner-automation.afphoto and /dev/null differ diff --git a/sources/technology/gold-fluid-handling.afphoto b/sources/technology/gold-fluid-handling.afphoto deleted file mode 100644 index a805f64..0000000 Binary files a/sources/technology/gold-fluid-handling.afphoto and /dev/null differ diff --git a/sources/technology/lignumis.afphoto b/sources/technology/lignumis.afphoto deleted file mode 100644 index f95ca80..0000000 Binary files a/sources/technology/lignumis.afphoto and /dev/null differ diff --git a/sources/technology/lumber-mill.afphoto b/sources/technology/lumber-mill.afphoto deleted file mode 100644 index 96d8903..0000000 Binary files a/sources/technology/lumber-mill.afphoto and /dev/null differ diff --git a/sources/technology/provisional-rocketry.afphoto b/sources/technology/provisional-rocketry.afphoto deleted file mode 100644 index de49820..0000000 Binary files a/sources/technology/provisional-rocketry.afphoto and /dev/null differ diff --git a/sources/technology/steam-automation.afphoto b/sources/technology/steam-automation.afphoto deleted file mode 100644 index 3cd33fa..0000000 Binary files a/sources/technology/steam-automation.afphoto and /dev/null differ diff --git a/sources/technology/steam-science-pack.afphoto b/sources/technology/steam-science-pack.afphoto deleted file mode 100644 index be83ce5..0000000 Binary files a/sources/technology/steam-science-pack.afphoto and /dev/null differ diff --git a/sources/technology/wood-lab.afphoto b/sources/technology/wood-lab.afphoto deleted file mode 100644 index 959e73e..0000000 Binary files a/sources/technology/wood-lab.afphoto and /dev/null differ diff --git a/sources/technology/wood-science-pack.afphoto b/sources/technology/wood-science-pack.afphoto deleted file mode 100644 index d65f142..0000000 Binary files a/sources/technology/wood-science-pack.afphoto and /dev/null differ diff --git a/sources/terrain/natural-gold-soil.afphoto b/sources/terrain/natural-gold-soil.afphoto deleted file mode 100644 index 64c7f44..0000000 Binary files a/sources/terrain/natural-gold-soil.afphoto and /dev/null differ diff --git a/sources/thumbnail.afphoto b/sources/thumbnail.afphoto deleted file mode 100644 index 89f0573..0000000 Binary files a/sources/thumbnail.afphoto and /dev/null differ