From 4ddc9229dd7b14384e6b01564757335ead7311c9 Mon Sep 17 00:00:00 2001
From: Jebzou <22751386+Jebzou@users.noreply.github.com>
Date: Thu, 3 Oct 2024 18:36:22 +0200
Subject: [PATCH] Kirishima Kai Ni C update (#500)

---
 .../Generated/TestData.sqlite                 | Bin 802816 -> 802816 bytes
 .../Generated/ships.json                      | 302 ++++++++++++------
 .../Attacks/Specials/KongouSpecialAttack.cs   |  86 ++---
 .../Attacks/Specials/NelsonSpecialAttack.cs   |   4 +-
 .../Specials/Yamato123SpecialAttack.cs        |   7 +-
 ElectronicObserverTypes/EquipmentId.cs        |  12 +
 ElectronicObserverTypes/ShipId.cs             |   6 +
 7 files changed, 272 insertions(+), 145 deletions(-)

diff --git a/ElectronicObserver.TestData/Generated/TestData.sqlite b/ElectronicObserver.TestData/Generated/TestData.sqlite
index f721f4b09fe018a0f0ecfc9c409ec55853326bf2..58f96fcbb994a1847787d9b5c48c4f07986bab62 100644
GIT binary patch
delta 16492
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
PCN9Y}UNgg_X6Jtc_1TmX

delta 17924
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
V1HG1YiI&!+ILESH4_WG*`#;#{1%v<q

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<SpecialAttackHit> 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,