From c9e0a582324e23bc7acc0caded458b3ae83ce982 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Fri, 16 Dec 2022 00:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0N64=E5=92=8CN64=5Fplus?=
 =?UTF-8?q?=E6=97=8B=E8=BD=AC=E7=B3=BB=E7=BB=9F=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?None=E5=92=8CNone=5Fplus=E6=90=9E=E5=8F=8D=20close=20#805?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/RSlist.lua              | 40 +++++++++++++++++++++++++++++++++--
 parts/scenes/setting_game.lua |  2 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/parts/RSlist.lua b/parts/RSlist.lua
index 7132534f..635b3cc0 100644
--- a/parts/RSlist.lua
+++ b/parts/RSlist.lua
@@ -938,6 +938,40 @@ do
     }
 end
 
+local N64
+do
+    local R={'+0+0','+0-1','+1+0','-1+0','+0+1'}
+    local L={'+0+0','+0-1','-1+0','+1+0','+0+1'}
+    N64={
+        centerTex=GC.DO{10,10,
+            {'setLW',2},
+            {'line',2,9,2,1,8,9,8,1},
+        },
+        kickTable=TABLE.new({
+            [01]=R,[10]=L,[12]=R,[21]=L,
+            [23]=R,[32]=L,[30]=R,[03]=L,
+        },29)
+    }
+end
+
+local N64_plus
+do
+    local R={'+0+0','+0-1','+1+0','-1+0','+0+1'}
+    local L={'+0+0','+0-1','-1+0','+1+0','+0+1'}
+    local F={'+0+0','+0-1','+0+1'}
+    N64_plus={
+        centerTex=GC.DO{10,10,
+        {'setLW',2},
+        {'line',4,9,2,9,2,1,8,9,8,1,6,1},
+    },
+        kickTable=TABLE.new({
+            [01]=R,[10]=L,[12]=R,[21]=L,
+            [23]=R,[32]=L,[30]=R,[03]=L,
+            [02]=F,[20]=F,[13]=F,[31]=F,
+        },29)
+    }
+end
+
 local Classic do
     local centerPos=TABLE.copy(defaultCenterPos)
     centerPos[1]={[0]={1,1},{1,0},{1,1},{1,0}}
@@ -978,7 +1012,7 @@ local None={
             {'setLW',2},
             {'line',2,2,6,6},
         },
-    kickTable=TABLE.new(noKickSet_180,29)
+    kickTable=TABLE.new(noKickSet,29)
 }
 
 local None_plus={
@@ -987,7 +1021,7 @@ local None_plus={
             {'line',1,1,7,7},
             {'fRect',2,2,4,4},
         },
-    kickTable=TABLE.new(noKickSet,29)
+    kickTable=TABLE.new(noKickSet_180,29)
 }
 
 local RSlist={
@@ -1002,6 +1036,8 @@ local RSlist={
     ASC_plus=ASC_plus,
     C2=C2,
     C2_sym=C2_sym,
+    N64=N64,
+    N64_plus=N64_plus,
     Classic=Classic,
     Classic_plus=Classic_plus,
     None=None,
diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua
index 2913288c..0a658782 100644
--- a/parts/scenes/setting_game.lua
+++ b/parts/scenes/setting_game.lua
@@ -43,7 +43,7 @@ scene.widgetList={
     WIDGET.newButton{name='touch',    x=990,  y=220, w=320,h=80,color=not MOBILE and 'dH',font=35,         code=goScene'setting_touch',hideF=function() return not SETTING.VKSwitch end},
     WIDGET.newSwitch{name='showVK',   x=1100, y=150, lim=400,                    disp=SETval('VKSwitch'), code=SETrev('VKSwitch')},
     WIDGET.newSlider{name='reTime',   x=330,  y=320, w=300,lim=180,axis={.5,3,.25},disp=SETval('reTime'), code=SETsto('reTime'),show=SETval('reTime')},
-    WIDGET.newSelector{name='RS',     x=300,  y=420, w=300,color='S',            disp=SETval('RS'),       code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','DRS_weak','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}},
+    WIDGET.newSelector{name='RS',     x=300,  y=420, w=300,color='S',            disp=SETval('RS'),       code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','DRS_weak','ASC','ASC_plus','C2','C2_sym','N64','N64_plus','Classic','Classic_plus','None','None_plus'}},
     WIDGET.newSelector{name='menuPos',x=980,  y=320, w=300,color='O',            disp=SETval('menuPos'),  code=SETsto('menuPos'),list={'left','middle','right'}},
     WIDGET.newSwitch{name='sysCursor',x=1060, y=400, lim=580,                    disp=SETval('sysCursor'),code=function() SETTING.sysCursor=not SETTING.sysCursor applySettings() end},
     WIDGET.newSwitch{name='autoPause',x=1060, y=470, lim=580,                    disp=SETval('autoPause'),code=SETrev('autoPause')},