OSDN Git Service

疲労に関する情報を表示する
authorKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Fri, 20 Dec 2013 15:25:31 +0000 (00:25 +0900)
committerKazuhiro Fujieda <fujieda@users.sourceforge.jp>
Sat, 4 Jan 2014 03:43:01 +0000 (12:43 +0900)
KancolleSniffer/MainForm.Designer.cs
KancolleSniffer/MainForm.cs

index 65c0565..d998d2c 100644 (file)
@@ -49,25 +49,27 @@ namespace KancolleSniffer
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));\r
             this.panelHeadquarters = new System.Windows.Forms.Panel();\r
             this.labelNumOfBuckets = new System.Windows.Forms.Label();\r
-            this.label4 = new System.Windows.Forms.Label();\r
-            this.labelNumOfEquips = new System.Windows.Forms.Label();\r
             this.label3 = new System.Windows.Forms.Label();\r
-            this.labelNumOfShips = new System.Windows.Forms.Label();\r
+            this.labelNumOfEquips = new System.Windows.Forms.Label();\r
             this.label2 = new System.Windows.Forms.Label();\r
+            this.labelNumOfShips = new System.Windows.Forms.Label();\r
+            this.label1 = new System.Windows.Forms.Label();\r
             this.labelFleet1 = new System.Windows.Forms.Label();\r
             this.panelFleet1 = new System.Windows.Forms.Panel();\r
-            this.label26 = new System.Windows.Forms.Label();\r
-            this.label25 = new System.Windows.Forms.Label();\r
-            this.label24 = new System.Windows.Forms.Label();\r
-            this.label23 = new System.Windows.Forms.Label();\r
-            this.label22 = new System.Windows.Forms.Label();\r
-            this.label21 = new System.Windows.Forms.Label();\r
             this.label20 = new System.Windows.Forms.Label();\r
+            this.labelCondTimer2 = new System.Windows.Forms.Label();\r
+            this.labelCondTimer1 = new System.Windows.Forms.Label();\r
             this.label19 = new System.Windows.Forms.Label();\r
-            this.label18 = new System.Windows.Forms.Label();\r
             this.label17 = new System.Windows.Forms.Label();\r
+            this.labelCond6 = new System.Windows.Forms.Label();\r
+            this.labelCond5 = new System.Windows.Forms.Label();\r
+            this.labelCond4 = new System.Windows.Forms.Label();\r
+            this.labelCond2 = new System.Windows.Forms.Label();\r
+            this.labelCond3 = new System.Windows.Forms.Label();\r
+            this.labelCond1 = new System.Windows.Forms.Label();\r
             this.label16 = new System.Windows.Forms.Label();\r
-            this.label1 = new System.Windows.Forms.Label();\r
+            this.label18 = new System.Windows.Forms.Label();\r
+            this.label4 = new System.Windows.Forms.Label();\r
             this.labelNextLv6 = new System.Windows.Forms.Label();\r
             this.labelNextLv5 = new System.Windows.Forms.Label();\r
             this.labelNextLv4 = new System.Windows.Forms.Label();\r
@@ -152,11 +154,11 @@ namespace KancolleSniffer
             // \r
             this.panelHeadquarters.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.panelHeadquarters.Controls.Add(this.labelNumOfBuckets);\r
-            this.panelHeadquarters.Controls.Add(this.label4);\r
-            this.panelHeadquarters.Controls.Add(this.labelNumOfEquips);\r
             this.panelHeadquarters.Controls.Add(this.label3);\r
-            this.panelHeadquarters.Controls.Add(this.labelNumOfShips);\r
+            this.panelHeadquarters.Controls.Add(this.labelNumOfEquips);\r
             this.panelHeadquarters.Controls.Add(this.label2);\r
+            this.panelHeadquarters.Controls.Add(this.labelNumOfShips);\r
+            this.panelHeadquarters.Controls.Add(this.label1);\r
             this.panelHeadquarters.Location = new System.Drawing.Point(12, 12);\r
             this.panelHeadquarters.Name = "panelHeadquarters";\r
             this.panelHeadquarters.Size = new System.Drawing.Size(263, 38);\r
@@ -167,54 +169,54 @@ namespace KancolleSniffer
             this.labelNumOfBuckets.Location = new System.Drawing.Point(120, 19);\r
             this.labelNumOfBuckets.Name = "labelNumOfBuckets";\r
             this.labelNumOfBuckets.Size = new System.Drawing.Size(29, 12);\r
-            this.labelNumOfBuckets.TabIndex = 7;\r
+            this.labelNumOfBuckets.TabIndex = 5;\r
             this.labelNumOfBuckets.Text = "0";\r
             this.labelNumOfBuckets.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
-            // label4\r
+            // label3\r
             // \r
-            this.label4.AutoSize = true;\r
-            this.label4.Location = new System.Drawing.Point(116, 4);\r
-            this.label4.Name = "label4";\r
-            this.label4.Size = new System.Drawing.Size(33, 12);\r
-            this.label4.TabIndex = 6;\r
-            this.label4.Text = "バケツ";\r
+            this.label3.AutoSize = true;\r
+            this.label3.Location = new System.Drawing.Point(116, 4);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(33, 12);\r
+            this.label3.TabIndex = 4;\r
+            this.label3.Text = "バケツ";\r
             // \r
             // labelNumOfEquips\r
             // \r
             this.labelNumOfEquips.Location = new System.Drawing.Point(55, 19);\r
             this.labelNumOfEquips.Name = "labelNumOfEquips";\r
             this.labelNumOfEquips.Size = new System.Drawing.Size(47, 12);\r
-            this.labelNumOfEquips.TabIndex = 5;\r
+            this.labelNumOfEquips.TabIndex = 3;\r
             this.labelNumOfEquips.Text = "0/0";\r
             this.labelNumOfEquips.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
-            // label3\r
+            // label2\r
             // \r
-            this.label3.AutoSize = true;\r
-            this.label3.Location = new System.Drawing.Point(61, 4);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(41, 12);\r
-            this.label3.TabIndex = 4;\r
-            this.label3.Text = "装備数";\r
+            this.label2.AutoSize = true;\r
+            this.label2.Location = new System.Drawing.Point(61, 4);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(41, 12);\r
+            this.label2.TabIndex = 2;\r
+            this.label2.Text = "装備数";\r
             // \r
             // labelNumOfShips\r
             // \r
             this.labelNumOfShips.Location = new System.Drawing.Point(0, 19);\r
             this.labelNumOfShips.Name = "labelNumOfShips";\r
             this.labelNumOfShips.Size = new System.Drawing.Size(47, 12);\r
-            this.labelNumOfShips.TabIndex = 3;\r
+            this.labelNumOfShips.TabIndex = 1;\r
             this.labelNumOfShips.Text = "0/0";\r
             this.labelNumOfShips.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
-            // label2\r
+            // label1\r
             // \r
-            this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(6, 4);\r
-            this.label2.Name = "label2";\r
-            this.label2.Size = new System.Drawing.Size(41, 12);\r
-            this.label2.TabIndex = 2;\r
-            this.label2.Text = "艦娘数";\r
+            this.label1.AutoSize = true;\r
+            this.label1.Location = new System.Drawing.Point(6, 4);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(41, 12);\r
+            this.label1.TabIndex = 0;\r
+            this.label1.Text = "艦娘数";\r
             // \r
             // labelFleet1\r
             // \r
@@ -228,18 +230,20 @@ namespace KancolleSniffer
             // panelFleet1\r
             // \r
             this.panelFleet1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.panelFleet1.Controls.Add(this.label26);\r
-            this.panelFleet1.Controls.Add(this.label25);\r
-            this.panelFleet1.Controls.Add(this.label24);\r
-            this.panelFleet1.Controls.Add(this.label23);\r
-            this.panelFleet1.Controls.Add(this.label22);\r
-            this.panelFleet1.Controls.Add(this.label21);\r
             this.panelFleet1.Controls.Add(this.label20);\r
+            this.panelFleet1.Controls.Add(this.labelCondTimer2);\r
+            this.panelFleet1.Controls.Add(this.labelCondTimer1);\r
             this.panelFleet1.Controls.Add(this.label19);\r
-            this.panelFleet1.Controls.Add(this.label18);\r
             this.panelFleet1.Controls.Add(this.label17);\r
+            this.panelFleet1.Controls.Add(this.labelCond6);\r
+            this.panelFleet1.Controls.Add(this.labelCond5);\r
+            this.panelFleet1.Controls.Add(this.labelCond4);\r
+            this.panelFleet1.Controls.Add(this.labelCond2);\r
+            this.panelFleet1.Controls.Add(this.labelCond3);\r
+            this.panelFleet1.Controls.Add(this.labelCond1);\r
             this.panelFleet1.Controls.Add(this.label16);\r
-            this.panelFleet1.Controls.Add(this.label1);\r
+            this.panelFleet1.Controls.Add(this.label18);\r
+            this.panelFleet1.Controls.Add(this.label4);\r
             this.panelFleet1.Controls.Add(this.labelNextLv6);\r
             this.panelFleet1.Controls.Add(this.labelNextLv5);\r
             this.panelFleet1.Controls.Add(this.labelNextLv4);\r
@@ -266,317 +270,335 @@ namespace KancolleSniffer
             this.panelFleet1.Controls.Add(this.labelShip1);\r
             this.panelFleet1.Location = new System.Drawing.Point(12, 68);\r
             this.panelFleet1.Name = "panelFleet1";\r
-            this.panelFleet1.Size = new System.Drawing.Size(259, 102);\r
+            this.panelFleet1.Size = new System.Drawing.Size(259, 135);\r
             this.panelFleet1.TabIndex = 2;\r
             // \r
-            // label26\r
-            // \r
-            this.label26.AutoSize = true;\r
-            this.label26.Location = new System.Drawing.Point(230, 84);\r
-            this.label26.Name = "label26";\r
-            this.label26.Size = new System.Drawing.Size(24, 12);\r
-            this.label26.TabIndex = 43;\r
-            this.label26.Text = "Exp";\r
-            // \r
-            // label25\r
-            // \r
-            this.label25.AutoSize = true;\r
-            this.label25.Location = new System.Drawing.Point(230, 68);\r
-            this.label25.Name = "label25";\r
-            this.label25.Size = new System.Drawing.Size(24, 12);\r
-            this.label25.TabIndex = 42;\r
-            this.label25.Text = "Exp";\r
-            // \r
-            // label24\r
-            // \r
-            this.label24.AutoSize = true;\r
-            this.label24.Location = new System.Drawing.Point(230, 52);\r
-            this.label24.Name = "label24";\r
-            this.label24.Size = new System.Drawing.Size(24, 12);\r
-            this.label24.TabIndex = 41;\r
-            this.label24.Text = "Exp";\r
-            // \r
-            // label23\r
-            // \r
-            this.label23.AutoSize = true;\r
-            this.label23.Location = new System.Drawing.Point(230, 36);\r
-            this.label23.Name = "label23";\r
-            this.label23.Size = new System.Drawing.Size(24, 12);\r
-            this.label23.TabIndex = 40;\r
-            this.label23.Text = "Exp";\r
+            // label20\r
             // \r
-            // label22\r
+            this.label20.AutoSize = true;\r
+            this.label20.Location = new System.Drawing.Point(188, 117);\r
+            this.label20.Name = "label20";\r
+            this.label20.Size = new System.Drawing.Size(29, 12);\r
+            this.label20.TabIndex = 36;\r
+            this.label20.Text = "間宮";\r
             // \r
-            this.label22.AutoSize = true;\r
-            this.label22.Location = new System.Drawing.Point(230, 20);\r
-            this.label22.Name = "label22";\r
-            this.label22.Size = new System.Drawing.Size(24, 12);\r
-            this.label22.TabIndex = 39;\r
-            this.label22.Text = "Exp";\r
+            // labelCondTimer2\r
             // \r
-            // label21\r
+            this.labelCondTimer2.Location = new System.Drawing.Point(223, 117);\r
+            this.labelCondTimer2.Name = "labelCondTimer2";\r
+            this.labelCondTimer2.Size = new System.Drawing.Size(31, 12);\r
+            this.labelCondTimer2.TabIndex = 37;\r
+            this.labelCondTimer2.Text = "00:00";\r
+            this.labelCondTimer2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
-            this.label21.AutoSize = true;\r
-            this.label21.Location = new System.Drawing.Point(230, 4);\r
-            this.label21.Name = "label21";\r
-            this.label21.Size = new System.Drawing.Size(24, 12);\r
-            this.label21.TabIndex = 38;\r
-            this.label21.Text = "Exp";\r
+            // labelCondTimer1\r
             // \r
-            // label20\r
-            // \r
-            this.label20.AutoSize = true;\r
-            this.label20.Location = new System.Drawing.Point(102, 84);\r
-            this.label20.Name = "label20";\r
-            this.label20.Size = new System.Drawing.Size(17, 12);\r
-            this.label20.TabIndex = 37;\r
-            this.label20.Text = "Lv";\r
+            this.labelCondTimer1.Location = new System.Drawing.Point(151, 117);\r
+            this.labelCondTimer1.Name = "labelCondTimer1";\r
+            this.labelCondTimer1.Size = new System.Drawing.Size(31, 12);\r
+            this.labelCondTimer1.TabIndex = 35;\r
+            this.labelCondTimer1.Text = "00:00";\r
+            this.labelCondTimer1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // label19\r
             // \r
             this.label19.AutoSize = true;\r
-            this.label19.Location = new System.Drawing.Point(102, 68);\r
+            this.label19.Location = new System.Drawing.Point(116, 117);\r
             this.label19.Name = "label19";\r
-            this.label19.Size = new System.Drawing.Size(17, 12);\r
-            this.label19.TabIndex = 36;\r
-            this.label19.Text = "Lv";\r
-            // \r
-            // label18\r
-            // \r
-            this.label18.AutoSize = true;\r
-            this.label18.Location = new System.Drawing.Point(102, 52);\r
-            this.label18.Name = "label18";\r
-            this.label18.Size = new System.Drawing.Size(17, 12);\r
-            this.label18.TabIndex = 35;\r
-            this.label18.Text = "Lv";\r
+            this.label19.Size = new System.Drawing.Size(29, 12);\r
+            this.label19.TabIndex = 34;\r
+            this.label19.Text = "疲労";\r
             // \r
             // label17\r
             // \r
             this.label17.AutoSize = true;\r
-            this.label17.Location = new System.Drawing.Point(102, 36);\r
+            this.label17.Location = new System.Drawing.Point(181, 4);\r
             this.label17.Name = "label17";\r
-            this.label17.Size = new System.Drawing.Size(17, 12);\r
-            this.label17.TabIndex = 34;\r
-            this.label17.Text = "Lv";\r
+            this.label17.Size = new System.Drawing.Size(29, 12);\r
+            this.label17.TabIndex = 20;\r
+            this.label17.Text = "状態";\r
+            // \r
+            // labelCond6\r
+            // \r
+            this.labelCond6.Location = new System.Drawing.Point(186, 100);\r
+            this.labelCond6.Name = "labelCond6";\r
+            this.labelCond6.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond6.TabIndex = 26;\r
+            this.labelCond6.Text = "0";\r
+            this.labelCond6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelCond5\r
+            // \r
+            this.labelCond5.Location = new System.Drawing.Point(186, 84);\r
+            this.labelCond5.Name = "labelCond5";\r
+            this.labelCond5.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond5.TabIndex = 25;\r
+            this.labelCond5.Text = "0";\r
+            this.labelCond5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelCond4\r
+            // \r
+            this.labelCond4.Location = new System.Drawing.Point(186, 68);\r
+            this.labelCond4.Name = "labelCond4";\r
+            this.labelCond4.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond4.TabIndex = 24;\r
+            this.labelCond4.Text = "0";\r
+            this.labelCond4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelCond2\r
+            // \r
+            this.labelCond2.Location = new System.Drawing.Point(186, 36);\r
+            this.labelCond2.Name = "labelCond2";\r
+            this.labelCond2.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond2.TabIndex = 22;\r
+            this.labelCond2.Text = "0";\r
+            this.labelCond2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelCond3\r
+            // \r
+            this.labelCond3.Location = new System.Drawing.Point(186, 52);\r
+            this.labelCond3.Name = "labelCond3";\r
+            this.labelCond3.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond3.TabIndex = 23;\r
+            this.labelCond3.Text = "0";\r
+            this.labelCond3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            // \r
+            // labelCond1\r
+            // \r
+            this.labelCond1.Location = new System.Drawing.Point(186, 20);\r
+            this.labelCond1.Name = "labelCond1";\r
+            this.labelCond1.Size = new System.Drawing.Size(23, 12);\r
+            this.labelCond1.TabIndex = 21;\r
+            this.labelCond1.Text = "0";\r
+            this.labelCond1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // label16\r
             // \r
             this.label16.AutoSize = true;\r
-            this.label16.Location = new System.Drawing.Point(102, 20);\r
+            this.label16.Location = new System.Drawing.Point(151, 4);\r
             this.label16.Name = "label16";\r
-            this.label16.Size = new System.Drawing.Size(17, 12);\r
-            this.label16.TabIndex = 33;\r
-            this.label16.Text = "Lv";\r
+            this.label16.Size = new System.Drawing.Size(29, 12);\r
+            this.label16.TabIndex = 13;\r
+            this.label16.Text = "耐久";\r
             // \r
-            // label1\r
+            // label18\r
             // \r
-            this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(102, 4);\r
-            this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(17, 12);\r
-            this.label1.TabIndex = 32;\r
-            this.label1.Text = "Lv";\r
+            this.label18.AutoSize = true;\r
+            this.label18.Location = new System.Drawing.Point(213, 4);\r
+            this.label18.Name = "label18";\r
+            this.label18.Size = new System.Drawing.Size(41, 12);\r
+            this.label18.TabIndex = 27;\r
+            this.label18.Text = "経験値";\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Location = new System.Drawing.Point(105, 4);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(34, 12);\r
+            this.label4.TabIndex = 6;\r
+            this.label4.Text = "レベル";\r
             // \r
             // labelNextLv6\r
             // \r
-            this.labelNextLv6.Location = new System.Drawing.Point(193, 84);\r
+            this.labelNextLv6.Location = new System.Drawing.Point(219, 100);\r
             this.labelNextLv6.Name = "labelNextLv6";\r
             this.labelNextLv6.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv6.TabIndex = 31;\r
+            this.labelNextLv6.TabIndex = 33;\r
             this.labelNextLv6.Text = "0";\r
             this.labelNextLv6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelNextLv5\r
             // \r
-            this.labelNextLv5.Location = new System.Drawing.Point(193, 68);\r
+            this.labelNextLv5.Location = new System.Drawing.Point(219, 84);\r
             this.labelNextLv5.Name = "labelNextLv5";\r
             this.labelNextLv5.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv5.TabIndex = 30;\r
+            this.labelNextLv5.TabIndex = 32;\r
             this.labelNextLv5.Text = "0";\r
             this.labelNextLv5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelNextLv4\r
             // \r
-            this.labelNextLv4.Location = new System.Drawing.Point(193, 52);\r
+            this.labelNextLv4.Location = new System.Drawing.Point(219, 68);\r
             this.labelNextLv4.Name = "labelNextLv4";\r
             this.labelNextLv4.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv4.TabIndex = 29;\r
+            this.labelNextLv4.TabIndex = 31;\r
             this.labelNextLv4.Text = "0";\r
             this.labelNextLv4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelNextLv3\r
             // \r
-            this.labelNextLv3.Location = new System.Drawing.Point(193, 36);\r
+            this.labelNextLv3.Location = new System.Drawing.Point(219, 52);\r
             this.labelNextLv3.Name = "labelNextLv3";\r
             this.labelNextLv3.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv3.TabIndex = 28;\r
+            this.labelNextLv3.TabIndex = 30;\r
             this.labelNextLv3.Text = "0";\r
             this.labelNextLv3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelNextLv2\r
             // \r
-            this.labelNextLv2.Location = new System.Drawing.Point(193, 20);\r
+            this.labelNextLv2.Location = new System.Drawing.Point(219, 36);\r
             this.labelNextLv2.Name = "labelNextLv2";\r
             this.labelNextLv2.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv2.TabIndex = 27;\r
+            this.labelNextLv2.TabIndex = 29;\r
             this.labelNextLv2.Text = "0";\r
             this.labelNextLv2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelNextLv1\r
             // \r
-            this.labelNextLv1.Location = new System.Drawing.Point(193, 4);\r
+            this.labelNextLv1.Location = new System.Drawing.Point(219, 20);\r
             this.labelNextLv1.Name = "labelNextLv1";\r
             this.labelNextLv1.Size = new System.Drawing.Size(35, 12);\r
-            this.labelNextLv1.TabIndex = 26;\r
+            this.labelNextLv1.TabIndex = 28;\r
             this.labelNextLv1.Text = "0";\r
             this.labelNextLv1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP6\r
             // \r
-            this.labelHP6.Location = new System.Drawing.Point(142, 84);\r
+            this.labelHP6.Location = new System.Drawing.Point(145, 100);\r
             this.labelHP6.Name = "labelHP6";\r
-            this.labelHP6.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP6.TabIndex = 23;\r
+            this.labelHP6.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP6.TabIndex = 19;\r
             this.labelHP6.Text = "0/0";\r
             this.labelHP6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP5\r
             // \r
-            this.labelHP5.Location = new System.Drawing.Point(142, 68);\r
+            this.labelHP5.Location = new System.Drawing.Point(145, 84);\r
             this.labelHP5.Name = "labelHP5";\r
-            this.labelHP5.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP5.TabIndex = 22;\r
+            this.labelHP5.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP5.TabIndex = 18;\r
             this.labelHP5.Text = "0/0";\r
             this.labelHP5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP4\r
             // \r
-            this.labelHP4.Location = new System.Drawing.Point(142, 52);\r
+            this.labelHP4.Location = new System.Drawing.Point(145, 68);\r
             this.labelHP4.Name = "labelHP4";\r
-            this.labelHP4.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP4.TabIndex = 21;\r
+            this.labelHP4.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP4.TabIndex = 17;\r
             this.labelHP4.Text = "0/0";\r
             this.labelHP4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP3\r
             // \r
-            this.labelHP3.Location = new System.Drawing.Point(142, 36);\r
+            this.labelHP3.Location = new System.Drawing.Point(145, 52);\r
             this.labelHP3.Name = "labelHP3";\r
-            this.labelHP3.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP3.TabIndex = 20;\r
+            this.labelHP3.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP3.TabIndex = 16;\r
             this.labelHP3.Text = "0/0";\r
             this.labelHP3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP2\r
             // \r
-            this.labelHP2.Location = new System.Drawing.Point(142, 20);\r
+            this.labelHP2.Location = new System.Drawing.Point(145, 36);\r
             this.labelHP2.Name = "labelHP2";\r
-            this.labelHP2.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP2.TabIndex = 19;\r
+            this.labelHP2.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP2.TabIndex = 15;\r
             this.labelHP2.Text = "0/0";\r
             this.labelHP2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelHP1\r
             // \r
-            this.labelHP1.Location = new System.Drawing.Point(142, 4);\r
+            this.labelHP1.Location = new System.Drawing.Point(145, 20);\r
             this.labelHP1.Name = "labelHP1";\r
-            this.labelHP1.Size = new System.Drawing.Size(35, 12);\r
-            this.labelHP1.TabIndex = 18;\r
+            this.labelHP1.Size = new System.Drawing.Size(35, 10);\r
+            this.labelHP1.TabIndex = 14;\r
             this.labelHP1.Text = "0/0";\r
             this.labelHP1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv6\r
             // \r
-            this.labelLv6.Location = new System.Drawing.Point(119, 84);\r
+            this.labelLv6.Location = new System.Drawing.Point(122, 100);\r
             this.labelLv6.Name = "labelLv6";\r
             this.labelLv6.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv6.TabIndex = 17;\r
+            this.labelLv6.TabIndex = 12;\r
             this.labelLv6.Text = "0";\r
             this.labelLv6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv5\r
             // \r
-            this.labelLv5.Location = new System.Drawing.Point(119, 68);\r
+            this.labelLv5.Location = new System.Drawing.Point(122, 84);\r
             this.labelLv5.Name = "labelLv5";\r
             this.labelLv5.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv5.TabIndex = 16;\r
+            this.labelLv5.TabIndex = 11;\r
             this.labelLv5.Text = "0";\r
             this.labelLv5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv4\r
             // \r
-            this.labelLv4.Location = new System.Drawing.Point(119, 52);\r
+            this.labelLv4.Location = new System.Drawing.Point(122, 68);\r
             this.labelLv4.Name = "labelLv4";\r
             this.labelLv4.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv4.TabIndex = 15;\r
+            this.labelLv4.TabIndex = 10;\r
             this.labelLv4.Text = "0";\r
             this.labelLv4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv2\r
             // \r
-            this.labelLv2.Location = new System.Drawing.Point(119, 20);\r
+            this.labelLv2.Location = new System.Drawing.Point(122, 36);\r
             this.labelLv2.Name = "labelLv2";\r
             this.labelLv2.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv2.TabIndex = 14;\r
+            this.labelLv2.TabIndex = 8;\r
             this.labelLv2.Text = "0";\r
             this.labelLv2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv3\r
             // \r
-            this.labelLv3.Location = new System.Drawing.Point(119, 36);\r
+            this.labelLv3.Location = new System.Drawing.Point(122, 52);\r
             this.labelLv3.Name = "labelLv3";\r
             this.labelLv3.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv3.TabIndex = 13;\r
+            this.labelLv3.TabIndex = 9;\r
             this.labelLv3.Text = "0";\r
             this.labelLv3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelLv1\r
             // \r
-            this.labelLv1.Location = new System.Drawing.Point(119, 4);\r
+            this.labelLv1.Location = new System.Drawing.Point(122, 20);\r
             this.labelLv1.Name = "labelLv1";\r
             this.labelLv1.Size = new System.Drawing.Size(17, 12);\r
-            this.labelLv1.TabIndex = 12;\r
+            this.labelLv1.TabIndex = 7;\r
             this.labelLv1.Text = "0";\r
             this.labelLv1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             // labelShip6\r
             // \r
-            this.labelShip6.Location = new System.Drawing.Point(3, 84);\r
+            this.labelShip6.Location = new System.Drawing.Point(3, 100);\r
             this.labelShip6.Name = "labelShip6";\r
             this.labelShip6.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip6.TabIndex = 5;\r
             // \r
             // labelShip5\r
             // \r
-            this.labelShip5.Location = new System.Drawing.Point(3, 68);\r
+            this.labelShip5.Location = new System.Drawing.Point(3, 84);\r
             this.labelShip5.Name = "labelShip5";\r
             this.labelShip5.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip5.TabIndex = 4;\r
             // \r
             // labelShip4\r
             // \r
-            this.labelShip4.Location = new System.Drawing.Point(3, 52);\r
+            this.labelShip4.Location = new System.Drawing.Point(3, 68);\r
             this.labelShip4.Name = "labelShip4";\r
             this.labelShip4.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip4.TabIndex = 3;\r
             // \r
             // labelShip3\r
             // \r
-            this.labelShip3.Location = new System.Drawing.Point(3, 36);\r
+            this.labelShip3.Location = new System.Drawing.Point(3, 52);\r
             this.labelShip3.Name = "labelShip3";\r
             this.labelShip3.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip3.TabIndex = 2;\r
             // \r
             // labelShip2\r
             // \r
-            this.labelShip2.Location = new System.Drawing.Point(3, 20);\r
+            this.labelShip2.Location = new System.Drawing.Point(3, 36);\r
             this.labelShip2.Name = "labelShip2";\r
             this.labelShip2.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip2.TabIndex = 1;\r
             // \r
             // labelShip1\r
             // \r
-            this.labelShip1.Location = new System.Drawing.Point(3, 4);\r
+            this.labelShip1.Location = new System.Drawing.Point(3, 20);\r
             this.labelShip1.Name = "labelShip1";\r
             this.labelShip1.Size = new System.Drawing.Size(77, 12);\r
             this.labelShip1.TabIndex = 0;\r
@@ -584,7 +606,7 @@ namespace KancolleSniffer
             // labelRepair\r
             // \r
             this.labelRepair.AutoSize = true;\r
-            this.labelRepair.Location = new System.Drawing.Point(15, 173);\r
+            this.labelRepair.Location = new System.Drawing.Point(15, 217);\r
             this.labelRepair.Name = "labelRepair";\r
             this.labelRepair.Size = new System.Drawing.Size(29, 12);\r
             this.labelRepair.TabIndex = 3;\r
@@ -605,7 +627,7 @@ namespace KancolleSniffer
             this.panelDock.Controls.Add(this.label7);\r
             this.panelDock.Controls.Add(this.label6);\r
             this.panelDock.Controls.Add(this.label5);\r
-            this.panelDock.Location = new System.Drawing.Point(12, 188);\r
+            this.panelDock.Location = new System.Drawing.Point(12, 232);\r
             this.panelDock.Name = "panelDock";\r
             this.panelDock.Size = new System.Drawing.Size(165, 68);\r
             this.panelDock.TabIndex = 4;\r
@@ -615,35 +637,35 @@ namespace KancolleSniffer
             this.labelRepairShip4.Location = new System.Drawing.Point(36, 50);\r
             this.labelRepairShip4.Name = "labelRepairShip4";\r
             this.labelRepairShip4.Size = new System.Drawing.Size(77, 12);\r
-            this.labelRepairShip4.TabIndex = 35;\r
+            this.labelRepairShip4.TabIndex = 7;\r
             // \r
             // labelRepairShip3\r
             // \r
             this.labelRepairShip3.Location = new System.Drawing.Point(36, 36);\r
             this.labelRepairShip3.Name = "labelRepairShip3";\r
             this.labelRepairShip3.Size = new System.Drawing.Size(77, 12);\r
-            this.labelRepairShip3.TabIndex = 34;\r
+            this.labelRepairShip3.TabIndex = 6;\r
             // \r
             // labelRepairShip2\r
             // \r
             this.labelRepairShip2.Location = new System.Drawing.Point(36, 20);\r
             this.labelRepairShip2.Name = "labelRepairShip2";\r
             this.labelRepairShip2.Size = new System.Drawing.Size(77, 12);\r
-            this.labelRepairShip2.TabIndex = 33;\r
+            this.labelRepairShip2.TabIndex = 5;\r
             // \r
             // labelRepairShip1\r
             // \r
             this.labelRepairShip1.Location = new System.Drawing.Point(36, 4);\r
             this.labelRepairShip1.Name = "labelRepairShip1";\r
             this.labelRepairShip1.Size = new System.Drawing.Size(77, 12);\r
-            this.labelRepairShip1.TabIndex = 32;\r
+            this.labelRepairShip1.TabIndex = 4;\r
             // \r
             // labelRepair3\r
             // \r
             this.labelRepair3.Location = new System.Drawing.Point(115, 36);\r
             this.labelRepair3.Name = "labelRepair3";\r
             this.labelRepair3.Size = new System.Drawing.Size(45, 12);\r
-            this.labelRepair3.TabIndex = 8;\r
+            this.labelRepair3.TabIndex = 10;\r
             this.labelRepair3.Text = "00:00:00";\r
             this.labelRepair3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -652,7 +674,7 @@ namespace KancolleSniffer
             this.labelRepair4.Location = new System.Drawing.Point(115, 50);\r
             this.labelRepair4.Name = "labelRepair4";\r
             this.labelRepair4.Size = new System.Drawing.Size(45, 12);\r
-            this.labelRepair4.TabIndex = 7;\r
+            this.labelRepair4.TabIndex = 11;\r
             this.labelRepair4.Text = "00:00:00";\r
             this.labelRepair4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -661,7 +683,7 @@ namespace KancolleSniffer
             this.labelRepair2.Location = new System.Drawing.Point(115, 20);\r
             this.labelRepair2.Name = "labelRepair2";\r
             this.labelRepair2.Size = new System.Drawing.Size(45, 12);\r
-            this.labelRepair2.TabIndex = 6;\r
+            this.labelRepair2.TabIndex = 9;\r
             this.labelRepair2.Text = "00:00:00";\r
             this.labelRepair2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -670,7 +692,7 @@ namespace KancolleSniffer
             this.labelRepair1.Location = new System.Drawing.Point(115, 4);\r
             this.labelRepair1.Name = "labelRepair1";\r
             this.labelRepair1.Size = new System.Drawing.Size(45, 12);\r
-            this.labelRepair1.TabIndex = 5;\r
+            this.labelRepair1.TabIndex = 8;\r
             this.labelRepair1.Text = "00:00:00";\r
             this.labelRepair1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -680,7 +702,7 @@ namespace KancolleSniffer
             this.label8.Location = new System.Drawing.Point(3, 50);\r
             this.label8.Name = "label8";\r
             this.label8.Size = new System.Drawing.Size(29, 12);\r
-            this.label8.TabIndex = 4;\r
+            this.label8.TabIndex = 3;\r
             this.label8.Text = "第四";\r
             // \r
             // label7\r
@@ -689,7 +711,7 @@ namespace KancolleSniffer
             this.label7.Location = new System.Drawing.Point(3, 36);\r
             this.label7.Name = "label7";\r
             this.label7.Size = new System.Drawing.Size(29, 12);\r
-            this.label7.TabIndex = 3;\r
+            this.label7.TabIndex = 2;\r
             this.label7.Text = "第三";\r
             // \r
             // label6\r
@@ -698,7 +720,7 @@ namespace KancolleSniffer
             this.label6.Location = new System.Drawing.Point(3, 20);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(29, 12);\r
-            this.label6.TabIndex = 2;\r
+            this.label6.TabIndex = 1;\r
             this.label6.Text = "第二";\r
             // \r
             // label5\r
@@ -721,7 +743,7 @@ namespace KancolleSniffer
             this.panel1.Controls.Add(this.label10);\r
             this.panel1.Controls.Add(this.labelConstruct1);\r
             this.panel1.Controls.Add(this.label9);\r
-            this.panel1.Location = new System.Drawing.Point(183, 188);\r
+            this.panel1.Location = new System.Drawing.Point(183, 232);\r
             this.panel1.Name = "panel1";\r
             this.panel1.Size = new System.Drawing.Size(88, 68);\r
             this.panel1.TabIndex = 7;\r
@@ -731,7 +753,7 @@ namespace KancolleSniffer
             this.labelConstruct3.Location = new System.Drawing.Point(38, 36);\r
             this.labelConstruct3.Name = "labelConstruct3";\r
             this.labelConstruct3.Size = new System.Drawing.Size(45, 12);\r
-            this.labelConstruct3.TabIndex = 12;\r
+            this.labelConstruct3.TabIndex = 6;\r
             this.labelConstruct3.Text = "00:00:00";\r
             this.labelConstruct3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -741,7 +763,7 @@ namespace KancolleSniffer
             this.label12.Location = new System.Drawing.Point(3, 50);\r
             this.label12.Name = "label12";\r
             this.label12.Size = new System.Drawing.Size(29, 12);\r
-            this.label12.TabIndex = 4;\r
+            this.label12.TabIndex = 3;\r
             this.label12.Text = "第四";\r
             // \r
             // labelConstruct4\r
@@ -749,7 +771,7 @@ namespace KancolleSniffer
             this.labelConstruct4.Location = new System.Drawing.Point(38, 50);\r
             this.labelConstruct4.Name = "labelConstruct4";\r
             this.labelConstruct4.Size = new System.Drawing.Size(45, 12);\r
-            this.labelConstruct4.TabIndex = 11;\r
+            this.labelConstruct4.TabIndex = 7;\r
             this.labelConstruct4.Text = "00:00:00";\r
             this.labelConstruct4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -759,7 +781,7 @@ namespace KancolleSniffer
             this.label11.Location = new System.Drawing.Point(3, 36);\r
             this.label11.Name = "label11";\r
             this.label11.Size = new System.Drawing.Size(29, 12);\r
-            this.label11.TabIndex = 3;\r
+            this.label11.TabIndex = 2;\r
             this.label11.Text = "第三";\r
             // \r
             // labelConstruct2\r
@@ -767,7 +789,7 @@ namespace KancolleSniffer
             this.labelConstruct2.Location = new System.Drawing.Point(38, 20);\r
             this.labelConstruct2.Name = "labelConstruct2";\r
             this.labelConstruct2.Size = new System.Drawing.Size(45, 12);\r
-            this.labelConstruct2.TabIndex = 10;\r
+            this.labelConstruct2.TabIndex = 5;\r
             this.labelConstruct2.Text = "00:00:00";\r
             this.labelConstruct2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -777,7 +799,7 @@ namespace KancolleSniffer
             this.label10.Location = new System.Drawing.Point(3, 20);\r
             this.label10.Name = "label10";\r
             this.label10.Size = new System.Drawing.Size(29, 12);\r
-            this.label10.TabIndex = 2;\r
+            this.label10.TabIndex = 1;\r
             this.label10.Text = "第二";\r
             // \r
             // labelConstruct1\r
@@ -785,7 +807,7 @@ namespace KancolleSniffer
             this.labelConstruct1.Location = new System.Drawing.Point(38, 4);\r
             this.labelConstruct1.Name = "labelConstruct1";\r
             this.labelConstruct1.Size = new System.Drawing.Size(45, 12);\r
-            this.labelConstruct1.TabIndex = 9;\r
+            this.labelConstruct1.TabIndex = 4;\r
             this.labelConstruct1.Text = "00:00:00";\r
             this.labelConstruct1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -801,7 +823,7 @@ namespace KancolleSniffer
             // labelConstruct\r
             // \r
             this.labelConstruct.AutoSize = true;\r
-            this.labelConstruct.Location = new System.Drawing.Point(184, 173);\r
+            this.labelConstruct.Location = new System.Drawing.Point(184, 217);\r
             this.labelConstruct.Name = "labelConstruct";\r
             this.labelConstruct.Size = new System.Drawing.Size(29, 12);\r
             this.labelConstruct.TabIndex = 6;\r
@@ -810,7 +832,7 @@ namespace KancolleSniffer
             // labelQuest\r
             // \r
             this.labelQuest.AutoSize = true;\r
-            this.labelQuest.Location = new System.Drawing.Point(14, 331);\r
+            this.labelQuest.Location = new System.Drawing.Point(14, 375);\r
             this.labelQuest.Name = "labelQuest";\r
             this.labelQuest.Size = new System.Drawing.Size(29, 12);\r
             this.labelQuest.TabIndex = 8;\r
@@ -819,7 +841,7 @@ namespace KancolleSniffer
             // labelMission\r
             // \r
             this.labelMission.AutoSize = true;\r
-            this.labelMission.Location = new System.Drawing.Point(13, 259);\r
+            this.labelMission.Location = new System.Drawing.Point(13, 303);\r
             this.labelMission.Name = "labelMission";\r
             this.labelMission.Size = new System.Drawing.Size(29, 12);\r
             this.labelMission.TabIndex = 10;\r
@@ -837,7 +859,7 @@ namespace KancolleSniffer
             this.panel2.Controls.Add(this.label15);\r
             this.panel2.Controls.Add(this.label14);\r
             this.panel2.Controls.Add(this.label13);\r
-            this.panel2.Location = new System.Drawing.Point(12, 274);\r
+            this.panel2.Location = new System.Drawing.Point(12, 318);\r
             this.panel2.Name = "panel2";\r
             this.panel2.Size = new System.Drawing.Size(259, 54);\r
             this.panel2.TabIndex = 11;\r
@@ -847,28 +869,28 @@ namespace KancolleSniffer
             this.labelMissionName3.Location = new System.Drawing.Point(61, 36);\r
             this.labelMissionName3.Name = "labelMissionName3";\r
             this.labelMissionName3.Size = new System.Drawing.Size(146, 12);\r
-            this.labelMissionName3.TabIndex = 18;\r
+            this.labelMissionName3.TabIndex = 5;\r
             // \r
             // labelMissionName2\r
             // \r
             this.labelMissionName2.Location = new System.Drawing.Point(62, 20);\r
             this.labelMissionName2.Name = "labelMissionName2";\r
             this.labelMissionName2.Size = new System.Drawing.Size(146, 12);\r
-            this.labelMissionName2.TabIndex = 17;\r
+            this.labelMissionName2.TabIndex = 4;\r
             // \r
             // labelMissionName1\r
             // \r
             this.labelMissionName1.Location = new System.Drawing.Point(61, 4);\r
             this.labelMissionName1.Name = "labelMissionName1";\r
             this.labelMissionName1.Size = new System.Drawing.Size(146, 12);\r
-            this.labelMissionName1.TabIndex = 16;\r
+            this.labelMissionName1.TabIndex = 3;\r
             // \r
             // labelMission3\r
             // \r
             this.labelMission3.Location = new System.Drawing.Point(209, 36);\r
             this.labelMission3.Name = "labelMission3";\r
             this.labelMission3.Size = new System.Drawing.Size(45, 12);\r
-            this.labelMission3.TabIndex = 15;\r
+            this.labelMission3.TabIndex = 8;\r
             this.labelMission3.Text = "00:00:00";\r
             this.labelMission3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -877,7 +899,7 @@ namespace KancolleSniffer
             this.labelMission2.Location = new System.Drawing.Point(209, 20);\r
             this.labelMission2.Name = "labelMission2";\r
             this.labelMission2.Size = new System.Drawing.Size(45, 12);\r
-            this.labelMission2.TabIndex = 14;\r
+            this.labelMission2.TabIndex = 7;\r
             this.labelMission2.Text = "00:00:00";\r
             this.labelMission2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -886,7 +908,7 @@ namespace KancolleSniffer
             this.labelMission1.Location = new System.Drawing.Point(209, 4);\r
             this.labelMission1.Name = "labelMission1";\r
             this.labelMission1.Size = new System.Drawing.Size(45, 12);\r
-            this.labelMission1.TabIndex = 13;\r
+            this.labelMission1.TabIndex = 6;\r
             this.labelMission1.Text = "00:00:00";\r
             this.labelMission1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
@@ -936,7 +958,7 @@ namespace KancolleSniffer
             this.panel3.Controls.Add(this.labelQuest3);\r
             this.panel3.Controls.Add(this.labelQuest2);\r
             this.panel3.Controls.Add(this.labelQuest1);\r
-            this.panel3.Location = new System.Drawing.Point(12, 346);\r
+            this.panel3.Location = new System.Drawing.Point(12, 390);\r
             this.panel3.Name = "panel3";\r
             this.panel3.Size = new System.Drawing.Size(259, 81);\r
             this.panel3.TabIndex = 13;\r
@@ -1020,7 +1042,7 @@ namespace KancolleSniffer
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(287, 439);\r
+            this.ClientSize = new System.Drawing.Size(283, 483);\r
             this.Controls.Add(this.panel3);\r
             this.Controls.Add(this.panel2);\r
             this.Controls.Add(this.labelMission);\r
@@ -1059,11 +1081,11 @@ namespace KancolleSniffer
 \r
         private System.Windows.Forms.Panel panelHeadquarters;\r
         private System.Windows.Forms.Label labelNumOfBuckets;\r
-        private System.Windows.Forms.Label label4;\r
-        private System.Windows.Forms.Label labelNumOfEquips;\r
         private System.Windows.Forms.Label label3;\r
-        private System.Windows.Forms.Label labelNumOfShips;\r
+        private System.Windows.Forms.Label labelNumOfEquips;\r
         private System.Windows.Forms.Label label2;\r
+        private System.Windows.Forms.Label labelNumOfShips;\r
+        private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.Label labelFleet1;\r
         private System.Windows.Forms.Panel panelFleet1;\r
         private System.Windows.Forms.Label labelShip6;\r
@@ -1138,18 +1160,20 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelRepairShip3;\r
         private System.Windows.Forms.Label labelRepairShip2;\r
         private System.Windows.Forms.Label labelRepairShip1;\r
-        private System.Windows.Forms.Label label26;\r
-        private System.Windows.Forms.Label label25;\r
-        private System.Windows.Forms.Label label24;\r
-        private System.Windows.Forms.Label label23;\r
-        private System.Windows.Forms.Label label22;\r
-        private System.Windows.Forms.Label label21;\r
-        private System.Windows.Forms.Label label20;\r
-        private System.Windows.Forms.Label label19;\r
         private System.Windows.Forms.Label label18;\r
+        private System.Windows.Forms.Label label4;\r
         private System.Windows.Forms.Label label17;\r
+        private System.Windows.Forms.Label labelCond6;\r
+        private System.Windows.Forms.Label labelCond5;\r
+        private System.Windows.Forms.Label labelCond4;\r
+        private System.Windows.Forms.Label labelCond2;\r
+        private System.Windows.Forms.Label labelCond3;\r
+        private System.Windows.Forms.Label labelCond1;\r
         private System.Windows.Forms.Label label16;\r
-        private System.Windows.Forms.Label label1;\r
+        private System.Windows.Forms.Label labelCondTimer2;\r
+        private System.Windows.Forms.Label labelCondTimer1;\r
+        private System.Windows.Forms.Label label19;\r
+        private System.Windows.Forms.Label label20;\r
     }\r
 }\r
 \r
index 9c984e1..8122cbf 100644 (file)
@@ -46,6 +46,9 @@ namespace KancolleSniffer
         private readonly SortedDictionary<int, QuestState> _questList = new SortedDictionary<int, QuestState>();\r
         private DateTime _questLastUpdated;\r
         private bool _slotRinged;\r
+        private int _prevWorstCond = int.MaxValue;\r
+        private DateTime _condEndTime1;\r
+        private DateTime _condEndTime2;\r
 \r
         private readonly string _shipNamesFile =\r
             Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "shipnames.json");\r
@@ -60,6 +63,7 @@ namespace KancolleSniffer
             public int ExpToNext { get; set; }\r
             public int MaxHp { get; set; }\r
             public int NowHp { get; set; }\r
+            public int Cond { get; set; }\r
         }\r
 \r
         private struct QuestState\r
@@ -298,7 +302,8 @@ namespace KancolleSniffer
                     Level = (int)entry.api_lv,\r
                     ExpToNext = (int)entry.api_exp[1],\r
                     MaxHp = (int)entry.api_maxhp,\r
-                    NowHp = (int)entry.api_nowhp\r
+                    NowHp = (int)entry.api_nowhp,\r
+                    Cond = (int)entry.api_cond\r
                 };\r
                 _shipStatuses[(int)entry.api_id] = data;\r
             }\r
@@ -397,8 +402,10 @@ namespace KancolleSniffer
             var name = new[] {labelShip1, labelShip2, labelShip3, labelShip4, labelShip5, labelShip6};\r
             var lv = new[] {labelLv1, labelLv2, labelLv3, labelLv4, labelLv5, labelLv6};\r
             var hp = new[] {labelHP1, labelHP2, labelHP3, labelHP4, labelHP5, labelHP6};\r
+            var cond = new[] {labelCond1, labelCond2, labelCond3, labelCond4, labelCond5, labelCond6};\r
             var next = new[] {labelNextLv1, labelNextLv2, labelNextLv3, labelNextLv4, labelNextLv5, labelNextLv6};\r
 \r
+            var worstCond = int.MaxValue;\r
             if (_shipStatuses.Count == 0)\r
                 return;\r
             for (var i = 0; i < 6; i++)\r
@@ -411,6 +418,8 @@ namespace KancolleSniffer
                     lv[i].Text = "0";\r
                     hp[i].Text = "0/0";\r
                     hp[i].BackColor = DefaultBackColor;\r
+                    cond[i].Text = "0";\r
+                    cond[i].BackColor = DefaultBackColor;\r
                     next[i].Text = "0";\r
                     continue;\r
                 }\r
@@ -420,11 +429,42 @@ namespace KancolleSniffer
                 hp[i].Text = string.Format("{0:D}/{1:D}", info.NowHp, info.MaxHp);\r
                 var damage = (double)info.NowHp / info.MaxHp;\r
                 hp[i].BackColor = damage > 0.5 ? DefaultBackColor : damage > 0.25 ? Color.Orange : Color.Red;\r
+                SetHpLavel(hp[i], info.NowHp, info.MaxHp);\r
+                SetCondLabel(cond[i], info.Cond);\r
+                if (info.Cond < worstCond)\r
+                    worstCond = info.Cond;\r
                 next[i].Text = info.ExpToNext.ToString("D");\r
             }\r
+            if (worstCond != _prevWorstCond)\r
+            {\r
+                _prevWorstCond = worstCond;\r
+                SetCondTimers(worstCond);\r
+            }\r
             UpdateSlotCount();\r
         }\r
 \r
+        private void SetHpLavel(Label label, int now, int max)\r
+        {\r
+            label.Text = string.Format("{0:D}/{1:D}", now, max);\r
+            var damage = (double)now / max;\r
+            label.ForeColor = damage > 0.5 ? Color.Black : damage > 0.25 ? Color.Orange : Color.Red;\r
+        }\r
+\r
+        private void SetCondLabel(Label label, int cond)\r
+        {\r
+            label.Text = cond.ToString("D");\r
+            label.BackColor = cond >= 50\r
+                ? Color.Yellow\r
+                : cond >= 30 ? DefaultBackColor : cond >= 20 ? Color.Orange : Color.Red;\r
+        }\r
+\r
+        private void SetCondTimers(int cond)\r
+        {\r
+            var now = DateTime.Now;\r
+            _condEndTime1 = (cond < 30) ? now.AddMinutes((30 - cond + 2) / 3 * 3) : DateTime.MinValue;\r
+            _condEndTime2 = (cond < 40) ? now.AddMinutes((40 - cond + 2) / 3 * 3) : DateTime.MinValue;\r
+        }\r
+\r
         private void UpdateTimers()\r
         {\r
             var mission = new[] {labelMission1, labelMission2, labelMission3};\r
@@ -460,6 +500,7 @@ namespace KancolleSniffer
                 Ring();\r
                 timer.NeedRing = false;\r
             }\r
+            UpdateCondTimers();\r
         }\r
 \r
         private void SetTimerLabel(RingTimer timer, Label label)\r
@@ -471,6 +512,14 @@ namespace KancolleSniffer
             label.Text = timer.ToString();\r
         }\r
 \r
+        private void UpdateCondTimers()\r
+        {\r
+            var now = DateTime.Now;\r
+            var min = DateTime.MinValue;\r
+            labelCondTimer1.Text = (_condEndTime1 != min) ? (_condEndTime1 - now).ToString(@"mm\:ss") : "00:00";\r
+            labelCondTimer2.Text = (_condEndTime2 != min) ? (_condEndTime2 - now).ToString(@"mm\:ss") : "00:00";\r
+        }\r
+\r
         private void UpdateQuestList()\r
         {\r
             var name = new[] {labelQuest1, labelQuest2, labelQuest3, labelQuest4, labelQuest5};\r