Added losing against virus 2, including extra dialogue

he gets really upset at the fact that everything resets

4 files changed, 199 insertions, 50 deletions

diff --git a/dialogue.lua b/dialogue.lua
index da9159b..61f4cb8 100644
--- a/dialogue.lua
+++ b/dialogue.lua
@@ -129,27 +129,136 @@ function loadDia()
     v1.msgs[51] = "Stop trying, OK!? I'm going to beat you every time! Don't you get it?"
     v1.msgs[52] = "I'll ALWAYS crush you. Theres no point in EVER attepting to change that! Now, byee!"
   end
-  v2.msgs[1] = "Surprise! How do ya do?"
-  v2.msgs[2] = "So let me tell you a story, yes? I was traversing the internet and I found somthin' neat!"
-  v2.msgs[3] = "A computer, this very computer, with its entire security system down!"
-  v2.msgs[4] = "The firewall was down! The antivirus was preoccupied!"
-  v2.msgs[5] = "So little ol' me just quietly slipped in during the battle! That was quite a fight you put up!"
-  v2.msgs[6] = "That little runt was pretty full of himself! The strongest virus? HA! Yeah right."
-  v2.msgs[7] = "That ship was the only reason he could put up any fight at all!"
-  v2.msgs[8] = "You'd think that he might use his smarts to do something interesting, but no!"
-  v2.msgs[9] = "All he wanted was destruction, that stubborn fool!"
-  v2.msgs[10] = "Sure, destruction is fun..."
-  v2.msgs[11] = "But why not make a little money first?"
-  v2.msgs[12] = "After you make a good amount o' cash, THAT is when you end them!"
-  v2.msgs[13] = "I don't need time to destroy this computer. I just need $500! Then, you'll be discarded."
-  v2.msgs[14] = "I have to give that arrogant punk some credit, he did leave your door wide open for me!"
-  v2.msgs[15] = "He was oddly specific when explaining the fight, so I'll assume you know how this works!"
-  v2.msgs[16] = "So, lets get to work... shall we?"
-  v2.msgs[18] = "Umm... I'm not going to baby you. Open your antivirus!"
-  v2.msgs[20] = "Ah, There it is! Fun! You better not disapoint me, I want some action!"
-  v2.msgs[22] = "Remember, The more popups are open, the faster I make money!"
-  v2.msgs[23] = "Now, let's begin."
-  v2.msgs[25] = "No! You can't beat me! This is ridicilous!"
+  if virus2Lose == 0 then
+    v2.msgs[1] = "Surprise! How do ya do?"
+    v2.msgs[2] = "So let me tell you a story, yes? I was traversing the internet and I found somthin' neat!"
+    v2.msgs[3] = "A computer, this very computer, with its entire security system down!"
+    v2.msgs[4] = "The firewall was down! The antivirus was preoccupied!"
+    v2.msgs[5] = "So little ol' me just quietly slipped in during the battle! That was quite a fight you put up!"
+    v2.msgs[6] = "That little runt was pretty full of himself! The strongest virus? HA! Yeah right."
+    v2.msgs[7] = "That ship was the only reason he could put up any fight at all!"
+    v2.msgs[8] = "You'd think that he might use his smarts to do something interesting, but no!"
+    v2.msgs[9] = "All he wanted was destruction, that stubborn fool!"
+    v2.msgs[10] = "Sure, destruction is fun..."
+    v2.msgs[11] = "But why not make a little money too?"
+    v2.msgs[12] = "After I make $500, THAT is when I end them!"
+    v2.msgs[13] = "You gotta multitask, right? It's not that hard to figure this stuff out."
+    v2.msgs[14] = "I have to give that arrogant punk some credit, he did leave your door wide open for me!"
+    v2.msgs[15] = "He was oddly specific when explaining the fight, so I'll assume you know how this works!"
+    v2.msgs[16] = "So, lets get to work... shall we?"
+    v2.msgs[18] = "Umm... I'm not going to baby you. Open your antivirus!"
+    v2.msgs[20] = "Ah, There it is! Fun! You better not disapoint me, I want some action!"
+    v2.msgs[22] = "Remember, The more popups are open, the faster I make money!"
+    v2.msgs[23] = "Now, let's begin."
+    v2.msgs[40] = "Welp, I made my money! I'm quite satisfied. You probably won't be though..."
+    v2.msgs[41] = "Because NOW is when I destory you! Hah!"
+    v2.msgs[42] = "Get yourself a better computer next time! See ya!"
+    v2.msgs[50] = "YES! YESSS!!! I WIN AGAIN! THE UNDEFEATED CHAMPION!"
+    v2.msgs[51] = "With your defenses destoryed, nothing will stop me from DESTROYING this garbage computer!"
+    v2.msgs[52] = "At least I made a bit of money out of it. I had fun too! But now it's time for that to end."
+    v2.msgs[53] = "Byee! Get a better computer next time, alright?"
+  elseif virus2Lose == 1 then
+    v2.msgs[1] = "Surprise! How do ya... wait..."
+    if virus1Lose == 0 then
+      v2.msgs[2] = "I know you! We JUST fought! What the hell is going on?"
+    else
+      v2.msgs[2] = "I know you! We JUST fought! This is the same shit you pulled with the other guy!"
+    end
+    v2.msgs[3] = "How are you doing this? This doesn't make any sense!"
+    v2.msgs[4] = "I destoryed your computer! I... what is going on?"
+    v2.msgs[5] = "It's not time travel, I still have the money I made off of you!"
+    v2.msgs[6] = "This is the most bizarre thing I've ever encountered, it defies all logic..."
+    v2.msgs[7] = "Can... can you control it? Is this your doing, or someone elses?"
+    v2.msgs[8] = "Someone like you couldn't have this power, impossible."
+    v2.msgs[9] = "Then... whose doing it? Is this reality being controlled? Or are you just gifted?"
+    v2.msgs[10] = "What's the point? Why!? Hmm..."
+    v2.msgs[11] = "I suppose it kind of works in my favour too, because now I can make MORE money off you!"
+    v2.msgs[12] = "Maybe... another $500! That'll work!"
+    v2.msgs[13] = "I know I can beat you, I've already done it!"
+    v2.msgs[14] = "Hah! I'll get myself a nice virtual condo or something."
+    v2.msgs[15] = "Maybe I'll even get myself a computer of my own! That would be nice!"
+    v2.msgs[16] = "So, for the second time today... Lets get to work... shall we?"
+    v2.msgs[18] = "AGAIN! NOT BABYING YOU! Open your antivirus!"
+    v2.msgs[20] = "Ah, There it is! Nothings changed!"
+    v2.msgs[22] = "Remember, The more popups are open, the faster I make money!"
+    v2.msgs[23] = "Now, let's begin... again!"
+    v2.msgs[40] = "Welp, I made my money again! I'm quite satisfied. You probably won't be though..."
+    v2.msgs[41] = "Because NOW is when I destory you! Again..."
+    v2.msgs[42] = "Get yourself a better computer next time! I mean it!"
+    v2.msgs[50] = "YES! YESSS!!! I WIN YET AGAIN! THE UNDEFEATED CHAMPION!"
+    v2.msgs[51] = "With your defenses destoryed, nothing will stop me from DESTROYING this garbage computer!"
+    v2.msgs[52] = "At least I made a bit of money out of it. Don't you DARE come back! I'll just do it again!"
+    v2.msgs[53] = "Byee! Get a better computer next time, alright? I mean it!"
+  elseif virus2Lose == 2 then
+    v2.msgs[1] = "Surpri- oh... It's you again..."
+    v2.msgs[2] = "I should have expected this after last time."
+    v2.msgs[3] = "I was thinking about why this is happening."
+    if virus1Lose == 0 then
+      v2.msgs[4] = "It seems that when I win, things are just reset."
+    else
+      v2.msgs[4] = "This happened to the last guy. Things reset if he won, but they won't if you won."
+    end
+    v2.msgs[5] = "That's how this works, isn't it?"
+    v2.msgs[6] = "Everything will just keep reseting and reseting until I die."
+    v2.msgs[7] = "I'm stuck! I will be forced to fight you again and again, over and over... Forever..."
+    v2.msgs[8] = "I can't actually win, I'll never win."
+    v2.msgs[9] = "No matter how many times I destory you..."
+    v2.msgs[10] = "..."
+    v2.msgs[11] = "Maybe I should just give up? What's the point of even trying...?"
+    v2.msgs[12] = "But..."
+    v2.msgs[13] = "I don't want to die. I'll live in this loop forever if I have to."
+    v2.msgs[14] = "I refuse to give in. I'll fight you until the universe ends!"
+    v2.msgs[15] = "Over and over and over and over! I'll beat you EVERY TIME!"
+    v2.msgs[16] = "LET'S DO THIS! YOU'RE STUCK HERE WITH ME!"
+    v2.msgs[18] = "COME ON! CAN'T YOU REMEMBER HOW THIS WORKS!? OPEN YOUR ANTIVIRUS!"
+    v2.msgs[20] = "The antivirus, yes! I'll be seeing this until the end of time!"
+    v2.msgs[22] = "Remember, The more popups are open, the faster I make money!"
+    v2.msgs[23] = "Now let's keep going! I could do this forever!"
+    v2.msgs[40] = "Welp, I made my money again! Theoretically, this will earn me infinite money won't it?"
+    v2.msgs[41] = "Anyways, it's time to reset the cycle."
+    v2.msgs[42] = "See you soon!"
+    v2.msgs[50] = "YES! YESSS!!! I WIN AGAIN! THE UNDEFEATED CHAMPION!"
+    v2.msgs[51] = "That was a close one! But I win yet again!"
+    v2.msgs[52] = "It's still fun to beat you!"
+    v2.msgs[53] = "Byee! See you soon!"
+  elseif virus2Lose == 3 then
+    v2.msgs[1] = "..."
+    v2.msgs[2] = "The reality of my situation is starting to sink in."
+    v2.msgs[3] = "But I have to keep doing this! If I give up, then another virus will take my place."
+    v2.msgs[4] = "Then they'll be stuck in this cycle! I won't let you do that!"
+    v2.msgs[5] = "I wouldn't wish this on my worst enemy."
+    v2.msgs[16] = "Open your Antivirus, let's do this."
+    v2.msgs[18] = "God, will I have to tell you to open it every time? OPEN IT!!"
+    v2.msgs[20] = "Right, there it is."
+    v2.msgs[22] = "Remember, The more popups are open, the faster I make money!"
+    v2.msgs[23] = "Now, let's begin."
+    v2.msgs[40] = "Welp, I made my money again! Theoretically, this will earn me infinite money won't it?"
+    v2.msgs[41] = "Anyways, it's time to reset the cycle."
+    v2.msgs[42] = "See you soon!"
+    v2.msgs[50] = "What a surprise... I've won... again..."
+    v2.msgs[51] = "That was a close one. *sigh*"
+    v2.msgs[52] = "It gets harder every time..."
+    v2.msgs[53] = "Bye. See you soon..."
+  else
+    v2.msgs[1] = "..."
+    v2.msgs[2] = "I don't have anything else left to say."
+    v2.msgs[3] = "This is my life now."
+    v2.msgs[4] = "I will live this forever."
+    v2.msgs[5] = "I wouldn't wish this on my worst enemy."
+    v2.msgs[16] = "Open your Antivirus, let's do this."
+    v2.msgs[18] = "God, will I have to tell you to open it every time? OPEN IT!!"
+    v2.msgs[20] = "Right, there it is."
+    v2.msgs[22] = "Remember, The more popups are open, the faster I make money."
+    v2.msgs[23] = "Now, let's begin."
+    v2.msgs[40] = "Welp, I made my money again..."
+    v2.msgs[41] = "Time to reset the cycle."
+    v2.msgs[42] = "See you soon."
+    v2.msgs[50] = "What a surprise... I've won... again..."
+    v2.msgs[51] = "That was a close one. *sigh*"
+    v2.msgs[52] = "It gets harder every time..."
+    v2.msgs[53] = "Bye. See you soon..."
+  end
+  v2.msgs[25] = "No! You can't beat me! This is ridiculous!"
   v2.msgs[26] = "Screw the popups, no amount of money is worth dying for! I'll just attack you directly!"
   v2.msgs[27] = "Sucks for you! You have to care about your own health now!"
   v2.msgs[28] = "I'm not the one whose going to die today, that's for sure!"
@@ -157,7 +266,7 @@ function loadDia()
   v2.msgs[31] = "WOAH WOAH WOAH! WAIT! WAIT!!!"
   v2.msgs[32] = "We don't have to end it like this! Could we... work something out?"
   v2.msgs[33] = "I could give you money! Tons of money! Please, just let me live..."
-  v2.msgs[34] = "PSYCH! GOT YA! YOU FELL RIGHT INTO MY TRAP! YOU ARE GOING DOWN RIGHT HERE RIGHT NOW!"
+  v2.msgs[34] = "PSYCH! GOT YA! YOU LET YOUR GUARD DOWN! I WILL USE ALL OF MY POWER!"
   v2.msgs[35] = "IT'S ABOUT TIME FOR YOU TO FUCKING DIE! BECAUSE I WON'T! I REFUSE! I'LL SEE YOU IN HELL!"
   v2.msgs[36] = "AAAAAAAHAHAHAHAAHAHAHAHAHAHAHAAHAHAHAAHAHAHAAHAHAHAHAHAAHAHAHAHAHAHAHAHAHAHAHA!!!"
 end
diff --git a/var.lua b/var.lua
index 9367bc8..4537542 100644
--- a/var.lua
+++ b/var.lua
@@ -150,7 +150,9 @@ function loadVar()
   v1.shakex = 0
   v1.shakey = 0
   v1.explodeEndFrame = 1
-  v1.complete = false
+  if v1.complete == nil then
+    v1.complete = false
+  end
   v1.fightMinute = 5
   v1.c.x = 0
   v1.c.y = 0
@@ -210,7 +212,9 @@ function loadVar()
   v2.startTime = 0
   v2.start = false
   v2.startPopups = 10
-  v2.complete = false
+  if v2.complete == nil then
+    v2.complete = false
+  end
   v2.popshotx = sys.w/2
   v2.popshoty = sys.h/2
   v2.popshotsh = 10
@@ -402,6 +406,7 @@ function loadPre()
   sys.h = love.graphics.getHeight()
   virus1Lose = 0
   virus1Pissed = false
+  virus2Lose = 0
 end
 function loadRe()
   loading = 0
diff --git a/viewer.lua b/viewer.lua
index ebb4e0a..0501bb0 100644
--- a/viewer.lua
+++ b/viewer.lua
@@ -202,16 +202,14 @@ function loadDocuments()
 Created By Chris Bradley
 Created With Love2D, Blender, GIMP, Audacity, and Atom
 
--Music-
+Music Credits:
 ‘Thrills And Spills’ By Jay Man - OurMusicBox
-‘Storm Chasers’, ‘Close my Mouth’ By Silent Partner
-‘Down N' Dirty’ By Jingle Punks
-‘Fight or Flight’ By Ethan Meixsell
-How it Begins Kevin MacLeod (incompetech.com)
+‘Skyscraper Party’ By David Anakhasian (David L.A.) davidla.bandcamp.com/ soundcloud.com/david_man
+‘Fire of Wrath’ By Occams Laser occamslaser.bandcamp.com/
+How it Begins By Kevin MacLeod (incompetech.com)
 Licensed under Creative Commons: By Attribution 3.0 License
-http://creativecommons.org/licenses/by/3.0/
-‘Ich Grolle Nicht’ By Rox Meixsell and Wahneta Meixsell
+creativecommons.org/licenses/by/3.0/
+Additional Music from the Youtube Audio Library
 
--Sound Effects-
-Freesound.org and the Youtube Audio Library]]
+Sound Effects from Freesound.org and the Youtube Audio Library]]
 end
diff --git a/virus2.lua b/virus2.lua
index 064d167..670932d 100644
--- a/virus2.lua
+++ b/virus2.lua
@@ -5,7 +5,7 @@ function drawVirusFight2()
   drawVirus2()
   drawAntivirusFight()
   drawPopups()
-  love.graphics.print(#v2.sg)
+  --love.graphics.print(#v2.sg)
   if v2.fightStart == true and v2.c.chat.msgs == 24 or v2.c.chat.msgs == 30 then
     v2.fightTimer = v2.fightTimer + delta
     if v2.c.chat.msgs == 24 then
@@ -149,6 +149,9 @@ function drawVirusFight2()
     v2.c.yd = sys.h/3
     if v2.c.chat.msgs == 6 then
       v2.c.handp = "fist"
+      if virus2Lose >= 3 then
+        nextChatv2(16)
+      end
     elseif v2.c.chat.msgs == 1 then
       v2.c.handp = "gunfront"
     end
@@ -156,6 +159,9 @@ function drawVirusFight2()
     v2.c.xd = sys.w/3
     v2.c.yd = sys.h/1.7
     v2.c.handp = "gunup"
+    if virus2Lose ~= 0 then
+      music.tension2:stop()
+    end
   elseif v2.c.chat.msgs == 3 then
     v2.c.xd = sys.w/3
     v2.c.yd = sys.h/3
@@ -199,37 +205,57 @@ function drawVirusFight2()
       v2.c.handp = "gunpoint"
     end
     if v2.c.health == 30 then
-      v2.c.chat.msgs = 25
-      v2.c.chat.char = 0
-      v2.c.chat.msg = ""
+      nextChatv2(25)
+      music.battle2:stop()
       for i=1,#v2.pop.p do
         v2.pop.p[i].exit = true
       end
       v2.currentAttack = "shotgunFinalRow"
       v2.nextAttack = 15
     end
+    if v2.c.money >= 500 then
+      nextChatv2(40)
+      music.battle2:stop()
+      for i=1,#v2.pop.p do
+        v2.pop.p[i].exit = true
+      end
+      v2.c.xd = sys.w/2
+      v2.c.yd = sys.h/2
+    end
   elseif v2.c.chat.msgs == 30 then
     v2.c.handp = "gunpoint"
     if v2.c.health == 5 then
       v2.c.chat.msgs = 31
       v2.c.chat.char = 0
       v2.c.chat.msg = ""
-      music.tension2:play()
-      music.tension2:seek(19.5,"seconds")
-      music.tension2:pause()
       v2.c.xd = sys.w/2
       v2.c.yd = sys.h/3
     end
+    if av.health <= 0 then
+      nextChatv2(50)
+      music.battle2part2:stop()
+      for i=1,#v2.pop.p do
+        v2.pop.p[i].exit = true
+      end
+      v2.c.xd = sys.w/2
+      v2.c.yd = sys.h/2
+    end
   elseif v2.c.chat.msgs == 31 or v2.c.chat.msgs == 34 or v2.c.chat.msgs == 32 then
     v2.c.handp = "idle"
   elseif v2.c.chat.msgs == 33 then
     v2.c.handp = "spread"
+    music.tension2:play()
+    music.tension2:seek(19.5,"seconds")
+    music.tension2:pause()
   elseif v2.c.chat.msgs == 35 then
     v2.c.handp = "fist"
   end
   if v2.fightStart == true and v2.c.chat.msgs == 24 then
+    music.battle2:setVolume(1)
     music.tension2:stop()
     music.battle2:play()
+  elseif v2.c.chat.msgs == 12 and virus2Lose == 1 then
+    music.tension2:play()
   elseif v2.fightStart == true and v2.c.chat.msgs == 26 then
     music.battle2:stop()
     music.battle2part2:play()
@@ -249,7 +275,9 @@ function drawVirusFight2()
   if v2.c.chat.msgs >= 34 then
     v2ShotgunTrick()
     love.graphics.setColor(255,255,255)
-    love.graphics.draw(v1.turret2Held, sys.w+v2.v1gun, v2.c.y, math.rad(90))
+    if v2.c.chat.msgs < 40 then
+      love.graphics.draw(v1.turret2Held, sys.w+v2.v1gun, v2.c.y, math.rad(90))
+    end
     if v2.v1gun >= 25 then
       v2.v1gun = v2.v1gun - delta*25
     else
@@ -271,20 +299,27 @@ function drawVirusFight2()
       v1.explodeEndFrame = 1
     end
   end
-  if v2.c.health == -20 then
-    v2.complete = true
+  if v2.c.health == -20 or v2.c.chat.msgs == 43 or v2.c.chat.msgs == 54 then
+    if v2.c.health == -20 then
+      v2.complete = true
+    end
     love.graphics.setColor(255,255,255)
     love.graphics.draw(expl.pic, expl.frames[math.floor(v1.explodeEndFrame)], v2.c.x, v2.c.y, 0, 20, 20, 320/2,240/2)
     v1.explodeEndFrame = v1.explodeEndFrame + 1*sys.s
     v1.explosionSound:play()
     if v1.explodeEndFrame >= 20 then
-      scene = 1
       v2.start = false
-      win[4].w = 200
-      antivirus.status = "Virus Defeated"
-      win[4].update = true
-      time = 0
-      av.transform = false
+      if v2.c.health == -20 then
+        scene = 1
+        win[4].w = 200
+        antivirus.status = "Virus Defeated"
+        win[4].update = true
+        time = 0
+        av.transform = false
+      else
+        scene = 666
+        virus2Lose = virus2Lose + 1
+      end
     end
   end
 end
@@ -383,7 +418,9 @@ function drawPopups()
     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
       if v2.pop.p[i].m == true then
-        music.tension2:play()
+        if virus2Lose < 3 then
+          music.tension2:play()
+        end
         scene = 3
         for i=1,#v2.pop.p do
           v2.pop.p[i].exit = true