Skip to content

Commit

Permalink
LADX: Adding 'Option Groups' to the player options page. (Archipelago…
Browse files Browse the repository at this point in the history
…MW#3560)

* Adding 'Option Groups' to the LADX player options page.

* Moved 'Miscellaneous' group to the logic effecting groups.
  • Loading branch information
mrkssr authored Jun 19, 2024
1 parent b6191ff commit 240d1a3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 3 deletions.
40 changes: 39 additions & 1 deletion worlds/ladx/Options.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os.path
import typing
import logging
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions
from Options import Choice, Toggle, DefaultOnToggle, Range, FreeText, PerGameCommonOptions, OptionGroup
from collections import defaultdict
import Utils

Expand Down Expand Up @@ -493,6 +493,44 @@ class AdditionalWarpPoints(DefaultOffToggle):
[Off] No change
"""

ladx_option_groups = [
OptionGroup("Goal Options", [
Goal,
InstrumentCount,
]),
OptionGroup("Shuffles", [
ShuffleInstruments,
ShuffleNightmareKeys,
ShuffleSmallKeys,
ShuffleMaps,
ShuffleCompasses,
ShuffleStoneBeaks
]),
OptionGroup("Warp Points", [
WarpImprovements,
AdditionalWarpPoints,
]),
OptionGroup("Miscellaneous", [
TradeQuest,
Rooster,
TrendyGame,
NagMessages,
BootsControls
]),
OptionGroup("Experimental", [
DungeonShuffle,
EntranceShuffle
]),
OptionGroup("Visuals & Sound", [
LinkPalette,
Palette,
TextShuffle,
APTitleScreen,
GfxMod,
Music,
MusicChangeCondition
])
]

@dataclass
class LinksAwakeningOptions(PerGameCommonOptions):
Expand Down
4 changes: 2 additions & 2 deletions worlds/ladx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from .LADXR.worldSetup import WorldSetup as LADXRWorldSetup
from .Locations import (LinksAwakeningLocation, LinksAwakeningRegion,
create_regions_from_ladxr, get_locations_to_id)
from .Options import DungeonItemShuffle, ShuffleInstruments, LinksAwakeningOptions
from .Options import DungeonItemShuffle, ShuffleInstruments, LinksAwakeningOptions, ladx_option_groups
from .Rom import LADXDeltaPatch, get_base_rom_path

DEVELOPER_MODE = False
Expand Down Expand Up @@ -65,7 +65,7 @@ class LinksAwakeningWebWorld(WebWorld):
["zig"]
)]
theme = "dirt"

option_groups = ladx_option_groups

class LinksAwakeningWorld(World):
"""
Expand Down

0 comments on commit 240d1a3

Please sign in to comment.