From e73e66acdbca6e250e380148832b784b4856735b Mon Sep 17 00:00:00 2001 From: Peter Gerwinski Date: Wed, 28 Mar 2018 23:03:33 +0200 Subject: [PATCH] Fixed mustard with left-facing molpy, intrduced Waiting For It after T** E** --- assets/playerLeftDown.png | Bin 426 -> 444 bytes molpyup.py | 43 ++++++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/assets/playerLeftDown.png b/assets/playerLeftDown.png index ea884f07a16d1093ae98c12fe52672562f4ed6f1..7b116b83de177cc3b098ad3a3665d45748571295 100644 GIT binary patch delta 335 zcmV-V0kHn61H1!}Bo78+OGiWi{{a60|De66laV1H2pkj>5<^b8sF6uJf58odFbuq) zvH>%AmTZv~7=kZDz>5)B1%_Y&9`2`&Oi4nh2vDh(A|&IS&xdgW{4I^Ch#3B2&n0Bp z7_)FRO_PfBrYKopqa`W`LXhVpi4qZtqCizuAR^0Qt2#Eu*ad*QuCspm^zDyHB;y1g zzld{P*GxnU94R$xtpNaif8Q@q=Xpk+=PPwzimNwZM9Z)T14M*rnoyP{+P1|wj=^@b zm1(V4Rex6R^2smai+B0o`CV#;ns`?qN+o4qN5-hYPp0-v1HO1%IxPzT`j%6*Prv7# zx}-{<`mS+z)LcHCY=S(SZ4gCt7=}}i;G>jP8;W15tR$e$y6B_=DdrS89tm$vw^#Ny hci%mP8GrjBdjgsspRJ!aHn0Ey002ovPDHLkV1n!$lJEck delta 345 zcmV-f0jB=E1F8d%Bqa%ONLh0L01FcU01FcV0GgZ_00007bV*G`2jT-53O6Tx&xHVy zTRMNsjf5}^eMX`IL=CPbRp4g0BGCdjN}v^Jg@gC9AYe=;!zApiG?pTi#GmIEI|2Ag z8lgXqudm>t7*4K&6p`Ix*LB`lnc+m48FgKwEK4x61wJa!Uy#e1hQw25)~0EcnRR2N zBC?wYfbr?B{+4gw_v?HamOWWnGc&5HLfe0~D2f8pG;K3qnK=0H9qpp0mXCR!k>~l& z&N&AF7>40#8LljEvU_0LV0_2UasN#JxaXWRPlp0Jm3$3o)!tD;bV4oxihT7Xy;if> z4n^dlZY_p4_Gcs6qo5Wj&yiCUW^O8pOK~&YBLo2BIKEZushOpd{f}doPUaM?ndo+00000NkvXXu0mjfQ~H=x diff --git a/molpyup.py b/molpyup.py index a154f91..8b8d59e 100644 --- a/molpyup.py +++ b/molpyup.py @@ -185,7 +185,37 @@ class MolpyUp: for x in range(80): pygame.draw.line(self.screen, (222,222,222), (x * 12, 0), (x * 12, self.sy)) pygame.draw.line(self.screen, (222,222,222), (0, x * 12), (self.sx, x * 12)) - + + def showScore(self): + line1 = self.font.render("Press ENTER to restart,", -1, (0, 0, 0)) + line2 = self.font.render("ESC to quit.", -1, (0, 0, 0)) + w = max(line1.get_width(), line2.get_width()) + h = line1.get_height() + line2.get_height() + dx = 10 + dy = 5 + pygame.draw.rect(self.screen, (255,255,255), ((self.sx - w) // 2 - dx, (self.sy - h) // 2 - dy, w + 2 * dx, h + 2 * dy)) + pygame.draw.rect(self.screen, (0,0,0), ((self.sx - w) // 2 - dx, (self.sy - h) // 2 - dy, w + 2 * dx, h + 2 * dy), 3) + self.screen.blit(line1, ((self.sx - line1.get_width()) // 2, self.sy // 2 - line1.get_height())) + self.screen.blit(line2, ((self.sx - line2.get_width()) // 2, self.sy // 2)) + pygame.display.flip() + waitForIt = True + while waitForIt: + pygame.event.get() + key = pygame.key.get_pressed() + if key[K_RETURN]: + waitForIt = False + elif key[K_ESCAPE]: + sys.exit() + + def reset(self): + self.cameray = 0 + self.score = 0 + self.accelerators = [] + self.playerx = self.sx // 2 + self.playery = self.sy * 3 // 4 + self.platforms = [[self.playerx, self.playery + self.sy // 6, 0, 0]] + self.generatePlatforms() + def run(self): clock = pygame.time.Clock() self.generatePlatforms() @@ -195,19 +225,14 @@ class MolpyUp: for event in pygame.event.get(): if event.type == QUIT: sys.exit() - if self.playery - self.cameray > self.sy * 7 // 6: - self.cameray = 0 - self.score = 0 - self.accelerators = [] - self.playerx = self.sx // 2 - self.playery = self.sy * 3 // 4 - self.platforms = [[self.playerx, self.playery + self.sy // 6, 0, 0]] - self.generatePlatforms() self.drawGrid() self.drawPlatforms() self.updatePlayer() self.updatePlatforms() self.screen.blit(self.font.render(str(self.score), -1, (0, 0, 0)), (self.sx // 32, self.sy // 24)) + if self.playery - self.cameray > self.sy * 7 // 6: + self.showScore() + self.reset() pygame.display.flip() -- 2.30.2