1 files changed, 154 insertions, 17 deletions

@@ -9,6 +9,7 @@ var SCRIPT_mypainting
 var SCRIPT_notifier
 var SCRIPT_panel
 var SCRIPT_pilgrimage_terminator
+var SCRIPT_textclient
 var SCRIPT_uuid
 
 var ap_server = ""
@@ -19,12 +20,12 @@ var enable_multiplayer = false
 var track_player = false
 var connection_history = []
 
-const my_version = "4.0.2"
-const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
+const my_version = "5.0.1"
+const ap_version = {"major": 0, "minor": 5, "build": 1, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
-const progressive_items = {
+const door_progressive_items = {
         "Progressive Orange Tower":
         ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Sixth Floor", "Seventh Floor"],
         "Progressive Art Gallery":
@@ -36,6 +37,15 @@ const progressive_items = {
         "Progressive Pilgrimage":
         ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
 }
+const panel_progressive_items = {
+        "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
+        "Progressive Colorful":
+        ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
+        "Progressive Number Hunt":
+        ["Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Zero"],
+        "Progressive Symmetry Room": ["Near Far", "Warts Straw", "Leaf Feel"],
+        "Progressive Suits Area": ["Words Sword", "Lost", "Amen Name"]
+}
 
 const kTHE_END = 0
 const kTHE_MASTER = 1
@@ -91,6 +101,7 @@ var _localdata_file = ""
 var _death_link = false
 var _victory_condition = 0  # THE END, THE MASTER, LEVEL 2
 var _door_shuffle = false
+var _panel_door_shuffle = false
 var _color_shuffle = false
 var _panel_shuffle = 0  # none, rearrange
 var _painting_shuffle = false
@@ -105,6 +116,7 @@ var _pilgrimage_allows_roof_access = false
 var _pilgrimage_allows_paintings = false
 var _sunwarp_shuffle = false
 var _sunwarp_mapping = []
+var _speed_boost_mode = false
 var _slot_seed = 0
 
 var _map_loaded = false
@@ -118,8 +130,11 @@ var _puzzle_skips = 0
 var _cached_slowness = 0
 var _cached_iceland = 0
 var _cached_atbash = 0
+var _cached_speed_boosts = 0
 var _geronimo_skip = false
 var _checked_paintings = []
+var _hints_key = ""
+var _hinted_locations = []
 
 signal could_not_connect
 signal connect_status
@@ -277,9 +292,15 @@ func _on_data():
                                 _color_shuffle = _slot_data["shuffle_colors"]
 
                         if _slot_data.has("shuffle_doors"):
-                                _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                if _slot_data.has("group_doors"):
+                                        _door_shuffle = (_slot_data["shuffle_doors"] == 2)
+                                        _panel_door_shuffle = (_slot_data["shuffle_doors"] == 1)
+                                else:
+                                        _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                        _panel_door_shuffle = false
                         else:
                                 _door_shuffle = false
+                                _panel_door_shuffle = false
 
                         if _slot_data.has("shuffle_paintings"):
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
@@ -331,6 +352,10 @@ func _on_data():
                                 _sunwarp_shuffle = false
                         if _slot_data.has("sunwarp_permutation"):
                                 _sunwarp_mapping = _slot_data["sunwarp_permutation"]
+                        if _slot_data.has("speed_boost_mode"):
+                                _speed_boost_mode = _slot_data["speed_boost_mode"]
+                        else:
+                                _speed_boost_mode = false
 
                         if (
                                 _location_classification_bit != kCLASSIFICATION_LOCAL_INSANITY
@@ -349,6 +374,7 @@ func _on_data():
                         _cached_slowness = 0
                         _cached_iceland = 0
                         _cached_atbash = 0
+                        _cached_speed_boosts = 0
                         _geronimo_skip = false
 
                         _localdata_file = "user://archipelago_data/%s_%d" % [_seed, _slot]
@@ -380,6 +406,9 @@ func _on_data():
                                 if localdata.size() > 5:
                                         _geronimo_skip = localdata[5]
 
+                                if localdata.size() > 6:
+                                        _cached_speed_boosts = localdata[6]
+
                         requestSync()
 
                         sendMessage(
@@ -394,6 +423,11 @@ func _on_data():
                                 ]
                         )
 
+                        _hints_key = "_read_hints_%d_%d" % [_team, _slot]
+                        sendMessage(
+                                [{"cmd": "SetNotify", "keys": [_hints_key]}, {"cmd": "Get", "keys": [_hints_key]}]
+                        )
+
                         emit_signal("client_connected")
 
                 elif cmd == "ConnectionRefused":
@@ -453,6 +487,8 @@ func _on_data():
                                 i += 1
 
                 elif cmd == "PrintJSON":
+                        parse_printjson(message)
+
                         if (
                                 !message.has("receiving")
                                 or !message.has("item")
@@ -489,9 +525,12 @@ func _on_data():
                                         )
                         else:
                                 if message["receiving"] != _slot:
-                                        messages.showMessage(
+                                        var sentMsg = (
                                                 "Sent [color=%s]%s[/color] to %s" % [item_color, item_name, player_name]
                                         )
+                                        if _hinted_locations.has(message["item"]["location"]):
+                                                sentMsg += " ([color=#fafad2]Hinted![/color])"
+                                        messages.showMessage(sentMsg)
 
                 elif cmd == "Bounced":
                         if (
@@ -512,8 +551,15 @@ func _on_data():
                                 get_tree().get_root().get_node("Spatial/player/pause_menu")._reload()
 
                 elif cmd == "SetReply":
-                        if message.has("key") and message["key"] == ("Lingo_%d_Paintings" % _slot):
-                                _checked_paintings = message["value"]
+                        if message.has("key"):
+                                if message["key"] == ("Lingo_%d_Paintings" % _slot):
+                                        _checked_paintings = message["value"]
+                                elif message["key"] == _hints_key:
+                                        parseHints(message["value"])
+
+                elif cmd == "Retrieved":
+                        if message.has("keys") and message["keys"].has(_hints_key):
+                                parseHints(message["keys"][_hints_key])
 
 
 func _process(_delta):
@@ -567,7 +613,8 @@ func saveLocaldata():
                 effects_node.slowness_remaining,
                 effects_node.iceland_remaining,
                 effects_node.atbash_remaining,
-                _geronimo_skip
+                _geronimo_skip,
+                effects_node.speed_boosts_remaining,
         ]
         file.store_var(data, true)
         file.close()
@@ -686,6 +733,10 @@ func setValue(key, value, operation = "replace"):
         )
 
 
+func say(textdata):
+        sendMessage([{"cmd": "Say", "text": textdata}])
+
+
 func completedGoal():
         sendMessage([{"cmd": "StatusUpdate", "status": 30}])  # CLIENT_GOAL
 
@@ -729,6 +780,18 @@ func processItem(item, index, from, flags):
                 for door_id in gamedata.door_ids_by_item_id[int(item)]:
                         doorsNode.get_node(door_id).openDoor()
 
+        if gamedata.panel_ids_by_item_id.has(int(item)):
+                var panel_ids = gamedata.panel_ids_by_item_id[int(item)]
+                if wasGeneratedOnVersion(0, 5, 1):
+                        var extradata = get_node("Extradata")
+                        if extradata.panels_mode_051_panel_fixes.has(int(item)):
+                                panel_ids = extradata.panels_mode_051_panel_fixes[int(item)]
+
+                var panelsNode = get_tree().get_root().get_node("Spatial/Panels")
+                for panel_id in panel_ids:
+                        panelsNode.get_node(panel_id).get_node("AP_Panel").locked = false
+                emit_signal("evaluate_solvability")
+
         if gamedata.painting_ids_by_item_id.has(int(item)):
                 var real_parent_node = get_tree().get_root().get_node("Spatial/Decorations/Paintings")
                 var fake_parent_node = get_tree().get_root().get_node_or_null("Spatial/AP_Paintings")
@@ -749,15 +812,34 @@ func processItem(item, index, from, flags):
                         warpsNode.get_node(warp_id).unlock_warp()
 
         # Handle progressive items.
-        if int(item) in gamedata.items_by_progressive_id.keys():
+        var is_progressive_door = int(item) in gamedata.door_items_by_progressive_id
+        var is_progressive_panel = int(item) in gamedata.panel_items_by_progressive_id
+        var progitems = null
+        var prognames = null
+
+        if is_progressive_door and is_progressive_panel:
+                if _door_shuffle:
+                        progitems = gamedata.door_items_by_progressive_id[int(item)]
+                        prognames = door_progressive_items
+                else:
+                        progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                        prognames = panel_progressive_items
+        elif is_progressive_door:
+                progitems = gamedata.door_items_by_progressive_id[int(item)]
+                prognames = door_progressive_items
+        elif is_progressive_panel:
+                progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                prognames = panel_progressive_items
+
+        if progitems != null:
                 if not int(item) in _progressive_progress:
                         _progressive_progress[int(item)] = 0
 
-                if _progressive_progress[int(item)] < gamedata.items_by_progressive_id[int(item)].size():
-                        var subitems = gamedata.items_by_progressive_id[int(item)]
-                        var subitem_id = subitems[_progressive_progress[int(item)]]
+                if _progressive_progress[int(item)] < progitems.size():
+                        var subitem_id = progitems[_progressive_progress[int(item)]]
                         global._print("Subitem: %d" % subitem_id)
                         processItem(subitem_id, null, null, null)
+                        item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
         if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
@@ -771,10 +853,6 @@ func processItem(item, index, from, flags):
                 _last_new_item = index
                 saveLocaldata()
 
-                if item_name in progressive_items:
-                        var subitem = progressive_items[item_name][_progressive_progress[int(item)] - 1]
-                        item_name += " (%s)" % subitem
-
                 var player_name = "Unknown"
                 if _player_name_by_slot.has(from):
                         player_name = _player_name_by_slot[from]
@@ -789,12 +867,14 @@ func processItem(item, index, from, flags):
                         )
 
                 var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
-                if item_name == "Slowness Trap":
+                if item_name == "Slowness Trap" and !_speed_boost_mode:
                         effects_node.trigger_slowness_trap()
                 if item_name == "Iceland Trap":
                         effects_node.trigger_iceland_trap()
                 if item_name == "Atbash Trap":
                         effects_node.trigger_atbash_trap()
+                if item_name == "Speed Boost" and _speed_boost_mode:
+                        effects_node.trigger_speed_boost()
                 if item_name == "Puzzle Skip":
                         _puzzle_skips += 1
 
@@ -845,6 +925,14 @@ func checkPainting(painting_id):
         setValue("Paintings", [painting_id], "add")
 
 
+func parseHints(hints):
+        _hinted_locations.clear()
+
+        for hint in hints:
+                if hint["finding_player"] == int(_slot):
+                        _hinted_locations.append(hint["location"])
+
+
 func colorForItemType(flags):
         var int_flags = int(flags)
         if int_flags & 1:  # progression
@@ -857,6 +945,47 @@ func colorForItemType(flags):
                 return "#14de9e"
 
 
+func parse_printjson(message):
+        var parts = []
+        for message_part in message["data"]:
+                if !message_part.has("type") and message_part.has("text"):
+                        parts.append(message_part["text"])
+                elif message_part["type"] == "player_id":
+                        if int(message_part["text"]) == _slot:
+                                parts.append("[color=#ee00ee]%s[/color]" % _player_name_by_slot[_slot])
+                        else:
+                                var from = float(message_part["text"])
+                                parts.append("[color=#fafad2]%s[/color]" % _player_name_by_slot[from])
+                elif message_part["type"] == "item_id":
+                        var item_name = "Unknown"
+                        var item_player_game = _game_by_player[message_part["player"]]
+                        if _item_id_to_name[item_player_game].has(float(message_part["text"])):
+                                item_name = _item_id_to_name[item_player_game][float(message_part["text"])]
+
+                        parts.append(
+                                "[color=%s]%s[/color]" % [colorForItemType(message_part["flags"]), item_name]
+                        )
+                elif message_part["type"] == "location_id":
+                        var location_name = "Unknown"
+                        var location_player_game = _game_by_player[message_part["player"]]
+                        if _location_id_to_name[location_player_game].has(float(message_part["text"])):
+                                location_name = _location_id_to_name[location_player_game][float(
+                                        message_part["text"]
+                                )]
+
+                        parts.append("[color=#00ff7f]%s[/color]" % location_name)
+                elif message_part.has("text"):
+                        parts.append(message_part["text"])
+
+        var textclient_node = get_tree().get_root().get_node_or_null("Spatial/AP_TextClient")
+        if textclient_node != null:
+                textclient_node.parse_printjson("".join(parts))
+
+
+func get_player_name():
+        return _player_name_by_slot[_slot]
+
+
 func compareVersion(lhs, rhs):
         if lhs["major"] == rhs["major"]:
                 if lhs["minor"] == rhs["minor"]:
@@ -869,3 +998,11 @@ func compareVersion(lhs, rhs):
 
 func wasGeneratedBeforeVersion(major, minor, build):
         return compareVersion(_gen_version, {"major": major, "minor": minor, "build": build})
+
+
+func wasGeneratedOnVersion(major, minor, build):
+        return (
+                _gen_version["major"] == major
+                and _gen_version["minor"] == minor
+                and _gen_version["build"] == build
+        )