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

Small Witness fixes (#698)

Browse Source
This commit is contained in:
NewSoupVi
2022-06-24 19:25:23 +02:00
committed by GitHub
parent efadf6fdf4
commit aa3d7f5e21
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/witness/Options.py
View File

@@ -37,7 +37,7 @@ class ShuffleDoors(Toggle):
class ShuffleDiscardedPanels(Toggle): class ShuffleDiscardedPanels(Toggle):
"""Discarded Panels will have items on them. """Discarded Panels will have items on them.
Solving certain Discarded Panels may still be necessary!""" Solving certain Discarded Panels may still be necessary even if off!"""
display_name = "Shuffle Discarded Panels" display_name = "Shuffle Discarded Panels"

4
worlds/witness/WitnessItems.txt
View File

@@ -14,8 +14,8 @@ Progression:
72 - Colored Squares 72 - Colored Squares
Usefuls: Usefuls:
101 - Functioning Brain 101 - Functioning Brain - False
510 - Puzzle Skip 510 - Puzzle Skip - True
Boosts: Boosts:
500 - Speed Boost 500 - Speed Boost

4
worlds/witness/docs/setup_en.md
View File

@@ -2,7 +2,7 @@
## Required Software ## Required Software
- [The Witness (Steam)](https://store.steampowered.com/app/210970/The_Witness/) - [The Witness for 64-bit Windows (e.g. Steam version)](https://store.steampowered.com/app/210970/The_Witness/)
- [The Witness Archipelago Randomizer](https://github.com/JarnoWesthof/The-Witness-Randomizer-for-Archipelago/releases) - [The Witness Archipelago Randomizer](https://github.com/JarnoWesthof/The-Witness-Randomizer-for-Archipelago/releases)
## Optional Software ## Optional Software
@@ -38,4 +38,4 @@ The Witness has a fully functional map tracker that supports auto-tracking.
3. Click on the "AP" symbol at the top. 3. Click on the "AP" symbol at the top.
4. Enter the AP address, slot name and password. 4. Enter the AP address, slot name and password.
The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly. The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly. Note that the tracker may be out of date.

2
worlds/witness/items.py
View File

@@ -66,7 +66,7 @@ class StaticWitnessItems:
item_tab[item[0]] = ItemData(158000 + item[1], False, False) item_tab[item[0]] = ItemData(158000 + item[1], False, False)
for item in StaticWitnessLogic.ALL_USEFULS: for item in StaticWitnessLogic.ALL_USEFULS:
item_tab[item[0]] = ItemData(158000 + item[1], False, False, False, True) item_tab[item[0]] = ItemData(158000 + item[1], False, False, False, item[2])
item_tab = dict(sorted( item_tab = dict(sorted(
item_tab.items(), item_tab.items(),

5
worlds/witness/static_logic.py
View File

@@ -52,7 +52,10 @@ class StaticWitnessLogic:
line_split = line.split(" - ") line_split = line.split(" - ")
current_set.add((line_split[1], int(line_split[0]))) if current_set is not self.ALL_USEFULS:
current_set.add((line_split[1], int(line_split[0])))
else:
current_set.add((line_split[1], int(line_split[0]), line_split[2] == "True"))
path = os.path.join(os.path.dirname(__file__), "Door_Shuffle.txt") path = os.path.join(os.path.dirname(__file__), "Door_Shuffle.txt")
with open(path, "r", encoding="utf-8") as file: with open(path, "r", encoding="utf-8") as file: