From 9ea2e659d37fd6907c9a498345ea00b24666b867 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Fri, 23 Apr 2021 11:10:52 +0200
Subject: [PATCH] fix: fixes menus sounds

Fixes #96
Fixes #95
---
 .../scenes/overworld/screens/mainmenu/character/init.lua   | 3 +++
 .../overworld/screens/mainmenu/character/pageparent.lua    | 1 +
 .../overworld/screens/mainmenu/character/skillpage.lua     | 7 +++++--
 .../overworld/screens/mainmenu/character/statpage.lua      | 2 ++
 .../scenes/overworld/screens/mainmenu/items.lua            | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/init.lua b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/init.lua
index 9306497..a5b307a 100644
--- a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/init.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/init.lua
@@ -28,9 +28,11 @@ function CharacterScreen:update(dt)
   local keys = self.scene:getKeys(1)
   if (keys["left"].isPressed) then
     self:setPage(self.pageIndex - 1)
+    self.scene.assets.sfx["mBeep"]:play()
   end
   if (keys["right"].isPressed) then
     self:setPage(self.pageIndex + 1)
+    self.scene.assets.sfx["mBeep"]:play()
   end
 end
 
@@ -66,6 +68,7 @@ function CharacterScreen:setMenu()
     customMenu.isLocked = true
     customMenu.isVisible = true
   end
+  self.scene.menusystem:setSoundFromSceneAssets("mBeep")
 end
 
 function CharacterScreen:draw()
diff --git a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/pageparent.lua b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/pageparent.lua
index 9cc279f..b91b8cd 100644
--- a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/pageparent.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/pageparent.lua
@@ -41,6 +41,7 @@ end
 
 function Widget:action()
     self.page:menuResponses(self.num)
+    self.scene.assets.sfx["mBeep"]:play()
 end
 
 return PageParent
diff --git a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/skillpage.lua b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/skillpage.lua
index a3cfe37..17220ec 100644
--- a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/skillpage.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/skillpage.lua
@@ -11,6 +11,7 @@ local PLAYER_MESSAGE = 240 - 24
 function StatPage:new(view, character)
   StatPage.super.new(self, view, character, {"See skill"})
   self.message = ""
+  self.showMessage = false
 end
 
 function StatPage:getCustomMenus()
@@ -20,11 +21,12 @@ end
 function StatPage:menuResponses(i)
   if (#self.character.skills > 0) then
     self.view.scene.menusystem:switchMenu("equip")
+    self.showMessage = true
   end
 end
 
 function StatPage:drawOverEverything()
-  if (not utils.string.isEmpty(self.message)) then
+  if (not utils.string.isEmpty(self.message) and self.showMessage) then
     love.graphics.setColor(0,0,0, 0.66)
     love.graphics.rectangle("fill", 0, PLAYER_MESSAGE, 424, 16)
     self.view.scene.assets.fonts["small"]:setColor(1,1,1, 1)
@@ -52,7 +54,8 @@ end
 
 function SkillMenu:cancelAction()
   self.scene.menusystem.menus["menu"]:getFocus()
-  self.page:setMessage("")
+  self.page.showMessage = false
+  self.scene.assets.sfx["mBack"]:play()
 end
 
 function SkillWidget:new(page, skill)
diff --git a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/statpage.lua b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/statpage.lua
index 70a97d0..175dc8b 100644
--- a/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/statpage.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/mainmenu/character/statpage.lua
@@ -60,6 +60,7 @@ end
 
 function EquipMenu:cancelAction()
   self.scene.menusystem.menus["menu"]:getFocus()
+  self.scene.assets.sfx["mBack"]:play()
 end
 
 function EquipWidget:new(page, type)
@@ -82,6 +83,7 @@ function EquipWidget:action()
   self.page:removeEquip(self.type)
   self.label = self:getLabel()
   self:redrawCanvas()
+  self.scene.assets.sfx["mSelect"]:play()
 end
 
 return StatPage
diff --git a/sonic-radiance.love/scenes/overworld/screens/mainmenu/items.lua b/sonic-radiance.love/scenes/overworld/screens/mainmenu/items.lua
index 4d62155..a6b79ec 100644
--- a/sonic-radiance.love/scenes/overworld/screens/mainmenu/items.lua
+++ b/sonic-radiance.love/scenes/overworld/screens/mainmenu/items.lua
@@ -32,10 +32,12 @@ function ItemsScreen:update(dt)
     if (keys["left"].isPressed) then
       self.widgetIndex = 1
       self:getMenu(self.menuIndex - 1)
+      self.scene.assets.sfx["mBeep"]:play()
     end
     if (keys["right"].isPressed) then
       self.widgetIndex = 1
       self:getMenu(self.menuIndex + 1)
+      self.scene.assets.sfx["mBeep"]:play()
     end
   end
 end