From 127446e6f22b479abf1935f04739104288504b51 Mon Sep 17 00:00:00 2001
From: 1029chris <1029chris@gmail.com>
Date: Fri, 11 Nov 2016 22:19:19 -0800
Subject: Fixed a couple bugs, adjusted dialogue

---
 desktop.lua  | 15 +++++++++++----
 dialogue.lua |  2 +-
 virus1.lua   |  2 ++
 virus2.lua   |  2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/desktop.lua b/desktop.lua
index 63ea467..081363f 100644
--- a/desktop.lua
+++ b/desktop.lua
@@ -78,11 +78,18 @@ function drawIcon(id, x, y)
 end
 function checkIcon(id)
   if(sys.mouse.p.x >= icon[id].x+4 and sys.mouse.p.x <= icon[id].x+100 and sys.mouse.p.p == true
-  and sys.mouse.p.y >= icon[id].y and sys.mouse.p.y <= icon[id].y+75 and v1.yes == false and v2.start == false) then
-    if icon[id].hl == false and icon[id].cl == false then
+  and sys.mouse.p.y >= icon[id].y and sys.mouse.p.y <= icon[id].y+75 and v1.yes == false) then
+    local click = true
+    if v2.start == true then
+      if v2.c.chat.msgs == 17 or v2.c.chat.msgs == 18 and id == 4 and scene == 3 then
+      else
+        click = false
+      end
+    end
+    if icon[id].hl == false and icon[id].cl == false and click == true then
       icon[id].hl = true
       icon[id].cl = true
-    elseif icon[id].hl == true and icon[id].cl == false then
+    elseif icon[id].hl == true and icon[id].cl == false and click == true then
       icon[id].hl = false
       icon[id].cl = true
       if win[id].ex == true then
@@ -90,7 +97,7 @@ function checkIcon(id)
         win[id].s = 0.2
         win[id].oldlayer = win[id].layer
         layer.sentToFront = id
-      else
+      elseif v2.start == false and win[id].ex == false then
         win[id].oldlayer = win[id].layer
         layer.sentToFront = id
       end
diff --git a/dialogue.lua b/dialogue.lua
index 61f4cb8..be0f0c9 100644
--- a/dialogue.lua
+++ b/dialogue.lua
@@ -57,7 +57,7 @@ function loadDia()
     v1.msgs[11] = "But you're still pretty stupid."
     v1.msgs[13] = "HAHA! PATHETIC! Is that it? Is that all you got?"
     v1.msgs[14] = "I bet that thing couldn't put a dent in me!"
-    v1.msgs[15] = "Go ahead! Try it, you won't stop me! Position it below me, and press the fire button! Go on! DO IT!"
+    v1.msgs[15] = "Go ahead! Try it, you won't stop me! Position it below me, and press the spacebar! Go on! DO IT!"
   elseif virus1Lose ~= 0 then
     v1.msgs[9] = "Oh nooo, you're antiviurs appeared! I've neeeevver seen THAT before!"
     if virus1Lose == 1 then
diff --git a/virus1.lua b/virus1.lua
index 638f449..58a17ca 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -548,6 +548,8 @@ function drawVirusFight1()
         scene = 1
         time = 0
         av.transform = false
+        av.wings = 0
+        av.gun = 0
       elseif v1.c.chat.msgs == 53 then
         virus1Lose = virus1Lose + 1
         scene = 666
diff --git a/virus2.lua b/virus2.lua
index 7d00422..b15b1d4 100644
--- a/virus2.lua
+++ b/virus2.lua
@@ -321,6 +321,8 @@ function drawVirusFight2()
         win[4].update = true
         time = 0
         av.transform = false
+        av.wings = 0
+        av.gun = 0
       else
         scene = 666
         virus2Lose = virus2Lose + 1
-- 
cgit