aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-12-21 14:42:19 -0800
committer1029chris <1029chris@gmail.com>2016-12-21 14:42:19 -0800
commit681a12e0142f219b5eab651a6808db0dddd1203d (patch)
treeb7e0eacd89d0e4f71f1ae1cd4cf827ed93284551
parenteb89627cd2b304e84c22f6432131a14dc5c5c122 (diff)
Raised shotguns higher, smaller screens will benefit from this.
Also allowed antivirus to go up higher during second fight Also, increased delay in one attack to make it a bit easier
-rw-r--r--virus2.lua14
-rw-r--r--window.lua2
2 files changed, 8 insertions, 8 deletions
diff --git a/virus2.lua b/virus2.lua
index 28b6139..ce2726c 100644
--- a/virus2.lua
+++ b/virus2.lua
@@ -812,7 +812,7 @@ function v2FirstAttack()
for i=1,math.floor(sys.w/130)+1 do
if i <= hole+2 and i >= hole then
else
- table.insert(v2.sg, 1, {x=i*140-50,y=200,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=125*sys.sh,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
end
end
if v2.c.cockgun:isPlaying() == true then
@@ -843,7 +843,7 @@ function v2ShotgunRowAttack()
for i=1,math.floor(sys.w/130)+1 do
if i <= hole+2 and i >= hole then
else
- table.insert(v2.sg, 1, {x=i*140-50,y=200,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=125*sys.sh,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
end
end
if v2.c.cockgun:isPlaying() == true then
@@ -965,10 +965,10 @@ function assholeShotgunAttack()
local hole = math.random(1,math.floor(sys.w/130)-2)
for i=1,math.floor(sys.w/130)+1 do
if i <= hole+2 and i >= hole then
- table.insert(v2.sg, 1, {x=i*140-50,y=150,r=math.rad(90),d=1.2,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=100,r=math.rad(90),d=1.2,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
table.insert(v2.sg, 1, {x=i*140-50+25,y=0,r=math.rad(90),d=2.2,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
else
- table.insert(v2.sg, 1, {x=i*140-50,y=150,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=100,r=math.rad(90),d=0.5,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
table.insert(v2.sg, 1, {x=i*140-50+25,y=0,r=math.rad(90),d=1.7,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
end
end
@@ -1041,13 +1041,13 @@ function v2ShotgunFinalRandomRowAttack()
end
function v2ShotgunFinalRowAttack()
if v2.attackTimer <= 0 then
- v2.attackTimer = 1.4
+ v2.attackTimer = 1.7
local hole = math.random(1,math.floor(sys.w/130)-2)
for i=1,math.floor(sys.w/130)+1 do
if i <= hole+2 and i >= hole then
- table.insert(v2.sg, 1, {x=i*140-50,y=50,r=math.rad(90),d=1.2,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=0,r=math.rad(90),d=1.4,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
else
- table.insert(v2.sg, 1, {x=i*140-50,y=150,r=math.rad(90),d=0.6,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
+ table.insert(v2.sg, 1, {x=i*140-50,y=100,r=math.rad(90),d=0.7,b=1,t=0,op=0,ra=math.rad(45),rem=false,remp=false,f=false})
end
end
if v2.c.cockgun:isPlaying() == true then
diff --git a/window.lua b/window.lua
index ec1e958..b3e701d 100644
--- a/window.lua
+++ b/window.lua
@@ -97,7 +97,7 @@ function drawWindow(id)
if id == 4 and v1.yes == true then
windowMouseMove(id,0,sys.w-win[id].w,sys.h/2,sys.h-win[id].h-panel.thick-1)
elseif id == 4 and v2.start == true and av.dead == false then
- windowMouseMove(id,0,sys.w-win[id].w,sys.h/2.4,sys.h-win[id].h-panel.thick-1)
+ windowMouseMove(id,0,sys.w-win[id].w,sys.h/3,sys.h-win[id].h-panel.thick-1)
elseif scene == 1 and v1.yes == false and v2.start == false and av.dead == false then
windowMouseMove(id,0,sys.w-win[id].w,0,sys.h-win[id].h-panel.thick-1)
end