From 25289562397c10dbdbcfac029ee4c9e775a8ba6e Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Sun, 2 Jan 2022 05:55:56 -0700
Subject: [PATCH] keyboard controls

---
 level maps/r3 level1.xcf | Bin 92757 -> 92757 bytes
 r3.py                    |  71 ++++++++++++++++++++++++++++-----------
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/level maps/r3 level1.xcf b/level maps/r3 level1.xcf
index cd8138698855d2cbf6f804c3e96cb144a1dcf582..fe64cade2dd83eb04aa4b4364274d885834d1942 100644
GIT binary patch
delta 116
zcmcb5h4tzc)(w@6jA5Ir7!NLBVParln7od$pN(lX0|Vo^$qU=8C$ldWVAPl_*e*P&
zot<m34^RaV?DGPOh)FH3fpE94htPZbA@n}0&5rFKr6$Mj<DR^Uv73!a325B3&5Zj)
GRs#SUOd<CG

delta 114
zcmcb5h4tzc)(w@6jDDM|7!NL(?7XOlHG+YGv2F6gHtWg!iv<`JCJVL;Pikl9TI|9A
z2K$_VB4SdDOCa3s%OUjMcBr(`X2<rAQta#jIf<32MU%}JO=n}c0y1(l<NlD<06f_u
A;s5{u

diff --git a/r3.py b/r3.py
index c7bffd5..5fb95cf 100644
--- a/r3.py
+++ b/r3.py
@@ -159,8 +159,8 @@ else:
                 self.velocity = [0, 0]
             def update(self):
                 self.rect.move_ip(*self.velocity)
-        player = Player(12,190)
-        css1 = Css(400,190)
+        player = Player(346,206)
+        css1 = Css(483,262)
         css2 = Css(500,400)
         sat1 = Sat(550,-100)
         sat2 = Sat(600,100)
@@ -178,6 +178,8 @@ else:
         running = True
         live = True
         complete = False
+        ax = 0
+        ay = 0
         bx = 0
         by = 0
         debug = False # This set debug mode
@@ -204,6 +206,35 @@ else:
                         bx = -1
                     elif event.key == pygame.K_d:
                         bx = 1
+                    elif event.key == pygame.K_n:
+                        pygame.mixer.music.stop()
+                    elif event.key == pygame.K_m:
+                        pygame.mixer.music.play(-1)
+                    elif event.key == pygame.K_c:
+                        if debug:
+                            #this trigger spaceship crash event
+                            live = False
+                            pygame.mixer.music.stop()
+                            csfx.play()
+                    elif event.key == pygame.K_r:
+                        #this restart the game
+                        player = Player(346,206)
+                        css1 = Css(483,262)
+                        css2 = Css(500,400)
+                        sat1 = Sat(550,-100)
+                        sat2 = Sat(600,100)
+                        goal = Goal(3000,-100)
+                        ast1 = Ast(120,200)
+                        ast2 = Ast(300,100)
+                        ast3 = Ast(500,150)
+                        wall1 = Wallh(-100,-200)
+                        wall2 = Wallh(3100,-200)
+                        wall3 = Wallv(-200,-200)
+                        wall4 = Wallv(-200,800)
+                        live = True
+                        complete = False
+                        pygame.mixer.music.play(-1)
+                        start_time = pygame.time.get_ticks()
                 elif event.type == pygame.KEYUP:
                     if event.key == pygame.K_w:
                         by = 0
@@ -214,8 +245,8 @@ else:
                     elif event.key == pygame.K_d:
                         bx = 0
             #ax and ay are for left stick
-            ax = joystick.get_axis(0)
-            ay = joystick.get_axis(1)
+            #ax = joystick.get_axis(0)
+            #ay = joystick.get_axis(1)
             #bx = 0
             #by = 0
             #if gamepad == 1:
@@ -237,18 +268,18 @@ else:
             if live:
                 runtime = pygame.time.get_ticks() - start_time
                 if (live & debug == False):
-                    if pygame.sprite.collide_rect(player, wall3):
-                        if ay < 0:
-                            ay = 0
-                    elif pygame.sprite.collide_rect(player, wall4):
-                        if ay > 0:
-                            ay = 0
-                    if pygame.sprite.collide_rect(player, wall1):
-                        if ax < 0:
-                            ax = 0
-                    elif pygame.sprite.collide_rect(player, wall2):
-                        if ax > 0:
-                            ax = 0
+                    #if pygame.sprite.collide_rect(player, wall3):
+                    #    if ay < 0:
+                    #        ay = 0
+                    #elif pygame.sprite.collide_rect(player, wall4):
+                    #    if ay > 0:
+                    #        ay = 0
+                    #if pygame.sprite.collide_rect(player, wall1):
+                    #    if ax < 0:
+                    #        ax = 0
+                    #elif pygame.sprite.collide_rect(player, wall2):
+                    #    if ax > 0:
+                    #        ax = 0
                     if pygame.sprite.collide_rect(background, wall3):
                         if by < 0:
                             by = 0
@@ -282,8 +313,8 @@ else:
                         complete = True
                         pygame.mixer.music.stop()
                         lcfx.play()
-                player.velocity[0] = int(600 * dt * (ax - bx))
-                player.velocity[1] = int(600 * dt * (ay - by))
+                #player.velocity[0] = int(600 * dt * (ax - bx))
+                #player.velocity[1] = int(600 * dt * (ay - by))
                 css1.velocity[0] = int(-600 * dt * bx)
                 css1.velocity[1] = int(-600 * dt * by)
                 css2.velocity = css1.velocity
@@ -313,8 +344,8 @@ else:
                 csfx.play()
             elif b3:
                 #this restart the game
-                player = Player(12,190)
-                css1 = Css(400,190)
+                player = Player(346,206)
+                css1 = Css(483,262)
                 css2 = Css(500,400)
                 sat1 = Sat(550,-100)
                 sat2 = Sat(600,100)