不必要にstatus.xmlに書き込まれるのを直す

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / QuestInfo.cs

diff --git a/KancolleSniffer/QuestInfo.cs b/KancolleSniffer/QuestInfo.cs
index 4515ced..d59b61b 100644 (file)
--- a/KancolleSniffer/QuestInfo.cs
+++ b/KancolleSniffer/QuestInfo.cs
@@ -27,12 +27,12 @@ namespace KancolleSniffer
         public int Id { get; set; }\r
         public int Category { get; set; }\r
         public string Name { get; set; }\r
+        public string Detail { get; set; }\r
+        public int Progress { get; set; }\r
 \r
         [XmlIgnore]\r
         public QuestCount Count { get; set; }\r
 \r
-        public int Progress { get; set; }\r
-\r
         [XmlIgnore]\r
         public Color Color { get; set; }\r
     }\r
@@ -210,7 +210,7 @@ namespace KancolleSniffer
             {229, new QuestSortie {Interval = Weekly, Max = 12, Rank = "B", Maps = new[] {41, 42, 43, 44, 45}}}, // 229: 敵東方艦隊を撃滅せよ！\r
             {241, new QuestSortie {Interval = Weekly, Max = 5, Rank = "B", Maps = new[] {33, 34, 35}}}, // 241: 敵北方艦隊主力を撃滅せよ！\r
             {242, new QuestSortie {Interval = Weekly, Max = 1, Rank = "B", Maps = new[] {44}}}, // 242: 敵東方中枢艦隊を撃破せよ！\r
-            {243, new QuestSortie {Interval = Weekly, Max = 2, Rank = "B", Maps = new[] {52}}}, // 243: 南方海域珊瑚諸島沖の制空権を握れ！\r
+            {243, new QuestSortie {Interval = Weekly, Max = 2, Rank = "S", Maps = new[] {52}}}, // 243: 南方海域珊瑚諸島沖の制空権を握れ！\r
             {256, new QuestSortie {Interval = Monthly, Max = 3, Rank = "S", Maps = new[] {61}}}, // 256: 「潜水艦隊」出撃せよ！\r
             {261, new QuestSortie {Interval = Weekly, Max = 3, Rank = "A", Maps = new[] {15}}}, // 261: 海上輸送路の安全確保に努めよ！\r
             {265, new QuestSortie {Interval = Monthly, Max = 10, Rank = "A", Maps = new[] {15}}}, // 265: 海上護衛強化月間\r
@@ -348,6 +348,7 @@ namespace KancolleSniffer
                     var progress = (int)entry.api_progress_flag;\r
                     var cat = (int)entry.api_category;\r
                     var name = (string)entry.api_title;\r
+                    var detail = ((string)entry.api_detail).Replace("<br>", "\r\n");\r
 \r
                     switch (progress)\r
                     {\r
@@ -370,7 +371,7 @@ namespace KancolleSniffer
                             progress = 100;\r
                             goto case 2;\r
                         case 2:\r
-                            AddQuest(id, cat, name, progress, true);\r
+                            AddQuest(id, cat, name, detail, progress, true);\r
                             break;\r
                     }\r
                 }\r
@@ -384,21 +385,24 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void AddQuest(int id, int category, string name, int progress, bool adjustCount)\r
+        private void AddQuest(int id, int category, string name, string detail, int progress, bool adjustCount)\r
         {\r
             var count = _countList.GetCount(id);\r
             if (adjustCount)\r
+            {\r
                 count.AdjustCount(progress);\r
+                NeedSave = true;\r
+            }\r
             _quests[id] = new QuestStatus\r
             {\r
                 Id = id,\r
                 Category = category,\r
                 Name = name,\r
+                Detail = detail,\r
                 Count = count,\r
                 Progress = progress,\r
                 Color = category <= _color.Length ? _color[category - 1] : Control.DefaultBackColor\r
             };\r
-            NeedSave = true;\r
         }\r
 \r
         public void ClearQuests()\r
@@ -658,6 +662,7 @@ namespace KancolleSniffer
 \r
         public void SaveState(Status status)\r
         {\r
+            NeedSave = false;\r
             status.QuestLastReset = _lastReset;\r
             if (_quests != null)\r
                 status.QuestList = _quests.Values.ToArray();\r
@@ -674,7 +679,7 @@ namespace KancolleSniffer
             {\r
                 _quests.Clear();\r
                 foreach (var q in status.QuestList)\r
-                    AddQuest(q.Id, q.Category, q.Name, q.Progress, false);\r
+                    AddQuest(q.Id, q.Category, q.Name, q.Detail, q.Progress, false);\r
             }\r
         }\r
     }\r