Commit: c0eaf176994ac78e0f2cd8a9a137ccf93e2129b8 - KancolleSniffer (git)

Commit MetaInfo

• Révision: c0eaf176994ac78e0f2cd8a9a137ccf93e2129b8 (tree)
• l'heure: 2019-07-06 18:14:05
• Auteur: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Message de Log

QuestCounterの見通しをよくする

Change Summary

• modified: KancolleSniffer/KancolleSniffer.csproj
• modified: KancolleSniffer/Model/QuestCounter.cs
• modified: KancolleSniffer/Model/QuestInfo.cs
• add: KancolleSniffer/Model/QuestSpec.cs

Modification

--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -57,6 +57,7 @@
     <Compile Include="Model\AirBaseParams.cs" />
     <Compile Include="Model\QuestCounter.cs" />
     <Compile Include="Model\QuestCountList.cs" />
+    <Compile Include="Model\QuestSpec.cs" />
     <Compile Include="Privacy.cs" />
     <Compile Include="Log\LogProcessor.cs" />
     <Compile Include="Model\Achievement.cs" />

--- a/KancolleSniffer/Model/QuestCounter.cs
+++ b/KancolleSniffer/Model/QuestCounter.cs
@@ -160,6 +160,26 @@ namespace KancolleSniffer.Model
         private int _cell;
         private bool _boss;
 
+        private class ResultShipSpecs
+        {
+            public ResultShipSpecs(BattleInfo battleInfo)
+            {
+                Specs = battleInfo.Result?.Friend.Main.Where(s => s.NowHp > 0).Select(ship => ship.Spec).ToArray() ?? new ShipSpec[0];
+                Ids = Specs.Select(spec => spec.Id).ToArray();
+                Types = Specs.Select(spec => spec.ShipType).ToArray();
+                Classes = Specs.Select(spec => spec.ShipClass).ToArray();
+                Flagship = Specs.FirstOrDefault();
+                FlagshipType = Types.FirstOrDefault();
+            }
+
+            public ShipSpec[] Specs { get; }
+            public int[] Ids { get; }
+            public int[] Types { get; }
+            public int[] Classes { get; }
+            public ShipSpec Flagship { get; }
+            public int FlagshipType { get; }
+        }
+
         public QuestCounter(QuestInfo questInfo, ItemInfo itemInfo, BattleInfo battleInfo)
         {
             _questInfo = questInfo;
@@ -186,272 +206,253 @@ namespace KancolleSniffer.Model
             _cell = json.api_no() ? (int)json.api_no : 0;
             _boss = (int)json.api_event_id == 5;
 
-            if (_quests.TryGetValue(861, out var q861))
+            if (_quests.TryGetValue(861, out var q861) && _map == 16 && (int)json.api_event_id == 8)
             {
-                if (_map == 16 && (int)json.api_event_id == 8)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)
-                        .ToArray();
-                    if (fleet.Count(s => s == 10 || s == 22) == 2)
-                        Increment(q861.Count);
-                }
+                if (new ResultShipSpecs(_battleInfo).Types.Count(s => s == 10 || s == 22) == 2)
+                    Increment(q861.Count);
             }
         }
 
+        private class Rank
+        {
+            private readonly string _rank;
+
+            public Rank(string rank)
+            {
+                _rank = rank;
+            }
+
+            public bool S => QuestSortie.CompareRank(_rank, "S") == 0;
+            public bool A => QuestSortie.CompareRank(_rank, "A") <= 0;
+            public bool B => QuestSortie.CompareRank(_rank, "B") <= 0;
+        }
+
         public void InspectBattleResult(dynamic json)
         {
-            var rank = json.api_win_rank;
+            var rawRak = json.api_win_rank;
+            var rank = new Rank(rawRak);
+            var specs = new ResultShipSpecs(_battleInfo);
             foreach (var quest in _quests.Values)
             {
                 var count = quest.Count;
                 switch (count.Spec)
                 {
                     case QuestSortie sortie:
-                        if (count.Id == 216 && !_boss || sortie.Check(rank, _map, _boss))
+                        if (count.Id == 216 && !_boss || sortie.Check(rawRak, _map, _boss))
                             Increment(count);
-                        break;
+                        continue;
                     case QuestEnemyType enemyType:
                         var num = enemyType.CountResult(
                             _battleInfo.Result.Enemy.Main.Concat(_battleInfo.Result.Enemy.Guard));
                         if (num > 0)
                             Add(count, num);
-                        break;
-                }
-            }
-            if (_quests.TryGetValue(214, out var ago))
-            {
-                var count = ago.Count;
-                if (_boss)
-                {
-                    IncrementNth(count, 2);
-                    if (QuestSortie.CompareRank(rank, "B") <= 0)
-                        IncrementNth(count, 3);
-                }
-                if (rank == "S")
-                    IncrementNth(count, 1);
-            }
-            if (_quests.TryGetValue(249, out var q249))
-            {
-                if (_map == 25 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.Id)
-                        .ToArray();
-                    if (fleet.Intersect(new[] {62, 63, 64, 265, 266, 268, 319, 192, 194}).Count() == 3)
-                        Increment(q249.Count);
-                }
-            }
-            if (_quests.TryGetValue(257, out var q257))
-            {
-                if (_map == 14 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)
-                        .ToArray();
-                    if (fleet[0] == 3 && fleet.Count(s => s == 3) <= 3 && fleet.All(s => s == 2 || s == 3))
-                        Increment(q257.Count);
-                }
-            }
-            if (_quests.TryGetValue(259, out var q259))
-            {
-                if (_map == 51 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec).ToArray();
-                    // ReSharper disable once IdentifierTypo
-                    var ctype = new[]
-                    {
-                        2, // 伊勢型
-                        19, // 長門型
-                        26, // 扶桑型
-                        37 // 大和型
-                    };
-                    if (fleet.Select(s => s.ShipClass).Count(c => ctype.Contains(c)) == 3 &&
-                        fleet.Count(s => s.ShipType == 3) > 0)
-                    {
-                        Increment(q259.Count);
-                    }
-                }
-            }
-            if (_quests.TryGetValue(264, out var q264))
-            {
-                if (_map == 42 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec)
-                        .ToArray();
-                    if (fleet.Count(spec => spec.ShipType == 2) >= 2 &&
-                        fleet.Count(spec => spec.IsAircraftCarrier) >= 2)
-                        Increment(q264.Count);
-                }
-            }
-            if (_quests.TryGetValue(266, out var q266))
-            {
-                if (_map == 25 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)
-                        .ToArray();
-                    if (fleet[0] == 2 && fleet.OrderBy(x => x).SequenceEqual(new[] {2, 2, 2, 2, 3, 5}))
-                        Increment(q266.Count);
+                        continue;
                 }
-            }
-            if (_quests.TryGetValue(280, out var q280))
-            {
-                if (!(_boss && QuestSortie.CompareRank(rank, "S") == 0))
-                    return;
-                var shipTypes = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)
-                    .ToArray();
-                if (!(shipTypes.Count(type => type == 1 || type == 2) >= 3 &&
-                      shipTypes.Any(type => new[] {3, 4, 7, 21}.Contains(type))))
-                    return;
-                var count = q280.Count;
-                switch (_map)
+                switch (quest.Id)
                 {
-                    case 12:
-                        IncrementNth(count, 0);
-                        break;
-                    case 13:
-                        IncrementNth(count, 1);
-                        break;
-                    case 14:
-                        IncrementNth(count, 2);
-                        break;
-                    case 21:
-                        IncrementNth(count, 3);
-                        break;
-                }
-            }
-            if (_quests.TryGetValue(854, out var opz) && _boss)
-            {
-                var count = opz.Count;
-                switch (_map)
-                {
-                    case 24 when QuestSortie.CompareRank(rank, "A") <= 0:
-                        IncrementNth(count, 0);
-                        break;
-                    case 61 when QuestSortie.CompareRank(rank, "A") <= 0:
-                        IncrementNth(count, 1);
+                    case 214:
+                        if (rank.S)
+                            IncrementNth(count, 1);
+                        if (_boss)
+                        {
+                            IncrementNth(count, 2);
+                            if (rank.B)
+                                IncrementNth(count, 3);
+                        }
                         break;
-                    case 63 when QuestSortie.CompareRank(rank, "A") <= 0:
-                        IncrementNth(count, 2);
+                    case 249:
+                        if (_map == 25 && _boss && rank.S &&
+                            specs.Ids.Intersect(new[] {62, 63, 64, 265, 266, 268, 319, 192, 194}).Count() == 3)
+                        {
+                            Increment(count);
+                        }
                         break;
-                    case 64 when QuestSortie.CompareRank(rank, "S") <= 0:
-                        IncrementNth(count, 3);
+                    case 257:
+                        if (_map == 14 && _boss && rank.S &&
+                            specs.FlagshipType == 3 &&
+                            specs.Types.Count(s => s == 3) <= 3 &&
+                            specs.Types.All(s => s == 2 || s == 3))
+                        {
+                            Increment(count);
+                        }
                         break;
-                }
-            }
-            if (_quests.TryGetValue(862, out var q862))
-            {
-                if (_map == 63 && _boss && QuestSortie.CompareRank(rank, "A") <= 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.ShipType)
-                        .ToArray();
-                    if (fleet.Count(s => s == 3) >= 2 && fleet.Count(s => s == 16) >= 1)
-                        Increment(q862.Count);
-                }
-            }
-            if (_quests.TryGetValue(873, out var q873))
-            {
-                if (_battleInfo.Result.Friend.Main.Count(s => s.NowHp > 0 && s.Spec.ShipType == 3) >= 1 &&
-                    _boss && QuestSortie.CompareRank(rank, "A") <= 0)
-                {
-                    var count = q873.Count;
-                    switch (_map)
-                    {
-                        case 31:
-                            IncrementNth(count, 0);
-                            break;
-                        case 32:
-                            IncrementNth(count, 1);
-                            break;
-                        case 33:
-                            IncrementNth(count, 2);
-                            break;
-                    }
-                }
-            }
-            if (_quests.TryGetValue(875, out var q875))
-            {
-                if (_map == 54 && _boss && QuestSortie.CompareRank(rank, "S") == 0)
-                {
-                    var fleet = _battleInfo.Result.Friend.Main.Where(s => s.NowHp > 0).Select(s => s.Spec.Id).ToArray();
-                    if (fleet.Contains(543) && fleet.Intersect(new[] {344, 345, 359}).Any())
-                        Increment(q875.Count);
-                }
-            }
-            if (_quests.TryGetValue(888, out var q888))
-            {
-                if (!_boss || QuestSortie.CompareRank(rank, "S") != 0)
-                    return;
-                var fleet = from ship in _battleInfo.Result.Friend.Main where ship.NowHp > 0 select ship.Spec.Id;
-                var member = new[]
-                {
-                    69, 272, 427, // 鳥海
-                    61, 264, // 青葉
-                    123, 295, 142, // 衣笠
-                    59, 262, 416, // 古鷹
-                    60, 263, 417, // 加古
-                    51, 213, 477, // 天龍
-                    115, 293 // 夕張
-                };
-                if (fleet.Intersect(member).Count() < 4)
-                    return;
-                var count = q888.Count;
-                switch (_map)
-                {
-                    case 51:
-                        IncrementNth(count, 0);
+                    case 259:
+                        if (_map == 51 && _boss && rank.S &&
+                            specs.Types.Count(type => type == 3) > 0 &&
+                            specs.Classes.Count(c => new[]
+                            {
+                                2, // 伊勢型
+                                19, // 長門型
+                                26, // 扶桑型
+                                37 // 大和型
+                            }.Contains(c)) == 3)
+                        {
+                            Increment(count);
+                        }
                         break;
-                    case 53:
-                        IncrementNth(count, 1);
+                    case 264:
+                        if (_map == 42 && _boss && rank.S &&
+                            specs.Types.Count(type => type == 2) >= 2 &&
+                            specs.Specs.Count(spec => spec.IsAircraftCarrier) >= 2)
+                        {
+                            Increment(count);
+                        }
                         break;
-                    case 54:
-                        IncrementNth(count, 2);
+                    case 266:
+                        if (_map == 25 && _boss && rank.S &&
+                            specs.FlagshipType == 2 &&
+                            specs.Types.OrderBy(x => x).SequenceEqual(new[] {2, 2, 2, 2, 3, 5}))
+                        {
+                            Increment(count);
+                        }
                         break;
-                }
-            }
-            if (_quests.TryGetValue(893, out var q893))
-            {
-                if (!_boss || QuestSortie.CompareRank(rank, "S") != 0)
-                    return;
-                var count = q893.Count;
-                switch (_map)
-                {
-                    case 15:
-                        IncrementNth(count, 0);
+                    case 280:
+                        if (!(_boss && rank.S))
+                            return;
+                        if (!(specs.Types.Count(type => type == 1 || type == 2) >= 3 &&
+                              specs.Types.Any(type => new[] {3, 4, 7, 21}.Contains(type))))
+                            return;
+                        switch (_map)
+                        {
+                            case 12:
+                                IncrementNth(count, 0);
+                                break;
+                            case 13:
+                                IncrementNth(count, 1);
+                                break;
+                            case 14:
+                                IncrementNth(count, 2);
+                                break;
+                            case 21:
+                                IncrementNth(count, 3);
+                                break;
+                        }
                         break;
-                    case 71:
-                        IncrementNth(count, 1);
+                    case 854:
+                        if (_boss)
+                        {
+                            switch (_map)
+                            {
+                                case 24 when rank.A:
+                                    IncrementNth(count, 0);
+                                    break;
+                                case 61 when rank.A:
+                                    IncrementNth(count, 1);
+                                    break;
+                                case 63 when rank.A:
+                                    IncrementNth(count, 2);
+                                    break;
+                                case 64 when rank.S:
+                                    IncrementNth(count, 3);
+                                    break;
+                            }
+                        }
                         break;
-                    case 72:
-                        if (_cell == 7)
+                    case 862:
+                        if (_map == 63 && _boss && rank.A &&
+                            specs.Types.Count(s => s == 3) >= 2 &&
+                            specs.Types.Count(s => s == 16) >= 1)
                         {
-                            IncrementNth(count, 2);
-                            break;
+                            Increment(count);
                         }
-                        IncrementNth(count, 3);
                         break;
-                }
-            }
-            if (_quests.TryGetValue(894, out var q894))
-            {
-                if (!_boss ||
-                    QuestSortie.CompareRank(rank, "S") != 0 ||
-                    !_battleInfo.Result.Friend.Main.Any(s => s.Spec.IsAircraftCarrier && s.NowHp > 0))
-                    return;
-                var count = q894.Count;
-                switch (_map)
-                {
-                    case 13:
-                        IncrementNth(count, 0);
+                    case 873:
+                        if (_boss && rank.A &&
+                            specs.Types.Count(type => type == 3) >= 1)
+                        {
+                            switch (_map)
+                            {
+                                case 31:
+                                    IncrementNth(count, 0);
+                                    break;
+                                case 32:
+                                    IncrementNth(count, 1);
+                                    break;
+                                case 33:
+                                    IncrementNth(count, 2);
+                                    break;
+                            }
+                        }
                         break;
-                    case 14:
-                        IncrementNth(count, 1);
+                    case 875:
+                        if (_map == 54 && _boss && rank.S &&
+                            specs.Ids.Contains(543) &&
+                            specs.Ids.Intersect(new[] {344, 345, 359}).Any())
+                        {
+                            Increment(count);
+                        }
                         break;
-                    case 21:
-                        IncrementNth(count, 2);
+                    case 888:
+                        if (!_boss || !rank.S)
+                            return;
+                        var member = new[]
+                        {
+                            69, 272, 427, // 鳥海
+                            61, 264, // 青葉
+                            123, 295, 142, // 衣笠
+                            59, 262, 416, // 古鷹
+                            60, 263, 417, // 加古
+                            51, 213, 477, // 天龍
+                            115, 293 // 夕張
+                        };
+                        if (specs.Ids.Intersect(member).Count() < 4)
+                            return;
+                        switch (_map)
+                        {
+                            case 51:
+                                IncrementNth(count, 0);
+                                break;
+                            case 53:
+                                IncrementNth(count, 1);
+                                break;
+                            case 54:
+                                IncrementNth(count, 2);
+                                break;
+                        }
                         break;
-                    case 22:
-                        IncrementNth(count, 3);
+                    case 893:
+                        if (!_boss || !rank.S)
+                            return;
+                        switch (_map)
+                        {
+                            case 15:
+                                IncrementNth(count, 0);
+                                break;
+                            case 71:
+                                IncrementNth(count, 1);
+                                break;
+                            case 72:
+                                if (_cell == 7)
+                                {
+                                    IncrementNth(count, 2);
+                                    break;
+                                }
+                                IncrementNth(count, 3);
+                                break;
+                        }
                         break;
-                    case 23:
-                        IncrementNth(count, 4);
+                    case 894:
+                        if (!_boss || !rank.S ||
+                            !specs.Specs.Any(spec => spec.IsAircraftCarrier))
+                            return;
+                        switch (_map)
+                        {
+                            case 13:
+                                IncrementNth(count, 0);
+                                break;
+                            case 14:
+                                IncrementNth(count, 1);
+                                break;
+                            case 21:
+                                IncrementNth(count, 2);
+                                break;
+                            case 22:
+                                IncrementNth(count, 3);
+                                break;
+                            case 23:
+                                IncrementNth(count, 4);
+                                break;
+                        }
                         break;
                 }
             }
@@ -467,31 +468,35 @@ namespace KancolleSniffer.Model
 
         public void InspectPracticeResult(dynamic json)
         {
+            var rank = new Rank(json.api_win_rank);
+            var specs = new ResultShipSpecs(_battleInfo);
             foreach (var quest in _quests.Values)
             {
                 var count = quest.Count;
-                if (!(count.Spec is QuestPractice practice))
-                    continue;
-                if (practice.Check(json.api_win_rank))
-                    Increment(count);
-            }
-            if (_quests.TryGetValue(318, out var q318))
-            {
-                if (_questFleet == 0 && QuestSortie.CompareRank(json.api_win_rank, "B") <= 0 &&
-                    _battleInfo.Result.Friend.Main.Count(s => s.Spec.ShipType == 3) >= 2)
+                if (count.Spec is QuestPractice practice)
                 {
-                    Increment(q318.Count);
+                    if (practice.Check(json.api_win_rank))
+                        Increment(count);
+                    continue;
                 }
-            }
-            if (_quests.TryGetValue(330, out var q330))
-            {
-                var fleet = _battleInfo.Result.Friend.Main;
-                if (QuestSortie.CompareRank(json.api_win_rank, "B") <= 0 &&
-                    fleet.Count(s => s.Spec.IsAircraftCarrier) >= 2 &&
-                    fleet.Count(s => s.Spec.ShipType == 2) >= 2 &&
-                    fleet[0].Spec.IsAircraftCarrier)
+                switch (quest.Id)
                 {
-                    Increment(q330.Count);
+                    case 318:
+                        if (_questFleet == 0 && rank.B &&
+                            specs.Types.Count(type => type == 3) >= 2)
+                        {
+                            Increment(count);
+                        }
+                        break;
+                    case 330:
+                        if (rank.B &&
+                            specs.Flagship.IsAircraftCarrier &&
+                            specs.Specs.Count(spec => spec.IsAircraftCarrier) >= 2 &&
+                            specs.Types.Count(type => type == 2) >= 2)
+                        {
+                            Increment(count);
+                        }
+                        break;
                 }
             }
         }
@@ -514,43 +519,44 @@ namespace KancolleSniffer.Model
             foreach (var quest in _quests.Values)
             {
                 var count = quest.Count;
-                if (!(count.Spec is QuestMission mission))
-                    continue;
-                if (mission.Check(mid))
-                    Increment(count);
-            }
-            if (_quests.TryGetValue(426, out var q426))
-            {
-                var count = q426.Count;
-                switch (mid)
+                if (count.Spec is QuestMission mission)
                 {
-                    case 3:
-                        IncrementNth(count, 0);
-                        break;
-                    case 4:
-                        IncrementNth(count, 1);
-                        break;
-                    case 5:
-                        IncrementNth(count, 2);
-                        break;
-                    case 10:
-                        IncrementNth(count, 3);
-                        break;
+                    if (mission.Check(mid))
+                        Increment(count);
+                    continue;
                 }
-            }
-            if (_quests.TryGetValue(428, out var q428))
-            {
-                var count = q428.Count;
-                switch (mid)
+                switch (quest.Id)
                 {
-                    case 4:
-                        IncrementNth(count, 0);
-                        break;
-                    case 101:
-                        IncrementNth(count, 1);
+                    case 426:
+                        switch (mid)
+                        {
+                            case 3:
+                                IncrementNth(count, 0);
+                                break;
+                            case 4:
+                                IncrementNth(count, 1);
+                                break;
+                            case 5:
+                                IncrementNth(count, 2);
+                                break;
+                            case 10:
+                                IncrementNth(count, 3);
+                                break;
+                        }
                         break;
-                    case 102:
-                        IncrementNth(count, 2);
+                    case 428:
+                        switch (mid)
+                        {
+                            case 4:
+                                IncrementNth(count, 0);
+                                break;
+                            case 101:
+                                IncrementNth(count, 1);
+                                break;
+                            case 102:
+                                IncrementNth(count, 2);
+                                break;
+                        }
                         break;
                 }
             }
@@ -588,16 +594,18 @@ namespace KancolleSniffer.Model
             foreach (var quest in _quests.Values)
             {
                 var count = quest.Count;
-                if (!(count.Spec is QuestDestroyItem destroy))
+                if (count.Spec is QuestDestroyItem destroy)
+                {
+                    if (destroy.Count(count, items))
+                        NeedSave = true;
                     continue;
-                if (destroy.Count(count, items))
+                }
+                if (quest.Id == 680)
+                {
+                    count.NowArray[0] += items.Count(spec => spec.Type == 21);
+                    count.NowArray[1] += items.Count(spec => spec.Type == 12 || spec.Type == 13);
                     NeedSave = true;
-            }
-            if (_quests.TryGetValue(680, out var q680))
-            {
-                q680.Count.NowArray[0] += items.Count(spec => spec.Type == 21);
-                q680.Count.NowArray[1] += items.Count(spec => spec.Type == 12 || spec.Type == 13);
-                NeedSave = true;
+                }
             }
         }
 

--- a/KancolleSniffer/Model/QuestInfo.cs
+++ b/KancolleSniffer/Model/QuestInfo.cs
@@ -65,86 +65,6 @@ namespace KancolleSniffer.Model
         Quarterly
     }
 
-    public class QuestSpec
-    {
-        public QuestInterval Interval { get; set; }
-        public int Max { get; set; }
-        public int[] MaxArray { get; set; }
-        public bool AdjustCount { get; set; } = true;
-        public int Shift { get; set; }
-        public int[] Material { get; set; }
-    }
-
-    public class QuestSortie : QuestSpec
-    {
-        public string Rank { get; set; }
-        public int[] Maps { get; set; }
-
-        public static int CompareRank(string a, string b)
-        {
-            const string ranks = "SABCDE";
-            return ranks.IndexOf(a, StringComparison.Ordinal) -
-                   ranks.IndexOf(b, StringComparison.Ordinal);
-        }
-
-        public bool Check(string rank, int map, bool boss)
-        {
-            return (Rank == null || CompareRank(rank, Rank) <= 0) &&
-                   (Maps == null || Maps.Contains(map) && boss);
-        }
-    }
-
-    public class QuestEnemyType : QuestSpec
-    {
-        public int[] EnemyType { get; set; } = new int[0];
-
-        public int CountResult(IEnumerable<ShipStatus> enemyResult) =>
-            enemyResult.Count(ship => ship.NowHp == 0 && EnemyType.Contains(ship.Spec.ShipType));
-    }
-
-    public class QuestPractice : QuestSpec
-    {
-        public bool Win { get; set; }
-        public bool Check(string rank) => !Win || QuestSortie.CompareRank(rank, "B") <= 0;
-    }
-
-    public class QuestMission : QuestSpec
-    {
-        public int[] Ids { get; set; }
-        public bool Check(int id) => Ids == null || Ids.Contains(id);
-    }
-
-    public class QuestDestroyItem : QuestSpec
-    {
-        public int[] Types { get; set; }
-        public int[] Ids { get; set; }
-
-        public bool Count(QuestCount count, ItemSpec[] specs)
-        {
-            if (count.NowArray == null)
-            {
-                var num = specs.Count(spec => Types?.Contains(spec.Type) ?? (Ids?.Contains(spec.Id) ?? true));
-                count.Now += num;
-                return num > 0;
-            }
-            if (Types == null && Ids == null)
-                return false;
-            var result = false;
-            for (var i = 0; i < count.NowArray.Length; i++)
-            {
-                var num = specs.Count(spec => Types != null ? Types[i] == spec.Type : Ids[i] == spec.Id);
-                count.NowArray[i] += num;
-                if (num > 0)
-                    result = true;
-            }
-            return result;
-        }
-    }
-
-    public class QuestPowerUp : QuestSpec
-    {
-    }
-
     public class QuestInfo : IHaveState
     {
         private readonly SortedDictionary<int, QuestStatus> _quests = new SortedDictionary<int, QuestStatus>();

--- /dev/null
+++ b/KancolleSniffer/Model/QuestSpec.cs
@@ -0,0 +1,100 @@
+// Copyright (C) 2019 Kazuhiro Fujieda <[e-mail]>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KancolleSniffer.Model
+{
+    public class QuestSpec
+    {
+        public QuestInterval Interval { get; set; }
+        public int Max { get; set; }
+        public int[] MaxArray { get; set; }
+        public bool AdjustCount { get; set; } = true;
+        public int Shift { get; set; }
+        public int[] Material { get; set; }
+    }
+
+    public class QuestSortie : QuestSpec
+    {
+        public string Rank { get; set; }
+        public int[] Maps { get; set; }
+
+        public static int CompareRank(string a, string b)
+        {
+            const string ranks = "SABCDE";
+            return ranks.IndexOf(a, StringComparison.Ordinal) -
+                   ranks.IndexOf(b, StringComparison.Ordinal);
+        }
+
+        public bool Check(string rank, int map, bool boss)
+        {
+            return (Rank == null || CompareRank(rank, Rank) <= 0) &&
+                   (Maps == null || Maps.Contains(map) && boss);
+        }
+    }
+
+    public class QuestEnemyType : QuestSpec
+    {
+        public int[] EnemyType { get; set; } = new int[0];
+
+        public int CountResult(IEnumerable<ShipStatus> enemyResult) =>
+            enemyResult.Count(ship => ship.NowHp == 0 && EnemyType.Contains(ship.Spec.ShipType));
+    }
+
+    public class QuestPractice : QuestSpec
+    {
+        public bool Win { get; set; }
+        public bool Check(string rank) => !Win || QuestSortie.CompareRank(rank, "B") <= 0;
+    }
+
+    public class QuestMission : QuestSpec
+    {
+        public int[] Ids { get; set; }
+        public bool Check(int id) => Ids == null || Ids.Contains(id);
+    }
+
+    public class QuestDestroyItem : QuestSpec
+    {
+        public int[] Types { get; set; }
+        public int[] Ids { get; set; }
+
+        public bool Count(QuestCount count, ItemSpec[] specs)
+        {
+            if (count.NowArray == null)
+            {
+                var num = specs.Count(spec => Types?.Contains(spec.Type) ?? (Ids?.Contains(spec.Id) ?? true));
+                count.Now += num;
+                return num > 0;
+            }
+            if (Types == null && Ids == null)
+                return false;
+            var result = false;
+            for (var i = 0; i < count.NowArray.Length; i++)
+            {
+                var num = specs.Count(spec => Types != null ? Types[i] == spec.Type : Ids[i] == spec.Id);
+                count.NowArray[i] += num;
+                if (num > 0)
+                    result = true;
+            }
+            return result;
+        }
+    }
+
+    public class QuestPowerUp : QuestSpec
+    {
+    }
+}
\ No newline at end of file