From 0db5dd4d0debeef598ab209ed13eb7e2b1d2b253 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sun, 6 Oct 2019 10:57:45 +0200
Subject: [PATCH] move up held in next pieces

---
 TetrArcade.py              |  23 +++++------------------
 resources/images/held.png  | Bin 499 -> 0 bytes
 resources/images/next.png  | Bin 475 -> 0 bytes
 tetrislogic/tetrislogic.py |   7 ++++---
 tetrislogic/utils.py       |   1 +
 5 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 resources/images/held.png
 delete mode 100644 resources/images/next.png

diff --git a/TetrArcade.py b/TetrArcade.py
index c28f49b..3c95f49 100644
--- a/TetrArcade.py
+++ b/TetrArcade.py
@@ -26,7 +26,7 @@ from tetrislogic import TetrisLogic, Color, Phase, Coord, I_Tetrimino, Movement
 # Matrix
 LINES = 20
 COLLUMNS = 10
-NEXT_PIECES = 5
+NEXT_PIECES = 6
 
 # Delays (seconds)
 LOCK_DELAY = 0.5
@@ -36,8 +36,8 @@ AUTOREPEAT_PERIOD = 0.010
 
 # Piece init coord
 MATRIX_PIECE_COORD = Coord(4, LINES)
-NEXT_PIECES_COORDS = [Coord(COLLUMNS + 4, LINES - 4 * n - 3) for n in range(COLLUMNS)]
-HELD_PIECE_COORD = Coord(-5, LINES - 3)
+NEXT_PIECES_COORDS = [Coord(COLLUMNS + 4, LINES - 4 * n) for n in range(NEXT_PIECES)]
+HELD_PIECE_COORD = Coord(-5, LINES)
 
 # Window
 WINDOW_WIDTH = 800
@@ -212,10 +212,6 @@ class TetrArcade(TetrisLogic, arcade.Window):
         self.bg = arcade.Sprite(WINDOW_BG_PATH)
         self.matrix.bg = arcade.Sprite(MATRIX_BG_PATH)
         self.matrix.bg.alpha = MATRIX_BG_ALPHA
-        self.held.bg = arcade.Sprite(HELD_BG_PATH)
-        self.held.bg.alpha = BAR_ALPHA
-        self.next.bg = arcade.Sprite(NEXT_BG_PATH)
-        self.next.bg.alpha = BAR_ALPHA
         self.matrix.sprites = MatrixSprites(self.matrix)
         self.on_resize(self.init_width, self.init_height)
 
@@ -401,11 +397,12 @@ AGAIN""".format(
         if combo_score:
             self.show_text("COMBO x{:n}\n{:n}".format(nb_combo, combo_score))
 
-    def on_hold(self, held_piece):
+    def on_hold(self, held_piece, falling_piece, ghost_piece):
         held_piece.coord = HELD_PIECE_COORD
         if type(held_piece) == I_Tetrimino:
             held_piece.coord += Movement.LEFT
         held_piece.sprites.refresh()
+        ghost_piece.sprites = TetrominoSprites(ghost_piece, self, GHOST_ALPHA)
 
     def pause(self):
         super().pause()
@@ -455,8 +452,6 @@ AGAIN""".format(
 
         if self.phase not in (Phase.STARTING, Phase.PAUSED):
             self.matrix.bg.draw()
-            self.held.bg.draw()
-            self.next.bg.draw()
             self.matrix.sprites.draw()
 
             for tetromino in [
@@ -545,14 +540,6 @@ AGAIN""".format(
         self.matrix.bg.left = int(self.matrix.bg.left)
         self.matrix.bg.top = int(self.matrix.bg.top)
 
-        self.held.bg.scale = self.scale
-        self.held.bg.right = self.matrix.bg.left
-        self.held.bg.top = self.matrix.bg.top
-
-        self.next.bg.scale = self.scale
-        self.next.bg.left = self.matrix.bg.right
-        self.next.bg.top = self.matrix.bg.top
-
         self.matrix.sprites.resize(self.scale)
 
         for tetromino in [
diff --git a/resources/images/held.png b/resources/images/held.png
deleted file mode 100644
index 919e7900facb2da01e07ebeabb2ff3aa28b4fa2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 499
zcmeAS@N?(olHy`uVBq!ia0vp^TYxx_gAGVlyYw&vDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLsG-Bt#WAEJ?(OY^c})%?4uOup|JScc?J=3K
z>%h7fXDvAy3)wC|Yr8vJPrk}V?sHL%?)2@Mv*tZ7)cJnw`Q6H$^|i6_(_dHC+>?3y
z`|G`LHu}}a@@=l?%(HxFJKyr%{&TN4{=4_<%=XvMD)-%e|2@9?eoX)8iKUO<*MI+e
ze&e5K$Nwk)%ZqZVh&}Y*{9f7w#f%^p->wCof+m_xYOWWSaLf{MoUDXH@Qld2>p9<L
pBh#0CNI4@i$!G}c57C>RpB=odYIknLbznp>c)I$ztaD0e0svrd&UXL+

diff --git a/resources/images/next.png b/resources/images/next.png
deleted file mode 100644
index 741bfb23aa8b26c6fd2dd41e0c63c350c30b4509..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmeAS@N?(olHy`uVBq!ia0vp^TYxx_gAGVlyYw&vDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLsG-2q#WAEJ?(OY^S<Mb24i{hi|6eF{d!~S*
z2zQ>=mm<CsK5L|c-W@s{y{}Dr`ps>*|Mt&kKmItm-rnN-&inT7pV#fpi@kpQ$GOGT
z-%Dq|-lS7pUvc-(?Gq{0>({?N_RsQs@87yJukEkTKR@gH`D(lQKY!h;m3<z6{D)2b
zf17go<2BbZjbD5h`?vq=UZ<u7o`NQtO=_+emT=4xah$A_5yax#g+tIVxWdr5HI3_`
z$$A+glp`5z+$wGyoUu&6@AD}~T&5!_N4SGRD}PKkZry&{eDek6HATPIZvsXLgQu&X
J%Q~loCIGHiy3GIp

diff --git a/tetrislogic/tetrislogic.py b/tetrislogic/tetrislogic.py
index 1db97cf..c961568 100644
--- a/tetrislogic/tetrislogic.py
+++ b/tetrislogic/tetrislogic.py
@@ -175,6 +175,7 @@ class TetrisLogic:
         pass
 
     def generation_phase(self):
+        self.phase = Phase.GENERATION
         self.matrix.piece = self.next.pieces.pop(0)
         self.next.pieces.append(Tetromino())
         self.matrix.piece.coord = self.MATRIX_PIECE_COORD
@@ -273,16 +274,16 @@ class TetrisLogic:
         self.stop(self.fall)
         self.matrix.piece, self.held.piece = self.held.piece, self.matrix.piece
 
-        self.on_hold(self.held.piece)
-
         if self.matrix.piece:
             self.matrix.piece.coord = self.MATRIX_PIECE_COORD
             self.matrix.ghost = self.matrix.piece.ghost()
+            self.on_hold(self.held.piece, self.matrix.piece, self.matrix.ghost)
             self.falling_phase()
         else:
             self.generation_phase()
+            self.on_hold(self.held.piece, self.matrix.piece, self.matrix.ghost)
 
-    def on_hold(self, held_piece):
+    def on_hold(self, held_piece, falling_piece, ghost_piece):
         pass
 
     def pattern_phase(self):
diff --git a/tetrislogic/utils.py b/tetrislogic/utils.py
index 99ca14a..506a01c 100644
--- a/tetrislogic/utils.py
+++ b/tetrislogic/utils.py
@@ -42,6 +42,7 @@ class Color:
 class Phase:
 
     STARTING = "STARTING"
+    GENERATION = "GENERATION"
     FALLING = "FALLING"
     LOCK = "LOCK"
     PATTERN = "PATTERN"