From dd872a72b26284f5556195cadfcf0a4b0c745fbe Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sat, 29 Oct 2022 00:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8Cre?= =?UTF-8?q?turn=E5=90=8E=E9=9D=A2=E8=B7=9F=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework | 2 +- parts/RSlist.lua | 2 +- parts/bot/init.lua | 4 ++-- parts/customEnv0.lua | 2 +- parts/data.lua | 2 +- parts/eventsets/attacker_h.lua | 2 +- parts/eventsets/attacker_u.lua | 2 +- parts/eventsets/backfire_0.lua | 2 +- parts/eventsets/backfire_120.lua | 2 +- parts/eventsets/backfire_30.lua | 2 +- parts/eventsets/backfire_60.lua | 2 +- parts/eventsets/bigWallGen.lua | 2 +- parts/eventsets/blindMesDisp.lua | 2 +- parts/eventsets/c4wBase.lua | 2 +- parts/eventsets/c4wCheck_easy.lua | 2 +- parts/eventsets/c4wCheck_hard.lua | 2 +- parts/eventsets/checkAttack_100.lua | 2 +- parts/eventsets/checkClearBoard.lua | 2 +- parts/eventsets/checkLine_10.lua | 2 +- parts/eventsets/checkLine_100.lua | 2 +- parts/eventsets/checkLine_1000.lua | 2 +- parts/eventsets/checkLine_20.lua | 2 +- parts/eventsets/checkLine_200.lua | 2 +- parts/eventsets/checkLine_40.lua | 2 +- parts/eventsets/checkLine_400.lua | 2 +- parts/eventsets/checkTurn_1.lua | 2 +- parts/eventsets/checkTurn_7.lua | 2 +- parts/eventsets/classic_e.lua | 2 +- parts/eventsets/classic_h.lua | 2 +- parts/eventsets/classic_l.lua | 2 +- parts/eventsets/classic_u.lua | 2 +- parts/eventsets/defender_l.lua | 2 +- parts/eventsets/defender_n.lua | 2 +- parts/eventsets/dig_100l.lua | 2 +- parts/eventsets/dig_10l.lua | 2 +- parts/eventsets/dig_400l.lua | 2 +- parts/eventsets/dig_40l.lua | 2 +- parts/eventsets/dig_h.lua | 2 +- parts/eventsets/dig_u.lua | 2 +- parts/eventsets/marathon_bfmax.lua | 2 +- parts/eventsets/master_ex.lua | 2 +- parts/eventsets/master_final.lua | 2 +- parts/eventsets/master_g.lua | 2 +- parts/eventsets/master_h.lua | 2 +- parts/eventsets/master_instinct.lua | 2 +- parts/eventsets/master_n.lua | 2 +- parts/eventsets/pc_inf.lua | 2 +- parts/eventsets/pctrain_l.lua | 2 +- parts/eventsets/pctrain_n.lua | 2 +- parts/eventsets/royale.lua | 2 +- parts/eventsets/secret_grade.lua | 2 +- parts/eventsets/sprintEff_40.lua | 2 +- parts/eventsets/sprintMD.lua | 2 +- parts/eventsets/sprintSym.lua | 2 +- parts/eventsets/stack_e.lua | 2 +- parts/eventsets/stack_u.lua | 2 +- parts/eventsets/survivor_e.lua | 2 +- parts/eventsets/survivor_h.lua | 2 +- parts/eventsets/survivor_l.lua | 2 +- parts/eventsets/survivor_n.lua | 2 +- parts/eventsets/survivor_u.lua | 2 +- parts/eventsets/techrash_n.lua | 2 +- parts/eventsets/techrash_u.lua | 2 +- parts/eventsets/tsd_e.lua | 2 +- parts/eventsets/tsd_h.lua | 2 +- parts/eventsets/tsd_u.lua | 2 +- parts/eventsets/ultra.lua | 2 +- parts/language/dict_en.lua | 2 +- parts/language/dict_ja.lua | 2 +- parts/language/dict_zh.lua | 2 +- parts/language/lang_en.lua | 2 +- parts/language/lang_es.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_id.lua | 2 +- parts/language/lang_ja.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_symbol.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/language/lang_zh_code.lua | 2 +- parts/language/lang_zh_trad.lua | 2 +- parts/modes.lua | 2 +- parts/modes/PCbase.lua | 2 +- parts/modes/PClist.lua | 2 +- parts/modes/attacker_h.lua | 4 ++-- parts/modes/attacker_u.lua | 4 ++-- parts/modes/backfire_h.lua | 4 ++-- parts/modes/backfire_l.lua | 4 ++-- parts/modes/backfire_n.lua | 4 ++-- parts/modes/backfire_u.lua | 4 ++-- parts/modes/big_h.lua | 4 ++-- parts/modes/big_n.lua | 4 ++-- parts/modes/blind_e.lua | 4 ++-- parts/modes/blind_h.lua | 4 ++-- parts/modes/blind_l.lua | 4 ++-- parts/modes/blind_n.lua | 4 ++-- parts/modes/blind_u.lua | 4 ++-- parts/modes/blind_wtf.lua | 4 ++-- parts/modes/c4wtrain_l.lua | 4 ++-- parts/modes/c4wtrain_n.lua | 4 ++-- parts/modes/classic_e.lua | 4 ++-- parts/modes/classic_h.lua | 4 ++-- parts/modes/classic_l.lua | 4 ++-- parts/modes/classic_u.lua | 4 ++-- parts/modes/custom_clear.lua | 2 +- parts/modes/custom_puzzle.lua | 2 +- parts/modes/defender_l.lua | 4 ++-- parts/modes/defender_n.lua | 4 ++-- parts/modes/dig_100l.lua | 4 ++-- parts/modes/dig_10l.lua | 4 ++-- parts/modes/dig_400l.lua | 4 ++-- parts/modes/dig_40l.lua | 4 ++-- parts/modes/dig_eff_100l.lua | 4 ++-- parts/modes/dig_eff_10l.lua | 4 ++-- parts/modes/dig_eff_400l.lua | 4 ++-- parts/modes/dig_eff_40l.lua | 4 ++-- parts/modes/dig_h.lua | 4 ++-- parts/modes/dig_quad_10l.lua | 4 ++-- parts/modes/dig_u.lua | 4 ++-- parts/modes/drought_l.lua | 4 ++-- parts/modes/drought_n.lua | 4 ++-- parts/modes/infinite.lua | 2 +- parts/modes/infinite_dig.lua | 2 +- parts/modes/marathon_bfmax.lua | 2 +- parts/modes/marathon_h.lua | 4 ++-- parts/modes/marathon_inf.lua | 4 ++-- parts/modes/marathon_n.lua | 4 ++-- parts/modes/master_ex.lua | 4 ++-- parts/modes/master_final.lua | 4 ++-- parts/modes/master_g.lua | 2 +- parts/modes/master_h.lua | 4 ++-- parts/modes/master_instinct.lua | 4 ++-- parts/modes/master_m.lua | 4 ++-- parts/modes/master_n.lua | 4 ++-- parts/modes/master_ph.lua | 4 ++-- parts/modes/netBattle.lua | 2 +- parts/modes/pc_h.lua | 4 ++-- parts/modes/pc_inf.lua | 4 ++-- parts/modes/pc_l.lua | 4 ++-- parts/modes/pc_n.lua | 4 ++-- parts/modes/pctrain_l.lua | 4 ++-- parts/modes/pctrain_n.lua | 4 ++-- parts/modes/round_e.lua | 4 ++-- parts/modes/round_h.lua | 4 ++-- parts/modes/round_l.lua | 4 ++-- parts/modes/round_n.lua | 4 ++-- parts/modes/round_u.lua | 4 ++-- parts/modes/secret_grade.lua | 4 ++-- parts/modes/solo_e.lua | 4 ++-- parts/modes/solo_h.lua | 4 ++-- parts/modes/solo_l.lua | 4 ++-- parts/modes/solo_n.lua | 4 ++-- parts/modes/solo_u.lua | 4 ++-- parts/modes/sprint123.lua | 4 ++-- parts/modes/sprintAtk.lua | 4 ++-- parts/modes/sprintEff.lua | 4 ++-- parts/modes/sprintFix.lua | 2 +- parts/modes/sprintLock.lua | 2 +- parts/modes/sprintMD.lua | 2 +- parts/modes/sprintMPH.lua | 4 ++-- parts/modes/sprintPenta.lua | 4 ++-- parts/modes/sprintSmooth.lua | 2 +- parts/modes/sprintSym.lua | 2 +- parts/modes/sprint_1000l.lua | 4 ++-- parts/modes/sprint_100l.lua | 4 ++-- parts/modes/sprint_10l.lua | 4 ++-- parts/modes/sprint_20l.lua | 4 ++-- parts/modes/sprint_400l.lua | 4 ++-- parts/modes/sprint_40l.lua | 4 ++-- parts/modes/stack_e.lua | 2 +- parts/modes/stack_u.lua | 2 +- parts/modes/strategy_e.lua | 4 ++-- parts/modes/strategy_e_plus.lua | 4 ++-- parts/modes/strategy_h.lua | 4 ++-- parts/modes/strategy_h_plus.lua | 4 ++-- parts/modes/strategy_u.lua | 4 ++-- parts/modes/strategy_u_plus.lua | 4 ++-- parts/modes/survivor_e.lua | 4 ++-- parts/modes/survivor_h.lua | 4 ++-- parts/modes/survivor_l.lua | 4 ++-- parts/modes/survivor_n.lua | 4 ++-- parts/modes/survivor_u.lua | 4 ++-- parts/modes/tech_finesse.lua | 4 ++-- parts/modes/tech_finesse_f.lua | 4 ++-- parts/modes/tech_h.lua | 4 ++-- parts/modes/tech_h_plus.lua | 4 ++-- parts/modes/tech_l.lua | 4 ++-- parts/modes/tech_l_plus.lua | 4 ++-- parts/modes/tech_n.lua | 4 ++-- parts/modes/tech_n_plus.lua | 4 ++-- parts/modes/techmino49_e.lua | 4 ++-- parts/modes/techmino49_h.lua | 4 ++-- parts/modes/techmino49_u.lua | 4 ++-- parts/modes/techmino99_e.lua | 4 ++-- parts/modes/techmino99_h.lua | 4 ++-- parts/modes/techmino99_u.lua | 4 ++-- parts/modes/techrash_n.lua | 2 +- parts/modes/techrash_u.lua | 2 +- parts/modes/tsd_e.lua | 4 ++-- parts/modes/tsd_h.lua | 4 ++-- parts/modes/tsd_u.lua | 4 ++-- parts/modes/ultra.lua | 4 ++-- parts/modes/zen.lua | 4 ++-- parts/patron.lua | 2 +- parts/player/gameEnv0.lua | 2 +- parts/player/player.lua | 2 +- parts/scenes/app_arithmetic.lua | 12 ++++++------ version.lua | 2 +- 207 files changed, 316 insertions(+), 316 deletions(-) diff --git a/Zframework b/Zframework index 69858c6c..632e95d4 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit 69858c6c14cd8dd72519d46e362e4101bbc9c3b4 +Subproject commit 632e95d48d3af9c2694782366a3cd26b4940bc8d diff --git a/parts/RSlist.lua b/parts/RSlist.lua index 0fa118f6..561dd4dc 100644 --- a/parts/RSlist.lua +++ b/parts/RSlist.lua @@ -72,7 +72,7 @@ local function _flipList(O) end local function _reflect(a) - return{ + return { [03]=_flipList(a[01]), [01]=_flipList(a[03]), [30]=_flipList(a[10]), diff --git a/parts/bot/init.lua b/parts/bot/init.lua index 24e42fab..ee5b3cea 100644 --- a/parts/bot/init.lua +++ b/parts/bot/init.lua @@ -62,7 +62,7 @@ local AISpeed={60,50,42,34,27,21,16,12,9,6} ]] function BOT.template(arg) if arg.type=='CC' then - return{ + return { type='CC', next=arg.next, hold=arg.hold, @@ -72,7 +72,7 @@ function BOT.template(arg) _20G=arg._20G, } elseif arg.type=='9S' then - return{ + return { type='9S', delay=math.floor(AISpeed[arg.speedLV]), hold=arg.hold, diff --git a/parts/customEnv0.lua b/parts/customEnv0.lua index 9c7a6c2c..5b662925 100644 --- a/parts/customEnv0.lua +++ b/parts/customEnv0.lua @@ -1,4 +1,4 @@ -return{ +return { version=VERSION.code, -- Basic diff --git a/parts/data.lua b/parts/data.lua index 295ab763..9498026b 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -413,7 +413,7 @@ function DATA.parseReplayData(fileName,fileData,ifFull) -- Create unavailable replay object ::BREAK_cannotParse:: - return{ + return { fileName=fileName, available=false, } diff --git a/parts/eventsets/attacker_h.lua b/parts/eventsets/attacker_h.lua index ecd92c13..fa2efa3f 100644 --- a/parts/eventsets/attacker_h.lua +++ b/parts/eventsets/attacker_h.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(P.modeData.wave,63,200) diff --git a/parts/eventsets/attacker_u.lua b/parts/eventsets/attacker_u.lua index 27ccf2b4..307ba42a 100644 --- a/parts/eventsets/attacker_u.lua +++ b/parts/eventsets/attacker_u.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(P.modeData.wave,63,200) diff --git a/parts/eventsets/backfire_0.lua b/parts/eventsets/backfire_0.lua index 8c4a012c..621df23d 100644 --- a/parts/eventsets/backfire_0.lua +++ b/parts/eventsets/backfire_0.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,0,generateLine(P.holeRND:random(10))) diff --git a/parts/eventsets/backfire_120.lua b/parts/eventsets/backfire_120.lua index 4a284a48..639cf3b7 100644 --- a/parts/eventsets/backfire_120.lua +++ b/parts/eventsets/backfire_120.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,120,generateLine(P.holeRND:random(10))) diff --git a/parts/eventsets/backfire_30.lua b/parts/eventsets/backfire_30.lua index bb949c4a..4ae0feb8 100644 --- a/parts/eventsets/backfire_30.lua +++ b/parts/eventsets/backfire_30.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,30,generateLine(P.holeRND:random(10))) diff --git a/parts/eventsets/backfire_60.lua b/parts/eventsets/backfire_60.lua index 22e7ff04..617fd624 100644 --- a/parts/eventsets/backfire_60.lua +++ b/parts/eventsets/backfire_60.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.atk>0 then P:receive(nil,P.lastPiece.atk,60,generateLine(P.holeRND:random(10))) diff --git a/parts/eventsets/bigWallGen.lua b/parts/eventsets/bigWallGen.lua index 07240673..a7005111 100644 --- a/parts/eventsets/bigWallGen.lua +++ b/parts/eventsets/bigWallGen.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.row>0 then for _=1,#P.clearedRow do diff --git a/parts/eventsets/blindMesDisp.lua b/parts/eventsets/blindMesDisp.lua index 425af0b3..1ece5ee9 100644 --- a/parts/eventsets/blindMesDisp.lua +++ b/parts/eventsets/blindMesDisp.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) mText(TEXTOBJ.techrash,63,420) setFont(75) diff --git a/parts/eventsets/c4wBase.lua b/parts/eventsets/c4wBase.lua index f1f932f9..3d88cab0 100644 --- a/parts/eventsets/c4wBase.lua +++ b/parts/eventsets/c4wBase.lua @@ -1,6 +1,6 @@ local rem=table.remove -return{ +return { mesDisp=function(P) setFont(45) GC.mStr(P.combo,63,310) diff --git a/parts/eventsets/c4wCheck_easy.lua b/parts/eventsets/c4wCheck_easy.lua index 5f81dd24..2058cf8d 100644 --- a/parts/eventsets/c4wCheck_easy.lua +++ b/parts/eventsets/c4wCheck_easy.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.row>0 then for _=1,#P.clearedRow do diff --git a/parts/eventsets/c4wCheck_hard.lua b/parts/eventsets/c4wCheck_hard.lua index e2ecc4d8..ac31d3e8 100644 --- a/parts/eventsets/c4wCheck_hard.lua +++ b/parts/eventsets/c4wCheck_hard.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.lastPiece.row==0 then P:lose() diff --git a/parts/eventsets/checkAttack_100.lua b/parts/eventsets/checkAttack_100.lua index 634796ce..5f36bb47 100644 --- a/parts/eventsets/checkAttack_100.lua +++ b/parts/eventsets/checkAttack_100.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(45) GC.mStr(("%.1f"):format(P.stat.atk),63,190) diff --git a/parts/eventsets/checkClearBoard.lua b/parts/eventsets/checkClearBoard.lua index 21222f8f..a6016c77 100644 --- a/parts/eventsets/checkClearBoard.lua +++ b/parts/eventsets/checkClearBoard.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.garbageBeneath==0 then local D=P.modeData diff --git a/parts/eventsets/checkLine_10.lua b/parts/eventsets/checkLine_10.lua index 0e285c88..06dc1675 100644 --- a/parts/eventsets/checkLine_10.lua +++ b/parts/eventsets/checkLine_10.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=10-P.stat.row diff --git a/parts/eventsets/checkLine_100.lua b/parts/eventsets/checkLine_100.lua index a3a80bbe..61e4e63b 100644 --- a/parts/eventsets/checkLine_100.lua +++ b/parts/eventsets/checkLine_100.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=100-P.stat.row diff --git a/parts/eventsets/checkLine_1000.lua b/parts/eventsets/checkLine_1000.lua index 36272ebc..8a515f78 100644 --- a/parts/eventsets/checkLine_1000.lua +++ b/parts/eventsets/checkLine_1000.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=1000-P.stat.row diff --git a/parts/eventsets/checkLine_20.lua b/parts/eventsets/checkLine_20.lua index 0f16ceb3..a135bc40 100644 --- a/parts/eventsets/checkLine_20.lua +++ b/parts/eventsets/checkLine_20.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=20-P.stat.row diff --git a/parts/eventsets/checkLine_200.lua b/parts/eventsets/checkLine_200.lua index 69758cb2..8edb41c5 100644 --- a/parts/eventsets/checkLine_200.lua +++ b/parts/eventsets/checkLine_200.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=200-P.stat.row diff --git a/parts/eventsets/checkLine_40.lua b/parts/eventsets/checkLine_40.lua index be764fa9..a5a62e4b 100644 --- a/parts/eventsets/checkLine_40.lua +++ b/parts/eventsets/checkLine_40.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/eventsets/checkLine_400.lua b/parts/eventsets/checkLine_400.lua index e1f17c68..852c69b9 100644 --- a/parts/eventsets/checkLine_400.lua +++ b/parts/eventsets/checkLine_400.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=400-P.stat.row diff --git a/parts/eventsets/checkTurn_1.lua b/parts/eventsets/checkTurn_1.lua index 2b5be985..8f96769b 100644 --- a/parts/eventsets/checkTurn_1.lua +++ b/parts/eventsets/checkTurn_1.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if #PLY_ALIVE>1 then P.control=false diff --git a/parts/eventsets/checkTurn_7.lua b/parts/eventsets/checkTurn_7.lua index 5b7752f8..d44d326f 100644 --- a/parts/eventsets/checkTurn_7.lua +++ b/parts/eventsets/checkTurn_7.lua @@ -1,4 +1,4 @@ -return{ +return { hook_drop=function(P) if P.stat.piece%7==0 and #PLY_ALIVE>1 then P.control=false diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index 4c9e11ef..fc45ff67 100644 --- a/parts/eventsets/classic_e.lua +++ b/parts/eventsets/classic_e.lua @@ -23,7 +23,7 @@ local function GetGravity(lvl) lvl<29 and 2 or 1 end -return{ +return { das=16,arr=6, sddas=6,sdarr=6, irs=false,ims=false, diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 7e906e47..be1ebb52 100644 --- a/parts/eventsets/classic_h.lua +++ b/parts/eventsets/classic_h.lua @@ -23,7 +23,7 @@ local function GetGravity(lvl) lvl<29 and 2 or 1 end -return{ +return { das=16,arr=6, sddas=3,sdarr=3, irs=false,ims=false, diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua index fae97d5c..12da585a 100644 --- a/parts/eventsets/classic_l.lua +++ b/parts/eventsets/classic_l.lua @@ -23,7 +23,7 @@ local function GetGravity(lvl) lvl<29 and 2 or 1 end -return{ +return { das=16,arr=6, sddas=2,sdarr=2, irs=false,ims=false, diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua index 842a50db..f6c9d14e 100644 --- a/parts/eventsets/classic_u.lua +++ b/parts/eventsets/classic_u.lua @@ -4,7 +4,7 @@ local function GetLevelStr(lvl) lvl=lvl%256 return list[lvl] end -return{ +return { das=16,arr=6, sddas=1,sdarr=1, irs=false,ims=false, diff --git a/parts/eventsets/defender_l.lua b/parts/eventsets/defender_l.lua index 90f3594b..ebd2afc7 100644 --- a/parts/eventsets/defender_l.lua +++ b/parts/eventsets/defender_l.lua @@ -1,4 +1,4 @@ -return{ +return { drop=5,lock=60, fall=6, mesDisp=function(P) diff --git a/parts/eventsets/defender_n.lua b/parts/eventsets/defender_n.lua index 0ab6a210..47f13b97 100644 --- a/parts/eventsets/defender_n.lua +++ b/parts/eventsets/defender_n.lua @@ -1,4 +1,4 @@ -return{ +return { drop=30,lock=60, fall=10, mesDisp=function(P) diff --git a/parts/eventsets/dig_100l.lua b/parts/eventsets/dig_100l.lua index a297ae0b..9ec7f3b7 100644 --- a/parts/eventsets/dig_100l.lua +++ b/parts/eventsets/dig_100l.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(100-P.stat.dig,63,265) diff --git a/parts/eventsets/dig_10l.lua b/parts/eventsets/dig_10l.lua index 6f4d9a70..c5aed4d8 100644 --- a/parts/eventsets/dig_10l.lua +++ b/parts/eventsets/dig_10l.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(10-P.stat.dig,63,265) diff --git a/parts/eventsets/dig_400l.lua b/parts/eventsets/dig_400l.lua index a7e9d5fd..23eb1cbc 100644 --- a/parts/eventsets/dig_400l.lua +++ b/parts/eventsets/dig_400l.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(400-P.stat.dig,63,265) diff --git a/parts/eventsets/dig_40l.lua b/parts/eventsets/dig_40l.lua index dbbf65df..8233b757 100644 --- a/parts/eventsets/dig_40l.lua +++ b/parts/eventsets/dig_40l.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) GC.mStr(40-P.stat.dig,63,265) diff --git a/parts/eventsets/dig_h.lua b/parts/eventsets/dig_h.lua index d5e5a3c1..45cc0f67 100644 --- a/parts/eventsets/dig_h.lua +++ b/parts/eventsets/dig_h.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/dig_u.lua b/parts/eventsets/dig_u.lua index ec6927d6..ac357a53 100644 --- a/parts/eventsets/dig_u.lua +++ b/parts/eventsets/dig_u.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/marathon_bfmax.lua b/parts/eventsets/marathon_bfmax.lua index cec03b5e..2873abba 100644 --- a/parts/eventsets/marathon_bfmax.lua +++ b/parts/eventsets/marathon_bfmax.lua @@ -1,6 +1,6 @@ local dropSpeed={50,40,30,25,20,15,12,9,7,5,4,3,2,1,1,.5,.5,.25,.25} -return{ +return { drop=60, wait=8, fall=20, diff --git a/parts/eventsets/master_ex.lua b/parts/eventsets/master_ex.lua index 211a93f6..16f02457 100644 --- a/parts/eventsets/master_ex.lua +++ b/parts/eventsets/master_ex.lua @@ -10,7 +10,7 @@ local function getRollGoal(P) return goal+(rem>0.3 and 4 or rem*10) end -return{ +return { drop=0,lock=15, wait=15,fall=6, noTele=true, diff --git a/parts/eventsets/master_final.lua b/parts/eventsets/master_final.lua index 54b203cd..b8fdbbd6 100644 --- a/parts/eventsets/master_final.lua +++ b/parts/eventsets/master_final.lua @@ -1,4 +1,4 @@ -return{ +return { drop=0,lock=12, wait=10,fall=10, noTele=true, diff --git a/parts/eventsets/master_g.lua b/parts/eventsets/master_g.lua index 875e592d..9b711325 100644 --- a/parts/eventsets/master_g.lua +++ b/parts/eventsets/master_g.lua @@ -119,7 +119,7 @@ local function getRollGoal() end end -return{ +return { drop=64, lock=30, wait=23, diff --git a/parts/eventsets/master_h.lua b/parts/eventsets/master_h.lua index 3d9d7d86..d141f8dc 100644 --- a/parts/eventsets/master_h.lua +++ b/parts/eventsets/master_h.lua @@ -2,7 +2,7 @@ local death_lock={12,11,10,9,8, 8,8,7,7,6} local death_wait={10,9, 8, 7,6, 7,6,6,5,5} local death_fall={10,9, 8, 7,6, 7,6,5,5,5} -return{ +return { drop=0, lock=death_lock[1], wait=death_wait[1], diff --git a/parts/eventsets/master_instinct.lua b/parts/eventsets/master_instinct.lua index ab97e083..053e786c 100644 --- a/parts/eventsets/master_instinct.lua +++ b/parts/eventsets/master_instinct.lua @@ -5,7 +5,7 @@ local inv_hide={20,17,14,11, 8, 5, 3, 2, 1, 0} local hidetimer=0 local held=false -return{ +return { drop=0, lock=inv_lock[1], wait=inv_wait[1], diff --git a/parts/eventsets/master_n.lua b/parts/eventsets/master_n.lua index 9dd868b1..3379f52c 100644 --- a/parts/eventsets/master_n.lua +++ b/parts/eventsets/master_n.lua @@ -2,7 +2,7 @@ local rush_lock={20,18,16,15,14, 14,13,12,11,11} local rush_wait={12,11,11,10,10, 10,10, 9, 9, 9} local rush_fall={18,16,14,13,12, 12,11,11,10,10} -return{ +return { drop=0, lock=rush_lock[1], wait=rush_wait[1], diff --git a/parts/eventsets/pc_inf.lua b/parts/eventsets/pc_inf.lua index 689c4827..e5bef011 100644 --- a/parts/eventsets/pc_inf.lua +++ b/parts/eventsets/pc_inf.lua @@ -1,4 +1,4 @@ -return{ +return { heightLimit=4, mesDisp=function(P) setFont(60) diff --git a/parts/eventsets/pctrain_l.lua b/parts/eventsets/pctrain_l.lua index 11f015a3..87199934 100644 --- a/parts/eventsets/pctrain_l.lua +++ b/parts/eventsets/pctrain_l.lua @@ -41,7 +41,7 @@ local function _check(P) end end end -return{ +return { sequence='none', RS="SRS", mesDisp=function(P) diff --git a/parts/eventsets/pctrain_n.lua b/parts/eventsets/pctrain_n.lua index dfaf7835..cfeac90e 100644 --- a/parts/eventsets/pctrain_n.lua +++ b/parts/eventsets/pctrain_n.lua @@ -34,7 +34,7 @@ local function _check(P) end end end -return{ +return { sequence='none', RS="SRS", mesDisp=function(P) diff --git a/parts/eventsets/royale.lua b/parts/eventsets/royale.lua index 376f8772..71922b57 100644 --- a/parts/eventsets/royale.lua +++ b/parts/eventsets/royale.lua @@ -1,4 +1,4 @@ -return{ +return { layout='royale', fkey1=function(P) P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) diff --git a/parts/eventsets/secret_grade.lua b/parts/eventsets/secret_grade.lua index 1fa2c5c4..6aa800a3 100644 --- a/parts/eventsets/secret_grade.lua +++ b/parts/eventsets/secret_grade.lua @@ -45,7 +45,7 @@ local function generateGuide(num) end end -return{ +return { fkey1=function(P) P.modeData.showGuide=not P.modeData.showGuide end, mesDisp=function(P) mText(TEXTOBJ.grade,63,190) diff --git a/parts/eventsets/sprintEff_40.lua b/parts/eventsets/sprintEff_40.lua index 8a739974..a9e85d21 100644 --- a/parts/eventsets/sprintEff_40.lua +++ b/parts/eventsets/sprintEff_40.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(45) GC.mStr(("%.1f"):format(P.stat.atk),63,270) diff --git a/parts/eventsets/sprintMD.lua b/parts/eventsets/sprintMD.lua index c4eed657..55793ceb 100644 --- a/parts/eventsets/sprintMD.lua +++ b/parts/eventsets/sprintMD.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(55) local r=40-P.stat.row diff --git a/parts/eventsets/sprintSym.lua b/parts/eventsets/sprintSym.lua index 52eb91d3..afe90dfc 100644 --- a/parts/eventsets/sprintSym.lua +++ b/parts/eventsets/sprintSym.lua @@ -1,7 +1,7 @@ local oppo={ [1]=7,[7]=1,[11]=3,[3]=11,[14]=14,[4]=4,[9]=9, } -return{ +return { skin={ 1,7,11,3,14,4,9, 1,7,2,6,10,2,13,5,9,15,10,11,3,12,2,16,8,4, diff --git a/parts/eventsets/stack_e.lua b/parts/eventsets/stack_e.lua index b3689a16..2ec77462 100644 --- a/parts/eventsets/stack_e.lua +++ b/parts/eventsets/stack_e.lua @@ -1,4 +1,4 @@ -return{ +return { fieldH=20, fillClear=false, mesDisp=function(P) diff --git a/parts/eventsets/stack_u.lua b/parts/eventsets/stack_u.lua index 828eefdc..b42b95ee 100644 --- a/parts/eventsets/stack_u.lua +++ b/parts/eventsets/stack_u.lua @@ -1,4 +1,4 @@ -return{ +return { fieldH=21, fillClear=false, mesDisp=function(P) diff --git a/parts/eventsets/survivor_e.lua b/parts/eventsets/survivor_e.lua index 442e8c87..ec098e09 100644 --- a/parts/eventsets/survivor_e.lua +++ b/parts/eventsets/survivor_e.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/survivor_h.lua b/parts/eventsets/survivor_h.lua index 8f591cc6..9e078c2f 100644 --- a/parts/eventsets/survivor_h.lua +++ b/parts/eventsets/survivor_h.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/survivor_l.lua b/parts/eventsets/survivor_l.lua index bf4ee313..e0999f93 100644 --- a/parts/eventsets/survivor_l.lua +++ b/parts/eventsets/survivor_l.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/survivor_n.lua b/parts/eventsets/survivor_n.lua index 10d57167..82393088 100644 --- a/parts/eventsets/survivor_n.lua +++ b/parts/eventsets/survivor_n.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/survivor_u.lua b/parts/eventsets/survivor_u.lua index 23a80341..0ab93cbf 100644 --- a/parts/eventsets/survivor_u.lua +++ b/parts/eventsets/survivor_u.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.wave,63,310) diff --git a/parts/eventsets/techrash_n.lua b/parts/eventsets/techrash_n.lua index 9870f4fe..b78fdb0a 100644 --- a/parts/eventsets/techrash_n.lua +++ b/parts/eventsets/techrash_n.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.stat.clear[7][4],63,250) diff --git a/parts/eventsets/techrash_u.lua b/parts/eventsets/techrash_u.lua index e03628f8..3302d971 100644 --- a/parts/eventsets/techrash_u.lua +++ b/parts/eventsets/techrash_u.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.techrash,63,250) diff --git a/parts/eventsets/tsd_e.lua b/parts/eventsets/tsd_e.lua index f8739b8a..b8583db4 100644 --- a/parts/eventsets/tsd_e.lua +++ b/parts/eventsets/tsd_e.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.tsd,63,250) diff --git a/parts/eventsets/tsd_h.lua b/parts/eventsets/tsd_h.lua index caaf38b8..27dbf092 100644 --- a/parts/eventsets/tsd_h.lua +++ b/parts/eventsets/tsd_h.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.tsd,63,250) diff --git a/parts/eventsets/tsd_u.lua b/parts/eventsets/tsd_u.lua index 46942dec..d818dfaa 100644 --- a/parts/eventsets/tsd_u.lua +++ b/parts/eventsets/tsd_u.lua @@ -1,4 +1,4 @@ -return{ +return { mesDisp=function(P) setFont(60) GC.mStr(P.modeData.tsd,63,250) diff --git a/parts/eventsets/ultra.lua b/parts/eventsets/ultra.lua index c02efe42..27f957d1 100644 --- a/parts/eventsets/ultra.lua +++ b/parts/eventsets/ultra.lua @@ -1,7 +1,7 @@ local warnTime={60,90,105,115,116,117,118,119,120} for i=1,#warnTime do warnTime[i]=warnTime[i]*60 end -return{ +return { mesDisp=function(P) GC.setLineWidth(2) GC.setColor(.98,.98,.98,.8) diff --git a/parts/language/dict_en.lua b/parts/language/dict_en.lua index 38cc8a66..92e6dc3c 100644 --- a/parts/language/dict_en.lua +++ b/parts/language/dict_en.lua @@ -1,6 +1,6 @@ local HDsearch="https://harddrop.com/wiki?search=" local HDwiki="\nFor more information, please visit Hard Drop Wiki. Click on the globe icon to open the link." -return{ +return { {"Translator Note 1", "", "help", diff --git a/parts/language/dict_ja.lua b/parts/language/dict_ja.lua index 5cda9866..5ada3ac0 100644 --- a/parts/language/dict_ja.lua +++ b/parts/language/dict_ja.lua @@ -1,6 +1,6 @@ local HDsearch="https://harddrop.com/wiki?search=" local HDwiki="\nHard Drop Wikiに詳しい情報があります!" -return{ +return { {"翻訳者からのメモ1", "", "help", diff --git a/parts/language/dict_zh.lua b/parts/language/dict_zh.lua index e55913d4..cb32fd68 100644 --- a/parts/language/dict_zh.lua +++ b/parts/language/dict_zh.lua @@ -1,6 +1,6 @@ local HDsearch="https://harddrop.com/wiki?search=" local HDwiki="\n更多内容见Hard Drop Wiki。" -return{ +return { {"新人须知", "读我 必读 萌新 xinren new noob readme", "help", diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index fa1b44b3..6223447e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { loadText={ loadSFX="Loading sound effects", loadSample="Loading instrument samples", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 4d3f4142..63ab6f74 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -1,4 +1,4 @@ -return{ +return { loadText={ loadSFX="Cargando efectos de sonido", loadSample="Cargando samples de música", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 283ca464..eb3ec4c7 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -1,4 +1,4 @@ -return{ +return { fallback='en', sureQuit="Appuyez à nouveau pour sortir", -- sureReset="Press again to reset", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 7af25e90..5bde664f 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { fallback='en', loadText={ loadSFX="Memuat efek suara", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index 19b6be31..edcd6a69 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { fallback='en', loadText={ loadSFX="効果音をロード中", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 6f48a7c8..658e095f 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { fallback='en', sureQuit="Aparte novamente para sair", -- sureReset="Press again to reset", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index cfd5cd7c..acab33c6 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -1,4 +1,4 @@ -return{ +return { fallback='en', loadText={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index dfb53e84..f3b14002 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { loadText={ loadSFX="加载音效资源", loadSample="加载乐器采样", diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index 5594c597..478f8e27 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -1,5 +1,5 @@ local C=COLOR -return{ +return { loadText={ loadSFX="Load(SFX);", loadSample="Load(Sample);", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 275e6e82..0e6107ae 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -1,4 +1,4 @@ -return{ +return { fallback='zh', loadText={ loadSFX="加載音效資源", diff --git a/parts/modes.lua b/parts/modes.lua index 1639e438..706dfe19 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -1,4 +1,4 @@ -return{ +return { {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_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','sprint123','secret_grade'}}, diff --git a/parts/modes/PCbase.lua b/parts/modes/PCbase.lua index f7d6f94c..e302db6a 100644 --- a/parts/modes/PCbase.lua +++ b/parts/modes/PCbase.lua @@ -1,4 +1,4 @@ -return{ +return { { { {4,4,4,3,3,3,7,0,0,0}, diff --git a/parts/modes/PClist.lua b/parts/modes/PClist.lua index 79112858..49a912b1 100644 --- a/parts/modes/PClist.lua +++ b/parts/modes/PClist.lua @@ -1,4 +1,4 @@ -return{ +return { -- 3*4 shape {{1,3,3},{1,3,4},{1,5,3},{3,1,3},{3,1,4},{3,2,4},{3,3,2},{3,3,5},{3,3,6},{3,3,7},{3,4,1},{3,4,5},{3,4,6},{3,5,3},{3,5,4},{3,5,5},{3,6,3},{3,6,4},{3,7,3},{3,7,4},{5,3,4},{5,3,5},{5,5,1},{5,5,3},{5,7,3},{6,3,3},{6,3,4},{6,6,7},{6,7,6},{7,3,3},{7,3,4},{7,5,3},{7,6,6},{7,7,7}}, diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index e203d0a7..a66f3ea2 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=30,lock=60, fall=12, @@ -7,7 +7,7 @@ return{ eventSet='attacker_h', bg='rainbow2',bgm='shining terminal', }, - score=function(P) return{P.modeData.wave,P.stat.time} end, + score=function(P) return {P.modeData.wave,P.stat.time} end, scoreDisp=function(D) return D[1].." Waves "..STRING.time(D[2]) end, comp=function(a,b) return a[1]>b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]>b[2] end, getRank=function(P) diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index b02f820a..3b17d017 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -1,11 +1,11 @@ -return{ +return { env={ sequence="bagES", eventSet='master_final', bg='lightning',bgm='rectification', }, slowMark=true, - score=function(P) return{P.modeData.pt,P.stat.time} end, + score=function(P) return {P.modeData.pt,P.stat.time} end, scoreDisp=function(D) return D[1].."P "..STRING.time(D[2]) end, comp=function(a,b) return a[1]>b[1] or a[1]==b[1] and a[2]b[1] or (a[1]==b[1] and a[2]b[1] or (a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or (a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]180*60 then P.strength=3;P:setFrameColor(3)break end end while true do yield() if S.frame>260*60 then P.strength=4;P:setFrameColor(4)break end end end -return{ +return { env={ bg={'bg1','bg2','blockhole','blockfall','blockrain','blockspace','cubes','fan','flink','glow','matrix','rainbow','rainbow2','tunnel'}, bgm={'battle','beat5th','cruelty','distortion','echo','far','final','here','hope','memory','moonbeam','push','rectification','secret7th remix','secret7th','secret8th remix','secret8th','shift','shining terminal','storm','super7th','there','truth','vapor','waterfall'}, diff --git a/parts/modes/pc_h.lua b/parts/modes/pc_h.lua index 980ff48f..b9424b27 100644 --- a/parts/modes/pc_h.lua +++ b/parts/modes/pc_h.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=120, fall=10, @@ -12,7 +12,7 @@ return{ eventSet='checkLine_100', bg='rgb',bgm='truth', }, - score=function(P) return{P.stat.pc,P.stat.time} end, + score=function(P) return {P.stat.pc,P.stat.time} end, scoreDisp=function(D) return D[1].." PCs "..STRING.time(D[2]) end, comp=function(a,b) return a[1]>b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[2] end, getRank=function(P) diff --git a/parts/modes/techmino49_h.lua b/parts/modes/techmino49_h.lua index fcd14bf8..639797f8 100644 --- a/parts/modes/techmino49_h.lua +++ b/parts/modes/techmino49_h.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=60, fall=20, @@ -39,7 +39,7 @@ return{ n=n+1 end end end, - score=function(P) return{P.modeData.place,P.modeData.ko} end, + score=function(P) return {P.modeData.place,P.modeData.ko} end, scoreDisp=function(D) return"NO."..D[1].." KO:"..D[2] end, comp=function(a,b) return a[1]b[2] end, getRank=function(P) diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index 72efa1d2..6667d753 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=15,lock=60, fall=20, @@ -39,7 +39,7 @@ return{ n=n+1 end end end, - score=function(P) return{P.modeData.place,P.modeData.ko} end, + score=function(P) return {P.modeData.place,P.modeData.ko} end, scoreDisp=function(D) return"NO."..D[1].." KO:"..D[2] end, comp=function(a,b) return a[1]b[2] end, getRank=function(P) diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index b644267d..d3112235 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=60, fall=20, @@ -39,7 +39,7 @@ return{ n=n+1 end end end, - score=function(P) return{P.modeData.place,P.modeData.ko} end, + score=function(P) return {P.modeData.place,P.modeData.ko} end, scoreDisp=function(D) return"NO."..D[1].." KO:"..D[2] end, comp=function(a,b) return a[1]b[2] end, getRank=function(P) diff --git a/parts/modes/techmino99_h.lua b/parts/modes/techmino99_h.lua index 6b02f980..1c3b7853 100644 --- a/parts/modes/techmino99_h.lua +++ b/parts/modes/techmino99_h.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=60, fall=20, @@ -39,7 +39,7 @@ return{ n=n+1 end end end, - score=function(P) return{P.modeData.place,P.modeData.ko} end, + score=function(P) return {P.modeData.place,P.modeData.ko} end, scoreDisp=function(D) return"NO."..D[1].." KO:"..D[2] end, comp=function(a,b) return a[1]b[2] end, getRank=function(P) diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index 9e503cd9..7b3934db 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=15,lock=60, fall=20, @@ -39,7 +39,7 @@ return{ n=n+1 end end end, - score=function(P) return{P.modeData.place,P.modeData.ko} end, + score=function(P) return {P.modeData.place,P.modeData.ko} end, scoreDisp=function(D) return"NO."..D[1].." KO:"..D[2] end, comp=function(a,b) return a[1]b[2] end, getRank=function(P) diff --git a/parts/modes/techrash_n.lua b/parts/modes/techrash_n.lua index 425b13bb..cd85ce72 100644 --- a/parts/modes/techrash_n.lua +++ b/parts/modes/techrash_n.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=60, freshLimit=15, diff --git a/parts/modes/techrash_u.lua b/parts/modes/techrash_u.lua index 8288319e..170da13e 100644 --- a/parts/modes/techrash_u.lua +++ b/parts/modes/techrash_u.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=60,lock=60, freshLimit=15, diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua index f8c16301..48429489 100644 --- a/parts/modes/tsd_e.lua +++ b/parts/modes/tsd_e.lua @@ -1,4 +1,4 @@ -return{ +return { env={ drop=120,lock=1e99, hang=15, @@ -7,7 +7,7 @@ return{ eventSet='tsd_e', bg='matrix',bgm='vapor', }, - score=function(P) return{P.modeData.tsd,P.stat.time} end, + score=function(P) return {P.modeData.tsd,P.stat.time} end, scoreDisp=function(D) return D[1].."TSD "..STRING.time(D[2]) end, comp=function(a,b) return a[1]>b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] or a[1]==b[1] and a[2]b[1] end, getRank=function(P) diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index ebc8424f..95d7c276 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -1,11 +1,11 @@ -return{ +return { env={ drop=120,lock=120, infHold=true, eventSet='checkLine_200', bg='bg2',bgm='venus', }, - score=function(P) return{P.stat.score} end, + score=function(P) return {P.stat.score} end, scoreDisp=function(D) return tostring(D[1]) end, comp=function(a,b) return a[1]>b[1] end, getRank=function(P) diff --git a/parts/patron.lua b/parts/patron.lua index 84d05423..22c7fe9c 100644 --- a/parts/patron.lua +++ b/parts/patron.lua @@ -1,4 +1,4 @@ -return{ +return { {font=100,name="☆★白羽★☆"}, {font=100,name="[*浩]"}, diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 90ae7db0..81fac4e1 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -1,4 +1,4 @@ -return{ +return { das=10,arr=2, dascut=0,dropcut=0, sddas=2,sdarr=2, diff --git a/parts/player/player.lua b/parts/player/player.lua index c2f28840..e2aeeef9 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1374,7 +1374,7 @@ end function Player:getBlock(id,name,color)-- Get a block object local ENV=self.gameEnv local dir=ENV.face[id] - return{ + return { id=id, dir=dir, bk=BLOCKS[id][dir], diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index a7e0b117..0f690acf 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -91,30 +91,30 @@ local levels={ end,nil,nil,nil,nil, function()-- [,10] local a=rnd(2,9) - return{COLOR.N,b2(a)},a + return {COLOR.N,b2(a)},a end,nil,nil,nil,nil, function()-- local a=rnd(9,63) - return{COLOR.lR,b8(a)},a + return {COLOR.lR,b8(a)},a end,nil,nil,nil, function()-- local a=rnd(17,255) - return{COLOR.J,b16(a)},a + return {COLOR.J,b16(a)},a end,nil,nil, function()-- local s=rnd(9,31) local a=rnd(5,int(s/2)) - return{COLOR.N,b2(a),COLOR.Z,"+",COLOR.N,b2(s-a)},s + return {COLOR.N,b2(a),COLOR.Z,"+",COLOR.N,b2(s-a)},s end,nil,nil,nil,nil, function()-- local s=rnd(18,63) local a=rnd(9,int(s/2)) - return{COLOR.lR,b8(a),COLOR.Z,"+",COLOR.lR,b8(s-a)},s + return {COLOR.lR,b8(a),COLOR.Z,"+",COLOR.lR,b8(s-a)},s end,nil,nil,nil, function()-- local s=rnd(34,255) local a=rnd(17,int(s/2)) - return{COLOR.J,b16(a),COLOR.Z,"+",COLOR.J,b16(s-a)},s + return {COLOR.J,b16(a),COLOR.Z,"+",COLOR.J,b16(s-a)},s end,nil,nil, function() timing=false return "Coming S∞n"..(rnd()<.5 and "" or " "),1e99 end, }setmetatable(levels,{__index=function(self,k) return self[k-1] end}) diff --git a/version.lua b/version.lua index 7883557e..7a60d73a 100644 --- a/version.lua +++ b/version.lua @@ -1,4 +1,4 @@ -return{ +return { ["apkCode"]=450, ["code"]=1707, ["string"]="V0.17.7",