aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets.lua3
-rw-r--r--viewer.lua2
-rw-r--r--virus2.lua5
3 files changed, 8 insertions, 2 deletions
diff --git a/assets.lua b/assets.lua
index c249950..1dfebcf 100644
--- a/assets.lua
+++ b/assets.lua
@@ -78,7 +78,8 @@ function loadAssets(id)
ohyeah = love.audio.newSource("assets/music/Down N Dirty.ogg"),
finale = love.audio.newSource("assets/music/Ich Grolle Nicht.ogg"),
tension2 = love.audio.newSource("assets/music/Overturn.ogg"),
- battle2part2 = love.audio.newSource("assets/music/Occams Laser - Fire of Wrath.ogg")
+ battle2part2 = love.audio.newSource("assets/music/Occams Laser - Fire of Wrath.ogg"),
+ realization = love.audio.newSource("assets/music/Occams Laser - Ceaseless Existence.ogg")
}
end
if id == 6 then
diff --git a/viewer.lua b/viewer.lua
index 0501bb0..a8a4801 100644
--- a/viewer.lua
+++ b/viewer.lua
@@ -205,7 +205,7 @@ Created With Love2D, Blender, GIMP, Audacity, and Atom
Music Credits:
‘Thrills And Spills’ By Jay Man - OurMusicBox
‘Skyscraper Party’ By David Anakhasian (David L.A.) davidla.bandcamp.com/ soundcloud.com/david_man
-‘Fire of Wrath’ By Occams Laser occamslaser.bandcamp.com/
+‘Fire of Wrath’ and ‘Ceaseless Existence’ By Occams Laser occamslaser.bandcamp.com/
How it Begins By Kevin MacLeod (incompetech.com)
Licensed under Creative Commons: By Attribution 3.0 License
creativecommons.org/licenses/by/3.0/
diff --git a/virus2.lua b/virus2.lua
index 670932d..7d00422 100644
--- a/virus2.lua
+++ b/virus2.lua
@@ -254,6 +254,11 @@ function drawVirusFight2()
music.battle2:setVolume(1)
music.tension2:stop()
music.battle2:play()
+ music.realization:stop()
+ elseif virus2Lose > 0 and virus2Lose < 3 and v2.c.chat.msgs == 3 then
+ music.realization:play()
+ elseif v2.c.chat.msgs == 11 and virus2Lose == 1 then
+ music.realization:stop()
elseif v2.c.chat.msgs == 12 and virus2Lose == 1 then
music.tension2:play()
elseif v2.fightStart == true and v2.c.chat.msgs == 26 then