fix

Cruiser/Cruiser/AbstractStrategy.cs

@@ -1,11 +1,8 @@
-using Cruiser;
-using Cruiser.MovementStrategy;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 namespace Cruiser.MovementStrategy
 {
     public abstract class AbstractStrategy
@@ -15,6 +12,7 @@ namespace Cruiser.MovementStrategy
         protected int FieldWidth { get; private set; }
         protected int FieldHeight { get; private set; }
         public Status GetStatus() { return _state; }
+ 
         public void SetData(IMoveableObject moveableObject, int width, int
         height)
         {

Cruiser/Cruiser/CruiserForm.Designer.cs

@@ -7,20 +7,17 @@
         private void InitializeComponent()
         {
             this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
-            this.ButtonDown = new System.Windows.Forms.Button();
-            this.ButtonLeft = new System.Windows.Forms.Button();
-            this.ButtonRight = new System.Windows.Forms.Button();
-            this.ButtonUp = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
             this.buttonAdvancedCreate = new System.Windows.Forms.Button();
             this.buttonCreate = new System.Windows.Forms.Button();
             this.comboBoxCruiser = new System.Windows.Forms.ComboBox();
             this.ButtonStep = new System.Windows.Forms.Button();
-            this.ButtonSelected = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
             this.SuspendLayout();
-            // 
             // pictureBoxCruiser
-            // 
             this.pictureBoxCruiser.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxCruiser.Location = new System.Drawing.Point(0, 0);
             this.pictureBoxCruiser.Name = "pictureBoxCruiser";
@@ -28,58 +25,48 @@
             this.pictureBoxCruiser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
             this.pictureBoxCruiser.TabIndex = 0;
             this.pictureBoxCruiser.TabStop = false;
-            this.pictureBoxCruiser.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonDown
-            // 
-            this.ButtonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonDown.BackgroundImage = global::Cruiser.Properties.Resources.вниз;
-            this.ButtonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.ButtonDown.Location = new System.Drawing.Point(543, 306);
-            this.ButtonDown.Name = "ButtonDown";
-            this.ButtonDown.Size = new System.Drawing.Size(30, 30);
-            this.ButtonDown.TabIndex = 1;
-            this.ButtonDown.UseVisualStyleBackColor = true;
-            this.ButtonDown.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonLeft
-            // 
-            this.ButtonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonLeft.BackgroundImage = global::Cruiser.Properties.Resources.влево;
-            this.ButtonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.ButtonLeft.Location = new System.Drawing.Point(517, 306);
-            this.ButtonLeft.Name = "ButtonLeft";
-            this.ButtonLeft.Size = new System.Drawing.Size(30, 30);
-            this.ButtonLeft.TabIndex = 2;
-            this.ButtonLeft.UseVisualStyleBackColor = true;
-            this.ButtonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonRight
-            // 
-            this.ButtonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonRight.BackgroundImage = global::Cruiser.Properties.Resources.вправо;
-            this.ButtonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.ButtonRight.Location = new System.Drawing.Point(567, 306);
-            this.ButtonRight.Name = "ButtonRight";
-            this.ButtonRight.Size = new System.Drawing.Size(30, 30);
-            this.ButtonRight.TabIndex = 3;
-            this.ButtonRight.UseVisualStyleBackColor = true;
-            this.ButtonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // ButtonUp
-            // 
-            this.ButtonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonUp.BackgroundImage = global::Cruiser.Properties.Resources.вверх;
-            this.ButtonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.ButtonUp.Location = new System.Drawing.Point(543, 284);
-            this.ButtonUp.Name = "ButtonUp";
-            this.ButtonUp.Size = new System.Drawing.Size(30, 30);
-            this.ButtonUp.TabIndex = 4;
-            this.ButtonUp.UseVisualStyleBackColor = true;
-            this.ButtonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
+            this.pictureBoxCruiser.Click += new System.EventHandler(this.buttonMove_Click);
+            // buttonDown
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::Cruiser.Properties.Resources.вниз;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonDown.Location = new System.Drawing.Point(543, 306);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 1;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
+            // buttonLeft
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::Cruiser.Properties.Resources.влево;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonLeft.Location = new System.Drawing.Point(517, 306);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 2;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
+            // buttonRight
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::Cruiser.Properties.Resources.вправо;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonRight.Location = new System.Drawing.Point(567, 306);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 3;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
+            // buttonUp 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::Cruiser.Properties.Resources.вверх;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonUp.Location = new System.Drawing.Point(543, 284);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 4;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
             // buttonAdvancedCreate
-            // 
             this.buttonAdvancedCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.buttonAdvancedCreate.Location = new System.Drawing.Point(12, 267);
             this.buttonAdvancedCreate.Name = "buttonAdvancedCreate";
@@ -87,10 +74,8 @@
             this.buttonAdvancedCreate.TabIndex = 5;
             this.buttonAdvancedCreate.Text = "Создать продвинутую версию";
             this.buttonAdvancedCreate.UseVisualStyleBackColor = true;
-            this.buttonAdvancedCreate.Click += new System.EventHandler(this.ButtonAdvancedCreate_Click);
-            // 
+            this.buttonAdvancedCreate.Click += new System.EventHandler(this.buttonAdvancedCreate_Click);
             // buttonCreate
-            // 
             this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.buttonCreate.Location = new System.Drawing.Point(240, 267);
             this.buttonCreate.Name = "buttonCreate";
@@ -98,10 +83,8 @@
             this.buttonCreate.TabIndex = 6;
             this.buttonCreate.Text = "Создать простую версию";
             this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
             // comboBoxCruiser
-            // 
             this.comboBoxCruiser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxCruiser.FormattingEnabled = true;
             this.comboBoxCruiser.Items.AddRange(new object[] {
@@ -111,9 +94,7 @@
             this.comboBoxCruiser.Name = "comboBoxCruiser";
             this.comboBoxCruiser.Size = new System.Drawing.Size(182, 33);
             this.comboBoxCruiser.TabIndex = 7;
-            // 
             // ButtonStep
-            // 
             this.ButtonStep.Location = new System.Drawing.Point(485, 70);
             this.ButtonStep.Name = "ButtonStep";
             this.ButtonStep.Size = new System.Drawing.Size(112, 34);
@@ -121,29 +102,16 @@
             this.ButtonStep.Text = "Шаг";
             this.ButtonStep.UseVisualStyleBackColor = true;
             this.ButtonStep.Click += new System.EventHandler(this.ButtonStep_Click);
-            // 
-            // ButtonSelected
-            // 
-            this.ButtonSelected.Location = new System.Drawing.Point(180, 215);
-            this.ButtonSelected.Name = "ButtonSelected";
-            this.ButtonSelected.Size = new System.Drawing.Size(105, 34);
-            this.ButtonSelected.TabIndex = 9;
-            this.ButtonSelected.Text = "Выбрать";
-            this.ButtonSelected.UseVisualStyleBackColor = true;
-            this.ButtonSelected.Click += new System.EventHandler(this.ButtonSelectedCruiser_Click);
-            // 
             // CruiserForm
-            // 
             this.ClientSize = new System.Drawing.Size(667, 358);
-            this.Controls.Add(this.ButtonSelected);
             this.Controls.Add(this.ButtonStep);
             this.Controls.Add(this.comboBoxCruiser);
             this.Controls.Add(this.buttonCreate);
             this.Controls.Add(this.buttonAdvancedCreate);
-            this.Controls.Add(this.ButtonUp);
-            this.Controls.Add(this.ButtonRight);
-            this.Controls.Add(this.ButtonLeft);
-            this.Controls.Add(this.ButtonDown);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.pictureBoxCruiser);
             this.Name = "CruiserForm";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
@@ -154,14 +122,13 @@
 
         #endregion
         private PictureBox pictureBoxCruiser;
-        private Button ButtonDown;
-        private Button ButtonLeft;
-        private Button ButtonRight;
-        private Button ButtonUp;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private Button buttonUp;
         private Button buttonAdvancedCreate;
         private Button buttonCreate;
         private ComboBox comboBoxCruiser;
         private Button ButtonStep;
-        private Button ButtonSelected;
     }
 }

Cruiser/Cruiser/CruiserForm.cs

@@ -9,12 +9,9 @@ namespace Cruiser
         private DrawningCruiser? _drawningCruiser;
         
         private AbstractStrategy? _abstractStrategy;
-        public DrawningCruiser? SelectedCruiser { get; private set; }
         public CruiserForm()
         {
             InitializeComponent();
-            _abstractStrategy = null;
-            SelectedCruiser = null;
         }
         private void Draw()
         {
@@ -27,7 +24,7 @@ namespace Cruiser
             _drawningCruiser.DrawTransport(gr);
             pictureBoxCruiser.Image = bmp;
         }
-        private void ButtonMove_Click(object sender, EventArgs e)
+        private void buttonMove_Click(object sender, EventArgs e)
         {
             if (_drawningCruiser == null)
             {
@@ -51,19 +48,16 @@ namespace Cruiser
             }
             Draw();
         }
-        private void ButtonCreate_Click(object sender, EventArgs e)
+        private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialogColor = new();
-            if (dialogColor.ShowDialog() == DialogResult.OK)
-            {
-                color = dialogColor.Color;
-            }
-            _drawningCruiser = new DrawningCruiser(random.Next(100, 300), random.Next(1000, 3000),
-            color, pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _drawningCruiser = new DrawningCruiser(random.Next(100, 300),
+            random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
+            100));
             Draw();
         }
     private void ButtonStep_Click(object sender, EventArgs e)
@@ -87,6 +81,7 @@ namespace Cruiser
                 }
                 _abstractStrategy.SetData(new DrawningObjectCruiser(_drawningCruiser), pictureBoxCruiser.Width,
                 pictureBoxCruiser.Height);
+                comboBoxCruiser.Enabled = false;
             }
             if (_abstractStrategy == null)
             {
@@ -100,36 +95,23 @@ namespace Cruiser
                 _abstractStrategy = null;
             }
         }
-        private void ButtonAdvancedCreate_Click(object sender, EventArgs e)
+        private void buttonAdvancedCreate_Click(object sender, EventArgs e)
         {
             Random random = new();
-            Color color = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialogColor = new();
-            if (dialogColor.ShowDialog() == DialogResult.OK)
-            {
-                color = dialogColor.Color;
-            }
-
-            Color dopColor = Color.FromArgb(random.Next(0, 256),
-            random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialogDopColor = new();
-            if (dialogDopColor.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDopColor.Color;
-            }
-
             _drawningCruiser = new DrawningAdvancedCruiser(random.Next(100, 300),
-            random.Next(1000, 3000), color, dopColor, Convert.ToBoolean(random.Next(0, 2)),
+            random.Next(1000, 3000),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
+            Color.FromArgb(random.Next(0, 256), random.Next(0, 256),
+            random.Next(0, 256)),
             Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)),
+            Convert.ToBoolean(random.Next(0, 2)),
+
             pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            _drawningCruiser.SetPosition(random.Next(10, 100), random.Next(10,
+            100));
             Draw();
         }
-        private void ButtonSelectedCruiser_Click(object sender, EventArgs e)
-        {
-            SelectedCruiser = _drawningCruiser;
-            DialogResult = DialogResult.OK;
-        }
     }
 }

Cruiser/Cruiser/CruiserGenericCollection.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cruiser.Generics;
-using Cruiser.DrawningObjects;
-using Cruiser.Entities;
-using Cruiser.MovementStrategy;
-
-namespace Cruiser.Generics
-{
-    internal class CruiserGenericCollection<T, U>
-        where T : DrawningCruiser
-        where U : IMoveableObject
-    {
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        private readonly int _placeSizeWidth = 210;
-        private readonly int _placeSizeHeight = 90;
-        private readonly SetGeneric<T> _collection;
-        public CruiserGenericCollection(int picWidth, int picHeight)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _collection = new SetGeneric<T>(width * height);
-        }
-        public static bool operator +(CruiserGenericCollection<T, U> collect, T? obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            return collect?._collection.Insert(obj) ?? false;
-        }
-        public static T? operator -(CruiserGenericCollection<T, U> collect, int pos)
-        {
-            T? obj = collect._collection[pos];
-            if (obj != null)
-            {
-                collect._collection.Remove(pos);
-            }
-
-            return obj;
-        }
-
-        public U? GetU(int pos)
-        {
-            return (U?)_collection[pos]?.GetMoveableObject;
-        }
-        public Bitmap ShowCruisers()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawObjects(gr);
-            return bmp;
-        }
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 0; j < _pictureHeight / _placeSizeHeight +
-                1; ++j)
-                {
-                    g.DrawLine(pen, i * _placeSizeWidth, j *
-                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
-                    _placeSizeHeight);
-                }
-                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
-                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
-            }
-        }
-        private void DrawObjects(Graphics g)
-        {
-            int i = 0;
-            foreach (var cruiser in _collection.GetCruiser())
-            {
-                if (cruiser != null)
-                {
-                    int inRow = _pictureWidth / _placeSizeWidth;
-                    cruiser.SetPosition((i % inRow) * _placeSizeWidth + _placeSizeWidth / 20, _placeSizeHeight * (i / inRow) + _placeSizeHeight / 10);
-                    cruiser.DrawTransport(g);
-                }
-                i++;
-            }
-        }
-    }
-}

Cruiser/Cruiser/CruiserGenericStorage.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cruiser.DrawningObjects;
-using Cruiser.MovementStrategy;
-
-namespace Cruiser.Generics
-{
-    internal class CruiserGenericStorage
-    {
-        readonly Dictionary<string, CruiserGenericCollection<DrawningCruiser,
-        DrawningObjectCruiser>> _cruiserStorages;
-        public List<string> Keys => _cruiserStorages.Keys.ToList();
-        private readonly int _pictureWidth;
-        private readonly int _pictureHeight;
-        public CruiserGenericStorage(int pictureWidth, int pictureHeight)
-        {
-            _cruiserStorages = new Dictionary<string, CruiserGenericCollection<DrawningCruiser, DrawningObjectCruiser>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        public void AddSet(string name)
-        {
-            _cruiserStorages.Add(name, new CruiserGenericCollection<DrawningCruiser, DrawningObjectCruiser>(_pictureWidth, _pictureHeight));
-        }
-        public void DelSet(string name)
-        {
-            if (!_cruiserStorages.ContainsKey(name))
-            {
-                return;
-            }
-
-            _cruiserStorages.Remove(name);
-        }
-        public CruiserGenericCollection<DrawningCruiser, DrawningObjectCruiser>? this[string ind]
-        {
-            get
-            {
-                if (_cruiserStorages.ContainsKey(ind))
-                {
-                    return _cruiserStorages[ind];
-                }
-                return null;
-            }
-        }
-    }
-}
-

Cruiser/Cruiser/Direction.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
 namespace Cruiser
 {
     public enum Direction

Cruiser/Cruiser/DrawningAdvancedCruiser.cs

@@ -1,58 +1,48 @@
-using System;
+using Cruiser.DrawningObjects;
+using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using Cruiser.Entities;
-
 namespace Cruiser.DrawningObjects
 {
     public class DrawningAdvancedCruiser : DrawningCruiser
     {
-        public DrawningAdvancedCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 110, 60)
+        public DrawningAdvancedCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool headlights, bool helicopterPad, bool coating, int width, int height) : base(speed, weight, bodyColor, width, height, 150, 50)
         {
             if (EntityCruiser != null)
             {
-                EntityCruiser = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, helicopterPad, coating);
+                EntityCruiser = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, headlights, helicopterPad, coating);
             }
         }
-
         public override void DrawTransport(Graphics g)
         {
             if (EntityCruiser is not EntityAdvancedCruiser cruiser)
             {
                 return;
             }
+            Pen pen = new Pen(Color.Black);
             Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
+            Brush brush = new SolidBrush(cruiser.BodyColor);
             base.DrawTransport(g);
-            if (cruiser.HelicopterPad)
+            if (cruiser.Headlights)
             {
-
-                Point[] trianglePoints1 =
-                 {
-                 new Point(_startPosX + 20, _startPosY + 5),
-                 new Point(_startPosX + 40, _startPosY + 25),
-                 new Point(_startPosX + 60, _startPosY + 5)
-               };
-
-                Point[] trianglePoints2 =
-                {
-                 new Point(_startPosX + 20, _startPosY + 55),
-                 new Point(_startPosX + 40, _startPosY + 35),
-                 new Point(_startPosX + 60, _startPosY + 55)
-                };
-
-                g.FillPolygon(addBrush, trianglePoints1);
-                g.FillPolygon(addBrush, trianglePoints2);
+                Brush brYellow = new SolidBrush(Color.Yellow);
+                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
+                20);
+                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
+                20);
+            }
+            if (cruiser.HelicopterPad)
+            { 
+                g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
             }
             if (cruiser.Coating)
             {
-                g.FillEllipse(addBrush, _startPosX + 90, _startPosY + 20, 20, 20);
-
-            } 
+                g.FillEllipse(Brushes.Red, _startPosX + 80, _startPosY + 20, 20, 20);
+                g.FillEllipse(Brushes.Red, _startPosX + 60, _startPosY + 20, 20, 20);
+            }
         }
     }
 }

Cruiser/Cruiser/DrawningCruiser.cs

@@ -4,24 +4,29 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Cruiser.Entities;
-using Cruiser.MovementStrategy;
 
 namespace Cruiser.DrawningObjects
 {
     public class DrawningCruiser
     {
-        public EntityCruiser? EntityCruiser { get; protected set; }
+
+        public EntityCruiser ? EntityCruiser { get; protected set; }
         private int _pictureWidth;
+
         private int _pictureHeight;
+
         protected int _startPosX;
+
         protected int _startPosY;
-        private readonly int _cruiserWidth = 110;
-        private readonly int _cruiserHeight = 60;
+
+        private readonly int _cruiserWidth = 150;
+
+        private readonly int _cruiserHeight = 50;
         public int GetPosX => _startPosX;
         public int GetPosY => _startPosY;
         public int GetWidth => _cruiserWidth;
         public int GetHeight => _cruiserHeight;
-        public IMoveableObject GetMoveableObject => new DrawningObjectCruiser(this);
+        
         public DrawningCruiser(int speed, double weight, Color bodyColor, int width, int height)
         {
             if (width < _cruiserWidth || height < _cruiserHeight)
@@ -95,12 +100,6 @@ width, int height, int cruiserWidth, int cruiserHeight)
                 _ => false,
             };
         }
-        
-        public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
-        {
-            _pictureWidth = pictureBoxWidth;
-            _pictureHeight = pictureBoxHeight;
-        }
         public virtual void DrawTransport(Graphics g)
         {
             if (EntityCruiser == null)
@@ -124,12 +123,19 @@ width, int height, int cruiserWidth, int cruiserHeight)
             points[1] = new Point(_startPosX + 100, _startPosY + 55);
             points[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
             g.FillPolygon(Brushes.Pink, points);
+
+            Point[] points1 = new Point[3];
+            points1[0] = new Point(_startPosX + 100, _startPosY + 5);
+            points1[1] = new Point(_startPosX + 100, _startPosY + 55);
+            points1[2] = new Point(_startPosX + 100 + 50, _startPosY + 50 / 2);
+            g.DrawPolygon(pen, points1);
             g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 15, 10, 10);
             g.FillRectangle(Brushes.Black, _startPosX + 5, _startPosY + 35, 10, 10);
             g.DrawRectangle(Pens.Black, _startPosX + 35,
                _startPosY + 23, 15, 15);
             g.DrawRectangle(Pens.Black, _startPosX + 50,
             _startPosY + 19, 30, 25);
+
         }
     }
 }

Cruiser/Cruiser/DrawningObjectCruiser.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Cruiser.DrawningObjects;
+
 namespace Cruiser.MovementStrategy
 {
     internal class DrawningObjectCruiser : IMoveableObject

Cruiser/Cruiser/EntityAdvancedCruiser.cs

@@ -1,29 +1,25 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
-using System.Windows.Forms;
-
+using static System.Net.Mime.MediaTypeNames;
 namespace Cruiser.Entities
 {
     public class EntityAdvancedCruiser : EntityCruiser
     {
         public Color AdditionalColor { get; private set; }
-        public bool HelicopterPad { get; private set; }
-        public bool Coating { get; private set; }
-        public EntityAdvancedCruiser(int speed, double weight, Color bodyColor, Color
-    additionalColor, bool helicopterPad, bool coating) : base(speed, weight, bodyColor)
-        {
-            AdditionalColor = additionalColor;
-            HelicopterPad = helicopterPad;
-            Coating = coating;
-        }
-        public void setAdditionalColor(Color color)
-        {
-            AdditionalColor = color;
+         public bool Headlights { get; private set; }
+         public bool HelicopterPad { get; private set; }
+         public bool Coating { get; private set; }
+    
+    public EntityAdvancedCruiser(int speed, double weight, Color bodyColor, Color
+   additionalColor, bool headlights, bool helicopterPad, bool coating) : base(speed, weight, bodyColor)
+    {
+        AdditionalColor = additionalColor;
+        Headlights = headlights;
+        HelicopterPad = helicopterPad;
+        Coating = coating;
         }
     }
 }

Cruiser/Cruiser/EntityCruiser.cs

@@ -18,9 +18,6 @@ namespace Cruiser.Entities
             Weight = weight;
             BodyColor = bodyColor;
         }
-        public void setBodyColor(Color color)
-        {
-            BodyColor = color;
-        }
+
     }
 }

Cruiser/Cruiser/FormCruiserCollection.Designer.cs

@@ -1,173 +0,0 @@
-namespace Cruiser
-{
-    partial class FormCruiserCollection
-    {
-        private System.ComponentModel.IContainer components = null;
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-        private void InitializeComponent()
-        {
-            this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
-            this.panelCruiser = new System.Windows.Forms.Panel();
-            this.panelSet = new System.Windows.Forms.Panel();
-            this.textBoxSet = new System.Windows.Forms.TextBox();
-            this.ButtonAddObject = new System.Windows.Forms.Button();
-            this.listBoxStorages = new System.Windows.Forms.ListBox();
-            this.ButtonDelObject = new System.Windows.Forms.Button();
-            this.ButtonAddCruiser = new System.Windows.Forms.Button();
-            this.textBoxCruiser = new System.Windows.Forms.TextBox();
-            this.ButtonRemoveCruiser = new System.Windows.Forms.Button();
-            this.ButtonRefreshCollection = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
-            this.panelCruiser.SuspendLayout();
-            this.panelSet.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // pictureBoxCruiser
-            // 
-            this.pictureBoxCruiser.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxCruiser.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxCruiser.Name = "pictureBoxCruiser";
-            this.pictureBoxCruiser.Size = new System.Drawing.Size(904, 510);
-            this.pictureBoxCruiser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxCruiser.TabIndex = 0;
-            this.pictureBoxCruiser.TabStop = false;
-            // 
-            // panelCruiser
-            // 
-            this.panelCruiser.Controls.Add(this.ButtonRefreshCollection);
-            this.panelCruiser.Controls.Add(this.ButtonRemoveCruiser);
-            this.panelCruiser.Controls.Add(this.textBoxCruiser);
-            this.panelCruiser.Controls.Add(this.ButtonAddCruiser);
-            this.panelCruiser.Controls.Add(this.panelSet);
-            this.panelCruiser.Location = new System.Drawing.Point(655, 12);
-            this.panelCruiser.Name = "panelCruiser";
-            this.panelCruiser.Size = new System.Drawing.Size(221, 486);
-            this.panelCruiser.TabIndex = 1;
-            // 
-            // panelSet
-            // 
-            this.panelSet.Controls.Add(this.ButtonDelObject);
-            this.panelSet.Controls.Add(this.listBoxStorages);
-            this.panelSet.Controls.Add(this.ButtonAddObject);
-            this.panelSet.Controls.Add(this.textBoxSet);
-            this.panelSet.Location = new System.Drawing.Point(22, 19);
-            this.panelSet.Name = "panelSet";
-            this.panelSet.Size = new System.Drawing.Size(185, 241);
-            this.panelSet.TabIndex = 0;
-            // 
-            // textBoxSet
-            // 
-            this.textBoxSet.Location = new System.Drawing.Point(38, 21);
-            this.textBoxSet.Name = "textBoxSet";
-            this.textBoxSet.Size = new System.Drawing.Size(118, 31);
-            this.textBoxSet.TabIndex = 0;
-            // 
-            // ButtonAddObject
-            // 
-            this.ButtonAddObject.Location = new System.Drawing.Point(18, 58);
-            this.ButtonAddObject.Name = "ButtonAddObject";
-            this.ButtonAddObject.Size = new System.Drawing.Size(153, 51);
-            this.ButtonAddObject.TabIndex = 2;
-            this.ButtonAddObject.Text = "Создать набор";
-            this.ButtonAddObject.UseVisualStyleBackColor = true;
-            this.ButtonAddObject.Click += new System.EventHandler(this.ButtonAddObject_Click);
-            // 
-            // listBoxStorages
-            // 
-            this.listBoxStorages.FormattingEnabled = true;
-            this.listBoxStorages.ItemHeight = 25;
-            this.listBoxStorages.Location = new System.Drawing.Point(49, 115);
-            this.listBoxStorages.Name = "listBoxStorages";
-            this.listBoxStorages.Size = new System.Drawing.Size(97, 54);
-            this.listBoxStorages.TabIndex = 3;
-            this.listBoxStorages.SelectedIndexChanged += new System.EventHandler(this.listBoxObjects_SelectedIndexChanged);
-            // 
-            // ButtonDelObject
-            // 
-            this.ButtonDelObject.Location = new System.Drawing.Point(18, 175);
-            this.ButtonDelObject.Name = "ButtonDelObject";
-            this.ButtonDelObject.Size = new System.Drawing.Size(153, 47);
-            this.ButtonDelObject.TabIndex = 2;
-            this.ButtonDelObject.Text = "Удалить набор";
-            this.ButtonDelObject.UseVisualStyleBackColor = true;
-            this.ButtonDelObject.Click += new System.EventHandler(this.ButtonDelObject_Click);
-            // 
-            // ButtonAddCruiser
-            // 
-            this.ButtonAddCruiser.Location = new System.Drawing.Point(45, 266);
-            this.ButtonAddCruiser.Name = "ButtonAddCruiser";
-            this.ButtonAddCruiser.Size = new System.Drawing.Size(133, 38);
-            this.ButtonAddCruiser.TabIndex = 2;
-            this.ButtonAddCruiser.Text = "Добавить";
-            this.ButtonAddCruiser.UseVisualStyleBackColor = true;
-            this.ButtonAddCruiser.Click += new System.EventHandler(this.ButtonAddCruiser_Click);
-            // 
-            // textBoxCruiser
-            // 
-            this.textBoxCruiser.Location = new System.Drawing.Point(45, 330);
-            this.textBoxCruiser.Name = "textBoxCruiser";
-            this.textBoxCruiser.Size = new System.Drawing.Size(133, 31);
-            this.textBoxCruiser.TabIndex = 3;
-            // 
-            // ButtonRemoveCruiser
-            // 
-            this.ButtonRemoveCruiser.Location = new System.Drawing.Point(45, 391);
-            this.ButtonRemoveCruiser.Name = "ButtonRemoveCruiser";
-            this.ButtonRemoveCruiser.Size = new System.Drawing.Size(138, 38);
-            this.ButtonRemoveCruiser.TabIndex = 2;
-            this.ButtonRemoveCruiser.Text = "Удалить";
-            this.ButtonRemoveCruiser.UseVisualStyleBackColor = true;
-            this.ButtonRemoveCruiser.Click += new System.EventHandler(this.ButtonRemoveCruiser_Click);
-            // 
-            // ButtonRefreshCollection
-            // 
-            this.ButtonRefreshCollection.Location = new System.Drawing.Point(45, 435);
-            this.ButtonRefreshCollection.Name = "ButtonRefreshCollection";
-            this.ButtonRefreshCollection.Size = new System.Drawing.Size(138, 41);
-            this.ButtonRefreshCollection.TabIndex = 2;
-            this.ButtonRefreshCollection.Text = "Обновить";
-            this.ButtonRefreshCollection.UseVisualStyleBackColor = true;
-            this.ButtonRefreshCollection.Click += new System.EventHandler(this.ButtonRefreshCollection_Click);
-            // 
-            // FormCruiserCollection
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(904, 510);
-            this.Controls.Add(this.panelCruiser);
-            this.Controls.Add(this.pictureBoxCruiser);
-            this.Name = "FormCruiserCollection";
-            this.Text = "FormCruiserCollection";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
-            this.panelCruiser.ResumeLayout(false);
-            this.panelCruiser.PerformLayout();
-            this.panelSet.ResumeLayout(false);
-            this.panelSet.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-        #endregion
-
-        private PictureBox pictureBoxCruiser;
-        private Panel panelCruiser;
-        private Panel panelSet;
-        private TextBox textBoxSet;
-        private ListBox listBoxStorages;
-        private Button ButtonAddObject;
-        private Button ButtonDelObject;
-        private Button ButtonAddCruiser;
-        private Button ButtonRemoveCruiser;
-        private TextBox textBoxCruiser;
-        private Button ButtonRefreshCollection;
-    }
-}

Cruiser/Cruiser/FormCruiserCollection.cs

@@ -1,144 +0,0 @@
-using Cruiser.Generics;
-using Cruiser.DrawningObjects;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Cruiser
-{
-    public partial class FormCruiserCollection : Form
-    {
-        private readonly CruiserGenericStorage _storage;
-        
-        public FormCruiserCollection()
-        {
-            InitializeComponent();
-            _storage = new CruiserGenericStorage(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-        }
-        private void ReloadObjects()
-        {
-            int index = listBoxStorages.SelectedIndex;
-
-            listBoxStorages.Items.Clear();
-            for (int i = 0; i < _storage.Keys.Count; i++)
-            {
-                listBoxStorages.Items.Add(_storage.Keys[i]);
-            }
-
-            if (listBoxStorages.Items.Count > 0 && (index == -1 || index >= listBoxStorages.Items.Count))
-            {
-                listBoxStorages.SelectedIndex = 0;
-            }
-
-            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
-            {
-                listBoxStorages.SelectedIndex = index;
-            }
-        }
-        private void ButtonAddObject_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxSet.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _storage.AddSet(textBoxSet.Text);
-            ReloadObjects();
-        }
-        private void listBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBoxCruiser.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowCruisers();
-        }
-        private void ButtonDelObject_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (MessageBox.Show($"Удалить объект{listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo,
-                MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _storage.DelSet(listBoxStorages.SelectedItem.ToString()
-                ?? string.Empty);
-                ReloadObjects();
-            }
-        }
-        private void ButtonAddCruiser_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            FormCruiserConfig form = new();
-            form.Show();
-            Action<DrawningCruiser>? cruiserDelegate = new((m) =>
-            {
-                bool isAdditionSuccessful = (obj + m);
-                if (isAdditionSuccessful)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    m.ChangePictureBoxSize(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-                    pictureBoxCruiser.Image = obj.ShowCruisers();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            });
-            form.AddEvent(cruiserDelegate);
-        }
-        private void ButtonRemoveCruiser_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
-            string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(textBoxCruiser.Text);
-            if (obj - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBoxCruiser.Image = obj.ShowCruisers();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void ButtonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            if (listBoxStorages.SelectedIndex == -1)
-            {
-                return;
-            }
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
-            string.Empty];
-            if (obj == null)
-            {
-                return;
-            }
-            pictureBoxCruiser.Image = obj.ShowCruisers();
-        }
-    }
-}

Cruiser/Cruiser/FormCruiserCollection.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Cruiser/Cruiser/FormCruiserConfig.Designer.cs

@@ -1,381 +0,0 @@
-namespace Cruiser
-{
-    partial class FormCruiserConfig
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBoxCruiser = new System.Windows.Forms.GroupBox();
-            this.checkBoxMissileSilos = new System.Windows.Forms.CheckBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.panelColor = new System.Windows.Forms.Panel();
-            this.label_addit_color = new System.Windows.Forms.Label();
-            this.label_color = new System.Windows.Forms.Label();
-            this.pictureBoxCruiser = new System.Windows.Forms.PictureBox();
-            this.labelAdvanced = new System.Windows.Forms.Label();
-            this.labelBasic = new System.Windows.Forms.Label();
-            this.groupBoxColor = new System.Windows.Forms.GroupBox();
-            this.panelOrchid = new System.Windows.Forms.Panel();
-            this.panelPink = new System.Windows.Forms.Panel();
-            this.panelViolet = new System.Windows.Forms.Panel();
-            this.panelBlue = new System.Windows.Forms.Panel();
-            this.panelLightBlue = new System.Windows.Forms.Panel();
-            this.panelPurple = new System.Windows.Forms.Panel();
-            this.panelBlack = new System.Windows.Forms.Panel();
-            this.panelWhite = new System.Windows.Forms.Panel();
-            this.checkBoxHelicopterPad = new System.Windows.Forms.CheckBox();
-            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
-            this.labelWeight = new System.Windows.Forms.Label();
-            this.labelSpeed = new System.Windows.Forms.Label();
-            this.groupBoxCruiser.SuspendLayout();
-            this.panelColor.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).BeginInit();
-            this.groupBoxColor.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxCruiser
-            // 
-            this.groupBoxCruiser.Controls.Add(this.checkBoxMissileSilos);
-            this.groupBoxCruiser.Controls.Add(this.buttonCancel);
-            this.groupBoxCruiser.Controls.Add(this.buttonAdd);
-            this.groupBoxCruiser.Controls.Add(this.panelColor);
-            this.groupBoxCruiser.Controls.Add(this.labelAdvanced);
-            this.groupBoxCruiser.Controls.Add(this.labelBasic);
-            this.groupBoxCruiser.Controls.Add(this.groupBoxColor);
-            this.groupBoxCruiser.Controls.Add(this.checkBoxHelicopterPad);
-            this.groupBoxCruiser.Controls.Add(this.numericUpDownWeight);
-            this.groupBoxCruiser.Controls.Add(this.numericUpDownSpeed);
-            this.groupBoxCruiser.Controls.Add(this.labelWeight);
-            this.groupBoxCruiser.Controls.Add(this.labelSpeed);
-            this.groupBoxCruiser.Location = new System.Drawing.Point(57, 43);
-            this.groupBoxCruiser.Name = "groupBoxCruiser";
-            this.groupBoxCruiser.Size = new System.Drawing.Size(1163, 391);
-            this.groupBoxCruiser.TabIndex = 0;
-            this.groupBoxCruiser.TabStop = false;
-            this.groupBoxCruiser.Text = "Параметры";
-            // 
-            // checkBoxMissileSilos
-            // 
-            this.checkBoxMissileSilos.AutoSize = true;
-            this.checkBoxMissileSilos.Location = new System.Drawing.Point(33, 277);
-            this.checkBoxMissileSilos.Name = "checkBoxMissileSilos";
-            this.checkBoxMissileSilos.Size = new System.Drawing.Size(232, 29);
-            this.checkBoxMissileSilos.TabIndex = 12;
-            this.checkBoxMissileSilos.Text = "Наличие ракетных шахт";
-            this.checkBoxMissileSilos.UseVisualStyleBackColor = true;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(991, 321);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(127, 38);
-            this.buttonCancel.TabIndex = 11;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(838, 321);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(136, 38);
-            this.buttonAdd.TabIndex = 10;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // panelColor
-            // 
-            this.panelColor.AllowDrop = true;
-            this.panelColor.Controls.Add(this.label_addit_color);
-            this.panelColor.Controls.Add(this.label_color);
-            this.panelColor.Controls.Add(this.pictureBoxCruiser);
-            this.panelColor.Location = new System.Drawing.Point(822, 45);
-            this.panelColor.Name = "panelColor";
-            this.panelColor.Size = new System.Drawing.Size(312, 261);
-            this.panelColor.TabIndex = 9;
-            this.panelColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
-            this.panelColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
-            // 
-            // label_addit_color
-            // 
-            this.label_addit_color.AllowDrop = true;
-            this.label_addit_color.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label_addit_color.Location = new System.Drawing.Point(169, 23);
-            this.label_addit_color.Name = "label_addit_color";
-            this.label_addit_color.Size = new System.Drawing.Size(117, 38);
-            this.label_addit_color.TabIndex = 10;
-            this.label_addit_color.Text = "Доп.цвет";
-            this.label_addit_color.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label_addit_color.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelColor_DragDrop);
-            this.label_addit_color.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelColor_DragEnter);
-            // 
-            // label_color
-            // 
-            this.label_color.AllowDrop = true;
-            this.label_color.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.label_color.Location = new System.Drawing.Point(30, 23);
-            this.label_color.Name = "label_color";
-            this.label_color.Size = new System.Drawing.Size(110, 38);
-            this.label_color.TabIndex = 9;
-            this.label_color.Text = "Цвет";
-            this.label_color.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.label_color.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelColor_DragDrop);
-            this.label_color.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelColor_DragEnter);
-            // 
-            // pictureBoxCruiser
-            // 
-            this.pictureBoxCruiser.Location = new System.Drawing.Point(76, 64);
-            this.pictureBoxCruiser.Name = "pictureBoxCruiser";
-            this.pictureBoxCruiser.Size = new System.Drawing.Size(163, 178);
-            this.pictureBoxCruiser.TabIndex = 8;
-            this.pictureBoxCruiser.TabStop = false;
-            // 
-            // labelAdvanced
-            // 
-            this.labelAdvanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelAdvanced.Location = new System.Drawing.Point(521, 293);
-            this.labelAdvanced.Name = "labelAdvanced";
-            this.labelAdvanced.Size = new System.Drawing.Size(141, 47);
-            this.labelAdvanced.TabIndex = 7;
-            this.labelAdvanced.Text = "Продвинутый";
-            this.labelAdvanced.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelAdvanced.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // labelBasic
-            // 
-            this.labelBasic.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.labelBasic.Location = new System.Drawing.Point(369, 293);
-            this.labelBasic.Name = "labelBasic";
-            this.labelBasic.Size = new System.Drawing.Size(131, 47);
-            this.labelBasic.TabIndex = 6;
-            this.labelBasic.Text = "Простой";
-            this.labelBasic.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelBasic.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
-            // 
-            // groupBoxColor
-            // 
-            this.groupBoxColor.Controls.Add(this.panelOrchid);
-            this.groupBoxColor.Controls.Add(this.panelPink);
-            this.groupBoxColor.Controls.Add(this.panelViolet);
-            this.groupBoxColor.Controls.Add(this.panelBlue);
-            this.groupBoxColor.Controls.Add(this.panelLightBlue);
-            this.groupBoxColor.Controls.Add(this.panelPurple);
-            this.groupBoxColor.Controls.Add(this.panelBlack);
-            this.groupBoxColor.Controls.Add(this.panelWhite);
-            this.groupBoxColor.Location = new System.Drawing.Point(335, 40);
-            this.groupBoxColor.Name = "groupBoxColor";
-            this.groupBoxColor.Size = new System.Drawing.Size(357, 231);
-            this.groupBoxColor.TabIndex = 5;
-            this.groupBoxColor.TabStop = false;
-            this.groupBoxColor.Text = "Цвета";
-            // 
-            // panelOrchid
-            // 
-            this.panelOrchid.BackColor = System.Drawing.Color.Fuchsia;
-            this.panelOrchid.Location = new System.Drawing.Point(264, 153);
-            this.panelOrchid.Name = "panelOrchid";
-            this.panelOrchid.Size = new System.Drawing.Size(53, 49);
-            this.panelOrchid.TabIndex = 7;
-            // 
-            // panelPink
-            // 
-            this.panelPink.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.panelPink.Location = new System.Drawing.Point(180, 153);
-            this.panelPink.Name = "panelPink";
-            this.panelPink.Size = new System.Drawing.Size(53, 49);
-            this.panelPink.TabIndex = 6;
-            // 
-            // panelViolet
-            // 
-            this.panelViolet.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
-            this.panelViolet.Location = new System.Drawing.Point(108, 153);
-            this.panelViolet.Name = "panelViolet";
-            this.panelViolet.Size = new System.Drawing.Size(53, 49);
-            this.panelViolet.TabIndex = 5;
-            // 
-            // panelBlue
-            // 
-            this.panelBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
-            this.panelBlue.Location = new System.Drawing.Point(34, 153);
-            this.panelBlue.Name = "panelBlue";
-            this.panelBlue.Size = new System.Drawing.Size(53, 49);
-            this.panelBlue.TabIndex = 4;
-            // 
-            // panelLightBlue
-            // 
-            this.panelLightBlue.BackColor = System.Drawing.Color.Purple;
-            this.panelLightBlue.Location = new System.Drawing.Point(264, 44);
-            this.panelLightBlue.Name = "panelLightBlue";
-            this.panelLightBlue.Size = new System.Drawing.Size(53, 49);
-            this.panelLightBlue.TabIndex = 3;
-            // 
-            // panelPurple
-            // 
-            this.panelPurple.BackColor = System.Drawing.Color.DarkOrchid;
-            this.panelPurple.Location = new System.Drawing.Point(186, 44);
-            this.panelPurple.Name = "panelPurple";
-            this.panelPurple.Size = new System.Drawing.Size(53, 49);
-            this.panelPurple.TabIndex = 2;
-            // 
-            // panelBlack
-            // 
-            this.panelBlack.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.panelBlack.Location = new System.Drawing.Point(108, 44);
-            this.panelBlack.Name = "panelBlack";
-            this.panelBlack.Size = new System.Drawing.Size(53, 49);
-            this.panelBlack.TabIndex = 1;
-            // 
-            // panelWhite
-            // 
-            this.panelWhite.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.panelWhite.Location = new System.Drawing.Point(32, 44);
-            this.panelWhite.Name = "panelWhite";
-            this.panelWhite.Size = new System.Drawing.Size(55, 49);
-            this.panelWhite.TabIndex = 0;
-            // 
-            // checkBoxHelicopterPad
-            // 
-            this.checkBoxHelicopterPad.AutoSize = true;
-            this.checkBoxHelicopterPad.Location = new System.Drawing.Point(33, 213);
-            this.checkBoxHelicopterPad.Name = "checkBoxHelicopterPad";
-            this.checkBoxHelicopterPad.Size = new System.Drawing.Size(310, 29);
-            this.checkBoxHelicopterPad.TabIndex = 4;
-            this.checkBoxHelicopterPad.Text = "Наличие площадки под вертолет";
-            this.checkBoxHelicopterPad.UseVisualStyleBackColor = true;
-            // 
-            // numericUpDownWeight
-            // 
-            this.numericUpDownWeight.Location = new System.Drawing.Point(128, 143);
-            this.numericUpDownWeight.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numericUpDownWeight.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            this.numericUpDownWeight.Name = "numericUpDownWeight";
-            this.numericUpDownWeight.Size = new System.Drawing.Size(84, 31);
-            this.numericUpDownWeight.TabIndex = 3;
-            this.numericUpDownWeight.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // numericUpDownSpeed
-            // 
-            this.numericUpDownSpeed.Location = new System.Drawing.Point(128, 75);
-            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
-            this.numericUpDownSpeed.Size = new System.Drawing.Size(74, 31);
-            this.numericUpDownSpeed.TabIndex = 2;
-            this.numericUpDownSpeed.Value = new decimal(new int[] {
-            100,
-            0,
-            0,
-            0});
-            // 
-            // labelWeight
-            // 
-            this.labelWeight.AutoSize = true;
-            this.labelWeight.Location = new System.Drawing.Point(33, 145);
-            this.labelWeight.Name = "labelWeight";
-            this.labelWeight.Size = new System.Drawing.Size(43, 25);
-            this.labelWeight.TabIndex = 1;
-            this.labelWeight.Text = "Вес:";
-            // 
-            // labelSpeed
-            // 
-            this.labelSpeed.AutoSize = true;
-            this.labelSpeed.Location = new System.Drawing.Point(33, 75);
-            this.labelSpeed.Name = "labelSpeed";
-            this.labelSpeed.Size = new System.Drawing.Size(93, 25);
-            this.labelSpeed.TabIndex = 0;
-            this.labelSpeed.Text = "Скорость:";
-            // 
-            // FormCruiserConfig
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1279, 552);
-            this.Controls.Add(this.groupBoxCruiser);
-            this.Name = "FormCruiserConfig";
-            this.Text = "Создание объекта";
-            this.groupBoxCruiser.ResumeLayout(false);
-            this.groupBoxCruiser.PerformLayout();
-            this.panelColor.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
-            this.groupBoxColor.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxCruiser;
-        private Button buttonCancel;
-        private Button buttonAdd;
-        private Panel panelColor;
-        private Label label_addit_color;
-        private Label label_color;
-        private PictureBox pictureBoxCruiser;
-        private Label labelAdvanced;
-        private Label labelBasic;
-        private GroupBox groupBoxColor;
-        private Panel panelBlack;
-        private Panel panelWhite;
-        private CheckBox checkBoxHelicopterPad;
-        private NumericUpDown numericUpDownWeight;
-        private NumericUpDown numericUpDownSpeed;
-        private Label labelWeight;
-        private Label labelSpeed;
-        private CheckBox checkBoxMissileSilos;
-        private Panel panelOrchid;
-        private Panel panelPink;
-        private Panel panelViolet;
-        private Panel panelBlue;
-        private Panel panelLightBlue;
-        private Panel panelPurple;
-    }
-}

Cruiser/Cruiser/FormCruiserConfig.cs

@@ -1,126 +0,0 @@
-using Cruiser.DrawningObjects;
-using Cruiser.Entities;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
-
-namespace Cruiser
-{
-    public partial class FormCruiserConfig : Form
-    {
-        DrawningCruiser? _cruiser = null;
-        public event Action<DrawningCruiser>? EventAddCruiser;
-        public FormCruiserConfig()
-        {
-            InitializeComponent();
-            panelWhite.MouseDown += PanelColor_MouseDown;
-            panelBlack.MouseDown += PanelColor_MouseDown;
-            panelLightBlue.MouseDown += PanelColor_MouseDown;
-            panelBlue.MouseDown += PanelColor_MouseDown;
-            panelPink.MouseDown += PanelColor_MouseDown;
-            panelViolet.MouseDown += PanelColor_MouseDown;
-            panelPurple.MouseDown += PanelColor_MouseDown;
-            panelColor.MouseDown += PanelColor_MouseDown;
-            buttonCancel.Click += (s, e) => Close();
-        }
-        
-        private void DrawCruiser()
-        {
-            Bitmap bmp = new(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _cruiser?.SetPosition(5, 5);
-            _cruiser?.DrawTransport(gr);
-            pictureBoxCruiser.Image = bmp;
-        }
-
-        public void AddEvent(Action<DrawningCruiser> ev)
-        {
-            if (EventAddCruiser == null)
-            {
-                EventAddCruiser = ev;
-            }
-            else
-            {
-                EventAddCruiser += ev;
-            }
-        }
-        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
-        {
-            (sender as Label)?.DoDragDrop((sender as Label)?.Name,
-           DragDropEffects.Move | DragDropEffects.Copy);
-        }
-        private void PanelObject_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-        private void PanelObject_DragDrop(object sender, DragEventArgs e)
-        {
-            switch (e.Data?.GetData(DataFormats.Text).ToString())
-            {
-                case "labelBasic":
-                    _cruiser = new DrawningCruiser((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value,
-                         Color.White, pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-                    break;
-                case "labelAdvanced":
-                    _cruiser = new DrawningAdvancedCruiser((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value,
-                         Color.White, Color.Black, checkBoxHelicopterPad.Checked, checkBoxMissileSilos.Checked,
-                          pictureBoxCruiser.Width, pictureBoxCruiser.Height);
-                    break;
-            }
-            label_color.BackColor = Color.Empty;
-            label_addit_color.BackColor = Color.Empty;
-            DrawCruiser();
-        }
-        private void PanelColor_MouseDown(object? sender, MouseEventArgs e)
-        {
-            (sender as Control)?.DoDragDrop((sender as Control)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            EventAddCruiser?.Invoke(_cruiser);
-            Close();
-        }
-        private void labelColor_DragDrop(object sender, DragEventArgs e)
-        {
-            if (_cruiser?.EntityCruiser == null)
-                return;
-            switch (((Label)sender).Name)
-            {
-                case "label_color":
-                    _cruiser?.EntityCruiser?.setBodyColor((Color)e.Data.GetData(typeof(Color)));
-                    break;
-                case "label_addit_color":
-                    if (!(_cruiser is DrawningAdvancedCruiser))
-                        return;
-                    (_cruiser.EntityCruiser as EntityAdvancedCruiser)?.setAdditionalColor(color: (Color)e.Data.GetData(typeof(Color)));
-                    break;
-            }
-            DrawCruiser();
-        }
-        private void labelColor_DragEnter(object sender, DragEventArgs e)
-        {
-            if (e.Data.GetDataPresent(typeof(Color)))
-            {
-                e.Effect = DragDropEffects.Copy;
-            }
-            else
-            {
-                e.Effect = DragDropEffects.None;
-            }
-        }
-    }
-}

Cruiser/Cruiser/FormCruiserConfig.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Cruiser/Cruiser/IMoveableObject.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser.MovementStrategy;
-
 namespace Cruiser.MovementStrategy
 {
     public interface IMoveableObject

Cruiser/Cruiser/MoveToBorder.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Cruiser.MovementStrategy;
 
 namespace Cruiser.MovementStrategy
 {
@@ -20,6 +21,7 @@ namespace Cruiser.MovementStrategy
             objParams.DownBorder <= FieldHeight &&
             objParams.DownBorder + GetStep() >= FieldHeight;
         }
+
         protected override void MoveToTarget()
         {
             var objParams = GetObjectParameters;
@@ -49,9 +51,10 @@ namespace Cruiser.MovementStrategy
                 else
                 {
                     MoveDown();
-
                 }
             }
+
+
         }
     }
 }

Cruiser/Cruiser/Program.cs

@@ -2,16 +2,13 @@ namespace Cruiser
 {
     internal static class Program
     {
-        /// <summary>
-        ///  The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormCruiserCollection());
+            Application.Run(new CruiserForm());
         }
     }
 }

Cruiser/Cruiser/SetGeneric.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Cruiser.Generics
-{
-    internal class SetGeneric<T>
-        where T : class
-    {
-        private readonly List<T?> _places;
-        public int Count => _places.Count;
-        private readonly int _maxCount;
-        public SetGeneric(int count)
-        {
-            _maxCount = count;
-            _places = new List<T?>(count);
-        }
-        public bool Insert(T cruiser)
-        {
-            if (_places.Count == _maxCount)
-            {
-                return false;
-            }
-
-            Insert(cruiser, 0);
-            return true;
-        }
-        public bool Insert(T cruiser, int position)
-        {
-            if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
-            {
-                return false;
-            }
-            _places.Insert(position, cruiser);
-            return true;
-        }
-        public bool Remove(int position)
-        {
-            if (position < 0 || position >= Count)
-            {
-                return false;
-            }
-
-            _places.RemoveAt(position);
-            return true;
-        }
-        public T? this[int position]
-        {
-            get
-            {
-                if (position < 0 || position >= _maxCount)
-                {
-                    return null;
-                }
-                return _places[position];
-            }
-            set
-            {
-                if (!(position >= 0 && position < Count && _places.Count < _maxCount))
-                {
-                    return;
-                }
-                _places.Insert(position, value);
-                return;
-            }
-        }
-        public IEnumerable<T?> GetCruiser(int? maxCruisers = null)
-        {
-            for (int i = 0; i < _places.Count; ++i)
-            {
-                yield return _places[i];
-                if (maxCruisers.HasValue && i == maxCruisers.Value)
-                {
-                    yield break;
-                }
-            }
-        }
-    }
-}