Shin bones now restore health like they are supposed to do. Healing now happens even if invincible. Thanks Ember for the bug report.
This commit is contained in:
@@ -189,10 +189,12 @@ class Player:
|
|||||||
|
|
||||||
def set_health(self, value):
|
def set_health(self, value):
|
||||||
"""Set health and handle death if needed."""
|
"""Set health and handle death if needed."""
|
||||||
if self.isInvincible:
|
|
||||||
return # No damage while invincible
|
|
||||||
|
|
||||||
old_health = self._health
|
old_health = self._health
|
||||||
|
|
||||||
|
# Oops, allow healing while invincible.
|
||||||
|
if self.isInvincible and value < old_health:
|
||||||
|
return
|
||||||
|
|
||||||
self._health = max(0, value) # Health can't go below 0
|
self._health = max(0, value) # Health can't go below 0
|
||||||
|
|
||||||
if self._health == 0 and old_health > 0:
|
if self._health == 0 and old_health > 0:
|
||||||
|
@@ -70,6 +70,11 @@ class PowerUp(Object):
|
|||||||
elif self.item_type == 'shin_bone': # Add shin bone handling
|
elif self.item_type == 'shin_bone': # Add shin bone handling
|
||||||
player.shinBoneCount += 1
|
player.shinBoneCount += 1
|
||||||
player._coins += 5
|
player._coins += 5
|
||||||
|
if player.get_health() < player.get_max_health():
|
||||||
|
player.set_health(min(
|
||||||
|
player.get_health() + 1,
|
||||||
|
player.get_max_health()
|
||||||
|
))
|
||||||
self.check_for_nunchucks(player)
|
self.check_for_nunchucks(player)
|
||||||
elif self.item_type == 'witch_broom':
|
elif self.item_type == 'witch_broom':
|
||||||
broomWeapon = Weapon.create_witch_broom()
|
broomWeapon = Weapon.create_witch_broom()
|
||||||
|
Reference in New Issue
Block a user