add aaci 48

ElectronicObserverEN · Oct 3, 2024 · 64755df · 64755df
1 parent 3bc45af
commit 64755df
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 0 deletions.
diff --git a/ElectronicObserver/Window/Wpf/Extensions.cs b/ElectronicObserver/Window/Wpf/Extensions.cs
@@ -129,6 +129,11 @@ private static List<string> EquipmentConditions(this AntiAirCutInCondition condi
 			conditions.Add($"{AaciResources.HighAngleWithoutDirector} >= {condition.HighAngleWithoutDirector}");
 		}
 
+		if (condition.AkizukiGunKai > 0)
+		{
+			conditions.Add($"{AaciResources.AkizukiGunKai} >= {condition.AkizukiGunKai}");
+		}
+
 		if (condition.AaDirector > 0)
 		{
 			conditions.Add($"{AaciResources.AaDirector} >= {condition.AaDirector}");

diff --git a/ElectronicObserverTypes/AntiAir/AaciResources.en.resx b/ElectronicObserverTypes/AntiAir/AaciResources.en.resx
@@ -207,4 +207,7 @@
   <data name="Radar4AaOrMore" xml:space="preserve">
     <value>Radar (AA &gt;= 4)</value>
   </data>
+  <data name="AkizukiGunKai" xml:space="preserve">
+    <value>Akizuki gun kai</value>
+  </data>
 </root>
diff --git a/ElectronicObserverTypes/AntiAir/AaciResources.resx b/ElectronicObserverTypes/AntiAir/AaciResources.resx
@@ -187,4 +187,7 @@
   <data name="Radar4AaOrMore" xml:space="preserve">
     <value>電探(対空4以上)</value>
   </data>
+  <data name="AkizukiGunKai" xml:space="preserve">
+    <value>秋月砲改</value>
+  </data>
 </root>
diff --git a/ElectronicObserverTypes/AntiAir/AntiAirCutIn.cs b/ElectronicObserverTypes/AntiAir/AntiAirCutIn.cs
@@ -1145,6 +1145,30 @@ public record AntiAirCutIn
 				},
 			],
 		},
+		new()
+		{
+			Id = 48,
+			FixedBonus = 8,
+			VariableBonus = 1.75,
+			Rate = 0.643,
+			Conditions =
+			[
+				new()
+				{
+					Ships =
+					[
+						ShipId.AkizukiKai,
+						ShipId.TeruzukiKai,
+						ShipId.SuzutsukiKai,
+						ShipId.HatsuzukiKai,
+						ShipId.HatsuzukiKaiNi,
+						ShipId.FuyutsukiKai,
+					],
+					AkizukiGunKai = 2,
+					Radar4AaOrMore = 1,
+				},
+			],
+		},
 	];
 
 	public static IEnumerable<AntiAirCutIn> AllCutIns => CutIns

diff --git a/ElectronicObserverTypes/AntiAir/AntiAirCutInCondition.cs b/ElectronicObserverTypes/AntiAir/AntiAirCutInCondition.cs
@@ -57,6 +57,7 @@ public class AntiAirCutInCondition
 	public int AaGunShigure { get; init; }
 
 	public int Radar4AaOrMore { get; init; }
+	public int AkizukiGunKai { get; init; }
 
 	public bool CanBeActivatedBy(IShipData ship, AntiAirCutIn antiAirCutIn)
 	{
@@ -97,6 +98,7 @@ public bool CanBeActivatedBy(IShipData ship, AntiAirCutIn antiAirCutIn)
 		if (!ship.HasHarusameGun(HarusameGun)) return false;
 		if (!ship.HasShigureAaGun(HarusameGun)) return false;
 		if (!ship.HasAirRadar(Radar4AaOrMore, 4)) return false;
+		if (!ship.HasAkizukiGunKai(AkizukiGunKai)) return false;
 
 		return true;
 	}

diff --git a/ElectronicObserverTypes/Extensions/ShipDataExtensions.cs b/ElectronicObserverTypes/Extensions/ShipDataExtensions.cs
@@ -315,6 +315,11 @@ public static bool HasHarusameGun(this IShipData ship, int count) => ship.AllSlo
 			EquipmentId.MainGunSmall_12_7cmTwinGunModelCKaiSanH)
 		>= count;
 
+	public static bool HasAkizukiGunKai(this IShipData ship, int count) => ship.AllSlotInstance
+		.Count(e => e?.MasterEquipment.EquipmentId is
+			EquipmentId.MainGunSmall_10cmTwinHighangleMountKai_AntiAircraftFireDirectorKai)
+		>= count;
+
 	public static bool HasHighAngleConcentrated(this IShipData ship, int count = 1) => ship.AllSlotInstance
 		.Count(e => e?.MasterEquipment.EquipmentId is
 			EquipmentId.SecondaryGun_10cmTwinHighangleGunMountBatteryConcentratedDeployment)