aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-07-13 16:47:47 -0700
committer1029chris <1029chris@gmail.com>2016-07-13 16:47:47 -0700
commit53129e96b74c206f4f06c85a44cde3a35c07c610 (patch)
treec3fb12ed26f79e3733ef4db63ca1ab2a2884b3a3
parent870fe80793d441cb4845b95e6eb7ca134728b412 (diff)
Virus blinks now, every 4-8 seconds.
-rw-r--r--assets.lua4
-rw-r--r--var.lua7
-rw-r--r--virus1.lua46
3 files changed, 56 insertions, 1 deletions
diff --git a/assets.lua b/assets.lua
index 1d19f99..47b8780 100644
--- a/assets.lua
+++ b/assets.lua
@@ -166,7 +166,9 @@ function loadAssets(id)
shipBack = love.graphics.newImage("assets/virus1_ship_back.png"),
rumbleLoop = love.audio.newSource("assets/rumble_loop.ogg"),
tent1 = love.graphics.newImage("assets/tentacle1.png"),
- tent2 = love.graphics.newImage("assets/tentacle2.png")
+ tent2 = love.graphics.newImage("assets/tentacle2.png"),
+ lidup = love.graphics.newImage("assets/v1_upper_eyelid.png"),
+ lidlow = love.graphics.newImage("assets/v1_lower_eyelid.png")
}
end
if id == 14 then
diff --git a/var.lua b/var.lua
index b8dd940..a121b5e 100644
--- a/var.lua
+++ b/var.lua
@@ -176,6 +176,13 @@ function loadVar()
v1.t.time = 0
v1.t.t = {}
v1.t.x = -1000*sys.sw
+ v1.lid = {}
+ v1.lid.lowy = 25
+ v1.lid.upy = -25
+ v1.lid.lowyd = 25
+ v1.lid.upyd = -25
+ v1.lid.bTimer = math.random(4,8)
+ v1.lid.b = false
expl.deb[1].x = 0
expl.deb[1].y = 0
expl.deb[1].ym = 5
diff --git a/virus1.lua b/virus1.lua
index b97ca34..14fc8e0 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -124,7 +124,53 @@ function drawVirusFight1()
elseif v1.c.eyety < v1.c.y-28+v1.c.eyey and v1.c.eyey > -10 then
v1.c.eyey = v1.c.eyey - 3*sys.s
end
+ v1.lid.bTimer = v1.lid.bTimer - delta
+ if v1.lid.bTimer <= 0 then
+ v1.lid.b = true
+ end
+ if v1.lid.b == true then
+ v1.lid.lowyd = 0
+ v1.lid.upyd = 0
+ end
+ if v1.lid.upy == 0 and v1.lid.lowy == 0 then
+ v1.lid.lowyd = 25
+ v1.lid.upyd = -25
+ v1.lid.b = false
+ v1.lid.bTimer = math.random(4,8)
+ end
+ if v1.lid.lowy > v1.lid.lowyd then
+ if v1.lid.lowy - 3*sys.s < v1.lid.lowyd then
+ v1.lid.lowy = v1.lid.lowyd
+ else
+ v1.lid.lowy = v1.lid.lowy - 3*sys.s
+ end
+ elseif v1.lid.lowy < v1.lid.lowyd then
+ if v1.lid.lowy + 3*sys.s > v1.lid.lowyd then
+ v1.lid.lowy = v1.lid.lowyd
+ else
+ v1.lid.lowy = v1.lid.lowy + 3*sys.s
+ end
+ end
+ if v1.lid.upy > v1.lid.upyd then
+ if v1.lid.upy - 3*sys.s < v1.lid.upyd then
+ v1.lid.upy = v1.lid.upyd
+ else
+ v1.lid.upy = v1.lid.upy - 3*sys.s
+ end
+ elseif v1.lid.upy < v1.lid.upyd then
+ if v1.lid.upy + 3*sys.s > v1.lid.upyd then
+ v1.lid.upy = v1.lid.upyd
+ else
+ v1.lid.upy = v1.lid.upy + 3*sys.s
+ end
+ 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)
+ if v1.lid.upy ~= -25 then
+ love.graphics.draw(v1.lidup, v1.c.x-43+v1.shakex, v1.c.y-58+v1.lid.upy+v1.shakey, v1.c.r, v1.c.s*1.1)
+ end
+ if v1.lid.lowy ~= 25 then
+ love.graphics.draw(v1.lidlow, v1.c.x-43+v1.shakex, v1.c.y-58+v1.lid.lowy+v1.shakey, v1.c.r, v1.c.s*1.1)
+ end
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)
if v1.c.chat.msgs > 28 and expl.frame <= 10 then
v1.turret[1].x = v1.c.x-615/2-10+v1.shakex