diff --git a/parts/eventsets/attacker_h.lua b/parts/eventsets/attacker_h.lua index a4aeaf42..b9937dba 100644 --- a/parts/eventsets/attacker_h.lua +++ b/parts/eventsets/attacker_h.lua @@ -11,25 +11,29 @@ return{ YIELD() if P.control and P.atkBufferSum==0 then local D=P.modeData - if D.wave<20 then - local t=1500-30*D.wave--1500~900 - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=12,countdown=t,cd0=t,time=0,sent=false,lv=3}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=10,countdown=t,cd0=t,time=0,sent=false,lv=4}) + if D.wave==50 then + P:win('finish') else - local t=900-10*(D.wave-20)--900~600 - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=14,countdown=t,cd0=t,time=0,sent=false,lv=4}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=8,countdown=t,cd0=t,time=0,sent=false,lv=5}) - end - P.atkBufferSum=P.atkBufferSum+22 - P.stat.recv=P.stat.recv+22 - D.wave=D.wave+1 - if D.wave%10==0 then - if D.wave==20 then - P:_showText(text.great,0,-140,100,'appear',.6) - P.gameEnv.pushSpeed=3 - elseif D.wave==50 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + if D.wave<20 then + local t=1500-30*D.wave--1500~900 + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=12,countdown=t,cd0=t,time=0,sent=false,lv=3}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=10,countdown=t,cd0=t,time=0,sent=false,lv=4}) + else + local t=900-10*(D.wave-20)--900~600 + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=14,countdown=t,cd0=t,time=0,sent=false,lv=4}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=8,countdown=t,cd0=t,time=0,sent=false,lv=5}) end + P.atkBufferSum=P.atkBufferSum+22 + P.stat.recv=P.stat.recv+22 + if D.wave%10==0 then + if D.wave==20 then + P:_showText(text.great,0,-140,100,'appear',.6) + P.gameEnv.pushSpeed=3 + elseif D.wave==50 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + end + D.wave=D.wave+1 end end end diff --git a/parts/eventsets/attacker_u.lua b/parts/eventsets/attacker_u.lua index 5f86c681..db93debb 100644 --- a/parts/eventsets/attacker_u.lua +++ b/parts/eventsets/attacker_u.lua @@ -11,34 +11,38 @@ return{ YIELD() if P.control and P.atkBufferSum<4 then local D=P.modeData - local s - local t=800-10*D.wave--800~700~600~500 - if D.wave<10 then - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(5,6)),amount=9,countdown=t,cd0=t,time=0,sent=false,lv=3}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=11,countdown=t,cd0=t+62,time=0,sent=false,lv=4}) - s=20 - elseif D.wave<20 then - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=11,countdown=t,cd0=t,time=0,sent=false,lv=4}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=13,countdown=t,cd0=t+62,time=0,sent=false,lv=5}) - s=24 + if D.wave==50 then + P:win('finish') else - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(2)*9-8),amount=14,countdown=t,cd0=t,time=0,sent=false,lv=5}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=14,countdown=t+62,cd0=t,time=0,sent=false,lv=5}) - s=28 - end - P.atkBufferSum=P.atkBufferSum+s - P.stat.recv=P.stat.recv+s - D.wave=D.wave+1 - if D.wave%10==0 then - if D.wave==10 then - P:_showText(text.great,0,-140,100,'appear',.6) - P.gameEnv.pushSpeed=4 - elseif D.wave==20 then - P:_showText(text.awesome,0,-140,100,'appear',.6) - P.gameEnv.pushSpeed=5 - elseif D.wave==30 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + local s + local t=800-10*D.wave--800~700~600~500 + if D.wave<10 then + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(5,6)),amount=9,countdown=t,cd0=t,time=0,sent=false,lv=3}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=11,countdown=t,cd0=t+62,time=0,sent=false,lv=4}) + s=20 + elseif D.wave<20 then + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=11,countdown=t,cd0=t,time=0,sent=false,lv=4}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(4,7)),amount=13,countdown=t,cd0=t+62,time=0,sent=false,lv=5}) + s=24 + else + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(2)*9-8),amount=14,countdown=t,cd0=t,time=0,sent=false,lv=5}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(3,8)),amount=14,countdown=t+62,cd0=t,time=0,sent=false,lv=5}) + s=28 end + P.atkBufferSum=P.atkBufferSum+s + P.stat.recv=P.stat.recv+s + if D.wave%10==0 then + if D.wave==10 then + P:_showText(text.great,0,-140,100,'appear',.6) + P.gameEnv.pushSpeed=4 + elseif D.wave==20 then + P:_showText(text.awesome,0,-140,100,'appear',.6) + P.gameEnv.pushSpeed=5 + elseif D.wave==30 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + end + D.wave=D.wave+1 end end end diff --git a/parts/eventsets/survivor_e.lua b/parts/eventsets/survivor_e.lua index f6efc32c..7cc357c2 100644 --- a/parts/eventsets/survivor_e.lua +++ b/parts/eventsets/survivor_e.lua @@ -11,14 +11,18 @@ return{ local D=P.modeData D.timer=D.timer+1 if D.timer>=math.max(60,150-2*D.wave)and P.atkBufferSum<4 then - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=1,countdown=30,cd0=30,time=0,sent=false,lv=1}) - P.atkBufferSum=P.atkBufferSum+1 - P.stat.recv=P.stat.recv+1 - if D.wave==45 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + if D.wave==100 then + P:win('finish') + else + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=1,countdown=30,cd0=30,time=0,sent=false,lv=1}) + P.atkBufferSum=P.atkBufferSum+1 + P.stat.recv=P.stat.recv+1 + if D.wave==45 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + D.timer=0 + D.wave=D.wave+1 end - D.timer=0 - D.wave=D.wave+1 end end end diff --git a/parts/eventsets/survivor_h.lua b/parts/eventsets/survivor_h.lua index bc913b85..2e86d1f0 100644 --- a/parts/eventsets/survivor_h.lua +++ b/parts/eventsets/survivor_h.lua @@ -11,21 +11,25 @@ return{ local D=P.modeData D.timer=D.timer+1 if D.timer>=math.max(60,180-2*D.wave)and P.atkBufferSum<15 then - local s - if D.wave%3<2 then - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=1,countdown=0,cd0=0,time=0,sent=false,lv=1}) - s=1 + if D.wave==90 then + P:win('finish') else - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=3,countdown=60,cd0=60,time=0,sent=false,lv=2}) - s=3 + local s + if D.wave%3<2 then + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=1,countdown=0,cd0=0,time=0,sent=false,lv=1}) + s=1 + else + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=3,countdown=60,cd0=60,time=0,sent=false,lv=2}) + s=3 + end + P.atkBufferSum=P.atkBufferSum+s + P.stat.recv=P.stat.recv+s + if D.wave==60 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + D.timer=0 + D.wave=D.wave+1 end - P.atkBufferSum=P.atkBufferSum+s - P.stat.recv=P.stat.recv+s - if D.wave==60 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) - end - D.timer=0 - D.wave=D.wave+1 end end end diff --git a/parts/eventsets/survivor_l.lua b/parts/eventsets/survivor_l.lua index fc11d8b8..9b505787 100644 --- a/parts/eventsets/survivor_l.lua +++ b/parts/eventsets/survivor_l.lua @@ -11,15 +11,19 @@ return{ local D=P.modeData D.timer=D.timer+1 if D.timer>=math.max(60,150-D.wave)and P.atkBufferSum<20 then - local t=math.max(60,90-D.wave) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}) - P.atkBufferSum=P.atkBufferSum+4 - P.stat.recv=P.stat.recv+4 - if D.wave==60 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + if D.wave==110 then + P:win('finish') + else + local t=math.max(60,90-D.wave) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}) + P.atkBufferSum=P.atkBufferSum+4 + P.stat.recv=P.stat.recv+4 + if D.wave==60 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + D.timer=0 + D.wave=D.wave+1 end - D.timer=0 - D.wave=D.wave+1 end end end diff --git a/parts/eventsets/survivor_n.lua b/parts/eventsets/survivor_n.lua index c8a75002..37926cdb 100644 --- a/parts/eventsets/survivor_n.lua +++ b/parts/eventsets/survivor_n.lua @@ -11,20 +11,24 @@ return{ local D=P.modeData D.timer=D.timer+1 if D.timer>=math.max(90,180-2*D.wave)and P.atkBufferSum<8 then - local d=D.wave+1 - table.insert(P.atkBuffer, - d%4==0 and{line=generateLine(P.holeRND:random(10)),amount=1,countdown=60,cd0=60,time=0,sent=false,lv=1}or - d%4==1 and{line=generateLine(P.holeRND:random(10)),amount=2,countdown=70,cd0=70,time=0,sent=false,lv=1}or - d%4==2 and{line=generateLine(P.holeRND:random(10)),amount=3,countdown=80,cd0=80,time=0,sent=false,lv=2}or - d%4==3 and{line=generateLine(P.holeRND:random(10)),amount=4,countdown=90,cd0=90,time=0,sent=false,lv=3} - ) - P.atkBufferSum=P.atkBufferSum+d%4+1 - P.stat.recv=P.stat.recv+d%4+1 - if D.wave==45 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + if D.wave==80 then + P:win('finish') + else + local d=D.wave+1 + table.insert(P.atkBuffer, + d%4==0 and{line=generateLine(P.holeRND:random(10)),amount=1,countdown=60,cd0=60,time=0,sent=false,lv=1}or + d%4==1 and{line=generateLine(P.holeRND:random(10)),amount=2,countdown=70,cd0=70,time=0,sent=false,lv=1}or + d%4==2 and{line=generateLine(P.holeRND:random(10)),amount=3,countdown=80,cd0=80,time=0,sent=false,lv=2}or + d%4==3 and{line=generateLine(P.holeRND:random(10)),amount=4,countdown=90,cd0=90,time=0,sent=false,lv=3} + ) + P.atkBufferSum=P.atkBufferSum+d%4+1 + P.stat.recv=P.stat.recv+d%4+1 + if D.wave==45 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + D.timer=0 + D.wave=d end - D.timer=0 - D.wave=d end end end diff --git a/parts/eventsets/survivor_u.lua b/parts/eventsets/survivor_u.lua index 79339782..63285fb5 100644 --- a/parts/eventsets/survivor_u.lua +++ b/parts/eventsets/survivor_u.lua @@ -11,18 +11,22 @@ return{ local D=P.modeData D.timer=D.timer+1 if D.timer>=math.max(300,600-10*D.wave)and P.atkBufferSum<20 then - local t=math.max(300,480-12*D.wave) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=2}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=6,countdown=1.2*t,cd0=1.2*t,time=0,sent=false,lv=4}) - table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=6,countdown=1.5*t,cd0=1.5*t,time=0,sent=false,lv=5}) - P.atkBufferSum=P.atkBufferSum+20 - P.stat.recv=P.stat.recv+20 - if D.wave==31 then - P:_showText(text.maxspeed,0,-140,100,'appear',.6) + if D.wave==35 then + P:win('finish') + else + local t=math.max(300,480-12*D.wave) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=2}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=6,countdown=1.2*t,cd0=1.2*t,time=0,sent=false,lv=4}) + table.insert(P.atkBuffer,{line=generateLine(P.holeRND:random(10)),amount=6,countdown=1.5*t,cd0=1.5*t,time=0,sent=false,lv=5}) + P.atkBufferSum=P.atkBufferSum+20 + P.stat.recv=P.stat.recv+20 + if D.wave==30 then + P:_showText(text.maxspeed,0,-140,100,'appear',.6) + end + D.timer=0 + D.wave=D.wave+1 end - D.timer=0 - D.wave=D.wave+1 end end end