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

Raft: Move to new Options API (#3587)

This commit is contained in:
Sunny Bat 2024-07-15 06:09:02 -07:00 committed by GitHub
parent e76d32e908
commit 925e02dca7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
worlds/raft/Options.py
View File

@ -1,4 +1,5 @@
from Options import Range, Toggle, DefaultOnToggle, Choice, DeathLink from dataclasses import dataclass
from Options import Range, Toggle, DefaultOnToggle, Choice, DeathLink, PerGameCommonOptions
class MinimumResourcePackAmount(Range): class MinimumResourcePackAmount(Range):
"""The minimum amount of resources available in a resource pack""" """The minimum amount of resources available in a resource pack"""
@ -47,6 +48,8 @@ class IslandFrequencyLocations(Choice):
option_progressive = 4 option_progressive = 4
option_anywhere = 5 option_anywhere = 5
default = 2 default = 2
def is_filling_frequencies_in_world(self):
return self.value <= self.option_random_on_island_random_order
class IslandGenerationDistance(Choice): class IslandGenerationDistance(Choice):
"""Sets how far away islands spawn from you when you input their coordinates into the Receiver.""" """Sets how far away islands spawn from you when you input their coordinates into the Receiver."""
@ -76,16 +79,16 @@ class PaddleboardMode(Toggle):
"""Sets later story islands to be in logic without an Engine or Steering Wheel. May require lots of paddling.""" """Sets later story islands to be in logic without an Engine or Steering Wheel. May require lots of paddling."""
display_name = "Paddleboard Mode" display_name = "Paddleboard Mode"
raft_options = { @dataclass
"minimum_resource_pack_amount": MinimumResourcePackAmount, class RaftOptions(PerGameCommonOptions):
"maximum_resource_pack_amount": MaximumResourcePackAmount, minimum_resource_pack_amount: MinimumResourcePackAmount
"duplicate_items": DuplicateItems, maximum_resource_pack_amount: MaximumResourcePackAmount
"filler_item_types": FillerItemTypes, duplicate_items: DuplicateItems
"island_frequency_locations": IslandFrequencyLocations, filler_item_types: FillerItemTypes
"island_generation_distance": IslandGenerationDistance, island_frequency_locations: IslandFrequencyLocations
"expensive_research": ExpensiveResearch, island_generation_distance: IslandGenerationDistance
"progressive_items": ProgressiveItems, expensive_research: ExpensiveResearch
"big_island_early_crafting": BigIslandEarlyCrafting, progressive_items: ProgressiveItems
"paddleboard_mode": PaddleboardMode, big_island_early_crafting: BigIslandEarlyCrafting
"death_link": DeathLink paddleboard_mode: PaddleboardMode
} death_link: DeathLink

4
worlds/raft/Rules.py
View File

@ -5,10 +5,10 @@ from ..AutoWorld import LogicMixin
class RaftLogic(LogicMixin): class RaftLogic(LogicMixin):
def raft_paddleboard_mode_enabled(self, player): def raft_paddleboard_mode_enabled(self, player):
return self.multiworld.paddleboard_mode[player].value return bool(self.multiworld.worlds[player].options.paddleboard_mode)
def raft_big_islands_available(self, player): def raft_big_islands_available(self, player):
return self.multiworld.big_island_early_crafting[player].value or self.raft_can_access_radio_tower(player) return bool(self.multiworld.worlds[player].options.big_island_early_crafting) or self.raft_can_access_radio_tower(player)
def raft_can_smelt_items(self, player): def raft_can_smelt_items(self, player):
return self.has("Smelter", player) return self.has("Smelter", player)

48
worlds/raft/__init__.py
View File

@ -6,7 +6,7 @@ from .Items import (createResourcePackName, item_table, progressive_table, progr
from .Regions import create_regions, getConnectionName from .Regions import create_regions, getConnectionName
from .Rules import set_rules from .Rules import set_rules
from .Options import raft_options from .Options import RaftOptions
from BaseClasses import Region, Entrance, Location, MultiWorld, Item, ItemClassification, Tutorial from BaseClasses import Region, Entrance, Location, MultiWorld, Item, ItemClassification, Tutorial
from ..AutoWorld import World, WebWorld from ..AutoWorld import World, WebWorld
@ -37,16 +37,17 @@ class RaftWorld(World):
lastItemId = max(filter(lambda val: val is not None, item_name_to_id.values())) lastItemId = max(filter(lambda val: val is not None, item_name_to_id.values()))
location_name_to_id = locations_lookup_name_to_id location_name_to_id = locations_lookup_name_to_id
option_definitions = raft_options options_dataclass = RaftOptions
options: RaftOptions
required_client_version = (0, 3, 4) required_client_version = (0, 3, 4)
def create_items(self): def create_items(self):
minRPSpecified = self.multiworld.minimum_resource_pack_amount[self.player].value minRPSpecified = self.options.minimum_resource_pack_amount.value
maxRPSpecified = self.multiworld.maximum_resource_pack_amount[self.player].value maxRPSpecified = self.options.maximum_resource_pack_amount.value
minimumResourcePackAmount = min(minRPSpecified, maxRPSpecified) minimumResourcePackAmount = min(minRPSpecified, maxRPSpecified)
maximumResourcePackAmount = max(minRPSpecified, maxRPSpecified) maximumResourcePackAmount = max(minRPSpecified, maxRPSpecified)
isFillingFrequencies = self.multiworld.island_frequency_locations[self.player].value <= 3 isFillingFrequencies = self.options.island_frequency_locations.is_filling_frequencies_in_world()
# Generate item pool # Generate item pool
pool = [] pool = []
frequencyItems = [] frequencyItems = []
@ -64,20 +65,20 @@ class RaftWorld(World):
extraItemNamePool = [] extraItemNamePool = []
extras = len(location_table) - len(item_table) - 1 # Victory takes up 1 unaccounted-for slot extras = len(location_table) - len(item_table) - 1 # Victory takes up 1 unaccounted-for slot
if extras > 0: if extras > 0:
if (self.multiworld.filler_item_types[self.player].value != 1): # Use resource packs if (self.options.filler_item_types != self.options.filler_item_types.option_duplicates): # Use resource packs
for packItem in resourcePackItems: for packItem in resourcePackItems:
for i in range(minimumResourcePackAmount, maximumResourcePackAmount + 1): for i in range(minimumResourcePackAmount, maximumResourcePackAmount + 1):
extraItemNamePool.append(createResourcePackName(i, packItem)) extraItemNamePool.append(createResourcePackName(i, packItem))
if self.multiworld.filler_item_types[self.player].value != 0: # Use duplicate items if self.options.filler_item_types != self.options.filler_item_types.option_resource_packs: # Use duplicate items
dupeItemPool = item_table.copy() dupeItemPool = item_table.copy()
# Remove frequencies if necessary # Remove frequencies if necessary
if self.multiworld.island_frequency_locations[self.player].value != 5: # Not completely random locations if self.options.island_frequency_locations != self.options.island_frequency_locations.option_anywhere: # Not completely random locations
# If we let frequencies stay in with progressive-frequencies, the progressive-frequency item # If we let frequencies stay in with progressive-frequencies, the progressive-frequency item
# will be included 7 times. This is a massive flood of progressive-frequency items, so we # will be included 7 times. This is a massive flood of progressive-frequency items, so we
# instead add progressive-frequency as its own item a smaller amount of times to prevent # instead add progressive-frequency as its own item a smaller amount of times to prevent
# flooding the duplicate item pool with them. # flooding the duplicate item pool with them.
if self.multiworld.island_frequency_locations[self.player].value == 4: if self.options.island_frequency_locations == self.options.island_frequency_locations.option_progressive:
for _ in range(2): for _ in range(2):
# Progressives are not in item_pool, need to create faux item for duplicate item pool # Progressives are not in item_pool, need to create faux item for duplicate item pool
# This can still be filtered out later by duplicate_items setting # This can still be filtered out later by duplicate_items setting
@ -86,9 +87,9 @@ class RaftWorld(World):
dupeItemPool = (itm for itm in dupeItemPool if "Frequency" not in itm["name"]) dupeItemPool = (itm for itm in dupeItemPool if "Frequency" not in itm["name"])
# Remove progression or non-progression items if necessary # Remove progression or non-progression items if necessary
if (self.multiworld.duplicate_items[self.player].value == 0): # Progression only if (self.options.duplicate_items == self.options.duplicate_items.option_progression): # Progression only
dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == True) dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == True)
elif (self.multiworld.duplicate_items[self.player].value == 1): # Non-progression only elif (self.options.duplicate_items == self.options.duplicate_items.option_non_progression): # Non-progression only
dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == False) dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == False)
dupeItemPool = list(dupeItemPool) dupeItemPool = list(dupeItemPool)
@ -115,14 +116,14 @@ class RaftWorld(World):
create_regions(self.multiworld, self.player) create_regions(self.multiworld, self.player)
def get_pre_fill_items(self): def get_pre_fill_items(self):
if self.multiworld.island_frequency_locations[self.player] in [0, 1, 2, 3]: if self.options.island_frequency_locations.is_filling_frequencies_in_world():
return [loc.item for loc in self.multiworld.get_filled_locations()] return [loc.item for loc in self.multiworld.get_filled_locations()]
return [] return []
def create_item_replaceAsNecessary(self, name: str) -> Item: def create_item_replaceAsNecessary(self, name: str) -> Item:
isFrequency = "Frequency" in name isFrequency = "Frequency" in name
shouldUseProgressive = ((isFrequency and self.multiworld.island_frequency_locations[self.player].value == 4) shouldUseProgressive = bool((isFrequency and self.options.island_frequency_locations == self.options.island_frequency_locations.option_progressive)
or (not isFrequency and self.multiworld.progressive_items[self.player].value)) or (not isFrequency and self.options.progressive_items))
if shouldUseProgressive and name in progressive_table: if shouldUseProgressive and name in progressive_table:
name = progressive_table[name] name = progressive_table[name]
return self.create_item(name) return self.create_item(name)
@ -152,7 +153,7 @@ class RaftWorld(World):
return super(RaftWorld, self).collect_item(state, item, remove) return super(RaftWorld, self).collect_item(state, item, remove)
def pre_fill(self): def pre_fill(self):
if self.multiworld.island_frequency_locations[self.player] == 0: # Vanilla if self.options.island_frequency_locations == self.options.island_frequency_locations.option_vanilla:
self.setLocationItem("Radio Tower Frequency to Vasagatan", "Vasagatan Frequency") self.setLocationItem("Radio Tower Frequency to Vasagatan", "Vasagatan Frequency")
self.setLocationItem("Vasagatan Frequency to Balboa", "Balboa Island Frequency") self.setLocationItem("Vasagatan Frequency to Balboa", "Balboa Island Frequency")
self.setLocationItem("Relay Station quest", "Caravan Island Frequency") self.setLocationItem("Relay Station quest", "Caravan Island Frequency")
@ -160,7 +161,7 @@ class RaftWorld(World):
self.setLocationItem("Tangaroa Frequency to Varuna Point", "Varuna Point Frequency") self.setLocationItem("Tangaroa Frequency to Varuna Point", "Varuna Point Frequency")
self.setLocationItem("Varuna Point Frequency to Temperance", "Temperance Frequency") self.setLocationItem("Varuna Point Frequency to Temperance", "Temperance Frequency")
self.setLocationItem("Temperance Frequency to Utopia", "Utopia Frequency") self.setLocationItem("Temperance Frequency to Utopia", "Utopia Frequency")
elif self.multiworld.island_frequency_locations[self.player] == 1: # Random on island elif self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_on_island:
self.setLocationItemFromRegion("RadioTower", "Vasagatan Frequency") self.setLocationItemFromRegion("RadioTower", "Vasagatan Frequency")
self.setLocationItemFromRegion("Vasagatan", "Balboa Island Frequency") self.setLocationItemFromRegion("Vasagatan", "Balboa Island Frequency")
self.setLocationItemFromRegion("BalboaIsland", "Caravan Island Frequency") self.setLocationItemFromRegion("BalboaIsland", "Caravan Island Frequency")
@ -168,7 +169,10 @@ class RaftWorld(World):
self.setLocationItemFromRegion("Tangaroa", "Varuna Point Frequency") self.setLocationItemFromRegion("Tangaroa", "Varuna Point Frequency")
self.setLocationItemFromRegion("Varuna Point", "Temperance Frequency") self.setLocationItemFromRegion("Varuna Point", "Temperance Frequency")
self.setLocationItemFromRegion("Temperance", "Utopia Frequency") self.setLocationItemFromRegion("Temperance", "Utopia Frequency")
elif self.multiworld.island_frequency_locations[self.player] in [2, 3]: elif self.options.island_frequency_locations in [
self.options.island_frequency_locations.option_random_island_order,
self.options.island_frequency_locations.option_random_on_island_random_order
]:
locationToFrequencyItemMap = { locationToFrequencyItemMap = {
"Vasagatan": "Vasagatan Frequency", "Vasagatan": "Vasagatan Frequency",
"BalboaIsland": "Balboa Island Frequency", "BalboaIsland": "Balboa Island Frequency",
@ -196,9 +200,9 @@ class RaftWorld(World):
else: else:
currentLocation = availableLocationList[0] # Utopia (only one left in list) currentLocation = availableLocationList[0] # Utopia (only one left in list)
availableLocationList.remove(currentLocation) availableLocationList.remove(currentLocation)
if self.multiworld.island_frequency_locations[self.player] == 2: # Random island order if self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_island_order:
self.setLocationItem(locationToVanillaFrequencyLocationMap[previousLocation], locationToFrequencyItemMap[currentLocation]) self.setLocationItem(locationToVanillaFrequencyLocationMap[previousLocation], locationToFrequencyItemMap[currentLocation])
elif self.multiworld.island_frequency_locations[self.player] == 3: # Random on island random order elif self.options.island_frequency_locations == self.options.island_frequency_locations.option_random_on_island_random_order:
self.setLocationItemFromRegion(previousLocation, locationToFrequencyItemMap[currentLocation]) self.setLocationItemFromRegion(previousLocation, locationToFrequencyItemMap[currentLocation])
previousLocation = currentLocation previousLocation = currentLocation
@ -215,9 +219,9 @@ class RaftWorld(World):
def fill_slot_data(self): def fill_slot_data(self):
return { return {
"IslandGenerationDistance": self.multiworld.island_generation_distance[self.player].value, "IslandGenerationDistance": self.options.island_generation_distance.value,
"ExpensiveResearch": bool(self.multiworld.expensive_research[self.player].value), "ExpensiveResearch": bool(self.options.expensive_research),
"DeathLink": bool(self.multiworld.death_link[self.player].value) "DeathLink": bool(self.options.death_link)
} }
def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None): def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):