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

minor cleanup

Browse Source
This commit is contained in:
StructuralMike
2021-03-19 17:29:45 +01:00
parent ad8dbcd01c
commit d9d664f7ba
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -687,7 +687,7 @@ class CollectionState(object):
# In the future, this can be used to check if the player starts without bombs # In the future, this can be used to check if the player starts without bombs
def can_use_bombs(self, player): def can_use_bombs(self, player):
StartingBombs = True StartingBombs = True
return (StartingBombs or self.has('Bomb Upgrade (+10)', player)) return StartingBombs or self.has('Bomb Upgrade (+10)', player)
def can_hit_crystal(self, player): def can_hit_crystal(self, player):
return (self.can_use_bombs(player) return (self.can_use_bombs(player)

10
Rom.py
View File

@@ -948,16 +948,6 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
difficulty = world.difficulty_requirements[player] difficulty = world.difficulty_requirements[player]
#Shift magic consumption costs if not starting with magic
StartingMagic = True
if not StartingMagic:
for item in magic_cost:
magic_cost[item][1][2] = magic_cost[item][1][1]
magic_cost[item][1][1] = magic_cost[item][1][0]
magic_cost[item][1][0] = 0x81
# Cape consumpion is a cost/X tick thing
magic_cost['Magic Cape Residual'][1][0] = 0x01
#Write magic consumption rates to rom #Write magic consumption rates to rom
for _,values in magic_cost.items(): for _,values in magic_cost.items():
rom.write_bytes(values[0], values[1]) rom.write_bytes(values[0], values[1])