7 files changed, 199 insertions, 17 deletions

@@ -19,7 +19,7 @@ var enable_multiplayer = false
 var track_player = false
 var connection_history = []
 
-const my_version = "panels-beta6"
+const my_version = "4.2.1"
 const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
@@ -114,6 +114,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
@@ -127,8 +128,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
@@ -346,6 +350,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
@@ -364,6 +372,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]
@@ -395,6 +404,9 @@ func _on_data():
                                 if localdata.size() > 5:
                                         _geronimo_skip = localdata[5]
 
+                                if localdata.size() > 6:
+                                        _cached_speed_boosts = localdata[6]
+
                         requestSync()
 
                         sendMessage(
@@ -409,6 +421,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":
@@ -506,9 +523,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 (
@@ -529,8 +549,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):
@@ -584,7 +611,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()
@@ -831,12 +859,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
 
@@ -887,6 +917,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
@@ -936,6 +974,10 @@ func parse_printjson(message):
                 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"]:
@@ -5,6 +5,7 @@ var effect_running = false
 var slowness_remaining = 0
 var iceland_remaining = 0
 var atbash_remaining = 0
+var speed_boosts_remaining = 0
 var queued_iceland = 0
 var skip_available = false
 var puzzle_focused = false
@@ -48,6 +49,12 @@ func _ready():
         add_child(slowness_timer)
         slowness_timer.connect("timeout", self, "_tick_slowness")
 
+        var speed_boost_timer = Timer.new()
+        speed_boost_timer.name = "SpeedBoostTimer"
+        speed_boost_timer.wait_time = 1.0
+        add_child(speed_boost_timer)
+        speed_boost_timer.connect("timeout", self, "_tick_speed_boost")
+
         var iceland_timer = Timer.new()
         iceland_timer.name = "IcelandTimer"
         iceland_timer.wait_time = 1.0
@@ -63,6 +70,12 @@ func activate():
 
         queued_iceland = 0
 
+        var apclient = global.get_node("Archipelago")
+        if apclient._speed_boost_mode:
+                var player = get_tree().get_root().get_node("Spatial/player")
+                player.walk_speed = orig_walk / 2.0
+                player.run_speed = orig_run / 2.0
+
 
 func trigger_slowness_trap(length = 30):
         if slowness_remaining == 0:
@@ -79,6 +92,21 @@ func trigger_slowness_trap(length = 30):
         apclient.saveLocaldata()
 
 
+func trigger_speed_boost(length = 20):
+        if speed_boosts_remaining == 0:
+                var player = get_tree().get_root().get_node("Spatial/player")
+                player.walk_speed = orig_walk
+                player.run_speed = orig_run
+
+                $SpeedBoostTimer.start()
+
+        speed_boosts_remaining += length
+        text_dirty = true
+
+        var apclient = global.get_node("Archipelago")
+        apclient.saveLocaldata()
+
+
 func trigger_iceland_trap(length = 60):
         if not activated:
                 queued_iceland += length
@@ -99,7 +127,7 @@ func trigger_iceland_trap(length = 60):
 
 
 func trigger_atbash_trap():
-        var newly_atbash = (atbash_remaining == 0)
+        var newly_atbash = atbash_remaining == 0
         atbash_remaining += 1
 
         if newly_atbash:
@@ -121,7 +149,7 @@ func deactivate_atbash_trap():
                         apclient.evaluateSolvability()
 
                 text_dirty = true
-        
+
         var apclient = global.get_node("Archipelago")
         apclient.saveLocaldata()
 
@@ -192,23 +220,37 @@ func _tick_slowness():
                 player.run_speed = orig_run
 
                 $SlownessTimer.stop()
-        
+
         if slowness_remaining % 5 == 0:
                 var apclient = global.get_node("Archipelago")
                 apclient.saveLocaldata()
 
 
+func _tick_speed_boost():
+        speed_boosts_remaining -= 1
+        text_dirty = true
+
+        if speed_boosts_remaining == 0:
+                var player = get_tree().get_root().get_node("Spatial/player")
+                player.walk_speed = orig_walk / 2.0
+                player.run_speed = orig_run / 2.0
+
+                $SpeedBoostTimer.stop()
+
+        if speed_boosts_remaining % 5 == 0:
+                var apclient = global.get_node("Archipelago")
+                apclient.saveLocaldata()
+
+
 func _tick_iceland():
         iceland_remaining -= 1
         text_dirty = true
 
         if iceland_remaining == 0:
-                get_tree().get_root().get_node("Spatial/player/pivot/camera").set_environment(
-                        orig_env
-                )
+                get_tree().get_root().get_node("Spatial/player/pivot/camera").set_environment(orig_env)
 
                 $IcelandTimer.stop()
-        
+
         if iceland_remaining % 5 == 0:
                 var apclient = global.get_node("Archipelago")
                 apclient.saveLocaldata()
@@ -220,9 +262,11 @@ func _process(_delta):
                 if wallcast.is_colliding():
                         var player = get_tree().get_root().get_node("Spatial/player")
                         var puzzlecast = player.get_node("pivot/camera/RayCast_sight")
-                        var distance = puzzlecast.get_collision_point().distance_to(wallcast.get_collision_point())
+                        var distance = puzzlecast.get_collision_point().distance_to(
+                                wallcast.get_collision_point()
+                        )
                         should_nbw = (distance < 0.05)
-                        
+
                 if should_nbw != not_behind_wall:
                         not_behind_wall = should_nbw
                         text_dirty = true
@@ -239,6 +283,10 @@ func _process(_delta):
                         if not text.empty():
                                 text += "\n"
                         text += "Slowness: %d seconds" % slowness_remaining
+                if speed_boosts_remaining > 0:
+                        if not text.empty():
+                                text += "\n"
+                        text += "Speed Boost: %d seconds" % speed_boosts_remaining
                 if iceland_remaining > 0:
                         if not text.empty():
                                 text += "\n"
@@ -674,6 +674,7 @@ func _load():
         # Create the multiplayer node, if needed.
         if apclient.enable_multiplayer:
                 var multiplayer_node = apclient.SCRIPT_multiplayer.new()
+                multiplayer_node.name = "Multiplayer"
                 multiplayer_node.ghost_mode = true
                 add_child(multiplayer_node)
         
@@ -1,5 +1,8 @@
 extends "res://scripts/multiplayer.gd"
 
+var queued_messages = []
+var queued_messages_mutex = Mutex.new()
+
 
 func _request_lobby_list():
         var apclient = global.get_node("Archipelago")
@@ -41,3 +44,55 @@ func _update_lobby_members():
                 if member_id != player_steam_id and member_id in active_lobby_members:
                         var slot_name = Steam.getLobbyMemberData(active_lobby_id, member_id, "slot_name")
                         active_lobby_members[member_id].steam_name = slot_name
+
+
+func say(text):
+        queued_messages_mutex.lock()
+        queued_messages.append(text)
+        queued_messages_mutex.unlock()
+
+
+func _physics_process(_delta):
+        if queued_messages_mutex.try_lock() == OK:
+                if queued_messages.empty():
+                        queued_messages_mutex.unlock()
+                else:
+                        var messages = queued_messages.duplicate()
+                        queued_messages = []
+                        queued_messages_mutex.unlock()
+
+                        var player = get_tree().get_root().get_node("Spatial/player")
+                        var space_state = get_tree().get_root().get_world().direct_space_state
+                        var nearby_members = []
+                        for member_id in active_lobby_members.keys():
+                                var other_member = active_lobby_members[member_id]
+                                var ray = space_state.intersect_ray(
+                                        player.global_translation, other_member.global_translation, [player], 0b0101
+                                )
+                                if !("collider" in ray) or ray["collider"] == other_member:
+                                        # Visible!
+                                        nearby_members.append(member_id)
+
+                        var apclient = global.get_node("Archipelago")
+                        var player_name = apclient.get_player_name()
+                        for member_id in nearby_members:
+                                for msg in messages:
+                                        _send_p2p_packet(
+                                                {"solves": [{"say": msg, "from": player_name}]},
+                                                member_id,
+                                                Steam.P2P_SEND_RELIABLE,
+                                                true
+                                        )
+
+
+# I'm completely hijacking this callback, since we're in ghost mode and it won't be called normally.
+func _receive_solve(data):
+        if "say" in data:
+                get_tree().get_root().get_node("Spatial/AP_TextClient").parse_printjson(
+                        "[LOCAL] [color=#fafad2]%s[/color]: %s" % [data["from"], data["say"]]
+                )
+                messages.showMessage("[color=#fafad2]%s[/color]: %s" % [data["from"], data["say"]])
+
+
+func _send_hi(_discard):
+        pass
@@ -25,6 +25,7 @@ func _ready():
         label.margin_top = 80
         label.margin_bottom = 720
         label.scroll_following = true
+        label.selection_enabled = true
         panel.add_child(label)
 
         var dynamic_font = DynamicFont.new()
@@ -51,7 +52,7 @@ func _ready():
 
 func _input(event):
         if event is InputEventKey and event.pressed:
-                if event.scancode == KEY_TAB:
+                if event.scancode == KEY_TAB and !Input.is_key_pressed(KEY_SHIFT):
                         if !get_tree().paused:
                                 is_open = true
                                 get_tree().paused = true
@@ -84,5 +85,16 @@ func parse_printjson(text):
 
 func text_entered(text):
         var apclient = global.get_node("Archipelago")
-        apclient.say(text.trim_suffix("\n"))
+        var cmd = text.trim_suffix("\n")
+        if cmd.begins_with("/say "):
+                if apclient.enable_multiplayer:
+                        var msg = cmd.trim_prefix("/say ")
+                        parse_printjson(
+                                "[LOCAL] [color=#ee00ee]%s[/color]: %s" % [apclient.get_player_name(), msg]
+                        )
+                        get_tree().get_root().get_node("Spatial/Multiplayer").say(msg)
+                else:
+                        parse_printjson("Multiplayer must be enabled to use /say")
+        else:
+                apclient.say(cmd)
         entry.text = ""
@@ -1,5 +1,24 @@
 # lingo-archipelago Releases
 
+## v4.2.1 - 2024-09-21
+
+- The text client will no longer open if SHIFT is being held, to prevent
+  conflicts with the Steam Overlay.
+
+Download:
+[lingo-archipelago-v4.2.1.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v4.2.1.zip)<br/>
+Source: [v4.2.1](https://code.fourisland.com/lingo-archipelago/tag/?h=v4.2.1)
+
+## v4.2.0 - 2024-09-20
+
+- Added a proximity chat feature. You can use the command "/say" followed by a
+  message in the text client, and it will broadcast the message only to other
+  nearby Lingo players.
+
+Download:
+[lingo-archipelago-v4.2.0.zip](https://files.fourisland.com/releases/lingo-archipelago/lingo-archipelago-v4.2.0.zip)<br/>
+Source: [v4.2.0](https://code.fourisland.com/lingo-archipelago/tag/?h=v4.2.0)
+
 ## v4.1.0 - 2024-09-02
 
 - Added an in-game text client, which can be used to talk to other players and
@@ -95,6 +95,11 @@ pick and choose which ones you would like to use.
 There is also a built-in text client you can use to talk to other players and
 issue commands. You can open and close it by pressing tab.
 
+The command "/say" can be used in the built-in text client to send messages that
+are only visible to players that you can currently see. Note that this is not
+symmetric: it is possible that you may see someone who cannot see you back, if,
+for instance, there is a door in between you and it is only open on your slot.
+
 ## Frequently Asked Questions
 
 ### What are location checks in this game?