aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris B <1029chris@gmail.com>2016-06-10 19:54:03 -0700
committerChris B <1029chris@gmail.com>2016-06-10 19:54:03 -0700
commit8d027534abab0abee2b01f13804805f4e6d8ff6c (patch)
tree325023a04d77709fec3c47dbfea73bb2ad5728c6
parent4ec720afe5e2f712e5f73d79a6540e7feb29d482 (diff)
Fixed more glitches
-rw-r--r--antivirus.lua2
-rw-r--r--virus1.lua10
2 files changed, 6 insertions, 6 deletions
diff --git a/antivirus.lua b/antivirus.lua
index 2830dd8..6dfc4a1 100644
--- a/antivirus.lua
+++ b/antivirus.lua
@@ -21,7 +21,7 @@ function updateAntivirus()
antivirus.prog = 0
end
if antivirus.scanning == true then
- antivirus.prog = antivirus.prog + math.random(0,0.5,2,10,1,20,0.1,0.2)
+ antivirus.prog = antivirus.prog + (math.random(0,0.5,2,10,1,20,0.1,0.2)*sys.s)
win[4].update = true
antivirus.status = "Scanning: " .. math.floor(antivirus.prog/174*100) .. "%"
end
diff --git a/virus1.lua b/virus1.lua
index 6e0ff94..fe3a636 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -182,15 +182,15 @@ function drawVirusFight1()
end
for i=1,3 do
if v1.c.eyetx > v1.c.x+7+v1.c.eyex and v1.c.eyex < 15 then
- v1.c.eyex = v1.c.eyex + 1
+ v1.c.eyex = v1.c.eyex + 1*sys.s
elseif v1.c.eyetx < v1.c.x+7+v1.c.eyex and v1.c.eyex > -15 then
- v1.c.eyex = v1.c.eyex - 1
+ v1.c.eyex = v1.c.eyex - 1*sys.s
end
end
if v1.c.eyety > v1.c.y-28+v1.c.eyey and v1.c.eyey < 5 then
- v1.c.eyey = v1.c.eyey + 3
+ v1.c.eyey = v1.c.eyey + 3*sys.s
elseif v1.c.eyety < v1.c.y-28+v1.c.eyey and v1.c.eyey > -10 then
- v1.c.eyey = v1.c.eyey - 3
+ v1.c.eyey = v1.c.eyey - 3*sys.s
end
love.graphics.draw(v1.c.pupil, v1.c.x+7+v1.c.eyex+math.random(0,0.5)+v1.shakex, v1.c.y-28+v1.c.eyey+math.random(0,0.5)+v1.shakey, v1.c.r, v1.c.s*1.2, v1.c.s*1.2, 3, 11)
playAnimation(v1.c.idle, true, v1.c.x+v1.shakex, v1.c.y+v1.shakey, v1.c.r, v1.c.s, 100, 100, 0.5)
@@ -523,7 +523,7 @@ function drawVirusFight1()
end
if v1.c.shine.s1 >= 7 or v1.c.shine.ct >= 3 then
v1.c.shine.sm1 = false
- v1.c.shine.ct = v1.c.shine.ct + 1*sys.s
+ v1.c.shine.ct = v1.c.shine.ct + 1
elseif v1.c.shine.s1 <= -5 and v1.c.shine.ct < 3 then
v1.c.shine.sm1 = true
end