Frozen (#243)

* Frozen (#242)

* Frozen (#240)

* make smart farms flora possitive

* version and changelog

* fix that collectors mk02-mk04 didnt get reset

fixes pyanodon/pybugreports#461

* i blame theros ass

* Smart farm fixes

* pyanodon/pybugreports#458

* TURD balance & migrations

* Fixed that subcritical-water-01 was not localised when pyAE is missing

* Fixed that the alpha dingrits from dingrit turd path 1 could not be used as modules inside the reproductive complex.

* Energy drink qol improvements

* Fixed several bugs involved with biofluid vessel underground pipes

* Fixed several bugs involved with biofluid vessel underground pipes

* remove print statements

* Reduce earlygame manual wood requirement grind.

---------

Co-authored-by: kingarthur91 <[email protected]>

* Fixed returned cages (#235)

* Add files via upload

* Fixed returned cages

* Fixed returned cages

* Fixed returned cages

* Returned cages fixed

* Fixed cage return

* Global Caravan handling GUI (#222)

* list of clickables everything is broken though

* click opens the thing

* moved to a new file-> todo prevent item stealing
list by outpost
scrollpane

* outpost gui

* status icon

* less loc

* new state idle

* pasting untested stuff from chatgpt

* ho

* more stuff that will certainly work nocap

* connected gui works

* lets try this migrations thingy

* fixed the migration

* use the migration

* fixed the close button...

* cleanup code a bit

* fixed the esc key

* localization

* localization

* ship it

* new rule I like open better

* wuuups

* I broke esc again...

* Apply pyanodon code formatting standard

* Remove references to stdlib functions as part of an ongoing effort to remove stdlib.

* Streamline the amount of code needed to handle GUI closing events

* Make the GUI expand to the container instead of having a hardcoded size

* Improve the relative GUI type guessing algorithm

* Move hotkey based GUI to pycodex and add a camera

* Add more buttons and finalize styling

---------

Co-authored-by: notnotmelon <[email protected]>

* Add a rename button to the original caravan GUI

* Add some randomly generated placeholder names for caravans.

---------

Co-authored-by: kingarthur91 <[email protected]>
Co-authored-by: Wisey <[email protected]>
Co-authored-by: TheGoesen <[email protected]>

* Fix vonix cages issue introduced in the PR yesterday

* Fixed unknown key error in the new caravan GUI

* Day 1 patch for caravan GUI

* pyanodon/pybugreports#469

* pyanodon/pybugreports#471

* Add a searchbar to the caravan global gui

* Removed the incompatibility with omnimatter wood.

* Buffed korlex path 2

* Removed references to nauvis in the locale

* Removed references to nauvis in the locale

* Buffed fawogae module breeding

* Update luatest to include the frozen branch

* Moved the ralesia turd from py4 to chem science. Also changed the text description on path 3.

* Fix caravan copypast

* nevermind this causes issues

* increase version number

* Fixed that nexelit ore had broken graphics in low-resolution mode.

* Added compatibility between caravans and the remote configuration mod

* path_resolution_modifier for caravans

* Actually, lets only do this for aerials

* added tier markers to rennea and arum seeds

* 10X improvement for biofluid UPS

* Increase version number

---------

Co-authored-by: kingarthur91 <[email protected]>
Co-authored-by: Wisey <[email protected]>
Co-authored-by: TheGoesen <[email protected]>

.github/workflows/factoriotest-pr.yml

@@ -4,6 +4,7 @@ on:
   pull_request_target:
     branches:
     - master
+    - Frozen
 
 permissions:
   contents: read

.github/workflows/factoriotest-push.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - master
+    - Frozen
 
 permissions:
   contents: read

changelog.txt

@@ -1,16 +1,71 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.34
+Date: 2024-9-5
+  Changes:
+    - Fixed that rennea and arum seeds mk02-mk04 didnt show tier pips.
+    - Optimized the biofluid network UPS by >10X. Huge thanks to @Harvester on Discord for the test world.
+    - Increased the animation speed of vessel pipes from 0.3 to 0.5.
+    - Improved the entity description for biofluid provider chests.
+    - Nerfed the manure output from guano 16 -> 10. Buffed the crafting time from 20 sec -> 8 sec.
+    - Fixed a missing catalyst_amount=8 on the guano manure recipe.
+---------------------------------------------------------------------------------------------------
+Version: 2.1.33
+Date: 2024-4-30
+  Changes:
+    - Fixed that nexelit ore had broken graphics in low-resolution mode.
+    - Added compatibility between caravans and the remote configuration mod.
+    - Allowed caravan GUI to be opened from anywhere including map view.
+    - Fixed a crash involving caravan GUI and editor mode.
+    - Improved aerial caravan UPS by optimizing the path resolution modifier.
+---------------------------------------------------------------------------------------------------
+Version: 2.1.32
+Date: 2024-4-30
+  Changes:
+    - Fixed that the shiny caravans from creature chamber turd were not copy-pasteable.
+---------------------------------------------------------------------------------------------------
+Version: 2.1.31
+Date: 2024-4-28
+  Changes:
+    - Removed references to nauvis in the locale. Part of preparation for the next pymod.
+    - Buffed the chance for breeding fawogae MK02+ modules from 25% to 50%.
+    - Moved the ralesia turd from py4 to chem science. Also changed the text description on path 3.
+---------------------------------------------------------------------------------------------------
+Version: 2.1.30
+Date: 2024-4-26
+  Changes:
+    - Buffed korlex path 2
+---------------------------------------------------------------------------------------------------
+Version: 2.1.29
+Date: 2024-4-25
+  Changes:
+    - Fixed oculas sometimes delivering too many items (https://github.com/pyanodon/pybugreports/issues/469)
+    - Fixed that smart farms did not work when installed with the Alien Biomes mod. (https://github.com/pyanodon/pybugreports/issues/471)
+    - Added a search bar to the caravan GUI in the pyCodex
+    - Removed the incompatibility with omnimatter wood. (https://mods.factorio.com/mod/pyalienlife/discussion/65e0119af246f66d7c5548b8)
+---------------------------------------------------------------------------------------------------
+Version: 2.1.28
+Date: 2024-4-16
+  Changes:
+    - Fixed unknown key error in the new caravan GUI
+    - Fixed that having only 1 caravan would make the GUI way too long
+    - Improved the quick summary description button in the caravan GUI
+    - Caravans now show their inventory on their item tooltip
+---------------------------------------------------------------------------------------------------
 Version: 2.1.27
-Date: 2024-4-??
-  Fixes:
+Date: 2024-4-15
+  Changes:
     - Trees now give 1.5 logs when broken instead of 2.
     - Dead trees now give 1 logs instead of 0.5.
     - Trees now give sap with a 10% chance instead of a 5% chance.
     - Updated pyPP cachefiles.
     - Fixed a crash with biofluid pipes (https://github.com/pyanodon/pybugreports/issues/409)
+    - Fixed that vonix raising recipes were returning cages.
+    - Added the ability to rename caravans.
+    - Added a caravan manager GUI. See the pyCodex for more information. Huge thank-you to TheGoesen for the awesome PR. (https://github.com/pyanodon/pyalienlife/pull/222)
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.26
 Date: 2024-4-13
-  Fixes:
+  Changes:
     - Fixed that you could generate infinite landfill by spam placing and replacing the smart farm
     - Fixed that the collector check area introduced in 2.1.25 was not big enough (https://github.com/pyanodon/pybugreports/issues/461)
     - Smart farms now properly clean up any wood fences when they are destroyed.
@@ -32,12 +87,12 @@ Date: 2024-4-13
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.25
 Date: 2024-3-25
-  Fixes:
+  Changes:
     - Fixed that collector mk02-mk04 were not getting reset properly in the smart farm
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.24
 Date: 2024-3-24
-  Fixes:
+  Changes:
     - Buffed simik scale -> uranium ore atomizer recipe by 5X
     - Fixed typos in arqad turd descriptions
     - Added nukes to nuclear carvan crafting recipe. Removed explosive rockets. (only applies when pyAE is installed)
@@ -58,12 +113,12 @@ Date: 2024-3-24
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.23
 Date: 2024-3-14
-  Fixes:
+  Changes:
     - Fixed that fish oil to tin recipe was being overwritten by fish to tin recipe
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.22
 Date: 2024-3-13
-  Fixes:
+  Changes:
     - Added a migration to clean any remaining bugged bioport graphics
     - Fixed misaligned pipe connections for korlex turd path 2 (https://github.com/pyanodon/pybugreports/issues/439)
     - added nano machine recipes and empty neuromorphic chip to the prod module list
@@ -73,25 +128,25 @@ Date: 2024-3-13
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.21
 Date: 2024-2-2
-  Fixes:
+  Changes:
     - Fixed ulric man light cone starting from the wrong location. (https://github.com/pyanodon/pybugreports/issues/385)
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.20
 Date: 2024-2-2
-  Fixes:
+  Changes:
     - Prevented biofluid bots from being affected by belts. https://github.com/pyanodon/pybugreports/issues/392
     - Fixed crash with mounts. https://github.com/pyanodon/pybugreports/issues/389
     - Allowed you to convert old unshiny units created from creature chamber turd path 3.
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.19
 Date: 2024-2-1
-  Fixes:
+  Changes:
     - fixed a typo on the gene lab upgrade (thanks, Arch)
     - moved limestone boring to chemical science as a peace offering to boldviking to stop breaking things
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.18
 Date: 2014-1-24
-  Fixes:
+  Changes:
     - fixed that smelter mk02 had an unneeded requirement on py sci 3. shut up it counts as a bug fix
     - fixed a crash when entering the editor mode while the biopyanoport gui was open
     - fixed that the biopyanoport could leave broken graphics after being picked up in certian cases
@@ -298,7 +353,7 @@ Date: 2023-7-25
     - zoology tech now adds +20 logistic trash slots.
     - fixed extreme high fuel buffer size. reduce stack size of gastrocapacitor 50->10. aerial caravan fuel size 4->2. standard & nuclear caravan fuel size 2->1
     - reduce stack size of workers food mk1, mk2 from 50->10
-  Bugfixes:
+  BugChanges:
     - fixed an ocula crash with the trainsaver mod
     - fixed that the quality cottongut food was referencing moondrop in the item tooltip even though it had no moondrop in the crafting recipe
     - fixed that thikats and workodile where showing up in kill statistics
@@ -419,7 +474,7 @@ Date: 2023-1-31
     - Added compost biomass amount to some tooltips
     - Radius visualization for smart farms
     - My body is stone. My voice, fire. The earth trebmles to my very presence. I am a god in human flesh. Despair, ye mortals
-  Bugfixes:
+  BugChanges:
     - Slaughterhouse gui no longer crashes in multiplayer
     - Fixed that RC could craft without modules
     - Locale fix for zungror, dhilmos

control.lua

@@ -229,7 +229,7 @@ script.on_nth_tick(7, function()
 		local gui = player.gui.relative.digosaurus_gui
 		if gui then Digosaurus.update_gui(gui); goto continue end
         gui = Caravan.get_caravan_gui(player)
-        if gui then Caravan.update_gui(gui, true); goto continue end
+        if gui then Caravan.update_gui(gui, true, player); goto continue end
         gui = player.gui.relative.bioport_gui
         if gui then Biofluid.update_bioport_gui(player, gui); goto continue end
         ::continue::

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pyalienlife",
-  "version": "2.1.26",
+  "version": "2.1.34",
   "factorio_version": "1.1",
   "title": "Pyanodons AlienLife",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
@@ -14,8 +14,7 @@
     "pyrawores >= 1.3.0",
     "pypetroleumhandling >= 1.3.4",
     "(?) pyhightech >= 1.5.0",
-    "! pyveganism >= 0.0.1",
-    "! omnimatter_wood"
+    "! pyveganism >= 0.0.1"
   ],
   "package": {
     "ignore": [],

locale/en/entity.cfg

@@ -265,7 +265,7 @@ vessel=Connects requester and provider tanks to floating biopyanoports.
 vessel-to-ground=Connects requester and provider tanks to floating biopyanoports.
 bioport=Used to store, feed, and muck out your biofluid creatures. Connect this to the biofluid network using vessels.
 requester-tank=Requests fluids from the biofluid network. Connect this to the biofluid network using vessels.
-provider-tank=Provides fluids to the biofluid network. Connect this to the biofluid network using vessels.
+provider-tank=Provides fluids to the biofluid network. Connect this to the biofluid network using vessels. Must contain at least 500 fluid to be active.
 gobachov=Transfers fluids between provider tanks and requester tanks. Place inside a floating biopyanoport.
 huzu=Transfers fluids between provider tanks and requester tanks. Place inside a floating biopyanoport.
 chorkok=Transfers fluids between provider tanks and requester tanks. Place inside a floating biopyanoport.
@@ -354,18 +354,18 @@ scrondrix-pen-mk01=Level 3 security area to raise scrondrixes, dangerous animals
 scrondrix-pen-mk02=Level 3 security area to raise scrondrixes, dangerous animals.
 scrondrix-pen-mk03=Level 3 security area to raise scrondrixes, dangerous animals.
 scrondrix-pen-mk04=Level 3 security area to raise scrondrixes, dangerous animals.
-rennea-plantation-mk01=A plantation to grow these nice mutated plants in this planet.
-rennea-plantation-mk02=A plantation to grow these nice mutated plants in this planet.
-rennea-plantation-mk03=A plantation to grow these nice mutated plants in this planet.
-rennea-plantation-mk04=A plantation to grow these nice mutated plants in this planet.
+rennea-plantation-mk01=A plantation to grow these nice mutated flowers.
+rennea-plantation-mk02=A plantation to grow these nice mutated flowers.
+rennea-plantation-mk03=A plantation to grow these nice mutated flowers.
+rennea-plantation-mk04=A plantation to grow these nice mutated flowers.
 phadai-enclosure-mk01=A fortified enclosure made to make these animals shaking their carapace out.
 phadai-enclosure-mk02=A fortified enclosure made to make these animals shaking their carapace out.
 phadai-enclosure-mk03=A fortified enclosure made to make these animals shaking their carapace out.
 phadai-enclosure-mk04=A fortified enclosure made to make these animals shaking their carapace out.
-simik den-mk01=Fortified and under constant surveillance enclosure to hold these exotic non-Nauvis based creatures.
-simik den-mk02=Fortified and under constant surveillance enclosure to hold these exotic non-Nauvis based creatures.
-simik den-mk03=Fortified and under constant surveillance enclosure to hold these exotic non-Nauvis based creatures.
-simik den-mk04=Fortified and under constant surveillance enclosure to hold these exotic non-Nauvis based creatures.
+simik den-mk01=This fortified enclosure is under constant surveillance enclosure to hold these exotic creatures.
+simik den-mk02=This fortified enclosure is under constant surveillance enclosure to hold these exotic creatures.
+simik den-mk03=This fortified enclosure is under constant surveillance enclosure to hold these exotic creatures.
+simik den-mk04=This fortified enclosure is under constant surveillance enclosure to hold these exotic creatures.
 auog-paddock-mk01=Underground paddock with shade for maximum comfort.
 auog-paddock-mk02=Underground paddock with shade for maximum comfort.
 auog-paddock-mk03=Underground paddock with shade for maximum comfort.
@@ -394,10 +394,10 @@ vonix-den-mk01=Level 4 surveillance structure. Vonixes move slowly and tend to b
 vonix-den-mk02=Level 4 surveillance structure. Vonixes move slowly and tend to be stationary, but always keep an eye on them.
 vonix-den-mk03=Level 4 surveillance structure. Vonixes move slowly and tend to be stationary, but always keep an eye on them.
 vonix-den-mk04=Level 4 surveillance structure. Vonixes move slowly and tend to be stationary, but always keep an eye on them.
-grods-swamp-mk01=Man-made swamp, used to grow specific watery species.
-grods-swamp-mk02=Man-made swamp, used to grow specific watery species.
-grods-swamp-mk03=Man-made swamp, used to grow specific watery species.
-grods-swamp-mk04=Man-made swamp, used to grow specific watery species.
+grods-swamp-mk01=Man-made swamp used to grow specific watery species.
+grods-swamp-mk02=Man-made swamp used to grow specific watery species.
+grods-swamp-mk03=Man-made swamp used to grow specific watery species.
+grods-swamp-mk04=Man-made swamp used to grow specific watery species.
 phagnot-corral-mk01=A place to grow this calm animal.
 phagnot-corral-mk02=A place to grow this calm animal.
 phagnot-corral-mk03=A place to grow this calm animal.
@@ -451,7 +451,7 @@ hidden-roboport-for-logistics-radius=Control tower for land beetles.
 harvester=An AI-controlled versatile machine, designed to efficiently harvest a variety of crops automatically.
 mega-farm=A building capable of automating every step of plant farming.
 ore-bioreserve=An area especially rich in biological material. The alien biodiversity here is very high. Good enough to collect samples to keep your gene pool refreshed.
-ore-nexelit=This valuable mineral native from this planet are too spread to collect by conventional ways, the alien fauna found a way to search and find it. Exploit it.
+ore-nexelit=This valuable mineral is too diffused to be collected in conventional ways. The alien fauna found a way to search and find it. Exploit it.
 collector=Automated delicate bots to obtain samples from that rare and fragile alien ecosystem. The only way to collect samples with minimum damage to the bioreserve.
 collector-mk02=Automated delicate bots to obtain samples from that rare and fragile alien ecosystem. The only way to collect samples with minimum damage to the bioreserve.
 collector-mk03=Automated delicate bots to obtain samples from that rare and fragile alien ecosystem. The only way to collect samples with minimum damage to the bioreserve.