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

Merge remote-tracking branch 'origin/MapNew' into MapNew

Browse Source 
# Conflicts:
#	src/entities/Collidable.py
This commit is contained in:
jonspacz 2020-04-05 21:29:11 +02:00
commit a9ca435cca
3 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/entities/Collidable.py
View File

@ -1,31 +0,0 @@
from src.entities.Entity import Entity
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
#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)"""

4
src/entities/Npc.py
View File

@ -1,10 +1,8 @@
from src.entities.Collidable import Collidable
from src.entities.Interactable import Interactable from src.entities.Interactable import Interactable
class Npc(Collidable, Interactable): class Npc(Interactable):
def __init__(self, texture, pos, id, path, speed): def __init__(self, texture, pos, id, path, speed):
Collidable.__init__(self, texture, pos, id)
Interactable.__init__(self, texture, pos, id) Interactable.__init__(self, texture, pos, id)
self.path = path self.path = path
self.speed = speed self.speed = speed

17
src/entities/Pickupable.py
View File

@ -1,16 +1,17 @@
import src.entities.Interactable as Interactable import src.entities.Interactable as Interactable
from src.entities import Statistics, Player from src.entities import Statistics, Player
from game.MapNew import Map
class Pickupable(Interactable): class Pickupable(Interactable):
def __init__(self, texture, pos, id): def __init__(self, texture, pos, id, Statistics):
super().__init__(texture, pos, id) super().__init__(texture, pos, id)
self.is_pickupable = True self.is_pickupable = True
self.Statistics = Statistics
def on_pickup(self, Player, Statistics): def on_pickup(self, Player):
Player.statistics.set_hp(Statistics.hp) Player.statistics.set_hp(self.Statistics.hp)
Player.statistics.set_stamina(Statistics.stamina) Player.statistics.set_stamina(self.Statistics.stamina)
Player.statistics.set_thirst(Statistics.thirst) Player.statistics.set_thirst(self.Statistics.thirst)
Player.statistics.set_hunger(Statistics.hunger) Player.statistics.set_hunger(self.Statistics.hunger)
# TODO delete pickupable object from map Map.removeSpriteFromMap(self)