From b8e20199af518f75411ac27b28fa319a61dda4a6 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Wed, 2 Oct 2019 00:01:02 +0200
Subject: [PATCH] add bg for held and next

---
 TetrArcade.py         |  19 +++++++++++++++++--
 images/held.png       | Bin 0 -> 499 bytes
 images/next.png       | Bin 0 -> 475 bytes
 tetrislogic/consts.py |   4 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 images/held.png
 create mode 100644 images/next.png

diff --git a/TetrArcade.py b/TetrArcade.py
index a9bb14e..8b0bec8 100644
--- a/TetrArcade.py
+++ b/TetrArcade.py
@@ -65,7 +65,8 @@ CONF_PATH = os.path.join(USER_PROFILE_DIR, "TetrArcade.ini")
 TEXT_COLOR = arcade.color.BUBBLES
 FONT_NAME = "joystix monospace.ttf"
 STATS_TEXT_MARGIN = 40
-STATS_TEXT_SIZE = 16
+STATS_TEXT_SIZE = 14
+STATS_TEXT_WIDTH = 150
 HIGHLIGHT_TEXT_COLOR = arcade.color.BUBBLES
 HIGHLIGHT_TEXT_SIZE = 20
 
@@ -160,6 +161,10 @@ class TetrArcade(tetrislogic.TetrisLogic, arcade.Window):
         self.bg = arcade.Sprite(WINDOW_BG_PATH)
         self.matrix_bg = arcade.Sprite(MATRIX_SPRITE_PATH)
         self.matrix_bg.alpha = MATRIX_BG_ALPHA
+        self.held_bg = arcade.Sprite("images/held.png")
+        self.held_bg.alpha = MATRIX_BG_ALPHA
+        self.next_bg = arcade.Sprite("images/next.png")
+        self.next_bg.alpha = MATRIX_BG_ALPHA
         self.matrix.sprites = MatrixSprites(self.matrix)
         self.on_resize(self.init_width, self.init_height)
 
@@ -314,6 +319,8 @@ AGAIN""".format(
 
         if self.state in (tetrislogic.State.PLAYING, tetrislogic.State.OVER):
             self.matrix_bg.draw()
+            self.held_bg.draw()
+            self.next_bg.draw()
             self.matrix.sprites.draw()
 
             for tetromino in [self.held, self.current, self.ghost] + self.next:
@@ -334,7 +341,7 @@ AGAIN""".format(
             ):
                 arcade.draw_text(
                     text = text,
-                    start_x = self.matrix_bg.left - STATS_TEXT_MARGIN*self.scale - self.matrix_bg.width,
+                    start_x = self.matrix_bg.left - self.scale*(STATS_TEXT_MARGIN + STATS_TEXT_WIDTH),
                     start_y = self.matrix_bg.bottom + 1.5*(2*y+1)*font_size,
                     color = TEXT_COLOR,
                     font_size = font_size,
@@ -406,6 +413,14 @@ 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 [self.held, self.current, self.ghost] + self.next:
diff --git a/images/held.png b/images/held.png
new file mode 100644
index 0000000000000000000000000000000000000000..919e7900facb2da01e07ebeabb2ff3aa28b4fa2c
GIT binary patch
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+

literal 0
HcmV?d00001

diff --git a/images/next.png b/images/next.png
new file mode 100644
index 0000000000000000000000000000000000000000..741bfb23aa8b26c6fd2dd41e0c63c350c30b4509
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/tetrislogic/consts.py b/tetrislogic/consts.py
index 8f1923a..f291545 100644
--- a/tetrislogic/consts.py
+++ b/tetrislogic/consts.py
@@ -17,7 +17,7 @@ AUTOREPEAT_PERIOD = 0.010   # Official : 0.010
 # Piece init coord
 CURRENT_COORD = Coord(4, NB_LINES)
 NEXT_COORDS = [
-    Coord(NB_COLS+6, NB_LINES-4*n-3)
+    Coord(NB_COLS+4, NB_LINES-4*n-3)
     for n in range(NB_NEXT)
 ]
-HELD_COORD = Coord(-7, NB_LINES-3)
\ No newline at end of file
+HELD_COORD = Coord(-5, NB_LINES-3)
\ No newline at end of file