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:
Marcin Kostrzewski 2020-04-06 00:50:20 +02:00
commit 325adc7de5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/Ui.py
View File

@ -80,10 +80,16 @@ class Ui():
self.thirstBar.updateFill(statistics.thirst) self.thirstBar.updateFill(statistics.thirst)
consoleLines.append("Stamina: " + str(statistics.thirst)) consoleLines.append("Stamina: " + str(statistics.thirst))
if len(consoleLines) > 0:
self.console.addLinesToConsoleAndScrollToDisplayThem(consoleLines) self.console.addLinesToConsoleAndScrollToDisplayThem(consoleLines)
def updateBasedOnPygameEvent(self, event: pygame.event): def updateBasedOnPygameEvent(self, event: pygame.event):
pass if event.type == pygame.MOUSEBUTTONDOWN:
console = self.console
if event.button == 4:
console.writeConsoleLines(console.topWrittenLineInd + 1)
elif event.button == 5:
console.writeConsoleLines(console.topWrittenLineInd - 1)
class Colors(Enum): class Colors(Enum):

4
src/ui/UiConsole.py
View File

@ -35,8 +35,8 @@ class UiConsole(UiElement):
self.image.fill(self.bgColor) self.image.fill(self.bgColor)
if startingLineInd < 0: if startingLineInd < 0:
startingLineInd = 0 startingLineInd = 0
elif startingLineInd > self.linesImagesCount: elif startingLineInd >= self.linesImagesCount:
startingLineInd = self.linesImagesCount startingLineInd = self.linesImagesCount - 1
self.topWrittenLineInd = startingLineInd self.topWrittenLineInd = startingLineInd
writtenLines = 0 writtenLines = 0
for i in range(startingLineInd, min(self.maxLines + startingLineInd, self.linesImagesCount)): for i in range(startingLineInd, min(self.maxLines + startingLineInd, self.linesImagesCount)):