diff --git a/README.md b/README.md index 7c16569..29f707e 100644 --- a/README.md +++ b/README.md @@ -2,107 +2,50 @@ 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). +## Alpha version + +This is a very early version of the mod. It contains the complete idea of the moon from beginning to end but still needs a lot of features and polishing. Also end-game content and a reason to come back are still missing but are planned. + +To not hinder development, I will not be considerate about breaking changes until I switch the status to "Beta". + +If you like to contribute in any way, feel free to contact me. + ## Mod recommendations The following mods can be a great addition for this mod: -#### [Burner Leech Fork](https://mods.factorio.com/mod/Burner-Leech-Fork) - -There will be fewer inserters that need to be fueled manually. - -#### [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. - -#### [Wooden Military](https://mods.factorio.com/mod/wood-military) - -If you want more of it than Lignumis offers, add this mod. It adds ammo for shotguns and there are settings for rockets and artillery shells. - -#### [Wooden Industry](https://mods.factorio.com/mod/wood-industry) - -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) - -For wood on the other planets. - -## 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) -- [Corrundum](https://mods.factorio.com/mod/corrundum) -- [Janus](https://mods.factorio.com/mod/janus) -- [Maraxsis](https://mods.factorio.com/mod/maraxsis) -- [Muluna](https://mods.factorio.com/mod/planet-muluna) -- [Terra Palus](https://mods.factorio.com/mod/terrapalus) -- [Secretas & Frozeta](https://mods.factorio.com/mod/secretas) - -## 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. -First it looks at a whitelist of science packs. If a technology has any of those, it is considered a candidate for adding the science packs. -Then a blacklist for science packs and specific technology names is applied. - -Also, Lignumis adds wood and steam science packs during `data-updates.lua` to all labs' inputs. If your lab is special use the `lab_blacklist` described below. - -These lists are made available in `data.lua` in a global table called `Lignumis` to add compatibility for other mods. - -#### `science_pack_whitelist` - -A technology having any of these science packs as ingredient will get wood and steam science packs added. - -As wood science packs can't be imported before coming back to Lignumis, only advanced Nauvis science packs are added here and exceptions are needed for advanced technologies that are required to upgrade Lignumis to export science packs. - -#### `science_pack_blacklist` - -A technology is skipped if it has any of these as ingredient. - -If you have a planet that only uses its own science packs and must not rely on other science packs to be imported, add your science packs to the blacklist. - -#### `science_blacklist` - -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. - -#### `lab_blacklist` - -Don't touch inputs for labs in this list. - -Lignumis adds wood and steam science packs to all labs' inputs in `data-updates.lua` so modded labs will support them. -If your modded lab is special and it should not support these science packs, use this list or set the inputs in `data-final-fixes.lua`. +- [Burner Leech Fork](https://mods.factorio.com/mod/Burner-Leech-Fork) ## Todo -- Fix pipe graphics on desiccation furnace and quality assembler -- Trees must not die when absorbing noise - - 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 +Sorted by priority + +- Adjust rocket parts recipe +- Add end-game stuff +- Guarantee spawn of gold in starting area +- Fix pipe graphics on desiccation furnace +- Change color of gold soil +- Ban huge rocks with coal from Nauvis +- Increase default moisture bias +- Create proper experience for the transition to Nauvis with a custom UI with launch button (and don't allow taking your inventory) + +Unsorted + +- Integrate [PlanetsLib](https://mods.factorio.com/mod/PlanetsLib) +- Compatibility with all wood mods from SafTheLamb - 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) -- 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 +- Optimize images +- Add noise to non-Lignumis entities brought in later +- Add deep core mining +- Add greenhouse ## Credits -### Translations - -- Simplified chinese (zh-CN): cyx2015s - -### Assets - [Hurricane](https://mods.factorio.com/user/Hurricane046) - Lumber mill - Deep miner -- Quality assembler [malcolmriley](https://github.com/malcolmriley/unused-renders) @@ -136,24 +79,4 @@ If your modded lab is special and it should not support these science packs, use [Krastorio 2 Assets](https://mods.factorio.com/mod/Krastorio2Assets) -- Basic radar - -[Icons8](https://icons8.com) - -- [Mute icon](https://icons8.com/icon/9414/no-audio) - -[_CodeGreen](https://mods.factorio.com/user/_CodeGreen) - -- Lignumis as starting planet inspired by [Any Planet Start](https://mods.factorio.com/mod/any-planet-start) - -[Free Music Archive](https://freemusicarchive.org) - -- [The Owl: telescope](https://freemusicarchive.org/music/The_Owl/Fairy_Forest/the_owl_-_fairy_forest_-_04_the_owl_-_telescope/) (CC BY-NC-ND) -- [malictusmusic: Forest Heartbeat](https://freemusicarchive.org/music/malictusmusic/free-cinematic-goodies/forest-heartbeat/) (CC BY) -- [Meydän: Surreal Forest](https://freemusicarchive.org/music/Meydan/Havor/4-_Surreal_Forest_1541/) (CC BY) -- [HoliznaCC0: Dark Forest](https://freemusicarchive.org/music/holiznacc0/retro-gamer-soundtrack/dark-forest/) (CC0) -- [Aaron Mist: Burning Forest](https://freemusicarchive.org/music/Aaron_Mist/Unnecessary_City/Aaron_Mist_-_Unnecessary_City_-_04_Burning_Forest/) (CC BY-NC) - -[Pixabay](https://pixabay.com) - -- [AudioPapkin: Forest ambience](https://pixabay.com/sound-effects/forest-ambience-296528/) \ No newline at end of file +- Basic radar \ No newline at end of file diff --git a/lignumis/changelog.txt b/lignumis/changelog.txt index 58ce704..bdacb05 100644 --- a/lignumis/changelog.txt +++ b/lignumis/changelog.txt @@ -1,230 +1,9 @@ --------------------------------------------------------------------------------------------------- -Version: 1.0.13 -Date: 13.02.2025 - Changes: - - Correct some icon orders - - Locomotives can burn wood again - - Reduce energy usage of active noise cancelling tower - - Nerf deep miner (halves the speed) - - Remove temporary fix for wooden walls - - Change asteroid chunk ratio for Lignumis to not wait ages for ice - - Add molten gold processing for the foundry - - Reduce peat from gold - - Add Lignumis recipes to Space Age recipe productivity technologies - Breaking Changes: - - LDS uses lumber instead of raw wood ---------------------------------------------------------------------------------------------------- -Version: 1.0.12 -Date: 08.02.2025 - Changes: - - Add HD starmap icon - - Reduce file size of audio - - Deep miner doesn't require production science pack - Bug Fixes: - - Fix crafting category of speed module 3 ---------------------------------------------------------------------------------------------------- -Version: 1.0.11 -Date: 05.02.2025 - Bug Fixes: - - The player can now craft generated quality crafting categories - - Fix crash site being created for every player in multiplayer ---------------------------------------------------------------------------------------------------- -Version: 1.0.10 -Date: 05.02.2025 - Changes: - - Balance trees (you should have the feeling that the whole planet is a forest) - - Add ambient sound and music - Bug Fixes: - - Fix gold stromatolite seeds not plantable on Lignumis ---------------------------------------------------------------------------------------------------- -Version: 1.0.9 -Date: 05.02.2025 - Bug Fixes: - - Fix agricultural towers not buildable on Lignumis ---------------------------------------------------------------------------------------------------- -Version: 1.0.8 -Date: 04.02.2025 - Bug Fixes: - - Fix crash due to error `attempt to get length of local 'woodResults' (a nil value)` ---------------------------------------------------------------------------------------------------- -Version: 1.0.7 -Date: 04.02.2025 - Changes: - - Add "○" to the mod name so it is easily recognized as a planet mod - - Set default import locations for repair packs - - Use mod "Pollution as surface property" - - Apply setting for progressive belt recipes to lab - - Unlock basic Nauvis technologies when adding the mod to an existing game - Bug Fixes: - - Fix nutrients-from-wood-pulp not being craftable ---------------------------------------------------------------------------------------------------- -Version: 1.0.6 -Date: 02.02.2025 - Bug Fixes: - - Only regular Nauvis trees are buffed - - Disable recycling for alternative recipes ---------------------------------------------------------------------------------------------------- -Version: 1.0.5 -Date: 27.01.2025 - Changes: - - Move requester chest to logistic robotics - Bug Fixes: - - Temporary fix for crash due to "Wood Walls and floors" (https://mods.factorio.com/mod/Wood-Walls/discussion/679915cbb8bf3c84c65db404) - - Fix error in migration code when Lignumis surface does not exist yet ---------------------------------------------------------------------------------------------------- -Version: 1.0.4 -Date: 27.01.2025 - Changes: - - Buff Lignumis military (and Vanilla gun turret as incentive to upgrade) - Bug Fixes: - - Make pipe code more robust (https://github.com/SimonBrodtmann/lignumis/issues/5) - - Fix error in migration code when Lignumis surface does not exist yet ---------------------------------------------------------------------------------------------------- -Version: 1.0.3 -Date: 26.01.2025 - Bug Fixes: - - Fix error when clicking a provisional rocket silo while in remote view ---------------------------------------------------------------------------------------------------- -Version: 1.0.2 -Date: 26.01.2025 - Bug Fixes: - - Fix transition to Nauvis for existing saves - - Fix provisional rocket silo only needing 1 rocket part ---------------------------------------------------------------------------------------------------- -Version: 1.0.1 -Date: 26.01.2025 - Bug Fixes: - - Fix migration error ---------------------------------------------------------------------------------------------------- -Version: 1.0.0 -Date: 26.01.2025 - Changes: - - Add translations for simplified chinese (thanks cyx2015s) - - Improve transition to Nauvis with a compound entity and a custom GUI - - Polish custom graphics - - Optimize graphics, drastically reducing the overall file size ---------------------------------------------------------------------------------------------------- -Version: 0.9.8 -Date: 25.01.2025 - Changes: - - Generator burner equipment can use wood as fuel - - Reduce output inventory slots of burner agricultural tower to 3 - - Add mod support for science packs and custom labs - - Add compatibility code for Cerys - Bug Fixes: - - Remove randomness from plants (thanks Atraxi; https://mods.factorio.com/mod/lignumis/discussion/67933ca99634a9d18f15f5af) ---------------------------------------------------------------------------------------------------- -Version: 0.9.7 -Date: 23.01.2025 - Changes: - - Add compatibility for "Metal and Stars" (thanks Atraxi) - - Rename "Planet discovery Lignumis" to "Moon discovery Lignumis" ---------------------------------------------------------------------------------------------------- -Version: 0.9.6 -Date: 20.01.2025 - Bug Fixes: - - Fix errors with initialization (probably) ---------------------------------------------------------------------------------------------------- -Version: 0.9.5 -Date: 20.01.2025 - Changes: - - Halved energy required for lumber, halved speed of lumber mill - - Allow bringing 40 item stacks to Nauvis (currently it's only in the tooltip) - - Replace yellow belt with brown belt in electric lab recipe to prevent deadlock - Bug Fixes: - - Fix only first player being sent to Lignumis (probably) ---------------------------------------------------------------------------------------------------- -Version: 0.9.4 -Date: 20.01.2025 - Changes: - - Enable music for Lignumis again - - Lignumis buildings now have golden pipe connections - - Prevent other mods from adding science packs to wood lab - - Increase inventory slots of burner agricultural tower to 5 - - Gold seeds are buffed to reduce ramp-up time of gold production - - Basic radar recipe now takes longer - - The amount of peat from gold stromatolite remnant is reduced - Bug Fixes: - - Non-planted trees didn't absorb noise - - Desiccation furnace was mined to regular furnace - Breaking Changes: - - The fluid input connection of the provisional rocket silo has been moved one tile to the right ---------------------------------------------------------------------------------------------------- -Version: 0.9.3 -Date: 17.01.2025 - Changes: - - Wooden military is now optional. Lignumis adds everything that is needed. You can keep it for the additional stuff. - - Wood lab now gets its input science packs defined in data-final-fixes because it should not get additional science packs from other mods - - Wooden industry is now supported (no code is needed for that) ---------------------------------------------------------------------------------------------------- -Version: 0.9.2 -Date: 15.01.2025 - Changes: - - Reduce trees in map generation a bit - Bug Fixes: - - Temporarily disables music on Lignumis because PlanetsLib 1.1.25 removes the function `PlanetsLib.borrow_music` - - Change locales for `surface-condition-too-low` and `surface-condition-too-high` to make sense for pollution surface condition ---------------------------------------------------------------------------------------------------- -Version: 0.9.1 -Date: 15.01.2025 - Changes: - - Optimized map generation - - Changed color of natural gold soil on the map - - Increased wood yield from peat - - Buff the game start with a second burner mining drill and 2 burner agricultural towers - - Add mining area visualization for the 4x4 burner mining drill - - Now uses PlanetsLib (that also adds a nice orbit ring) ---------------------------------------------------------------------------------------------------- -Version: 0.9.0 -Date: 14.01.2025 - Changes: - - Add recipes to Quality assembler ---------------------------------------------------------------------------------------------------- -Version: 0.0.10 -Date: 13.01.2025 - Changes: - - Add noise pollution icon - - Add Quality assembler - Bug Fixes: - - Fix tree-seeding being disabled ---------------------------------------------------------------------------------------------------- -Version: 0.0.9 -Date: 13.01.2025 - Changes: - - Add Active noise cancelling tower - - Add noise emissions to non-Lignumis entities - - Balance noise - Bug Fixes: - - Reduce Space Age dependency to latest stable release instead of experimental ---------------------------------------------------------------------------------------------------- -Version: 0.0.8 -Date: 12.01.2025 - Changes: - - Add mod "Astropinics" - - Update dependencies - - Add mid-game items and balancing (a.k.a. coming back to Lignumis) - - Mark known incompatible mods as such until compatibility code is added ---------------------------------------------------------------------------------------------------- -Version: 0.0.7 -Date: 11.01.2025 - Changes: - - Reactors and cars burn wood fuel - - Unlock Lignumis via technology instead of script - - Give deep miner a proper recipe and balance it - - Balance basic construction robots - Bug Fixes: - - Fix a crash when starting Lignumis not in freeplay mode - - Fix a crash when starting Lignumis in the editor - - Fix some item orders ---------------------------------------------------------------------------------------------------- Version: 0.0.6 -Date: 09.01.2025 +Date: 08.01.2025 Changes: - Remove temporary incompatibility with wood-logistics - Add basic radar - - Balance peat resource patches - - Increase fuel value of wood pulp - - Balance start on Nauvis --------------------------------------------------------------------------------------------------- Version: 0.0.5 Date: 07.01.2025 diff --git a/lignumis/control.lua b/lignumis/control.lua index 3beffba..115ffee 100644 --- a/lignumis/control.lua +++ b/lignumis/control.lua @@ -1,12 +1,148 @@ -local handler = require("event_handler") -gui = require("__flib__/gui") +require("script/to-nauvis") -handler.add_libraries({ - require("scripts/init-existing"), - require("scripts/init-new"), - require("scripts/init"), - require("scripts/to-nauvis"), - require("scripts/wooden-rocket-silo") -}) +local crash_site = require("crash-site") +local util = require("util") +local e = defines.events +local function chart_starting_area() + local r = 200 + local force = game.forces.player + local surface = storage.surface + local origin = force.get_spawn_position(surface) + force.chart(surface, { { origin.x - r, origin.y - r }, { origin.x + r, origin.y + r } }) +end +local function correct_space_locations() + local force = game.forces.player + force.unlock_space_location("lignumis") + if not force.technologies["planet-discovery-nauvis"].researched then + force.lock_space_location("nauvis") + end +end + +script.on_init(function() + if game.tick > 0 then + storage.init = true + game.print { "", { "lignumis.start-new-game" } } + return + end + + if remote.interfaces.freeplay then + storage.disable_crashsite = remote.call("freeplay", "get_disable_crashsite") + remote.call("freeplay", "set_disable_crashsite", true) + remote.call("freeplay", "set_skip_intro", true) + end + + correct_space_locations() + + storage.surface = game.planets["lignumis"].create_surface() + storage.surface.request_to_generate_chunks({ 0, 0 }, 3) + storage.surface.force_generate_chunk_requests() +end) + +script.on_event(e.on_player_created, function(event) + local player = game.get_player(event.player_index) --[[@as LuaPlayer]] + + local surface = storage.surface + player.teleport(surface.find_non_colliding_position("character", { 0, 0 }, 0, 1) --[[@as MapPosition]], "lignumis") + + if not storage.nauvis_visited then + local nauvis = game.get_surface("nauvis") --[[@as LuaSurface]] + nauvis.clear() + end + + if not storage.init then + storage.init = true + storage.crashed_ship_items = remote.call("freeplay", "get_ship_items") + storage.crashed_debris_items = remote.call("freeplay", "get_debris_items") + storage.crashed_ship_parts = remote.call("freeplay", "get_ship_parts") + storage.starting_message = remote.call("freeplay", "get_custom_intro_message") + + local ship_items = { ["wood-darts-magazine"] = 8 } + local debris_items = { ["lumber"] = 8 } + + surface.daytime = 0.7 + crash_site.create_crash_site(surface, { -5, -6 }, ship_items, debris_items, table.deepcopy(storage.crashed_ship_parts)) + util.remove_safe(player, storage.crashed_ship_items) + util.remove_safe(player, storage.crashed_debris_items) + player.get_main_inventory().sort_and_merge() + if player.character then + player.character.destructible = false + end + storage.crash_site_cutscene_active = true + crash_site.create_cutscene(player, { -5, -4 }) + + chart_starting_area() + end +end) + +script.on_event(e.on_player_changed_surface, function(event) + local player = game.get_player(event.player_index) --[[@as LuaPlayer]] + if player.surface.name == "nauvis" then + storage.nauvis_visited = true + end +end) + +local get_starting_message = function() + if storage.custom_intro_message then + return storage.custom_intro_message + end + return { "msg-intro-space-age" } +end + +local function show_intro_message(player) + if storage.skip_intro then + return + end + + if game.is_multiplayer() then + player.print(get_starting_message()) + else + game.show_message_dialog { text = get_starting_message() } + end +end + +script.on_event(e.on_cutscene_waypoint_reached, function(event) + if not storage.crash_site_cutscene_active then + return + end + if not crash_site.is_crash_site_cutscene(event) then + return + end + + local player = game.get_player(event.player_index) --[[@as LuaPlayer]] + + player.exit_cutscene() + show_intro_message(player) +end) + +script.on_event("crash-site-skip-cutscene", function(event) + if not storage.crash_site_cutscene_active then + return + end + if event.player_index ~= 1 then + return + end + local player = game.get_player(event.player_index) --[[@as LuaPlayer]] + if player.controller_type == defines.controllers.cutscene then + player.exit_cutscene() + end +end) + +script.on_event(e.on_cutscene_cancelled, function(event) + if not storage.crash_site_cutscene_active then + return + end + if event.player_index ~= 1 then + return + end + storage.crash_site_cutscene_active = nil + local player = game.get_player(event.player_index) --[[@as LuaPlayer]] + if player.gui.screen.skip_cutscene_label then + player.gui.screen.skip_cutscene_label.destroy() + end + if player.character then + player.character.destructible = true + end + player.zoom = 1.5 +end) \ No newline at end of file diff --git a/lignumis/data-final-fixes.lua b/lignumis/data-final-fixes.lua deleted file mode 100644 index 866c65d..0000000 --- a/lignumis/data-final-fixes.lua +++ /dev/null @@ -1 +0,0 @@ -require("prototypes/content/final") \ No newline at end of file diff --git a/lignumis/data.lua b/lignumis/data.lua index 26aeedd..dc657df 100644 --- a/lignumis/data.lua +++ b/lignumis/data.lua @@ -1,27 +1,9 @@ Lignumis = { - -- A technology having any of these science packs as ingredient will get wood and steam science packs added - science_pack_whitelist = { "utility-science-pack", "production-science-pack", "space-science-pack" }, - - -- A technology is skipped if it has any of these as ingredient - 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 - }, - - -- These technologies are skipped even if they are matches according to above lists science_blacklist = { "deep-miner", "logistic-system", "space-platform-thruster", - "kovarex-enrichment-process", - "astroponics" - }, - - -- Add wood and steam science packs to all labs' inputs except these - lab_blacklist = { - "wood-lab", -- Lignumis - "cerys-lab" -- Cerys + "kovarex-enrichment-process" } } @@ -29,4 +11,4 @@ require("__cf-lib__/util") require("prototypes/content/data") require("prototypes/integrations/data") -require("prototypes/compatibility/data") \ No newline at end of file +require("prototypes/compatibility/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 index 2e2d49d..56d2cb5 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-remnants.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-remnants.png 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 index 89fedd7..e683a70 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-working.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper-working.png 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 index ec277aa..8c7c676 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-copper.png 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 index 986e6b4..515b091 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-remnants.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-remnants.png 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 index 6e77498..604618d 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-working.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold-working.png 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 index 0e709f0..9fd3205 100644 Binary files a/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold.png and b/lignumis/graphics/entity/basic-construction-robot/basic-construction-robot-gold.png 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 index 8683315..001db99 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-base.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-base.png 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 index 8b1ac5c..8c7ab02 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-raising.png 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 index 1526d02..c7b3087 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-1.png 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 index cacc464..fb82fce 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-2.png 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 index 90e93dd..85a126f 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-3.png 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 index 31740b6..de30549 100644 Binary files a/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png and b/lignumis/graphics/entity/basic-gun-turret/basic-gun-turret-shooting-4.png differ diff --git a/lignumis/graphics/entity/basic-radar.png b/lignumis/graphics/entity/basic-radar.png index d6f27d6..168f28e 100644 Binary files a/lignumis/graphics/entity/basic-radar.png and b/lignumis/graphics/entity/basic-radar.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-base.png b/lignumis/graphics/entity/burner-agricultural-tower-base.png new file mode 100644 index 0000000..3ab9e11 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-base.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-1-1.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-1-1.png new file mode 100644 index 0000000..2edf9f2 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-1-1.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-1-2.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-1-2.png new file mode 100644 index 0000000..1ef0eeb Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-1-2.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-10.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-10.png new file mode 100644 index 0000000..64a672d Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-10.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-3.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-3.png new file mode 100644 index 0000000..0aef4fb Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-3.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-4.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-4.png new file mode 100644 index 0000000..defd6ca Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-4.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5-1.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-5-1.png new file mode 100644 index 0000000..e1ccf76 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-5-1.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5-2.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-5-2.png new file mode 100644 index 0000000..3ca4fc3 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-5-2.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-5.png new file mode 100644 index 0000000..6ff323e Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-5.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-6.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-6.png new file mode 100644 index 0000000..071788d Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-6.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7-1.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-7-1.png new file mode 100644 index 0000000..f088100 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-7-1.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7-2.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-7-2.png new file mode 100644 index 0000000..cc9806b Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-7-2.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-7.png new file mode 100644 index 0000000..2788fbe Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-7.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-8.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-8.png new file mode 100644 index 0000000..f463d20 Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-8.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-9.png b/lignumis/graphics/entity/burner-agricultural-tower-crane-9.png new file mode 100644 index 0000000..8aeea9f Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-crane-9.png differ diff --git a/lignumis/graphics/entity/burner-agricultural-tower-remnants.png b/lignumis/graphics/entity/burner-agricultural-tower-remnants.png new file mode 100644 index 0000000..ed3de1f Binary files /dev/null and b/lignumis/graphics/entity/burner-agricultural-tower-remnants.png 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-remnants.png b/lignumis/graphics/entity/burner-assembling-machine-remnants.png new file mode 100644 index 0000000..24e758c Binary files /dev/null and b/lignumis/graphics/entity/burner-assembling-machine-remnants.png differ diff --git a/lignumis/graphics/entity/burner-assembling-machine.png b/lignumis/graphics/entity/burner-assembling-machine.png new file mode 100644 index 0000000..881645a Binary files /dev/null and b/lignumis/graphics/entity/burner-assembling-machine.png 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-hand-base.png b/lignumis/graphics/entity/burner-inserter-hand-base.png new file mode 100644 index 0000000..4a8c833 Binary files /dev/null and b/lignumis/graphics/entity/burner-inserter-hand-base.png differ diff --git a/lignumis/graphics/entity/burner-inserter-hand-closed.png b/lignumis/graphics/entity/burner-inserter-hand-closed.png new file mode 100644 index 0000000..74e2aae Binary files /dev/null and b/lignumis/graphics/entity/burner-inserter-hand-closed.png differ diff --git a/lignumis/graphics/entity/burner-inserter-hand-open.png b/lignumis/graphics/entity/burner-inserter-hand-open.png new file mode 100644 index 0000000..974f958 Binary files /dev/null and b/lignumis/graphics/entity/burner-inserter-hand-open.png differ diff --git a/lignumis/graphics/entity/burner-inserter-platform.png b/lignumis/graphics/entity/burner-inserter-platform.png new file mode 100644 index 0000000..4eac826 Binary files /dev/null and b/lignumis/graphics/entity/burner-inserter-platform.png differ diff --git a/lignumis/graphics/entity/burner-inserter-remnants.png b/lignumis/graphics/entity/burner-inserter-remnants.png new file mode 100644 index 0000000..24a71e7 Binary files /dev/null and b/lignumis/graphics/entity/burner-inserter-remnants.png 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-hand-base.png b/lignumis/graphics/entity/burner-long-handed-inserter-hand-base.png new file mode 100644 index 0000000..dbf9123 Binary files /dev/null and b/lignumis/graphics/entity/burner-long-handed-inserter-hand-base.png differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-hand-closed.png b/lignumis/graphics/entity/burner-long-handed-inserter-hand-closed.png new file mode 100644 index 0000000..964511b Binary files /dev/null and b/lignumis/graphics/entity/burner-long-handed-inserter-hand-closed.png differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-hand-open.png b/lignumis/graphics/entity/burner-long-handed-inserter-hand-open.png new file mode 100644 index 0000000..b10dca1 Binary files /dev/null and b/lignumis/graphics/entity/burner-long-handed-inserter-hand-open.png differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-platform.png b/lignumis/graphics/entity/burner-long-handed-inserter-platform.png new file mode 100644 index 0000000..ca04f2a Binary files /dev/null and b/lignumis/graphics/entity/burner-long-handed-inserter-platform.png differ diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-remnants.png b/lignumis/graphics/entity/burner-long-handed-inserter-remnants.png new file mode 100644 index 0000000..00e85f1 Binary files /dev/null and b/lignumis/graphics/entity/burner-long-handed-inserter-remnants.png 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-E.png b/lignumis/graphics/entity/burner-mining-drill-E.png new file mode 100644 index 0000000..7d6fc7f Binary files /dev/null and b/lignumis/graphics/entity/burner-mining-drill-E.png differ diff --git a/lignumis/graphics/entity/burner-mining-drill-N.png b/lignumis/graphics/entity/burner-mining-drill-N.png new file mode 100644 index 0000000..98bacee Binary files /dev/null and b/lignumis/graphics/entity/burner-mining-drill-N.png differ diff --git a/lignumis/graphics/entity/burner-mining-drill-S.png b/lignumis/graphics/entity/burner-mining-drill-S.png new file mode 100644 index 0000000..5924c6b Binary files /dev/null and b/lignumis/graphics/entity/burner-mining-drill-S.png differ diff --git a/lignumis/graphics/entity/burner-mining-drill-W.png b/lignumis/graphics/entity/burner-mining-drill-W.png new file mode 100644 index 0000000..8491728 Binary files /dev/null and b/lignumis/graphics/entity/burner-mining-drill-W.png 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 index 7126493..296e521 100644 Binary files a/lignumis/graphics/entity/gold-patch.png and b/lignumis/graphics/entity/gold-patch.png 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 index 128d746..51d58b4 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-left.png 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 index dc05d92..e64307d 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-down-right.png 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 index fff5959..730cfa9 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-left.png 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 index 2a35731..5635a8b 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-corner-up-right.png 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 index 19cbe46..657983c 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-east.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-east.png 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 index 2a97937..a87117c 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-north.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-north.png 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 index 91215a3..43261d1 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-south.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-south.png 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 index 86512d4..1522391 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-west.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-cover-west.png differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png index bd08152..49be40c 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-cross.png 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 index a1c9d48..8dbc671 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-down.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-down.png 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 index ea878fa..e852b7a 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-left.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-left.png 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 index 849f635..800da3c 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-right.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-right.png 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 index 60cfe92..bc3366e 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-up.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-ending-up.png differ diff --git a/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png b/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png index 55417c5..98aadae 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-remnants.png 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 index 006c388..ed64deb 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal-window.png 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 index 2e7404a..61040f6 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-horizontal.png 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 index feba002..1590384 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-single.png 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 index 5a64abe..7535263 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical-window.png 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 index dd0de5f..84535d5 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-straight-vertical.png 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 index 9ca4227..e377d56 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-down.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-down.png 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 index 7b29ab7..6719507 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-left.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-left.png 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 index 9f7d8fe..0dea91f 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-right.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-right.png 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 index 660428a..b3582ca 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-t-up.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-t-up.png 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 index a09c842..74dd9ef 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-down.png 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 index 362e2f4..d825ef8 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-left.png 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 index c539d5d..663cef7 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-remnants.png 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 index 1dab1a9..dc5fd23 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-right.png 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 index 62bada5..7a6d997 100644 Binary files a/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png and b/lignumis/graphics/entity/gold-pipe/gold-pipe-to-ground-up.png 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-remnants.png b/lignumis/graphics/entity/gold-storage-tank-remnants.png new file mode 100644 index 0000000..9d0a705 Binary files /dev/null and b/lignumis/graphics/entity/gold-storage-tank-remnants.png differ diff --git a/sources/entity/gold-storage-tank/gold-storage-tank-window-background.png b/lignumis/graphics/entity/gold-storage-tank-window-background.png similarity index 100% rename from sources/entity/gold-storage-tank/gold-storage-tank-window-background.png rename to lignumis/graphics/entity/gold-storage-tank-window-background.png diff --git a/lignumis/graphics/entity/gold-storage-tank.png b/lignumis/graphics/entity/gold-storage-tank.png new file mode 100644 index 0000000..2b213c3 Binary files /dev/null and b/lignumis/graphics/entity/gold-storage-tank.png 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-01.png b/lignumis/graphics/entity/gold-stromatolite-01.png new file mode 100644 index 0000000..d01fc46 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-01.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-02.png b/lignumis/graphics/entity/gold-stromatolite-02.png new file mode 100644 index 0000000..ed4d3b4 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-02.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-03.png b/lignumis/graphics/entity/gold-stromatolite-03.png new file mode 100644 index 0000000..5fe8f1a Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-03.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-04.png b/lignumis/graphics/entity/gold-stromatolite-04.png new file mode 100644 index 0000000..b64cc63 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-04.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-05.png b/lignumis/graphics/entity/gold-stromatolite-05.png new file mode 100644 index 0000000..b14d841 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-05.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-06.png b/lignumis/graphics/entity/gold-stromatolite-06.png new file mode 100644 index 0000000..d3bf6aa Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-06.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-07.png b/lignumis/graphics/entity/gold-stromatolite-07.png new file mode 100644 index 0000000..25c4bf6 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-07.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-08.png b/lignumis/graphics/entity/gold-stromatolite-08.png new file mode 100644 index 0000000..2feebba Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-08.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-09.png b/lignumis/graphics/entity/gold-stromatolite-09.png new file mode 100644 index 0000000..698c720 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-09.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-10.png b/lignumis/graphics/entity/gold-stromatolite-10.png new file mode 100644 index 0000000..ea2face Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-10.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-11.png b/lignumis/graphics/entity/gold-stromatolite-11.png new file mode 100644 index 0000000..80770eb Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-11.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-12.png b/lignumis/graphics/entity/gold-stromatolite-12.png new file mode 100644 index 0000000..6018099 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-12.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-13.png b/lignumis/graphics/entity/gold-stromatolite-13.png new file mode 100644 index 0000000..14fd480 Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-13.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-14.png b/lignumis/graphics/entity/gold-stromatolite-14.png new file mode 100644 index 0000000..6d6d3ad Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-14.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-15.png b/lignumis/graphics/entity/gold-stromatolite-15.png new file mode 100644 index 0000000..a1e3daa Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-15.png differ diff --git a/lignumis/graphics/entity/gold-stromatolite-16.png b/lignumis/graphics/entity/gold-stromatolite-16.png new file mode 100644 index 0000000..f2de06c Binary files /dev/null and b/lignumis/graphics/entity/gold-stromatolite-16.png 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-remnants.png b/lignumis/graphics/entity/steam-assembling-machine-remnants.png new file mode 100644 index 0000000..9593097 Binary files /dev/null and b/lignumis/graphics/entity/steam-assembling-machine-remnants.png differ diff --git a/lignumis/graphics/entity/steam-assembling-machine.png b/lignumis/graphics/entity/steam-assembling-machine.png new file mode 100644 index 0000000..a09d336 Binary files /dev/null and b/lignumis/graphics/entity/steam-assembling-machine.png 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-light.png b/lignumis/graphics/entity/wood-lab-light.png new file mode 100644 index 0000000..c3f6c80 Binary files /dev/null and b/lignumis/graphics/entity/wood-lab-light.png differ diff --git a/lignumis/graphics/entity/wood-lab.png b/lignumis/graphics/entity/wood-lab.png new file mode 100644 index 0000000..d18b7f1 Binary files /dev/null and b/lignumis/graphics/entity/wood-lab.png 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/02-rocket.png b/lignumis/graphics/entity/wooden-rocket-silo/02-rocket.png new file mode 100644 index 0000000..12ced59 Binary files /dev/null and b/lignumis/graphics/entity/wooden-rocket-silo/02-rocket.png 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 index 8ef0ddb..0a87f90 100644 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/06-rocket-silo.png and b/lignumis/graphics/entity/wooden-rocket-silo/06-rocket-silo.png 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 index 337e192..c24da9b 100644 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png and b/lignumis/graphics/entity/wooden-rocket-silo/14-rocket-silo-front.png 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 index 0790c5d..809977d 100644 Binary files a/lignumis/graphics/entity/wooden-rocket-silo/rocket-static-pod.png and b/lignumis/graphics/entity/wooden-rocket-silo/rocket-static-pod.png differ diff --git a/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png b/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png index 85fe0c5..4e1009f 100644 Binary files a/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png and b/lignumis/graphics/equipment/basic-personal-roboport-equipment-copper.png differ diff --git a/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png b/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png index f4c1447..b38f580 100644 Binary files a/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png and b/lignumis/graphics/equipment/basic-personal-roboport-equipment-gold.png differ diff --git a/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png b/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png index 3b8ec27..4457626 100644 Binary files a/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png and b/lignumis/graphics/equipment/basic-portable-generator-equipment-copper.png differ diff --git a/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png b/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png index 46f39f1..4114c4b 100644 Binary files a/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png and b/lignumis/graphics/equipment/basic-portable-generator-equipment-gold.png 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 index 74e53f8..aaa8d11 100644 Binary files a/lignumis/graphics/icons/basic-construction-robot-copper.png and b/lignumis/graphics/icons/basic-construction-robot-copper.png differ diff --git a/lignumis/graphics/icons/basic-construction-robot-gold.png b/lignumis/graphics/icons/basic-construction-robot-gold.png index 812c6e0..bd46650 100644 Binary files a/lignumis/graphics/icons/basic-construction-robot-gold.png and b/lignumis/graphics/icons/basic-construction-robot-gold.png differ diff --git a/lignumis/graphics/icons/basic-gun-turret.png b/lignumis/graphics/icons/basic-gun-turret.png index 2c76f81..2640a6a 100644 Binary files a/lignumis/graphics/icons/basic-gun-turret.png and b/lignumis/graphics/icons/basic-gun-turret.png differ diff --git a/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png b/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png index 3f951a2..1684820 100644 Binary files a/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png and b/lignumis/graphics/icons/basic-personal-roboport-equipment-copper.png differ diff --git a/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png b/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png index d4139f9..7a9afc2 100644 Binary files a/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png and b/lignumis/graphics/icons/basic-personal-roboport-equipment-gold.png differ diff --git a/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png b/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png index 83115bb..6d32e3e 100644 Binary files a/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png and b/lignumis/graphics/icons/basic-portable-generator-equipment-copper.png differ diff --git a/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png b/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png index 43986f5..2dbc345 100644 Binary files a/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png and b/lignumis/graphics/icons/basic-portable-generator-equipment-gold.png differ diff --git a/lignumis/graphics/icons/basic-radar.png b/lignumis/graphics/icons/basic-radar.png index 3dc6c8e..da1c566 100644 Binary files a/lignumis/graphics/icons/basic-radar.png and b/lignumis/graphics/icons/basic-radar.png differ diff --git a/lignumis/graphics/icons/basic-repair-pack.png b/lignumis/graphics/icons/basic-repair-pack.png index 8f496fb..aae3c68 100644 Binary files a/lignumis/graphics/icons/basic-repair-pack.png and b/lignumis/graphics/icons/basic-repair-pack.png differ diff --git a/lignumis/graphics/icons/burner-agricultural-tower.png b/lignumis/graphics/icons/burner-agricultural-tower.png index 7537661..083a878 100644 Binary files a/lignumis/graphics/icons/burner-agricultural-tower.png and b/lignumis/graphics/icons/burner-agricultural-tower.png differ diff --git a/lignumis/graphics/icons/burner-assembling-machine.png b/lignumis/graphics/icons/burner-assembling-machine.png index d8923f9..fc7efb5 100644 Binary files a/lignumis/graphics/icons/burner-assembling-machine.png and b/lignumis/graphics/icons/burner-assembling-machine.png differ diff --git a/lignumis/graphics/icons/burner-inserter.png b/lignumis/graphics/icons/burner-inserter.png index 06476fe..ecb6520 100644 Binary files a/lignumis/graphics/icons/burner-inserter.png and b/lignumis/graphics/icons/burner-inserter.png differ diff --git a/lignumis/graphics/icons/burner-long-handed-inserter.png b/lignumis/graphics/icons/burner-long-handed-inserter.png index 2907b4f..dd327ff 100644 Binary files a/lignumis/graphics/icons/burner-long-handed-inserter.png and b/lignumis/graphics/icons/burner-long-handed-inserter.png differ diff --git a/lignumis/graphics/icons/burner-mining-drill.png b/lignumis/graphics/icons/burner-mining-drill.png index 23f5e12..7be87da 100644 Binary files a/lignumis/graphics/icons/burner-mining-drill.png and b/lignumis/graphics/icons/burner-mining-drill.png 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 index 334c03a..ebbce69 100644 Binary files a/lignumis/graphics/icons/gold-bacteria-1.png and b/lignumis/graphics/icons/gold-bacteria-1.png differ diff --git a/lignumis/graphics/icons/gold-bacteria-2.png b/lignumis/graphics/icons/gold-bacteria-2.png index eba29ef..51e2a21 100644 Binary files a/lignumis/graphics/icons/gold-bacteria-2.png and b/lignumis/graphics/icons/gold-bacteria-2.png differ diff --git a/lignumis/graphics/icons/gold-bacteria-3.png b/lignumis/graphics/icons/gold-bacteria-3.png index d3cbb20..a812ad3 100644 Binary files a/lignumis/graphics/icons/gold-bacteria-3.png and b/lignumis/graphics/icons/gold-bacteria-3.png differ diff --git a/lignumis/graphics/icons/gold-bacteria.png b/lignumis/graphics/icons/gold-bacteria.png index caac312..274e8ef 100644 Binary files a/lignumis/graphics/icons/gold-bacteria.png and b/lignumis/graphics/icons/gold-bacteria.png differ diff --git a/lignumis/graphics/icons/gold-cable.png b/lignumis/graphics/icons/gold-cable.png index 89d4bd9..47639d8 100644 Binary files a/lignumis/graphics/icons/gold-cable.png and b/lignumis/graphics/icons/gold-cable.png differ diff --git a/lignumis/graphics/icons/gold-ore-1.png b/lignumis/graphics/icons/gold-ore-1.png index 0f30043..3fa7d2f 100644 Binary files a/lignumis/graphics/icons/gold-ore-1.png and b/lignumis/graphics/icons/gold-ore-1.png differ diff --git a/lignumis/graphics/icons/gold-ore-2.png b/lignumis/graphics/icons/gold-ore-2.png index 606281c..ac85aca 100644 Binary files a/lignumis/graphics/icons/gold-ore-2.png and b/lignumis/graphics/icons/gold-ore-2.png differ diff --git a/lignumis/graphics/icons/gold-ore-3.png b/lignumis/graphics/icons/gold-ore-3.png index 440cd46..b087c62 100644 Binary files a/lignumis/graphics/icons/gold-ore-3.png and b/lignumis/graphics/icons/gold-ore-3.png differ diff --git a/lignumis/graphics/icons/gold-ore.png b/lignumis/graphics/icons/gold-ore.png index 0295900..0ea33cd 100644 Binary files a/lignumis/graphics/icons/gold-ore.png and b/lignumis/graphics/icons/gold-ore.png differ diff --git a/lignumis/graphics/icons/gold-patch.png b/lignumis/graphics/icons/gold-patch.png index 36de4d8..35e4072 100644 Binary files a/lignumis/graphics/icons/gold-patch.png and b/lignumis/graphics/icons/gold-patch.png differ diff --git a/lignumis/graphics/icons/gold-pipe-to-ground.png b/lignumis/graphics/icons/gold-pipe-to-ground.png index 08d8b9b..bf96bd0 100644 Binary files a/lignumis/graphics/icons/gold-pipe-to-ground.png and b/lignumis/graphics/icons/gold-pipe-to-ground.png differ diff --git a/lignumis/graphics/icons/gold-pipe.png b/lignumis/graphics/icons/gold-pipe.png index c9fe002..5adbe30 100644 Binary files a/lignumis/graphics/icons/gold-pipe.png and b/lignumis/graphics/icons/gold-pipe.png differ diff --git a/lignumis/graphics/icons/gold-plate.png b/lignumis/graphics/icons/gold-plate.png index 01440a9..75ddece 100644 Binary files a/lignumis/graphics/icons/gold-plate.png and b/lignumis/graphics/icons/gold-plate.png differ diff --git a/lignumis/graphics/icons/gold-storage-tank.png b/lignumis/graphics/icons/gold-storage-tank.png index c062f7a..fc7171d 100644 Binary files a/lignumis/graphics/icons/gold-storage-tank.png and b/lignumis/graphics/icons/gold-storage-tank.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-1.png b/lignumis/graphics/icons/gold-stromatolite-seed-1.png index 420eb6f..4851a8c 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-1.png and b/lignumis/graphics/icons/gold-stromatolite-seed-1.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-2.png b/lignumis/graphics/icons/gold-stromatolite-seed-2.png index 12cd0d9..6bc1914 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-2.png and b/lignumis/graphics/icons/gold-stromatolite-seed-2.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-3.png b/lignumis/graphics/icons/gold-stromatolite-seed-3.png index b28decb..b33b636 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-3.png and b/lignumis/graphics/icons/gold-stromatolite-seed-3.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-4.png b/lignumis/graphics/icons/gold-stromatolite-seed-4.png index 1322b63..433d097 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-4.png and b/lignumis/graphics/icons/gold-stromatolite-seed-4.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed-5.png b/lignumis/graphics/icons/gold-stromatolite-seed-5.png index 64ec62a..55691a9 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed-5.png and b/lignumis/graphics/icons/gold-stromatolite-seed-5.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite-seed.png b/lignumis/graphics/icons/gold-stromatolite-seed.png index f7fd366..4cbacf4 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite-seed.png and b/lignumis/graphics/icons/gold-stromatolite-seed.png differ diff --git a/lignumis/graphics/icons/gold-stromatolite.png b/lignumis/graphics/icons/gold-stromatolite.png index 080ff19..0022d84 100644 Binary files a/lignumis/graphics/icons/gold-stromatolite.png and b/lignumis/graphics/icons/gold-stromatolite.png differ diff --git a/lignumis/graphics/icons/hot-gold-plate.png b/lignumis/graphics/icons/hot-gold-plate.png index 962c5ed..50efac1 100644 Binary files a/lignumis/graphics/icons/hot-gold-plate.png and b/lignumis/graphics/icons/hot-gold-plate.png differ diff --git a/lignumis/graphics/icons/lignumis.png b/lignumis/graphics/icons/lignumis.png index cce5b7c..18fd823 100644 Binary files a/lignumis/graphics/icons/lignumis.png and b/lignumis/graphics/icons/lignumis.png differ diff --git a/lignumis/graphics/icons/lumber-1.png b/lignumis/graphics/icons/lumber-1.png index 5330628..359382b 100644 Binary files a/lignumis/graphics/icons/lumber-1.png and b/lignumis/graphics/icons/lumber-1.png differ diff --git a/lignumis/graphics/icons/lumber-2.png b/lignumis/graphics/icons/lumber-2.png index 89fbea1..0c06bc2 100644 Binary files a/lignumis/graphics/icons/lumber-2.png and b/lignumis/graphics/icons/lumber-2.png differ diff --git a/lignumis/graphics/icons/lumber.png b/lignumis/graphics/icons/lumber.png index fab15ce..cb3aa8f 100644 Binary files a/lignumis/graphics/icons/lumber.png and b/lignumis/graphics/icons/lumber.png differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-1.png b/lignumis/graphics/icons/moist-stromatolite-remnant-1.png index 6c611c3..4db8403 100644 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-1.png and b/lignumis/graphics/icons/moist-stromatolite-remnant-1.png differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-2.png b/lignumis/graphics/icons/moist-stromatolite-remnant-2.png index b814b6f..a880a83 100644 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-2.png and b/lignumis/graphics/icons/moist-stromatolite-remnant-2.png differ diff --git a/lignumis/graphics/icons/moist-stromatolite-remnant-3.png b/lignumis/graphics/icons/moist-stromatolite-remnant-3.png index c405013..eb335c4 100644 Binary files a/lignumis/graphics/icons/moist-stromatolite-remnant-3.png and b/lignumis/graphics/icons/moist-stromatolite-remnant-3.png 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 index ac800e4..1b1a341 100644 Binary files a/lignumis/graphics/icons/peat.png and b/lignumis/graphics/icons/peat.png differ diff --git a/lignumis/graphics/icons/provisional-rocket-part.png b/lignumis/graphics/icons/provisional-rocket-part.png index 99bd4eb..2be7d3f 100644 Binary files a/lignumis/graphics/icons/provisional-rocket-part.png and b/lignumis/graphics/icons/provisional-rocket-part.png differ diff --git a/lignumis/graphics/icons/provisional-rocket-silo.png b/lignumis/graphics/icons/provisional-rocket-silo.png index ed29f7f..b947e0c 100644 Binary files a/lignumis/graphics/icons/provisional-rocket-silo.png and b/lignumis/graphics/icons/provisional-rocket-silo.png 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 index a2728c7..a0ca76e 100644 Binary files a/lignumis/graphics/icons/starmap-planet-lignumis.png and b/lignumis/graphics/icons/starmap-planet-lignumis.png differ diff --git a/lignumis/graphics/icons/steam-assembling-machine.png b/lignumis/graphics/icons/steam-assembling-machine.png index 2945346..bcdcf8c 100644 Binary files a/lignumis/graphics/icons/steam-assembling-machine.png and b/lignumis/graphics/icons/steam-assembling-machine.png differ diff --git a/lignumis/graphics/icons/steam-science-pack.png b/lignumis/graphics/icons/steam-science-pack.png index fceda3c..d5eb51a 100644 Binary files a/lignumis/graphics/icons/steam-science-pack.png and b/lignumis/graphics/icons/steam-science-pack.png 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 index 43a574e..a1b2587 100644 Binary files a/lignumis/graphics/icons/wood-lab.png and b/lignumis/graphics/icons/wood-lab.png differ diff --git a/lignumis/graphics/icons/wood-pulp.png b/lignumis/graphics/icons/wood-pulp.png index 57f0918..46a3084 100644 Binary files a/lignumis/graphics/icons/wood-pulp.png and b/lignumis/graphics/icons/wood-pulp.png differ diff --git a/lignumis/graphics/icons/wood-science-pack.png b/lignumis/graphics/icons/wood-science-pack.png index e6b999d..25c21c5 100644 Binary files a/lignumis/graphics/icons/wood-science-pack.png and b/lignumis/graphics/icons/wood-science-pack.png differ diff --git a/lignumis/graphics/icons/wooden-gear-wheel.png b/lignumis/graphics/icons/wooden-gear-wheel.png index 634fda1..7931ef0 100644 Binary files a/lignumis/graphics/icons/wooden-gear-wheel.png and b/lignumis/graphics/icons/wooden-gear-wheel.png 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 index 1c0cbde..75194f3 100644 Binary files a/lignumis/graphics/technology/basic-construction-robotics-copper.png and b/lignumis/graphics/technology/basic-construction-robotics-copper.png differ diff --git a/lignumis/graphics/technology/basic-construction-robotics-gold.png b/lignumis/graphics/technology/basic-construction-robotics-gold.png index 97bff95..13cfcdd 100644 Binary files a/lignumis/graphics/technology/basic-construction-robotics-gold.png and b/lignumis/graphics/technology/basic-construction-robotics-gold.png differ diff --git a/lignumis/graphics/technology/basic-gun-turret.png b/lignumis/graphics/technology/basic-gun-turret.png index 83396c2..edc6fd1 100644 Binary files a/lignumis/graphics/technology/basic-gun-turret.png and b/lignumis/graphics/technology/basic-gun-turret.png differ diff --git a/lignumis/graphics/technology/basic-radar.png b/lignumis/graphics/technology/basic-radar.png index 53d8fda..21e3515 100644 Binary files a/lignumis/graphics/technology/basic-radar.png and b/lignumis/graphics/technology/basic-radar.png differ diff --git a/lignumis/graphics/technology/basic-repair-pack.png b/lignumis/graphics/technology/basic-repair-pack.png index 5b740f7..b8c6454 100644 Binary files a/lignumis/graphics/technology/basic-repair-pack.png and b/lignumis/graphics/technology/basic-repair-pack.png differ diff --git a/lignumis/graphics/technology/burner-automation.png b/lignumis/graphics/technology/burner-automation.png index f034cc2..559d285 100644 Binary files a/lignumis/graphics/technology/burner-automation.png and b/lignumis/graphics/technology/burner-automation.png differ diff --git a/lignumis/graphics/technology/gold-fluid-handling.png b/lignumis/graphics/technology/gold-fluid-handling.png index ed8d0fe..226bffc 100644 Binary files a/lignumis/graphics/technology/gold-fluid-handling.png and b/lignumis/graphics/technology/gold-fluid-handling.png 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 index 163196f..e862510 100644 Binary files a/lignumis/graphics/technology/nauvis.png and b/lignumis/graphics/technology/nauvis.png differ diff --git a/lignumis/graphics/technology/provisional-rocketry.png b/lignumis/graphics/technology/provisional-rocketry.png index 183175a..6942083 100644 Binary files a/lignumis/graphics/technology/provisional-rocketry.png and b/lignumis/graphics/technology/provisional-rocketry.png differ diff --git a/lignumis/graphics/technology/steam-automation.png b/lignumis/graphics/technology/steam-automation.png index 63f897c..fc85eb5 100644 Binary files a/lignumis/graphics/technology/steam-automation.png and b/lignumis/graphics/technology/steam-automation.png differ diff --git a/lignumis/graphics/technology/steam-science-pack.png b/lignumis/graphics/technology/steam-science-pack.png index dbc469f..1fdfba0 100644 Binary files a/lignumis/graphics/technology/steam-science-pack.png and b/lignumis/graphics/technology/steam-science-pack.png differ diff --git a/lignumis/graphics/technology/wood-science-pack.png b/lignumis/graphics/technology/wood-science-pack.png index 3538e9d..e275d5f 100644 Binary files a/lignumis/graphics/technology/wood-science-pack.png and b/lignumis/graphics/technology/wood-science-pack.png differ diff --git a/lignumis/graphics/terrain/gold-blubber.png b/lignumis/graphics/terrain/gold-blubber.png new file mode 100644 index 0000000..204ba4d Binary files /dev/null and b/lignumis/graphics/terrain/gold-blubber.png differ diff --git a/lignumis/graphics/terrain/natural-gold-soil.png b/lignumis/graphics/terrain/natural-gold-soil.png index 6c4a2a9..942f879 100644 Binary files a/lignumis/graphics/terrain/natural-gold-soil.png and b/lignumis/graphics/terrain/natural-gold-soil.png differ diff --git a/lignumis/info.json b/lignumis/info.json index 284f016..2d87956 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -1,30 +1,19 @@ { "name": "lignumis", - "version": "1.0.13", - "title": "Lignumis", - "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies.", + "version": "0.0.5", + "title": "[Alpha] Lignumis", + "description": "Dive into the world of Lignumis, a moon of Nauvis offering only the most basic technologies. Warning: This is an early development version. Breaking changes will happen.", "author": "cackling fiend", - "homepage": "https://discord.gg/5bevXf5W", + "homepage": "", "factorio_version": "2.0", "dependencies": [ "base", - "space-age >= 2.0.28", - "flib", - "PlanetsLib >= 1.1.26", - "astroponics >= 1.2.0", - "cf-lib >= 0.0.4", - "mf-core >= 1.0.3", - "mf-buildings >= 1.0.7", - "mf-logistics >= 1.0.1", - "Wood-Walls >= 1.2.1", - "pollution-as-surface-property", - "?hot-metals >= 1.1.0", - "?wood-military >= 2.3.3", - "?metal-and-stars", - "!apm_power_ldinc", - "!wood-logistics", - "!early-agriculture", - "!wood-universe-modpack", - "!aai-industry" + "space-age >= 2.0.0", + "cf-lib >= 0.0.1", + "wood-military >= 2.0.0", + "Wood-Walls >= 1.2.0", + "mf-buildings >= 0.1.0", + "mf-logistics >= 0.1.0", + "?hot-metals" ] } \ No newline at end of file diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 9c81d4a..f67bc23 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -1,12 +1,3 @@ -surface-condition-too-low=__1__ does not fit. -surface-condition-too-high=__1__ does not fit. - -[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 @@ -16,9 +7,6 @@ lignumis=Lignumis is a moon orbiting Nauvis. It is quite similar to Nauvis but s [airborne-pollutant-name] noise=Noise -[airborne-pollutant-name-with-amount] -noise=__1__ noise - [entity-name] wood-lab=Wood lab peat=Peat @@ -37,7 +25,6 @@ gold-storage-tank=Gold storage tank desiccation-furnace=Desiccation furnace steam-assembling-machine=Steam assembling machine provisional-rocket-silo=Provisional rocket silo -provisional-rocket-silo-ready=Provisional rocket silo (ready) basic-gun-turret=Basic gun turret basic-construction-robot-gold=Basic construction robot (gold) basic-construction-robot-copper=Basic construction robot (copper) @@ -45,12 +32,6 @@ wood-transport-belt=Wood transport belt wood-underground-belt=Wood underground belt wood-splitter=Wood splitter basic-radar=Basic radar -active-noise-cancelling-tower=Active noise cancelling tower -quality-assembler=Quality assembler - -[entity-description] -lumber-mill=Advanced machine to process wood. -quality-assembler=High-end assembler to craft only the finest quality machines. It gives one free quality tier to the crafted item by consuming [item=gold-quality-catalyst]. Surface conditions and ingredients are otherwise unchanged. [equipment-name] basic-portable-generator-equipment-gold=Basic portable generator equipment (gold) @@ -72,20 +53,13 @@ steam-science-pack=Steam science pack destination-nauvis=Travel to Nauvis lumber=Lumber basic-repair-pack=Basic repair pack -cupriavidus-necator=Cupriavidus necator -dead-cupriavidus-necator=Dead Cupriavidus necator -gold-quality-catalyst=Gold quality catalyst -wood-armor=Wood armor -wood-darts-magazine=Wood darts magazine [item-description] wooden-wall=Use wooden walls to protect your base from the locals and to reduce noise levels. -stone-wall=Better acoustic and physical protection than the wooden counterpart. -destination-nauvis=Insert this item into a rocket to travel to Nauvis. Notice that you won`t come back for a while.\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__ +destination-nauvis=Insert this item into a rocket to travel to Nauvis. Notice that you won`t come back for a while.\n__REMARK_COLOR_BEGIN__ALPHA notice: Clear your inventory before leaving as the current transition to Nauvis is a temporary implementation.__REMARK_COLOR_END__ [fluid-name] wood-pulp=Wood pulp -molten-gold=Molten gold [recipe-name] moist-stromatolite-remnant-desiccation=Desiccate moist stromatolite remnant @@ -93,16 +67,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 -low-density-structure-gold=Low density structure -rocket-fuel-from-wood-pulp-and-peat=Bio-rocket-fuel -nutrients-from-wood-pulp=Nutrients from wood pulp -active-noise-cancelling=Active noise cancelling [recipe-description] moist-stromatolite-remnant-desiccation-without-steam=Used for balancing the production of steam. @@ -112,7 +76,6 @@ gold-stromatolite-seed-to-peat=Used for voiding excess gold stromatolite seeds. wood-science-pack=Wood science pack burner-automation=Burner automation planet-discovery-nauvis=Planet discovery Nauvis -planet-discovery-lignumis=Moon discovery Lignumis iron-processing=Iron processing copper-processing=Copper processing lumber-mill=Lumber mill @@ -130,26 +93,9 @@ automation=Electric automation tree-seeding=Basic agriculture basic-repair-pack=Basic repair pack basic-radar=Basic radar -active-noise-cancelling=Active noise cancelling -quality-assembler=Quality assembler [technology-description] -wood-science-pack=Allows research of basic technologies based on wood products. -burner-automation=Technology for basic automation using burner machines. -planet-discovery-nauvis=A temperate planet offering all the common resources. -planet-discovery-lignumis=A moon orbiting Nauvis that has not much to offer besides some vegetation and a metal that might be useful. -lumber-mill=Advanced machine to process wood. -deep-miner=Gives access to huge gold deposits that were previously unreachable. -steam-automation=Allows research of more sophisticated technologies based on wood products and gold. -wood-liquefaction=Converting wood into a liquid offers new possibilities. -provisional-rocketry=We need to get off of this moon somehow. This is our only chance! -basic-gun-turret=The most basic automatic defense. It's not much, but it has to suffice for now. -basic-construction-robotics-gold=The most basic assistance for personal construction needs. -basic-construction-robotics-copper=The most basic assistance for personal construction needs. -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. [modifier-description] basic-gun-turret-attack-bonus=Basic gun turret damage: +__1__ @@ -160,30 +106,14 @@ natural-gold-soil=Gold-infused soil [fuel-category-name] wood=Wood fuel -quality-catalyst=Quality catalyst [mod-setting-name] lignumis-belt-progression=Enable progressive belt recipes lignumis-inserter-progression=Enable progressive inserter recipes -lignumis-ammo-progression=Enable progressive ammo 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. - -[entity-status] -no-quality-catalyst=No quality catalyst - -[description] -accepted-catalysts=Accepted catalysts -quality-catalyst-energy-value=Quality value - -[gui] -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-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. +start-new-game=Lignumis is meant to be played in a fresh game as it extends the early game before Nauvis. \ No newline at end of file diff --git a/lignumis/locale/zh-CN/strings.cfg b/lignumis/locale/zh-CN/strings.cfg deleted file mode 100644 index 54a2640..0000000 --- a/lignumis/locale/zh-CN/strings.cfg +++ /dev/null @@ -1,168 +0,0 @@ -surface-condition-too-low=__1__不符合. -surface-condition-too-high=__1__不符合. - -[mod-name] -lignumis=○ 愈创星 - Lignumis - -[mod-description] -lignumis=潜入木木世界的世界，木星的月亮只提供最基本的技术 - -[space-location-name] -lignumis=愈创星 - -[space-location-description] -lignumis=愈创星（Lignumis）：新地星的卫星。与新地星十分类似，但形成年代比新地星晚的多，资源也更少。 - -[airborne-pollutant-name] -noise=噪声 - -[airborne-pollutant-name-with-amount] -noise=__1__ 噪声 - -[entity-name] -wood-lab=木制研究中心 -peat=泥炭 -burner-agricultural-tower=热能农业塔 -burner-assembling-machine=热能组装机 -burner-long-handed-inserter=热能加长机械臂 -lumber-mill=木材加工厂 -gold-stromatolite=金叠层石 -gold-stromatolite-plant=金叠层石植物 -gold-stromatolite-lignumis=金叠层石 -gold-patch=金矿脉 -deep-miner=深层采矿机 -gold-pipe=金制管道 -gold-pipe-to-ground=金制地下管道 -gold-storage-tank=金制储液罐 -desiccation-furnace=干燥炉 -steam-assembling-machine=蒸汽组装机 -provisional-rocket-silo=临时火箭发射井 -basic-gun-turret=基础机枪炮塔 -basic-construction-robot-gold=基础建设机器人（金） -basic-construction-robot-copper=基础建设机器人（铜） -wood-transport-belt=木制传送带 -wood-underground-belt=木制地下传送带 -wood-splitter=木制分流器 -basic-radar=基础雷达 -active-noise-cancelling-tower=主动降噪塔 -quality-assembler=品质组装机 - -[entity-description] -quality-assembler=高品质的配方往往只需要朴素的方式制作。消耗[item=gold-quality-catalyst]，可以无条件提升一级产品的品质。 - -[equipment-name] -basic-portable-generator-equipment-gold=基础发电机模块 (金) -basic-portable-generator-equipment-copper=基础发电机模块 (铜) -basic-personal-roboport-equipment-gold=基础机器人指令模块（金） -basic-personal-roboport-equipment-copper=基础机器人指令模块（铜） - -[item-name] -wooden-gear-wheel=木齿轮 -wood-science-pack=木制科技包 -peat=泥炭 -gold-stromatolite-seed=金叠层石种子 -gold-ore=金矿 -gold-bacteria=金细菌 -gold-plate=金板 -gold-cable=金缆 -moist-stromatolite-remnant=湿叠层石残余物 -steam-science-pack=蒸汽科技包 -destination-nauvis=前往新地星 -lumber=木料 -basic-repair-pack=基础维修包 -cupriavidus-necator=钩虫贪铜菌 -dead-cupriavidus-necator=死钩虫贪铜菌 -gold-quality-catalyst=金品质催化剂 -wood-armor=木制装甲 -wood-darts-magazine=木镖弹匣 - -[item-description] -wooden-wall=使用木墙保护基地，防御土著的侵袭，同时降低噪音。 -destination-nauvis=将此物品放入火箭中，即可前往新地星。注意，你可能一段时间内回不来。\n__REMARK_COLOR_BEGIN__BETA 注意：背包中最多只能持有40堆叠的物品。目前前往新地星的方法是临时实现的。带一些资源有助于你在新地星上快速启动，生产铁板、铜板和木料。 - -[fluid-name] -wood-pulp=木浆 - -[recipe-name] -moist-stromatolite-remnant-desiccation=烘干湿叠层石残余物 -moist-stromatolite-remnant-desiccation-without-steam=烘干湿叠层石残余物 -gold-stromatolite-seed-to-peat=加工金叠层石种子 -wood-liquefaction=木材液化 -provisional-rocket-part=临时火箭组件 -wood-splitter-electronic-circuit=木制分流器 -lumber-mill-electronic-circuit=木材加工厂 -burner-agricultural-tower-electronic-circuit=热能农业塔 -cupriavidus-necator-starter=钩虫贪铜菌(启动培养) -plastic-from-cupriavidus-necator=生物塑料 -plastic-from-dead-cupriavidus-necator=生物塑料 -low-density-structure-gold=轻质框架 -rocket-fuel-from-wood-pulp-and-peat=生物火箭燃料 -nutrients-from-wood-pulp=木浆制营养素 -active-noise-cancelling=主动降噪 - -[recipe-description] -moist-stromatolite-remnant-desiccation-without-steam=用于平衡蒸汽的生产。 -gold-stromatolite-seed-to-peat=用于消耗多余的金叠层石种子。 - -[technology-name] -wood-science-pack=木制科技包 -burner-automation=热能自动化 -planet-discovery-nauvis=发现星球：新地星 -planet-discovery-lignumis=发现卫星：愈创星 -iron-processing=铁加工 -copper-processing=铜加工 -lumber-mill=木材加工厂 -deep-miner=深层采矿机 -gold-fluid-handling=金制设备流体处理 -steam-automation=蒸汽自动化 -steam-science-pack=蒸汽科技包 -wood-liquefaction=木材液化 -provisional-rocketry=临时火箭技术 -basic-gun-turret=基础机枪炮塔 -basic-construction-robotics-gold=基础建设机器人（金） -basic-construction-robotics-copper=基础建设机器人（铜） -wood-logistics=木制物流学 -automation=电力自动化 -tree-seeding=基础农业 -basic-repair-pack=基础维修包 -basic-radar=基础雷达 -active-noise-cancelling=主动降噪技术 -quality-assembler=品质组装机 - -[technology-description] -tree-seeding=使用[entity=burner-agricultural-tower]在可耕种的泥土上种植植物，并且自动收货。\n[entity=tree-plant]能够在草地和泥地上生长。[entity=gold-stromatolite]能够在[tile=natural-gold-soil]上生长。 -active-noise-cancelling=控制噪音。 -quality-assembler=使用愈创星上的特殊资源，可以制作高品质的产品。 - -[modifier-description] -basic-gun-turret-attack-bonus=基础机枪炮塔伤害：+__1__ - -[tile-name] -wood-floor=木地板 -natural-gold-soil=含金土壤 - -[fuel-category-name] -wood=木制燃料 -quality-catalyst=品质催化剂 - -[mod-setting-name] -lignumis-belt-progression=渐进式的传送带配方 -lignumis-inserter-progression=渐进式的机械臂配方 -lignumis-ammo-progression=渐进式的弹药配方 -[mod-setting-description] -lignumis-belt-progression=基础传送带需要木制传送带制作。 -lignumis-inserter-progression=电力机械臂需要热能机械臂制作。 -lignumis-ammo-progression=标准弹匣需要木镖弹匣制作。 - -[entity-status] -no-quality-catalyst=无品质催化剂 - -[description] -accepted-catalysts=接受的催化剂 -quality-catalyst-energy-value=品质提升能力 - -[gui] -quality-catalyst=品质催化剂 - -[lignumis] -start-new-game=愈创星扩充新地星了之前的早期游戏内容，推荐在新游戏中体验。 diff --git a/lignumis/migrations/lignumis-1.0.0.lua b/lignumis/migrations/lignumis-1.0.0.lua deleted file mode 100644 index f8b80f8..0000000 --- a/lignumis/migrations/lignumis-1.0.0.lua +++ /dev/null @@ -1,26 +0,0 @@ -local RocketSilo = require("scripts/wooden-rocket-silo") - -if not storage.rocket_silos then - storage.rocket_silos = {} -end - -if not game.planets["lignumis"] or not game.planets["lignumis"].surface then return end - -local lignumis = game.planets["lignumis"].surface - -for _, silo in pairs(lignumis.find_entities_filtered { name = "provisional-rocket-silo" }) do - local found = false - for _, entry in pairs(storage.rocket_silos) do - if type(entry) == "table" and entry.real_silo == silo then - found = true - break - end - end - if not found then - RocketSilo.events[defines.events.on_script_trigger_effect]({ - effect_id = "provisional-rocket-ready", - surface_index = lignumis.index, - cause_entity = silo - }) - end -end diff --git a/lignumis/prototypes/compatibility/alien-biomes.lua b/lignumis/prototypes/compatibility/alien-biomes.lua deleted file mode 100644 index ebc234e..0000000 --- a/lignumis/prototypes/compatibility/alien-biomes.lua +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua index c6832f0..9b936d5 100644 --- a/lignumis/prototypes/compatibility/data.lua +++ b/lignumis/prototypes/compatibility/data.lua @@ -1,4 +1 @@ -require("hot-metals") -require("wood-military") -require("metal-and-stars") -require("alien-biomes") \ No newline at end of file +require("hot-metals") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/hot-metals.lua b/lignumis/prototypes/compatibility/hot-metals.lua index 83ca8ec..7298a2f 100644 --- a/lignumis/prototypes/compatibility/hot-metals.lua +++ b/lignumis/prototypes/compatibility/hot-metals.lua @@ -1,3 +1,5 @@ -if not mods["hot-metals"] then return end +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 diff --git a/lignumis/prototypes/compatibility/metal-and-stars.lua b/lignumis/prototypes/compatibility/metal-and-stars.lua deleted file mode 100644 index 8e8dba5..0000000 --- a/lignumis/prototypes/compatibility/metal-and-stars.lua +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/lignumis/prototypes/content/active-noise-cancelling-tower.lua b/lignumis/prototypes/content/active-noise-cancelling-tower.lua deleted file mode 100644 index 79ad117..0000000 --- a/lignumis/prototypes/content/active-noise-cancelling-tower.lua +++ /dev/null @@ -1,154 +0,0 @@ -local hit_effects = require("__base__.prototypes.entity.hit-effects") -local sounds = require("__base__.prototypes.entity.sounds") -local item_sounds = require("__base__.prototypes.item_sounds") -local item_tints = require("__base__.prototypes.item-tints") - -data:extend({ - { - type = "recipe-category", - name = "active-noise-cancelling" - }, - { - type = "assembling-machine", - 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_draw_specification = { shift = { 0, -1 }, scale = 0.75, scale_for_many = 0.5 }, - flags = { "placeable-neutral", "player-creation" }, - minable = { mining_time = 0.1, result = "active-noise-cancelling-tower" }, - fast_replaceable_group = "active-noise-cancelling-tower", - max_health = 150, - crafting_speed = 1, - crafting_categories = { "active-noise-cancelling" }, - energy_usage = "2MW", - energy_source = { - type = "electric", - usage_priority = "secondary-input", - emissions_per_minute = { noise = -1000 }, - drain = "0W" - }, - fixed_recipe = "active-noise-cancelling", - is_military_target = true, - show_recipe_icon_on_map = true, - map_color = { r = 112, g = 61, b = 150, a = 1 }, - corpse = "programmable-speaker-remnants", - dying_explosion = "programmable-speaker-explosion", - collision_box = { { -0.3, -0.3 }, { 0.3, 0.3 } }, - selection_box = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - damaged_trigger_effect = hit_effects.entity({ { -0.2, -2 }, { 0.2, 0.2 } }), - drawing_box_vertical_extension = 2, - open_sound = sounds.machine_open, - close_sound = sounds.machine_close, - graphics_set = { - animation = { - layers = { - { - filename = "__base__/graphics/entity/programmable-speaker/programmable-speaker.png", - priority = "extra-high", - width = 59, - height = 178, - shift = util.by_pixel(-2.25, -39.5), - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/programmable-speaker/programmable-speaker-shadow.png", - priority = "extra-high", - width = 237, - height = 50, - shift = util.by_pixel(52.75, -3), - draw_as_shadow = true, - scale = 0.5 - } - } - } - }, - water_reflection = { - pictures = { - filename = "__base__/graphics/entity/programmable-speaker/programmable-speaker-reflection.png", - priority = "extra-high", - width = 12, - height = 24, - shift = util.by_pixel(0, 45), - variation_count = 1, - scale = 5 - }, - rotate = false, - orientation_to_variation = false - }, - surface_conditions = { { property = "pollutant-type", min = 3, max = 3 } } - }, - { - type = "item", - 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 } } - }, - subgroup = "circuit-network", - order = "d[other]-c[active-noise-cancelling-tower]", - inventory_move_sound = item_sounds.mechanical_inventory_move, - pick_sound = item_sounds.mechanical_inventory_pickup, - drop_sound = item_sounds.mechanical_inventory_move, - place_result = "active-noise-cancelling-tower", - stack_size = 10, - random_tint_color = item_tints.iron_rust - }, - { - type = "recipe", - name = "active-noise-cancelling-tower", - enabled = false, - energy_required = 20, - ingredients = { - { type = "item", name = "gold-plate", amount = 6 }, - { type = "item", name = "gold-cable", amount = 6 }, - { type = "item", name = "low-density-structure", amount = 4 }, - { type = "item", name = "processing-unit", amount = 8 } - }, - results = { { type = "item", name = "active-noise-cancelling-tower", amount = 1 } } - }, - { - type = "recipe", - name = "active-noise-cancelling", - icons = { { icon = "__lignumis__/graphics/icons/active-noise-cancelling.png" } }, - enabled = false, - energy_required = 1000000, - ingredients = {}, - results = {}, - category = "active-noise-cancelling", - hide_from_stats = true, - hide_from_player_crafting = true, - surface_conditions = { { property = "pollutant-type", min = 3, max = 3 } } - }, - { - type = "technology", - name = "active-noise-cancelling", - icon = "__lignumis__/graphics/technology/active-noise-cancelling.png", - icon_size = 128, - effects = { - { - type = "unlock-recipe", - recipe = "active-noise-cancelling-tower" - }, - { - type = "unlock-recipe", - recipe = "active-noise-cancelling" - } - }, - prerequisites = { "utility-science-pack" }, - unit = { - time = 60, - count = 500, - ingredients = { - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 }, - { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "space-science-pack", 1 }, - { "utility-science-pack", 1 } - } - } - } -}) diff --git a/lignumis/prototypes/content/basic-construction-robots.lua b/lignumis/prototypes/content/basic-construction-robots.lua index 3d58393..9cd765a 100644 --- a/lignumis/prototypes/content/basic-construction-robots.lua +++ b/lignumis/prototypes/content/basic-construction-robots.lua @@ -122,7 +122,6 @@ local function roboport(color) result.energy_source.input_flow_limit = "400kW" result.energy_source.buffer_capacity = "10MJ" result.charging_energy = "500kW" - result.construction_radius = 10 return result end diff --git a/lignumis/prototypes/content/basic-gun-turret.lua b/lignumis/prototypes/content/basic-gun-turret.lua index b9eb15a..8a6edb7 100644 --- a/lignumis/prototypes/content/basic-gun-turret.lua +++ b/lignumis/prototypes/content/basic-gun-turret.lua @@ -30,7 +30,7 @@ turret.folding_animation.layers[1].filename = "__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" -turret.attack_parameters.range = 18 +turret.attack_parameters.range = 16 local turret_item = { type = "item", diff --git a/lignumis/prototypes/content/basic-radar.lua b/lignumis/prototypes/content/basic-radar.lua index 469bc8b..ea92093 100644 --- a/lignumis/prototypes/content/basic-radar.lua +++ b/lignumis/prototypes/content/basic-radar.lua @@ -75,7 +75,6 @@ data:extend({ type = "recipe", name = "basic-radar", category = "crafting-with-fluid", - energy_required = 10, ingredients = { { type = "item", name = "stone-brick", amount = 4 }, { type = "item", name = "wooden-gear-wheel", amount = 4 }, diff --git a/lignumis/prototypes/content/basic-repair-pack.lua b/lignumis/prototypes/content/basic-repair-pack.lua index da6a1e7..991eea4 100644 --- a/lignumis/prototypes/content/basic-repair-pack.lua +++ b/lignumis/prototypes/content/basic-repair-pack.lua @@ -1,9 +1,6 @@ local item_sounds = require("__base__.prototypes.item_sounds") local item_tints = require("__base__.prototypes.item-tints") -local vanilla_repair_pack = data.raw["repair-tool"]["repair-pack"] -vanilla_repair_pack.default_import_location = vanilla_repair_pack.default_import_location or "nauvis" - data:extend({ { type = "repair-tool", @@ -17,8 +14,7 @@ data:extend({ speed = 1, durability = 150, stack_size = 100, - random_tint_color = item_tints.iron_rust, - default_import_location = "lignumis" + random_tint_color = item_tints.iron_rust }, { type = "recipe", diff --git a/lignumis/prototypes/content/burner-agricultural-tower.lua b/lignumis/prototypes/content/burner-agricultural-tower.lua index 4bec13f..c97bf69 100644 --- a/lignumis/prototypes/content/burner-agricultural-tower.lua +++ b/lignumis/prototypes/content/burner-agricultural-tower.lua @@ -1,16 +1,13 @@ local item_sounds = require("__base__.prototypes.item_sounds") -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.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" +agricultural_tower.graphics_set.animation.layers[1].filename = "__lignumis__/graphics/entity/burner-agricultural-tower-base.png" +agricultural_tower.graphics_set.working_visualisations[1].animation.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-base.png" agricultural_tower.energy_source = { type = "burner", fuel_categories = { "chemical" }, @@ -20,23 +17,19 @@ agricultural_tower.energy_source = { } agricultural_tower.resistances = nil agricultural_tower.input_inventory_size = 1 -agricultural_tower.output_inventory_size = 3 +agricultural_tower.output_inventory_size = 4 agricultural_tower.radius = 2 -agricultural_tower.surface_conditions[1].min = 900 local crane = agricultural_tower.crane -crane.parts[1].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-1-1.png", gfx .. -"burner-agricultural-tower-crane-1-2.png" } -crane.parts[2].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-3.png" -crane.parts[3].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-4.png" -crane.parts[4].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-5-1.png", gfx .. -"burner-agricultural-tower-crane-5-2.png" } -crane.parts[5].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-6.png" -crane.parts[6].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-7-1.png", gfx .. -"burner-agricultural-tower-crane-7-2.png" } -crane.parts[7].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-8.png" -crane.parts[8].sprite.filename = gfx .. "burner-agricultural-tower-crane-9.png" -crane.parts[9].sprite.filename = gfx .. "burner-agricultural-tower-crane-10.png" +crane.parts[1].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-1-1.png", "__lignumis__/graphics/entity/burner-agricultural-tower-crane-1-2.png" } +crane.parts[2].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-3.png" +crane.parts[3].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-4.png" +crane.parts[4].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-5-1.png", "__lignumis__/graphics/entity/burner-agricultural-tower-crane-5-2.png" } +crane.parts[5].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-6.png" +crane.parts[6].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-7-1.png", "__lignumis__/graphics/entity/burner-agricultural-tower-crane-7-2.png" } +crane.parts[7].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-8.png" +crane.parts[8].sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-9.png" +crane.parts[9].sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-10.png" crane.speed = { arm = { turn_rate = 0.001, @@ -53,7 +46,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.animation.filename = gfx .. "burner-agricultural-tower-remnants.png" +remnants.animation.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-remnants.png" remnants.order = "a[0-burner-agricultural-tower]" data:extend({ @@ -64,7 +57,7 @@ data:extend({ name = "burner-agricultural-tower", icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png", subgroup = "agriculture", - order = "0[burner-agricultural-tower]", + order = "a[0-burner-agricultural-tower]", inventory_move_sound = item_sounds.mechanical_large_inventory_move, pick_sound = item_sounds.mechanical_large_inventory_pickup, drop_sound = item_sounds.mechanical_large_inventory_move, @@ -77,27 +70,9 @@ data:extend({ name = "burner-agricultural-tower", energy_required = 10, ingredients = { - { type = "item", name = "stone-brick", amount = 5 }, + { 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 = "lumber", amount = 20 } }, results = { { type = "item", name = "burner-agricultural-tower", amount = 1 } }, enabled = false @@ -115,9 +90,4 @@ tech.unit = { time = 10 } -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" -}) +data.raw.technology["fish-breeding"].prerequisites = { "agricultural-science-pack" } \ No newline at end of file diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua index e121c90..1e25026 100644 --- a/lignumis/prototypes/content/burner-assembling-machine.lua +++ b/lignumis/prototypes/content/burner-assembling-machine.lua @@ -1,7 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") -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" @@ -10,7 +8,7 @@ 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" +"__lignumis__/graphics/entity/burner-assembling-machine.png" assembling_machine.crafting_categories = { "crafting", "basic-crafting", @@ -40,9 +38,9 @@ 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.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" +remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png" +remnants.animation[2].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png" +remnants.animation[3].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png" remnants.order = "0[burner-assembling-machine]" data:extend({ diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index 257c584..4c3621b 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -1,7 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") -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" @@ -9,10 +7,10 @@ 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" long_handed_inserter.resistances = nil -long_handed_inserter.hand_base_picture.filename = gfx .. "burner-long-handed-inserter-hand-base.png" -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.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-base.png" +long_handed_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-closed.png" +long_handed_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-open.png" +long_handed_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-platform.png" long_handed_inserter.energy_per_movement = "100kJ" long_handed_inserter.energy_per_rotation = "100kJ" long_handed_inserter.energy_source = { @@ -37,10 +35,10 @@ 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.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" -remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png" +remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" +remnants.animation[2].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" +remnants.animation[3].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" +remnants.animation[4].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" remnants.order = "a-c-0" data:extend({ diff --git a/lignumis/prototypes/content/data.lua b/lignumis/prototypes/content/data.lua index 42fdb57..ad11f52 100644 --- a/lignumis/prototypes/content/data.lua +++ b/lignumis/prototypes/content/data.lua @@ -23,10 +23,5 @@ require("lumber") require("wood-logistics") require("basic-repair-pack") require("basic-radar") -require("mid-game-recipes") -require("active-noise-cancelling-tower") -require("quality-assembler") -require("decoratives") -require("wood-military") require("noise") diff --git a/lignumis/prototypes/content/decoratives.lua b/lignumis/prototypes/content/decoratives.lua deleted file mode 100644 index 90d3c79..0000000 --- a/lignumis/prototypes/content/decoratives.lua +++ /dev/null @@ -1,23 +0,0 @@ -local sounds = require("__base__.prototypes.entity.sounds") - -data:extend({ - { - name = "gold-rock-cluster", - type = "optimized-decorative", - order = "a[lignumis]-a[decorative]-a[gold-rock-clusters]", - collision_box = { { -1, -1 }, { 1, 1 } }, - collision_mask = { layers = { water_tile = true, doodad = true }, colliding_with_tiles_only = true }, - render_layer = "decorative", - walking_sound = sounds.sand, - autoplace = { - order = "d[ground-surface]-b[sulfur-rock]-b[cluster]", - placement_density = 1, - probability_expression = - "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 3000000, input_scale = 1/8, output_scale = 1/4}", - tile_restriction = { "natural-gold-soil" } - }, - pictures = get_decal_pictures( - "__space-age__/graphics/decorative/tiny-volcanic-rock-cluster/tiny-volcanic-rock-cluster-", "", 128, 8, - { 0.788, 0.627, 0.167 }, true) - } -}) diff --git a/lignumis/prototypes/content/deep-miner.lua b/lignumis/prototypes/content/deep-miner.lua index 8f8db39..cf42147 100644 --- a/lignumis/prototypes/content/deep-miner.lua +++ b/lignumis/prototypes/content/deep-miner.lua @@ -4,41 +4,31 @@ local DeepMiner = DeepMinerFactory("deep-miner") local entity = DeepMiner.EntityBuilder:new():build({ resource_searching_radius = 0.49, energy_usage = "25MW", - mining_speed = 7.5, - energy_source = { - emissions_per_minute = { noise = 2000 } - }, - resource_drain_rate_percent = 75 + mining_speed = 30, + energySource = { + emissions_per_minute = { noise = 500 } + } }) entity.resource_categories = { "deep-mining" } data:extend({ entity }) -DeepMiner.ItemBuilder:new() - :itemsPerRocket(1) - :apply({ - subgroup = "extraction-machine", - order = "a[items]-d[deep-miner]" - }) +DeepMiner.ItemBuilder:new():apply() DeepMiner.RecipeBuilder:new() :ingredients({ - { type = "item", name = "processing-unit", amount = 100 }, - { type = "item", name = "electric-engine-unit", amount = 100 }, - { type = "item", name = "steel-plate", amount = 200 }, - { type = "item", name = "concrete", amount = 50 } - }) - :apply({ - category = "metallurgy-or-assembling" + { type = "item", name = "iron-plate", amount = 100 } }) + :apply() DeepMiner.TechnologyBuilder:new() :prerequisites({ "space-science-pack" }) :count(500) :ingredients({ { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "space-science-pack", 1 } + { "logistic-science-pack", 1 }, + { "chemical-science-pack", 1 }, + { "production-science-pack", 1 }, + { "space-science-pack", 1 } }) :time(60) :apply() diff --git a/lignumis/prototypes/content/desiccation-furnace.lua b/lignumis/prototypes/content/desiccation-furnace.lua index 7f2f583..b64bb17 100644 --- a/lignumis/prototypes/content/desiccation-furnace.lua +++ b/lignumis/prototypes/content/desiccation-furnace.lua @@ -1,18 +1,12 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local pipecovers = require("prototypes/content/gold/pipecovers") -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 = "__base__/graphics/icons/fluid/steam.png", scale = 0.25, shift = { 8, -8 } } -} furnace.fluid_boxes = { { - volume = 100, - pipe_picture = machinepipes(), - pipe_covers = pipecovers(), + volume = 50, + pipe_picture = assembler2pipepictures(), + pipe_covers = pipecoverspictures(), pipe_connections = { { flow_direction = "output", direction = defines.direction.east, position = { 0.5, 0.5 } } }, @@ -20,8 +14,6 @@ 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.fluid_boxes[1].pipe_covers.north.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" @@ -36,7 +28,7 @@ local furnace_item = { type = "item", name = "desiccation-furnace", icons = { - { icon = "__lignumis__/graphics/icons/stone-furnace.png" }, + { icon = "__base__/graphics/icons/stone-furnace.png" }, { icon = "__base__/graphics/icons/fluid/steam.png", scale = 0.25, shift = { 8, -8 } } }, subgroup = "smelting-machine", @@ -67,4 +59,4 @@ data:extend({ furnace, furnace_item, furnace_recipe -}) +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/final.lua b/lignumis/prototypes/content/final.lua deleted file mode 100644 index 99a684a..0000000 --- a/lignumis/prototypes/content/final.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Override science packs in final fixes in the case other mods add their science packs to all labs in a generic way -data.raw.lab["wood-lab"].inputs = { - "wood-science-pack", - "steam-science-pack", - "automation-science-pack", - "logistic-science-pack" -} \ No newline at end of file diff --git a/lignumis/prototypes/content/fuel-category-updates.lua b/lignumis/prototypes/content/fuel-category-updates.lua index b2cb932..3002887 100644 --- a/lignumis/prototypes/content/fuel-category-updates.lua +++ b/lignumis/prototypes/content/fuel-category-updates.lua @@ -16,22 +16,16 @@ local blacklist = {} function update_fuel_categories(t) for _, entity in pairs(t) do - for _, energy_source in pairs({ "energy_source", "burner" }) do - if entity[energy_source] - and entity[energy_source].type == "burner" - and not table.contains(blacklist, entity.name) - and entity[energy_source].fuel_categories - and table.contains(entity[energy_source].fuel_categories, "chemical") - then - table.insert(entity[energy_source].fuel_categories, "wood") - end + if entity.energy_source + and entity.energy_source.type == "burner" + and not table.contains(blacklist, entity.name) + and entity.energy_source.fuel_categories + and table.contains(entity.energy_source.fuel_categories, "chemical") + then + table.insert(entity.energy_source.fuel_categories, "wood") end end end -- Add more if incompatibilities arise update_fuel_categories(data.raw["boiler"]) -update_fuel_categories(data.raw["reactor"]) -update_fuel_categories(data.raw["car"]) -update_fuel_categories(data.raw["locomotive"]) -update_fuel_categories(data.raw["generator-equipment"]) diff --git a/lignumis/prototypes/content/gold/intermediates.lua b/lignumis/prototypes/content/gold/intermediates.lua index b2440f1..3e0e3d4 100644 --- a/lignumis/prototypes/content/gold/intermediates.lua +++ b/lignumis/prototypes/content/gold/intermediates.lua @@ -1,5 +1,4 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local Technology = require("__cf-lib__/data/Technology") data:extend({ { @@ -42,58 +41,5 @@ data:extend({ ingredients = { { type = "item", name = "gold-plate", amount = 1 } }, results = { { type = "item", name = "gold-cable", amount = 2 } }, allow_productivity = true - }, - { - type = "fluid", - name = "molten-gold", - icon = "__lignumis__/graphics/icons/molten-gold.png", - subgroup = "fluid", - order = "b[new-fluid]-0[lignumis]-a[molten-gold]", - default_temperature = 1500, - max_temperature = 2000, - heat_capacity = "0.01kJ", - base_color = { 210, 149, 34 }, - flow_color = { 210, 149, 34 }, - auto_barrel = false - }, - { - type = "recipe", - name = "molten-gold", - category = "metallurgy", - subgroup = "vulcanus-processes", - order = "a[melting]-d[molten-gold]", - auto_recycle = false, - enabled = false, - ingredients = { - { type = "item", name = "gold-ore", amount = 50 }, - { type = "item", name = "calcite", amount = 1 }, - }, - energy_required = 32, - results = { - { type = "fluid", name = "molten-gold", amount = 500 }, - }, - allow_productivity = true, - hide_from_signal_gui = false, - main_product = "molten-gold" - }, - { - type = "recipe", - name = "casting-gold", - category = "metallurgy", - subgroup = "vulcanus-processes", - order = "b[casting]-c[casting-gold]", - icon = "__lignumis__/graphics/icons/casting-gold.png", - enabled = false, - ingredients = { - { type = "fluid", name = "molten-gold", amount = 20, fluidbox_multiplier = 10 }, - }, - energy_required = 3.2, - allow_decomposition = false, - results = { { type = "item", name = "gold-plate", amount = 2 } }, - allow_productivity = true } }) - -local foundry_technology = Technology:new("foundry") -foundry_technology:addRecipe("casting-gold") -foundry_technology:addRecipe("molten-gold") \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/machinepipes.lua b/lignumis/prototypes/content/gold/machinepipes.lua deleted file mode 100644 index e5f44e4..0000000 --- a/lignumis/prototypes/content/gold/machinepipes.lua +++ /dev/null @@ -1,41 +0,0 @@ -return function() - return - { - north = - { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-N.png", - priority = "extra-high", - width = 71, - height = 38, - shift = util.by_pixel(2.25, 13.5), - scale = 0.5 - }, - east = - { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-E.png", - priority = "extra-high", - width = 42, - height = 76, - shift = util.by_pixel(-24.5, 1), - scale = 0.5 - }, - south = - { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-S.png", - priority = "extra-high", - width = 88, - height = 61, - shift = util.by_pixel(0, -31.25), - scale = 0.5 - }, - west = - { - filename = "__lignumis__/graphics/entity/gold-pipe/machine-gold-pipe-W.png", - priority = "extra-high", - width = 39, - height = 73, - shift = util.by_pixel(25.75, 1.25), - scale = 0.5 - } - } -end \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/pipecovers.lua b/lignumis/prototypes/content/gold/pipecovers.lua deleted file mode 100644 index c22936e..0000000 --- a/lignumis/prototypes/content/gold/pipecovers.lua +++ /dev/null @@ -1,81 +0,0 @@ -return function() - return - { - north = { - layers = { - { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-north-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - } - } - }, - east = { - layers = { - { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-east.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-east-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - } - } - }, - south = { - layers = { - { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-south.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-south-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - } - } - }, - west = { - layers = { - { - filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-west.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5 - }, - { - filename = "__base__/graphics/entity/pipe-covers/pipe-cover-west-shadow.png", - priority = "extra-high", - width = 128, - height = 128, - scale = 0.5, - draw_as_shadow = true - } - } - } - } -end diff --git a/lignumis/prototypes/content/gold/pipes.lua b/lignumis/prototypes/content/gold/pipes.lua index 5c631c1..05521b0 100644 --- a/lignumis/prototypes/content/gold/pipes.lua +++ b/lignumis/prototypes/content/gold/pipes.lua @@ -2,7 +2,6 @@ local item_sounds = require("__base__.prototypes.item_sounds") local item_tints = require("__base__.prototypes.item-tints") local hit_effects = require("__base__.prototypes.entity.hit-effects") local sounds = require("__base__.prototypes.entity.sounds") -local pipecovers = require("prototypes/content/gold/pipecovers") function make_rotated_animation_variations_from_sheet(variation_count, sheet) --makes remnants work with more than 1 variation local result = {} @@ -127,12 +126,8 @@ 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 +pipe_to_ground.fluid_box.pipe_connections[2].max_underground_distance = 6 pipe_to_ground.minable.result = "gold-pipe-to-ground" -for _, connection in pairs(pipe_to_ground.fluid_box.pipe_connections) do - if connection.connection_type == "underground" then - connection.max_underground_distance = 6 - end -end pipe_to_ground.fluid_box.pipe_covers.north.layers[1].filename = "__lignumis__/graphics/entity/gold-pipe/gold-pipe-cover-north.png" @@ -217,7 +212,7 @@ local tank = { damaged_trigger_effect = hit_effects.entity(), fluid_box = { volume = 10000, - pipe_covers = pipecovers(), + pipe_covers = pipecoverspictures(), pipe_connections = { { direction = defines.direction.north, position = { 0.5, -0.5 } }, { direction = defines.direction.east, position = { 0.5, -0.5 } }, @@ -231,7 +226,7 @@ local tank = { picture = { sheets = { { - filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank.png", + filename = "__lignumis__/graphics/entity/gold-storage-tank.png", priority = "extra-high", width = 128, height = 160, @@ -240,7 +235,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.png", priority = "extra-high", y = 160, width = 160, @@ -253,7 +248,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-window-background.png", priority = "extra-high", width = 20, height = 41, @@ -380,7 +375,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-remnants.png", line_length = 1, width = 284, height = 188, diff --git a/lignumis/prototypes/content/gold/stromatolite.lua b/lignumis/prototypes/content/gold/stromatolite.lua index 9fdb060..ee08f86 100644 --- a/lignumis/prototypes/content/gold/stromatolite.lua +++ b/lignumis/prototypes/content/gold/stromatolite.lua @@ -5,7 +5,7 @@ stromatolite.name = "gold-stromatolite" 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}", + "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/8, output_scale = 1/3}", tile_restriction = { "natural-gold-soil" } } stromatolite.collision_mask = table.deepcopy(data.raw["plant"]["tree-plant"].collision_mask) @@ -13,12 +13,12 @@ stromatolite.mining_time = 2 stromatolite.minable.results = { { type = "item", name = "gold-ore", amount_min = 1, amount_max = 7 }, { type = "item", name = "gold-bacteria", amount_min = 3, amount_max = 9 }, - { type = "item", name = "gold-stromatolite-seed", amount = 1, probability = 0.2 } + { type = "item", name = "gold-stromatolite-seed", amount = 1, probability = 0.1 } } 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-01.png", width = 209, height = 138, shift = { 0.304688, -0.4 }, @@ -26,105 +26,105 @@ stromatolite.pictures = { }, { - filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-02.png", + filename = "__lignumis__/graphics/entity/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-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-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-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-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-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-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-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-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-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-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-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-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-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-16.png", width = 209, height = 154, shift = { 0.351562, -0.1 }, @@ -145,9 +145,9 @@ plant.minable = { mining_particle = "copper-ore-particle", mining_time = 2, results = { - { type = "item", name = "moist-stromatolite-remnant", amount = 25 }, - { type = "item", name = "gold-bacteria", amount = 15 }, - { type = "item", name = "gold-stromatolite-seed", amount_min = 1, amount_max = 3 } + { type = "item", name = "moist-stromatolite-remnant", amount_min = 23, amount_max = 37 }, + { type = "item", name = "gold-bacteria", amount_min = 13, amount_max = 17 }, + { type = "item", name = "gold-stromatolite-seed", amount_min = 1, amount_max = 2 } } } plant.growth_ticks = 20 * minute @@ -161,7 +161,6 @@ plant.autoplace = { probability_expression = "0", tile_restriction = { "natural-gold-soil" } } -plant.surface_conditions[1].min = 900 local seed = { type = "item", @@ -244,10 +243,10 @@ local desiccation_recipe = { subgroup = "raw-material", order = "b0[desiccation]", energy_required = 9.6, - ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 6 } }, + ingredients = { { type = "item", name = "moist-stromatolite-remnant", amount = 2 } }, results = { { type = "item", name = "peat", amount = 1 }, - { type = "fluid", name = "steam", amount = 60, temperature = 165 } + { type = "fluid", name = "steam", amount = 20, temperature = 165 } }, enabled = false } diff --git a/lignumis/prototypes/content/gold/tiles.lua b/lignumis/prototypes/content/gold/tiles.lua index a8bd838..ae1833e 100644 --- a/lignumis/prototypes/content/gold/tiles.lua +++ b/lignumis/prototypes/content/gold/tiles.lua @@ -35,7 +35,7 @@ data:extend({ 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 }, + map_color = { 185, 166, 5 }, scorch_mark_color = { r = 0.329, g = 0.242 * 2, b = 0.177, a = 1.000 }, autoplace = { probability_expression = diff --git a/lignumis/prototypes/content/lignumis/mapgen.lua b/lignumis/prototypes/content/lignumis/mapgen.lua index c757597..398b647 100644 --- a/lignumis/prototypes/content/lignumis/mapgen.lua +++ b/lignumis/prototypes/content/lignumis/mapgen.lua @@ -1,6 +1,6 @@ return { aux_climate_control = false, - moisture_climate_control = true, + moisture_climate_control = false, property_expression_names = { -- Warning: anything set here overrides any selections made in the map setup screen so the options do nothing. --cliff_elevation = "cliff_elevation_nauvis", --cliffiness = "cliffiness_nauvis", @@ -16,11 +16,10 @@ return { ["lignumis_peat"] = { richness = 1/2, frequency = 6, size = 2 }, ["stone"] = { richness = 1/6, frequency = 4, size = 4 }, ["water"] = {}, - ["trees"] = { richness = 3, frequency = 4, size = 3 }, + ["trees"] = {}, ["enemy-base"] = {}, ["rocks"] = {}, - ["starting_area_moisture"] = { size = 1, richness = 6 }, - ["nauvis_cliff"] = { frequency = 2, size = 2 } + ["nauvis_cliff"] = {} }, autoplace_settings = { ["tile"] = { @@ -60,12 +59,7 @@ return { ["green-bush-mini"] = {}, ["medium-rock"] = {}, ["small-rock"] = {}, - ["tiny-rock"] = {}, - ["knobbly-roots"] = {}, - ["crater-large"] = {}, - ["crater-small"] = {}, - ["waves-decal"] = {}, - ["gold-rock-cluster"] = {} + ["tiny-rock"] = {} } }, ["entity"] = { diff --git a/lignumis/prototypes/content/lignumis/planet.lua b/lignumis/prototypes/content/lignumis/planet.lua index 6579879..491fed2 100644 --- a/lignumis/prototypes/content/lignumis/planet.lua +++ b/lignumis/prototypes/content/lignumis/planet.lua @@ -4,42 +4,30 @@ local procession_graphic_catalogue_types = require("__base__/prototypes/planet/p local asteroid_util = require("__space-age__/prototypes/planet/asteroid-spawn-definitions") local lignumis_chunks = 0.025 -local lignumis_ratio = {1, 1, 1 , 0} local nauvis_lignumis = { probability_on_range_chunk = { { position = 0.1, probability = asteroid_util.nauvis_chunks, angle_when_stopped = asteroid_util.chunk_angle }, - { position = 0.9, probability = lignumis_chunks, angle_when_stopped = asteroid_util.chunk_angle } + { position = 0.9, probability = lignumis_chunks, angle_when_stopped = asteroid_util.chunk_angle } }, type_ratios = { { position = 0.1, ratios = asteroid_util.nauvis_ratio }, - { position = 0.9, ratios = lignumis_ratio }, + { position = 0.9, ratios = asteroid_util.nauvis_ratio }, } } -PlanetsLib:extend({ +data:extend({ { type = "planet", name = "lignumis", - orbit = { - parent = { - type = "planet", - name = "nauvis" - }, - distance = 2, - orientation = 0.16, - sprite = { - type = "sprite", - 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", - starmap_icon_size = 2048, + starmap_icon_size = 512, gravity_pull = 4, - order = "a[nauvis]-a[lignumis]", + distance = 16.5, + orientation = 0.2625, + magnitude = 0.35, + order = "a[lignumis]", + subgroup = "planets", map_seed_offset = 100, map_gen_settings = planet_map_gen, pollutant_type = "noise", @@ -50,10 +38,7 @@ PlanetsLib:extend({ departure = { "default-rocket-a" } }, surface_properties = { - ["day-night-cycle"] = 2 * minute, - ["gravity"] = 4, - ["pressure"] = 900, - ["solar-power"] = 120 + ["day-night-cycle"] = 1 * minute }, asteroid_spawn_influence = 1, asteroid_spawn_definitions = asteroid_util.spawn_definitions(nauvis_lignumis, 0.9), @@ -61,7 +46,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 = "__base__/sound/world/world_base_wind.ogg", volume = 0.3 }, wind = { filename = "__base__/sound/wind/wind.ogg", volume = 0.8 }, crossfade = { order = { "wind", "base_ambience" }, @@ -73,39 +58,36 @@ PlanetsLib:extend({ procession_graphic_catalogue = { { index = procession_graphic_catalogue_types.planet_hatch_emission_in_1, - sprite = util.sprite_load( - "__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-A", - { - priority = "medium", - draw_as_glow = true, - blend_mode = "additive", - scale = 0.5, - shift = util.by_pixel(-16, 96) --32 x ({0.5, -3.5} + {0, 0.5}) - }) + sprite = util.sprite_load("__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-A", + { + priority = "medium", + draw_as_glow = true, + blend_mode = "additive", + scale = 0.5, + shift = util.by_pixel(-16, 96) --32 x ({0.5, -3.5} + {0, 0.5}) + }) }, { index = procession_graphic_catalogue_types.planet_hatch_emission_in_2, - sprite = util.sprite_load( - "__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-B", - { - priority = "medium", - draw_as_glow = true, - blend_mode = "additive", - scale = 0.5, - shift = util.by_pixel(-64, 96) --32 x ({2, -3.5} + {0, 0.5}) - }) + sprite = util.sprite_load("__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-B", + { + priority = "medium", + draw_as_glow = true, + blend_mode = "additive", + scale = 0.5, + shift = util.by_pixel(-64, 96) --32 x ({2, -3.5} + {0, 0.5}) + }) }, { index = procession_graphic_catalogue_types.planet_hatch_emission_in_3, - sprite = util.sprite_load( - "__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-C", - { - priority = "medium", - draw_as_glow = true, - blend_mode = "additive", - scale = 0.5, - shift = util.by_pixel(-40, 64) --32 x ({1.25, -2.5} + {0, 0.5}) - }) + sprite = util.sprite_load("__base__/graphics/entity/cargo-hubs/hatches/planet-lower-hatch-pod-emission-C", + { + priority = "medium", + draw_as_glow = true, + blend_mode = "additive", + scale = 0.5, + shift = util.by_pixel(-40, 64) --32 x ({1.25, -2.5} + {0, 0.5}) + }) } } } @@ -122,44 +104,4 @@ data:extend({ length = 2000, asteroid_spawn_definitions = asteroid_util.spawn_definitions(nauvis_lignumis) }, - { - type = "ambient-sound", - name = "lignumis-1", - track_type = "main-track", - planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-1.ogg", - weight = 10 - }, - { - type = "ambient-sound", - name = "lignumis-2", - track_type = "main-track", - planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-2.ogg", - weight = 10 - }, - { - type = "ambient-sound", - name = "lignumis-3", - track_type = "main-track", - planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-3.ogg", - weight = 7 - }, - { - type = "ambient-sound", - name = "lignumis-4", - track_type = "main-track", - planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-4.ogg", - weight = 8 - }, - { - type = "ambient-sound", - name = "lignumis-5", - track_type = "main-track", - planet = "lignumis", - sound = "__lignumis__/sound/music/lignumis-5.ogg", - weight = 4 - } -}) +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber-mill.lua b/lignumis/prototypes/content/lumber-mill.lua index 44f4aae..c84e0f8 100644 --- a/lignumis/prototypes/content/lumber-mill.lua +++ b/lignumis/prototypes/content/lumber-mill.lua @@ -15,14 +15,13 @@ LumberMill.EntityBuilder:new() :baseProductivity(0.5) :apply({ crafting_categories = { "wood-processing-or-assembling" }, - crafting_speed = 2, + crafting_speed = 4, energy_usage = "1000kW", }) -local lumber_mill_item = LumberMill.ItemBuilder:new() +LumberMill.ItemBuilder:new() :apply({ - default_import_location = "lignumis", - order = "2[lumber-mill]" + default_import_location = "lignumis" }) LumberMill.RecipeBuilder:new() @@ -42,26 +41,4 @@ LumberMill.TechnologyBuilder:new() :count(250) :time(15) :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 } } - } - }) - -table.insert(data.raw.technology["electronics"].effects, { - type = "unlock-recipe", - recipe = "lumber-mill-electronic-circuit" -}) + :apply() \ No newline at end of file diff --git a/lignumis/prototypes/content/lumber.lua b/lignumis/prototypes/content/lumber.lua index 0991942..9c1be4d 100644 --- a/lignumis/prototypes/content/lumber.lua +++ b/lignumis/prototypes/content/lumber.lua @@ -28,6 +28,6 @@ data:extend({ allow_as_intermediate = true, ingredients = { { type = "item", name = "wood", amount = 2 } }, results = { { type = "item", name = "lumber", amount = 1 } }, - energy_required = 1 + energy_required = 2 } }) diff --git a/lignumis/prototypes/content/mid-game-recipes.lua b/lignumis/prototypes/content/mid-game-recipes.lua deleted file mode 100644 index 7dec68e..0000000 --- a/lignumis/prototypes/content/mid-game-recipes.lua +++ /dev/null @@ -1,255 +0,0 @@ -local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") -local Technology = require("__cf-lib__/data/Technology") - -data:extend({ - { - type = "recipe", - name = "cupriavidus-necator-starter", - category = "organic-or-chemistry", - energy_required = 12.8, - enabled = false, - ingredients = { - { type = "item", name = "peat", amount = 10 }, - { type = "item", name = "gold-stromatolite-seed", amount = 1 }, - { type = "fluid", name = "wood-pulp", amount = 100 }, - { type = "fluid", name = "water", amount = 100 } - }, - 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 } } - }, - crafting_machine_tint = { - primary = { r = 1.000, g = 1.000, b = 1.000, a = 1.000 }, -- #fefeffff - secondary = { r = 0.771, g = 0.771, b = 0.771, a = 1.000 }, -- #c4c4c4ff - tertiary = { r = 0.768, g = 0.665, b = 0.762, a = 1.000 }, -- #c3a9c2ff - quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff - }, - enabled = false, - allow_quality = false, - preserve_products_in_machine_output = true, - order = "0[lignumis]-b[cupriavidus-necator-starter]", - }, - { - type = "recipe", - name = "cupriavidus-necator", - category = "organic-or-chemistry", - energy_required = 12.8, - enabled = false, - ingredients = { - { type = "fluid", name = "wood-pulp", amount = 40 }, - { type = "fluid", name = "water", amount = 100 }, - { type = "item", name = "cupriavidus-necator", amount = 10 }, - }, - results = { - { type = "item", name = "cupriavidus-necator", amount_min = 10, amount_max = 80, ignored_by_productivity = 1 } - }, - result_is_always_fresh = true, - crafting_machine_tint = { - primary = { r = 1.000, g = 1.000, b = 1.000, a = 1.000 }, -- #fefeffff - secondary = { r = 0.771, g = 0.771, b = 0.771, a = 1.000 }, -- #c4c4c4ff - tertiary = { r = 0.768, g = 0.665, b = 0.762, a = 1.000 }, -- #c3a9c2ff - quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff - }, - enabled = false, - allow_productivity = true, - preserve_products_in_machine_output = true - }, - { - type = "item", - name = "cupriavidus-necator", - 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 }, - }, - stack_size = 1000, - spoil_result = "dead-cupriavidus-necator", - spoil_ticks = 2 * 60 * 60, - 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", - order = "0[lignumis]-c1[cupriavidus-necator]", - default_import_location = "lignumis", - weight = 1 * kg - }, - { - type = "item", - name = "dead-cupriavidus-necator", - 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 }, - }, - 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", - order = "0[lignumis]-c2[dead-cupriavidus-necator]", - default_import_location = "lignumis", - weight = 1 * kg - }, - { - type = "recipe", - name = "plastic-from-cupriavidus-necator", - 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 } } - }, - energy_required = 12.8, - enabled = false, - auto_recycle = false, - ingredients = { { type = "item", name = "cupriavidus-necator", amount = 100 } }, - results = { - { type = "item", name = "plastic-bar", amount_min = 1, amount_max = 20 }, - { type = "fluid", name = "wood-pulp", amount = 10, ignore_productivity = 10 } - }, - crafting_machine_tint = { - primary = { r = 1.000, g = 1.000, b = 1.000, a = 1.000 }, -- #fefeffff - secondary = { r = 0.771, g = 0.771, b = 0.771, a = 1.000 }, -- #c4c4c4ff - tertiary = { r = 0.768, g = 0.665, b = 0.762, a = 1.000 }, -- #c3a9c2ff - quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff - }, - enabled = false, - subgroup = "agriculture-processes", - order = "0[lignumis]-d1[plastic]", - allow_productivity = true - }, - { - type = "recipe", - name = "plastic-from-dead-cupriavidus-necator", - 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 } } - }, - energy_required = 12.8, - enabled = false, - auto_recycle = false, - ingredients = { { type = "item", name = "dead-cupriavidus-necator", amount = 100 } }, - results = { - { type = "item", name = "plastic-bar", amount_min = 1, amount_max = 14 }, - { type = "fluid", name = "wood-pulp", amount = 7, ignore_productivity = 7 } - }, - crafting_machine_tint = { - primary = { r = 1.000, g = 1.000, b = 1.000, a = 1.000 }, -- #fefeffff - secondary = { r = 0.771, g = 0.771, b = 0.771, a = 1.000 }, -- #c4c4c4ff - tertiary = { r = 0.768, g = 0.665, b = 0.762, a = 1.000 }, -- #c3a9c2ff - quaternary = { r = 0.000, g = 0.000, b = 0.000, a = 1.000 }, -- #000000ff - }, - enabled = false, - subgroup = "agriculture-processes", - order = "0[lignumis]-d2[plastic]", - allow_productivity = true - }, - { - type = "recipe", - name = "low-density-structure-gold", - category = "crafting", - energy_required = 15, - enabled = false, - auto_recycle = false, - ingredients = { - { type = "item", name = "gold-plate", amount = 20 }, - { type = "item", name = "plastic-bar", amount = 7 }, - { type = "item", name = "lumber", amount = 4 } - }, - results = { { type = "item", name = "low-density-structure", amount = 2 } }, - 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 } } - } - }, - { - type = "recipe", - name = "nutrients-from-wood-pulp", - category = "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, - icons = { - { icon = "__space-age__/graphics/icons/nutrients.png" }, - { icon = "__base__/graphics/icons/wood.png", scale = 0.25, shift = { 8, 8 } } - }, - order = "0[lignumis]-a[nutrients]", - }, - { - type = "recipe", - name = "rocket-fuel-from-wood-pulp-and-peat", - energy_required = 15, - enabled = false, - auto_recycle = false, - category = "crafting-with-fluid", - ingredients = - { - { type = "item", name = "peat", amount = 9 }, - { type = "fluid", name = "wood-pulp", amount = 45 } - }, - results = { { type = "item", name = "rocket-fuel", amount = 1 } }, - crafting_machine_tint = - { - primary = { r = 1.0, g = 0.7, b = 0.0, a = 1.000 }, - secondary = { r = 1.0, g = 0.7, b = 0.0, a = 1.000 }, - }, - 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 } } - }, - subgroup = "agriculture-processes", - order = "0[lignumis]-e[rocket-fuel]", - } -}) - -local plastics = Technology:new("plastics") -plastics:addRecipe("cupriavidus-necator-starter") -plastics:addRecipe("cupriavidus-necator") -plastics:addRecipe("plastic-from-cupriavidus-necator") -plastics:addRecipe("plastic-from-dead-cupriavidus-necator") - -local lds = Technology:new("low-density-structure") -lds:addRecipe("low-density-structure-gold") - -local rocket_fuel = Technology:new("rocket-fuel") -rocket_fuel:addRecipe("rocket-fuel-from-wood-pulp-and-peat") - -local agriculture = Technology:new("agriculture") -agriculture:addRecipe("nutrients-from-wood-pulp") - -local plastic_productivity = Technology:new("plastic-bar-productivity") -plastic_productivity:addEffect({ - type = "change-recipe-productivity", - recipe = "plastic-from-cupriavidus-necator", - change = 0.1 -}) -plastic_productivity:addEffect({ - type = "change-recipe-productivity", - recipe = "plastic-from-dead-cupriavidus-necator", - change = 0.1 -}) - -local lds_productivity = Technology:new("low-density-structure-productivity") -lds_productivity:addEffect({ - type = "change-recipe-productivity", - recipe = "low-density-structure-gold", - change = 0.1 -}) - -local rocket_fuel_productivity = Technology:new("rocket-fuel-productivity") -rocket_fuel_productivity:addEffect({ - type = "change-recipe-productivity", - recipe = "rocket-fuel-from-wood-pulp-and-peat", - change = 0.1 -}) \ No newline at end of file diff --git a/lignumis/prototypes/content/noise.lua b/lignumis/prototypes/content/noise.lua index db5b72d..f5b458c 100644 --- a/lignumis/prototypes/content/noise.lua +++ b/lignumis/prototypes/content/noise.lua @@ -1,27 +1,14 @@ --- 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", + filename = "__core__/graphics/icons/mip/side-map-menu-buttons.png", priority = "high", size = 64, + mipmap_count = 2, + y = 3 * 64, flags = { "gui-icon" } }, affects_evolution = true, @@ -29,30 +16,25 @@ data:extend({ } }) - --- 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 +data.raw["unit-spawner"]["spitter-spawner"].absorptions_per_second.noise = { absolute = 20, proportional = 0.01 } +data.raw["unit-spawner"]["biter-spawner"].absorptions_per_second.noise = { absolute = 20, proportional = 0.01 } +data.raw["unit"]["small-biter"].absorptions_to_join_attack.noise = 4 +data.raw["unit"]["medium-biter"].absorptions_to_join_attack.noise = 20 +data.raw["unit"]["big-biter"].absorptions_to_join_attack.noise = 80 +data.raw["unit"]["behemoth-biter"].absorptions_to_join_attack.noise = 400 +data.raw["unit"]["small-spitter"].absorptions_to_join_attack.noise = 4 +data.raw["unit"]["medium-spitter"].absorptions_to_join_attack.noise = 12 +data.raw["unit"]["big-spitter"].absorptions_to_join_attack.noise = 30 +data.raw["unit"]["behemoth-spitter"].absorptions_to_join_attack.noise = 200 for _, tree in pairs(data.raw.tree) do - emit_constant("tree", tree.name, -6) + if tree.emissions_per_second then + tree.emissions_per_second.noise = -0.1 + end end -emit_constant("plant", "tree-plant", -6) - --- Tiles absorb noise +data.raw.furnace["stone-furnace"].energy_source.emissions_per_minute.noise = 10 +data.raw["mining-drill"]["burner-mining-drill"].energy_source.emissions_per_minute.noise = 50 local tiles = {"grass-1", "grass-2", "grass-3", "grass-4", "water", "deepwater", "natural-gold-soil"} for _, tile in pairs(tiles) do @@ -60,58 +42,4 @@ for _, tile in pairs(tiles) do 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 +end \ No newline at end of file diff --git a/lignumis/prototypes/content/peat.lua b/lignumis/prototypes/content/peat.lua index 9140da2..2128793 100644 --- a/lignumis/prototypes/content/peat.lua +++ b/lignumis/prototypes/content/peat.lua @@ -35,7 +35,7 @@ data:extend({ name = "wood", amount_min = 1, amount_max = 8, - probability = 0.1 + probability = 0.05 } } }, diff --git a/lignumis/prototypes/content/quality-assembler.lua b/lignumis/prototypes/content/quality-assembler.lua deleted file mode 100644 index 5ee0727..0000000 --- a/lignumis/prototypes/content/quality-assembler.lua +++ /dev/null @@ -1,182 +0,0 @@ -local item_sounds = require("__base__.prototypes.item_sounds") - -local QualityAssemblerFactory = require(MF.buildings .. "GravityAssembler") -local QualityAssembler = QualityAssemblerFactory("quality-assembler") - -data:extend({ - { - type = "burner-usage", - name = "quality-catalyst", - empty_slot_sprite = { - filename = "__lignumis__/graphics/empty-quality-catalyst-slot.png", - priority = "extra-high-no-scale", - size = 64, - flags = { "gui-icon" }, - }, - empty_slot_caption = { "gui.quality-catalyst" }, - empty_slot_description = { "gui.quality-catalyst-description" }, - icon = { - filename = "__lignumis__/graphics/quality-catalyst-icon-red.png", - priority = "extra-high-no-scale", - width = 64, - height = 64, - flags = { "icon" } - }, - no_fuel_status = { "entity-status.no-quality-catalyst" }, - accepted_fuel_key = "description.accepted-catalysts", - burned_in_key = "used-in", -- factoriopedia - }, - { - type = "fuel-category", - name = "quality-catalyst", - fuel_value_type = { "description.quality-catalyst-energy-value" } - }, - { - type = "item", - name = "gold-quality-catalyst", - icon = "__lignumis__/graphics/icons/quality-gold-catalyst.png", - subgroup = "raw-material", - color_hint = { text = "C" }, - order = "a[smelting]-0[gold-plate]", - inventory_move_sound = item_sounds.metal_small_inventory_move, - pick_sound = item_sounds.metal_small_inventory_pickup, - drop_sound = item_sounds.metal_small_inventory_move, - stack_size = 50, - fuel_category = "quality-catalyst", - fuel_value = "1MJ", - weight = 1000 / 50 * kg, - }, - { - type = "recipe", - name = "gold-quality-catalyst", - category = "electromagnetics", - energy_required = 60, - ingredients = { - { type = "item", name = "gold-plate", amount = 10 }, - { type = "item", name = "tungsten-carbide", amount = 2 }, - { type = "item", name = "supercapacitor", amount = 2 } - }, - results = { { type = "item", name = "gold-quality-catalyst", amount = 2 } }, - allow_productivity = false, - allow_quality = false, - enabled = false - } -}) - -QualityAssembler.EntityBuilder:new() - :allowProductivity(false) - :burnerEnergySource({ - burner_usage = "quality-catalyst", - fuel_categories = { "quality-catalyst" }, - fuel_inventory_size = 1, - emissions_per_minute = { noise = 100, pollution = 6 } - }) - :pipes() - :apply({ - energy_usage = "1MW", - crafting_speed = 4, - module_slots = 6, - allowed_effects = { "pollution", "quality" }, - effect_receiver = { base_effect = { quality = 10 } } - }) - -QualityAssembler.ItemBuilder:new():apply() - -QualityAssembler.RecipeBuilder:new() - :ingredients({ - { type = "item", name = "gold-plate", amount = 60 }, - { type = "item", name = "tungsten-plate", amount = 40 }, - { type = "item", name = "superconductor", amount = 50 }, - { type = "item", name = "carbon-fiber", amount = 100 }, - { type = "item", name = "quantum-processor", amount = 10 } - }) - :apply({ - category = "electromagnetics-or-quality-assembling", - }) - -QualityAssembler.TechnologyBuilder:new() - :prerequisites({ "legendary-quality", "quantum-processor" }) - :count(5000) - :ingredients({ - { "wood-science-pack", 1 }, - { "steam-science-pack", 1 }, - { "automation-science-pack", 1 }, - { "logistic-science-pack", 1 }, - { "chemical-science-pack", 1 }, - { "space-science-pack", 1 }, - { "production-science-pack", 1 }, - { "utility-science-pack", 1 }, - { "metallurgic-science-pack", 1 }, - { "agricultural-science-pack", 1 }, - { "electromagnetic-science-pack", 1 }, - { "cryogenic-science-pack", 1 } - }) - :time(60) - :additionalRecipes({ "gold-quality-catalyst" }) - :apply() - -local function convert_category(name) - local quality_name = name .. "-or-quality-assembling" - data:extend({ - { - type = "recipe-category", - name = quality_name - } - }) - - for _, assembler in pairs(data.raw["assembling-machine"]) do - if assembler.crafting_categories and table.contains(assembler.crafting_categories, name) then - table.insert(assembler.crafting_categories, quality_name) - end - end - for _, character in pairs(data.raw["character"]) do - if character.crafting_categories and table.contains(character.crafting_categories, name) then - table.insert(character.crafting_categories, quality_name) - end - end - table.insert(data.raw["assembling-machine"]["quality-assembler"].crafting_categories, quality_name) -end - -convert_category("wood-processing-or-assembling") -convert_category("metallurgy-or-assembling") -convert_category("metallurgy") -convert_category("electronics") -convert_category("electronics-or-assembling") -convert_category("electromagnetics") -convert_category("organic-or-assembling") -convert_category("crafting") -convert_category("cryogenics-or-assembling") - --- Lignumis -data.raw.recipe["lumber-mill"].category = "wood-processing-or-assembling-or-quality-assembling" - --- Nauvis -data.raw.recipe["logistic-robot"].category = "crafting-or-quality-assembling" -data.raw.recipe["construction-robot"].category = "crafting-or-quality-assembling" -data.raw.recipe["roboport"].category = "crafting-or-quality-assembling" -data.raw.recipe["speed-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["productivity-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["efficiency-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["rocket-silo"].category = "crafting-or-quality-assembling" -data.raw.recipe["cargo-bay"].category = "crafting-or-quality-assembling" -data.raw.recipe["asteroid-collector"].category = "crafting-or-quality-assembling" -data.raw.recipe["thruster"].category = "crafting-or-quality-assembling" - --- Vulcanus -data.raw.recipe["foundry"].category = "metallurgy-or-assembling-or-quality-assembling" -data.raw.recipe["big-mining-drill"].category = "metallurgy-or-quality-assembling" - --- Fulgora -data.raw.recipe["electromagnetic-plant"].category = "electronics-or-assembling-or-quality-assembling" -data.raw.recipe["lightning-collector"].category = "electromagnetics-or-quality-assembling" -data.raw.recipe["mech-armor"].category = "crafting-or-quality-assembling" -data.raw.recipe["quality-module-3"].category = "electronics-or-quality-assembling" -data.raw.recipe["recycler"].category = "crafting-or-quality-assembling" - --- Gleba -data.raw.recipe["biochamber"].category = "organic-or-assembling-or-quality-assembling" -data.raw.recipe["stack-inserter"].category = "crafting-or-quality-assembling" -data.raw.recipe["spidertron"].category = "crafting-or-quality-assembling" - --- Aquilo -data.raw.recipe["cryogenic-plant"].category = "cryogenics-or-assembling-or-quality-assembling" \ No newline at end of file diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index 24b79b2..1e8409d 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -1,8 +1,4 @@ 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 assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"]) assembling_machine.name = "steam-assembling-machine" @@ -14,7 +10,7 @@ assembling_machine.corpses = "steam-assembling-machine-remnants" assembling_machine.resistances = nil assembling_machine.graphics_set = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set) assembling_machine.graphics_set.animation.layers[1].filename = -gfx .. "steam-assembling-machine.png" +"__lignumis__/graphics/entity/steam-assembling-machine.png" assembling_machine.crafting_categories = { "crafting", "basic-crafting", @@ -32,8 +28,8 @@ assembling_machine.energy_source = { scale_fluid_usage = true, fluid_box = { production_type = "input", - pipe_picture = machinepipes(), - pipe_covers = pipecovers(), + pipe_picture = assembler2pipepictures(), + pipe_covers = pipecoverspictures(), volume = 50, pipe_connections = { { flow_direction = "input-output", direction = defines.direction.west, position = { -1, 0 } }, @@ -42,17 +38,13 @@ assembling_machine.energy_source = { secondary_draw_orders = { north = -1 } } } -assembling_machine.fluid_boxes[1].pipe_picture = machinepipes() -assembling_machine.fluid_boxes[1].pipe_covers = pipecovers() -assembling_machine.fluid_boxes[2].pipe_picture = machinepipes() -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.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.animation[1].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png" +remnants.animation[2].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png" +remnants.animation[3].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png" remnants.order = "1[steam-assembling-machine]" data:extend({ diff --git a/lignumis/prototypes/content/steam-science.lua b/lignumis/prototypes/content/steam-science.lua index 83779a4..e235da6 100644 --- a/lignumis/prototypes/content/steam-science.lua +++ b/lignumis/prototypes/content/steam-science.lua @@ -19,8 +19,7 @@ data:extend({ durability_description_key = "description.science-pack-remaining-amount-key", factoriopedia_durability_description_key = "description.factoriopedia-science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", - random_tint_color = item_tints.iron_rust, - default_import_location = "lignumis" + random_tint_color = item_tints.iron_rust }, { type = "recipe", diff --git a/lignumis/prototypes/content/technology.lua b/lignumis/prototypes/content/technology.lua index a028168..a4b573b 100644 --- a/lignumis/prototypes/content/technology.lua +++ b/lignumis/prototypes/content/technology.lua @@ -1,25 +1,4 @@ data:extend({ - { - type = "technology", - name = "planet-discovery-lignumis", - icons = PlanetsLib.technology_icons_moon("__lignumis__/graphics/technology/lignumis.png", 256), - essential = true, - effects = { - { - type = "unlock-space-location", - space_location = "lignumis", - use_icon_overlay_constant = true - } - }, - prerequisites = { "automation-science-pack" }, - unit = { - count = 10, - ingredients = { - { "automation-science-pack", 1 }, - }, - time = 10 - } - }, { type = "technology", name = "planet-discovery-nauvis", @@ -32,6 +11,10 @@ data:extend({ space_location = "nauvis", use_icon_overlay_constant = true }, + { + type = "unlock-recipe", + recipe = "destination-nauvis" + }, { type = "unlock-space-platforms", modifier = true, diff --git a/lignumis/prototypes/content/wood-lab.lua b/lignumis/prototypes/content/wood-lab.lua index 2f6748f..f410ec6 100644 --- a/lignumis/prototypes/content/wood-lab.lua +++ b/lignumis/prototypes/content/wood-lab.lua @@ -1,7 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") -local gfx = "__lignumis__/graphics/entity/wood-lab/" - data:extend({ { type = "lab", @@ -19,7 +17,7 @@ data:extend({ on_animation = { layers = { { - filename = gfx .. "wood-lab.png", + filename = "__lignumis__/graphics/entity/wood-lab.png", width = 194, height = 174, frame_count = 33, @@ -39,7 +37,7 @@ data:extend({ scale = 0.5 }, { - filename = gfx .. "wood-lab-light.png", + filename = "__lignumis__/graphics/entity/wood-lab-light.png", blend_mode = "additive", draw_as_light = true, width = 216, @@ -66,7 +64,7 @@ data:extend({ off_animation = { layers = { { - filename = gfx .. "wood-lab.png", + filename = "__lignumis__/graphics/entity/wood-lab.png", width = 194, height = 174, shift = util.by_pixel(0, 1.5), @@ -115,7 +113,6 @@ data:extend({ }, energy_usage = "150kW", researching_speed = 0.5, - -- Applied again in final-fixes inputs = { "wood-science-pack", "steam-science-pack", diff --git a/lignumis/prototypes/content/wood-liquefaction.lua b/lignumis/prototypes/content/wood-liquefaction.lua index a1753af..64f8e1c 100644 --- a/lignumis/prototypes/content/wood-liquefaction.lua +++ b/lignumis/prototypes/content/wood-liquefaction.lua @@ -38,8 +38,7 @@ data:extend({ }, results = { { type = "fluid", name = "wood-pulp", amount = 10 } - }, - allow_productivity = true + } }, { type = "technology", diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 2fa41ae..ea695b0 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -18,25 +18,24 @@ Belt.EntityBuilder:new() } }) -local splitter_item = Belt.ItemBuilder:new() +Belt.ItemBuilder:new() :order("0") :apply() - .splitter Belt.RecipeBuilder:new() :beltAmount(2) :ingredients("transportBelt", { - { type = "item", name = "lumber", amount = 1 }, + { 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 = "lumber", amount = 1 }, { type = "item", name = "wood-transport-belt", amount = 4 }, }) :ingredients("splitter", { + { type = "item", name = "lumber", amount = 2 }, + { type = "item", name = "wooden-gear-wheel", amount = 5 }, { type = "item", name = "wood-transport-belt", amount = 2 }, - { type = "item", name = "lumber", amount = 2 }, - { type = "item", name = "gold-cable", amount = 10 } }) :apply() @@ -45,28 +44,4 @@ Belt.TechnologyBuilder:new() :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" -}) + :apply() \ No newline at end of file diff --git a/lignumis/prototypes/content/wood-military.lua b/lignumis/prototypes/content/wood-military.lua deleted file mode 100644 index c6a4715..0000000 --- a/lignumis/prototypes/content/wood-military.lua +++ /dev/null @@ -1,148 +0,0 @@ --- Wooden military mod replaces the content here -if mods["wood-military"] then - return -end - -local item_sounds = require("__base__.prototypes.item_sounds") -local simulations = require("__base__.prototypes.factoriopedia-simulations") - -data:extend({ - { - type = "explosion", - name = "explosion-hit-splinters", - localised_name = { "entity-name.explosion-hit" }, - flags = { "not-on-map" }, - subgroup = "explosions", - animations = util.empty_sprite(), - smoke = "smoke-fast", - smoke_count = 1, - smoke_slow_down_factor = 1, - created_effect = { - type = "direct", - action_delivery = { - type = "instant", - target_effects = { - type = "create-particle", - repeat_count = 2, - particle_name = "wooden-chest-wooden-splinter-particle-small", - offset_deviation = { { -0.5, -0.5 }, { 0.5, 0.5 } }, - initial_height = 0.5, - initial_height_deviation = 0.04, - initial_vertical_speed = 0.069, - initial_vertical_speed_deviation = 0.025, - speed_from_center = 0.01, - speed_from_center_deviation = 0.023 - } - } - } - }, - { - type = "ammo", - name = "wood-darts-magazine", - icon = "__lignumis__/graphics/icons/wood-darts-magazine.png", - ammo_category = "bullet", - ammo_type = { - cooldown_modifier = 1 / 0.75, - action = { - type = "direct", - action_delivery = { - type = "instant", - source_effects = { - { - type = "create-explosion", - entity_name = "explosion-gunshot" - } - }, - target_effects = { - { - type = "create-entity", - entity_name = "explosion-hit-splinters", - offsets = { { 0, 0.5 } }, - offset_deviation = { { -0.5, -0.5 }, { 0.5, 0.5 } } - }, - { - type = "damage", - damage = { amount = 3, type = "physical" } - } - } - } - } - }, - magazine_size = 10, - reload_time = 15, - subgroup = "ammo", - order = "a[basic-clips]-0[wood-darts-magazine]", - 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, - weight = 10 * kg - }, - { - type = "recipe", - name = "wood-darts-magazine", - energy_required = 1, - ingredients = { { type = "item", name = "wood", amount = 2 } }, - results = { { type = "item", name = "wood-darts-magazine", amount = 1 } } - }, - { - type = "armor", - name = "wood-armor", - icon = "__lignumis__/graphics/icons/wood-armor.png", - resistances = { - { - type = "physical", - decrease = 2, - percent = 10 - }, - { - type = "acid", - decrease = 0, - percent = 10 - }, - { - type = "explosion", - decrease = 1, - percent = 10 - }, - { - type = "fire", - decrease = 0, - percent = -90 - } - }, - subgroup = "armor", - order = "0[light-armor]", - factoriopedia_simulation = simulations.factoriopedia_light_armor, - inventory_move_sound = item_sounds.armor_small_inventory_move, - pick_sound = item_sounds.armor_small_inventory_pickup, - drop_sound = item_sounds.armor_small_inventory_move, - stack_size = 1, - infinite = true, - equipment_grid = "tiny-equipment-grid" - }, - { - type = "recipe", - name = "wood-armor", - energy_required = 4, - ingredients = { - { type = "item", name = "wood", amount = 20 }, - { type = "item", name = "gold-plate", amount = 4 } - }, - results = { { type = "item", name = "wood-armor", amount = 1 } } - }, -}) - -if settings.startup["lignumis-ammo-progression"].value then - table.insert( - data.raw.recipe["firearm-magazine"].ingredients, - { type = "item", name = "wood-darts-magazine", amount = 1 } - ) -end - -data.raw.recipe["firearm-magazine"].enabled = false -data.raw.recipe["light-armor"].enabled = false -table.assign(data.raw.technology["military"].effects, { - { type = "unlock-recipe", recipe = "firearm-magazine" }, - { type = "unlock-recipe", recipe = "light-armor" } -}) diff --git a/lignumis/prototypes/content/wood-science.lua b/lignumis/prototypes/content/wood-science.lua index b8b724c..08af71e 100644 --- a/lignumis/prototypes/content/wood-science.lua +++ b/lignumis/prototypes/content/wood-science.lua @@ -19,8 +19,7 @@ data:extend({ durability_description_key = "description.science-pack-remaining-amount-key", factoriopedia_durability_description_key = "description.factoriopedia-science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", - random_tint_color = item_tints.iron_rust, - default_import_location = "lignumis" + random_tint_color = item_tints.iron_rust }, { type = "recipe", diff --git a/lignumis/prototypes/content/wooden-gearwheel.lua b/lignumis/prototypes/content/wooden-gearwheel.lua index 1216a01..96d89cc 100644 --- a/lignumis/prototypes/content/wooden-gearwheel.lua +++ b/lignumis/prototypes/content/wooden-gearwheel.lua @@ -18,7 +18,7 @@ data:extend({ type = "recipe", name = "wooden-gear-wheel", ingredients = { { type = "item", name = "lumber", amount = 1 } }, - results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } }, + results = { { type = "item", name = "wooden-gear-wheel", amount = 1 } }, 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..827dd8d 100644 --- a/lignumis/prototypes/content/wooden-rocket-silo.lua +++ b/lignumis/prototypes/content/wooden-rocket-silo.lua @@ -1,11 +1,9 @@ -local pipecovers = require("prototypes/content/gold/pipecovers") -local machinepipes = require("prototypes/content/gold/machinepipes") +local item_sounds = require("__base__.prototypes.item_sounds") 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.module_slots = 0 -silo.allowed_effects = { "consumption", "pollution", "speed" } +silo.allowed_effects = { "consumption", "pollution" } silo.minable = { mining_time = 1, result = "provisional-rocket-silo" } silo.max_health = 1000 silo.energy_source = { @@ -13,7 +11,7 @@ silo.energy_source = { fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 1, - emissions_per_minute = { noise = 10000 }, + emissions_per_minute = { noise = 1000 }, smoke = { { name = "smoke", @@ -25,35 +23,27 @@ silo.energy_source = { } } } -silo.emissions_per_second = { noise = 1000 / 60 } 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.fluid_boxes = { { - production_type = "input", - pipe_picture = machinepipes(), - pipe_covers = pipecovers(), volume = 50, - pipe_connections = { { flow_direction = "input", direction = defines.direction.south, position = { -2, 4 } } }, - secondary_draw_orders = { north = -1 } + pipe_picture = assembler2pipepictures(), + pipe_covers = pipecoverspictures(), + pipe_connections = { + { flow_direction = "input", direction = defines.direction.south, position = { -3.0, 4.0 } } + }, + production_type = "input", + secondary_draw_orders = { south = 110 } } } -silo.fluid_boxes_off_when_no_fluid_recipe = true silo.launch_to_space_platforms = false -silo.rocket_parts_required = 50 silo.rocket_parts_storage_cap = 50 silo.to_be_inserted_to_rocket_inventory_size = 1 -silo.clamps_on_trigger = { - type = "script", - effect_id = "provisional-rocket-ready" -} local silo_item = table.deepcopy(data.raw["item"]["rocket-silo"]) silo_item.name = "provisional-rocket-silo" @@ -74,7 +64,6 @@ silo_recipe.ingredients = { local rocket = table.deepcopy(data.raw["rocket-silo-rocket"]["rocket-silo-rocket"]) rocket.name = "provisional-rocket" -rocket.inventory_size = 40 rocket.rising_speed = 1 / (14 * 60) rocket.engine_starting_speed = 1 / (11 * 60) rocket.flying_speed = 1 / (4000 * 60) @@ -100,36 +89,28 @@ local rocket_part_recipe = { allow_productivity = true } -local silo_ready = { - type = "container", - name = "provisional-rocket-silo-ready", - icon = silo.icon, - minable = { mining_time = 1, result = nil }, - deconstruction_alternative = "provisional-rocket-silo", - inventory_size = 40, - inventory_type = "normal", - quality_affects_inventory_size = false, - placeable_by = { item = "provisional-rocket-silo", count = 1 }, - health = 1000, - surface_conditions = { - { - property = "pressure", - min = 1 - } - }, - flags = { "not-on-map", "not-blueprintable", "not-deconstructable", "not-flammable", "not-repairable", "not-upgradable", "no-automated-item-insertion", "no-automated-item-removal", "not-in-kill-statistics" }, - allow_copy_paste = false, - additional_pastable_entities = { "provisional-rocket-silo" }, - collision_mask = { layers = {} }, - collision_box = table.deepcopy(silo.collision_box), - selection_box = table.deepcopy(silo.selection_box), +local nauvis_item = { + type = "item", + name = "destination-nauvis", + icon = "__base__/graphics/icons/nauvis.png", + subgroup = "space-related", + order = "z[destination-nauvis]", + inventory_move_sound = item_sounds.mechanical_inventory_move, + pick_sound = item_sounds.mechanical_inventory_pickup, + drop_sound = item_sounds.mechanical_inventory_move, + stack_size = 1, + weight = 1 * tons, + send_to_orbit_mode = "automated", + spoil_ticks = 60 * 60 * 10 } -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" +local nauvis_recipe = { + type = "recipe", + name = "destination-nauvis", + enabled = false, + ingredients = {}, + results = { { type = "item", name = "destination-nauvis", amount = 1 } } +} data:extend({ silo, @@ -137,6 +118,6 @@ data:extend({ silo_recipe, rocket, rocket_part_recipe, - silo_ready, - silo_ready_item + nauvis_item, + nauvis_recipe }) diff --git a/lignumis/prototypes/integrations/Wood-Walls.lua b/lignumis/prototypes/integrations/Wood-Walls.lua index 7262078..908b981 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 } } + +local entity = data.raw.wall["wooden-wall"] +entity.emissions_per_second = { noise = -1 } \ No newline at end of file diff --git a/lignumis/prototypes/integrations/astroponics-updates.lua b/lignumis/prototypes/integrations/astroponics-updates.lua deleted file mode 100644 index 72bc125..0000000 --- a/lignumis/prototypes/integrations/astroponics-updates.lua +++ /dev/null @@ -1,2 +0,0 @@ -data.raw.technology["tree-seeding"].hidden = false -data.raw.technology["tree-seeding"].enabled = true diff --git a/lignumis/prototypes/integrations/data.lua b/lignumis/prototypes/integrations/data.lua index 038c3cb..db5ef92 100644 --- a/lignumis/prototypes/integrations/data.lua +++ b/lignumis/prototypes/integrations/data.lua @@ -1,2 +1,3 @@ require("vanilla") -require("Wood-Walls") \ No newline at end of file +require("Wood-Walls") +require("wood-military") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/updates.lua b/lignumis/prototypes/integrations/updates.lua index b8f72cc..168d98d 100644 --- a/lignumis/prototypes/integrations/updates.lua +++ b/lignumis/prototypes/integrations/updates.lua @@ -1,2 +1 @@ -require("vanilla-updates") -require("astroponics-updates") \ No newline at end of file +require("vanilla-updates") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla-updates.lua b/lignumis/prototypes/integrations/vanilla-updates.lua index 3b5a41a..2453157 100644 --- a/lignumis/prototypes/integrations/vanilla-updates.lua +++ b/lignumis/prototypes/integrations/vanilla-updates.lua @@ -1,27 +1,18 @@ -- Add wood and steam science packs as ingredients to technologies that require Nauvis science packs. +-- It skips technologies that are available before coming back to Lignumis. + 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 local ingredients = technology.unit.ingredients local noMatches = table.filter(ingredients, function(ingredient) - return table.contains(Lignumis.science_pack_blacklist, ingredient[1]) + return table.contains({ "wood-science-pack", "steam-science-pack" }, ingredient[1]) end) local yesMatches = table.filter(ingredients, function(ingredient) - return table.contains(Lignumis.science_pack_whitelist, ingredient[1]) + return table.contains({ "utility-science-pack", "production-science-pack", "space-science-pack" }, ingredient[1]) end) if #noMatches == 0 and #yesMatches > 0 then table.insert(technology.unit.ingredients, { "wood-science-pack", 1 }) table.insert(technology.unit.ingredients, { "steam-science-pack", 1 }) end end -end - - --- Add wood and steam science packs to all labs' inputs -for _, lab in pairs(data.raw.lab) do - if lab.inputs and not table.contains(Lignumis.lab_blacklist, lab.name) then - lab.inputs = table.assign({ - "wood-science-pack", - "steam-science-pack" - }, lab.inputs) - end end \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 68bc1b5..aaeedd8 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -7,11 +7,10 @@ local drill_animation = drill.graphics_set.animation drill.resource_searching_radius = 1.99 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-N.png" +drill_animation.east.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-E.png" +drill_animation.south.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-S.png" +drill_animation.west.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-W.png" local drill_item = data.raw["item"]["burner-mining-drill"] drill_item.icon = "__lignumis__/graphics/icons/burner-mining-drill.png" @@ -28,10 +27,10 @@ drill_recipe.ingredients = { 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.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-base.png" +burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-closed.png" +burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-open.png" +burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/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" @@ -42,36 +41,19 @@ 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" - -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" - - -- Lab -if settings.startup["lignumis-belt-progression"].value then - local lab_recipe = data.raw.recipe["lab"] - for _, ingredient in pairs(lab_recipe.ingredients) do - if ingredient.name == "transport-belt" then - ingredient.name = "wood-transport-belt" - end - end -end +local lab = data.raw["lab"]["lab"] +lab.inputs = table.assign({ + "wood-science-pack", + "steam-science-pack" +}, lab.inputs) - --- Gun turret -data.raw["ammo-turret"]["gun-turret"].attack_parameters.range = 20 - - --- Agricultural tower - -data.raw["agricultural-tower"]["agricultural-tower"].surface_conditions[1].min = 900 +local biolab = data.raw["lab"]["biolab"] +biolab.inputs = table.assign({ + "wood-science-pack", + "steam-science-pack" +}, biolab.inputs) -- Wood processing @@ -81,33 +63,17 @@ wood_processing.ingredients[1].amount = 1 wood_processing.icon = data.raw.item["tree-seed"].icon for _, tree in pairs(data.raw.tree) do - local function isWoodResult(result) - return result.name == "wood" - end - local minable = tree.minable - local woodResults = minable.results and table.filter(minable.results, isWoodResult) - local isRegularTree = (minable.result == "wood" and minable.count == 4) or (minable.results and #minable.results == 1 and #woodResults == 1 and woodResults[1].amount == 4) - if not isRegularTree then goto continue end tree.minable.result = nil tree.minable.count = nil - local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 10 } - if minable.results and #woodResults > 0 then - table.assign(woodResults[1], woodResult) - else - minable.results = { woodResult } - end - ::continue:: + tree.minable.results = { { type = "item", name = "wood", amount_min = 2, amount_max = 10 } } end local tree_plant = data.raw.plant["tree-plant"] tree_plant.growth_ticks = 5 * minute -tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 } } +tree_plant.minable.results = { { type = "item", name = "wood", amount_min = 4, amount_max = 6 } } tree_plant.minable.count = nil -tree_plant.surface_conditions[1].min = 900 -table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil") 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") table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories, "wood-processing-or-assembling") @@ -290,16 +256,11 @@ weapon_speed_technology_4.prerequisites = { "weapon-shooting-speed-3", "military 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" }) +production_science_pack_technology:addIngredients({ "wood-science-pack", "steam-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({ "wood-science-pack", "steam-science-pack", "space-science-pack" }) - -if not mods["planet-muluna"] then -- Muluna does the same - Technology:new("logistic-robotics"):addRecipe("requester-chest") - Technology:new("logistic-system"):removeRecipe("requester-chest") -end +utility_science_pack_technology:addIngredients({ "wood-science-pack", "steam-science-pack" }) -- Equipment @@ -310,10 +271,3 @@ data.raw["equipment-grid"]["small-equipment-grid"].width = 6 data.raw["equipment-grid"]["small-equipment-grid"].height = 6 data.raw["equipment-grid"]["medium-equipment-grid"].width = 8 data.raw["equipment-grid"]["medium-equipment-grid"].height = 8 - - --- Always show Nauvis icon - -local nauvis = data.raw.planet["nauvis"] -nauvis.flags = nauvis.flags or {} -table.insert(nauvis.flags, "always-show") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/wood-military.lua b/lignumis/prototypes/integrations/wood-military.lua similarity index 56% rename from lignumis/prototypes/compatibility/wood-military.lua rename to lignumis/prototypes/integrations/wood-military.lua index 61b8381..e43bac9 100644 --- a/lignumis/prototypes/compatibility/wood-military.lua +++ b/lignumis/prototypes/integrations/wood-military.lua @@ -1,3 +1 @@ -if not mods["wood-military"] then return end - -data.raw.armor["wood-armor"].equipment_grid = "tiny-equipment-grid" \ No newline at end of file +data.raw.armor["wood-armor"].equipment_grid = "tiny-equipment-grid" diff --git a/lignumis/script/to-nauvis.lua b/lignumis/script/to-nauvis.lua new file mode 100644 index 0000000..29463e1 --- /dev/null +++ b/lignumis/script/to-nauvis.lua @@ -0,0 +1,40 @@ +local crash_site = require("crash-site") +local util = require("util") +local e = defines.events + +local function chart_starting_area(surface, player) + local r = 200 + local force = player.force + local origin = force.get_spawn_position(surface) + force.chart(surface, { { origin.x - r, origin.y - r }, { origin.x + r, origin.y + r } }) +end + +local function travel_to_nauvis() + local nauvis = game.planets["nauvis"].create_surface() + nauvis.request_to_generate_chunks({ 0, 0 }, 3) + nauvis.force_generate_chunk_requests() + + for _, player in pairs(game.players) do + if player.surface.name == "lignumis" then + player.teleport(nauvis.find_non_colliding_position("character", { 0, 0 }, 0, 1) --[[@as MapPosition]], + "nauvis") + chart_starting_area(nauvis, player) + player.print("Oh no, not again. But... Welcome to Nauvis!") + end + end + + local ship_items = { ["burner-mining-drill"] = 5, ["stone-furnace"] = 5, ["burner-assembling-machine"] = 2, ["burner-agricultural-tower"] = 4, ["wood-lab"] = 4 } + local debris_items = { ["wood-darts-magazine"] = 20, ["wood"] = 20, ["lumber"] = 20 } + local crashed_ship_parts = remote.call("freeplay", "get_ship_parts") + + nauvis.daytime = 0.7 + crash_site.create_crash_site(nauvis, { -5, -6 }, ship_items, debris_items, table.deepcopy(crashed_ship_parts)) +end + +script.on_event(e.on_rocket_launched, function(event) + local rocket_silo = event.rocket_silo + if rocket_silo.name == "provisional-rocket-silo" then + --rocket_silo.destroy() + travel_to_nauvis() + end +end) diff --git a/lignumis/scripts/init-existing.lua b/lignumis/scripts/init-existing.lua deleted file mode 100644 index c5cb392..0000000 --- a/lignumis/scripts/init-existing.lua +++ /dev/null @@ -1,28 +0,0 @@ -local InitExisting = {} - --- Initialization for existing games --- Don't send players to Lignumis but instead print a warning - -InitExisting.on_init = function() - if game.tick == 0 then return end - - storage.init = {} - for _, player in pairs(game.players) do - storage.init[player.index] = true - if player.physical_surface.name == "nauvis" then - storage.nauvis_visited = true - end - end - - for _, force in pairs(game.forces) do - force.technologies["iron-processing"].researched = true - force.technologies["copper-processing"].researched = true - if force.is_space_location_unlocked("nauvis") then - force.technologies["planet-discovery-nauvis"].researched = true - end - end - - game.print { "", { "lignumis.start-new-game" } } -end - -return InitExisting diff --git a/lignumis/scripts/init-new.lua b/lignumis/scripts/init-new.lua deleted file mode 100644 index efe1a07..0000000 --- a/lignumis/scripts/init-new.lua +++ /dev/null @@ -1,72 +0,0 @@ -local InitNew = {} - --- Initialization for new games --- Send all players to Lignumis and clear Nauvis - - --- Initialize the freeplay intro -local function init_intro() - if not remote.interfaces.freeplay then return end - - -- Disable Nauvis intro - remote.call("freeplay", "set_disable_crashsite", true) - remote.call("freeplay", "set_skip_intro", true) - - -- Replace yellow ammo with wood ammo - -- Wooden military does the same already - if not script.active_mods["wood-military"] then - local respawn_items = remote.call("freeplay", "get_respawn_items") - respawn_items["wood-darts-magazine"] = respawn_items["firearm-magazine"] - respawn_items["firearm-magazine"] = nil - remote.call("freeplay", "set_respawn_items", respawn_items) - - local created_items = remote.call("freeplay", "get_created_items") - created_items["wood-darts-magazine"] = created_items["firearm-magazine"] - created_items["firearm-magazine"] = nil - remote.call("freeplay", "set_created_items", created_items) - end -end - - --- Initialize space locations --- Lock Nauvis, unlock Lignumis -local function init_space_locations() - local force = game.forces.player - force.technologies["planet-discovery-lignumis"].researched = true - if not force.technologies["planet-discovery-nauvis"].researched then - force.lock_space_location("nauvis") - end -end - - --- Initialize Lignumis -local function init_lignumis() - storage.surface = game.planets["lignumis"].create_surface() - storage.surface.request_to_generate_chunks({ 0, 0 }, 3) - storage.surface.force_generate_chunk_requests() - storage.surface.daytime = 0.7 - - -- Chart starting area - local r = 200 - local force = game.forces.player - local origin = force.get_spawn_position(storage.surface) - force.chart(storage.surface, { { origin.x - r, origin.y - r }, { origin.x + r, origin.y + r } }) -end - - --- Clear Nauvis surface as we start on Lignumis -local function clear_nauvis() - game.get_surface("nauvis").clear() -end - - -InitNew.on_init = function() - if game.tick > 0 then return end - - init_intro() - init_space_locations() - init_lignumis() - clear_nauvis() -end - -return InitNew diff --git a/lignumis/scripts/init.lua b/lignumis/scripts/init.lua deleted file mode 100644 index 54e8f15..0000000 --- a/lignumis/scripts/init.lua +++ /dev/null @@ -1,140 +0,0 @@ -local crash_site = require("crash-site") -local util = require("util") - --- General initialization - -local Init = { - events = {} -} - - --- Migrate storage init as it was just a boolean before not supporting multiple players -local function migrate_0_9_6(event) - if storage.init and type(storage.init) == "boolean" then - storage.init = { - [event.player_index] = true - } - end -end - - --- Initialize the player --- Teleport to Lignumis and give some starting items -local function init_player(event) - local player = game.get_player(event.player_index) - - if not player.character then return end - - local surface = storage.surface or game.planets["lignumis"].surface - player.teleport(surface.find_non_colliding_position("character", { 0, 0 }, 0, 1), "lignumis") - player.character.destructible = false - local main_inventory = player.character.get_main_inventory() - - -- Add some starting items to player inventory - main_inventory.insert({ name = "lumber", count = 8 }) -end - - --- Initialize the freeplay scenario -local function init_freeplay(event) - if storage.crashed_ship_lignumis then return end - - local player = game.get_player(event.player_index) - - if not player or not remote.interfaces.freeplay then return end - - storage.crashed_ship_lignumis = true - local surface = storage.surface or game.planets["lignumis"].surface - storage.crashed_ship_items = remote.call("freeplay", "get_ship_items") - storage.crashed_debris_items = remote.call("freeplay", "get_debris_items") - storage.crashed_ship_parts = remote.call("freeplay", "get_ship_parts") - storage.starting_message = remote.call("freeplay", "get_custom_intro_message") - - local ship_items = { - ["burner-mining-drill"] = 1, - ["burner-agricultural-tower"] = 2 - } - local debris_items = { - ["lumber"] = 8, - ["wood-darts-magazine"] = 2 - } - - crash_site.create_crash_site(surface, { -5, -6 }, ship_items, debris_items, - 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() - - storage.crash_site_cutscene_active = true - crash_site.create_cutscene(player, { -5, -4 }) -end - - -Init.events[defines.events.on_player_created] = function(event) - migrate_0_9_6(event) - storage.init = storage.init or {} - - if storage.init[event.player_index] then return end - - storage.init[event.player_index] = true - init_player(event) - init_freeplay(event) -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 and player.surface.name == "nauvis" then - storage.nauvis_visited = true - end -end - - --- End intro and show starting message -Init.events[defines.events.on_cutscene_waypoint_reached] = function(event) - if not storage.crash_site_cutscene_active then return end - if not crash_site.is_crash_site_cutscene(event) then return end - - local player = game.get_player(event.player_index) - player.exit_cutscene() - - if storage.skip_intro then return end - - local intro_message = storage.custom_intro_message or { "msg-intro-space-age" } - - if game.is_multiplayer() then - player.print(intro_message) - else - game.show_message_dialog { text = intro_message } - end -end - - --- Cancel intro -Init.events["crash-site-skip-cutscene"] = function(event) - if not storage.crash_site_cutscene_active then return end - if event.player_index ~= 1 then return end - - local player = game.get_player(event.player_index) - if player.controller_type == defines.controllers.cutscene then - player.exit_cutscene() - end -end - -Init.events[defines.events.on_cutscene_cancelled] = function(event) - if not storage.crash_site_cutscene_active then return end - if event.player_index ~= 1 then return end - - storage.crash_site_cutscene_active = nil - local player = game.get_player(event.player_index) - if player.gui.screen.skip_cutscene_label then - player.gui.screen.skip_cutscene_label.destroy() - end - if player.character then - player.character.destructible = true - end - player.zoom = 1.5 -end - -return Init diff --git a/lignumis/scripts/to-nauvis.lua b/lignumis/scripts/to-nauvis.lua deleted file mode 100644 index c2b3bc3..0000000 --- a/lignumis/scripts/to-nauvis.lua +++ /dev/null @@ -1,93 +0,0 @@ -local crash_site = require("crash-site") - --- Transition from Lignumis to Nauvis with the provisional rocket silo - -local ToNauvis = { - events = {} -} - - --- Chart the starting area for the player -local function chart_starting_area(surface, player) - local r = 200 - local force = player.force - local origin = force.get_spawn_position(surface) - force.chart(surface, { { origin.x - r, origin.y - r }, { origin.x + r, origin.y + r } }) -end - - --- Initialize Nauvis -local function init_nauvis() - if storage.nauvis_visited then return end - local nauvis = game.planets["nauvis"].create_surface() - nauvis.request_to_generate_chunks({ 0, 0 }, 3) - nauvis.force_generate_chunk_requests() - nauvis.daytime = 0.7 -end - - --- Teleport player to Nauvis and show welcome message -local function teleport_player(player) - local nauvis = game.planets["nauvis"].surface - if player.surface.name == "lignumis" then - local position = nauvis.find_non_colliding_position("character", { 0, 0 }, 100, 1) or { 0, 0 } - player.teleport(position, "nauvis") - chart_starting_area(nauvis, player) - player.print("Oh no, not again. But... Welcome to Nauvis!") - end -end - - --- Initialize the Nauvis freeplay scenario -local function init_freeplay() - if storage.crashed_ship_nauvis then return end - if not remote.interfaces.freeplay then return end - - storage.crashed_ship_nauvis = true - local nauvis = game.planets["nauvis"].surface - local ship_items = { - ["burner-mining-drill"] = 2, - ["stone-furnace"] = 2, - ["burner-assembling-machine"] = 2, - ["burner-agricultural-tower"] = 2, - ["wood-lab"] = 2 - } - local debris_items = { ["wood-darts-magazine"] = 20, ["wood"] = 20, ["lumber"] = 20 } - local crashed_ship_parts = remote.call("freeplay", "get_ship_parts") - - crash_site.create_crash_site(nauvis, { -5, -6 }, ship_items, debris_items, table.deepcopy(crashed_ship_parts)) -end - - -ToNauvis.events[defines.events.on_rocket_launched] = function(event) - if event.rocket_silo.name ~= "provisional-rocket-silo" then return end - - local rocket_entry - local rocket_entry_index - local player - - for i, entry in pairs(storage.rocket_silos) do - if entry.real_silo == event.rocket_silo then - rocket_entry = entry - rocket_entry_index = i - player = entry.player and game.get_player(entry.player) or game.players[1] - break - end - end - - init_nauvis() - teleport_player(player) - init_freeplay() - - -- Give the player the content of the rocket - if rocket_entry.rocket_content then - local inventory = player.get_main_inventory() - for _, item in pairs(rocket_entry.rocket_content) do - inventory.insert(item) - end - inventory.sort_and_merge() - end - table.remove(storage.rocket_silos, rocket_entry_index) -end - -return ToNauvis diff --git a/lignumis/scripts/wooden-rocket-silo.lua b/lignumis/scripts/wooden-rocket-silo.lua deleted file mode 100644 index 1d0f6bd..0000000 --- a/lignumis/scripts/wooden-rocket-silo.lua +++ /dev/null @@ -1,148 +0,0 @@ -local RocketSilo = { - events = {} -} - - --- Logic for provisional rocket silo with fake silo with inventory and custom launch GUI - -local function build_gui(player, rocket_silo) - local anchor = { - gui = defines.relative_gui_type.container_gui, - names = { "provisional-rocket-silo-ready" }, - position = defines.relative_gui_position.right - } - - 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" } - end - - storage.rocket_silo_guis = storage.rocket_silo_guis or {} - storage.rocket_silo_guis[player.index] = { - fake_silo = rocket_silo, - gui = gui.add(player.gui.relative, { - { - type = "frame", - name = "provisional-rocket-silo-relative-frame", - direction = "vertical", - anchor = anchor, - children = { - { type = "label", style = "frame_title", caption = { "lignumis.provisional-rocket-silo-button" }, ignored_by_interaction = true }, - { - type = "frame", - direction = "vertical", - style = "inside_shallow_frame_with_padding", - children = { - { - type = "flow", - direction = "vertical", - style = "inset_frame_container_vertical_flow", - children = { - { type = "label", caption = { "lignumis.provisional-rocket-silo-description" } }, - launch_button - } - } - } - } - } - } - }) - } -end - - -local function on_gui_opened(event) - local entity = event.entity - if not entity or not entity.valid then return end - if entity.name ~= "provisional-rocket-silo-ready" then return end - local player = game.get_player(event.player_index) - if player.controller_type ~= defines.controllers.character then return end - - if player.gui.relative["provisional-rocket-silo-relative-frame"] then - player.gui.relative["provisional-rocket-silo-relative-frame"].destroy() - end - - build_gui(player, entity) -end - - -local function on_gui_closed(event) - local entity = event.entity - if not entity or not entity.valid then return end - if entity.name ~= "provisional-rocket-silo-ready" then return end -end - - -local function launch(event) - if event.element.name ~= "provisional-rocket-silo-launch-button" then return end - local player = game.get_player(event.player_index) - local fake_silo = storage.rocket_silo_guis[player.index].fake_silo - rocket_content = fake_silo.get_inventory(defines.inventory.chest).get_contents() - for _, entry in pairs(storage.rocket_silos) do - if entry.fake_silo == fake_silo then - entry.player = event.player_index - entry.rocket_content = rocket_content - fake_silo.destroy() - entry.real_silo.launch_rocket() - break - end - end -end - - -local function on_silo_mined(event) - if event.entity.name ~= "provisional-rocket-silo-ready" then return end - local fake_silo = event.entity - local player = game.get_player(event.player_index) - for i, entry in pairs(storage.rocket_silos) do - if entry.fake_silo == fake_silo then - player.mine_entity(entry.real_silo, true) - table.remove(storage.rocket_silos, i) - break - end - end -end - - -RocketSilo.on_init = function() - storage.rocket_silos = {} - storage.rocket_silo_guis = {} -end - - -RocketSilo.events[defines.events.on_script_trigger_effect] = function(event) - if event.effect_id ~= "provisional-rocket-ready" then return end - - local lignumis = game.planets["lignumis"].surface - - if event.surface_index ~= lignumis.index then return end - - local real_silo = event.cause_entity - local fake_silo = real_silo.surface.create_entity({ - name = "provisional-rocket-silo-ready", - position = real_silo.position, - force = real_silo.force, - create_build_effect_smoke = false, - }) - storage.rocket_silos = storage.rocket_silos or {} - table.insert(storage.rocket_silos, { - real_silo = real_silo, - fake_silo = fake_silo - }) - for _, player in pairs(real_silo.force.players) do - if player.selected == real_silo then - player.selected = fake_silo - end - end -end - -RocketSilo.events[defines.events.on_gui_opened] = on_gui_opened -RocketSilo.events[defines.events.on_gui_closed] = on_gui_closed -RocketSilo.events[defines.events.on_gui_click] = launch -RocketSilo.events[defines.events.on_player_mined_entity] = on_silo_mined - - -return RocketSilo diff --git a/lignumis/settings-updates.lua b/lignumis/settings-updates.lua index fa983e5..a4401c8 100644 --- a/lignumis/settings-updates.lua +++ b/lignumis/settings-updates.lua @@ -1 +1,7 @@ -require("settings/updates") \ No newline at end of file +data.raw["bool-setting"]["wood-military-rockets"].default_value = false +data.raw["bool-setting"]["wood-military-artillery"].default_value = false +data.raw["bool-setting"]["wood-military-damage-buff"].default_value = false +data.raw["bool-setting"]["wood-military-armor"].hidden = true +data.raw["bool-setting"]["wood-military-armor"].forced_value = true +data.raw["bool-setting"]["wood-military-nerf-start"].hidden = true +data.raw["bool-setting"]["wood-military-nerf-start"].forced_value = true \ No newline at end of file diff --git a/lignumis/settings.lua b/lignumis/settings.lua index 3ecebc1..4fae102 100644 --- a/lignumis/settings.lua +++ b/lignumis/settings.lua @@ -12,17 +12,5 @@ data:extend({ setting_type = "startup", default_value = true, order = "b" - }, + } }) - -if not mods["wood-military"] then - data:extend({ - { - type = "bool-setting", - name = "lignumis-ammo-progression", - setting_type = "startup", - default_value = true, - order = "c" - } - }) -end diff --git a/lignumis/settings/updates.lua b/lignumis/settings/updates.lua deleted file mode 100644 index aedfdff..0000000 --- a/lignumis/settings/updates.lua +++ /dev/null @@ -1 +0,0 @@ -require("wood-military") \ No newline at end of file diff --git a/lignumis/settings/wood-military.lua b/lignumis/settings/wood-military.lua deleted file mode 100644 index 75ee975..0000000 --- a/lignumis/settings/wood-military.lua +++ /dev/null @@ -1,11 +0,0 @@ -if not mods["wood-military"] then - return -end - -data.raw["bool-setting"]["wood-military-rockets"].default_value = false -data.raw["bool-setting"]["wood-military-artillery"].default_value = false -data.raw["bool-setting"]["wood-military-damage-buff"].default_value = false -data.raw["bool-setting"]["wood-military-armor"].hidden = true -data.raw["bool-setting"]["wood-military-armor"].forced_value = true -data.raw["bool-setting"]["wood-military-nerf-start"].hidden = true -data.raw["bool-setting"]["wood-military-nerf-start"].forced_value = true \ No newline at end of file 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/lignumis/thumbnail.png b/lignumis/thumbnail.png index 8c07e6f..9c5344e 100644 Binary files a/lignumis/thumbnail.png and b/lignumis/thumbnail.png differ 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-gun-turret/basic-gun-turret-base.afphoto b/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto index bbdc39b..6705f2c 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-base.afphoto 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 index 5ab20dd..4c3e143 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-raising.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-raising.afphoto 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 index a079bc1..808e0aa 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-1.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-1.afphoto 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 index a0f49ca..39a7c73 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-2.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-2.afphoto 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 index db9d3aa..f7a2b87 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-3.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-3.afphoto 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 index 17c8ae9..3540db2 100644 Binary files a/sources/entity/basic-gun-turret/basic-gun-turret-shooting-4.afphoto and b/sources/entity/basic-gun-turret/basic-gun-turret-shooting-4.afphoto differ diff --git a/sources/entity/basic-radar.afphoto b/sources/entity/basic-radar.afphoto index ba218b6..149a695 100644 Binary files a/sources/entity/basic-radar.afphoto and b/sources/entity/basic-radar.afphoto differ diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto b/sources/entity/burner-agricultural-tower-base.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto rename to sources/entity/burner-agricultural-tower-base.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto b/sources/entity/burner-agricultural-tower-crane-1-1.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto rename to sources/entity/burner-agricultural-tower-crane-1-1.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto b/sources/entity/burner-agricultural-tower-crane-1-2.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto rename to sources/entity/burner-agricultural-tower-crane-1-2.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto b/sources/entity/burner-agricultural-tower-crane-10.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto rename to sources/entity/burner-agricultural-tower-crane-10.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto b/sources/entity/burner-agricultural-tower-crane-3.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto rename to sources/entity/burner-agricultural-tower-crane-3.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto b/sources/entity/burner-agricultural-tower-crane-4.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto rename to sources/entity/burner-agricultural-tower-crane-4.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto b/sources/entity/burner-agricultural-tower-crane-5-1.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto rename to sources/entity/burner-agricultural-tower-crane-5-1.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto b/sources/entity/burner-agricultural-tower-crane-5-2.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto rename to sources/entity/burner-agricultural-tower-crane-5-2.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto b/sources/entity/burner-agricultural-tower-crane-5.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto rename to sources/entity/burner-agricultural-tower-crane-5.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto b/sources/entity/burner-agricultural-tower-crane-6.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto rename to sources/entity/burner-agricultural-tower-crane-6.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto b/sources/entity/burner-agricultural-tower-crane-7-1.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto rename to sources/entity/burner-agricultural-tower-crane-7-1.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto b/sources/entity/burner-agricultural-tower-crane-7-2.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto rename to sources/entity/burner-agricultural-tower-crane-7-2.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto b/sources/entity/burner-agricultural-tower-crane-7.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto rename to sources/entity/burner-agricultural-tower-crane-7.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto b/sources/entity/burner-agricultural-tower-crane-8.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto rename to sources/entity/burner-agricultural-tower-crane-8.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto b/sources/entity/burner-agricultural-tower-crane-9.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto rename to sources/entity/burner-agricultural-tower-crane-9.afphoto diff --git a/sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto b/sources/entity/burner-agricultural-tower-remnants.afphoto similarity index 100% rename from sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto rename to sources/entity/burner-agricultural-tower-remnants.afphoto diff --git a/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto b/sources/entity/burner-assembling-machine-remnants.afphoto similarity index 59% rename from sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto rename to sources/entity/burner-assembling-machine-remnants.afphoto index 7d9989d..d4d95cb 100644 Binary files a/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto and b/sources/entity/burner-assembling-machine-remnants.afphoto differ diff --git a/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto b/sources/entity/burner-assembling-machine.afphoto similarity index 86% rename from sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto rename to sources/entity/burner-assembling-machine.afphoto index ac8b350..0c613fd 100644 Binary files a/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto and b/sources/entity/burner-assembling-machine.afphoto 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/icons/wood-darts-magazine.afphoto b/sources/entity/burner-inserter-hand-base.afphoto similarity index 68% rename from sources/icons/wood-darts-magazine.afphoto rename to sources/entity/burner-inserter-hand-base.afphoto index 06a35b2..c7f4287 100644 Binary files a/sources/icons/wood-darts-magazine.afphoto and b/sources/entity/burner-inserter-hand-base.afphoto differ diff --git a/sources/entity/burner-inserter-hand-closed.afphoto b/sources/entity/burner-inserter-hand-closed.afphoto new file mode 100644 index 0000000..ae9f5e1 Binary files /dev/null and b/sources/entity/burner-inserter-hand-closed.afphoto differ diff --git a/sources/entity/burner-inserter-hand-open.afphoto b/sources/entity/burner-inserter-hand-open.afphoto new file mode 100644 index 0000000..36db657 Binary files /dev/null and b/sources/entity/burner-inserter-hand-open.afphoto differ diff --git a/sources/entity/burner-inserter/burner-inserter-platform.afphoto b/sources/entity/burner-inserter-platform.afphoto similarity index 50% rename from sources/entity/burner-inserter/burner-inserter-platform.afphoto rename to sources/entity/burner-inserter-platform.afphoto index 69d7e12..f616708 100644 Binary files a/sources/entity/burner-inserter/burner-inserter-platform.afphoto and b/sources/entity/burner-inserter-platform.afphoto differ diff --git a/sources/entity/burner-inserter/burner-inserter-remnants.afphoto b/sources/entity/burner-inserter-remnants.afphoto similarity index 50% rename from sources/entity/burner-inserter/burner-inserter-remnants.afphoto rename to sources/entity/burner-inserter-remnants.afphoto index 4d1c37a..7ef592c 100644 Binary files a/sources/entity/burner-inserter/burner-inserter-remnants.afphoto and b/sources/entity/burner-inserter-remnants.afphoto 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-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto b/sources/entity/burner-long-handed-inserter-hand-base.afphoto similarity index 100% rename from sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto rename to sources/entity/burner-long-handed-inserter-hand-base.afphoto diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto b/sources/entity/burner-long-handed-inserter-hand-closed.afphoto similarity index 100% rename from sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto rename to sources/entity/burner-long-handed-inserter-hand-closed.afphoto diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto b/sources/entity/burner-long-handed-inserter-hand-open.afphoto similarity index 100% rename from sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto rename to sources/entity/burner-long-handed-inserter-hand-open.afphoto diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto b/sources/entity/burner-long-handed-inserter-platform.afphoto similarity index 100% rename from sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto rename to sources/entity/burner-long-handed-inserter-platform.afphoto diff --git a/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto b/sources/entity/burner-long-handed-inserter-remnants.afphoto similarity index 100% rename from sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto rename to sources/entity/burner-long-handed-inserter-remnants.afphoto diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto b/sources/entity/burner-mining-drill-E.afphoto similarity index 64% rename from sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto rename to sources/entity/burner-mining-drill-E.afphoto index 79f5359..6b7374b 100644 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto and b/sources/entity/burner-mining-drill-E.afphoto differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto b/sources/entity/burner-mining-drill-N.afphoto similarity index 76% rename from sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto rename to sources/entity/burner-mining-drill-N.afphoto index 2295da5..f433ead 100644 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto and b/sources/entity/burner-mining-drill-N.afphoto differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto b/sources/entity/burner-mining-drill-S.afphoto similarity index 77% rename from sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto rename to sources/entity/burner-mining-drill-S.afphoto index 3ac6e24..b3cc8bb 100644 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto and b/sources/entity/burner-mining-drill-S.afphoto differ diff --git a/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto b/sources/entity/burner-mining-drill-W.afphoto similarity index 74% rename from sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto rename to sources/entity/burner-mining-drill-W.afphoto index d8a8fd4..c2b7a5d 100644 Binary files a/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto and b/sources/entity/burner-mining-drill-W.afphoto differ diff --git a/sources/entity/gold-fluid-tank-window-background.png b/sources/entity/gold-fluid-tank-window-background.png new file mode 100644 index 0000000..202cfc9 Binary files /dev/null and b/sources/entity/gold-fluid-tank-window-background.png differ diff --git a/sources/entity/gold-fluid-tank.afphoto b/sources/entity/gold-fluid-tank.afphoto new file mode 100644 index 0000000..d5a7ebd Binary files /dev/null and b/sources/entity/gold-fluid-tank.afphoto 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 index 56d1016..93acfa6 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-down-left.afphoto and b/sources/entity/gold-pipe/gold-pipe-corner-down-left.afphoto 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 index 8198cbe..b443c0e 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-down-right.afphoto and b/sources/entity/gold-pipe/gold-pipe-corner-down-right.afphoto 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 index a425027..58feb9c 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-up-left.afphoto and b/sources/entity/gold-pipe/gold-pipe-corner-up-left.afphoto 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 index 5a00e01..c2ce28a 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-corner-up-right.afphoto and b/sources/entity/gold-pipe/gold-pipe-corner-up-right.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto index 623402e..57da440 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto and b/sources/entity/gold-pipe/gold-pipe-cover-east.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto index 3aca06b..d3d6ee8 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto and b/sources/entity/gold-pipe/gold-pipe-cover-north.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto index 78a8f23..112c03f 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto and b/sources/entity/gold-pipe/gold-pipe-cover-south.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto b/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto index 1046839..b7ca84a 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto and b/sources/entity/gold-pipe/gold-pipe-cover-west.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-cross.afphoto b/sources/entity/gold-pipe/gold-pipe-cross.afphoto index 5f3e8a8..c17abf0 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-cross.afphoto and b/sources/entity/gold-pipe/gold-pipe-cross.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto index 152d706..0dba5d7 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto and b/sources/entity/gold-pipe/gold-pipe-ending-down.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto index e93d51e..0b2c477 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto and b/sources/entity/gold-pipe/gold-pipe-ending-left.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto index ed8ba60..feeb931 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto and b/sources/entity/gold-pipe/gold-pipe-ending-right.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto b/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto index 5edc12f..a047bd3 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto and b/sources/entity/gold-pipe/gold-pipe-ending-up.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-remnants.afphoto b/sources/entity/gold-pipe/gold-pipe-remnants.afphoto index 3b9c248..5bb3999 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-remnants.afphoto and b/sources/entity/gold-pipe/gold-pipe-remnants.afphoto 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 index 736c1d4..efab2ab 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-horizontal-window.afphoto and b/sources/entity/gold-pipe/gold-pipe-straight-horizontal-window.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto index 09a5e1f..12797e6 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto and b/sources/entity/gold-pipe/gold-pipe-straight-horizontal.afphoto 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 index 7f11cba..1ec0000 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical-single.afphoto and b/sources/entity/gold-pipe/gold-pipe-straight-vertical-single.afphoto 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 index 379e21b..df42c6f 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical-window.afphoto and b/sources/entity/gold-pipe/gold-pipe-straight-vertical-window.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto b/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto index b0caad4..14614cc 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto and b/sources/entity/gold-pipe/gold-pipe-straight-vertical.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-down.afphoto b/sources/entity/gold-pipe/gold-pipe-t-down.afphoto index 2271491..cb04e4d 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-t-down.afphoto and b/sources/entity/gold-pipe/gold-pipe-t-down.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-left.afphoto b/sources/entity/gold-pipe/gold-pipe-t-left.afphoto index 7bb3ca2..257c85d 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-t-left.afphoto and b/sources/entity/gold-pipe/gold-pipe-t-left.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-right.afphoto b/sources/entity/gold-pipe/gold-pipe-t-right.afphoto index 31f362b..afe0591 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-t-right.afphoto and b/sources/entity/gold-pipe/gold-pipe-t-right.afphoto differ diff --git a/sources/entity/gold-pipe/gold-pipe-t-up.afphoto b/sources/entity/gold-pipe/gold-pipe-t-up.afphoto index 97a150f..cb4ac59 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-t-up.afphoto and b/sources/entity/gold-pipe/gold-pipe-t-up.afphoto 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 index f4c2d27..7376804 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-down.afphoto and b/sources/entity/gold-pipe/gold-pipe-to-ground-down.afphoto 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 index 218dba0..7062045 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-left.afphoto and b/sources/entity/gold-pipe/gold-pipe-to-ground-left.afphoto 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 index bf07fc4..ad681f6 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-remnants.afphoto and b/sources/entity/gold-pipe/gold-pipe-to-ground-remnants.afphoto 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 index e99f51b..1f403cd 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-right.afphoto and b/sources/entity/gold-pipe/gold-pipe-to-ground-right.afphoto 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 index cfcf3c1..f18d650 100644 Binary files a/sources/entity/gold-pipe/gold-pipe-to-ground-up.afphoto and b/sources/entity/gold-pipe/gold-pipe-to-ground-up.afphoto 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-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-rift.afphoto b/sources/entity/gold-rift.afphoto new file mode 100644 index 0000000..69765a3 Binary files /dev/null and b/sources/entity/gold-rift.afphoto differ diff --git a/sources/entity/gold-rift.png b/sources/entity/gold-rift.png new file mode 100644 index 0000000..c10d94e Binary files /dev/null and b/sources/entity/gold-rift.png differ diff --git a/sources/entity/gold-storage-tank-remnants.afphoto b/sources/entity/gold-storage-tank-remnants.afphoto new file mode 100644 index 0000000..a111725 Binary files /dev/null and b/sources/entity/gold-storage-tank-remnants.afphoto 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.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-01.afphoto b/sources/entity/gold-stromatolite-01.afphoto new file mode 100644 index 0000000..5bae3fa Binary files /dev/null and b/sources/entity/gold-stromatolite-01.afphoto differ diff --git a/sources/entity/gold-stromatolite-02.afphoto b/sources/entity/gold-stromatolite-02.afphoto new file mode 100644 index 0000000..cae56bb Binary files /dev/null and b/sources/entity/gold-stromatolite-02.afphoto differ diff --git a/sources/entity/gold-stromatolite-03.afphoto b/sources/entity/gold-stromatolite-03.afphoto new file mode 100644 index 0000000..e2dc038 Binary files /dev/null and b/sources/entity/gold-stromatolite-03.afphoto differ diff --git a/sources/entity/gold-stromatolite-04.afphoto b/sources/entity/gold-stromatolite-04.afphoto new file mode 100644 index 0000000..c96c577 Binary files /dev/null and b/sources/entity/gold-stromatolite-04.afphoto differ diff --git a/sources/entity/gold-stromatolite-05.afphoto b/sources/entity/gold-stromatolite-05.afphoto new file mode 100644 index 0000000..d10a900 Binary files /dev/null and b/sources/entity/gold-stromatolite-05.afphoto differ diff --git a/sources/entity/gold-stromatolite-06.afphoto b/sources/entity/gold-stromatolite-06.afphoto new file mode 100644 index 0000000..e0acb4f Binary files /dev/null and b/sources/entity/gold-stromatolite-06.afphoto differ diff --git a/sources/entity/gold-stromatolite-07.afphoto b/sources/entity/gold-stromatolite-07.afphoto new file mode 100644 index 0000000..261c64c Binary files /dev/null and b/sources/entity/gold-stromatolite-07.afphoto differ diff --git a/sources/entity/gold-stromatolite-08.afphoto b/sources/entity/gold-stromatolite-08.afphoto new file mode 100644 index 0000000..702f627 Binary files /dev/null and b/sources/entity/gold-stromatolite-08.afphoto differ diff --git a/sources/entity/gold-stromatolite-09.afphoto b/sources/entity/gold-stromatolite-09.afphoto new file mode 100644 index 0000000..697c43e Binary files /dev/null and b/sources/entity/gold-stromatolite-09.afphoto differ diff --git a/sources/entity/gold-stromatolite-10.afphoto b/sources/entity/gold-stromatolite-10.afphoto new file mode 100644 index 0000000..cc84d95 Binary files /dev/null and b/sources/entity/gold-stromatolite-10.afphoto differ diff --git a/sources/entity/gold-stromatolite-11.afphoto b/sources/entity/gold-stromatolite-11.afphoto new file mode 100644 index 0000000..9c9800b Binary files /dev/null and b/sources/entity/gold-stromatolite-11.afphoto differ diff --git a/sources/entity/gold-stromatolite-12.afphoto b/sources/entity/gold-stromatolite-12.afphoto new file mode 100644 index 0000000..c523c9a Binary files /dev/null and b/sources/entity/gold-stromatolite-12.afphoto differ diff --git a/sources/entity/gold-stromatolite-13.afphoto b/sources/entity/gold-stromatolite-13.afphoto new file mode 100644 index 0000000..0a53a60 Binary files /dev/null and b/sources/entity/gold-stromatolite-13.afphoto differ diff --git a/sources/entity/gold-stromatolite-14.afphoto b/sources/entity/gold-stromatolite-14.afphoto new file mode 100644 index 0000000..66500dd Binary files /dev/null and b/sources/entity/gold-stromatolite-14.afphoto differ diff --git a/sources/entity/gold-stromatolite-15.afphoto b/sources/entity/gold-stromatolite-15.afphoto new file mode 100644 index 0000000..f94c4c6 Binary files /dev/null and b/sources/entity/gold-stromatolite-15.afphoto differ diff --git a/sources/entity/gold-stromatolite-16.afphoto b/sources/entity/gold-stromatolite-16.afphoto new file mode 100644 index 0000000..d737453 Binary files /dev/null and b/sources/entity/gold-stromatolite-16.afphoto 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-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/gold-pipe/machine-gold-pipe-S.afphoto b/sources/entity/steam-assembling-machine-remnants.afphoto similarity index 66% rename from sources/entity/gold-pipe/machine-gold-pipe-S.afphoto rename to sources/entity/steam-assembling-machine-remnants.afphoto index 1d88b69..eef58c6 100644 Binary files a/sources/entity/gold-pipe/machine-gold-pipe-S.afphoto and b/sources/entity/steam-assembling-machine-remnants.afphoto differ diff --git a/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto b/sources/entity/steam-assembling-machine.afphoto similarity index 80% rename from sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto rename to sources/entity/steam-assembling-machine.afphoto index cd7326f..721282a 100644 Binary files a/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto and b/sources/entity/steam-assembling-machine.afphoto 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/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-light.afphoto similarity index 100% rename from sources/entity/wood-lab/wood-lab-light.afphoto rename to sources/entity/wood-lab-light.afphoto diff --git a/sources/entity/wood-lab/wood-lab.afphoto b/sources/entity/wood-lab.afphoto similarity index 100% rename from sources/entity/wood-lab/wood-lab.afphoto rename to sources/entity/wood-lab.afphoto diff --git a/sources/entity/wood-splitter-east-top_patch.afphoto b/sources/entity/wood-splitter-east-top_patch.afphoto new file mode 100644 index 0000000..dd9d374 Binary files /dev/null and b/sources/entity/wood-splitter-east-top_patch.afphoto differ diff --git a/sources/entity/wood-splitter-east.afphoto b/sources/entity/wood-splitter-east.afphoto new file mode 100644 index 0000000..20711de Binary files /dev/null and b/sources/entity/wood-splitter-east.afphoto differ diff --git a/sources/entity/wood-splitter-north.afphoto b/sources/entity/wood-splitter-north.afphoto new file mode 100644 index 0000000..0e63ce8 Binary files /dev/null and b/sources/entity/wood-splitter-north.afphoto differ diff --git a/sources/entity/wood-splitter-remnants.afphoto b/sources/entity/wood-splitter-remnants.afphoto new file mode 100644 index 0000000..fcd5578 Binary files /dev/null and b/sources/entity/wood-splitter-remnants.afphoto differ diff --git a/sources/entity/wood-splitter-south.afphoto b/sources/entity/wood-splitter-south.afphoto new file mode 100644 index 0000000..510abaf Binary files /dev/null and b/sources/entity/wood-splitter-south.afphoto differ diff --git a/sources/entity/wood-splitter-west-top_patch.afphoto b/sources/entity/wood-splitter-west-top_patch.afphoto new file mode 100644 index 0000000..80afaf0 Binary files /dev/null and b/sources/entity/wood-splitter-west-top_patch.afphoto differ diff --git a/sources/entity/wood-splitter-west.afphoto b/sources/entity/wood-splitter-west.afphoto new file mode 100644 index 0000000..4b67ce8 Binary files /dev/null and b/sources/entity/wood-splitter-west.afphoto differ diff --git a/sources/entity/wood-transport-belt-remnants.afphoto b/sources/entity/wood-transport-belt-remnants.afphoto new file mode 100644 index 0000000..fe29894 Binary files /dev/null and b/sources/entity/wood-transport-belt-remnants.afphoto differ diff --git a/sources/entity/wood-transport-belt.afphoto b/sources/entity/wood-transport-belt.afphoto new file mode 100644 index 0000000..0e4059f Binary files /dev/null and b/sources/entity/wood-transport-belt.afphoto differ diff --git a/sources/entity/wood-underground-belt-remnants.afphoto b/sources/entity/wood-underground-belt-remnants.afphoto new file mode 100644 index 0000000..7f0e6c3 Binary files /dev/null and b/sources/entity/wood-underground-belt-remnants.afphoto differ diff --git a/sources/entity/wood-underground-belt-structure.afphoto b/sources/entity/wood-underground-belt-structure.afphoto new file mode 100644 index 0000000..9d88a4e Binary files /dev/null and b/sources/entity/wood-underground-belt-structure.afphoto differ diff --git a/sources/entity/wooden-rocket-silo/02-rocket.afphoto b/sources/entity/wooden-rocket-silo/02-rocket.afphoto new file mode 100644 index 0000000..626f928 Binary files /dev/null and b/sources/entity/wooden-rocket-silo/02-rocket.afphoto differ diff --git a/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto b/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto index 2402e06..dec31ca 100644 Binary files a/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto and b/sources/entity/wooden-rocket-silo/06-rocket-silo.afphoto 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-back.png b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png new file mode 100644 index 0000000..c32d618 Binary files /dev/null and b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-back.png 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/08-rocket-silo-arms-right.png b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png new file mode 100644 index 0000000..affe531 Binary files /dev/null and b/sources/entity/wooden-rocket-silo/08-rocket-silo-arms-right.png 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/13-rocket-silo-arms-front.png b/sources/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png new file mode 100644 index 0000000..b67b160 Binary files /dev/null and b/sources/entity/wooden-rocket-silo/13-rocket-silo-arms-front.png 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 index 37a3fb9..94b417b 100644 Binary files a/sources/entity/wooden-rocket-silo/14-rocket-silo-front.afphoto and b/sources/entity/wooden-rocket-silo/14-rocket-silo-front.afphoto differ diff --git a/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto b/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto index cdd5034..3717d24 100644 Binary files a/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto and b/sources/entity/wooden-rocket-silo/rocket-static-pod.afphoto 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-gun-turret.afphoto b/sources/icons/basic-gun-turret.afphoto index 80e4891..8e5ed4a 100644 Binary files a/sources/icons/basic-gun-turret.afphoto and b/sources/icons/basic-gun-turret.afphoto differ diff --git a/sources/icons/burner-inserter.afphoto b/sources/icons/burner-inserter.afphoto index 3af976c..397fe88 100644 Binary files a/sources/icons/burner-inserter.afphoto and b/sources/icons/burner-inserter.afphoto differ diff --git a/sources/icons/burner-mining-drill.afphoto b/sources/icons/burner-mining-drill.afphoto index a856d93..253c65d 100644 Binary files a/sources/icons/burner-mining-drill.afphoto and b/sources/icons/burner-mining-drill.afphoto 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/desiccation-furnace.afphoto b/sources/icons/desiccation-furnace.afphoto new file mode 100644 index 0000000..113cf71 Binary files /dev/null and b/sources/icons/desiccation-furnace.afphoto differ diff --git a/sources/icons/gold-pipe-to-ground.afphoto b/sources/icons/gold-pipe-to-ground.afphoto index 548ad97..cf75fa2 100644 Binary files a/sources/icons/gold-pipe-to-ground.afphoto and b/sources/icons/gold-pipe-to-ground.afphoto differ diff --git a/sources/icons/gold-pipe.afphoto b/sources/icons/gold-pipe.afphoto index 80c8eda..413b3b1 100644 Binary files a/sources/icons/gold-pipe.afphoto and b/sources/icons/gold-pipe.afphoto differ diff --git a/sources/icons/gold-rift.afphoto b/sources/icons/gold-rift.afphoto new file mode 100644 index 0000000..9449049 Binary files /dev/null and b/sources/icons/gold-rift.afphoto differ diff --git a/sources/icons/gold-storage-tank.afphoto b/sources/icons/gold-storage-tank.afphoto index e5b541a..4aeaca1 100644 Binary files a/sources/icons/gold-storage-tank.afphoto and b/sources/icons/gold-storage-tank.afphoto differ diff --git a/sources/icons/lignumis.afphoto b/sources/icons/lignumis.afphoto index 43bfeea..c8ba11c 100644 Binary files a/sources/icons/lignumis.afphoto and b/sources/icons/lignumis.afphoto 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/noise-reduction-module-1.afphoto b/sources/icons/noise-reduction-module-1.afphoto new file mode 100644 index 0000000..46504b6 Binary files /dev/null and b/sources/icons/noise-reduction-module-1.afphoto differ diff --git a/sources/icons/noise-reduction-module-2.afphoto b/sources/icons/noise-reduction-module-2.afphoto new file mode 100644 index 0000000..6363252 Binary files /dev/null and b/sources/icons/noise-reduction-module-2.afphoto differ diff --git a/sources/icons/noise-reduction-module-3.afphoto b/sources/icons/noise-reduction-module-3.afphoto new file mode 100644 index 0000000..e00fadd Binary files /dev/null and b/sources/icons/noise-reduction-module-3.afphoto differ diff --git a/sources/icons/provisional-rocket-part.afphoto b/sources/icons/provisional-rocket-part.afphoto index 1076b02..72e241d 100644 Binary files a/sources/icons/provisional-rocket-part.afphoto and b/sources/icons/provisional-rocket-part.afphoto differ diff --git a/sources/icons/provisional-rocket-silo.afphoto b/sources/icons/provisional-rocket-silo.afphoto index c038497..fca65dc 100644 Binary files a/sources/icons/provisional-rocket-silo.afphoto and b/sources/icons/provisional-rocket-silo.afphoto 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 index 0a2afc8..22072a6 100644 Binary files a/sources/icons/starmap-planet-lignumis.afphoto and b/sources/icons/starmap-planet-lignumis.afphoto 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/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/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/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/technology/basic-gun-turret.afphoto b/sources/technology/basic-gun-turret.afphoto index 12d312c..c9153d1 100644 Binary files a/sources/technology/basic-gun-turret.afphoto and b/sources/technology/basic-gun-turret.afphoto differ diff --git a/sources/technology/gold-fluid-handling.afphoto b/sources/technology/gold-fluid-handling.afphoto index a805f64..599ec30 100644 Binary files a/sources/technology/gold-fluid-handling.afphoto and b/sources/technology/gold-fluid-handling.afphoto differ diff --git a/sources/technology/lignumis.afphoto b/sources/technology/lignumis.afphoto index f95ca80..a91b9b0 100644 Binary files a/sources/technology/lignumis.afphoto and b/sources/technology/lignumis.afphoto differ diff --git a/sources/technology/provisional-rocketry.afphoto b/sources/technology/provisional-rocketry.afphoto index de49820..2b0c84f 100644 Binary files a/sources/technology/provisional-rocketry.afphoto and b/sources/technology/provisional-rocketry.afphoto differ diff --git a/sources/technology/wood-logistics.afphoto b/sources/technology/wood-logistics.afphoto new file mode 100644 index 0000000..1f966f5 Binary files /dev/null and b/sources/technology/wood-logistics.afphoto differ diff --git a/sources/terrain/gold-blubber.afphoto b/sources/terrain/gold-blubber.afphoto new file mode 100644 index 0000000..0b0e18d Binary files /dev/null and b/sources/terrain/gold-blubber.afphoto differ diff --git a/sources/thumbnail.afphoto b/sources/thumbnail.afphoto index 89f0573..4c5217d 100644 Binary files a/sources/thumbnail.afphoto and b/sources/thumbnail.afphoto differ