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

Extract clicks on collidables to new method - make code clear

Browse Source
This commit is contained in:
Michał Czekański 2020-04-26 18:45:07 +02:00
parent 013e8b524d
commit a6b717935f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/game/EventManager.py
View File

@ -42,19 +42,7 @@ class EventManager:
if event.type == pygame.MOUSEBUTTONUP: if event.type == pygame.MOUSEBUTTONUP:
pos = pygame.mouse.get_pos() pos = pygame.mouse.get_pos()
# get a list of all sprites that are under the mouse cursor self.handleClickingOnCollidablesAndTerrains(pos)
clicked_collidables = [s for s in self.game.map.collidables if s.rect.collidepoint(pos)]
# do something with the clicked sprites...
if len(clicked_collidables) > 0:
self.game.movement.gotoToTarget(Random().choice(clicked_collidables))
else:
clicked_terrains = [tile for tile in self.game.map.terrainTilesList if tile.rect.collidepoint(pos)]
if len(clicked_terrains) > 0:
print("Terrains under clik:")
for terrain in clicked_terrains:
print(terrain)
else:
print("NO TERRAIN FOUND UNDER CLICK")
self.game.screen.ui.updateBasedOnPygameEvent(event) self.game.screen.ui.updateBasedOnPygameEvent(event)
self.keyTimeout += self.keyTimer.tick() self.keyTimeout += self.keyTimer.tick()
@ -68,6 +56,22 @@ class EventManager:
self.game.screen.ui.updateBarsBasedOnPlayerStats(self.player.statistics) self.game.screen.ui.updateBarsBasedOnPlayerStats(self.player.statistics)
def handleClickingOnCollidablesAndTerrains(self, pos):
# get a list of all collidables that are under the mouse cursor
clicked_collidables = [s for s in self.game.map.collidables if s.rect.collidepoint(pos)]
if len(clicked_collidables) > 0:
self.game.movement.gotoToTarget(Random().choice(clicked_collidables))
else:
# get a list of all terrains that are under the mouse cursor
clicked_terrains = [tile for tile in self.game.map.terrainTilesList if tile.rect.collidepoint(pos)]
if len(clicked_terrains) > 0:
print("Terrains under clik:")
for terrain in clicked_terrains:
print(terrain)
else:
print("NO TERRAIN FOUND UNDER CLICK")
def handlePlayerControls(self, keys): def handlePlayerControls(self, keys):
# Key names are temporary # Key names are temporary
# TODO: Load key bindings from JSON # TODO: Load key bindings from JSON