修一些有submode的模式进去就爆炸

26F-Studio · Jul 21, 2024 · b0e8e95 · b0e8e95
1 parent 1cac9fc
commit b0e8e95
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/assets/game/mode/brik/exterior/backfire.lua b/assets/game/mode/brik/exterior/backfire.lua
@@ -21,7 +21,7 @@ return {
                 T.add(P,'backfire_cheese','modeTask_backfire_cheese_title','modeTask_backfire_cheese_desc','(0/8)')
                 T.add(P,'backfire_normal','modeTask_backfire_normal_title','modeTask_backfire_normal_desc','(0/7)')
 
-                if PROGRESS.getExteriorModeState('backfire').showAmplify then
+                if PROGRESS.getExteriorModeScore('backfire','showAmplify') then
                     T.add(P,'backfire_amplify','modeTask_backfire_amplify_title','modeTask_backfire_amplify_desc','(0/8)')
                 end
             end,
@@ -44,7 +44,7 @@ return {
                     T.set(P,'backfire_amplify',0,"---")
                 end
                 if P.stat.atk>=8 and P.stat.line<=4 then
-                    if not PROGRESS.getExteriorModeState('backfire').showAmplify then
+                    if not PROGRESS.getExteriorModeScore('backfire','showAmplify') then
                         T.add(P,'backfire_amplify','modeTask_backfire_amplify_title','modeTask_backfire_amplify_desc','(0/8)')
                         T.set(P,'backfire_amplify',P.stat.atk/8,("($1/8)"):repD(P.stat.atk))
                     end

diff --git a/assets/game/mode/brik/exterior/excavate.lua b/assets/game/mode/brik/exterior/excavate.lua
@@ -21,7 +21,7 @@ return {
                 T.add(P,'excavate_shale',     'modeTask_excavate_shale_title',     'modeTask_excavate_shale_desc')
                 T.add(P,'excavate_volcanics', 'modeTask_excavate_volcanics_title', 'modeTask_excavate_volcanics_desc')
 
-                local S=PROGRESS.getExteriorModeState('excavate')
+                local S=PROGRESS.getExteriorModeState('excavate') or NONE
                 if S.shale and S.volcanics then
                     PROGRESS.setExteriorScore('excavate','showChecker',1)
                 end

diff --git a/assets/game/mode/brik/exterior/hypersonic.lua b/assets/game/mode/brik/exterior/hypersonic.lua
@@ -20,7 +20,7 @@ return {
                 T.add(P,'hypersonic_low','modeTask_hypersonic_low_title','modeTask_hypersonic_low_desc','(0/4)')
                 T.add(P,'hypersonic_high','modeTask_hypersonic_high_title','modeTask_hypersonic_high_desc')
 
-                local S=PROGRESS.getExteriorModeState('hypersonic')
+                local S=PROGRESS.getExteriorModeState('hypersonic') or NONE
                 if S.showHidden then
                     T.add(P,'hypersonic_hidden','modeTask_hypersonic_hidden_title','modeTask_hypersonic_hidden_desc')
                 else
@@ -44,7 +44,7 @@ return {
 
                     if #P.holdQueue==0 and P.gameTime<=8e3 then
                         -- Titanium: Techrash in 8s without hold
-                        if not PROGRESS.getExteriorModeState('hypersonic').showTitanium then
+                        if not PROGRESS.getExteriorModeScore('hypersonic','showTitanium') then
                             T.add(P,'hypersonic_titanium','modeTask_hypersonic_titanium_title','modeTask_hypersonic_titanium_desc')
                         end
                         T.set(P,'hypersonic_titanium',true)

diff --git a/assets/game/mode/brik/exterior/sequence.lua b/assets/game/mode/brik/exterior/sequence.lua
@@ -82,7 +82,7 @@ return {
                 T.add(P,'sequence_rect',    'modeTask_sequence_rect_title',    'modeTask_sequence_rect_desc')
                 T.add(P,'sequence_rain',    'modeTask_sequence_rain_title',    'modeTask_sequence_rain_desc')
 
-                local S=PROGRESS.getExteriorModeState('sequence')
+                local S=PROGRESS.getExteriorModeState('sequence') or NONE
                 local count=0
                 for _,v in next,{'mph','flood','drought','saw','rect','rain','pento'} do
                     if S[v] then count=count+1 end
@@ -105,7 +105,7 @@ return {
 
                     -- MPH
                     if P.stat.piece<=4 then
-                        if not PROGRESS.getExteriorModeState('sequence').showMPH then
+                        if not PROGRESS.getExteriorModeScore('sequence','showMPH') then
                             T.add(P,'sequence_mph','modeTask_sequence_mph_title','modeTask_sequence_mph_desc')
                         end
                         T.set(P,'sequence_mph',true)

diff --git a/assets/game/mode/brik/exterior/survivor.lua b/assets/game/mode/brik/exterior/survivor.lua
@@ -35,7 +35,7 @@ return {
                     T.add(P,'survivor_cheese','modeTask_survivor_cheese_title','modeTask_survivor_cheese_desc')
                     T.add(P,'survivor_power','modeTask_survivor_power_title','modeTask_survivor_power_desc')
 
-                    if PROGRESS.getExteriorModeState('survivor').showSpike then
+                    if PROGRESS.getExteriorModeScore('survivor','showSpike') then
                         T.add(P,'survivor_spike','modeTask_survivor_spike_title','modeTask_survivor_spike_desc')
                     end
                 end,
@@ -59,7 +59,7 @@ return {
                 if P.stat.atk>=8 then
                     local eff=P.stat.atk/P.stat.line
                     if eff>=2 then
-                        if not PROGRESS.getExteriorModeState('survivor').showSpike then
+                        if not PROGRESS.getExteriorModeScore('survivor','showSpike') then
                             T.add(P,'survivor_spike','modeTask_survivor_spike_title','modeTask_survivor_spike_desc')
                             T.set(P,'survivor_spike',P.stat.atk/8,("($1/8)"):repD(P.stat.atk))
                         end

diff --git a/assets/progress.lua b/assets/progress.lua
@@ -405,6 +405,7 @@ function PROGRESS.getInteriorScore(mode) return prgs.interiorScore[mode] end
 function PROGRESS.getTotalInteriorScore() return prgs.interiorScore.dig+prgs.interiorScore.sprint+prgs.interiorScore.marathon end
 function PROGRESS.getExteriorMapState() return prgs.exteriorMap end
 function PROGRESS.getExteriorModeState(mode) return prgs.exteriorMap[mode] end ---@param mode Techmino.ModeName
+function PROGRESS.getExteriorModeScore(mode,key) local M=prgs.exteriorMap[mode] return M and M[key] end --[[@param mode Techmino.ModeName]] --[[@param key string]]
 function PROGRESS.getSecret(id) return not not prgs.secretFound[id] end
 
 --------------------------------------------------------------