From e5dda8936a005622fd6b5d83f3ac8726b0abf7a2 Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:17:58 -0500
Subject: [PATCH] logo added

---
 Main/__pycache__/game.cpython-310.pyc  | Bin 3570 -> 3593 bytes
 Main/__pycache__/setup.cpython-310.pyc | Bin 2118 -> 2174 bytes
 Main/{ => assets}/colour_palette.pdf   | Bin
 Main/assets/logo.png                   | Bin 0 -> 1544 bytes
 Main/background.py                     |  17 +++++++++++++++++
 Main/game.py                           |   2 +-
 Main/main.py                           |   2 +-
 Main/setup.py                          |   1 +
 8 files changed, 20 insertions(+), 2 deletions(-)
 rename Main/{ => assets}/colour_palette.pdf (100%)
 create mode 100644 Main/assets/logo.png
 create mode 100644 Main/background.py

diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index e54377ff2c48516249daf751a53804677453c9aa..8274f661699d71b86769b7a8f1c1eca85847dfaf 100644
GIT binary patch
delta 270
zcmew)-6_MH&&$ijz`(%3{;whV#YW!!jEtu?pJiOjC{x3brIw{E!BE4HrIo@V%^=RO
zkV%}OnX!f;UVC#3^BP7*oy~@<>5Ou+<@rS^@hO?b1@XnH1&Kw8C7JnoAbv?=UUKT>
z>1?wZEjAmoCows?F)%O`Ie-Wg5aA3WTtI|9h;U_KV9;bLa%W&*xW$^1np2WkBmfcz
z6XGD2-{udT^^A<3lMA?G8C@rz<CbFdocxkIhy!G>CQFg~WM`f^N?{-a*dkqheEh?U
kLP7ehK|~0M@COmDlNou1*?d4uzsXX(lNsG6uj6$A003`8c>n+a

delta 234
zcmeB_`6SJo&&$ijz`(%J|F$7{;YQy5jEp-rpJiOj$hDA3oS~Vqh9O>S^EBo)jEvfw
zomtZvC!b`S#i+J9g*}N$)|G*Qp~wM5n1Bdp5a9wM>=_ssCa+|ZXVGLTa+~~yQ;N}d
zGdov3BcsRUcJ5f2FpwH!1_p*(EJ3NsCAU~|QqxL`K$?m?Ch-JufXvloDRP?}#WTk`
y6r_$V($&YuKfEXeq|+Ki1cL}a5CJwV4a7<T5nyAyK`h_NhP;y*T_+#qbpZe{(l@vO

diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc
index 800458e329af3a0f5b2059fd6a639f2453d9dd37..524abc3af29794362089951fb6332221300a6685 100644
GIT binary patch
delta 195
zcmX>m@K1m@pO=@5fq{X+fvqvweIl<c<ClrrtNi&F2&Xb-i7a4GVPD9&kdcugl_^Vf
zf!IQZDDf1ID2Y_YEXgRTbcPhpMT}9>?hGkhDcmg#DcsFWQ8MlfDLg5>Eet8V%}i0U
zDU87kntYQ57%c>=_!EnZQ%j2VbMn*k^$PORH+wKHVPaI+{FeDC6Qj=L%WP(ha+A5(
xmkCC36sMNNXC~+8MX_e)CZ?xO-oT#4s5M!dL!M8Bk&BUqk&TIik&i=&2LMlPF@695

delta 137
zcmew-a7=(VpO=@5fq{X+Zc=?R$3$LP#s?F%S6K@$5Lw6&C7Qw>C6>yVB_1V_&XB^f
zh%rjiogsxYg{y@jg{zq<O3Ixfg*%0(g&~EfnJG#-g)x{xlXtQTqs8W2#wARQ@|%TN
qo-#3NPyWGX#wascpMBZnXY5&w8j}M#<axLlSs2-vI2idjgm?fuG9Uy1

diff --git a/Main/colour_palette.pdf b/Main/assets/colour_palette.pdf
similarity index 100%
rename from Main/colour_palette.pdf
rename to Main/assets/colour_palette.pdf
diff --git a/Main/assets/logo.png b/Main/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..851a8cac6d29bf02cd5cc18682a04f1217a38f61
GIT binary patch
literal 1544
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
HN@xNA*0s4I

literal 0
HcmV?d00001

diff --git a/Main/background.py b/Main/background.py
new file mode 100644
index 0000000..a823a90
--- /dev/null
+++ b/Main/background.py
@@ -0,0 +1,17 @@
+import pygame
+
+from setup import *
+
+
+class Background:
+    background = pygame.Surface(dimensions)
+    
+
+    def __init__(self):
+        pass
+
+    def update(self, delta):
+        pass
+
+    def draw(self, surf):
+        pass
\ No newline at end of file
diff --git a/Main/game.py b/Main/game.py
index c71c26f..d1454d5 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))
+        self.timer = Timer(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 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])
diff --git a/Main/main.py b/Main/main.py
index a3eac68..a41195d 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{12}.txt"
+puzzle = f"puzzles/PuzzlePack{4}/puzzle{13}.txt"
 print(puzzle)
 scene = Game(puzzle)
 
diff --git a/Main/setup.py b/Main/setup.py
index 6f7e4e1..4d782e5 100644
--- a/Main/setup.py
+++ b/Main/setup.py
@@ -16,6 +16,7 @@ center = pygame.Vector2(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2)
 screen = pygame.display.set_mode(dimensions)
 
 pygame.display.set_caption("Word Hunt")
+pygame.display.set_icon(pygame.image.load("assets/logo.png"))
 clock = pygame.time.Clock()
 fps = 60
 
-- 
2.54.0