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 
# Conflicts:
#	data/mapdata/mapEntities.json
This commit is contained in:
Wirus 2020-04-06 00:03:06 +02:00
commit e8e9cca0bb
7 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/entities/rock.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

15
data/mapdata/mapEntities.json
View File

@ -13,7 +13,6 @@
"hunger" : 20
}
},
{
"name" : "cranberry",
"position" : {
@ -51,5 +50,19 @@
"y": 9
},
"isPickupable" : false,
},
{
"name" : "rock",
"position" : {
"x": 13,
"y": 1
},
"isPickupable" : false,
"effect" : {
"hp" : 0,
"stamina" : 0,
"thirst" : 0,
"hunger" : 0
}
}
]

2
src/entities/Player.py
View File

@ -30,7 +30,7 @@ class Player(Entity):
if self.rotation == Rotations.NORTH:
return (0, -1)
elif self.rotation == Rotations.SOUTH:
pass
# Returns given statistic
def getStatistic(self, stat):
if stat.value == StatisticNames.HP:

2
src/game/EventManager.py
View File

@ -21,6 +21,8 @@ class EventManager:
def handleEvents(self):
pygame.event.pump()
self.game.screen.ui.timerTextView.changeText(self.game.ingameTimer.getPrettyTime())
keys = pygame.key.get_pressed()
for event in pygame.event.get():
if event.type == pygame.QUIT:

2
src/game/Map.py
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:

41
src/ui/Ui.py
View File

@ -26,26 +26,37 @@ class Ui():
self.timerTextView = UiText(pygame.Rect(0, 0, leftUiWidth, self.barHeight), font=self.font,
text=timer.getPrettyTime(), textColor=Colors.WHITE.value,
backgroundColor=Colors.GRAY.value)
self.isDayTextView = UiText(pygame.Rect(0, self.timerTextView.rect.y + self.barHeight, leftUiWidth, self.barHeight), text="Day",
font=self.font, backgroundColor=Colors.GRAY.value, textColor=Colors.WHITE.value)
self.isDayTextView = UiText(
pygame.Rect(0, self.timerTextView.rect.y + self.barHeight, leftUiWidth, self.barHeight), text="Day",
font=self.font, backgroundColor=Colors.GRAY.value, textColor=Colors.WHITE.value)
self.healthTextView = UiText(pygame.Rect(0, 0, rightUiWidth, self.barHeight), text="Health points",
font=self.font, textColor=Colors.WHITE.value)
self.healthBar = UiBar(pygame.Rect(0, self.healthTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight))
self.healthBar = UiBar(
pygame.Rect(0, self.healthTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight))
self.hungerTextView = UiText(pygame.Rect(0, self.healthBar.rect.y + self.barHeight, rightUiWidth, self.barHeight),
text="Hunger", font=self.font, textColor=Colors.WHITE.value)
self.hungerBar = UiBar(pygame.Rect(0, self.hungerTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), initialFilledPercent=0,
filledBarColor=Colors.YELLOW.value)
self.hungerTextView = UiText(
pygame.Rect(0, self.healthBar.rect.y + self.barHeight, rightUiWidth, self.barHeight),
text="Hunger", font=self.font, textColor=Colors.WHITE.value)
self.hungerBar = UiBar(
pygame.Rect(0, self.hungerTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
initialFilledPercent=0,
filledBarColor=Colors.YELLOW.value)
self.staminaTextView = UiText(pygame.Rect(0, self.hungerBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Stamina",
font=self.font, textColor=Colors.WHITE.value)
self.staminaBar = UiBar(pygame.Rect(0, self.staminaTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), filledBarColor=Colors.GREEN.value)
self.staminaTextView = UiText(
pygame.Rect(0, self.hungerBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Stamina",
font=self.font, textColor=Colors.WHITE.value)
self.staminaBar = UiBar(
pygame.Rect(0, self.staminaTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
filledBarColor=Colors.GREEN.value)
self.thirstTextView = UiText(pygame.Rect(0, self.staminaBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Thirst",
font=self.font, textColor=Colors.WHITE.value)
self.thirstBar = UiBar(pygame.Rect(0, self.thirstTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight), initialFilledPercent=0,
filledBarColor=Colors.BLUE.value)
self.thirstTextView = UiText(
pygame.Rect(0, self.staminaBar.rect.y + self.barHeight, rightUiWidth, self.barHeight), text="Thirst",
font=self.font, textColor=Colors.WHITE.value)
self.thirstBar = UiBar(
pygame.Rect(0, self.thirstTextView.rect.y + self.barHeight, rightUiWidth, self.barHeight),
initialFilledPercent=0,
filledBarColor=Colors.BLUE.value)
self.console = UiConsole(pygame.Rect(0, self.timerTextView.rect.h + self.isDayTextView.rect.h, leftUiWidth,
screenHeight - self.timerTextView.rect.h - self.isDayTextView.rect.h),
@ -61,8 +72,6 @@ class Ui():
pass
class Colors(Enum):
RED = (255, 0, 0)
GREEN = (0, 255, 0)

8
src/ui/UiText.py
View File

@ -24,3 +24,11 @@ class UiText(UiElement):
self.image.fill(backgroundColor)
wordImage = self.font.render(text, antialias, textColor)
self.image.blit(wordImage, (0, 0))
def changeText(self, newText):
self.text = newText
if self.backgroundColor is not None:
self.image.fill(self.backgroundColor)
wordImage = self.font.render(self.text, self.antialias, self.textColor)
self.image.blit(wordImage, (0, 0))