From 7ae418c597610efc17adf2e1ab150aae684d75c8 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 8 Jul 2021 21:31:48 +0800
Subject: [PATCH] =?UTF-8?q?grey=E7=9A=84=E6=8B=BC=E5=86=99=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAgray?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua                       | 4 ++++
 parts/gametoolfunc.lua         | 2 +-
 parts/player/draw.lua          | 2 +-
 parts/scenes/setting_video.lua | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main.lua b/main.lua
index 39627305..89fe2bc3 100644
--- a/main.lua
+++ b/main.lua
@@ -261,6 +261,10 @@ do
 		needSave=true
 		autoRestart=true
 	end
+	if SETTING.ghostType=='greyCell'then
+		SETTING.ghostType='grayCell'
+		needSave=true
+	end
 	if not SETTING.VKSkin then SETTING.VKSkin=1 end
 	if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then
 		SETTING.frameMul=100
diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index aef62090..b93dd0ea 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -21,7 +21,7 @@ do--function applyXxxSatur(mode)
 	local saturateValues={
 		normal={0,1},
 		soft={.2,.7},
-		grey={.4,.4},
+		gray={.4,.4},
 		light={.2,.8},
 		color={-.2,1.2},
 	}
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index 70db51d3..dfa752b6 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -239,7 +239,7 @@ local drawGhost={
 			end
 		end end
 	end,
-	greyCell=function(P,_,alpha)
+	grayCell=function(P,_,alpha)
 		gc_setColor(1,1,1,alpha)
 		local CB=P.cur.bk
 		for i=1,#CB do for j=1,#CB[1]do
diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua
index a1d5a330..67949662 100644
--- a/parts/scenes/setting_video.lua
+++ b/parts/scenes/setting_video.lua
@@ -45,7 +45,7 @@ scene.widgetList={
 	WIDGET.newSwitch{name="upEdge",		x=380,y=320,disp=SETval("upEdge"),code=SETrev("upEdge")},
 	WIDGET.newSwitch{name="bagLine",	x=380,y=390,disp=SETval("bagLine"),code=SETrev("bagLine")},
 
-	WIDGET.newSelector{name="ghostType",x=915,y=180,w=350,list={'color','gray','colorCell','greyCell','colorLine','grayLine'},disp=SETval("ghostType"),code=SETsto("ghostType")},
+	WIDGET.newSelector{name="ghostType",x=915,y=180,w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval("ghostType"),code=SETsto("ghostType")},
 	WIDGET.newSlider{name="ghost",		x=740,y=240,w=350,unit=1,	disp=SETval("ghost"),show="percent",code=SETsto("ghost")},
 	WIDGET.newSlider{name="grid",		x=740,y=320,w=350,unit=.4,	disp=SETval("grid"),show="percent",	code=SETsto("grid")},
 	WIDGET.newSlider{name="center",		x=740,y=400,w=350,unit=1,	disp=SETval("center"),				code=SETsto("center")},
@@ -79,12 +79,12 @@ scene.widgetList={
 		end},
 
 	WIDGET.newSelector{name="blockSatur",x=800,y=1440,w=300,color='lN',
-		list={'normal','soft','grey','light','color'},
+		list={'normal','soft','gray','light','color'},
 		disp=SETval("blockSatur"),
 		code=function(v)SETTING.blockSatur=v;applyBlockSatur(SETTING.blockSatur)end
 	},
 	WIDGET.newSelector{name="fieldSatur",x=800,y=1540,w=300,color='lN',
-		list={'normal','soft','grey','light','color'},
+		list={'normal','soft','gray','light','color'},
 		disp=SETval("fieldSatur"),
 		code=function(v)SETTING.fieldSatur=v;applyFieldSatur(SETTING.fieldSatur)end
 	},