diff --git a/worlds/keymasters_keep/Supported Games by Platform.md b/worlds/keymasters_keep/Supported Games by Platform.md index a8bc87bb4f4b..a728a31a93b3 100644 --- a/worlds/keymasters_keep/Supported Games by Platform.md +++ b/worlds/keymasters_keep/Supported Games by Platform.md @@ -1,6 +1,6 @@ # Keymaster's Keep Supported Games by Platform -Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded games). +Keymaster's Keep currently supports 151 games ### Android (19) * A Dance of Fire and Ice @@ -148,6 +148,10 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Vampire Survivors * Warframe +### Modded Game (2) +* PlatinumQuest +* Pokémon Platinum Map Randomizer + ### Nintendo 3DS (2) * Hyrule Warriors: Definitive Edition * The Binding of Isaac: Rebirth @@ -159,12 +163,11 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Mario Party 3 * Re-Volt -### Nintendo DS (6) +### Nintendo DS (5) * Advance Wars: Days of Ruin * Lego Rock Band * Plants vs. Zombies * Pokémon Diamond, Pearl, and Platinum Versions -* Pokémon Platinum Map Randomizer * Rock Band 3 ### Nintendo Entertainment System (4) @@ -268,7 +271,7 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game ### Nokia N-GAGE (1) * Guitar Hero World Tour -### PC (100) +### PC (99) * 14 Minesweeper Variants * 14 Minesweeper Variants 2 * A Dance of Fire and Ice @@ -332,7 +335,6 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Pizza Tower * Placid Plastic Duck Simulator * Plants vs. Zombies -* PlatinumQuest * PowerWash Simulator * Rabbit & Steel * Re-Volt diff --git a/worlds/keymasters_keep/Supported Games.md b/worlds/keymasters_keep/Supported Games.md index 3053c6cd374a..1fc1f9c95185 100644 --- a/worlds/keymasters_keep/Supported Games.md +++ b/worlds/keymasters_keep/Supported Games.md @@ -1,33 +1,27 @@ # Keymaster's Keep Supported Games -Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded games). +Keymaster's Keep currently supports 151 games -### Metagames Supported (8) -* Archipelago Multiworld Randomizer (META) -* Artwork (META) -* BizHawk Shuffler (META) -* Custom (META) -* Game Backlog (META) -* Jackbox Party Packs (META) -* RetroAchievements (META) -* Shiny Pokémon Hunt (META) - -### Games Supported (141) +### Games Supported (151) * 14 Minesweeper Variants (PC) * 14 Minesweeper Variants 2 (PC) * A Dance of Fire and Ice (PC + AND, IOS) * Advance Wars: Days of Ruin (NDS) * Anger Foot (PC) * Arcaea (SW) +* Archipelago Multiworld Randomizer (META) +* Artwork (META) * Awaria (PC) * Backpack Battles (PC) * BattleBlock Theater (PC + X360) +* BizHawk Shuffler (META) * Bloons TD 6 (PC + AND, IOS, PS4, XONE) * Bomberman 64 (N64) * Creeper World 3: Arc Eternal (PC) * Creeper World 4 (PC) * Crush Crush (PC + AND, IOS, SW, WEB) * Cuphead (PC + PS4, SW, XONE) +* Custom (META) * Cytus II (AND + IOS) * DJMax Respect V (PC + XONE, XSX) * Dark Souls: Remastered (PC + PS4, SW, XONE) @@ -50,6 +44,7 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Frogger (1997) (PS1 + PC) * GTFO (PC) * GUILTY GEAR -STRIVE- (PC + PS4, PS5, XONE, XSX, SW) +* Game Backlog (META) * Guild Wars 2 (PC) * Guitar Hero (PS2) * Guitar Hero 5 (X360 + PS3, PS2, WII) @@ -64,6 +59,7 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Hyrule Warriors: Definitive Edition (SW + 3DS) * I Was a Teenage Exocolonist (PC + PS4, PS5, SW) * Insaniquarium Deluxe (PC + AND, IOS) +* Jackbox Party Packs (META) * Just Shapes & Beats (PC + PS4, SW, XONE) * Kingdom Hearts III (PC + PS4, SW, XONE) * Kingdom Hearts: Melody of Memory (SW + PC, PS4, XONE) @@ -102,13 +98,16 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Plants vs. Zombies (PC + AND, IOS, NDS, PS3, VITA, X360) * Plants vs. Zombies 2: It's About Time (AND + IOS) * Plants vs. Zombies: Heroes (IOS + AND) +* PlatinumQuest (MOD) * Pokémon Diamond, Pearl, and Platinum Versions (NDS) +* Pokémon Platinum Map Randomizer (MOD) * Pokémon Ruby, Sapphire, and Emerald Versions (GBA) * PowerWash Simulator (PC + PS4, PS5, SW, VR, XONE, XSX) * Project Sekai: Colorful Stage (AND + IOS) * Rabbit & Steel (PC) * Re-Volt (PC + DC, N64, PS1) * Realm of the Mad God (PC) +* RetroAchievements (META) * Rhythm Doctor (PC) * Rhythm Heaven Fever (WII + WIIU) * Rimworld (PC + XONE, PS4) @@ -119,6 +118,7 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * Rock of Ages 2: Bigger & Boulder (PC + PS4, SW, XONE) * Salt and Sacrifice (PC + PS4, PS5, SW) * Shadow The Hedgehog (GC + PS2, XBOX) +* Shiny Pokémon Hunt (META) * Shovel Knight Dig (PC + IOS, PS5, SW, XSX) * Sins of a Solar Empire II (PC) * Smite 2 (PC) @@ -154,7 +154,3 @@ Keymaster's Keep currently supports 151 games (141 + 8 metagames + 2 modded game * WEBFISHING (PC) * Warframe (PC + AND, IOS, PS4, PS5, SW, XONE, XSX) * Ys VIII: Lacrimosa of Dana (PC + PS4, PS5, SW, VITA) - -### Modded Games Supported (2) -* PlatinumQuest (PC) -* Pokémon Platinum Map Randomizer (NDS) diff --git a/worlds/keymasters_keep/data/mapping_data.py b/worlds/keymasters_keep/data/mapping_data.py index b55ac7907f1b..2c3fcce71133 100644 --- a/worlds/keymasters_keep/data/mapping_data.py +++ b/worlds/keymasters_keep/data/mapping_data.py @@ -278,6 +278,7 @@ KeymastersKeepGamePlatforms.MART: "Fujitsu FM Towns Marty", KeymastersKeepGamePlatforms.MCD: "Sega Mega CD", KeymastersKeepGamePlatforms.META: "Metagame", + KeymastersKeepGamePlatforms.MOD: "Modded Game", KeymastersKeepGamePlatforms.MSX: "MSX", KeymastersKeepGamePlatforms.MSX2: "MSX2, MSX2+, MSX TurboR", KeymastersKeepGamePlatforms.N64: "Nintendo 64", diff --git a/worlds/keymasters_keep/enums.py b/worlds/keymasters_keep/enums.py index 0bee9fd8c4d7..0955cbada2b2 100644 --- a/worlds/keymasters_keep/enums.py +++ b/worlds/keymasters_keep/enums.py @@ -63,6 +63,7 @@ class KeymastersKeepGamePlatforms(enum.Enum): MART = "MART" # Fujitsu FM Towns Marty MCD = "MCD" # Sega Mega CD META = "META" # Metagame + MOD = "MOD" # Modded Game MSX = "MSX" # MSX MSX2 = "MSX2" # MSX2, MSX2+, MSX TurboR N64 = "N64" # Nintendo 64 diff --git a/worlds/keymasters_keep/game.py b/worlds/keymasters_keep/game.py index bd310e423c70..dd6edb7098f7 100644 --- a/worlds/keymasters_keep/game.py +++ b/worlds/keymasters_keep/game.py @@ -12,21 +12,13 @@ class AutoGameRegister(type): games: Dict[str, Type[Game]] = dict() - metagames: Dict[str, Type[Game]] = dict() - modded_games: Dict[str, Type[Game]] = dict() def __new__(mcs, name: str, bases: Tuple[type, ...], dict_: Dict[str, Any]) -> AutoGameRegister: new_class: Type[Game] = super().__new__(mcs, name, bases, dict_) if name != "Game" and new_class.should_autoregister: game_name: str = new_class.game_name_with_platforms() - - if "is_metagame" in dict_ and dict_["is_metagame"]: - mcs.metagames[game_name] = new_class - elif "is_modded_game" in dict_ and dict_["is_modded_game"]: - mcs.modded_games[game_name] = new_class - else: - mcs.games[game_name] = new_class + mcs.games[game_name] = new_class return new_class @@ -38,9 +30,6 @@ class Game(metaclass=AutoGameRegister): # Other available platforms the game integration might work with platforms_other: Optional[List[KeymastersKeepGamePlatforms]] = None - is_metagame: bool = False # Whether the game should be considered a metagame for grouping purposes - is_modded_game: bool = False # Whether the game is a modded version of a base game. For grouping purposes - is_adult_only_or_unrated: bool = True # ESRB AO / PEGI 18 / USK 18 / Unrated? Used for filtering should_autoregister: bool = True # Development flag. Used to prevent AutoGameRegister from registering the game diff --git a/worlds/keymasters_keep/game_objective_generator.py b/worlds/keymasters_keep/game_objective_generator.py index 9fc8ad24948e..f45cd52cae1b 100644 --- a/worlds/keymasters_keep/game_objective_generator.py +++ b/worlds/keymasters_keep/game_objective_generator.py @@ -178,18 +178,10 @@ def _filter_games( game_name: str for game_name in allowable_games: - in_games: bool = game_name in AutoGameRegister.games - in_metagames: bool = game_name in AutoGameRegister.metagames - in_modded_games: bool = game_name in AutoGameRegister.modded_games - - if not in_games and not in_metagames and not in_modded_games: + if game_name not in AutoGameRegister.games: continue - game: Type[Game] = AutoGameRegister.games.get( - game_name, AutoGameRegister.metagames.get( - game_name, AutoGameRegister.modded_games.get(game_name) - ) - ) + game: Type[Game] = AutoGameRegister.games[game_name] game_instance: Game = game(archipelago_options=self.archipelago_options) diff --git a/worlds/keymasters_keep/games/__init__.py b/worlds/keymasters_keep/games/__init__.py index a0cc766490d6..5fbcca3e3715 100644 --- a/worlds/keymasters_keep/games/__init__.py +++ b/worlds/keymasters_keep/games/__init__.py @@ -4,7 +4,7 @@ from importlib import import_module from pkgutil import iter_modules -from ..game import AutoGameRegister +from ..game import AutoGameRegister, Game for game_module_info in iter_modules(__path__): import_module(f".{game_module_info.name}", __package__) @@ -13,13 +13,9 @@ option_classes: List[Type] = list() # Reverse order here is needed so that the options are added in alphabetical order in the YAML -for _, game_cls in [ - *sorted(AutoGameRegister.modded_games.items(), reverse=True), - *sorted(AutoGameRegister.games.items(), reverse=True), - *sorted(AutoGameRegister.metagames.items(), reverse=True), -]: - if game_cls.options_cls: - option_classes.append(game_cls.options_cls) +game_cls: Type[Game] +for _, game_cls in sorted(AutoGameRegister.games.items(), reverse=True): + option_classes.append(game_cls.options_cls) @dataclass diff --git a/worlds/keymasters_keep/games/archipelago_multiworld_randomizer_game.py b/worlds/keymasters_keep/games/archipelago_multiworld_randomizer_game.py index 59c860a492f0..adccdd56f91f 100644 --- a/worlds/keymasters_keep/games/archipelago_multiworld_randomizer_game.py +++ b/worlds/keymasters_keep/games/archipelago_multiworld_randomizer_game.py @@ -34,7 +34,6 @@ class ArchipelagoMultiworldRandomizerGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = ArchipelagoMultiworldRandomizerArchipelagoOptions diff --git a/worlds/keymasters_keep/games/artwork_game.py b/worlds/keymasters_keep/games/artwork_game.py index cef4614aef12..bc9408e396b2 100644 --- a/worlds/keymasters_keep/games/artwork_game.py +++ b/worlds/keymasters_keep/games/artwork_game.py @@ -28,8 +28,6 @@ class ArtworkGame(Game): platforms_other = None - is_metagame = True - options_cls = ArtworkArchipelagoOptions def optional_game_constraint_templates(self) -> List[GameObjectiveTemplate]: diff --git a/worlds/keymasters_keep/games/bizhawk_shuffler_game.py b/worlds/keymasters_keep/games/bizhawk_shuffler_game.py index 7e9cff4fdaa8..7a8863ba2140 100644 --- a/worlds/keymasters_keep/games/bizhawk_shuffler_game.py +++ b/worlds/keymasters_keep/games/bizhawk_shuffler_game.py @@ -23,7 +23,6 @@ class BizHawkShufflerGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = BizHawkShufflerArchipelagoOptions diff --git a/worlds/keymasters_keep/games/custom_game.py b/worlds/keymasters_keep/games/custom_game.py index 4f0688dc3736..61017c295aad 100644 --- a/worlds/keymasters_keep/games/custom_game.py +++ b/worlds/keymasters_keep/games/custom_game.py @@ -23,7 +23,6 @@ class CustomGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = CustomArchipelagoOptions diff --git a/worlds/keymasters_keep/games/game_backlog_game.py b/worlds/keymasters_keep/games/game_backlog_game.py index 874287858b0f..8fdbfa67bc02 100644 --- a/worlds/keymasters_keep/games/game_backlog_game.py +++ b/worlds/keymasters_keep/games/game_backlog_game.py @@ -24,7 +24,6 @@ class GameBacklogGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = GameBacklogArchipelagoOptions diff --git a/worlds/keymasters_keep/games/game_medley_game.py b/worlds/keymasters_keep/games/game_medley_game.py index 134e3612117e..6aa9baa17a66 100644 --- a/worlds/keymasters_keep/games/game_medley_game.py +++ b/worlds/keymasters_keep/games/game_medley_game.py @@ -22,7 +22,6 @@ class GameMedleyGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False should_autoregister = False diff --git a/worlds/keymasters_keep/games/jackbox_party_packs_game.py b/worlds/keymasters_keep/games/jackbox_party_packs_game.py index 96474261a7b2..15ce95138853 100644 --- a/worlds/keymasters_keep/games/jackbox_party_packs_game.py +++ b/worlds/keymasters_keep/games/jackbox_party_packs_game.py @@ -23,7 +23,6 @@ class JackboxPartyPacksGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = JackboxPartyPacksArchipelagoOptions diff --git a/worlds/keymasters_keep/games/platinumquest_game.py b/worlds/keymasters_keep/games/platinumquest_game.py index 0444bbb02c21..1518f10f7655 100644 --- a/worlds/keymasters_keep/games/platinumquest_game.py +++ b/worlds/keymasters_keep/games/platinumquest_game.py @@ -20,11 +20,10 @@ class PlatinumQuestArchipelagoOptions: class PlatinumQuestGame(Game): name = "PlatinumQuest" - platform = KeymastersKeepGamePlatforms.PC + platform = KeymastersKeepGamePlatforms.MOD platforms_other = None - is_modded_game = True is_adult_only_or_unrated = False options_cls = PlatinumQuestArchipelagoOptions diff --git a/worlds/keymasters_keep/games/pokemon_platinum_map_randomizer_game.py b/worlds/keymasters_keep/games/pokemon_platinum_map_randomizer_game.py index 54f7587f9d25..85edf311f935 100644 --- a/worlds/keymasters_keep/games/pokemon_platinum_map_randomizer_game.py +++ b/worlds/keymasters_keep/games/pokemon_platinum_map_randomizer_game.py @@ -17,11 +17,10 @@ class PokemonPlatinumMapRandomizerArchipelagoOptions: class PokemonPlatinumMapRandomizerGame(Game): name = "Pokémon Platinum Map Randomizer" - platform = KeymastersKeepGamePlatforms.NDS + platform = KeymastersKeepGamePlatforms.MOD platforms_other = None - is_modded_game = True is_adult_only_or_unrated = False options_cls = PokemonPlatinumMapRandomizerArchipelagoOptions diff --git a/worlds/keymasters_keep/games/retro_achievements_game.py b/worlds/keymasters_keep/games/retro_achievements_game.py index 57a19103cf5a..ca69658cf735 100644 --- a/worlds/keymasters_keep/games/retro_achievements_game.py +++ b/worlds/keymasters_keep/games/retro_achievements_game.py @@ -23,7 +23,6 @@ class RetroAchievementsGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = RetroAchievementsArchipelagoOptions diff --git a/worlds/keymasters_keep/games/shiny_pokemon_hunt_game.py b/worlds/keymasters_keep/games/shiny_pokemon_hunt_game.py index 1cf9ea96aeaf..5d0ffcb99c93 100644 --- a/worlds/keymasters_keep/games/shiny_pokemon_hunt_game.py +++ b/worlds/keymasters_keep/games/shiny_pokemon_hunt_game.py @@ -66,7 +66,6 @@ class ShinyPokemonHuntGame(Game): platforms_other = None - is_metagame = True is_adult_only_or_unrated = False options_cls = ShinyPokemonHuntArchipelagoOptions diff --git a/worlds/keymasters_keep/options.py b/worlds/keymasters_keep/options.py index 14d5a4ed0991..82f5fa48dd5d 100644 --- a/worlds/keymasters_keep/options.py +++ b/worlds/keymasters_keep/options.py @@ -217,7 +217,7 @@ class GameMedleyGameSelection(OptionList): """ Defines the game pool that will be used to generate Game Medley trials. - Only game names originally listed in 'game_selection', 'metagame_selection' and 'modded_game_selection' are accepted. + Only game names originally listed in 'game_selection' are accepted. You are allowed to place games that already appear in other selection options here. @@ -227,30 +227,11 @@ class GameMedleyGameSelection(OptionList): """ display_name: str = "Game Medley Game Selection" - valid_keys = ( - sorted(AutoGameRegister.games.keys()) - + sorted(AutoGameRegister.metagames.keys()) - + sorted(AutoGameRegister.modded_games.keys()) - ) + valid_keys = sorted(AutoGameRegister.games.keys()) default = list() -class MetagameSelection(OptionList): - """ - Defines the metagame pool to select from. - - All supported metagames are listed. Remove the ones you don't own or want to play. - - You are allowed to add the same game multiple times here. This will act as a weighted pool. - """ - - display_name: str = "Metagame Selection" - valid_keys = sorted(AutoGameRegister.metagames.keys()) - - default = sorted(AutoGameRegister.metagames.keys()) - - class GameSelection(OptionList): """ Defines the game pool to select from. @@ -266,21 +247,6 @@ class GameSelection(OptionList): default = sorted(AutoGameRegister.games.keys()) -class ModdedGameSelection(OptionList): - """ - Defines the modded game pool to select from. - - All supported modded games are listed. Remove the ones you don't own or want to play. - - You are allowed to add the same game multiple times here. This will act as a weighted pool. - """ - - display_name: str = "Modded Game Selection" - valid_keys = sorted(AutoGameRegister.modded_games.keys()) - - default = sorted(AutoGameRegister.modded_games.keys()) - - class IncludeAdultOnlyOrUnratedGames(Toggle): """ Determines if adult only or unrated games should be considered for the game pool. @@ -317,17 +283,13 @@ class ExcludedGamesDifficultObjectives(OptionSet): """ When 'include_difficult_objectives' is enabled, this option allows you to still exclude specific games. - Only game names originally listed in 'game_selection', 'metagame_selection' and 'modded_game_selection' are accepted. + Only game names originally listed in 'game_selection' are accepted. If a game specified here only offers difficult objectives, this option will have no effect for it. """ display_name: str = "Excluded Games Difficult Objectives" - valid_keys = ( - sorted(AutoGameRegister.games.keys()) - + sorted(AutoGameRegister.metagames.keys()) - + sorted(AutoGameRegister.modded_games.keys()) - ) + valid_keys = sorted(AutoGameRegister.games.keys()) default = list() @@ -348,17 +310,13 @@ class ExcludedGamesTimeConsumingObjectives(OptionSet): """ When 'include_time_consuming_objectives' is enabled, this option allows you to still exclude specific games. - Only game names originally listed in 'game_selection', 'metagame_selection' and 'modded_game_selection' are accepted. + Only game names originally listed in 'game_selection' are accepted. If a game specified here only offers time-consuming objectives, this option will have no effect for it. """ display_name: str = "Excluded Games Time-Consuming Objectives" - valid_keys = ( - sorted(AutoGameRegister.games.keys()) - + sorted(AutoGameRegister.metagames.keys()) - + sorted(AutoGameRegister.modded_games.keys()) - ) + valid_keys = sorted(AutoGameRegister.games.keys()) default = list() @@ -390,9 +348,7 @@ class KeymastersKeepOptions(PerGameCommonOptions, GameArchipelagoOptions): game_medley_mode: GameMedleyMode game_medley_percentage_chance: GameMedleyPercentageChance game_medley_game_selection: GameMedleyGameSelection - metagame_selection: MetagameSelection game_selection: GameSelection - modded_game_selection: ModdedGameSelection include_adult_only_or_unrated_games: IncludeAdultOnlyOrUnratedGames include_modern_console_games: IncludeModernConsoleGames include_difficult_objectives: IncludeDifficultObjectives @@ -440,9 +396,7 @@ class KeymastersKeepOptions(PerGameCommonOptions, GameArchipelagoOptions): GameMedleyMode, GameMedleyPercentageChance, GameMedleyGameSelection, - MetagameSelection, GameSelection, - ModdedGameSelection, ], ), OptionGroup( diff --git a/worlds/keymasters_keep/utils.py b/worlds/keymasters_keep/utils.py index 583f4c77fee4..320590a29959 100644 --- a/worlds/keymasters_keep/utils.py +++ b/worlds/keymasters_keep/utils.py @@ -8,28 +8,13 @@ def generate_docs_supported_games() -> None: count_games: int = len(AutoGameRegister.games) - count_metagames: int = len(AutoGameRegister.metagames) - count_modded_games: int = len(AutoGameRegister.modded_games) - - count_total: int = count_games + count_metagames + count_modded_games with open("worlds/keymasters_keep/Supported Games.md", "w", encoding="utf-8") as f: f.truncate(0) f.write("# Keymaster's Keep Supported Games\n\n") - f.write( - f"Keymaster's Keep currently supports {count_total} games " - f"({count_games} + {count_metagames} metagames + {count_modded_games} modded games).\n\n" - ) - - f.write(f"### Metagames Supported ({count_metagames})\n") - - game: str - for game in sorted(AutoGameRegister.metagames.keys()): - f.write(f"* {game}\n") - - f.write("\n") + f.write(f"Keymaster's Keep currently supports {count_games} games\n\n") f.write(f"### Games Supported ({count_games})\n") @@ -37,21 +22,9 @@ def generate_docs_supported_games() -> None: for game in sorted(AutoGameRegister.games.keys()): f.write(f"* {game}\n") - f.write("\n") - - f.write(f"### Modded Games Supported ({count_modded_games})\n") - - game: str - for game in sorted(AutoGameRegister.modded_games.keys()): - f.write(f"* {game}\n") - def generate_docs_supported_games_by_platform() -> None: count_games: int = len(AutoGameRegister.games) - count_metagames: int = len(AutoGameRegister.metagames) - count_modded_games: int = len(AutoGameRegister.modded_games) - - count_total: int = count_games + count_metagames + count_modded_games games_by_platform: Dict[KeymastersKeepGamePlatforms, List[str]] = dict() @@ -61,9 +34,6 @@ def generate_docs_supported_games_by_platform() -> None: games: Dict[str, Type[Game]] = AutoGameRegister.games - games.update(AutoGameRegister.metagames) - games.update(AutoGameRegister.modded_games) - game: Type[Game] for game in games.values(): games_by_platform[game.platform].append(game.name) @@ -92,10 +62,7 @@ def generate_docs_supported_games_by_platform() -> None: f.write("# Keymaster's Keep Supported Games by Platform\n\n") - f.write( - f"Keymaster's Keep currently supports {count_total} games " - f"({count_games} + {count_metagames} metagames + {count_modded_games} modded games).\n\n" - ) + f.write(f"Keymaster's Keep currently supports {count_games} games\n\n") platform_label: str for platform_label in sorted(platform_labels.keys()): diff --git a/worlds/keymasters_keep/world.py b/worlds/keymasters_keep/world.py index 23b3ae2f361f..e7d4c86f2167 100644 --- a/worlds/keymasters_keep/world.py +++ b/worlds/keymasters_keep/world.py @@ -137,8 +137,6 @@ class KeymastersKeepWorld(World): lock_magic_keys_minimum: int magic_keys_required: int magic_keys_total: int - metagame_selection: List[str] - modded_game_selection: List[str] selected_areas: List[KeymastersKeepRegions] selected_magic_keys: List[KeymastersKeepItems] unlocked_areas: int @@ -238,8 +236,6 @@ def generate_early(self) -> None: self.game_medley_game_selection = list(self.options.game_medley_game_selection.value) self.game_selection = list(self.options.game_selection.value) - self.metagame_selection = list(self.options.metagame_selection.value) - self.modded_game_selection = list(self.options.modded_game_selection.value) self.include_adult_only_or_unrated_games = bool(self.options.include_adult_only_or_unrated_games) self.include_modern_console_games = bool(self.options.include_modern_console_games) @@ -610,11 +606,7 @@ def _generate_keep(self) -> None: self.area_trials[area] = self.random.sample(possible_trials, trial_count) def _generate_game_objective_data(self) -> None: - game_selection: List[str] = sorted( - self.game_selection[:] - + self.metagame_selection[:] - + self.modded_game_selection[:] - ) + game_selection: List[str] = sorted(self.game_selection[:]) generator: GameObjectiveGenerator = GameObjectiveGenerator( game_selection,