Added music player

Added song for music player to play
Added button assets for play/pause/stop/back

11 files changed, 75 insertions, 3 deletions

diff --git a/assets.lua b/assets.lua
index f8d7a41..c8818e6 100644
--- a/assets.lua
+++ b/assets.lua
@@ -71,7 +71,8 @@ function loadAssets(id)
       sad1 = love.audio.newSource("assets/music/Startup Ambiance.ogg"),
       battle3 = love.audio.newSource("assets/music/Without Silence.ogg"),
       fox = love.audio.newSource("assets/music/FOX.ogg"),
-      tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg")
+      tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg"),
+      chill = love.audio.newSource("assets/music/How it Begins.ogg")
     }
   end
   if id == 6 then
@@ -83,6 +84,7 @@ function loadAssets(id)
     music.battle2:setLooping(true)
     music.battleNSA:setLooping(true)
     music.battleUndertale:setLooping(true)
+    music.chill:setLooping(false)
   end
   if id == 7 then
     window = {
@@ -94,8 +96,15 @@ function loadAssets(id)
     settings = {
       comp = love.graphics.newImage("assets/computer.png")
     }
-    picture = {}
-    picture.cat = love.graphics.newImage("assets/cat.jpg")
+    picture = {
+      cat = love.graphics.newImage("assets/cat.jpg")
+    }
+    but = {
+      play = love.graphics.newImage("assets/button_play.png"),
+      pause = love.graphics.newImage("assets/button_pause.png"),
+      back = love.graphics.newImage("assets/button_back.png"),
+      stop = love.graphics.newImage("assets/button_stop.png")
+    }
   end
   if id == 9 then
     chat = {
diff --git a/assets/button_back.png b/assets/button_back.png
new file mode 100644
index 0000000..273524a
--- /dev/null
+++ b/assets/button_back.png
diff --git a/assets/button_pause.png b/assets/button_pause.png
new file mode 100644
index 0000000..673a491
--- /dev/null
+++ b/assets/button_pause.png
diff --git a/assets/button_play.png b/assets/button_play.png
new file mode 100644
index 0000000..4fa833f
--- /dev/null
+++ b/assets/button_play.png
diff --git a/assets/button_stop.png b/assets/button_stop.png
new file mode 100644
index 0000000..94ce961
--- /dev/null
+++ b/assets/button_stop.png
diff --git a/assets/music/How it Begins.ogg b/assets/music/How it Begins.ogg
new file mode 100644
index 0000000..c50a6a9
--- /dev/null
+++ b/assets/music/How it Begins.ogg
diff --git a/files.lua b/files.lua
index 370f5b1..ea05f0c 100644
--- a/files.lua
+++ b/files.lua
@@ -86,6 +86,10 @@ function updateFiles()
         elseif files == f.videos then
           openFileWindow(8)
         elseif files == f.music then
+          if i == 1 and mplay.m ~= music.chill then
+            mplay.m = music.chill
+            mplay.p = true
+          end
           openFileWindow(9)
         end
       end
diff --git a/main.lua b/main.lua
index 6b580af..3892cc3 100644
--- a/main.lua
+++ b/main.lua
@@ -93,6 +93,7 @@ function love.mousereleased(x, y, button)
     icon[i].cl = false
   end
   file.p = false
+  mplay.drag = false
 end
 function love.draw()
   if scene == 1 then
diff --git a/var.lua b/var.lua
index d4f85b8..0ae4270 100644
--- a/var.lua
+++ b/var.lua
@@ -248,6 +248,15 @@ function loadVar()
   file.p = false
   file.back = false
   picture.img = 0
+  mplay = {}
+  mplay.volx = 232
+  mplay.volpx = mplay.volx
+  mplay.volxmax = 10+38+38+38+108
+  mplay.volxmin = 10+38+38+38
+  mplay.voly = win[9].h-39
+  mplay.drag = false
+  mplay.m = 0
+  mplay.p = false
 end
 function loadPre()
   love.graphics.setDefaultFilter("nearest", "nearest")
diff --git a/viewer.lua b/viewer.lua
index 5255d72..fd3e116 100644
--- a/viewer.lua
+++ b/viewer.lua
@@ -7,4 +7,49 @@ end
 function drawVideo()
 end
 function drawMusic()
+  drawDownBox(8,31,win[9].w-17,win[9].h-82,4)
+  love.graphics.setColor(20,20,20)
+  love.graphics.rectangle("fill",8,31,win[9].w-17,win[9].h-82)
+  drawControls(8+38,win[9].h-34-8)
+  drawDownBox(10+38+38+38,win[9].h-34+5,118,5,2)
+  drawUpBox(mplay.volx,mplay.voly,10,25,2)
+end
+function drawControls(x,y)
+  love.graphics.setColor(256,256,256)
+  drawUpBox(x,y,32,32,2)
+  love.graphics.draw(but.play, x, y)
+  drawUpBox(x+38,y,32,32,2)
+  love.graphics.draw(but.stop, x+38, y)
+  drawUpBox(x-38,y,32,32,2)
+  love.graphics.draw(but.back, x-38, y)
+end
+function updateMusic()
+  if mplay.p == true and mplay.m ~= 0 then
+    mplay.m:play()
+  end
+  if win[9].ex == true and mplay.m ~= 0 then
+    mplay.m:stop()
+    mplay.m = 0
+  end
+  if mplay.m ~= 0 then
+    local d = mplay.volx - mplay.volxmin
+    local v = 0.00806451612903226 * d
+    mplay.m:setVolume(v)
+  end
+  if mouseClick(win[9].x+mplay.volx,win[9].y+mplay.voly,10,25) == true and layer[1] == 9 then
+    mplay.drag = true
+  end
+  if mplay.drag == true then
+    if mplay.volpx + (sys.mouse.x - sys.mouse.p.x) <= mplay.volxmax
+    and mplay.volpx + (sys.mouse.x - sys.mouse.p.x) >= mplay.volxmin then
+      mplay.volx = mplay.volpx + (sys.mouse.x - sys.mouse.p.x)
+    elseif mplay.volpx + (sys.mouse.x - sys.mouse.p.x) > mplay.volxmax then
+      mplay.volx = mplay.volxmax
+    elseif mplay.volpx + (sys.mouse.x - sys.mouse.p.x) < mplay.volxmin then
+      mplay.volx = mplay.volxmin
+    end
+    win[9].update = true
+  else
+    mplay.volpx = mplay.volx
+  end
 end
diff --git a/window.lua b/window.lua
index f497cc9..e95e01e 100644
--- a/window.lua
+++ b/window.lua
@@ -28,6 +28,8 @@ function drawWindow(id)
       drawHelp()
     elseif id == 7 then
       drawPicture()
+    elseif id == 9 then
+      drawMusic()
     end
     love.graphics.setCanvas()
     win[id].update = false
@@ -178,6 +180,8 @@ function drawWindow(id)
     updateSettings()
   elseif id == 3 then
     updateFiles()
+  elseif id == 9 then
+    updateMusic()
   end
   if id == layer[1] and win[id].bar == "grey" then
     win[id].bar = "active"