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

This commit is contained in:
Michał Czekański 2020-04-05 23:59:13 +02:00
commit b56269888c
2 changed files with 6 additions and 1 deletions

View File

@ -26,6 +26,11 @@ class Player(Entity):
elif rotation.value == Rotations.WEST.value:
self.rect.x -= self.rect.w
def getFacingCoord(self):
if self.rotation == Rotations.NORTH:
return (0, -1)
elif self.rotation == Rotations.SOUTH:
# Returns given statistic
def getStatistic(self, stat):
if stat.value == StatisticNames.HP:

View File

@ -50,7 +50,7 @@ class Map:
entity["effect"]["thirst"],
entity["effect"]["stamina"])))
else:
actualEntities.append(Entity(entity["name"],
actualEntities.append(Entity(entity["name"] + ".jpg",
self.tileSize,
(entity["position"]["x"] * self.tileSize, entity["position"]["y"] * self.tileSize)))
except KeyError: