diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
index 7d271e22f..7a663ba65 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.Designer.cs
@@ -3779,6 +3779,63 @@ public static string Updater_Notification_TransUpdate_Success {
}
}
+ ///
+ /// Looks up a localized string similar to 艦娘と装備の索敵値の単純な合計値.
+ ///
+ public static string ViewRangeLogic_Type1_Desc {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type1_Desc", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 単純計算.
+ ///
+ public static string ViewRangeLogic_Type1_Name {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type1_Name", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to (偵察機 × 2) + (電探) + √(装備込みの艦隊索敵値合計 - 偵察機 - 電探).
+ ///
+ public static string ViewRangeLogic_Type2_Desc {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type2_Desc", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 2-5 式 (旧).
+ ///
+ public static string ViewRangeLogic_Type2_Name {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type2_Name", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to (艦上爆撃機 × 1.04) + (艦上攻撃機 × 1.37) + (艦上偵察機 × 1.66)
+ ///+ (水上偵察機 × 2.00) + (水上爆撃機 × 1.78) + (探照灯 × 0.91)
+ ///+ (小型電探 × 1.00) + (大型電探 × 0.99) + (√各艦毎の素索敵 × 1.69)
+ ///+ (司令部レベルを 5 の倍数に切り上げ × -0.61).
+ ///
+ public static string ViewRangeLogic_Type3_Desc {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type3_Desc", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 2-5 式 (秋).
+ ///
+ public static string ViewRangeLogic_Type3_Name {
+ get {
+ return ResourceManager.GetString("ViewRangeLogic_Type3_Name", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to ズーム {0} % はサポートされていません。.
///
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
index f860fc0db..3002e4284 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.en.resx
@@ -713,7 +713,7 @@ GPU: Slow! GPU optimization for tablets.
Give a notification for ships in critical condition
- Settings_Plugins_PluginInfo_Features
+ Line of Sight Formula
Carrier-based Recon Aircraft
@@ -1369,4 +1369,28 @@ HTTP proxy settings are applied immediately. Settings for all other protocols ar
Settings for {0}
+
+ Simple sum of ship and equipment LoS
+
+
+ Simple sum
+
+
+ (Recon planes × 2) + (Radar) +
+√(Total LoS with equip LoS included - Recon planes - Radar)
+
+
+ 2-5 formula (old)
+
+
+ Dive Bomber LoS × (1.04) + Torpedo Bomber LoS × (1.37) +
+Carrier-based Recon LoS × (1.66) + Recon Seaplane LoS × (2.00) +
+Seaplane Bomber LoS × (1.78) + Searchlight LoS × (0.91) +
+Small Radar LoS × (1.00) + Large Radar LoS × (0.99) +
+√(base LoS of each ship) × (1.69) +
+(HQ Lv. rounded up to the next multiple of 5) × (-0.61)
+
+
+ 2-5 formula (new)
+
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Properties/Resources.resx b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
index bc283be3f..0c8699ac5 100644
--- a/source/Grabacr07.KanColleViewer/Properties/Resources.resx
+++ b/source/Grabacr07.KanColleViewer/Properties/Resources.resx
@@ -1376,4 +1376,25 @@ HTTP プロトコルの通信は自動構成も含め「インターネット
短
+
+ 艦娘と装備の索敵値の単純な合計値
+
+
+ 単純計算
+
+
+ (偵察機 × 2) + (電探) + √(装備込みの艦隊索敵値合計 - 偵察機 - 電探)
+
+
+ 2-5 式 (旧)
+
+
+ (艦上爆撃機 × 1.04) + (艦上攻撃機 × 1.37) + (艦上偵察機 × 1.66)
++ (水上偵察機 × 2.00) + (水上爆撃機 × 1.78) + (探照灯 × 0.91)
++ (小型電探 × 1.00) + (大型電探 × 0.99) + (√各艦毎の素索敵 × 1.69)
++ (司令部レベルを 5 の倍数に切り上げ × -0.61)
+
+
+ 2-5 式 (秋)
+
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs
index fa2fabd88..97a61c058 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Threading.Tasks;
using Grabacr07.KanColleViewer.Composition;
@@ -9,6 +10,7 @@
using Grabacr07.KanColleViewer.ViewModels.Composition;
using Grabacr07.KanColleWrapper;
using Grabacr07.KanColleWrapper.Models;
+using Livet;
using Livet.EventListeners;
using MetroTrilithon.Mvvm;
@@ -119,12 +121,16 @@ public void Initialize()
}
- public class ViewRangeSettingsViewModel
+ public class ViewRangeSettingsViewModel : ViewModel
{
private bool selected;
public ICalcViewRange Logic { get; set; }
+ public string Name => GetLocalisedStrings(Logic.Id);
+
+ public string Description => GetLocalisedStrings(Logic.Id, true);
+
public bool Selected
{
get { return this.selected; }
@@ -142,6 +148,26 @@ public ViewRangeSettingsViewModel(ICalcViewRange logic)
{
this.Logic = logic;
this.selected = KanColleSettings.ViewRangeCalcType == logic.Id;
+ ResourceService.Current.Subscribe(x =>
+ {
+ this.RaisePropertyChanged(nameof(Name));
+ this.RaisePropertyChanged(nameof(Description));
+ });
+ }
+
+ private string GetLocalisedStrings(string type, bool desc = false)
+ {
+ switch (type)
+ {
+ case "KanColleViewer.Type1":
+ return !desc ? Resources.ViewRangeLogic_Type1_Name : Resources.ViewRangeLogic_Type1_Desc;
+ case "KanColleViewer.Type2":
+ return !desc ? Resources.ViewRangeLogic_Type2_Name : Resources.ViewRangeLogic_Type2_Desc;
+ case "KanColleViewer.Type3":
+ return !desc ? Resources.ViewRangeLogic_Type3_Name : Resources.ViewRangeLogic_Type3_Desc;
+ }
+
+ return !desc ? Logic.Name : Logic.Description;
}
}
}
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
index 127d1691c..8ad780452 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Operation.xaml
@@ -73,10 +73,10 @@
GroupName="ViewRangeCalcLogicSelection">
-
-
+