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

Merged in DR v1.2.0.14 (2nd)

Browse Source
This commit is contained in:
codemann8
2023-04-07 12:04:12 -05:00
parent c2b3d8ce6c
commit 793f3b30b0
28 changed files with 633 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/inverted/TestInverted.py
View File

@@ -3,10 +3,10 @@ from DoorShuffle import link_doors
from Doors import create_doors
from Dungeons import create_dungeons, get_dungeon_item_pool
from OverworldShuffle import link_overworld
from EntranceShuffle import link_inverted_entrances
from EntranceShuffle import link_entrances
from ItemList import generate_itempool, difficulties
from Items import ItemFactory
from Regions import create_regions, mark_light_world_regions, create_dungeon_regions, create_shops
from Regions import create_regions, mark_light_dark_world_regions, create_dungeon_regions, create_shops
from RoomData import create_rooms
from Rules import set_rules
from test.TestBase import TestBase
@@ -25,7 +25,7 @@ class TestInverted(TestBase):
create_rooms(self.world, 1)
create_dungeons(self.world, 1)
link_overworld(self.world, 1)
link_inverted_entrances(self.world, 1)
link_entrances(self.world, 1)
link_doors(self.world, 1)
generate_itempool(self.world, 1)
self.world.required_medallions[1] = ['Ether', 'Quake']
@@ -33,5 +33,5 @@ class TestInverted(TestBase):
self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
self.world.get_location('Agahnim 1', 1).item = None
self.world.get_location('Agahnim 2', 1).item = None
mark_light_world_regions(self.world, 1)
mark_light_dark_world_regions(self.world, 1)
set_rules(self.world, 1)

5
test/inverted/TestInvertedBombRules.py
View File

@@ -4,6 +4,7 @@ from BaseClasses import World
from Dungeons import create_dungeons
from EntranceShuffle import connect_entrance, Inverted_LW_Entrances, Inverted_LW_Dungeon_Entrances, Inverted_LW_Single_Cave_Doors, Inverted_Old_Man_Entrances, Inverted_DW_Entrances, Inverted_DW_Dungeon_Entrances, Inverted_DW_Single_Cave_Doors, \
Inverted_LW_Entrances_Must_Exit, Inverted_LW_Dungeon_Entrances_Must_Exit, Inverted_Bomb_Shop_Multi_Cave_Doors, Inverted_Bomb_Shop_Single_Cave_Doors, Inverted_Blacksmith_Single_Cave_Doors, Inverted_Blacksmith_Multi_Cave_Doors
from Regions import create_regions
from ItemList import difficulties
from Rules import set_inverted_big_bomb_rules
from test.inverted.TestInverted import TestInverted
@@ -20,7 +21,7 @@ class TestInvertedBombRules(TestInverted):
entrance = self.world.get_entrance(entrance_name, 1)
entrance.connected_region = None
self.world.get_region('Big Bomb Shop', 1).entrances = []
connect_entrance(self.world, entrance, 'Links House', 1)
connect_entrance(self.world, entrance, 'Big Bomb Shop', 1)
set_inverted_big_bomb_rules(self.world, 1)
entrance.connected_region.entrances.remove(entrance)
entrance.connected_region = None
@@ -35,7 +36,7 @@ class TestInvertedBombRules(TestInverted):
for entrance_name in ['Desert Palace Entrance (East)', 'Spectacle Rock Cave', 'Spectacle Rock Cave (Bottom)']:
entrance = self.world.get_entrance(entrance_name, 1)
self.world.get_region('Big Bomb Shop', 1).entrances = []
connect_entrance(self.world, entrance, 'Links House', 1)
connect_entrance(self.world, entrance, 'Big Bomb Shop', 1)
with self.assertRaises(Exception):
set_inverted_big_bomb_rules(self.world, 1)
entrance.connected_region.entrances.remove(entrance)

42
test/inverted/TestInvertedEntrances.py
View File

@@ -49,16 +49,15 @@ class TestEntrances(TestInverted):
["Tower of Hera", True, ["Moon Pearl", "Hammer", "Hookshot", "Progressive Glove", "Ocarina"]],
["Tower of Hera", True, ["Moon Pearl", "Hammer", "Beat Agahnim 1", "Ocarina", "Hookshot"]],
# Agahnim's Tower (Inverted)
["Ganons Tower", False, []],
["Ganons Tower", False, [], ["Ocarina", "Lamp"]],
["Ganons Tower", False, [], ["Ocarina", "Progressive Glove"]],
["Ganons Tower", False, [], ["Moon Pearl", "Lamp"]],
["Ganons Tower", False, [], ["Moon Pearl", "Progressive Glove"]],
["Ganons Tower", True, ["Lamp", "Progressive Glove"]],
["Ganons Tower", True, ["Ocarina", "Beat Agahnim 1", "Moon Pearl"]],
["Ganons Tower", True, ["Ocarina", "Progressive Glove", "Progressive Glove", "Moon Pearl"]],
["Ganons Tower", True, ["Ocarina", "Progressive Glove", "Hammer", "Moon Pearl"]],
["Agahnims Tower", False, []],
["Agahnims Tower", False, [], ["Ocarina", "Lamp"]],
["Agahnims Tower", False, [], ["Ocarina", "Progressive Glove"]],
["Agahnims Tower", False, [], ["Moon Pearl", "Lamp"]],
["Agahnims Tower", False, [], ["Moon Pearl", "Progressive Glove"]],
["Agahnims Tower", True, ["Lamp", "Progressive Glove"]],
["Agahnims Tower", True, ["Ocarina", "Beat Agahnim 1", "Moon Pearl"]],
["Agahnims Tower", True, ["Ocarina", "Progressive Glove", "Progressive Glove", "Moon Pearl"]],
["Agahnims Tower", True, ["Ocarina", "Progressive Glove", "Hammer", "Moon Pearl"]],
["Palace of Darkness", False, []],
["Palace of Darkness", False, [], ["Hammer", "Flippers", "Magic Mirror", "Ocarina"]],
@@ -105,16 +104,15 @@ class TestEntrances(TestInverted):
["Turtle Rock", True, ["Quake", "Progressive Sword", "Progressive Glove", "Hammer", "Moon Pearl", "Ocarina"]],
["Turtle Rock", True, ["Quake", "Progressive Sword", "Beat Agahnim 1", "Moon Pearl", "Ocarina"]],
# Ganon's Tower (Inverted)
["Agahnims Tower", False, []],
["Agahnims Tower", False, [], ["Crystal 1"]],
["Agahnims Tower", False, [], ["Crystal 2"]],
["Agahnims Tower", False, [], ["Crystal 3"]],
["Agahnims Tower", False, [], ["Crystal 4"]],
["Agahnims Tower", False, [], ["Crystal 5"]],
["Agahnims Tower", False, [], ["Crystal 6"]],
["Agahnims Tower", False, [], ["Crystal 7"]],
["Agahnims Tower", True, ["Beat Agahnim 1", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Agahnims Tower", True, ["Moon Pearl", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Agahnims Tower", True, ["Moon Pearl", "Hammer", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", False, []],
["Ganons Tower", False, [], ["Crystal 1"]],
["Ganons Tower", False, [], ["Crystal 2"]],
["Ganons Tower", False, [], ["Crystal 3"]],
["Ganons Tower", False, [], ["Crystal 4"]],
["Ganons Tower", False, [], ["Crystal 5"]],
["Ganons Tower", False, [], ["Crystal 6"]],
["Ganons Tower", False, [], ["Crystal 7"]],
["Ganons Tower", True, ["Beat Agahnim 1", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", True, ["Moon Pearl", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
["Ganons Tower", True, ["Moon Pearl", "Hammer", "Progressive Glove", "Progressive Glove", "Crystal 1", "Crystal 2", "Crystal 3", "Crystal 4", "Crystal 5", "Crystal 6", "Crystal 7"]],
])