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]>
pyanodon · Apr 14, 2024 · 7f524ac · 7f524ac
1 parent 4b8b53e
commit 7f524ac
Show file tree

Hide file tree

Showing 22 changed files with 242 additions and 120 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,32 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.26
+Date: ?
+  Fixes:
+    - 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.
+    - Guano explosives can now be buffed by productivity to match the vanilla recipe. (https://github.com/pyanodon/pybugreports/issues/458)
+    - Fixed that subcritical-water-01 was not localised when pyAE is missing. (https://github.com/pyanodon/pybugreports/issues/445)
+    - Fixed that the alpha dingrits from dingrit turd path 1 could not be used as modules inside the reproductive complex. (https://github.com/pyanodon/pybugreports/issues/452)
+    - Fixed several bugs involved with biofluid vessel underground pipes (https://github.com/pyanodon/pybugreports/issues/437) (https://github.com/pyanodon/pybugreports/issues/409)
+    - Trees now gives 2 logs when broken instead of 1.
+  Energy drinks:
+    - The energy drink now gives you a linearly decreasing speed instead of a linearly increasing speed. Should be much easier to control.
+    - Removed damage per second from energy drinks.
+    - Removed fire spread from energy drinks.
+    - Max speedup of energy drinks reduced from 40X to 20X.
+  TURD:
+    - Nerfed kickalk turd path 1. Amount of non-dryed kickalk reduced from floor(75%) -> ceil(35%)
+    - Nerfed scrondrix turd path 3 from giving 24x brains to 16x. Also returns 1 less basic circuit.
+    - NOTE: If you already picked kickalk or scrondrix turd, you will have a 5 hour grace period to change them to a diffrent option.
+---------------------------------------------------------------------------------------------------
+Version: 2.1.25
+Date: 2024-3-25
+  Fixes:
+    - Fixed that collector mk02-mk04 were not getting reset properly in the smart farm
+---------------------------------------------------------------------------------------------------
 Version: 2.1.24
-Date: 2024-?-??
+Date: 2024-3-24
   Fixes:
     - Buffed simik scale -> uranium ore atomizer recipe by 5X
     - Fixed typos in arqad turd descriptions
@@ -18,6 +44,7 @@ Date: 2024-?-??
     - Fixed that zipir cubs had no uses (https://github.com/pyanodon/pybugreports/issues/432)
     - Fixed misspelling of genes as "gens" (https://github.com/pyanodon/pybugreports/issues/431)
     - Fixed yaedols turd path 2 did not return barrels
+    - removed generic sample from bioreserve smart farm recipes
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.23
 Date: 2024-3-14

diff --git a/control.lua b/control.lua
@@ -170,6 +170,7 @@ script.on_event(on_destroyed, function(event)
     Vatbrain.events.on_destroyed(event)
     Biofluid.events.on_destroyed(event)
     Mounts.events.on_destroyed(event)
+    Smart_Farm.events.on_destroyed(event)
 end)
 
 script.on_event(defines.events.on_player_removed_equipment, function(event)

diff --git a/data-final-fixes.lua b/data-final-fixes.lua
@@ -340,6 +340,7 @@ local recipes_list = {
 	"fdtd",
 	"milfe",
 	"mirror-mk04",
+	'guano-explosives'
 }
 
 --adding to module limitation list

diff --git a/data-updates.lua b/data-updates.lua
@@ -55,11 +55,6 @@ for food, value in pairs(Digosaurus.favorite_foods) do
     }
 end
 
---RECIPE('digosaurus-helmod-recipe-guts'):add_unlock('nexelit-mk01')
---RECIPE('digosaurus-helmod-recipe-meat'):add_unlock('nexelit-mk01')
---RECIPE('digosaurus-helmod-recipe-workers-food'):add_unlock('nexelit-mk01')
---RECIPE('digosaurus-helmod-recipe-workers-food-02'):add_unlock('nexelit-mk03')
-
 ----------------------------------------------------------------------------------------------------
 -- crafting_categories
 ----------------------------------------------------------------------------------------------------

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "pyalienlife",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "factorio_version": "1.1",
   "title": "Pyanodons AlienLife",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",

diff --git a/locale/en/items.cfg b/locale/en/items.cfg
@@ -1111,10 +1111,10 @@ dingrits-alpha=Only the oldest and strongest dingrits can become the alpha.
 auog-pup=Auog pup.
 auog-food-01=Basic auog food.
 auog-food-02=Oak chilli tart with crispy fawogae and bitter seaweed salad.
-fish=Bloop bloop.
+fish=Bloop.
 fish-mk02=Bloop bloop.
-fish-mk03=Bloop bloop.
-fish-mk04=Bloop bloop.
+fish-mk03=Bloop bloop bloop.
+fish-mk04=Bloop bloop bloop bloop.
 fish-food-01=Basic fish food.
 fish-food-02=Premium fish food for better care. Made from fish, for fish.
 yaedols-spores=These spores had issues, must be complemented.

diff --git a/locale/en/recipes.cfg b/locale/en/recipes.cfg
@@ -5,6 +5,10 @@ lard-combustion=Lard to combustion mixture (__1__°C)
 bio-oil-combustion=Bio oil to combustion mixture (__1__°C)
 oleochemical-combustion=Oleochemicals to combustion mixture (__1__°C)
 
+subcritical-water-01=Subcritical water MK 01
+subcritical-water-02=Subcritical water MK 02
+subcritical-water-03=Subcritical water MK 03
+
 ulric-sex-01=Breed new ulrics
 ulric-full-rendering=Render ulric
 ulric-manure-01=Basic farming

diff --git a/migrations/2.1.14.lua b/migrations/2.1.14.lua
diff --git a/migrations/2.1.26.lua b/migrations/2.1.26.lua
@@ -0,0 +1,9 @@
+local turd_migrate = require('__pyalienlife__/scripts/turd/turd-migration')
+
+turd_migrate('kicalk-upgrade', 'wire-netting')
+turd_migrate('kicalk-upgrade', 'extra-water')
+turd_migrate('kicalk-upgrade', 'crop-rotation')
+
+turd_migrate('scrondrix-upgrade', 'boronb')
+turd_migrate('scrondrix-upgrade', 'hspa')
+turd_migrate('scrondrix-upgrade', 'neuron')
diff --git a/prototypes/buildings/rc-mk01.lua b/prototypes/buildings/rc-mk01.lua
@@ -52,7 +52,7 @@ ENTITY {
         module_info_icon_shift = util.by_pixel(160, 230),
         module_slots = 2,
     },
-    allowed_effects = {"speed",'consumption','pollution'},
+    allowed_effects = {"speed",'consumption','pollution','productivity'},
     crafting_categories = {'rc'},
     crafting_speed = .333, -- 2 modules + 1 building = target speed of 1
     energy_source = {

diff --git a/prototypes/buildings/rc-mk02.lua b/prototypes/buildings/rc-mk02.lua
@@ -53,7 +53,7 @@ ENTITY {
         module_info_icon_shift = util.by_pixel(160, 230),
         module_slots = 4,
     },
-    allowed_effects = {"speed",'consumption','pollution'},
+    allowed_effects = {"speed",'consumption','pollution','productivity'},
     crafting_categories = {'rc'},
     crafting_speed = .4, -- 4 modules + 1 building = target speed of 2
     energy_source = {

diff --git a/prototypes/buildings/rc-mk03.lua b/prototypes/buildings/rc-mk03.lua
@@ -53,7 +53,7 @@ ENTITY {
         module_info_icon_shift = util.by_pixel(160, 230),
         module_slots = 6,
     },
-    allowed_effects = {"speed",'consumption','pollution'},
+    allowed_effects = {"speed",'consumption','pollution','productivity'},
     crafting_categories = {'rc'},
     crafting_speed = .428, -- 6 modules + 1 building = target speed of 3
     energy_source = {

diff --git a/prototypes/buildings/rc-mk04.lua b/prototypes/buildings/rc-mk04.lua
@@ -53,7 +53,7 @@ ENTITY {
         module_info_icon_shift = util.by_pixel(160, 230),
         module_slots = 8,
     },
-    allowed_effects = {"speed",'consumption','pollution'},
+    allowed_effects = {"speed",'consumption','pollution','productivity'},
     crafting_categories = {'rc'},
     crafting_speed = .444, -- 8 modules + 1 building = target speed of 4
     energy_source = {

diff --git a/prototypes/items/energy-drink.lua b/prototypes/items/energy-drink.lua
@@ -66,14 +66,7 @@ ITEM {
 
 local speedup_sticker = table.deepcopy(data.raw['sticker']['slowdown-sticker'])
 speedup_sticker.name = 'speedup-sticker'
-speedup_sticker.spread_fire_entity = 'fire-flame-on-tree'
-speedup_sticker.fire_spread_radius = 3
 speedup_sticker.duration_in_ticks = 60 * 60
-speedup_sticker.damage_interval = 70
-speedup_sticker.damage_per_tick = {
-	amount = 8,
-	type = 'fire'
-}
-speedup_sticker.target_movement_modifier_from = 1
-speedup_sticker.target_movement_modifier_to = 40
+speedup_sticker.target_movement_modifier_from = 20
+speedup_sticker.target_movement_modifier_to = 1
 data:extend{speedup_sticker}
diff --git a/prototypes/recipes/recipes-bioreserve-megafarm.lua b/prototypes/recipes/recipes-bioreserve-megafarm.lua
@@ -7,7 +7,6 @@ RECIPE {
     enabled = false,
     energy_required = 100,
     ingredients = {
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'bio-sample', amount = 2},
         {type = 'item', name = 'soil', amount = 1000},
     },
@@ -26,7 +25,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
     },
     results = {
@@ -44,7 +42,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
         {type = 'item', name = 'alien-sample01', amount = 2},
     },
@@ -63,7 +60,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
         {type = 'item', name = 'alien-sample01', amount = 2},
         {type = 'item', name = 'lignin', amount = 200},
@@ -83,7 +79,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
         {type = 'item', name = 'alien-sample01', amount = 2},
         {type = 'item', name = 'lignin', amount = 200},
@@ -104,7 +99,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
         {type = 'item', name = 'alien-sample-02', amount = 2},
         {type = 'item', name = 'lignin', amount = 200},
@@ -125,7 +119,6 @@ RECIPE {
         {type = 'fluid', name = 'water', amount = 10000},
         {type = 'item', name = 'soil', amount = 1000},
         {type = 'item', name = 'bio-sample', amount = 2},
-        {type = 'item', name = 'earth-generic-sample', amount = 10},
         {type = 'item', name = 'stone', amount = 1500},
         {type = 'item', name = 'alien-sample-02', amount = 5},
         {type = 'item', name = 'fertilizer', amount = 150},

diff --git a/prototypes/recipes/recipes.lua b/prototypes/recipes/recipes.lua
@@ -1705,7 +1705,6 @@ RECIPE {
     enabled = false,
     energy_required = 30,
     ingredients = {
-        {type = 'item', name = 'earth-generic-sample', amount = 5},
         {type = 'item', name = 'titanium-plate', amount = 100},
         --{type = 'item', name = 'metallic-glass', amount = 2},
         {type = 'item', name = 'biofilm', amount = 20},

diff --git a/prototypes/recipes/sap/recipes-sap.lua b/prototypes/recipes/sap/recipes-sap.lua
@@ -1,5 +1,4 @@
-local mine_results_1 =
-{
+local mine_results_1 = {
     type = 'item',
     name = 'saps',
     amount = 1,
@@ -19,14 +18,14 @@ for _, tree in pairs(data.raw.tree) do
                 {
                     type = 'item',
                     name = 'log',
-                    amount = tree.minable.count / 4.0,
+                    amount = math.ceil(tree.minable.count / 2.0),
                 },
             }
     end
 
     if tree.minable ~= nil then
         if tree.minable.result ~= nil then
-            --do nothing for now as i dont think the "trees" are the kind we want giving sap
+            --do nothing for now as i dont think the 'trees' are the kind we want giving sap
         elseif tree.minable.results[1].amount >= 1 then -- no sap from dead trees
             table.insert(tree.minable.results, mine_results_1)
         else
@@ -38,30 +37,30 @@ end
 --log(serpent.block(data.raw.tree['temperate-tree'].minable.results))
 
 RECIPE {
-    type = "recipe",
-    name = "sap-seeds",
-    category = "nursery",
+    type = 'recipe',
+    name = 'sap-seeds',
+    category = 'nursery',
     enabled = false,
     energy_required = 5,
     ingredients = {
-        {type = "item", name = "saps", amount = 5},
+        {type = 'item', name = 'saps', amount = 5},
     },
     results = {
-        {type = "item", name = "sap-seeds", amount = 2}
+        {type = 'item', name = 'sap-seeds', amount = 2}
     },
-}:add_unlock("sap-mk01")
+}:add_unlock('sap-mk01')
 
 RECIPE {
-    type = "recipe",
-    name = "sap-tree",
-    category = "nursery",
+    type = 'recipe',
+    name = 'sap-tree',
+    category = 'nursery',
     enabled = false,
     energy_required = 45,
     ingredients = {
-        {type = "item", name = "sap-seeds", amount = 5},
-        {type = "item", name = "planter-box", amount = 1},
+        {type = 'item', name = 'sap-seeds', amount = 5},
+        {type = 'item', name = 'planter-box', amount = 1},
     },
     results = {
-        {type = "item", name = "sap-tree", amount = 1}
+        {type = 'item', name = 'sap-tree', amount = 1}
     },
-}:add_unlock("sap-mk01")
+}:add_unlock('sap-mk01')
diff --git a/prototypes/upgrades/kicalk.lua b/prototypes/upgrades/kicalk.lua
@@ -12,7 +12,7 @@ if data and not yafc_turd_integration then
         local amount = recipe.results[1].amount
         recipe.results = {
             {type = 'item', name = 'kicalk-dry', amount = math.floor(amount / 2)},
-            {type = 'item', name = 'kicalk', amount = math.floor(amount * 0.75)},
+            {type = 'item', name = 'kicalk', amount = math.ceil(amount * 0.35)},
         }
         recipe.main_product = 'kicalk-dry'
         recipe.energy_required = math.ceil(recipe.energy_required * 0.8)

diff --git a/prototypes/upgrades/scrondrix.lua b/prototypes/upgrades/scrondrix.lua
@@ -55,7 +55,7 @@ if data and not yafc_turd_integration then
     local brains = table.deepcopy(data.raw.recipe['ex-bra-scro'])
     brains.name = 'scrondrix-brain-slaughterhouse-ex'
     brains.localised_name = {'recipe-name.ex-bra-scro'}
-    FUN.multiply_result_amount(brains, 'brain', 24)
+    FUN.multiply_result_amount(brains, 'brain', 16)
     FUN.multiply_result_amount(brains, 'pineal-gland', 0.25)
 
     local experimental = table.deepcopy(data.raw.recipe['Caged scrondrix 9'])
@@ -64,7 +64,7 @@ if data and not yafc_turd_integration then
     experimental.results = {
         {name = 'bones', amount = 1, type = 'item', probability = 0.6},
         {name = 'cage', amount = 1, type = 'item', probability = 0.6},
-        {name = 'electronic-circuit', amount_min = 8, amount_max = 9, type = 'item'},
+        {name = 'electronic-circuit', amount_min = 7, amount_max = 8, type = 'item'},
         {name = 'brain-caged-scrondrix', amount = 1, type = 'item', probability = 0.4},
     }
     experimental.main_product = 'brain-caged-scrondrix'

diff --git a/scripts/biofluid/biofluid.lua b/scripts/biofluid/biofluid.lua
@@ -70,7 +70,7 @@ Biofluid.events.on_built = function(event)
 	elseif connection_type == Biofluid.PROVIDER then
 		entity.operable = false
 	end
-	Biofluid.built_pipe(entity, true)
+	Biofluid.built_pipe(entity)
 end
 
 function Biofluid.update_bioport_animation(bioport_data)