From 7bc76a884f3e7ff657b56504259a627d2f6ff2a2 Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Fri, 25 Nov 2022 23:30:43 -0500
Subject: [PATCH] confirmation screen + status in main

need to make buttons
---
 Main/Button.py                         |  45 +++++++++++++++++++++++++
 Main/__pycache__/game.cpython-310.pyc  | Bin 3593 -> 3646 bytes
 Main/__pycache__/setup.cpython-310.pyc | Bin 2174 -> 2271 bytes
 Main/confirmation.py                   |  41 ++++++++++++++++++++++
 Main/game.py                           |  18 +++++++---
 Main/main.py                           |  22 ++++++++++--
 Main/setup.py                          |   7 ++++
 7 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100644 Main/Button.py
 create mode 100644 Main/confirmation.py

diff --git a/Main/Button.py b/Main/Button.py
new file mode 100644
index 0000000..aecb1b3
--- /dev/null
+++ b/Main/Button.py
@@ -0,0 +1,45 @@
+import pygame.mouse
+
+from setup import *
+
+
+class Button:
+    font = pygame.font.Font("font/Silkscreen-Regular.ttf", 20)
+
+    edge_radius = 5
+    bezel = 3
+
+    inset = 5
+
+    cooldown_time = 250
+
+    def __init__(self, position, text, colour):
+        self.colour = colour
+        self.text = self.font.render(text,True, self.colour)
+        self.position = position
+        self.selected = False
+
+        self.width = self.text.get_width() + self.inset * 2
+        self.height = self.text.get_height()
+
+        self.time = 0
+        self.cooldown = 0
+
+    def update(self, delta, new_text=None):
+        if new_text is not None:
+            self.text = self.font.render(new_text, True, self.colour)
+        self.cooldown = max(self.cooldown - delta, 0)
+        if self.cooldown == 0:
+            if pygame.mouse.get_pressed(3)[0] and self.get_rect().collidepoint(pygame.mouse.get_pos()):
+                self.selected = True
+                self.cooldown = self.cooldown_time
+            else:
+                self.selected = False
+
+    def get_rect(self):
+        return pygame.Rect(self.position.x - self.width/2,self.position.y - self.height/2, self.width,self.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(),border_radius=self.edge_radius,width=self.bezel)
+        surf.blit(self.text,self.text.get_rect(center=self.position))
\ No newline at end of file
diff --git a/Main/__pycache__/game.cpython-310.pyc b/Main/__pycache__/game.cpython-310.pyc
index 8274f661699d71b86769b7a8f1c1eca85847dfaf..38268556db1abb26f80a9c03399c2a80a42233c2 100644
GIT binary patch
delta 598
zcmeB_*(bx7&&$ijz`($;rL8eJS9l{|F?&5T0|Ns{%$b3Kp*Vz*fuV#Ui*W(dLIxLx
zSe{y@8m27f5{4|6Y^EZ?5>_S#MuuR9Le?4v7KSXg8ip+P1spYuH4IstH4Ir?3z^Ls
zm>A+g;@k^3K(bjpS-dq2S$rTBk_-!(7(u4<FAzv!T*#QhB*{>mSYN}C#a1F%#!wUq
zV%0EY36(K|*+L71K_Uwo85zLVaiuV)u#|{^#F`mX7$q2l8AKSs7ILMq*1)V4UC01Z
zpCtx$m=MU)8ip+K8isg~BSDT6Dq|?BsA0&Gs9}f?<;(*MgPqV=!;mEjRVcMU8e~-p
zTZv4T>_X-mhIqLehAergv0_;YB@7D`Q<!QPvcwiBEo8`22C=eKBp7NKvQ#IZ<1o-s
zD>7zaV7SGaT9%qua*H`Vwd58{No7ImEtbGg&yZU@&i=l>j(#rjt`VLglmBygO!ncN
z>&jf@4%U>Cnp2Wk<j26kP$U2+#6hfJ1_lOGP-JN^Ffi~j@-T8RGX0lhl3^5J6l3IL
zRA6Ld->k}&#>f~qxrf`HF?RA9?v1QT3=9k*lbd)-9HK$Svqif4`1pqxMS%>o1`&}U
nA_PRZf{1JokqIK~L4*&809jm=H2FNQ_+(#ReMb4owY)t5&Ps?Y

delta 542
zcmdld(<#H3&&$ijz`(%3{;whVh0sR6V)l9_1_lO@m@@+dL$Mzt149i13quw|4MP^=
z0;U?q8ip+98ip*Eh0Nv*ObqcLan=P)AlWRoEcP0PEDn$gNrr_?j0`25SzHUaQy3RA
zrZ7n|6vx#tWHFTRlra>Afmk&RS-fS8U^edpK9I;lMn;DE5`GY~nK6Yio2keRY&lB`
z#4?sV0T@4p1+I=of<c%;gaPavmK4?+n4<(1GBARiCkS;mFUUzX3|T@o4Dlc@faG|~
z7>Y`37_x*xVtJf33|amV7uMA<WQl+TYZ$Ub7l?tJl)_dbo+Yu6xrQNLvW6i`3Tmui
zmUIc{0+|$07zi$qUC59nSHqAcm?bX(vOr<-6%GSN#mNSo9;`*i3=9mDD>&!cFcrBo
zFfiO=O-aouNh}gzU|@g{;vkkE0|SF8DDYJn7#QRjWf%n*#TfY*`IrP46`0tVH%D=$
zF)~I@KFDp)7%`cVXCrGY0|P_g<n25q4q+fu*&<zieEh?ULP3UEgNP6i;SVBQK|~se
bNC6S{Ai@VkfGjPFot(|<#was+6K@XyjG}Wk

diff --git a/Main/__pycache__/setup.cpython-310.pyc b/Main/__pycache__/setup.cpython-310.pyc
index 524abc3af29794362089951fb6332221300a6685..f980017ae3c56a637eee85c4916a6c4af1b33882 100644
GIT binary patch
delta 640
zcmew-a9@x&pO=@5fq{WxNo!;BjETImOe~BObxt^>FhohFa7Ia`utrIza7D?aGG@s}
z$)z)-a4%wvl6PlF;Ys0bVMyU^W{Og9XGq~o;csC`;csS&QcPhCX3!LvtitHW{*sY_
zf#D_d=6ptf#(GW$28JRKp~?IlWFf<Yc!wg8)nEc9=n(2q#0^pjBH)6l4n;g5K@g$I
zTm&)}L1;3AjYSavs{mOB76oaUY|G5a3lf1T=bRkOT+Sv4GFEW%1!h}i4h9AWRR#uz
zVi5)g1`Y-mMpVebSi~{efMpe<=;Yfh=7EwRuZc1+FlaKrTm@nmfCx*l0N6b*FN2I$
z1Pi>p0+O5uBC@~&MIfCoJwYlIAOh->lUWtnR6ruyle<`D^wdGBg+PQYM1=u}%?cv)
z7#JA*G=+=!K&tscguv!2tlW%}5Z{0Vz$}pNB4Gvw2E)le*bLb~EKQ}!`s^3&c%A)y
zeI5N=;)6pRgF<fcz__jvo*_|!FrK@kuWP)2m}^iJTz!CJXt3+#|Lm%|px^=<UIexa
oL4a(%#bJ}1pHiBWY6psmVx!4{9I65=Opp*|W8z@s;}GHj0O$d8`~Uy|

delta 507
zcmcaF_)ma0pO=@5fq{X+fvqvweIl<c(-($`IwuTL8M7p#q|zBuI2SQSNxL(oaHVj!
zFr;udGeya`Go<jO@U}3d@HR6=$)+#{GidTnHevMJ+{5U@=*rH(z)%DtG?|}+3}$!`
z?@+`65(E)2L5EO>B2JJXh=2>GIuwB%Q^Yk{mRZ~qWJnPsND+w8WQMTeqA&rFB-BDM
zRm46ym${scAEc3g@+)RrRyGC(28GEwEV7Jjlf770F$z!q%3{taK3SJl#sp;C%gZ3O
z@(c_Nn#?b+FfcH@oChMZzyd|WAhst+g&agcb#g7MVt^7zL=z;p9xVKF1Be{~BAUSh
zMXDgS5Qwma2<U;>tRMo!^3xP9;sF`L3nKV7zhmWQl!Uk%Bmia!fLMYI3=BGxh1d<*
zKrBtU$)4;NCr5Iq=z{!J1QII(D@G6?ZMQgVa`RJ4b5iX<0aUCtc@>8$2OARyBOiwl
F4*-#3S%Uxo

diff --git a/Main/confirmation.py b/Main/confirmation.py
new file mode 100644
index 0000000..8291492
--- /dev/null
+++ b/Main/confirmation.py
@@ -0,0 +1,41 @@
+from setup import *
+from button import Button
+
+
+class Confirmation:
+    font = pygame.font.Font("font/Silkscreen-Regular.ttf", 25)
+    edge_radius = 10
+    bezel = 4
+    separation_distance = 10
+    inset = 15
+
+    def __init__(self):
+        self.position = center.copy()
+        self.text = self.font.render("Show Solutions?",True,Colour.BLACK)
+        self.accept_button = Button(self.position, "Accept",Colour.BLACK)
+        self.deny_button = Button(self.position, "Cancel",Colour.BLACK)
+        self.width = self.inset * 2 + self.accept_button.get_rect().width + self.deny_button.get_rect().width + self.separation_distance
+        self.height = self.inset * 2 + self.accept_button.get_rect().height + self.text.get_rect().height + self.separation_distance
+
+
+    def update(self, delta):
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+                return COMMAND_EXIT
+
+
+        if self.accept_button.update(delta):
+            return COMMAND_CONFIRMATION
+        if self.deny_button.update(delta):
+            return COMMAND_GAME
+        pass
+
+    def get_rect(self):
+        return pygame.Rect(self.position.x-self.width/2,self.position.y -self.height/2,self.width,self.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.LIGHT_GRAY,self.get_rect(),width=self.bezel,border_radius=self.edge_radius)
+        surf.blit(self.text, self.text.get_rect(center = (self.position.x,self.position.y - self.text.get_rect().height/2 - self.separation_distance/2)))
+        self.accept_button.draw(surf)
+        self.deny_button.draw(surf)
\ No newline at end of file
diff --git a/Main/game.py b/Main/game.py
index d1454d5..79f9ec7 100644
--- a/Main/game.py
+++ b/Main/game.py
@@ -51,16 +51,21 @@ class Game:
         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.unknown_word_display.inset + self.word_disp_separation_distance/2))
     def update(self, delta):
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+                return COMMAND_EXIT
+            elif event.type == pygame.K_ESCAPE: # for testing purposes
+                return COMMAND_PAUSE
         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])
         if not pygame.mouse.get_pressed(3)[0]:  # mouse not down
             if self.word in word_list and self.word not in self.seen:
                 self.seen.add(self.word)
-                # self.points += 10 ** (len(self.word) - 2)
-                if len(self.word) == 3:
-                    self.points += 100
-                else:
-                    self.points += 100 * 2 ** (len(self.word) - 2)
+                self.points += 100 * 2 ** (len(self.word) - 3)
+                # if len(self.word) == 3:
+                #     self.points += 100
+                # else:
+                #     self.points += 100 * 2 ** (len(self.word) - 2)
                 # self.points_display = self.text_font.render(f"Score: {self.points}", True, Colour.BLACK)
 
             self.word = ""
@@ -77,6 +82,9 @@ class Game:
 
         self.word_display = self.font.render(self.word, True, Colour.BLACK)
         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 get_next_scene(self):
+        return COMMAND_CONFIRMATION
+
 
     def draw(self, surf):
         surf.fill(Palette.primary_shade1)
diff --git a/Main/main.py b/Main/main.py
index a41195d..05a1fa2 100644
--- a/Main/main.py
+++ b/Main/main.py
@@ -1,5 +1,6 @@
 from setup import *
 from game import Game
+from confirmation import Confirmation
 
 puzzle = f"puzzles/PuzzlePack{4}/puzzle{13}.txt"
 print(puzzle)
@@ -8,13 +9,28 @@ scene = Game(puzzle)
 is_running = True
 delta = 1000/fps
 
+paused = False
+paused_scene = None
+
 while is_running:
-    # screen.fill(Colour.WHITE)
 
-    if pygame.event.peek(pygame.QUIT):
+    status = scene.update(delta)
+
+    if status == COMMAND_EXIT:
         is_running = False
+    elif status == COMMAND_PAUSE:
+        paused = not paused
+        if paused:
+            paused_scene = scene
+            status = scene.get_next_scene()
+        else:
+            scene = paused_scene
+            paused_scene = None
+    # Switching scenes
+    if status == COMMAND_CONFIRMATION:
+        scene = Confirmation()
+
 
-    scene.update(delta)
     scene.draw(screen)
 
     pygame.display.update()
diff --git a/Main/setup.py b/Main/setup.py
index 4d782e5..ac34d61 100644
--- a/Main/setup.py
+++ b/Main/setup.py
@@ -20,6 +20,13 @@ pygame.display.set_icon(pygame.image.load("assets/logo.png"))
 clock = pygame.time.Clock()
 fps = 60
 
+COMMAND_START = 0 # go to level select
+COMMAND_EXIT = 1 # quit
+COMMAND_GAME_OVER = 2 # go to game over screen
+COMMAND_PAUSE = 3 # Pause game
+COMMAND_CONFIRMATION = 4 # Confirm show solutions
+COMMAND_GAME = 5 # switch to actual game
+
 alphabet = string.ascii_lowercase
 weights = [8.464812190575197, 1.8290213382006486, 4.377463842181293, 3.238497204031964, 10.77374340292079,
            1.1220794892410257, 2.3639146242995768, 2.64283880414943, 8.95783107183879, 0.15584834882323761,
-- 
2.54.0