From 950fd858c6f9fe6c4650220682c7f339c8194e27 Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:02:25 -0500
Subject: [PATCH] timer box added

---
 .idea/misc.xml                                |   2 +-
 .idea/word-hunt.iml                           |   2 +-
 Main/__pycache__/board.cpython-310.pyc        | Bin 3296 -> 3318 bytes
 Main/__pycache__/game.cpython-310.pyc         | Bin 3489 -> 3500 bytes
 Main/__pycache__/setup.cpython-310.pyc        | Bin 2096 -> 2118 bytes
 Main/__pycache__/tile.cpython-310.pyc         | Bin 2377 -> 2399 bytes
 Main/__pycache__/timer.cpython-310.pyc        | Bin 1119 -> 1599 bytes
 .../word_connector.cpython-310.pyc            | Bin 1861 -> 1883 bytes
 .../__pycache__/words_display.cpython-310.pyc | Bin 3732 -> 3754 bytes
 Main/game.py                                  |   2 +-
 Main/timer.py                                 |  11 ++++++++++-
 11 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a4652f3..d8a3dd8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (venv)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (word-hunt)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/word-hunt.iml b/.idea/word-hunt.iml
index 7efdecd..a3fe4f9 100644
--- a/.idea/word-hunt.iml
+++ b/.idea/word-hunt.iml
@@ -5,7 +5,7 @@
       <excludeFolder url="file://$MODULE_DIR$/Main/venv" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (venv)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Main/__pycache__/board.cpython-310.pyc b/Main/__pycache__/board.cpython-310.pyc
index d6f0cae572b428c499ff5a12ee4d2de00d971e20..8f37252d064ad83dc1306458531ecbebef240ac0 100644
GIT binary patch
delta 55
zcmaDL`Aw25pO=@5fq{YH+O&;al}vKx&Q>v@#i>QbF^MU;`FSxe`N^fZsd**EG47cq
K9-F(FLb(9t5)x<t

delta 33
ocmew+`9P8@pO=@5fq{WR_0&eLN+u3P7poZe%#w`F3z<T>0G1^Q4*&oF

diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index 186ed23bc977075391b726a3481a9c2cdcf4df8f..851c75d07bb0e7c07e411a5164b3e8db12ed3820 100644
GIT binary patch
delta 284
zcmZ1|y+)cZpO=@5fq{YH^RtHJ|AHI&_AxT<*?g99BO}*BCUJ&l#u|ort;v1Nm2zgz
zRxzQ)sYS&xi7C1Hc`+{e$)&lec_qa$?wKVXoB3Hp85y-VtFopuPF~G6i&1N{8@m~k
zvMU1vgC<jv8v_HwE!LFOoRY*M0R{#J2q6w)`EH)iS<lGk0b)l?R^hgn2nQ)<thmLM
zo>~&0k(!yFQF4p9B)?#CH=F$A25xaikI6H*gE+uOvlO{a{=}`!7&BRnr@|o=q?0Yu
w)yKy_yeI@@qBV#J1`&QBA^}9Cfru0kVGkm_L4+@eh?#tjr;pKfaxAY40NcGvw*UYD

delta 291
zcmZ1@y-=DjpO=@5fq{Wxm1aY-lF&xJeT<BUHlJnO$S6?5kfkNgu#icdp_#FUAzpiO
z2XiHdf{Rs*duB<-W_cD-Mn;{@rmX3VlXJP{CeLP@&1kUMoZXB`*^PmLL6fP-oq>Vj
z7HdjsPDx^s00RR9gb)X@{5DVEtY>8N1hFG0i*nnWMt~GER@~xBPc4bhNX<;oD7nR4
zl3!5d3Q}VXl4S`>O)j~`l9QTNQe+Pj^_;wzJBR~p8%vS<<iFg?jIomyc`6*jK+4%7
wU44A~!;3;eO07Xe2#D|p5nw~pK&%uH0XEGC#PS0Xv6FA|^f9_k&fs+c0Nn3KYXATM

diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc
index 34c28cf2aa5a7e90e43eb525e1639659909555c9..800458e329af3a0f5b2059fd6a639f2453d9dd37 100644
GIT binary patch
delta 56
zcmdlWa7=(ZpO=@5fq{X+Zc_b5?j_7}=FV0zp~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
MB_5l%Ggq<z0MfP+QUCw|

delta 34
qcmX>mut9)3pO=@5fq{Wxg<8W#?j_6|iY`_$?wKVSo6j;=vH$><YzcJ$

diff --git a/Main/__pycache__/tile.cpython-310.pyc b/Main/__pycache__/tile.cpython-310.pyc
index 45cfd25fe0feff68f4e4671701de1ea96910b3fc..44094fe81dc883e2e25cb41db4ee14ce47cfe7f0 100644
GIT binary patch
delta 56
zcmX>pbYF-&pO=@5fq{YHcuoCA?sZIZX3kbIp~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
MB_5j(GIg*40P`#p9RL6T

delta 34
qcmcaFbW(^rpO=@5fq{Wxg<8W#?sZHY3NBVL?wKVSo3Ar<umJ#`Ckf2}

diff --git a/Main/__pycache__/timer.cpython-310.pyc b/Main/__pycache__/timer.cpython-310.pyc
index 7dd974ea0b946be8ee890cce2b75c77a5a4fda77..95bcd967e30b66ae108800efc971473b2b15fd76 100644
GIT binary patch
delta 1113
zcmcc5v7d)8pO=@5fq{Wx%Cm;#E|!UW35;$N^Q8@<*iu-c*i%@eI8xYB*jpH)I8!)M
zI9nK^xKg-MxLX*axKnsicv~2vcvAR+88rDPF4N?B$<M&R@DgO&OO}aeWEle{zH;U%
z;jCfEVk+TkW@2QRtjj3F$UWJM(Z%f+Ye7+FUdb)4l+4`JyyDFKykbqJTP($?IcY__
z3=9k_8H&Ui7#Mz;J6pws7N-^!$0VlY=I6z@<R_QrrskCt$GB&fcuZc+s3O44z`#(<
z!N9=4!^p;{$0#uQE~8<62_wkbX2ul8W~LaXTBcg&6s85tHB2?k3z=$JY8bLu7O>W^
z%w|YoE@8`JU&vg;5YJJ<nF5kws$ooFm1dA&XlANmh-XS+2xib^^DE+HU|^`?t+p~S
zN~yJiP$5N(3=9mJFPIq^G`ViErDT@n=BM0Z&de*(FXCfhV7SGWmS2>cSW*NEm?8lN
z28JR*5FrF2gh2|Ja}z5xS&PIb?_rXw2YDFm>mmt|99wBYN@7VWNC((^B8)tYVvJIZ
zRXib?xv52Z5b0!)6F?CN!XP#~0|SFIC`e2g7#K<z7JvgHiy7o)2?kK0WU<yTWU(z^
zU&xRGl4B8J5C@5~)i2;!$gq$lm_d`t?<Erh1A``K5h!eLu>_?imw;pC7GuRN*37)(
z)RJ3_l|^75aHgl0#FuBLlw{oE0x>gEGt)ClG#QJ;K%PYN5(h{{QEGAtNW2(ihY4d9
zAH+N9?5QR3Ai0U>rRt-=ZqH)OVya;*Va{TyVOYSr5bVkn#$Faih7tz296MZ&1LUt1
zre0P?h8o5NpmfJo!;r-V_Ahq|b1&mUCPoHubh7wqGT!1%$}dVuEs8HnOvx+-r9M`$
zH;ObF80r}`8E>(d<QL?mrj=;&K!YKrD6#w&3&@G!XuQSc<LT}Z67L@57+ItNiZSlg
zl=M`ndAB%S9D}^UlDAlsQmayPZm}fgWR`$K4IG%7OyDrO#Zp{alm>}+P_Td^UxlGa
zhk=1X3KWfO3=9l1j0%i$j8$BakOH~GPm_1@MrPGCPy~UK*DV&e{JfGP6;P<_g9t+q
zAqgTBKm^EvU_+5?f?3B<#LU3Jzyh)jlr%XQ_!wE3SQuFtIhZ)uIM{fYCo8asYJpWF
a2yhzZu*uC&Da}c>1EsuTkO>?NLd*b{i~t1y

delta 653
zcmdnbbDx7RpO=@5fq{YHuU13y2BwL835-S)^QC1{SXvmO*iu+i*jgB(*i+b3I9eE@
zI8r!+88o>j?$Vt2Ns7^BGB2a^<QPU7M$XBVj4ra8Ot)ByQ*+XaK<2GvC=y~|VECoz
zVin__S&}iCnMs9@oq>U&n2mvffrpWe(P*+clVN=dV+}(VV+~^plQe?_Lo-tiLp);%
zQwcLjw3#u5xtS@3sg|jhIfZ2bOAS*E^FpRtmKugE)&*=eEVCI>SWDQmI2JP3FvN4F
zFa$GbviTJ;GB7Y?zF=lxC<573#anG<V3bm81))MTxo$D%CRP-2GcYjRVoTA_EX&PL
zxy78BS8|IjEx#x?v80HHfq|ij7ew%Z2!0SDz`($u$yy{hS&Uh(9^^5w?}~)Mrj!<>
zB$lLtv=wtOFffQQiZJppN-<XPgk<KX7U@BxlbJxF48<Te$aT)30Fh&0V5nhSzyR_x
z2xl?XFk~^OF!nMoWMX6hdyC0WlkpaNNq#|2YFbHzCd)0Bq@2u>B9N<Yaiph~#22L|
zmw>}vlc`7$<S3Tn(xNnoBf-uEyObrRD6t&GEe1J2j<Jdh;zE$HpC;$zQdU(jkPpB?
zaErw)Kd+=n1mt~b5TO7fK)TV4En;S1U|<3H1QhWc41A0nOdPB{Y?IhTwXi6^#bJ}1
TpHiBWY6ps`Vvt4-1|enu@W_QQ

diff --git a/Main/__pycache__/word_connector.cpython-310.pyc b/Main/__pycache__/word_connector.cpython-310.pyc
index e4da1227ac47bb17e62f70e2bee295e727b1cd0f..4d258cd58aa32ffcfa0bff51e65c819f64fe547d 100644
GIT binary patch
delta 55
zcmX@gcbktZpO=@5fq{V`dgewh9Y#3^XRDad;?$zzn8cLa{Ja>K{N&Qy)Vz}7828K)
KkIi<B>}&wFJ`leE

delta 33
ocmcc3ca)DSpO=@5fq{WR_0&c#9Yzi<7poZe%#w`FA&l&70ET)8-T(jq

diff --git a/Main/__pycache__/words_display.cpython-310.pyc b/Main/__pycache__/words_display.cpython-310.pyc
index b4b7b646cec561affd509f00796f30671bef0c03..be2ef95b818154bb547cc3ac7a6c017f5350c9fc 100644
GIT binary patch
delta 56
zcmbOtyGoWjpO=@5fq{X+Zc_b5?wgEq_Rdx@p~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
MB_5mKFs|SM0M-f;*#H0l

delta 34
qcmZ1_J4Kc|pO=@5fq{Wxg<8W#?wgDpnl4r`?wKVSo0*ta@BjdlMF{->

diff --git a/Main/game.py b/Main/game.py
index dbbba98..097563a 100644
--- a/Main/game.py
+++ b/Main/game.py
@@ -49,7 +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.word_disp_separation_distance))
+        self.timer = Timer(self.unknown_word_display.position + pygame.Vector2(0, self.unknown_word_display.get_rect().height/2 ))
 
     def update(self, delta):
         self.word += self.board.update(delta, self.bg_colour, self.points)
diff --git a/Main/timer.py b/Main/timer.py
index c7b1b0c..af755b0 100644
--- a/Main/timer.py
+++ b/Main/timer.py
@@ -4,16 +4,25 @@ from setup import *
 class Timer:
     font = pygame.font.Font("font/Silkscreen-Regular.ttf", 30)
 
+    inset = 15
+    edge_radius = 10
+    bezel = 4
+
     def __init__(self, position):
         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):
-        self.time = max(0, self.time - delta/1000)
         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)
+
+    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())
 
     def draw(self, surf):
+        pygame.draw.rect(surf,Colour.LIGHT_GRAY,self.get_rect(),border_radius=self.edge_radius)
+        pygame.draw.rect(surf,Colour.DARK_GRAY,self.get_rect(),width= self.bezel,border_radius=self.edge_radius)
         surf.blit(self.text, self.text.get_rect(topleft =self.position))
-- 
2.54.0