From dfd28f2f10a8ee8e501756cdcb199149ee379d2e Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sun, 7 Nov 2021 21:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E5=9C=A8=E6=9B=B4=E6=96=B0=E5=90=8E?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2=E4=BB=A5?=
 =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9C=AC=E6=A8=A1=E5=BC=8F=E5=90=8D=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/main.lua b/main.lua
index 3e714608..bb21a7bf 100644
--- a/main.lua
+++ b/main.lua
@@ -461,16 +461,28 @@ do
         fs.remove('record/stack_100l.rec')
     end
     if STAT.version~=VERSION.code then
+        for k,v in next,MODE_UPDATE_MAP do
+            if RANKS[k]then
+                RANKS[v]=RANKS[k]
+                RANKS[k]=nil
+            end
+            k='record/'..k
+            if fs.getInfo(k..'.dat')then
+                fs.write('record/'..v..'.rec',fs.read(k..'.dat'))
+                fs.remove(k..'.dat')
+            end
+            if fs.getInfo(k..'.rec')then
+                fs.write('record/'..v..'.rec',fs.read(k..'.rec'))
+                fs.remove(k..'.rec')
+            end
+        end
         STAT.version=VERSION.code
         needSave=true
-        love.event.quit('restart')
     end
-    SETTING.appLock=nil
-    SETTING.dataSaving=nil
-    SETTING.swap=nil
+    SETTING.appLock,SETTING.dataSaving,SETTING.swap=nil
     if not SETTING.VKSkin then SETTING.VKSkin=1 end
     for _,v in next,SETTING.skin do if v<1 or v>17 then v=17 end end
-    if SETTING.RS=='ZRS'or SETTING.RS=='BRS'or SETTING.RS=='ASCplus'or SETTING.RS=='C2sym'then SETTING.RS='TRS'end
+    if not RSlist[SETTING.RS]then SETTING.RS='TRS'end
     if SETTING.ghostType=='greyCell'then SETTING.ghostType='grayCell'end
     if type(SETTING.skinSet)=='number'then SETTING.skinSet='crystal_scf'end
     if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then SETTING.frameMul=100 end
@@ -506,26 +518,11 @@ do
         needSave=true
     end
 
-    for k,v in next,MODE_UPDATE_MAP do
-        if RANKS[k]then
-            RANKS[v]=RANKS[k]
-            RANKS[k]=nil
-        end
-        k='record/'..k
-        if fs.getInfo(k..'.dat')then
-            fs.write('record/'..v..'.rec',fs.read(k..'.dat'))
-            fs.remove(k..'.dat')
-        end
-        if fs.getInfo(k..'.rec')then
-            fs.write('record/'..v..'.rec',fs.read(k..'.rec'))
-            fs.remove(k..'.rec')
-        end
-    end
-
     if needSave then
         saveStats()
         saveProgress()
         saveSettings()
+        love.event.quit('restart')
     end
 end