1 files changed, 43 insertions, 17 deletions

@@ -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