diff --git a/src/entities/Collidable.py b/src/entities/Collidable.py index 72a7c36..2a2d556 100644 --- a/src/entities/Collidable.py +++ b/src/entities/Collidable.py @@ -5,27 +5,6 @@ class Collidable(Entity): def __init__(self, texture, pos, id): super().__init__(texture, pos, id) - - def check_for_collision(self, x_pos, y_pos): - if self.pos[0] == x_pos: - if self.pos[1] == y_pos: - return True - - return False + self.is_collidable = True -col = Collidable(1, 1, 1) - - -""" - def interact_with_hp(self, hp, Statistics): - Statistics.set_hp(hp) - - def interact_with_hunger(self, hunger, Statistics): - Statistics.set_hunger(hunger) - - def interact_with_thirst(self, thirst, Statistics): - Statistics.set_thirst(thirst) - - def interact_with_stamina(self, stamina, Statistics): - Statistics.set_stamina(stamina)""" \ No newline at end of file diff --git a/src/entities/Pickupable.py b/src/entities/Pickupable.py index b59b728..cb7e7d6 100644 --- a/src/entities/Pickupable.py +++ b/src/entities/Pickupable.py @@ -1,5 +1,16 @@ import src.entities.Interactable as Interactable +from src.entities import Statistics, Player class Pickupable(Interactable): - pass + def __init__(self, texture, pos, id): + super().__init__(texture, pos, id) + self.is_pickupable = True + + def on_pickup(self, Player, Statistics): + Player.statistics.set_hp(Statistics.hp) + Player.statistics.set_stamina(Statistics.stamina) + Player.statistics.set_thirst(Statistics.thirst) + Player.statistics.set_hunger(Statistics.hunger) + + # TODO delete pickupable object from map diff --git a/src/entities/Statistics.py b/src/entities/Statistics.py index 1b28c2b..1ebe1f4 100644 --- a/src/entities/Statistics.py +++ b/src/entities/Statistics.py @@ -1,9 +1,9 @@ class Statistics: - def __init__(self): - self.hp = 100 - self.hunger = 100 - self.thirst = 100 - self.stamina = 100 + def __init__(self, hp, hunger, thirst, stamina): + self.hp = hp + self.hunger = hunger + self.thirst = thirst + self.stamina = stamina # methods that don't let the values pass below 0 and over 100 during change def set_hp(self, hp_diff):