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

Spike Cave v29 adjustment

Browse Source 
This makes spike cave correctly understand that potions in v29 will refill full magic independent of difficulty setting.
This commit is contained in:
AmazingAmpharos
2018-01-29 18:56:15 -06:00
committed by GitHub
parent ffe8df3304
commit b8778385ad
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaseClasses.py
View File

@@ -387,17 +387,17 @@ class CollectionState(object):
def can_lift_heavy_rocks(self):
return self.has('Titans Mitts')
def can_extend_magic(self, smallmagic=8): #This reflects the total magic Link has, not the total extra he has.
def can_extend_magic(self, smallmagic=8, fullrefill=False): #This reflects the total magic Link has, not the total extra he has.
basemagic = 8
if self.has('Quarter Magic'):
basemagic = 32
elif self.has('Half Magic'):
basemagic = 16
if self.world.difficulty == 'hard':
if self.world.difficulty == 'hard' and fullrefill == False:
basemagic = basemagic + int(basemagic * 0.5 * self.bottle_count())
elif self.world.difficulty == 'expert':
elif self.world.difficulty == 'expert' and fullrefill == False:
basemagic = basemagic + int(basemagic * 0.25 * self.bottle_count())
elif self.world.difficulty == 'insane':
elif self.world.difficulty == 'insane' and fullrefill == False:
basemagic = basemagic
else:
basemagic = basemagic + basemagic * self.bottle_count()