about summary refs log tree commit diff stats
path: root/Archipelago/client.gd
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2024-02-20 10:09:57 -0500
committerStar Rauchenberger <fefferburbia@gmail.com>2024-02-20 10:09:57 -0500
commit17572f8cd5945536eccffbbe832517d75993c03f (patch)
tree377088f516d54556d214b7419f2f8a2600c4d7d4 /Archipelago/client.gd
parentb2b098573ef5bcd03d61e827d11b969460d992af (diff)
downloadlingo-archipelago-17572f8cd5945536eccffbbe832517d75993c03f.tar.gz
lingo-archipelago-17572f8cd5945536eccffbbe832517d75993c03f.tar.bz2
lingo-archipelago-17572f8cd5945536eccffbbe832517d75993c03f.zip
Revert "Added support for warp items (including sunwarps)"
This reverts commit b2b098573ef5bcd03d61e827d11b969460d992af.
Diffstat (limited to 'Archipelago/client.gd')
-rw-r--r--Archipelago/client.gd26
1 files changed, 0 insertions, 26 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index db79e15..3541016 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd
@@ -62,15 +62,6 @@ const progressive_items = {
62 {"item": "The Colorful - Green Door", "display": "Green"}, 62 {"item": "The Colorful - Green Door", "display": "Green"},
63 {"item": "The Colorful - Brown Door", "display": "Brown"}, 63 {"item": "The Colorful - Brown Door", "display": "Brown"},
64 {"item": "The Colorful - Gray Door", "display": "Gray"}, 64 {"item": "The Colorful - Gray Door", "display": "Gray"},
65 ],
66 "Progressive Pilgrimage":
67 [
68 {"item": "Hub Room - 1 Sunwarp", "display": "1 Sunwarp"},
69 {"item": "Orange Tower Fourth Floor - 2 Sunwarp", "display": "2 Sunwarp"},
70 {"item": "Orange Tower Third Floor - 3 Sunwarp", "display": "3 Sunwarp"},
71 {"item": "Orange Tower First Floor - 4 Sunwarp", "display": "4 Sunwarp"},
72 {"item": "Orange Tower Fourth Floor - 5 Sunwarp", "display": "5 Sunwarp"},
73 {"item": "Outside The Agreeable - 6 Sunwarp", "display": "6 Sunwarp"},
74 ] 65 ]
75} 66}
76 67
@@ -89,11 +80,6 @@ const kCLASSIFICATION_REMOTE_NORMAL = 0
89const kCLASSIFICATION_REMOTE_REDUCED = 1 80const kCLASSIFICATION_REMOTE_REDUCED = 1
90const kCLASSIFICATION_REMOTE_INSANITY = 2 81const kCLASSIFICATION_REMOTE_INSANITY = 2
91 82
92const kSUNWARP_ACCESS_NORMAL = 0
93const kSUNWARP_ACCESS_DISABLED = 1
94const kSUNWARP_ACCESS_UNLOCK = 2
95const kSUNWARP_ACCESS_PROGRESSIVE = 3
96
97var _client = WebSocketClient.new() 83var _client = WebSocketClient.new()
98var _should_process = false 84var _should_process = false
99var _initiated_disconnect = false 85var _initiated_disconnect = false
@@ -125,7 +111,6 @@ var _door_shuffle = false
125var _color_shuffle = false 111var _color_shuffle = false
126var _panel_shuffle = 0 # none, rearrange 112var _panel_shuffle = 0 # none, rearrange
127var _painting_shuffle = false 113var _painting_shuffle = false
128var _sunwarp_access = 0 # normal, disabled, unlock, progressive
129var _mastery_achievements = 21 114var _mastery_achievements = 21
130var _level_2_requirement = 223 115var _level_2_requirement = 223
131var _location_classification_bit = 0 116var _location_classification_bit = 0
@@ -291,8 +276,6 @@ func _on_data():
291 _painting_shuffle = _slot_data["shuffle_paintings"] 276 _painting_shuffle = _slot_data["shuffle_paintings"]
292 if _slot_data.has("shuffle_panels"): 277 if _slot_data.has("shuffle_panels"):
293 _panel_shuffle = _slot_data["shuffle_panels"] 278 _panel_shuffle = _slot_data["shuffle_panels"]
294 if _slot_data.has("sunwarp_access"):
295 _sunwarp_access = _slot_data["sunwarp_access"]
296 if _slot_data.has("seed"): 279 if _slot_data.has("seed"):
297 _slot_seed = _slot_data["seed"] 280 _slot_seed = _slot_data["seed"]
298 if _slot_data.has("painting_entrance_to_exit"): 281 if _slot_data.has("painting_entrance_to_exit"):
@@ -649,11 +632,6 @@ func processItem(item, index, from, flags):
649 painting_node = fake_parent_node.get_node_or_null(painting_id) 632 painting_node = fake_parent_node.get_node_or_null(painting_id)
650 if painting_node != null: 633 if painting_node != null:
651 painting_node.get_node("Script").movePainting() 634 painting_node.get_node("Script").movePainting()
652
653 if gamedata.warp_ids_by_item_id.has(int(item)):
654 var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
655 for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
656 warpsNode.get_node(warp_id).unlock_warp()
657 635
658 # Handle progressive items. 636 # Handle progressive items.
659 if item_name in progressive_items.keys(): 637 if item_name in progressive_items.keys():
@@ -715,10 +693,6 @@ func paintingIsVanilla(painting):
715 return !$Gamedata.mentioned_paintings.has(painting) 693 return !$Gamedata.mentioned_paintings.has(painting)
716 694
717 695
718func warpIsVanilla(warp):
719 return !$Gamedata.mentioned_warps.has(warp)
720
721
722func evaluateSolvability(): 696func evaluateSolvability():
723 emit_signal("evaluate_solvability") 697 emit_signal("evaluate_solvability")
724 698