diff --git a/data/images/entities/rock.jpg b/data/images/entities/rock.jpg new file mode 100644 index 0000000..01a4d5a Binary files /dev/null and b/data/images/entities/rock.jpg differ diff --git a/data/mapdata/mapEntities.json b/data/mapdata/mapEntities.json index a427f25..6401e4b 100644 --- a/data/mapdata/mapEntities.json +++ b/data/mapdata/mapEntities.json @@ -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 + } } ] \ No newline at end of file diff --git a/src/entities/Player.py b/src/entities/Player.py index f654149..f3cbd4e 100644 --- a/src/entities/Player.py +++ b/src/entities/Player.py @@ -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: diff --git a/src/game/EventManager.py b/src/game/EventManager.py index 7ee55b6..3960521 100644 --- a/src/game/EventManager.py +++ b/src/game/EventManager.py @@ -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: diff --git a/src/game/Map.py b/src/game/Map.py index 3cbf07f..f0fa06c 100644 --- a/src/game/Map.py +++ b/src/game/Map.py @@ -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: diff --git a/src/ui/Ui.py b/src/ui/Ui.py index a68b3bf..394c2e8 100644 --- a/src/ui/Ui.py +++ b/src/ui/Ui.py @@ -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) diff --git a/src/ui/UiText.py b/src/ui/UiText.py index a6beb6a..676faf7 100644 --- a/src/ui/UiText.py +++ b/src/ui/UiText.py @@ -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))