aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-05-11 13:36:33 -0700
committer1029chris <1029chris@gmail.com>2016-05-11 13:36:33 -0700
commitb12aafee92b40a16b61d30839beb8b68188659ea (patch)
tree142d3595a23ec960b110f6820ec55dfbdafee514
parent9d07c35aa001b3994591b33ab54de3271b5637b0 (diff)
Many different tweaks
Added files gui Tweaked fight Added code for window shadow (but it isnt enabled)
-rw-r--r--files.lua11
-rw-r--r--system.lua3
-rw-r--r--var.lua2
-rw-r--r--virus1.lua10
-rw-r--r--window.lua12
5 files changed, 33 insertions, 5 deletions
diff --git a/files.lua b/files.lua
index 63cb926..f31bf34 100644
--- a/files.lua
+++ b/files.lua
@@ -1,2 +1,13 @@
function drawFiles()
+ drawDownBox(8, 74, win[3].w-17, win[3].h-108, 4)
+ drawDownBox(8, 31, win[3].w-17, 34, 4)
+ drawDownBox(7, 374, win[3].w-15, 18, 2)
+ love.graphics.setColor(250, 250, 250)
+ love.graphics.rectangle("fill", 8, 74, win[3].w-17, win[3].h-108)
+ love.graphics.rectangle("fill", 8, 31, win[3].w-17, 34)
+ drawUpBox(9, 32, 38, 32, 2)
+ love.graphics.setColor(255, 255, 255)
+ love.graphics.draw(internet.back, 11, 32)
+ love.graphics.setColor(colors.font.dark)
+ love.graphics.print("/User/", 70, 44)
end
diff --git a/system.lua b/system.lua
index d2639b4..29a3b97 100644
--- a/system.lua
+++ b/system.lua
@@ -1,4 +1,7 @@
function drawLayer(id)
+ --love.graphics.setColor(0,0,0,30)
+ --love.graphics.rectangle("fill", win[layer[id]].x+20, win[layer[id]].y+20, win[layer[id]].w, win[layer[id]].h)
+ love.graphics.setColor(256,256,256)
love.graphics.draw(win[layer[id]].cvs, win[layer[id]].x, win[layer[id]].y, 0, win[layer[id]].s)
end
function updateSystem(dt)
diff --git a/var.lua b/var.lua
index 5c98b44..ff5b355 100644
--- a/var.lua
+++ b/var.lua
@@ -163,7 +163,7 @@ function loadVar()
v1.turretTimer2 = 0
v1.specialAbi = false
v1.bulletSpeed = 0
- v1.specialAbiTime = 21
+ v1.specialAbiTime = 70
expl.deb[1].x = 0
expl.deb[1].y = 0
expl.deb[1].ym = 5
diff --git a/virus1.lua b/virus1.lua
index 5e3f443..64075c7 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -389,7 +389,7 @@ function drawVirusFight1()
v1.specialAbi = false
end
if v1.turretTimer2 > v1.specialAbiTime+4 then
- v1.specialAbiTime = v1.specialAbiTime + 21
+ v1.specialAbiTime = v1.specialAbiTime + math.random(20,70)
end
if v1.c.y == v1.c.yd and v1.c.health < 55 and v1.turretTimer < 30 then
v1.c.yd = math.random(80,sys.h/2-(120*(1080/sys.h)))
@@ -450,7 +450,7 @@ function drawVirusFight1()
end
v1.c.sp = v1.c.sp*sys.s
if v1.specialAbi == true then
- v1.c.sp = v1.c.sp*3
+ v1.c.sp = v1.c.sp*2
end
if v1.c.chat.msgs == 36 or v1.c.chat.msgs == 40 then
v1.c.sp = v1.c.sp*di
@@ -555,8 +555,6 @@ function drawVirusFight1()
if v1.c.chat.msgs == 47 or v1.c.chat.msgs == 53 then
if v1.c.chat.msgs == 47 then
v1.complete = true
- elseif v1.c.chat.msgs == 53 then
- virus1Lose = virus1Lose + 1
end
love.graphics.setColor(255,255,255)
love.graphics.draw(expl.pic, expl.frames[v1.explodeEndFrame], v1.c.x-615/2-800, v1.c.y-100+20-700, 0, 7, 7)
@@ -566,8 +564,12 @@ function drawVirusFight1()
if v1.explodeEndFrame >= 20 then
v1.yes = false
if v1.c.chat.msgs == 47 then
+ win[4].w = 200
+ antivirus.status = "Virus Defeated"
+ win[4].update = true
scene = 1
elseif v1.c.chat.msgs == 53 then
+ virus1Lose = virus1Lose + 1
scene = 666
end
end
diff --git a/window.lua b/window.lua
index e957221..450fe00 100644
--- a/window.lua
+++ b/window.lua
@@ -22,6 +22,8 @@ function drawWindow(id)
drawInternet()
elseif id == 6 then
drawSettings()
+ elseif id == 3 then
+ drawFiles()
end
love.graphics.setCanvas()
win[id].update = false
@@ -88,6 +90,16 @@ function drawWindow(id)
windowMouseMove(id,0,sys.w-win[id].w,0,sys.h-win[id].h-panel.thick-1)
end
end
+ if win[id].x > sys.w-win[id].w then
+ win[id].x = sys.w-win[id].w
+ elseif win[id].x < 0 then
+ win[id].x = 0
+ end
+ if win[id].y > sys.h-win[id].h then
+ win[id].y = sys.h-win[id].h
+ elseif win[id].y < 0 then
+ win[id].y = 0
+ end
if v1.yes == true and id ~= 2 and win[id].ex == false and v1.timer >= 4 and v1.c.chat.msgs < 7 then
win[id].ex = true
end