ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Test heart healing

This commit is contained in:
Yohann D'ANELLO 2020-11-11 17:15:28 +01:00
parent 8db00bcaa6
commit 61714a5129
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dungeonbattle/entities/items.py
View File

@ -7,9 +7,6 @@ from ..interfaces import Entity, FightingEntity, Map
class Item(Entity): class Item(Entity):
held: bool held: bool
held_by: Optional["Player"] held_by: Optional["Player"]
# When it is False, items disappear when they are hold.
# Action is done when the item is picked up.
can_be_in_inventory: bool = True
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -25,13 +22,11 @@ class Item(Entity):
self.held = True self.held = True
self.held_by = player self.held_by = player
self.map.remove_entity(self) self.map.remove_entity(self)
if self.can_be_in_inventory: player.inventory.append(self)
player.inventory.append(self)
class Heart(Item): class Heart(Item):
name: str = "heart" name: str = "heart"
can_be_in_inventory: bool = False
healing: int = 5 healing: int = 5
def hold(self, player: "Player") -> None: def hold(self, player: "Player") -> None:
@ -39,7 +34,7 @@ class Heart(Item):
When holding a heart, heal the player and don't put item in inventory. When holding a heart, heal the player and don't put item in inventory.
""" """
player.health = min(player.maxhealth, player.health + self.healing) player.health = min(player.maxhealth, player.health + self.healing)
return super().hold(player) self.map.remove_entity(self)
class Bomb(Item): class Bomb(Item):

15
dungeonbattle/tests/entities_test.py
View File

@ -1,6 +1,6 @@
import unittest import unittest
from dungeonbattle.entities.items import Bomb, Item from dungeonbattle.entities.items import Bomb, Heart, Item
from dungeonbattle.entities.monsters import Hedgehog from dungeonbattle.entities.monsters import Hedgehog
from dungeonbattle.entities.player import Player from dungeonbattle.entities.player import Player
from dungeonbattle.interfaces import Entity, Map from dungeonbattle.interfaces import Entity, Map
@ -93,6 +93,19 @@ class TestEntities(unittest.TestCase):
item.act(self.map) item.act(self.map)
self.assertTrue(hedgehog.dead) self.assertTrue(hedgehog.dead)
def test_hearts(self) -> None:
"""
Test some random stuff with hearts.
"""
item = Heart()
self.map.add_entity(item)
item.move(2, 6)
self.player.health -= 2 * item.healing
self.player.move_down()
self.assertNotIn(item, self.map.entities)
self.assertEqual(self.player.health,
self.player.maxhealth - item.healing)
def test_players(self) -> None: def test_players(self) -> None:
""" """
Test some random stuff with players. Test some random stuff with players.