Implimented new loading system

webpages now load

7 files changed, 90 insertions, 44 deletions

diff --git a/assets.lua b/assets.lua
index 34dfca8..628a541 100644
--- a/assets.lua
+++ b/assets.lua
@@ -227,6 +227,15 @@ function loadAssets(id)
     expl.deb[2].pic = love.graphics.newImage("assets/debris2.png")
     expl.deb[3].pic = love.graphics.newImage("assets/debris3.png")
   end
+  if id == 16 then
+    loadVar()
+  end
+  if id == 17 then
+    loadDia()
+  end
+  if id == 18 then
+    loaded = true
+  end
 end
 function loadAnimation(pic, quad, frames, limit, w, h)
   local frame = 1
diff --git a/internet.lua b/internet.lua
index 570f074..0539fcd 100644
--- a/internet.lua
+++ b/internet.lua
@@ -14,15 +14,20 @@ function drawInternet()
   love.graphics.draw(internet.back, 11, 32)
   love.graphics.setColor(colors.font.dark)
   love.graphics.print(internet.url, 70, 44)
+  love.graphics.stencil(internetStencil, "replace", 1)
+  love.graphics.setStencilTest("greater", 0)
   love.graphics.setColor(255, 255, 255)
   if internet.urlc == "www.homepage.com" then
     love.graphics.draw(internet.welcome, 8, 74)
   elseif internet.urlc == "www.freedownloads.com" then
     love.graphics.draw(internet.freedownloads1, 8, 74)
-    v1.yes = true
+    if v1.complete == false then
+      v1.yes = true
+    end
   else
     love.graphics.draw(internet.error, 8, 74)
   end
+  love.graphics.setStencilTest()
 end
 function updateInternet()
   internet.urlold = internet.url
@@ -36,6 +41,7 @@ function updateInternet()
     if key == "return" and layer[1] == 2 then
       internet.urlc = internet.url
       win[2].update = true
+      internet.load = 0
     end
   end
   function love.textinput(t)
@@ -46,4 +52,13 @@ function updateInternet()
       end
     end
   end
+  if internet.load ~= 442 then
+    if math.random(1,3) == 3 then
+      internet.load = internet.load + math.random(0,20)
+      win[2].update = true
+    end
+  end
+end
+function internetStencil()
+  love.graphics.rectangle("fill", 8, 74, 600, internet.load)
 end
diff --git a/loading.lua b/loading.lua
index d88f4c9..de67665 100644
--- a/loading.lua
+++ b/loading.lua
@@ -7,7 +7,11 @@ function drawLoading()
   love.graphics.setColor(0,0,120)
   love.graphics.rectangle("fill", sys.w/2-125+5, sys.h/2-10, loading, 20)
   if loading < 240 then
-    loading = loading + math.random(0.1,2)
+    loading = loading + 5
+    if loading > loadingId*10 and loaded == false then
+      loadAssets(loadingId)
+      loadingId = loadingId + 1
+    end
   elseif loading >= 240 then
     loading = 240
     fade = 1
@@ -20,3 +24,5 @@ function drawLoading()
     sound.boot:play()
   end
 end
+function drawBSOD()
+end
diff --git a/main.lua b/main.lua
index 6c3aa07..a24a72d 100644
--- a/main.lua
+++ b/main.lua
@@ -15,21 +15,7 @@ function love.load()
   require "elements"
   require "virus1"
   require "dialogue"
-  love.graphics.setDefaultFilter("nearest", "nearest")
-  love.graphics.setBackgroundColor(0, 0, 0)
-  love.graphics.setNewFont()
-  pressstart = love.graphics.newFont("fonts/pressstart.ttf", 12)
-  pressstart:setFilter("nearest", "nearest")
-  --pressstarts = love.graphics.newFont("fonts/pressstart.ttf", 10)
-  --pressstarts:setFilter("nearest", "nearest")
-  pixeloperatorb = love.graphics.newFont("fonts/pixel_operator/PixelOperator8-Bold.ttf", 16)
-  pixeloperatorb:setFilter("nearest", "nearest")
-  pixeloperator = love.graphics.newFont("fonts/pixel_operator/PixelOperator8.ttf", 16.5)
-  pixeloperator:setFilter("nearest", "nearest")
-  pixeloperators = love.graphics.newFont("fonts/pixel_operator/PixelOperator-Bold.ttf", 16)
-  pixeloperators:setFilter("nearest", "nearest")
-  love.graphics.setFont(pressstart)
-  love.keyboard.setKeyRepeat(true)
+  loadPre()
   --loadAssets()
   --loadVar()
   --loadDia()
@@ -49,8 +35,14 @@ function love.update(dt)
   end
   if love.keyboard.isDown("f4") == true then
     love.window.setMode(800, 600, {fullscreen=true, fullscreentype="desktop"})
+    for i=1,#win do
+      win[i].update = true
+    end
   elseif love.keyboard.isDown("f5") == true then
     love.window.setMode(1280, 720, {fullscreen=false})
+    for i=1,#win do
+      win[i].update = true
+    end
   end
   if fade == 1 and fadeOpacity ~= 255 then
     fadeOpacity = fadeOpacity + 5
@@ -60,13 +52,15 @@ function love.update(dt)
   if scene == 1 then
     updateSystem(dt)
   end
-  if v1.yes == true then
-    v1.timer = v1.timer + dt
-  end
-  if v1.yes == true and v1.timer >= 5 then
-    scene = 2
-    if v1.explodeintrotimer <= 7.8 then
-      v1.explodeintrotimer = v1.explodeintrotimer + dt
+  if loaded == true then
+    if v1.yes == true and v1.complete == false then
+      v1.timer = v1.timer + dt
+    end
+    if v1.yes == true and v1.timer >= 5 then
+      scene = 2
+      if v1.explodeintrotimer <= 7.8 then
+        v1.explodeintrotimer = v1.explodeintrotimer + dt
+      end
     end
   end
 end
diff --git a/panel.lua b/panel.lua
index bc01a9f..0ba0687 100644
--- a/panel.lua
+++ b/panel.lua
@@ -65,6 +65,8 @@ function drawStart()
   end
 end
 function drawNoti()
+  notify.x = sys.w-258
+  notify.y = sys.h-135
   if notify.yes == true or notify.op ~= 0 then
     love.graphics.setColor(255, 255, 255, notify.op)
     love.graphics.draw(notification.bubble, notify.x, notify.y)
diff --git a/var.lua b/var.lua
index 568c92b..16d0f94 100644
--- a/var.lua
+++ b/var.lua
@@ -35,20 +35,6 @@ function loadIcon(id, x, y)
   icon[id].cl = false
 end
 function loadVar()
-  sys = {}
-  sys.s = 0
-  sys.width = love.graphics.getWidth()
-  sys.height = love.graphics.getHeight()
-  sys.mouse = {}
-  sys.mouse.p = {}
-  sys.mouse.x = love.mouse.getX
-  sys.mouse.y = love.mouse.getY
-  sys.mouse.p.x = 0
-  sys.mouse.p.y = 0
-  sys.mouse.p.p = false
-  sys.mouse.drag = false
-  sys.w = love.graphics.getWidth()
-  sys.h = love.graphics.getHeight()
   di = 0.75
   panel = {}
   panel.thick = 30
@@ -91,10 +77,6 @@ function loadVar()
   layer = {}
   layer.sentToFront = 0
   desktop.bg.current = 0
-  fade = 0
-  fadeOpacity = 0
-  scene = 0
-  loading = 0
   antivirus.prog = 0
   antivirus.status = "Not Scanning"
   antivirus.scanning = false
@@ -135,6 +117,7 @@ function loadVar()
   internet.url = "www.homepage.com"
   internet.urlold = internet.url
   internet.urlc = internet.url
+  internet.load = 0
   v1.yes = false
   v1.timer = 0
   v1.shakemin = 0
@@ -173,7 +156,6 @@ function loadVar()
   expl.deb[3].r = math.rad(0)
   expl.deb[3].rm = math.rad(1)
   expl.deb.load = false
-  time = 0
   std = {}
   std[1] = {}
   std[1].title = "Baby"
@@ -194,3 +176,41 @@ function loadVar()
   std[6].title = "Impossible"
   std[6].hl = false
 end
+function loadPre()
+  love.graphics.setDefaultFilter("nearest", "nearest")
+  love.graphics.setBackgroundColor(0, 0, 0)
+  love.graphics.setNewFont()
+  pressstart = love.graphics.newFont("fonts/pressstart.ttf", 12)
+  pressstart:setFilter("nearest", "nearest")
+  --pressstarts = love.graphics.newFont("fonts/pressstart.ttf", 10)
+  --pressstarts:setFilter("nearest", "nearest")
+  pixeloperatorb = love.graphics.newFont("fonts/pixel_operator/PixelOperator8-Bold.ttf", 16)
+  pixeloperatorb:setFilter("nearest", "nearest")
+  pixeloperator = love.graphics.newFont("fonts/pixel_operator/PixelOperator8.ttf", 16.5)
+  pixeloperator:setFilter("nearest", "nearest")
+  pixeloperators = love.graphics.newFont("fonts/pixel_operator/PixelOperator-Bold.ttf", 16)
+  pixeloperators:setFilter("nearest", "nearest")
+  love.graphics.setFont(pressstart)
+  love.keyboard.setKeyRepeat(true)
+  scene = 0
+  loading = 0
+  fade = 0
+  loaded = false
+  loadingId = 1
+  time = 0
+  fadeOpacity = 0
+  sys = {}
+  sys.s = 0
+  sys.width = love.graphics.getWidth()
+  sys.height = love.graphics.getHeight()
+  sys.mouse = {}
+  sys.mouse.p = {}
+  sys.mouse.x = love.mouse.getX
+  sys.mouse.y = love.mouse.getY
+  sys.mouse.p.x = 0
+  sys.mouse.p.y = 0
+  sys.mouse.p.p = false
+  sys.mouse.drag = false
+  sys.w = love.graphics.getWidth()
+  sys.h = love.graphics.getHeight()
+end
diff --git a/virus1.lua b/virus1.lua
index 64513a4..b97ece3 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -214,7 +214,7 @@ function drawVirusFight1()
     if v1.c.chat.msgs == 2 then
       v1.c.xd = sys.w/2
       v1.c.yd = sys.h/2
-    elseif v1.c.chat.msgs == 8 or v1.c.chat.msgs == 41 or v1.c.chat.msgs == 39 then
+    elseif v1.c.chat.msgs == 8 or v1.c.chat.msgs == 41 or v1.c.chat.msgs == 39 or v1.c.chat.msgs == 50 then
       v1.c.xd = sys.w/2
       v1.c.yd = 200
     elseif v1.c.chat.msgs == 25 then