Standardise Requirements

worlds/metroidfusion/data/logic/topologies/MainDeck.py

@@ -24,7 +24,7 @@
         Requirement(["Morph Ball"], [HasKeycard4, CanPowerBomb], level_2_e_tanks)
     ]),
     Connection(NexusStorage, [
-        Level2KeycardRequirement([], [CanDefeatLargeGeron])
+        Requirement(["Level 2 Keycard"], [CanDefeatLargeGeron])
     ])
 ]
 
@@ -53,7 +53,7 @@
     Connection(LowerArachnusArena, [
         PONRRequirement([], [HasMissile]),
         CanBeatToughEnemyRequirement(["Morph Ball"], [CanDefeatSmallGeron]),
-        CanMorphRequirement(["Screw Attack"], [CanJumpHigh, CanDoSimpleWallJump])
+        Requirement(["Screw Attack", "Morph Ball"], [CanJumpHigh, CanDoSimpleWallJump])
     ], one_way=True)
 ]
 
@@ -132,7 +132,7 @@
     FusionLocation("Main Deck -- Quarantine Bay", False, []),
     FusionLocation("Main Deck -- Station Entrance", False, [CanPowerBomb]),
     FusionLocation("Main Deck -- Sub-Zero Containment", False, [
-        Level3KeycardRequirement([], [HasVaria])
+        Requirement(["Level 3 Keycard"], [HasVaria])
     ])
 ]
 

worlds/metroidfusion/data/logic/topologies/Sector1.py

@@ -13,21 +13,21 @@
 Sector1Hub.connections = [
     VariableConnection(SectorHubElevator1Top, []),
     Connection(Sector1Antechamber, [
-        Level2KeycardRequirement(["Screw Attack"], [HasSpaceJump, CanDoAdvancedWallJumpWithHiJump])
+        Requirement(["Screw Attack", "Level 2 Keycard"], [HasSpaceJump, CanDoAdvancedWallJumpWithHiJump])
     ]),
     Connection(Sector1TubeLeft, [
-        Level1KeycardRequirement(["Morph Ball", "Screw Attack"], [])
+        Requirement(["Morph Ball", "Screw Attack", "Level 1 Keycard"], [])
     ]),
     Connection(Sector1FirstStabilizerZone, [
         CanDefeatSmallGeron,
-        Level1And2KeycardRequirement([], [CanLavaDive]),
+        Requirement(["Level 1 Keycard", "Level 2 Keycard"], [CanLavaDive]),
         CanDoAdvancedShinespark
     ]),
 ]
 
 Sector1Antechamber.connections = [
     Connection(Sector1Hub, [
-        Level2KeycardRequirement([], [HasScrewAttack])
+        Requirement(["Level 2 Keycard"], [HasScrewAttack])
     ], one_way=True),
     Connection(Sector1TubeRight, [HasMorph], one_way=True)
 ]

worlds/metroidfusion/data/logic/topologies/Sector2.py

@@ -77,7 +77,7 @@
         Requirement(["Level 1 Keycard"], []),
     ]),
     FusionLocation("Sector 2 (TRO) -- Lobby Cache", False, [
-        Level1KeycardRequirement([], [CanBombOrPowerBomb])
+        Requirement(["Level 1 Keycard"], [CanBombOrPowerBomb])
     ]),
 ]
 

worlds/metroidfusion/data/logic/topologies/Sector3.py

@@ -70,7 +70,7 @@
         Requirement(["Morph Ball", "Speed Booster"], [CanDestroyBombBlocks]),
         CanDefeatMediumGeronRequirement(["Morph Ball", "Level 2 Keycard"], [CanDestroyBombBlocks])
     ], one_way=True),
-    Connection(Sector3BoilerZone, [Level2KeycardRequirement([], [HasVaria])]),
+    Connection(Sector3BoilerZone, [Requirement(["Level 2 Keycard"], [HasVaria])]),
     Connection(Sector3BobZone, [
         Requirement(["Morph Ball", "Hi-Jump"], [HasScrewAttack])
     ], one_way=True),
@@ -187,7 +187,7 @@
         PONRRequirement(["Morph Ball", "Power Bomb"], [CanDoAdvancedShinespark])
     ]),
     FusionLocation("Sector 3 (PYR) -- Processing Access", False, [
-        Level2KeycardRequirement([], [])
+        Requirement(["Level 2 Keycard"], [])
     ]),
 ]
 

worlds/metroidfusion/data/logic/topologies/Sector4.py

@@ -65,7 +65,7 @@
 
 Sector4BeforePumpControlZone.connections = [
     Connection(Sector4PumpControl, [
-        Level1KeycardRequirement([], [HasSpeedBooster])
+        Requirement(["Level 1 Keycard"], [HasSpeedBooster])
     ], one_way=True),
     Connection(Sector4UpperWaterZone, [
         CanDrainAQARequirement(["Gravity Suit"], [HasKeycard4])
@@ -114,7 +114,7 @@
             CanFightMidgameBossRequirement(["Wave Beam", "Ice Beam"], [HasSpaceJump, CanDoSimpleWallJump]),
             CanFightMidgameBossRequirement(["Missile Data", "Diffusion Missile"], [HasSpaceJump, CanDoSimpleWallJump])
         ], level_4_e_tanks),
-        HasMorphRequirement(["Speed Booster"], [CanScrewAttackUnderwater], level_4_e_tanks)
+        Requirement(["Speed Booster", "Morph Ball"], [CanScrewAttackUnderwater], level_4_e_tanks)
     ], one_way=True)
 ]
 
@@ -146,7 +146,7 @@
     Connection(Sector4LowerSecurityZone, [
         PONRRequirement([], [HasKeycard4]),
         PONRRequirement(["Missile Data", "Morph Ball"], [
-            HasGravityRequirement([], [CanBomb, HasScrewAttack]),
+            Requirement(["Gravity Suit"], [CanBomb, HasScrewAttack]),
             HasHiJumpRequirement([], [CanBomb]),
             CanPowerBomb
         ])
@@ -172,28 +172,28 @@
         ])
     ], one_way=True),
     Connection(Sector4SecurityZone, [
-        Level4KeyCardRequirement(["Gravity Suit"], [HasSpaceJump, CanDoSimpleWallJump]),
+        Requirement(["Gravity Suit", "Level 4 Keycard"], [HasSpaceJump, CanDoSimpleWallJump]),
         CanPowerBombRequirement(["Gravity Suit", "Missile Data"], [HasSpaceJump, CanDoSimpleWallJump]),
         CanScrewAttackUnderwaterRequirement(["Missile Data", "Morph Ball"], [HasSpaceJump, CanDoSimpleWallJump])
     ])
 ]
 
 Sector4SecurityRoom.connections = [
     Connection(Sector4LowerSecurityZone, [
-        Level4KeycardRequirement(["Gravity Suit"], [HasSpaceJump, CanDoSimpleWallJump])
+        Requirement(["Gravity Suit", "Level 4 Keycard"], [HasSpaceJump, CanDoSimpleWallJump])
     ])
 ]
 
 Sector4RightWaterZone.connections = [
     Connection(Sector4RightDataZone, [
         PONRRequirement(["Gravity Suit", "Morph Ball", "Missile Data"], [CanFreezeEnemies, HasSpaceJump]),
-        CanDiffusionMissileRequirement(["Morph Ball"], [HasGravity])
+        Requirement(["Morph Ball", "Missile Data", "Diffusion Missile"], [HasGravity])
     ], one_way=True),
     Connection(Sector4TubeLeft, [
         PONRRequirement(["Screw Attack"], [HasGravity])
     ], one_way=True),
     Connection(Sector4RightWaterZoneSave, [
-        HasGravityRequirement([], [HasScrewAttack]),
+        Requirement(["Gravity Suit"], [HasScrewAttack]),
         PONRRequirement(["Gravity Suit"], [CanDoBeginnerShinespark])
     ], one_way=True)
 ]
@@ -205,21 +205,21 @@
     Connection(Sector4RightWaterZone, [
         PONRRequirement(["Morph Ball", "Hi-Jump", "Gravity Suit", "Speed Booster"], [CanFreezeEnemies]),
         PONRRequirement(["Morph Ball", "Bomb Data", "Gravity Suit", "Speed Booster"], [CanFreezeEnemies]),
-        HasGravityRequirement([], [HasScrewAttack])
+        Requirement(["Gravity Suit"], [HasScrewAttack])
     ], one_way=True)
 ]
 
 Sector4DataZone.connections = [
     Connection(Sector4RightDataZone, [
-        Level4KeycardRequirement([], [CanBombOrPowerBomb])
+        Requirement(["Level 4 Keycard"], [CanBombOrPowerBomb])
     ])
 ]
 
 Sector4RightDataZone.connections = [
     Connection(Sector4TubeRight, [CanBallJumpRequirement([], [CanDiffusionMissile])]),
     Connection(Sector4RightWaterZone, [
         PONRRequirement(["Morph Ball"], [CanDiffusionMissile]),
-        HasGravityRequirement(["Morph Ball"], [CanDiffusionMissile])
+        Requirement(["Morph Ball", "Gravity Suit"], [CanDiffusionMissile])
     ], one_way=True)
 ]
 
@@ -279,9 +279,9 @@
 
 Sector4SecurityZone.locations = [
     FusionLocation("Sector 4 (AQA) -- Cheddar Bay", False, [
-        HasMissileRequirement(["Gravity Suit", "Morph Ball"], [CanBomb, HasScrewAttack]),
-        HasMissileRequirement([], [CanPowerBomb]),
-        HasGravityRequirement(["Level 4 Keycard", "Morph Ball"], [HasScrewAttack, CanPowerBomb])
+        Requirement(["Gravity Suit", "Morph Ball", "Missile Data"], [CanBomb, HasScrewAttack]),
+        Requirement(["Missile Data"], [CanPowerBomb]),
+        Requirement(["Level 4 Keycard", "Morph Ball", "Gravity Suit"], [HasScrewAttack, CanPowerBomb])
     ]),
     FusionLocation("Sector 4 (AQA) -- Aquarium Pirate Tank", False, [
         PONRRequirement([], [CanPowerBomb]),

worlds/metroidfusion/data/logic/topologies/Sector5.py

@@ -41,16 +41,16 @@
 Sector5FrozenHub.connections = [
     Connection(Sector5DataRoom, [
         PONRRequirement(["Level 3 Keycard"], [HasVaria]),
-        HasKeycard3Requirement([], [HasVaria])
+        Requirement(["Level 3 Keycard"], [HasVaria])
     ], one_way=True),
     Connection(Sector5BeforeNightmareHub, [
-        Level3KeycardRequirement([], [HasVaria])
+        Requirement(["Level 3 Keycard"], [HasVaria])
     ]),
     Connection(Sector5SecurityZone, [
         PONRRequirement(["Speed Booster", "Varia Suit"], [CanBombOrPowerBomb], level_3_e_tanks),
         HasSpaceJumpRequirement(["Speed Booster", "Varia Suit"], [CanBombOrPowerBomb], level_3_e_tanks),
-        #Level3KeycardRequirement(["Varia Suit"], [CanDoExpertShinespark]),
-        Level3KeycardRequirement(["Varia Suit"], [HasWaveBeam])
+        #Requirement(["Varia Suit", "Level 3 Keycard"], [CanDoExpertShinespark]),
+        Requirement(["Varia Suit", "Level 3 Keycard"], [HasWaveBeam])
     ], one_way=True),
     Connection(Sector5TopLeftBigRoom, [
         Requirement(["Varia Suit"], [CanJumpHigh, CanDoAdvancedWallJump])
@@ -64,9 +64,9 @@
         #ReverseIceLOLRequirement
     ]),
     Connection(Sector5FrozenHub, [
-        HasVariaRequirement(["Level 3 Keycard"], []),
-        HasVariaRequirement(["Space Jump"], [CanBombOrPowerBomb]),
-        HasVariaRequirement(["Space Jump", "Speed Booster", "Morph Ball", "Level 3 Keycard"], [CanFreezeEnemies])
+        Requirement(["Level 3 Keycard", "Varia Suit"], []),
+        Requirement(["Space Jump", "Varia Suit"], [CanBombOrPowerBomb]),
+        Requirement(["Space Jump", "Speed Booster", "Morph Ball", "Level 3 Keycard", "Varia Suit"], [CanFreezeEnemies])
     ], one_way=True)
 ]
 
@@ -189,7 +189,7 @@
         ])
     ]),
     FusionLocation("Sector 5 (ARC) -- Security Shaft East", False, [
-        HasVariaRequirement([], [CanPowerBomb])
+        Requirement(["Varia Suit"], [CanPowerBomb])
     ]),
     FusionLocation("Sector 5 (ARC) -- Transmutation Trial", False, [
         CanBallJumpRequirement(["Level 3 Keycard", "Varia Suit"], [HasSpaceJump, CanFreezeEnemies])

worlds/metroidfusion/data/logic/topologies/Sector6.py

@@ -123,7 +123,7 @@
 Sector6AfterVariaCoreXZone.connections = [
     Connection(Sector6Crossroads, [
         PONRRequirement([], [HasMorph]),
-        HasVariaRequirement(["Morph Ball"], [HasScrewAttack]),
+        Requirement(["Morph Ball", "Varia Suit"], [HasScrewAttack]),
         CanFightBossRequirement(["Speed Booster", "Level 2 Keycard", "Varia Suit"], [CanBombOrPowerBomb])
     ], one_way=True),
     Connection(Sector6VariaCoreXZone, [
@@ -144,10 +144,10 @@
 
 Sector6Crossroads.locations = [
     FusionLocation("Sector 6 (NOC) -- Missile Mimic Lodge", False, [
-        HasVariaRequirement([], [CanBombOrPowerBomb])
+        Requirement(["Varia Suit"], [CanBombOrPowerBomb])
     ]),
     FusionLocation("Sector 6 (NOC) -- Pillar Highway", False, [
-        HasVariaRequirement(["Screw Attack", "Speed Booster"], [CanBomb, HasWaveBeam])
+        Requirement(["Screw Attack", "Speed Booster", "Varia Suit"], [CanBomb, HasWaveBeam])
     ]),
     FusionLocation("Sector 6 (NOC) -- Vault", False, [CanBallJumpAndBomb])
 ]
@@ -196,7 +196,7 @@
 
 Sector6AfterVariaCoreXZone.locations = [
     FusionLocation("Sector 6 (NOC) -- Twin Caverns West -- Lower Item", False, [
-        HasMorphRequirement([], [CanJumpHigh])
+        Requirement(["Morph Ball"], [CanJumpHigh])
     ]),
     FusionLocation("Sector 6 (NOC) -- Twin Caverns West -- Upper Item", False, [])
 ]