7 files changed, 134 insertions, 19 deletions

@@ -6,6 +6,7 @@ var objects
 var door_id_by_map_node_path = {}
 var painting_id_by_map_node_path = {}
 var panel_id_by_map_node_path = {}
+var port_id_by_map_node_path = {}
 var door_id_by_ap_id = {}
 var map_id_by_name = {}
 var progressive_id_by_ap_id = {}
@@ -79,6 +80,16 @@ func load(data_bytes):
 
                 var _map_data = painting_id_by_map_node_path[map.get_name()]
 
+        for port in objects.get_ports():
+                var room = objects.get_rooms()[port.get_room_id()]
+                var map = objects.get_maps()[room.get_map_id()]
+
+                if not map.get_name() in port_id_by_map_node_path:
+                        port_id_by_map_node_path[map.get_name()] = {}
+
+                var map_data = port_id_by_map_node_path[map.get_name()]
+                map_data[port.get_path()] = port.get_id()
+
         for progressive in objects.get_progressives():
                 progressive_id_by_ap_id[progressive.get_ap_id()] = progressive.get_id()
 
@@ -121,6 +132,14 @@ func get_panel_for_map_node_path(map_name, node_path):
         return map_data.get(node_path, null)
 
 
+func get_port_for_map_node_path(map_name, node_path):
+        if not port_id_by_map_node_path.has(map_name):
+                return null
+
+        var map_data = port_id_by_map_node_path[map_name]
+        return map_data.get(node_path, null)
+
+
 func get_door_ap_id(door_id):
         var door = objects.get_doors()[door_id]
         if door.has_ap_id():
@@ -46,11 +46,13 @@ var apworld_version = [0, 0]
 var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var keyholder_sanity = false
+var port_pairings = {}
 var shuffle_control_center_colors = false
 var shuffle_doors = false
 var shuffle_gallery_paintings = false
 var shuffle_letters = kSHUFFLE_LETTERS_VANILLA
 var shuffle_symbols = false
+var shuffle_worldports = false
 var strict_cyan_ending = false
 var strict_purple_ending = false
 var victory_condition = -1
@@ -207,8 +209,6 @@ func _process_item(item, index, from, flags, amount):
                 if client._player_name_by_slot.has(float(from)):
                         player_name = client._player_name_by_slot[float(from)]
 
-                var item_color = colorForItemType(flags)
-
                 var full_item_name = item_name
                 if prog_id != null:
                         var door = gamedata.objects.get_doors()[prog_id]
@@ -216,10 +216,10 @@ func _process_item(item, index, from, flags, amount):
 
                 var message
                 if from == client._slot:
-                        message = "Found [color=%s]%s[/color]" % [item_color, full_item_name]
+                        message = "Found %s" % wrapInItemColorTags(full_item_name, flags)
                 else:
                         message = (
-                                "Received [color=%s]%s[/color] from %s" % [item_color, full_item_name, player_name]
+                                "Received %s from %s" % [wrapInItemColorTags(full_item_name, flags), player_name]
                         )
 
                 if gamedata.anti_trap_ids.has(item):
@@ -265,13 +265,20 @@ func _process_message(message):
                 if !message.has("found") || !message["found"]:
                         global.get_node("Messages").showMessage(
                                 (
-                                        "Hint: [color=%s]%s[/color]%s is on %s"
-                                        % [item_color, item_name, is_for, location_name]
+                                        "Hint: %s%s is on %s"
+                                        % [
+                                                wrapInItemColorTags(item_name, message["item"]["flags"]),
+                                                is_for,
+                                                location_name
+                                        ]
                                 )
                         )
         else:
                 if message["receiving"] != client._slot:
-                        var sentMsg = "Sent [color=%s]%s[/color] to %s" % [item_color, item_name, player_name]
+                        var sentMsg = (
+                                "Sent %s to %s"
+                                % [wrapInItemColorTags(item_name, message["item"]["flags"]), player_name]
+                        )
                         #if _hinted_locations.has(message["item"]["location"]):
                         #       sentMsg += " ([color=#fafad2]Hinted![/color])"
                         global.get_node("Messages").showMessage(sentMsg)
@@ -296,9 +303,7 @@ func parse_printjson_for_textclient(message):
                         if client._item_id_to_name[item_player_game].has(int(message_part["text"])):
                                 item_name = client._item_id_to_name[item_player_game][int(message_part["text"])]
 
-                        parts.append(
-                                "[color=%s]%s[/color]" % [colorForItemType(message_part["flags"]), item_name]
-                        )
+                        parts.append(wrapInItemColorTags(item_name, message_part["flags"]))
                 elif message_part["type"] == "location_id":
                         var location_name = "Unknown"
                         var location_player_game = client._game_by_player[message_part["player"]]
@@ -380,6 +385,7 @@ func _client_connected(slot_data):
         shuffle_gallery_paintings = bool(slot_data.get("shuffle_gallery_paintings", false))
         shuffle_letters = int(slot_data.get("shuffle_letters", 0))
         shuffle_symbols = bool(slot_data.get("shuffle_symbols", false))
+        shuffle_worldports = bool(slot_data.get("shuffle_worldports", false))
         strict_cyan_ending = bool(slot_data.get("strict_cyan_ending", false))
         strict_purple_ending = bool(slot_data.get("strict_purple_ending", false))
         victory_condition = int(slot_data.get("victory_condition", 0))
@@ -387,6 +393,13 @@ func _client_connected(slot_data):
         if slot_data.has("version"):
                 apworld_version = [int(slot_data["version"][0]), int(slot_data["version"][1])]
 
+        port_pairings.clear()
+        if slot_data.has("port_pairings"):
+                var raw_pp = slot_data.get("port_pairings")
+
+                for p1 in raw_pp.keys():
+                        port_pairings[int(p1)] = int(raw_pp[p1])
+
         # Set up item locks.
         _item_locks = {}
 
@@ -404,12 +417,14 @@ func _client_connected(slot_data):
                                 _item_locks[door.get_id()] = [progressive.get_ap_id(), i + 1]
 
                 for door_group in gamedata.objects.get_door_groups():
-                        if (
-                                door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CONNECTOR
-                                or door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.SHUFFLE_GROUP
-                        ):
-                                for door in door_group.get_doors():
-                                        _item_locks[door] = [door_group.get_ap_id(), 1]
+                        if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.CONNECTOR:
+                                if shuffle_worldports:
+                                        continue
+                        elif door_group.get_type() != gamedata.SCRIPT_proto.DoorGroupType.SHUFFLE_GROUP:
+                                continue
+
+                        for door in door_group.get_doors():
+                                _item_locks[door] = [door_group.get_ap_id(), 1]
 
         if shuffle_control_center_colors:
                 for door in gamedata.objects.get_doors():
@@ -417,7 +432,10 @@ func _client_connected(slot_data):
                                 _item_locks[door.get_id()] = [door.get_ap_id(), 1]
 
                 for door_group in gamedata.objects.get_door_groups():
-                        if door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.COLOR_CONNECTOR:
+                        if (
+                                door_group.get_type() == gamedata.SCRIPT_proto.DoorGroupType.COLOR_CONNECTOR
+                                and not shuffle_worldports
+                        ):
                                 for door in door_group.get_doors():
                                         _item_locks[door] = [door_group.get_ap_id(), 1]
 
@@ -497,6 +515,14 @@ func colorForItemType(flags):
                 return "#14de9e"
 
 
+func wrapInItemColorTags(text, flags):
+        var int_flags = int(flags)
+        if int_flags & 1 and int_flags & 2:  # proguseful
+                return "[rainbow]%s[/rainbow]" % text
+        else:
+                return "[color=%s]%s[/color]" % [colorForItemType(flags), text]
+
+
 func get_letter_behavior(key, level2):
         if shuffle_letters == kSHUFFLE_LETTERS_UNLOCKED:
                 return kLETTER_BEHAVIOR_UNLOCKED
@@ -1,5 +1,7 @@
 extends CanvasLayer
 
+var SCRIPT_rainbowText
+
 var _message_queue = []
 var _font
 var _container
@@ -23,6 +25,7 @@ func _ready():
 
 func _add_message(text):
         var new_label = RichTextLabel.new()
+        new_label.install_effect(SCRIPT_rainbowText.new())
         new_label.push_font(_font)
         new_label.push_font_size(36)
         new_label.push_outline_color(Color(0, 0, 0, 1))
@@ -0,0 +1,10 @@
+extends RichTextEffect
+
+var bbcode = "rainbow"
+
+
+func _process_custom_fx(char_fx: CharFXTransform):
+        char_fx.color = Color.from_hsv(
+                char_fx.elapsed_time - floor(char_fx.elapsed_time), 1.0, 1.0, 1.0
+        )
+        return true
@@ -62,6 +62,7 @@ func _ready():
                 var messages_script = load("user://maps/Archipelago/messages.gd")
                 var messages_instance = messages_script.new()
                 messages_instance.name = "Messages"
+                messages_instance.SCRIPT_rainbowText = load("user://maps/Archipelago/rainbowText.gd")
                 global.add_child(messages_instance)
 
                 var textclient_script = load("user://maps/Archipelago/textclient.gd")
@@ -192,6 +193,11 @@ func startGame():
         unlocks.loadData()
         unlocks.unlockKey("capslock", 1)
 
+        if ap.shuffle_worldports:
+                settings.worldport_fades = "default"
+        else:
+                settings.worldport_fades = "never"
+
         clearResourceCache("res://objects/meshes/gridDoor.tscn")
         clearResourceCache("res://objects/nodes/collectable.tscn")
         clearResourceCache("res://objects/nodes/door.tscn")
@@ -82,5 +82,13 @@ func parse_printjson(text):
 func text_entered(text):
         var ap = global.get_node("Archipelago")
         var cmd = text.trim_suffix("\n")
-        ap.client.say(cmd)
         entry.text = ""
+        if OS.is_debug_build():
+                if cmd.begins_with("/tp_map "):
+                        var new_map = cmd.substr(8)
+                        global.map = new_map
+                        global.sets_entry_point = false
+                        switcher.switch_map("res://objects/scenes/%s.tscn" % new_map)
+                        return
+
+        ap.client.say(cmd)
@@ -1,10 +1,53 @@
 extends "res://scripts/nodes/worldport.gd"
 
+var absolute_rotation = false
+var target_rotation = 0
+
 
 func _ready():
+        var node_path = String(
+                get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
+        )
+
+        var ap = global.get_node("Archipelago")
+
+        if ap.shuffle_worldports:
+                var gamedata = global.get_node("Gamedata")
+                var port_id = gamedata.get_port_for_map_node_path(global.map, node_path)
+                if port_id != null:
+                        if port_id in ap.port_pairings:
+                                var target_port = gamedata.objects.get_ports()[ap.port_pairings[port_id]]
+                                var target_room = gamedata.objects.get_rooms()[target_port.get_room_id()]
+                                var target_map = gamedata.objects.get_maps()[target_room.get_map_id()]
+
+                                exit = target_map.get_name()
+                                entry_point.x = target_port.get_destination().get_x()
+                                entry_point.y = target_port.get_destination().get_y()
+                                entry_point.z = target_port.get_destination().get_z()
+                                absolute_rotation = true
+                                target_rotation = target_port.get_rotation()
+                                sets_entry_point = true
+                                invisible = false
+                                fades = true
+
         if global.map == "icarus" and exit == "daedalus":
-                var ap = global.get_node("Archipelago")
                 if not ap.daedalus_roof_access:
                         entry_point = Vector3(58, 10, 0)
 
         super._ready()
+
+
+func bodyEntered(body):
+        if body.is_in_group("player"):
+                if absolute_rotation:
+                        entry_rotate.y = target_rotation - body.rotation_degrees.y
+
+        super.bodyEntered(body)
+
+
+func changeScene():
+        var player = get_tree().get_root().get_node("scene/player")
+        if player != null:
+                player.playable = false
+
+        super.changeScene()