Revert "Added support for warp items (including sunwarps)"

This reverts commit b2b098573ef5bcd03d61e827d11b969460d992af.

4 files changed, 0 insertions, 75 deletions

@@ -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")
 
@@ -46,7 +46,6 @@ func _ready():
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/panelInput.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pause_menu.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd"))
-                installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd"))
                 installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldTransporter.gd"))
 
         var apclient = global.get_node("Archipelago")
@@ -1,24 +0,0 @@
-extends "res://scripts/teleport.gd"
-
-var _unlocked = true
-
-
-func _ready():
-        var apclient = global.get_node("Archipelago")
-        if apclient._door_shuffle and !apclient.warpIsVanilla(self.get_parent().name + "/" + self.name):
-                if self.get_parent().name == "Teleporter Warps":
-                        if apclient._sunwarp_access != apclient.kSUNWARP_ACCESS_NORMAL:
-                                _unlocked = false
-                else:
-                        _unlocked = false
-
-        ._ready()
-
-
-func _body_entered(var body):
-        if _unlocked:
-                ._body_entered(body)
-
-
-func unlock_warp():
-        _unlocked = true
@@ -15,12 +15,10 @@ door_groups = {}
 panel_output = []
 door_ids_by_item_id = {}
 painting_ids_by_item_id = {}
-warp_ids_by_item_id = {}
 panel_ids_by_location_id = {}
 classification_by_location_id = {}
 mentioned_doors = Set[]
 mentioned_paintings = Set[]
-mentioned_warps = Set[]
 painting_output = {}
 
 ids_config = YAML.load_file(idspath)
@@ -154,18 +152,6 @@ config.each do |room_name, room_data|
           painting_ids_by_item_id[item_id] = internal_painting_ids
           mentioned_paintings.merge(internal_painting_ids)
         end
-
-        if door.include? "warp_id"
-          internal_warp_ids = []
-          if door["warp_id"].kind_of? String
-            internal_warp_ids = [door["warp_id"]]
-          else
-            internal_warp_ids = door["warp_id"]
-          end
-
-          warp_ids_by_item_id[item_id] = internal_warp_ids
-          mentioned_warps.merge(internal_warp_ids)
-        end
       end
     end
   end
@@ -195,12 +181,6 @@ File.open(outputpath, "w") do |f|
       "\"#{painting_id}\""
     end.join(",") + "]"
   end.join(","))
-  f.write "}\nvar warp_ids_by_item_id = {"
-  f.write(warp_ids_by_item_id.map do |item_id, warp_ids|
-    "#{item_id}:[" + warp_ids.map do |warp_id|
-      "\"#{warp_id}\""
-    end.join(",") + "]"
-  end.join(","))
   f.write "}\nvar panel_ids_by_location_id = {"
   f.write(panel_ids_by_location_id.map do |location_id, panel_ids|
     "#{location_id}:[" + panel_ids.map do |panel_id|
@@ -215,10 +195,6 @@ File.open(outputpath, "w") do |f|
   f.write(mentioned_paintings.map do |painting_id|
     "\"#{painting_id}\""
   end.join(","))
-  f.write "]\nvar mentioned_warps = ["
-  f.write(mentioned_warps.map do |warp_id|
-    "\"#{warp_id}\""
-  end.join(","))
   f.write "]\nvar paintings = {"
   f.write(painting_output.map do |painting_id, painting|
     "\"#{painting_id}\":{\"orientation\":\"#{painting["orientation"]}\",\"move\":#{painting.include? "move" and painting["move"]}}"