From ce5cb1298f5361d57fc02e576c43ab5ec10ca8e1 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sat, 1 Aug 2020 16:32:09 +0200
Subject: [PATCH] improvement: make option menu a bit less plain

---
 .../assets/backgrounds/options.png            | Bin 0 -> 1346 bytes
 sonic-radiance.love/scenes/options/assets.lua |  36 +-----------------
 sonic-radiance.love/scenes/options/init.lua   |  30 +++++++++++----
 sonic-radiance.love/scenes/options/menu.lua   |  14 +++++++
 4 files changed, 37 insertions(+), 43 deletions(-)
 create mode 100644 sonic-radiance.love/assets/backgrounds/options.png
 create mode 100644 sonic-radiance.love/scenes/options/menu.lua

diff --git a/sonic-radiance.love/assets/backgrounds/options.png b/sonic-radiance.love/assets/backgrounds/options.png
new file mode 100644
index 0000000000000000000000000000000000000000..20941e8d3d6e727c3af3496a349758be388b4011
GIT binary patch
literal 1346
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}*5h!1NUMMFQKe9J?GB5S6@Fqat}<J>TvrHWwT8+1#QkFTm6{|X?tXCVg9qo6
zt{yxZ8O|Q=DDa1|u&5-cWTMb}Z!X=WJs&FMpWiL6cyH&hV*1Rq(jMknd9zo##GFY9
zKe{fwMZiIyjbUcwu{kQL52NG1U-2##e;oO*wmz(X)@BI-fzI@qiMNhOAGthx+ri5D
z7KgevdDZyYq+Md|l;63o;?J?24>lbzR!*}r^_Ni;<IY{P#ZY^e)JKuRkgFx9#Es-u
z&)IH~{ZuRa-sJrTb1sKZ+v%4r!KstPDdeKDVo{4x&XJ7ko*O4D`n;pR{=`@BCqXAd
znUs$+X<bm*UH8HMhi$aBz2!sI*2fOdyC2u|FvRY5Sp3Z5{_(!c7K}~j4@|xHDg4!e
zGwLt5P7||b`n9dG`}MSCZy2XrA9yfXarP!{)=bWyHXrKT?oVO;mEZWzG(Ycb@f<sb
z%vqtI*eonq+_<OgefRlY!0$W%-e#VA&wj(CC^L}r$SGj7uqAoByD<C*!3BGlPX>x`
z7I;J!Gcf2WgD_*oQu{KXAbW|YuPgf#4n{sX`B_p2HUNbrOI#yLobz*YQ}ap~oQqNu
zOHxx5$}>wc6x=<11Hv2m#2FZvr9536Ln>~)y=z!>#XzF%VJk0VR94oygPc2}^d<`z
z^j=w+896O+LDAw!<&!~4f3JNm<1r9U-}ip2PIle?pTGV-e4m*lx8C14{@=^DoJ<Ui
z2bSD<`tRV+%fBy(|9F0U{j&f6-+iuq@%sPYnp6f8iG<7xNlpCn$M-EbectY@zqH6%
zmYvUx8S<nPGOKPaczS-iqwj?5f4554-u--;&DHQ=)aUE#x)~)Ngj}6*g=O*jZ`<vT
zx)?jI`+1FFh4F!+{{1OF23jwJPj7O2k=qogX)3~OaNz&RnF(K>eb2iRIO{xvhOtBD
z<Er)d(ieWsTy)ig$H0<FfkA+QgMozs=+*`X2L?E|VezFJxdmTq>%M$usosA+9jhXU
zo`UAxd+Qrsd}ef;FL8(=!`R{d&E4x$r`!|vU2L+qtWOc>ifzy4v(Fc~mA&ZYHO@KJ
z>s`Hk4>0fqY`2pCx|?xl=d!KGx-R|s@_dykBeQ|Sn`io8X64GP{kc^wf#J$q<|W_H
ztqtBDKf8GO&0~T4rNXRk&tQ~T@a|`o*`oJfpC>e&6a)tImF$M&uP<NO-;n=3UIOfy
z+6HNtyPU7T%Glr9*&bE&+k)o+Ln?1qT2q{L#mma3!24}_SLQuTVPM-)d%pkE)i;-(
zP2VT0{Wt4Zf%+n@^99T5&ol58tjapGLhVKEq~+k?F7`JB8S<N9Y5Ezrg;xXio|Aaz
z`s>Q3vPr;5S+Fk9J-==(r(6EMT81x%2Uhgnz3p*vfB6B1$;ud^3kz%ut+US=7wtcv
zzw~SEzkAO)B@XD~R;vP3+xO3R?(}0d3`YzcrY!qDFFC@xx?E)O6hD(x2DTg5{#;aV
z-8O4M$+veavO6zzE(5xD<LvqWV)pt7yw!dM4Cw4*NepZqcmG5Q1H+d)I$heBfq9Cl
zmek%f>E++gZC!bLaiQLv+%pV38*=3n#1_3_$ZKU(a|b35<Int8FHcD3<e&8$n3Whj
MUHx3vIVCg!05u*<Qvd(}

literal 0
HcmV?d00001

diff --git a/sonic-radiance.love/scenes/options/assets.lua b/sonic-radiance.love/scenes/options/assets.lua
index 17a38c4..41efadb 100644
--- a/sonic-radiance.love/scenes/options/assets.lua
+++ b/sonic-radiance.love/scenes/options/assets.lua
@@ -1,49 +1,15 @@
 return {
-  ["tilesets"] = {
-    {"charicons",     "assets/sprites/characters/charicons"},
-    {"normaltiles",   "assets/backgrounds/normaltile"},
-    {"sptiles",       "assets/backgrounds/specialtile"},
-    {"borders",       "assets/backgrounds/borders"},
-  },
   ["sprites"]  = {
     {"cursorground",  "assets/gui/cursor/ground"},
     {"hitGFX",        "assets/sprites/gfx/hit"},
   },
   ["textures"] = {
-    {"menucursor",    "assets/gui/cursor-menulist.png"},
-    {"statusbar",     "assets/gui/status_bar.png"},
-    {"cursorpeak",    "assets/gui/cursor/peak.png"},
-    {"actorsShadow",  "assets/sprites/shadow.png"},
-    {"emptytile",     "assets/backgrounds/tilemask.png"},
-
-    {"e_speedster", "assets/gui/emblem_speedster.png"},
-    {"e_technic",   "assets/gui/emblem_technic.png"},
-    {"e_power",     "assets/gui/emblem_power.png"},
-
-    {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
-    {"m_technic",   "assets/gui/emblem_technic_mask.png"},
-    {"m_power",     "assets/gui/emblem_power_mask.png"},
-
-    {"hudturn",     "assets/gui/strings/hudturn.png"},
-    {"battlecompleted", "assets/gui/strings/battle_completed.png" }
-  },
-  ["fonts"]    = {
-    {"small",         "assets/gui/fonts/PixelOperator.ttf", 16},
-    {"victory",       "assets/gui/fonts/vipnagorgialla.ttf", 12}
+    {"background",    "assets/backgrounds/options.png"}
   },
   ["imagefonts"]    = {
-    {"hudnbrs",       "assets/gui/fonts/hudnumbers"},
-    {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
     {"medium",        "assets/gui/fonts/SA2font"},
   },
   ["sfx"] = {
-    {"hit", "assets/sfx/hit.wav"},
-    {"hitconnect", "assets/sfx/hitconnect.wav"},
-    {"jump", "assets/sfx/jump.wav"},
-    {"woosh", "assets/sfx/woosh.wav"},
-    {"spincharge", "assets/sfx/spincharge.wav"},
-    {"spinrelease", "assets/sfx/spinrelease.wav"},
-
     {"mBack", "assets/sfx/menus/back.wav"},
     {"mBeep", "assets/sfx/menus/beep.wav"},
     {"mSelect", "assets/sfx/menus/select.wav"},
diff --git a/sonic-radiance.love/scenes/options/init.lua b/sonic-radiance.love/scenes/options/init.lua
index 6790219..281f30f 100644
--- a/sonic-radiance.love/scenes/options/init.lua
+++ b/sonic-radiance.love/scenes/options/init.lua
@@ -1,9 +1,11 @@
 local Scene     = require "core.modules.scenes"
 local OptionsMenu  = Scene:extend()
 
-local ListBox   = require "core.modules.menusystem.listbox"
+local OptionMenu = require "scenes.options.menu"
 local Widgets   = require "scenes.options.widgets"
 
+local gui         = require "game.modules.gui"
+
 function OptionsMenu:new()
   OptionsMenu.super.new(self)
 
@@ -33,16 +35,22 @@ function OptionsMenu:new()
 
   self.keyDetector = {}
   self.keyDetector.widget = nil
+
+  self.borderY = 25
+  self.borders = gui.newBorder(424, 30, 8)
+
+  self.timer = 0
+end
+
+function OptionsMenu:update(dt)
+  self.timer = (self.timer + (30 * dt)) % 128
 end
 
 -- MENU FUNCTION
 -- Functions that serve the handling of menus
 
 function OptionsMenu:addMenu(name, nobackbutton)
-  local screenHeight, screenWidth = core.screen:getDimensions()
-  local w, h = 424/2, 240 - 48
-  local x, y = w / 2, 24
-  ListBox(self.menusystem, name, x, y, w, h, 8)
+  OptionMenu(self.menusystem, name)
 end
 
 function OptionsMenu:addSubMenu(name, fullname)
@@ -89,9 +97,15 @@ function OptionsMenu:keypressed( key )
 end
 
 function OptionsMenu:draw()
-  love.graphics.setColor(.3,  .1, .4, 1)
-  love.graphics.rectangle("fill", 0, 0, 424, 240)
-  utils.graphics.resetColor()
+  local w, h = core.screen:getDimensions()
+  for i=-1, (w/128) do
+    for j=-1,(h/128) do
+      self.assets.images["background"]:draw(i*128 + self.timer, j*128 + self.timer)
+    end
+  end
+
+  love.graphics.draw(self.borders,   0,    self.borderY, 0,  1, -1)
+  love.graphics.draw(self.borders,   424, 240 - self.borderY, 0, -1,  1)
 end
 
 return OptionsMenu
diff --git a/sonic-radiance.love/scenes/options/menu.lua b/sonic-radiance.love/scenes/options/menu.lua
new file mode 100644
index 0000000..98401bf
--- /dev/null
+++ b/sonic-radiance.love/scenes/options/menu.lua
@@ -0,0 +1,14 @@
+local ListBox   = require "core.modules.menusystem.listbox"
+local OptionMenu = ListBox:extend()
+local WIDTH = 424/1.4
+local HEIGHT = 240/1.4
+
+function OptionMenu:new(menusystem, name)
+  local w, h = math.floor(WIDTH), math.floor(HEIGHT)
+  local screenw, screenh = core.screen:getDimensions()
+  local x = (screenw/2) - (w/2)
+  local y = (screenh/2) - (h/2)
+  OptionMenu.super.new(self, menusystem, name, x, y, w, h, 8)
+end
+
+return OptionMenu