ubufugu/dockipelago
1
0
Fork 0
forked from mirror/Archipelago
Code Issues Pull Requests Actions Activity

The Witness: Fix CreateHints spoiling vague hints (#5359)

Browse Source 
* Encode non-local vague hints as negative player number

* comments

* also bump req client version
This commit is contained in:
NewSoupVi
2025-11-15 16:22:56 +01:00
committed by GitHub
parent 3ec1e9184b
commit b3c323ede3
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/witness/__init__.py
View File

@@ -81,7 +81,7 @@ class WitnessWorld(World):
item_name_groups = static_witness_items.ITEM_GROUPS item_name_groups = static_witness_items.ITEM_GROUPS
location_name_groups = static_witness_locations.AREA_LOCATION_GROUPS location_name_groups = static_witness_locations.AREA_LOCATION_GROUPS
required_client_version = (0, 6, 0) required_client_version = (0, 6, 4)
player_logic: WitnessPlayerLogic player_logic: WitnessPlayerLogic
player_locations: WitnessPlayerLocations player_locations: WitnessPlayerLocations

13
worlds/witness/hints.py
View File

@@ -705,6 +705,8 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) ->
Area Hint: 1st Arg is the amount of area progression and hunt panels. 2nd Arg is the name of the area. Area Hint: 1st Arg is the amount of area progression and hunt panels. 2nd Arg is the name of the area.
Location Hint: 1st Arg is the location's address, second arg is the player number the location belongs to. Location Hint: 1st Arg is the location's address, second arg is the player number the location belongs to.
In case of a local vague hint, the second arg is a string with the containing location group.
In case of a nonlocal vague hint, the second arg is the *negative* player number.
Junk Hint: 1st Arg is -1, second arg is this slot's player number. Junk Hint: 1st Arg is -1, second arg is this slot's player number.
""" """
@@ -724,10 +726,13 @@ def get_compact_hint_args(hint: WitnessWordedHint, local_player_number: int) ->
# Is location hint # Is location hint
if location and location.address is not None: if location and location.address is not None:
if hint.vague_location_hint and location.player == local_player_number: if hint.vague_location_hint:
assert hint.area is not None # A local vague location hint should have an area argument if location.player == local_player_number:
return location.address, "containing_area:" + hint.area assert hint.area is not None # A local vague location hint should have an area argument
return location.address, location.player # Scouting does not matter for other players (currently) return location.address, "containing_area:" + hint.area
return location.address, - location.player # Encode non-local vague hint as negative player number
return location.address, location.player
# Is junk / undefined hint # Is junk / undefined hint
return -1, local_player_number return -1, local_player_number