Compare commits

..

1 Commits

Author SHA1 Message Date
MrZ_26
830f0ffbed Alpha V0.7.16 2020-02-04 19:33:52 +08:00
9 changed files with 36 additions and 24 deletions

View File

@@ -160,7 +160,6 @@ function mouseDown.draw(x,y,k)
end end
function mouseDown.setting3(x,y,k) function mouseDown.setting3(x,y,k)
if k==2 then back()end if k==2 then back()end
sel=nil
for K=1,#virtualkey do for K=1,#virtualkey do
local b=virtualkey[K] local b=virtualkey[K]
if (x-b[1])^2+(y-b[2])^2<b[3]then if (x-b[1])^2+(y-b[2])^2<b[3]then
@@ -672,7 +671,7 @@ function love.resize(w,h)
collectgarbage() collectgarbage()
end end
function love.focus(f) function love.focus(f)
if not f and scene=="play"then pauseGame()end if not f and wd.isMinimized()and scene=="play"then pauseGame()end
end end
function love.update(dt) function love.update(dt)
--[[ --[[
@@ -776,11 +775,11 @@ function love.run()
readyDrawFrame=readyDrawFrame+setting.frameMul readyDrawFrame=readyDrawFrame+setting.frameMul
if readyDrawFrame>=100 then if readyDrawFrame>=100 then
readyDrawFrame=readyDrawFrame-100 readyDrawFrame=readyDrawFrame-100
gc.clear()
love.draw() love.draw()
gc.present() gc.present()
end end
::L::if Timer()-frameT<1/60 then goto L end ::L::if Timer()-frameT<1/60 then goto L end
frameT=Timer() frameT=Timer()
tm.sleep(.001)
end end
end end

View File

@@ -9,7 +9,7 @@ function love.conf(t)
t.audio.mixwithsystem=true--Switch on to keep sysBGM t.audio.mixwithsystem=true--Switch on to keep sysBGM
local W=t.window local W=t.window
W.title="Techmino V0.7.15" W.title="Techmino V0.7.16"
W.icon="/image/icon.png" W.icon="/image/icon.png"
W.width,W.height=1280,720 W.width,W.height=1280,720
W.minwidth,W.minheight=640,360 W.minwidth,W.minheight=640,360

View File

@@ -149,6 +149,7 @@ loadmode={
modeEnv[k]=customRange[k][customSel[k]] modeEnv[k]=customRange[k][customSel[k]]
end end
modeEnv._20G=modeEnv.drop==-1 modeEnv._20G=modeEnv.drop==-1
modeEnv.oncehold=customSel.hold==1
createPlayer(1,340,15) createPlayer(1,340,15)
if modeEnv.opponent==0 then if modeEnv.opponent==0 then
else else
@@ -392,9 +393,6 @@ Event={
Event_gameover.lose() Event_gameover.lose()
elseif #P.clearing>0 then elseif #P.clearing>0 then
P.cstat.event=P.cstat.event+1 P.cstat.event=P.cstat.event+1
if #P.field>11 and P.cstat.event%5~=1 then
ins(P.clearing,1)
end
end end
end, end,
tech_reach=function() tech_reach=function()
@@ -444,7 +442,6 @@ Event_gameover={
if modeEnv.royaleMode then if modeEnv.royaleMode then
P.rank=1 P.rank=1
P.result="WIN" P.result="WIN"
showText(P,1,"appear",60,120,nil,true)
changeAtk(P) changeAtk(P)
BGM("end") BGM("end")
end end
@@ -457,7 +454,7 @@ Event_gameover={
P.visTime[i][j]=min(P.visTime[i][j],20) P.visTime[i][j]=min(P.visTime[i][j],20)
end end
end end
showText(P,text.win,"beat",90,nil,nil,true) showText(P,text.win,"beat",90,nil,.4,curMode.id~="custom")
SFX("win") SFX("win")
end, end,
lose=function() lose=function()
@@ -574,7 +571,7 @@ Event_task={
dig_normal=function(P) dig_normal=function(P)
if not P.control then return end if not P.control then return end
P.counter=P.counter+1 P.counter=P.counter+1
if P.counter>=max(90,180-2*P.cstat.event)then if P.counter>=max(90,180-P.cstat.event)then
garbageRise(10,1,rnd(10)) garbageRise(10,1,rnd(10))
P.counter=0 P.counter=0
P.cstat.event=P.cstat.event+1 P.cstat.event=P.cstat.event+1
@@ -583,7 +580,7 @@ Event_task={
dig_lunatic=function(P) dig_lunatic=function(P)
if not P.control then return end if not P.control then return end
P.counter=P.counter+1 P.counter=P.counter+1
if P.counter>=max(45,80-.4*P.cstat.event)then if P.counter>=max(45,80-.3*P.cstat.event)then
garbageRise(11+P.cstat.event%3,1,rnd(10)) garbageRise(11+P.cstat.event%3,1,rnd(10))
P.counter=0 P.counter=0
P.cstat.event=P.cstat.event+1 P.cstat.event=P.cstat.event+1
@@ -671,11 +668,12 @@ Event_task={
r[j]=PCbase[4*t+i][j] r[j]=PCbase[4*t+i][j]
end end
ins(P.field,1,r) ins(P.field,1,r)
ins(P.visTime,1,getNewRow(P.showTime)) ins(P.visTime,1,getNewRow(20))
end end
P.fieldBeneath=P.fieldBeneath+120 P.fieldBeneath=P.fieldBeneath+120
-- P.curY=P.curY+4 for i=1,#P.clearing do
P.y_img=P.y_img+4 P.clearing[i]=P.clearing[i]+4
end
freshgho() freshgho()
return true return true
end end

BIN
font.ttf

Binary file not shown.

View File

@@ -1054,7 +1054,8 @@ act={
if curMode.id=="custom"and curMode.lv==2 and#P.field>0 then if curMode.id=="custom"and curMode.lv==2 and#P.field>0 then
for y=1,#P.field do for y=1,#P.field do
for x=1,10 do for x=1,10 do
if P.field[y][x]~=preField[y][x]then return end local a,b=preField[y][x],P.field[y][x]
if a==0 and b>0 or a<8 and a~=b or a>7 and b==0 then return end
end end
end end
Event_gameover.win() Event_gameover.win()

View File

@@ -43,7 +43,7 @@ return{
wait=nil, wait=nil,
fall=nil, fall=nil,
next=nil, next=nil,
hold={"",""}, hold={"","","无限"},
sequence={"bag7","his4","随机"}, sequence={"bag7","his4","随机"},
visible={"可见","半隐","全隐","瞬隐"}, visible={"可见","半隐","全隐","瞬隐"},
target={10,20,40,100,200,500,1000,""}, target={10,20,40,100,200,500,1000,""},
@@ -90,15 +90,21 @@ return{
"不是动画,真的在加载!", "不是动画,真的在加载!",
"整个游戏都是MrZ完成的!", "整个游戏都是MrZ完成的!",
"大满贯10连击消四全清!", "大满贯10连击消四全清!",
"方块研究所有一个Nspire-CX版本!", "<方块研究所>有一个Nspire-CX版本!",
"B2B2B2B存在吗?", "B2B2B2B存在吗?",
"MrZ旋转消5!",
"MEGACMB!", "MEGACMB!",
"ALLSPIN!", "ALLSPIN!",
"O型回旋三清?", "O型回旋三清?",
"只用一个输入设备就可以玩游戏啦~", "只用一个输入设备就可以游玩了",
"Miya:喵!", "Miya:喵!",
"225238922,哔哩哔哩 干杯~", "225238922,哔哩哔哩 干杯~",
"适度游戏益脑,沉迷游戏伤身,合理安排时间,享受健康生活",
"合群了就会消失,但是消失不代表没有意义",
"学会使用两个旋转键,三个更好",
"更小的DAS和ARR拥有更高的操作上限",
"注意到\"旋转\"到底对方块做了些什么吗?",
"20G是一套全新的游戏规则",
"请勿在上课时游玩本游戏!",
}, },
stat={ stat={
"游戏运行次数:", "游戏运行次数:",

View File

@@ -43,7 +43,7 @@ return{
wait=nil, wait=nil,
fall=nil, fall=nil,
next=nil, next=nil,
hold={"ON","OFF"}, hold={"ON","OFF","FREE"},
sequence={"bag7","his4","random"}, sequence={"bag7","his4","random"},
visible={"normal","time","invisible","sudden"}, visible={"normal","time","invisible","sudden"},
target={10,20,40,100,200,500,1000,""}, target={10,20,40,100,200,500,1000,""},
@@ -92,13 +92,19 @@ return{
"Back to Back 10 combo Techrash PC!", "Back to Back 10 combo Techrash PC!",
"Techmino has a Nspire-CX edition!", "Techmino has a Nspire-CX edition!",
"Is B2B2B2B possible?", "Is B2B2B2B possible?",
"MrZ spin Penta!",
"MEGACMB!", "MEGACMB!",
"ALLSPIN!", "ALLSPIN!",
"O spin triple?", "O spin triple?",
"You can play with any input device!", "You can play with any input device!",
"Miya:Nya!", "Miya:Nya!",
"225238922,Bilibili cheers!", "225238922,Bilibili cheers!",
"Playing too much = taking drugs",
"Disappearing doesn't mean useless",
"Try to use two rotate button,three better",
"Small DAS&ARR can make you faster,if you can adapt to it",
"Have you noticed what does \"rotating\" do to block?",
"20G is a brand new game rule",
"Do not play this game in class!",
}, },
stat={ stat={
"Games run:", "Games run:",
@@ -114,7 +120,7 @@ return{
}, },
help={ help={
"I don't think you need \"help\".", "I don't think you need \"help\".",
"THIS IS ONLY A SMALL BLOCK GAME", "THIS IS ONLY A BLOCK GAME",
"But just play like playing TOP/C2/KOS/TGM3", "But just play like playing TOP/C2/KOS/TGM3",
"Game is not public now,so DO NOT DISTIRBUTE", "Game is not public now,so DO NOT DISTIRBUTE",
"", "",

View File

@@ -288,7 +288,7 @@ function Pnt.main()
gc.setColor(1,1,1) gc.setColor(1,1,1)
gc.draw(titleImage,300,30) gc.draw(titleImage,300,30)
setFont(30) setFont(30)
gc.print("Alpha V0.7.15",290,140) gc.print("Alpha V0.7.16",290,140)
gc.print(system,800,110) gc.print(system,800,110)
end end
function Pnt.mode() function Pnt.mode()
@@ -620,6 +620,7 @@ function Pnt.play()
end end
end end
function Pnt.pause() function Pnt.pause()
Pnt.play()
gc.setColor(0,0,0,pauseTime*.015) gc.setColor(0,0,0,pauseTime*.015)
gc.rectangle("fill",0,0,1280,720) gc.rectangle("fill",0,0,1280,720)
if system~="Android"then if system~="Android"then

View File

@@ -1,3 +1,4 @@
local wd=love.window
local Timer=love.timer.getTime local Timer=love.timer.getTime
Tmr={} Tmr={}
@@ -276,7 +277,7 @@ function Tmr.play(dt)
if modeEnv.royaleMode and frame%120==0 then freshMostDangerous()end if modeEnv.royaleMode and frame%120==0 then freshMostDangerous()end
end end
function Tmr.pause(dt) function Tmr.pause(dt)
if pauseTime<50 then if not wd.isMinimized()and pauseTime<50 then
pauseTime=pauseTime+1 pauseTime=pauseTime+1
end end
end end