From: Skullheadx <704277@pdsb.net>
Date: Fri, 25 Nov 2022 02:43:00 +0000 (-0500)
Subject: timer added
X-Git-Url: http://git.skullheadx.com/index.js?a=commitdiff_plain;h=8c0a997eb1897cd1f3a97d2a7f76cae06dafa6a4;p=word-hunt.git

timer added
---

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 8f37252..d6f0cae 100644
Binary files a/Main/__pycache__/board.cpython-310.pyc and b/Main/__pycache__/board.cpython-310.pyc differ
diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index b47c4e2..186ed23 100644
Binary files a/Main/__pycache__/game.cpython-310.pyc and b/Main/__pycache__/game.cpython-310.pyc differ
diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc
index 800458e..34c28cf 100644
Binary files a/Main/__pycache__/setup.cpython-310.pyc and b/Main/__pycache__/setup.cpython-310.pyc differ
diff --git a/Main/__pycache__/tile.cpython-310.pyc b/Main/__pycache__/tile.cpython-310.pyc
index c274ceb..45cfd25 100644
Binary files a/Main/__pycache__/tile.cpython-310.pyc and b/Main/__pycache__/tile.cpython-310.pyc differ
diff --git a/Main/__pycache__/timer.cpython-310.pyc b/Main/__pycache__/timer.cpython-310.pyc
new file mode 100644
index 0000000..7dd974e
Binary files /dev/null and b/Main/__pycache__/timer.cpython-310.pyc differ
diff --git a/Main/__pycache__/word_connector.cpython-310.pyc b/Main/__pycache__/word_connector.cpython-310.pyc
index 4d258cd..e4da122 100644
Binary files a/Main/__pycache__/word_connector.cpython-310.pyc and b/Main/__pycache__/word_connector.cpython-310.pyc differ
diff --git a/Main/__pycache__/words_display.cpython-310.pyc b/Main/__pycache__/words_display.cpython-310.pyc
index be2ef95..b4b7b64 100644
Binary files a/Main/__pycache__/words_display.cpython-310.pyc and b/Main/__pycache__/words_display.cpython-310.pyc differ
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))