public Point Location { get; set; }\r
public Size Size { get; set; }\r
public bool ShipType { get; set; }\r
- public ShipListForm.SortOrder SortOrder { get; set; } = ShipListForm.SortOrder.ExpToNext;\r
+ public ListForm.SortOrder SortOrder { get; set; } = ListForm.SortOrder.ExpToNext;\r
public List<List<int>> ShipGroup { get; set; }\r
\r
public ShipListConfig()\r
public void InitializeValues()\r
{\r
NotifyConditions = new List<int>(new[] {40, 49});\r
- ResetHours = new List<int>(new int[] {2});\r
+ ResetHours = new List<int>(new[] {2});\r
}\r
\r
public void Load()\r
\r
namespace KancolleSniffer\r
{\r
- public class EquipPanel : Panel\r
+ public class FleetPanel : Panel\r
{\r
private const int LineHeight = 14;\r
private const int LabelHeight = 12;\r
var lbp = new Panel\r
{\r
Location = new Point(0, y),\r
- Size = new Size(ShipListForm.PanelWidth, LineHeight),\r
+ Size = new Size(ListForm.PanelWidth, LineHeight),\r
BackColor = ShipLabels.ColumnColors[(i + 1) % 2],\r
Visible = false\r
};\r
<SubType>Component</SubType>\r
</Compile>\r
<Compile Include="DockInfo.cs" />\r
- <Compile Include="EquipPanel.cs">\r
+ <Compile Include="FleetPanel.cs">\r
<SubType>Component</SubType>\r
</Compile>\r
<Compile Include="ExMapInfo.cs" />\r
<Compile Include="MiscTextInfo.cs" />\r
<Compile Include="MissingData.cs" />\r
<Compile Include="ShipLabels.cs" />\r
- <Compile Include="ShipListForm.cs">\r
+ <Compile Include="ListForm.cs">\r
<SubType>Form</SubType>\r
</Compile>\r
- <Compile Include="ShipListForm.Designer.cs">\r
- <DependentUpon>ShipListForm.cs</DependentUpon>\r
+ <Compile Include="ListForm.Designer.cs">\r
+ <DependentUpon>ListForm.cs</DependentUpon>\r
</Compile>\r
<Compile Include="MainForm.cs">\r
<SubType>Form</SubType>\r
<EmbeddedResource Include="ErrorDialog.resx">\r
<DependentUpon>ErrorDialog.cs</DependentUpon>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="ShipListForm.resx">\r
- <DependentUpon>ShipListForm.cs</DependentUpon>\r
+ <EmbeddedResource Include="ListForm.resx">\r
+ <DependentUpon>ListForm.cs</DependentUpon>\r
</EmbeddedResource>\r
<EmbeddedResource Include="MainForm.resx">\r
<DependentUpon>MainForm.cs</DependentUpon>\r
// Copyright (C) 2014 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
-// \r
+//\r
// Licensed under the Apache License, Version 2.0 (the "License");\r
// you may not use this file except in compliance with the License.\r
// You may obtain a copy of the License at\r
\r
namespace KancolleSniffer\r
{\r
- partial class ShipListForm\r
+ partial class ListForm\r
{\r
/// <summary>\r
/// Required designer variable.\r
private void InitializeComponent()\r
{\r
this.components = new System.ComponentModel.Container();\r
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShipListForm));\r
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ListForm));\r
this.panelShipList = new System.Windows.Forms.Panel();\r
this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);\r
this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
this.contextMenuStripShipList = new System.Windows.Forms.ContextMenuStrip(this.components);\r
this.csvToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
this.kantaiSarashiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
- this.equipPanel = new KancolleSniffer.EquipPanel();\r
+ this.equipPanel = new KancolleSniffer.FleetPanel();\r
this.itemTreeView = new KancolleSniffer.ItemTreeView();\r
this.contextMenuStrip.SuspendLayout();\r
this.panelGroupHeader.SuspendLayout();\r
private System.Windows.Forms.Label label5;\r
private System.Windows.Forms.Label label11;\r
private System.Windows.Forms.Panel panelItemHeader;\r
- private EquipPanel equipPanel;\r
+ private FleetPanel equipPanel;\r
private ItemTreeView itemTreeView;\r
private System.Windows.Forms.RichTextBox richTextBoxMiscText;\r
private System.Windows.Forms.ContextMenuStrip contextMenuStrip;\r
\r
namespace KancolleSniffer\r
{\r
- public partial class ShipListForm : Form\r
+ public partial class ListForm : Form\r
{\r
private readonly Sniffer _sniffer;\r
private readonly Config _config;\r
Repair\r
}\r
\r
- public ShipListForm(Sniffer sniffer, Config config)\r
+ public ListForm(Sniffer sniffer, Config config)\r
{\r
InitializeComponent();\r
_sniffer = sniffer;\r
\r
private void CreateShipList()\r
{\r
- var ships = InRepairList ? _sniffer.DamagedShipList : FilterByGroup(_sniffer.ShipList).ToArray();\r
+ var ships = InRepairList ? _sniffer.RepairList : FilterByGroup(_sniffer.ShipList).ToArray();\r
var order = InRepairList ? SortOrder.Repair : _config.ShipList.SortOrder;\r
if (!_config.ShipList.ShipType)\r
{\r
this.labelBucketHistory = new System.Windows.Forms.Label();\r
this.label36 = new System.Windows.Forms.Label();\r
this.labelMaterialHistoryButton = new System.Windows.Forms.Label();\r
- this.panelDamagedShipList = new System.Windows.Forms.Panel();\r
- this.labelDamgedShipListButton = new System.Windows.Forms.Label();\r
+ this.panelRepairList = new System.Windows.Forms.Panel();\r
+ this.labelRepairListButton = new System.Windows.Forms.Label();\r
this.label31 = new System.Windows.Forms.Label();\r
this.imageListFuelSq = new System.Windows.Forms.ImageList(this.components);\r
this.labelFuelSq1 = new System.Windows.Forms.Label();\r
this.labelMaterialHistoryButton.TabIndex = 10;\r
this.labelMaterialHistoryButton.Click += new System.EventHandler(this.labelMaterialHistoryButton_Click);\r
// \r
- // panelDamagedShipList\r
+ // panelRepairList\r
// \r
- this.panelDamagedShipList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
- this.panelDamagedShipList.Location = new System.Drawing.Point(6, 207);\r
- this.panelDamagedShipList.Name = "panelDamagedShipList";\r
- this.panelDamagedShipList.Size = new System.Drawing.Size(129, 19);\r
- this.panelDamagedShipList.TabIndex = 44;\r
- this.panelDamagedShipList.Visible = false;\r
- this.panelDamagedShipList.Click += new System.EventHandler(this.panelDamagedShipList_Click);\r
+ this.panelRepairList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+ this.panelRepairList.Location = new System.Drawing.Point(6, 207);\r
+ this.panelRepairList.Name = "panelRepairList";\r
+ this.panelRepairList.Size = new System.Drawing.Size(129, 19);\r
+ this.panelRepairList.TabIndex = 44;\r
+ this.panelRepairList.Visible = false;\r
+ this.panelRepairList.Click += new System.EventHandler(this.panelRepairList_Click);\r
// \r
- // labelDamgedShipListButton\r
+ // labelRepairListButton\r
// \r
- this.labelDamgedShipListButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
- this.labelDamgedShipListButton.Image = ((System.Drawing.Image)(resources.GetObject("labelDamgedShipListButton.Image")));\r
- this.labelDamgedShipListButton.Location = new System.Drawing.Point(121, 193);\r
- this.labelDamgedShipListButton.Name = "labelDamgedShipListButton";\r
- this.labelDamgedShipListButton.Size = new System.Drawing.Size(14, 14);\r
- this.labelDamgedShipListButton.TabIndex = 45;\r
- this.labelDamgedShipListButton.Click += new System.EventHandler(this.labelDamgedShipListButton_Click);\r
+ this.labelRepairListButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+ this.labelRepairListButton.Image = ((System.Drawing.Image)(resources.GetObject("labelRepairListButton.Image")));\r
+ this.labelRepairListButton.Location = new System.Drawing.Point(121, 193);\r
+ this.labelRepairListButton.Name = "labelRepairListButton";\r
+ this.labelRepairListButton.Size = new System.Drawing.Size(14, 14);\r
+ this.labelRepairListButton.TabIndex = 45;\r
+ this.labelRepairListButton.Click += new System.EventHandler(this.labelRepairListButton_Click);\r
// \r
// label31\r
// \r
this.label31.Size = new System.Drawing.Size(41, 12);\r
this.label31.TabIndex = 46;\r
this.label31.Text = "要修復";\r
- this.label31.Click += new System.EventHandler(this.labelDamgedShipListButton_Click);\r
+ this.label31.Click += new System.EventHandler(this.labelRepairListButton_Click);\r
// \r
// imageListFuelSq\r
// \r
this.Controls.Add(this.labelFuelSq2);\r
this.Controls.Add(this.labelBullSq1);\r
this.Controls.Add(this.labelFuelSq1);\r
- this.Controls.Add(this.labelDamgedShipListButton);\r
- this.Controls.Add(this.panelDamagedShipList);\r
+ this.Controls.Add(this.labelRepairListButton);\r
+ this.Controls.Add(this.panelRepairList);\r
this.Controls.Add(this.label31);\r
this.Controls.Add(this.labelMaterialHistoryButton);\r
this.Controls.Add(this.label36);\r
private System.Windows.Forms.Label labelFuelHistory;\r
private System.Windows.Forms.Label label36;\r
private System.Windows.Forms.Label labelMaterialHistoryButton;\r
- private System.Windows.Forms.Panel panelDamagedShipList;\r
- private System.Windows.Forms.Label labelDamgedShipListButton;\r
+ private System.Windows.Forms.Panel panelRepairList;\r
+ private System.Windows.Forms.Label labelRepairListButton;\r
private System.Windows.Forms.Label label31;\r
private System.Windows.Forms.ContextMenuStrip contextMenuStripNotifyIcon;\r
private System.Windows.Forms.ToolStripMenuItem NotifyIconOpenToolStripMenuItem;\r
private bool _combinedFleet;\r
private readonly Label[] _labelCheckFleets;\r
private readonly ShipLabels _shipLabels;\r
- private readonly ShipListForm _shipListForm;\r
+ private readonly ListForm _listForm;\r
private readonly NoticeQueue _noticeQueue;\r
private bool _started;\r
private string _debugLogFile;\r
SetupFleetClick();\r
_shipLabels = new ShipLabels();\r
_shipLabels.CreateAkashiTimers(panelShipInfo);\r
- _shipLabels.CreateLabels(panelShipInfo, ShowShipOnShipList);\r
+ _shipLabels.CreateShipLabels(panelShipInfo, ShowShipOnShipList);\r
_shipLabels.CreateCombinedShipLabels(panelCombinedFleet, ShowShipOnShipList);\r
- _shipLabels.CreateDamagedShipList(panelDamagedShipList, panelDamagedShipList_Click);\r
+ _shipLabels.CreateRepairList(panelRepairList, panelRepairList_Click);\r
_shipLabels.CreateNDockLabels(panelDock, labelNDock_Click);\r
labelPresetAkashiTimer.BackColor = ShipLabels.ColumnColors[1];\r
- _shipListForm = new ShipListForm(_sniffer, _config) {Owner = this};\r
+ _listForm = new ListForm(_sniffer, _config) {Owner = this};\r
_noticeQueue = new NoticeQueue(Ring);\r
_config.Load();\r
PerformZoom();\r
if (_config.Zoom == 100)\r
return;\r
var prev = CurrentAutoScaleDimensions;\r
- foreach (var control in new Control[] {this, _shipListForm, labelLogin, labelGuide})\r
+ foreach (var control in new Control[] {this, _listForm, labelLogin, labelGuide})\r
control.Font = new Font(control.Font.FontFamily, control.Font.Size * _config.Zoom / 100);\r
ShipLabel.LatinFont = new Font("Tahoma", 8f * _config.Zoom / 100);\r
var cur = CurrentAutoScaleDimensions;\r
\r
private void ApplyConfig()\r
{\r
- _shipListForm.TopMost = TopMost = _config.TopMost;\r
+ _listForm.TopMost = TopMost = _config.TopMost;\r
_sniffer.Item.MarginShips = _config.MarginShips;\r
_sniffer.Item.MarginEquips = _config.MarginEquips;\r
_sniffer.Achievement.ResetHours = _config.ResetHours;\r
\r
private void ShowShipOnShipList(object sender, EventArgs ev)\r
{\r
- if (!_shipListForm.Visible)\r
+ if (!_listForm.Visible)\r
return;\r
var idx = (int)((Control)sender).Tag;\r
var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
if (statuses.Length <= idx)\r
return;\r
- _shipListForm.ShowShip(statuses[idx].Id);\r
+ _listForm.ShowShip(statuses[idx].Id);\r
}\r
\r
private void UpdateItemInfo()\r
"今月 " + _sniffer.Achievement.ValueOfMonth.ToString("F1") + "\n" +\r
"EO " + _sniffer.ExMap.Achievement);\r
UpdateMaterialHistry();\r
- if (_shipListForm.Visible)\r
- _shipListForm.UpdateList();\r
+ if (_listForm.Visible)\r
+ _listForm.UpdateList();\r
}\r
\r
private void UpdateNumOfShips()\r
UpdatePanelShipInfo();\r
NotifyDamagedShip();\r
UpdateChargeInfo();\r
- UpdateDamagedShipList();\r
- if (_shipListForm.Visible)\r
- _shipListForm.UpdateList();\r
+ UpdateRepairList();\r
+ if (_listForm.Visible)\r
+ _listForm.UpdateList();\r
}\r
\r
private void UpdatePanelShipInfo()\r
{\r
var statuses = _sniffer.GetShipStatuses(_currentFleet);\r
- _shipLabels.SetShipInfo(statuses);\r
+ _shipLabels.SetShipLabels(statuses);\r
if (_sniffer.CombinedFleetType == 0)\r
_combinedFleet = false;\r
labelFleet1.Text = _combinedFleet ? "連合" : "第一";\r
panelCombinedFleet.Visible = _combinedFleet;\r
if (_combinedFleet)\r
- _shipLabels.SetCombinedShipInfo(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
+ _shipLabels.SetCombinedShipLabels(_sniffer.GetShipStatuses(0), _sniffer.GetShipStatuses(1));\r
UpdateAkashiTimer();\r
UpdateFighterPower();\r
UpdateLoS();\r
}\r
}\r
\r
- private void UpdateDamagedShipList()\r
+ private void UpdateRepairList()\r
{\r
- _shipLabels.SetDamagedShipList(_sniffer.DamagedShipList);\r
+ _shipLabels.SetRepairList(_sniffer.RepairList);\r
}\r
\r
private void UpdateQuestList()\r
UpdateItemInfo();\r
}\r
\r
- private void labelDamgedShipListButton_Click(object sender, EventArgs e)\r
+ private void labelRepairListButton_Click(object sender, EventArgs e)\r
{\r
- if (panelDamagedShipList.Visible)\r
+ if (panelRepairList.Visible)\r
{\r
- panelDamagedShipList.Visible = false;\r
- labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+ panelRepairList.Visible = false;\r
+ labelRepairListButton.BackColor = DefaultBackColor;\r
}\r
else\r
{\r
- panelDamagedShipList.Visible = true;\r
- panelDamagedShipList.BringToFront();\r
- labelDamgedShipListButton.BackColor = SystemColors.ActiveCaption;\r
+ panelRepairList.Visible = true;\r
+ panelRepairList.BringToFront();\r
+ labelRepairListButton.BackColor = SystemColors.ActiveCaption;\r
}\r
}\r
\r
- private void panelDamagedShipList_Click(object sender, EventArgs e)\r
+ private void panelRepairList_Click(object sender, EventArgs e)\r
{\r
- panelDamagedShipList.Visible = false;\r
- labelDamgedShipListButton.BackColor = DefaultBackColor;\r
+ panelRepairList.Visible = false;\r
+ labelRepairListButton.BackColor = DefaultBackColor;\r
}\r
\r
private void ShipListToolStripMenuItem_Click(object sender, EventArgs e)\r
{\r
- _shipListForm.UpdateList();\r
- _shipListForm.Show();\r
- if (_shipListForm.WindowState == FormWindowState.Minimized)\r
- _shipListForm.WindowState = FormWindowState.Normal;\r
- _shipListForm.Activate();\r
+ _listForm.UpdateList();\r
+ _listForm.Show();\r
+ if (_listForm.WindowState == FormWindowState.Minimized)\r
+ _listForm.WindowState = FormWindowState.Normal;\r
+ _listForm.Activate();\r
}\r
\r
private void LogToolStripMenuItem_Click(object sender, EventArgs e)\r
h2GHd/wlVSVtUVWOLbxy2cIrny1olragaTawAaZHH+EhWPx/AAAAAElFTkSuQmCC\r
</value>\r
</data>\r
- <metadata name="timerMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <data name="timerMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>17, 17</value>\r
- </metadata>\r
- <metadata name="notifyIconMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ </data>\r
+ <data name="notifyIconMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>129, 17</value>\r
- </metadata>\r
- <metadata name="contextMenuStripNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ </data>\r
+ <data name="contextMenuStripNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>577, 26</value>\r
- </metadata>\r
+ </data>\r
<data name="notifyIconMain.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
<value>\r
AAABAAQAQEAAAAEAIAAoQAAARgAAACAgAAABACAAKBAAAG5AAAAYGAAAAQAgACgJAACWUAAAEBAAAAEA\r
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\r
</value>\r
</data>\r
- <metadata name="contextMenuStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <data name="contextMenuStripMain.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>269, 17</value>\r
- </metadata>\r
- <metadata name="imageListMisc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ </data>\r
+ <data name="imageListMisc.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>449, 23</value>\r
- </metadata>\r
+ </data>\r
<data name="imageListMisc.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
<value>\r
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABI\r
- BwAAAk1TRnQBSQFMAwEBAAEgAQEBIAEBAQUBAAENAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
+ BwAAAk1TRnQBSQFMAwEBAAEgAQEBJAEBAQUBAAENAQAE/wEJARAI/wFCAU0BNgEEBgABNgEEAgABKAMA\r
ARQDAAENAwABAQEAAQgFAAEEAQEYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA\r
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5\r
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA\r
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAfATAAEOAfMTAAEV\r
Af8TAAHsFAABBxQAAfITAAESEwAB8hIAAQcSAAHsEgABFQH/EQABDgHzEgAB8BMAAUIBTQE+BwABPgMA\r
ASgDAAEUAwABDQMAAQEBAAEBBQABNBcAA/8BAAF4AwABOAMAARgDAAEYAwABCA8AAQgDAAEYAwABGAMA\r
- ATgDAAF4AwAL\r
+ ATgDAAF4GQAL\r
</value>\r
</data>\r
<data name="labelMaterialHistoryButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
h2GHd/wlVSVtUVWOLbxy2cIrny1olragaTawAaZHH+EhWPx/AAAAAElFTkSuQmCC\r
</value>\r
</data>\r
- <data name="labelDamgedShipListButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+ <data name="labelRepairListButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
<value>\r
iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
YQUAAAAJcEhZcwAAFxEAABcRAcom8z8AAAA9SURBVChTdYxBDgAgCMP2NH/u05SRzEyFJrtAWgQztprx\r
h2GHd/wlVSVtUVWOLbxy2cIrny1olragaTawAaZHH+EhWPx/AAAAAElFTkSuQmCC\r
</value>\r
</data>\r
- <metadata name="imageListFuelSq.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <data name="imageListFuelSq.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>796, 26</value>\r
- </metadata>\r
+ </data>\r
<data name="imageListFuelSq.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
<value>\r
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm\r
- GAAAAk1TRnQBSQFMAgEBCgEAARgBAAEYAQABCAEAAQ0BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg\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
AYMBUQH/ATIBgwFRAf8BMgGDAVEB/wEyAYMBUQH/ATIBgwFRAf8BMgGDAVEB/wFCAU0BPgcAAT4DAAEo\r
AwABIAMAAScDAAEBAQABAQUAAZwXAAP/NgAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/\r
AwAB/wMAAf8DAAH/AwAB/wIAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/\r
- AwAB/wMAAf8DAAs=\r
+ AwAB/wMAAf8ZAAs=\r
</value>\r
</data>\r
- <metadata name="imageListBullSq.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <data name="imageListBullSq.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>945, 26</value>\r
- </metadata>\r
+ </data>\r
<data name="imageListBullSq.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">\r
<value>\r
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w\r
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADs\r
- FgAAAk1TRnQBSQFMAgEBCgEAARABAAEQAQABCAEAAQ0BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAEg\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
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/wOBAf8Dwws=\r
+ Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wOBAf8DwxYACw==\r
</value>\r
</data>\r
- <metadata name="toolTipAchievement.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ <data name="toolTipAchievement.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>1092, 26</value>\r
- </metadata>\r
- <metadata name="toolTipFighterPower.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+ </data>\r
+ <data name="toolTipFighterPower.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
<value>17, 39</value>\r
- </metadata>\r
+ </data>\r
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
<value>\r
AAABAAQAQEAAAAEAIAAoQAAARgAAACAgAAABACAAKBAAAG5AAAAYGAAAAQAgACgJAACWUAAAEBAAAAEA\r
ship.Slot.Zip(ship.OnSlot, (slot, onslot) =>\r
slot.Spec.ContactTriggerRate * slot.Spec.LoS * Sqrt(onslot))).Sum();\r
\r
- public ShipStatus[] GetDamagedShipList(DockInfo dockInfo)\r
+ public ShipStatus[] GetRepairList(DockInfo dockInfo)\r
=> (from s in ShipList\r
where s.NowHp < s.MaxHp && !dockInfo.InNDock(s.Id)\r
select s).OrderByDescending(s => s.RepairTime).ToArray();\r
private readonly ShipLabel[][] _labels = new ShipLabel[ShipInfo.MemberCount][];\r
private readonly ShipLabel[][] _combinedLabels = new ShipLabel[ShipInfo.MemberCount * 2][];\r
private readonly ShipLabel[] _akashiTimers = new ShipLabel[ShipInfo.MemberCount];\r
- private readonly ShipLabel[][] _damagedShipList = new ShipLabel[16][];\r
- private Control _panelDamagedShipList;\r
+ private readonly ShipLabel[][] _repairList = new ShipLabel[16][];\r
+ private Control _panelRepairList;\r
private readonly ShipLabel[][] _ndockLabels = new ShipLabel[DockInfo.DockCount][];\r
public static Color[] ColumnColors = {SystemColors.Control, Color.FromArgb(255, 250, 250, 250)};\r
\r
- public void CreateLabels(Control parent, EventHandler onClick)\r
+ public void CreateShipLabels(Control parent, EventHandler onClick)\r
{\r
parent.SuspendLayout();\r
const int top = 3, height = 12, lh = 16;\r
parent.ResumeLayout();\r
}\r
\r
- public void SetShipInfo(ShipStatus[] statuses)\r
+ public void SetShipLabels(ShipStatus[] statuses)\r
{\r
for (var i = 0; i < _labels.Length; i++)\r
{\r
parent.ResumeLayout();\r
}\r
\r
- public void SetCombinedShipInfo(ShipStatus[] first, ShipStatus[] second)\r
+ public void SetCombinedShipLabels(ShipStatus[] first, ShipStatus[] second)\r
{\r
for (var i = 0; i < _combinedLabels.Length; i++)\r
{\r
{"朝潮改二丁", "朝潮改二"}\r
};\r
\r
- public void CreateDamagedShipList(Control parent, EventHandler onClick)\r
+ public void CreateRepairList(Control parent, EventHandler onClick)\r
{\r
parent.SuspendLayout();\r
- for (var i = 0; i < _damagedShipList.Length; i++)\r
+ for (var i = 0; i < _repairList.Length; i++)\r
{\r
var y = 3 + i * 16;\r
const int height = 12;\r
- parent.Controls.AddRange(_damagedShipList[i] = new[]\r
+ parent.Controls.AddRange(_repairList[i] = new[]\r
{\r
new ShipLabel {Location = new Point(0, y), Size = new Size(11, height)},\r
new ShipLabel {Location = new Point(119, y), Size = new Size(5, height - 1)},\r
new ShipLabel {Location = new Point(9, y), AutoSize = true},\r
new ShipLabel {Location = new Point(0, y - 2), Size = new Size(parent.Width, height + 3)}\r
});\r
- foreach (var label in _damagedShipList[i])\r
+ foreach (var label in _repairList[i])\r
{\r
label.Scale();\r
label.PresetColor = label.BackColor = ColumnColors[(i + 1) % 2];\r
label.Click += onClick;\r
}\r
}\r
- _panelDamagedShipList = parent;\r
+ _panelRepairList = parent;\r
parent.ResumeLayout();\r
}\r
\r
- public void SetDamagedShipList(ShipStatus[] list)\r
+ public void SetRepairList(ShipStatus[] list)\r
{\r
const int fleet = 0, name = 3, time = 2, damage = 1;\r
- var parent = _panelDamagedShipList;\r
- var num = Min(list.Length, _damagedShipList.Length);\r
+ var parent = _panelRepairList;\r
+ var num = Min(list.Length, _repairList.Length);\r
if (num == 0)\r
{\r
parent.Size = new Size(parent.Width, (int)Round(ShipLabel.ScaleFactor.Height * 19));\r
- var labels = _damagedShipList[0];\r
+ var labels = _repairList[0];\r
labels[fleet].Text = "";\r
labels[name].SetName("なし");\r
labels[time].Text = "";\r
for (var i = 0; i < num; i++)\r
{\r
var s = list[i];\r
- var labels = _damagedShipList[i];\r
+ var labels = _repairList[i];\r
labels[fleet].SetFleet(s);\r
labels[name].SetName(s, new Dictionary<string, string>\r
{\r
\r
public double GetFleetLineOfSights(int fleet) => _shipInfo.GetLineOfSights(fleet);\r
\r
- public ShipStatus[] DamagedShipList => _shipInfo.GetDamagedShipList(_dockInfo);\r
+ public ShipStatus[] RepairList => _shipInfo.GetRepairList(_dockInfo);\r
\r
public ShipStatus[] ShipList => _shipInfo.ShipList;\r
\r
OSDN Git Service
