aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets.lua428
-rw-r--r--dialogue.lua4
-rw-r--r--main.lua6
-rw-r--r--panel.lua1
-rw-r--r--var.lua5
-rw-r--r--virus1.lua9
6 files changed, 247 insertions, 206 deletions
diff --git a/assets.lua b/assets.lua
index 39efe38..34dfca8 100644
--- a/assets.lua
+++ b/assets.lua
@@ -1,202 +1,232 @@
-function loadAssets()
- icons = {}
- icons[32] = {
- chat = love.graphics.newImage("assets/icon_32_chat.png"),
- internet = love.graphics.newImage("assets/icon_32_internet.png"),
- files = love.graphics.newImage("assets/icon_32_files.png"),
- file = love.graphics.newImage("assets/icon_32_file.png"),
- help = love.graphics.newImage("assets/icon_32_help.png"),
- antivirus = love.graphics.newImage("assets/icon_32_antivirus.png"),
- settings = love.graphics.newImage("assets/icon_32_settings.png")
- }
- icons[16] = {
- chat = love.graphics.newImage("assets/icon_16_chat.png"),
- internet = love.graphics.newImage("assets/icon_16_internet.png"),
- files = love.graphics.newImage("assets/icon_16_files.png"),
- help = love.graphics.newImage("assets/icon_16_help.png"),
- settings = love.graphics.newImage("assets/icon_16_settings.png"),
- antivirus = love.graphics.newImage("assets/icon_16_antivirus.png")
- }
- desktop = {}
- desktop.bg = {
- hills = love.graphics.newImage("assets/bg_hills.jpg"),
- coast = love.graphics.newImage("assets/bg_coast.jpg"),
- cloud = love.graphics.newImage("assets/bg_cloud.jpg"),
- flower = love.graphics.newImage("assets/bg_flower.jpg"),
- city = love.graphics.newImage("assets/bg_city.jpg")
- }
- st = {}
- st[1] = {}
- st[1].title = "Default"
- st[1].hl = false
- st[2] = {}
- st[2].title = "Hills"
- st[2].hl = false
- st[3] = {}
- st[3].title = "Clouds"
- st[3].hl = false
- st[4] = {}
- st[4].title = "City"
- st[4].hl = false
- st[5] = {}
- st[5].title = "Flower"
- st[5].hl = false
- st[6] = {}
- st[6].title = "Coast"
- st[6].hl = false
- music = {
- battle1 = love.audio.newSource("assets/music/Thrills And Spills.ogg"),
- battleNSA = love.audio.newSource("assets/music/Less Than Three.ogg"),
- battleUndertale = love.audio.newSource("assets/music/Alphys Takes Action.ogg"),
- battle2 = love.audio.newSource("assets/music/Skyscraper Party.ogg"),
- sad1 = love.audio.newSource("assets/music/Startup Ambiance.ogg"),
- battle3 = love.audio.newSource("assets/music/Without Silence.ogg"),
- fox = love.audio.newSource("assets/music/FOX.ogg"),
- tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg")
- }
- sound = {
- boot = love.audio.newSource("assets/boot.ogg")
- }
- sound.boot:setLooping(false)
- music.battle1:setLooping(true)
- music.battle2:setLooping(true)
- music.battleNSA:setLooping(true)
- music.battleUndertale:setLooping(true)
- window = {
- bar = love.graphics.newImage("assets/win_bar.png"),
- barGrey = love.graphics.newImage("assets/win_bar_grey.png")
- }
- settings = {
- comp = love.graphics.newImage("assets/computer.png")
- }
- chat = {
- online = love.graphics.newImage("assets/chat_status_online.png"),
- offline = love.graphics.newImage("assets/chat_status_offline.png"),
- profile = love.graphics.newImage("assets/chat_profile.png")
- }
- internet = {
- back = love.graphics.newImage("assets/internet_back.png"),
- freedownloads1 = love.graphics.newImage("assets/internet_freedownloads.png"),
- freedownloads2 = love.graphics.newImage("assets/internet_freedownloads2.png"),
- welcome = love.graphics.newImage("assets/internet_welcome.png"),
- error = love.graphics.newImage("assets/internet_error.png")
- }
- antivirus = {
- gun = love.graphics.newImage("assets/antivirus_turret_gun.png"),
- body = love.graphics.newImage("assets/antivirus_turret_body.png"),
- left = love.graphics.newImage("assets/antivirus_turret_leftwing.png"),
- right = love.graphics.newImage("assets/antivirus_turret_rightwing.png"),
- open = love.audio.newSource("assets/antivirus_open.ogg"),
- opengun = love.audio.newSource("assets/antivirus_open_gun.ogg"),
- laser = love.audio.newSource("assets/antivirus_laser.ogg"),
- bullet = love.graphics.newImage("assets/bullet_blue.png"),
- hit = love.audio.newSource("assets/antivirus_hit.ogg"),
- charge = love.graphics.newImage("assets/antivirus_charge.png")
- }
- notification = {
- bubble = love.graphics.newImage("assets/notification.png"),
- sound1 = love.audio.newSource("assets/notification1.ogg"),
- sound2 = love.audio.newSource("assets/notification2.ogg")
- }
- v1 = {
- intro = love.audio.newSource("assets/virus1intro.ogg"),
- shine = love.audio.newSource("assets/shine.ogg"),
- scorch = love.graphics.newImage("assets/virus_scorch.png"),
- scorchMask = love.graphics.newImage("assets/virus_scorch_mask.png"),
- shineplay = false,
- corner = love.graphics.newImage("assets/chat_bubble_corner.png"),
- cornerSpike = love.graphics.newImage("assets/chat_bubble_cornerspike.png"),
- turret1 = love.graphics.newImage("assets/virus1_turret.png"),
- turret2 = love.graphics.newImage("assets/virus1_turret2.png"),
- turret2Held = love.graphics.newImage("assets/virus1_turret2_held.png"),
- shipFront = love.graphics.newImage("assets/virus1_ship_front.png"),
- shipBack = love.graphics.newImage("assets/virus1_ship_back.png"),
- rumbleLoop = love.audio.newSource("assets/rumble_loop.ogg")
- }
- v1.rumbleLoop:setLooping(true)
- v1.msgs = {}
- v1.c = {}
- v1.c.chat = {}
- v1.c.chat.next = false
- v1.c.chat.msgs = 1
- v1.c.chat.msg = ""
- v1.c.chat.sp = 0.5
- v1.c.chat.char = 0
- v1.turret = {}
- v1.turret[1] = {r=math.rad(30),x=0,y=0,rt=math.rad(30),t=0,tl=1}
- v1.turret[2] = {r=math.rad(15),x=0,y=0,rt=math.rad(15),t=0,tl=2}
- v1.turret[3] = {r=math.rad(-15),x=0,y=0,rt=math.rad(-15),t=0,tl=3}
- v1.turret[4] = {r=math.rad(-30),x=0,y=0,rt=math.rad(-30),t=0,tl=4}
- v1.laserSound = love.audio.newSource("assets/virus1_laser.ogg")
- v1.laserSound:setVolume(0.6)
- v1.explosionSound = love.audio.newSource("assets/explosion.ogg")
- v1.bullets = {}
- v1.bullet = love.graphics.newImage("assets/bullet_green.png")
- v1.bulletRed = love.graphics.newImage("assets/bullet_red.png")
- v1.bulletYellow = love.graphics.newImage("assets/bullet_yellow.png")
- v1.c.idle = {}
- v1.c.idle.fs = {}
- v1.c.idle.pic = love.graphics.newImage("assets/virus1_idle_noeye.png")
- v1.c.pupil = love.graphics.newImage("assets/virus1_pupil.png")
- v1.c.eye = love.graphics.newImage("assets/eye_thing.png")
- v1.c.idle.f = 1
- loadAnimation(v1.c.idle.pic, v1.c.idle.fs, 98, 10, 200, 200)
- v1.c.monitorspin = {}
- v1.c.monitorspin.fs = {}
- v1.c.monitorspin.pic = love.graphics.newImage("assets/virus1_monitorspin.png")
- v1.c.monitorspin.f = 1
- v1.c.monitorspin.x = 330
- v1.c.monitorspin.y = -200
- v1.c.monitorspin.sp = 0.4
- loadAnimation(v1.c.monitorspin.pic, v1.c.monitorspin.fs, 59, 6, 200, 200)
- v1.c.slime = {}
- v1.c.slime.fs = {}
- v1.c.slime.pic = love.graphics.newImage("assets/virus1_slime.png")
- v1.c.slime.f = 1
- v1.c.slime.x = 330
- v1.c.slime.y = 350
- loadAnimation(v1.c.slime.pic, v1.c.slime.fs, 26, 3, 50, 50)
- v1.c.shine = {}
- v1.c.shine.f1 = love.graphics.newImage("assets/shine1.png")
- v1.c.shine.f2 = love.graphics.newImage("assets/shine2.png")
- v1.c.shine.r1 = 0
- v1.c.shine.r2 = 0
- v1.c.shine.s1 = 0
- v1.c.shine.s2 = 0
- v1.c.shine.s = -25
- v1.c.shine.sm1 = true
- v1.c.shine.sm2 = true
- v1.c.shine.ct = 0
- v1.c.shine.opa = 255
- v1.c.x = 0
- v1.c.y = 0
- v1.c.s = 1
- v1.c.r = 0
- v1.c.xd = 0
- v1.c.yd = 0
- v1.c.spx = 0
- v1.c.spy = 0
- v1.c.sp = 1
- v1.c.angle = 0
- v1.c.load = false
- v1.c.eyex = 0
- v1.c.eyey = 0
- v1.c.eyetx = 0
- v1.c.eyety = 0
- v1.c.chat.time = 0
- v1.c.health = 100
- expl = {}
- expl.frames = {}
- expl.pic = love.graphics.newImage("assets/explosion.png")
- loadAnimation(expl.pic, expl.frames, 89, 9, 320, 240)
- expl.frame = 1
- expl.deb = {}
- expl.deb[1] = {}
- expl.deb[2] = {}
- expl.deb[3] = {}
- expl.deb[1].pic = love.graphics.newImage("assets/debris1.png")
- expl.deb[2].pic = love.graphics.newImage("assets/debris2.png")
- expl.deb[3].pic = love.graphics.newImage("assets/debris3.png")
+function loadAssets(id)
+ if id == 1 then
+ icons = {}
+ icons[32] = {
+ chat = love.graphics.newImage("assets/icon_32_chat.png"),
+ internet = love.graphics.newImage("assets/icon_32_internet.png"),
+ files = love.graphics.newImage("assets/icon_32_files.png"),
+ file = love.graphics.newImage("assets/icon_32_file.png"),
+ help = love.graphics.newImage("assets/icon_32_help.png"),
+ antivirus = love.graphics.newImage("assets/icon_32_antivirus.png"),
+ settings = love.graphics.newImage("assets/icon_32_settings.png")
+ }
+ end
+ if id == 2 then
+ icons[16] = {
+ chat = love.graphics.newImage("assets/icon_16_chat.png"),
+ internet = love.graphics.newImage("assets/icon_16_internet.png"),
+ files = love.graphics.newImage("assets/icon_16_files.png"),
+ help = love.graphics.newImage("assets/icon_16_help.png"),
+ settings = love.graphics.newImage("assets/icon_16_settings.png"),
+ antivirus = love.graphics.newImage("assets/icon_16_antivirus.png")
+ }
+ end
+ if id == 3 then
+ desktop = {}
+ desktop.bg = {
+ hills = love.graphics.newImage("assets/bg_hills.jpg"),
+ coast = love.graphics.newImage("assets/bg_coast.jpg"),
+ cloud = love.graphics.newImage("assets/bg_cloud.jpg"),
+ flower = love.graphics.newImage("assets/bg_flower.jpg"),
+ city = love.graphics.newImage("assets/bg_city.jpg")
+ }
+ end
+ if id == 4 then
+ st = {}
+ st[1] = {}
+ st[1].title = "Default"
+ st[1].hl = false
+ st[2] = {}
+ st[2].title = "Hills"
+ st[2].hl = false
+ st[3] = {}
+ st[3].title = "Clouds"
+ st[3].hl = false
+ st[4] = {}
+ st[4].title = "City"
+ st[4].hl = false
+ st[5] = {}
+ st[5].title = "Flower"
+ st[5].hl = false
+ st[6] = {}
+ st[6].title = "Coast"
+ st[6].hl = false
+ end
+ if id == 5 then
+ music = {
+ battle1 = love.audio.newSource("assets/music/Thrills And Spills.ogg"),
+ battleNSA = love.audio.newSource("assets/music/Less Than Three.ogg"),
+ battleUndertale = love.audio.newSource("assets/music/Alphys Takes Action.ogg"),
+ battle2 = love.audio.newSource("assets/music/Skyscraper Party.ogg"),
+ sad1 = love.audio.newSource("assets/music/Startup Ambiance.ogg"),
+ battle3 = love.audio.newSource("assets/music/Without Silence.ogg"),
+ fox = love.audio.newSource("assets/music/FOX.ogg"),
+ tension1 = love.audio.newSource("assets/music/Storm Chasers.ogg")
+ }
+ end
+ if id == 6 then
+ sound = {
+ boot = love.audio.newSource("assets/boot.ogg")
+ }
+ sound.boot:setLooping(false)
+ music.battle1:setLooping(true)
+ music.battle2:setLooping(true)
+ music.battleNSA:setLooping(true)
+ music.battleUndertale:setLooping(true)
+ end
+ if id == 7 then
+ window = {
+ bar = love.graphics.newImage("assets/win_bar.png"),
+ barGrey = love.graphics.newImage("assets/win_bar_grey.png")
+ }
+ end
+ if id == 8 then
+ settings = {
+ comp = love.graphics.newImage("assets/computer.png")
+ }
+ end
+ if id == 9 then
+ chat = {
+ online = love.graphics.newImage("assets/chat_status_online.png"),
+ offline = love.graphics.newImage("assets/chat_status_offline.png"),
+ profile = love.graphics.newImage("assets/chat_profile.png")
+ }
+ end
+ if id == 10 then
+ internet = {
+ back = love.graphics.newImage("assets/internet_back.png"),
+ freedownloads1 = love.graphics.newImage("assets/internet_freedownloads.png"),
+ freedownloads2 = love.graphics.newImage("assets/internet_freedownloads2.png"),
+ welcome = love.graphics.newImage("assets/internet_welcome.png"),
+ error = love.graphics.newImage("assets/internet_error.png")
+ }
+ end
+ if id == 11 then
+ antivirus = {
+ gun = love.graphics.newImage("assets/antivirus_turret_gun.png"),
+ body = love.graphics.newImage("assets/antivirus_turret_body.png"),
+ left = love.graphics.newImage("assets/antivirus_turret_leftwing.png"),
+ right = love.graphics.newImage("assets/antivirus_turret_rightwing.png"),
+ open = love.audio.newSource("assets/antivirus_open.ogg"),
+ opengun = love.audio.newSource("assets/antivirus_open_gun.ogg"),
+ laser = love.audio.newSource("assets/antivirus_laser.ogg"),
+ bullet = love.graphics.newImage("assets/bullet_blue.png"),
+ hit = love.audio.newSource("assets/antivirus_hit.ogg"),
+ charge = love.graphics.newImage("assets/antivirus_charge.png")
+ }
+ end
+ if id == 12 then
+ notification = {
+ bubble = love.graphics.newImage("assets/notification.png"),
+ sound1 = love.audio.newSource("assets/notification1.ogg"),
+ sound2 = love.audio.newSource("assets/notification2.ogg")
+ }
+ end
+ if id == 13 then
+ v1 = {
+ intro = love.audio.newSource("assets/virus1intro.ogg"),
+ shine = love.audio.newSource("assets/shine.ogg"),
+ scorch = love.graphics.newImage("assets/virus_scorch.png"),
+ scorchMask = love.graphics.newImage("assets/virus_scorch_mask.png"),
+ shineplay = false,
+ corner = love.graphics.newImage("assets/chat_bubble_corner.png"),
+ cornerSpike = love.graphics.newImage("assets/chat_bubble_cornerspike.png"),
+ turret1 = love.graphics.newImage("assets/virus1_turret.png"),
+ turret2 = love.graphics.newImage("assets/virus1_turret2.png"),
+ turret2Held = love.graphics.newImage("assets/virus1_turret2_held.png"),
+ shipFront = love.graphics.newImage("assets/virus1_ship_front.png"),
+ shipBack = love.graphics.newImage("assets/virus1_ship_back.png"),
+ rumbleLoop = love.audio.newSource("assets/rumble_loop.ogg")
+ }
+ end
+ if id == 14 then
+ v1.rumbleLoop:setLooping(true)
+ v1.msgs = {}
+ v1.c = {}
+ v1.c.chat = {}
+ v1.c.chat.next = false
+ v1.c.chat.msgs = 1
+ v1.c.chat.msg = ""
+ v1.c.chat.sp = 0.5
+ v1.c.chat.char = 0
+ v1.turret = {}
+ v1.turret[1] = {r=math.rad(30),x=0,y=0,rt=math.rad(30),t=0,tl=1}
+ v1.turret[2] = {r=math.rad(15),x=0,y=0,rt=math.rad(15),t=0,tl=2}
+ v1.turret[3] = {r=math.rad(-15),x=0,y=0,rt=math.rad(-15),t=0,tl=3}
+ v1.turret[4] = {r=math.rad(-30),x=0,y=0,rt=math.rad(-30),t=0,tl=4}
+ v1.laserSound = love.audio.newSource("assets/virus1_laser.ogg")
+ v1.laserSound:setVolume(0.6)
+ v1.explosionSound = love.audio.newSource("assets/explosion.ogg")
+ v1.bullets = {}
+ v1.bullet = love.graphics.newImage("assets/bullet_green.png")
+ v1.bulletRed = love.graphics.newImage("assets/bullet_red.png")
+ v1.bulletYellow = love.graphics.newImage("assets/bullet_yellow.png")
+ v1.c.idle = {}
+ v1.c.idle.fs = {}
+ v1.c.idle.pic = love.graphics.newImage("assets/virus1_idle_noeye.png")
+ v1.c.pupil = love.graphics.newImage("assets/virus1_pupil.png")
+ v1.c.eye = love.graphics.newImage("assets/eye_thing.png")
+ v1.c.idle.f = 1
+ loadAnimation(v1.c.idle.pic, v1.c.idle.fs, 98, 10, 200, 200)
+ v1.c.monitorspin = {}
+ v1.c.monitorspin.fs = {}
+ v1.c.monitorspin.pic = love.graphics.newImage("assets/virus1_monitorspin.png")
+ v1.c.monitorspin.f = 1
+ v1.c.monitorspin.x = 330
+ v1.c.monitorspin.y = -200
+ v1.c.monitorspin.sp = 0.4
+ loadAnimation(v1.c.monitorspin.pic, v1.c.monitorspin.fs, 59, 6, 200, 200)
+ v1.c.slime = {}
+ v1.c.slime.fs = {}
+ v1.c.slime.pic = love.graphics.newImage("assets/virus1_slime.png")
+ v1.c.slime.f = 1
+ v1.c.slime.x = 330
+ v1.c.slime.y = 350
+ loadAnimation(v1.c.slime.pic, v1.c.slime.fs, 26, 3, 50, 50)
+ v1.c.shine = {}
+ v1.c.shine.f1 = love.graphics.newImage("assets/shine1.png")
+ v1.c.shine.f2 = love.graphics.newImage("assets/shine2.png")
+ v1.c.shine.r1 = 0
+ v1.c.shine.r2 = 0
+ v1.c.shine.s1 = 0
+ v1.c.shine.s2 = 0
+ v1.c.shine.s = -25
+ v1.c.shine.sm1 = true
+ v1.c.shine.sm2 = true
+ v1.c.shine.ct = 0
+ v1.c.shine.opa = 255
+ v1.c.x = 0
+ v1.c.y = 0
+ v1.c.s = 1
+ v1.c.r = 0
+ v1.c.xd = 0
+ v1.c.yd = 0
+ v1.c.spx = 0
+ v1.c.spy = 0
+ v1.c.sp = 1
+ v1.c.angle = 0
+ v1.c.load = false
+ v1.c.eyex = 0
+ v1.c.eyey = 0
+ v1.c.eyetx = 0
+ v1.c.eyety = 0
+ v1.c.chat.time = 0
+ v1.c.health = 100
+ end
+ if id == 15 then
+ expl = {}
+ expl.frames = {}
+ expl.pic = love.graphics.newImage("assets/explosion.png")
+ loadAnimation(expl.pic, expl.frames, 89, 9, 320, 240)
+ expl.frame = 1
+ expl.deb = {}
+ expl.deb[1] = {}
+ expl.deb[2] = {}
+ expl.deb[3] = {}
+ expl.deb[1].pic = love.graphics.newImage("assets/debris1.png")
+ expl.deb[2].pic = love.graphics.newImage("assets/debris2.png")
+ expl.deb[3].pic = love.graphics.newImage("assets/debris3.png")
+ end
end
function loadAnimation(pic, quad, frames, limit, w, h)
local frame = 1
diff --git a/dialogue.lua b/dialogue.lua
index db0b4e5..745ad28 100644
--- a/dialogue.lua
+++ b/dialogue.lua
@@ -55,5 +55,7 @@ function loadDia()
v1.msgs[43] = "OH GOD IT HURTS! OW OW OW!!! YOU JUST GOT LUCKY!!! NO, YOU CHEATED!!! CHEATER!!!"
v1.msgs[44] = "WHATEVER YOU DID, IT ISN'T FAIR!!! YOU DICKHEAD!!! AAAHH!!!"
v1.msgs[45] = "THIS ISN'T OVER!!! I WILL STILL DESTORY YOU!!! ONE DAY!!! WATCH YOUR BACK!!!"
- v1.msgs[46] = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!"
+ v1.msgs[46] = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!"
+ v1.msgs[50] = "AAAAHAHAHAH! I WIN YET AGAIN! ANOTHER COMPUTER, DOMINATED BY ME!!! AAAAAHAHAHA!!!"
+ v1.msgs[51] = "I WIN! YOU LOSE! JUST LIKE IT'S MEANT TO BE!"
end
diff --git a/main.lua b/main.lua
index a20d568..6c3aa07 100644
--- a/main.lua
+++ b/main.lua
@@ -30,9 +30,9 @@ function love.load()
pixeloperators:setFilter("nearest", "nearest")
love.graphics.setFont(pressstart)
love.keyboard.setKeyRepeat(true)
- loadAssets()
- loadVar()
- loadDia()
+ --loadAssets()
+ --loadVar()
+ --loadDia()
end
function love.update(dt)
delta = dt
diff --git a/panel.lua b/panel.lua
index aee62bf..bc01a9f 100644
--- a/panel.lua
+++ b/panel.lua
@@ -61,6 +61,7 @@ function drawStart()
if v1.c.chat.msgs > 35 and v1.yes == true then
love.graphics.setColor(colors.font.dark)
love.graphics.print("VIRUS HEALTH: " .. v1.c.health, sys.w/2, panel.s.y+7)
+ love.graphics.print("TIMER: " .. v1.fightMinute .. ":" .. math.floor(-(v1.fightTimer-60)), sys.w/2-200, panel.s.y+7)
end
end
function drawNoti()
diff --git a/var.lua b/var.lua
index 91d6157..568c92b 100644
--- a/var.lua
+++ b/var.lua
@@ -93,7 +93,7 @@ function loadVar()
desktop.bg.current = 0
fade = 0
fadeOpacity = 0
- scene = 1
+ scene = 0
loading = 0
antivirus.prog = 0
antivirus.status = "Not Scanning"
@@ -142,7 +142,7 @@ function loadVar()
v1.introplay = false
v1.explodeintro = false
v1.explodeintrotimer = 0
- v1.fightTimer = 0
+ v1.fightTimer = 60
v1.turretTimer = 0
v1.turretAbi = 0
v1.spm = 1
@@ -153,6 +153,7 @@ function loadVar()
v1.shakey = 0
v1.explodeEndFrame = 1
v1.complete = false
+ v1.fightMinute = 5
expl.deb[1].x = 0
expl.deb[1].y = 0
expl.deb[1].ym = 5
diff --git a/virus1.lua b/virus1.lua
index 5ee5662..64513a4 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -117,7 +117,7 @@ function drawVirusFight1()
music.tension1:play()
end
if v1.c.shine.ct >= 3 then
- if v1.c.chat.msgs >= 41 then
+ if v1.c.chat.msgs >= 41 and v1.c.chat.msgs < 50 then
v1.shake = (v1.c.chat.msgs-40)*3
v1.shakex = math.random(v1.shake,-v1.shake)
v1.shakey = math.random(v1.shake,-v1.shake)
@@ -301,6 +301,13 @@ function drawVirusFight1()
end
if v1.c.chat.msgs == 36 or v1.c.chat.msgs == 40 then
v1.fightTimer = v1.fightTimer + delta
+ if v1.fightMinute == 0 and v1.fightTimer > 59 then
+ v1.c.chat.msgs = 50
+ end
+ if v1.fightTimer > 59 then
+ v1.fightMinute = v1.fightMinute - 1
+ v1.fightTimer = 0
+ end
if v1.c.health > 20 then
v1.turretTimer = v1.turretTimer + delta
else