From 938b0bf2d332d71399d3729934ff9ec81230839d Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Wed, 5 Mar 2025 18:42:33 -0500 Subject: Don't send ORs for remotely received solves --- Archipelago/client.gd | 6 +++++- Archipelago/panel.gd | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Archipelago/client.gd b/Archipelago/client.gd index d3d5053..2aa7bec 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd @@ -969,6 +969,7 @@ func syncSolvedPanel(panel_index): var the_panel = get_tree().get_root().get_node("Spatial/Panels").get_node(panel_name) if !the_panel.is_complete: + the_panel.get_node("AP_Panel").solved_remotely = true the_panel.get_node("Viewport/GUI/Panel/TextEdit").complete() else: _held_synced_panels.append(panel_index) @@ -1018,8 +1019,11 @@ func checkPainting(painting_id): setValue("Paintings", [painting_id], "add") -func solvePanel(panel_index): +func solvePanel(panel_index, solved_remotely=false): _solved_panels.append(panel_index) + + if solved_remotely: + return if _map_loaded: var key_index = panel_index / kPANEL_BITFIELD_LENGTH diff --git a/Archipelago/panel.gd b/Archipelago/panel.gd index 0cf29cd..2224ffa 100644 --- a/Archipelago/panel.gd +++ b/Archipelago/panel.gd @@ -7,6 +7,7 @@ var orig_color = Color(0, 0, 0, 0) var solvable = true var locked = false var solve_index = null +var solved_remotely = false const kAtbashPre = "abcdefghijklmnopqrstuvwxyz1234567890+-" const kAtbashPost = "zyxwvutsrqponmlkjihgfedcba0987654321-+" @@ -35,7 +36,7 @@ func answer_correct(): if solve_index != null: var apclient = global.get_node("Archipelago") - apclient.solvePanel(solve_index) + apclient.solvePanel(solve_index, solved_remotely) func evaluate_solvability(): -- cgit 1.4.1