monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The Witness: Cleanup - Options Access, data version, snake_case for file name (#2631)

This commit is contained in:
NewSoupVi 2024-01-16 15:33:34 +01:00 committed by GitHub
parent 71a3e2230d
commit 4fdeec4f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/witness/__init__.py
View File

@ -16,7 +16,7 @@ from .locations import WitnessPlayerLocations, StaticWitnessLocations
from .items import WitnessItem, StaticWitnessItems, WitnessPlayerItems, ItemData from .items import WitnessItem, StaticWitnessItems, WitnessPlayerItems, ItemData
from .regions import WitnessRegions from .regions import WitnessRegions
from .rules import set_rules from .rules import set_rules
from .Options import TheWitnessOptions from .options import TheWitnessOptions
from .utils import get_audio_logs from .utils import get_audio_logs
from logging import warning, error from logging import warning, error
@ -43,7 +43,6 @@ class WitnessWorld(World):
""" """
game = "The Witness" game = "The Witness"
topology_present = False topology_present = False
data_version = 14
StaticWitnessLogic() StaticWitnessLogic()
StaticWitnessLocations() StaticWitnessLocations()
@ -91,10 +90,10 @@ class WitnessWorld(World):
} }
def generate_early(self): def generate_early(self):
disabled_locations = self.multiworld.exclude_locations[self.player].value disabled_locations = self.options.exclude_locations.value
self.player_logic = WitnessPlayerLogic( self.player_logic = WitnessPlayerLogic(
self, disabled_locations, self.multiworld.start_inventory[self.player].value self, disabled_locations, self.options.start_inventory.value
) )
self.locat: WitnessPlayerLocations = WitnessPlayerLocations(self, self.player_logic) self.locat: WitnessPlayerLocations = WitnessPlayerLocations(self, self.player_logic)
@ -272,7 +271,7 @@ class WitnessWorld(World):
self.own_itempool += new_items self.own_itempool += new_items
self.multiworld.itempool += new_items self.multiworld.itempool += new_items
if self.items.item_data[item_name].local_only: if self.items.item_data[item_name].local_only:
self.multiworld.local_items[self.player].value.add(item_name) self.options.local_items.value.add(item_name)
def fill_slot_data(self) -> dict: def fill_slot_data(self) -> dict:
hint_amount = self.options.hint_amount.value hint_amount = self.options.hint_amount.value

0
worlds/witness/Options.py → worlds/witness/options.py
View File