Merge pull request #1185 from nEEtdo0d/shop_refactor

Fix: shop module refactor; medal shop adjustment
2026-03-12 07:28:21 +08:00 · 2022-06-05 15:34:52 +08:00
parent b67556af86 78e15ccdd2
commit 4ab0a6189a
34 changed files with 763 additions and 454 deletions
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -4766,6 +4766,69 @@
      "Filter": {
        "type": "textarea",
        "value": "DR > PR\n> BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2 > BookYellowT2 > BookBlueT2\n> RetrofitT3 > PlateGeneralT3\n> FoodT6 > FoodT5"
+      },
+      "RETROFIT_T1": {
+        "type": "select",
+        "value": "cl",
+        "option": [
+          "dd",
+          "cl",
+          "bb",
+          "cv"
+        ]
+      },
+      "RETROFIT_T2": {
+        "type": "select",
+        "value": "cl",
+        "option": [
+          "dd",
+          "cl",
+          "bb",
+          "cv"
+        ]
+      },
+      "RETROFIT_T3": {
+        "type": "select",
+        "value": "cl",
+        "option": [
+          "dd",
+          "cl",
+          "bb",
+          "cv"
+        ]
+      },
+      "PLATE_T1": {
+        "type": "select",
+        "value": "general",
+        "option": [
+          "general",
+          "gun",
+          "torpedo",
+          "antiair",
+          "plane"
+        ]
+      },
+      "PLATE_T2": {
+        "type": "select",
+        "value": "general",
+        "option": [
+          "general",
+          "gun",
+          "torpedo",
+          "antiair",
+          "plane"
+        ]
+      },
+      "PLATE_T3": {
+        "type": "select",
+        "value": "general",
+        "option": [
+          "general",
+          "gun",
+          "torpedo",
+          "antiair",
+          "plane"
+        ]
      }
    },
    "MeritShop": {
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -384,6 +384,24 @@ MedalShop:
    > BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2 > BookYellowT2 > BookBlueT2
    > RetrofitT3 > PlateGeneralT3
    > FoodT6 > FoodT5
+  RETROFIT_T1:
+    value: cl
+    option: [dd, cl, bb, cv]
+  RETROFIT_T2:
+    value: cl
+    option: [dd, cl, bb, cv]
+  RETROFIT_T3:
+    value: cl
+    option: [dd, cl, bb, cv]
+  PLATE_T1:
+    value: general
+    option: [general, gun, torpedo, antiair, plane]
+  PLATE_T2:
+    value: general
+    option: [general, gun, torpedo, antiair, plane]
+  PLATE_T3:
+    value: general
+    option: [general, gun, torpedo, antiair, plane]
 MeritShop:
  Refresh: false
  Filter: |-
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -245,6 +245,12 @@ class GeneratedConfig:

    # Group `MedalShop`
    MedalShop_Filter = 'DR > PR\n> BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2 > BookYellowT2 > BookBlueT2\n> RetrofitT3 > PlateGeneralT3\n> FoodT6 > FoodT5'
+    MedalShop_RETROFIT_T1 = 'cl'  # dd, cl, bb, cv
+    MedalShop_RETROFIT_T2 = 'cl'  # dd, cl, bb, cv
+    MedalShop_RETROFIT_T3 = 'cl'  # dd, cl, bb, cv
+    MedalShop_PLATE_T1 = 'general'  # general, gun, torpedo, antiair, plane
+    MedalShop_PLATE_T2 = 'general'  # general, gun, torpedo, antiair, plane
+    MedalShop_PLATE_T3 = 'general'  # general, gun, torpedo, antiair, plane

    # Group `MeritShop`
    MeritShop_Refresh = False
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -1406,7 +1406,58 @@
    },
    "Filter": {
      "name": "Item Filter",
-      "help": "All options have been defined at <https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string>"
+      "help": "All options have been defined at <https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string>\nDifferent from other shops, the below select options assist with filling the unknowns for the vague items 'Retrofit' and 'Plate'\nFurthermore restricted for 'Plate', there are both specific and wild types\nIf you are targeting a specific type then use a string combination such as 'PlateGeneralT3 > PlateWildT3' otherwise 'PlateT3' will purchase every available T3 Plate\nFor research blueprints it is adviseable to use 'DR > PR', players should convert surplus into Prototype Core currency"
+    },
+    "RETROFIT_T1": {
+      "name": "Type Preference RetrofitT1",
+      "help": "",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T2": {
+      "name": "Type Preference RetrofitT2",
+      "help": "",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T3": {
+      "name": "Type Preference RetrofitT3",
+      "help": "",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "PLATE_T1": {
+      "name": "Type Preference PlateT1",
+      "help": "",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T2": {
+      "name": "Type Preference PlateT2",
+      "help": "",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T3": {
+      "name": "Type Preference PlateT3",
+      "help": "",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
    }
  },
  "MeritShop": {
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -1407,6 +1407,57 @@
    "Filter": {
      "name": "MedalShop.Filter.name",
      "help": "MedalShop.Filter.help"
+    },
+    "RETROFIT_T1": {
+      "name": "MedalShop.RETROFIT_T1.name",
+      "help": "MedalShop.RETROFIT_T1.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T2": {
+      "name": "MedalShop.RETROFIT_T2.name",
+      "help": "MedalShop.RETROFIT_T2.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T3": {
+      "name": "MedalShop.RETROFIT_T3.name",
+      "help": "MedalShop.RETROFIT_T3.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "PLATE_T1": {
+      "name": "MedalShop.PLATE_T1.name",
+      "help": "MedalShop.PLATE_T1.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T2": {
+      "name": "MedalShop.PLATE_T2.name",
+      "help": "MedalShop.PLATE_T2.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T3": {
+      "name": "MedalShop.PLATE_T3.name",
+      "help": "MedalShop.PLATE_T3.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
    }
  },
  "MeritShop": {
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -1407,6 +1407,57 @@
    "Filter": {
      "name": "商店过滤器",
      "help": ""
+    },
+    "RETROFIT_T1": {
+      "name": "MedalShop.RETROFIT_T1.name",
+      "help": "MedalShop.RETROFIT_T1.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T2": {
+      "name": "MedalShop.RETROFIT_T2.name",
+      "help": "MedalShop.RETROFIT_T2.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T3": {
+      "name": "MedalShop.RETROFIT_T3.name",
+      "help": "MedalShop.RETROFIT_T3.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "PLATE_T1": {
+      "name": "MedalShop.PLATE_T1.name",
+      "help": "MedalShop.PLATE_T1.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T2": {
+      "name": "MedalShop.PLATE_T2.name",
+      "help": "MedalShop.PLATE_T2.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T3": {
+      "name": "MedalShop.PLATE_T3.name",
+      "help": "MedalShop.PLATE_T3.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
    }
  },
  "MeritShop": {
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -1407,6 +1407,57 @@
    "Filter": {
      "name": "兌換商店過濾器",
      "help": ""
+    },
+    "RETROFIT_T1": {
+      "name": "MedalShop.RETROFIT_T1.name",
+      "help": "MedalShop.RETROFIT_T1.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T2": {
+      "name": "MedalShop.RETROFIT_T2.name",
+      "help": "MedalShop.RETROFIT_T2.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "RETROFIT_T3": {
+      "name": "MedalShop.RETROFIT_T3.name",
+      "help": "MedalShop.RETROFIT_T3.help",
+      "dd": "dd",
+      "cl": "cl",
+      "bb": "bb",
+      "cv": "cv"
+    },
+    "PLATE_T1": {
+      "name": "MedalShop.PLATE_T1.name",
+      "help": "MedalShop.PLATE_T1.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T2": {
+      "name": "MedalShop.PLATE_T2.name",
+      "help": "MedalShop.PLATE_T2.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
+    },
+    "PLATE_T3": {
+      "name": "MedalShop.PLATE_T3.name",
+      "help": "MedalShop.PLATE_T3.help",
+      "general": "general",
+      "gun": "gun",
+      "torpedo": "torpedo",
+      "antiair": "antiair",
+      "plane": "plane"
    }
  },
  "MeritShop": {