From 8c0a997eb1897cd1f3a97d2a7f76cae06dafa6a4 Mon Sep 17 00:00:00 2001
From: Skullheadx <704277@pdsb.net>
Date: Thu, 24 Nov 2022 21:43:00 -0500
Subject: [PATCH] timer added

---
 .idea/misc.xml                                |   2 +-
 .idea/word-hunt.iml                           |   2 +-
 Main/__pycache__/board.cpython-310.pyc        | Bin 3318 -> 3296 bytes
 Main/__pycache__/game.cpython-310.pyc         | Bin 3367 -> 3489 bytes
 Main/__pycache__/setup.cpython-310.pyc        | Bin 2118 -> 2096 bytes
 Main/__pycache__/tile.cpython-310.pyc         | Bin 2399 -> 2377 bytes
 Main/__pycache__/timer.cpython-310.pyc        | Bin 0 -> 1119 bytes
 .../word_connector.cpython-310.pyc            | Bin 1883 -> 1861 bytes
 .../__pycache__/words_display.cpython-310.pyc | Bin 3754 -> 3732 bytes
 Main/game.py                                  |   5 ++++-
 Main/main.py                                  |   2 +-
 Main/timer.py                                 |  19 ++++++++++++++++++
 12 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 Main/__pycache__/timer.cpython-310.pyc
 create mode 100644 Main/timer.py

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d8a3dd8..a4652f3 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 (word-hunt)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (venv)" 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 bfd0b6b..7efdecd 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 (word-hunt)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.10 (venv)" jdkType="Python SDK" />
     <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 8f37252d064ad83dc1306458531ecbebef240ac0..d6f0cae572b428c499ff5a12ee4d2de00d971e20 100644
GIT binary patch
delta 33
ocmew+`9P8@pO=@5fq{WR_0&eLN+u3P7poZe%#w`F3z<T>0G1^Q4*&oF

delta 55
zcmaDL`Aw25pO=@5fq{YH+O&;al}vKx&Q>v@#i>QbF^MU;`FSxe`N^fZsd**EG47cq
K9-F(FLb(9t5)x<t

diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index b47c4e2aabc74fa44ded3314e5b4f0689b42d9dd..186ed23bc977075391b726a3481a9c2cdcf4df8f 100644
GIT binary patch
delta 1078
zcmZ23wNRQbpO=@5fq{Wxm1aY-lF&px8OFGY+Rh3o3@Pk6T)Es)+>8wF3@IEboGlC~
zoXt#8JSmL944PaMo18f{8E>(MWag$8O+5OE@zCZSj8hqHO4Mr@vedFvN<<cjrm%t7
z3p5roWND^wNHf$hWNC>rEMyXAXlAToh}TYG2xia}^wVT|$-=<EP{cnumN{NX0K^0l
zzZ6`oV%#%JGA2J^R%Mi#%*7JI#siY%o1DU8Wg-J&GJ*(@;vx|^3(OT~U|_h#Ws{Pb
zT#}rhTVSUJl9rr&iA9}JXY(%>e@5{lc90T|^wg60qSWM)TWlGrnduoNlfQGxv)^JZ
z0eNe(C!3wJ7)U4BOfUg9m?J(uGcU6wK3<Z6fuY!F@+vk%W;I5G$#>Ya7?n1&vx_qN
z)-YsAEnuo)T*%1C0QM)lUlG{#ASb^}0U0U_BIFqu7(z6qi!4DLbC8qRN()jFOHzyM
zKq9&z!gg{jhqkFPNRl--zqB~@7B|S*1x2aF#i=PpnjkegAX(<bl$0V15R0`awK%n;
z$Z7Ik4g*&!kOF-WVE`fwL4*y6aARO#&}1rd2kS^l%_&JN0(%lnfP7ly$H2f~2J)oJ
zWL-{W7BMCP#>qjP>Wu#;S8;w6tzpQLUBH6mNjASC*~ukbiUOV><0C-?FUStL$xFEu
z#K7KTNhwM!F9KWd43dwS{D4cmzQ`5C278eu2oxPGIjLzSMfM<3uvso3H?n|Y3LG%E
zxKmToQ{#&gQ!-17i$LDG#p&W0<Q?xG<QRF2H7T_!HRl#fQch+`krBuYkROU{K`bW_
z0rofx#N#Z*rA0PrMN$k53{lKU=|$*45X->85CjSWP)guo<Y6*m)L@iglwss!RAS^|
z;$fV8g4?_v<n$s?K;L3<%g-w*(gRrob{DIAkgKa-Q5eVrY>}=$KK|iFp&(gn5D@|*
z{6Pdb1kyk(aOwbi-3P=4#X%9s6-X{a#1IDq0|OVs<T@TT9$6llA`n-Tx5#+%1|BhP
zP=FVK^Oo)8i#)QfAa8@yJy;nw<8E=-<mRW8=A_zz(rGcs8V&{yCLTr@6k-AZk#OXe

delta 925
zcmZ1|y<CbfpO=@5fq{YH`NaBUCBcb&GK@hJwVg%W8B*9&I9eD|IGUNFxKbE{88kU3
z_Bl_y^@(xX=Ch1b83j@pf*CXg{WO_gvM?|(6!A@-#~iQ04`PCdUuMo$F`>n&Ma40R
zDY^N1F)sPZrManjCB-rBnI#^R`B_xCq!}0(J~J^eFo;e5&muiJlEr|H8>F9iazBfe
z2}rhx5yS_XS0oH)fw^J~3=FrpY*I3lOOo?*3+yyO(h`&ZvZynvZ&qdXXPmr|%}!Yq
zBnnm!Ccv6F;^Q;(GE3s)B^VeOiVY?Uu^TdKO?G3~Vien4$S%t02=*AeUlG_XAP2lm
z0U09$BIFnt7(z6qiY!1JGmsnDN()jFOHzw$K_WUJ!e;Vi4sAxG$^SVdWHdkm+8}kz
zi76>X<{%bpQEG8&Ns;4ZV@?AHOOOIR5TOqu3_yf60|SF5Q;`!`aY|}VNn#P$`CtO%
zhayh~1_l$5^OYvA;8bRkVw!xOQ=ReC<nNpxIl<0n^DB~>{Fh5nzy)Mr2#DYTnJPP3
zk6XbA>~NNpqQvqdkX^Sp(o;*~i&B$Iih@CQGFIH;0*Pd#W~OJ9++r@tFPPlTCU0A0
z1d?S5N=+`g#gdbnR#IdKG8kmVEjFlP7O*j(z_`Vonv$LxUzC`VSz27AKY16ojEf;i
zy(x&W0TGTMC$T_0%2HfflvX6kz`zj2oRnUK?&Ams1_pnSk3}ZS^N3D1<1w!Xxuysd
zez#cM^7BfHbU{XfLh%->dyuQEUr`{)xonZHK0f~8MFAjLD-Z!PrpOD#iUkqi$V~#V
zz`k(@u|VNl1hNvz8HmtlXJBC9WSIPhM~z2@N4f~a)#NTRnk>gF#tjPEB5;PVnQYH1
lYYCFXX2>lLo80`A(wtN~Pzo#NV_;z5VBlclVT3>-CICU%$5sFU

diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc
index 800458e329af3a0f5b2059fd6a639f2453d9dd37..34c28cf2aa5a7e90e43eb525e1639659909555c9 100644
GIT binary patch
delta 34
qcmX>mut9)3pO=@5fq{Wxg<8W#?j_6|iY`_$?wKVSo6j;=vH$><YzcJ$

delta 56
zcmdlWa7=(ZpO=@5fq{X+Zc_b5?j_7}=FV0zp~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
MB_5l%Ggq<z0MfP+QUCw|

diff --git a/Main/__pycache__/tile.cpython-310.pyc b/Main/__pycache__/tile.cpython-310.pyc
index c274cebdb90fae9b13ce7eb127f94d1fbd0428bb..45cfd25fe0feff68f4e4671701de1ea96910b3fc 100644
GIT binary patch
delta 72
zcmcaFbW(^rpO=@5fq{Wxg<8W#?sZHY3NBVL?wKVSo3AsiWnsKExs`njqv>QT4nJ-y
a1_p*ABM@Oec`}DNqv>RQPVvc)IBEgh)D!>!

delta 90
zcmX>pbYF-&pO=@5fq{YHcuoCA?sZIZX3kbIp~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
sB_5j(GOcA{jGCO!zJ<|bvI>VEw<QAuLy-}PFq>S<Va{kWc`L^h01USqk^lez

diff --git a/Main/__pycache__/timer.cpython-310.pyc b/Main/__pycache__/timer.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7dd974ea0b946be8ee890cce2b75c77a5a4fda77
GIT binary patch
literal 1119
zcmd1j<>g{vU|{&G)sVb_iGkrUh=Yuo85kHG7#J9er5G3(QW#Pga~MJx+!<1sQkYv9
zQka{Wq8L+Hf*CYfUxIXLGTvg;N(QlzF$>HLBL)VBRE8+V6ox3KROT#}1*|EIDNGBQ
zqF7RxQ&?IUqS#VcQ`lM<qS#Z|Q#e`}qBv4GgBdirZn1`B=B5@^NvGxKmFNd&=42Nq
z7p11==?0~ym*ylE>6MhEy_92MU`S>{vKPc=XJBA(207n_fq|ifVF6<e<3h$7hIpnF
z5XoG_0CGePLl$!ilN7^j29Pr#JTV3_hS>~rnNwIx*s|CcGS@J~bEGf?Gib8;y{uqh
zV0dZ6z`*c}(W;6?RnI6bM3eItTR~-dVs7d!_OR6ClKdj0TO0-X#hE3U`FXckN-}d(
zZ?S+}e~YasH7_N#=oXuEeolUA(JfXdA4g~JTP!816(yQXw^)i(bJB`Hak7%3NC;$y
zqKj3GduB;SX;Msieo=~UMrmG2jBjFQUJS_8BE5pjTO9H6nR%Hd@$n$<7PB!hFz_(4
zF&Z&e@qxol4<?NgJgf{13?K{+o&a$0fC43pv4$~)Nt!`|p_!?MA)c{>sRR^EjLnRo
z*p6YUWvXRPVOhXZ!&Jk(kg1lXh9Qe}0b32rY=#up680<(a8PkVgQ|#;fq^0O1v3Lf
z5y(|lywz3)Mk%#c5Gq8I>lSlvVnq=*0|Ub?wv^1W-29YV%$a#5x7gD1i*gf7ig*|p
z7>am71Rsdt2N41c3=EpAMS>trtSPBEC5cfixtV#zQ7px&$;G!=!NCF!I|v~RQpi?X
zkdj!E3No*lgMooTj8TM<hf#{LiU$%z5NVVE0;M02tHA*TN?kRK3m9q`vKT=)iwT@g
z7<(BPGBGlMz02gM$#{#sB)=dhHLXOG<rYg)PG(6F$hEgP(o;*~i&B$Iz%i@I1aUk|
zacNN+#EqbsE&@B0C8a2_9K<aK*)PXf#RYL7NZ3!46BO5ZiMgrq@wd3*<8$*<N^?ML
zp7{8}(!?ByOcBU~;Gnz3;+CIRQX~QjHfa!{03tx9qgh)7%IBbbS`12h91MJn984Un
pJZxZbKTW1vti`D%r3GLvl2))uU}tmKK-^*nit%EQNgND9%m6f%`H27k

literal 0
HcmV?d00001

diff --git a/Main/__pycache__/word_connector.cpython-310.pyc b/Main/__pycache__/word_connector.cpython-310.pyc
index 4d258cd58aa32ffcfa0bff51e65c819f64fe547d..e4da1227ac47bb17e62f70e2bee295e727b1cd0f 100644
GIT binary patch
delta 33
ocmcc3ca)DSpO=@5fq{WR_0&c#9Yzi<7poZe%#w`FA&l&70ET)8-T(jq

delta 55
zcmX@gcbktZpO=@5fq{V`dgewh9Y#3^XRDad;?$zzn8cLa{Ja>K{N&Qy)Vz}7828K)
KkIi<B>}&wFJ`leE

diff --git a/Main/__pycache__/words_display.cpython-310.pyc b/Main/__pycache__/words_display.cpython-310.pyc
index be2ef95b818154bb547cc3ac7a6c017f5350c9fc..b4b7b646cec561affd509f00796f30671bef0c03 100644
GIT binary patch
delta 34
qcmZ1_J4Kc|pO=@5fq{Wxg<8W#?wgDpnl4r`?wKVSo0*ta@BjdlMF{->

delta 56
zcmbOtyGoWjpO=@5fq{X+Zc_b5?wgEq_Rdx@p~b01#W9H~x%qi9F8Rr&xv6<2#WC)g
MB_5mKFs|SM0M-f;*#H0l

diff --git a/Main/game.py b/Main/game.py
index cddbd90..dbbba98 100644
--- a/Main/game.py
+++ b/Main/game.py
@@ -5,6 +5,7 @@ from tile import Tile
 from board import Board
 from word_connector import WordConnector
 from words_display import UnknownWordDisplay
+from timer import Timer
 
 class Game:
     font = pygame.font.Font("font/Silkscreen-Regular.ttf", 40)
@@ -48,6 +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))
 
     def update(self, delta):
         self.word += self.board.update(delta, self.bg_colour, self.points)
@@ -75,6 +77,7 @@ class Game:
             self.bg_colour = self.correct_colour
 
         self.word_display = self.font.render(self.word, True, Colour.BLACK)
+        self.timer.update(delta)
 
     def draw(self, surf):
         surf.fill(Palette.primary_shade1)
@@ -89,7 +92,7 @@ class Game:
 
         self.word_connector.draw(surf)
         self.unknown_word_display.draw(surf)
-
+        self.timer.draw(surf)
         # pygame.draw.circle(surf, Colour.WHITE,r.center,5)
         # pygame.draw.line(surf, Colour.BLACK, (0, SCREEN_HEIGHT / 2), (SCREEN_WIDTH, SCREEN_HEIGHT / 2))
         # pygame.draw.line(surf, Colour.BLACK, (SCREEN_WIDTH / 2, 0), (SCREEN_WIDTH / 2, SCREEN_HEIGHT))
diff --git a/Main/main.py b/Main/main.py
index cb2310f..a3eac68 100644
--- a/Main/main.py
+++ b/Main/main.py
@@ -1,7 +1,7 @@
 from setup import *
 from game import Game
 
-puzzle = f"puzzles/PuzzlePack{4}/puzzle{10}.txt"
+puzzle = f"puzzles/PuzzlePack{4}/puzzle{12}.txt"
 print(puzzle)
 scene = Game(puzzle)
 
diff --git a/Main/timer.py b/Main/timer.py
new file mode 100644
index 0000000..c7b1b0c
--- /dev/null
+++ b/Main/timer.py
@@ -0,0 +1,19 @@
+from setup import *
+
+
+class Timer:
+    font = pygame.font.Font("font/Silkscreen-Regular.ttf", 30)
+
+    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)
+
+    def draw(self, surf):
+        surf.blit(self.text, self.text.get_rect(topleft =self.position))
-- 
2.54.0