From 48608dcd255c3c7033d94bafd27720208155087a Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:30:56 -0500
Subject: [PATCH] timer moves with word display

---
 Main/__pycache__/game.cpython-310.pyc         | Bin 3500 -> 3570 bytes
 Main/__pycache__/timer.cpython-310.pyc        | Bin 1599 -> 1615 bytes
 .../__pycache__/words_display.cpython-310.pyc | Bin 3754 -> 3775 bytes
 Main/game.py                                  |   5 ++---
 Main/timer.py                                 |   6 ++++--
 Main/words_display.py                         |   7 +++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index 851c75d07bb0e7c07e411a5164b3e8db12ed3820..e54377ff2c48516249daf751a53804677453c9aa 100644
GIT binary patch
delta 229
zcmZ1@{YjcHpO=@5fq{Xc|7}C^LZOX(`xqH_Y(C4lmT_|(^A2W4waMn}id-NS&I}9;
z#eSQU*ku{@Y8bKvv!qKn7s#YAf!GUV7cykYfmm7c5)3sASqdpE(hTAZ3z<N8awCTd
zqvGUc9H%9V92giFicCNR$h;yK5X+u{fnjnExBTQnP9;Xu$x}GB7;QH1=L}_JjGQdW
zZ7&<az`$^evEmk2dTL30MrvkyM#(MalKg_AFp$P>?y0P?3=9l`lT~@9GKNjw%_GYg
PJNYJ$3!}_rIo>`1Dq%Yp

delta 186
zcmew)y+)cZpO=@5fq{YH^RtHJ|AHI&_AxT<*?g99Eh9?`hcv_HD&`%`j9Qb8*%i6i
z85kIx85kIfl{Uw*%Q7-8WSqQ`LxoX#@;Q#vlP_{AF`7;O!l}h5uvwlfl#wxFaw)gH
zc{l?D!!5>&TU_a>CGi=lnduoNx0p-v3vS7l=NF~Kr(_lv#22R)Bo-x>Waj6A_$7&X
n$*Gesa!+NAVPIegnw-rul`&y5Bd;uD%w&097e?91DZG6Eb3i$_

diff --git a/Main/__pycache__/timer.cpython-310.pyc b/Main/__pycache__/timer.cpython-310.pyc
index 95bcd967e30b66ae108800efc971473b2b15fd76..029c675b6049c897dcb27059381ee5b73fe6b1d4 100644
GIT binary patch
delta 562
zcmdnbbDoDcpO=@5fq{V`<!wXq>WRFvdP*P;LkeRKLli>_Lkd$4V+eygLke>WOAA8^
zOEXgxQwn1+gC^@skS@Q8{(Bi+Ci5~nPmW=fVdR`#$><`e$#jdQI5j7&h?jwZVI@P6
z=;VitZmA$nF&hH|0}mq`qY+~jUr1(dYLQ-id}dx|Nql@VGsrwB1}S4@U|?`&U|=YY
zVPIe=VJKm&VaQ@?W=vshW{P2|Wv*pOVOqdk!(79%kg1lnh9Qe(0c#EG<US@9o)WGF
z+%-%K8EY8gc_wdSQfK6ye2d9Ksfe3_fuV>8M1b6)$yOx7z`$^eH6=BtBoXY^$qLLO
z8loTtU_uNe%~o2Fl30=|2yzK1phOsX7{wUH7zHLrF)x<`nNS2)3?{%jIMP!~;)_y~
zOC%=Cvut2gpL~JEm{Dyq3#+L-Nck<6;?kltG)+ZX3=9m?lOtGz>OtXOqziI{K8O$p
z5pp0x4Mc#{A?bzNS_BF{P_PvXF)%Q2Fz_+5FtISQFmf<)uyC;RFoWeanZaRji?ukl
jq_hAmgkhEp$kQA)x%nxjIjMGxAa8?=<zV1o5@H4b-*jaT

delta 568
zcmX@lv!91IpO=@5fq{Wx%Cm;#u8F*|s!|LL3@HpLj5!P;4DJjmOexGQ3@OabOi_#}
zEWr$#tS>>TCr0dL445p&=*&~XS;LUURKnHF#K<r?l2L|{dvY10i^?t5f}+g4l3QFU
znYpQX#hLke#hOgFSc+3~(u#N)7#LPE6p2qh&FEIo&A`A=%)!9Gz{AMKsK+S4Sj88T
znVVXq7ayOQmst`YpUecZ5Q<qD7#Kj<8Kf(Kfq|ifp@b3SfM&)N#%87%rdp<2<`kv{
z%r#6k%nO-nS!x)vSQfC>u*_yiVJ>0IVqeHy!w}C=!kGe+VX9%A+{eT-c^Q*BBiH0}
zOcoxRtVLoB3=FqeQ&MwE5~EmhGxLh0Sc+4Vi*K=(fSgq%&cMI`AtXQw*-8si5=&AA
zLGA(hLWGfrQH)V)atiZuIgm*ZrC?29^&IJ`CGkb6$tB{GHCZ+=YEHhzV$7&9nUB>}
z9;EyhOL1vY8k(je9R>ylsmV#KK{hHN+x0<&A&8I!5egte14Mw-A?bzNTExu2z`!#3
y1FNVD8wVQ?GnntE$#jdgIJKm-0L;av?-qwmZhlH>PO2Rv$bT#h3=A9$Ld*cUJaz8?

diff --git a/Main/__pycache__/words_display.cpython-310.pyc b/Main/__pycache__/words_display.cpython-310.pyc
index be2ef95b818154bb547cc3ac7a6c017f5350c9fc..54149a84fedb7288207a5074b2563b645879af6f 100644
GIT binary patch
delta 357
zcmZ1_yI+<spO=@5fq{WR>TN@E0N+Hu?~Eyv4|0f3mS*JjRj6gIVX9%4WJqDmW+~FI
zVaQ@xz*@tQ#kPPwg{g)iiy0(0n<0fcg{6jBgkd(rT$U8p5{@j+h0F^X85s)sQy797
zG}-)$7#SECCZ{l-7ZG4!VBle7V`O9GV&q{oU}S1w`M24bNr#b9U~&QT4o3dPnk<Zr
zQj@h<TNq_0uV?LKl-z8|rpm~uHaVVs4kO3rKkUAY%)c1*C;M^EW^|pb$R^Ax&cMK6
zKADMYx_OZ^0|P^dCRdR!0|P^m5{Qrm5pE#D3q*kIFY*Mj1VMy1i13+wj!T2lVe)sb
zwTv#4mvU=z`+$UXK!oq)o7_f>uA6yyxEL8-CX4g>h=cUpVoge|O3i`TV+>O0Gr5Y_
Zk<n}N9$s%ougM&I_KXITJ@^tCbpXWTO`QM$

delta 328
zcmdllyGoWXpO=@5fq{X+Zc=^ndfthA-x(t&voR{!NYygeFl4bTV69=uVq3tT!dSzQ
z#azQI$uOHCg(-!(hFOGRHp5(&6qXW>EY5|@3mF+13i(qQf*CYf{U(<(o)_R@U|`^3
zWMgDw<YF{pWcj~2f=P#wk$-Y4^A1M7#da)=jFOY>Sz8!oCLdw#WR%$K$EM22s5-fX
zeGVi0W<d^LM%F531$~9diJY?;T_*qK6lXM>EXp<A^cSOkh$dH&4+8^3krIfI1re?w
z!V^RYfCvu|AqXP8K!o??$6OkW_LF(I*D^X!-o>rS?F|yv0TDiv-*Fo;x@=bD;bLTT
yo~*;`BM#DYi!~{=Dm4dUk1<H0_vC(FM@G-d7kRxIJtxcZ*)!@-j^#^a)CK@J-AOJ0

diff --git a/Main/game.py b/Main/game.py
index 097563a..c71c26f 100644
--- a/Main/game.py
+++ b/Main/game.py
@@ -49,8 +49,7 @@ class Game:
         self.word_connector = WordConnector()
         self.bg_colour = Colour.LIGHT_GRAY
         self.unknown_word_display = UnknownWordDisplay((SCREEN_WIDTH*2/3-UnknownWordDisplay.inset,self.board.position.y),self.word_frequency)
-        self.timer = Timer(self.unknown_word_display.position + pygame.Vector2(0, self.unknown_word_display.get_rect().height/2 ))
-
+        self.timer = Timer(self.unknown_word_display.position +pygame.Vector2(0,self.unknown_word_display.get_rect().height))
     def update(self, delta):
         self.word += self.board.update(delta, self.bg_colour, self.points)
         self.word_connector.update(self.board.grid.last_selected, self.colour_converter[self.bg_colour])
@@ -77,7 +76,7 @@ class Game:
             self.bg_colour = self.correct_colour
 
         self.word_display = self.font.render(self.word, True, Colour.BLACK)
-        self.timer.update(delta)
+        self.timer.update(delta, self.unknown_word_display.position +pygame.Vector2(0,self.unknown_word_display.get_rect().height-self.unknown_word_display.inset + self.word_disp_separation_distance/2))
 
     def draw(self, surf):
         surf.fill(Palette.primary_shade1)
diff --git a/Main/timer.py b/Main/timer.py
index af755b0..db6389f 100644
--- a/Main/timer.py
+++ b/Main/timer.py
@@ -1,3 +1,5 @@
+import pygame
+
 from setup import *
 
 
@@ -12,12 +14,12 @@ class Timer:
         self.position = pygame.Vector2(position)
         self.time = 120 # 120 seconds
         self.text = self.font.render(f"{self.time//60}:{'%.2f' % (self.time % 60)}",True,Colour.BLACK)
-
-    def update(self,delta):
+    def update(self,delta, position):
         mins, secs = divmod(int(self.time), 60)
         timer = '{:02d}:{:02d}'.format(mins, secs)
         self.text = self.font.render(f"{timer}",True,Colour.BLACK)
         self.time = max(0, self.time - delta/1000)
+        self.position = pygame.Vector2(position)
 
     def get_rect(self):
         return pygame.Rect(self.position.x - self.inset, self.position.y, self.text.get_width() + 2 * self.inset, self.text.get_height())
diff --git a/Main/words_display.py b/Main/words_display.py
index 56d6c94..5ae382c 100644
--- a/Main/words_display.py
+++ b/Main/words_display.py
@@ -9,7 +9,8 @@ class ListDisplay:
         self.frequencies = frequencies
         self.display = []
         for i in self.frequencies:
-            self.display.append(self.font.render(f"({self.frequencies[i]}) {'?' * i}", True, Colour.BLACK))
+            if frequencies[i] > 0:
+                self.display.append(self.font.render(f"({self.frequencies[i]}) {'?' * i}", True, Colour.BLACK))
 
     def update(self, delta, seen):
         f = {i + 1: 0 for i in range(16)}
@@ -57,7 +58,7 @@ class UnknownWordDisplay:
         self.words_found = 0
         self.total_words = sum(word_frequency.values())
         # self.title = self.title_font.render("Word Bank", True, Colour.DARK_GRAY)
-        self.title = self.title_font.render(f"Words: {self.words_found} / {self.total_words}", True, Colour.DARK_GRAY)
+        self.title = self.title_font.render(f"Words: {self.words_found}/{self.total_words}", True, Colour.DARK_GRAY)
         self.list_display = ListDisplay(self.position+ pygame.Vector2(0,self.title.get_height()/2), self.word_frequency)
 
     def update(self, delta, seen):
@@ -81,4 +82,6 @@ class UnknownWordDisplay:
 #self.position.y-self.inset + max(self.title.get_height(),self.inset)/2)
 
         # pygame.draw.circle(surf, Colour.RED,self.position, 4)
+        # pygame.draw.circle(surf, Colour.GREEN,self.position + pygame.Vector2(0,self.get_rect().height-self.inset), 4)
+
         # pygame.draw.circle(surf, Colour.BLUE,self.list_display.position, 5)
\ No newline at end of file
-- 
2.54.0