diff options
| author | 1029chris <1029chris@gmail.com> | 2016-08-08 00:02:49 -0700 |
|---|---|---|
| committer | 1029chris <1029chris@gmail.com> | 2016-08-08 00:02:49 -0700 |
| commit | f2c4f1b45619abfd6fdd079d00adfd25e4243ef3 (patch) | |
| tree | 8b133b4c2c1fea2d93d2708b007c65f095aa1e7b | |
| parent | 231d03a9c852e169ccc7648142175859f80b94cf (diff) | |
Added second tension music for virus 2
| -rw-r--r-- | assets.lua | 3 | ||||
| -rw-r--r-- | assets/music/Overturn.ogg | bin | 0 -> 2841363 bytes | |||
| -rw-r--r-- | virus2.lua | 7 |
3 files changed, 8 insertions, 2 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..098a4cd --- /dev/null +++ b/assets/music/Overturn.ogg @@ -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 |
