From dfbfb093e0f456025153a7156cffc111e5a4019b Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sat, 28 Sep 2019 13:47:38 +0200
Subject: [PATCH] display controls on start and pause instead of play

---
 tetrarcade.py | 66 +++++++++++++++++++++++++++++----------------------
 tetris.py     | 16 ++++++-------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/tetrarcade.py b/tetrarcade.py
index 117f949..77bcca2 100644
--- a/tetrarcade.py
+++ b/tetrarcade.py
@@ -32,33 +32,47 @@ TEXT_COLOR = arcade.color.BUBBLES
 HIGHLIGHT_TEXT_COLOR = arcade.color.BUBBLES
 FONT_NAME = "joystix monospace.ttf"
 TEXT_MARGIN = 40
-FONT_SIZE = 10
+FONT_SIZE = 16
+TEXT_HEIGHT = 20.8
 HIGHLIGHT_TEXT_FONT_SIZE = 20
-TEXT_HEIGHT = 13.2
-START_TEXT = """PRESS
-[ENTER]
-TO
-START"""
+START_TEXT = """TETRARCADE
+
+CONTROLS
+MOVE LEFT                 ←
+MOVE RIGHT                →
+SOFT DROP                 ↓
+HARD DROP             SPACE
+ROTATE CLOCKWISE          ↑
+ROTATE COUNTERCLOCKWISE   Z
+HOLD                      C
+PAUSE                   ESC
+
+PRESS [ENTER] TO START"""
 STATS_TEXT = """SCORE
+
 HIGH SCORE
-TIME
+
 LEVEL
+
 GOAL
+
 LINES
 
+TIME
+"""
+PAUSE_TEXT = """TETRARCADE
 
+CONTROLS
+MOVE LEFT                 ←
+MOVE RIGHT                →
+SOFT DROP                 ↓
+HARD DROP             SPACE
+ROTATE CLOCKWISE          ↑
+ROTATE COUNTERCLOCKWISE   Z
+HOLD                      C
+RESUME                  ESC
 
-
-MOVE LEFT        ←
-MOVE RIGHT       →
-SOFT DROP        ↓
-HARD DROP    SPACE
-ROTATE           ↑
-CLOCKWISE
-ROTATE           Z
-COUNTERCLOCKWISE
-HOLD             C
-PAUSE          ESC"""
+PRESS [ESC] TO RESUME"""
 GAME_OVER_TEXT = """GAME
 OVER
 
@@ -66,12 +80,6 @@ PRESS
 [ENTER]
 TO PLAY
 AGAIN"""
-PAUSE_TEXT = """PAUSE
-
-PRESS
-[ESC]
-TO
-RESUME"""
 
 # Sprites paths
 WINDOW_BG = "images/bg.jpg"
@@ -357,19 +365,21 @@ class TetrArcade(Tetris, arcade.Window):
             t = time.localtime(self.time)
             for y, text in enumerate(
                 (
+
+                    "{:02d}:{:02d}:{:02d}".format(
+                        t.tm_hour-1, t.tm_min, t.tm_sec
+                    ),
                     "{:n}".format(self.nb_lines),
                     "{:n}".format(self.goal),
                     "{:n}".format(self.level),
-                    "{:02d}:{:02d}:{:02d}".format(t.tm_hour-1, t.tm_min, t.tm_sec),
                     "{:n}".format(self.high_score),
                     "{:n}".format(self.score)
-                ),
-                start=14
+                )
             ):
                 arcade.draw_text(
                     text = text,
                     start_x = self.matrix_sprite.left - TEXT_MARGIN,
-                    start_y = self.matrix_sprite.bottom + y*TEXT_HEIGHT,
+                    start_y = self.matrix_sprite.bottom + 2*y*TEXT_HEIGHT,
                     color = TEXT_COLOR,
                     font_size = FONT_SIZE,
                     align = 'right',
diff --git a/tetris.py b/tetris.py
index c21008e..df9135a 100644
--- a/tetris.py
+++ b/tetris.py
@@ -29,27 +29,27 @@ NEXT_PIECES_POSITIONS = [
     for n in range(NB_NEXT_PIECES)
 ]
 HELD_PIECE_POSITION = Coord(-7, NB_LINES-3)
-HELD_I_POSITION = Coord(-5, NB_LINES-3)
+HELD_I_POSITION = Coord(-7, NB_LINES-3)
 
 
 class Status:
 
     STARTING = "starting"
-    PLAYING =  "playing"
-    PAUSED =   "paused"
-    OVER =     "over"
+    PLAYING  = "playing"
+    PAUSED   = "paused"
+    OVER     = "over"
 
 
 class Movement:
 
-    LEFT  = Coord(-1, 0)
-    RIGHT = Coord(1, 0)
-    DOWN  = Coord(0, -1)
+    LEFT  = Coord(-1,  0)
+    RIGHT = Coord( 1,  0)
+    DOWN  = Coord( 0, -1)
 
 
 class Rotation:
 
-    CLOCKWISE = -1
+    CLOCKWISE        = -1
     COUNTERCLOCKWISE = 1