monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused checks (as indicated by new type annotations)

This commit is contained in:
Fabian Dill 2020-03-03 00:17:36 +01:00
parent 260e156316
commit d49bb10534
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BaseClasses.py
View File

@ -116,9 +116,7 @@ class World(object):
def get_regions(self, player=None): def get_regions(self, player=None):
return self.regions if player is None else self._region_cache[player].values() return self.regions if player is None else self._region_cache[player].values()
def get_region(self, regionname, player: int) -> Region: def get_region(self, regionname: str, player: int) -> Region:
if isinstance(regionname, Region):
return regionname
try: try:
return self._region_cache[player][regionname] return self._region_cache[player][regionname]
except KeyError: except KeyError:
@ -128,9 +126,7 @@ class World(object):
return region return region
raise RuntimeError('No such region %s for player %d' % (regionname, player)) raise RuntimeError('No such region %s for player %d' % (regionname, player))
def get_entrance(self, entrance, player: int) -> Entrance: def get_entrance(self, entrance: str, player: int) -> Entrance:
if isinstance(entrance, Entrance):
return entrance
try: try:
return self._entrance_cache[(entrance, player)] return self._entrance_cache[(entrance, player)]
except KeyError: except KeyError:
@ -141,9 +137,7 @@ class World(object):
return exit return exit
raise RuntimeError('No such entrance %s for player %d' % (entrance, player)) raise RuntimeError('No such entrance %s for player %d' % (entrance, player))
def get_location(self, location, player: int) -> Location: def get_location(self, location: str, player: int) -> Location:
if isinstance(location, Location):
return location
try: try:
return self._location_cache[(location, player)] return self._location_cache[(location, player)]
except KeyError: except KeyError:
@ -154,10 +148,7 @@ class World(object):
return r_location return r_location
raise RuntimeError('No such location %s for player %d' % (location, player)) raise RuntimeError('No such location %s for player %d' % (location, player))
def get_dungeon(self, dungeonname, player: int) -> Dungeon: def get_dungeon(self, dungeonname: str, player: int) -> Dungeon:
if isinstance(dungeonname, Dungeon):
return dungeonname
for dungeon in self.dungeons: for dungeon in self.dungeons:
if dungeon.name == dungeonname and dungeon.player == player: if dungeon.name == dungeonname and dungeon.player == player:
return dungeon return dungeon

2
EntranceShuffle.py
View File

@ -1766,7 +1766,7 @@ def connect_simple(world, exitname, regionname, player):
world.get_entrance(exitname, player).connect(world.get_region(regionname, player)) world.get_entrance(exitname, player).connect(world.get_region(regionname, player))
def connect_entrance(world, entrancename, exitname, player): def connect_entrance(world, entrancename: str, exitname: str, player: int):
entrance = world.get_entrance(entrancename, player) entrance = world.get_entrance(entrancename, player)
# check if we got an entrance or a region to connect to # check if we got an entrance or a region to connect to
try: try: