Frozen (#249)

* 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 * fix pks turd prod * CHANGELOG * fix pks turd prod (#244) * fix pks turd prod * CHANGELOG * pyanodon/pybugreports#399 * fix turd prod * fuck those space rocks --------- Co-authored-by: kingarthur91 <[email protected]> Co-authored-by: Wisey <[email protected]> Co-authored-by: TheGoesen <[email protected]> Co-authored-by: przemo1232 <[email protected]>
pyanodon · May 28, 2024 · ebc8fd8 · ebc8fd8
1 parent 5a5a60f
commit ebc8fd8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,3 @@
----------------------------------------------------------------------------------------------------
 Version: 2.1.35
 Date: ?
   Changes:
@@ -7,6 +6,7 @@ Date: ?
     - Allowed productivity on the titanium+propene plastic recipe.
     - Fixed that mk2 and mk3 starch recipes did not accept productivity.
     - Allowed productivity on tuuphra path 3.
+    - Fixed the PKS recipes not accepting prod mods
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.34
 Date: 2024-9-5

diff --git a/control.lua b/control.lua
@@ -183,7 +183,7 @@ py.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::

diff --git a/data-final-fixes.lua b/data-final-fixes.lua
@@ -118,6 +118,7 @@ local recipes_list = {
 	'energy-drink',
 	'energy-drinkb',
 	'enzyme-pks',
+	'enzyme-pks-nickel-carbonyl',
 	'ethanol-combustion',
 	'ethanol',
 	'ethylene-from-fruit',
@@ -305,7 +306,7 @@ local recipes_list = {
 	'zogna-bacteria-darkness',
 	'zogna-bacteria',
 	'zymogens',
-
+  
 	'deposited-core',
 	'biofilm-pyht',
 	'graphene-roll',

diff --git a/locale/en/caravan.cfg b/locale/en/caravan.cfg
@@ -7,7 +7,7 @@ outpost-aerial=Aerial outpost
 
 [entity-description] 
 caravan=Slow moving land creature with a lack of free will. Not too bright, but reliable.
-flyavan=Sometimes we push way to far. Heavily modified creature made with earth whale genes and trits alien genome, plus with some organs and parts changed for a similar biomechanical part to allow floating and cargo capabilities.
+flyavan=Sometimes we push way too far. Heavily modified creature made with earth whale genes and trits alien genome, plus with some organs and parts changed for a similar biomechanical part to allow floating and cargo capabilities.
 nukavan=A type of caravan with a "special delivery".
 outpost=Item and food storage for land-based caravans.
 outpost-aerial=Item and food storage for aerial caravans.

diff --git a/prototypes/recipes/dhilmos/recipes-dhilmos-modules.lua b/prototypes/recipes/dhilmos/recipes-dhilmos-modules.lua
@@ -214,7 +214,7 @@ RECIPE {
         {type = 'item', name = 'dhilmos-codex-mk04', amount = 1},
         {type = 'item', name = 'cdna', amount = 2},
         {type = 'item', name = 'bio-scafold', amount = 8},
-        {type = 'item', name = 'regolite-rock', amount = 5},
+        {type = 'item', name = 'rich-gas', amount = 5},
         {type = 'item', name = 'cysteine', amount = 1},
         {type = 'item', name = 'solidified-sarcorus', amount = 2},
         {type = 'item', name = 'enediyne', amount = 1},

diff --git a/prototypes/recipes/moss/recipes-moss-modules.lua b/prototypes/recipes/moss/recipes-moss-modules.lua
@@ -157,7 +157,7 @@ RECIPE {
       {type = 'fluid', name = 'tholins', amount = 50},
       {type = 'fluid', name = 'psc', amount = 50},
       {type = 'item', name = 'chimeric-proteins', amount = 5},
-      {type = 'item', name = 'regolite-rock', amount = 5},
+      {type = 'item', name = 'rich-gas', amount = 5},
       },
   results = {
       {type = 'item', name = 'moss-mk04', amount = 4},

diff --git a/prototypes/recipes/simik/recipes-simik-modules.lua b/prototypes/recipes/simik/recipes-simik-modules.lua
@@ -213,7 +213,7 @@ RECIPE {
         {type = 'item', name = 'cdna', amount = 2},
         {type = 'item', name = 'strorix-unknown-sample', amount = 3},
         {type = 'item', name = 'bio-scafold', amount = 8},
-        {type = 'item', name = 'regolite-rock', amount = 50},
+        {type = 'item', name = 'rich-gas', amount = 50},
         {type = 'item', name = 'bmp', amount = 1},
         {type = 'fluid', name = 'psc', amount = 500},
         {type = 'fluid', name = 'gta', amount = 100},

diff --git a/prototypes/recipes/xeno/recipes-xeno-modules.lua b/prototypes/recipes/xeno/recipes-xeno-modules.lua
@@ -223,7 +223,7 @@ RECIPE {
         {type = 'item', name = 'bio-scafold', amount = 8},
         {type = 'item', name = 'nanochondria', amount = 1},
         {type = 'item', name = 'reca', amount = 1},
-        {type = 'item', name = 'regolite-rock', amount = 10},
+        {type = 'item', name = 'rich-gas', amount = 10},
         {type = 'item', name = 'immunosupressants', amount = 1},
         {type = 'fluid', name = 'psc', amount = 100},
         {type = 'fluid', name = 'sulfuric-acid', amount = 250},