From 17572f8cd5945536eccffbbe832517d75993c03f Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Tue, 20 Feb 2024 10:09:57 -0500 Subject: Revert "Added support for warp items (including sunwarps)" This reverts commit b2b098573ef5bcd03d61e827d11b969460d992af. --- Archipelago/client.gd | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'Archipelago/client.gd') 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 = { {"item": "The Colorful - Green Door", "display": "Green"}, {"item": "The Colorful - Brown Door", "display": "Brown"}, {"item": "The Colorful - Gray Door", "display": "Gray"}, - ], - "Progressive Pilgrimage": - [ - {"item": "Hub Room - 1 Sunwarp", "display": "1 Sunwarp"}, - {"item": "Orange Tower Fourth Floor - 2 Sunwarp", "display": "2 Sunwarp"}, - {"item": "Orange Tower Third Floor - 3 Sunwarp", "display": "3 Sunwarp"}, - {"item": "Orange Tower First Floor - 4 Sunwarp", "display": "4 Sunwarp"}, - {"item": "Orange Tower Fourth Floor - 5 Sunwarp", "display": "5 Sunwarp"}, - {"item": "Outside The Agreeable - 6 Sunwarp", "display": "6 Sunwarp"}, ] } @@ -89,11 +80,6 @@ const kCLASSIFICATION_REMOTE_NORMAL = 0 const kCLASSIFICATION_REMOTE_REDUCED = 1 const kCLASSIFICATION_REMOTE_INSANITY = 2 -const kSUNWARP_ACCESS_NORMAL = 0 -const kSUNWARP_ACCESS_DISABLED = 1 -const kSUNWARP_ACCESS_UNLOCK = 2 -const kSUNWARP_ACCESS_PROGRESSIVE = 3 - var _client = WebSocketClient.new() var _should_process = false var _initiated_disconnect = false @@ -125,7 +111,6 @@ var _door_shuffle = false var _color_shuffle = false var _panel_shuffle = 0 # none, rearrange var _painting_shuffle = false -var _sunwarp_access = 0 # normal, disabled, unlock, progressive var _mastery_achievements = 21 var _level_2_requirement = 223 var _location_classification_bit = 0 @@ -291,8 +276,6 @@ func _on_data(): _painting_shuffle = _slot_data["shuffle_paintings"] if _slot_data.has("shuffle_panels"): _panel_shuffle = _slot_data["shuffle_panels"] - if _slot_data.has("sunwarp_access"): - _sunwarp_access = _slot_data["sunwarp_access"] if _slot_data.has("seed"): _slot_seed = _slot_data["seed"] if _slot_data.has("painting_entrance_to_exit"): @@ -649,11 +632,6 @@ func processItem(item, index, from, flags): painting_node = fake_parent_node.get_node_or_null(painting_id) if painting_node != null: painting_node.get_node("Script").movePainting() - - if gamedata.warp_ids_by_item_id.has(int(item)): - var warpsNode = get_tree().get_root().get_node("Spatial/Warps") - for warp_id in gamedata.warp_ids_by_item_id[int(item)]: - warpsNode.get_node(warp_id).unlock_warp() # Handle progressive items. if item_name in progressive_items.keys(): @@ -715,10 +693,6 @@ func paintingIsVanilla(painting): return !$Gamedata.mentioned_paintings.has(painting) -func warpIsVanilla(warp): - return !$Gamedata.mentioned_warps.has(warp) - - func evaluateSolvability(): emit_signal("evaluate_solvability") -- cgit 1.4.1