From ce79c26b55da5ba488a5d340d7a4f9586701bc3d Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Mon, 2 Dec 2024 21:58:03 +0800
Subject: [PATCH] =?UTF-8?q?spin=E6=A8=A1=E5=BC=8F=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=92=8C=E8=A7=A3=E9=94=81Gela=E7=9A=84?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/game/mode/brik/exterior/drill.lua |  3 +-
 assets/game/mode/brik/exterior/spin.lua  | 41 ++++++++++++++++++------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/assets/game/mode/brik/exterior/drill.lua b/assets/game/mode/brik/exterior/drill.lua
index 359512bc..8e4849c9 100644
--- a/assets/game/mode/brik/exterior/drill.lua
+++ b/assets/game/mode/brik/exterior/drill.lua
@@ -52,7 +52,8 @@ return {
                     then PROGRESS.setExteriorUnlock('survivor') return true end
                 end,
                 function()
-                    if PROGRESS.getStyleUnlock('acry') then return true end
+                    -- Unlock Acry-action
+                    if PROGRESS.getStyleUnlock('acry') and PROGRESS.getStyleUnlock('acry') then return true end
                     if
                         0.3/PROGRESS.getExteriorModeScore('drill','ppl10')+
                         0.3/PROGRESS.getExteriorModeScore('drill','ppl20')+
diff --git a/assets/game/mode/brik/exterior/spin.lua b/assets/game/mode/brik/exterior/spin.lua
index c6186589..bb5769cf 100644
--- a/assets/game/mode/brik/exterior/spin.lua
+++ b/assets/game/mode/brik/exterior/spin.lua
@@ -31,15 +31,15 @@ return {
             beforePress=mechLib.brik.misc.skipReadyWithHardDrop_beforePress,
             afterClear={
                 function(P)
-                    -- if P.modeData.subMode=='piece' or P.modeData.subMode=='hero' then
-                    --     PROGRESS.setExteriorScore('spin','piece',P.modeData.spinClear,'>')
-                    -- end
-                    -- if P.modeData.subMode=='column' or P.modeData.subMode=='hero' then
-                    --     PROGRESS.setExteriorScore('spin','column',P.modeData.spinClear,'>')
-                    --     if P.modeData.spin_column_pure then
-                    --         PROGRESS.setExteriorScore('spin','column_pure',P.modeData.spinClear,'>')
-                    --     end
-                    -- end
+                    if P.modeData.subMode=='piece' or P.modeData.subMode=='hero' then
+                        PROGRESS.setExteriorScore('spin','piece',P.modeData.spinClear,'>')
+                    end
+                    if P.modeData.subMode=='column' or P.modeData.subMode=='hero' then
+                        PROGRESS.setExteriorScore('spin','column',P.modeData.spinClear,'>')
+                        if P.modeData.spin_column_pure then
+                            PROGRESS.setExteriorScore('spin','column_pure_'..P.modeData.spin_column_pure,P.modeData.spinClear,'>')
+                        end
+                    end
                 end,
                 function(P,clear)
                     local T=mechLib.common.task
@@ -74,6 +74,29 @@ return {
                         return true
                     end
                 end,
+                function()
+                    -- Unlock Gela-chain
+                    if PROGRESS.getStyleUnlock('gela') and PROGRESS.getExteriorUnlock('chain') then return true end
+                    local data=PROGRESS.get('exteriorMap').spin
+                    local Z,S,J,L,T,O,I=
+                        0 or data.column_pure_Z,
+                        0 or data.column_pure_S,
+                        0 or data.column_pure_J,
+                        0 or data.column_pure_L,
+                        0 or data.column_pure_T,
+                        0 or data.column_pure_O,
+                        0 or data.column_pure_I
+                    if
+                        (0 or data.piece)+
+                        (0 or data.column)+
+                        math.max(Z,S,J,L,T,O,I)/2.6+
+                        (Z+S+J+L+T+O+I)/6.26
+                        >=70.23
+                    then
+                        PROGRESS.setStyleUnlock('gela')
+                        PROGRESS.setExteriorUnlock('chain')
+                    end
+                end
             },
             drawOnPlayer=mechLib.brik.chargeLimit.spin_event_drawOnPlayer,
         },