alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Minor

Browse Source
This commit is contained in:
StructuralMike
2021-03-08 21:49:48 +01:00
parent 0ec7719c86
commit ccb8ff75df
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DoorShuffle.py
View File

@@ -2466,7 +2466,7 @@ interior_doors = [
('Skull Star Pits ES', 'Skull Torch Room WS'), ('Skull Star Pits ES', 'Skull Torch Room WS'),
('Skull Torch Room WN', 'Skull Vines EN'), ('Skull Torch Room WN', 'Skull Vines EN'),
('Skull Spike Corner ES', 'Skull Final Drop WS'), ('Skull Spike Corner ES', 'Skull Final Drop WS'),
('Thieves Hallway WS', 'Thieves Pot Alcove Mid ES'), ('Thieves Hallway WS', 'Thieves Pot Alcove Mid ES'w),
('Thieves Conveyor Maze SW', 'Thieves Pot Alcove Top NW'), ('Thieves Conveyor Maze SW', 'Thieves Pot Alcove Top NW'),
('Thieves Conveyor Maze EN', 'Thieves Hallway WN'), ('Thieves Conveyor Maze EN', 'Thieves Hallway WN'),
('Thieves Spike Track NE', 'Thieves Triple Bypass SE'), ('Thieves Spike Track NE', 'Thieves Triple Bypass SE'),

5
Doors.py
View File

@@ -1258,7 +1258,6 @@ def create_doors(world, player):
world.get_door('PoD Bow Statue Left to Right Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('PoD Bow Statue Left to Right Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('PoD Bow Statue Right to Left Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('PoD Bow Statue Right to Left Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('PoD Bow Statue Ranged Crystal Exit', player).c_switch() world.get_door('PoD Bow Statue Ranged Crystal Exit', player).c_switch()
world.get_door('PoD Dark Pegs Right to Middle Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('PoD Dark Pegs Right to Middle Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('PoD Dark Pegs Middle to Right Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('PoD Dark Pegs Middle to Right Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('PoD Dark Pegs Middle to Left Barrier - Blue', player).barrier(CrystalBarrier.Blue) world.get_door('PoD Dark Pegs Middle to Left Barrier - Blue', player).barrier(CrystalBarrier.Blue)
@@ -1358,7 +1357,6 @@ def create_doors(world, player):
world.get_door('GT Crystal Conveyor Ranged Crystal Exit', player).c_switch() world.get_door('GT Crystal Conveyor Ranged Crystal Exit', player).c_switch()
world.get_door('GT Crystal Conveyor Corner Ranged Crystal Exit', player).c_switch() world.get_door('GT Crystal Conveyor Corner Ranged Crystal Exit', player).c_switch()
world.get_door('GT Crystal Conveyor Left Ranged Crystal Exit', player).c_switch() world.get_door('GT Crystal Conveyor Left Ranged Crystal Exit', player).c_switch()
world.get_door('GT Hookshot South-North Path', player).c_switch() world.get_door('GT Hookshot South-North Path', player).c_switch()
world.get_door('GT Hookshot South-East Path', player).c_switch() world.get_door('GT Hookshot South-East Path', player).c_switch()
world.get_door('GT Hookshot ES', player).c_switch() world.get_door('GT Hookshot ES', player).c_switch()
@@ -1366,15 +1364,14 @@ def create_doors(world, player):
world.get_door('GT HookShot South Entry Ranged Crystal Exit', player).c_switch() world.get_door('GT HookShot South Entry Ranged Crystal Exit', player).c_switch()
world.get_door('GT Spike Crystals WN', player).c_switch() world.get_door('GT Spike Crystals WN', player).c_switch()
world.get_door('GT Spike Crystals Warp', player).c_switch() world.get_door('GT Spike Crystals Warp', player).c_switch()
world.get_door('GT Crystal Paths Down Stairs', player).c_switch() world.get_door('GT Crystal Paths Down Stairs', player).c_switch()
world.get_door('GT Crystal Paths SW', player).c_switch() world.get_door('GT Crystal Paths SW', player).c_switch()
world.get_door('GT Hidden Spikes SE', player).c_switch() world.get_door('GT Hidden Spikes SE', player).c_switch()
world.get_door('GT Hidden Spikes EN', player).c_switch() world.get_door('GT Hidden Spikes EN', player).c_switch()
world.get_door('GT Crystal Circles Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('GT Crystal Circles Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('GT Crystal Inner Circle Barrier - Orange', player).c_switch() world.get_door('GT Crystal Inner Circle Barrier - Orange', player).c_switch()
world.get_door('GT Crystal Circles Ranged Crystal Exit', player).c_switch() world.get_door('GT Crystal Circles Ranged Crystal Exit', player).c_switch()
world.get_door('GT Hookshot Entry Blue Barrier', player).barrier(CrystalBarrier.Blue) world.get_door('GT Hookshot Entry Blue Barrier', player).barrier(CrystalBarrier.Blue)
world.get_door('GT Double Switch to Pot Corners Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('GT Double Switch to Pot Corners Barrier - Orange', player).barrier(CrystalBarrier.Orange)
world.get_door('GT Double Switch Pot Corners to Barrier - Orange', player).barrier(CrystalBarrier.Orange) world.get_door('GT Double Switch Pot Corners to Barrier - Orange', player).barrier(CrystalBarrier.Orange)

28
TestSuite.py
View File

@@ -25,10 +25,10 @@ def main(args=None):
def test(testname: str, command: str): def test(testname: str, command: str):
tests[testname] = [command] tests[testname] = [command]
testmodes = [['Open', ''], # testmodes = [['Open', ''],
['Std ', ' --mode standard'], # ['Std ', ' --mode standard'],
['Inv ', ' --mode inverted']] # ['Inv ', ' --mode inverted']]
# testmodes = [['Open', '']] testmodes = [['Open', '']]
for mode in testmodes: for mode in testmodes:
basecommand = f"py -3.8 DungeonRandomizer.py --door_shuffle {args.dr} --intensity {args.tense} --suppress_rom --suppress_spoiler" basecommand = f"py -3.8 DungeonRandomizer.py --door_shuffle {args.dr} --intensity {args.tense} --suppress_rom --suppress_spoiler"
@@ -46,13 +46,13 @@ def main(args=None):
task_mapping.append(task) task_mapping.append(task)
test("Vanilla ", "--shuffle vanilla") test("Vanilla ", "--shuffle vanilla")
test("Retro ", "--retro --shuffle vanilla") # test("Retro ", "--retro --shuffle vanilla")
test("Futuro ", "--futuro --shuffle vanilla") # test("Futuro ", "--futuro --shuffle vanilla")
test("Keysanity ", "--shuffle vanilla --keydropshuffle --keysanity") # test("Keysanity ", "--shuffle vanilla --keydropshuffle --keysanity")
test("Simple ", "--shuffle simple") # test("Simple ", "--shuffle simple")
test("Full ", "--shuffle full") # test("Full ", "--shuffle full")
test("Crossed ", "--shuffle crossed") # test("Crossed ", "--shuffle crossed")
test("Insanity ", "--shuffle insanity") # test("Insanity ", "--shuffle insanity")
from tqdm import tqdm from tqdm import tqdm
with tqdm(concurrent.futures.as_completed(task_mapping), with tqdm(concurrent.futures.as_completed(task_mapping),
@@ -74,8 +74,8 @@ def main(args=None):
def get_results(testname: str): def get_results(testname: str):
result = "" result = ""
for mode in ['Open', 'Std ', 'Inv ']: # for mode in ['Open', 'Std ', 'Inv ']:
# for mode in ['Open']: for mode in ['Open']:
dead_or_alive = [task.success for task in task_mapping if task.name == testname and task.mode == mode] dead_or_alive = [task.success for task in task_mapping if task.name == testname and task.mode == mode]
alive = [x for x in dead_or_alive if x] alive = [x for x in dead_or_alive if x]
success = f"{testname}{mode} Rate: {(len(alive) / len(dead_or_alive)) * 100:.2f}%" success = f"{testname}{mode} Rate: {(len(alive) / len(dead_or_alive)) * 100:.2f}%"
@@ -114,7 +114,7 @@ if __name__ == "__main__":
# for dr in [['vanilla', args.count if args.count else 2, 1], # for dr in [['vanilla', args.count if args.count else 2, 1],
# ['basic', args.count if args.count else 5, 3], # ['basic', args.count if args.count else 5, 3],
# ['crossed', args.count if args.count else 10, 3]]: # ['crossed', args.count if args.count else 10, 3]]:
for dr in [['basic', args.count if args.count else 10, 3]]: for dr in [['crossed', args.count if args.count else 10, 3]]:
for tense in range(1, dr[2] + 1): for tense in range(1, dr[2] + 1):
args = argparse.Namespace() args = argparse.Namespace()