add option to export locked ships only

ElectronicObserverEN · Oct 8, 2023 · 5b98476 · 5b98476
1 parent 689f488
commit 5b98476
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 46 deletions.
diff --git a/Browser/CefSharpBrowser/AirControlSimulator/AirControlSimulatorViewModel.cs b/Browser/CefSharpBrowser/AirControlSimulator/AirControlSimulatorViewModel.cs
@@ -34,9 +34,11 @@ private async Task UpdateFleet()
 	}
 
 	[RelayCommand]
-	private async Task UpdateShips()
+	private async Task UpdateShips(bool? allShips)
 	{
-		string data = await BrowserHost.GetShipData();
+		if (allShips is not bool all) return;
+
+		string data = await BrowserHost.GetShipData(all);
 
 		ExecuteScriptAsync?.Invoke($"loadShipData('{data}')");
 	}

diff --git a/Browser/CefSharpBrowser/AirControlSimulator/AirControlSimulatorWindow.xaml b/Browser/CefSharpBrowser/AirControlSimulator/AirControlSimulatorWindow.xaml
@@ -35,7 +35,17 @@
 
 			<Button Command="{Binding UpdateFleetCommand}" Content="{Binding AirControlSimulator.Fleet}" />
 
-			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.Ships}" />
+			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.LockedShips}">
+				<Button.CommandParameter>
+					<system:Boolean>False</system:Boolean>
+				</Button.CommandParameter>
+			</Button>
+
+			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.AllShips}">
+				<Button.CommandParameter>
+					<system:Boolean>True</system:Boolean>
+				</Button.CommandParameter>
+			</Button>
 
 			<Button Command="{Binding UpdateEquipmentCommand}" Content="{Binding AirControlSimulator.LockedEquipment}">
 				<Button.CommandParameter>

diff --git a/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorResources.en.resx b/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorResources.en.resx
@@ -123,8 +123,8 @@
   <data name="Fleet" xml:space="preserve">
     <value>Fleet</value>
   </data>
-  <data name="Ships" xml:space="preserve">
-    <value>Ships</value>
+  <data name="LockedShips" xml:space="preserve">
+    <value>Locked ships</value>
   </data>
   <data name="Title" xml:space="preserve">
     <value>Air control simulator</value>
@@ -138,4 +138,7 @@
   <data name="AllEquipment" xml:space="preserve">
     <value>All equipment</value>
   </data>
+  <data name="AllShips" xml:space="preserve">
+    <value>All ships</value>
+  </data>
 </root>
diff --git a/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorResources.resx b/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorResources.resx
@@ -123,8 +123,8 @@
   <data name="Fleet" xml:space="preserve">
     <value>艦隊</value>
   </data>
-  <data name="Ships" xml:space="preserve">
-    <value>艦娘</value>
+  <data name="LockedShips" xml:space="preserve">
+    <value>ロック済みのみ艦娘</value>
   </data>
   <data name="Title" xml:space="preserve">
     <value>制空権シミュレータ</value>
@@ -138,4 +138,7 @@
   <data name="AllEquipment" xml:space="preserve">
     <value>未ロックも含める装備</value>
   </data>
+  <data name="AllShips" xml:space="preserve">
+    <value>未ロックも含める艦娘</value>
+  </data>
 </root>
diff --git a/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorTranslationViewModel.cs b/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorTranslationViewModel.cs
@@ -5,8 +5,8 @@ public class AirControlSimulatorTranslationViewModel
 	public string Title => AirControlSimulatorResources.Title;
 
 	public string Fleet => AirControlSimulatorResources.Fleet;
-	public string Ships => AirControlSimulatorResources.Ships;
-	public string Equipment => AirControlSimulatorResources.Equipment;
+	public string LockedShips => AirControlSimulatorResources.LockedShips;
+	public string AllShips => AirControlSimulatorResources.AllShips;
 	public string LockedEquipment => AirControlSimulatorResources.LockedEquipment;
 	public string AllEquipment => AirControlSimulatorResources.AllEquipment;
 

diff --git a/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorViewModel.cs b/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorViewModel.cs
@@ -33,9 +33,11 @@ private async Task UpdateFleet()
 	}
 
 	[RelayCommand]
-	private async Task UpdateShips()
+	private async Task UpdateShips(bool? allShips)
 	{
-		string data = await BrowserHost.GetShipData();
+		if (allShips is not bool all) return;
+
+		string data = await BrowserHost.GetShipData(all);
 
 		ExecuteScriptAsync?.Invoke($"loadShipData('{data}')");
 	}

diff --git a/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorWindow.xaml b/Browser/WebView2Browser/AirControlSimulator/AirControlSimulatorWindow.xaml
@@ -36,7 +36,17 @@
 
 			<Button Command="{Binding UpdateFleetCommand}" Content="{Binding AirControlSimulator.Fleet}" />
 
-			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.Ships}" />
+			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.LockedShips}">
+				<Button.CommandParameter>
+					<system:Boolean>False</system:Boolean>
+				</Button.CommandParameter>
+			</Button>
+
+			<Button Command="{Binding UpdateShipsCommand}" Content="{Binding AirControlSimulator.AllShips}">
+				<Button.CommandParameter>
+					<system:Boolean>True</system:Boolean>
+				</Button.CommandParameter>
+			</Button>
 
 			<Button Command="{Binding UpdateEquipmentCommand}" Content="{Binding AirControlSimulator.LockedEquipment}">
 				<Button.CommandParameter>

diff --git a/BrowserLibCore/IBrowserHost.cs b/BrowserLibCore/IBrowserHost.cs
@@ -16,6 +16,6 @@ public interface IBrowserHost : IStreamingHub<IBrowserHost, IBrowser>
 	Task<bool> IsServerAlive();
 	Task<int> GetTheme();
 	Task<string?> GetFleetData();
-	Task<string> GetShipData();
+	Task<string> GetShipData(bool allShips);
 	Task<string> GetEquipmentData(bool allEquipment);
 }
diff --git a/ElectronicObserver/Services/DataSerializationService.cs b/ElectronicObserver/Services/DataSerializationService.cs
@@ -68,9 +68,10 @@ private string DeckBuilderFleet4()
 		);
 	}
 
-	public string FleetAnalysisShips()
+	public string FleetAnalysisShips(bool allShips)
 	{
-		return FleetAnalysisShips(KCDatabase.Instance.Ships.Values);
+		return FleetAnalysisShips(KCDatabase.Instance.Ships.Values
+			.Where(s => allShips || s.IsLocked));
 	}
 
 	public string FleetAnalysisEquipment(bool allEquipment)
@@ -103,13 +104,14 @@ public string AirControlSimulatorLink(AirControlSimulatorViewModel airControlSim
 			bases.Skip(2).FirstOrDefault(),
 			airControlSimulator.ShipData switch
 			{
-				true => KCDatabase.Instance.Ships.Values,
+				true => KCDatabase.Instance.Ships.Values
+					.Where(s => airControlSimulator.IncludeUnlockedShips || s.IsLocked),
 				_ => null,
 			},
 			airControlSimulator.EquipmentData switch
 			{
 				true => KCDatabase.Instance.Equipments.Values
-					.Where(e => airControlSimulator.AllEquipment || e!.IsLocked)
+					.Where(e => airControlSimulator.IncludeUnlockedEquipment || e!.IsLocked)
 					.Cast<EquipmentData>(),
 				_ => null,
 			},

diff --git a/ElectronicObserver/Window/BrowserHostHub.cs b/ElectronicObserver/Window/BrowserHostHub.cs
@@ -111,11 +111,11 @@ public Task<int> GetTheme()
 		return a;
 	}
 
-	public Task<string> GetShipData()
+	public Task<string> GetShipData(bool allShips)
 	{
 		DataSerializationService service = Ioc.Default.GetService<DataSerializationService>()!;
 
-		return Task.Run(() => service.FleetAnalysisShips());
+		return Task.Run(() => service.FleetAnalysisShips(allShips));
 	}
 
 	public Task<string> GetEquipmentData(bool allEquipment)

diff --git a/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorDialog.xaml b/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorDialog.xaml
@@ -76,19 +76,24 @@
 			Header="{Binding AirControlSimulator.Data}"
 			Visibility="{Binding DataSelectionVisible, Converter={StaticResource BooleanToVisibilityConverter}}"
 			>
-			<StackPanel Orientation="Horizontal">
-				<CheckBox Content="{Binding AirControlSimulator.Ships}" IsChecked="{Binding ShipData}" />
-				<CheckBox Content="{Binding AirControlSimulator.Equipment}" IsChecked="{Binding EquipmentData}" />
-				<RadioButton
-					Content="{Binding AirControlSimulator.LockedEquipment}"
-					IsChecked="{Binding LockedEquipment}"
-					IsEnabled="{Binding EquipmentData}"
-					/>
-				<RadioButton
-					Content="{Binding AirControlSimulator.AllEquipment}"
-					IsChecked="{Binding AllEquipment}"
-					IsEnabled="{Binding EquipmentData}"
-					/>
+			<StackPanel>
+				<StackPanel Orientation="Horizontal">
+					<CheckBox Content="{Binding AirControlSimulator.Ships}" IsChecked="{Binding ShipData}" />
+					<CheckBox
+						Content="{Binding AirControlSimulator.IncludeUnlocked}"
+						IsChecked="{Binding IncludeUnlockedShips}"
+						IsEnabled="{Binding ShipData}"
+						/>
+				</StackPanel>
+
+				<StackPanel Orientation="Horizontal">
+					<CheckBox Content="{Binding AirControlSimulator.Equipment}" IsChecked="{Binding EquipmentData}" />
+					<CheckBox
+						Content="{Binding AirControlSimulator.IncludeUnlocked}"
+						IsChecked="{Binding IncludeUnlockedEquipment}"
+						IsEnabled="{Binding EquipmentData}"
+						/>
+				</StackPanel>
 			</StackPanel>
 		</GroupBox>
 

diff --git a/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorResources.en.resx b/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorResources.en.resx
@@ -138,11 +138,8 @@
   <data name="Equipment" xml:space="preserve">
     <value>Equipment</value>
   </data>
-  <data name="AllEquipment" xml:space="preserve">
-    <value>All equipment</value>
-  </data>
-  <data name="LockedEquipment" xml:space="preserve">
-    <value>Locked equipment</value>
+  <data name="IncludeUnlocked" xml:space="preserve">
+    <value>Include unlocked</value>
   </data>
   <data name="Ok" xml:space="preserve">
     <value>OK</value>

diff --git a/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorResources.resx b/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorResources.resx
@@ -118,10 +118,7 @@
   <data name="Equipment" xml:space="preserve">
     <value>装備</value>
   </data>
-  <data name="LockedEquipment" xml:space="preserve">
-    <value>ロック済みのみ</value>
-  </data>
-  <data name="AllEquipment" xml:space="preserve">
+  <data name="IncludeUnlocked" xml:space="preserve">
     <value>未ロックも含める</value>
   </data>
   <data name="Ok" xml:space="preserve">

diff --git a/...ronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorTranslationViewModel.cs b/...ronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorTranslationViewModel.cs
@@ -16,8 +16,7 @@ public class AirControlSimulatorTranslationViewModel : TranslationBaseViewModel
 
 	public string Ships => AirControlSimulatorResources.Ships;
 	public string Equipment => AirControlSimulatorResources.Equipment;
-	public string AllEquipment => AirControlSimulatorResources.AllEquipment;
-	public string LockedEquipment => AirControlSimulatorResources.LockedEquipment;
+	public string IncludeUnlocked => AirControlSimulatorResources.IncludeUnlocked;
 
 	public string CopyLink => SortieRecordViewerResources.CopyLink;
 	public string Ok => AirControlSimulatorResources.Ok;

diff --git a/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorViewModel.cs b/ElectronicObserver/Window/Tools/AirControlSimulator/AirControlSimulatorViewModel.cs
@@ -31,9 +31,9 @@ public partial class AirControlSimulatorViewModel : WindowViewModelBase
 
 	public bool DataSelectionVisible { get; set; } = true;
 	public bool ShipData { get; set; } = true;
+	public bool IncludeUnlockedShips { get; set; } = true;
 	public bool EquipmentData { get; set; } = true;
-	public bool LockedEquipment { get; set; } = true;
-	public bool AllEquipment { get; set; }
+	public bool IncludeUnlockedEquipment { get; set; } = true;
 
 	public bool ElectronicObserverBrowser { get; set; } = true;
 	public bool SystemBrowser { get; set; }
@@ -61,7 +61,7 @@ public AirControlSimulatorViewModel(Func<AirControlSimulatorViewModel, string>?
 		foreach (MapAreaData map in maps)
 		{
 			int mapAreaID = map.MapAreaID;
-			string? name = map.NameEN;
+			string name = map.NameEN;
 
 			if (string.IsNullOrWhiteSpace(map.NameEN) || map.NameEN == "※")
 			{