diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2025-03-05 18:42:33 -0500 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2025-03-05 18:42:33 -0500 |
commit | 938b0bf2d332d71399d3729934ff9ec81230839d (patch) | |
tree | 89e4c373b3283e6b77c1d3dd06e7220bddc29651 /Archipelago | |
parent | eaabe9d0ec76a17257d44d218ee59ec82ef54ae6 (diff) | |
download | lingo-archipelago-938b0bf2d332d71399d3729934ff9ec81230839d.tar.gz lingo-archipelago-938b0bf2d332d71399d3729934ff9ec81230839d.tar.bz2 lingo-archipelago-938b0bf2d332d71399d3729934ff9ec81230839d.zip |
Don't send ORs for remotely received solves
Diffstat (limited to 'Archipelago')
-rw-r--r-- | Archipelago/client.gd | 6 | ||||
-rw-r--r-- | 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): | |||
969 | var the_panel = get_tree().get_root().get_node("Spatial/Panels").get_node(panel_name) | 969 | var the_panel = get_tree().get_root().get_node("Spatial/Panels").get_node(panel_name) |
970 | 970 | ||
971 | if !the_panel.is_complete: | 971 | if !the_panel.is_complete: |
972 | the_panel.get_node("AP_Panel").solved_remotely = true | ||
972 | the_panel.get_node("Viewport/GUI/Panel/TextEdit").complete() | 973 | the_panel.get_node("Viewport/GUI/Panel/TextEdit").complete() |
973 | else: | 974 | else: |
974 | _held_synced_panels.append(panel_index) | 975 | _held_synced_panels.append(panel_index) |
@@ -1018,8 +1019,11 @@ func checkPainting(painting_id): | |||
1018 | setValue("Paintings", [painting_id], "add") | 1019 | setValue("Paintings", [painting_id], "add") |
1019 | 1020 | ||
1020 | 1021 | ||
1021 | func solvePanel(panel_index): | 1022 | func solvePanel(panel_index, solved_remotely=false): |
1022 | _solved_panels.append(panel_index) | 1023 | _solved_panels.append(panel_index) |
1024 | |||
1025 | if solved_remotely: | ||
1026 | return | ||
1023 | 1027 | ||
1024 | if _map_loaded: | 1028 | if _map_loaded: |
1025 | var key_index = panel_index / kPANEL_BITFIELD_LENGTH | 1029 | 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) | |||
7 | var solvable = true | 7 | var solvable = true |
8 | var locked = false | 8 | var locked = false |
9 | var solve_index = null | 9 | var solve_index = null |
10 | var solved_remotely = false | ||
10 | 11 | ||
11 | const kAtbashPre = "abcdefghijklmnopqrstuvwxyz1234567890+-" | 12 | const kAtbashPre = "abcdefghijklmnopqrstuvwxyz1234567890+-" |
12 | const kAtbashPost = "zyxwvutsrqponmlkjihgfedcba0987654321-+" | 13 | const kAtbashPost = "zyxwvutsrqponmlkjihgfedcba0987654321-+" |
@@ -35,7 +36,7 @@ func answer_correct(): | |||
35 | 36 | ||
36 | if solve_index != null: | 37 | if solve_index != null: |
37 | var apclient = global.get_node("Archipelago") | 38 | var apclient = global.get_node("Archipelago") |
38 | apclient.solvePanel(solve_index) | 39 | apclient.solvePanel(solve_index, solved_remotely) |
39 | 40 | ||
40 | 41 | ||
41 | func evaluate_solvability(): | 42 | func evaluate_solvability(): |