refactor: Sub_ObtainedAwards->ObtainedAwards

MaaXYZ · Dec 8, 2024 · 7986be7 · 7986be7
1 parent 055d09a
commit 7986be7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json
@@ -2,8 +2,8 @@
     "Awards": {
         "next": [
             "Sub_MailBadge",
-            "Sub_JukeboxBadge",
             "Sub_DailyBadge",
+            "Sub_JukeboxBadge",
             "HomeFlag"
         ],
         "interrupt": [
@@ -38,9 +38,11 @@
         ],
         "action": "Click",
         "next": [
-            "Sub_ObtainedAwards",
             "NoMailAwards",
             "CollectMailAwards"
+        ],
+        "interrupt": [
+            "ObtainedAwards"
         ]
     },
     "ObtainedAwards": {
@@ -54,18 +56,6 @@
         ],
         "action": "Click"
     },
-    "Sub_ObtainedAwards": {
-        "is_sub": true,
-        "recognition": "TemplateMatch",
-        "template": "Awards/ObtainedAwards.png",
-        "roi": [
-            524,
-            62,
-            232,
-            158
-        ],
-        "action": "Click"
-    },
     "NoMailAwards": {
         "recognition": "TemplateMatch",
         "template": "Awards/NoMailAwards.png",
@@ -97,10 +87,11 @@
         "post_wait_freezes": 200,
         "next": [
             "Sub_CollectDailyAwards",
-            "Sub_ObtainedAwards",
-            "WeeklyAwardsBadge"
+            "WeeklyAwardsBadge",
+            "HomeFlag"
         ],
         "interrupt": [
+            "ObtainedAwards",
             "BackButton"
         ]
     },
@@ -132,10 +123,12 @@
         ],
         "next": [
             "Sub_CollectDailyAwards",
-            "Sub_ObtainedAwards",
             "WeeklyAwardsBadge",
-            "Sub_BackButton",
             "HomeFlag"
+        ],
+        "interrupt": [
+            "ObtainedAwards",
+            "BackButton"
         ]
     },
     "DailyAwardsPageFlag": {
@@ -164,9 +157,11 @@
         "next": [
             "Sub_CollectJukebox",
             "Sub_JukeboxAwardsBadge",
-            "Sub_ObtainedAwards",
-            "Sub_BackButton",
             "HomeFlag"
+        ],
+        "interrupt": [
+            "ObtainedAwards",
+            "BackButton"
         ]
     },
     "Sub_JukeboxAwardsBadge": {
@@ -183,10 +178,12 @@
         "action": "Click",
         "next": [
             "Sub_CollectJukebox",
-            "Sub_ObtainedAwards",
             "Sub_JukeboxAwardsBadge",
             "NoJukeboxAwards",
             "ExitEdition"
+        ],
+        "interrupt": [
+            "ObtainedAwards"
         ]
     },
     "ExitEdition": {
@@ -247,8 +244,10 @@
         "action": "Click",
         "post_wait_freezes": 200,
         "next": [
-            "Sub_CollectJukebox",
-            "Sub_ObtainedAwards"
+            "Sub_CollectJukebox"
+        ],
+        "interrupt": [
+            "ObtainedAwards"
         ]
     }
 }
diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json
@@ -112,13 +112,13 @@
         ],
         "action": "Click",
         "next": [
-            "Sub_ObtainedAwards",
             "CollectTrust",
             "TrustDialogueNext",
             "TrustDialogueInteraction",
             "HomeFlag"
         ],
         "interrupt": [
+            "ObtainedAwards",
             "HomeButton"
         ]
     },