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

Changed item pickup method

Browse Source
This commit is contained in:
Marcin Kostrzewski 2020-05-13 20:17:32 +02:00
parent 649b61a84e
commit cba207f98c
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/EventManager.py
View File

@ -75,15 +75,7 @@ class EventManager:
# Picking up items # Picking up items
if keys[pygame.K_SPACE]: if keys[pygame.K_SPACE]:
object = self.game.map.getEntityOnCoord(self.player.getFacingCoord()) object = self.game.map.getEntityOnCoord(self.player.getFacingCoord())
# Picked up item gets removed from the map self.player.move(Movement.PICKUP, object)
if type(object) is Pickupable:
object.on_interaction(self.player)
self.game.screen.ui.updateOnPlayerPickup(self.player.statistics, object)
self.game.map.removeSpriteFromMap(object)
elif type(object) is Interactable:
object.on_interaction(self.player)
self.game.screen.ui.updateOnPlayerInteraction(self.player.statistics, object)
if keys[pygame.K_w]: if keys[pygame.K_w]:
if not self.game.map.collision(self.player.getFacingCoord()[0], self.player.getFacingCoord()[1]): if not self.game.map.collision(self.player.getFacingCoord()[0], self.player.getFacingCoord()[1]):
self.player.move(Movement.FORWARD) self.player.move(Movement.FORWARD)