Done

Cruiser/Cruiser/AbstractStrategy.cs

@@ -1,20 +1,22 @@
-using Monorail.DrawningObjects;
+using Cruiser;
+using Cruiser.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-namespace Monorail.MovementStrategy
+namespace Cruiser.MovementStrategy
 {
     public abstract class AbstractStrategy
     {
         private IMoveableObject? _moveableObject;
-
         private Status _state = Status.NotInit;
-
         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)
+        public void SetData(IMoveableObject moveableObject, int width, int
+        height)
         {
             if (moveableObject == null)
             {
@@ -26,7 +28,6 @@ namespace Monorail.MovementStrategy
             FieldWidth = width;
             FieldHeight = height;
         }
-
         public void MakeStep()
         {
             if (_state != Status.InProgress)
@@ -40,18 +41,12 @@ namespace Monorail.MovementStrategy
             }
             MoveToTarget();
         }
-
-        protected bool MoveLeft() => MoveTo(DirectionType.Left);
-
-        protected bool MoveRight() => MoveTo(DirectionType.Right);
-
-        protected bool MoveUp() => MoveTo(DirectionType.Up);
-
-        protected bool MoveDown() => MoveTo(DirectionType.Down);
-
+        protected bool MoveLeft() => MoveTo(Direction.Left);
+        protected bool MoveRight() => MoveTo(Direction.Right);
+        protected bool MoveUp() => MoveTo(Direction.Up);
+        protected bool MoveDown() => MoveTo(Direction.Down);
         protected ObjectParameters? GetObjectParameters =>
-_moveableObject?.GetObjectPosition;
-
+               _moveableObject?.GetObjectPosition;
         protected int? GetStep()
         {
             if (_state != Status.InProgress)
@@ -60,25 +55,20 @@ _moveableObject?.GetObjectPosition;
             }
             return _moveableObject?.GetStep;
         }
-
         protected abstract void MoveToTarget();
-
         protected abstract bool IsTargetDestinaion();
-
-        private bool MoveTo(DirectionType directionType)
+        private bool MoveTo(Direction direction)
         {
             if (_state != Status.InProgress)
             {
                 return false;
             }
-            if (_moveableObject?.CheckCanMove(directionType) ?? false)
+            if (_moveableObject?.CheckCanMove(direction) ?? false)
             {
-                _moveableObject.MoveObject(directionType);
+                _moveableObject.MoveObject(direction);
                 return true;
             }
             return false;
         }
-
-
     }
 }

Cruiser/Cruiser/CarsGenericCollection.cs

@@ -1 +0,0 @@
-

Cruiser/Cruiser/CruiserForm.Designer.cs

@@ -0,0 +1,167 @@
+namespace Cruiser
+{
+    partial class CruiserForm
+    {
+        private System.ComponentModel.IContainer components = null;
+        #region Windows Form Designer generated code
+        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.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";
+            this.pictureBoxCruiser.Size = new System.Drawing.Size(667, 358);
+            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);
+            // 
+            // 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";
+            this.buttonAdvancedCreate.Size = new System.Drawing.Size(210, 69);
+            this.buttonAdvancedCreate.TabIndex = 5;
+            this.buttonAdvancedCreate.Text = "Создать продвинутую версию";
+            this.buttonAdvancedCreate.UseVisualStyleBackColor = true;
+            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";
+            this.buttonCreate.Size = new System.Drawing.Size(242, 69);
+            this.buttonCreate.TabIndex = 6;
+            this.buttonCreate.Text = "Создать простую версию";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            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[] {
+            "Центр",
+            "Угол"});
+            this.comboBoxCruiser.Location = new System.Drawing.Point(415, 22);
+            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);
+            this.ButtonStep.TabIndex = 8;
+            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.pictureBoxCruiser);
+            this.Name = "CruiserForm";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCruiser)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private PictureBox pictureBoxCruiser;
+        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

@@ -0,0 +1,135 @@
+using System.Windows.Forms;
+using Cruiser.DrawningObjects;
+using Cruiser.MovementStrategy;
+
+namespace Cruiser
+{
+    public partial class CruiserForm : Form
+    {
+        private DrawningCruiser? _drawningCruiser;
+        
+        private AbstractStrategy? _abstractStrategy;
+        public DrawningCruiser? SelectedCruiser { get; private set; }
+        public CruiserForm()
+        {
+            InitializeComponent();
+            _abstractStrategy = null;
+            SelectedCruiser = null;
+        }
+        private void Draw()
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            Bitmap bmp = new Bitmap(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningCruiser.DrawTransport(gr);
+            pictureBoxCruiser.Image = bmp;
+        }
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _drawningCruiser.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _drawningCruiser.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _drawningCruiser.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _drawningCruiser.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        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));
+            Draw();
+        }
+    private void ButtonStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningCruiser == null)
+            {
+                return;
+            }
+            if (comboBoxCruiser.Enabled)
+            {
+                _abstractStrategy = comboBoxCruiser.SelectedIndex
+                switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_abstractStrategy == null)
+                {
+                    return;
+                }
+                _abstractStrategy.SetData(new DrawningObjectCruiser(_drawningCruiser), pictureBoxCruiser.Width,
+                pictureBoxCruiser.Height);
+            }
+            if (_abstractStrategy == null)
+            {
+                return;
+            }
+            _abstractStrategy.MakeStep();
+            Draw();
+            if (_abstractStrategy.GetStatus() == Status.Finish)
+            {
+                comboBoxCruiser.Enabled = true;
+                _abstractStrategy = null;
+            }
+        }
+        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)),
+            Convert.ToBoolean(random.Next(0, 2)),
+            pictureBoxCruiser.Width, pictureBoxCruiser.Height);
+            _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,30 +1,25 @@
-using Monorail.MovementStrategy;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Monorail.DrawningObjects;
-using System.Drawing;
+using Cruiser.Generics;
+using Cruiser.DrawningObjects;
+using Cruiser.Entities;
+using Cruiser.MovementStrategy;
 
-
-namespace Monorail.Generics
+namespace Cruiser.Generics
 {
-    internal class MonorailGenericCollection<T, U>
-        where T : DrawningMonorail
+    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 MonorailGenericCollection(int picWidth, int picHeight)
+        public CruiserGenericCollection(int picWidth, int picHeight)
         {
             int width = picWidth / _placeSizeWidth;
             int height = picHeight / _placeSizeHeight;
@@ -32,21 +27,23 @@ namespace Monorail.Generics
             _pictureHeight = picHeight;
             _collection = new SetGeneric<T>(width * height);
         }
-
-        public static bool operator +(MonorailGenericCollection<T, U> collect, T? obj)
+        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 -(MonorailGenericCollection<T, U> collect, int
-pos)
+        public static T? operator -(CruiserGenericCollection<T, U> collect, int pos)
         {
             T? obj = collect._collection[pos];
             if (obj != null)
+            {
                 collect._collection.Remove(pos);
+            }
+
             return obj;
         }
 
@@ -54,8 +51,7 @@ pos)
         {
             return (U?)_collection[pos]?.GetMoveableObject;
         }
-
-        public Bitmap ShowMonorails()
+        public Bitmap ShowCruisers()
         {
             Bitmap bmp = new(_pictureWidth, _pictureHeight);
             Graphics gr = Graphics.FromImage(bmp);
@@ -63,7 +59,6 @@ pos)
             DrawObjects(gr);
             return bmp;
         }
-
         private void DrawBackground(Graphics g)
         {
             Pen pen = new(Color.Black, 3);
@@ -80,23 +75,19 @@ pos)
                 _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
             }
         }
-
         private void DrawObjects(Graphics g)
         {
             int i = 0;
-            foreach (var monorail in _collection.GetMonorails())
+            foreach (var cruiser in _collection.GetCruiser())
             {
-                if (monorail != null)
+                if (cruiser != null)
                 {
                     int inRow = _pictureWidth / _placeSizeWidth;
-                   // monorail.SetPosition(i % inRow * _placeSizeWidth, _pictureHeight - _pictureHeight % _placeSizeHeight - (i / inRow + 1) * _placeSizeHeight + 5);
-                    monorail.SetPosition((i % inRow) * (_placeSizeWidth) + _placeSizeWidth / 20, _placeSizeHeight * (i / inRow) + _placeSizeHeight / 20);
-                   
-                    monorail.DrawTransport(g);
+                    cruiser.SetPosition((i % inRow) * _placeSizeWidth + _placeSizeWidth / 20, _placeSizeHeight * (i / inRow) + _placeSizeHeight / 10);
+                    cruiser.DrawTransport(g);
                 }
                 i++;
             }
         }
-
     }
 }

Cruiser/Cruiser/CruiserGenericStorage.cs

@@ -0,0 +1,50 @@
+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

@@ -4,14 +4,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail
+namespace Cruiser
 {
-    public enum DirectionType
+    public enum Direction
     {
         Up = 1,
         Down = 2,
         Left = 3,
         Right = 4
-
     }
 }

Cruiser/Cruiser/DrawningAdvancedCruiser.cs

@@ -0,0 +1,58 @@
+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)
+        {
+            if (EntityCruiser != null)
+            {
+                EntityCruiser = new EntityAdvancedCruiser(speed, weight, bodyColor, additionalColor, helicopterPad, coating);
+            }
+        }
+
+        public override void DrawTransport(Graphics g)
+        {
+            if (EntityCruiser is not EntityAdvancedCruiser cruiser)
+            {
+                return;
+            }
+            Brush addBrush = new SolidBrush(cruiser.AdditionalColor);
+            base.DrawTransport(g);
+            if (cruiser.HelicopterPad)
+            {
+
+                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);
+            }
+            if (cruiser.Coating)
+            {
+                g.FillEllipse(addBrush, _startPosX + 90, _startPosY + 20, 20, 20);
+
+            } 
+        }
+    }
+}

Cruiser/Cruiser/DrawningCruiser.cs

@@ -1,177 +1,135 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cruiser;
-using Monorail.Entities;
-using Monorail.MovementStrategy;
+using Cruiser.Entities;
+using Cruiser.MovementStrategy;
 
-namespace Monorail.DrawningObjects
+namespace Cruiser.DrawningObjects
 {
-    public class DrawningMonorail
+    public class DrawningCruiser
     {
-        public EntityMonorail? EntityMonorail { get; protected set; }
-
-        public int GetPosX => _startPosX;
-
-        public int GetPosY => _startPosY;
-
-        public int GetWidth => _monoRailWidth;
-
-        public int GetHeight => _monoRailHeight;
-
+        public EntityCruiser? EntityCruiser { get; protected set; }
         private int _pictureWidth;
-
         private int _pictureHeight;
-
-        protected int _startPosX = 0;
-
-        protected int _startPosY = 0;
-
-        protected int _monoRailWidth = 110;
-
-        protected int _monoRailHeight = 60;
-
-        protected int wheelSz;
-        public DrawningMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height)
+        protected int _startPosX;
+        protected int _startPosY;
+        private readonly int _cruiserWidth = 110;
+        private readonly int _cruiserHeight = 60;
+        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 <= _monoRailWidth || height <= _monoRailHeight)
+            if (width < _cruiserWidth || height < _cruiserHeight)
+            {
                 return;
+            }
             _pictureWidth = width;
             _pictureHeight = height;
-            wheelSz = _monoRailHeight - _monoRailHeight * 7 / 10;
-            EntityMonorail = new EntityMonorail(speed, weight, bodyColor, wheelColor, tireColor);
+            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
         }
-
-        protected DrawningMonorail(int speed, double weight, Color bodyColor, int width, int height, Color wheelColor, Color tireColor, int monoRailWidth, int monoRailHeight)
+        protected DrawningCruiser(int speed, double weight, Color bodyColor, int
+width, int height, int cruiserWidth, int cruiserHeight)
         {
-            if (width <= _monoRailWidth || height <= _monoRailHeight)
+            if (width <= _cruiserWidth || height <= _cruiserHeight)
+            {
                 return;
+            }
             _pictureWidth = width;
             _pictureHeight = height;
-            _monoRailHeight = monoRailHeight;
-            _monoRailWidth = monoRailWidth;
-            wheelSz = _monoRailHeight - _monoRailHeight * 7 / 10;
-            EntityMonorail = new EntityMonorail(speed, weight, bodyColor, wheelColor, tireColor);
+            _cruiserWidth = cruiserWidth;
+            _cruiserHeight = cruiserHeight;
+            EntityCruiser = new EntityCruiser(speed, weight, bodyColor);
         }
         public void SetPosition(int x, int y)
         {
-            if (EntityMonorail == null)
-                return;
+            if (x < 0 || x + _cruiserWidth > _pictureWidth)
+            {
+                x = Math.Max(0, _pictureWidth - _cruiserWidth);
+            }
+            if (y < 0 || y + _cruiserHeight > _pictureHeight)
+            {
+                y = Math.Max(0, _pictureHeight - _cruiserHeight);
+            }
             _startPosX = x;
             _startPosY = y;
-            if (x + _monoRailWidth >= _pictureWidth || y + _monoRailHeight >= _pictureHeight)
-            {
-                _startPosX = 1;
-                _startPosY = 1;
-            }
         }
-        public IMoveableObject GetMoveableObject => new
-DrawningObjectMonorail(this);
-        public bool CanMove(DirectionType direction)
+        public void MoveTransport(Direction direction)
         {
-            if (EntityMonorail == null)
-                return false;
-            return direction switch
+            if (!CanMove(direction) || EntityCruiser == null)
             {
-                DirectionType.Left => _startPosX - EntityMonorail.Step > 0,
-                DirectionType.Up => _startPosY - EntityMonorail.Step > 0,
-                DirectionType.Right => _startPosX + EntityMonorail.Step < _pictureWidth,
-                DirectionType.Down => _startPosY - +EntityMonorail.Step < _pictureHeight
-            };
-        }
-        public void MoveTransport(DirectionType direction)
-        {
-            if (!CanMove(direction) || EntityMonorail == null)
                 return;
+            }
             switch (direction)
             {
-                case DirectionType.Left:
-                    if (_startPosX - EntityMonorail.Step >= 0)
-                        _startPosX -= (int)EntityMonorail.Step;
+                case Direction.Left:
+                    _startPosX -= (int)EntityCruiser.Step;
                     break;
-                case DirectionType.Up:
-                    if (_startPosY - EntityMonorail.Step >= 0)
-                        _startPosY -= (int)EntityMonorail.Step;
+                case Direction.Up:
+                    _startPosY -= (int)EntityCruiser.Step;
                     break;
-                case DirectionType.Right:
-                    if (_startPosX + EntityMonorail.Step + _monoRailWidth < _pictureWidth)
-                        _startPosX += (int)EntityMonorail.Step;
+                case Direction.Right:
+                    _startPosX += (int)EntityCruiser.Step;
                     break;
-                case DirectionType.Down:
-                    if (_startPosY + EntityMonorail.Step + _monoRailHeight < _pictureHeight)
-                        _startPosY += (int)EntityMonorail.Step;
+                case Direction.Down:
+                    _startPosY += (int)EntityCruiser.Step;
                     break;
             }
         }
-
+        public bool CanMove(Direction direction)
+        {
+            if (EntityCruiser == null)
+            {
+                return false;
+            }
+            return direction switch
+            {
+                Direction.Left => _startPosX - EntityCruiser.Step > 0,
+                Direction.Up => _startPosY - EntityCruiser.Step > 0,
+                Direction.Right => _startPosX + EntityCruiser.Step + _cruiserWidth < _pictureWidth,
+                Direction.Down => _startPosY + EntityCruiser.Step + _cruiserHeight < _pictureHeight,
+                _ => false,
+            };
+        }
+        
+        public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
+        {
+            _pictureWidth = pictureBoxWidth;
+            _pictureHeight = pictureBoxHeight;
+        }
         public virtual void DrawTransport(Graphics g)
         {
-            if (EntityMonorail == null)
+            if (EntityCruiser == null)
+            {
                 return;
-            int dif = _monoRailWidth / 10;
-            _monoRailWidth -= dif;
-            Pen pen = new(Color.Black);
-            Brush cartBrush = new SolidBrush(Color.Black);
-            Brush bodyBrush = new SolidBrush(EntityMonorail.BodyColor);
-            Pen windowPen = new(Color.Blue);
-            Brush wheelBrush = new SolidBrush(EntityMonorail.WheelColor);
-            Brush windowBrush = new SolidBrush(Color.White);
-            Pen tirePen = new Pen(EntityMonorail.TireColor);
-            if (_monoRailWidth - _monoRailWidth / 20 * 17 < wheelSz)
-                wheelSz = _monoRailWidth - _monoRailWidth / 20 * 17;
+            }
+            Pen pen = new Pen(Color.Black);
+            Brush brush = new SolidBrush(EntityCruiser.BodyColor);
             g.DrawEllipse(pen, _startPosX + 15, _startPosY + 5, 20, 20);
             g.DrawEllipse(pen, _startPosX + 15, _startPosY + 35, 20, 20);
             g.DrawRectangle(pen, _startPosX + 9, _startPosY + 15, 10, 30);
             g.DrawRectangle(pen, _startPosX + 90, _startPosY + 15, 10,
            30);
             g.DrawRectangle(pen, _startPosX + 20, _startPosY + 4, 70, 52);
-
-            //если есть доп.фонари
-            /* if (Cruiser.Headlights)
-             {
-
-                 Brush brYellow = new SolidBrush(Color.Yellow);
-                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
-                 20);
-                 g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
-                 20);
-             }*/
-            //основание лодки!!!
-            Brush br = new SolidBrush(EntityMonorail.BodyColor);
+            Brush br = new SolidBrush(EntityCruiser.BodyColor);
             g.FillRectangle(br, _startPosX + 10, _startPosY + 15, 10, 30);
             g.FillRectangle(br, _startPosX + 90, _startPosY + 15, 10, 30);
             g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 70, 50);
-            Point[] points = new Point[3];// нос лодки
+            Point[] points = new Point[3];
             points[0] = new Point(_startPosX + 100, _startPosY + 5);
             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);
-
-
-
-
-
-           // _monoRailWidth += dif;
-
         }
     }
-
-}
-
+}

Cruiser/Cruiser/DrawningObjectCar.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cruiser;
-using Monorail.DrawningObjects;
-
-namespace Monorail.MovementStrategy
-{
-    public class DrawningObjectMonorail : IMoveableObject
-    {
-        private readonly DrawningMonorail? _drawningMonorail = null;
-
-        public DrawningObjectMonorail(DrawningMonorail drawningMonorail)
-        {
-            _drawningMonorail = drawningMonorail;
-        }
-
-        public ObjectParameters? GetObjectPosition
-        {
-            get
-            {
-                if (_drawningMonorail == null || _drawningMonorail.EntityMonorail == null)
-                {
-                    return null;
-                }
-                return new ObjectParameters(_drawningMonorail.GetPosX,
-                _drawningMonorail.GetPosY, _drawningMonorail.GetWidth, _drawningMonorail.GetHeight);
-            }
-
-        }
-        public int GetStep => (int)(_drawningMonorail?.EntityMonorail?.Step ?? 0);
-        public bool CheckCanMove(DirectionType direction) =>
-        _drawningMonorail?.CanMove(direction) ?? false;
-        public void MoveObject(DirectionType direction) =>
-        _drawningMonorail?.MoveTransport(direction);
-    }
-}

Cruiser/Cruiser/DrawningObjectCruiser.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Cruiser.DrawningObjects;
+namespace Cruiser.MovementStrategy
+{
+    internal class DrawningObjectCruiser : IMoveableObject
+    {
+        private readonly DrawningCruiser? _drawningCruiser = null;
+        public DrawningObjectCruiser(DrawningCruiser drawningCruiser)
+        {
+            _drawningCruiser = drawningCruiser;
+        }
+        public ObjectParameters? GetObjectPosition
+        {
+            get
+            {
+                if (_drawningCruiser == null || _drawningCruiser.EntityCruiser ==
+                null)
+                {
+                    return null;
+                }
+                return new ObjectParameters(_drawningCruiser.GetPosX,
+                _drawningCruiser.GetPosY, _drawningCruiser.GetWidth, _drawningCruiser.GetHeight);
+            }
+        }
+        public int GetStep => (int)(_drawningCruiser?.EntityCruiser?.Step ?? 0);
+        public bool CheckCanMove(Direction direction) =>
+        _drawningCruiser?.CanMove(direction) ?? false;
+        public void MoveObject(Direction direction) =>
+        _drawningCruiser?.MoveTransport(direction);
+    }
+}

Cruiser/Cruiser/DrawningPro.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Monorail.Entities;
-
-namespace Monorail.DrawningObjects
-{
-    public class DrawningLocomotive : DrawningMonorail
-    {
-        public DrawningLocomotive(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor, int width, int height, int addWheelsNumb,
-            Color additionalColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor, width, height)
-        {
-            if (EntityMonorail != null)
-            {
-                EntityMonorail = new EntityLocomotive(speed, weight, bodyColor, wheelColor, tireColor,
-                    addWheelsNumb, additionalColor, secondCabine, magniteRail);
-            }
-        }
-        public override void DrawTransport(Graphics g)
-        {
-            base.DrawTransport(g);
-            int dif = _monoRailWidth / 10;
-            _monoRailWidth -= dif;
-            Pen windowPen = new(Color.Blue);
-            Brush wheelBrush = new SolidBrush(EntityMonorail.WheelColor);
-            Brush windowBrush = new SolidBrush(Color.White);
-            if (EntityMonorail == null)
-                return;
-            if (EntityMonorail is not EntityLocomotive advancedMonorail)
-            {
-                return;
-            }
-            Pen additionalPen = new(advancedMonorail.AdditionalColor);
-            Brush additionalBrush = new SolidBrush(advancedMonorail.AdditionalColor);
-
-            //3 колеса
-           /* if (advancedMonorail.AddWheelsNumb >= 3)
-            {
-                g.FillEllipse(additionalBrush, _startPosX + _monoRailWidth / 10 * 6, _startPosY + _monoRailHeight / 10 * 7, wheelSz, wheelSz);
-                g.DrawEllipse(additionalPen, _startPosX + _monoRailWidth / 10 * 6, _startPosY + _monoRailHeight / 10 * 7, wheelSz, wheelSz);
-            }
-
-          g.DrawEllipse(additionalPen, _startPosX + _monoRailWidth / 10 * 3, _startPosY + _monoRailHeight / 10 * 7, wheelSz, wheelSz);
-            }*/
-
-            if (advancedMonorail.SecondCabine)
-            {
-                Brush brYellow = new SolidBrush(Color.Yellow);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 5, 20,
-                20);
-                g.FillEllipse(brYellow, _startPosX + 80, _startPosY + 35, 20,
-                20);
-                _monoRailWidth += dif;
-                //магнитная линия
-                if (advancedMonorail.MagniteRail)
-                {
-                    g.FillEllipse(Brushes.Green, _startPosX + 90, _startPosY + 20, 20, 20);
-                }
-            }
-        }
-
-    }
-}

Cruiser/Cruiser/EntityAdvancedCruiser.cs

@@ -0,0 +1,29 @@
+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;
+
+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;
+        }
+    }
+}

Cruiser/Cruiser/EntityCruiser.cs

@@ -1,32 +1,26 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail.Entities
+namespace Cruiser.Entities
 {
-    public class EntityMonorail
+    public class EntityCruiser
     {
         public int Speed { get; private set; }
         public double Weight { get; private set; }
-
         public Color BodyColor { get; private set; }
-        public Color WheelColor { get; private set; }
-
-        public Color TireColor { get; private set; }
-
         public double Step => (double)Speed * 100 / Weight;
-
-
-        public EntityMonorail(int speed, double weight, Color bodyColor, Color wheelColor, Color tireColor)
+        public EntityCruiser(int speed, double weight, Color bodyColor)
         {
             Speed = speed;
             Weight = weight;
             BodyColor = bodyColor;
-            WheelColor = wheelColor;
-            TireColor = tireColor;
+        }
+        public void setBodyColor(Color color)
+        {
+            BodyColor = color;
         }
     }
 }

Cruiser/Cruiser/Form1.Designer.cs

@@ -1,196 +0,0 @@
-namespace Cruiser
-{
-    partial class CruiserForm
-    {
-        /// <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>
-       
-
-        #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.button1 = new System.Windows.Forms.Button();
-            this.pictureBox1 = 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.buttonCreate = new System.Windows.Forms.Button();
-            this.button2 = new System.Windows.Forms.Button();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.ButtonStep = new System.Windows.Forms.Button();
-            this.SelectedCruiser = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // button1
-            // 
-            this.button1.Location = new System.Drawing.Point(386, 68);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(112, 34);
-            this.button1.TabIndex = 0;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(667, 358);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.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);
-            // 
-            // 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(0, 302);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(218, 34);
-            this.buttonCreate.TabIndex = 5;
-            this.buttonCreate.Text = "Создать простую";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
-            // 
-            // button2
-            // 
-            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.button2.Location = new System.Drawing.Point(210, 301);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(251, 37);
-            this.button2.TabIndex = 6;
-            this.button2.Text = "Создать про версию";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Items.AddRange(new object[] {
-            "Центр",
-            "Угол"});
-            this.comboBox1.Location = new System.Drawing.Point(415, 22);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(182, 33);
-            this.comboBox1.TabIndex = 7;
-            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
-            // 
-            // ButtonStep
-            // 
-            this.ButtonStep.Location = new System.Drawing.Point(485, 70);
-            this.ButtonStep.Name = "ButtonStep";
-            this.ButtonStep.Size = new System.Drawing.Size(112, 34);
-            this.ButtonStep.TabIndex = 8;
-            this.ButtonStep.Text = "Шаг";
-            this.ButtonStep.UseVisualStyleBackColor = true;
-            this.ButtonStep.Click += new System.EventHandler(this.ButtonStep_Click);
-            // 
-            // SelectedCruiser
-            // 
-            this.SelectedCruiser.Location = new System.Drawing.Point(210, 261);
-            this.SelectedCruiser.Name = "SelectedCruiser";
-            this.SelectedCruiser.Size = new System.Drawing.Size(112, 34);
-            this.SelectedCruiser.TabIndex = 9;
-            this.SelectedCruiser.Text = "Выбрать";
-            this.SelectedCruiser.UseVisualStyleBackColor = true;
-            this.SelectedCruiser.Click += new System.EventHandler(this.SelectedCruiser_Click);
-            // 
-            // CruiserForm
-            // 
-            this.ClientSize = new System.Drawing.Size(667, 358);
-            this.Controls.Add(this.SelectedCruiser);
-            this.Controls.Add(this.ButtonStep);
-            this.Controls.Add(this.comboBox1);
-            this.Controls.Add(this.button2);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.pictureBox1);
-            this.Name = "CruiserForm";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-        /// <param name="e"></param>
-       
-#endregion
-
-private Button button1;
-        private PictureBox pictureBox1;
-        private Button buttonDown;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonUp;
-        private Button buttonCreate;
-        private Button button2;
-        private ComboBox comboBox1;
-        private Button ButtonStep;
-        private Button SelectedCruiser;
-    }
-}

Cruiser/Cruiser/Form1.cs

@@ -1,164 +0,0 @@
-using System;
-using Cruiser;
-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 Monorail.DrawningObjects;
-using Monorail.MovementStrategy;
-using Monorail;
-
-
-namespace Cruiser
-{
-
-    public partial class CruiserForm : Form
-    {
-        private DrawningMonorail? _drawningMonorail;
-
-        private AbstractStrategy? _abstractStrategy;
-        private AbstractStrategy? _strategy;
-
-        public DrawningMonorail? SelectedCar { get; private set; }
-
-        public CruiserForm()
-        {
-            InitializeComponent();
-            _strategy = null;
-            SelectedCar = null;
-        }
-        private void Draw()
-        {
-            if (_drawningMonorail == null)
-            {
-                return;
-            }
-            Bitmap bmp = new Bitmap(pictureBox1.Width, pictureBox1.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningMonorail.DrawTransport(gr);
-            pictureBox1.Image = bmp;
-        }
-        private void buttonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningMonorail == null)
-            {
-                return;
-            }
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _drawningMonorail.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    _drawningMonorail.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    _drawningMonorail.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    _drawningMonorail.MoveTransport(DirectionType.Right);
-                    break;
-            }
-            Draw();
-        }
-
-        private void button2_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color bodyColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            Color wheelColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            Color tireColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                bodyColor = dialog.Color;
-            }
-            _drawningMonorail = new DrawningMonorail(random.Next(100, 300), random.Next(1000, 3000),
-                bodyColor, wheelColor, tireColor,
-                pictureBox1.Width, pictureBox1.Height);
-            Draw();
-        }
-
-
-    
-
-
-    private void ButtonStep_Click(object sender, EventArgs e)
-        {
-            if (_drawningMonorail == null)
-            {
-                return;
-            }
-            if (comboBox1.Enabled)
-            {
-                _abstractStrategy = comboBox1.SelectedIndex
-                switch
-                {
-                    0 => new MoveToCenter(),
-                    1 => new MoveToEdge(),
-                    _ => null,
-                };
-                if (_abstractStrategy == null)
-                {
-                    return;
-                }
-                _abstractStrategy.SetData(new DrawningObjectMonorail(_drawningMonorail), pictureBox1.Width,
-                pictureBox1.Height);
-                comboBox1.Enabled = false;
-            }
-            if (_abstractStrategy == null)
-            {
-                return;
-            }
-            _abstractStrategy.MakeStep();
-            Draw();
-            if (_abstractStrategy.GetStatus() == Status.Finish)
-            {
-                comboBox1.Enabled = true;
-                _abstractStrategy = null;
-            }
-        }
-
-        private void buttonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            Color bodyColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            Color wheelColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            Color tireColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            Color additionalColor = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-                bodyColor = dialog.Color;
-            if (dialog.ShowDialog() == DialogResult.OK)
-                additionalColor = dialog.Color;
-            int addWheelNumb = random.Next(3, 5);
-            _drawningMonorail = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000),
-                bodyColor, wheelColor, tireColor,
-                pictureBox1.Width, pictureBox1.Height, addWheelNumb,
-                additionalColor, random.Next(0, 2) > 0, random.Next(0, 2) > 0);
-            Draw();
-        }
-
-        public void SelectedCruiser_Click(object sender, EventArgs e)
-        {
-            SelectedCar = _drawningMonorail;
-            DialogResult = DialogResult.OK;
-        }
-
-        private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
-
-
-
-
-
-

Cruiser/Cruiser/FormCruiserCollection.Designer.cs

@@ -2,15 +2,7 @@
 {
     partial class FormCruiserCollection
     {
-        /// <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))
@@ -21,156 +13,161 @@
         }
 
         #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.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.textBox2 = new System.Windows.Forms.TextBox();
-            this.addStorageButton = new System.Windows.Forms.Button();
+            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.button2 = new System.Windows.Forms.Button();
-            this.updateCollectionButton = new System.Windows.Forms.Button();
-            this.ButtonRemoveCar = new System.Windows.Forms.Button();
+            this.ButtonDelObject = new System.Windows.Forms.Button();
             this.ButtonAddCruiser = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.panel1.SuspendLayout();
+            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();
             // 
-            // pictureBox1
+            // pictureBoxCruiser
             // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(971, 544);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBox1.TabIndex = 0;
-            this.pictureBox1.TabStop = false;
-            this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+            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;
             // 
-            // panel1
+            // panelCruiser
             // 
-            this.panel1.Controls.Add(this.textBox2);
-            this.panel1.Controls.Add(this.addStorageButton);
-            this.panel1.Controls.Add(this.listBoxStorages);
-            this.panel1.Controls.Add(this.button2);
-            this.panel1.Controls.Add(this.updateCollectionButton);
-            this.panel1.Controls.Add(this.ButtonRemoveCar);
-            this.panel1.Controls.Add(this.ButtonAddCruiser);
-            this.panel1.Controls.Add(this.textBox1);
-            this.panel1.Location = new System.Drawing.Point(692, 12);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(267, 520);
-            this.panel1.TabIndex = 1;
+            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;
             // 
-            // textBox2
+            // panelSet
             // 
-            this.textBox2.Location = new System.Drawing.Point(60, 36);
-            this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(150, 31);
-            this.textBox2.TabIndex = 2;
+            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;
             // 
-            // addStorageButton
+            // textBoxSet
             // 
-            this.addStorageButton.Location = new System.Drawing.Point(79, 88);
-            this.addStorageButton.Name = "addStorageButton";
-            this.addStorageButton.Size = new System.Drawing.Size(112, 34);
-            this.addStorageButton.TabIndex = 2;
-            this.addStorageButton.Text = "Добавить";
-            this.addStorageButton.UseVisualStyleBackColor = true;
-            this.addStorageButton.Click += new System.EventHandler(this.addStorageButton_Click);
+            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(60, 128);
+            this.listBoxStorages.Location = new System.Drawing.Point(49, 115);
             this.listBoxStorages.Name = "listBoxStorages";
-            this.listBoxStorages.Size = new System.Drawing.Size(152, 104);
-            this.listBoxStorages.TabIndex = 4;
-            this.listBoxStorages.SelectedIndexChanged += new System.EventHandler(this.listBoxStorages_SelectedIndexChanged);
+            this.listBoxStorages.Size = new System.Drawing.Size(97, 54);
+            this.listBoxStorages.TabIndex = 3;
+            this.listBoxStorages.SelectedIndexChanged += new System.EventHandler(this.listBoxObjects_SelectedIndexChanged);
             // 
-            // button2
+            // ButtonDelObject
             // 
-            this.button2.Location = new System.Drawing.Point(60, 264);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(159, 36);
-            this.button2.TabIndex = 2;
-            this.button2.Text = "Удалить набор";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.delStorageButton_Click);
-            // 
-            // updateCollectionButton
-            // 
-            this.updateCollectionButton.Location = new System.Drawing.Point(79, 469);
-            this.updateCollectionButton.Name = "updateCollectionButton";
-            this.updateCollectionButton.Size = new System.Drawing.Size(112, 34);
-            this.updateCollectionButton.TabIndex = 2;
-            this.updateCollectionButton.Text = "Обновить";
-            this.updateCollectionButton.UseVisualStyleBackColor = true;
-            this.updateCollectionButton.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // ButtonRemoveCar
-            // 
-            this.ButtonRemoveCar.Location = new System.Drawing.Point(60, 429);
-            this.ButtonRemoveCar.Name = "ButtonRemoveCar";
-            this.ButtonRemoveCar.Size = new System.Drawing.Size(150, 34);
-            this.ButtonRemoveCar.TabIndex = 2;
-            this.ButtonRemoveCar.Text = "Удалить";
-            this.ButtonRemoveCar.UseVisualStyleBackColor = true;
-            this.ButtonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveCar_Click);
+            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(60, 317);
+            this.ButtonAddCruiser.Location = new System.Drawing.Point(45, 266);
             this.ButtonAddCruiser.Name = "ButtonAddCruiser";
-            this.ButtonAddCruiser.Size = new System.Drawing.Size(150, 34);
-            this.ButtonAddCruiser.TabIndex = 3;
+            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);
             // 
-            // textBox1
+            // textBoxCruiser
             // 
-            this.textBox1.Location = new System.Drawing.Point(60, 381);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(150, 31);
-            this.textBox1.TabIndex = 2;
-            this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            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(971, 544);
-            this.Controls.Add(this.panel1);
-            this.Controls.Add(this.pictureBox1);
+            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.pictureBox1)).EndInit();
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
+            ((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 pictureBox1;
-        private Panel panel1;
-        private Button ButtonRemoveCar;
-        private Button ButtonAddCruiser;
-        private TextBox textBox1;
-        private Button updateCollectionButton;
-        private TextBox textBox2;
-        private Button addStorageButton;
+        private PictureBox pictureBoxCruiser;
+        private Panel panelCruiser;
+        private Panel panelSet;
+        private TextBox textBoxSet;
         private ListBox listBoxStorages;
-        private Button button2;
+        private Button ButtonAddObject;
+        private Button ButtonDelObject;
+        private Button ButtonAddCruiser;
+        private Button ButtonRemoveCruiser;
+        private TextBox textBoxCruiser;
+        private Button ButtonRefreshCollection;
     }
 }

Cruiser/Cruiser/FormCruiserCollection.cs

@@ -1,6 +1,5 @@
-using Monorail.DrawningObjects;
-using Monorail.Generics;
-using Monorail.MovementStrategy;
+using Cruiser.Generics;
+using Cruiser.DrawningObjects;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,54 +10,16 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-
 namespace Cruiser
 {
     public partial class FormCruiserCollection : Form
     {
-        private readonly MonorailGenericStorage _storage;
-
+        private readonly CruiserGenericStorage _storage;
+        
         public FormCruiserCollection()
         {
             InitializeComponent();
-            _storage = new MonorailGenericStorage(pictureBox1.Width, pictureBox1.Height);
-        }
-
-        private void pictureBox1_Click(object sender, EventArgs e)
-        {
-
-        }
-
-
-        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;
-            }
-            CruiserForm form = new();
-
-
-
-
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (obj + form.SelectedCar != null)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox1.Image = obj.ShowMonorails();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
+            _storage = new CruiserGenericStorage(pictureBoxCruiser.Width, pictureBoxCruiser.Height);
         }
         private void ReloadObjects()
         {
@@ -69,20 +30,75 @@ namespace Cruiser
             {
                 listBoxStorages.Items.Add(_storage.Keys[i]);
             }
-            if (listBoxStorages.Items.Count > 0 && (index == -1 || index
->= listBoxStorages.Items.Count))
+
+            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)
+
+            else if (listBoxStorages.Items.Count > 0 && index > -1 && index < listBoxStorages.Items.Count)
             {
                 listBoxStorages.SelectedIndex = index;
             }
-
         }
-
-        private void ButtonRemoveCar_Click(object sender, EventArgs e)
+        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)
             {
@@ -95,65 +111,22 @@ namespace Cruiser
                 return;
             }
             if (MessageBox.Show("Удалить объект?", "Удаление",
-        MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
-            int pos;
-            if (textBox1.Text == null || !int.TryParse(textBox1.Text, out pos))
-            {
-                MessageBox.Show("Введите номер парковочного места");
-                return;
-            }
-
+            int pos = Convert.ToInt32(textBoxCruiser.Text);
             if (obj - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox1.Image = obj.ShowMonorails();
+                pictureBoxCruiser.Image = obj.ShowCruisers();
             }
             else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
-
         }
-
         private void ButtonRefreshCollection_Click(object sender, EventArgs e)
-        {
-            var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
-           string.Empty];
-            
-            CruiserForm form = new();
-
-
-
-
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (obj + form.SelectedCar != null)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox1.Image = obj.ShowMonorails();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-    
-
-        private void maskedTextBoxNumber_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
-        {
-
-        }
-
-        private void textBox1_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void button1_Click(object sender, EventArgs e)
         {
             if (listBoxStorages.SelectedIndex == -1)
             {
@@ -165,46 +138,7 @@ namespace Cruiser
             {
                 return;
             }
-            pictureBox1.Image = obj.ShowMonorails();
-
-
-        }
-
-        private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox1.Image =
-_storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowMonorails();
-        }
-
-        private void delStorageButton_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 addStorageButton_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBox2.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _storage.AddSet(textBox2.Text);
-            ReloadObjects();
+            pictureBoxCruiser.Image = obj.ShowCruisers();
         }
     }
-    }
-    
-
-
+}

Cruiser/Cruiser/FormCruiserConfig.Designer.cs

@@ -0,0 +1,381 @@
+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

@@ -0,0 +1,126 @@
+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

@@ -0,0 +1,60 @@
+<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

@@ -1,17 +1,17 @@
-using Cruiser;
-using Monorail.DrawningObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Cruiser.MovementStrategy;
 
-namespace Monorail.MovementStrategy
+namespace Cruiser.MovementStrategy
 {
     public interface IMoveableObject
     {
         ObjectParameters? GetObjectPosition { get; }
-
         int GetStep { get; }
-
-        bool CheckCanMove(DirectionType direction);
-
-        void MoveObject(DirectionType direction);
-
+        bool CheckCanMove(Direction direction);
+        void MoveObject(Direction direction);
     }
 }

Cruiser/Cruiser/MonorailGenericStorage.cs

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

Cruiser/Cruiser/MoveToBorder.cs

@@ -1,14 +1,12 @@
-
-using Monorail.MovementStrategy;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail.MovementStrategy
+namespace Cruiser.MovementStrategy
 {
-    public class MoveToEdge : AbstractStrategy
+    internal class MoveToBorder : AbstractStrategy
     {
         protected override bool IsTargetDestinaion()
         {
@@ -17,10 +15,11 @@ namespace Monorail.MovementStrategy
             {
                 return false;
             }
-            return objParams.RightBorder < FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
-            objParams.DownBorder < FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
+            return objParams.RightBorder <= FieldWidth &&
+            objParams.RightBorder + GetStep() >= FieldWidth &&
+            objParams.DownBorder <= FieldHeight &&
+            objParams.DownBorder + GetStep() >= FieldHeight;
         }
-
         protected override void MoveToTarget()
         {
             var objParams = GetObjectParameters;
@@ -31,7 +30,11 @@ namespace Monorail.MovementStrategy
             var diffX = objParams.RightBorder - FieldWidth;
             if (Math.Abs(diffX) > GetStep())
             {
-                if (diffX < 0)
+                if (diffX > 0)
+                {
+                    MoveLeft();
+                }
+                else
                 {
                     MoveRight();
                 }
@@ -39,9 +42,14 @@ namespace Monorail.MovementStrategy
             var diffY = objParams.DownBorder - FieldHeight;
             if (Math.Abs(diffY) > GetStep())
             {
-                if (diffY < 0)
+                if (diffY > 0)
+                {
+                    MoveUp();
+                }
+                else
                 {
                     MoveDown();
+
                 }
             }
         }

Cruiser/Cruiser/MoveToCenter.cs

@@ -1,13 +1,12 @@
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail.MovementStrategy
+namespace Cruiser.MovementStrategy
 {
-    public class MoveToCenter : AbstractStrategy
+    internal class MoveToCenter : AbstractStrategy
     {
         protected override bool IsTargetDestinaion()
         {
@@ -16,12 +15,12 @@ namespace Monorail.MovementStrategy
             {
                 return false;
             }
-            return objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
+            return (objParams.ObjectMiddleHorizontal <= FieldWidth / 2 &&
             objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
             objParams.ObjectMiddleVertical <= FieldHeight / 2 &&
-            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
-        }
+            objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2);
 
+        }
         protected override void MoveToTarget()
         {
             var objParams = GetObjectParameters;
@@ -54,6 +53,5 @@ namespace Monorail.MovementStrategy
                 }
             }
         }
-
     }
 }

Cruiser/Cruiser/ObjectParameters.cs

@@ -1,25 +1,23 @@
-namespace Monorail.MovementStrategy
-{
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
+namespace Cruiser.MovementStrategy
+{
     public class ObjectParameters
     {
         private readonly int _x;
         private readonly int _y;
         private readonly int _width;
         private readonly int _height;
-
         public int LeftBorder => _x;
-
         public int TopBorder => _y;
-
         public int RightBorder => _x + _width;
-
         public int DownBorder => _y + _height;
-
         public int ObjectMiddleHorizontal => _x + _width / 2;
-
         public int ObjectMiddleVertical => _y + _height / 2;
-
         public ObjectParameters(int x, int y, int width, int height)
         {
             _x = x;
@@ -27,6 +25,5 @@
             _width = width;
             _height = height;
         }
-
     }
 }

Cruiser/Cruiser/Pro.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Monorail.Entities
-{
-    public class EntityLocomotive : EntityMonorail
-    {
-        public Color AdditionalColor { get; private set; }
-        public int AddWheelsNumb { get; private set; }
-
-        public bool SecondCabine { get; private set; }
-
-        public bool MagniteRail { get; private set; }
-        public EntityLocomotive(int speed, double weight, Color bodyColor, Color wheelColor,
-            Color tireColor, int addWheelsNumb, Color secondCabineColor, bool secondCabine, bool magniteRail) : base(speed, weight, bodyColor, wheelColor, tireColor)
-        {
-            AdditionalColor = secondCabineColor;
-            AddWheelsNumb = addWheelsNumb;
-            SecondCabine = secondCabine;
-            MagniteRail = magniteRail;
-        }
-
-    }
-}

Cruiser/Cruiser/Program.cs

@@ -1,6 +1,5 @@
 namespace Cruiser
 {
-    // <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>
     internal static class Program
     {
         /// <summary>

Cruiser/Cruiser/SetGeneric.cs

@@ -4,42 +4,45 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail.Generics
+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 monorail)
+        public bool Insert(T cruiser)
         {
             if (_places.Count == _maxCount)
+            {
                 return false;
-            Insert(monorail, 0);
+            }
+
+            Insert(cruiser, 0);
             return true;
-
         }
-
-        public bool Insert(T monorail, int position)
+        public bool Insert(T cruiser, int position)
         {
             if (!(position >= 0 && position <= Count && _places.Count < _maxCount))
+            {
                 return false;
-            _places.Insert(position, monorail);
+            }
+            _places.Insert(position, cruiser);
             return true;
         }
         public bool Remove(int position)
         {
-            if (!(position >= 0 && position < Count))
+            if (position < 0 || position >= Count)
+            {
                 return false;
+            }
+
             _places.RemoveAt(position);
             return true;
         }
@@ -47,30 +50,32 @@ namespace Monorail.Generics
         {
             get
             {
-                if (!(position >= 0 && position < Count))
+                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?> GetMonorails(int? maxMonorails = null)
+        public IEnumerable<T?> GetCruiser(int? maxCruisers = null)
         {
             for (int i = 0; i < _places.Count; ++i)
             {
                 yield return _places[i];
-                if (maxMonorails.HasValue && i == maxMonorails.Value)
+                if (maxCruisers.HasValue && i == maxCruisers.Value)
                 {
                     yield break;
                 }
             }
         }
-
     }
 }

Cruiser/Cruiser/Status.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monorail
+namespace Cruiser.MovementStrategy
 {
     public enum Status
     {
-        NotInit = 1,
-        InProgress = 2,
-        Finish = 3
+        NotInit,
+        InProgress,
+        Finish
     }
 }