From 6cccf2604cfa885363fdbd2435927f8b336328af Mon Sep 17 00:00:00 2001 From: MrZ_26 Date: Sat, 15 Aug 2020 17:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=A4=A7=E5=A4=9A?= =?UTF-8?q?=E6=95=B0=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/bg.lua | 12 ++++++------ Zframework/scene.lua | 6 +++--- modes/attacker_hard.lua | 2 +- modes/attacker_ultimate.lua | 2 +- modes/bigbang.lua | 2 +- modes/defender_lunatic.lua | 2 +- modes/defender_normal.lua | 2 +- modes/dig_hard.lua | 2 +- modes/dig_ultimate.lua | 2 +- modes/marathon_hard.lua | 2 +- modes/marathon_normal.lua | 2 +- modes/master_advance.lua | 4 ++-- modes/master_beginner.lua | 4 ++-- modes/master_final.lua | 2 +- modes/round_1.lua | 2 +- modes/round_2.lua | 2 +- modes/round_3.lua | 2 +- modes/round_4.lua | 2 +- modes/round_5.lua | 2 +- modes/solo_1.lua | 2 +- modes/solo_2.lua | 2 +- modes/solo_3.lua | 2 +- modes/solo_4.lua | 2 +- modes/solo_5.lua | 2 +- modes/sprint_10.lua | 2 +- modes/sprint_100.lua | 2 +- modes/sprint_1000.lua | 2 +- modes/sprint_20.lua | 2 +- modes/sprint_40.lua | 2 +- modes/sprint_400.lua | 2 +- modes/techmino49_easy.lua | 2 +- modes/techmino49_hard.lua | 2 +- modes/techmino49_ultimate.lua | 2 +- modes/techmino99_easy.lua | 2 +- modes/techmino99_hard.lua | 2 +- modes/techmino99_ultimate.lua | 2 +- modes/zen.lua | 2 +- parts/list.lua | 2 +- 38 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Zframework/bg.lua b/Zframework/bg.lua index f5d4a5ee..68dba3d3 100644 --- a/Zframework/bg.lua +++ b/Zframework/bg.lua @@ -77,7 +77,7 @@ back.aura={ gc.setShader() end, }--Cool liquid background -back.game1={ +back.bg1={ init=function() t=0 BG.resize(scr.w) @@ -95,7 +95,7 @@ back.game1={ gc.setShader() end, }--Horizonal red-blue gradient -back.game2={ +back.bg2={ init=function() t=0 BG.resize(nil,scr.h) @@ -113,7 +113,7 @@ back.game2={ gc.setShader() end, }--Vertical red-green gradient -back.game3={ +back.rainbow={ init=function() t=0 BG.resize(scr.w,scr.h) @@ -132,7 +132,7 @@ back.game3={ gc.setShader() end, }--Colorful RGB -back.game4={ +back.rainbow2={ init=function() t=0 BG.resize(scr.w,scr.h) @@ -151,7 +151,7 @@ back.game4={ gc.setShader() end, }--Blue RGB -back.game5={ +back.lightning={ init=function() t=0 end, @@ -168,7 +168,7 @@ back.game5={ local blocks=require("parts/mino") local scs=require("parts/spinCenters") -back.game6={ +back.lightning2={ init=function() t=0 colorLib=_G.SKIN.libColor diff --git a/Zframework/scene.lua b/Zframework/scene.lua index b8dd8f6b..ecf362d8 100644 --- a/Zframework/scene.lua +++ b/Zframework/scene.lua @@ -197,7 +197,7 @@ function sceneInit.setting_control() dir=1, wait=30, } - BG.set("game1") + BG.set("bg1") end function sceneInit.setting_key() sceneTemp={ @@ -207,7 +207,7 @@ function sceneInit.setting_key() } end function sceneInit.setting_touch() - BG.set("game3") + BG.set("rainbow") sceneTemp={ default=1, snap=1, @@ -264,7 +264,7 @@ function sceneInit.stat() end end function sceneInit.history() - BG.set("game3") + BG.set("rainbow") sceneTemp={ text=require("parts/updateLog"),--Text list pos=1,--Scroll pos diff --git a/modes/attacker_hard.lua b/modes/attacker_hard.lua index fc71d898..7cac23ee 100644 --- a/modes/attacker_hard.lua +++ b/modes/attacker_hard.lua @@ -34,7 +34,7 @@ return{ end end end, - bg="game4",bgm="way", + bg="rainbow2",bgm="way", }, pauseLimit=true, load=function() diff --git a/modes/attacker_ultimate.lua b/modes/attacker_ultimate.lua index b7d4f00a..84b257a3 100644 --- a/modes/attacker_ultimate.lua +++ b/modes/attacker_ultimate.lua @@ -43,7 +43,7 @@ return{ end end end, - bg="game4",bgm="shining terminal", + bg="rainbow2",bgm="shining terminal", }, pauseLimit=true, load=function() diff --git a/modes/bigbang.lua b/modes/bigbang.lua index 6fbe730f..36464ad1 100644 --- a/modes/bigbang.lua +++ b/modes/bigbang.lua @@ -13,7 +13,7 @@ return{ hold=false, dropPiece=function(P)P:lose()end, task=nil, - bg="game1",bgm="newera", + bg="bg1",bgm="newera", }, pauseLimit=true, load=function() diff --git a/modes/defender_lunatic.lua b/modes/defender_lunatic.lua index 7fad15c3..0d0643db 100644 --- a/modes/defender_lunatic.lua +++ b/modes/defender_lunatic.lua @@ -37,7 +37,7 @@ return{ end end end, - bg="game4",bgm="shining terminal", + bg="rainbow2",bgm="shining terminal", }, pauseLimit=true, load=function() diff --git a/modes/defender_normal.lua b/modes/defender_normal.lua index 0b2e5540..33b442aa 100644 --- a/modes/defender_normal.lua +++ b/modes/defender_normal.lua @@ -37,7 +37,7 @@ return{ end end end, - bg="game4",bgm="way", + bg="rainbow2",bgm="way", }, pauseLimit=true, load=function() diff --git a/modes/dig_hard.lua b/modes/dig_hard.lua index 2764663b..41a0bf2a 100644 --- a/modes/dig_hard.lua +++ b/modes/dig_hard.lua @@ -16,7 +16,7 @@ return{ D.event=D.event+1 end end, - bg="game2",bgm="way", + bg="bg2",bgm="way", }, pauseLimit=true, load=function() diff --git a/modes/dig_ultimate.lua b/modes/dig_ultimate.lua index 226bee5d..03ec1118 100644 --- a/modes/dig_ultimate.lua +++ b/modes/dig_ultimate.lua @@ -15,7 +15,7 @@ return{ D.event=D.event+1 end end, - bg="game2",bgm="shining terminal", + bg="bg2",bgm="shining terminal", }, pauseLimit=true, load=function() diff --git a/modes/marathon_hard.lua b/modes/marathon_hard.lua index 8e91de96..a2f039fe 100644 --- a/modes/marathon_hard.lua +++ b/modes/marathon_hard.lua @@ -21,7 +21,7 @@ return{ mindas=7,minarr=1,minsdarr=1, drop=.5,wait=8,fall=20, target=50,dropPiece=check, - bg="game2",bgm="push", + bg="bg2",bgm="push", }, pauseLimit=true, slowMark=true, diff --git a/modes/marathon_normal.lua b/modes/marathon_normal.lua index 93ad2f8a..2b90d802 100644 --- a/modes/marathon_normal.lua +++ b/modes/marathon_normal.lua @@ -20,7 +20,7 @@ return{ wait=8,fall=20, target=10,dropPiece=check_LVup, mindas=7,minarr=1,minsdarr=1, - bg="game2",bgm="push", + bg="bg2",bgm="push", }, pauseLimit=true, slowMark=true, diff --git a/modes/master_advance.lua b/modes/master_advance.lua index a55ad8a9..9e12421e 100644 --- a/modes/master_advance.lua +++ b/modes/master_advance.lua @@ -17,7 +17,7 @@ local function score(P) --Level up! local s=P.modeData.event+1;P.modeData.event=s local E=P.gameEnv - BG.set(s==1 and"game3"or s==2 and"game4"or s==3 and"game5"or s==4 and"game6"or"game5") + BG.set(s==1 and"rainbow"or s==2 and"rainbow2"or s==3 and"lightning"or s==4 and"lightning2"or"lightning") E.lock=death_lock[s] E.wait=death_wait[s] E.fall=death_fall[s] @@ -44,7 +44,7 @@ return{ fall=death_fall[1], dropPiece=score, freshLimit=15, - bg="game2",bgm="secret7th", + bg="bg2",bgm="secret7th", }, slowMark=true, load=function() diff --git a/modes/master_beginner.lua b/modes/master_beginner.lua index 74c6c615..9dca7aa4 100644 --- a/modes/master_beginner.lua +++ b/modes/master_beginner.lua @@ -16,7 +16,7 @@ local function score(P) --Level up! local s=P.modeData.event+1;P.modeData.event=s local E=P.gameEnv - BG.set(s==1 and"game1"or s==2 and"game2"or s==3 and"game3"or "game4") + BG.set(s==1 and"bg1"or s==2 and"bg2"or s==3 and"rainbow"or "rainbow2") E.lock=rush_lock[s] E.wait=rush_wait[s] E.fall=rush_fall[s] @@ -48,7 +48,7 @@ return{ fall=rush_fall[1], dropPiece=score, freshLimit=15, - bg="game1",bgm="secret8th", + bg="bg1",bgm="secret8th", }, slowMark=true, load=function() diff --git a/modes/master_final.lua b/modes/master_final.lua index f5222807..9b132400 100644 --- a/modes/master_final.lua +++ b/modes/master_final.lua @@ -46,7 +46,7 @@ return{ dropPiece=score, freshLimit=15, easyFresh=false,bone=true, - bg="none",bgm="distortion", + bg="lightning",bgm="distortion", }, slowMark=true, load=function() diff --git a/modes/round_1.lua b/modes/round_1.lua index 7af56ac3..43d37c75 100644 --- a/modes/round_1.lua +++ b/modes/round_1.lua @@ -16,7 +16,7 @@ return{ drop=1e99,lock=1e99, oncehold=false, dropPiece=update_round, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/round_2.lua b/modes/round_2.lua index ca908e8c..981eea08 100644 --- a/modes/round_2.lua +++ b/modes/round_2.lua @@ -16,7 +16,7 @@ return{ drop=1e99,lock=1e99, oncehold=false, dropPiece=update_round, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/round_3.lua b/modes/round_3.lua index 341313e0..e7318c6f 100644 --- a/modes/round_3.lua +++ b/modes/round_3.lua @@ -16,7 +16,7 @@ return{ drop=1e99,lock=1e99, oncehold=false, dropPiece=update_round, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/round_4.lua b/modes/round_4.lua index 997e1d7f..94cd2402 100644 --- a/modes/round_4.lua +++ b/modes/round_4.lua @@ -16,7 +16,7 @@ return{ drop=1e99,lock=1e99, oncehold=false, dropPiece=update_round, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/round_5.lua b/modes/round_5.lua index cc39ccc0..c2d709c8 100644 --- a/modes/round_5.lua +++ b/modes/round_5.lua @@ -16,7 +16,7 @@ return{ drop=1e99,lock=1e99, oncehold=false, dropPiece=update_round, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/solo_1.lua b/modes/solo_1.lua index 7e3a9363..58a5796d 100644 --- a/modes/solo_1.lua +++ b/modes/solo_1.lua @@ -3,7 +3,7 @@ return{ env={ drop=60,lock=60, freshLimit=15, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, pauseLimit=true, load=function() diff --git a/modes/solo_2.lua b/modes/solo_2.lua index fd0d76c7..6c1e75e9 100644 --- a/modes/solo_2.lua +++ b/modes/solo_2.lua @@ -3,7 +3,7 @@ return{ env={ drop=60,lock=60, freshLimit=15, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, pauseLimit=true, load=function() diff --git a/modes/solo_3.lua b/modes/solo_3.lua index 276d33be..8cc3fbed 100644 --- a/modes/solo_3.lua +++ b/modes/solo_3.lua @@ -3,7 +3,7 @@ return{ env={ drop=60,lock=60, freshLimit=15, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, pauseLimit=true, load=function() diff --git a/modes/solo_4.lua b/modes/solo_4.lua index 9c65d847..d8a7bf67 100644 --- a/modes/solo_4.lua +++ b/modes/solo_4.lua @@ -3,7 +3,7 @@ return{ env={ drop=60,lock=60, freshLimit=15, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, pauseLimit=true, load=function() diff --git a/modes/solo_5.lua b/modes/solo_5.lua index f27788c5..97748f54 100644 --- a/modes/solo_5.lua +++ b/modes/solo_5.lua @@ -3,7 +3,7 @@ return{ env={ drop=60,lock=60, freshLimit=15, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, pauseLimit=true, load=function() diff --git a/modes/sprint_10.lua b/modes/sprint_10.lua index d1671cce..ab843e0c 100644 --- a/modes/sprint_10.lua +++ b/modes/sprint_10.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=10,dropPiece=PLY.reach_winCheck, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/sprint_100.lua b/modes/sprint_100.lua index cf85c266..e2c396d7 100644 --- a/modes/sprint_100.lua +++ b/modes/sprint_100.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=100,dropPiece=PLY.reach_winCheck, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/sprint_1000.lua b/modes/sprint_1000.lua index 31fb4592..0d598fcb 100644 --- a/modes/sprint_1000.lua +++ b/modes/sprint_1000.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=1000,dropPiece=PLY.reach_winCheck, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/sprint_20.lua b/modes/sprint_20.lua index 2c0f3cf2..5107036d 100644 --- a/modes/sprint_20.lua +++ b/modes/sprint_20.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=20,dropPiece=PLY.reach_winCheck, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/sprint_40.lua b/modes/sprint_40.lua index 207c1aba..b37595b1 100644 --- a/modes/sprint_40.lua +++ b/modes/sprint_40.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=40,dropPiece=PLY.reach_winCheck, - bg="game2",bgm="race", + bg="bg2",bgm="race", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/sprint_400.lua b/modes/sprint_400.lua index 5476d31a..0264c97d 100644 --- a/modes/sprint_400.lua +++ b/modes/sprint_400.lua @@ -5,7 +5,7 @@ return{ env={ drop=60,lock=60, target=400,dropPiece=PLY.reach_winCheck, - bg="game3",bgm="push", + bg="rainbow",bgm="push", }, load=function() PLY.newPlayer(1,340,15) diff --git a/modes/techmino49_easy.lua b/modes/techmino49_easy.lua index 7e4a7a6a..93cf2512 100644 --- a/modes/techmino49_easy.lua +++ b/modes/techmino49_easy.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/techmino49_hard.lua b/modes/techmino49_hard.lua index 2cd0660f..7abcaa71 100644 --- a/modes/techmino49_hard.lua +++ b/modes/techmino49_hard.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/techmino49_ultimate.lua b/modes/techmino49_ultimate.lua index 5b548aef..5150029a 100644 --- a/modes/techmino49_ultimate.lua +++ b/modes/techmino49_ultimate.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/techmino99_easy.lua b/modes/techmino99_easy.lua index b32ceb0a..3bcd885f 100644 --- a/modes/techmino99_easy.lua +++ b/modes/techmino99_easy.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/techmino99_hard.lua b/modes/techmino99_hard.lua index 941d3fff..c2543d48 100644 --- a/modes/techmino99_hard.lua +++ b/modes/techmino99_hard.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/techmino99_ultimate.lua b/modes/techmino99_ultimate.lua index 5812298c..78a7aff4 100644 --- a/modes/techmino99_ultimate.lua +++ b/modes/techmino99_ultimate.lua @@ -24,7 +24,7 @@ return{ Fkey=selectTarget, pushSpeed=2, freshLimit=15, - bg="game3",bgm="rockblock", + bg="rainbow",bgm="rockblock", }, load=function() royaleData={ diff --git a/modes/zen.lua b/modes/zen.lua index 8928a019..a8a5ffc1 100644 --- a/modes/zen.lua +++ b/modes/zen.lua @@ -4,7 +4,7 @@ return{ drop=120,lock=120, oncehold=false,target=200, dropPiece=PLY.reach_winCheck, - bg="game2",bgm="infinite", + bg="bg2",bgm="infinite", }, load=function() PLY.newPlayer(1,340,15) diff --git a/parts/list.lua b/parts/list.lua index 92668df5..45012af2 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -168,7 +168,7 @@ customRange={ target={10,20,40,100,200,500,1000,1e99}, freshLimit={0,8,15,1e99}, opponent={0,1,2,3,4,5,11,12,13,14,15,16}, - bg={"none","game1","game2","game3","aura","rgb","glow","matrix"}, + bg={"none","bg1","bg2","rainbow","aura","rgb","glow","matrix"}, bgm={"blank","way","race","newera","push","reason","infinite","secret7th","secret8th","rockblock"}, } local function T(s,t)return love.graphics.newText(setFont(s),t)end