From 7896502cd996b64d4c301eaa1c77c37a9f3e83cd Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sat, 13 Sep 2025 13:01:54 -0400 Subject: [Client] Don't show our traps --- client/Archipelago/manager.gd | 4 ++++ client/Archipelago/player.gd | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'client') diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd index 590b498..1370e9d 100644 --- a/client/Archipelago/manager.gd +++ b/client/Archipelago/manager.gd @@ -312,6 +312,10 @@ func parse_printjson_for_textclient(message): func _process_location_scout(item_id, location_id, player, flags): _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags} + if player == client._slot and flags & 4 != 0: + # This is a trap for us, so let's not display it. + return + var gamedata = global.get_node("Gamedata") var map_id = gamedata.map_id_by_name.get(global.map) diff --git a/client/Archipelago/player.gd b/client/Archipelago/player.gd index 0614077..f0b214f 100644 --- a/client/Archipelago/player.gd +++ b/client/Archipelago/player.gd @@ -97,7 +97,10 @@ func _ready(): != ap.kLETTER_BEHAVIOR_VANILLA ): var scout = ap.scout_location(letter.get_ap_id()) - if scout != null: + if ( + scout != null + and not (scout["player"] == ap.client._slot and scout["flags"] & 4 != 0) + ): var item_name = "Unknown" var item_player_game = ap.client._game_by_player[float(scout["player"])] if ap.client._item_id_to_name[item_player_game].has(scout["item"]): -- cgit 1.4.1