changed keyboard controlls, v0.6

Author: goserg

README.md

@@ -1,10 +1,10 @@
 # Tetris
 Python & pygame
 
-![v0.4 screenshot](img/0.4-alpha.png?raw=true "v0.4 screenshot")  
+![v0.6 screenshot](img/0.6-alpha.png?raw=true "v0.6 screenshot")  
 
 
-supporting XBOX 360 For Windows (Controller)  
+recommended XBOX 360 For Windows (Controller)  
 
 pygame 1.9.6 required
 
@@ -13,6 +13,7 @@ Controls:
 Move left - Arrow left (D-pad left)    
 Move right - Arrow right (D-pad right)  
 Move down - Arrow down (D-pad down)  
-Rotate clockwise - Arrow up/X (A)  
-Hard drop - Space (D-pad up) (disabled)  
-
+Rotate clockwise - Arrow up/X (A)    
+Menu enter - Enter (A)  
+Menu back - Escape (B)  
+Pause - Escape (Start)

img/0.6-alpha.png

@@ -50,8 +50,6 @@ def new_player():
                 if score_list.is_enough(stats.score.score):
                     score_list.add_score(start_menu.player.text, stats.score.score)
                     menu.update_score()
-                #     state = GameState.GAME_OVER_RECORD
-                # else:
                 return
     shade.shade = type(player)()
     shade.update_pos(player)
@@ -68,7 +66,7 @@ def draw():
     global state
     window.fill(s.colors["Background"])
     if state == GameState.PLAY or state == GameState.PAUSE or \
-            state == GameState.GAME_OVER_RECORD or state == GameState.GAME_OVER:
+            state == GameState.GAME_OVER:
         shade.draw()
         player.draw()
         next_indicator.next_one.draw()
@@ -94,20 +92,7 @@ def draw():
         if event.type == pygame.QUIT:
             run = False
 
-    if state == GameState.GAME_OVER_RECORD:
-        if controller.just_pressed["Start"]:
-            to_draw = True
-            if score_list.is_enough(stats.score.score):
-                if score_list.add_score(ui.score_plate.get_name(), stats.score.score) == 1:
-                    menu.update_score()
-            state = GameState.MENU
-            next_indicator.change()
-            game_over()
-            new_player()
-            continue
-        if ui.score_plate.update():
-            to_draw = True
-    elif state == GameState.MENU:
+    if state == GameState.MENU:
         if menu.change_state():
             to_draw = True
         if controller.just_pressed["Start"]:
@@ -128,15 +113,15 @@ def draw():
             state = GameState.MENU
 
     elif state == GameState.GAME_OVER:
-        if controller.just_pressed["Start"]:
+        if controller.just_pressed["Start"] or controller.just_pressed["Pause"]:
             to_draw = True
             state = GameState.MENU
             next_indicator.change()
             game_over()
             new_player()
             continue
     elif state == GameState.PLAY:
-        if controller.just_pressed["Start"]:
+        if controller.just_pressed["Pause"]:
             to_draw = True
             state = GameState.PAUSE
         p_event = player.update()
@@ -146,7 +131,7 @@ def draw():
             new_player()
             to_draw = True
     elif state == GameState.PAUSE:
-        if controller.just_pressed["Start"]:
+        if controller.just_pressed["Pause"]:
             to_draw = True
             state = GameState.PLAY
 

src/main.py

@@ -59,6 +59,9 @@ def change_state(self):
             if self.btn == self.ButtonPos.SCORE:
                 self.state = self.MenuState.SCORE
                 self.btn = None
-            elif self.state == self.MenuState.SCORE:
+                return 1
+        elif controller.just_pressed["Back"]:
+            if self.state == self.MenuState.SCORE:
                 self.state = self.MenuState.MAIN
                 self.btn = self.ButtonPos.SCORE
+                return 1

src/ui/menu.py

@@ -35,9 +35,9 @@ def __init__(self):
         x0 = 0
         y0 = 0
         for letter in LETTERS:
-            x = x0 * 15 * s.scale + 180
-            y = y0 * 20 * s.scale + 150
-            self.buttons.append(Button(letter, letter, 7 * s.scale, x, y, self.plate))
+            x = x0 * 15 * s.scale + 90 * s.scale
+            y = y0 * 20 * s.scale + 75 * s.scale
+            self.buttons.append(Button(letter, letter, 14, x, y, self.plate))
             x0 += 1
             if x0 == 9:
                 x0 = 0
@@ -47,7 +47,7 @@ def update(self):
         to_draw = False
         if self.move(controller.get_direction()) != 0:
             to_draw = True
-        if controller.just_pressed["Rotate"]:
+        if controller.just_pressed["Start"]:
             self.add_letter()
             to_draw = True
         elif controller.just_pressed["Clear"]:

src/ui/name_input.py

@@ -36,7 +36,7 @@ def update(self):
         :return 9: back
         """
         if self.name_input_enabled:
-            if controller.just_pressed["Start"]:
+            if controller.just_pressed["Pause"]:
                 name = self.name_input.get_name()
                 save.table.change_name(name, self.name_index)
                 self.player.text = name
@@ -91,6 +91,6 @@ def draw(self):
 
         if self.name_input_enabled:
             self.name_input.draw()
-
-        for i in self.arrows:
-            i.draw()
+        else:
+            for i in self.arrows:
+                i.draw()

src/ui/start_menu.py

@@ -4,6 +4,8 @@
 gamepad = None
 
 pressed = {"Start": False,
+           "Pause": False,
+           "Back": False,
            "Rotate": False,
            "Left": False,
            "Right": False,
@@ -22,6 +24,8 @@ def get_keys():
     global just_pressed
     global keys
     just_pressed = {"Start": False,
+                    "Pause": False,
+                    "Back": False,
                     "Rotate": False,
                     "Left": False,
                     "Right": False,
@@ -31,14 +35,30 @@ def get_keys():
                     "Clear": False}
     keys = pygame.key.get_pressed()
     joy_direct = gamepad.get_hat()
-    # Start/Pause the game
-    if keys[pygame.K_ESCAPE] or gamepad.is_pause_pressed():
+    # Start the game
+    if keys[pygame.K_RETURN] or gamepad.is_A_pressed():
         if not pressed["Start"]:
             just_pressed["Start"] = True
         pressed["Start"] = True
     else:
         pressed["Start"] = False
 
+    # Pause the game
+    if keys[pygame.K_ESCAPE] or gamepad.is_start_pressed():
+        if not pressed["Pause"]:
+            just_pressed["Pause"] = True
+        pressed["Pause"] = True
+    else:
+        pressed["Pause"] = False
+
+    # Back button
+    if keys[pygame.K_ESCAPE] or gamepad.is_B_pressed():
+        if not pressed["Back"]:
+            just_pressed["Back"] = True
+        pressed["Back"] = True
+    else:
+        pressed["Back"] = False
+
     # Rotate clockwise
     if keys[pygame.K_UP] or keys[pygame.K_x] or gamepad.is_A_pressed():
         if not pressed["Rotate"]:
@@ -96,11 +116,6 @@ def get_keys():
         pressed["Clear"] = False
 
 
-def is_start_pressed():
-    if keys[pygame.K_SPACE] or gamepad.is_start_pressed():
-        return True
-
-
 def get_direction():
     joy_direct = gamepad.get_hat()
     if keys[pygame.K_DOWN] or joy_direct == (0, 1):

src/utils/controller.py

@@ -17,7 +17,7 @@ def get_hat(self):
             return self.joystick.get_hat(0)
         return 0, 0
 
-    def is_pause_pressed(self):
+    def is_start_pressed(self):
         if self.enabled:
             return self.joystick.get_button(7)