OSDN Git Service

補強増設スロットの装備状況が装備一覧に反映されないのを直す
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / ShipInfo.cs
index 8484a71..215446e 100644 (file)
@@ -19,11 +19,10 @@ using static System.Math;
 \r
 namespace KancolleSniffer\r
 {\r
-    public class ShipStatus\r
+    public class ShipStatus : ICloneable\r
     {\r
-        private readonly ItemInfo _itemInfo;\r
         public int Id { get; set; }\r
-        public int Fleet { get; set; } // ShipListだけで使う\r
+        public int Fleet { get; set; }\r
         public ShipSpec Spec { get; set; }\r
 \r
         public string Name => Spec.Name;\r
@@ -40,16 +39,20 @@ namespace KancolleSniffer
         public ItemStatus SlotEx { get; set; }\r
         public int LoS { get; set; }\r
         public int Firepower { get; set; }\r
+        public int Torpedo { get; set; }\r
         public int AntiSubmarine { get; set; }\r
         public int Lucky { get; set; }\r
+        public bool Locked { get; set; }\r
         public bool Escaped { get; set; }\r
 \r
         public Damage DamageLevel => CalcDamage(NowHp, MaxHp);\r
 \r
-        public ShipStatus(ItemInfo itemInfo = null)\r
+        public int CombinedFleetType { get; set; }\r
+\r
+        public ShipStatus()\r
         {\r
-            _itemInfo = itemInfo;\r
             Id = -1;\r
+            Fleet = -1;\r
             Spec = new ShipSpec();\r
             OnSlot = new int[0];\r
             Slot = new ItemStatus[0];\r
@@ -91,56 +94,98 @@ namespace KancolleSniffer
             steal = (int)(Spec.FuelMax * 0.2 * 0.3 * damage);\r
         }\r
 \r
-        public int RealFirepower\r
+        public double RealFirepower\r
         {\r
             get\r
             {\r
                 if (Spec.IsSubmarine)\r
                     return 0;\r
-                if (!Spec.IsAircraftCarrier)\r
-                    return Firepower + 5;\r
-                var specs = (from item in Slot\r
-                    let spec = _itemInfo.GetStatus(item.Id).Spec\r
-                    where spec.IsAircraft\r
-                    select new {torpedo = spec.Torpedo, bomber = spec.Bomber}).ToArray();\r
-                var torpedo = specs.Sum(s => s.torpedo);\r
-                var bomber = specs.Sum(s => s.bomber);\r
+                var isRyuseiAttack = Spec.Id == 352 && // 速吸改\r
+                                     Slot.Any(item => item.Spec.Type == 8); // 艦攻装備\r
+                var levelBonus = Slot.Sum(item => item.FirePowerLevelBonus);\r
+                if (!Spec.IsAircraftCarrier && !isRyuseiAttack)\r
+                    return Firepower + levelBonus + CombinedFleetFirepowerBonus + 5;\r
+                var specs = (from item in Slot where item.Spec.IsAircraft select item.Spec).ToArray();\r
+                var torpedo = specs.Sum(s => s.Torpedo);\r
+                var bomber = specs.Sum(s => s.Bomber);\r
                 if (torpedo == 0 && bomber == 0)\r
                     return 0;\r
-                return (int)((Firepower + torpedo) * 1.5 + bomber * 2 + 55);\r
+                return (int)((Firepower + torpedo + levelBonus + (int)(bomber * 1.3) + CombinedFleetFirepowerBonus) * 1.5) + 55;\r
+            }\r
+        }\r
+\r
+        private int CombinedFleetFirepowerBonus\r
+        {\r
+            get\r
+            {\r
+                switch (CombinedFleetType)\r
+                {\r
+                    case 0:\r
+                        return 0;\r
+                    case 1: // 機動\r
+                        return Fleet == 0 ? 2 : 10;\r
+                    case 2: // 水上\r
+                        return Fleet == 0 ? 10 : -5;\r
+                    case 3: // 輸送\r
+                        return Fleet == 0 ? -5 : 10;\r
+                    default:\r
+                        return 0;\r
+                }\r
             }\r
         }\r
 \r
-        public int RealAntiSubmarine\r
+        public double RealTorpedo\r
+        {\r
+            get\r
+            {\r
+                if (Spec.IsAircraftCarrier || Torpedo == 0)\r
+                    return 0;\r
+                return Torpedo + Slot.Sum(item => item.TorpedoLevelBonus) + CombinedFleetTorpedoPenalty + 5;\r
+            }\r
+        }\r
+\r
+        private int CombinedFleetTorpedoPenalty => CombinedFleetType > 0 && Fleet == 1 ? -5 : 0;\r
+\r
+        public double RealAntiSubmarine\r
         {\r
             get\r
             {\r
                 if (!Spec.IsAntiSubmarine)\r
                     return 0;\r
+                // ReSharper disable once CompareOfFloatsByEqualityOperator\r
                 if (Spec.IsAircraftCarrier && RealFirepower == 0) // 砲撃戦に参加しない\r
                     return 0;\r
-                var sonar = 0;\r
-                var dc = 0;\r
-                var aircraft = 0;\r
-                var all = 0;\r
+                var sonar = false;\r
+                var dc = false;\r
+                var aircraft = false;\r
+                var all = 0.0;\r
                 var vanilla = AntiSubmarine;\r
-                foreach (var spec in Slot.Select(item => _itemInfo.GetStatus(item.Id).Spec))\r
+                foreach (var spec in Slot.Select(item => item.Spec))\r
                 {\r
                     vanilla -= spec.AntiSubmarine;\r
-                    if (spec.IsReconSeaplane) // 水偵は除外\r
-                        continue;\r
                     if (spec.IsSonar)\r
-                        sonar += spec.AntiSubmarine;\r
+                        sonar = true;\r
                     else if (spec.IsDepthCharge)\r
-                        dc += spec.AntiSubmarine;\r
+                        dc = true;\r
                     else if (spec.IsAircraft)\r
-                        aircraft += spec.AntiSubmarine;\r
-                    all += spec.AntiSubmarine;\r
+                        aircraft = true;\r
+                    all += spec.RealAntiSubmarine;\r
                 }\r
-                if (vanilla == 0 && aircraft == 0) // 素対潜0で航空機なしは対潜攻撃なし\r
+                if (vanilla == 0 && !aircraft) // 素対潜0で航空機なしは対潜攻撃なし\r
                     return 0;\r
-                var bonus = sonar > 0 && dc > 0 ? 1.15 : 1.0;\r
-                return (int)(bonus * (vanilla / 5 + all * 2 + (aircraft > 0 ? 10 : 25)));\r
+                var bonus = sonar && dc ? 1.15 : 1.0;\r
+                var levelBonus = Slot.Sum(item => item.AntiSubmarineLevelBonus);\r
+                return bonus * (Sqrt(vanilla) * 2 + all * 1.5 + levelBonus + (aircraft ? 8 : 13));\r
+            }\r
+        }\r
+\r
+        public double NightBattlePower\r
+        {\r
+            get\r
+            {\r
+                if (Spec.IsAircraftCarrier && Spec.Id != 353 && Spec.Id != 432) // Graf Zeppelin以外の空母\r
+                    return 0;\r
+                return Firepower + Torpedo + Slot.Sum(item => item.NightBattleLevelBonus);\r
             }\r
         }\r
 \r
@@ -150,6 +195,16 @@ namespace KancolleSniffer
                 : SlotEx.Spec.Id == 42 || SlotEx.Spec.Id == 43\r
                     ? SlotEx.Spec.Id\r
                     : Slot.FirstOrDefault(item => item.Spec.Id == 42 || item.Spec.Id == 43)?.Spec.Id ?? -1;\r
+\r
+        public double TransportPoint\r
+            => Spec.TransportPoint + Slot.Sum(item => item.Spec.TransportPoint) + SlotEx.Spec.TransportPoint;\r
+\r
+        public object Clone()\r
+        {\r
+            var r = (ShipStatus)MemberwiseClone();\r
+            r.Slot = r.Slot.ToArray(); // 戦闘中のダメコンの消費が見えないように複製する\r
+            return r;\r
+        }\r
     }\r
 \r
     public struct ChargeStatus\r
@@ -198,7 +253,6 @@ namespace KancolleSniffer
         private int _hqLevel;\r
         private readonly List<int> _escapedShips = new List<int>();\r
         private int _combinedFleetType;\r
-        private readonly int[][] _presetDeck = new int[8][];\r
 \r
         public ShipInfo(ItemInfo itemInfo)\r
         {\r
@@ -246,7 +300,7 @@ namespace KancolleSniffer
                 InspectDeck(json.api_deck_data);\r
                 InspectShipData(json.api_ship_data);\r
             }\r
-            else if (json.api_ship()) // getship\r
+            else if (json.api_ship()) // getshipとpowerup\r
             {\r
                 InspectShipData(new[] {json.api_ship});\r
             }\r
@@ -274,7 +328,7 @@ namespace KancolleSniffer
         {\r
             foreach (var entry in json)\r
             {\r
-                _shipInfo[(int)entry.api_id] = new ShipStatus(_itemInfo)\r
+                _shipInfo[(int)entry.api_id] = new ShipStatus\r
                 {\r
                     Id = (int)entry.api_id,\r
                     Spec = _shipMaster[(int)entry.api_ship_id],\r
@@ -290,10 +344,11 @@ namespace KancolleSniffer
                     SlotEx = entry.api_slot_ex() ? new ItemStatus((int)entry.api_slot_ex) : new ItemStatus(),\r
                     LoS = (int)entry.api_sakuteki[0],\r
                     Firepower = (int)entry.api_karyoku[0],\r
+                    Torpedo = (int)entry.api_raisou[0],\r
                     AntiSubmarine = (int)entry.api_taisen[0],\r
-                    Lucky = (int)entry.api_lucky[0]\r
+                    Lucky = (int)entry.api_lucky[0],\r
+                    Locked = entry.api_locked() && entry.api_locked == 1\r
                 };\r
-                _itemInfo.CountNewItems((int[])entry.api_slot);\r
             }\r
         }\r
 \r
@@ -358,9 +413,14 @@ namespace KancolleSniffer
         private void WithdrowShip(int fleet, int idx)\r
         {\r
             var deck = _decks[fleet];\r
-            for (var i = idx; i < deck.Length - 1; i++)\r
-                deck[i] = deck[i + 1];\r
-            deck[deck.Length - 1] = -1;\r
+            var j = idx;\r
+            for (var i = idx + 1; i < deck.Length; i++)\r
+            {\r
+                if (deck[i] != -1)\r
+                    deck[j++] = deck[i];\r
+            }\r
+            for (; j < deck.Length; j++)\r
+                deck[j] = -1;\r
         }\r
 \r
         public void InspectPowerup(string request, dynamic json)\r
@@ -372,7 +432,7 @@ namespace KancolleSniffer
             foreach (var ship in ships)\r
                 _shipInfo.Remove(int.Parse(ship));\r
             InspectDeck(json.api_deck);\r
-            InspectShip(json.api_ship);\r
+            InspectShip(json);\r
         }\r
 \r
         public void InspectSlotExchange(string request, dynamic json)\r
@@ -382,6 +442,11 @@ namespace KancolleSniffer
             _shipInfo[ship].Slot = ((int[])json.api_slot).Select(id => new ItemStatus(id)).ToArray();\r
         }\r
 \r
+        public void InspectSlotDeprive(dynamic json)\r
+        {\r
+            InspectShipData(new[] {json.api_ship_data.api_set_ship, json.api_ship_data.api_unset_ship});\r
+        }\r
+\r
         public void InspectDestroyShip(string request, dynamic json)\r
         {\r
             var values = HttpUtility.ParseQueryString(request);\r
@@ -395,37 +460,17 @@ namespace KancolleSniffer
             _shipInfo.Remove(ship);\r
         }\r
 \r
-        public void InspectPresetDeck(dynamic json)\r
-        {\r
-            foreach (KeyValuePair<string, dynamic> entry in json.api_deck)\r
-                InspectPresetRegister(entry.Value);\r
-        }\r
-\r
-        public void InspectPresetRegister(dynamic json)\r
-        {\r
-            var no = (int)json.api_preset_no - 1;\r
-            _presetDeck[no] = json.api_ship;\r
-        }\r
-\r
-        public void InspectPresetDelete(string request)\r
-        {\r
-            var values = HttpUtility.ParseQueryString(request);\r
-            _presetDeck[int.Parse(values["api_preset_no"]) - 1] = null;\r
-        }\r
-\r
         public void InspectCombined(string request)\r
         {\r
             var values = HttpUtility.ParseQueryString(request);\r
             _combinedFleetType = int.Parse(values["api_combined_type"]);\r
         }\r
 \r
-        public int[][] PresetDeck => _presetDeck;\r
-\r
         public void InspectMapStart(string request)\r
         {\r
             var values = HttpUtility.ParseQueryString(request);\r
             var fleet = int.Parse(values["api_deck_id"]) - 1;\r
-            if (_combinedFleetType == 0)\r
+            if (_combinedFleetType == 0 || fleet > 1)\r
             {\r
                 _inSortie[fleet] = true;\r
             }\r
@@ -455,12 +500,25 @@ namespace KancolleSniffer
             ShipStatus s;\r
             if (!_shipInfo.TryGetValue(id, out s))\r
                 return new ShipStatus();\r
-            s.Slot = (from item in s.Slot select _itemInfo.GetStatus(item.Id)).ToArray();\r
+            s.Slot = s.Slot.Select(item => _itemInfo.GetStatus(item.Id)).ToArray();\r
             s.SlotEx = _itemInfo.GetStatus(s.SlotEx.Id);\r
             s.Escaped = _escapedShips.Contains(id);\r
+            int idx;\r
+            s.Fleet = FindFleet(s.Id, out idx);\r
+            s.CombinedFleetType = s.Fleet < 2 ? _combinedFleetType : 0;\r
             return s;\r
         }\r
 \r
+        public void SetItemHolder()\r
+        {\r
+            foreach (var ship in _shipInfo.Values)\r
+            {\r
+                foreach (var item in ship.Slot)\r
+                    _itemInfo.GetStatus(item.Id).Holder = ship;\r
+                _itemInfo.GetStatus(ship.SlotEx.Id).Holder = ship;\r
+            }\r
+        }\r
+\r
         public ShipSpec GetSpec(int id) => _shipMaster[id];\r
 \r
         public bool InMission(int fleet) => _inMission[fleet];\r
@@ -469,15 +527,7 @@ namespace KancolleSniffer
 \r
         public int CombinedFleetType => _combinedFleetType;\r
 \r
-        public ShipStatus[] ShipList\r
-            => _shipInfo.Values.Where(s => s.Level != 0).Select(s =>\r
-            {\r
-                int oi;\r
-                var f = FindFleet(s.Id, out oi);\r
-                s.Fleet = f;\r
-                s.Escaped = _escapedShips.Contains(s.Id);\r
-                return s;\r
-            }).ToArray();\r
+        public ShipStatus[] ShipList => _shipInfo.Keys.Where(id => id != -1).Select(GetStatus).ToArray();\r
 \r
         public ChargeStatus[] ChargeStatuses\r
             => (from deck in _decks\r
@@ -493,13 +543,12 @@ namespace KancolleSniffer
         public int[] GetFighterPower(int fleet)\r
             => GetShipStatuses(fleet).Where(ship => !ship.Escaped).SelectMany(ship =>\r
                 ship.Slot.Zip(ship.OnSlot, (slot, onslot) =>\r
-                    !slot.Spec.CanAirCombat || onslot == 0\r
-                        ? new[] {0, 0}\r
-                        : new[]\r
-                        {\r
-                            (int)(slot.Spec.AntiAir * Sqrt(onslot) + slot.AlvBonus[0]),\r
-                            (int)(slot.Spec.AntiAir * Sqrt(onslot) + slot.AlvBonus[1])\r
-                        }))\r
+                {\r
+                    if (!slot.Spec.CanAirCombat || onslot == 0)\r
+                        return new[] {0, 0};\r
+                    var unskilled = (slot.Spec.AntiAir + slot.FighterPowerLevelBonus) * Sqrt(onslot);\r
+                    return new[] {(int)(unskilled + slot.AlvBonus[0]), (int)(unskilled + slot.AlvBonus[1])};\r
+                }))\r
                 .Aggregate(new[] {0, 0}, (prev, fp) => new[] {prev[0] + fp[0], prev[1] + fp[1]});\r
 \r
         public double GetContactTriggerRate(int fleet)\r
@@ -507,7 +556,7 @@ namespace KancolleSniffer
                 ship.Slot.Zip(ship.OnSlot, (slot, onslot) =>\r
                     slot.Spec.ContactTriggerRate * slot.Spec.LoS * Sqrt(onslot))).Sum();\r
 \r
-        public ShipStatus[] GetDamagedShipList(DockInfo dockInfo)\r
+        public ShipStatus[] GetRepairList(DockInfo dockInfo)\r
             => (from s in ShipList\r
                 where s.NowHp < s.MaxHp && !dockInfo.InNDock(s.Id)\r
                 select s).OrderByDescending(s => s.RepairTime).ToArray();\r
@@ -516,17 +565,20 @@ namespace KancolleSniffer
         public double GetLineOfSights(int fleet)\r
         {\r
             var result = 0.0;\r
-            foreach (var s in _decks[fleet].Select(id => _shipInfo[id]))\r
+            var emptyBonus = 6;\r
+            foreach (var s in GetShipStatuses(fleet))\r
             {\r
-                var items = 0;\r
-                foreach (var spec in s.Slot.Select(item => _itemInfo.GetStatus(item.Id).Spec))\r
+                emptyBonus--;\r
+                var itemLoS = 0;\r
+                foreach (var item in s.Slot)\r
                 {\r
-                    items += spec.LoS;\r
-                    result += spec.LoS * spec.LoSScaleFactor();\r
+                    var spec = item.Spec;\r
+                    itemLoS += spec.LoS;\r
+                    result += (spec.LoS + item.LoSLevelBonus) * spec.LoSScaleFactor;\r
                 }\r
-                result += Sqrt(s.LoS - items) * 1.6841056;\r
+                result += Sqrt(s.LoS - itemLoS);\r
             }\r
-            return result > 0 ? result + (_hqLevel + 4) / 5 * 5 * -0.6142467 : 0.0;\r
+            return result > 0 ? result - Ceiling(_hqLevel * 0.4) + emptyBonus * 2 : 0.0;\r
         }\r
 \r
         public string[] BadlyDamagedShips { get; private set; } = new string[0];\r