Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyanodon/pyalienlife
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 96a749e29dbacd17f142ae5c9c102a6d491da20d
Choose a base ref
..
head repository: pyanodon/pyalienlife
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec1abeaae702af75b581484c3fc97187e9dffe68
Choose a head ref
Showing with 8 additions and 16 deletions.
  1. +2 −1 changelog.txt
  2. +0 −12 migrations/3.0.24.lua
  3. +1 −1 prototypes/recipes/korlex/recipes-korlex.lua
  4. +5 −2 scripts/turd/turd.lua
3 changes: 2 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@ Version: 3.0.24
Date: ?
Changes:
- Fixed digosaurs pywiki page missing [item=dried-meat] → 1 ore info. Resolves https://github.com/pyanodon/pybugreports/issues/725
- Change order of oil and steam input for Korlex food.
- Fixed a crash when clicking on the "Unavaliable" button in the fish TURD while dousing pumps is selected.
- Fixed a crash migrating TURDs
---------------------------------------------------------------------------------------------------
Version: 3.0.23
Date: 2024-11-17
12 changes: 0 additions & 12 deletions migrations/3.0.24.lua

This file was deleted.

2 changes: 1 addition & 1 deletion prototypes/recipes/korlex/recipes-korlex.lua
Original file line number Diff line number Diff line change
@@ -56,8 +56,8 @@ RECIPE {
{type = "item", name = "seaweed", amount = 10},
{type = "item", name = "salt", amount = 10},
{type = "item", name = "fawogae", amount = 10},
{type = "fluid", name = "fish-oil", amount = 100},
{type = "fluid", name = "steam", amount = 100},
{type = "fluid", name = "fish-oil", amount = 100},
},
results = {
{type = "item", name = "korlex-food-01", amount = 3},
7 changes: 5 additions & 2 deletions scripts/turd/turd.lua
Original file line number Diff line number Diff line change
@@ -386,7 +386,7 @@ end
local function apply_turd_bonus(force, master_tech_name, tech_upgrade, assembling_machine_list)
local turd_bonuses = storage.turd_bonuses[force.index] or {}
local selection = turd_bonuses[master_tech_name] or NOT_SELECTED
if selection == NOT_SELECTED then return end
if selection == NOT_SELECTED then return assembling_machine_list end
local sub_tech = tech_upgrade.sub_techs[selection]

local recipes = force.recipes
@@ -406,14 +406,15 @@ local function apply_turd_bonus(force, master_tech_name, tech_upgrade, assemblin
storage.turd_machine_replacements[force.index][effect.old] = effect.new
end
end
return assembling_machine_list
end

local function reapply_turd_bonuses(force)
storage.turd_unlocked_modules[force.index] = {}
local assembling_machine_list = find_all_assembling_machines(force)

for master_tech_name, tech_upgrade in pairs(tech_upgrades) do
apply_turd_bonus(force, master_tech_name, tech_upgrade, assembling_machine_list)
assembling_machine_list = apply_turd_bonus(force, master_tech_name, tech_upgrade, assembling_machine_list)
end
end

@@ -475,6 +476,8 @@ gui_events[defines.events.on_gui_click]["py_turd_confirm_button"] = function(eve
return
end

if element.caption[1] == "turd.unavailable" then return end

local turd_bonuses = storage.turd_bonuses[force_index] or {}
storage.turd_bonuses[force_index] = turd_bonuses
local selection = turd_bonuses[master_tech_name] or NOT_SELECTED