From c919adbcfe6145fa4d95332565b696c50ff4a277 Mon Sep 17 00:00:00 2001 From: notnotmelon Date: Thu, 1 Feb 2024 12:18:56 -0600 Subject: [PATCH 1/3] Master <- Frozen (#229) * removed unneeded py3 pack from smelter 2 * Update changelog.txt * biofluid fixes * biofluid fixes 2 * https://github.com/pyanodon/pybugreports/issues/372 * version and changelog * Fix typo in genlab (gene lab) upgrade <@238483380491124737> * It is no longer 2014 * version and changelog * Fix all the things --------- Co-authored-by: kingarthur91 Co-authored-by: oorzkws <65210810+oorzkws@users.noreply.github.com> --- changelog.txt | 19 ++++++++++++++++--- info.json | 2 +- locale/en/techs.cfg | 4 ++-- prototypes/biofluid/chorkok.lua | 1 + prototypes/biofluid/gobachov.lua | 1 + prototypes/biofluid/huzu.lua | 1 + .../updates/pypetroleumhandling-updates.lua | 2 ++ prototypes/upgrades/creature.lua | 15 ++++++++++++++- scripts/mounts/mounts.lua | 2 +- 9 files changed, 39 insertions(+), 8 deletions(-) diff --git a/changelog.txt b/changelog.txt index 7ab3c033..e677062f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,17 @@ --------------------------------------------------------------------------------------------------- +Version: 2.1.20 +Date: 2024-2-2 + Fixes: + - Prevented biofluid bots from being effected (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: + - 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: @@ -8,18 +21,18 @@ Date: 2014-1-24 - 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 +Date: 2024-1-23 Changes: - Updated tech tree for recent changes --------------------------------------------------------------------------------------------------- Version: 2.1.16 -Date: 2014-1-23 +Date: 2024-1-23 Changes: - Added a color mask for ulric man - Updated Russian locale (by Shadow_Man). --------------------------------------------------------------------------------------------------- Version: 2.1.15 -Date: 2014-1-19 +Date: 2024-1-19 Changes: - Reworked mounts. See the pycodex for more information. - Buffed fawogae path 3. No longer replaces the fawogae -> raw coal recipe and instead lets you have both. diff --git a/info.json b/info.json index 04f583d8..3ab96a29 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "pyalienlife", - "version": "2.1.18", + "version": "2.1.20", "factorio_version": "1.1", "title": "Pyanodons AlienLife", "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple", diff --git a/locale/en/techs.cfg b/locale/en/techs.cfg index 77279cbb..e84fda19 100644 --- a/locale/en/techs.cfg +++ b/locale/en/techs.cfg @@ -289,7 +289,7 @@ bioreactor-upgrade=Bioreactor upgrade cadaveric-arum-upgrade=Cadaveric arum upgrade compost-upgrade=Compost upgrade creature-chamber-upgrade=Creature chamber upgrade -genlab-upgrade=Genlab upgrade +genlab-upgrade=Gene lab upgrade cridren-upgrade=Cridren upgrade data-array-upgrade=Data-array upgrade dhilmos-upgrade=Dhilmos upgrade @@ -966,4 +966,4 @@ guarpulse=A nanobot-based technology that can monitor the health of individual g aquaguar=A genetically engineered strain of guar that is resistant to drought and can grow in saline soil. This strain of guar would require less water and fertilizer to grow, making it more sustainable to cultivate. hh=A drone-based system that uses advanced sensors and AI algorithms to identify the most productive areas of a guar plantation. The drones can then autonomously harvest the ripe guar pods, maximizing yield and minimizing costs. turd-respec=Resets all T.U.R.D. selections. -turd-partial-respec=Allows you to reselect an option for one T.U.R.D. \ No newline at end of file +turd-partial-respec=Allows you to reselect an option for one T.U.R.D. diff --git a/prototypes/biofluid/chorkok.lua b/prototypes/biofluid/chorkok.lua index 3433f23c..a0916d86 100644 --- a/prototypes/biofluid/chorkok.lua +++ b/prototypes/biofluid/chorkok.lua @@ -101,6 +101,7 @@ data:extend{{ flags = {'placeable-player', 'placeable-off-grid', 'not-repairable', 'breaths-air', 'building-direction-8-way'}, minable = {mining_time = 0.2, result = 'chorkok'}, max_health = 250, + has_belt_immunity = true, order = 'z', subgroup = 'py-alienlife-biofluid-network', healing_per_tick = 0.01, diff --git a/prototypes/biofluid/gobachov.lua b/prototypes/biofluid/gobachov.lua index a985e4e8..3dee7214 100644 --- a/prototypes/biofluid/gobachov.lua +++ b/prototypes/biofluid/gobachov.lua @@ -91,6 +91,7 @@ data:extend{{ minable = {mining_time = 0.2, result = 'gobachov'}, max_health = 250, order = 'z', + has_belt_immunity = true, subgroup = 'py-alienlife-biofluid-network', healing_per_tick = 0.01, collision_box = {{0,0}, {0,0}}, diff --git a/prototypes/biofluid/huzu.lua b/prototypes/biofluid/huzu.lua index a91402ea..a8566c32 100644 --- a/prototypes/biofluid/huzu.lua +++ b/prototypes/biofluid/huzu.lua @@ -92,6 +92,7 @@ data:extend{{ minable = {mining_time = 0.2, result = 'huzu'}, max_health = 250, order = 'z', + has_belt_immunity = true, subgroup = 'py-alienlife-biofluid-network', healing_per_tick = 0.01, collision_box = {{0,0}, {0,0}}, diff --git a/prototypes/updates/pypetroleumhandling-updates.lua b/prototypes/updates/pypetroleumhandling-updates.lua index 4f61fd7e..f0a470cb 100644 --- a/prototypes/updates/pypetroleumhandling-updates.lua +++ b/prototypes/updates/pypetroleumhandling-updates.lua @@ -86,6 +86,8 @@ FUN.results_replacer("crude-from-manure", "ash", "soot") FUN.results_replacer("guar-separation", "organics", "biomass") FUN.results_replacer("bitumen-comb", "tar", "bitumen") +RECIPE("mining-limestone"):remove_unlock("excavation-2"):add_unlock("excavation-1") + ----EXCLUSIVE RECIPES---- RECIPE { diff --git a/prototypes/upgrades/creature.lua b/prototypes/upgrades/creature.lua index da219194..54c82514 100644 --- a/prototypes/upgrades/creature.lua +++ b/prototypes/upgrades/creature.lua @@ -14,6 +14,9 @@ local path_3_effects = {} for _, unit_name in pairs(units) do path_3_effects[#path_3_effects + 1] = {type = 'recipe-replacement', old = unit_name, new = unit_name .. '-turd'} end +for _, unit_name in pairs(units) do + path_3_effects[#path_3_effects + 1] = {type = 'unlock-recipe', recipe = unit_name .. '-convert-from-base'} +end if data and not yafc_turd_integration then path_1_effects[#path_1_effects + 1] = path_1_module_effect @@ -94,7 +97,17 @@ if data and not yafc_turd_integration then } item.icon = nil - data:extend{unit, recipe, item} + local convert_recipe = { + type = 'recipe', + name = unit_name .. '-convert-from-base', + enabled = false, + category = 'crafting', + energy_required = 0.5, + ingredients = {{type = 'item', name = unit_name, amount = 1}}, + results = {{type = 'item', name = name, amount = 1}}, + } + + data:extend{unit, recipe, item, convert_recipe} end elseif script then path_1_effects = function() diff --git a/scripts/mounts/mounts.lua b/scripts/mounts/mounts.lua index d2c05843..3c2bf2ae 100644 --- a/scripts/mounts/mounts.lua +++ b/scripts/mounts/mounts.lua @@ -40,7 +40,7 @@ local mounts = { Mounts.events.on_built = function(event) local entity = event.created_entity or event.entity - if not mounts[entity.name] then return end + if not entity.valid or not mounts[entity.name] then return end entity.grid.put{ name = 'py-mount-generator', position = {3, 0}, From 99d0b87b9c5f9e7475562d6dd03564b2a70e3c19 Mon Sep 17 00:00:00 2001 From: Erkigmo <122825731+Erkigmo@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:19:09 -0500 Subject: [PATCH 2/3] Affected (#230) --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index e677062f..7daf854d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,7 @@ Version: 2.1.20 Date: 2024-2-2 Fixes: - - Prevented biofluid bots from being effected (affected?) by belts. https://github.com/pyanodon/pybugreports/issues/392 + - 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. --------------------------------------------------------------------------------------------------- From 3f7b5c207a38432f24d816d040dd9b98f5fd6163 Mon Sep 17 00:00:00 2001 From: Alex ten Brink Date: Sun, 4 Feb 2024 14:54:52 +0100 Subject: [PATCH 3/3] Added code to trigger turd achievement --- scripts/turd/turd.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/turd/turd.lua b/scripts/turd/turd.lua index c199f0be..e0737177 100644 --- a/scripts/turd/turd.lua +++ b/scripts/turd/turd.lua @@ -452,6 +452,9 @@ gui_events[defines.events.on_gui_click]['py_turd_confirm_button'] = function(eve force.print{'turd.font', {'turd.selected-alert', {'technology-name.'..master_tech_name}, {'technology-name.'..sub_tech_name}, player.name, player.color.r, player.color.g, player.color.b}} turd_bonuses[master_tech_name] = sub_tech_name apply_turd_bonus(force, master_tech_name, tech_upgrades[master_tech_name], find_all_assembling_machines(force)) + for _, player in pairs(force.players) do + player.unlock_achievement("polished-turd") + end else global.turd_reset_remaining[force_index] = global.turd_reset_remaining[force_index] or 0 if global.turd_reset_remaining[force_index] <= 0 and not has_turd_migration(force_index, sub_tech_name) then