Upd: remove merit, core, medal and guild coin

LmeSzinc · May 17, 2024 · 352963f · 352963f
1 parent b26f81b
commit 352963f
Show file tree

Hide file tree

Showing 12 changed files with 205 additions and 413 deletions.
diff --git a/config/template.json b/config/template.json
@@ -337,7 +337,10 @@
       "CoinLimit": 10000,
       "TaskCall": "Main"
     },
-    "EventStorage": {
+    "CampaignStorage": {
+      "Oil": {},
+      "Coin": {},
+      "Gem": {},
       "Pt": {}
     }
   },
@@ -1128,12 +1131,6 @@
       "PresetFilter": "cube",
       "CustomFilter": "DailyEvent > Gem-4 > Gem-2 > Gem-8 > ExtraCube-0:30\n> UrgentCube-1:30 > UrgentCube-1:45 > UrgentCube-3\n> ExtraDrill-5:20 > ExtraDrill-2 > ExtraDrill-3:20\n> UrgentCube-2:15 > UrgentCube-4\n> ExtraDrill-1 > UrgentCube-6 > ExtraCube-1:30\n> ExtraDrill-2:40 > ExtraDrill-0:20\n> Major > DailyChip > DailyResource\n> ExtraPart-0:30 > ExtraOil-1 > UrgentBox-6\n> ExtraCube-3 > ExtraPart-1 > UrgentBox-3\n> ExtraCube-4 > ExtraPart-1:30 > ExtraOil-4\n> UrgentBox-1 > ExtraCube-5 > UrgentBox-1\n> ExtraCube-8 > ExtraOil-8\n> UrgentDrill-4 > UrgentDrill-2:40 > UrgentDrill-2\n> UrgentDrill-1 > UrgentDrill-1:30 > UrgentDrill-1:10\n> Extra-0:20 > Extra-0:30 > Extra-1:00 > Extra-1:30 > Extra-2:00\n> shortest",
       "DoMajorCommission": false
-    },
-    "ItemStorage": {
-      "Oil": {},
-      "Coin": {},
-      "Gem": {},
-      "Cube": {}
     }
   },
   "Tactical": {
@@ -1376,12 +1373,6 @@
     },
     "CoreShop": {
       "Filter": "Array"
-    },
-    "ShopStorage": {
-      "Merit": {},
-      "Core": {},
-      "Medal": {},
-      "GuildCoin": {}
     }
   },
   "Shipyard": {
@@ -1420,6 +1411,9 @@
       "Amount": 1,
       "UseTicket": true,
       "UseDrill": false
+    },
+    "GachaStorage": {
+      "Cube": {}
     }
   },
   "Freebies": {

diff --git a/module/config/argument/args.json b/module/config/argument/args.json
@@ -1862,7 +1862,31 @@
         ]
       }
     },
-    "EventStorage": {
+    "CampaignStorage": {
+      "Oil": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredOil",
+        "order": 1,
+        "color": "#000000"
+      },
+      "Coin": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredCoin",
+        "order": 2,
+        "color": "#FFAA33"
+      },
+      "Gem": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 3,
+        "color": "#FF3333"
+      },
       "Pt": {
         "type": "stored",
         "value": {},
@@ -6451,40 +6475,6 @@
         "type": "checkbox",
         "value": false
       }
-    },
-    "ItemStorage": {
-      "Oil": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredOil",
-        "order": 1,
-        "color": "#000000"
-      },
-      "Coin": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredCoin",
-        "order": 2,
-        "color": "#FFAA33"
-      },
-      "Gem": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 3,
-        "color": "#FF3333"
-      },
-      "Cube": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 8,
-        "color": "#33FFFF"
-      }
     }
   },
   "Tactical": {
@@ -7586,40 +7576,6 @@
         "type": "textarea",
         "value": "Array"
       }
-    },
-    "ShopStorage": {
-      "Merit": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 9,
-        "color": "#FFFF00"
-      },
-      "Core": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 10,
-        "color": "#AAAAAA"
-      },
-      "Medal": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 11,
-        "color": "#FFDD00"
-      },
-      "GuildCoin": {
-        "type": "stored",
-        "value": {},
-        "display": "hide",
-        "stored": "StoredInt",
-        "order": 12,
-        "color": "#AAAAAA"
-      }
     }
   },
   "Shipyard": {
@@ -7797,6 +7753,16 @@
         "type": "checkbox",
         "value": false
       }
+    },
+    "GachaStorage": {
+      "Cube": {
+        "type": "stored",
+        "value": {},
+        "display": "hide",
+        "stored": "StoredInt",
+        "order": 5,
+        "color": "#33FFFF"
+      }
     }
   },
   "Freebies": {
@@ -7963,15 +7929,15 @@
         "value": {},
         "display": "hide",
         "stored": "StoredInt",
-        "order": 5,
+        "order": 7,
         "color": "#FF8800"
       },
       "PurpleCoin": {
         "type": "stored",
         "value": {},
         "display": "hide",
         "stored": "StoredInt",
-        "order": 7,
+        "order": 8,
         "color": "#7700BB"
       },
       "ActionPoint": {

diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml
@@ -278,6 +278,23 @@ GemsFarming:
     value: any
     option: [ any, aulick_or_foote , cassin_or_downes ]
   CommissionLimit: true
+CampaignStorage:
+  Oil:
+    stored: StoredOil
+    order: 1
+    color: "#000000"
+  Coin:
+    stored: StoredCoin
+    order: 2
+    color: "#FFAA33"
+  Gem:
+    stored: StoredInt
+    order: 3
+    color: "#FF3333"
+  Pt:
+    stored: StoredInt
+    order: 4
+    color: "#00BFFF"
 
 # ==================== Event ====================
 
@@ -308,11 +325,6 @@ Coalition:
   Fleet:
     value: single
     option: [ single, multi ]
-EventStorage:
-  Pt:
-    stored: StoredInt
-    order: 4
-    color: "#00BFFF"
 
 # ==================== Reward ====================
 
@@ -526,23 +538,6 @@ MeritShop:
 CoreShop:
   Filter: |-
     Array
-ShopStorage:
-  Merit:
-    stored: StoredInt
-    order: 9
-    color: "#FFFF00"
-  Core:
-    stored: StoredInt
-    order: 10
-    color: "#AAAAAA"
-  Medal:
-    stored: StoredInt
-    order: 11
-    color: "#FFDD00"
-  GuildCoin:
-    stored: StoredInt
-    order: 12
-    color: "#AAAAAA"
 ShipyardDr:
   ResearchSeries:
     value: 2
@@ -587,22 +582,10 @@ SupplyPack:
     option: [ 0, 1, 2, 3, 4, 5, 6 ]
 Minigame:
   Collect: false
-ItemStorage:
-  Oil:
-    stored: StoredOil
-    order: 1
-    color: "#000000"
-  Coin:
-    stored: StoredCoin
-    order: 2
-    color: "#FFAA33"
-  Gem:
-    stored: StoredInt
-    order: 3
-    color: "#FF3333"
+GachaStorage:
   Cube:
     stored: StoredInt
-    order: 8
+    order: 5
     color: "#33FFFF"
 
 # ==================== Daily ====================
@@ -738,11 +721,11 @@ OpsiHazard1Leveling:
 OpsiStorage:
   YellowCoin:
     stored: StoredInt
-    order: 5
+    order: 7
     color: "#FF8800"
   PurpleCoin:
     stored: StoredInt
-    order: 7
+    order: 8
     color: "#7700BB"
   ActionPoint:
     stored: StoredInt