morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

The Witness: Get rid of Menu region, prepare for other worlds to change theirs (hints) #3888

Browse Source
This commit is contained in:
NewSoupVi
2024-11-09 21:10:54 +01:00
committed by GitHub
parent 6b4f6ebc1e
commit fa93bc5d1e
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/witness/__init__.py
View File

@@ -50,6 +50,8 @@ class WitnessWorld(World):
topology_present = False topology_present = False
web = WitnessWebWorld() web = WitnessWebWorld()
origin_region_name = "Entry"
options_dataclass = TheWitnessOptions options_dataclass = TheWitnessOptions
options: TheWitnessOptions options: TheWitnessOptions

2
worlds/witness/data/WitnessLogic.txt
View File

@@ -1,7 +1,5 @@
==Tutorial (Inside)== ==Tutorial (Inside)==
Menu (Menu) - Entry - True:
Entry (Entry): Entry (Entry):
Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:

2
worlds/witness/data/WitnessLogicExpert.txt
View File

@@ -1,7 +1,5 @@
==Tutorial (Inside)== ==Tutorial (Inside)==
Menu (Menu) - Entry - True:
Entry (Entry): Entry (Entry):
Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:

2
worlds/witness/data/WitnessLogicVanilla.txt
View File

@@ -1,7 +1,5 @@
==Tutorial (Inside)== ==Tutorial (Inside)==
Menu (Menu) - Entry - True:
Entry (Entry): Entry (Entry):
Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:

2
worlds/witness/data/WitnessLogicVariety.txt
View File

@@ -1,7 +1,5 @@
==Tutorial (Inside)== ==Tutorial (Inside)==
Menu (Menu) - Entry - True:
Entry (Entry): Entry (Entry):
Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064: Tutorial First Hallway (Tutorial First Hallway) - Entry - True - Tutorial First Hallway Room - 0x00064:

7
worlds/witness/hints.py
View File

@@ -250,8 +250,11 @@ def word_direct_hint(world: "WitnessWorld", hint: WitnessLocationHint) -> Witnes
elif group_type == "Group": elif group_type == "Group":
location_name = f"a \"{chosen_group}\" location in {player_name}'s world" location_name = f"a \"{chosen_group}\" location in {player_name}'s world"
elif group_type == "Region": elif group_type == "Region":
if chosen_group == "Menu": origin_region_name = world.multiworld.worlds[hint.location.player].origin_region_name
location_name = f"a location near the start of {player_name}'s game (\"Menu\" region)" if chosen_group == origin_region_name:
location_name = (
f"a location in the origin region of {player_name}'s world (\"{origin_region_name}\" region)"
)
else: else:
location_name = f"a location in {player_name}'s \"{chosen_group}\" region" location_name = f"a location in {player_name}'s \"{chosen_group}\" region"