about summary refs log tree commit diff stats
path: root/client/Archipelago
diff options
context:
space:
mode:
Diffstat (limited to 'client/Archipelago')
-rw-r--r--client/Archipelago/manager.gd4
-rw-r--r--client/Archipelago/player.gd5
2 files changed, 8 insertions, 1 deletions
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):
312func _process_location_scout(item_id, location_id, player, flags): 312func _process_location_scout(item_id, location_id, player, flags):
313 _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags} 313 _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags}
314 314
315 if player == client._slot and flags & 4 != 0:
316 # This is a trap for us, so let's not display it.
317 return
318
315 var gamedata = global.get_node("Gamedata") 319 var gamedata = global.get_node("Gamedata")
316 var map_id = gamedata.map_id_by_name.get(global.map) 320 var map_id = gamedata.map_id_by_name.get(global.map)
317 321
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():
97 != ap.kLETTER_BEHAVIOR_VANILLA 97 != ap.kLETTER_BEHAVIOR_VANILLA
98 ): 98 ):
99 var scout = ap.scout_location(letter.get_ap_id()) 99 var scout = ap.scout_location(letter.get_ap_id())
100 if scout != null: 100 if (
101 scout != null
102 and not (scout["player"] == ap.client._slot and scout["flags"] & 4 != 0)
103 ):
101 var item_name = "Unknown" 104 var item_name = "Unknown"
102 var item_player_game = ap.client._game_by_player[float(scout["player"])] 105 var item_player_game = ap.client._game_by_player[float(scout["player"])]
103 if ap.client._item_id_to_name[item_player_game].has(scout["item"]): 106 if ap.client._item_id_to_name[item_player_game].has(scout["item"]):