diff --git a/ElectronicObserver.TestData/Generated/TestData.sqlite b/ElectronicObserver.TestData/Generated/TestData.sqlite index f721f4b09..58f96fcbb 100644 Binary files a/ElectronicObserver.TestData/Generated/TestData.sqlite and b/ElectronicObserver.TestData/Generated/TestData.sqlite differ diff --git a/ElectronicObserver.TestData/Generated/ships.json b/ElectronicObserver.TestData/Generated/ships.json index de08667f0..75ad872d5 100644 --- a/ElectronicObserver.TestData/Generated/ships.json +++ b/ElectronicObserver.TestData/Generated/ships.json @@ -13593,14 +13593,14 @@ "NameReading": "きりしま", "ShipType": 8, "ShipClass": 6, - "RemodelAfterLevel": 0, - "RemodelAfterShipId": 0, + "RemodelAfterLevel": 89, + "RemodelAfterShipId": 694, "RemodelBeforeShipId": 212, - "RemodelAmmo": 0, - "RemodelSteel": 0, - "NeedBlueprint": 0, + "RemodelAmmo": 8900, + "RemodelSteel": 7800, + "NeedBlueprint": 2, "NeedCatapult": 0, - "NeedActionReport": 0, + "NeedActionReport": 1, "NeedAviationMaterial": 0, "NeedArmamentMaterial": 0, "HpMin": 82, @@ -60572,6 +60572,106 @@ "VoiceFlag": 3, "OriginalCostumeShipID": -1 }, + { + "ShipId": 694, + "AlbumNo": 394, + "SortId": 1047, + "Name": "霧島改二丙", + "NameReading": "きりしま", + "ShipType": 8, + "ShipClass": 6, + "RemodelAfterLevel": 0, + "RemodelAfterShipId": 0, + "RemodelBeforeShipId": 152, + "RemodelAmmo": 0, + "RemodelSteel": 0, + "NeedBlueprint": 0, + "NeedCatapult": 0, + "NeedActionReport": 0, + "NeedAviationMaterial": 0, + "NeedArmamentMaterial": 0, + "HpMin": 85, + "HpMax": 98, + "FirepowerMin": 79, + "FirepowerMax": 106, + "TorpedoMin": 17, + "TorpedoMax": 40, + "AaMin": 32, + "AaMax": 82, + "ArmorMin": 71, + "ArmorMax": 92, + "AswMin": 0, + "AswMax": 0, + "EvasionMin": 36, + "EvasionMax": 74, + "LosMin": 25, + "LosMax": 52, + "LuckMin": 16, + "LuckMax": 90, + "Speed": 10, + "Range": 3, + "SlotSize": 4, + "Aircraft1": 2, + "Aircraft2": 2, + "Aircraft3": 4, + "Aircraft4": 3, + "Aircraft5": 0, + "DefaultSlot1": null, + "DefaultSlot2": null, + "DefaultSlot3": null, + "DefaultSlot4": null, + "DefaultSlot5": null, + "EquippableCategories": [ + 3, + 4, + 5, + 10, + 12, + 13, + 14, + 16, + 17, + 18, + 19, + 20, + 21, + 23, + 28, + 29, + 33, + 34, + 36, + 37, + 39, + 40, + 42, + 43, + 45, + 46, + 93, + 95 + ], + "BuildingTime": 240, + "Material": [ + 14, + 19, + 38, + 4 + ], + "PowerUp": [ + 4, + 1, + 2, + 4 + ], + "Rarity": 8, + "MessageGet": "", + "MessageAlbum": "", + "Fuel": 100, + "Ammo": 160, + "VoiceFlag": 3, + "OriginalCostumeShipID": -1 + }, { "ShipId": 695, "AlbumNo": 1495, @@ -64001,10 +64101,10 @@ "ArmorMax": 92, "AswMin": 0, "AswMax": 0, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "EvasionMin": 30, + "EvasionMax": 69, + "LosMin": 20, + "LosMax": 59, "LuckMin": 40, "LuckMax": 105, "Speed": 5, @@ -64193,9 +64293,9 @@ "AswMin": 0, "AswMax": 0, "EvasionMin": 4999, - "EvasionMax": 9999, + "EvasionMax": 51, "LosMin": 4999, - "LosMax": 9999, + "LosMax": 80, "LuckMin": 17, "LuckMax": 74, "Speed": 10, @@ -64206,11 +64306,11 @@ "Aircraft3": 20, "Aircraft4": 13, "Aircraft5": 0, - "DefaultSlot1": null, - "DefaultSlot2": null, - "DefaultSlot3": null, - "DefaultSlot4": null, - "DefaultSlot5": null, + "DefaultSlot1": 543, + "DefaultSlot2": 544, + "DefaultSlot3": -1, + "DefaultSlot4": -1, + "DefaultSlot5": -1, "EquippableCategories": [ 4, 6, @@ -68048,10 +68148,10 @@ "ArmorMax": 90, "AswMin": 0, "AswMax": 0, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "EvasionMin": 25, + "EvasionMax": 54, + "LosMin": 15, + "LosMax": 47, "LuckMin": 35, "LuckMax": 85, "Speed": 5, @@ -69780,11 +69880,11 @@ "ArmorMin": 16, "ArmorMax": 39, "AswMin": 0, - "AswMax": 9999, + "AswMax": 34, "EvasionMin": 4999, - "EvasionMax": 9999, + "EvasionMax": 68, "LosMin": 4999, - "LosMax": 9999, + "LosMax": 68, "LuckMin": 19, "LuckMax": 79, "Speed": 10, @@ -70608,12 +70708,12 @@ "AaMax": 64, "ArmorMin": 13, "ArmorMax": 34, - "AswMin": 4999, - "AswMax": 9999, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "AswMin": 32, + "AswMax": 52, + "EvasionMin": 53, + "EvasionMax": 87, + "LosMin": 8, + "LosMax": 38, "LuckMin": 6, "LuckMax": 51, "Speed": 10, @@ -70786,12 +70886,12 @@ "AaMax": 68, "ArmorMin": 16, "ArmorMax": 37, - "AswMin": 4999, - "AswMax": 9999, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "AswMin": 0, + "AswMax": 36, + "EvasionMin": 32, + "EvasionMax": 74, + "LosMin": 20, + "LosMax": 64, "LuckMin": 22, "LuckMax": 82, "Speed": 10, @@ -70883,9 +70983,9 @@ "AswMin": 0, "AswMax": 0, "EvasionMin": 4999, - "EvasionMax": 9999, + "EvasionMax": 40, "LosMin": 4999, - "LosMax": 9999, + "LosMax": 67, "LuckMin": 15, "LuckMax": 70, "Speed": 10, @@ -70972,12 +71072,12 @@ "AaMax": 73, "ArmorMin": 29, "ArmorMax": 57, - "AswMin": 4999, - "AswMax": 9999, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "AswMin": 48, + "AswMax": 63, + "EvasionMin": 72, + "EvasionMax": 91, + "LosMin": 27, + "LosMax": 50, "LuckMin": 11, "LuckMax": 71, "Speed": 10, @@ -71159,10 +71259,10 @@ "ArmorMax": 109, "AswMin": 0, "AswMax": 0, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "EvasionMin": 40, + "EvasionMax": 74, + "LosMin": 19, + "LosMax": 58, "LuckMin": 28, "LuckMax": 118, "Speed": 10, @@ -71257,12 +71357,12 @@ "AaMax": 76, "ArmorMin": 24, "ArmorMax": 66, - "AswMin": 4999, - "AswMax": 9999, - "EvasionMin": 4999, - "EvasionMax": 9999, - "LosMin": 4999, - "LosMax": 9999, + "AswMin": 23, + "AswMax": 45, + "EvasionMin": 61, + "EvasionMax": 83, + "LosMin": 51, + "LosMax": 76, "LuckMin": 35, "LuckMax": 97, "Speed": 10, @@ -129499,8 +129599,8 @@ "Range": 0, "SlotSize": 5, "Aircraft1": 48, - "Aircraft2": 44, - "Aircraft3": 44, + "Aircraft2": 46, + "Aircraft3": 42, "Aircraft4": 42, "Aircraft5": 0, "DefaultSlot1": 1581, @@ -130424,10 +130524,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 46, - "Aircraft2": 46, - "Aircraft3": 46, - "Aircraft4": 42, + "Aircraft1": 48, + "Aircraft2": 44, + "Aircraft3": 44, + "Aircraft4": 44, "Aircraft5": 0, "DefaultSlot1": 1581, "DefaultSlot2": 1574, @@ -130610,8 +130710,8 @@ "SlotSize": 5, "Aircraft1": 48, "Aircraft2": 44, - "Aircraft3": 46, - "Aircraft4": 42, + "Aircraft3": 44, + "Aircraft4": 44, "Aircraft5": 0, "DefaultSlot1": 1581, "DefaultSlot2": 1574, @@ -130700,10 +130800,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 68, - "Aircraft2": 74, - "Aircraft3": 32, - "Aircraft4": 34, + "Aircraft1": 64, + "Aircraft2": 48, + "Aircraft3": 48, + "Aircraft4": 48, "Aircraft5": 0, "DefaultSlot1": 1581, "DefaultSlot2": 1574, @@ -130793,9 +130893,9 @@ "Range": 0, "SlotSize": 5, "Aircraft1": 72, - "Aircraft2": 82, - "Aircraft3": 46, - "Aircraft4": 48, + "Aircraft2": 64, + "Aircraft3": 56, + "Aircraft4": 56, "Aircraft5": 0, "DefaultSlot1": 1581, "DefaultSlot2": 1574, @@ -141797,9 +141897,9 @@ "Speed": 0, "Range": 0, "SlotSize": 4, - "Aircraft1": 16, - "Aircraft2": 16, - "Aircraft3": 12, + "Aircraft1": 24, + "Aircraft2": 12, + "Aircraft3": 8, "Aircraft4": 4, "Aircraft5": 0, "DefaultSlot1": 1561, @@ -141899,10 +141999,10 @@ "Speed": 0, "Range": 0, "SlotSize": 4, - "Aircraft1": 24, + "Aircraft1": 32, "Aircraft2": 24, - "Aircraft3": 16, - "Aircraft4": 12, + "Aircraft3": 12, + "Aircraft4": 8, "Aircraft5": 0, "DefaultSlot1": 1562, "DefaultSlot2": 1617, @@ -142001,10 +142101,10 @@ "Speed": 0, "Range": 0, "SlotSize": 4, - "Aircraft1": 36, + "Aircraft1": 40, "Aircraft2": 24, - "Aircraft3": 24, - "Aircraft4": 12, + "Aircraft3": 16, + "Aircraft4": 16, "Aircraft5": 0, "DefaultSlot1": 1562, "DefaultSlot2": 1617, @@ -142715,9 +142815,9 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 38, - "Aircraft2": 18, - "Aircraft3": 18, + "Aircraft1": 24, + "Aircraft2": 36, + "Aircraft3": 14, "Aircraft4": 8, "Aircraft5": 0, "DefaultSlot1": 1650, @@ -142807,10 +142907,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 0, - "Aircraft2": 0, - "Aircraft3": 0, - "Aircraft4": 0, + "Aircraft1": 28, + "Aircraft2": 48, + "Aircraft3": 18, + "Aircraft4": 18, "Aircraft5": 0, "DefaultSlot1": 1650, "DefaultSlot2": 1651, @@ -142899,10 +142999,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 64, - "Aircraft2": 32, - "Aircraft3": 32, - "Aircraft4": 14, + "Aircraft1": 34, + "Aircraft2": 54, + "Aircraft3": 30, + "Aircraft4": 24, "Aircraft5": 0, "DefaultSlot1": 1650, "DefaultSlot2": 1651, @@ -142991,10 +143091,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 58, - "Aircraft2": 30, - "Aircraft3": 30, - "Aircraft4": 14, + "Aircraft1": 34, + "Aircraft2": 52, + "Aircraft3": 26, + "Aircraft4": 20, "Aircraft5": 0, "DefaultSlot1": 1650, "DefaultSlot2": 1651, @@ -143083,10 +143183,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 0, - "Aircraft2": 0, - "Aircraft3": 0, - "Aircraft4": 0, + "Aircraft1": 36, + "Aircraft2": 67, + "Aircraft3": 32, + "Aircraft4": 27, "Aircraft5": 0, "DefaultSlot1": 1650, "DefaultSlot2": 1651, @@ -143175,10 +143275,10 @@ "Speed": 10, "Range": 0, "SlotSize": 5, - "Aircraft1": 72, - "Aircraft2": 48, - "Aircraft3": 48, - "Aircraft4": 14, + "Aircraft1": 42, + "Aircraft2": 72, + "Aircraft3": 36, + "Aircraft4": 32, "Aircraft5": 0, "DefaultSlot1": 1650, "DefaultSlot2": 1651, diff --git a/ElectronicObserverTypes/Attacks/Specials/KongouSpecialAttack.cs b/ElectronicObserverTypes/Attacks/Specials/KongouSpecialAttack.cs index c8ee8f4a4..10f35fff3 100644 --- a/ElectronicObserverTypes/Attacks/Specials/KongouSpecialAttack.cs +++ b/ElectronicObserverTypes/Attacks/Specials/KongouSpecialAttack.cs @@ -64,19 +64,22 @@ public override double GetTriggerRate() IShipData? flagship = ships.First(); if (flagship is null) return 0; + // TODO : Kirishima Kai Ni C's trigger rate mods are unknown for now + if (flagship.MasterShip.ShipId is ShipId.KirishimaKaiNiC) return 0; + IShipData? helper = ships[1]; if (helper is null) return 0; - // https://docs.google.com/spreadsheets/d/1xO0krWBDnevmp0zrqDs1MKek7YD-ly3B6av5R2GRpho/edit#gid=0 - double rate = 4 * Math.Sqrt(flagship.Level) + 4 * Math.Sqrt(helper.Level) + Math.Sqrt(flagship.LuckTotal) + Math.Sqrt(helper.LuckTotal) - 45; + // https://x.com/Divinity_123/status/1820114427619709288 + double rate = 3.5 * Math.Sqrt(flagship.Level) + 3.5 * Math.Sqrt(helper.Level) + 1.1 * Math.Sqrt(flagship.LuckTotal) + 1.1 * Math.Sqrt(helper.LuckTotal) - 33; if (flagship.AllSlotInstance.Any(e => e?.MasterEquipment is { IsSurfaceRadar: true, LOS: >= 8 })) { rate += flagship.MasterShip.ShipId switch { - ShipId.KongouKaiNiC or - ShipId.HarunaKaiNiB or - ShipId.HarunaKaiNiC => 31, + ShipId.KongouKaiNiC => 30, + ShipId.HarunaKaiNiB => 15, + ShipId.HarunaKaiNiC => 20, ShipId.HieiKaiNiC => 10, _ => 0, }; @@ -86,10 +89,8 @@ ShipId.HarunaKaiNiB or { rate += flagship.MasterShip.ShipId switch { - ShipId.KongouKaiNiC or - ShipId.HarunaKaiNiB or - ShipId.HarunaKaiNiC => 10, - ShipId.HieiKaiNiC => 31, + ShipId.KongouKaiNiC => 10, + ShipId.HieiKaiNiC => 30, _ => 0, }; } @@ -104,46 +105,51 @@ private double GetPowerModifier(int shipIndex) IShipData? ship = ships[shipIndex]; if (ship is null) return 1; - int bonusEquipments = ship.AllSlotInstance.Count(IsBonusGun); - - return bonusEquipments switch + // https://docs.google.com/spreadsheets/d/16tTtSVntB5MmlaxkZcLuFoH3A69bVPRpqXjNgo7f_a0/edit?gid=0#gid=0 + double equipmentMods = ship.AllSlotInstance.Count(IsKaiSanOrKaiYonGun) switch { - 0 => 2.4, - 1 => 2.66, - _ => 2.76, + 0 => 1, + 1 => 1.11, + _ => 1.15, }; + + // https://x.com/yukicacoon/status/1839167149317009709 + if (ship.AllSlotInstance.Any(IsKaiNiGun)) + { + equipmentMods += 0.05; + } + + return equipmentMods * 2.4; } - private static bool IsBonusGun(IEquipmentData? eq) => eq?.EquipmentId is EquipmentId.MainGunLarge_35_6cmTwinGunMountKaiYon or EquipmentId.MainGunLarge_35_6cmTwinGunMountKaiSanC; + private static bool IsKaiSanOrKaiYonGun(IEquipmentData? eq) => eq?.EquipmentId is EquipmentId.MainGunLarge_35_6cmTwinGunMountKaiYon or EquipmentId.MainGunLarge_35_6cmTwinGunMountKaiSanC; + private static bool IsKaiNiGun(IEquipmentData? eq) => eq?.EquipmentId is EquipmentId.MainGunLarge_35_6cmTwinGunMountKaiNi; private static bool IsKongouClassThirdRemodel(ShipId id) => id is ShipId.KongouKaiNiC or ShipId.HieiKaiNiC or ShipId.HarunaKaiNiB or - ShipId.HarunaKaiNiC; + ShipId.HarunaKaiNiC or + ShipId.KirishimaKaiNiC; - private static bool IsValidPair(ShipId flagship, ShipId helper) => flagship switch + private static bool IsValidPair(ShipId flagship, ShipId helper) { - ShipId.KongouKaiNiC => helper is - ShipId.HieiKaiNiC or - ShipId.HarunaKaiNi or - ShipId.HarunaKaiNiB or - ShipId.HarunaKaiNiC or - ShipId.Warspite or - ShipId.WarspiteKai or - ShipId.Valiant or - ShipId.ValiantKai, - - ShipId.HieiKaiNiC => helper is - ShipId.KirishimaKaiNi or - ShipId.HarunaKaiNiB or - ShipId.HarunaKaiNiC or - ShipId.KongouKaiNiC, - - ShipId.HarunaKaiNiB or ShipId.HarunaKaiNiC => helper is - ShipId.HieiKaiNiC or - ShipId.KongouKaiNiC, - - _ => false, - }; + if (IsKongouClassThirdRemodel(helper)) return true; + + return flagship switch + { + ShipId.KongouKaiNiC => helper is + ShipId.HarunaKaiNi or + ShipId.Warspite or + ShipId.WarspiteKai or + ShipId.Valiant or + ShipId.ValiantKai, + + ShipId.HieiKaiNiC => helper is ShipId.KirishimaKaiNi, + + ShipId.KirishimaKaiNiC => helper is ShipId.SouthDakotaKai, + + _ => false, + }; + } } diff --git a/ElectronicObserverTypes/Attacks/Specials/NelsonSpecialAttack.cs b/ElectronicObserverTypes/Attacks/Specials/NelsonSpecialAttack.cs index 7670bf606..252a623d3 100644 --- a/ElectronicObserverTypes/Attacks/Specials/NelsonSpecialAttack.cs +++ b/ElectronicObserverTypes/Attacks/Specials/NelsonSpecialAttack.cs @@ -41,8 +41,8 @@ public override double GetTriggerRate() IShipData? secondHelper = ships[4]; if (secondHelper is null) return 0; - // https://twitter.com/dewydrops/status/1181520911444271105?s=20 - return (Math.Sqrt(flagship.Level) + Math.Sqrt(firstHelper.Level) + Math.Sqrt(secondHelper.Level) + flagship.LuckTotal * 0.24 + 25) / 100; + // https://x.com/Divinity_123/status/1820114418904002935 + return (1.1 * Math.Sqrt(flagship.Level) + Math.Sqrt(firstHelper.Level) + Math.Sqrt(secondHelper.Level) + Math.Sqrt(flagship.LuckTotal) * 1.4 + 25) / 100; } public override List GetAttacks() diff --git a/ElectronicObserverTypes/Attacks/Specials/Yamato123SpecialAttack.cs b/ElectronicObserverTypes/Attacks/Specials/Yamato123SpecialAttack.cs index dfcecbc90..a583d1f15 100644 --- a/ElectronicObserverTypes/Attacks/Specials/Yamato123SpecialAttack.cs +++ b/ElectronicObserverTypes/Attacks/Specials/Yamato123SpecialAttack.cs @@ -151,9 +151,12 @@ private double GetEquipmentPowerModifier(IShipData ship, bool applyYamatoRadarBo private static bool IsYamatoHelperPair(ShipId firstHelper, ShipId secondHelper) => firstHelper switch { - ShipId.KongouKaiNiC => secondHelper is ShipId.HieiKaiNiC or ShipId.HarunaKaiNiB or ShipId.HarunaKaiNiC, + ShipId.KongouKaiNiC => secondHelper is ShipId.HieiKaiNiC or ShipId.HarunaKaiNiB or ShipId.HarunaKaiNiC or ShipId.KirishimaKaiNiC, + + ShipId.HieiKaiNiC => secondHelper is ShipId.KongouKaiNiC or ShipId.KirishimaKaiNiC, + + ShipId.KirishimaKaiNiC => secondHelper is ShipId.HieiKaiNiC or ShipId.KongouKaiNiC, - ShipId.HieiKaiNiC or ShipId.HarunaKaiNiC or ShipId.HarunaKaiNiB => secondHelper is ShipId.KongouKaiNiC, diff --git a/ElectronicObserverTypes/EquipmentId.cs b/ElectronicObserverTypes/EquipmentId.cs index f2cceaab7..51a35df84 100644 --- a/ElectronicObserverTypes/EquipmentId.cs +++ b/ElectronicObserverTypes/EquipmentId.cs @@ -535,4 +535,16 @@ public enum EquipmentId CommandFacility_FleetCommunicationAntenna = 531, CommandFacility_CommunicationEquipment_Personnel = 532, MainGunSmall_10cmTwinHighangleMountKai_AntiAircraftFireDirectorKai = 533, + MainGunSmall_13_8cmTwinGun = 534, + MainGunSmall_13_8cmTwinGunKai = 535, + MainGunMedium_15_2cmTripleMainGun = 536, + MainGunMedium_15_2cmTripleMainGunKai = 537, + SeaplaneRecon_Loire130MKai_Skilled = 538, + SeaplaneRecon_SOCSeagullLateModel_Skilled = 539, + SeaplaneRecon_Type0ReconnaissanceSeaplaneModel11AKaiNi = 540, + CarrierBasedBomber_SBD_YellowWings = 541, + CarrierBasedTorpedo_TBD_YellowWings = 542, + CarrierBasedRecon_SBDVS2_ReconnaissanceSquadron = 543, + CarrierBasedBomber_SBDVB2_BomberSquadron = 544, + CarrierBasedTorpedo_TenzanModel12AKaiNi_MurataSquadronwRadar = 545 } diff --git a/ElectronicObserverTypes/ShipId.cs b/ElectronicObserverTypes/ShipId.cs index cc3f1de7e..cb5fa1091 100644 --- a/ElectronicObserverTypes/ShipId.cs +++ b/ElectronicObserverTypes/ShipId.cs @@ -665,6 +665,7 @@ public enum ShipId GGaribaldiKai = 691, FletcherKai = 692, LdSDdAbruzziKai = 693, + KirishimaKaiNiC = 694, AkishimoKai = 695, AtlantaKai = 696, SouthDakotaKai = 697, @@ -704,6 +705,8 @@ public enum ShipId CCappelliniKai = 731, DrumKai = 732, ValiantKai = 733, + PhoenixKai = 734, + LexingtonKai = 735, ContediCavour = 877, ContediCavourKai = 878, ContediCavournuovo = 879, @@ -765,9 +768,11 @@ public enum ShipId KumanoMaruKai = 948, HeianMaruKai = 949, AmatsukazeKaiNi = 951, + Phoenix = 952, Asahi = 953, HarunaKaiNiC = 954, KiyoshimoKaiNi = 955, + GeneralBelgrano = 957, AsahiKai = 958, MiyukiKaiNi = 959, KiyoshimoKaiNiD = 960, @@ -775,6 +780,7 @@ public enum ShipId Mogador = 962, Shirakumo = 964, Gloire = 965, + Lexington = 966, MogadorKai = 967, HatsuzukiKaiNi = 968, RichelieuDeux = 969,