🔖: Support StarRail 2.0

Signed-off-by: ishkong <19740260+ishkong@users.noreply.github.com>

starrail_damage_cal/map/data/AvatarRelicScore.json

@@ -161,7 +161,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "卡芙卡",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,
@@ -197,7 +197,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "镜流",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,
@@ -233,7 +233,7 @@
         "StatusResistanceBase": 0.75,
         "AttributeAddedRatio": 0
     },
-	{
+    {
         "role": "玲可",
         "HPDelta": 1.0,
         "HPAddedRatio": 1.0,
@@ -251,7 +251,7 @@
         "StatusResistanceBase": 0.75,
         "AttributeAddedRatio": 0
     },
-	{
+    {
         "role": "藿藿",
         "HPDelta": 1.0,
         "HPAddedRatio": 1.0,
@@ -269,7 +269,7 @@
         "StatusResistanceBase": 0.75,
         "AttributeAddedRatio": 0
     },
-	{
+    {
         "role": "符玄",
         "HPDelta": 1.0,
         "HPAddedRatio": 1.0,
@@ -287,7 +287,7 @@
         "StatusResistanceBase": 1.0,
         "AttributeAddedRatio": 0
     },
-	{
+    {
         "role": "罗刹",
         "HPDelta": 0.75,
         "HPAddedRatio": 0.75,
@@ -305,7 +305,7 @@
         "StatusResistanceBase": 0.75,
         "AttributeAddedRatio": 0
     },
-	{
+    {
         "role": "桂乃芬",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,
@@ -323,7 +323,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "驭空",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,
@@ -629,7 +629,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "刃",
         "HPDelta": 0.75,
         "HPAddedRatio": 0.75,
@@ -683,7 +683,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "托帕&账账",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,
@@ -701,7 +701,7 @@
         "StatusResistanceBase": 0.0,
         "AttributeAddedRatio": 1
     },
-	{
+    {
         "role": "银枝",
         "HPDelta": 0.0,
         "HPAddedRatio": 0.0,

starrail_damage_cal/map/data/EquipmentID2EnName_mapping_2.0.0.json

@@ -77,9 +77,19 @@
   "21025": "PastandFuture",
   "23017": "NightofFright",
   "23018": "AnInstantBeforeAGaze",
-  "22001": "Hey,OverHere",
-  "24003": "SolitaryHealing",
-  "21007": "SharedFeeling",
   "23019": "PastSelfinMirror",
-  "23020": "BaptismofPureThought"
+  "23021": "EarthlyEscapade",
+  "23020": "BaptismofPureThought",
+  "24003": "SolitaryHealing",
+  "21035": "WhatIsReal?",
+  "21038": "FlamesAfar",
+  "21039": "Destiny'sThreadsForewoven",
+  "21040": "TheDayTheCosmosFell",
+  "21041": "It'sShowtime",
+  "23022": "ReforgedRemembrance",
+  "21007": "SharedFeeling",
+  "22001": "Hey,OverHere",
+  "21042": "IndeliblePromise",
+  "21037": "FinalVictor",
+  "21036": "DreamvilleAdventure"
 }

starrail_damage_cal/map/data/EquipmentID2Name_mapping_2.0.0.json

@@ -77,9 +77,19 @@
   "21025": "过往未来",
   "23017": "惊魂夜",
   "23018": "片刻，留在眼底",
-  "22001": "嘿，我在这儿",
-  "24003": "孤独的疗愈",
-  "21007": "同一种心情",
   "23019": "镜中故我",
-  "23020": "纯粹思维的洗礼"
+  "23021": "游戏尘寰",
+  "23020": "纯粹思维的洗礼",
+  "24003": "孤独的疗愈",
+  "21035": "何物为真",
+  "21038": "在火的远处",
+  "21039": "织造命运之线",
+  "21040": "银河沦陷日",
+  "21041": "好戏开演",
+  "23022": "重塑时光之忆",
+  "21007": "同一种心情",
+  "22001": "嘿，我在这儿",
+  "21042": "铭记于心的约定",
+  "21037": "最后的赢家",
+  "21036": "美梦小镇大冒险"
 }

starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_2.0.0.json

@@ -55,6 +55,14 @@
   "21032": 4,
   "21033": 4,
   "21034": 4,
+  "21035": 4,
+  "21036": 4,
+  "21037": 4,
+  "21038": 4,
+  "21039": 4,
+  "21040": 4,
+  "21041": 4,
+  "21042": 4,
   "22000": 4,
   "22001": 4,
   "23000": 5,
@@ -76,10 +84,12 @@
   "23016": 5,
   "23017": 5,
   "23018": 5,
+  "23019": 5,
+  "23020": 5,
+  "23021": 5,
+  "23022": 5,
   "24000": 5,
   "24001": 5,
   "24002": 5,
-  "24003": 5,
+  "24003": 5
-  "23019": 5,
-  "23020": 5
 }

starrail_damage_cal/map/data/ItemId2Name_mapping_2.0.0.json

@@ -63,6 +63,14 @@
     "31162": "系囚的铅石梏铐",
     "31163": "系囚的幽闭缚束",
     "31164": "系囚的绝足锁桎",
+    "31171": "先驱的绝热围壳",
+    "31172": "先驱的虚极罗盘",
+    "31173": "先驱的密合铅衣",
+    "31174": "先驱的泊星桩锚",
+    "31181": "钟表匠的极目透镜",
+    "31182": "钟表匠的交运腕表",
+    "31183": "钟表匠的空幻礼服",
+    "31184": "钟表匠的隐梦革履",
     "33015": "「黑塔」的空间站点",
     "33016": "「黑塔」的漫历轨迹",
     "33025": "罗浮仙舟的天外楼船",
@@ -151,6 +159,14 @@
     "41162": "系囚的铅石梏铐",
     "41163": "系囚的幽闭缚束",
     "41164": "系囚的绝足锁桎",
+    "41171": "先驱的绝热围壳",
+    "41172": "先驱的虚极罗盘",
+    "41173": "先驱的密合铅衣",
+    "41174": "先驱的泊星桩锚",
+    "41181": "钟表匠的极目透镜",
+    "41182": "钟表匠的交运腕表",
+    "41183": "钟表匠的空幻礼服",
+    "41184": "钟表匠的隐梦革履",
     "43015": "「黑塔」的空间站点",
     "43016": "「黑塔」的漫历轨迹",
     "43025": "罗浮仙舟的天外楼船",
@@ -239,6 +255,14 @@
     "51162": "系囚的铅石梏铐",
     "51163": "系囚的幽闭缚束",
     "51164": "系囚的绝足锁桎",
+    "51171": "先驱的绝热围壳",
+    "51172": "先驱的虚极罗盘",
+    "51173": "先驱的密合铅衣",
+    "51174": "先驱的泊星桩锚",
+    "51181": "钟表匠的极目透镜",
+    "51182": "钟表匠的交运腕表",
+    "51183": "钟表匠的空幻礼服",
+    "51184": "钟表匠的隐梦革履",
     "53015": "「黑塔」的空间站点",
     "53016": "「黑塔」的漫历轨迹",
     "53025": "罗浮仙舟的天外楼船",
@@ -333,6 +357,14 @@
     "61162": "系囚的铅石梏铐",
     "61163": "系囚的幽闭缚束",
     "61164": "系囚的绝足锁桎",
+    "61171": "先驱的绝热围壳",
+    "61172": "先驱的虚极罗盘",
+    "61173": "先驱的密合铅衣",
+    "61174": "先驱的泊星桩锚",
+    "61181": "钟表匠的极目透镜",
+    "61182": "钟表匠的交运腕表",
+    "61183": "钟表匠的空幻礼服",
+    "61184": "钟表匠的隐梦革履",
     "63015": "「黑塔」的空间站点",
     "63016": "「黑塔」的漫历轨迹",
     "63025": "罗浮仙舟的天外楼船",

starrail_damage_cal/map/data/RelicId2MainAffixGroup_mapping_2.0.0.json

@@ -356,5 +356,37 @@
     "33126": 26,
     "43126": 36,
     "53126": 46,
-    "63126": 56
+    "63126": 56,
+    "31171": 21,
+    "41171": 31,
+    "51171": 41,
+    "61171": 51,
+    "31172": 22,
+    "41172": 32,
+    "51172": 42,
+    "61172": 52,
+    "31173": 23,
+    "41173": 33,
+    "51173": 43,
+    "61173": 53,
+    "31174": 24,
+    "41174": 34,
+    "51174": 44,
+    "61174": 54,
+    "31181": 21,
+    "41181": 31,
+    "51181": 41,
+    "61181": 51,
+    "31182": 22,
+    "41182": 32,
+    "51182": 42,
+    "61182": 52,
+    "31183": 23,
+    "41183": 33,
+    "51183": 43,
+    "61183": 53,
+    "31184": 24,
+    "41184": 34,
+    "51184": 44,
+    "61184": 54
 }

starrail_damage_cal/map/data/RelicId2Rarity_mapping_2.0.0.json

@@ -63,6 +63,14 @@
     "31162": 2,
     "31163": 2,
     "31164": 2,
+    "31171": 2,
+    "31172": 2,
+    "31173": 2,
+    "31174": 2,
+    "31181": 2,
+    "31182": 2,
+    "31183": 2,
+    "31184": 2,
     "33015": 2,
     "33016": 2,
     "33025": 2,
@@ -151,6 +159,14 @@
     "41162": 3,
     "41163": 3,
     "41164": 3,
+    "41171": 3,
+    "41172": 3,
+    "41173": 3,
+    "41174": 3,
+    "41181": 3,
+    "41182": 3,
+    "41183": 3,
+    "41184": 3,
     "43015": 3,
     "43016": 3,
     "43025": 3,
@@ -239,6 +255,14 @@
     "51162": 4,
     "51163": 4,
     "51164": 4,
+    "51171": 4,
+    "51172": 4,
+    "51173": 4,
+    "51174": 4,
+    "51181": 4,
+    "51182": 4,
+    "51183": 4,
+    "51184": 4,
     "53015": 4,
     "53016": 4,
     "53025": 4,
@@ -333,6 +357,14 @@
     "61162": 5,
     "61163": 5,
     "61164": 5,
+    "61171": 5,
+    "61172": 5,
+    "61173": 5,
+    "61174": 5,
+    "61181": 5,
+    "61182": 5,
+    "61183": 5,
+    "61184": 5,
     "63015": 5,
     "63016": 5,
     "63025": 5,

starrail_damage_cal/map/data/RelicId2SetId_mapping_2.0.0.json

@@ -356,5 +356,37 @@
     "33126": 312,
     "43126": 312,
     "53126": 312,
-    "63126": 312
+    "63126": 312,
+    "31171": 117,
+    "41171": 117,
+    "51171": 117,
+    "61171": 117,
+    "31172": 117,
+    "41172": 117,
+    "51172": 117,
+    "61172": 117,
+    "31173": 117,
+    "41173": 117,
+    "51173": 117,
+    "61173": 117,
+    "31174": 117,
+    "41174": 117,
+    "51174": 117,
+    "61174": 117,
+    "31181": 118,
+    "41181": 118,
+    "51181": 118,
+    "61181": 118,
+    "31182": 118,
+    "41182": 118,
+    "51182": 118,
+    "61182": 118,
+    "31183": 118,
+    "41183": 118,
+    "51183": 118,
+    "61183": 118,
+    "31184": 118,
+    "41184": 118,
+    "51184": 118,
+    "61184": 118
 }

starrail_damage_cal/map/data/RelicSetSkill_mapping_2.0.0.json

@@ -2,38 +2,38 @@
     "101": {
         "2": {
             "Property": "HealRatioBase",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "102": {
         "2": {
             "Property": "AttackAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         },
         "4": {
             "Property": "SpeedAddedRatio",
-            "Value": 0.060000000055879354
+            "Value": 0.06
         }
     },
     "103": {
         "2": {
             "Property": "DefenceAddedRatio",
-            "Value": 0.1500000001396984
+            "Value": 0.15
         },
         "4": {}
     },
     "104": {
         "2": {
             "Property": "IceAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "105": {
         "2": {
             "Property": "PhysicalAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
@@ -44,119 +44,119 @@
     "107": {
         "2": {
             "Property": "FireAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "108": {
         "2": {
             "Property": "QuantumAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "109": {
         "2": {
             "Property": "ThunderAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "110": {
         "2": {
             "Property": "WindAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "111": {
         "2": {
             "Property": "BreakDamageAddedRatioBase",
-            "Value": 0.1600000001490116
+            "Value": 0.16
         },
         "4": {
             "Property": "BreakDamageAddedRatioBase",
-            "Value": 0.1600000001490116
+            "Value": 0.16
         }
     },
     "112": {
         "2": {
             "Property": "ImaginaryAddedRatio",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         },
         "4": {}
     },
     "301": {
         "2": {
             "Property": "AttackAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         }
     },
     "302": {
         "2": {
             "Property": "HPAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         }
     },
     "303": {
         "2": {
             "Property": "StatusProbabilityBase",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         }
     },
     "304": {
         "2": {
             "Property": "DefenceAddedRatio",
-            "Value": 0.1500000001396984
+            "Value": 0.15
         }
     },
     "305": {
         "2": {
             "Property": "CriticalDamageBase",
-            "Value": 0.1600000001490116
+            "Value": 0.16
         }
     },
     "306": {
         "2": {
             "Property": "CriticalChanceBase",
-            "Value": 0.0800000000745058
+            "Value": 0.08
         }
     },
     "307": {
         "2": {
             "Property": "BreakDamageAddedRatioBase",
-            "Value": 0.1600000001490116
+            "Value": 0.16
         }
     },
     "308": {
         "2": {
             "Property": "SPRatioBase",
-            "Value": 0.05000000004656613
+            "Value": 0.05
         }
     },
     "309": {
         "2": {
             "Property": "CriticalChanceBase",
-            "Value": 0.0800000000745058
+            "Value": 0.08
         }
     },
     "310": {
         "2": {
             "Property": "StatusResistanceBase",
-            "Value": 0.10000000009313226
+            "Value": 0.1
         }
     },
     "113": {
         "2": {
             "Property": "HPAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         },
         "4": {}
     },
     "114": {
         "2": {
             "Property": "SpeedAddedRatio",
-            "Value": 0.060000000055879354
+            "Value": 0.06
         },
         "4": {}
     },
@@ -167,20 +167,34 @@
     "116": {
         "2": {
             "Property": "AttackAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         },
         "4": {}
     },
     "311": {
         "2": {
             "Property": "AttackAddedRatio",
-            "Value": 0.12000000011175871
+            "Value": 0.12
         }
     },
     "312": {
         "2": {
             "Property": "SPRatioBase",
-            "Value": 0.05000000004656613
+            "Value": 0.05
         }
+    },
+    "117": {
+        "2": {},
+        "4": {
+            "Property": "CriticalChanceBase",
+            "Value": 0.04
+        }
+    },
+    "118": {
+        "2": {
+            "Property": "BreakDamageAddedRatioBase",
+            "Value": 0.16
+        },
+        "4": {}
     }
 }

starrail_damage_cal/map/data/SetId2Name_mapping_2.0.0.json

@@ -15,6 +15,8 @@
     "114": "骇域漫游的信使",
     "115": "毁烬焚骨的大公",
     "116": "幽锁深牢的系囚",
+    "117": "死水深潜的先驱",
+    "118": "机心戏梦的钟表匠",
     "301": "太空封印站",
     "302": "不老者的仙舟",
     "303": "泛银河商业公司",

starrail_damage_cal/map/data/avatarId2DamageType_mapping_1.5.0.json

@@ -1,46 +0,0 @@
-{
-  "1001": "Ice",
-  "1002": "Wind",
-  "1003": "Fire",
-  "1004": "Imaginary",
-  "1005": "Thunder",
-  "1006": "Quantum",
-  "1008": "Thunder",
-  "1009": "Fire",
-  "1013": "Ice",
-  "1101": "Wind",
-  "1102": "Quantum",
-  "1103": "Thunder",
-  "1104": "Ice",
-  "1105": "Physical",
-  "1106": "Ice",
-  "1107": "Physical",
-  "1108": "Wind",
-  "1109": "Fire",
-  "1110": "Quantum",
-  "1111": "Physical",
-  "1112": "Fire",
-  "1201": "Quantum",
-  "1202": "Thunder",
-  "1203": "Imaginary",
-  "1204": "Thunder",
-  "1205": "Wind",
-  "1206": "Physical",
-  "1207": "Imaginary",
-  "1208": "Quantum",
-  "1209": "Ice",
-  "1210": "Fire",
-  "1211": "Thunder",
-  "1212": "Ice",
-  "1213": "Imaginary",
-  "1215": "Physical",
-  "1217": "Wind",
-  "1302": "Physical",
-  "8001": "Physical",
-  "8002": "Physical",
-  "8003": "Fire",
-  "8004": "Fire",
-  "1214": "Quantum",
-  "1303": "Ice",
-  "1305": "Imaginary"
-}

starrail_damage_cal/map/data/avatarId2DamageType_mapping_2.0.0.json

@@ -0,0 +1,49 @@
+{
+    "1001": "Ice",
+    "1002": "Wind",
+    "1003": "Fire",
+    "1004": "Imaginary",
+    "1005": "Thunder",
+    "1006": "Quantum",
+    "1008": "Thunder",
+    "1009": "Fire",
+    "1013": "Ice",
+    "1101": "Wind",
+    "1102": "Quantum",
+    "1103": "Thunder",
+    "1104": "Ice",
+    "1105": "Physical",
+    "1106": "Ice",
+    "1107": "Physical",
+    "1108": "Wind",
+    "1109": "Fire",
+    "1110": "Quantum",
+    "1111": "Physical",
+    "1112": "Fire",
+    "1201": "Quantum",
+    "1202": "Thunder",
+    "1203": "Imaginary",
+    "1204": "Thunder",
+    "1205": "Wind",
+    "1206": "Physical",
+    "1207": "Imaginary",
+    "1208": "Quantum",
+    "1209": "Ice",
+    "1210": "Fire",
+    "1211": "Thunder",
+    "1212": "Ice",
+    "1213": "Imaginary",
+    "1214": "Quantum",
+    "1215": "Physical",
+    "1217": "Wind",
+    "1302": "Physical",
+    "1303": "Ice",
+    "1305": "Imaginary",
+    "1306": "Quantum",
+    "1307": "Wind",
+    "1312": "Ice",
+    "8001": "Physical",
+    "8002": "Physical",
+    "8003": "Fire",
+    "8004": "Fire"
+}

starrail_damage_cal/map/data/avatarId2EnName_mapping_2.0.0.json

@@ -33,14 +33,17 @@
   "1211": "Bailu",
   "1212": "Jingliu",
   "1213": "DanHeng•ImbibitorLunae",
+  "1214": "Xueyi",
   "1215": "Hanya",
   "1217": "Huohuo",
   "1302": "Argenti",
+  "1303": "RuanMei",
+  "1305": "Dr. Ratio",
+  "1306": "Sparkle",
+  "1307": "BlackSwan",
+  "1312": "Misha",
   "8001": "{NICKNAME}",
   "8002": "{NICKNAME}",
   "8003": "{NICKNAME}",
-  "8004": "{NICKNAME}",
+  "8004": "{NICKNAME}"
-  "1214": "Xueyi",
-  "1303": "Ruan Mei",
-  "1305": "Dr. Ratio"
 }

starrail_damage_cal/map/data/avatarId2Name_mapping_2.0.0.json

@@ -33,14 +33,17 @@
   "1211": "白露",
   "1212": "镜流",
   "1213": "丹恒•饮月",
+  "1214": "雪衣",
   "1215": "寒鸦",
   "1217": "藿藿",
   "1302": "银枝",
+  "1303": "阮•梅",
+  "1305": "真理医生",
+  "1306": "花火",
+  "1307": "黑天鹅",
+  "1312": "米沙",
   "8001": "开拓者",
   "8002": "开拓者",
   "8003": "开拓者",
-  "8004": "开拓者",
+  "8004": "开拓者"
-  "1214": "雪衣",
-  "1303": "阮•梅",
-  "1305": "真理医生"
 }

starrail_damage_cal/map/data/avatarId2Rarity_mapping_2.0.0.json

@@ -33,14 +33,17 @@
   "1211": "5",
   "1212": "5",
   "1213": "5",
+  "1214": "4",
   "1215": "4",
   "1217": "5",
   "1302": "5",
+  "1303": "5",
+  "1305": "5",
+  "1306": "5",
+  "1307": "5",
+  "1312": "4",
   "8001": "5",
   "8002": "5",
   "8003": "5",
-  "8004": "5",
+  "8004": "5"
-  "1214": "4",
-  "1303": "5",
-  "1305": "5"
 }

starrail_damage_cal/map/data/avatarId2Star_mapping_2.0.0.json

@@ -33,14 +33,17 @@
   "1211": "5",
   "1212": "5",
   "1213": "5",
+  "1214": "4",
   "1215": "4",
   "1217": "5",
   "1302": "5",
+  "1303": "5",
+  "1305": "5",
+  "1306": "5",
+  "1307": "5",
+  "1312": "4",
   "8001": "5",
   "8002": "5",
   "8003": "5",
-  "8004": "5",
+  "8004": "5"
-  "1214": "4",
-  "1303": "5",
-  "1305": "5"
 }

starrail_damage_cal/map/data/avatarRankSkillUp_mapping_2.0.0.json

@@ -847,6 +847,30 @@
     }
   ],
   "121306": [],
+  "121401": [],
+  "121402": [],
+  "121403": [
+    {
+      "id": "121402",
+      "num": 2
+    },
+    {
+      "id": "121401",
+      "num": 1
+    }
+  ],
+  "121404": [],
+  "121405": [
+    {
+      "id": "121403",
+      "num": 2
+    },
+    {
+      "id": "121404",
+      "num": 2
+    }
+  ],
+  "121406": [],
   "121501": [],
   "121502": [],
   "121503": [
@@ -923,6 +947,126 @@
     }
   ],
   "130206": [],
+  "130301": [],
+  "130302": [],
+  "130303": [
+    {
+      "id": "130303",
+      "num": 2
+    },
+    {
+      "id": "130304",
+      "num": 2
+    }
+  ],
+  "130304": [],
+  "130305": [
+    {
+      "id": "130302",
+      "num": 2
+    },
+    {
+      "id": "130301",
+      "num": 1
+    }
+  ],
+  "130306": [],
+  "130501": [],
+  "130502": [],
+  "130503": [
+    {
+      "id": "130501",
+      "num": 1
+    },
+    {
+      "id": "130503",
+      "num": 2
+    }
+  ],
+  "130504": [],
+  "130505": [
+    {
+      "id": "130502",
+      "num": 2
+    },
+    {
+      "id": "130504",
+      "num": 2
+    }
+  ],
+  "130506": [],
+  "130601": [],
+  "130602": [],
+  "130603": [
+    {
+      "id": "130602",
+      "num": 2
+    },
+    {
+      "id": "130601",
+      "num": 1
+    }
+  ],
+  "130604": [],
+  "130605": [
+    {
+      "id": "130603",
+      "num": 2
+    },
+    {
+      "id": "130604",
+      "num": 2
+    }
+  ],
+  "130606": [],
+  "130701": [],
+  "130702": [],
+  "130703": [
+    {
+      "id": "130702",
+      "num": 2
+    },
+    {
+      "id": "130704",
+      "num": 2
+    }
+  ],
+  "130704": [],
+  "130705": [
+    {
+      "id": "130703",
+      "num": 2
+    },
+    {
+      "id": "130701",
+      "num": 1
+    }
+  ],
+  "130706": [],
+  "131201": [],
+  "131202": [],
+  "131203": [
+    {
+      "id": "131203",
+      "num": 2
+    },
+    {
+      "id": "131201",
+      "num": 1
+    }
+  ],
+  "131204": [],
+  "131205": [
+    {
+      "id": "131202",
+      "num": 2
+    },
+    {
+      "id": "131204",
+      "num": 2
+    }
+  ],
+  "131206": [],
   "800101": [],
   "800102": [],
   "800103": [
@@ -1042,77 +1186,5 @@
       "num": 1
     }
   ],
-  "800406": [],
+  "800406": []
-  "121401": [],
-  "121402": [],
-  "121403": [
-    {
-      "id": "121401",
-      "num": 1
-    },
-    {
-      "id": "121402",
-      "num": 2
-    }
-  ],
-  "121404": [],
-  "121405": [
-    {
-      "id": "121403",
-      "num": 2
-    },
-    {
-      "id": "121404",
-      "num": 2
-    }
-  ],
-  "121406": [],
-  "130301": [],
-  "130302": [],
-  "130303": [
-    {
-      "id": "130303",
-      "num": 2
-    },
-    {
-      "id": "130304",
-      "num": 2
-    }
-  ],
-  "130304": [],
-  "130305": [
-    {
-      "id": "130301",
-      "num": 1
-    },
-    {
-      "id": "130302",
-      "num": 2
-    }
-  ],
-  "130306": [],
-  "130501": [],
-  "130502": [],
-  "130503": [
-    {
-      "id": "130501",
-      "num": 1
-    },
-    {
-      "id": "130503",
-      "num": 2
-    }
-  ],
-  "130504": [],
-  "130505": [
-    {
-      "id": "130502",
-      "num": 2
-    },
-    {
-      "id": "130504",
-      "num": 2
-    }
-  ],
-  "130506": []
 }

starrail_damage_cal/map/data/char_alias.json

@@ -1,200 +1,44 @@
 {
     "characters": {
-        "1001": [
+        "1001": ["三月七", "三月", "小三月", "阿七", "冷面小粉龙", "纠缠之缘", "小仓唯", "xcw"],
-            "三月七",
+        "1002": ["丹恒", "冷面小青龙", "闷葫芦"],
-            "三月",
+        "1003": ["姬子", "姬子阿姐"],
-            "小三月",
+        "1004": ["瓦尔特", "瓦尔特杨", "杨叔", "牧月忍冬", "约阿希姆诺基安维塔宁"],
-            "阿七",
+        "1005": ["卡芙卡", "妈", "妈妈"],
-            "冷面小粉龙",
+        "1006": ["银狼", "小板鸭", "酷鸭", "超级骇客"],
-            "纠缠之缘",
+        "1008": ["阿兰"],
-            "小仓唯",
+        "1009": ["艾丝妲", "富婆", "代理站长", "知名不具"],
-            "xcw"
+        "1013": ["黑塔", "天才俱乐部#83", "天才俱乐部第83席", "天才俱乐部第八十三席", "黑塔女士"],
-        ],
+        "1101": ["布洛妮娅", "布洛妮娅兰德", "兰德鸭", "大板鸭", "三涡轮增鸭"],
-        "1002": [
+        "1102": ["希儿", "蝴蝶", "希尔"],
-            "丹恒",
+        "1103": ["希露瓦", "希露瓦朗道", "朗道家长女", "贝洛伯格机械师"],
-            "冷面小青龙",
+        "1104": ["杰帕德", "杰帕德朗道", "杰哥", "小杰杰"],
-            "闷葫芦"
+        "1105": ["娜塔莎", "娜塔", "娜塔莎姐姐", "老巫婆"],
-        ],
+        "1106": ["佩拉", "佩拉格娅谢尔盖耶夫娜", "佩拉格娅", "谢尔盖耶夫娜"],
-        "1003": [
+        "1107": ["克拉拉", "猩红兔子", "天才侦探少女", "史瓦罗", "史瓦罗发射器"],
-            "姬子",
+        "1108": ["桑博", "桑博科斯基", "深蓝帅哥", "布鲁海尔波桑"],
-            "姬子阿姐"
+        "1109": ["虎克", "漆黑的虎克大人"],
-        ],
+        "1110": ["玲可"],
-        "1004": [
+        "1111": ["卢卡", "铁臂卢卡", "熔锤镇的卢卡"],
-            "瓦尔特",
+        "1112": ["托帕&账账", "托帕", "账账", "账账启动器"],
-            "瓦尔特杨",
+        "1201": ["青雀", "QQ"],
-            "杨叔",
+        "1202": ["停云", "屑狐狸", "骚狐狸"],
-            "牧月忍冬",
+        "1203": ["罗刹", "主教"],
-            "约阿希姆诺基安维塔宁"
+        "1204": ["景元", "云骑将军", "闭目将军"],
-        ],
+        "1205": ["刃", "应星", "阿刃", "点刀哥", "笑面小黑龙"],
-        "1005": [
+        "1206": ["素裳", "李素裳", "李大枕头"],
-            "卡芙卡",
+        "1207": ["驭空", "星火之狐", "司舵"],
-            "妈",
+        "1208": ["符玄"],
-            "妈妈"
+        "1209": ["彦卿", "马彦卿", "老马"],
-        ],
+        "1211": ["白露", "衔药龙女"],
-        "1006": [
+        "1212": ["镜流"],
-            "银狼",
+        "1213": ["丹恒•饮月", "饮月君", "饮月", "龙丹"],
-            "小板鸭",
+        "1214": ["雪衣"],
-            "酷鸭",
+        "1215": ["寒鸦"],
-            "超级骇客"
+        "1217": ["藿藿"],
-        ],
+        "1302": ["银枝"],
-        "1008": [
+        "1305": ["真理医生"],
-            "阿兰"
+        "1303": ["阮•梅", "阮梅"],
-        ],
-        "1009": [
-            "艾丝妲",
-            "富婆",
-            "代理站长",
-            "知名不具"
-        ],
-        "1013": [
-            "黑塔",
-            "天才俱乐部#83",
-            "天才俱乐部第83席",
-            "天才俱乐部第八十三席",
-            "黑塔女士"
-        ],
-        "1101": [
-            "布洛妮娅",
-            "布洛妮娅兰德",
-            "兰德鸭",
-            "大板鸭",
-            "三涡轮增鸭"
-        ],
-        "1102": [
-            "希儿",
-            "蝴蝶",
-            "希尔"
-        ],
-        "1103": [
-            "希露瓦",
-            "希露瓦朗道",
-            "朗道家长女",
-            "贝洛伯格机械师"
-        ],
-        "1104": [
-            "杰帕德",
-            "杰帕德朗道",
-            "杰哥",
-            "小杰杰"
-        ],
-        "1105": [
-            "娜塔莎",
-            "娜塔",
-            "娜塔莎姐姐",
-            "老巫婆"
-        ],
-        "1106": [
-            "佩拉",
-            "佩拉格娅谢尔盖耶夫娜",
-            "佩拉格娅",
-            "谢尔盖耶夫娜"
-        ],
-        "1107": [
-            "克拉拉",
-            "猩红兔子",
-            "天才侦探少女",
-            "史瓦罗",
-            "史瓦罗发射器"
-        ],
-        "1108": [
-            "桑博",
-            "桑博科斯基",
-            "深蓝帅哥",
-            "布鲁海尔波桑"
-        ],
-        "1109": [
-            "虎克",
-            "漆黑的虎克大人"
-        ],
-        "1110": [
-            "玲可"
-        ],
-        "1111": [
-            "卢卡",
-            "铁臂卢卡",
-            "熔锤镇的卢卡"
-        ],
-		"1112": [
-            "托帕&账账",
-            "托帕",
-			"账账",
-            "账账启动器"
-        ],
-        "1201": [
-            "青雀",
-            "QQ"
-        ],
-        "1202": [
-            "停云",
-            "屑狐狸",
-            "骚狐狸"
-        ],
-        "1203": [
-            "罗刹",
-            "主教"
-        ],
-        "1204": [
-            "景元",
-            "云骑将军",
-            "闭目将军"
-        ],
-        "1205": [
-            "刃",
-            "应星",
-            "阿刃",
-            "点刀哥",
-            "笑面小黑龙"
-        ],
-        "1206": [
-            "素裳",
-            "李素裳",
-            "李大枕头"
-        ],
-        "1207": [
-            "驭空",
-            "星火之狐",
-            "司舵"
-        ],
-        "1208": [
-            "符玄"
-        ],
-        "1209": [
-            "彦卿",
-            "马彦卿",
-            "老马"
-        ],
-        "1211": [
-            "白露",
-            "衔药龙女"
-        ],
-		"1212": [
-            "镜流"
-        ],
-        "1213": [
-            "丹恒•饮月",
-            "饮月君",
-			"饮月",
-			"龙丹"
-        ],
-		"1214": [
-            "雪衣"
-        ],
-		"1215": [
-            "寒鸦"
-        ],
-		"1217": [
-            "藿藿"
-        ],
-		"1302": [
-            "银枝"
-        ],
-		"1305": [
-            "真理医生"
-        ],
-		"1303": [
-            "阮•梅",
-			"阮梅"
-        ],
         "8000": [
             "开拓者",
             "爷",
@@ -215,409 +59,117 @@
             "开拓者物理",
             "开拓者毁灭"
         ],
-        "8002": [
+        "8002": ["物理女开拓者", "毁灭女开拓者", "物女主", "物理女主", "毁灭女主"],
-            "物理女开拓者",
+        "8003": ["火开拓者", "存护开拓者", "火主", "存护主", "开拓者火", "开拓者存护"],
-            "毁灭女开拓者",
+        "8004": ["火女开拓者", "存护女开拓者", "火女主", "存护女主"]
-            "物女主",
-            "物理女主",
-            "毁灭女主"
-        ],
-        "8003": [
-            "火开拓者",
-            "存护开拓者",
-            "火主",
-            "存护主",
-            "开拓者火",
-            "开拓者存护"
-        ],
-        "8004": [
-            "火女开拓者",
-            "存护女开拓者",
-            "火女主",
-            "存护女主"
-        ]
     },
     "light_cones": {
-        "20000": [
+        "20000": ["锋镝"],
-            "锋镝"
+        "20001": ["物穰"],
-        ],
+        "20002": ["天倾"],
-        "20001": [
+        "20003": ["琥珀"],
-            "物穰"
+        "20004": ["幽邃"],
-        ],
+        "20005": ["齐颂"],
-        "20002": [
+        "20006": ["智库"],
-            "天倾"
+        "20007": ["离弦"],
-        ],
+        "20008": ["嘉果"],
-        "20003": [
+        "20009": ["乐圮"],
-            "琥珀"
+        "20010": ["戍御"],
-        ],
+        "20011": ["渊环"],
-        "20004": [
+        "20012": ["轮契"],
-            "幽邃"
+        "20013": ["灵钥"],
-        ],
+        "20014": ["相抗"],
-        "20005": [
+        "20015": ["蕃息"],
-            "齐颂"
+        "20016": ["俱殁"],
-        ],
+        "20017": ["开疆"],
-        "20006": [
+        "20018": ["匿影"],
-            "智库"
+        "20019": ["调和"],
-        ],
+        "20020": ["睿见"],
-        "20007": [
+        "21000": ["一场术后对话"],
-            "离弦"
+        "21001": ["晚安与睡颜", "晚安睡颜"],
-        ],
+        "21002": ["余生的第一天"],
-        "20008": [
+        "21003": ["唯有沉默"],
-            "嘉果"
+        "21004": ["记忆中的模样"],
-        ],
+        "21005": ["鼹鼠党欢迎你", "鼹鼠党"],
-        "20009": [
+        "21006": ["「我」的诞生", "我的诞生"],
-            "乐圮"
+        "21007": ["同一种心情"],
-        ],
+        "21008": ["猎物的视线"],
-        "20010": [
+        "21009": ["朗道的选择"],
-            "戍御"
+        "21010": ["论剑"],
-        ],
+        "21011": ["与行星相会"],
-        "20011": [
+        "21012": ["秘密誓心"],
-            "渊环"
+        "21013": ["别让世界静下来"],
-        ],
+        "21014": ["此时恰好"],
-        "20012": [
+        "21015": ["决心如汗珠般闪耀"],
-            "轮契"
+        "21016": ["宇宙市场趋势"],
-        ],
+        "21017": ["点个关注吧！", "点个关注吧", "点个关注"],
-        "20013": [
+        "21018": ["舞！舞！舞！", "舞舞舞"],
-            "灵钥"
+        "21019": ["在蓝天下"],
-        ],
+        "21020": ["天才们的休憩"],
-        "20014": [
+        "21021": ["等价交换"],
-            "相抗"
+        "21022": ["延长记号"],
-        ],
+        "21023": ["我们是地火"],
-        "20015": [
+        "21024": ["春水初生"],
-            "蕃息"
+        "21025": ["过往未来"],
-        ],
+        "21026": ["汪！散步时间！", "汪散步时间", "散步时间"],
-        "20016": [
+        "21027": ["早餐的仪式感"],
-            "俱殁"
+        "21028": ["暖夜不会漫长"],
-        ],
+        "21029": ["后会有期"],
-        "20017": [
+        "21030": ["这就是我啦！", "这就是我啦"],
-            "开疆"
+        "21031": ["重返幽冥"],
-        ],
+        "21032": ["镂月裁云之意", "镂月裁云"],
-        "20018": [
+        "21033": ["无处可逃"],
-            "匿影"
+        "21034": ["今日亦是和平的一日", "和平的一日"],
-        ],
+        "22000": ["新手任务开始前"],
-        "20019": [
+        "23000": ["银河铁道之夜"],
-            "调和"
+        "23001": ["于夜色中", "希儿专武"],
-        ],
+        "23002": ["无可取代的东西"],
-        "20020": [
+        "23003": ["但战斗还未结束"],
-            "睿见"
+        "23004": ["以世界之名"],
-        ],
+        "23005": ["制胜的瞬间"],
-        "21000": [
+        "23006": ["只需等待"],
-            "一场术后对话"
+        "23007": ["雨一直下"],
-        ],
+        "23016": ["烦恼着，幸福着", "烦恼着幸福着"],
-        "21001": [
+        "23008": ["棺的回响"],
-            "晚安与睡颜",
+        "23009": ["到不了的彼岸"],
-            "晚安睡颜"
+        "23010": ["拂晓之前", "景元专武"],
-        ],
+        "23011": ["她已闭上双眼"],
-        "21002": [
+        "23012": ["如泥酣眠"],
-            "余生的第一天"
+        "23013": ["时节不居"],
-        ],
+        "23015": ["比阳光更明亮的"],
-        "21003": [
+        "23017": ["惊魂夜"],
-            "唯有沉默"
+        "23018": ["片刻，留在眼底", "片刻留在眼底", "留在眼底"],
-        ],
+        "23019": ["镜中故我"],
-        "21004": [
+        "23020": ["纯粹思维的洗礼", "思维的洗礼"],
-            "记忆中的模样"
+        "24000": ["记一位星神的陨落", "星神陨落", "星神的陨落"],
-        ],
+        "24001": ["星海巡航"],
-        "21005": [
+        "24002": ["记忆的质料"],
-            "鼹鼠党欢迎你",
+        "24003": ["孤独的疗愈"]
-            "鼹鼠党"
-        ],
-        "21006": [
-            "「我」的诞生",
-            "我的诞生"
-        ],
-        "21007": [
-            "同一种心情"
-        ],
-        "21008": [
-            "猎物的视线"
-        ],
-        "21009": [
-            "朗道的选择"
-        ],
-        "21010": [
-            "论剑"
-        ],
-        "21011": [
-            "与行星相会"
-        ],
-        "21012": [
-            "秘密誓心"
-        ],
-        "21013": [
-            "别让世界静下来"
-        ],
-        "21014": [
-            "此时恰好"
-        ],
-        "21015": [
-            "决心如汗珠般闪耀"
-        ],
-        "21016": [
-            "宇宙市场趋势"
-        ],
-        "21017": [
-            "点个关注吧！",
-            "点个关注吧",
-            "点个关注"
-        ],
-        "21018": [
-            "舞！舞！舞！",
-            "舞舞舞"
-        ],
-        "21019": [
-            "在蓝天下"
-        ],
-        "21020": [
-            "天才们的休憩"
-        ],
-        "21021": [
-            "等价交换"
-        ],
-        "21022": [
-            "延长记号"
-        ],
-        "21023": [
-            "我们是地火"
-        ],
-        "21024": [
-            "春水初生"
-        ],
-        "21025": [
-            "过往未来"
-        ],
-        "21026": [
-            "汪！散步时间！",
-            "汪散步时间",
-            "散步时间"
-        ],
-        "21027": [
-            "早餐的仪式感"
-        ],
-        "21028": [
-            "暖夜不会漫长"
-        ],
-        "21029": [
-            "后会有期"
-        ],
-        "21030": [
-            "这就是我啦！",
-            "这就是我啦"
-        ],
-        "21031": [
-            "重返幽冥"
-        ],
-        "21032": [
-            "镂月裁云之意",
-            "镂月裁云"
-        ],
-        "21033": [
-            "无处可逃"
-        ],
-        "21034": [
-            "今日亦是和平的一日",
-            "和平的一日"
-        ],
-        "22000": [
-            "新手任务开始前"
-        ],
-        "23000": [
-            "银河铁道之夜"
-        ],
-        "23001": [
-            "于夜色中",
-            "希儿专武"
-        ],
-        "23002": [
-            "无可取代的东西"
-        ],
-        "23003": [
-            "但战斗还未结束"
-        ],
-        "23004": [
-            "以世界之名"
-        ],
-        "23005": [
-            "制胜的瞬间"
-        ],
-        "23006": [
-            "只需等待"
-        ],
-        "23007": [
-            "雨一直下"
-        ],
-		"23016": [
-			"烦恼着，幸福着",
-			"烦恼着幸福着"
-		],
-        "23008": [
-            "棺的回响"
-        ],
-        "23009": [
-            "到不了的彼岸"
-        ],
-        "23010": [
-            "拂晓之前",
-            "景元专武"
-        ],
-        "23011": [
-            "她已闭上双眼"
-        ],
-        "23012": [
-            "如泥酣眠"
-        ],
-        "23013": [
-            "时节不居"
-        ],
-        "23015": [
-            "比阳光更明亮的"
-        ],
-		"23017": [
-            "惊魂夜"
-        ],
-		"23018": [
-            "片刻，留在眼底",
-			"片刻留在眼底",
-			"留在眼底"
-        ],
-		"23019": [
-            "镜中故我"
-        ],
-		"23020": [
-            "纯粹思维的洗礼",
-			"思维的洗礼"
-        ],
-        "24000": [
-            "记一位星神的陨落",
-            "星神陨落",
-            "星神的陨落"
-        ],
-        "24001": [
-            "星海巡航"
-        ],
-        "24002": [
-            "记忆的质料"
-        ],
-        "24003": [
-            "孤独的疗愈"
-        ]
     },
     "relic_sets": {
-        "101": [
+        "101": ["云无留迹的过客", "治疗套", "过客"],
-            "云无留迹的过客",
+        "102": ["野穗伴行的快枪手", "攻击套", "快枪手"],
-            "治疗套",
+        "103": ["净庭教宗的圣骑士", "防御套", "圣骑士"],
-            "过客"
+        "104": ["密林卧雪的猎人", "冰套", "猎人"],
-        ],
+        "105": ["街头出身的拳王", "物理套", "拳王"],
-        "102": [
+        "106": ["戍卫风雪的铁卫", "减伤套", "铁卫"],
-            "野穗伴行的快枪手",
+        "107": ["熔岩锻铸的火匠", "火套", "火匠"],
-            "攻击套",
+        "108": ["繁星璀璨的天才", "量子套", "天才"],
-            "快枪手"
+        "109": ["激奏雷电的乐队", "雷套", "乐队"],
-        ],
+        "110": ["晨昏交界的翔鹰", "风套", "翔鹰"],
-        "103": [
+        "111": ["流星追迹的怪盗", "破盾套", "怪盗"],
-            "净庭教宗的圣骑士",
+        "112": ["盗匪荒漠的废土客", "虚数套", "废土客"],
-            "防御套",
+        "113": ["宝命长存的莳者", "生命套", "莳者"],
-            "圣骑士"
+        "114": ["骇域漫游的信使", "速度套", "信使"],
-        ],
+        "301": ["太空封印站", "太空站"],
-        "104": [
+        "302": ["不老者的仙舟", "不老者仙舟", "不老仙舟", "仙舟"],
-            "密林卧雪的猎人",
+        "303": ["泛银河商业公司", "银河商业公司", "商业公司", "公司"],
-            "冰套",
+        "304": ["筑城者的贝洛伯格", "贝洛伯格", "筑城者"],
-            "猎人"
+        "305": ["星体差分机", "差分机"],
-        ],
+        "306": ["停转的萨尔索图", "萨尔索图", "停转"],
-        "105": [
+        "307": ["盗贼公国塔利亚", "盗贼公国", "塔利亚"],
-            "街头出身的拳王",
+        "308": ["生命的翁瓦克", "翁瓦克"],
-            "物理套",
+        "309": ["繁星竞技场", "竞技场"],
-            "拳王"
+        "310": ["折断的龙骨", "龙骨"]
-        ],
-        "106": [
-            "戍卫风雪的铁卫",
-            "减伤套",
-            "铁卫"
-        ],
-        "107": [
-            "熔岩锻铸的火匠",
-            "火套",
-            "火匠"
-        ],
-        "108": [
-            "繁星璀璨的天才",
-            "量子套",
-            "天才"
-        ],
-        "109": [
-            "激奏雷电的乐队",
-            "雷套",
-            "乐队"
-        ],
-        "110": [
-            "晨昏交界的翔鹰",
-            "风套",
-            "翔鹰"
-        ],
-        "111": [
-            "流星追迹的怪盗",
-            "破盾套",
-            "怪盗"
-        ],
-        "112": [
-            "盗匪荒漠的废土客",
-            "虚数套",
-            "废土客"
-        ],
-        "113": [
-            "宝命长存的莳者",
-            "生命套",
-            "莳者"
-        ],
-        "114": [
-            "骇域漫游的信使",
-            "速度套",
-            "信使"
-        ],
-        "301": [
-            "太空封印站",
-            "太空站"
-        ],
-        "302": [
-            "不老者的仙舟",
-            "不老者仙舟",
-            "不老仙舟",
-            "仙舟"
-        ],
-        "303": [
-            "泛银河商业公司",
-            "银河商业公司",
-            "商业公司",
-            "公司"
-        ],
-        "304": [
-            "筑城者的贝洛伯格",
-            "贝洛伯格",
-            "筑城者"
-        ],
-        "305": [
-            "星体差分机",
-            "差分机"
-        ],
-        "306": [
-            "停转的萨尔索图",
-            "萨尔索图",
-            "停转"
-        ],
-        "307": [
-            "盗贼公国塔利亚",
-            "盗贼公国",
-            "塔利亚"
-        ],
-        "308": [
-            "生命的翁瓦克",
-            "翁瓦克"
-        ],
-        "309": [
-            "繁星竞技场",
-            "竞技场"
-        ],
-        "310": [
-            "折断的龙骨",
-            "龙骨"
-        ]
     }
 }

starrail_damage_cal/map/data/rankId2Name_mapping_2.0.0.json

@@ -203,6 +203,12 @@
   "121304": "嘲风",
   "121305": "偃蹇",
   "121306": "见谯",
+  "121401": "缚心魔",
+  "121402": "破五尘",
+  "121403": "止苦谛",
+  "121404": "断业根",
+  "121405": "勾灵神",
+  "121406": "司死生",
   "121501": "一心",
   "121502": "二观",
   "121503": "三尘",
@@ -221,6 +227,36 @@
   "130204": "号角的奉献",
   "130205": "宇宙某处的雪",
   "130206": "「你」的光芒",
+  "130301": "神经仿绣图",
+  "130302": "芦前漫步",
+  "130303": "彩缎烟衫绿婆娑",
+  "130304": "寻神铜镜前",
+  "130305": "手弄慵鬟玲珑钗",
+  "130306": "半脱纱巾落团扇",
+  "130501": "倨傲生祸患",
+  "130502": "显微而阐幽",
+  "130503": "认识你自己",
+  "130504": "盲目造痴愚",
+  "130505": "海阔舟无楫",
+  "130506": "永恒唯真理",
+  "130601": "悬置怀疑",
+  "130602": "虚构无端",
+  "130603": "梦幻泡影",
+  "130604": "游戏人间",
+  "130605": "双面真相",
+  "130606": "多重解答",
+  "130701": "三磅石，七阶柱",
+  "130702": "羔羊，请勿为我恸哭",
+  "130703": "上界如此，下界亦然",
+  "130704": "泪水，亦是礼物",
+  "130705": "候鸟之路",
+  "130706": "万神皆善，苦役者未知",
+  "131201": "飘忽的幻影",
+  "131202": "青春的怅望",
+  "131203": "欢乐年光的影子",
+  "131204": "亲挚的音容",
+  "131205": "最初的爱与友谊",
+  "131206": "久已生疏的憧憬",
   "800101": "坠临万界的星芒",
   "800102": "因缘假合的人身",
   "800103": "揭示前路的言灵",
@@ -244,23 +280,5 @@
   "800403": "砌造未来的蓝图",
   "800404": "驻留文明的誓言",
   "800405": "点燃光焰的勇气",
-  "800406": "永屹城垣的壁垒",
+  "800406": "永屹城垣的壁垒"
-  "121401": "缚心魔",
-  "121402": "破五尘",
-  "121403": "止苦谛",
-  "121404": "断业根",
-  "121405": "勾灵神",
-  "121406": "司死生",
-  "130301": "神经仿绣图",
-  "130302": "芦前漫步",
-  "130303": "彩缎烟衫绿婆娑",
-  "130304": "寻神铜镜前",
-  "130305": "手弄慵鬟玲珑钗",
-  "130306": "半脱纱巾落团扇",
-  "130501": "倨傲生祸患",
-  "130502": "显微而阐幽",
-  "130503": "认识你自己",
-  "130504": "盲目造痴愚",
-  "130505": "海阔舟无楫",
-  "130506": "永恒唯真理"
 }

starrail_damage_cal/map/data/skillId2AttackType_mapping_2.0.0.json

@@ -21,11 +21,7 @@
   "100406": "MazeNormal",
   "100407": "Maze",
   "100501": "Normal",
-  "100502": "BPSkill",
-  "100503": "Ultra",
-  "100504": "",
   "100506": "MazeNormal",
-  "100507": "Maze",
   "100801": "Normal",
   "100802": "BPSkill",
   "100803": "Ultra",
@@ -65,8 +61,6 @@
   "110406": "MazeNormal",
   "110407": "Maze",
   "110501": "Normal",
-  "110502": "BPSkill",
-  "110503": "Ultra",
   "110504": "",
   "110506": "MazeNormal",
   "110601": "Normal",
@@ -123,9 +117,7 @@
   "120307": "Maze",
   "120501": "Normal",
   "120508": "Normal",
-  "120502": "BPSkill",
   "120503": "Ultra",
-  "120504": "",
   "120506": "MazeNormal",
   "120507": "Maze",
   "120601": "Normal",
@@ -171,6 +163,12 @@
   "121304": "",
   "121306": "MazeNormal",
   "121307": "Maze",
+  "121401": "Normal",
+  "121402": "BPSkill",
+  "121403": "Ultra",
+  "121404": "",
+  "121406": "MazeNormal",
+  "121407": "Maze",
   "121501": "Normal",
   "121502": "BPSkill",
   "121503": "Ultra",
@@ -208,15 +206,13 @@
   "800406": "MazeNormal",
   "800407": "Maze",
   "100601": "Normal",
+  "100602": "BPSkill",
+  "100603": "Ultra",
+  "100604": "",
   "100606": "MazeNormal",
   "100607": "Maze",
   "120401": "Normal",
-  "120402": "BPSkill",
-  "120403": "Ultra",
-  "120404": "",
   "120406": "MazeNormal",
-  "120407": "Maze",
-  "909807": "Maze",
   "110603": "Ultra",
   "120202": "BPSkill",
   "110507": "Maze",
@@ -233,6 +229,12 @@
   "121204": "",
   "121206": "MazeNormal",
   "121207": "Maze",
+  "130301": "Normal",
+  "130302": "BPSkill",
+  "130303": "Ultra",
+  "130304": "",
+  "130306": "MazeNormal",
+  "130307": "Maze",
   "120302": "BPSkill",
   "111201": "Normal",
   "111202": "BPSkill",
@@ -242,11 +244,29 @@
   "111207": "Maze",
   "121701": "Normal",
   "121702": "BPSkill",
+  "121703": "Ultra",
+  "121704": "",
   "121706": "MazeNormal",
+  "121707": "Maze",
+  "131201": "Normal",
+  "131202": "BPSkill",
+  "131203": "Ultra",
+  "131204": "",
+  "131206": "MazeNormal",
+  "131207": "Maze",
   "120303": "Ultra",
   "120304": "",
   "100102": "BPSkill",
   "121309": "BPSkill",
+  "130701": "Normal",
+  "130706": "MazeNormal",
+  "130707": "Maze",
+  "130501": "Normal",
+  "130502": "BPSkill",
+  "130503": "Ultra",
+  "130504": "",
+  "130506": "MazeNormal",
+  "130507": "Maze",
   "100403": "Ultra",
   "120703": "Ultra",
   "121104": "",
@@ -256,25 +276,25 @@
   "110302": "BPSkill",
   "110304": "",
   "110307": "Maze",
-  "121703": "Ultra",
+  "100502": "BPSkill",
-  "121704": "",
+  "100503": "Ultra",
-  "121707": "Maze",
+  "100504": "",
-  "100602": "BPSkill",
+  "100507": "Maze",
-  "100603": "Ultra",
+  "110502": "BPSkill",
-  "100604": "",
+  "110503": "Ultra",
-  "121401": "Normal",
+  "120502": "BPSkill",
-  "121402": "BPSkill",
+  "120504": "",
-  "121403": "Ultra",
+  "120402": "BPSkill",
-  "121404": "",
+  "120403": "Ultra",
-  "121407": "Maze",
+  "120404": "",
-  "130301": "Normal",
+  "120407": "Maze",
-  "130302": "BPSkill",
+  "130601": "Normal",
-  "130303": "Ultra",
+  "130602": "BPSkill",
-  "130304": "",
+  "130603": "Ultra",
-  "130307": "Maze",
+  "130604": "",
-  "130501": "Normal",
+  "130606": "MazeNormal",
-  "130502": "BPSkill",
+  "130607": "Maze",
-  "130503": "Ultra",
+  "130704": "",
-  "130504": "",
+  "130703": "Ultra",
-  "130507": "Maze"
+  "130702": "BPSkill"
 }

starrail_damage_cal/map/data/skillId2Name_mapping_2.0.0.json

@@ -21,11 +21,7 @@
   "100406": "攻击",
   "100407": "画地为牢",
   "100501": "夜间喧嚣不止",
-  "100502": "月光摩挲连绵",
-  "100503": "悲剧尽头的颤音",
-  "100504": "温柔亦同残酷",
   "100506": "攻击",
-  "100507": "宽恕无关慈悲",
   "100801": "如雷疾行",
   "100802": "禁锢解除",
   "100803": "狂者制裁",
@@ -65,8 +61,6 @@
   "110406": "攻击",
   "110407": "有情之证",
   "110501": "仁慈的背面",
-  "110502": "爱，救护与抉择",
-  "110503": "新生之礼",
   "110504": "生机焕发",
   "110506": "攻击",
   "110601": "冰点射击",
@@ -123,9 +117,7 @@
   "120307": "愚者的悲悯",
   "120501": "支离剑",
   "120508": "无间剑树",
-  "120502": "地狱变",
   "120503": "大辟万死",
-  "120504": "倏忽恩赐",
   "120506": "攻击",
   "120507": "业途风",
   "120601": "云骑剑经 • 素霓",
@@ -171,6 +163,12 @@
   "121304": "亢心",
   "121306": "攻击",
   "121307": "掣空如虹",
+  "121401": "破魔锥",
+  "121402": "摄伏诸恶",
+  "121403": "天罚贯身",
+  "121404": "十王圣断，业报恒常",
+  "121406": "攻击",
+  "121407": "斩立决",
   "121501": "冥谶天笔",
   "121502": "生灭系缚",
   "121503": "十王敕令，遍土遵行",
@@ -208,15 +206,13 @@
   "800406": "攻击",
   "800407": "守护者召令",
   "100601": "|系统警告|",
+  "100602": "是否允许更改？",
+  "100603": "|账号已封禁|",
+  "100604": "等待程序响应…",
   "100606": "攻击",
   "100607": "|强制结束进程|",
   "120401": "石火流光",
-  "120402": "紫霄震曜",
-  "120403": "吾身光明",
-  "120404": "斩勘神形",
   "120406": "攻击",
-  "120407": "摄召威灵",
-  "909807": "dev_秘技",
   "110603": "领域压制",
   "120202": "祥音和韵",
   "110507": "催眠研习",
@@ -233,6 +229,12 @@
   "121204": "澹月转魄",
   "121206": "攻击",
   "121207": "古镜照神",
+  "130301": "一针幽兰",
+  "130302": "慢捻抹复挑",
+  "130303": "摇花缎水，沾衣不摘",
+  "130304": "分型的螺旋",
+  "130306": "攻击",
+  "130307": "拭琴抚罗袂",
   "120302": "白花的祈望",
   "111201": "赤字…",
   "111202": "支付困难？",
@@ -242,11 +244,29 @@
   "111207": "明补",
   "121701": "令旗•征风召雨",
   "121702": "灵符•保命护身",
+  "121703": "尾巴•遣神役鬼",
+  "121704": "凭附•气通天真",
   "121706": "攻击",
+  "121707": "凶煞•劾压鬼物",
+  "131201": "请…请让一下！",
+  "131202": "客…客房服务！",
+  "131203": "要…要迟到了！",
+  "131204": "擒纵机构",
+  "131206": "攻击",
+  "131207": "停一停吧，你真美丽！",
   "120303": "归葬的遂愿",
   "120304": "生息的轮转",
   "100102": "可爱即是正义",
   "121309": "取消",
+  "130701": "洞见，缄默的黎明",
+  "130706": "攻击",
+  "130707": "取此真相，弃舍表征",
+  "130501": "知识就是力量",
+  "130502": "精神助产术",
+  "130503": "三段悖论",
+  "130504": "我思故我在",
+  "130506": "攻击",
+  "130507": "偶像塑造",
   "100403": "拟似黑洞",
   "120703": "贯云饮羽",
   "121104": "奔走悬壶济世长",
@@ -256,25 +276,25 @@
   "110302": "电光石火间",
   "110304": "燃情和弦",
   "110307": "晚安，贝洛伯格",
-  "121703": "尾巴•遣神役鬼",
+  "100502": "月光摩挲连绵",
-  "121704": "凭附•气通天真",
+  "100503": "悲剧尽头的颤音",
-  "121707": "凶煞•劾压鬼物",
+  "100504": "温柔亦同残酷",
-  "100602": "是否允许更改？",
+  "100507": "宽恕无关慈悲",
-  "100603": "|账号已封禁|",
+  "110502": "爱，救护与抉择",
-  "100604": "等待程序响应…",
+  "110503": "新生之礼",
-  "121401": "破魔锥",
+  "120502": "地狱变",
-  "121402": "摄伏诸恶",
+  "120504": "倏忽恩赐",
-  "121403": "天罚贯身",
+  "120402": "紫霄震曜",
-  "121404": "十王圣断，业报恒常",
+  "120403": "吾身光明",
-  "121407": "斩立决",
+  "120404": "斩勘神形",
-  "130301": "一针幽兰",
+  "120407": "摄召威灵",
-  "130302": "慢捻抹复挑",
+  "130601": "独角戏",
-  "130303": "摇花缎水，沾衣不摘",
+  "130602": "梦游鱼",
-  "130304": "分型的螺旋",
+  "130603": "一人千役",
-  "130307": "拭琴抚罗袂",
+  "130604": "叙述性诡计",
-  "130501": "知识就是力量",
+  "130606": "攻击",
-  "130502": "精神助产术",
+  "130607": "不可靠叙事者",
-  "130503": "三段悖论",
+  "130704": "无端命运的机杼",
-  "130504": "我思故我在",
+  "130703": "沉醉于彼界的臂湾",
-  "130507": "偶像塑造"
+  "130702": "失坠，伪神的黄昏"
 }

starrail_damage_cal/map/data/skillId2Type_mapping_2.0.0.json

@@ -21,11 +21,7 @@
   "100406": "",
   "100407": "妨害",
   "100501": "单攻",
-  "100502": "扩散",
-  "100503": "群攻",
-  "100504": "单攻",
   "100506": "",
-  "100507": "",
   "100801": "单攻",
   "100802": "单攻",
   "100803": "扩散",
@@ -59,18 +55,16 @@
   "110303": "群攻",
   "110306": "",
   "110401": "单攻",
-  "110402": "妨害",
+  "110402": "单攻",
   "110403": "防御",
   "110404": "回复",
   "110406": "",
   "110407": "防御",
   "110501": "单攻",
-  "110502": "回复",
-  "110503": "回复",
   "110504": "强化",
   "110506": "",
   "110601": "单攻",
-  "110602": "妨害",
+  "110602": "单攻",
   "110604": "辅助",
   "110606": "",
   "110607": "",
@@ -82,7 +76,7 @@
   "110707": "",
   "110801": "单攻",
   "110802": "弹射",
-  "110803": "妨害",
+  "110803": "群攻",
   "110804": "强化",
   "110806": "",
   "110807": "妨害",
@@ -123,9 +117,7 @@
   "120307": "回复",
   "120501": "单攻",
   "120508": "扩散",
-  "120502": "强化",
   "120503": "扩散",
-  "120504": "群攻",
   "120506": "",
   "120507": "",
   "120601": "单攻",
@@ -171,6 +163,12 @@
   "121304": "强化",
   "121306": "",
   "121307": "强化",
+  "121401": "单攻",
+  "121402": "扩散",
+  "121403": "单攻",
+  "121404": "弹射",
+  "121406": "",
+  "121407": "",
   "121501": "单攻",
   "121502": "单攻",
   "121503": "强化",
@@ -208,16 +206,14 @@
   "800406": "",
   "800407": "防御",
   "100601": "单攻",
+  "100602": "单攻",
+  "100603": "单攻",
+  "100604": "妨害",
   "100606": "",
   "100607": "",
   "120401": "单攻",
-  "120402": "群攻",
-  "120403": "群攻",
-  "120404": "弹射",
   "120406": "",
-  "120407": "强化",
+  "110603": "群攻",
-  "909807": "回复",
-  "110603": "妨害",
   "120202": "辅助",
   "110507": "",
   "130201": "单攻",
@@ -233,6 +229,12 @@
   "121204": "强化",
   "121206": "",
   "121207": "妨害",
+  "130301": "单攻",
+  "130302": "辅助",
+  "130303": "辅助",
+  "130304": "辅助",
+  "130306": "",
+  "130307": "强化",
   "120302": "回复",
   "111201": "单攻",
   "111202": "单攻",
@@ -242,11 +244,29 @@
   "111207": "强化",
   "121701": "单攻",
   "121702": "回复",
+  "121703": "辅助",
+  "121704": "回复",
   "121706": "",
+  "121707": "妨害",
+  "131201": "单攻",
+  "131202": "扩散",
+  "131203": "弹射",
+  "131204": "强化",
+  "131206": "",
+  "131207": "妨害",
   "120303": "群攻",
   "120304": "回复",
   "100102": "防御",
   "121309": "取消",
+  "130701": "单攻",
+  "130706": "",
+  "130707": "强化",
+  "130501": "单攻",
+  "130502": "单攻",
+  "130503": "单攻",
+  "130504": "单攻",
+  "130506": "",
+  "130507": "妨害",
   "100403": "群攻",
   "120703": "单攻",
   "121104": "回复",
@@ -256,25 +276,25 @@
   "110302": "扩散",
   "110304": "强化",
   "110307": "",
-  "121703": "辅助",
+  "100502": "扩散",
-  "121704": "回复",
+  "100503": "群攻",
-  "121707": "妨害",
+  "100504": "单攻",
-  "100602": "妨害",
+  "100507": "",
-  "100603": "妨害",
+  "110502": "回复",
-  "100604": "妨害",
+  "110503": "回复",
-  "121401": "单攻",
+  "120502": "强化",
-  "121402": "扩散",
+  "120504": "群攻",
-  "121403": "单攻",
+  "120402": "群攻",
-  "121404": "弹射",
+  "120403": "群攻",
-  "121407": "",
+  "120404": "弹射",
-  "130301": "单攻",
+  "120407": "强化",
-  "130302": "辅助",
+  "130601": "单攻",
-  "130303": "辅助",
+  "130602": "辅助",
-  "130304": "辅助",
+  "130603": "辅助",
-  "130307": "强化",
+  "130604": "辅助",
-  "130501": "单攻",
+  "130606": "",
-  "130502": "单攻",
+  "130607": "辅助",
-  "130503": "单攻",
+  "130704": "妨害",
-  "130504": "单攻",
+  "130703": "群攻",
-  "130507": "妨害"
+  "130702": "扩散"
 }

starrail_damage_cal/mihomo/models.py

@@ -46,17 +46,23 @@ class Challenge(Struct):
     PreMazeGroupIndex: Union[int, None] = None
 
 
+class ChallengeInfo(Struct):
+    scheduleGroupId: int
+    noneScheduleMaxLevel: int
+    scheduleMaxLevel: int
+
+
 class PlayerSpaceInfo(Struct):
     maxRogueChallengeScore: int
     equipmentCount: int
     avatarCount: int
     achievementCount: int
-    challengeInfo: Union[int, None] = None
+    challengeInfo: ChallengeInfo
 
 
 class PlayerDetailInfo(Struct):
-    assistAvatarDetail: Avatar
+    assistAvatarList: Union[List[Avatar], None]
-    platform: str
+    platform: Union[int, str]
     isDisplayAvatar: bool
     avatarDetailList: Union[List[Avatar], None]
     uid: int

starrail_damage_cal/to_data.py

@@ -65,35 +65,19 @@ async def api_to_dict(
     char_id_list: List[str] = []
     char_data_list: Dict[str, Dict] = {}
     nickName = PlayerDetailInfo.nickname
-    if (
+    avatarList = (PlayerDetailInfo.avatarDetailList if PlayerDetailInfo.avatarDetailList else []) + (PlayerDetailInfo.assistAvatarList if PlayerDetailInfo.assistAvatarList else [])
-        PlayerDetailInfo.assistAvatarDetail
+    for char in avatarList:
-        and PlayerDetailInfo.assistAvatarDetail.avatarId not in char_id_list
+        if str(char.avatarId) in char_id_list:
-    ):
+                continue
         char_data, avatarName = await get_data(
-            PlayerDetailInfo.assistAvatarDetail,
+            char,
             nickName,
             player_uid,
             save_path,
         )
         char_name_list.append(avatarName)
-        char_id_list.append(str(PlayerDetailInfo.assistAvatarDetail.avatarId))
+        char_id_list.append(str(char.avatarId))
-        char_data_list[str(PlayerDetailInfo.assistAvatarDetail.avatarId)] = char_data
+        char_data_list[str(char.avatarId)] = char_data
-    if (
-        PlayerDetailInfo.avatarDetailList
-        and PlayerDetailInfo.avatarDetailList is not None
-    ):
-        for char in PlayerDetailInfo.avatarDetailList:
-            if str(char.avatarId) in char_id_list:
-                continue
-            char_data, avatarName = await get_data(
-                char,
-                nickName,
-                player_uid,
-                save_path,
-            )
-            char_name_list.append(avatarName)
-            char_id_list.append(str(char.avatarId))
-            char_data_list[str(char.avatarId)] = char_data
 
     if not char_name_list:
         raise CharacterShowcaseNotOpenError(player_uid)

starrail_damage_cal/version.py

@@ -1 +1 @@
-StarRail_version = "1.5.0"
+StarRail_version = "2.0.0"