diff --git a/worlds/blasphemous/Locations.py b/worlds/blasphemous/Locations.py index 6c2f71cd..fac84313 100644 --- a/worlds/blasphemous/Locations.py +++ b/worlds/blasphemous/Locations.py @@ -89,7 +89,7 @@ location_names: Dict[str, str] = { "RESCUED_CHERUB_15": "DC: Top of elevator Child of Moonlight", "Lady[D01Z05S22]": "DC: Lady of the Six Sorrows, from MD", "QI75": "DC: Chalice room", - "Sword[D01Z05S24]": "DC: Mea culpa altar", + "Sword[D01Z05S24]": "DC: Mea Culpa altar", "CO44": "DC: Elevator shaft ledge", "RESCUED_CHERUB_22": "DC: Elevator shaft Child of Moonlight", "Lady[D01Z05S26]": "DC: Lady of the Six Sorrows, elevator shaft", diff --git a/worlds/blasphemous/__init__.py b/worlds/blasphemous/__init__.py index 4b151f41..a643e91c 100644 --- a/worlds/blasphemous/__init__.py +++ b/worlds/blasphemous/__init__.py @@ -67,7 +67,8 @@ class BlasphemousWorld(World): def generate_early(self): if not self.options.starting_location.randomized: - if self.options.starting_location == "mourning_havoc" and self.options.difficulty < 2: + if (self.options.starting_location == "knot_of_words" or self.options.starting_location == "rooftops" \ + or self.options.starting_location == "mourning_havoc") and self.options.difficulty < 2: raise OptionError(f"[Blasphemous - '{self.player_name}'] " f"{self.options.starting_location} cannot be chosen if Difficulty is lower than Hard.") @@ -83,6 +84,8 @@ class BlasphemousWorld(World): locations: List[int] = [ 0, 1, 2, 3, 4, 5, 6 ] if self.options.difficulty < 2: + locations.remove(4) + locations.remove(5) locations.remove(6) if self.options.dash_shuffle: diff --git a/worlds/blasphemous/test/test_starting_locations.py b/worlds/blasphemous/test/test_starting_locations.py index 9e04d52e..1d541bc9 100644 --- a/worlds/blasphemous/test/test_starting_locations.py +++ b/worlds/blasphemous/test/test_starting_locations.py @@ -85,20 +85,7 @@ class TestGrievanceHard(BlasphemousTestBase): } -class TestKnotOfWordsEasy(BlasphemousTestBase): - options = { - "starting_location": "knot_of_words", - "difficulty": "easy" - } - - -class TestKnotOfWordsNormal(BlasphemousTestBase): - options = { - "starting_location": "knot_of_words", - "difficulty": "normal" - } - - +# knot of the three words, rooftops, and mourning and havoc can't be selected on easy or normal. hard only class TestKnotOfWordsHard(BlasphemousTestBase): options = { "starting_location": "knot_of_words", @@ -106,20 +93,6 @@ class TestKnotOfWordsHard(BlasphemousTestBase): } -class TestRooftopsEasy(BlasphemousTestBase): - options = { - "starting_location": "rooftops", - "difficulty": "easy" - } - - -class TestRooftopsNormal(BlasphemousTestBase): - options = { - "starting_location": "rooftops", - "difficulty": "normal" - } - - class TestRooftopsHard(BlasphemousTestBase): options = { "starting_location": "rooftops", @@ -127,7 +100,6 @@ class TestRooftopsHard(BlasphemousTestBase): } -# mourning and havoc can't be selected on easy or normal. hard only class TestMourningHavocHard(BlasphemousTestBase): options = { "starting_location": "mourning_havoc",