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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/entities/Player.py
View File

@ -26,6 +26,11 @@ class Player(Entity):
elif rotation.value == Rotations.WEST.value: elif rotation.value == Rotations.WEST.value:
self.rect.x -= self.rect.w 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 # Returns given statistic
def getStatistic(self, stat): def getStatistic(self, stat):
if stat.value == StatisticNames.HP: if stat.value == StatisticNames.HP:

2
src/game/Map.py
View File

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