From 8d08b2de8ac8f35bfb12950708a6ab676a10871e Mon Sep 17 00:00:00 2001 From: Kazuhiro Fujieda Date: Fri, 23 Dec 2016 11:28:07 +0900 Subject: [PATCH] =?utf8?q?Real=E3=82=92Effective=E3=81=AB=E3=83=AA?= =?utf8?q?=E3=83=8D=E3=83=BC=E3=83=A0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KancolleSniffer.Test/SnifferTest.cs | 2 +- KancolleSniffer/FleetPanel.cs | 6 +++--- KancolleSniffer/ItemInfo.cs | 2 +- KancolleSniffer/ShipInfo.cs | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs index a5e1156..b8e5e7b 100644 --- a/KancolleSniffer.Test/SnifferTest.cs +++ b/KancolleSniffer.Test/SnifferTest.cs @@ -690,7 +690,7 @@ namespace KancolleSniffer.Test { var sniffer = new Sniffer(); SniffLogFile(sniffer, "powerup_001"); - PAssert.That(() => Math.Abs(sniffer.GetShipStatuses(0)[0].RealFirepower - 30) < 0.0001); + PAssert.That(() => Math.Abs(sniffer.GetShipStatuses(0)[0].EffectiveFirepower - 30) < 0.0001); } /// diff --git a/KancolleSniffer/FleetPanel.cs b/KancolleSniffer/FleetPanel.cs index 75215a1..f274c6a 100644 --- a/KancolleSniffer/FleetPanel.cs +++ b/KancolleSniffer/FleetPanel.cs @@ -109,9 +109,9 @@ namespace KancolleSniffer levelTotal += s.Level; if (f < (sniffer.CombinedFleetType == 3 ? 2 : 1)) tp += s.TransportPoint; - var fire = s.RealFirepower; - var subm = s.RealAntiSubmarine; - var torp = s.RealTorpedo; + var fire = s.EffectiveFirepower; + var subm = s.EffectiveAntiSubmarine; + var torp = s.EffectiveTorpedo; var night = s.NightBattlePower; var ship = new Record { diff --git a/KancolleSniffer/ItemInfo.cs b/KancolleSniffer/ItemInfo.cs index 0baac4e..d74734f 100644 --- a/KancolleSniffer/ItemInfo.cs +++ b/KancolleSniffer/ItemInfo.cs @@ -114,7 +114,7 @@ namespace KancolleSniffer public bool IsTorpedoBomber => Type == 8 || Type == 58; - public int RealAntiSubmarine + public int EffectiveAntiSubmarine { get { diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs index 9b34481..d9c0789 100644 --- a/KancolleSniffer/ShipInfo.cs +++ b/KancolleSniffer/ShipInfo.cs @@ -96,7 +96,7 @@ namespace KancolleSniffer steal = (int)(Spec.FuelMax * 0.2 * 0.3 * damage); } - public double RealFirepower + public double EffectiveFirepower { get { @@ -137,7 +137,7 @@ namespace KancolleSniffer } } - public double RealTorpedo + public double EffectiveTorpedo { get { @@ -149,14 +149,14 @@ namespace KancolleSniffer private int CombinedFleetTorpedoPenalty => CombinedFleetType > 0 && Fleet == 1 ? -5 : 0; - public double RealAntiSubmarine + public double EffectiveAntiSubmarine { get { if (!Spec.IsAntiSubmarine) return 0; // ReSharper disable once CompareOfFloatsByEqualityOperator - if (Spec.IsAircraftCarrier && RealFirepower == 0) // 砲撃戦に参加しない + if (Spec.IsAircraftCarrier && EffectiveFirepower == 0) // 砲撃戦に参加しない return 0; var sonar = false; var dc = false; @@ -172,7 +172,7 @@ namespace KancolleSniffer dc = true; else if (spec.IsAircraft) aircraft = true; - all += spec.RealAntiSubmarine; + all += spec.EffectiveAntiSubmarine; } if (vanilla == 0 && !aircraft) // 素対潜0で航空機なしは対潜攻撃なし return 0; -- 2.11.0