From 8741f4a4e58215baa547a15039bc0f56533116d3 Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 12 Jun 2023 12:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=8A=A040=E8=A1=8C=E8=B7=AF?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=80=E5=A0=86=E6=A8=A1=E5=BC=8F=E7=9A=84=E8=A7=A3?=
 =?UTF-8?q?=E9=94=81=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/game/mechanicLib/mino/progress.lua     | 92 ++++++++++++++++++-
 assets/game/mode/mino/exterior/sprint_10.lua  |  5 +-
 .../mode/mino/exterior/sprint_drought_40.lua  | 12 +--
 .../mode/mino/exterior/sprint_float_40.lua    | 12 +--
 .../mode/mino/exterior/sprint_flood_40.lua    | 12 +--
 .../game/mode/mino/exterior/sprint_low_40.lua | 12 +--
 .../game/mode/mino/exterior/sprint_mph_40.lua | 12 +--
 .../mode/mino/exterior/sprint_obstacle_20.lua | 12 +--
 8 files changed, 116 insertions(+), 53 deletions(-)

diff --git a/assets/game/mechanicLib/mino/progress.lua b/assets/game/mechanicLib/mino/progress.lua
index c827b208..e1615a3d 100644
--- a/assets/game/mechanicLib/mino/progress.lua
+++ b/assets/game/mechanicLib/mino/progress.lua
@@ -13,6 +13,9 @@ do-- sprint_40
         end
         P.modeData.maxHeight=math.max(P.modeData.maxHeight or 0,P.field:getHeight())
         if P.finished then
+            if P.gameTime<=86 then
+                PROGRESS.setMinoModeUnlocked('sprint_hide_40')
+            end
             if P.modeData.maxHeight<=8 then
                 PROGRESS.setMinoModeUnlocked('sprint_10')
             end
@@ -21,6 +24,15 @@ do-- sprint_40
     end
 end
 
+do-- sprint_10
+    function progress.sprint_10_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_obstacle_20')
+        end
+    end
+end
+
 do-- sprint_200
     local bgmTransBegin,bgmTransFinish=100,150
     function progress.sprint_200_afterClear(P,clear)
@@ -44,6 +56,59 @@ do-- sprint_1000
     end
 end
 
+do-- sprint_obstacle_20
+    local bgmTransBegin,bgmTransFinish=5,15
+    function progress.sprint_obstacle_20_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_drought_40')
+        end
+    end
+end
+
+do-- sprint_drought_40
+    local bgmTransBegin,bgmTransFinish=10,30
+    function progress.sprint_drought_40_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_flood_40')
+            PROGRESS.setMinoModeUnlocked('sprint_mph_40')
+        end
+    end
+end
+
+do-- sprint_flood_40
+    local bgmTransBegin,bgmTransFinish=10,30
+    function progress.sprint_flood_40_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_pento_40')
+        end
+    end
+end
+
+do-- sprint_mph_40
+    local bgmTransBegin,bgmTransFinish=10,30
+    function progress.sprint_mph_40_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_pento_40')
+        end
+    end
+end
+
 do-- sprint_hide_40
     local bgmTransBegin,bgmTransFinish=10,30
     function progress.sprint_hide_40_afterClear(P,clear)
@@ -52,7 +117,7 @@ do-- sprint_hide_40
             BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
         end
         if P.finished then
-            PROGRESS.setMinoModeUnlocked('sprint_1000')
+            PROGRESS.setMinoModeUnlocked('sprint_invis_40')
         end
     end
 end
@@ -65,7 +130,7 @@ do-- sprint_invis_40
             BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
         end
         if P.finished then
-            PROGRESS.setMinoModeUnlocked('sprint_1000')
+            PROGRESS.setMinoModeUnlocked('sprint_blind_40')
         end
     end
 end
@@ -94,6 +159,29 @@ do-- sprint_big_80
     end
 end
 
+do-- sprint_low_40
+    local bgmTransBegin,bgmTransFinish=40,60
+    function progress.sprint_low_40_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+        if P.finished then
+            PROGRESS.setMinoModeUnlocked('sprint_float_40')
+        end
+    end
+end
+
+do-- sprint_low_40
+    local bgmTransBegin,bgmTransFinish=40,60
+    function progress.sprint_float_40_afterClear(P,clear)
+        if not P.isMain then return true end
+        if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
+            BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
+        end
+    end
+end
+
 function progress.marathon_afterClear(P,clear)
     if not P.modeData.marathon_lastLevel then P.modeData.marathon_lastLevel=1 end
     if P.modeData.level>P.modeData.marathon_lastLevel then
diff --git a/assets/game/mode/mino/exterior/sprint_10.lua b/assets/game/mode/mino/exterior/sprint_10.lua
index b295acd9..cf8cdd55 100644
--- a/assets/game/mode/mino/exterior/sprint_10.lua
+++ b/assets/game/mode/mino/exterior/sprint_10.lua
@@ -7,7 +7,10 @@ return {
     settings={mino={
         seqType='bag7_sprint',
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_10_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[10],
diff --git a/assets/game/mode/mino/exterior/sprint_drought_40.lua b/assets/game/mode/mino/exterior/sprint_drought_40.lua
index a3b02763..af823be7 100644
--- a/assets/game/mode/mino/exterior/sprint_drought_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_drought_40.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=10,30
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -9,15 +7,13 @@ return {
     settings={mino={
         seqType='bag12_drought',
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_drought_40_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[40],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
             },
             drawInField=mechLib.mino.sprint.event_drawInField[40],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[40],
diff --git a/assets/game/mode/mino/exterior/sprint_float_40.lua b/assets/game/mode/mino/exterior/sprint_float_40.lua
index 86d8dd7d..2f3d1513 100644
--- a/assets/game/mode/mino/exterior/sprint_float_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_float_40.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=10,30
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -9,15 +7,13 @@ return {
     settings={mino={
         clearRule='line_float',
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_float_40_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[40],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
             },
             drawInField=mechLib.mino.sprint.event_drawInField[40],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[40],
diff --git a/assets/game/mode/mino/exterior/sprint_flood_40.lua b/assets/game/mode/mino/exterior/sprint_flood_40.lua
index f1c45d4e..88e9c6ad 100644
--- a/assets/game/mode/mino/exterior/sprint_flood_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_flood_40.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=10,30
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -9,15 +7,13 @@ return {
     settings={mino={
         seqType='bag7_flood',
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_flood_40_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[40],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
             },
             drawInField=mechLib.mino.sprint.event_drawInField[40],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[40],
diff --git a/assets/game/mode/mino/exterior/sprint_low_40.lua b/assets/game/mode/mino/exterior/sprint_low_40.lua
index 1538dfc2..11bed294 100644
--- a/assets/game/mode/mino/exterior/sprint_low_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_low_40.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=10,30
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -10,15 +8,13 @@ return {
         spawnH=4,
         extraSpawnH=0,
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_low_40_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[40],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
             },
             drawInField=mechLib.mino.sprint.event_drawInField[40],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[40],
diff --git a/assets/game/mode/mino/exterior/sprint_mph_40.lua b/assets/game/mode/mino/exterior/sprint_mph_40.lua
index ad8c968f..64846d2d 100644
--- a/assets/game/mode/mino/exterior/sprint_mph_40.lua
+++ b/assets/game/mode/mino/exterior/sprint_mph_40.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=10,30
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -11,15 +9,13 @@ return {
         holdSlot=0,
         seqType='mess',
         event={
-            playerInit=mechLib.mino.statistics.event_playerInit,
+            playerInit={
+                mechLib.mino.statistics.event_playerInit,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_mph_40_afterClear)",
+            },
             afterClear={
                 mechLib.mino.statistics.event_afterClear,
                 mechLib.mino.sprint.event_afterClear[40],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
             },
             drawInField=mechLib.mino.sprint.event_drawInField[40],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[40],
diff --git a/assets/game/mode/mino/exterior/sprint_obstacle_20.lua b/assets/game/mode/mino/exterior/sprint_obstacle_20.lua
index f932a642..96be5446 100644
--- a/assets/game/mode/mino/exterior/sprint_obstacle_20.lua
+++ b/assets/game/mode/mino/exterior/sprint_obstacle_20.lua
@@ -1,5 +1,3 @@
-local bgmTransBegin,bgmTransFinish=5,10
-
 return {
     initialize=function()
         GAME.newPlayer(1,'mino')
@@ -11,15 +9,9 @@ return {
             playerInit={
                 mechLib.mino.statistics.event_playerInit,
                 mechLib.mino.misc.obstacle_generateField,
+                "P:addEvent('afterClear',mechLib.mino.progress.sprint_obstacle_20_afterClear)",
             },
-            afterClear={
-                mechLib.mino.misc.obstacle_event_afterClear[20],
-                function(P)
-                    if P.modeData.line>bgmTransBegin and P.modeData.line<bgmTransFinish+4 and P.isMain then
-                        BGM.set(bgmList['race'].add,'volume',math.min((P.modeData.line-bgmTransBegin)/(bgmTransFinish-bgmTransBegin),1),2.6)
-                    end
-                end,
-            },
+            afterClear=mechLib.mino.misc.obstacle_event_afterClear[20],
             drawInField=mechLib.mino.sprint.event_drawInField[20],
             drawOnPlayer=mechLib.mino.sprint.event_drawOnPlayer[20],
         },