mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Lingo: Add panels mode door shuffle (#3163)
* Created panels mode door shuffle * Added some panel door item names * Remove RUNT TURN panel door Not really useful. * Fix logic with First SIX related stuff * Add group_doors to slot data * Fix LEVEL 2 behavior with panels mode * Fixed unit tests * Fixed duplicate IDs from merge * Just regenerated new IDs * Fixed duplication of color and door group items * Removed unnecessary unit test option * Fix The Seeker being achievable without entrance door * Fix The Observant being achievable without locked panels * Added some more panel doors * Added Progressive Suits Area * Lingo: Fix Basement access with THE MASTER * Added indirect conditions for MASTER-blocked entrances * Fixed Incomparable achievement access * Fix STAIRS panel logic * Fix merge error with good items * Is this clearer? * DREAD and TURN LEARN * Allow a weird edge case for reduced locations Panels mode door shuffle + grouped doors + color shuffle + pilgrimage enabled is exactly the right number of items for reduced locations. Removing color shuffle also allows for disabling pilgrimage, adding sunwarp locking, or both, with a couple of locations left over. * Prevent small sphere one on panels mode * Added shuffle_doors aliases for old options * Fixed a unit test * Updated datafile * Tweaked requirements for reduced locations * Added player name to OptionError messages * Update generated.dat
This commit is contained in:
committed by
GitHub
parent
d030a698a6
commit
cc22161644
@@ -3,7 +3,7 @@ from . import LingoTestBase
|
||||
|
||||
class TestRequiredRoomLogic(LingoTestBase):
|
||||
options = {
|
||||
"shuffle_doors": "complex",
|
||||
"shuffle_doors": "doors",
|
||||
"shuffle_colors": "false",
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ class TestRequiredRoomLogic(LingoTestBase):
|
||||
|
||||
class TestRequiredDoorLogic(LingoTestBase):
|
||||
options = {
|
||||
"shuffle_doors": "complex",
|
||||
"shuffle_doors": "doors",
|
||||
"shuffle_colors": "false",
|
||||
}
|
||||
|
||||
@@ -78,7 +78,8 @@ class TestRequiredDoorLogic(LingoTestBase):
|
||||
|
||||
class TestSimpleDoors(LingoTestBase):
|
||||
options = {
|
||||
"shuffle_doors": "simple",
|
||||
"shuffle_doors": "doors",
|
||||
"group_doors": "true",
|
||||
"shuffle_colors": "false",
|
||||
}
|
||||
|
||||
@@ -90,3 +91,52 @@ class TestSimpleDoors(LingoTestBase):
|
||||
self.assertTrue(self.multiworld.state.can_reach("Outside The Wanderer", "Region", self.player))
|
||||
self.assertTrue(self.multiworld.state.can_reach("Orange Tower Third Floor", "Region", self.player))
|
||||
|
||||
|
||||
class TestPanels(LingoTestBase):
|
||||
options = {
|
||||
"shuffle_doors": "panels"
|
||||
}
|
||||
|
||||
def test_requirement(self):
|
||||
self.assertFalse(self.can_reach_location("Starting Room - HIDDEN"))
|
||||
self.assertFalse(self.can_reach_location("Hidden Room - OPEN"))
|
||||
self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
|
||||
|
||||
self.collect_by_name("Starting Room - HIDDEN (Panel)")
|
||||
self.assertTrue(self.can_reach_location("Starting Room - HIDDEN"))
|
||||
self.assertFalse(self.can_reach_location("Hidden Room - OPEN"))
|
||||
self.assertFalse(self.can_reach_location("The Seeker - Achievement"))
|
||||
|
||||
self.collect_by_name("Hidden Room - OPEN (Panel)")
|
||||
self.assertTrue(self.can_reach_location("Starting Room - HIDDEN"))
|
||||
self.assertTrue(self.can_reach_location("Hidden Room - OPEN"))
|
||||
self.assertTrue(self.can_reach_location("The Seeker - Achievement"))
|
||||
|
||||
|
||||
class TestGroupedPanels(LingoTestBase):
|
||||
options = {
|
||||
"shuffle_doors": "panels",
|
||||
"group_doors": "true",
|
||||
"shuffle_colors": "false",
|
||||
}
|
||||
|
||||
def test_requirement(self):
|
||||
self.assertFalse(self.can_reach_location("Hub Room - SLAUGHTER"))
|
||||
self.assertFalse(self.can_reach_location("Dread Hallway - DREAD"))
|
||||
self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
|
||||
|
||||
self.collect_by_name("Tenacious Entrance Panels")
|
||||
self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
|
||||
self.assertFalse(self.can_reach_location("Dread Hallway - DREAD"))
|
||||
self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
|
||||
|
||||
self.collect_by_name("Outside The Agreeable - BLACK (Panel)")
|
||||
self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
|
||||
self.assertTrue(self.can_reach_location("Dread Hallway - DREAD"))
|
||||
self.assertFalse(self.can_reach_location("The Tenacious - Achievement"))
|
||||
|
||||
self.collect_by_name("The Tenacious - Black Palindromes (Panels)")
|
||||
self.assertTrue(self.can_reach_location("Hub Room - SLAUGHTER"))
|
||||
self.assertTrue(self.can_reach_location("Dread Hallway - DREAD"))
|
||||
self.assertTrue(self.can_reach_location("The Tenacious - Achievement"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user