分岐点係数が3と4の場合の索敵値をツールチップで表示する

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 3c204b8..7426122 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -464,9 +464,11 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "lineofsight_001");\r
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - 39.45) < 0.01);\r
+            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0, 1) - 39.45) < 0.01);\r
+            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0, 3) - 115.19) < 0.01);\r
+            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0, 4) - 153.06) < 0.01);\r
             SniffLogFile(sniffer, "lineofsight_002");\r
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - -25.10) < 0.01, "艦隊に空きがある");\r
+            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0, 1) - -25.10) < 0.01, "艦隊に空きがある");\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer/MainForm.Designer.cs b/KancolleSniffer/MainForm.Designer.cs
index 5021f5f..80ef50f 100644 (file)
--- a/KancolleSniffer/MainForm.Designer.cs
+++ b/KancolleSniffer/MainForm.Designer.cs
@@ -66,7 +66,7 @@ namespace KancolleSniffer
             this.labelFormation = new System.Windows.Forms.Label();\r
             this.labelResultRank = new System.Windows.Forms.Label();\r
             this.labelLoS = new System.Windows.Forms.Label();\r
-            this.label19 = new System.Windows.Forms.Label();\r
+            this.labelLoSCaption = new System.Windows.Forms.Label();\r
             this.labelFighterPower = new System.Windows.Forms.Label();\r
             this.labelFighterPowerCaption = new System.Windows.Forms.Label();\r
             this.labelCondTimerTitle = new System.Windows.Forms.Label();\r
@@ -164,6 +164,7 @@ namespace KancolleSniffer
             this.toolTipAchievement = new System.Windows.Forms.ToolTip(this.components);\r
             this.labelAkashiRepair = new System.Windows.Forms.Label();\r
             this.toolTipFighterPower = new System.Windows.Forms.ToolTip(this.components);\r
+            this.toolTipLoS = new System.Windows.Forms.ToolTip(this.components);\r
             this.panelHeadquarters.SuspendLayout();\r
             this.panelShipInfo.SuspendLayout();\r
             this.panelBattleInfo.SuspendLayout();\r
@@ -305,7 +306,7 @@ namespace KancolleSniffer
             this.panelShipInfo.Controls.Add(this.panelCombinedFleet);\r
             this.panelShipInfo.Controls.Add(this.panelBattleInfo);\r
             this.panelShipInfo.Controls.Add(this.labelLoS);\r
-            this.panelShipInfo.Controls.Add(this.label19);\r
+            this.panelShipInfo.Controls.Add(this.labelLoSCaption);\r
             this.panelShipInfo.Controls.Add(this.labelFighterPower);\r
             this.panelShipInfo.Controls.Add(this.labelFighterPowerCaption);\r
             this.panelShipInfo.Controls.Add(this.labelCondTimerTitle);\r
@@ -394,14 +395,14 @@ namespace KancolleSniffer
             this.labelLoS.Text = "0.0";\r
             this.labelLoS.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
-            // label19\r
+            // labelLoSCaption\r
             // \r
-            this.label19.AutoSize = true;\r
-            this.label19.Location = new System.Drawing.Point(59, 117);\r
-            this.label19.Name = "label19";\r
-            this.label19.Size = new System.Drawing.Size(29, 12);\r
-            this.label19.TabIndex = 41;\r
-            this.label19.Text = "索敵";\r
+            this.labelLoSCaption.AutoSize = true;\r
+            this.labelLoSCaption.Location = new System.Drawing.Point(59, 117);\r
+            this.labelLoSCaption.Name = "labelLoSCaption";\r
+            this.labelLoSCaption.Size = new System.Drawing.Size(29, 12);\r
+            this.labelLoSCaption.TabIndex = 41;\r
+            this.labelLoSCaption.Text = "索敵";\r
             // \r
             // labelFighterPower\r
             // \r
@@ -1283,6 +1284,10 @@ namespace KancolleSniffer
             // \r
             this.toolTipFighterPower.ShowAlways = true;\r
             // \r
+            // toolTipLoS\r
+            // \r
+            this.toolTipLoS.ShowAlways = true;\r
+            // \r
             // MainForm\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
@@ -1442,7 +1447,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.ToolStripMenuItem NotifyIconExitToolStripMenuItem;\r
         private System.Windows.Forms.ToolStripMenuItem listToolStripMenuItem;\r
         private System.Windows.Forms.Label labelLoS;\r
-        private System.Windows.Forms.Label label19;\r
+        private System.Windows.Forms.Label labelLoSCaption;\r
         private System.Windows.Forms.Label labelPlayLog;\r
         private System.Windows.Forms.Panel panelBattleInfo;\r
         private System.Windows.Forms.Label labelEnemyFighterPower;\r
@@ -1476,6 +1481,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label labelAkashiRepair;\r
         private System.Windows.Forms.Label labelPresetAkashiTimer;\r
         private System.Windows.Forms.ToolTip toolTipFighterPower;\r
+        private System.Windows.Forms.ToolTip toolTipLoS;\r
     }\r
 }\r
 \r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index c7d7a8c..3b4c511 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -550,7 +550,16 @@ namespace KancolleSniffer
 \r
         private void UpdateLoS()\r
         {\r
-            labelLoS.Text = (Floor(_sniffer.GetFleetLineOfSights(_currentFleet) * 10) / 10.0).ToString("F1");\r
+            labelLoS.Text = RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 1)).ToString("F1");\r
+            var text = $"係数3: {RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 3)):F1}\r\n" +\r
+                       $"係数4: {RoundDown(_sniffer.GetFleetLineOfSights(_currentFleet, 4)):F1}";\r
+            toolTipLoS.SetToolTip(labelLoS, text);\r
+            toolTipLoS.SetToolTip(labelLoSCaption, text);\r
+        }\r
+\r
+        private double RoundDown(double number)\r
+        {\r
+            return Floor(number * 10) / 10.0;\r
         }\r
 \r
         private void UpdateBattleInfo()\r

diff --git a/KancolleSniffer/MainForm.resx b/KancolleSniffer/MainForm.resx
index bc75dd2..d368150 100644 (file)
--- a/KancolleSniffer/MainForm.resx
+++ b/KancolleSniffer/MainForm.resx
@@ -125,15 +125,15 @@
         h2GHd/wlVSVtUVWOLbxy2cIrny1olragaTawAaZHH+EhWPx/AAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
-  <data name="timerMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  <metadata name="timerMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 17</value>\r
-  </data>\r
-  <data name="notifyIconMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  </metadata>\r
+  <metadata name="notifyIconMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>129, 17</value>\r
-  </data>\r
-  <data name="contextMenuStripNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  </metadata>\r
+  <metadata name="contextMenuStripNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>577, 26</value>\r
-  </data>\r
+  </metadata>\r
   <data name="notifyIconMain.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAQAQEAAAAEAIAAoQAAARgAAACAgAAABACAAKBAAAG5AAAAYGAAAAQAgACgJAACWUAAAEBAAAAEA\r
@@ -688,18 +688,18 @@
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
 </value>\r
   </data>\r
-  <data name="contextMenuStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  <metadata name="contextMenuStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>269, 17</value>\r
-  </data>\r
-  <data name="imageListMisc.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  </metadata>\r
+  <metadata name="imageListMisc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>449, 23</value>\r
-  </data>\r
+  </metadata>\r
   <data name="imageListMisc.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
     <value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABI\r
-        BwAAAk1TRnQBSQFMAwEBAAEgAQEBJAEBAQUBAAENAQAE/wEJARAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
+        BwAAAk1TRnQBSQFMAwEBAAEsAQEBLAEBAQUBAAENAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
         ARQDAAENAwABAQEAAQgFAAEEAQEYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
@@ -730,7 +730,7 @@
         AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAfATAAEOAfMTAAEV\r
         Af8TAAHsFAABBxQAAfITAAESEwAB8hIAAQcSAAHsEgABFQH/EQABDgHzEgAB8BMAAUIBTQE+BwABPgMA\r
         ASgDAAEUAwABDQMAAQEBAAEBBQABNBcAA/8BAAF4AwABOAMAARgDAAEYAwABCA8AAQgDAAEYAwABGAMA\r
-        ATgDAAF4GQAL\r
+        ATgDAAF4AwAL\r
 </value>\r
   </data>\r
   <data name="labelMaterialHistoryButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
@@ -747,23 +747,23 @@
         h2GHd/wlVSVtUVWOLbxy2cIrny1olragaTawAaZHH+EhWPx/AAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
-  <data name="imageListFuelSq.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  <metadata name="imageListFuelSq.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>796, 26</value>\r
-  </data>\r
+  </metadata>\r
   <data name="imageListFuelSq.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
     <value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm\r
-        GAAAAk1TRnQBSQFMAgEBCgEAARgBAAEcAQABCAEAAQ0BAAT/ASEBEAj/AUIBTQE2BwABNgMAASgDAAEg\r
-        AwABJwMAAQEBAAEgBQABgAETEgABIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/\r
-        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEh\r
-        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
-        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/\r
-        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wPDAf8DwwH/A8MB/wPDAf8DwwH/\r
-        A8MB/wPDAf8DwwH/QAABIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
-        Af8BIQEZAe0B/wEhARkB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEhARkB7QH/\r
-        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8DwwH/\r
+        GAAAAk1TRnQBSQFMAgEBCgEAASQBAAEkAQABCAEAAQ0BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg\r
+        AwABJwMAAQEBAAEgBQABgAETEgABIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/\r
+        ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEg\r
+        ARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHt\r
+        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAASABGAHtAf8BIAEYAe0B/wEgARgB7QH/\r
+        ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wPDAf8DwwH/A8MB/wPDAf8DwwH/\r
+        A8MB/wPDAf8DwwH/QAABIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHt\r
+        Af8BIAEYAe0B/wEgARgB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEgARgB7QH/\r
+        ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8DwwH/\r
         A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAAaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGy\r
         Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGl\r
         AcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf9AAAGlAcQBsgH/AaUBxAGyAf8BpQHE\r
@@ -792,190 +792,192 @@
         AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEA\r
         AaUC/wEAAaUC/wEAAaUC/wEAAaUC/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/IQAB8gL/\r
         AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQABpQL/AQABpQL/AQABpQL/\r
-        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/yAAAaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/\r
+        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/yAAAaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/\r
         AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHE\r
-        AbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/IAABpQHEAbIB/wGl\r
+        AbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/IAABpQHEAbIB/wGl\r
         AcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGy\r
-        Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
+        Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
         Af8gAAGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/\r
         AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHE\r
-        AbIB/wGlAcQBsgH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/yAAAaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGl\r
+        AbIB/wGlAcQBsgH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/yAAAaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGl\r
         AcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGy\r
-        Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/IAABpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHE\r
+        Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/IAABpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHE\r
         AbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/\r
-        AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8gAAGlAcQBsgH/AaUBxAGy\r
+        AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8gAAGlAcQBsgH/AaUBxAGy\r
         Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGl\r
-        AcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/yAA\r
+        AcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/yAA\r
         AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHE\r
         AbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/\r
-        AaUBxAGyAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/IAABpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGy\r
+        AaUBxAGyAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/IAABpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGy\r
         Af8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGlAcQBsgH/AaUBxAGyAf8BpQHEAbIB/wGl\r
         AcQBsgH/AaUBxAGyAf8BpQHEAbIB/yEAA/8BAAP/AQAD/wEAA/8BAAP/AQAD/wEAA/8BAAP/AQABpQL/\r
-        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ASEBGQHtAf8BIQEZAe0B/wEh\r
-        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/yEAA/8BAAP/AQAD/wEA\r
+        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ASABGAHtAf8BIAEYAe0B/wEg\r
+        ARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/yEAA/8BAAP/AQAD/wEA\r
         A/8BAAP/AQAD/wEAA/8BAAP/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/\r
-        AQABpQL/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
-        Af8BIQEZAe0B/yEAA/8BAAP/AQAD/wEAA/8BAAP/AQAD/wEAA/8BAAP/AQABpQL/AQABpQL/AQABpQL/\r
-        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
-        Af8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
+        AQABpQL/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHt\r
+        Af8BIAEYAe0B/yEAA/8BAAP/AQAD/wEAA/8BAAP/AQAD/wEAA/8BAAP/AQABpQL/AQABpQL/AQABpQL/\r
+        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHt\r
+        Af8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
         AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEA\r
-        AaUC/wEAAaUC/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEh\r
-        ARkB7QH/ASEBGQHtAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
-        Av8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BIQEZAe0B/wEh\r
-        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/IAABMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8gAAEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/yAAATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/IAABMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8gAAEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/yAAATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/IAABMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGD\r
-        AVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/\r
-        ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8gAAEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFR\r
-        Af8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEy\r
-        AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wFCAU0BPgcAAT4DAAEo\r
+        AaUC/wEAAaUC/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEg\r
+        ARgB7QH/ASABGAHtAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
+        Av8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BIAEYAe0B/wEg\r
+        ARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/ASABGAHtAf8BIAEYAe0B/wEgARgB7QH/IAABMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8gAAExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/yAAATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/IAABMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8gAAExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/yAAATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/IAABMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGD\r
+        AVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/\r
+        ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8gAAExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQ\r
+        Af8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wEx\r
+        AYMBUAH/ATEBgwFQAf8BMQGDAVAB/wExAYMBUAH/ATEBgwFQAf8BMQGDAVAB/wFCAU0BPgcAAT4DAAEo\r
         AwABIAMAAScDAAEBAQABAQUAAZwXAAP/NgAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/\r
         AwAB/wMAAf8DAAH/AwAB/wIAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/\r
-        AwAB/wMAAf8ZAAs=\r
+        AwAB/wMAAf8DAAs=\r
 </value>\r
   </data>\r
-  <data name="imageListBullSq.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  <metadata name="imageListBullSq.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>945, 26</value>\r
-  </data>\r
+  </metadata>\r
   <data name="imageListBullSq.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
     <value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADu\r
-        FgAAAk1TRnQBSQFMAgEBCgEAARABAAEUAQABCAEAAQ0BAAT/ASEBEAj/AUIBTQE2BwABNgMAASgDAAEg\r
-        AwABJwMAAQEBAAEgBQABgAETEgABIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/\r
-        ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEi\r
-        ARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHt\r
-        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/\r
-        ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wPDAf8DwwH/A8MB/wPDAf8DwwH/\r
-        A8MB/wPDAf8DwwH/QAABIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHt\r
-        Af8BIgEaAe0B/wEiARoB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEiARoB7QH/\r
-        ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8DwwH/\r
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACU\r
+        FgAAAk1TRnQBSQFMAgEBCgEAARwBAAEcAQABCAEAAQ0BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg\r
+        AwABJwMAAQEBAAEgBQABgAETEgABIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/\r
+        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEh\r
+        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
+        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/\r
+        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wPDAf8DwwH/A8MB/wPDAf8DwwH/\r
+        A8MB/wPDAf8DwwH/QAABIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
+        Af8BIQEZAe0B/wEhARkB7QH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf9AAAEhARkB7QH/\r
+        ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8DwwH/\r
         A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/0AAAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
         Af8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
         AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf9AAAGQAbkBzQH/AZABuQHNAf8BkAG5\r
         Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/\r
-        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/QAABfQGZAaQB4wGQ\r
-        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wF7AZQBnwHfAX0BmQGk\r
-        AeMBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BewGUAZ8B30AA\r
-        AXIBgQGJAcsBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BawF3\r
-        AX4BvwFyAYEBiQHLAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/\r
-        AWsBdwF+Ab9AAAFLAU4BTwGAAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
-        AbkBzQH/AUsBTgFPAYABSwFOAU8BgAGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
-        Af8BkAG5Ac0B/wFLAU4BTwGAQAADFwEgAYsBrQHBAfcBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
-        Ac0B/wGOAbEBxgH7AhQBFQEcAxcBIAGLAa0BwQH3AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
-        Af8BjgGxAcYB+wIUARUBHEQAAT8BQAFBAWgBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wFD\r
-        AUQBRQFwCAABPwFAAUEBaAGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AUMBRAFFAXBMAAE5\r
-        AjoBXAFtAXwBgwHDAW0BfAGDAcMBOQI6AVwQAAE5AjoBXAFtAXwBgwHDAW0BfAGDAcMBOQI6AVxIAAPD\r
-        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/IQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/\r
-        AQAB8gL/AQAB8gL/AQAB8gL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/\r
-        AQABpQL/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
-        Av8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGl\r
-        Av8BAAGlAv8BAAGlAv8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/yEAAfIC/wEAAfIC/wEA\r
-        AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEA\r
-        AaUC/wEAAaUC/wEAAaUC/wEAAaUC/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/IQAB8gL/\r
-        AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQABpQL/AQABpQL/AQABpQL/\r
-        AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPD\r
+        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/QAABdgGMAZYB4wGQ\r
+        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wF1AYcBjwHfAXYBjAGW\r
+        AeMBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BdQGHAY8B30AA\r
+        AWsBdAF4AcsBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BYwFp\r
+        AW4BvwFrAXQBeAHLAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/\r
+        AWMBaQFuAb9AAAJIAUkBgAGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
+        Ac0B/wJIAUkBgAJIAUkBgAGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
+        Ac0B/wJIAUkBgEAAAxcBIAGJAakBvAH3AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BjQGt\r
+        AcMB+wMUARwDFwEgAYkBqQG8AfcBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGNAa0BwwH7\r
+        AxQBHEQAAj0BPgFoAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BQAJBAXAIAAI9AT4BaAGQ\r
+        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AUACQQFwTAADOAFcAWYBbwFyAcMBZgFvAXIBwwM4\r
+        AVwQAAM4AVwBZgFvAXIBwwFmAW8BcgHDAzgBXEgAA8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/wPD\r
         Af8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAGlAv8BAAGl\r
-        Av8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAFkAZkB/wEAAWQBmQH/AQABZAGZ\r
-        Af8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/IAABkAG5Ac0B/wGQAbkBzQH/\r
-        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
-        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wEAAWQBmQH/\r
-        AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8gAAGQ\r
-        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
+        Av8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8DwwH/A8MB/wPDAf8DwwH/A8MB/wPD\r
+        Af8DwwH/A8MB/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
+        AaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wPDAf8DwwH/A8MB/wPD\r
+        Af8DwwH/A8MB/wPDAf8DwwH/IQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/\r
+        AQAB8gL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/AQABpQL/A8MB/wPD\r
+        Af8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
+        Av8BAAHyAv8BAAHyAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGlAv8BAAGl\r
+        Av8DwwH/A8MB/wPDAf8DwwH/A8MB/wPDAf8DwwH/A8MB/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
+        AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEAAaUC/wEA\r
+        AaUC/wEAAaUC/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEA\r
+        AWMBmQH/AQABYwGZAf8gAAGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
+        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/\r
+        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFj\r
+        AZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/yAAAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
         Af8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
-        AbkBzQH/ASQBZAGEAeMBAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZ\r
-        Af8BJgFiAYEB3yAAAX0BmQGkAeMBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/\r
-        AZABuQHNAf8BewGUAZ8B3wF9AZkBpAHjAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
-        Ac0B/wGQAbkBzQH/AXsBlAGfAd8BNgFeAXQBywEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/\r
-        AQABZAGZAf8BAAFkAZkB/wE8AV0BbgG/IAABcgGBAYkBywGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
-        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wFrAXcBfgG/AXIBgQGJAcsBkAG5Ac0B/wGQAbkBzQH/AZABuQHN\r
-        Af8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BawF3AX4BvwFCAUgBTAGAAQABZAGZAf8BAAFkAZkB/wEA\r
-        AWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AUIBSAFMAYAgAAFLAU4BTwGAAZABuQHNAf8BkAG5\r
-        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AUsBTgFPAYABSwFOAU8BgAGQAbkBzQH/\r
-        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wFLAU4BTwGAAxcBIAEMAWYBkQH3\r
-        AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BBAFiAZYB+wMUARwgAAMXASABiwGtAcEB9wGQ\r
-        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AY4BsQHGAfsCFAEVARwDFwEgAYsBrQHBAfcBkAG5\r
-        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGOAbEBxgH7AhQBFQEcBAABOwE+AT8BaAEAAWQBmQH/\r
-        AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AT0BQQFDAXAoAAE/AUABQQFoAZABuQHNAf8BkAG5Ac0B/wGQ\r
-        AbkBzQH/AZABuQHNAf8BQwFEAUUBcAgAAT8BQAFBAWgBkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5\r
-        Ac0B/wFDAUQBRQFwDAABNgE4ATkBXAE7AV0BbwHDATsBXQFvAcMBNgE4ATkBXDAAATkCOgFcAW0BfAGD\r
-        AcMBbQF8AYMBwwE5AjoBXBAAATkCOgFcAW0BfAGDAcMBbQF8AYMBwwE5AjoBXCkAAfIC/wEAAfIC/wEA\r
-        AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEA\r
-        AagC/wEAAagC/wEAAagC/wEAAagC/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHt\r
-        Af8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
-        Av8BAAHyAv8BAAHyAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGo\r
-        Av8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEi\r
-        ARoB7QH/IQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQABqAL/\r
-        AQABqAL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/ASIBGgHtAf8BIgEaAe0B/wEi\r
-        ARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/yEAAfIC/wEAAfIC/wEA\r
-        AfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEA\r
-        AagC/wEAAagC/wEAAagC/wEAAagC/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHt\r
-        Af8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHy\r
-        Av8BAAHyAv8BAAHyAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGo\r
-        Av8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEiARoB7QH/ASIBGgHtAf8BIgEaAe0B/wEi\r
-        ARoB7QH/IQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZ\r
-        Af8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEA\r
-        AWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZ\r
-        Af8BAAFkAZkB/wEAAWQBmQH/IQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEA\r
-        AWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZ\r
-        Af8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEA\r
-        AWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/IAABJAFkAYQB4wEAAWQBmQH/AQABZAGZAf8BAAFk\r
-        AZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEmAWIBgQHfASQBZAGEAeMBAAFkAZkB/wEAAWQBmQH/\r
-        AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BJgFiAYEB3wEkAWQBhAHjAQABZAGZAf8BAAFk\r
-        AZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/ASYBYgGBAd8gAAE2AV4BdAHLAQABZAGZ\r
-        Af8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/ATwBXQFuAb8BNgFeAXQBywEA\r
-        AWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wE8AV0BbgG/ATYBXgF0\r
-        AcsBAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BPAFdAW4BvyAA\r
-        AUIBSAFMAYABAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BQgFI\r
-        AUwBgAFCAUgBTAGAAQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/\r
-        AUIBSAFMAYABQgFIAUwBgAEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFk\r
-        AZkB/wFCAUgBTAGAIAADFwEgAQwBZgGRAfcBAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEE\r
-        AWIBlgH7AxQBHAMXASABDAFmAZEB9wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQQBYgGW\r
-        AfsDFAEcAxcBIAEMAWYBkQH3AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BBAFiAZYB+wMU\r
-        ARwkAAE7AT4BPwFoAQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BPQFBAUMBcAgAATsBPgE/\r
-        AWgBAAFkAZkB/wEAAWQBmQH/AQABZAGZAf8BAAFkAZkB/wE9AUEBQwFwCAABOwE+AT8BaAEAAWQBmQH/\r
-        AQABZAGZAf8BAAFkAZkB/wEAAWQBmQH/AT0BQQFDAXAsAAE2ATgBOQFcATsBXQFvAcMBOwFdAW8BwwE2\r
-        ATgBOQFcEAABNgE4ATkBXAE7AV0BbwHDATsBXQFvAcMBNgE4ATkBXBAAATYBOAE5AVwBOwFdAW8BwwE7\r
-        AV0BbwHDATYBOAE5AVwIAAFCAU0BPgcAAT4DAAEoAwABIAMAAScDAAEBAQABAQUAAZwXAAP/LQACgQIA\r
-        AsMDAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wIAAYEB/wKBAcMB/wLD\r
-        Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wOBAf8DwxYACw==\r
+        AbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BLwFiAX0B4wEAAWMBmQH/AQABYwGZ\r
+        Af8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEyAWEBeQHfIAABdgGMAZYB4wGQAbkBzQH/\r
+        AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wF1AYcBjwHfAXYBjAGWAeMBkAG5\r
+        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BdQGHAY8B3wFEAV0BawHL\r
+        AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AUkBWwFlAb8gAAFr\r
+        AXQBeAHLAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AWMBaQFu\r
+        Ab8BawF0AXgBywGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wFj\r
+        AWkBbgG/AUUBRwFIAYABAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZ\r
+        Af8BRQFHAUgBgCAAAkgBSQGAAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
+        AbkBzQH/AkgBSQGAAkgBSQGAAZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQ\r
+        AbkBzQH/AkgBSQGAAxcBIAESAWYBjQH3AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BBgFg\r
+        AZUB+wMUARwgAAMXASABiQGpAbwB9wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AY0BrQHD\r
+        AfsDFAEcAxcBIAGJAakBvAH3AZABuQHNAf8BkAG5Ac0B/wGQAbkBzQH/AZABuQHNAf8BjQGtAcMB+wMU\r
+        ARwEAAE8Aj0BaAEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AT8CQAFwKAACPQE+AWgBkAG5\r
+        Ac0B/wGQAbkBzQH/AZABuQHNAf8BkAG5Ac0B/wFAAkEBcAgAAj0BPgFoAZABuQHNAf8BkAG5Ac0B/wGQ\r
+        AbkBzQH/AZABuQHNAf8BQAJBAXAMAAE3AjgBXAFHAVsBZwHDAUcBWwFnAcMBNwI4AVwwAAM4AVwBZgFv\r
+        AXIBwwFmAW8BcgHDAzgBXBAAAzgBXAFmAW8BcgHDAWYBbwFyAcMDOAFcKQAB8gL/AQAB8gL/AQAB8gL/\r
+        AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/\r
+        AQABqAL/AQABqAL/AQABqAL/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEh\r
+        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
+        AfIC/wEAAfIC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEh\r
+        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
+        Af8hAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAHyAv8BAAGoAv8BAAGo\r
+        Av8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BAAGoAv8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
+        Af8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/IQAB8gL/AQAB8gL/AQAB8gL/\r
+        AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQAB8gL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/AQABqAL/\r
+        AQABqAL/AQABqAL/AQABqAL/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEh\r
+        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/yEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEAAfIC/wEA\r
+        AfIC/wEAAfIC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEAAagC/wEh\r
+        ARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHtAf8BIQEZAe0B/wEhARkB7QH/ASEBGQHt\r
+        Af8hAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEA\r
+        AWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZ\r
+        Af8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEA\r
+        AWMBmQH/AQABYwGZAf8hAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZ\r
+        Af8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEA\r
+        AWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZ\r
+        Af8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8gAAEvAWIBfQHjAQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/\r
+        AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/ATIBYQF5Ad8BLwFiAX0B4wEAAWMBmQH/AQABYwGZAf8BAAFj\r
+        AZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEyAWEBeQHfAS8BYgF9AeMBAAFjAZkB/wEAAWMBmQH/\r
+        AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BMgFhAXkB3yAAAUQBXQFrAcsBAAFjAZkB/wEA\r
+        AWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BSQFbAWUBvwFEAV0BawHLAQABYwGZ\r
+        Af8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AUkBWwFlAb8BRAFdAWsBywEA\r
+        AWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wFJAVsBZQG/IAABRQFH\r
+        AUgBgAEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wFFAUcBSAGA\r
+        AUUBRwFIAYABAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BRQFH\r
+        AUgBgAFFAUcBSAGAAQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/\r
+        AUUBRwFIAYAgAAMXASABEgFmAY0B9wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQYBYAGV\r
+        AfsDFAEcAxcBIAESAWYBjQH3AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BBgFgAZUB+wMU\r
+        ARwDFwEgARIBZgGNAfcBAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BAAFjAZkB/wEGAWABlQH7AxQBHCQA\r
+        ATwCPQFoAQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AQABYwGZAf8BPwJAAXAIAAE8Aj0BaAEAAWMBmQH/\r
+        AQABYwGZAf8BAAFjAZkB/wEAAWMBmQH/AT8CQAFwCAABPAI9AWgBAAFjAZkB/wEAAWMBmQH/AQABYwGZ\r
+        Af8BAAFjAZkB/wE/AkABcCwAATcCOAFcAUcBWwFnAcMBRwFbAWcBwwE3AjgBXBAAATcCOAFcAUcBWwFn\r
+        AcMBRwFbAWcBwwE3AjgBXBAAATcCOAFcAUcBWwFnAcMBRwFbAWcBwwE3AjgBXAgAAUIBTQE+BwABPgMA\r
+        ASgDAAEgAwABJwMAAQEBAAEBBQABnBcAA/8tAAKBAgACwwMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA\r
+        Af8DAAH/AwAB/wMAAf8DAAH/AgABgQH/AoEBwwH/AsMB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMA\r
+        Af8DAAH/AwAB/wMAAf8DAAH/A4EB/wPDCw==\r
 </value>\r
   </data>\r
-  <data name="toolTipAchievement.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  <metadata name="toolTipAchievement.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>1092, 26</value>\r
-  </data>\r
-  <data name="toolTipFighterPower.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
+  </metadata>\r
+  <metadata name="toolTipFighterPower.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>17, 39</value>\r
-  </data>\r
+  </metadata>\r
+  <metadata name="toolTipLoS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>189, 39</value>\r
+  </metadata>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAQAQEAAAAEAIAAoQAAARgAAACAgAAABACAAKBAAAG5AAAAYGAAAAQAgACgJAACWUAAAEBAAAAEA\r

diff --git a/KancolleSniffer/ShipInfo.cs b/KancolleSniffer/ShipInfo.cs
index 9f1ae61..4f1a72d 100644 (file)
--- a/KancolleSniffer/ShipInfo.cs
+++ b/KancolleSniffer/ShipInfo.cs
@@ -584,7 +584,7 @@ namespace KancolleSniffer
                 select s).OrderByDescending(s => s.RepairTime).ToArray();\r
 \r
 \r
-        public double GetLineOfSights(int fleet)\r
+        public double GetLineOfSights(int fleet, int factor)\r
         {\r
             var result = 0.0;\r
             var emptyBonus = 6;\r
@@ -596,7 +596,7 @@ namespace KancolleSniffer
                 {\r
                     var spec = item.Spec;\r
                     itemLoS += spec.LoS;\r
-                    result += (spec.LoS + item.LoSLevelBonus) * spec.LoSScaleFactor;\r
+                    result += (spec.LoS + item.LoSLevelBonus) * spec.LoSScaleFactor * factor;\r
                 }\r
                 result += Sqrt(s.LoS - itemLoS);\r
             }\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index 27939a1..a2e7532 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -512,7 +512,7 @@ namespace KancolleSniffer
 \r
         public double GetContactTriggerRate(int fleet) => _shipInfo.GetContactTriggerRate(fleet);\r
 \r
-        public double GetFleetLineOfSights(int fleet) => _shipInfo.GetLineOfSights(fleet);\r
+        public double GetFleetLineOfSights(int fleet, int factor) => _shipInfo.GetLineOfSights(fleet, factor);\r
 \r
         public ShipStatus[] RepairList => _shipInfo.GetRepairList(_dockInfo);\r
 \r

diff --git a/KancolleSniffer/TextGenerator.cs b/KancolleSniffer/TextGenerator.cs
index dc3f989..ccec31f 100644 (file)
--- a/KancolleSniffer/TextGenerator.cs
+++ b/KancolleSniffer/TextGenerator.cs
@@ -71,7 +71,7 @@ namespace KancolleSniffer
                                 select dict[item.Spec.Name] + ItemStatusString(item))).TrimEnd(' ') + "\r\n"));\r
                 var fp = sniffer.GetFighterPower(f);\r
                 sb.Append($"制空: {(fp[0] == fp[1] ? fp[0].ToString() : fp[0] + "～" + fp[1])} " +\r
-                          $"索敵: {sniffer.GetFleetLineOfSights(f):F1}\r\n");\r
+                          $"索敵: {sniffer.GetFleetLineOfSights(f, 1):F1}\r\n");\r
             }\r
             if (sniffer.BaseAirCorps != null)\r
             {\r