s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor Interactable.py and Pickupable.py

Browse Source
This commit is contained in:
Marcin Kostrzewski 2020-04-06 10:33:29 +02:00
parent c6ab7cc2f4
commit 6d1dc4ffb7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/entities/Interactable.py
View File

@ -3,12 +3,12 @@ from src.entities.Entity import Entity
class Interactable(Entity):
def __init__(self, texture, size, pos, Statistics):
super().__init__(texture, size, pos, Statistics)
super().__init__(texture, size, pos)
self.Statistics = Statistics
def on_interaction(self, Player):
Player.statistics.set_hp(self.Statistics.hp)
Player.statistics.set_stamina(self.Statistics.stamina)
Player.statistics.set_thirst(self.Statistics.thirst)
Player.statistics.set_hunger(self.Statistics.hunger)
def on_interaction(self, Player):
Player.statistics.set_hp(self.Statistics.hp)
Player.statistics.set_stamina(self.Statistics.stamina)
Player.statistics.set_thirst(self.Statistics.thirst)
Player.statistics.set_hunger(self.Statistics.hunger)

2
src/entities/Pickupable.py
View File

@ -3,6 +3,6 @@ from src.entities.Interactable import Interactable
class Pickupable(Interactable):
def __init__(self, texture, size, pos, Statistics):
super().__init__(texture, size, pos)
super().__init__(texture, size, pos, Statistics)
self.is_pickupable = True

2
src/game/EventManager.py
View File

@ -42,7 +42,7 @@ class EventManager:
if keys[pygame.K_SPACE]:
object = self.game.map.getEntityOnCoord(self.player.getFacingCoord())
if type(object) is Pickupable:
object.on_pickup(self.player)
object.on_interaction(self.player)
self.game.map.removeSpriteFromMap(object)
if keys[pygame.K_w]:
self.player.rotate(Rotations.NORTH)