再调整堆积模式:
三个难度都用100高度场地 第二个难度四/五连块2包:1包混合 第三个难度纯五连块
This commit is contained in:
2
main.lua
2
main.lua
@@ -290,7 +290,7 @@ do
|
|||||||
if RANKS.tsd_u then RANKS.tsd_u=0 end
|
if RANKS.tsd_u then RANKS.tsd_u=0 end
|
||||||
needSave=true
|
needSave=true
|
||||||
end
|
end
|
||||||
if STAT.version==1600 then
|
if RANKS.stack_20l then
|
||||||
RANKS.stack_20l=nil
|
RANKS.stack_20l=nil
|
||||||
RANKS.stack_40l=nil
|
RANKS.stack_40l=nil
|
||||||
RANKS.stack_100l=nil
|
RANKS.stack_100l=nil
|
||||||
|
|||||||
@@ -740,9 +740,9 @@ return{
|
|||||||
['dig_1000l']= {"Dig", "1000L", "Dig 1000 garbage lines."},
|
['dig_1000l']= {"Dig", "1000L", "Dig 1000 garbage lines."},
|
||||||
['drought_n']= {"Drought", "100L", "There are no I-pieces."},
|
['drought_n']= {"Drought", "100L", "There are no I-pieces."},
|
||||||
['drought_l']= {"Drought+", "100L", "W T F"},
|
['drought_l']= {"Drought+", "100L", "W T F"},
|
||||||
['stack_20l']= {"Stack", "20L", "Pack them!"},
|
['stack_e']= {"Stack", "EASY", "Pack them!"},
|
||||||
['stack_40l']= {"Stack", "40L", "Pack them!"},
|
['stack_h']= {"Stack", "HARD", "Pack them!"},
|
||||||
['stack_100l']= {"Stack", "100L", "Pack them!"},
|
['stack_u']= {"Stack", "ULTIMATE", "Pack them!"},
|
||||||
['marathon_n']= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."},
|
['marathon_n']= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."},
|
||||||
['marathon_h']= {"Marathon", "HARD", "200-line high-speed marathon."},
|
['marathon_h']= {"Marathon", "HARD", "200-line high-speed marathon."},
|
||||||
['solo_e']= {"Battle", "EASY", "Defeat the AI!"},
|
['solo_e']= {"Battle", "EASY", "Defeat the AI!"},
|
||||||
|
|||||||
@@ -645,9 +645,9 @@ return{
|
|||||||
['dig_1000l']= {"Queso", "1000L", "Limpia 1000 líneas de queso."},
|
['dig_1000l']= {"Queso", "1000L", "Limpia 1000 líneas de queso."},
|
||||||
['drought_n']= {"Sequía", "100L", "¡Sin piezas I!"},
|
['drought_n']= {"Sequía", "100L", "¡Sin piezas I!"},
|
||||||
['drought_l']= {"Sequía+", "100L", "Guat de foc..."},
|
['drought_l']= {"Sequía+", "100L", "Guat de foc..."},
|
||||||
-- ['stack_20l']= {"Stack", "20L", "Pack them!"},
|
-- ['stack_e']= {"Stack", "Fácil", "Pack them!"},
|
||||||
-- ['stack_40l']= {"Stack", "40L", "Pack them!"},
|
-- ['stack_h']= {"Stack", "Difícil", "Pack them!"},
|
||||||
-- ['stack_100l']= {"Stack", "100L", "Pack them!"},
|
-- ['stack_u']= {"Stack", "Supremo", "Pack them!"},
|
||||||
['marathon_n']= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."},
|
['marathon_n']= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."},
|
||||||
['marathon_h']= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."},
|
['marathon_h']= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."},
|
||||||
['solo_e']= {"VS.", "Fácil", "¡Derrota a la CPU!"},
|
['solo_e']= {"VS.", "Fácil", "¡Derrota a la CPU!"},
|
||||||
|
|||||||
@@ -647,9 +647,9 @@ return{
|
|||||||
['dig_1000l']= {"Dig", "1000L", "Creusez 1000 lines"},
|
['dig_1000l']= {"Dig", "1000L", "Creusez 1000 lines"},
|
||||||
['drought_n']= {"Drought", "100L", "Pas de pièce I !"},
|
['drought_n']= {"Drought", "100L", "Pas de pièce I !"},
|
||||||
['drought_l']= {"Drought+", "100L", "WTF ??!!"},
|
['drought_l']= {"Drought+", "100L", "WTF ??!!"},
|
||||||
-- ['stack_20l']= {"Stack", "20L", "Pack them!"},
|
-- ['stack_e']= {"Stack", "FACILE", "Pack them!"},
|
||||||
-- ['stack_40l']= {"Stack", "40L", "Pack them!"},
|
-- ['stack_h']= {"Stack", "DIFFICILE", "Pack them!"},
|
||||||
-- ['stack_100l']= {"Stack", "100L", "Pack them!"},
|
-- ['stack_u']= {"Stack", "ULTIME", "Pack them!"},
|
||||||
['marathon_n']= {"Marathon", "NORMAL", "Marathon de 200 lignes."},
|
['marathon_n']= {"Marathon", "NORMAL", "Marathon de 200 lignes."},
|
||||||
['marathon_h']= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"},
|
['marathon_h']= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"},
|
||||||
['solo_e']= {"Battle", "FACILE", "Battez l'IA !"},
|
['solo_e']= {"Battle", "FACILE", "Battez l'IA !"},
|
||||||
|
|||||||
@@ -731,9 +731,9 @@ return{
|
|||||||
['dig_1000l']= {"Cave", "1000L", "Cave 1000 linhas de lixo."},
|
['dig_1000l']= {"Cave", "1000L", "Cave 1000 linhas de lixo."},
|
||||||
['drought_n']= {"Drought", "100L", "Sem peça I !"},
|
['drought_n']= {"Drought", "100L", "Sem peça I !"},
|
||||||
['drought_l']= {"Drought+", "100L", "WTF"},
|
['drought_l']= {"Drought+", "100L", "WTF"},
|
||||||
-- ['stack_20l']= {"Stack", "20L", "Pack them!"},
|
-- ['stack_e']= {"Stack", "FÁCIL", "Pack them!"},
|
||||||
-- ['stack_40l']= {"Stack", "40L", "Pack them!"},
|
-- ['stack_h']= {"Stack", "DIFÍCIL", "Pack them!"},
|
||||||
-- ['stack_100l']= {"Stack", "100L", "Pack them!"},
|
-- ['stack_u']= {"Stack", "ULTIMATE", "Pack them!"},
|
||||||
['marathon_n']= {"Maratona", "NORMAL", "200-line Maratona com velocidade aumentando."},
|
['marathon_n']= {"Maratona", "NORMAL", "200-line Maratona com velocidade aumentando."},
|
||||||
['marathon_h']= {"Maratona", "DIFÍCIL", "200-line Maratona com velocidade alta."},
|
['marathon_h']= {"Maratona", "DIFÍCIL", "200-line Maratona com velocidade alta."},
|
||||||
['solo_e']= {"Batalha", "FÁCIL", "Derrote a inteligência!"},
|
['solo_e']= {"Batalha", "FÁCIL", "Derrote a inteligência!"},
|
||||||
|
|||||||
@@ -223,9 +223,9 @@ return{
|
|||||||
['dig_1000l']= {"挖掘", "1000L", "挖1000行"},
|
['dig_1000l']= {"挖掘", "1000L", "挖1000行"},
|
||||||
['drought_n']= {"干旱", "100L", "放轻松,简单得很"},
|
['drought_n']= {"干旱", "100L", "放轻松,简单得很"},
|
||||||
['drought_l']= {"干旱+", "100L", "有趣的要来了"},
|
['drought_l']= {"干旱+", "100L", "有趣的要来了"},
|
||||||
['stack_20l']= {"堆叠", "20L", "拼图(确信"},
|
['stack_e']= {"堆叠", "简单", "智力启蒙玩具(确信"},
|
||||||
['stack_40l']= {"堆叠", "40L", "拼图(确信"},
|
['stack_h']= {"堆叠", "困难", "智力启蒙玩具(确信"},
|
||||||
['stack_100l']= {"堆叠", "100L", "盖楼(确信"},
|
['stack_u']= {"堆叠", "极限", "智力启蒙玩具(确信"},
|
||||||
['marathon_n']= {"马拉松", "普通", "休闲模式"},
|
['marathon_n']= {"马拉松", "普通", "休闲模式"},
|
||||||
['marathon_h']= {"马拉松", "困难", "休闲模式"},
|
['marathon_h']= {"马拉松", "困难", "休闲模式"},
|
||||||
['solo_e']= {"单挑", "简单", "鲨AI"},
|
['solo_e']= {"单挑", "简单", "鲨AI"},
|
||||||
|
|||||||
@@ -741,9 +741,9 @@ return{
|
|||||||
['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"},
|
['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"},
|
||||||
['drought_n']= {"干旱", "100L", "你I没了"},
|
['drought_n']= {"干旱", "100L", "你I没了"},
|
||||||
['drought_l']= {"干旱+", "100L", "后 妈 发 牌"},
|
['drought_l']= {"干旱+", "100L", "后 妈 发 牌"},
|
||||||
['stack_20l']= {"堆积", "20L", "搭积木"},
|
['stack_e']= {"堆积", "简单", "搭积木"},
|
||||||
['stack_40l']= {"堆积", "40L", "搭积木"},
|
['stack_h']= {"堆积", "困难", "搭积木"},
|
||||||
['stack_100l']= {"堆积", "100L", "搭积木"},
|
['stack_u']= {"堆积", "极限", "搭积木"},
|
||||||
['marathon_n']= {"马拉松", "普通", "200行加速马拉松"},
|
['marathon_n']= {"马拉松", "普通", "200行加速马拉松"},
|
||||||
['marathon_h']= {"马拉松", "困难", "200行高速马拉松"},
|
['marathon_h']= {"马拉松", "困难", "200行高速马拉松"},
|
||||||
['solo_e']= {"单挑", "简单", "打败AI"},
|
['solo_e']= {"单挑", "简单", "打败AI"},
|
||||||
|
|||||||
@@ -140,9 +140,9 @@ return{
|
|||||||
['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"},
|
['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"},
|
||||||
['drought_n']= {"干旱", "100行", "你I没了"},
|
['drought_n']= {"干旱", "100行", "你I没了"},
|
||||||
['drought_l']= {"干旱+", "100行", "后 妈 发 牌"},
|
['drought_l']= {"干旱+", "100行", "后 妈 发 牌"},
|
||||||
['stack_20l']= {"堆积", "20L", "搭积木"},
|
['stack_e']= {"堆积", "简单", "搭积木"},
|
||||||
['stack_40l']= {"堆积", "40L", "搭积木"},
|
['stack_h']= {"堆积", "困难", "搭积木"},
|
||||||
['stack_100l']= {"堆积", "100L", "搭积木"},
|
['stack_u']= {"堆积", "极限", "搭积木"},
|
||||||
['marathon_n']= {"马拉松", "普通", "200行加速马拉松"},
|
['marathon_n']= {"马拉松", "普通", "200行加速马拉松"},
|
||||||
['marathon_h']= {"马拉松", "困难", "200行高速马拉松"},
|
['marathon_h']= {"马拉松", "困难", "200行高速马拉松"},
|
||||||
['solo_e']= {"单挑", "简单", "打败机器人"},
|
['solo_e']= {"单挑", "简单", "打败机器人"},
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
return{
|
return{
|
||||||
{name='sprint_10l', x=0, y=0, size=40,shape=1,icon="sprint1", unlock={'sprint_20l','sprint_40l'}},
|
{name='sprint_10l', x=0, y=0, size=40,shape=1,icon="sprint1", unlock={'sprint_20l','sprint_40l'}},
|
||||||
{name='sprint_20l', x=-200, y=200, size=50,shape=1,icon="sprint1"},
|
{name='sprint_20l', x=-200, y=200, size=50,shape=1,icon="sprint1"},
|
||||||
{name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','stack_20l'}},
|
{name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','stack_e'}},
|
||||||
{name='sprint_100l', x=-200, y=0, size=50,shape=1,icon="sprint2", unlock={'sprint_400l','drought_n'}},
|
{name='sprint_100l', x=-200, y=0, size=50,shape=1,icon="sprint2", unlock={'sprint_400l','drought_n'}},
|
||||||
{name='sprint_400l', x=-400, y=0, size=40,shape=1,icon="sprint3", unlock={'sprint_1000l'}},
|
{name='sprint_400l', x=-400, y=0, size=40,shape=1,icon="sprint3", unlock={'sprint_1000l'}},
|
||||||
{name='sprint_1000l', x=-600, y=0, size=40,shape=1,icon="sprint3"},
|
{name='sprint_1000l', x=-600, y=0, size=40,shape=1,icon="sprint3"},
|
||||||
@@ -12,9 +12,9 @@ return{
|
|||||||
{name='drought_n', x=-400, y=200, size=40,shape=1,icon="drought", unlock={'drought_l'}},
|
{name='drought_n', x=-400, y=200, size=40,shape=1,icon="drought", unlock={'drought_l'}},
|
||||||
{name='drought_l', x=-600, y=200, size=40,shape=1,icon="drought"},
|
{name='drought_l', x=-600, y=200, size=40,shape=1,icon="drought"},
|
||||||
|
|
||||||
{name='stack_20l', x=-200, y=-400, size=40,shape=1,icon="mess", unlock={'stack_40l'}},
|
{name='stack_e', x=-200, y=-400, size=40,shape=1,icon="mess", unlock={'stack_h'}},
|
||||||
{name='stack_40l', x=-400, y=-400, size=40,shape=1,icon="mess", unlock={'stack_100l'}},
|
{name='stack_h', x=-400, y=-400, size=40,shape=1,icon="mess", unlock={'stack_u'}},
|
||||||
{name='stack_100l', x=-600, y=-400, size=40,shape=1,icon="mess"},
|
{name='stack_u', x=-600, y=-400, size=40,shape=1,icon="mess"},
|
||||||
|
|
||||||
{name='dig_10l', x=-200, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_40l'}},
|
{name='dig_10l', x=-200, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_40l'}},
|
||||||
{name='dig_40l', x=-400, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_100l'}},
|
{name='dig_40l', x=-400, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_100l'}},
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
local function getHoleCount(P)
|
local function getHoleCount(P)
|
||||||
local hole=0
|
local hole=0
|
||||||
for x=1,10 do
|
for x=1,10 do
|
||||||
for y=1,20 do
|
for y=1,100 do
|
||||||
if not P:solid(x,y)then
|
if not P:solid(x,y)then
|
||||||
hole=hole+1
|
hole=hole+1
|
||||||
end
|
end
|
||||||
@@ -13,13 +13,13 @@ return{
|
|||||||
color=COLOR.cyan,
|
color=COLOR.cyan,
|
||||||
env={
|
env={
|
||||||
drop=60,lock=60,
|
drop=60,lock=60,
|
||||||
freshLimit=15,
|
fieldH=100,
|
||||||
fieldH=20,
|
|
||||||
highCam=true,
|
highCam=true,
|
||||||
fillClear=false,
|
fillClear=false,
|
||||||
seqData={1,2,3,4,5,6,7},
|
seqData={1,2,3,4,5,6,7},
|
||||||
bg='blockrain',bgm='there',
|
bg='blockrain',bgm='there',
|
||||||
},
|
},
|
||||||
|
mesDisp=function(P)PLY.draw.drawTargetLine(P,100)end,
|
||||||
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
||||||
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
||||||
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
local function getHoleCount(P)
|
local function getHoleCount(P)
|
||||||
local hole=0
|
local hole=0
|
||||||
for x=1,10 do
|
for x=1,10 do
|
||||||
for y=1,39 do
|
for y=1,98 do
|
||||||
if not P:solid(x,y)then
|
if not P:solid(x,y)then
|
||||||
hole=hole+1
|
hole=hole+1
|
||||||
end
|
end
|
||||||
@@ -10,16 +10,16 @@ local function getHoleCount(P)
|
|||||||
return hole
|
return hole
|
||||||
end
|
end
|
||||||
return{
|
return{
|
||||||
color=COLOR.cyan,
|
color=COLOR.magenta,
|
||||||
env={
|
env={
|
||||||
drop=60,lock=90,
|
drop=60,lock=60,
|
||||||
freshLimit=15,
|
fieldH=100,
|
||||||
fieldH=40,
|
|
||||||
highCam=true,
|
highCam=true,
|
||||||
fillClear=false,
|
fillClear=false,
|
||||||
seqData={1,2,3,4,5,6,7,1,2,3,4,5,6,7,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},
|
seqData={1,2,3,4,5,6,7,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},
|
||||||
bg='blockrain',bgm='there',
|
bg='blockrain',bgm='there',
|
||||||
},
|
},
|
||||||
|
mesDisp=function(P)PLY.draw.drawTargetLine(P,98)end,
|
||||||
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
||||||
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
||||||
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
||||||
@@ -27,9 +27,9 @@ return{
|
|||||||
local H=getHoleCount(P)
|
local H=getHoleCount(P)
|
||||||
return
|
return
|
||||||
H==0 and 5 or
|
H==0 and 5 or
|
||||||
H<=1 and 4 or
|
H<=2 and 4 or
|
||||||
H<=3 and 3 or
|
H<=4 and 3 or
|
||||||
H<=6 and 2 or
|
H<=7 and 2 or
|
||||||
H<=10 and 1 or
|
H<=10 and 1 or
|
||||||
H<=20 and 0
|
H<=20 and 0
|
||||||
end,
|
end,
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
local function getHoleCount(P)
|
local function getHoleCount(P)
|
||||||
local hole=0
|
local hole=0
|
||||||
for x=1,10 do
|
for x=1,10 do
|
||||||
for y=1,98 do
|
for y=1,97 do
|
||||||
if not P:solid(x,y)then
|
if not P:solid(x,y)then
|
||||||
hole=hole+1
|
hole=hole+1
|
||||||
end
|
end
|
||||||
@@ -10,16 +10,16 @@ local function getHoleCount(P)
|
|||||||
return hole
|
return hole
|
||||||
end
|
end
|
||||||
return{
|
return{
|
||||||
color=COLOR.cyan,
|
color=COLOR.yellow,
|
||||||
env={
|
env={
|
||||||
drop=60,lock=120,
|
drop=60,lock=60,
|
||||||
freshLimit=15,
|
|
||||||
fieldH=100,
|
fieldH=100,
|
||||||
highCam=true,
|
highCam=true,
|
||||||
fillClear=false,
|
fillClear=false,
|
||||||
seqData={1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},
|
seqData={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25},
|
||||||
bg='blockrain',bgm='there',
|
bg='blockrain',bgm='there',
|
||||||
},
|
},
|
||||||
|
mesDisp=function(P)PLY.draw.drawTargetLine(P,97)end,
|
||||||
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
score=function(P)return{getHoleCount(P),P.stat.time}end,
|
||||||
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end,
|
||||||
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,
|
||||||
Reference in New Issue
Block a user