Sync pyAL frozen branch with master in order to account for portal up…

…date (#226) * removed unneeded py3 pack from smelter 2 * Update changelog.txt * biofluid fixes * biofluid fixes 2 * pyanodon/pybugreports#372 * version and changelog --------- Co-authored-by: kingarthur91 <[email protected]>
pyanodon · Jan 24, 2024 · 9b35a22 · 9b35a22
1 parent 49be7ee
commit 9b35a22
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 75 deletions.
diff --git a/...e+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/...e+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua
@@ -353,7 +353,7 @@ fix_tech("zinc-mk03",{order="000067",prerequisites={"zinc-mk02","additives","dia
 fix_tech("zinc-mk04",{order="000084",prerequisites={"zinc-mk03","machines-mk04"},unit={count=2000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}})
 fix_tech("zinc-mk05",{order="000095",prerequisites={"zinc-mk04","machines-mk05"},unit={count=1400,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}})
 fix_tech("smelters-mk01",{order="000020",prerequisites={"advanced-material-processing"},unit={count=75,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}})
-fix_tech("smelters-mk02",{order="000072",prerequisites={"py-science-pack-mk03"},unit={count=1200,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=10,name="py-science-pack-1",type="item"}},time=180}})
+fix_tech("smelters-mk02",{order="000064",prerequisites={"chemical-science-pack","small-parts-mk02"},unit={count=1100,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=6,name="py-science-pack-1",type="item"}},time=120}})
 fix_tech("smelters-mk03",{order="000081",prerequisites={"smelters-mk02","superconductor"},unit={count=1400,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=20,name="py-science-pack-1",type="item"}},time=300}})
 fix_tech("smelters-mk04",{order="000094",prerequisites={"smelters-mk03","quantum"},unit={count=1200,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=60,name="py-science-pack-1",type="item"}},time=600}})
 fix_tech("solder-mk01",{order="000008",prerequisites={"acetylene"},unit={count=40,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}})

diff --git a/.../pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores.lua b/.../pyalienlife+pycoalprocessing+pyfusionenergy+pyindustry+pypetroleumhandling+pyrawores.lua
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.1.18
+Date: 2014-1-24
+  Fixes:
+    - 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
+    - fixed that the sponge path 2 recipe replacements did not allow productivity even though the original recipes allowed it. (https://github.com/pyanodon/pybugreports/issues/372)
+---------------------------------------------------------------------------------------------------
 Version: 2.1.17
 Date: 2014-1-23
   Changes:

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

diff --git a/prototypes/updates/pyrawores-updates.lua b/prototypes/updates/pyrawores-updates.lua
@@ -30,7 +30,7 @@ if not mods["pyalternativeenergy"] then
 end
 
 --TECHNOLOGY("super-steel-mk01"):add_pack("py-science-pack-3")
-TECHNOLOGY("smelters-mk02"):add_pack("py-science-pack-3")
+--TECHNOLOGY("smelters-mk02"):add_pack("py-science-pack-3")
 
 --BUILDINDS--
 RECIPE('plankton-farm'):add_ingredient({type = "item", name = "glass", amount = 30})

diff --git a/prototypes/upgrades/sponge.lua b/prototypes/upgrades/sponge.lua
@@ -51,7 +51,8 @@ if data and not yafc_turd_integration then
             energy_required = 4
         }
     }
-
+
+    local productivity = {}
     local sponges = {'sea-sponge', 'sea-sponge-mk02', 'sea-sponge-mk03', 'sea-sponge-mk04'}
     for i, recipe in pairs({
         table.deepcopy(data.raw.recipe['sea-sponge-sprouts']),
@@ -60,12 +61,14 @@ if data and not yafc_turd_integration then
         table.deepcopy(data.raw.recipe['sea-sponge-sprouts-4']),
     }) do
         recipe.name = recipe.name .. '-flagellum'
-        FUN.add_result(recipe, {name = sponges[i], probability = 0.15 + i * 0.2, type = 'item', amount = 1})
+        productivity[i] = recipe.name
+        FUN.add_result(recipe, {name = sponges[i], probability = 0.15 + i * 0.2, type = 'item', amount = 1, catalyst_amount = 1})
         FUN.add_ingredient(recipe, {name = 'limestone', type = 'item', amount = 2})
         recipe.energy_required = recipe.energy_required * 1.5
         recipe.main_product = sponges[i]
         data:extend{recipe}
     end
+    FUN.productivity(productivity)
 
     for _, recipe in pairs({
         table.deepcopy(data.raw.recipe['sea-sponge-1']),

diff --git a/scripts/biofluid/biofluid-gui.lua b/scripts/biofluid/biofluid-gui.lua
@@ -88,6 +88,7 @@ function Biofluid.update_bioport_gui(player, gui)
 end
 
 function Biofluid.build_bioport_gui(entity, player)
+	if player.gui.relative.bioport_gui then player.gui.relative.bioport_gui.destroy() end
 	local main_frame = player.gui.relative.add{
 		type = 'frame', name = 'bioport_gui', caption = entity.prototype.localised_name, direction = 'vertical', tags = {unit_number = entity.unit_number},
 		anchor = {
@@ -175,6 +176,7 @@ function Biofluid.update_requester_gui(player, gui)
 end
 
 function Biofluid.build_requester_gui(entity, player)
+	if player.gui.screen.biofluid_requester_gui then player.gui.screen.biofluid_requester_gui.destroy() end
 	local unit_number = entity.unit_number
 	local main_frame = player.gui.screen.add{type = 'frame', name = 'biofluid_requester_gui', caption = entity.prototype.localised_name, direction = 'vertical'}
 	main_frame.auto_center = true

diff --git a/scripts/biofluid/biofluid.lua b/scripts/biofluid/biofluid.lua
@@ -649,9 +649,14 @@ Biofluid.events.on_destroyed = function(event)
 			if not heat_connection or not heat_connection.valid then return end
 			heat_connection.destroy()
 			global.biofluid_undergrounds[unit_number] = nil
+		elseif entity.name == BIOPORT then
+			local bioport_data = global.biofluid_bioports[unit_number]
+			if not bioport_data then return end
+			local graphic = bioport_data.animation_entity
+			if graphic and graphic.valid then graphic.destroy() end
+			global.biofluid_bioports[unit_number] = nil
 		else
 			global.biofluid_requesters[unit_number] = nil
-			global.biofluid_bioports[unit_number] = nil
 		end
 	elseif Biofluid.biorobots[name] then
 		local unit_number = entity.unit_number