From 654ced6a14d96cce9861564a0b42c159c3e902bd Mon Sep 17 00:00:00 2001
From: Vlad <89295404+Virashu@users.noreply.github.com>
Date: Sun, 4 Feb 2024 14:26:47 +0300
Subject: [PATCH] Update VGame; Rework code according to update; Edit settings

---
 danmaku/history.py  |  6 ++----
 danmaku/menu.py     |  6 ++----
 danmaku/settings.py | 25 ++++++++++++++++---------
 poetry.lock         |  4 ++--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/danmaku/history.py b/danmaku/history.py
index 351ffc8..bfd1e10 100644
--- a/danmaku/history.py
+++ b/danmaku/history.py
@@ -14,11 +14,9 @@ def load(self):
         self.record_count = len(self.history)
 
     def update(self):
-        if vgame.Keys.UP in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.UP)
+        if self.get_click(vgame.Keys.UP):
             self.selection_index = (self.selection_index - 1) % self.record_count
-        if vgame.Keys.DOWN in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.DOWN)
+        if self.get_click(vgame.Keys.DOWN):
             self.selection_index = (self.selection_index + 1) % self.record_count
         if {
             vgame.Keys.RETURN,
diff --git a/danmaku/menu.py b/danmaku/menu.py
index 8b81f7d..efeeece 100644
--- a/danmaku/menu.py
+++ b/danmaku/menu.py
@@ -22,11 +22,9 @@ def load(self):
         self.exit_status = ""
 
     def update(self):
-        if vgame.Keys.UP in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.UP)
+        if self.get_click(vgame.Keys.UP):
             self.selection_index = (self.selection_index - 1) % len(self.buttons)
-        if vgame.Keys.DOWN in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.DOWN)
+        if self.get_click(vgame.Keys.DOWN):
             self.selection_index = (self.selection_index + 1) % len(self.buttons)
         if {vgame.Keys.RETURN, vgame.Keys.Z, vgame.Keys.SPACE} & self.pressed_keys:
             match self.buttons[self.selection_index][1]:
diff --git a/danmaku/settings.py b/danmaku/settings.py
index 8dbadbc..681fc12 100644
--- a/danmaku/settings.py
+++ b/danmaku/settings.py
@@ -8,25 +8,32 @@ class Settings(vgame.Scene):
     def load(self):
         self.selection_index = 0
 
-        self.buttons = (("Quit", "quit"),)
+        # Buttons
+        # ("Text", "codename",)
+
+        # Settings
+        # ("Text", "codename", (current_value_index, (*possible_values)))
+
+        self.buttons = (
+            ("Volume", "volume", (3, (0, 1, 2, 3, 4, 5))),
+            ("Quit", "quit"),
+        )
 
         self.exit_status: str = ""
 
     def update(self):
-        if vgame.Keys.UP in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.UP)
+        if self.get_click(vgame.Keys.UP):
             self.selection_index = (self.selection_index - 1) % len(self.buttons)
-        if vgame.Keys.DOWN in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.DOWN)
+        if self.get_click(vgame.Keys.DOWN):
             self.selection_index = (self.selection_index + 1) % len(self.buttons)
-        if vgame.Keys.RIGHT in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.RIGHT)
+        if self.get_click(vgame.Keys.RIGHT):
             # Update settings values left<->right
             # Like: music  [x x _ _ _]
             #       sfx    [x _ _ _ _]
-        if vgame.Keys.LEFT in self.pressed_keys:
-            self.pressed_keys.discard(vgame.Keys.LEFT)
+            ...
+        if self.get_click(vgame.Keys.LEFT):
             # Same
+            ...
         if {vgame.Keys.RETURN, vgame.Keys.Z, vgame.Keys.SPACE} & self.pressed_keys:
             match self.buttons[self.selection_index][1]:
                 case "quit":
diff --git a/poetry.lock b/poetry.lock
index 598f4a8..e6462d2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -201,7 +201,7 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar
 
 [[package]]
 name = "vgame"
-version = "1.4.0"
+version = "1.5.0"
 description = ""
 optional = false
 python-versions = "^3.10"
@@ -215,7 +215,7 @@ pygame = "^2.5.2"
 type = "git"
 url = "https://github.com/virashu/pygametest"
 reference = "HEAD"
-resolved_reference = "d49c10c8cc8ff0c10c30acb0059a7ec0deb38fbc"
+resolved_reference = "e11be2384d171e521781d12e241030d79fb2c936"
 
 [metadata]
 lock-version = "2.0"