morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SM: Optimize a bit (#350)

Browse Source 
* SM: Optimize a bit

* SM: init bosses only once
This commit is contained in:
Fabian Dill
2022-03-28 01:50:58 +02:00
committed by GitHub
parent 2b138ac940
commit 3bb3a902b3
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
worlds/sm/__init__.py
View File

@@ -524,22 +524,22 @@ class SMWorld(World):
progitempool.sort( progitempool.sort(
key=lambda item: 1 if (item.name == 'Morph Ball') else 0) key=lambda item: 1 if (item.name == 'Morph Ball') else 0)
def post_fill(self): @classmethod
new_state = CollectionState(self.world) def stage_post_fill(cls, world):
new_state = CollectionState(world)
progitempool = [] progitempool = []
for item in self.world.itempool: for item in world.itempool:
if item.player == self.player and item.advancement: if item.game == "Super Metroid" and item.advancement:
progitempool.append(item) progitempool.append(item)
if item.location.player == self.player and item.game == "Super Metroid" and item.type == "Nothing":
item.location.address = None
for item in progitempool: for item in progitempool:
new_state.collect(item, True) new_state.collect(item, True)
bossesLoc = ['Draygon', 'Kraid', 'Ridley', 'Phantoon', 'Mother Brain'] bossesLoc = ['Draygon', 'Kraid', 'Ridley', 'Phantoon', 'Mother Brain']
for player in world.get_game_players("Super Metroid"):
for bossLoc in bossesLoc: for bossLoc in bossesLoc:
if (not self.world.get_location(bossLoc, self.player).can_reach(new_state)): if not world.get_location(bossLoc, player).can_reach(new_state):
self.world.state.smbm[self.player].onlyBossLeft = True world.state.smbm[player].onlyBossLeft = True
break break
@@ -576,5 +576,7 @@ class SMItem(Item):
game = "Super Metroid" game = "Super Metroid"
def __init__(self, name, advancement, type, code, player: int = None): def __init__(self, name, advancement, type, code, player: int = None):
if type == "Nothing":
code = None
super(SMItem, self).__init__(name, advancement, code, player) super(SMItem, self).__init__(name, advancement, code, player)
self.type = type self.type = type