diff --git a/AzurLaneData b/AzurLaneData
index 16ef2878c..ffd41c307 160000
--- a/AzurLaneData
+++ b/AzurLaneData
@@ -1 +1 @@
-Subproject commit 16ef2878c852211925f3a9704844fc1e505a6fa0
+Subproject commit ffd41c30792e87d7cbfa0497146ab627bad6b187
diff --git a/dist/ships.json b/dist/ships.json
index 08faf28a0..eed9b29e7 100644
--- a/dist/ships.json
+++ b/dist/ships.json
@@ -18257,6 +18257,129 @@
     },
     "stars": 6
   },
+  "20136": {
+    "id": 20136,
+    "code": 585,
+    "name": {"en": "Hero", "code": "HMS Hero", "cn": "英雄", "jp": "ヒーロー"},
+    "property_hexagon": [1, 3, 0, 4, 1, 1],
+    "type": 1,
+    "armor": 1,
+    "slots": [[1], [5], [6], [10, 14], [10, 14]],
+    "nationality": 2,
+    "data": {
+      "201361": {
+        "id": 201361,
+        "tags": ["H-Class"],
+        "type": 1,
+        "rarity": 4,
+        "stars": 2,
+        "oil": 3,
+        "max_level": 70,
+        "stats": {
+          "hp": 236,
+          "fp": 16,
+          "trp": 71,
+          "aa": 31,
+          "av": 0,
+          "rld": 72,
+          "acc": 72,
+          "eva": 78,
+          "spd": 43.2,
+          "luk": 80,
+          "asw": 55
+        }
+      },
+      "201362": {
+        "id": 201362,
+        "tags": ["H-Class"],
+        "type": 1,
+        "rarity": 4,
+        "stars": 3,
+        "oil": 5,
+        "max_level": 80,
+        "stats": {
+          "hp": 294,
+          "fp": 20,
+          "trp": 89,
+          "aa": 39,
+          "av": 0,
+          "rld": 72,
+          "acc": 72,
+          "eva": 78,
+          "spd": 43.2,
+          "luk": 80,
+          "asw": 69
+        }
+      },
+      "201363": {
+        "id": 201363,
+        "tags": ["H-Class"],
+        "type": 1,
+        "rarity": 4,
+        "stars": 4,
+        "oil": 7,
+        "max_level": 90,
+        "stats": {
+          "hp": 409,
+          "fp": 28,
+          "trp": 124,
+          "aa": 54,
+          "av": 0,
+          "rld": 72,
+          "acc": 72,
+          "eva": 78,
+          "spd": 43.2,
+          "luk": 80,
+          "asw": 96
+        }
+      },
+      "201364": {
+        "id": 201364,
+        "tags": ["H-Class"],
+        "type": 1,
+        "rarity": 4,
+        "stars": 5,
+        "oil": 9,
+        "max_level": 100,
+        "stats": {
+          "hp": 582,
+          "fp": 40,
+          "trp": 176,
+          "aa": 77,
+          "av": 0,
+          "rld": 72,
+          "acc": 72,
+          "eva": 78,
+          "spd": 43.2,
+          "luk": 80,
+          "asw": 137
+        }
+      },
+      "900363": {
+        "id": 900363,
+        "tags": ["H-Class"],
+        "type": 1,
+        "rarity": 4,
+        "stars": 5,
+        "oil": 9,
+        "max_level": 90,
+        "stats": {
+          "hp": 1101,
+          "fp": 72,
+          "trp": 162,
+          "aa": 132,
+          "av": 0,
+          "rld": 70,
+          "acc": 52,
+          "eva": 29,
+          "spd": 35.3,
+          "luk": 38,
+          "asw": 59
+        }
+      }
+    },
+    "stars": 5
+  },
   "20201": {
     "id": 20201,
     "code": 104,
@@ -21562,6 +21685,129 @@
     },
     "stars": 5
   },
+  "20233": {
+    "id": 20233,
+    "code": 584,
+    "name": {"en": "Scylla", "code": "HMS Scylla", "cn": "斯库拉", "jp": "シラ"},
+    "property_hexagon": [3, 1, 0, 3, 4, 2],
+    "type": 2,
+    "armor": 1,
+    "slots": [[1, 2], [5], [6], [10, 14], [10, 14]],
+    "nationality": 2,
+    "data": {
+      "202331": {
+        "id": 202331,
+        "tags": ["Dido-Class"],
+        "type": 2,
+        "rarity": 5,
+        "stars": 3,
+        "oil": 5,
+        "max_level": 70,
+        "stats": {
+          "hp": 677,
+          "fp": 27,
+          "trp": 33,
+          "aa": 84,
+          "av": 0,
+          "rld": 71,
+          "acc": 59,
+          "eva": 28,
+          "spd": 32.25,
+          "luk": 56,
+          "asw": 41
+        }
+      },
+      "202332": {
+        "id": 202332,
+        "tags": ["Dido-Class"],
+        "type": 2,
+        "rarity": 5,
+        "stars": 4,
+        "oil": 7,
+        "max_level": 80,
+        "stats": {
+          "hp": 842,
+          "fp": 34,
+          "trp": 41,
+          "aa": 105,
+          "av": 0,
+          "rld": 71,
+          "acc": 59,
+          "eva": 28,
+          "spd": 32.25,
+          "luk": 56,
+          "asw": 51
+        }
+      },
+      "202333": {
+        "id": 202333,
+        "tags": ["Dido-Class"],
+        "type": 2,
+        "rarity": 5,
+        "stars": 5,
+        "oil": 9,
+        "max_level": 90,
+        "stats": {
+          "hp": 1173,
+          "fp": 47,
+          "trp": 57,
+          "aa": 146,
+          "av": 0,
+          "rld": 71,
+          "acc": 59,
+          "eva": 28,
+          "spd": 32.25,
+          "luk": 56,
+          "asw": 72
+        }
+      },
+      "202334": {
+        "id": 202334,
+        "tags": ["Dido-Class"],
+        "type": 2,
+        "rarity": 5,
+        "stars": 6,
+        "oil": 11,
+        "max_level": 100,
+        "stats": {
+          "hp": 1668,
+          "fp": 68,
+          "trp": 82,
+          "aa": 208,
+          "av": 0,
+          "rld": 71,
+          "acc": 59,
+          "eva": 28,
+          "spd": 32.25,
+          "luk": 56,
+          "asw": 102
+        }
+      },
+      "900362": {
+        "id": 900362,
+        "tags": ["Dido-Class"],
+        "type": 2,
+        "rarity": 5,
+        "stars": 6,
+        "oil": 11,
+        "max_level": 80,
+        "stats": {
+          "hp": 1612,
+          "fp": 67,
+          "trp": 75,
+          "aa": 195,
+          "av": 0,
+          "rld": 66,
+          "acc": 59,
+          "eva": 28,
+          "spd": 32.25,
+          "luk": 56,
+          "asw": 84
+        }
+      }
+    },
+    "stars": 6
+  },
   "20301": {
     "id": 20301,
     "code": 119,
@@ -24653,6 +24899,134 @@
     },
     "stars": 6
   },
+  "20514": {
+    "id": 20514,
+    "code": 582,
+    "name": {
+      "en": "Royal Oak",
+      "code": "HMS Royal Oak",
+      "cn": "皇家橡树",
+      "jp": "ロイヤル・オーク"
+    },
+    "property_hexagon": [5, 0, 0, 1, 1, 4],
+    "type": 5,
+    "armor": 3,
+    "slots": [[4], [1, 2], [6, 21], [10], [10]],
+    "nationality": 2,
+    "data": {
+      "205141": {
+        "id": 205141,
+        "tags": ["Revenge-Class", "Royal Oak"],
+        "type": 5,
+        "rarity": 5,
+        "stars": 3,
+        "oil": 9,
+        "max_level": 70,
+        "stats": {
+          "hp": 1305,
+          "fp": 81,
+          "trp": 0,
+          "aa": 43,
+          "av": 0,
+          "rld": 57,
+          "acc": 24,
+          "eva": 5,
+          "spd": 22,
+          "luk": 47,
+          "asw": 0
+        }
+      },
+      "205142": {
+        "id": 205142,
+        "tags": ["Revenge-Class", "Royal Oak"],
+        "type": 5,
+        "rarity": 5,
+        "stars": 4,
+        "oil": 11,
+        "max_level": 80,
+        "stats": {
+          "hp": 1623,
+          "fp": 101,
+          "trp": 0,
+          "aa": 53,
+          "av": 0,
+          "rld": 57,
+          "acc": 24,
+          "eva": 5,
+          "spd": 22,
+          "luk": 47,
+          "asw": 0
+        }
+      },
+      "205143": {
+        "id": 205143,
+        "tags": ["Revenge-Class", "Royal Oak"],
+        "type": 5,
+        "rarity": 5,
+        "stars": 5,
+        "oil": 13,
+        "max_level": 90,
+        "stats": {
+          "hp": 2260,
+          "fp": 141,
+          "trp": 0,
+          "aa": 74,
+          "av": 0,
+          "rld": 57,
+          "acc": 24,
+          "eva": 5,
+          "spd": 22,
+          "luk": 47,
+          "asw": 0
+        }
+      },
+      "205144": {
+        "id": 205144,
+        "tags": ["Revenge-Class", "Royal Oak"],
+        "type": 5,
+        "rarity": 5,
+        "stars": 6,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 3215,
+          "fp": 201,
+          "trp": 0,
+          "aa": 106,
+          "av": 0,
+          "rld": 57,
+          "acc": 24,
+          "eva": 5,
+          "spd": 22,
+          "luk": 47,
+          "asw": 0
+        }
+      },
+      "900366": {
+        "id": 900366,
+        "tags": ["Revenge-Class", "Royal Oak"],
+        "type": 5,
+        "rarity": 5,
+        "stars": 6,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 3215,
+          "fp": 201,
+          "trp": 0,
+          "aa": 106,
+          "av": 0,
+          "rld": 57,
+          "acc": 24,
+          "eva": 5,
+          "spd": 22,
+          "luk": 47,
+          "asw": 0
+        }
+      }
+    },
+    "stars": 6
+  },
   "20601": {
     "id": 20601,
     "code": 140,
@@ -24761,6 +25135,129 @@
     },
     "stars": 4
   },
+  "20602": {
+    "id": 20602,
+    "code": 583,
+    "name": {"en": "Argus", "code": "HMS Argus", "cn": "百眼巨人", "jp": "アーガス"},
+    "property_hexagon": [0, 0, 3, 1, 3, 2],
+    "type": 6,
+    "armor": 2,
+    "slots": [[7], [8], [6], [10, 15], [10, 15]],
+    "nationality": 2,
+    "data": {
+      "206021": {
+        "id": 206021,
+        "tags": ["Royal Fleet-CVL", "Argus"],
+        "type": 6,
+        "rarity": 4,
+        "stars": 2,
+        "oil": 5,
+        "max_level": 70,
+        "stats": {
+          "hp": 833,
+          "fp": 0,
+          "trp": 0,
+          "aa": 48,
+          "av": 53,
+          "rld": 65,
+          "acc": 26,
+          "eva": 16,
+          "spd": 20,
+          "luk": 81,
+          "asw": 26
+        }
+      },
+      "206022": {
+        "id": 206022,
+        "tags": ["Royal Fleet-CVL", "Argus"],
+        "type": 6,
+        "rarity": 4,
+        "stars": 3,
+        "oil": 7,
+        "max_level": 80,
+        "stats": {
+          "hp": 1036,
+          "fp": 0,
+          "trp": 0,
+          "aa": 60,
+          "av": 66,
+          "rld": 65,
+          "acc": 26,
+          "eva": 16,
+          "spd": 20,
+          "luk": 81,
+          "asw": 32
+        }
+      },
+      "206023": {
+        "id": 206023,
+        "tags": ["Royal Fleet-CVL", "Argus"],
+        "type": 6,
+        "rarity": 4,
+        "stars": 4,
+        "oil": 9,
+        "max_level": 90,
+        "stats": {
+          "hp": 1442,
+          "fp": 0,
+          "trp": 0,
+          "aa": 83,
+          "av": 92,
+          "rld": 65,
+          "acc": 26,
+          "eva": 16,
+          "spd": 20,
+          "luk": 81,
+          "asw": 45
+        }
+      },
+      "206024": {
+        "id": 206024,
+        "tags": ["Royal Fleet-CVL", "Argus"],
+        "type": 6,
+        "rarity": 4,
+        "stars": 5,
+        "oil": 11,
+        "max_level": 100,
+        "stats": {
+          "hp": 2051,
+          "fp": 0,
+          "trp": 0,
+          "aa": 118,
+          "av": 132,
+          "rld": 65,
+          "acc": 26,
+          "eva": 16,
+          "spd": 20,
+          "luk": 81,
+          "asw": 64
+        }
+      },
+      "900367": {
+        "id": 900367,
+        "tags": ["Royal Fleet-CVL"],
+        "type": 6,
+        "rarity": 4,
+        "stars": 5,
+        "oil": 11,
+        "max_level": 100,
+        "stats": {
+          "hp": 2051,
+          "fp": 0,
+          "trp": 0,
+          "aa": 118,
+          "av": 132,
+          "rld": 65,
+          "acc": 26,
+          "eva": 16,
+          "spd": 20,
+          "luk": 81,
+          "asw": 64
+        }
+      }
+    },
+    "stars": 5
+  },
   "20603": {
     "id": 20603,
     "code": 142,
@@ -26251,6 +26748,136 @@
     },
     "stars": 5
   },
+  "20707": {
+    "id": 20707,
+    "code": 581,
+    "name": {
+      "en": "Implacable",
+      "code": "HMS Implacable",
+      "cn": "怨仇",
+      "jp": "インプラカブル"
+    },
+    "property_hexagon": [0, 0, 5, 1, 4, 5],
+    "type": 7,
+    "armor": 3,
+    "slots": [[7], [9], [8], [10], [10]],
+    "nationality": 2,
+    "data": {
+      "207071": {
+        "id": 207071,
+        "tags": ["Implacable-Class", "Armor-CV"],
+        "type": 7,
+        "rarity": 6,
+        "stars": 3,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 1151,
+          "fp": 0,
+          "trp": 0,
+          "aa": 62,
+          "av": 84,
+          "rld": 46,
+          "acc": 32,
+          "eva": 13,
+          "spd": 32.5,
+          "luk": 79,
+          "asw": 0
+        }
+      },
+      "207072": {
+        "id": 207072,
+        "tags": ["Implacable-Class", "Armor-CV"],
+        "type": 7,
+        "rarity": 6,
+        "stars": 4,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 1432,
+          "fp": 0,
+          "trp": 0,
+          "aa": 77,
+          "av": 105,
+          "rld": 46,
+          "acc": 32,
+          "eva": 13,
+          "spd": 32.5,
+          "luk": 79,
+          "asw": 0
+        }
+      },
+      "207073": {
+        "id": 207073,
+        "tags": ["Implacable-Class", "Armor-CV"],
+        "type": 7,
+        "rarity": 6,
+        "stars": 5,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 1993,
+          "fp": 0,
+          "trp": 0,
+          "aa": 108,
+          "av": 146,
+          "rld": 46,
+          "acc": 32,
+          "eva": 13,
+          "spd": 32.5,
+          "luk": 79,
+          "asw": 0
+        }
+      },
+      "207074": {
+        "id": 207074,
+        "tags": ["Implacable-Class", "Armor-CV"],
+        "type": 7,
+        "rarity": 6,
+        "stars": 6,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 2835,
+          "fp": 0,
+          "trp": 0,
+          "aa": 153,
+          "av": 209,
+          "rld": 46,
+          "acc": 32,
+          "eva": 13,
+          "spd": 32.5,
+          "luk": 79,
+          "asw": 0
+        },
+        "slots": [[7], [7, 8, 9], [8], [10], [10]]
+      },
+      "900365": {
+        "id": 900365,
+        "tags": ["Implacable-Class", "Armor-CV"],
+        "type": 7,
+        "rarity": 6,
+        "stars": 6,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 2835,
+          "fp": 0,
+          "trp": 0,
+          "aa": 153,
+          "av": 209,
+          "rld": 46,
+          "acc": 32,
+          "eva": 13,
+          "spd": 32.5,
+          "luk": 79,
+          "asw": 0
+        },
+        "slots": [[7], [7, 8, 9], [8], [10], [10]]
+      }
+    },
+    "stars": 6
+  },
   "20709": {
     "id": 20709,
     "code": 459,
@@ -56106,7 +56733,8 @@
       "code": "SN Soobrazitelny",
       "cn": "灵敏",
       "jp": "ソオブラジーテリヌイ",
-      "kr": "소브라지텔니"
+      "kr": "소브라지텔니",
+      "tw": "靈敏"
     },
     "property_hexagon": [4, 1, 0, 3, 2, 1],
     "type": 1,
@@ -56213,7 +56841,8 @@
       "code": "SN Kiev",
       "cn": "基辅",
       "jp": "キエフ",
-      "kr": "키예프"
+      "kr": "키예프",
+      "tw": "基輔"
     },
     "property_hexagon": [4, 1, 0, 4, 2, 1],
     "type": 1,
@@ -56548,7 +57177,7 @@
         },
         "slots": [[1], [5], [6], [10, 14], [10, 14]],
         "name": {
-          "en": "Pamiat Merkuria (Retrofit)",
+          "en": "Pamiat' Merkuria (Retrofit)",
           "cn": "水星纪念.改",
           "jp": "パーミャチ・メルクーリヤ改",
           "kr": "파먀티 메르쿠리야·改",
@@ -57472,7 +58101,8 @@
       "code": "SN Arkhangelsk",
       "cn": "阿尔汉格尔斯克",
       "jp": "アルハンゲリスク",
-      "kr": "아르한겔스크"
+      "kr": "아르한겔스크",
+      "tw": "阿爾漢格爾斯克"
     },
     "property_hexagon": [4, 0, 0, 1, 1, 4],
     "type": 5,
@@ -57579,7 +58209,8 @@
       "code": "SN Volga",
       "cn": "伏尔加",
       "jp": "ヴォルガ",
-      "kr": "볼가"
+      "kr": "볼가",
+      "tw": "窩瓦"
     },
     "property_hexagon": [0, 0, 4, 2, 2, 4],
     "type": 7,
@@ -57686,7 +58317,8 @@
       "code": "SN Kronshtadt",
       "cn": "喀琅施塔得",
       "jp": "クロンシュタット",
-      "kr": "크론시타트"
+      "kr": "크론시타트",
+      "tw": "喀琅施塔得"
     },
     "property_hexagon": [4, 0, 0, 2, 2, 5],
     "type": 18,
@@ -58962,6 +59594,28 @@
           "asw": 0
         },
         "name": {"tw": "黎塞留"}
+      },
+      "900364": {
+        "id": 900364,
+        "tags": ["Richelieu-Class", "Richelieu", "PRE"],
+        "type": 18,
+        "rarity": 5,
+        "stars": 6,
+        "oil": 15,
+        "max_level": 100,
+        "stats": {
+          "hp": 3072,
+          "fp": 134,
+          "trp": 0,
+          "aa": 104,
+          "av": 0,
+          "rld": 62,
+          "acc": 43,
+          "eva": 11,
+          "spd": 24.8,
+          "luk": 50,
+          "asw": 0
+        }
       }
     },
     "stars": 6