aboutsummaryrefslogtreecommitdiff
path: root/desktop.lua
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-04-30 21:50:07 -0700
committer1029chris <1029chris@gmail.com>2016-04-30 21:50:07 -0700
commit9cbb6fa487c4e87085c1e32269ce671e99760b44 (patch)
treef7056cc4e2abe913f26d82a6c09d81a7876de611 /desktop.lua
parent0b95f7b3e6531d599d705fb8692d86fc0abb45d6 (diff)
Added more to the fight
ship explodes at 20 health fight stops at 0 health other fixes refresh rate adjustments
Diffstat (limited to 'desktop.lua')
-rw-r--r--desktop.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop.lua b/desktop.lua
index be4a75e..d0f4979 100644
--- a/desktop.lua
+++ b/desktop.lua
@@ -4,7 +4,7 @@ function drawDesktop()
love.graphics.draw(desktop.bg.current, 0, 0, 0, sys.w/1920, sys.h/1280)
end
if v1.explodeintro == true and v1.yes == true then
- if expl.frame >= 20 then
+ if expl.frame >= 20 or v1.c.chat.msgs > 1 then
love.graphics.draw(v1.scorch, win[2].x-300, win[2].y-100)
end
if expl.deb.load == false then
@@ -25,7 +25,7 @@ function drawDesktop()
expl.deb[i].r = expl.deb[i].r + expl.deb[i].rm
end
end
- if expl.frame <= 89 then
+ if expl.frame <= 89 and v1.c.chat.msgs < 2 then
love.graphics.setColor(255,255,255)
love.graphics.draw(expl.pic, expl.frames[expl.frame], win[2].x-750, win[2].y-500, 0, 7, 7)
expl.frame = expl.frame + 1