morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Muse Dash: Change Exception to Option Error and Update to Muse Radio FM106 (#5374)

Browse Source 
* Change Exception to OptionError

* Update to Muse Radio FM106.

* Add Scipio's suggestion.

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
This commit is contained in:
Justus Lind
2025-08-30 01:41:29 +10:00
committed by GitHub
parent 439be48f36
commit bb2ecb8a97
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/musedash/MuseDashData.py
View File

@@ -661,4 +661,8 @@ SONG_DATA: Dict[str, SongData] = {
"Ineffabilis": SongData(2900785, "87-4", "Aim to Be a Rhythm Master!", False, 3, 7, 10), "Ineffabilis": SongData(2900785, "87-4", "Aim to Be a Rhythm Master!", False, 3, 7, 10),
"DaJiaHao": SongData(2900786, "87-5", "Aim to Be a Rhythm Master!", False, 5, 7, 10), "DaJiaHao": SongData(2900786, "87-5", "Aim to Be a Rhythm Master!", False, 5, 7, 10),
"Echoes of SeraphiM": SongData(2900787, "87-6", "Aim to Be a Rhythm Master!", False, 5, 8, 10), "Echoes of SeraphiM": SongData(2900787, "87-6", "Aim to Be a Rhythm Master!", False, 5, 8, 10),
"Othello feat.Uiro": SongData(2900788, "88-0", "MUSE RADIO FM106", True, 3, 5, 7),
"Midnight Blue": SongData(2900789, "88-1", "MUSE RADIO FM106", True, 2, 5, 7),
"overwork feat.Woonoo": SongData(2900790, "88-2", "MUSE RADIO FM106", True, 2, 6, 8),
"SUPER CITYLIGHTS": SongData(2900791, "88-3", "MUSE RADIO FM106", True, 5, 7, 10),
} }

5
worlds/musedash/__init__.py
View File

@@ -2,7 +2,7 @@ from worlds.AutoWorld import World, WebWorld
from BaseClasses import Region, Item, ItemClassification, Tutorial from BaseClasses import Region, Item, ItemClassification, Tutorial
from typing import List, ClassVar, Type, Set from typing import List, ClassVar, Type, Set
from math import floor from math import floor
from Options import PerGameCommonOptions from Options import PerGameCommonOptions, OptionError
from .Options import MuseDashOptions, md_option_groups from .Options import MuseDashOptions, md_option_groups
from .Items import MuseDashSongItem, MuseDashFixedItem from .Items import MuseDashSongItem, MuseDashFixedItem
@@ -102,7 +102,8 @@ class MuseDashWorld(World):
# If the above fails, we want to adjust the difficulty thresholds. # If the above fails, we want to adjust the difficulty thresholds.
# Easier first, then harder # Easier first, then harder
if lower_diff_threshold <= 1 and higher_diff_threshold >= 11: if lower_diff_threshold <= 1 and higher_diff_threshold >= 11:
raise Exception("Failed to find enough songs, even with maximum difficulty thresholds.") raise OptionError("Failed to find enough songs, even with maximum difficulty thresholds. "
"Too many songs have been excluded or set to be starter songs.")
elif lower_diff_threshold <= 1: elif lower_diff_threshold <= 1:
higher_diff_threshold += 1 higher_diff_threshold += 1
else: else: