diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/1bf02bc5-d4d0-4eab-a92e-2acf2816d61c.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/1bf02bc5-d4d0-4eab-a92e-2acf2816d61c.vsidx deleted file mode 100644 index 12bab58..0000000 Binary files a/MotorShip/.vs/MotorShip/FileContentIndex/1bf02bc5-d4d0-4eab-a92e-2acf2816d61c.vsidx and /dev/null differ diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/4a4960fc-1c41-4c34-9772-2697d388c5ae.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/4a4960fc-1c41-4c34-9772-2697d388c5ae.vsidx new file mode 100644 index 0000000..e3cef87 Binary files /dev/null and b/MotorShip/.vs/MotorShip/FileContentIndex/4a4960fc-1c41-4c34-9772-2697d388c5ae.vsidx differ diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/5960edb1-8d18-4cf4-8d27-babe279160fd.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/5960edb1-8d18-4cf4-8d27-babe279160fd.vsidx new file mode 100644 index 0000000..6ab0fff Binary files /dev/null and b/MotorShip/.vs/MotorShip/FileContentIndex/5960edb1-8d18-4cf4-8d27-babe279160fd.vsidx differ diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/96b7b0a0-bc2c-4c12-b9b5-b2a15d7fbecd.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/96b7b0a0-bc2c-4c12-b9b5-b2a15d7fbecd.vsidx new file mode 100644 index 0000000..b60dec0 Binary files /dev/null and b/MotorShip/.vs/MotorShip/FileContentIndex/96b7b0a0-bc2c-4c12-b9b5-b2a15d7fbecd.vsidx differ diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/d34d53e3-4a93-47fa-a7c0-180334cd1924.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/d34d53e3-4a93-47fa-a7c0-180334cd1924.vsidx deleted file mode 100644 index a1cf8f3..0000000 Binary files a/MotorShip/.vs/MotorShip/FileContentIndex/d34d53e3-4a93-47fa-a7c0-180334cd1924.vsidx and /dev/null differ diff --git a/MotorShip/.vs/MotorShip/FileContentIndex/df361c03-3539-4482-9dc5-759c4a48a1d1.vsidx b/MotorShip/.vs/MotorShip/FileContentIndex/df361c03-3539-4482-9dc5-759c4a48a1d1.vsidx deleted file mode 100644 index 5ca386d..0000000 Binary files a/MotorShip/.vs/MotorShip/FileContentIndex/df361c03-3539-4482-9dc5-759c4a48a1d1.vsidx and /dev/null differ diff --git a/MotorShip/.vs/WarmlyShip/v17/.suo b/MotorShip/.vs/WarmlyShip/v17/.suo index 6e74cc6..2b3fc33 100644 Binary files a/MotorShip/.vs/WarmlyShip/v17/.suo and b/MotorShip/.vs/WarmlyShip/v17/.suo differ diff --git a/MotorShip/MotorShip/FormShipCollection.Designer.cs b/MotorShip/MotorShip/FormShipCollection.Designer.cs index d9a2e99..116c0b3 100644 --- a/MotorShip/MotorShip/FormShipCollection.Designer.cs +++ b/MotorShip/MotorShip/FormShipCollection.Designer.cs @@ -30,35 +30,76 @@ { this.pictureBoxCollection = new System.Windows.Forms.PictureBox(); this.panelCollection = new System.Windows.Forms.Panel(); - this.labelCollection = new System.Windows.Forms.Label(); - this.buttonAddShip = new System.Windows.Forms.Button(); - this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox(); - this.buttonRemoveShip = new System.Windows.Forms.Button(); this.buttonRefreshCollection = new System.Windows.Forms.Button(); + this.buttonRemoveShip = new System.Windows.Forms.Button(); + this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox(); + this.buttonAddShip = new System.Windows.Forms.Button(); + this.labelCollection = new System.Windows.Forms.Label(); + this.groupBoxSets = new System.Windows.Forms.GroupBox(); + this.textBoxStorageName = new System.Windows.Forms.TextBox(); + this.buttonnAddObject = new System.Windows.Forms.Button(); + this.listBoxStorages = new System.Windows.Forms.ListBox(); + this.buttonDelObject = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit(); this.panelCollection.SuspendLayout(); + this.groupBoxSets.SuspendLayout(); this.SuspendLayout(); // // pictureBoxCollection // this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0); this.pictureBoxCollection.Name = "pictureBoxCollection"; - this.pictureBoxCollection.Size = new System.Drawing.Size(700, 453); + this.pictureBoxCollection.Size = new System.Drawing.Size(864, 536); this.pictureBoxCollection.TabIndex = 0; this.pictureBoxCollection.TabStop = false; // // panelCollection // + this.panelCollection.Controls.Add(this.groupBoxSets); this.panelCollection.Controls.Add(this.buttonRefreshCollection); this.panelCollection.Controls.Add(this.buttonRemoveShip); this.panelCollection.Controls.Add(this.maskedTextBoxNumber); this.panelCollection.Controls.Add(this.buttonAddShip); this.panelCollection.Controls.Add(this.labelCollection); - this.panelCollection.Location = new System.Drawing.Point(699, 0); + this.panelCollection.Location = new System.Drawing.Point(870, 0); this.panelCollection.Name = "panelCollection"; - this.panelCollection.Size = new System.Drawing.Size(218, 453); + this.panelCollection.Size = new System.Drawing.Size(218, 536); this.panelCollection.TabIndex = 1; // + // buttonRefreshCollection + // + this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 482); + this.buttonRefreshCollection.Name = "buttonRefreshCollection"; + this.buttonRefreshCollection.Size = new System.Drawing.Size(171, 40); + this.buttonRefreshCollection.TabIndex = 4; + this.buttonRefreshCollection.Text = "Обновить коллекцию"; + this.buttonRefreshCollection.UseVisualStyleBackColor = true; + // + // buttonRemoveShip + // + this.buttonRemoveShip.Location = new System.Drawing.Point(16, 424); + this.buttonRemoveShip.Name = "buttonRemoveShip"; + this.buttonRemoveShip.Size = new System.Drawing.Size(171, 40); + this.buttonRemoveShip.TabIndex = 3; + this.buttonRemoveShip.Text = "Удалить теплоход"; + this.buttonRemoveShip.UseVisualStyleBackColor = true; + // + // maskedTextBoxNumber + // + this.maskedTextBoxNumber.Location = new System.Drawing.Point(16, 375); + this.maskedTextBoxNumber.Name = "maskedTextBoxNumber"; + this.maskedTextBoxNumber.Size = new System.Drawing.Size(171, 27); + this.maskedTextBoxNumber.TabIndex = 2; + // + // buttonAddShip + // + this.buttonAddShip.Location = new System.Drawing.Point(16, 309); + this.buttonAddShip.Name = "buttonAddShip"; + this.buttonAddShip.Size = new System.Drawing.Size(171, 40); + this.buttonAddShip.TabIndex = 1; + this.buttonAddShip.Text = "Добавить теплоход"; + this.buttonAddShip.UseVisualStyleBackColor = true; + // // labelCollection // this.labelCollection.AutoSize = true; @@ -68,45 +109,58 @@ this.labelCollection.TabIndex = 0; this.labelCollection.Text = "Инструменты"; // - // buttonAddShip + // groupBoxSets // - this.buttonAddShip.Location = new System.Drawing.Point(16, 38); - this.buttonAddShip.Name = "buttonAddShip"; - this.buttonAddShip.Size = new System.Drawing.Size(171, 40); - this.buttonAddShip.TabIndex = 1; - this.buttonAddShip.Text = "Добавить теплоход"; - this.buttonAddShip.UseVisualStyleBackColor = true; + this.groupBoxSets.Controls.Add(this.buttonDelObject); + this.groupBoxSets.Controls.Add(this.listBoxStorages); + this.groupBoxSets.Controls.Add(this.buttonnAddObject); + this.groupBoxSets.Controls.Add(this.textBoxStorageName); + this.groupBoxSets.Location = new System.Drawing.Point(12, 42); + this.groupBoxSets.Name = "groupBoxSets"; + this.groupBoxSets.Size = new System.Drawing.Size(199, 242); + this.groupBoxSets.TabIndex = 5; + this.groupBoxSets.TabStop = false; + this.groupBoxSets.Text = "Наборы"; // - // maskedTextBoxNumber + // textBoxStorageName // - this.maskedTextBoxNumber.Location = new System.Drawing.Point(16, 117); - this.maskedTextBoxNumber.Name = "maskedTextBoxNumber"; - this.maskedTextBoxNumber.Size = new System.Drawing.Size(171, 27); - this.maskedTextBoxNumber.TabIndex = 2; + this.textBoxStorageName.Location = new System.Drawing.Point(0, 26); + this.textBoxStorageName.Name = "textBoxStorageName"; + this.textBoxStorageName.Size = new System.Drawing.Size(193, 27); + this.textBoxStorageName.TabIndex = 0; // - // buttonRemoveShip + // buttonnAddObject // - this.buttonRemoveShip.Location = new System.Drawing.Point(16, 166); - this.buttonRemoveShip.Name = "buttonRemoveShip"; - this.buttonRemoveShip.Size = new System.Drawing.Size(171, 40); - this.buttonRemoveShip.TabIndex = 3; - this.buttonRemoveShip.Text = "Удалить теплоход"; - this.buttonRemoveShip.UseVisualStyleBackColor = true; + this.buttonnAddObject.Location = new System.Drawing.Point(4, 71); + this.buttonnAddObject.Name = "buttonnAddObject"; + this.buttonnAddObject.Size = new System.Drawing.Size(189, 29); + this.buttonnAddObject.TabIndex = 1; + this.buttonnAddObject.Text = "Добавить набор"; + this.buttonnAddObject.UseVisualStyleBackColor = true; // - // buttonRefreshCollection + // listBoxStorages // - this.buttonRefreshCollection.Location = new System.Drawing.Point(16, 239); - this.buttonRefreshCollection.Name = "buttonRefreshCollection"; - this.buttonRefreshCollection.Size = new System.Drawing.Size(171, 40); - this.buttonRefreshCollection.TabIndex = 4; - this.buttonRefreshCollection.Text = "Обновить коллекцию"; - this.buttonRefreshCollection.UseVisualStyleBackColor = true; + this.listBoxStorages.FormattingEnabled = true; + this.listBoxStorages.ItemHeight = 20; + this.listBoxStorages.Location = new System.Drawing.Point(6, 117); + this.listBoxStorages.Name = "listBoxStorages"; + this.listBoxStorages.Size = new System.Drawing.Size(187, 84); + this.listBoxStorages.TabIndex = 2; + // + // buttonDelObject + // + this.buttonDelObject.Location = new System.Drawing.Point(6, 207); + this.buttonDelObject.Name = "buttonDelObject"; + this.buttonDelObject.Size = new System.Drawing.Size(187, 29); + this.buttonDelObject.TabIndex = 3; + this.buttonDelObject.Text = "Удалить набор"; + this.buttonDelObject.UseVisualStyleBackColor = true; // // FormShipCollection // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(918, 453); + this.ClientSize = new System.Drawing.Size(1093, 534); this.Controls.Add(this.panelCollection); this.Controls.Add(this.pictureBoxCollection); this.Name = "FormShipCollection"; @@ -114,6 +168,8 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit(); this.panelCollection.ResumeLayout(false); this.panelCollection.PerformLayout(); + this.groupBoxSets.ResumeLayout(false); + this.groupBoxSets.PerformLayout(); this.ResumeLayout(false); } @@ -127,5 +183,10 @@ private MaskedTextBox maskedTextBoxNumber; private Button buttonAddShip; private Label labelCollection; + private GroupBox groupBoxSets; + private Button buttonDelObject; + private ListBox listBoxStorages; + private Button buttonnAddObject; + private TextBox textBoxStorageName; } } \ No newline at end of file diff --git a/MotorShip/MotorShip/SetGeneric.cs b/MotorShip/MotorShip/SetGeneric.cs index 57d8652..cca61a3 100644 --- a/MotorShip/MotorShip/SetGeneric.cs +++ b/MotorShip/MotorShip/SetGeneric.cs @@ -9,89 +9,75 @@ namespace WarmlyShip.Generics internal class SetGeneric where T : class { - /// - /// Массив объектов, которые храним - /// - private readonly T?[] _places; - /// - /// Количество объектов в массиве - /// - public int Count => _places.Length; - /// - /// Конструктор - /// - /// + private readonly List _places; + public int Count => _places.Count; + private readonly int _maxCount; public SetGeneric(int count) { - _places = new T?[count]; + _maxCount = count; + _places = new List(count); } - /// - /// Добавление объекта в набор - /// - /// Добавляемый теплоход - /// - public int Insert(T warmlyship) + public bool Insert(T warmlyship) { - return Insert(warmlyship, 0); + if (_places.Count == _maxCount) + { + return false; + } + Insert(warmlyship, 0); + return true; } - /// - /// Добавление объекта в набор на конкретную позицию - /// - /// Добавляемый теплоход - /// Позиция - /// - public int Insert(T warmlyship, int position) + + public bool Insert(T warmlyship, int position) { - int nullIndex = -1; - int i; - - if (position < 0 || position >= Count) - return -1; - - for (i = position; i < Count; i++) + if (!(position >= 0 && position <= Count && _places.Count < _maxCount)) { - if (_places[i] == null) - { - nullIndex = i; - break; - } + return false; } - if (nullIndex < 0) - return -1; - - for (i = nullIndex; i > position; i--) - { - _places[i] = _places[i - 1]; - } - _places[position] = warmlyship; - return position; + _places.Insert(position, warmlyship); + return true; } - /// - /// Удаление объекта из набора с конкретной позиции - /// - /// - /// + public bool Remove(int position) { if (position < 0 || position >= Count) { return false; } - _places[position] = null; + _places.RemoveAt(position); return true; } - /// - /// Получение объекта из набора по позиции - /// - /// - /// - public T? Get(int position) + + public T? this[int position] { - if (position < 0 || position >= Count) + get { - return null; + if (position < 0 || position >= Count) + { + return null; + } + return _places[position]; + } + set + { + if (!(position >= 0 && position < Count && _places.Count < _maxCount)) + { + return; + } + + _places.Insert(position, value); + return; + } + } + public IEnumerable GetShips(int? maxShips = null) + { + for (int i = 0; i < _places.Count; ++i) + { + yield return _places[i]; + if (maxShips.HasValue && i == maxShips.Value) + { + yield break; + } } - return _places[position]; } } } \ No newline at end of file diff --git a/MotorShip/MotorShip/ShipsGenericCollection.cs b/MotorShip/MotorShip/ShipsGenericCollection.cs index 836d3ec..05f90e5 100644 --- a/MotorShip/MotorShip/ShipsGenericCollection.cs +++ b/MotorShip/MotorShip/ShipsGenericCollection.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using WarmlyShip.DrawingObjects; using WarmlyShip.MovementStrategy; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace WarmlyShip.Generics { @@ -14,31 +13,11 @@ namespace WarmlyShip.Generics where T : DrawingWarmlyShip where U : IMoveableObject { - /// - /// Ширина окна прорисовки - /// private readonly int _pictureWidth; - /// - /// Высота окна прорисовки - /// private readonly int _pictureHeight; - /// - /// Размер занимаемого объектом места (ширина) - /// private readonly int _placeSizeWidth = 185; - /// - /// Размер занимаемого объектом места (высота) - /// private readonly int _placeSizeHeight = 185; - /// - /// Набор объектов - /// private readonly SetGeneric _collection; - /// - /// Конструктор - /// - /// - /// public ShipsGenericCollection(int picWidth, int picHeight) { int width = picWidth / _placeSizeWidth; @@ -47,50 +26,29 @@ namespace WarmlyShip.Generics _pictureHeight = picHeight; _collection = new SetGeneric(width * height); } - /// - /// Перегрузка оператора сложения - /// - /// - /// - /// - public static int operator +(ShipsGenericCollection collect, T? + public static bool operator +(ShipsGenericCollection collect, T? obj) { if (obj == null) { - return -1; + return false; } - return collect._collection.Insert(obj); + return (bool)collect?._collection.Insert(obj); } - /// - /// Перегрузка оператора вычитания - /// - /// - /// - /// - public static bool operator -(ShipsGenericCollection collect, int + public static T? operator -(ShipsGenericCollection collect, int pos) { - T? obj = collect._collection.Get(pos); + T? obj = collect._collection[pos]; if (obj != null) { collect._collection.Remove(pos); } - return false; + return obj; } - /// - /// Получение объекта IMoveableObject - /// - /// - /// public U? GetU(int pos) { - return (U?)_collection.Get(pos)?.GetMoveableObject; + return (U?)_collection[pos]?.GetMoveableObject; } - /// - /// Вывод всего набора объектов - /// - /// public Bitmap ShowShips() { Bitmap bmp = new(_pictureWidth, _pictureHeight); @@ -99,10 +57,6 @@ namespace WarmlyShip.Generics DrawObjects(gr); return bmp; } - /// - /// Метод отрисовки фона - /// - /// private void DrawBackground(Graphics g) { Pen pen = new(Color.Black, 3); @@ -110,7 +64,7 @@ namespace WarmlyShip.Generics { for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j) - {//линия рамзетки места + { g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight); @@ -119,32 +73,19 @@ namespace WarmlyShip.Generics _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight); } } - /// - /// /// Метод прорисовки объектов - /// - /// private void DrawObjects(Graphics g) { - T? ship; - int width = _pictureWidth / _placeSizeWidth; - int diff = 1; - int currWidth = 0; - for (int i = 0; i < _collection.Count; i++) + int i = 0; + foreach (var ship in _collection.GetShips()) { - currWidth++; - if (currWidth > width) - { - diff++; - currWidth = 1; - } - ship = _collection.Get(i); if (ship != null) { + int width = _pictureWidth / _placeSizeWidth; ship.SetPosition((width - 1 - (i % width)) * _placeSizeWidth, i / width * _placeSizeHeight); ship.DrawTransport(g); } + i++; } } } } - diff --git a/MotorShip/MotorShip/ShipsGenericStorage.cs b/MotorShip/MotorShip/ShipsGenericStorage.cs new file mode 100644 index 0000000..2fc139d --- /dev/null +++ b/MotorShip/MotorShip/ShipsGenericStorage.cs @@ -0,0 +1,50 @@ +using System.Text; +using System.Threading.Tasks; +using WarmlyShip.DrawingObjects; +using WarmlyShip.MovementStrategy; + +namespace WarmlyShip.Generics +{ + internal class ShipsGenericStorage + { + readonly Dictionary> _shipStorages; + public List Keys => _shipStorages.Keys.ToList(); + private readonly int _pictureWidth; + private readonly int _pictureHeight; + public ShipsGenericStorage(int pictureWidth, int pictureHeight) + { + _shipStorages = new Dictionary>(); + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; + } + public void AddSet(string name) + { + if (_shipStorages.ContainsKey(name)) + { + return; + } + _shipStorages[name] = new ShipsGenericCollection(_pictureWidth, _pictureHeight); + } + public void DelSet(string name) + { + if (!_shipStorages.ContainsKey(name)) + { + return; + } + + _shipStorages.Remove(name); + } + public ShipsGenericCollection? this[string ind] + { + get + { + if (_shipStorages.ContainsKey(ind)) + { + return _shipStorages[ind]; + } + return null; + } + } + } +} diff --git a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll index 630ce94..86dcd11 100644 Binary files a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll and b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb index 14c1416..924e0e5 100644 Binary files a/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb and b/MotorShip/MotorShip/bin/Debug/net6.0-windows/WarmlyShip.pdb differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache index dafdd05..0e26907 100644 --- a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache +++ b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -06cd6889c77069e0f55068eddb8f6c6d07ea4abf +621cbda5ca6541382078a80e2a7b1378f7a5c582 diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache index 992a539..946b5ea 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.csproj.GenerateResource.cache differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll index 630ce94..86dcd11 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb index 14c1416..924e0e5 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/WarmlyShip.pdb differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll index 07f972e..3c87cc1 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/ref/WarmlyShip.dll differ diff --git a/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll b/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll index 07f972e..3c87cc1 100644 Binary files a/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll and b/MotorShip/MotorShip/obj/Debug/net6.0-windows/refint/WarmlyShip.dll differ