morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename has_blunt_weapon to has_melee_weapon

Browse Source
This commit is contained in:
Fabian Dill
2020-04-20 19:17:10 +02:00
parent 860faf6ef5
commit 1a53b0e69b
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseClasses.py
View File

@@ -523,7 +523,7 @@ class CollectionState(object):
return basemagic >= smallmagic
def can_kill_most_things(self, player: int, enemies=5) -> bool:
return (self.has_blunt_weapon(player)
return (self.has_melee_weapon(player)
or self.has('Cane of Somaria', player)
or (self.has('Cane of Byrna', player) and (enemies < 6 or self.can_extend_magic(player)))
or self.can_shoot_arrows(player)
@@ -554,7 +554,7 @@ class CollectionState(object):
def has_beam_sword(self, player: int) -> bool:
return self.has('Master Sword', player) or self.has('Tempered Sword', player) or self.has('Golden Sword', player)
def has_blunt_weapon(self, player: int) -> bool:
def has_melee_weapon(self, player: int) -> bool:
return self.has_sword(player) or self.has('Hammer', player)
def has_Mirror(self, player: int) -> bool: