diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index aedfcfc8..6281c307 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -528,7 +528,9 @@ do--function resetGameData(args) MES.new('error',"Wrong task type") end end - BG.set(GAME.modeEnv.bg) + + local bg=GAME.modeEnv.bg + BG.set(type(bg)=='string'and bg or type(bg)=='table'and bg[math.random(#bg)]) local bgm=GAME.modeEnv.bgm BGM.play(type(bgm)=='string'and bgm or type(bgm)=='table'and bgm[math.random(#bgm)]) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 23eb1e7e..370f600d 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -237,10 +237,6 @@ ROOMENV={ b2bKill=false, easyFresh=true, deepDrop=false, - - --Else - bg='blockfall', - bgm='battle', } SETTING={--Settings --Tuning diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index d3c709d1..b03f2d45 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -294,9 +294,6 @@ return{ holdCount="Hold", infHold="Infinite Hold", phyHold="In-place Hold", - - bg="Background", - bgm="Music", }, net_game={ ready="Ready", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 47ebdd51..7aef960b 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -260,9 +260,6 @@ return{ holdCount="Reserva", infHold="Reserva Inft.", phyHold="Reserva Limit.", - - bg="Fundo", - bgm="Música", }, net_game={ ready="Estoy Listo", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 46300fde..389c498d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -256,9 +256,6 @@ return{ holdCount="Réserve", infHold="Réserver une fois", -- phyHold="Physical Hold", - - bg="Arrière-plan", - bgm="Musique", }, net_game={ -- ready="Ready", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 001276d0..6fef6a75 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -284,9 +284,6 @@ return{ holdCount="Segurar", infHold="Segurar Infinito", -- phyHold="Physical Hold", - - bg="Fundo", - bgm="Música", }, net_game={ -- ready="Ready", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 6dbde262..8fd74912 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -294,9 +294,6 @@ return{ holdCount="Hold", infHold="无限Hold", phyHold="物理Hold", - - bg="背景", - bgm="音乐", }, net_game={ ready="准备", diff --git a/parts/modes/netBattle.lua b/parts/modes/netBattle.lua index 93ff5f63..b7506877 100644 --- a/parts/modes/netBattle.lua +++ b/parts/modes/netBattle.lua @@ -8,9 +8,11 @@ local function marginTask(P) end return{ color=COLOR.white, - env={}, + env={ + bg={'bg1','bg2','blackhole','blockfall','blockrain','blockspace','cubes','fan','flink','glow','lightning','matrix','rainbow','rainbow2','rgb','tunnel','welcome'}, + 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','warped','waterfall'}, + }, load=function() - TABLE.clear(GAME.modeEnv) for k,v in next,NET.roomState.roomData do GAME.modeEnv[k]=v end diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 0ce36ef2..cccd1b50 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -105,10 +105,6 @@ scene.widgetList={ WIDGET.newSlider{name="holdCount", x=120,y=1030,w=200,unit=6, disp=ROOMval("holdCount"),code=ROOMsto("holdCount")}, WIDGET.newSwitch{name="infHold", x=560,y=940, disp=ROOMval("infHold"),code=ROOMrev("infHold"),hideF=function()return ROOMENV.holdCount==0 end}, WIDGET.newSwitch{name="phyHold", x=560,y=1030, disp=ROOMval("phyHold"),code=ROOMrev("phyHold"),hideF=function()return ROOMENV.holdCount==0 end}, - - --BG & BGM - WIDGET.newSelector{name="bg", x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=ROOMval("bg"),code=function(i)ROOMENV.bg=i BG.set(i)end}, - WIDGET.newSelector{name="bgm", x=1120, y=1030,w=250,color='Y',list=BGM.getList(),disp=ROOMval("bgm"),code=function(i)ROOMENV.bgm=i BGM.play(i)end}, } return scene \ No newline at end of file