From f2c4f1b45619abfd6fdd079d00adfd25e4243ef3 Mon Sep 17 00:00:00 2001 From: 1029chris <1029chris@gmail.com> Date: Mon, 8 Aug 2016 00:02:49 -0700 Subject: Added second tension music for virus 2 --- assets.lua | 3 ++- assets/music/Overturn.ogg | Bin 0 -> 2841363 bytes virus2.lua | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 assets/music/Overturn.ogg diff --git a/assets.lua b/assets.lua index e5576f1..33babae 100644 --- a/assets.lua +++ b/assets.lua @@ -76,7 +76,8 @@ function loadAssets(id) rage = love.audio.newSource("assets/music/Fight or Flight.ogg"), sophie = love.audio.newSource("assets/music/Close My Mouth.ogg"), ohyeah = love.audio.newSource("assets/music/Down N Dirty.ogg"), - finale = love.audio.newSource("assets/music/Ich Grolle Nicht.ogg") + finale = love.audio.newSource("assets/music/Ich Grolle Nicht.ogg"), + tension2 = love.audio.newSource("assets/music/Overturn.ogg") } end if id == 6 then diff --git a/assets/music/Overturn.ogg b/assets/music/Overturn.ogg new file mode 100644 index 0000000..098a4cd Binary files /dev/null and b/assets/music/Overturn.ogg differ diff --git a/virus2.lua b/virus2.lua index 0c85929..f95712e 100644 --- a/virus2.lua +++ b/virus2.lua @@ -83,7 +83,12 @@ function drawPopups() end if mouseClick(v2.pop.p[i].x+v2.pop.p[i].w-22, v2.pop.p[i].y+5, 16, 16) == true and v2.pop.p[i].exit == false and v2.pop.hov == i then v2.pop.p[i].exit = true - elseif mouseClick(v2.pop.p[i].x+8, v2.pop.p[i].y+31, v2.pop.p[i].w-16, v2.pop.p[i].h-39) == true and v2.pop.p[i].exit == false and v2.pop.hov == i then + if v2.pop.p[i].m == true then + music.tension2:play() + scene = 3 + end + elseif mouseClick(v2.pop.p[i].x+8, v2.pop.p[i].y+31, v2.pop.p[i].w-16, v2.pop.p[i].h-39) == true + and v2.pop.p[i].exit == false and v2.pop.hov == i and v2.pop.p[i].dup == true then v2.pop.p[i].exit = true if #v2.pop.p <= 6 then v2.pop.add = true -- cgit