From 74622c377f07fa87a362b0a5b2e29de1e695099f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 8 Mar 2021 02:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E8=A1=8C=E5=88=87=E6=8D=A2=E8=8A=82?= =?UTF-8?q?=E6=97=A5=E4=BB=A3=E7=A0=81=E7=A7=BB=E5=85=A5cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/app_cmd.lua | 36 +++++++++++++++++++++++++++++++++++- parts/scenes/dict.lua | 34 ---------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/parts/scenes/app_cmd.lua b/parts/scenes/app_cmd.lua index 699e93ee..9c8e879d 100644 --- a/parts/scenes/app_cmd.lua +++ b/parts/scenes/app_cmd.lua @@ -295,7 +295,7 @@ function commands.unlockall(bool) log"Type: unlockall sure" end end -function commands.play(m)--marathon_bfmax can only played here +function commands.play(m)--marathon_bfmax can only entered through here if MODES[m]then loadGame(m) elseif m then @@ -304,6 +304,40 @@ function commands.play(m)--marathon_bfmax can only played here log"Usage: play [modeName]" end end +function commands.festival(name) + if name=="flag"then + BG.setDefault("none") + BGM.setDefault(false) + BG.set("none") + BGM.stop() + SFX.play("clear_4") + LOG.print("What are you looking for?",COLOR.G) + elseif name=="classic"then + FESTIVAL=false + BG.setDefault("space") + BGM.setDefault("blank") + BGM.play() + elseif name=="xmas"then + FESTIVAL="xMas" + BG.setDefault("snow") + BGM.setDefault("mXmas") + BGM.play() + elseif name=="sprfes"then + FESTIVAL="sprFes" + BG.setDefault("firework") + BGM.setDefault("spring festival") + BGM.play() + elseif name=="zday"then + FESTIVAL="zDay" + BG.setDefault("lanterns") + BGM.setDefault("overzero") + BGM.play() + elseif name then + log("No festival called "..name) + else + log"Usage: festival [festivalName]" + end +end diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 4cbdb5ba..ceb82846 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -55,40 +55,6 @@ local eggInput={ drp=goScene"app_dropper", calc=goScene"app_calc", cmd=goScene"app_cmd", - flag=function() - BG.setDefault("none") - BGM.setDefault(false) - BG.set("none") - BGM.stop() - SFX.play("clear_4") - LOG.print("What are you looking for?",COLOR.G) - end, - classic=function() - FESTIVAL=false - BG.setDefault("space") - BGM.setDefault("blank") - BGM.play() - end, - normal="classic", - xmas=function() - FESTIVAL="xMas" - BG.setDefault("snow") - BGM.setDefault("mXmas") - BGM.play() - end, - sprfes=function() - FESTIVAL="sprFes" - BG.setDefault("firework") - BGM.setDefault("spring festival") - BGM.play() - end, - spring="sprfes", - zday=function() - FESTIVAL="zDay" - BG.setDefault("lanterns") - BGM.setDefault("overzero") - BGM.play() - end, }for k,v in next,eggInput do if type(v)=="string"then eggInput[k]=eggInput[v]end end local function search() local input=inputBox.value