From 0f75ca62ae803cc88080e9e237ed647d55c6771a Mon Sep 17 00:00:00 2001 From: AFranticTypist Date: Wed, 13 Nov 2024 11:54:25 -0500 Subject: [PATCH 1/3] Fix for bug #687 Included caravan-control ghost detection for the caravan open-dialog event. --- scripts/caravan/caravan.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/caravan/caravan.lua b/scripts/caravan/caravan.lua index 2c2f0486..e5581510 100644 --- a/scripts/caravan/caravan.lua +++ b/scripts/caravan/caravan.lua @@ -156,7 +156,13 @@ end py.on_event(py.events.on_entity_clicked(), function(event) local player = game.get_player(event.player_index) local cursor_stack = player.cursor_stack - if not cursor_stack or not cursor_stack.valid_for_read or cursor_stack.name ~= "caravan-control" then return end + local cursor_ghost = player.cursor_ghost + + if not (cursor_ghost and cursor_ghost.name.name == "caravan-control") then + if not cursor_stack or not cursor_stack.valid_for_read or cursor_stack.name ~= "caravan-control" then + return + end + end cursor_stack.clear() local caravan_data = storage.last_opened_caravan[player.index] From 3dadeacfe97b504d74408c6731234a4d3c76f12d Mon Sep 17 00:00:00 2001 From: AFranticTypist Date: Wed, 4 Dec 2024 22:32:02 -0500 Subject: [PATCH 2/3] Update caravan-gui.lua All caravans can use all types of caravan outposts. --- scripts/caravan/caravan-gui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/caravan/caravan-gui.lua b/scripts/caravan/caravan-gui.lua index 8e6acf24..1f574a5c 100644 --- a/scripts/caravan/caravan-gui.lua +++ b/scripts/caravan/caravan-gui.lua @@ -126,7 +126,7 @@ function Caravan.build_schedule_gui(gui, caravan_data) local entity = schedule.entity local actions if entity and entity.valid then - if entity.name == prototype.outpost then + if (entity.name == "outpost") or (entity.name == "outpost-aerial") then actions = prototype.actions.outpost elseif prototype.actions[entity.type] then actions = prototype.actions[entity.type] From 94d7796f9975f3cd89c6c2afaaa5d2f80f1b8301 Mon Sep 17 00:00:00 2001 From: AFranticTypist Date: Wed, 4 Dec 2024 22:33:29 -0500 Subject: [PATCH 3/3] Update changelog.txt --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index 3b90afb5..f19fb0ad 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,7 @@ Date: ? Changes: - Composter TURD path 2 no longer generates methanol. Now it instead generates coalbed gas. Resolves https://github.com/pyanodon/pybugreports/issues/757 - Greatly increased the science pack requirement for the wood processing unit turd from 500 -> 7000. Resolves https://github.com/pyanodon/pybugreports/issues/758 + - All caravans can use all caravan outpost types --------------------------------------------------------------------------------------------------- Version: 3.0.31 Date: 2024-11-29