diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 68c54df3..0c46e229 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -1,11 +1,11 @@ local langList={ - require("LANG/lang_zh"), - require("LANG/lang_zh2"), - require("LANG/lang_en"), - require("LANG/lang_fr"), - require("LANG/lang_sp"), - require("LANG/lang_symbol"), - require("LANG/lang_yygq"), + require("parts/language/lang_zh"), + require("parts/language/lang_zh2"), + require("parts/language/lang_en"), + require("parts/language/lang_fr"), + require("parts/language/lang_sp"), + require("parts/language/lang_symbol"), + require("parts/language/lang_yygq"), --Add new language file to LANG folder. Attention, new language won't show in-game when you add language } local publicText={ diff --git a/LANG/dict_en.lua b/parts/language/dict_en.lua similarity index 100% rename from LANG/dict_en.lua rename to parts/language/dict_en.lua diff --git a/LANG/dict_zh.lua b/parts/language/dict_zh.lua similarity index 100% rename from LANG/dict_zh.lua rename to parts/language/dict_zh.lua diff --git a/LANG/lang_en.lua b/parts/language/lang_en.lua similarity index 100% rename from LANG/lang_en.lua rename to parts/language/lang_en.lua diff --git a/LANG/lang_fr.lua b/parts/language/lang_fr.lua similarity index 100% rename from LANG/lang_fr.lua rename to parts/language/lang_fr.lua diff --git a/LANG/lang_sp.lua b/parts/language/lang_sp.lua similarity index 100% rename from LANG/lang_sp.lua rename to parts/language/lang_sp.lua diff --git a/LANG/lang_symbol.lua b/parts/language/lang_symbol.lua similarity index 100% rename from LANG/lang_symbol.lua rename to parts/language/lang_symbol.lua diff --git a/LANG/lang_yygq.lua b/parts/language/lang_yygq.lua similarity index 100% rename from LANG/lang_yygq.lua rename to parts/language/lang_yygq.lua diff --git a/LANG/lang_zh.lua b/parts/language/lang_zh.lua similarity index 100% rename from LANG/lang_zh.lua rename to parts/language/lang_zh.lua diff --git a/LANG/lang_zh2.lua b/parts/language/lang_zh2.lua similarity index 100% rename from LANG/lang_zh2.lua rename to parts/language/lang_zh2.lua diff --git a/modes/GM.lua b/parts/modes/GM.lua similarity index 100% rename from modes/GM.lua rename to parts/modes/GM.lua diff --git a/modes/PCbase.lua b/parts/modes/PCbase.lua similarity index 100% rename from modes/PCbase.lua rename to parts/modes/PCbase.lua diff --git a/modes/PClist.lua b/parts/modes/PClist.lua similarity index 100% rename from modes/PClist.lua rename to parts/modes/PClist.lua diff --git a/modes/attacker_hard.lua b/parts/modes/attacker_hard.lua similarity index 100% rename from modes/attacker_hard.lua rename to parts/modes/attacker_hard.lua diff --git a/modes/attacker_ultimate.lua b/parts/modes/attacker_ultimate.lua similarity index 100% rename from modes/attacker_ultimate.lua rename to parts/modes/attacker_ultimate.lua diff --git a/modes/bigbang.lua b/parts/modes/bigbang.lua similarity index 100% rename from modes/bigbang.lua rename to parts/modes/bigbang.lua diff --git a/modes/blind_easy.lua b/parts/modes/blind_easy.lua similarity index 100% rename from modes/blind_easy.lua rename to parts/modes/blind_easy.lua diff --git a/modes/blind_hard.lua b/parts/modes/blind_hard.lua similarity index 100% rename from modes/blind_hard.lua rename to parts/modes/blind_hard.lua diff --git a/modes/blind_lunatic.lua b/parts/modes/blind_lunatic.lua similarity index 100% rename from modes/blind_lunatic.lua rename to parts/modes/blind_lunatic.lua diff --git a/modes/blind_normal.lua b/parts/modes/blind_normal.lua similarity index 100% rename from modes/blind_normal.lua rename to parts/modes/blind_normal.lua diff --git a/modes/blind_ultimate.lua b/parts/modes/blind_ultimate.lua similarity index 100% rename from modes/blind_ultimate.lua rename to parts/modes/blind_ultimate.lua diff --git a/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua similarity index 100% rename from modes/blind_wtf.lua rename to parts/modes/blind_wtf.lua diff --git a/modes/c4wtrain_lunatic.lua b/parts/modes/c4wtrain_lunatic.lua similarity index 100% rename from modes/c4wtrain_lunatic.lua rename to parts/modes/c4wtrain_lunatic.lua diff --git a/modes/c4wtrain_normal.lua b/parts/modes/c4wtrain_normal.lua similarity index 100% rename from modes/c4wtrain_normal.lua rename to parts/modes/c4wtrain_normal.lua diff --git a/modes/classic_fast.lua b/parts/modes/classic_fast.lua similarity index 100% rename from modes/classic_fast.lua rename to parts/modes/classic_fast.lua diff --git a/modes/custom_clear.lua b/parts/modes/custom_clear.lua similarity index 100% rename from modes/custom_clear.lua rename to parts/modes/custom_clear.lua diff --git a/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua similarity index 100% rename from modes/custom_puzzle.lua rename to parts/modes/custom_puzzle.lua diff --git a/modes/defender_lunatic.lua b/parts/modes/defender_lunatic.lua similarity index 100% rename from modes/defender_lunatic.lua rename to parts/modes/defender_lunatic.lua diff --git a/modes/defender_normal.lua b/parts/modes/defender_normal.lua similarity index 100% rename from modes/defender_normal.lua rename to parts/modes/defender_normal.lua diff --git a/modes/dig_10.lua b/parts/modes/dig_10.lua similarity index 100% rename from modes/dig_10.lua rename to parts/modes/dig_10.lua diff --git a/modes/dig_100.lua b/parts/modes/dig_100.lua similarity index 100% rename from modes/dig_100.lua rename to parts/modes/dig_100.lua diff --git a/modes/dig_40.lua b/parts/modes/dig_40.lua similarity index 100% rename from modes/dig_40.lua rename to parts/modes/dig_40.lua diff --git a/modes/dig_400.lua b/parts/modes/dig_400.lua similarity index 100% rename from modes/dig_400.lua rename to parts/modes/dig_400.lua diff --git a/modes/dig_hard.lua b/parts/modes/dig_hard.lua similarity index 100% rename from modes/dig_hard.lua rename to parts/modes/dig_hard.lua diff --git a/modes/dig_ultimate.lua b/parts/modes/dig_ultimate.lua similarity index 100% rename from modes/dig_ultimate.lua rename to parts/modes/dig_ultimate.lua diff --git a/modes/drought_lunatic.lua b/parts/modes/drought_lunatic.lua similarity index 100% rename from modes/drought_lunatic.lua rename to parts/modes/drought_lunatic.lua diff --git a/modes/drought_normal.lua b/parts/modes/drought_normal.lua similarity index 100% rename from modes/drought_normal.lua rename to parts/modes/drought_normal.lua diff --git a/modes/infinite.lua b/parts/modes/infinite.lua similarity index 100% rename from modes/infinite.lua rename to parts/modes/infinite.lua diff --git a/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua similarity index 100% rename from modes/infinite_dig.lua rename to parts/modes/infinite_dig.lua diff --git a/modes/marathon_hard.lua b/parts/modes/marathon_hard.lua similarity index 100% rename from modes/marathon_hard.lua rename to parts/modes/marathon_hard.lua diff --git a/modes/marathon_normal.lua b/parts/modes/marathon_normal.lua similarity index 100% rename from modes/marathon_normal.lua rename to parts/modes/marathon_normal.lua diff --git a/modes/marathon_ultimate.lua b/parts/modes/marathon_ultimate.lua similarity index 100% rename from modes/marathon_ultimate.lua rename to parts/modes/marathon_ultimate.lua diff --git a/modes/master_advance.lua b/parts/modes/master_advance.lua similarity index 100% rename from modes/master_advance.lua rename to parts/modes/master_advance.lua diff --git a/modes/master_beginner.lua b/parts/modes/master_beginner.lua similarity index 100% rename from modes/master_beginner.lua rename to parts/modes/master_beginner.lua diff --git a/modes/master_final.lua b/parts/modes/master_final.lua similarity index 100% rename from modes/master_final.lua rename to parts/modes/master_final.lua diff --git a/modes/master_phantasm.lua b/parts/modes/master_phantasm.lua similarity index 100% rename from modes/master_phantasm.lua rename to parts/modes/master_phantasm.lua diff --git a/modes/pcchallenge_hard.lua b/parts/modes/pcchallenge_hard.lua similarity index 100% rename from modes/pcchallenge_hard.lua rename to parts/modes/pcchallenge_hard.lua diff --git a/modes/pcchallenge_lunatic.lua b/parts/modes/pcchallenge_lunatic.lua similarity index 100% rename from modes/pcchallenge_lunatic.lua rename to parts/modes/pcchallenge_lunatic.lua diff --git a/modes/pcchallenge_normal.lua b/parts/modes/pcchallenge_normal.lua similarity index 100% rename from modes/pcchallenge_normal.lua rename to parts/modes/pcchallenge_normal.lua diff --git a/modes/pctrain_lunatic.lua b/parts/modes/pctrain_lunatic.lua similarity index 95% rename from modes/pctrain_lunatic.lua rename to parts/modes/pctrain_lunatic.lua index 0bc34e76..82aa6356 100644 --- a/modes/pctrain_lunatic.lua +++ b/parts/modes/pctrain_lunatic.lua @@ -2,8 +2,8 @@ local int=math.floor local pc_drop={50,45,40,35,30,26,22,18,15,12} local pc_lock={55,50,45,40,36,32,30} local pc_fall={18,16,14,12,10,9,8,7,6} -local PCbase=require("modes/PCbase") -local PClist=require("modes/PClist") +local PCbase=require("parts/modes/PCbase") +local PClist=require("parts/modes/PClist") local PCtype={[0]=1,2,3,2,3} local function task_PC(P) diff --git a/modes/pctrain_normal.lua b/parts/modes/pctrain_normal.lua similarity index 94% rename from modes/pctrain_normal.lua rename to parts/modes/pctrain_normal.lua index ee96c911..fe343017 100644 --- a/modes/pctrain_normal.lua +++ b/parts/modes/pctrain_normal.lua @@ -1,5 +1,5 @@ -local PCbase=require("modes/PCbase") -local PClist=require("modes/PClist") +local PCbase=require("parts/modes/PCbase") +local PClist=require("parts/modes/PClist") local PCtype={ [0]=1,1,1,1,2, 1,1,1,1,3, diff --git a/modes/round_1.lua b/parts/modes/round_1.lua similarity index 100% rename from modes/round_1.lua rename to parts/modes/round_1.lua diff --git a/modes/round_2.lua b/parts/modes/round_2.lua similarity index 100% rename from modes/round_2.lua rename to parts/modes/round_2.lua diff --git a/modes/round_3.lua b/parts/modes/round_3.lua similarity index 100% rename from modes/round_3.lua rename to parts/modes/round_3.lua diff --git a/modes/round_4.lua b/parts/modes/round_4.lua similarity index 100% rename from modes/round_4.lua rename to parts/modes/round_4.lua diff --git a/modes/round_5.lua b/parts/modes/round_5.lua similarity index 100% rename from modes/round_5.lua rename to parts/modes/round_5.lua diff --git a/modes/solo_1.lua b/parts/modes/solo_1.lua similarity index 100% rename from modes/solo_1.lua rename to parts/modes/solo_1.lua diff --git a/modes/solo_2.lua b/parts/modes/solo_2.lua similarity index 100% rename from modes/solo_2.lua rename to parts/modes/solo_2.lua diff --git a/modes/solo_3.lua b/parts/modes/solo_3.lua similarity index 100% rename from modes/solo_3.lua rename to parts/modes/solo_3.lua diff --git a/modes/solo_4.lua b/parts/modes/solo_4.lua similarity index 100% rename from modes/solo_4.lua rename to parts/modes/solo_4.lua diff --git a/modes/solo_5.lua b/parts/modes/solo_5.lua similarity index 100% rename from modes/solo_5.lua rename to parts/modes/solo_5.lua diff --git a/modes/sprintFix.lua b/parts/modes/sprintFix.lua similarity index 100% rename from modes/sprintFix.lua rename to parts/modes/sprintFix.lua diff --git a/modes/sprintLock.lua b/parts/modes/sprintLock.lua similarity index 100% rename from modes/sprintLock.lua rename to parts/modes/sprintLock.lua diff --git a/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua similarity index 100% rename from modes/sprintMPH.lua rename to parts/modes/sprintMPH.lua diff --git a/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua similarity index 100% rename from modes/sprintPenta.lua rename to parts/modes/sprintPenta.lua diff --git a/modes/sprint_10.lua b/parts/modes/sprint_10.lua similarity index 100% rename from modes/sprint_10.lua rename to parts/modes/sprint_10.lua diff --git a/modes/sprint_100.lua b/parts/modes/sprint_100.lua similarity index 100% rename from modes/sprint_100.lua rename to parts/modes/sprint_100.lua diff --git a/modes/sprint_1000.lua b/parts/modes/sprint_1000.lua similarity index 100% rename from modes/sprint_1000.lua rename to parts/modes/sprint_1000.lua diff --git a/modes/sprint_20.lua b/parts/modes/sprint_20.lua similarity index 100% rename from modes/sprint_20.lua rename to parts/modes/sprint_20.lua diff --git a/modes/sprint_40.lua b/parts/modes/sprint_40.lua similarity index 100% rename from modes/sprint_40.lua rename to parts/modes/sprint_40.lua diff --git a/modes/sprint_400.lua b/parts/modes/sprint_400.lua similarity index 100% rename from modes/sprint_400.lua rename to parts/modes/sprint_400.lua diff --git a/modes/survivor_easy.lua b/parts/modes/survivor_easy.lua similarity index 100% rename from modes/survivor_easy.lua rename to parts/modes/survivor_easy.lua diff --git a/modes/survivor_hard.lua b/parts/modes/survivor_hard.lua similarity index 100% rename from modes/survivor_hard.lua rename to parts/modes/survivor_hard.lua diff --git a/modes/survivor_lunatic.lua b/parts/modes/survivor_lunatic.lua similarity index 100% rename from modes/survivor_lunatic.lua rename to parts/modes/survivor_lunatic.lua diff --git a/modes/survivor_normal.lua b/parts/modes/survivor_normal.lua similarity index 100% rename from modes/survivor_normal.lua rename to parts/modes/survivor_normal.lua diff --git a/modes/survivor_ultimate.lua b/parts/modes/survivor_ultimate.lua similarity index 100% rename from modes/survivor_ultimate.lua rename to parts/modes/survivor_ultimate.lua diff --git a/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua similarity index 100% rename from modes/tech_finesse.lua rename to parts/modes/tech_finesse.lua diff --git a/modes/tech_finesse2.lua b/parts/modes/tech_finesse2.lua similarity index 100% rename from modes/tech_finesse2.lua rename to parts/modes/tech_finesse2.lua diff --git a/modes/tech_hard.lua b/parts/modes/tech_hard.lua similarity index 100% rename from modes/tech_hard.lua rename to parts/modes/tech_hard.lua diff --git a/modes/tech_hard2.lua b/parts/modes/tech_hard2.lua similarity index 100% rename from modes/tech_hard2.lua rename to parts/modes/tech_hard2.lua diff --git a/modes/tech_lunatic.lua b/parts/modes/tech_lunatic.lua similarity index 100% rename from modes/tech_lunatic.lua rename to parts/modes/tech_lunatic.lua diff --git a/modes/tech_lunatic2.lua b/parts/modes/tech_lunatic2.lua similarity index 100% rename from modes/tech_lunatic2.lua rename to parts/modes/tech_lunatic2.lua diff --git a/modes/tech_normal.lua b/parts/modes/tech_normal.lua similarity index 100% rename from modes/tech_normal.lua rename to parts/modes/tech_normal.lua diff --git a/modes/tech_normal2.lua b/parts/modes/tech_normal2.lua similarity index 100% rename from modes/tech_normal2.lua rename to parts/modes/tech_normal2.lua diff --git a/modes/techmino49_easy.lua b/parts/modes/techmino49_easy.lua similarity index 100% rename from modes/techmino49_easy.lua rename to parts/modes/techmino49_easy.lua diff --git a/modes/techmino49_hard.lua b/parts/modes/techmino49_hard.lua similarity index 100% rename from modes/techmino49_hard.lua rename to parts/modes/techmino49_hard.lua diff --git a/modes/techmino49_ultimate.lua b/parts/modes/techmino49_ultimate.lua similarity index 100% rename from modes/techmino49_ultimate.lua rename to parts/modes/techmino49_ultimate.lua diff --git a/modes/techmino99_easy.lua b/parts/modes/techmino99_easy.lua similarity index 100% rename from modes/techmino99_easy.lua rename to parts/modes/techmino99_easy.lua diff --git a/modes/techmino99_hard.lua b/parts/modes/techmino99_hard.lua similarity index 100% rename from modes/techmino99_hard.lua rename to parts/modes/techmino99_hard.lua diff --git a/modes/techmino99_ultimate.lua b/parts/modes/techmino99_ultimate.lua similarity index 100% rename from modes/techmino99_ultimate.lua rename to parts/modes/techmino99_ultimate.lua diff --git a/modes/tsd_easy.lua b/parts/modes/tsd_easy.lua similarity index 100% rename from modes/tsd_easy.lua rename to parts/modes/tsd_easy.lua diff --git a/modes/tsd_hard.lua b/parts/modes/tsd_hard.lua similarity index 100% rename from modes/tsd_hard.lua rename to parts/modes/tsd_hard.lua diff --git a/modes/tsd_ultimate.lua b/parts/modes/tsd_ultimate.lua similarity index 100% rename from modes/tsd_ultimate.lua rename to parts/modes/tsd_ultimate.lua diff --git a/modes/ultra.lua b/parts/modes/ultra.lua similarity index 100% rename from modes/ultra.lua rename to parts/modes/ultra.lua diff --git a/modes/zen.lua b/parts/modes/zen.lua similarity index 100% rename from modes/zen.lua rename to parts/modes/zen.lua diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 5713508f..eba053fa 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -9,7 +9,7 @@ local find,sub=string.find,string.sub function sceneInit.dict() local location=({"zh","zh","en","en","en","en","zh"})[SETTING.lang] sceneTemp={ - dict=require("LANG/dict_"..location), + dict=require("parts/language/dict_"..location), input="", result={}, diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 4056543a..64e8e020 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -2,7 +2,7 @@ function sceneBack.lang() FILE.saveSetting() end -local function setLang(n)return function()LANG.set(n)SETTING.lang=n end end +local function setLang(n)return function()SETTING.lang=n LANG.set(n)end end WIDGET.init("lang",{ WIDGET.newButton({name="zh", x=200, y=100,w=200,h=120,font=45,code=setLang(1)}), WIDGET.newButton({name="zh2", x=420, y=100,w=200,h=120,font=45,code=setLang(2)}), diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index af9599e5..0a16da80 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -65,7 +65,7 @@ function Tmr.load() SKIN.loadOne(S.cur) elseif S.phase==7 then local m=MODES[S.cur]--Mode template - local M=require("modes/"..m.name)--Mode file + local M=require("parts/modes/"..m.name)--Mode file MODES[m.name],MODES[S.cur]=M for k,v in next,m do M[k]=v