From 63d3f02abe1c43b46768ae9d1b050bb0751d2887 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 18 Apr 2021 23:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=89=E4=B8=AA=E4=B8=8D?= =?UTF-8?q?=E5=BD=93=E9=A2=9C=E8=89=B2=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/color.lua | 26 ++--- parts/globalTables.lua | 26 ++--- parts/language/lang_en.lua | 2 +- parts/language/lang_pt.lua | 4 +- parts/language/lang_zh.lua | 30 +++--- parts/list.lua | 4 +- parts/modes/bigbang.lua | 2 +- parts/modes/master_final.lua | 2 +- parts/modes/sprint_1000l.lua | 2 +- parts/modes/tech_finesse_f.lua | 2 +- parts/modes/ultra.lua | 2 +- parts/modes/zen.lua | 2 +- parts/patron.lua | 158 +++++++++++++++---------------- parts/player/draw.lua | 8 +- parts/scenes/app_15p.lua | 12 +-- parts/scenes/app_2048.lua | 8 +- parts/scenes/app_cannon.lua | 8 +- parts/scenes/app_cmd.lua | 34 +++---- parts/scenes/app_dropper.lua | 2 +- parts/scenes/app_dtw.lua | 2 +- parts/scenes/app_tap.lua | 2 +- parts/scenes/app_ten.lua | 2 +- parts/scenes/customGame.lua | 8 +- parts/scenes/custom_advance.lua | 2 +- parts/scenes/custom_field.lua | 16 ++-- parts/scenes/custom_mission.lua | 4 +- parts/scenes/custom_sequence.lua | 46 ++++----- parts/scenes/depause.lua | 2 +- parts/scenes/load.lua | 2 +- parts/scenes/main.lua | 2 +- parts/scenes/net_game.lua | 2 +- parts/scenes/pause.lua | 4 +- parts/scenes/test.lua | 8 +- 33 files changed, 218 insertions(+), 218 deletions(-) diff --git a/Zframework/color.lua b/Zframework/color.lua index 1e05dff0..3456562c 100644 --- a/Zframework/color.lua +++ b/Zframework/color.lua @@ -3,10 +3,10 @@ local COLOR={ fire= {1.0, 0.4, 0.0}, orange= {1.0, 0.6, 0.0}, yellow= {1.0, 1.0, 0.0}, - lame= {0.7, 1.0, 0.0}, + lime= {0.7, 1.0, 0.0}, grass= {0.5, 1.0, 0.0}, green= {0.0, 1.0, 0.0}, - water= {0.0, 1.0, 0.6}, + aqua= {0.0, 1.0, 0.6}, cyan= {0.0, 1.0, 1.0}, sky= {0.0, 0.7, 1.0}, sea= {0.0, 0.4, 1.0}, @@ -20,10 +20,10 @@ local COLOR={ lFire= {1.0, 0.7, 0.5}, lOrange= {1.0, 0.8, 0.3}, lYellow= {1.0, 1.0, 0.5}, - lLame= {0.8, 1.0, 0.4}, + lLime= {0.8, 1.0, 0.4}, lGrass= {0.6, 1.0, 0.4}, lGreen= {0.5, 1.0, 0.5}, - lWater= {0.4, 1.0, 0.7}, + lAqua= {0.4, 1.0, 0.7}, lCyan= {0.5, 1.0, 1.0}, lSky= {0.5, 0.8, 1.0}, lSea= {0.4, 0.7, 1.0}, @@ -37,10 +37,10 @@ local COLOR={ dFire= {0.6, 0.3, 0.0}, dOrange= {0.6, 0.4, 0.0}, dYellow= {0.6, 0.6, 0.0}, - dLame= {0.5, 0.6, 0.0}, + dLime= {0.5, 0.6, 0.0}, dGrass= {0.3, 0.6, 0.0}, dGreen= {0.0, 0.6, 0.0}, - dWater= {0.0, 0.6, 0.4}, + dAqua= {0.0, 0.6, 0.4}, dCyan= {0.0, 0.6, 0.6}, dSky= {0.0, 0.4, 0.6}, dSea= {0.0, 0.2, 0.6}, @@ -51,9 +51,9 @@ local COLOR={ dPink= {0.6, 0.0, 0.3}, black= {0.0, 0.0, 0.0}, - dGrey= {0.3, 0.3, 0.3}, - grey= {0.6, 0.6, 0.6}, - lGrey= {0.8, 0.8, 0.8}, + dGray= {0.3, 0.3, 0.3}, + gray= {0.6, 0.6, 0.6}, + lGray= {0.8, 0.8, 0.8}, white= {1.0, 1.0, 1.0}, } local map={ @@ -63,20 +63,20 @@ local map={ W="white", }for k,v in next,map do COLOR[k]=COLOR[v]end -local list_norm={"red","fire","orange","yellow","lame","grass","green","water","cyan","sky","sea","blue","purple","grape","magenta","pink"} +local list_norm={"red","fire","orange","yellow","i","grass","green","aqua","cyan","sky","sea","blue","purple","grape","magenta","pink"} local len_list_norm=#list_norm local rnd=math.random function COLOR.random_norm() return COLOR[list_norm[rnd(len_list_norm)]] end -local list_bright={"lRed","lFire","lOrange","lYellow","lLame","lGrass","lGreen","lWater","lCyan","lSky","lSea","lBlue","lPurple","lGrape","lMagenta","lPink"} +local list_bright={"lRed","lFire","lOrange","lYellow","lLime","lGrass","lGreen","lAqua","lCyan","lSky","lSea","lBlue","lPurple","lGrape","lMagenta","lPink"} local len_list_bright=#list_bright function COLOR.random_bright() return COLOR[list_bright[rnd(len_list_bright)]] end -local list_dark={"dRed","dFire","dOrange","dYellow","dLame","dGrass","dGreen","dWater","dCyan","dSky","dSea","dBlue","dPurple","dGrape","dMagenta","dPink"} +local list_dark={"dRed","dFire","dOrange","dYellow","dLime","dGrass","dGreen","dAqua","dCyan","dSky","dSea","dBlue","dPurple","dGrape","dMagenta","dPink"} local len_list_dark=#list_dark function COLOR.random_dark() return COLOR[list_dark[rnd(len_list_dark)]] @@ -101,7 +101,7 @@ function COLOR.rainbow_dark(phase) sin(phase+2.0944)*.2+.4, sin(phase-2.0944)*.2+.4 end -function COLOR.rainbow_grey(phase) +function COLOR.rainbow_gray(phase) return sin(phase)*.16+.5, sin(phase+2.0944)*.16+.5, diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 36c305d7..4ee9d2ec 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -15,12 +15,12 @@ MODOPT={--Mod options unranked=true, }, {no=2,id="FL",name="hideNext", - key="e",x=320,y=230,color="water", + key="e",x=320,y=230,color="aqua", list={1,2,3,4,5}, func=function(P,O)P.gameEnv.nextStartPos=O +1 end, }, {no=3,id="IH",name="infHold", - key="r",x=440,y=230,color="water", + key="r",x=440,y=230,color="aqua", func=function(P)P.gameEnv.infHold=true end, unranked=true, }, @@ -91,7 +91,7 @@ MODOPT={--Mod options }, {no=16,id="TL",name="tele", - key="z",x=200,y=470,color="lGrey", + key="z",x=200,y=470,color="lGray", func=function(P) P.gameEnv.das,P.gameEnv.arr=0,0 P.gameEnv.sddas,P.gameEnv.sdarr=0,0 @@ -99,7 +99,7 @@ MODOPT={--Mod options unranked=true, }, {no=17,id="FX",name="noRotation", - key="x",x=320,y=470,color="lGrey", + key="x",x=320,y=470,color="lGray", func=function(P) disableKey(P,3) disableKey(P,4) @@ -108,7 +108,7 @@ MODOPT={--Mod options unranked=true, }, {no=18,id="GL",name="noMove", - key="c",x=440,y=470,color="lGrey", + key="c",x=440,y=470,color="lGray", func=function(P) disableKey(P,1)disableKey(P,2) disableKey(P,11)disableKey(P,12) @@ -331,8 +331,8 @@ keyMap=FILE.load("conf/key")or{--Key setting }, } VK_org=FILE.load("conf/virtualkey")or{--Virtualkey layout, refresh all VKs' position with this before each game - {ava=true, x=80, y=720-200, r=80,color=COLOR.lame},--moveLeft - {ava=true, x=320, y=720-200, r=80,color=COLOR.lame},--moveRight + {ava=true, x=80, y=720-200, r=80,color=COLOR.lime},--moveLeft + {ava=true, x=320, y=720-200, r=80,color=COLOR.lime},--moveRight {ava=true, x=1280-80, y=720-200, r=80,color=COLOR.red},--rotRight {ava=true, x=1280-200, y=720-80, r=80,color=COLOR.orange},--rotLeft {ava=true, x=1280-200, y=720-320, r=80,color=COLOR.magenta},--rot180 @@ -341,16 +341,16 @@ VK_org=FILE.load("conf/virtualkey")or{--Virtualkey layout, refresh all VKs' posi {ava=true, x=1280-320, y=720-200, r=80,color=COLOR.yellow},--hold {ava=true, x=1280-80, y=280, r=80,color=COLOR.lRed},--func1 {ava=true, x=80, y=280, r=80,color=COLOR.lMagenta},--func2 - {ava=false, x=100, y=50, r=80,color=COLOR.water},--insLeft - {ava=false, x=200, y=50, r=80,color=COLOR.water},--insRight + {ava=false, x=100, y=50, r=80,color=COLOR.aqua},--insLeft + {ava=false, x=200, y=50, r=80,color=COLOR.aqua},--insRight {ava=false, x=300, y=50, r=80,color={COLOR.rainbow(3.5)}},--insDown {ava=false, x=400, y=50, r=80,color={COLOR.rainbow(3.3)}},--down1 {ava=false, x=500, y=50, r=80,color={COLOR.rainbow(3.1)}},--down4 {ava=false, x=600, y=50, r=80,color={COLOR.rainbow(2.9)}},--down10 - {ava=false, x=700, y=50, r=80,color=COLOR.lLame},--dropLeft - {ava=false, x=800, y=50, r=80,color=COLOR.lLame},--dropRight - {ava=false, x=900, y=50, r=80,color=COLOR.lWater},--addToLeft - {ava=false, x=1000, y=50, r=80,color=COLOR.lWater},--addToRight + {ava=false, x=700, y=50, r=80,color=COLOR.lLime},--dropLeft + {ava=false, x=800, y=50, r=80,color=COLOR.lLime},--dropRight + {ava=false, x=900, y=50, r=80,color=COLOR.laqua},--addToLeft + {ava=false, x=1000, y=50, r=80,color=COLOR.laqua},--addToRight } virtualkey={}for i=1,#VK_org do virtualkey[i]={}end--In-game virtualkey layout REPLAY=FILE.load("conf/replay")or{} \ No newline at end of file diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 82304989..37b11337 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -864,7 +864,7 @@ return{ {c.fire,"Also try Tetr.js"}, {c.fire,"Also try Tetralegends"}, {c.grape,"T-spin!"}, - {c.grey,"REGRET!!"}, + {c.gray,"REGRET!!"}, {c.lR,"Z ",c.lG,"S ",c.lSea,"J ",c.lOrange,"L ",c.lGrape,"T ",c.lY,"O ",c.lC,"I"}, {c.lY,"COOL!!"}, {c.R,"\"DMCA abusing\""}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 2a0f3629..7858b18f 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -860,8 +860,8 @@ return{ {COLOR.fire,"Tente também Tetr.js"}, {COLOR.fire,"Tente também Tetralegends"}, {COLOR.grape,"T-spin!"}, - {COLOR.grey,"暫定段位:9"}, - {COLOR.grey,"REGRET!!"}, + {COLOR.gray,"暫定段位:9"}, + {COLOR.gray,"REGRET!!"}, {COLOR.lR,"Z ",COLOR.lG,"S ",COLOR.lSea,"J ",COLOR.lOrange,"L ",COLOR.lGrape,"T ",COLOR.lY,"O ",COLOR.lC,"I"}, {COLOR.lY,"LEGAL!!"}, {COLOR.R,"\"DMCA abusing\""}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 6e5ed217..ffc9104e 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -1013,6 +1013,7 @@ return{ "Z酱累了,Z酱不想更新", "Z酱只是个写代码的,懂什么方块", "Z块等身抱枕来一个(x", + {c.aqua,"AQUA"}, {c.B,"BLUE"}, {c.C,""}, {c.C,"15puzzle好玩!"}, @@ -1043,23 +1044,24 @@ return{ {c.G,"快捷键: Ctrl+Tab=切换标签页"}, {c.G,"快捷键: Ctrl+W=关闭当前标签页"}, {c.G,"快捷键: shift+del=永久删除文件 (技术人员别杠)"}, + {c.G,"GREEN"}, {c.grape,"GRAPE"}, {c.grape,"T-spin!"}, {c.grass,"GRASS"}, - {c.grey,"感谢Phigros提供部分tip模板("}, - {c.grey,"暂定段位:9"}, - {c.grey,"REGRET!!"}, - {c.lame,"LAME"}, + {c.gray,"感谢Phigros提供部分tip模板("}, + {c.gray,"暂定段位:9"}, + {c.gray,"REGRET!!"}, + {c.lime,"LIME"}, {c.lC,"26连T2来一个?"}, {c.lC,"Xspin",c.W,"是啥"}, {c.lGrape,"Naki",c.W," 可爱!"}, - {c.lGrey,"腱鞘炎警告"}, - {c.lGrey,"看起来是个计算器,其实…"}, - {c.lGrey,"没学过编曲,音乐都是自己瞎写的,觉得不好听就去设置关了吧"}, - {c.lGrey,"秘密数字:626"}, - {c.lGrey,"你有一个好"}, - {c.lGrey,"STSD必死"}, - {c.lGrey,"Techmino没有抽卡没有氪金,太良心了"}, + {c.lGray,"腱鞘炎警告"}, + {c.lGray,"看起来是个计算器,其实…"}, + {c.lGray,"没学过编曲,音乐都是自己瞎写的,觉得不好听就去设置关了吧"}, + {c.lGray,"秘密数字:626"}, + {c.lGray,"你有一个好"}, + {c.lGray,"STSD必死"}, + {c.lGray,"Techmino没有抽卡没有氪金,太良心了"}, {c.lR,"Z ",c.lG,"S ",c.lSea,"J ",c.lOrange,"L ",c.lGrape,"T ",c.lY,"O ",c.lC,"I"}, {c.lSea,"茶娘",c.W," 可爱!"}, {c.lY,"COOL!!"}, @@ -1085,16 +1087,14 @@ return{ {c.sky,"Lua",c.W,"天下第一"}, {c.sky,"SKY"}, {c.W,"1, 2, ",c.C,"⑨",c.W,"!!!!!"}, - {c.W,"效率药水",c.grey," 效率提升 (8:00)"}, - {c.W,"协调药水",c.grey," MD减少 II(1:30)"}, - {c.water,"WATER"}, + {c.W,"效率药水",c.gray," 效率提升 (8:00)"}, + {c.W,"协调药水",c.gray," MD减少 II(1:30)"}, {c.Y,"暂定段位:GM"}, {c.Y,"暂定段位:M"}, {c.Y,"暂定段位:MK"}, {c.Y,"暂定段位:MM"}, {c.Y,"暂定段位:MO"}, {c.Y,"暂定段位:MV"}, - {c.Y,"GREEN"}, {c.Y,"Miya",c.W," 可爱!"}, {c.Y,"O-spin Triple!"}, {c.Y,"YELLOW"}, diff --git a/parts/list.lua b/parts/list.lua index 35d22c99..23c92c35 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -302,7 +302,7 @@ rankColor={ } minoColor={ - COLOR.red, COLOR.fire, COLOR.orange, COLOR.yellow, COLOR.lame, COLOR.grass, COLOR.green, COLOR.water, + COLOR.red, COLOR.fire, COLOR.orange, COLOR.yellow, COLOR.lime, COLOR.grass, COLOR.green, COLOR.aqua, COLOR.cyan, COLOR.sky, COLOR.sea, COLOR.blue, COLOR.purple, COLOR.grape, COLOR.magenta, COLOR.pink, - COLOR.dGrey,COLOR.black,COLOR.lYellow, COLOR.grey, COLOR.lGrey, COLOR.dPurple, COLOR.dRed, COLOR.dGreen, + COLOR.dGray,COLOR.black,COLOR.lYellow, COLOR.gray, COLOR.lGray, COLOR.dPurple, COLOR.dRed, COLOR.dGreen, } \ No newline at end of file diff --git a/parts/modes/bigbang.lua b/parts/modes/bigbang.lua index bb697a37..a318f911 100644 --- a/parts/modes/bigbang.lua +++ b/parts/modes/bigbang.lua @@ -1,6 +1,6 @@ local format=string.format return{ - color=COLOR.lGrey, + color=COLOR.lGray, env={ drop=1e99,lock=1e99, holdCount=0, diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 8715ad59..c777780c 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -40,7 +40,7 @@ local function score(P) end return{ - color=COLOR.lGrey, + color=COLOR.lGray, env={ noTele=true, das=5,arr=1, diff --git a/parts/modes/sprint_1000l.lua b/parts/modes/sprint_1000l.lua index 2a645188..12620407 100644 --- a/parts/modes/sprint_1000l.lua +++ b/parts/modes/sprint_1000l.lua @@ -1,5 +1,5 @@ return{ - color=COLOR.lGrey, + color=COLOR.lGray, env={ drop=60,lock=60, dropPiece=function(P)if P.stat.row>=1000 then P:win("finish")end end, bg="rainbow",bgm="push", diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index 71c4cbaf..355d61f8 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -13,7 +13,7 @@ local function tech_check_hard(P) end return{ - color=COLOR.grey, + color=COLOR.gray, env={ arr=0, drop=1e99,lock=60, diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index 815e06cc..ef36ecf9 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -1,7 +1,7 @@ local gc=love.graphics local warnTime={60,90,105,115,116,117,118,119,120} return{ - color=COLOR.lGrey, + color=COLOR.lGray, env={ noTele=true, minarr=1,minsdarr=1, diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index aab2917d..0de30483 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -1,5 +1,5 @@ return{ - color=COLOR.lGrey, + color=COLOR.lGray, env={ drop=120,lock=120, infHold=true, diff --git a/parts/patron.lua b/parts/patron.lua index 00380ce4..e20aab4f 100644 --- a/parts/patron.lua +++ b/parts/patron.lua @@ -110,337 +110,337 @@ return{ { name="八零哥", font=25, - color=C.grey, + color=C.gray, }, { name="蕴空之灵", font=25, - color=C.grey, + color=C.gray, }, { name="gggf127", font=25, - color=C.grey, + color=C.gray, }, { name="solainu", font=25, - color=C.grey, + color=C.gray, }, { name="ThTsOd", font=25, - color=C.grey, + color=C.gray, }, { name="Fireboos", font=25, - color=C.grey, + color=C.gray, }, { name="星月千雪", font=25, - color=C.grey, + color=C.gray, }, { name="10元", font=25, - color=C.grey, + color=C.gray, }, { name="立斐", font=25, - color=C.grey, + color=C.gray, }, { name="Deep_Sea", font=25, - color=C.grey, + color=C.gray, }, { name="时雪", font=25, - color=C.grey, + color=C.gray, }, { name="yyangdid", font=25, - color=C.grey, + color=C.gray, }, { name="sfqr", font=25, - color=C.grey, + color=C.gray, }, { name="心痕", font=25, - color=C.grey, + color=C.gray, }, { name="Sasoric", font=25, - color=C.grey, + color=C.gray, }, { name="夏小亚", font=25, - color=C.grey, + color=C.gray, }, { name="仁参", font=25, - color=C.grey, + color=C.gray, }, { name="乐↗乐↘", font=25, - color=C.grey, + color=C.gray, }, { name="喜欢c4w的ztcjoin", font=25, - color=C.grey, + color=C.gray, }, { name="面包", font=25, - color=C.grey, + color=C.gray, }, { name="蠢熏", font=25, - color=C.grey, + color=C.gray, }, { name="潘一栗", font=25, - color=C.grey, + color=C.gray, }, { name="Lied", font=25, - color=C.grey, + color=C.gray, }, { name="星街书婉", font=25, - color=C.grey, + color=C.gray, }, { name="祝西", font=25, - color=C.grey, + color=C.gray, }, { name="829", font=25, - color=C.grey, + color=C.gray, }, { name="e m*12", font=25, - color=C.grey, + color=C.gray, }, { name="我永远爱白银诺艾尔(鹏", font=25, - color=C.grey, + color=C.gray, }, { name="PCX", font=25, - color=C.grey, + color=C.gray, }, { name="kagura77", font=25, - color=C.grey, + color=C.gray, }, { name="呆喂", font=25, - color=C.grey, + color=C.gray, }, { name="GlowingEmbers", font=25, - color=C.grey, + color=C.gray, }, { name="轩辕辚", font=25, - color=C.grey, + color=C.gray, }, { name="HimuroAki", font=25, - color=C.grey, + color=C.gray, }, { name="TCV100", font=25, - color=C.grey, + color=C.gray, }, { name="tech有养成系统了@7065", font=25, - color=C.grey, + color=C.gray, }, { name="HAGE KANOBU", font=25, - color=C.grey, + color=C.gray, }, { name="闪电和拐棍", font=25, - color=C.grey, + color=C.gray, }, { name="葡萄味的曼妥思", font=25, - color=C.grey, + color=C.gray, }, { name="蓝绿", font=25, - color=C.grey, + color=C.gray, }, { name="天生的魔法师", font=25, - color=C.grey, + color=C.gray, }, { name="琳雨空", font=25, - color=C.grey, + color=C.gray, }, { name="T8779.易缄", font=25, - color=C.grey, + color=C.gray, }, { name="诗情画意", font=25, - color=C.grey, + color=C.gray, }, { name="星姐阿夸双推Man暗炎", font=25, - color=C.grey, + color=C.gray, }, { name="[*炎]", font=25, - color=C.grey, + color=C.gray, }, { name="[*Y]", font=25, - color=C.grey, + color=C.gray, }, { name="aaa222", font=25, - color=C.grey, + color=C.gray, }, { name="[**城]", font=25, - color=C.grey, + color=C.gray, }, { name="cnDD", font=25, - color=C.grey, + color=C.gray, }, { name="红桃老给", font=25, - color=C.grey, + color=C.gray, }, { name="昭庭玲秋", font=25, - color=C.grey, + color=C.gray, }, { name="旋树墩", font=25, - color=C.grey, + color=C.gray, }, { name="火花工作室", font=25, - color=C.grey, + color=C.gray, }, { name="Cosine", font=25, - color=C.grey, + color=C.gray, }, { name="沁音的芝麻王", font=25, - color=C.grey, + color=C.gray, }, { name="SuperJH", font=25, - color=C.grey, + color=C.gray, }, { name="天上_飞", font=25, - color=C.grey, + color=C.gray, }, { name="uiro", font=25, - color=C.grey, + color=C.gray, }, { name="宇酱", font=25, - color=C.grey, + color=C.gray, }, { name="[W*N]", font=25, - color=C.grey, + color=C.gray, }, { name="[Z*.]", font=25, - color=C.grey, + color=C.gray, }, { name="[*之]", font=25, - color=C.grey, + color=C.gray, }, { name="白衣", font=25, - color=C.grey, + color=C.gray, }, { name="给虫", font=25, - color=C.grey, + color=C.gray, }, { name="我永远喜欢樱花小姐", font=25, - color=C.grey, + color=C.gray, }, { name="xb", font=25, - color=C.grey, + color=C.gray, }, { name="flaribbit", @@ -450,47 +450,47 @@ return{ { name="工口发动机", font=25, - color=C.grey, + color=C.gray, }, { name="金海星", font=25, - color=C.grey, + color=C.gray, }, { name="tatianyi", font=25, - color=C.grey, + color=C.gray, }, { name="[*瞳]", font=25, - color=C.grey, + color=C.gray, }, { name="彼方云城", font=25, - color=C.grey, + color=C.gray, }, { name="pm250", font=25, - color=C.grey, + color=C.gray, }, { name="nanaya", font=25, - color=C.grey, + color=C.gray, }, { name="黑红蓝白", font=25, - color=C.grey, + color=C.gray, }, { name="细胞", font=25, - color=C.grey, + color=C.gray, }, { name="流光梦", @@ -500,16 +500,16 @@ return{ { name="George2003", font=25, - color=C.grey, + color=C.gray, }, { name="竹月可安", font=25, - color=C.grey, + color=C.gray, }, { name="T7887库德里尔", font=25, - color=C.grey, + color=C.gray, }, } \ No newline at end of file diff --git a/parts/player/draw.lua b/parts/player/draw.lua index f06cd03c..16b13306 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -218,8 +218,8 @@ local function drawBoarders(P) gc_rectangle("line",-16,-3,15,604)--B2b bar boarder end local attackColor={ - {COLOR.dGrey,COLOR.white}, - {COLOR.grey,COLOR.white}, + {COLOR.dGray,COLOR.white}, + {COLOR.gray,COLOR.white}, {COLOR.lPurple,COLOR.white}, {COLOR.lRed,COLOR.white}, {COLOR.dGreen,COLOR.cyan}, @@ -650,7 +650,7 @@ function draw.norm(P) gc_setStencilTest("equal",1) gc_setLineWidth(20) for i=0,24 do - gc_setColor(COLOR.rainbow_grey(t*.626+i*.1)) + gc_setColor(COLOR.rainbow_gray(t*.626+i*.1)) gc_line(20*i-190,-2,20*i+10,602) end gc_setStencilTest() @@ -800,7 +800,7 @@ function draw.norm_remote(P) gc_setStencilTest("equal",1) gc_setLineWidth(20) for i=0,24 do - gc_setColor(COLOR.rainbow_grey(t*.626+i*.1)) + gc_setColor(COLOR.rainbow_gray(t*.626+i*.1)) gc_line(20*i-190,-2,20*i+10,602) end gc_setStencilTest() diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index d8b73b98..2906e68c 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -223,7 +223,7 @@ local frontColor={ COLOR.white,COLOR.white,COLOR.white,COLOR.white, COLOR.white,COLOR.white,COLOR.white,COLOR.white, COLOR.white,COLOR.white,COLOR.white,COLOR.white, - },--Grey + },--Gray { COLOR.white,COLOR.white,COLOR.white,COLOR.white, COLOR.white,COLOR.white,COLOR.white,COLOR.white, @@ -251,11 +251,11 @@ local backColor={ COLOR.dGreen,COLOR.dYellow,COLOR.dPurple,COLOR.dPurple, },--Colored(row) { - COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey, - COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey, - COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey, - COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey, - },--Grey + COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray, + COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray, + COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray, + COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray, + },--Gray { COLOR.black,COLOR.black,COLOR.black,COLOR.black, COLOR.black,COLOR.black,COLOR.black,COLOR.black, diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index b80d682d..3fa5abe7 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -370,7 +370,7 @@ function scene.draw() "Y" )or( repeater.seq[i]==repeater.last[i]and - "grey"or + "gray"or "white" ) ]) @@ -414,7 +414,7 @@ function scene.draw() mStr(tileName[N],320+(x-.5)*160,40+(y-.5)*160-fontSize*.7) end else - setColor(COLOR.grey) + setColor(COLOR.gray) rectangle("fill",x*160+163,y*160-117,154,154,15) end else @@ -489,8 +489,8 @@ scene.widgetList={ WIDGET.newKey{name="left", x=55,y=560,w=100,fText="←",font=50,color="yellow",code=pressKey"left",hide=function()return tapControl end}, WIDGET.newKey{name="right", x=255,y=560,w=100,fText="→",font=50,color="yellow",code=pressKey"right",hide=function()return tapControl end}, WIDGET.newKey{name="skip", x=155,y=400,w=100,font=20,color="yellow",code=pressKey"space",hide=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, - WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="",color="grey",code=pressKey"1",hide=function()return state==2 end}, - WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="",color="grey",code=pressKey"2",hide=function()return state==2 end}, + WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="",color="gray",code=pressKey"1",hide=function()return state==2 end}, + WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="",color="gray",code=pressKey"2",hide=function()return state==2 end}, WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!",color="green",code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end}, WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!",color="green",code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 38ce5a79..4ec26a0d 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -82,16 +82,16 @@ end local scoreColor={ "white",--0 - "water",--20 + "aqua",--20 "sky",--40 "blue",--60 "grape",--80 "pink",--100 - "red","fire","orange","yellow","lWater",--200 + "red","fire","orange","yellow","lAqua",--200 "lSky","lBlue","lGrape","lPink","lRed",--300 - "lFire","lOrange","lYellow","dWater","dSky",--400 + "lFire","lOrange","lYellow","dAqua","dSky",--400 "dBlue","dGrape","dPink","dRed","dFire",--500 - "dYellow","lGrey","grey","dGrey",--before 600, black after + "dYellow","lGray","gray","dGray",--before 600, black after } function scene.draw() --Spawn area diff --git a/parts/scenes/app_cmd.lua b/parts/scenes/app_cmd.lua index 81be3d9f..2f26efd3 100644 --- a/parts/scenes/app_cmd.lua +++ b/parts/scenes/app_cmd.lua @@ -275,7 +275,7 @@ do--commands.help(arg) log{C.lPink,"Page ",C.lG,page,C.lPink," of ",C.lG,maxPage} for i=pageSize*(page-1)+1,math.min(pageSize*page,#command_help_list)do local cmd=command_help_list[i] - log{C.W,cmd,C.grey," "..command_help_messages[cmd].description} + log{C.W,cmd,C.gray," "..command_help_messages[cmd].description} end else log{C.R,"Invalid page number. Must be between 1 and "..maxPage.." (inclusive)."} @@ -306,7 +306,7 @@ function commands.print(name) log{C.R,"No file called '"..name.."'"} end else - log{C.water,"Usage: print [filename]"} + log{C.aqua,"Usage: print [filename]"} end end function commands.url(url) @@ -316,7 +316,7 @@ function commands.url(url) log{C.R,"[ERR] ",C.W,err} end else - log{C.water,"Usage: url [url]"} + log{C.aqua,"Usage: url [url]"} end end local function tree(path,name,depth) @@ -368,7 +368,7 @@ function commands.del(name) log{C.R,"No file called '"..name.."'"} end else - log{C.water,"Usage: del [filename]"} + log{C.aqua,"Usage: del [filename]"} end end commands.exit=backScene @@ -384,7 +384,7 @@ function commands.fn(n) return end end - log{C.water,"Usage: fn [1~12]"} + log{C.aqua,"Usage: fn [1~12]"} end function commands.scrinfo() for _,v in next,SCR.info()do @@ -396,7 +396,7 @@ function commands.wireframe(bool) gc.setWireframe(bool=="true") log("Wireframe: "..(gc.isWireframe()and"on"or"off")) else - log{C.water,"Usage: wireframe [true|false]"} + log{C.aqua,"Usage: wireframe [true|false]"} end end function commands.gammacorrect(bool) @@ -404,7 +404,7 @@ function commands.gammacorrect(bool) love._setGammaCorrect(bool=="true") log("GammaCorrect: "..(gc.isGammaCorrect()and"on"or"off")) else - log{C.water,"Usage: gammacorrect [true|false]"} + log{C.aqua,"Usage: gammacorrect [true|false]"} end end function commands.rmwtm(pw) @@ -413,7 +413,7 @@ function commands.rmwtm(pw) log{C.lC,"\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100"} SFX.play("clear") else - log{C.water,"Usage: rmwtm [password]"} + log{C.aqua,"Usage: rmwtm [password]"} end end function commands.unlockall(bool) @@ -437,7 +437,7 @@ function commands.play(m)--marathon_bfmax can only entered through here elseif m~=""then log{C.R,"No mode called "..m} else - log{C.water,"Usage: play [modeName]"} + log{C.aqua,"Usage: play [modeName]"} end end function commands.playbgm(bgm) @@ -452,7 +452,7 @@ function commands.playbgm(bgm) log("Already playing: "..bgm) end else - log{C.water,"Usage: playbgm [bgmName]"} + log{C.aqua,"Usage: playbgm [bgmName]"} end end function commands.stopbgm() @@ -470,7 +470,7 @@ function commands.setbg(name) log("Background already set to '"..name.."'") end else - log{C.water,"Usage: setbg [bgName]"} + log{C.aqua,"Usage: setbg [bgName]"} end end function commands.theme(name) @@ -481,7 +481,7 @@ function commands.theme(name) log("No theme called "..name) end else - log{C.water,"Usage: theme [themeName]"} + log{C.aqua,"Usage: theme [themeName]"} end end function commands.demo() @@ -519,11 +519,11 @@ do--commands.applet(name) return end end - log{C.water,"No this applet"} + log{C.aqua,"No this applet"} else - log{C.water,"Usage:"} - log{C.water,"applet -list"} - log{C.water,"applet [appName]"} + log{C.aqua,"Usage:"} + log{C.aqua,"applet -list"} + log{C.aqua,"applet [appName]"} end end commands.app=commands.applet @@ -689,7 +689,7 @@ function scene.keyDown(k) log(">Commands start with '"..str.."' :") table.sort(res) for i=1,#res do - log{COLOR.lGrey,res[i]} + log{COLOR.lGray,res[i]} end elseif #res==1 then inputBox.value=res[1] diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 31f58064..ba284c71 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -188,7 +188,7 @@ function scene.draw() gc.setColor(COLOR.rainbow_light(TIME()*2.6)) mStr("DROPPER",640,120) - gc.setColor(COLOR.rainbow_grey(TIME()*1.626)) + gc.setColor(COLOR.rainbow_gray(TIME()*1.626)) setFont(55) mStr("Score - "..score,640,290) mStr("High Score - "..highScore,640,370) diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index fda925ef..f89d6be6 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -107,7 +107,7 @@ function scene.sceneInit() mode=1 arcade=true reset() - BG.set("grey") + BG.set("gray") BGM.play("way") love.keyboard.setKeyRepeat(false) end diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index a0d3fe34..6cec4407 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -13,7 +13,7 @@ function scene.sceneInit() lastKey=nil speed=0 keyTime={}for i=1,40 do keyTime[i]=-1e99 end - BG.set("grey") + BG.set("gray") BGM.play("push") love.keyboard.setKeyRepeat(false) end diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index e176f909..fcd24d1d 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -269,7 +269,7 @@ function scene.draw() local N=board[i][j] if N>0 then if hide and N>maxNew then - setColor(COLOR.dGrey) + setColor(COLOR.dGray) rectangle("fill",320+j*128-128,40+i*128-128,128,128) setColor(1,1,1,.3) mStr("?",j*128+256,i*128-75) diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index d3988082..3d1a100b 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -144,9 +144,9 @@ end scene.widgetList={ WIDGET.newText{name="title", x=520, y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530, y=50,font=35,align="L",color="grey"}, - WIDGET.newText{name="defSeq", x=330, y=550,align="L",color="grey",hide=function()return BAG[1]end}, - WIDGET.newText{name="noMsn", x=610, y=550,align="L",color="grey",hide=function()return MISSION[1]end}, + WIDGET.newText{name="subTitle", x=530, y=50,font=35,align="L",color="gray"}, + WIDGET.newText{name="defSeq", x=330, y=550,align="L",color="gray",hide=function()return BAG[1]end}, + WIDGET.newText{name="noMsn", x=610, y=550,align="L",color="gray",hide=function()return MISSION[1]end}, --Basic WIDGET.newSelector{name="drop", x=170, y=150,w=220,color="orange", list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, @@ -167,7 +167,7 @@ scene.widgetList={ --More WIDGET.newKey{name="advance", x=730, y=190,w=220,h=90,color="red", font=35,code=goScene"custom_advance"}, WIDGET.newKey{name="mod", x=730, y=310,w=220,h=90,color="white", font=35,code=goScene"mod"}, - WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color="water", font=25,code=goScene"custom_field"}, + WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color="aqua", font=25,code=goScene"custom_field"}, WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color="pink", font=25,code=goScene"custom_sequence"}, WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color="sky", font=25,code=goScene"custom_mission"}, diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 14df8793..ef9132ab 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -11,7 +11,7 @@ local scene={} scene.widgetList={ WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"}, + WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="gray"}, --Control WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6,disp=CUSval("nextCount"),code=CUSsto("nextCount")}, diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 0edef2b3..14d00f73 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -424,16 +424,16 @@ end local function setPen(i)return function()penType=i end end scene.widgetList={ WIDGET.newText{name="title", x=1020,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="grey"}, + WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="gray"}, WIDGET.newButton{name="b1", x=580, y=130,w=75,fText="",color=COLOR.red, code=setPen(1)},--B1 WIDGET.newButton{name="b2", x=660, y=130,w=75,fText="",color=COLOR.fire, code=setPen(2)},--B2 WIDGET.newButton{name="b3", x=740, y=130,w=75,fText="",color=COLOR.orange, code=setPen(3)},--B3 WIDGET.newButton{name="b4", x=820, y=130,w=75,fText="",color=COLOR.yellow, code=setPen(4)},--B4 - WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color=COLOR.lame, code=setPen(5)},--B5 + WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color=COLOR.lime, code=setPen(5)},--B5 WIDGET.newButton{name="b6", x=980, y=130,w=75,fText="",color=COLOR.grass, code=setPen(6)},--B6 WIDGET.newButton{name="b7", x=1060, y=130,w=75,fText="",color=COLOR.green, code=setPen(7)},--B7 - WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color=COLOR.water, code=setPen(8)},--B8 + WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color=COLOR.aqua, code=setPen(8)},--B8 WIDGET.newButton{name="b9", x=580, y=210,w=75,fText="",color=COLOR.cyan, code=setPen(9)},--B9 WIDGET.newButton{name="b10", x=660, y=210,w=75,fText="",color=COLOR.sky, code=setPen(10)},--B10 @@ -444,17 +444,17 @@ scene.widgetList={ WIDGET.newButton{name="b15", x=1060, y=210,w=75,fText="",color=COLOR.magenta,code=setPen(15)},--B15 WIDGET.newButton{name="b16", x=1140, y=210,w=75,fText="",color=COLOR.pink, code=setPen(16)},--B16 - WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color="dGrey", code=setPen(17)},--BONE + WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color="dGray", code=setPen(17)},--BONE WIDGET.newButton{name="b18", x=660, y=290,w=75,fText="N", color="black", code=setPen(18)},--HIDE WIDGET.newButton{name="b19", x=740, y=290,w=75,fText="B", color="lYellow",code=setPen(19)},--BOMB - WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color="grey", code=setPen(20)},--GB1 - WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color="lGrey", code=setPen(21)},--GB2 + WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color="gray", code=setPen(20)},--GB1 + WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color="lGray", code=setPen(21)},--GB2 WIDGET.newButton{name="b22", x=980, y=290,w=75,fText="_", color="dPurple",code=setPen(22)},--GB3 WIDGET.newButton{name="b23", x=1060, y=290,w=75,fText="_", color="dRed", code=setPen(23)},--GB4 WIDGET.newButton{name="b24", x=1140, y=290,w=75,fText="_", color="dGreen", code=setPen(24)},--GB5 - WIDGET.newButton{name="any", x=600, y=400,w=120,color="lGrey", font=40,code=setPen(0)}, - WIDGET.newButton{name="space", x=730, y=400,w=120,color="grey", font=65,code=setPen(-1)}, + WIDGET.newButton{name="any", x=600, y=400,w=120,color="lGray", font=40,code=setPen(0)}, + WIDGET.newButton{name="space", x=730, y=400,w=120,color="gray", font=65,code=setPen(-1)}, WIDGET.newButton{name="smartPen", x=860, y=400,w=120,color="lGreen", font=30,code=setPen(-2)}, WIDGET.newButton{name="pushLine", x=990, y=400,w=120,h=120,color="lYellow",font=20,code=pressKey"k"}, WIDGET.newButton{name="delLine", x=1120, y=400,w=120,h=120,color="lYellow",font=20,code=pressKey"l"}, diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index b5688b98..78ba8218 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -160,7 +160,7 @@ function scene.draw() elseif L[i]>4 then gc.setColor(COLOR.rainbow(i+TIME()*6.26)) else - gc.setColor(COLOR.grey) + gc.setColor(COLOR.gray) end gc.print(missionEnum[L[i]],x,y-25) x=x+56 @@ -185,7 +185,7 @@ end scene.widgetList={ WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"}, + WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="gray"}, WIDGET.newKey{name="_1", x=800, y=540, w=90, font=50,code=pressKey(01)}, WIDGET.newKey{name="_2", x=900, y=540, w=90, font=50,code=pressKey(02)}, diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 17deb1b6..061711a0 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -186,7 +186,7 @@ end scene.widgetList={ WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle",x=530,y=50,font=35,align="L",color="grey"}, + WIDGET.newText{name="subTitle",x=530,y=50,font=35,align="L",color="gray"}, WIDGET.newSelector{name="sequence", x=1080,y=60,w=200,color="yellow", @@ -208,30 +208,30 @@ scene.widgetList={ WIDGET.newKey{name="backsp",x=920,y=460,w=80,color="lYellow",font=50,code=pressKey"backspace"}, WIDGET.newKey{name="reset", x=1000,y=460,w=80,color="lYellow",font=25,code=pressKey"delete"}, - WIDGET.newKey{name="Z5", x=120,y=540,w=80,color="lGrey",font=50,code=pressKey(8)}, - WIDGET.newKey{name="S5", x=200,y=540,w=80,color="lGrey",font=50,code=pressKey(9)}, - WIDGET.newKey{name="P", x=280,y=540,w=80,color="lGrey",font=50,code=pressKey(10)}, - WIDGET.newKey{name="Q", x=360,y=540,w=80,color="lGrey",font=50,code=pressKey(11)}, - WIDGET.newKey{name="F", x=440,y=540,w=80,color="lGrey",font=50,code=pressKey(12)}, - WIDGET.newKey{name="E", x=520,y=540,w=80,color="lGrey",font=50,code=pressKey(13)}, - WIDGET.newKey{name="T5", x=600,y=540,w=80,color="lGrey",font=50,code=pressKey(14)}, - WIDGET.newKey{name="U", x=680,y=540,w=80,color="lGrey",font=50,code=pressKey(15)}, - WIDGET.newKey{name="V", x=760,y=540,w=80,color="lGrey",font=50,code=pressKey(16)}, - WIDGET.newKey{name="I3", x=840,y=540,w=80,color="grey",font=50,code=pressKey(26)}, - WIDGET.newKey{name="C", x=920,y=540,w=80,color="grey",font=50,code=pressKey(27)}, + WIDGET.newKey{name="Z5", x=120,y=540,w=80,color="lGray",font=50,code=pressKey(8)}, + WIDGET.newKey{name="S5", x=200,y=540,w=80,color="lGray",font=50,code=pressKey(9)}, + WIDGET.newKey{name="P", x=280,y=540,w=80,color="lGray",font=50,code=pressKey(10)}, + WIDGET.newKey{name="Q", x=360,y=540,w=80,color="lGray",font=50,code=pressKey(11)}, + WIDGET.newKey{name="F", x=440,y=540,w=80,color="lGray",font=50,code=pressKey(12)}, + WIDGET.newKey{name="E", x=520,y=540,w=80,color="lGray",font=50,code=pressKey(13)}, + WIDGET.newKey{name="T5", x=600,y=540,w=80,color="lGray",font=50,code=pressKey(14)}, + WIDGET.newKey{name="U", x=680,y=540,w=80,color="lGray",font=50,code=pressKey(15)}, + WIDGET.newKey{name="V", x=760,y=540,w=80,color="lGray",font=50,code=pressKey(16)}, + WIDGET.newKey{name="I3", x=840,y=540,w=80,color="gray",font=50,code=pressKey(26)}, + WIDGET.newKey{name="C", x=920,y=540,w=80,color="gray",font=50,code=pressKey(27)}, WIDGET.newKey{name="rnd", x=1000,y=540,w=80,color="red",font=25,code=pressKey"="}, - WIDGET.newKey{name="W", x=120,y=620,w=80,color="lGrey",font=50,code=pressKey(17)}, - WIDGET.newKey{name="X", x=200,y=620,w=80,color="lGrey",font=50,code=pressKey(18)}, - WIDGET.newKey{name="J5", x=280,y=620,w=80,color="lGrey",font=50,code=pressKey(19)}, - WIDGET.newKey{name="L5", x=360,y=620,w=80,color="lGrey",font=50,code=pressKey(20)}, - WIDGET.newKey{name="R", x=440,y=620,w=80,color="lGrey",font=50,code=pressKey(21)}, - WIDGET.newKey{name="Y", x=520,y=620,w=80,color="lGrey",font=50,code=pressKey(22)}, - WIDGET.newKey{name="N", x=600,y=620,w=80,color="lGrey",font=50,code=pressKey(23)}, - WIDGET.newKey{name="H", x=680,y=620,w=80,color="lGrey",font=50,code=pressKey(24)}, - WIDGET.newKey{name="I5", x=760,y=620,w=80,color="lGrey",font=50,code=pressKey(25)}, - WIDGET.newKey{name="I2", x=840,y=620,w=80,color="dGrey",font=50,code=pressKey(28)}, - WIDGET.newKey{name="O1", x=920,y=620,w=80,color="dGrey",font=50,code=pressKey(29)}, + WIDGET.newKey{name="W", x=120,y=620,w=80,color="lGray",font=50,code=pressKey(17)}, + WIDGET.newKey{name="X", x=200,y=620,w=80,color="lGray",font=50,code=pressKey(18)}, + WIDGET.newKey{name="J5", x=280,y=620,w=80,color="lGray",font=50,code=pressKey(19)}, + WIDGET.newKey{name="L5", x=360,y=620,w=80,color="lGray",font=50,code=pressKey(20)}, + WIDGET.newKey{name="R", x=440,y=620,w=80,color="lGray",font=50,code=pressKey(21)}, + WIDGET.newKey{name="Y", x=520,y=620,w=80,color="lGray",font=50,code=pressKey(22)}, + WIDGET.newKey{name="N", x=600,y=620,w=80,color="lGray",font=50,code=pressKey(23)}, + WIDGET.newKey{name="H", x=680,y=620,w=80,color="lGray",font=50,code=pressKey(24)}, + WIDGET.newKey{name="I5", x=760,y=620,w=80,color="lGray",font=50,code=pressKey(25)}, + WIDGET.newKey{name="I2", x=840,y=620,w=80,color="dGray",font=50,code=pressKey(28)}, + WIDGET.newKey{name="O1", x=920,y=620,w=80,color="dGray",font=50,code=pressKey(29)}, WIDGET.newButton{name="copy", x=1140, y=460,w=170,h=80,color="lRed", font=40,code=pressKey"cC",hide=function()return #BAG==0 end}, diff --git a/parts/scenes/depause.lua b/parts/scenes/depause.lua index 3d3d2978..f8ef896b 100644 --- a/parts/scenes/depause.lua +++ b/parts/scenes/depause.lua @@ -24,7 +24,7 @@ function scene.draw() SCN.scenes.game.draw() end - --Grey screen cover + --Gray screen cover gc.setColor(.15,.15,.15,timer*1.26) gc.push("transform") gc.origin() diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 819e2aac..47880155 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -356,7 +356,7 @@ function scene.draw() setFont(25) for i=0,26 do local x,y=light[3*i+1],light[3*i+2] - gc.setColor(COLOR[i==progress and"grey"or light[3*i+3]and"dOrange"or"dGrey"]) + gc.setColor(COLOR[i==progress and"gray"or light[3*i+3]and"dOrange"or"dGray"]) gc.circle("fill",x,y,23) gc.setColor(.16,.16,.16) gc.circle("line",x,y,23) diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 776174f9..4a223d0d 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -177,7 +177,7 @@ scene.widgetList={ WIDGET.newButton{name="custom", x=-1200,y=570,w=800,h=100, color="lSea", font=45,align="R",edge=30, code=pressKey"z"}, WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color="lOrange",font=40,align="L",edge=30, code=pressKey"-"}, - WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color="lLame", font=40,align="L",edge=30, code=pressKey"p"}, + WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color="lLime", font=40,align="L",edge=30, code=pressKey"p"}, WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color="lGreen", font=40,align="L",edge=30, code=pressKey"l"}, WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color="lC", font=40,align="L",edge=30, code=pressKey","}, diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 2e1407e4..744dcc57 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -275,7 +275,7 @@ scene.widgetList={ PLY_NET[1].ready or NET.getlock("ready") end}, - WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="grey",font=40,code=pressKey"space", + WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="gray",font=40,code=pressKey"space", hide=function() return playing or diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index e4155e25..ccc88685 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -6,7 +6,7 @@ local SCR,setFont,mStr=SCR,setFont,mStr local fnsRankColor={ Z=COLOR.lYellow, - S=COLOR.lGrey, + S=COLOR.lGray, A=COLOR.sky, B=COLOR.lGreen, C=COLOR.magenta, @@ -38,7 +38,7 @@ function scene.sceneInit(org) local frameLostRate=(S.frame/S.time/60-1)*100 form={ - {COLOR.white,TIMESTR(S.time),COLOR[frameLostRate>10 and"red"or frameLostRate>3 and"yellow"or"grey"],format(" (%.2f%%)",frameLostRate)}, + {COLOR.white,TIMESTR(S.time),COLOR[frameLostRate>10 and"red"or frameLostRate>3 and"yellow"or"gray"],format(" (%.2f%%)",frameLostRate)}, format("%d/%d/%d",S.key,S.rotate,S.hold), format("%d %.2fPPS",S.piece,S.piece/S.time), format("%d(%d) %.2fLPM",S.row,S.dig,S.row/S.time*60), diff --git a/parts/scenes/test.lua b/parts/scenes/test.lua index c856b7d5..3a520bdd 100644 --- a/parts/scenes/test.lua +++ b/parts/scenes/test.lua @@ -24,13 +24,13 @@ function scene.gamepadDown(key) push("[gamepadDown] <"..key..">") end function scene.gamepadUp(key) - push{COLOR.grey,"[gamepadUp] <"..key..">"} + push{COLOR.gray,"[gamepadUp] <"..key..">"} end function scene.keyDown(key) push("[keyDown] <"..key..">") end function scene.keyUp(key) - push{COLOR.grey,"[keyUp] <"..key..">"} + push{COLOR.gray,"[keyUp] <"..key..">"} end function scene.mouseDown(x,y,k) push(("[mouseDown] <%d: %d, %d>"):format(k,x,y)) @@ -40,7 +40,7 @@ function scene.mouseMove(x,y) end function scene.mouseUp(x,y,k) SYSFX.newRectRipple(1,x-10,y-10,21,21) - push{COLOR.grey,"[mouseUp] <"..k..">"} + push{COLOR.gray,"[mouseUp] <"..k..">"} end function scene.touchClick(x,y) SYSFX.newRipple(.5,x,y,50) @@ -55,7 +55,7 @@ function scene.touchMove(x,y) end function scene.touchUp(x,y) SYSFX.newRipple(.5,x,y,50) - push{COLOR.grey,"[touchUp]"} + push{COLOR.gray,"[touchUp]"} end function scene.wheelMoved(dx,dy) push(("[wheelMoved] <%d, %d>"):format(dx,dy))